Merge branch 'trunk' into add/converge-wpcomsh

Automattic · Jun 12, 2024 · 79a3ebb · 79a3ebb
2 parents e79719a + d6e18b5
commit 79a3ebb
Show file tree

Hide file tree

Showing 64 changed files with 482 additions and 302 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true,
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.exclude": {
 		"**/.cache/**": true,
@@ -25,7 +25,7 @@
 		"**/packages/**/wordpress/**",
 		"**/projects/**/wordpress/**",
 		"**/plugins/**/wordpress/**",
-		"**/vendor/**",		
+		"**/vendor/**",
 	],
 	"phpCodeSniffer.autoExecutable": true,
 	"phpCodeSniffer.standard": "Automatic",
@@ -38,4 +38,4 @@
 		"**/vendor/**",
 	],
 	"prettier.prettierPath": "tools/js-tools/node_modules/prettier/index.cjs"
-}
+}
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md b/projects/js-packages/babel-plugin-replace-textdomain/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).
 
+## [1.0.35] - 2024-06-12
+### Changed
+- Updated package dependencies. [#37796]
+
 ## [1.0.34] - 2024-03-04
 ### Changed
 - Updated package dependencies. [#36142]
@@ -157,6 +161,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial release.
 - Replace missing domains too.
 
+[1.0.35]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.34...v1.0.35
 [1.0.34]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.33...v1.0.34
 [1.0.33]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.32...v1.0.33
 [1.0.32]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.31...v1.0.32

diff --git a/projects/js-packages/babel-plugin-replace-textdomain/changelog/renovate-babel-monorepo b/projects/js-packages/babel-plugin-replace-textdomain/changelog/renovate-babel-monorepo
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/package.json b/projects/js-packages/babel-plugin-replace-textdomain/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/babel-plugin-replace-textdomain",
-	"version": "1.0.35-alpha",
+	"version": "1.0.35",
 	"description": "A Babel plugin to replace the textdomain in gettext-style function calls.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/babel-plugin-replace-textdomain/#readme",
 	"bugs": {

diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.53.10] - 2024-06-12
+### Changed
+- Updated package dependencies. [#37796]
+
 ## [0.53.9] - 2024-06-11
 ### Changed
 - Updated package dependencies. [#37779]
@@ -1063,6 +1067,7 @@
 ### Changed
 - Update node version requirement to 14.16.1
 
+[0.53.10]: https://github.com/Automattic/jetpack-components/compare/0.53.9...0.53.10
 [0.53.9]: https://github.com/Automattic/jetpack-components/compare/0.53.8...0.53.9
 [0.53.8]: https://github.com/Automattic/jetpack-components/compare/0.53.7...0.53.8
 [0.53.7]: https://github.com/Automattic/jetpack-components/compare/0.53.6...0.53.7

diff --git a/projects/js-packages/components/changelog/renovate-babel-monorepo b/projects/js-packages/components/changelog/renovate-babel-monorepo
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.53.10-alpha",
+	"version": "0.53.10",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

diff --git a/projects/js-packages/connection/CHANGELOG.md b/projects/js-packages/connection/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## [0.33.16] - 2024-06-12
+### Changed
+- Updated package dependencies. [#37796]
+
 ## [0.33.15] - 2024-06-11
 ### Changed
 - Updated package dependencies. [#37779]
@@ -781,6 +785,7 @@
 - `Main` and `ConnectUser` components added.
 - `JetpackRestApiClient` API client added.
 
+[0.33.16]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.15...v0.33.16
 [0.33.15]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.14...v0.33.15
 [0.33.14]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.13...v0.33.14
 [0.33.13]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.12...v0.33.13

diff --git a/projects/js-packages/connection/changelog/renovate-babel-monorepo b/projects/js-packages/connection/changelog/renovate-babel-monorepo
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.33.16-alpha",
+	"version": "0.33.16",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {

diff --git a/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md b/projects/js-packages/i18n-check-webpack-plugin/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).
 
+## [1.1.9] - 2024-06-12
+### Changed
+- Updated package dependencies. [#37796]
+
 ## [1.1.8] - 2024-05-06
 ### Changed
 - Internal updates.
@@ -206,6 +210,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release.
 
+[1.1.9]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.1.8...v1.1.9
 [1.1.8]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.1.7...v1.1.8
 [1.1.7]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.1.6...v1.1.7
 [1.1.6]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.1.5...v1.1.6

diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-babel-monorepo b/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-babel-monorepo
diff --git a/projects/js-packages/i18n-check-webpack-plugin/package.json b/projects/js-packages/i18n-check-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/i18n-check-webpack-plugin",
-	"version": "1.1.9-alpha",
+	"version": "1.1.9",
 	"description": "A Webpack plugin to check that WordPress i18n hasn't been mangled by Webpack optimizations.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/i18n-check-webpack-plugin/#readme",
 	"bugs": {

diff --git a/projects/js-packages/idc/CHANGELOG.md b/projects/js-packages/idc/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA IDC package releases.
 
+## 0.11.1 - 2024-06-12
+### Changed
+- Updated package dependencies. [#37796]
+
 ## 0.11.0 - 2024-06-10
 ### Added
 - Safe mode: Added new screen for staging sites. [#37023]

diff --git a/projects/js-packages/idc/changelog/renovate-babel-monorepo b/projects/js-packages/idc/changelog/renovate-babel-monorepo
diff --git a/projects/js-packages/idc/package.json b/projects/js-packages/idc/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-idc",
-	"version": "0.11.1-alpha",
+	"version": "0.11.1",
 	"description": "Jetpack Connection Component",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

diff --git a/projects/js-packages/webpack-config/CHANGELOG.md b/projects/js-packages/webpack-config/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).
 
+## 3.2.8 - 2024-06-12
+### Changed
+- Updated package dependencies. [#37796]
+
 ## 3.2.7 - 2024-06-05
 ### Changed
 - Updated package dependencies. [#37669]

diff --git a/projects/js-packages/webpack-config/changelog/renovate-babel-monorepo b/projects/js-packages/webpack-config/changelog/renovate-babel-monorepo
diff --git a/projects/js-packages/webpack-config/package.json b/projects/js-packages/webpack-config/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-webpack-config",
-	"version": "3.2.8-alpha",
+	"version": "3.2.8",
 	"description": "Library of pieces for webpack config in Jetpack projects.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/webpack-config/#readme",
 	"bugs": {

diff --git a/projects/packages/connection/CHANGELOG.md b/projects/packages/connection/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).
 
+## [2.10.1] - 2024-06-12
+### Changed
+- Updated package dependencies. [#37796]
+
 ## [2.10.0] - 2024-06-10
 ### Added
 - Staging: deprecating staging mode and separating the logic into is_development_site and in_safe_mode [#37023]
@@ -1111,6 +1115,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[2.10.1]: https://github.com/Automattic/jetpack-connection/compare/v2.10.0...v2.10.1
 [2.10.0]: https://github.com/Automattic/jetpack-connection/compare/v2.9.3...v2.10.0
 [2.9.3]: https://github.com/Automattic/jetpack-connection/compare/v2.9.2...v2.9.3
 [2.9.2]: https://github.com/Automattic/jetpack-connection/compare/v2.9.1...v2.9.2

diff --git a/projects/packages/connection/changelog/renovate-babel-monorepo b/projects/packages/connection/changelog/renovate-babel-monorepo
diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '2.10.1-alpha';
+	const PACKAGE_VERSION = '2.10.1';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-wp-logo-nav-menu b/projects/packages/jetpack-mu-wpcom/changelog/update-wp-logo-nav-menu
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Replace the wp-admin/about.php links with a link to wp-admin/ main page. This is needed for Simple Sites where we restrict access to the about.php and contribute.php
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
@@ -202,6 +202,40 @@ function add_all_sites_menu_to_masterbar( $wp_admin_bar ) {
 }
 add_action( 'admin_bar_menu', 'add_all_sites_menu_to_masterbar', 15 );
 
+/**
+ * Replace the WP logo /about.php link with /wp-admin/.
+ *
+ * This is needed because on Simple Sites we don't expose the about and contribute pages.
+ * Although really needed only on Simple, it would make sense to have the same behavior on AT.
+ *
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar core object. On Simple sites it's a different class.
+ *
+ * @return void
+ */
+function replace_wp_logo_menu_on_masterbar( $wp_admin_bar ) {
+	if ( ! function_exists( 'wpcom_is_nav_redesign_enabled' ) || ! wpcom_is_nav_redesign_enabled() ) {
+		return;
+	}
+
+	$wp_admin_bar->remove_menu( 'wp-logo' );
+
+	$wp_logo_menu_args = array(
+		'id'    => 'wp-logo',
+		'title' => '<span class="ab-icon" aria-hidden="true"></span><span class="screen-reader-text">' .
+					/* translators: Hidden accessibility text. */
+					__( 'About WordPress', 'jetpack-mu-wpcom' ) .
+					'</span>',
+		'href'  => get_dashboard_url(),
+		'meta'  => array(
+			'menu_title' => __( 'About WordPress', 'jetpack-mu-wpcom' ),
+		),
+	);
+
+	$wp_admin_bar->add_node( $wp_logo_menu_args );
+}
+
+add_action( 'admin_bar_menu', 'replace_wp_logo_menu_on_masterbar', 11 );
+
 /**
  * Enqueue scripts and styles needed by the WP.com menu.
  */

diff --git a/projects/plugins/automattic-for-agencies-client/CHANGELOG.md b/projects/plugins/automattic-for-agencies-client/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.2.1 - 2024-06-12
+### Changed
+- Dashboard: switch to a smaller and faster dependency (`clsx`) to handle class names. [#37708]
+- Dashboard: update the connection screen's messaging to make our Terms of Service clearer. [#37536]
+- Dependencies: remove the 'jetpack-identity-crisis' dependency. [#36968]
+- Dependencies: update multiple dependencies. [#37669], [#37767], [#37776], [#37796]
+
 ## 0.2.0 - 2024-05-28
 ### Added
 - Add autotagger and autorelease to composer.json to enable auto-tagging and auto-release actions [#37143]

diff --git a/projects/plugins/automattic-for-agencies-client/automattic-for-agencies-client.php b/projects/plugins/automattic-for-agencies-client/automattic-for-agencies-client.php
@@ -4,7 +4,7 @@
  * Plugin Name: Automattic for Agencies Client
  * Plugin URI: https://wordpress.org/plugins/automattic-for-agencies-client
  * Description: Securely connect your clients’ sites to the Automattic for Agencies Sites Dashboard. Manage your sites from one place and see what needs attention.
- * Version: 0.2.1-alpha
+ * Version: 0.2.1
  * Author: Automattic
  * Author URI: https://jetpack.com/
  * License: GPLv2 or later

diff --git a/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode b/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#2 b/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#2
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#3 b/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#3
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#4 b/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#4
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#5 b/projects/plugins/automattic-for-agencies-client/changelog/add-jetpack-development-mode#5
diff --git a/...ects/plugins/automattic-for-agencies-client/changelog/delete-idc-dependency-from-packages b/...ects/plugins/automattic-for-agencies-client/changelog/delete-idc-dependency-from-packages
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/fix-37695-classnames_to_clsx b/projects/plugins/automattic-for-agencies-client/changelog/fix-37695-classnames_to_clsx
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-babel-monorepo b/projects/plugins/automattic-for-agencies-client/changelog/renovate-babel-monorepo
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance b/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-playwright-monorepo b/projects/plugins/automattic-for-agencies-client/changelog/renovate-playwright-monorepo
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo b/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-idc-to-connection b/projects/plugins/automattic-for-agencies-client/changelog/update-idc-to-connection
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-improve-tos-message b/projects/plugins/automattic-for-agencies-client/changelog/update-improve-tos-message
diff --git a/projects/plugins/automattic-for-agencies-client/composer.json b/projects/plugins/automattic-for-agencies-client/composer.json
@@ -72,6 +72,6 @@
 			"automattic/jetpack-autoloader": true,
 			"automattic/jetpack-composer-plugin": true
 		},
-		"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_automattic_for_agencies_clientⓥ0_2_1_alpha"
+		"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_automattic_for_agencies_clientⓥ0_2_1"
 	}
 }