+
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/index.js b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/index.js
index e7a8363f85897..afbf19d1f8a83 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/index.js
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/index.js
@@ -2,32 +2,20 @@ import { __ } from '@wordpress/i18n';
import React from 'react';
import './style.scss';
-const WpcomSiteManagementWidget = ( { siteName, siteDomain, siteIconUrl } ) => {
- const devToolItems = [
- {
- name: __( 'Deployments', 'jetpack-mu-wpcom' ),
- href: `/github-deployments/${ siteDomain }`,
- },
- {
- name: __( 'Monitoring', 'jetpack-mu-wpcom' ),
- href: `/site-monitoring/${ siteDomain }`,
- },
- {
- name: __( 'Logs', 'jetpack-mu-wpcom' ),
- href: `/site-logs/${ siteDomain }/php`,
- },
- {
- name: __( 'Staging Site', 'jetpack-mu-wpcom' ),
- href: `/staging-site/${ siteDomain }`,
- },
- {
- name: __( 'Server Settings', 'jetpack-mu-wpcom' ),
- href: `/hosting-config/${ siteDomain }`,
- },
- ];
-
+const WpcomSiteManagementWidget = ( { siteName, siteUrl, siteIconUrl, isBlockTheme } ) => {
+ const siteDomain = new URL( siteUrl ).hostname;
return (
<>
+
-
+
+
+
+
{
@@ -41,34 +29,19 @@ const WpcomSiteManagementWidget = ( { siteName, siteDomain, siteIconUrl } ) => {
-
-
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/style.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/style.scss
index 2bd4bd4577d90..f7ac7b2e60d62 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/style.scss
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-dashboard-widgets/wpcom-site-management-widget/style.scss
@@ -1,4 +1,4 @@
-#wpcom_site_management_widget {
+#wpcom_site_preview_widget {
color: #1e1e1e;
.postbox-title-action {
@@ -6,7 +6,30 @@
}
}
-#wpcom_site_management_widget_main {
+#wpcom_site_preview_widget_main {
+ .wpcom_site_preview_wrapper {
+ background: #f0f0f1;
+ margin-bottom: 12px;
+ padding: 12px 12px 0;
+ }
+
+ .wpcom_site_preview {
+ display: block;
+ max-width: 425px;
+ height: 200px;
+ overflow: hidden;
+ margin: 0 auto;
+
+ iframe {
+ max-width: 250%;
+ min-height: 375%;
+ transform: scale(.4);
+ transform-origin: top left;
+ translate: 0 -13px;
+ width: 250%;
+ }
+ }
+
.wpcom_site_management_widget__header {
display: flex;
align-items: center;
@@ -60,42 +83,7 @@
.wpcom_site_management_widget__site-actions {
flex-shrink: 0;
- }
-
- .wpcom_site_management_widget__content p {
- margin: 12px 0;
- font-size: 13px;
- font-weight: 400;
- line-height: 18px;
- }
-
- .wpcom_site_management_widget__dev-tools-title {
- margin-bottom: 12px;
- font-size: 11px;
- font-weight: 600;
- line-height: 16px;
- text-transform: uppercase;
- }
-
- .wpcom_site_management_widget__dev-tools-content {
- ul {
- display: grid;
- grid-template-columns: 1fr 1fr;
- gap: 12px;
- margin-bottom: 0;
- list-style: disc inside;
- }
-
- li {
- margin: 0 8px;
- color: #0073aa;
- font-size: 13px;
- font-weight: 400;
- line-height: 18px;
-
- &::marker {
- margin-inline-end: 2px;
- }
- }
+ display: flex;
+ gap: 12px;
}
}
diff --git a/projects/packages/jitm/changelog/renovate-webpack-cli-6.x b/projects/packages/jitm/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/jitm/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/jitm/package.json b/projects/packages/jitm/package.json
index c0b5d5e3d8704..696a1f4d0e8c8 100644
--- a/projects/packages/jitm/package.json
+++ b/projects/packages/jitm/package.json
@@ -28,6 +28,6 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/packages/masterbar/CHANGELOG.md b/projects/packages/masterbar/CHANGELOG.md
index 1c298b39a101c..3f44847564b10 100644
--- a/projects/packages/masterbar/CHANGELOG.md
+++ b/projects/packages/masterbar/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [0.12.0] - 2025-01-27
+### Added
+- Hide the calypso based Performance menu item on wordpress.com, show page-optimize based Performance menu item on Atomic sites. [#41145]
+
+### Removed
+- Remove classic view admin notice from general settings (for Atomic sites). [#41155]
+
## [0.11.0] - 2025-01-20
### Changed
- Add watch command in the masterbar package. [#41066]
@@ -207,6 +214,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Notifications: Change Icon [#37676]
- Updated package dependencies. [#37669] [#37706]
+[0.12.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.11.0...v0.12.0
[0.11.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.10.6...v0.11.0
[0.10.6]: https://github.com/Automattic/jetpack-masterbar/compare/v0.10.5...v0.10.6
[0.10.5]: https://github.com/Automattic/jetpack-masterbar/compare/v0.10.4...v0.10.5
diff --git a/projects/packages/masterbar/changelog/remove-classic-view-notice b/projects/packages/masterbar/changelog/remove-classic-view-notice
deleted file mode 100644
index c67067aa466a4..0000000000000
--- a/projects/packages/masterbar/changelog/remove-classic-view-notice
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: removed
-
-removed classic view admin notice from general settings (for atomic sites)
diff --git a/projects/packages/masterbar/changelog/renovate-webpack-cli-6.x b/projects/packages/masterbar/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/masterbar/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/masterbar/changelog/update-remove-performance-menu-item b/projects/packages/masterbar/changelog/update-remove-performance-menu-item
deleted file mode 100644
index 2300c80248710..0000000000000
--- a/projects/packages/masterbar/changelog/update-remove-performance-menu-item
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Hides the calypso based Performance menu item on wordpress.com, shows page-optimize based Performance menu item on Atomic sites.
diff --git a/projects/packages/masterbar/composer.json b/projects/packages/masterbar/composer.json
index 413d35d133621..11a9b82e9bd9e 100644
--- a/projects/packages/masterbar/composer.json
+++ b/projects/packages/masterbar/composer.json
@@ -70,7 +70,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.11.x-dev"
+ "dev-trunk": "0.12.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
diff --git a/projects/packages/masterbar/package.json b/projects/packages/masterbar/package.json
index 1bb298709bf2b..16dead5779881 100644
--- a/projects/packages/masterbar/package.json
+++ b/projects/packages/masterbar/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-masterbar",
- "version": "0.11.0",
+ "version": "0.12.0",
"description": "The WordPress.com Toolbar feature replaces the default admin bar and offers quick links to the Reader, all your sites, your WordPress.com profile, and notifications.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/masterbar/#readme",
"bugs": {
@@ -41,6 +41,6 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/packages/masterbar/src/class-main.php b/projects/packages/masterbar/src/class-main.php
index 57551b00d9334..72b808a99261d 100644
--- a/projects/packages/masterbar/src/class-main.php
+++ b/projects/packages/masterbar/src/class-main.php
@@ -14,7 +14,7 @@
*/
class Main {
- const PACKAGE_VERSION = '0.11.0';
+ const PACKAGE_VERSION = '0.12.0';
/**
* Initializer.
diff --git a/projects/packages/my-jetpack/changelog/renovate-webpack-cli-6.x b/projects/packages/my-jetpack/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
index 18ffda790b6d8..c5fd957188a85 100644
--- a/projects/packages/my-jetpack/package.json
+++ b/projects/packages/my-jetpack/package.json
@@ -78,6 +78,6 @@
"storybook": "8.4.7",
"typescript": "5.0.4",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/packages/plugin-deactivation/changelog/renovate-webpack-cli-6.x b/projects/packages/plugin-deactivation/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/plugin-deactivation/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/plugin-deactivation/package.json b/projects/packages/plugin-deactivation/package.json
index 03e4c990dfeac..b8434a08dd075 100644
--- a/projects/packages/plugin-deactivation/package.json
+++ b/projects/packages/plugin-deactivation/package.json
@@ -27,6 +27,6 @@
"tslib": "2.5.0",
"typescript": "5.0.4",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/packages/publicize/CHANGELOG.md b/projects/packages/publicize/CHANGELOG.md
index b579d3da4a50b..00e423dd439f7 100644
--- a/projects/packages/publicize/CHANGELOG.md
+++ b/projects/packages/publicize/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [0.58.0] - 2025-01-27
+### Changed
+- Refactored Social Note settings to use core [#41153]
+- Social | Unify connections management API schema [#40679]
+- Social | Use feature flag for share status data [#41218]
+
+### Fixed
+- Social: Fix profile links for LinkedIn connections [#40873]
+- Social | Fix editor invalid parameters error for old Jetpack versions. [#41199]
+- Social | Fix feature check for social connections list initial state [#40679]
+
## [0.57.4] - 2025-01-20
### Changed
- Code: Use function-style exit() and die() with a default status code of 0. [#41167]
@@ -817,6 +828,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated package dependencies.
- Update package.json metadata.
+[0.58.0]: https://github.com/Automattic/jetpack-publicize/compare/v0.57.4...v0.58.0
[0.57.4]: https://github.com/Automattic/jetpack-publicize/compare/v0.57.3...v0.57.4
[0.57.3]: https://github.com/Automattic/jetpack-publicize/compare/v0.57.2...v0.57.3
[0.57.2]: https://github.com/Automattic/jetpack-publicize/compare/v0.57.1...v0.57.2
diff --git a/projects/packages/publicize/changelog/fix-social-connections-list-feature-check b/projects/packages/publicize/changelog/fix-social-connections-list-feature-check
deleted file mode 100644
index db871891de374..0000000000000
--- a/projects/packages/publicize/changelog/fix-social-connections-list-feature-check
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Social | Fix feature check for social connections list initial state
diff --git a/projects/packages/publicize/changelog/fix-social-jetpack-v4-endpoint-profile-link-field b/projects/packages/publicize/changelog/fix-social-jetpack-v4-endpoint-profile-link-field
deleted file mode 100644
index db5148732cb59..0000000000000
--- a/projects/packages/publicize/changelog/fix-social-jetpack-v4-endpoint-profile-link-field
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Social | Fix editor invalid parameters error for old Jetpack versions.
diff --git a/projects/packages/publicize/changelog/fix-social-linkedin-profile-links b/projects/packages/publicize/changelog/fix-social-linkedin-profile-links
deleted file mode 100644
index e043639911d3a..0000000000000
--- a/projects/packages/publicize/changelog/fix-social-linkedin-profile-links
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Social: Fix profile links for LinkedIn connections
diff --git a/projects/packages/publicize/changelog/refactor-social-note-settings-core b/projects/packages/publicize/changelog/refactor-social-note-settings-core
deleted file mode 100644
index cb6e8105e2e53..0000000000000
--- a/projects/packages/publicize/changelog/refactor-social-note-settings-core
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Refactored Social Note settings to use core
diff --git a/projects/packages/publicize/changelog/renovate-webpack-cli-6.x b/projects/packages/publicize/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/publicize/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/publicize/changelog/social-unified-connections-management b/projects/packages/publicize/changelog/social-unified-connections-management
deleted file mode 100644
index 03f5d101125bf..0000000000000
--- a/projects/packages/publicize/changelog/social-unified-connections-management
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Social | Unify connections management API schema
diff --git a/projects/packages/publicize/composer.json b/projects/packages/publicize/composer.json
index f97740fea8854..812f4033df7b4 100644
--- a/projects/packages/publicize/composer.json
+++ b/projects/packages/publicize/composer.json
@@ -70,7 +70,7 @@
"link-template": "https://github.com/Automattic/jetpack-publicize/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "0.57.x-dev"
+ "dev-trunk": "0.58.x-dev"
}
},
"config": {
diff --git a/projects/packages/publicize/package.json b/projects/packages/publicize/package.json
index d4c3f900ea181..3de93476f47eb 100644
--- a/projects/packages/publicize/package.json
+++ b/projects/packages/publicize/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-publicize",
- "version": "0.57.4",
+ "version": "0.58.0",
"description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/publicize/#readme",
"bugs": {
@@ -31,7 +31,7 @@
"@wordpress/browserslist-config": "6.16.0",
"concurrently": "7.6.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
},
"dependencies": {
"@automattic/jetpack-analytics": "workspace:*",
diff --git a/projects/packages/publicize/src/class-publicize-script-data.php b/projects/packages/publicize/src/class-publicize-script-data.php
index c40d5f51a31c9..0c42234e95630 100644
--- a/projects/packages/publicize/src/class-publicize-script-data.php
+++ b/projects/packages/publicize/src/class-publicize-script-data.php
@@ -171,14 +171,12 @@ public static function get_social_settings() {
*/
public static function get_store_initial_state() {
- $is_wpcom = ( new Host() )->is_wpcom_platform();
-
$post = get_post();
$share_status = array();
// get_post_share_status is not available on WPCOM yet.
- if ( Utils::should_block_editor_have_social() && $post && ! $is_wpcom ) {
+ if ( Utils::should_block_editor_have_social() && $post && self::has_feature_flag( 'share-status' ) ) {
$share_status[ $post->ID ] = self::publicize()->get_post_share_status( $post->ID );
}
diff --git a/projects/packages/search/CHANGELOG.md b/projects/packages/search/CHANGELOG.md
index 39e1e1f9dee3b..0f19be500029d 100644
--- a/projects/packages/search/CHANGELOG.md
+++ b/projects/packages/search/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [0.47.7] - 2025-01-27
+### Changed
+- Internal updates.
+
## [0.47.6] - 2025-01-20
### Changed
- Code: Use function-style exit() and die() with a default status code of 0. [#41167]
@@ -1112,6 +1116,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated package dependencies.
- Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't.
+[0.47.7]: https://github.com/Automattic/jetpack-search/compare/v0.47.6...v0.47.7
[0.47.6]: https://github.com/Automattic/jetpack-search/compare/v0.47.5...v0.47.6
[0.47.5]: https://github.com/Automattic/jetpack-search/compare/v0.47.4...v0.47.5
[0.47.4]: https://github.com/Automattic/jetpack-search/compare/v0.47.3...v0.47.4
diff --git a/projects/packages/search/changelog/renovate-webpack-cli-6.x b/projects/packages/search/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/search/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
index aa3ee4672171c..034765fd53fb9 100644
--- a/projects/packages/search/package.json
+++ b/projects/packages/search/package.json
@@ -1,6 +1,5 @@
{
- "name": "jetpack-search",
- "version": "0.47.6",
+ "private": true,
"description": "Package for Jetpack Search products",
"main": "main.js",
"directories": {
@@ -92,7 +91,7 @@
"sass-loader": "12.4.0",
"size-limit": "11.1.6",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
},
"browserslist": [
"extends @wordpress/browserslist-config"
diff --git a/projects/packages/search/src/class-package.php b/projects/packages/search/src/class-package.php
index 0006b997f6ae8..e1e73f8497b92 100644
--- a/projects/packages/search/src/class-package.php
+++ b/projects/packages/search/src/class-package.php
@@ -11,7 +11,7 @@
* Search package general information
*/
class Package {
- const VERSION = '0.47.6';
+ const VERSION = '0.47.7';
const SLUG = 'search';
/**
diff --git a/projects/packages/videopress/CHANGELOG.md b/projects/packages/videopress/CHANGELOG.md
index c70d4f2853b8a..edf6ca53cc250 100644
--- a/projects/packages/videopress/CHANGELOG.md
+++ b/projects/packages/videopress/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [0.25.8] - 2025-01-27
+### Fixed
+- VideoPress: Fix issue with VideoPress block with 0 height and width [#41319]
+
## [0.25.7] - 2025-01-20
### Changed
- Code: Use function-style exit() and die() with a default status code of 0. [#41167]
@@ -1517,6 +1521,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created empty package [#24952]
+[0.25.8]: https://github.com/Automattic/jetpack-videopress/compare/v0.25.7...v0.25.8
[0.25.7]: https://github.com/Automattic/jetpack-videopress/compare/v0.25.6...v0.25.7
[0.25.6]: https://github.com/Automattic/jetpack-videopress/compare/v0.25.5...v0.25.6
[0.25.5]: https://github.com/Automattic/jetpack-videopress/compare/v0.25.4...v0.25.5
diff --git a/projects/packages/videopress/changelog/renovate-webpack-cli-6.x b/projects/packages/videopress/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/videopress/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
index cf03fb3ad28f5..66b35a3981fc4 100644
--- a/projects/packages/videopress/package.json
+++ b/projects/packages/videopress/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-videopress",
- "version": "0.25.7",
+ "version": "0.25.8",
"description": "VideoPress package",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",
"bugs": {
@@ -55,7 +55,7 @@
"storybook": "8.4.7",
"typescript": "5.0.4",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
},
"dependencies": {
"@automattic/jetpack-analytics": "workspace:*",
diff --git a/projects/packages/videopress/src/class-package-version.php b/projects/packages/videopress/src/class-package-version.php
index 2dc0c60e61184..92d353f8e1802 100644
--- a/projects/packages/videopress/src/class-package-version.php
+++ b/projects/packages/videopress/src/class-package-version.php
@@ -11,7 +11,7 @@
* The Package_Version class.
*/
class Package_Version {
- const PACKAGE_VERSION = '0.25.7';
+ const PACKAGE_VERSION = '0.25.8';
const PACKAGE_SLUG = 'videopress';
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/style.scss b/projects/packages/videopress/src/client/block-editor/blocks/video/style.scss
index 817e00019483e..10911c90ab106 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/style.scss
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/style.scss
@@ -11,7 +11,6 @@
.jetpack-videopress-player__wrapper {
position: relative;
- display: flex;
line-height: 0;
}
diff --git a/projects/packages/wordads/changelog/renovate-webpack-cli-6.x b/projects/packages/wordads/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/wordads/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/wordads/package.json b/projects/packages/wordads/package.json
index 5b66f900fc4a7..b4438478319b0 100644
--- a/projects/packages/wordads/package.json
+++ b/projects/packages/wordads/package.json
@@ -79,7 +79,7 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
},
"browserslist": [
"extends @wordpress/browserslist-config"
diff --git a/projects/packages/yoast-promo/changelog/renovate-webpack-cli-6.x b/projects/packages/yoast-promo/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/packages/yoast-promo/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/yoast-promo/package.json b/projects/packages/yoast-promo/package.json
index 7b8a7b27372cc..d9344bc634679 100644
--- a/projects/packages/yoast-promo/package.json
+++ b/projects/packages/yoast-promo/package.json
@@ -43,7 +43,7 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
},
"browserslist": [
"extends @wordpress/browserslist-config"
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/fix-bad-npm-package-names b/projects/plugins/automattic-for-agencies-client/changelog/fix-bad-npm-package-names
new file mode 100644
index 0000000000000..fc1da13877c8e
--- /dev/null
+++ b/projects/plugins/automattic-for-agencies-client/changelog/fix-bad-npm-package-names
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename intra-monorepo `jetpack-e2e-commons` dep to `_jetpack-e2e-commons`, which cannot be published to npmjs.com.
+
+
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-webpack-cli-6.x b/projects/plugins/automattic-for-agencies-client/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/automattic-for-agencies-client/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/package.json b/projects/plugins/automattic-for-agencies-client/package.json
index 99c8a40511e9e..aea55fc6a1c64 100644
--- a/projects/plugins/automattic-for-agencies-client/package.json
+++ b/projects/plugins/automattic-for-agencies-client/package.json
@@ -56,6 +56,6 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/plugins/automattic-for-agencies-client/tests/e2e/config/default.cjs b/projects/plugins/automattic-for-agencies-client/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/automattic-for-agencies-client/tests/e2e/config/default.cjs
+++ b/projects/plugins/automattic-for-agencies-client/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/automattic-for-agencies-client/tests/e2e/eslint.config.mjs b/projects/plugins/automattic-for-agencies-client/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/automattic-for-agencies-client/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/automattic-for-agencies-client/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/automattic-for-agencies-client/tests/e2e/package.json b/projects/plugins/automattic-for-agencies-client/tests/e2e/package.json
index 764e9d8bc18cb..d25acda3f41d6 100644
--- a/projects/plugins/automattic-for-agencies-client/tests/e2e/package.json
+++ b/projects/plugins/automattic-for-agencies-client/tests/e2e/package.json
@@ -16,7 +16,7 @@
"scripts": {
"build": "pnpm jetpack build plugins/automattic-for-agencies-client plugins/jetpack -v --no-pnpm-install --production",
"clean": "rm -rf output",
- "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+ "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
"distclean": "rm -rf node_modules",
"env:up": "e2e-env start --activate-plugins automattic-for-agencies-client",
"env:down": "e2e-env stop",
@@ -25,13 +25,13 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/automattic-for-agencies-client/tests/e2e/playwright.config.mjs b/projects/plugins/automattic-for-agencies-client/tests/e2e/playwright.config.mjs
index b5d057df1a7b8..e4ba2c71b583d 100644
--- a/projects/plugins/automattic-for-agencies-client/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/automattic-for-agencies-client/tests/e2e/playwright.config.mjs
@@ -1 +1 @@
-export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+export { default } from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/automattic-for-agencies-client/tests/e2e/specs/start.test.js b/projects/plugins/automattic-for-agencies-client/tests/e2e/specs/start.test.js
index f13283a0ab1e1..baa9f3ee0f4fa 100644
--- a/projects/plugins/automattic-for-agencies-client/tests/e2e/specs/start.test.js
+++ b/projects/plugins/automattic-for-agencies-client/tests/e2e/specs/start.test.js
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { Sidebar, DashboardPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { Sidebar, DashboardPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
import playwrightConfig from '../playwright.config.mjs';
test.describe( 'Starter plugin!', () => {
diff --git a/projects/plugins/boost/changelog/fix-bad-npm-package-names b/projects/plugins/boost/changelog/fix-bad-npm-package-names
new file mode 100644
index 0000000000000..6e781f5152830
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-bad-npm-package-names
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Remove unused "name" field from package.json. This is not published and is not the target of an intra-monorepo JS dependency.
+
+
diff --git a/projects/plugins/boost/changelog/fix-bad-npm-package-names#2 b/projects/plugins/boost/changelog/fix-bad-npm-package-names#2
new file mode 100644
index 0000000000000..fc1da13877c8e
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-bad-npm-package-names#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename intra-monorepo `jetpack-e2e-commons` dep to `_jetpack-e2e-commons`, which cannot be published to npmjs.com.
+
+
diff --git a/projects/plugins/boost/changelog/renovate-webpack-cli-6.x b/projects/plugins/boost/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/boost/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/boost/changelog/update-boost-stable-tag b/projects/plugins/boost/changelog/update-boost-stable-tag
new file mode 100644
index 0000000000000..27b9b851f4e2a
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-boost-stable-tag
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Update stable tag
+
+
diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json
index b7e6f8cac3df3..6753d2d82e30f 100644
--- a/projects/plugins/boost/package.json
+++ b/projects/plugins/boost/package.json
@@ -1,6 +1,5 @@
{
- "name": "jetpack-boost",
- "version": "3.8.0",
+ "private": true,
"description": "Boost your WordPress site's performance, from the creators of Jetpack",
"directories": {
"test": "tests"
@@ -53,7 +52,7 @@
"tslib": "2.5.0",
"typescript": "5.0.4",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
},
"browserslist": [
"extends @wordpress/browserslist-config"
@@ -73,7 +72,6 @@
"test-e2e:stop": "pnpm --prefix tests/e2e run tunnel:down && pnpm --prefix tests/e2e run env:down",
"test-e2e:decrypt-config": "pnpm --prefix tests/e2e run config:decrypt"
},
- "private": true,
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack",
diff --git a/projects/plugins/boost/readme.txt b/projects/plugins/boost/readme.txt
index fb0e08f55cf6c..a7b2c01e0ddee 100644
--- a/projects/plugins/boost/readme.txt
+++ b/projects/plugins/boost/readme.txt
@@ -5,7 +5,7 @@ Tags: performance, speed, web vitals, critical css, cache
Requires at least: 6.6
Tested up to: 6.7
Requires PHP: 7.2
-Stable tag: 3.6.0
+Stable tag: 3.8.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/projects/plugins/boost/tests/e2e/config/default.cjs b/projects/plugins/boost/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/boost/tests/e2e/config/default.cjs
+++ b/projects/plugins/boost/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/boost/tests/e2e/eslint.config.mjs b/projects/plugins/boost/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/boost/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/boost/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js b/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
index 31a9e7f9f57ac..f4bd70c7623e3 100644
--- a/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
+++ b/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
@@ -1,7 +1,7 @@
import { expect } from '@playwright/test';
-import { ensureUserIsLoggedIn } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import logger from 'jetpack-e2e-commons/logger.js';
+import { ensureUserIsLoggedIn } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { execWpCommand } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from '_jetpack-e2e-commons/logger.js';
import { JetpackBoostPage } from '../pages/index.js';
/**
diff --git a/projects/plugins/boost/tests/e2e/lib/pages/frontend/FirstPostPage.js b/projects/plugins/boost/tests/e2e/lib/pages/frontend/FirstPostPage.js
index d8540cc86fc71..78f2d0d783061 100644
--- a/projects/plugins/boost/tests/e2e/lib/pages/frontend/FirstPostPage.js
+++ b/projects/plugins/boost/tests/e2e/lib/pages/frontend/FirstPostPage.js
@@ -1,5 +1,5 @@
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import WpPage from '_jetpack-e2e-commons/pages/wp-page.js';
export default class FirstPostPage extends WpPage {
constructor( page ) {
diff --git a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
index afe15bab290cc..6ae7aa9e7733b 100644
--- a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
+++ b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
@@ -1,5 +1,5 @@
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import WpPage from '_jetpack-e2e-commons/pages/wp-page.js';
const apiEndpointsRegex = {
'modules-state': /jetpack-boost-ds\/modules-state\/set/,
diff --git a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/PermalinksPage.js b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/PermalinksPage.js
index 881a85f8b01af..4ab16a4ac48ed 100644
--- a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/PermalinksPage.js
+++ b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/PermalinksPage.js
@@ -1,5 +1,5 @@
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import WpPage from '_jetpack-e2e-commons/pages/wp-page.js';
export default class PermalinksPage extends WpPage {
constructor( page ) {
diff --git a/projects/plugins/boost/tests/e2e/lib/setupTests.js b/projects/plugins/boost/tests/e2e/lib/setupTests.js
index 99d581b450de8..22e968f03506f 100644
--- a/projects/plugins/boost/tests/e2e/lib/setupTests.js
+++ b/projects/plugins/boost/tests/e2e/lib/setupTests.js
@@ -1,5 +1,5 @@
import { chromium } from '@playwright/test';
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
import { boostPrerequisitesBuilder } from './env/prerequisites.js';
/**
diff --git a/projects/plugins/boost/tests/e2e/package.json b/projects/plugins/boost/tests/e2e/package.json
index 0121aa55e79da..908e8fb8d45b3 100644
--- a/projects/plugins/boost/tests/e2e/package.json
+++ b/projects/plugins/boost/tests/e2e/package.json
@@ -15,7 +15,7 @@
"scripts": {
"build": "pnpm jetpack build plugins/jetpack plugins/boost js-packages/image-guide js-packages/critical-css-gen packages/plugin-deactivation -v --no-pnpm-install --production",
"clean": "rm -rf output",
- "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+ "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
"distclean": "rm -rf node_modules",
"env:up": "e2e-env start --activate-plugins boost && pnpm run prepare:e2e",
"env:down": "e2e-env stop",
@@ -24,14 +24,14 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs",
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs",
"prepare:e2e": "pnpm jetpack docker --type e2e --name t1 exec-silent -- chown -R www-data .htaccess wp-config.php wp-content"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/boost/tests/e2e/playwright.config.mjs b/projects/plugins/boost/tests/e2e/playwright.config.mjs
index 56d22771f7342..dd9f4cfb1c655 100644
--- a/projects/plugins/boost/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/boost/tests/e2e/playwright.config.mjs
@@ -1,4 +1,4 @@
-import config from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+import config from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
config.globalSetup = './lib/setupTests.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/base/common.test.js b/projects/plugins/boost/tests/e2e/specs/base/common.test.js
index ff8d67c4e303a..390203f988241 100644
--- a/projects/plugins/boost/tests/e2e/specs/base/common.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/base/common.test.js
@@ -1,8 +1,8 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import { DashboardPage, PluginsPage, Sidebar } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { execWpCommand } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import { DashboardPage, PluginsPage, Sidebar } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/base/get-started.test.ts b/projects/plugins/boost/tests/e2e/specs/base/get-started.test.ts
index 5539420458675..381ffa66e33b3 100644
--- a/projects/plugins/boost/tests/e2e/specs/base/get-started.test.ts
+++ b/projects/plugins/boost/tests/e2e/specs/base/get-started.test.ts
@@ -1,5 +1,5 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/concatenate/concatenate.test.js b/projects/plugins/boost/tests/e2e/specs/concatenate/concatenate.test.js
index cf32b45c90166..27b33ce5125db 100644
--- a/projects/plugins/boost/tests/e2e/specs/concatenate/concatenate.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/concatenate/concatenate.test.js
@@ -1,6 +1,6 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { PostFrontendPage } from '_jetpack-e2e-commons/pages/index.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/critical-css/critical-css.test.js b/projects/plugins/boost/tests/e2e/specs/critical-css/critical-css.test.js
index 231c9c9b278a2..b4425559eb857 100644
--- a/projects/plugins/boost/tests/e2e/specs/critical-css/critical-css.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/critical-css/critical-css.test.js
@@ -1,8 +1,8 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
-import { DashboardPage, ThemesPage, Sidebar } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { execWpCommand } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import { PostFrontendPage } from '_jetpack-e2e-commons/pages/index.js';
+import { DashboardPage, ThemesPage, Sidebar } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/image-cdn/image-cdn.test.js b/projects/plugins/boost/tests/e2e/specs/image-cdn/image-cdn.test.js
index 049bbca926f41..9d45b1ae539dd 100644
--- a/projects/plugins/boost/tests/e2e/specs/image-cdn/image-cdn.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/image-cdn/image-cdn.test.js
@@ -1,5 +1,5 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage, FirstPostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/image-guide/image-guide.test.js b/projects/plugins/boost/tests/e2e/specs/image-guide/image-guide.test.js
index 161843448925b..d09258476c819 100644
--- a/projects/plugins/boost/tests/e2e/specs/image-guide/image-guide.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/image-guide/image-guide.test.js
@@ -1,5 +1,5 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { FirstPostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/modules/modules-common.test.js b/projects/plugins/boost/tests/e2e/specs/modules/modules-common.test.js
index 95344c7dd210f..b3181c642cd52 100644
--- a/projects/plugins/boost/tests/e2e/specs/modules/modules-common.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/modules/modules-common.test.js
@@ -1,5 +1,5 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/modules/render-blocking-js.test.js b/projects/plugins/boost/tests/e2e/specs/modules/render-blocking-js.test.js
index 6358b0b3fba7d..6d8206b033ac2 100644
--- a/projects/plugins/boost/tests/e2e/specs/modules/render-blocking-js.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/modules/render-blocking-js.test.js
@@ -1,6 +1,6 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { PostFrontendPage } from '_jetpack-e2e-commons/pages/index.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
const testPostTitle = 'Hello World with JavaScript';
diff --git a/projects/plugins/boost/tests/e2e/specs/modules/score-auto-refresh.test.js b/projects/plugins/boost/tests/e2e/specs/modules/score-auto-refresh.test.js
index 4286016401339..f61b63a559f21 100644
--- a/projects/plugins/boost/tests/e2e/specs/modules/score-auto-refresh.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/modules/score-auto-refresh.test.js
@@ -1,5 +1,5 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js b/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js
index 794a0e09cde51..4df4b7bdf9960 100644
--- a/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js
@@ -1,4 +1,4 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/boost/tests/e2e/specs/page-cache/page-cache.test.js b/projects/plugins/boost/tests/e2e/specs/page-cache/page-cache.test.js
index c76a67e1dc602..d45fd4e2f12d5 100644
--- a/projects/plugins/boost/tests/e2e/specs/page-cache/page-cache.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/page-cache/page-cache.test.js
@@ -1,8 +1,8 @@
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
-import { WPLoginPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import { PostFrontendPage } from '_jetpack-e2e-commons/pages/index.js';
+import { WPLoginPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
+import playwrightConfig from '_jetpack-e2e-commons/playwright.config.mjs';
import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
import { JetpackBoostPage, PermalinksPage } from '../../lib/pages/index.js';
diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/fix-bad-npm-package-names b/projects/plugins/classic-theme-helper-plugin/changelog/fix-bad-npm-package-names
new file mode 100644
index 0000000000000..fc1da13877c8e
--- /dev/null
+++ b/projects/plugins/classic-theme-helper-plugin/changelog/fix-bad-npm-package-names
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename intra-monorepo `jetpack-e2e-commons` dep to `_jetpack-e2e-commons`, which cannot be published to npmjs.com.
+
+
diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/renovate-webpack-cli-6.x b/projects/plugins/classic-theme-helper-plugin/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/classic-theme-helper-plugin/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/classic-theme-helper-plugin/package.json b/projects/plugins/classic-theme-helper-plugin/package.json
index ec6c9a447eb14..560d9fad27562 100644
--- a/projects/plugins/classic-theme-helper-plugin/package.json
+++ b/projects/plugins/classic-theme-helper-plugin/package.json
@@ -52,6 +52,6 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/plugins/classic-theme-helper-plugin/tests/e2e/config/default.cjs b/projects/plugins/classic-theme-helper-plugin/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/classic-theme-helper-plugin/tests/e2e/config/default.cjs
+++ b/projects/plugins/classic-theme-helper-plugin/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/classic-theme-helper-plugin/tests/e2e/eslint.config.mjs b/projects/plugins/classic-theme-helper-plugin/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/classic-theme-helper-plugin/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/classic-theme-helper-plugin/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/classic-theme-helper-plugin/tests/e2e/package.json b/projects/plugins/classic-theme-helper-plugin/tests/e2e/package.json
index 1abf3ffd9f812..d726e7aaae3d0 100644
--- a/projects/plugins/classic-theme-helper-plugin/tests/e2e/package.json
+++ b/projects/plugins/classic-theme-helper-plugin/tests/e2e/package.json
@@ -16,7 +16,7 @@
"scripts": {
"build": "pnpm jetpack build plugins/classic-theme-helper-plugin plugins/jetpack -v --no-pnpm-install --production",
"clean": "rm -rf output",
- "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+ "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
"distclean": "rm -rf node_modules",
"env:up": "e2e-env start --activate-plugins classic-theme-helper-plugin",
"env:down": "e2e-env stop",
@@ -25,13 +25,13 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/classic-theme-helper-plugin/tests/e2e/playwright.config.mjs b/projects/plugins/classic-theme-helper-plugin/tests/e2e/playwright.config.mjs
index b5d057df1a7b8..e4ba2c71b583d 100644
--- a/projects/plugins/classic-theme-helper-plugin/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/classic-theme-helper-plugin/tests/e2e/playwright.config.mjs
@@ -1 +1 @@
-export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+export { default } from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/classic-theme-helper-plugin/tests/e2e/specs/start.test.js b/projects/plugins/classic-theme-helper-plugin/tests/e2e/specs/start.test.js
index f13283a0ab1e1..baa9f3ee0f4fa 100644
--- a/projects/plugins/classic-theme-helper-plugin/tests/e2e/specs/start.test.js
+++ b/projects/plugins/classic-theme-helper-plugin/tests/e2e/specs/start.test.js
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { Sidebar, DashboardPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { Sidebar, DashboardPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
import playwrightConfig from '../playwright.config.mjs';
test.describe( 'Starter plugin!', () => {
diff --git a/projects/plugins/crm/changelog/renovate-webpack-cli-6.x b/projects/plugins/crm/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/crm/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/crm/package.json b/projects/plugins/crm/package.json
index ec514bd05dfe7..933f0b90ddbae 100644
--- a/projects/plugins/crm/package.json
+++ b/projects/plugins/crm/package.json
@@ -55,6 +55,6 @@
"sass-loader": "12.4.0",
"typescript": "5.0.4",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md
index 534c1fa2ad32f..00c73bb3bf771 100644
--- a/projects/plugins/jetpack/CHANGELOG.md
+++ b/projects/plugins/jetpack/CHANGELOG.md
@@ -2,6 +2,27 @@
### This is a list detailing changes for all Jetpack releases.
+## 14.3-a.5 - 2025-01-27
+### Enhancements
+- Forms: Add Checkbox and Consent field enter action to create a new block. [#41297]
+
+### Bug fixes
+- Forms: Make the icons show up as expected in the style editor. [#41314]
+- Sitemaps: Ensure a valid news sitemap is present even if no posts are eligible. [#40893]
+- Social: Fix profile links for LinkedIn connections. [#40873]
+- Social: Fix Publicize error in the editor due to malformed connections data. [#40679]
+- VideoPress: Fix issue with VideoPress block with zero height and width. [#41319]
+
+### Other changes
+- Comments API: Add wpcom_id and wpcom_login fields to comment author responses when requested via author_wpcom_data parameter. [#41254]
+- Forms: Fix default editor stying for textarea. [#41229]
+- Forms: Remove wrapping - { __( - 'Get a quick overview of your plans, storage, and domains, or easily access your development tools using the links provided below:', - 'jetpack-mu-wpcom' - ) } -
-
-
- { __( 'DEV TOOLS:', 'jetpack-mu-wpcom' ) }
-
-
-
+ { isBlockTheme ? (
+
+ { __( 'Edit Site', 'jetpack-mu-wpcom' ) }
+
+ ) : null }
-
- { devToolItems.map( item => (
-
- - { item.name } - - ) ) } -
element from form block. [#41274]
+- General: Fix the rendering of Jetpack Google Fonts font faces for classic themes. [#41190]
+- General: Deprecate Jetpack geo location module. [#41193]
+- Jetpack AI: Use the PluginDocumentSettingPanel slotfill for compatibility with site and post editor in the Excerpt panel. [#41251]
+- Jetpack button: Implement outline style. [#41194]
+- Related Posts: Revert "Hide settings in block themes." [#41203]
+
## 14.3-a.3 - 2025-01-20
### Enhancements
- Forms: Allow HTML block within forms. [#41040]
diff --git a/projects/plugins/jetpack/changelog/add-comment-endpoint-wpcom-user-fields b/projects/plugins/jetpack/changelog/add-comment-endpoint-wpcom-user-fields
deleted file mode 100644
index 56e3b470c7d40..0000000000000
--- a/projects/plugins/jetpack/changelog/add-comment-endpoint-wpcom-user-fields
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: other
-
-Comments API: Add wpcom_id and wpcom_login fields to comment author responses when requested via author_wpcom_data parameter.
diff --git a/projects/plugins/jetpack/changelog/add-phpcs-ignore-for-wpcut b/projects/plugins/jetpack/changelog/add-phpcs-ignore-for-wpcut
deleted file mode 100644
index e61241f9dddd2..0000000000000
--- a/projects/plugins/jetpack/changelog/add-phpcs-ignore-for-wpcut
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Add phpcs:ignore for wpcom. No changes to functionality.
-
-
diff --git a/projects/plugins/jetpack/changelog/change-jetpack-seo-assistant-wizard-mechanics b/projects/plugins/jetpack/changelog/change-jetpack-seo-assistant-wizard-mechanics
new file mode 100644
index 0000000000000..031857263b525
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/change-jetpack-seo-assistant-wizard-mechanics
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Jetpack SEO: assistant wizard changes to achieve desired step flow
diff --git a/projects/plugins/jetpack/changelog/clean-extra-composer-things b/projects/plugins/jetpack/changelog/clean-extra-composer-things
deleted file mode 100644
index 0246f2989b8fd..0000000000000
--- a/projects/plugins/jetpack/changelog/clean-extra-composer-things
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Only updated dev tools
-
-
diff --git a/projects/plugins/jetpack/changelog/fix-empty-news b/projects/plugins/jetpack/changelog/fix-empty-news
deleted file mode 100644
index 2a7c16c64d28a..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-empty-news
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Sitemaps: ensures a valid news sitemap is present even if no posts are eligible.
diff --git a/projects/plugins/jetpack/changelog/fix-form-radio-button-missing-div b/projects/plugins/jetpack/changelog/fix-form-radio-button-missing-div
deleted file mode 100644
index e28a76958ead5..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-form-radio-button-missing-div
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: bugfix
-Comment: Seems like a minor bug fix
-
-
diff --git a/projects/plugins/jetpack/changelog/fix-form-submit-button-outline b/projects/plugins/jetpack/changelog/fix-form-submit-button-outline
deleted file mode 100644
index 57b3002471771..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-form-submit-button-outline
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: other
-
-Jetpack button: implement outline style
diff --git a/projects/plugins/jetpack/changelog/fix-form-textarea-default-border-stylinig b/projects/plugins/jetpack/changelog/fix-form-textarea-default-border-stylinig
deleted file mode 100644
index d7c3a3acbc3c5..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-form-textarea-default-border-stylinig
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Forms: fixed default editor stying for textarea
diff --git a/projects/plugins/jetpack/changelog/fix-jetpack-ai-excerpt-site-editor b/projects/plugins/jetpack/changelog/fix-jetpack-ai-excerpt-site-editor
deleted file mode 100644
index 923bc46e99287..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-jetpack-ai-excerpt-site-editor
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Jetpack AI: excerpt panel now uses PluginDocumentSettingPanel slotfill for compatibility with site and post editor
diff --git a/projects/plugins/jetpack/changelog/fix-jetpack-google-fonts-in-classic-themes b/projects/plugins/jetpack/changelog/fix-jetpack-google-fonts-in-classic-themes
deleted file mode 100644
index 0a2c259a241f1..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-jetpack-google-fonts-in-classic-themes
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Fix the rendering of jetpack google fonts font faces for classic themes.
diff --git a/projects/plugins/jetpack/changelog/fix-publicize-php-unit-tests b/projects/plugins/jetpack/changelog/fix-publicize-php-unit-tests
deleted file mode 100644
index 62ae61fa5fb9f..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-publicize-php-unit-tests
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Fixed Publicize unit tests
-
-
diff --git a/projects/plugins/jetpack/changelog/fix-publicize-unit-tests-again b/projects/plugins/jetpack/changelog/fix-publicize-unit-tests-again
deleted file mode 100644
index c8f7896ae00a9..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-publicize-unit-tests-again
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Fixed publicize unit test
-
-
diff --git a/projects/plugins/jetpack/changelog/fix-social-connections-list-feature-check b/projects/plugins/jetpack/changelog/fix-social-connections-list-feature-check
deleted file mode 100644
index 76c3a4215d02f..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-social-connections-list-feature-check
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Social | Fix publicize error in the editor due to malformed connections data
diff --git a/projects/plugins/jetpack/changelog/fix-social-linkedin-profile-links b/projects/plugins/jetpack/changelog/fix-social-linkedin-profile-links
deleted file mode 100644
index 06f9ff81b9f67..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-social-linkedin-profile-links
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Social: Fix profile links for LinkedIn connections
diff --git a/projects/plugins/jetpack/changelog/prerelease b/projects/plugins/jetpack/changelog/prerelease
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/jetpack/changelog/remove-contact-form-hocs b/projects/plugins/jetpack/changelog/remove-contact-form-hocs
deleted file mode 100644
index 3566d3d26c790..0000000000000
--- a/projects/plugins/jetpack/changelog/remove-contact-form-hocs
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Forms: Remove wrapping
element from form block.
diff --git a/projects/plugins/jetpack/changelog/remove-remove-jetpack-geo-location-2 b/projects/plugins/jetpack/changelog/remove-remove-jetpack-geo-location-2
deleted file mode 100644
index 7ad726083cde6..0000000000000
--- a/projects/plugins/jetpack/changelog/remove-remove-jetpack-geo-location-2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: other
-
-Deprecate Jetpack geo location module
diff --git a/projects/plugins/jetpack/changelog/fix-cookie-consent-reg b/projects/plugins/jetpack/changelog/renovate-webpack-cli-6.x
similarity index 52%
rename from projects/plugins/jetpack/changelog/fix-cookie-consent-reg
rename to projects/plugins/jetpack/changelog/renovate-webpack-cli-6.x
index 1ef8afea050a2..1eaea6a769e84 100644
--- a/projects/plugins/jetpack/changelog/fix-cookie-consent-reg
+++ b/projects/plugins/jetpack/changelog/renovate-webpack-cli-6.x
@@ -1,4 +1,4 @@
Significance: patch
Type: other
-
+Updated package dependencies.
diff --git a/projects/plugins/jetpack/changelog/revert-41075-update-related-posts-block-theme b/projects/plugins/jetpack/changelog/revert-41075-update-related-posts-block-theme
deleted file mode 100644
index 842a45c767d72..0000000000000
--- a/projects/plugins/jetpack/changelog/revert-41075-update-related-posts-block-theme
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Revert "Related Posts: Hide settings in block themes"
diff --git a/projects/plugins/jetpack/changelog/update-forms-unique-id b/projects/plugins/jetpack/changelog/update-forms-unique-id
deleted file mode 100644
index b9412e76b338b..0000000000000
--- a/projects/plugins/jetpack/changelog/update-forms-unique-id
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: bugfix
-Comment: Forms: Add unique ids to each form
-
-
diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
index 7092b747b3737..46a456adaf195 100644
--- a/projects/plugins/jetpack/composer.json
+++ b/projects/plugins/jetpack/composer.json
@@ -106,7 +106,7 @@
"platform": {
"ext-intl": "0.0.0"
},
- "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ14_3_a_3",
+ "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ14_3_a_5",
"allow-plugins": {
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 80966e8bf38aa..c238ed0a903d4 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -1642,7 +1642,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "a1c271b55fc72f8d436a5e104900953419a9ab4e"
+ "reference": "8f51311ffdd7a5ae6b1b425acb766a767d68d142"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1671,7 +1671,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.11.x-dev"
+ "dev-trunk": "0.12.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
@@ -2192,7 +2192,7 @@
"dist": {
"type": "path",
"url": "../../packages/publicize",
- "reference": "f495c414a30bec3c9e2cb5e74fa4fb991825a947"
+ "reference": "ef59d41b8d9b9b26f6ba0fb1699e144e83911516"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -2221,7 +2221,7 @@
"link-template": "https://github.com/Automattic/jetpack-publicize/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "0.57.x-dev"
+ "dev-trunk": "0.58.x-dev"
}
},
"autoload": {
diff --git a/projects/plugins/jetpack/extensions/blocks/map/block.json b/projects/plugins/jetpack/extensions/blocks/map/block.json
index eca12d214a760..ed1e04ab2423a 100644
--- a/projects/plugins/jetpack/extensions/blocks/map/block.json
+++ b/projects/plugins/jetpack/extensions/blocks/map/block.json
@@ -8,7 +8,7 @@
"version": "12.5.0",
"textdomain": "jetpack",
"category": "embed",
- "icon": "",
+ "icon": "",
"supports": { "defaultStylePicker": false, "html": false },
"attributes": {
"align": {
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/assistant-wizard.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/assistant-wizard.tsx
new file mode 100644
index 0000000000000..5e8254095acd1
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/assistant-wizard.tsx
@@ -0,0 +1,175 @@
+import { Button, Icon, Tooltip } from '@wordpress/components';
+import { useState, useEffect, useRef, useMemo, useCallback } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { next, closeSmall, chevronLeft } from '@wordpress/icons';
+import debugFactory from 'debug';
+import { useKeywordsStep } from './use-keywords-step';
+import { useMetaDescriptionStep } from './use-meta-description-step';
+import { useTitleStep } from './use-title-step';
+import { OptionsInput, TextInput, CompletionInput } from './wizard-input';
+import WizardStep from './wizard-step';
+import type { Step, Option } from './types';
+
+const debug = debugFactory( 'jetpack-seo:assistant-wizard' );
+
+export default function AssistantWizard( { close, tasks } ) {
+ const [ currentStep, setCurrentStep ] = useState( 0 );
+ const [ currentStepData, setCurrentStepData ] = useState< Step >();
+ const [ isBusy ] = useState( false );
+ const stepsEndRef = useRef( null );
+ const scrollToBottom = () => {
+ stepsEndRef.current?.scrollIntoView( { behavior: 'smooth' } );
+ };
+ const keywordsInputRef = useRef( null );
+
+ useEffect( () => {
+ scrollToBottom();
+ }, [ currentStep ] );
+
+ // Keywords
+ const keywordsStepData = useKeywordsStep();
+ const titleStepData = useTitleStep();
+ const metaStepData = useMetaDescriptionStep();
+
+ // Memoize steps array to prevent unnecessary recreations
+ const steps = useMemo(
+ () => [ tasks[ 0 ], keywordsStepData, titleStepData, metaStepData, tasks[ 1 ] ],
+ [ tasks, keywordsStepData, titleStepData, metaStepData ]
+ );
+
+ const handleNext = useCallback( () => {
+ if ( currentStep + 1 < steps.length ) {
+ debug( 'moving to ' + ( currentStep + 1 ) );
+ setCurrentStep( currentStep + 1 );
+ setCurrentStepData( steps[ currentStep + 1 ] );
+ steps[ currentStep + 1 ].onStart?.();
+ }
+ }, [ currentStep, steps ] );
+
+ const handleStepSubmit = useCallback( async () => {
+ await steps[ currentStep ]?.onSubmit?.();
+ debug( 'step submitted, moving next' );
+ // always give half a second before moving forward
+ setTimeout( handleNext, 500 );
+ }, [ currentStep, handleNext, steps ] );
+
+ const jumpToStep = useCallback(
+ stepNumber => {
+ if ( stepNumber < steps.length - 1 ) {
+ setCurrentStep( stepNumber );
+ setCurrentStepData( stepNumber );
+ }
+ },
+ [ steps ]
+ );
+
+ const handleSelect = useCallback(
+ ( stepNumber: number, option: Option ) => {
+ if ( stepNumber !== currentStep ) {
+ jumpToStep( stepNumber );
+ }
+ steps[ stepNumber ].onSelect?.( option );
+ },
+ [ currentStep, jumpToStep, steps ]
+ );
+
+ // Initialize current step data
+ useEffect( () => {
+ if ( currentStep === 0 ) {
+ setCurrentStepData( steps[ 0 ] );
+ if ( steps[ 0 ].autoAdvance ) {
+ setTimeout( handleNext, steps[ 0 ].autoAdvance );
+ }
+ }
+ }, [ currentStep, steps, handleNext ] );
+
+ const handleBack = () => {
+ if ( currentStep > 1 ) {
+ debug( 'moving to ' + ( currentStep - 1 ) );
+ setCurrentStep( currentStep - 1 );
+ setCurrentStepData( steps[ currentStep - 1 ] );
+ }
+ };
+
+ const handleSkip = async () => {
+ await currentStepData?.onSkip?.();
+ handleNext();
+ };
+
+ // Reset states and close the wizard
+ const handleDone = () => {
+ close();
+ setCurrentStep( 0 );
+ setCurrentStepData( steps[ 0 ] );
+ };
+
+ return (
+
setIsOpen( false ) } />
+ { isOpen &&
);
}
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/seo-assistant-wizard.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/seo-assistant-wizard.tsx
index 4fd874e0f2c16..641e2cda5d452 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/seo-assistant-wizard.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/seo-assistant-wizard.tsx
@@ -1,167 +1,82 @@
-import { Button, Icon, Tooltip } from '@wordpress/components';
-import { useState, useCallback, useEffect, useRef, useMemo } from '@wordpress/element';
+import { createInterpolateElement } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { next, closeSmall, chevronLeft } from '@wordpress/icons';
import debugFactory from 'debug';
import './style.scss';
-import { useCompletionStep } from './use-completion-step';
-import { useKeywordsStep } from './use-keywords-step';
-import { useMetaDescriptionStep } from './use-meta-description-step';
-import { useTitleStep } from './use-title-step';
-import WizardInput from './wizard-input';
-import WizardMessages from './wizard-messages';
-import type { SeoAssistantProps, Step, Message } from './types';
+import AssistantWizard from './assistant-wizard';
const debug = debugFactory( 'jetpack-ai:seo-assistant-wizard' );
-export default function SeoAssistantWizard( { isOpen, close, onStep }: SeoAssistantProps ) {
- const [ currentStep, setCurrentStep ] = useState( 0 );
- const [ messages, setMessages ] = useState< Message[] >( [] );
- const messagesEndRef = useRef< HTMLDivElement >( null );
- const [ isBusy, setIsBusy ] = useState( false );
-
- const scrollToBottom = () => {
- messagesEndRef.current?.scrollIntoView( { behavior: 'smooth' } );
- };
-
- useEffect( () => {
- scrollToBottom();
- }, [ messages ] );
-
- const addMessage = useCallback( async ( message: Message ) => {
- const newMessage = {
- ...message,
- showIcon: message.showIcon === false ? false : ! message.isUser,
- } as Message;
-
- setMessages( prev => [ ...prev, { ...newMessage, id: `message-${ prev.length }` } ] );
- }, [] );
-
- /* Removes last message */
- const removeLastMessage = () => {
- setMessages( prev => prev.slice( 0, -1 ) );
- };
-
- const keywordsStep: Step = useKeywordsStep( {
- addMessage,
- onStep,
- } );
-
- const titleStep: Step = useTitleStep( {
- addMessage,
- removeLastMessage,
- onStep,
- contextData: keywordsStep.value,
- setIsBusy,
- } );
-
- const metaStep: Step = useMetaDescriptionStep( {
- addMessage,
- removeLastMessage,
- onStep,
- setIsBusy,
- } );
-
- const completionStep: Step = useCompletionStep( {
- steps: [ keywordsStep, titleStep, metaStep ],
- addMessage,
- } );
-
- const steps: Step[] = useMemo(
- () => [ keywordsStep, titleStep, metaStep, completionStep ],
- [ keywordsStep, metaStep, titleStep, completionStep ]
- );
-
- const currentStepData = useMemo( () => steps[ currentStep ], [ steps, currentStep ] );
-
- // initialize wizard, set completion monitors
- useEffect( () => {
- if ( ! isOpen ) {
- return;
- }
- // add messageQueue.length check here for delayed messages
- if ( messages.length === 0 ) {
- debug( 'init' );
- // Initialize with first step messages
- currentStepData.messages.forEach( addMessage );
- }
- }, [ isOpen, currentStepData.messages, messages, addMessage ] );
-
- const handleNext = useCallback( () => {
- if ( currentStep < steps.length - 1 ) {
- debug( 'moving to ' + ( currentStep + 1 ), steps[ currentStep + 1 ] );
- setCurrentStep( currentStep + 1 );
- // Add next step messages
- // TODO: can we capture completion step here and craft the messages?
- // Nothing else has worked so far to keep track of step completions
- steps[ currentStep + 1 ].messages.forEach( addMessage );
- steps[ currentStep + 1 ].onStart?.();
- }
- }, [ currentStep, steps, setCurrentStep, addMessage ] );
-
- const handleSubmit = useCallback( async () => {
- await currentStepData.onSubmit?.();
- handleNext();
- }, [ currentStepData, handleNext ] );
-
- const handleBack = () => {
- if ( currentStep > 0 ) {
- setCurrentStep( currentStep - 1 );
- // Re-add previous step messages
- steps[ currentStep - 1 ].messages.forEach( message =>
- addMessage( {
- content: message.content,
- showIcon: message.showIcon,
- } )
- );
- }
- };
-
- const handleSkip = async () => {
- await currentStepData?.onSkip?.();
- handleNext();
- };
-
- // Reset states and close the wizard
- const handleDone = useCallback( () => {
- close();
- setCurrentStep( 0 );
- setMessages( [] );
- steps
- .filter( step => step.type !== 'completion' )
- .forEach( step => step.setCompleted( false ) );
- }, [ close, steps ] );
-
+export default function SeoAssistantWizard( { close }: { close?: () => void } ) {
+ debug( 'render' );
return (
- isOpen && (
- Hi there! 👋 Let's optimise your blog post for SEO.", 'jetpack' ),
+ { b: }
+ ),
+ showIcon: true,
+ id: '1',
+ },
+ {
+ content: createInterpolateElement(
+ __(
+ "Here's what we can improve:
1. Keywords
2. Title
3. Meta description", + 'jetpack' + ), + { br:
} + ), + showIcon: false, + id: '2', + }, + ], + }, + { + id: 'completion', + title: __( 'Your post is SEO-ready', 'jetpack' ), + label: 'completion', + type: 'completion', + submitCtaLabel: __( 'Done!', 'jetpack' ), + onSubmit: () => close(), + messages: [ + { + content: __( "Here's your updated checklist:", 'jetpack' ), + showIcon: true, + id: '1', + }, + { + content: 'some summary here!', + showIcon: false, + id: '2', + }, + { + content: createInterpolateElement( + __( + 'SEO optimization complete! 🎉
Your blog post is now search-engine friendly.', + 'jetpack' + ), + { br:
} + ), + showIcon: true, + id: '3', + }, + { + content: __( 'Happy blogging! 😊', 'jetpack' ), + showIcon: false, + id: '4', + }, + ], + }, + ] } + /> ); } diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss index e541444b6a5e1..48038e9b2829a 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss @@ -1,4 +1,4 @@ -.seo-assistant-wizard { +.assistant-wizard { position: fixed; bottom: 32px; left: 50%; @@ -11,6 +11,10 @@ z-index: 1000; display: flex; flex-direction: column; + // countering the Jetpack sidebar ai-feature styles: + button { + width: unset; + } &__header { flex: 0 0 auto; @@ -54,7 +58,7 @@ display: flex; flex-direction: column; gap: 8px; - padding: 16px 24px; + padding: 8px 24px; overflow-y: auto; scroll-behavior: smooth; align-items: flex-start; @@ -69,9 +73,9 @@ line-height: 1.5; display: flex; align-items: center; - min-width: 48px; + min-width: 80%; - .seo-assistant-wizard__message-icon { + .assistant-wizard__message-icon { flex-shrink: 0; align-self: center; flex-basis: 26px; @@ -81,7 +85,7 @@ } } - .seo-assistant-wizard__message-text { + .assistant-wizard__message-text { padding: 4px 12px; // flex: 1 0 200px; } @@ -90,8 +94,9 @@ background: #f3f4f6; align-self: flex-end; max-width: 85%; + min-width: 15%; - .seo-assistant-wizard__message-icon { + .assistant-wizard__message-icon { display: none; } } @@ -103,6 +108,7 @@ background: white; border-radius: 0 0 16px 16px; border-top: 1px solid var( --jp-gray-5, #e5e7eb ); + flex-basis: 77px; // seems better than min-height } &__input { @@ -113,15 +119,24 @@ align-items: center; padding-right: 6px; height: 44px; + animation: assistantInputAppear 0.3s ease-out; &:focus-within { outline-width: 2px; outline-color: var( --wp-components-color-accent, var( --wp-admin-theme-color, #007cba ) ); } + + // keyboardshortcuts component wraps the base control with a div + // This is a quick fix to mimic the rule below (components-base-control) + & > div:first-child { + flex-grow: 1; + } + .components-base-control { flex-grow: 1; } + .components-text-control__input, .components-text-control__input:focus { padding: 8px; @@ -176,6 +191,7 @@ justify-content: flex-end; align-items: center; gap: 16px; + animation: assistantInputAppear 0.3s ease-out; .components-button { border-radius: 20px; @@ -202,6 +218,14 @@ transform: translateY(0); } } +@keyframes assistantInputAppear { + from { + opacity: 0; + } + to { + opacity: 1; + } +} // Keep this around for magic: @keyframes typing-blink { diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx index d14a0d2578d19..04d51db8ef9d1 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx @@ -1,4 +1,4 @@ -type StepType = 'input' | 'options' | 'completion'; +type StepType = 'welcome' | 'input' | 'options' | 'completion'; export interface Message { id?: string; @@ -19,20 +19,20 @@ interface BaseStep { id: string; title: string; label?: string; - messages: StepMessage[]; + messages: Message[]; type: StepType; onStart?: () => void; onSubmit?: () => void; onSkip?: () => void; - value: string; - setValue: + value?: string; + setValue?: | React.Dispatch< React.SetStateAction< string > > | React.Dispatch< React.SetStateAction< Array< string > > >; setCompleted?: React.Dispatch< React.SetStateAction< boolean > >; completed?: boolean; } -interface InputStep extends BaseStep { +export interface InputStep extends BaseStep { type: 'input'; placeholder: string; } @@ -43,29 +43,11 @@ interface OptionsStep extends BaseStep { onSelect: ( option: Option ) => void; submitCtaLabel?: string; onRetry?: () => void; - onRetryCtaLabel?: string; + retryCtaLabel?: string; } interface CompletionStep extends BaseStep { type: 'completion'; } -interface StepMessage { - content: string | React.ReactNode; - showIcon?: boolean; -} - export type Step = InputStep | OptionsStep | CompletionStep; - -export type CompletionStepHookProps = { - steps: Step[]; - addMessage?: ( message: Message | string ) => void; -}; - -export interface SeoAssistantProps { - isBusy?: boolean; - disabled?: boolean; - onStep?: ( data: { value: string | Option | null } ) => void; - isOpen?: boolean; - close?: () => void; -} diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-completion-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-completion-step.tsx deleted file mode 100644 index a46bc41eadd5f..0000000000000 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-completion-step.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { createInterpolateElement, useCallback } from '@wordpress/element'; -import { __ } from '@wordpress/i18n'; -import type { Step, CompletionStepHookProps } from './types'; - -export const useCompletionStep = ( { steps }: CompletionStepHookProps ): Step => { - const getSummaryCheck = useCallback( () => { - const summaryString = steps - .map( step => { - const stepLabel = step.label || step.title; - return step.completed ? `✅ ${ stepLabel }` : `❌ ${ stepLabel }`; - } ) - .join( '
' ); - return createInterpolateElement( summaryString, { br:
} ); - }, [ steps ] ); - - return { - id: 'completion', - title: __( 'Your post is SEO-ready', 'jetpack' ), - // onStart: handleSummaryChecks, - messages: [ - { - content: __( "Here's your updated checklist:", 'jetpack' ), - showIcon: true, - }, - { - content: getSummaryCheck(), - showIcon: false, - }, - { - content: createInterpolateElement( - __( - 'SEO optimization complete! 🎉
Your blog post is now search-engine friendly.', - 'jetpack' - ), - { br:
} - ), - showIcon: true, - }, - { - content: __( 'Happy blogging! 😊', 'jetpack' ), - showIcon: false, - }, - ], - type: 'completion', - // onStart: handleStart, - value: null, - setValue: () => null, - }; -}; diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx index ac811cd2546af..c8a3a1df9b2ed 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx @@ -1,36 +1,56 @@ -import { createInterpolateElement, useCallback, useState } from '@wordpress/element'; +import { createInterpolateElement, useCallback, useState, useEffect } from '@wordpress/element'; import { __, sprintf } from '@wordpress/i18n'; -import type { Step } from './types'; +import TypingMessage from './typing-message'; +import { useMessages } from './wizard-messages'; +import type { InputStep } from './types'; -export const useKeywordsStep = ( { addMessage, onStep } ): Step => { +export const useKeywordsStep = (): InputStep => { const [ keywords, setKeywords ] = useState( '' ); const [ completed, setCompleted ] = useState( false ); + const { messages, setMessages, addMessage, removeLastMessage } = useMessages(); + + useEffect( () => { + setMessages( [ + { + content: __( + 'To start, please enter 1–3 focus keywords that describe your blog post.', + 'jetpack' + ), + showIcon: true, + }, + ] ); + }, [ setMessages ] ); const handleSkip = useCallback( () => { addMessage( { content: __( 'Skipped!', 'jetpack' ) } ); - if ( onStep ) { - onStep( { value: '' } ); - } - }, [ addMessage, onStep ] ); + }, [ addMessage ] ); - const handleKeywordsSubmit = useCallback( () => { + const handleKeywordsSubmit = useCallback( async () => { if ( ! keywords.trim() ) { return handleSkip(); } addMessage( { content: keywords, isUser: true } ); + addMessage( { content:
1. Keywords
2. Title
3. Meta description", - 'jetpack' - ), - { br:
} - ), - showIcon: false, - }, - { - content: __( - 'To start, please enter 1–3 focus keywords that describe your blog post.', - 'jetpack' - ), - showIcon: true, - }, - ], + messages, type: 'input', placeholder: __( 'Photography, plants', 'jetpack' ), onSubmit: handleKeywordsSubmit, diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx index 5b4699fd95872..6ad5f60bc960f 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx @@ -1,20 +1,28 @@ import { useDispatch } from '@wordpress/data'; -import { useCallback, useState } from '@wordpress/element'; +import { useCallback, useState, useEffect, createInterpolateElement } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; import TypingMessage from './typing-message'; +import { useMessages } from './wizard-messages'; import type { Step, Option } from './types'; -export const useMetaDescriptionStep = ( { - addMessage, - removeLastMessage, - onStep, - setIsBusy, -} ): Step => { +export const useMetaDescriptionStep = (): Step => { const [ selectedMetaDescription, setSelectedMetaDescription ] = useState< string >(); const [ metaDescriptionOptions, setMetaDescriptionOptions ] = useState< Option[] >( [] ); + const { messages, setMessages, addMessage, removeLastMessage, editLastMessage } = useMessages(); const { editPost } = useDispatch( 'core/editor' ); const [ completed, setCompleted ] = useState( false ); + useEffect( () => { + if ( messages.length === 0 ) { + setMessages( [ + { + content: __( "Now, let's optimize your meta description.", 'jetpack' ), + showIcon: true, + }, + ] ); + } + }, [ setMessages, messages ] ); + const handleMetaDescriptionSelect = useCallback( ( option: Option ) => { setSelectedMetaDescription( option.content ); setMetaDescriptionOptions( prev => @@ -29,16 +37,11 @@ export const useMetaDescriptionStep = ( { addMessage( { content:
Here's a suggestion:", 'jetpack' ), + { br:
} + ); + // addMessage( { content: __( "Here's a suggestion:", 'jetpack' ) } ); + editLastMessage( editedFirstMessage ); setMetaDescriptionOptions( newMetaDescriptions || metaDescriptionOptions ); - setIsBusy( false ); - }, [ metaDescriptionOptions, addMessage, removeLastMessage, setIsBusy ] ); + }, [ metaDescriptionOptions, addMessage, removeLastMessage, editLastMessage ] ); const handleMetaDescriptionRegenerate = useCallback( async () => { setMetaDescriptionOptions( [] ); + editLastMessage( __( "Now, let's optimize your meta description.", 'jetpack' ) ); addMessage( { content:
Here's a new suggestion:", 'jetpack' ), + { br:
} + ); + editLastMessage( editedFirstMessage ); setMetaDescriptionOptions( newMetaDescription ); - }, [ addMessage, removeLastMessage ] ); + }, [ addMessage, removeLastMessage, editLastMessage ] ); const handleSkip = useCallback( () => { addMessage( { content: __( 'Skipped!', 'jetpack' ) } ); - if ( onStep ) { - onStep(); - } - }, [ addMessage, onStep ] ); + }, [ addMessage ] ); return { id: 'meta', title: __( 'Add meta description', 'jetpack' ), - messages: [ - { - content: __( "Now, let's optimize your meta description.", 'jetpack' ), - showIcon: true, - }, - ], + messages: messages, type: 'options', options: metaDescriptionOptions, onSelect: handleMetaDescriptionSelect, onSubmit: handleMetaDescriptionSubmit, submitCtaLabel: __( 'Insert', 'jetpack' ), onRetry: handleMetaDescriptionRegenerate, - onRetryCtaLabel: __( 'Regenerate', 'jetpack' ), + retryCtaLabel: __( 'Regenerate', 'jetpack' ), onStart: handleMetaDescriptionGenerate, onSkip: handleSkip, value: selectedMetaDescription, diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx index 0153dab8dfaab..1ced6c572c62f 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx @@ -2,18 +2,14 @@ import { useDispatch } from '@wordpress/data'; import { useCallback, useState, useEffect } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; import TypingMessage from './typing-message'; +import { useMessages } from './wizard-messages'; import type { Step, Option } from './types'; -export const useTitleStep = ( { - addMessage, - removeLastMessage, - onStep, - contextData, - setIsBusy, -} ): Step => { +export const useTitleStep = (): Step => { const [ selectedTitle, setSelectedTitle ] = useState< string >(); const [ titleOptions, setTitleOptions ] = useState< Option[] >( [] ); const { editPost } = useDispatch( 'core/editor' ); + const { messages, setMessages, addMessage, removeLastMessage } = useMessages(); const [ completed, setCompleted ] = useState( false ); const handleTitleSelect = useCallback( ( option: Option ) => { @@ -26,10 +22,16 @@ export const useTitleStep = ( { ); }, [] ); - useEffect( () => setTitleOptions( [] ), [ contextData ] ); + useEffect( () => { + setMessages( [ + { + content: __( "Let's optimise your title.", 'jetpack' ), + showIcon: true, + }, + ] ); + }, [ setMessages ] ); const handleTitleGenerate = useCallback( async () => { - setIsBusy( true ); let newTitles; // we only generate if options are empty if ( titleOptions.length === 0 ) { @@ -53,43 +55,18 @@ export const useTitleStep = ( { ); removeLastMessage(); } - if ( contextData ) { - addMessage( { - content: __( - 'Here are two suggestions based on your keywords. Select the one you prefer:', - 'jetpack' - ), - } ); - } else { - addMessage( { - content: __( 'Here are two suggestions. Select the one you prefer:', 'jetpack' ), - } ); - } - setTitleOptions( newTitles || titleOptions ); - setIsBusy( false ); - }, [ titleOptions, addMessage, removeLastMessage, contextData, setIsBusy ] ); - - const replaceOptionsWithFauxUseMessages = useCallback( () => { - const optionsMessage = { - id: 'title-options-' + Math.random(), - content: '', - type: 'past-options', - options: [], - showIcon: false, - }; - // removeLastMessage(); - titleOptions.forEach( titleOption => { - optionsMessage.options.push( { ...titleOption } ); + addMessage( { + content: __( + 'Here are two suggestions based on your keywords. Select the one you prefer:', + 'jetpack' + ), } ); - addMessage( optionsMessage ); - }, [ titleOptions, addMessage ] ); + setTitleOptions( newTitles || titleOptions ); + }, [ titleOptions, addMessage, removeLastMessage ] ); const handleTitleRegenerate = useCallback( async () => { - // let the controller know we're working - setIsBusy( true ); - // This would typically be an async call to generate new titles - replaceOptionsWithFauxUseMessages(); + // replaceOptionsWithFauxUseMessages(); setTitleOptions( [] ); addMessage( { content:
+
+ );
+}
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/index.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/index.tsx
index 167dfa8d948c0..26ceb1e28adb9 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/index.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/index.tsx
@@ -2,37 +2,38 @@ import { useModuleStatus } from '@automattic/jetpack-shared-extension-utils';
import { Button } from '@wordpress/components';
import { useSelect } from '@wordpress/data';
import { store as editorStore } from '@wordpress/editor';
-import { useState } from '@wordpress/element';
+import { useState, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import debugFactory from 'debug';
import { SeoPlaceholder } from '../../../../plugins/seo/components/placeholder';
import './style.scss';
import bigSkyIcon from './big-sky-icon.svg';
import SeoAssistantWizard from './seo-assistant-wizard';
-import type { SeoAssistantProps } from './types';
const debug = debugFactory( 'jetpack-ai:seo-assistant' );
-export default function SeoAssistant( { disabled, onStep }: SeoAssistantProps ) {
+export default function SeoAssistant( { disabled } ) {
const [ isOpen, setIsOpen ] = useState( false );
const postIsEmpty = useSelect( select => select( editorStore ).isEditedPostEmpty(), [] );
const { isLoadingModules, isChangingStatus, isModuleActive, changeStatus } =
useModuleStatus( 'seo-tools' );
+ const handleOpen = useCallback( () => setIsOpen( true ), [] );
+ const handleClose = useCallback( () => setIsOpen( false ), [] );
+
debug( 'rendering seo-assistant entry point' );
return (
+
+
+
+ { currentStepData?.title }
+
+
+
+
+
+
+
+ { steps.map( ( step, index ) => (
+ = index }
+ options={ step.options || [] }
+ onSelect={ option => handleSelect( index, option ) }
+ />
+ ) ) }
+
+
+
+
+ { currentStep === 1 && (
+
+ { __( 'Improve post engagement.', 'jetpack' ) }
{ ( isModuleActive || isLoadingModules ) && ( ) } { ! isModuleActive && ! isLoadingModules && ( @@ -42,7 +43,7 @@ export default function SeoAssistant( { disabled, onStep }: SeoAssistantProps ) changeStatus={ changeStatus } /> ) } -
-
- )
+
-
-
-
- { currentStepData.title }
-
-
-
-
-
-
-
-
- 1. Keywords
2. Title
3. Meta description", + 'jetpack' + ), + { br:
} + ), + showIcon: false, + id: '2', + }, + ], + }, + { + id: 'completion', + title: __( 'Your post is SEO-ready', 'jetpack' ), + label: 'completion', + type: 'completion', + submitCtaLabel: __( 'Done!', 'jetpack' ), + onSubmit: () => close(), + messages: [ + { + content: __( "Here's your updated checklist:", 'jetpack' ), + showIcon: true, + id: '1', + }, + { + content: 'some summary here!', + showIcon: false, + id: '2', + }, + { + content: createInterpolateElement( + __( + 'SEO optimization complete! 🎉
Your blog post is now search-engine friendly.', + 'jetpack' + ), + { br:
} + ), + showIcon: true, + id: '3', + }, + { + content: __( 'Happy blogging! 😊', 'jetpack' ), + showIcon: false, + id: '4', + }, + ], + }, + ] } + /> ); } diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss index e541444b6a5e1..48038e9b2829a 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/style.scss @@ -1,4 +1,4 @@ -.seo-assistant-wizard { +.assistant-wizard { position: fixed; bottom: 32px; left: 50%; @@ -11,6 +11,10 @@ z-index: 1000; display: flex; flex-direction: column; + // countering the Jetpack sidebar ai-feature styles: + button { + width: unset; + } &__header { flex: 0 0 auto; @@ -54,7 +58,7 @@ display: flex; flex-direction: column; gap: 8px; - padding: 16px 24px; + padding: 8px 24px; overflow-y: auto; scroll-behavior: smooth; align-items: flex-start; @@ -69,9 +73,9 @@ line-height: 1.5; display: flex; align-items: center; - min-width: 48px; + min-width: 80%; - .seo-assistant-wizard__message-icon { + .assistant-wizard__message-icon { flex-shrink: 0; align-self: center; flex-basis: 26px; @@ -81,7 +85,7 @@ } } - .seo-assistant-wizard__message-text { + .assistant-wizard__message-text { padding: 4px 12px; // flex: 1 0 200px; } @@ -90,8 +94,9 @@ background: #f3f4f6; align-self: flex-end; max-width: 85%; + min-width: 15%; - .seo-assistant-wizard__message-icon { + .assistant-wizard__message-icon { display: none; } } @@ -103,6 +108,7 @@ background: white; border-radius: 0 0 16px 16px; border-top: 1px solid var( --jp-gray-5, #e5e7eb ); + flex-basis: 77px; // seems better than min-height } &__input { @@ -113,15 +119,24 @@ align-items: center; padding-right: 6px; height: 44px; + animation: assistantInputAppear 0.3s ease-out; &:focus-within { outline-width: 2px; outline-color: var( --wp-components-color-accent, var( --wp-admin-theme-color, #007cba ) ); } + + // keyboardshortcuts component wraps the base control with a div + // This is a quick fix to mimic the rule below (components-base-control) + & > div:first-child { + flex-grow: 1; + } + .components-base-control { flex-grow: 1; } + .components-text-control__input, .components-text-control__input:focus { padding: 8px; @@ -176,6 +191,7 @@ justify-content: flex-end; align-items: center; gap: 16px; + animation: assistantInputAppear 0.3s ease-out; .components-button { border-radius: 20px; @@ -202,6 +218,14 @@ transform: translateY(0); } } +@keyframes assistantInputAppear { + from { + opacity: 0; + } + to { + opacity: 1; + } +} // Keep this around for magic: @keyframes typing-blink { diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx index d14a0d2578d19..04d51db8ef9d1 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/types.tsx @@ -1,4 +1,4 @@ -type StepType = 'input' | 'options' | 'completion'; +type StepType = 'welcome' | 'input' | 'options' | 'completion'; export interface Message { id?: string; @@ -19,20 +19,20 @@ interface BaseStep { id: string; title: string; label?: string; - messages: StepMessage[]; + messages: Message[]; type: StepType; onStart?: () => void; onSubmit?: () => void; onSkip?: () => void; - value: string; - setValue: + value?: string; + setValue?: | React.Dispatch< React.SetStateAction< string > > | React.Dispatch< React.SetStateAction< Array< string > > >; setCompleted?: React.Dispatch< React.SetStateAction< boolean > >; completed?: boolean; } -interface InputStep extends BaseStep { +export interface InputStep extends BaseStep { type: 'input'; placeholder: string; } @@ -43,29 +43,11 @@ interface OptionsStep extends BaseStep { onSelect: ( option: Option ) => void; submitCtaLabel?: string; onRetry?: () => void; - onRetryCtaLabel?: string; + retryCtaLabel?: string; } interface CompletionStep extends BaseStep { type: 'completion'; } -interface StepMessage { - content: string | React.ReactNode; - showIcon?: boolean; -} - export type Step = InputStep | OptionsStep | CompletionStep; - -export type CompletionStepHookProps = { - steps: Step[]; - addMessage?: ( message: Message | string ) => void; -}; - -export interface SeoAssistantProps { - isBusy?: boolean; - disabled?: boolean; - onStep?: ( data: { value: string | Option | null } ) => void; - isOpen?: boolean; - close?: () => void; -} diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-completion-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-completion-step.tsx deleted file mode 100644 index a46bc41eadd5f..0000000000000 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-completion-step.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { createInterpolateElement, useCallback } from '@wordpress/element'; -import { __ } from '@wordpress/i18n'; -import type { Step, CompletionStepHookProps } from './types'; - -export const useCompletionStep = ( { steps }: CompletionStepHookProps ): Step => { - const getSummaryCheck = useCallback( () => { - const summaryString = steps - .map( step => { - const stepLabel = step.label || step.title; - return step.completed ? `✅ ${ stepLabel }` : `❌ ${ stepLabel }`; - } ) - .join( '
' ); - return createInterpolateElement( summaryString, { br:
} ); - }, [ steps ] ); - - return { - id: 'completion', - title: __( 'Your post is SEO-ready', 'jetpack' ), - // onStart: handleSummaryChecks, - messages: [ - { - content: __( "Here's your updated checklist:", 'jetpack' ), - showIcon: true, - }, - { - content: getSummaryCheck(), - showIcon: false, - }, - { - content: createInterpolateElement( - __( - 'SEO optimization complete! 🎉
Your blog post is now search-engine friendly.', - 'jetpack' - ), - { br:
} - ), - showIcon: true, - }, - { - content: __( 'Happy blogging! 😊', 'jetpack' ), - showIcon: false, - }, - ], - type: 'completion', - // onStart: handleStart, - value: null, - setValue: () => null, - }; -}; diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx index ac811cd2546af..c8a3a1df9b2ed 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-keywords-step.tsx @@ -1,36 +1,56 @@ -import { createInterpolateElement, useCallback, useState } from '@wordpress/element'; +import { createInterpolateElement, useCallback, useState, useEffect } from '@wordpress/element'; import { __, sprintf } from '@wordpress/i18n'; -import type { Step } from './types'; +import TypingMessage from './typing-message'; +import { useMessages } from './wizard-messages'; +import type { InputStep } from './types'; -export const useKeywordsStep = ( { addMessage, onStep } ): Step => { +export const useKeywordsStep = (): InputStep => { const [ keywords, setKeywords ] = useState( '' ); const [ completed, setCompleted ] = useState( false ); + const { messages, setMessages, addMessage, removeLastMessage } = useMessages(); + + useEffect( () => { + setMessages( [ + { + content: __( + 'To start, please enter 1–3 focus keywords that describe your blog post.', + 'jetpack' + ), + showIcon: true, + }, + ] ); + }, [ setMessages ] ); const handleSkip = useCallback( () => { addMessage( { content: __( 'Skipped!', 'jetpack' ) } ); - if ( onStep ) { - onStep( { value: '' } ); - } - }, [ addMessage, onStep ] ); + }, [ addMessage ] ); - const handleKeywordsSubmit = useCallback( () => { + const handleKeywordsSubmit = useCallback( async () => { if ( ! keywords.trim() ) { return handleSkip(); } addMessage( { content: keywords, isUser: true } ); + addMessage( { content:
1. Keywords
2. Title
3. Meta description", - 'jetpack' - ), - { br:
} - ), - showIcon: false, - }, - { - content: __( - 'To start, please enter 1–3 focus keywords that describe your blog post.', - 'jetpack' - ), - showIcon: true, - }, - ], + messages, type: 'input', placeholder: __( 'Photography, plants', 'jetpack' ), onSubmit: handleKeywordsSubmit, diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx index 5b4699fd95872..6ad5f60bc960f 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-meta-description-step.tsx @@ -1,20 +1,28 @@ import { useDispatch } from '@wordpress/data'; -import { useCallback, useState } from '@wordpress/element'; +import { useCallback, useState, useEffect, createInterpolateElement } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; import TypingMessage from './typing-message'; +import { useMessages } from './wizard-messages'; import type { Step, Option } from './types'; -export const useMetaDescriptionStep = ( { - addMessage, - removeLastMessage, - onStep, - setIsBusy, -} ): Step => { +export const useMetaDescriptionStep = (): Step => { const [ selectedMetaDescription, setSelectedMetaDescription ] = useState< string >(); const [ metaDescriptionOptions, setMetaDescriptionOptions ] = useState< Option[] >( [] ); + const { messages, setMessages, addMessage, removeLastMessage, editLastMessage } = useMessages(); const { editPost } = useDispatch( 'core/editor' ); const [ completed, setCompleted ] = useState( false ); + useEffect( () => { + if ( messages.length === 0 ) { + setMessages( [ + { + content: __( "Now, let's optimize your meta description.", 'jetpack' ), + showIcon: true, + }, + ] ); + } + }, [ setMessages, messages ] ); + const handleMetaDescriptionSelect = useCallback( ( option: Option ) => { setSelectedMetaDescription( option.content ); setMetaDescriptionOptions( prev => @@ -29,16 +37,11 @@ export const useMetaDescriptionStep = ( { addMessage( { content:
Here's a suggestion:", 'jetpack' ), + { br:
} + ); + // addMessage( { content: __( "Here's a suggestion:", 'jetpack' ) } ); + editLastMessage( editedFirstMessage ); setMetaDescriptionOptions( newMetaDescriptions || metaDescriptionOptions ); - setIsBusy( false ); - }, [ metaDescriptionOptions, addMessage, removeLastMessage, setIsBusy ] ); + }, [ metaDescriptionOptions, addMessage, removeLastMessage, editLastMessage ] ); const handleMetaDescriptionRegenerate = useCallback( async () => { setMetaDescriptionOptions( [] ); + editLastMessage( __( "Now, let's optimize your meta description.", 'jetpack' ) ); addMessage( { content:
Here's a new suggestion:", 'jetpack' ), + { br:
} + ); + editLastMessage( editedFirstMessage ); setMetaDescriptionOptions( newMetaDescription ); - }, [ addMessage, removeLastMessage ] ); + }, [ addMessage, removeLastMessage, editLastMessage ] ); const handleSkip = useCallback( () => { addMessage( { content: __( 'Skipped!', 'jetpack' ) } ); - if ( onStep ) { - onStep(); - } - }, [ addMessage, onStep ] ); + }, [ addMessage ] ); return { id: 'meta', title: __( 'Add meta description', 'jetpack' ), - messages: [ - { - content: __( "Now, let's optimize your meta description.", 'jetpack' ), - showIcon: true, - }, - ], + messages: messages, type: 'options', options: metaDescriptionOptions, onSelect: handleMetaDescriptionSelect, onSubmit: handleMetaDescriptionSubmit, submitCtaLabel: __( 'Insert', 'jetpack' ), onRetry: handleMetaDescriptionRegenerate, - onRetryCtaLabel: __( 'Regenerate', 'jetpack' ), + retryCtaLabel: __( 'Regenerate', 'jetpack' ), onStart: handleMetaDescriptionGenerate, onSkip: handleSkip, value: selectedMetaDescription, diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx index 0153dab8dfaab..1ced6c572c62f 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx +++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/use-title-step.tsx @@ -2,18 +2,14 @@ import { useDispatch } from '@wordpress/data'; import { useCallback, useState, useEffect } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; import TypingMessage from './typing-message'; +import { useMessages } from './wizard-messages'; import type { Step, Option } from './types'; -export const useTitleStep = ( { - addMessage, - removeLastMessage, - onStep, - contextData, - setIsBusy, -} ): Step => { +export const useTitleStep = (): Step => { const [ selectedTitle, setSelectedTitle ] = useState< string >(); const [ titleOptions, setTitleOptions ] = useState< Option[] >( [] ); const { editPost } = useDispatch( 'core/editor' ); + const { messages, setMessages, addMessage, removeLastMessage } = useMessages(); const [ completed, setCompleted ] = useState( false ); const handleTitleSelect = useCallback( ( option: Option ) => { @@ -26,10 +22,16 @@ export const useTitleStep = ( { ); }, [] ); - useEffect( () => setTitleOptions( [] ), [ contextData ] ); + useEffect( () => { + setMessages( [ + { + content: __( "Let's optimise your title.", 'jetpack' ), + showIcon: true, + }, + ] ); + }, [ setMessages ] ); const handleTitleGenerate = useCallback( async () => { - setIsBusy( true ); let newTitles; // we only generate if options are empty if ( titleOptions.length === 0 ) { @@ -53,43 +55,18 @@ export const useTitleStep = ( { ); removeLastMessage(); } - if ( contextData ) { - addMessage( { - content: __( - 'Here are two suggestions based on your keywords. Select the one you prefer:', - 'jetpack' - ), - } ); - } else { - addMessage( { - content: __( 'Here are two suggestions. Select the one you prefer:', 'jetpack' ), - } ); - } - setTitleOptions( newTitles || titleOptions ); - setIsBusy( false ); - }, [ titleOptions, addMessage, removeLastMessage, contextData, setIsBusy ] ); - - const replaceOptionsWithFauxUseMessages = useCallback( () => { - const optionsMessage = { - id: 'title-options-' + Math.random(), - content: '', - type: 'past-options', - options: [], - showIcon: false, - }; - // removeLastMessage(); - titleOptions.forEach( titleOption => { - optionsMessage.options.push( { ...titleOption } ); + addMessage( { + content: __( + 'Here are two suggestions based on your keywords. Select the one you prefer:', + 'jetpack' + ), } ); - addMessage( optionsMessage ); - }, [ titleOptions, addMessage ] ); + setTitleOptions( newTitles || titleOptions ); + }, [ titleOptions, addMessage, removeLastMessage ] ); const handleTitleRegenerate = useCallback( async () => { - // let the controller know we're working - setIsBusy( true ); - // This would typically be an async call to generate new titles - replaceOptionsWithFauxUseMessages(); + // replaceOptionsWithFauxUseMessages(); setTitleOptions( [] ); addMessage( { content:
- { currentStepData.type === 'input' && (
-
-
- ) }
+
+
- { currentStepData.type === 'options' && (
-
+ );
+};
- { currentStepData.type === 'completion' && (
-
-
-
-
-
- ) }
+
+
-
-
- ) }
+function UnforwardedKeywordsInput( { placeholder, value, setValue, handleSubmit }, ref ) {
+ return (
+
+
+
+
);
}
+
+export const TextInput = forwardRef( UnforwardedKeywordsInput );
+
+export const CompletionInput = ( { submitCtaLabel, handleSubmit } ) => {
+ return (
+
+
+
+ );
+};
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/wizard-messages.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/wizard-messages.tsx
index fc6e0af1dc98c..295086b82254d 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/wizard-messages.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/wizard-messages.tsx
@@ -1,27 +1,81 @@
-import { useEffect, useRef } from '@wordpress/element';
+import { useCallback, useEffect, useRef, useState } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import clsx from 'clsx';
import bigSkyIcon from './big-sky-icon.svg';
+import TypingMessage from './typing-message';
+import type { Message } from './types';
-const Message = ( { message } ) => {
+const randomId = () => Math.random().toString( 32 ).substring( 2, 8 );
+
+export const useMessages = () => {
+ const [ messages, setMessages ] = useState< Message[] >( [] );
+
+ const wrapMessagesWithId = useCallback(
+ rawMessages => {
+ setMessages(
+ rawMessages.map( rawMessage => ( { ...rawMessage, id: rawMessage.id || randomId() } ) )
+ );
+ },
+ [ setMessages ]
+ );
+
+ const addMessage = async ( message: Message ) => {
+ const newMessage = {
+ ...message,
+ showIcon: message.showIcon === false ? false : ! message.isUser,
+ id: message.id || randomId(),
+ } as Message;
+
+ setMessages( prev => [ ...prev, newMessage ] );
+ };
+
+ /* Removes last message */
+ const removeLastMessage = () => {
+ setMessages( prev => prev.slice( 0, -1 ) );
+ };
+
+ /* Edits content of last message */
+ const editLastMessage = ( content: Message[ 'content' ] ) => {
+ setMessages( prev => {
+ const prevMessages = [ ...prev ];
+ if ( prevMessages.length > 0 ) {
+ prevMessages[ prevMessages.length - 1 ] = {
+ ...prevMessages[ prevMessages.length - 1 ],
+ content,
+ };
+ }
+ return prevMessages;
+ } );
+ };
+
+ return {
+ messages,
+ setMessages: wrapMessagesWithId,
+ addMessage,
+ removeLastMessage,
+ editLastMessage,
+ };
+};
+
+export const MessageBubble = ( { message } ) => {
return (
-
+
{ message.showIcon && (
) }
{ message.type === 'past-options' && (
-
+
{ message.options.map( option => (
@@ -32,29 +86,29 @@ const Message = ( { message } ) => {
) }
{ ( ! message.type || message.type === 'chat' ) && (
-
);
};
-const OptionMessages = ( { currentStepData } ) => {
- if ( currentStepData.type !== 'options' || ! currentStepData.options.length ) {
+const OptionMessages = ( { options = [], onSelect } ) => {
+ if ( ! options.length ) {
return null;
}
return (
- { message.content }
+ { message.content }
) }
-
-
-
- { currentStepData.options.map( option => (
+
+
+
+
+ { options.map( option => (
@@ -65,7 +119,7 @@ const OptionMessages = ( { currentStepData } ) => {
);
};
-export default function Messages( { currentStepData, messages } ) {
+export default function Messages( { options, onSelect, messages, loading } ) {
const messagesEndRef = useRef< HTMLDivElement >( null );
const scrollToBottom = () => {
messagesEndRef.current?.scrollIntoView( { behavior: 'smooth' } );
@@ -76,12 +130,15 @@ export default function Messages( { currentStepData, messages } ) {
}, [ messages ] );
return (
-
- { messages.map( message => (
-
+
);
}
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/wizard-step.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/wizard-step.tsx
new file mode 100644
index 0000000000000..e2257e06a6723
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/seo-assistant/wizard-step.tsx
@@ -0,0 +1,25 @@
+import { useRef } from '@wordpress/element';
+import clsx from 'clsx';
+import { default as WizardMessages } from './wizard-messages';
+
+export default function WizardStep( {
+ className = '',
+ messages,
+ visible,
+ loading = false,
+ options = [],
+ onSelect,
+} ) {
+ const stepRef = useRef( null );
+ const classes = clsx( 'assistant-wizard-step', className );
+ return (
+
+ { messages.map( message => (
+
-
+
+ );
+}
diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php
index 095e97494f88a..8ea34457295d0 100644
--- a/projects/plugins/jetpack/jetpack.php
+++ b/projects/plugins/jetpack/jetpack.php
@@ -4,7 +4,7 @@
* Plugin URI: https://jetpack.com
* Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.
* Author: Automattic
- * Version: 14.3-a.3
+ * Version: 14.3-a.5
* Author URI: https://jetpack.com
* License: GPL2+
* Text Domain: jetpack
@@ -34,7 +34,7 @@
define( 'JETPACK__MINIMUM_WP_VERSION', '6.6' );
define( 'JETPACK__MINIMUM_PHP_VERSION', '7.2' );
-define( 'JETPACK__VERSION', '14.3-a.3' );
+define( 'JETPACK__VERSION', '14.3-a.5' );
/**
* Constant used to fetch the connection owner token
diff --git a/projects/plugins/jetpack/modules/geo-location/class.jetpack-geo-location.php b/projects/plugins/jetpack/modules/geo-location/class.jetpack-geo-location.php
index 450edb92ee352..5552ce54c5250 100644
--- a/projects/plugins/jetpack/modules/geo-location/class.jetpack-geo-location.php
+++ b/projects/plugins/jetpack/modules/geo-location/class.jetpack-geo-location.php
@@ -63,7 +63,7 @@ public function __construct() {
public function wordpress_init() {
// Only render location label after post content, if the theme claims to support "geo-location".
if ( current_theme_supports( 'jetpack-geo-location' ) ) {
- _deprecated_class( 'Jetpack_Geo_Location', '$$next-version$$', '' );
+ _deprecated_class( 'Jetpack_Geo_Location', '14.3', '' );
}
}
}
diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json
index ddfe931a97db9..9fbb9c85aa850 100644
--- a/projects/plugins/jetpack/package.json
+++ b/projects/plugins/jetpack/package.json
@@ -1,6 +1,4 @@
{
- "name": "Jetpack",
- "version": "14.3.0-a.3",
"private": true,
"description": "[Jetpack](https://jetpack.com/) is a WordPress plugin that supercharges your self-hosted WordPress site with the awesome cloud power of [WordPress.com](https://wordpress.com).",
"homepage": "https://jetpack.com",
@@ -116,7 +114,7 @@
"tinycolor2": "1.4.2",
"tus-js-client": "4.2.3",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
},
"devDependencies": {
"@automattic/color-studio": "4.0.0",
diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt
index 705a43e725a2b..7b698af14a10a 100644
--- a/projects/plugins/jetpack/readme.txt
+++ b/projects/plugins/jetpack/readme.txt
@@ -326,17 +326,16 @@ Jetpack Backup can do a full website migration to a new host, migrate theme file
== Changelog ==
-### 14.3-a.3 - 2025-01-20
+### 14.3-a.5 - 2025-01-27
#### Enhancements
-- Forms: Allow HTML block within forms.
-- Show Infinite Scroll options in Simple Classic.
+- Forms: Add Checkbox and Consent field enter action to create a new block.
#### Bug fixes
-- Fix: Newsletter toggle in editor sidebar has a visually broken active state.
-- Forms: Fix dropdown icon style.
-- Photon: Fix double encoding image urls.
-- Sharing: Fix the location of the sharing dialog so it is not always the first sharing element on the page.
-- Social: Fix wordpress.com login error when connecting Social accounts.
+- Forms: Make the icons show up as expected in the style editor.
+- Sitemaps: Ensure a valid news sitemap is present even if no posts are eligible.
+- Social: Fix profile links for LinkedIn connections.
+- Social: Fix Publicize error in the editor due to malformed connections data.
+- VideoPress: Fix issue with VideoPress block with zero height and width.
--------
diff --git a/projects/plugins/jetpack/tests/e2e/config/default.cjs b/projects/plugins/jetpack/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/jetpack/tests/e2e/config/default.cjs
+++ b/projects/plugins/jetpack/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/jetpack/tests/e2e/config/encrypted.enc b/projects/plugins/jetpack/tests/e2e/config/encrypted.enc
index 2b7a724cefde0..1742470fc1a9f 100644
--- a/projects/plugins/jetpack/tests/e2e/config/encrypted.enc
+++ b/projects/plugins/jetpack/tests/e2e/config/encrypted.enc
@@ -1,2 +1 @@
-Salted__B Hø߂Uj/XП_T3 'AxM{(
-J"Fr A%&+GMNj|mFP
\ No newline at end of file
+Salted__dR!(d$+UQfx% ͨWeff!q1LLdk kzgX m~#7K&?RWƙh8
\ No newline at end of file
diff --git a/projects/plugins/jetpack/tests/e2e/eslint.config.mjs b/projects/plugins/jetpack/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/jetpack/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/jetpack/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/jetpack/tests/e2e/helpers/sync-helper.js b/projects/plugins/jetpack/tests/e2e/helpers/sync-helper.js
index d2b414229eb8d..09b23dbff53d6 100644
--- a/projects/plugins/jetpack/tests/e2e/helpers/sync-helper.js
+++ b/projects/plugins/jetpack/tests/e2e/helpers/sync-helper.js
@@ -1,5 +1,5 @@
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import logger from 'jetpack-e2e-commons/logger.js';
+import { execWpCommand } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from '_jetpack-e2e-commons/logger.js';
/**
* Enable sync
diff --git a/projects/plugins/jetpack/tests/e2e/helpers/waf-helper.js b/projects/plugins/jetpack/tests/e2e/helpers/waf-helper.js
index d0b9b6072ef57..c09fe1a7b19a6 100644
--- a/projects/plugins/jetpack/tests/e2e/helpers/waf-helper.js
+++ b/projects/plugins/jetpack/tests/e2e/helpers/waf-helper.js
@@ -1,5 +1,5 @@
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import logger from 'jetpack-e2e-commons/logger.js';
+import { execWpCommand } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from '_jetpack-e2e-commons/logger.js';
/**
* Enable automatic rules
diff --git a/projects/plugins/jetpack/tests/e2e/package.json b/projects/plugins/jetpack/tests/e2e/package.json
index d45561b038e83..5f29079ed847b 100644
--- a/projects/plugins/jetpack/tests/e2e/package.json
+++ b/projects/plugins/jetpack/tests/e2e/package.json
@@ -26,18 +26,18 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.mjs",
- "test-decrypt-default-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./node_modules/jetpack-e2e-commons/config/local.cjs",
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.mjs",
+ "test-decrypt-default-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./node_modules/_jetpack-e2e-commons/config/local.cjs",
"test-decrypt-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./config/encrypted.enc -out config/local.cjs",
"test-decrypt-all-config": "pnpm test-decrypt-default-config && pnpm test-decrypt-config",
- "test-encrypt-default-config": "openssl enc -md sha1 -aes-256-cbc -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/local.cjs -out ./node_modules/jetpack-e2e-commons/config/encrypted.enc",
+ "test-encrypt-default-config": "openssl enc -md sha1 -aes-256-cbc -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/local.cjs -out ./node_modules/_jetpack-e2e-commons/config/encrypted.enc",
"test-encrypt-config": "openssl enc -md sha1 -aes-256-cbc -pass env:CONFIG_KEY -in config/local.cjs -out ./config/encrypted.enc"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/jetpack/tests/e2e/playwright.config.mjs b/projects/plugins/jetpack/tests/e2e/playwright.config.mjs
index b5d057df1a7b8..e4ba2c71b583d 100644
--- a/projects/plugins/jetpack/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/jetpack/tests/e2e/playwright.config.mjs
@@ -1 +1 @@
-export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+export { default } from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js b/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js
index 41c6a4ad1ea12..aa6840fe94467 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js
@@ -1,11 +1,11 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { doSiteLevelConnection, doClassicConnection } from 'jetpack-e2e-commons/flows/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { doSiteLevelConnection, doClassicConnection } from '_jetpack-e2e-commons/flows/index.js';
import {
Sidebar,
JetpackDashboardPage,
DashboardPage,
-} from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+} from '_jetpack-e2e-commons/pages/wp-admin/index.js';
test.beforeEach( async ( { page } ) => {
await prerequisitesBuilder( page )
diff --git a/projects/plugins/jetpack/tests/e2e/specs/editor/sidebar-social.test.js b/projects/plugins/jetpack/tests/e2e/specs/editor/sidebar-social.test.js
index 0bb8368131b93..a9868b75089dd 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/editor/sidebar-social.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/editor/sidebar-social.test.js
@@ -1,7 +1,7 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { expect, test } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import logger from 'jetpack-e2e-commons/logger.js';
-import { BlockEditorPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/index.js';
+import { expect, test } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import logger from '_jetpack-e2e-commons/logger.js';
+import { BlockEditorPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
test.beforeEach( async ( { page } ) => {
await prerequisitesBuilder( page )
diff --git a/projects/plugins/jetpack/tests/e2e/specs/post-connection/recommendations.test.js b/projects/plugins/jetpack/tests/e2e/specs/post-connection/recommendations.test.js
index 5c4142d2f768a..264481827e4ef 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/post-connection/recommendations.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/post-connection/recommendations.test.js
@@ -1,6 +1,6 @@
-import { Plans, prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { RecommendationsPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { Plans, prerequisitesBuilder } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { RecommendationsPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
import playwrightConfig from '../../playwright.config.mjs';
test.beforeAll( async ( { browser } ) => {
diff --git a/projects/plugins/jetpack/tests/e2e/specs/post-connection/waf-blocking.test.js b/projects/plugins/jetpack/tests/e2e/specs/post-connection/waf-blocking.test.js
index bb131bdfcbb88..1e3ded8a27e2b 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/post-connection/waf-blocking.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/post-connection/waf-blocking.test.js
@@ -1,7 +1,7 @@
-import { Plans, prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import { WpPage } from 'jetpack-e2e-commons/pages/index.js';
+import { Plans, prerequisitesBuilder } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import { WpPage } from '_jetpack-e2e-commons/pages/index.js';
import { enableAutomaticRules, generateRules } from '../../helpers/waf-helper.js';
import playwrightConfig from '../../playwright.config.mjs';
diff --git a/projects/plugins/jetpack/tests/e2e/specs/pre-connection/pre-connection.test.js b/projects/plugins/jetpack/tests/e2e/specs/pre-connection/pre-connection.test.js
index 5941883344d72..6d8c6e987d5e5 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/pre-connection/pre-connection.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/pre-connection/pre-connection.test.js
@@ -1,6 +1,6 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { Sidebar, DashboardPage, JetpackPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { Sidebar, DashboardPage, JetpackPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
import playwrightConfig from '../../playwright.config.mjs';
test.beforeAll( async ( { browser } ) => {
diff --git a/projects/plugins/jetpack/tests/e2e/specs/sync/sync.test.js b/projects/plugins/jetpack/tests/e2e/specs/sync/sync.test.js
index 75b843c08e559..e761b1cface6b 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/sync/sync.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/sync/sync.test.js
@@ -1,8 +1,8 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import logger from 'jetpack-e2e-commons/logger.js';
-import { BlockEditorPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { execWpCommand } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from '_jetpack-e2e-commons/logger.js';
+import { BlockEditorPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
import {
enableSync,
disableSync,
diff --git a/projects/plugins/jetpack/tests/e2e/specs/update/plugin-update.test.js b/projects/plugins/jetpack/tests/e2e/specs/update/plugin-update.test.js
index 21eec5a21dfff..522c7606b02c6 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/update/plugin-update.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/update/plugin-update.test.js
@@ -1,11 +1,11 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
import {
execShellCommand,
resolveSiteUrl,
execContainerShellCommand,
-} from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import { PluginsPage, JetpackDashboardPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+} from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import { PluginsPage, JetpackDashboardPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
test.skip( 'Update Jetpack plugin', async ( { page } ) => {
const binPath = '/usr/local/src/jetpack-monorepo/projects/plugins/jetpack/tests/e2e/bin/update/';
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-launch-button b/projects/plugins/mu-wpcom-plugin/changelog/add-launch-button
new file mode 100644
index 0000000000000..9163c43711231
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/add-launch-button
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add site launch button to the admin bar.
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-site-widget b/projects/plugins/mu-wpcom-plugin/changelog/add-site-widget
new file mode 100644
index 0000000000000..db8bc5eafa54e
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/add-site-widget
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Dashboard: add site preview and links
diff --git a/projects/plugins/social/changelog/prerelease b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#4
similarity index 100%
rename from projects/plugins/social/changelog/prerelease
rename to projects/plugins/mu-wpcom-plugin/changelog/prerelease#4
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
index ea378249a1e24..c12ff041d16be 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.lock
+++ b/projects/plugins/mu-wpcom-plugin/composer.lock
@@ -994,7 +994,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "a1c271b55fc72f8d436a5e104900953419a9ab4e"
+ "reference": "8f51311ffdd7a5ae6b1b425acb766a767d68d142"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1023,7 +1023,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.11.x-dev"
+ "dev-trunk": "0.12.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
diff --git a/projects/plugins/protect/changelog/renovate-webpack-cli-6.x b/projects/plugins/protect/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/protect/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/protect/package.json b/projects/plugins/protect/package.json
index 677dca360c4b6..5381c47827c08 100644
--- a/projects/plugins/protect/package.json
+++ b/projects/plugins/protect/package.json
@@ -60,6 +60,6 @@
"sass-loader": "12.4.0",
"typescript": "5.0.4",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/plugins/search/changelog/fix-bad-npm-package-names b/projects/plugins/search/changelog/fix-bad-npm-package-names
new file mode 100644
index 0000000000000..fc1da13877c8e
--- /dev/null
+++ b/projects/plugins/search/changelog/fix-bad-npm-package-names
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename intra-monorepo `jetpack-e2e-commons` dep to `_jetpack-e2e-commons`, which cannot be published to npmjs.com.
+
+
diff --git a/projects/plugins/search/tests/e2e/config/default.cjs b/projects/plugins/search/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/search/tests/e2e/config/default.cjs
+++ b/projects/plugins/search/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/search/tests/e2e/eslint.config.mjs b/projects/plugins/search/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/search/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/search/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/search/tests/e2e/helpers/search-helper.js b/projects/plugins/search/tests/e2e/helpers/search-helper.js
index 77450e19eac47..7ab5660d1b617 100644
--- a/projects/plugins/search/tests/e2e/helpers/search-helper.js
+++ b/projects/plugins/search/tests/e2e/helpers/search-helper.js
@@ -1,5 +1,5 @@
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import logger from 'jetpack-e2e-commons/logger.js';
+import { execWpCommand } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from '_jetpack-e2e-commons/logger.js';
import { SearchHomepage } from '../pages/index.js';
/**
diff --git a/projects/plugins/search/tests/e2e/package.json b/projects/plugins/search/tests/e2e/package.json
index 56ce4e0989500..b2c71aea1d4eb 100644
--- a/projects/plugins/search/tests/e2e/package.json
+++ b/projects/plugins/search/tests/e2e/package.json
@@ -12,7 +12,7 @@
"scripts": {
"build": "pnpm jetpack build packages/assets packages/search packages/connection plugins/jetpack -v --no-pnpm-install --production",
"clean": "rm -rf output",
- "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+ "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
"distclean": "rm -rf node_modules",
"env:up": "e2e-env start",
"env:down": "e2e-env stop",
@@ -23,13 +23,13 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.mjs"
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.mjs"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/search/tests/e2e/pages/search-homepage.js b/projects/plugins/search/tests/e2e/pages/search-homepage.js
index 0a4b6a3fdb6d4..63a66e0338bf4 100644
--- a/projects/plugins/search/tests/e2e/pages/search-homepage.js
+++ b/projects/plugins/search/tests/e2e/pages/search-homepage.js
@@ -1,5 +1,5 @@
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import WpPage from '_jetpack-e2e-commons/pages/wp-page.js';
export default class SearchHomepage extends WpPage {
static SEARCH_API_PATTERN =
diff --git a/projects/plugins/search/tests/e2e/pages/wp-admin/search-configure.js b/projects/plugins/search/tests/e2e/pages/wp-admin/search-configure.js
index 9f6a1b9bda3bf..e0eafb381a109 100644
--- a/projects/plugins/search/tests/e2e/pages/wp-admin/search-configure.js
+++ b/projects/plugins/search/tests/e2e/pages/wp-admin/search-configure.js
@@ -1,5 +1,5 @@
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import WpPage from '_jetpack-e2e-commons/pages/wp-page.js';
export default class SearchConfigure extends WpPage {
static SEARCH_SETTING_API_PATTERN = /^https?:\/\/.*%2Fwp%2Fv2%2Fsettings/;
diff --git a/projects/plugins/search/tests/e2e/pages/wp-admin/search-dashboard.js b/projects/plugins/search/tests/e2e/pages/wp-admin/search-dashboard.js
index 4e81cedbb1479..01242026b988f 100644
--- a/projects/plugins/search/tests/e2e/pages/wp-admin/search-dashboard.js
+++ b/projects/plugins/search/tests/e2e/pages/wp-admin/search-dashboard.js
@@ -1,5 +1,5 @@
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import WpPage from '_jetpack-e2e-commons/pages/wp-page.js';
export default class SearchDashboard extends WpPage {
static SEARCH_SETTING_API_PATTERN = /^https?:\/\/.*jetpack\/v4\/search\/settings/;
diff --git a/projects/plugins/search/tests/e2e/playwright.config.mjs b/projects/plugins/search/tests/e2e/playwright.config.mjs
index b5d057df1a7b8..e4ba2c71b583d 100644
--- a/projects/plugins/search/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/search/tests/e2e/playwright.config.mjs
@@ -1 +1 @@
-export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+export { default } from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/search/tests/e2e/specs/search-configure.test.js b/projects/plugins/search/tests/e2e/specs/search-configure.test.js
index 1bb77758e0286..a187084283fa1 100644
--- a/projects/plugins/search/tests/e2e/specs/search-configure.test.js
+++ b/projects/plugins/search/tests/e2e/specs/search-configure.test.js
@@ -1,5 +1,5 @@
-import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
+import { prerequisitesBuilder, Plans } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
import {
disableInstantSearch,
enableInstantSearch,
diff --git a/projects/plugins/search/tests/e2e/specs/search-dashboard.test.js b/projects/plugins/search/tests/e2e/specs/search-dashboard.test.js
index 5f279f7503f02..134b8b7ad03e9 100644
--- a/projects/plugins/search/tests/e2e/specs/search-dashboard.test.js
+++ b/projects/plugins/search/tests/e2e/specs/search-dashboard.test.js
@@ -1,5 +1,5 @@
-import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
+import { prerequisitesBuilder, Plans } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
import {
enableInstantSearch,
disableInstantSearch,
diff --git a/projects/plugins/search/tests/e2e/specs/search.test.js b/projects/plugins/search/tests/e2e/specs/search.test.js
index 32bc34f061d18..c45fe540ae80c 100644
--- a/projects/plugins/search/tests/e2e/specs/search.test.js
+++ b/projects/plugins/search/tests/e2e/specs/search.test.js
@@ -1,6 +1,6 @@
-import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
+import { prerequisitesBuilder, Plans } from '_jetpack-e2e-commons/env/index.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
import {
enableInstantSearch,
disableInstantSearch,
diff --git a/projects/plugins/social/CHANGELOG.md b/projects/plugins/social/CHANGELOG.md
index 8092d19e46b9a..662eb8d226df4 100644
--- a/projects/plugins/social/CHANGELOG.md
+++ b/projects/plugins/social/CHANGELOG.md
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 6.1.0 - 2025-01-27
+### Changed
+- Code: Use function-style exit() and die() with a default status code of 0. [#41167]
+- License: Social admin page header hides license link on WoA sites. [#41076]
+- Moved the Social admin page to the publicize-components package [#41181]
+- Refactored Social Note settings to use core [#41153]
+- Updated package dependencies. [#41099]
+
+### Fixed
+- Fixed profile links for LinkedIn connections [#40873]
+- Fixed wordpress.com log in error when connecting Social accounts [#41149]
+- Fix publicize error in the editor due to malformed connections data [#40679]
+
## 6.0.0 - 2025-01-14
### Added
- Add Bluesky to social feature copy. [#40487]
diff --git a/projects/plugins/social/changelog/clean-extra-composer-things b/projects/plugins/social/changelog/clean-extra-composer-things
deleted file mode 100644
index 3d6f81cf571b7..0000000000000
--- a/projects/plugins/social/changelog/clean-extra-composer-things
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Removed dev packages, no functional changes
-
-
diff --git a/projects/plugins/social/changelog/fix-functionify_and_statusify_exit_and_die b/projects/plugins/social/changelog/fix-functionify_and_statusify_exit_and_die
deleted file mode 100644
index 5f323ddb3e478..0000000000000
--- a/projects/plugins/social/changelog/fix-functionify_and_statusify_exit_and_die
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Code: Use function-style exit() and die() with a default status code of 0.
diff --git a/projects/plugins/social/changelog/fix-social-connections-list-feature-check b/projects/plugins/social/changelog/fix-social-connections-list-feature-check
deleted file mode 100644
index d4868fdf6e0a2..0000000000000
--- a/projects/plugins/social/changelog/fix-social-connections-list-feature-check
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fix publicize error in the editor due to malformed connections data
diff --git a/projects/plugins/social/changelog/fix-social-linkedin-profile-links b/projects/plugins/social/changelog/fix-social-linkedin-profile-links
deleted file mode 100644
index fbcf7bc784a02..0000000000000
--- a/projects/plugins/social/changelog/fix-social-linkedin-profile-links
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed profile links for LinkedIn connections
diff --git a/projects/plugins/social/changelog/hide-license-on-woa b/projects/plugins/social/changelog/hide-license-on-woa
deleted file mode 100644
index 4a91af7a3d646..0000000000000
--- a/projects/plugins/social/changelog/hide-license-on-woa
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-License: Social admin page header hides license link on WoA sites.
diff --git a/projects/plugins/social/changelog/refactor-social-move-admin-page-to-publicize-components b/projects/plugins/social/changelog/refactor-social-move-admin-page-to-publicize-components
deleted file mode 100644
index c1fdb6d472afa..0000000000000
--- a/projects/plugins/social/changelog/refactor-social-move-admin-page-to-publicize-components
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Moved the Social admin page to the publicize-components package
diff --git a/projects/plugins/social/changelog/refactor-social-note-settings-core b/projects/plugins/social/changelog/refactor-social-note-settings-core
deleted file mode 100644
index cb6e8105e2e53..0000000000000
--- a/projects/plugins/social/changelog/refactor-social-note-settings-core
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Refactored Social Note settings to use core
diff --git a/projects/plugins/social/changelog/renovate-webpack-cli-6.x b/projects/plugins/social/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/social/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/social/changelog/update-social-disable-caching-for-publicize-services-list b/projects/plugins/social/changelog/update-social-disable-caching-for-publicize-services-list
deleted file mode 100644
index 3445dbbab7f45..0000000000000
--- a/projects/plugins/social/changelog/update-social-disable-caching-for-publicize-services-list
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed wordpress.com log in error when connecting Social accounts
diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json
index 30b1bc6fdfac3..92ca5b5a6ee2a 100644
--- a/projects/plugins/social/composer.json
+++ b/projects/plugins/social/composer.json
@@ -83,6 +83,6 @@
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
},
- "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ6_0_0"
+ "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ6_1_0"
}
}
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
index 351d5248324f1..3e3105c7d8da7 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -1485,7 +1485,7 @@
"dist": {
"type": "path",
"url": "../../packages/publicize",
- "reference": "f495c414a30bec3c9e2cb5e74fa4fb991825a947"
+ "reference": "ef59d41b8d9b9b26f6ba0fb1699e144e83911516"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1514,7 +1514,7 @@
"link-template": "https://github.com/Automattic/jetpack-publicize/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "0.57.x-dev"
+ "dev-trunk": "0.58.x-dev"
}
},
"autoload": {
diff --git a/projects/plugins/social/jetpack-social.php b/projects/plugins/social/jetpack-social.php
index 8f74067289e63..b32f11808190e 100644
--- a/projects/plugins/social/jetpack-social.php
+++ b/projects/plugins/social/jetpack-social.php
@@ -4,7 +4,7 @@
* Plugin Name: Jetpack Social
* Plugin URI: https://wordpress.org/plugins/jetpack-social
* Description: Share your site’s posts on several social media networks automatically when you publish a new post.
- * Version: 6.0.0
+ * Version: 6.1.0
* Author: Automattic - Jetpack Social team
* Author URI: https://jetpack.com/social/
* License: GPLv2 or later
diff --git a/projects/plugins/social/package.json b/projects/plugins/social/package.json
index 24bc0cb7e5a16..a43197c2e3f94 100644
--- a/projects/plugins/social/package.json
+++ b/projects/plugins/social/package.json
@@ -68,6 +68,6 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/plugins/social/readme.txt b/projects/plugins/social/readme.txt
index d21d09fbe1043..fe1e5e91b9ccf 100644
--- a/projects/plugins/social/readme.txt
+++ b/projects/plugins/social/readme.txt
@@ -104,43 +104,18 @@ The easiest way is to use the Custom Message option in the publishing options bo
6. Managing Social media accounts in the post editor
== Changelog ==
-### 6.0.0 - 2025-01-14
-#### Added
-- Add Bluesky to social feature copy.
-- Add a new toggle for UTM tracking.
-- Add LinkedIn permissions warning.
-- Enable test coverage.
-- Make Post share status immediately available in the editor on page load.
-- My Jetpack: Update recommendations section in My Jetpack to include a slider interaction for the cards.
-
+### 6.1.0 - 2025-01-27
#### Changed
-- Change My Jetpack CTA from "Learn more" to "Activate".
-- Change order of connections.
-- Clean up unused TypeScript types
-- E2E Tests: Update tests to use @wordpress/e2e-test-utils-playwright.
-- Ensure the support link points to Jetpack support.
-- Image Generator: Change description for toggle.
-- Image Generator: Move settings to new store.
-- Migrate settings to new script data.
-- Migrate the last bits of social store to new script data.
-- Move the admin menu initialization to the init hook.
-- Readme: Update documentation to include all supported social networks.
-- Remove some unused code.
-- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
-- Updated dependencies.
+- Code: Use function-style exit() and die() with a default status code of 0.
+- License: Social admin page header hides license link on WoA sites.
+- Moved the Social admin page to the publicize-components package
+- Refactored Social Note settings to use core
- Updated package dependencies.
-#### Removed
-- General: Update minimum PHP version to 7.2.
-- General: Update minimum WordPress version to 6.6.
-
#### Fixed
-- E2E Tests: Only install single browser used by Playwright.
-- Fix an issue where we showed the license message even with a plan.
-- Fix the infinite reload issue on Jetpack Sharing settings.
-- Fix the Instagram max video length.
-- Page & Post: Fix the layout on mobile when details are open.
-- Prevent dataviews styles imported in share status from being added globally.
+- Fixed profile links for LinkedIn connections
+- Fixed wordpress.com log in error when connecting Social accounts
+- Fix publicize error in the editor due to malformed connections data
== Upgrade Notice ==
diff --git a/projects/plugins/social/tests/e2e/config/default.cjs b/projects/plugins/social/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/social/tests/e2e/config/default.cjs
+++ b/projects/plugins/social/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/social/tests/e2e/eslint.config.mjs b/projects/plugins/social/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/social/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/social/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/social/tests/e2e/flows/connection.js b/projects/plugins/social/tests/e2e/flows/connection.js
index f15e94d3e0b66..3ed17dc9a5d63 100644
--- a/projects/plugins/social/tests/e2e/flows/connection.js
+++ b/projects/plugins/social/tests/e2e/flows/connection.js
@@ -1,5 +1,5 @@
-import logger from 'jetpack-e2e-commons/logger.js';
-import { AuthorizePage } from 'jetpack-e2e-commons/pages/wpcom/index.js';
+import logger from '_jetpack-e2e-commons/logger.js';
+import { AuthorizePage } from '_jetpack-e2e-commons/pages/wpcom/index.js';
import { JetpackSocialPage } from '../pages/index.js';
/**
diff --git a/projects/plugins/social/tests/e2e/package.json b/projects/plugins/social/tests/e2e/package.json
index f15c2a56b88f1..3aae91eaad655 100644
--- a/projects/plugins/social/tests/e2e/package.json
+++ b/projects/plugins/social/tests/e2e/package.json
@@ -16,7 +16,7 @@
"scripts": {
"build": "pnpm jetpack build packages/assets packages/connection plugins/social plugins/jetpack -v --no-pnpm-install --production",
"clean": "rm -rf output",
- "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+ "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
"distclean": "rm -rf node_modules",
"env:up": "e2e-env start --activate-plugins social",
"env:down": "e2e-env stop",
@@ -27,13 +27,13 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/social/tests/e2e/pages/wp-admin/jetpack-social.js b/projects/plugins/social/tests/e2e/pages/wp-admin/jetpack-social.js
index 4adcd9c7bfb46..fd2588a782640 100644
--- a/projects/plugins/social/tests/e2e/pages/wp-admin/jetpack-social.js
+++ b/projects/plugins/social/tests/e2e/pages/wp-admin/jetpack-social.js
@@ -1,6 +1,6 @@
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
-import logger from 'jetpack-e2e-commons/logger.js';
-import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
+import { resolveSiteUrl } from '_jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from '_jetpack-e2e-commons/logger.js';
+import WpPage from '_jetpack-e2e-commons/pages/wp-page.js';
export default class JetpackSocialPage extends WpPage {
constructor( page ) {
diff --git a/projects/plugins/social/tests/e2e/playwright.config.mjs b/projects/plugins/social/tests/e2e/playwright.config.mjs
index b5d057df1a7b8..e4ba2c71b583d 100644
--- a/projects/plugins/social/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/social/tests/e2e/playwright.config.mjs
@@ -1 +1 @@
-export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+export { default } from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/social/tests/e2e/specs/admin-page.test.js b/projects/plugins/social/tests/e2e/specs/admin-page.test.js
index 29d171225ff37..6b45921581ea8 100644
--- a/projects/plugins/social/tests/e2e/specs/admin-page.test.js
+++ b/projects/plugins/social/tests/e2e/specs/admin-page.test.js
@@ -1,6 +1,6 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { expect, test } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import logger from 'jetpack-e2e-commons/logger.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { expect, test } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import logger from '_jetpack-e2e-commons/logger.js';
test.beforeEach( async ( { page } ) => {
await prerequisitesBuilder( page )
diff --git a/projects/plugins/social/tests/e2e/specs/connection.test.js b/projects/plugins/social/tests/e2e/specs/connection.test.js
index ac72cf2182efb..8e525df9c251c 100644
--- a/projects/plugins/social/tests/e2e/specs/connection.test.js
+++ b/projects/plugins/social/tests/e2e/specs/connection.test.js
@@ -1,5 +1,5 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { test, expect } from '_jetpack-e2e-commons/fixtures/base-test.js';
import { connect } from '../flows/index.js';
import { JetpackSocialPage } from '../pages/index.js';
diff --git a/projects/plugins/social/tests/e2e/specs/social-sidebar.test.js b/projects/plugins/social/tests/e2e/specs/social-sidebar.test.js
index 1d4f3b3757cd0..acc67d06557a2 100644
--- a/projects/plugins/social/tests/e2e/specs/social-sidebar.test.js
+++ b/projects/plugins/social/tests/e2e/specs/social-sidebar.test.js
@@ -1,7 +1,7 @@
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { expect, test } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import logger from 'jetpack-e2e-commons/logger.js';
-import BlockEditorPage from 'jetpack-e2e-commons/pages/wp-admin/block-editor.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { expect, test } from '_jetpack-e2e-commons/fixtures/base-test.js';
+import logger from '_jetpack-e2e-commons/logger.js';
+import BlockEditorPage from '_jetpack-e2e-commons/pages/wp-admin/block-editor.js';
import { connect } from '../flows/index.js';
test.beforeEach( async ( { page } ) => {
diff --git a/projects/plugins/starter-plugin/changelog/fix-bad-npm-package-names b/projects/plugins/starter-plugin/changelog/fix-bad-npm-package-names
new file mode 100644
index 0000000000000..fc1da13877c8e
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/fix-bad-npm-package-names
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename intra-monorepo `jetpack-e2e-commons` dep to `_jetpack-e2e-commons`, which cannot be published to npmjs.com.
+
+
diff --git a/projects/plugins/starter-plugin/changelog/renovate-webpack-cli-6.x b/projects/plugins/starter-plugin/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/starter-plugin/package.json b/projects/plugins/starter-plugin/package.json
index 8ffa6f4e10a67..e2573fe9ad72c 100644
--- a/projects/plugins/starter-plugin/package.json
+++ b/projects/plugins/starter-plugin/package.json
@@ -52,6 +52,6 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/plugins/starter-plugin/tests/e2e/config/default.cjs b/projects/plugins/starter-plugin/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/starter-plugin/tests/e2e/config/default.cjs
+++ b/projects/plugins/starter-plugin/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/starter-plugin/tests/e2e/eslint.config.mjs b/projects/plugins/starter-plugin/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/starter-plugin/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/starter-plugin/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/starter-plugin/tests/e2e/package.json b/projects/plugins/starter-plugin/tests/e2e/package.json
index 41cbbf0950ed3..d67019704ff29 100644
--- a/projects/plugins/starter-plugin/tests/e2e/package.json
+++ b/projects/plugins/starter-plugin/tests/e2e/package.json
@@ -16,7 +16,7 @@
"scripts": {
"build": "pnpm jetpack build plugins/starter-plugin plugins/jetpack -v --no-pnpm-install --production",
"clean": "rm -rf output",
- "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+ "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
"distclean": "rm -rf node_modules",
"env:up": "e2e-env start --activate-plugins starter-plugin",
"env:down": "e2e-env stop",
@@ -25,13 +25,13 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/starter-plugin/tests/e2e/playwright.config.mjs b/projects/plugins/starter-plugin/tests/e2e/playwright.config.mjs
index b5d057df1a7b8..e4ba2c71b583d 100644
--- a/projects/plugins/starter-plugin/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/starter-plugin/tests/e2e/playwright.config.mjs
@@ -1 +1 @@
-export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+export { default } from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/starter-plugin/tests/e2e/specs/start.test.js b/projects/plugins/starter-plugin/tests/e2e/specs/start.test.js
index f13283a0ab1e1..baa9f3ee0f4fa 100644
--- a/projects/plugins/starter-plugin/tests/e2e/specs/start.test.js
+++ b/projects/plugins/starter-plugin/tests/e2e/specs/start.test.js
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { Sidebar, DashboardPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { Sidebar, DashboardPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
import playwrightConfig from '../playwright.config.mjs';
test.describe( 'Starter plugin!', () => {
diff --git a/projects/plugins/videopress/changelog/fix-bad-npm-package-names b/projects/plugins/videopress/changelog/fix-bad-npm-package-names
new file mode 100644
index 0000000000000..fc1da13877c8e
--- /dev/null
+++ b/projects/plugins/videopress/changelog/fix-bad-npm-package-names
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename intra-monorepo `jetpack-e2e-commons` dep to `_jetpack-e2e-commons`, which cannot be published to npmjs.com.
+
+
diff --git a/projects/plugins/videopress/changelog/fix-videopress-block-classic-themes b/projects/plugins/videopress/changelog/fix-videopress-block-classic-themes
new file mode 100644
index 0000000000000..154c3dd749648
--- /dev/null
+++ b/projects/plugins/videopress/changelog/fix-videopress-block-classic-themes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+VideoPress: Fix issue with VideoPress block with 0 height and width
diff --git a/projects/plugins/videopress/changelog/renovate-webpack-cli-6.x b/projects/plugins/videopress/changelog/renovate-webpack-cli-6.x
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/videopress/changelog/renovate-webpack-cli-6.x
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/videopress/package.json b/projects/plugins/videopress/package.json
index cf180cd49235d..b1b89ae2519b2 100644
--- a/projects/plugins/videopress/package.json
+++ b/projects/plugins/videopress/package.json
@@ -36,6 +36,6 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
- "webpack-cli": "4.9.1"
+ "webpack-cli": "6.0.1"
}
}
diff --git a/projects/plugins/videopress/tests/e2e/config/default.cjs b/projects/plugins/videopress/tests/e2e/config/default.cjs
index 179bdfe0e8c9a..2c757920e87a2 100644
--- a/projects/plugins/videopress/tests/e2e/config/default.cjs
+++ b/projects/plugins/videopress/tests/e2e/config/default.cjs
@@ -1 +1 @@
-module.exports = require( 'jetpack-e2e-commons/config/default.cjs' );
+module.exports = require( '_jetpack-e2e-commons/config/default.cjs' );
diff --git a/projects/plugins/videopress/tests/e2e/eslint.config.mjs b/projects/plugins/videopress/tests/e2e/eslint.config.mjs
index 8d2ff03cc1c1a..81d63116a5e48 100644
--- a/projects/plugins/videopress/tests/e2e/eslint.config.mjs
+++ b/projects/plugins/videopress/tests/e2e/eslint.config.mjs
@@ -1,3 +1,3 @@
-import { makeE2eConfig } from 'jetpack-e2e-commons/eslint.config.mjs';
+import { makeE2eConfig } from '_jetpack-e2e-commons/eslint.config.mjs';
export default [ ...makeE2eConfig( import.meta.url ) ];
diff --git a/projects/plugins/videopress/tests/e2e/package.json b/projects/plugins/videopress/tests/e2e/package.json
index 7ebc72623571e..71f2c2d6b5880 100644
--- a/projects/plugins/videopress/tests/e2e/package.json
+++ b/projects/plugins/videopress/tests/e2e/package.json
@@ -16,7 +16,7 @@
"scripts": {
"build": "pnpm jetpack build plugins/videopress plugins/jetpack -v --no-pnpm-install --production",
"clean": "rm -rf output",
- "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+ "config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/_jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
"distclean": "rm -rf node_modules",
"env:up": "e2e-env start --activate-plugins boost",
"env:down": "e2e-env stop",
@@ -25,13 +25,13 @@
"tunnel:reset": "tunnel reset",
"tunnel:down": "tunnel down",
"pretest:run": "pnpm run clean",
- "test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
+ "test:run": ". ./node_modules/_jetpack-e2e-commons/bin/app-password.sh && playwright install --with-deps chromium && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
},
"devDependencies": {
"@playwright/test": "1.48.2",
"allure-playwright": "2.9.2",
"config": "3.3.12",
- "jetpack-e2e-commons": "workspace:*"
+ "_jetpack-e2e-commons": "workspace:*"
},
"browserslist": [],
"ci": {
diff --git a/projects/plugins/videopress/tests/e2e/playwright.config.mjs b/projects/plugins/videopress/tests/e2e/playwright.config.mjs
index b5d057df1a7b8..e4ba2c71b583d 100644
--- a/projects/plugins/videopress/tests/e2e/playwright.config.mjs
+++ b/projects/plugins/videopress/tests/e2e/playwright.config.mjs
@@ -1 +1 @@
-export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
+export { default } from '_jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/videopress/tests/e2e/specs/start.test.js b/projects/plugins/videopress/tests/e2e/specs/start.test.js
index f13283a0ab1e1..baa9f3ee0f4fa 100644
--- a/projects/plugins/videopress/tests/e2e/specs/start.test.js
+++ b/projects/plugins/videopress/tests/e2e/specs/start.test.js
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
-import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import { Sidebar, DashboardPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
+import { prerequisitesBuilder } from '_jetpack-e2e-commons/env/prerequisites.js';
+import { Sidebar, DashboardPage } from '_jetpack-e2e-commons/pages/wp-admin/index.js';
import playwrightConfig from '../playwright.config.mjs';
test.describe( 'Starter plugin!', () => {
diff --git a/projects/plugins/wpcomsh/changelog/add-launch-button b/projects/plugins/wpcomsh/changelog/add-launch-button
new file mode 100644
index 0000000000000..9163c43711231
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/add-launch-button
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add site launch button to the admin bar.
diff --git a/projects/plugins/wpcomsh/changelog/add-site-widget b/projects/plugins/wpcomsh/changelog/add-site-widget
new file mode 100644
index 0000000000000..db8bc5eafa54e
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/add-site-widget
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Dashboard: add site preview and links
diff --git a/projects/plugins/social/changelog/prerelease#2 b/projects/plugins/wpcomsh/changelog/prerelease#10
similarity index 100%
rename from projects/plugins/social/changelog/prerelease#2
rename to projects/plugins/wpcomsh/changelog/prerelease#10
diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock
index 539294ce51e3a..3d7681b0ade56 100644
--- a/projects/plugins/wpcomsh/composer.lock
+++ b/projects/plugins/wpcomsh/composer.lock
@@ -1131,7 +1131,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "a1c271b55fc72f8d436a5e104900953419a9ab4e"
+ "reference": "8f51311ffdd7a5ae6b1b425acb766a767d68d142"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1160,7 +1160,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.11.x-dev"
+ "dev-trunk": "0.12.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
diff --git a/tools/cli/skeletons/common/package.json b/tools/cli/skeletons/common/package.json
index 6097e7f1cd3b2..dd3d01cae25c6 100644
--- a/tools/cli/skeletons/common/package.json
+++ b/tools/cli/skeletons/common/package.json
@@ -1,8 +1,8 @@
{
"private": true,
- "name": "TBD",
- "version": "TBD",
- "description": "TBD",
+ "name": "_TBD_",
+ "version": "_TBD_",
+ "description": "_TBD_",
"homepage": "https://jetpack.com",
"bugs": {
"url": "https://github.com/Automattic/jetpack/issues"
diff --git a/tools/e2e-commons/package.json b/tools/e2e-commons/package.json
index cc5f0d3ecdc21..51618e804871a 100644
--- a/tools/e2e-commons/package.json
+++ b/tools/e2e-commons/package.json
@@ -1,9 +1,9 @@
{
- "name": "jetpack-e2e-commons",
+ "private": true,
+ "name": "_jetpack-e2e-commons",
"description": "Jetpack end-to-end tests commons",
"license": "GPL-2.0-or-later",
"author": "Automattic",
- "version": "0.0.1",
"type": "module",
"scripts": {
"distclean": "rm -rf node_modules",