Backport Changes (#37847)

* Changelog and readme.txt edits.

* Version bumps

* Revert "Version bumps"

This reverts commit b30f148.

projects/packages/classic-theme-helper/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.3.1] - 2024-06-13
+### Changed
+- Updated package dependencies. [#37796]
+
 ## [0.3.0] - 2024-06-10
 ### Changed
 - Classic Theme Helper: Move code from module to package [#37260]
@@ -29,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Add wordpress folder on gitignore. [#37177]
 
+[0.3.1]: https://github.com/Automattic/jetpack-classic-theme-helper/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/Automattic/jetpack-classic-theme-helper/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/Automattic/jetpack-classic-theme-helper/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/Automattic/jetpack-classic-theme-helper/compare/v0.1.0...v0.2.0

projects/packages/classic-theme-helper/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-classic-theme-helper",
-	"version": "0.3.1-alpha",
+	"version": "0.3.1",
 	"description": "Features used with classic themes",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/classic-theme-helper/#readme",
 	"bugs": {

projects/packages/classic-theme-helper/src/class-main.php

@@ -14,7 +14,7 @@
  */
 class Main {
 
-	const PACKAGE_VERSION = '0.3.1-alpha';
+	const PACKAGE_VERSION = '0.3.1';
 
 	/**
 	 * Modules to include.

projects/packages/jetpack-mu-wpcom/CHANGELOG.md

@@ -5,6 +5,14 @@ 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).
 
+## [5.35.1] - 2024-06-13
+### Changed
+- Move Verbum comments to clsx [#37789]
+- Updated package dependencies. [#37776] [#37796]
+
+### 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 [#37777]
+
 ## [5.35.0] - 2024-06-10
 ### Added
 - Add Hosting > Overview menu option on WP Admin sidebar. [#37732]
@@ -868,6 +876,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[5.35.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.35.0...v5.35.1
 [5.35.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.34.0...v5.35.0
 [5.34.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.33.0...v5.34.0
 [5.33.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.32.0...v5.33.0

projects/packages/jetpack-mu-wpcom/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.35.1-alpha",
+	"version": "5.35.1",
 	"description": "Enhances your site with features powered by WordPress.com",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
 	"bugs": {

projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php

@@ -13,7 +13,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.35.1-alpha';
+	const PACKAGE_VERSION = '5.35.1';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;

projects/packages/sync/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.1.1] - 2024-06-13
+### Changed
+- Internal updates.
+
 ## [3.1.0] - 2024-06-10
 ### Added
 - Staging: deprecating staging mode and separating the logic into is_development_site and in_safe_mode [#37023]
@@ -1176,6 +1180,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Move sync to a classmapped package
 
+[3.1.1]: https://github.com/Automattic/jetpack-sync/compare/v3.1.0...v3.1.1
 [3.1.0]: https://github.com/Automattic/jetpack-sync/compare/v3.0.2...v3.1.0
 [3.0.2]: https://github.com/Automattic/jetpack-sync/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/Automattic/jetpack-sync/compare/v3.0.0...v3.0.1

projects/packages/sync/src/class-package-version.php

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '3.1.1-alpha';
+	const PACKAGE_VERSION = '3.1.1';
 
 	const PACKAGE_SLUG = 'sync';
 

projects/plugins/wpcomsh/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Changelog
 
+## 3.22.6 - 2024-06-13
+### Added
+- Initial version. [#37737]
+
+### Changed
+- Nav Redesign: Drop the early access and is_proxied. [#37845]
+- Updated package dependencies. [#37737]
+
+### Removed
+- Remove code to replace "Site visibility" with a link to Calypso [#37843]
+- Revert adding overview menu option [#37844]
+
 ## 3.22.5 - 2024-05-31
-### Other Changes 
+### Other Changes
 - Phan: fixed bugs and problems that triggered static analysis warnings.
 
 [13.3]: https://wp.me/p1moTy-19qu
@@ -10,4 +22,3 @@ 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).
-

projects/plugins/wpcomsh/composer.json

@@ -125,7 +125,7 @@
 			"composer/installers": true,
 			"roots/wordpress-core-installer": true
 		},
-		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ3_22_6_alpha"
+		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ3_22_6"
 	},
 	"extra": {
 		"mirror-repo": "Automattic/wpcom-site-helper",

projects/plugins/wpcomsh/package.json

@@ -3,7 +3,7 @@
 	"name": "@automattic/jetpack-wpcomsh",
 	"description": "A helper for connecting WordPress.com sites to external host infrastructure.",
 	"homepage": "https://jetpack.com",
-	"version": "3.22.6-alpha",
+	"version": "3.22.6",
 	"bugs": {
 		"url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh"
 	},

projects/plugins/wpcomsh/wpcomsh.php

@@ -2,15 +2,15 @@
 /**
  * Plugin Name: WordPress.com Site Helper
  * Description: A helper for connecting WordPress.com sites to external host infrastructure.
- * Version: 3.22.6-alpha
+ * Version: 3.22.6
  * Author: Automattic
  * Author URI: http://automattic.com/
  *
  * @package wpcomsh
  */
 
 // Increase version number if you change something in wpcomsh.
-define( 'WPCOMSH_VERSION', '3.22.6-alpha' );
+define( 'WPCOMSH_VERSION', '3.22.6' );
 
 // If true, Typekit fonts will be available in addition to Google fonts
 add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );