Merge remote-tracking branch 'origin/trunk' into update/phan-wpcom-stubs

projects/js-packages/components/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.54.2] - 2024-06-25
+### Added
+- Added social preview for Threads [#38003]
+
 ## [0.54.1] - 2024-06-24
 ### Fixed
 - Updated threads icon color [#37977]
@@ -1075,6 +1079,7 @@
 ### Changed
 - Update node version requirement to 14.16.1
 
+[0.54.2]: https://github.com/Automattic/jetpack-components/compare/0.54.1...0.54.2
 [0.54.1]: https://github.com/Automattic/jetpack-components/compare/0.54.0...0.54.1
 [0.54.0]: https://github.com/Automattic/jetpack-components/compare/0.53.10...0.54.0
 [0.53.10]: https://github.com/Automattic/jetpack-components/compare/0.53.9...0.53.10

projects/js-packages/components/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.54.2-alpha",
+	"version": "0.54.2",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

projects/js-packages/publicize-components/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.54.6] - 2024-06-26
+### Added
+- Added social preview for Threads [#38003]
+
 ## [0.54.5] - 2024-06-24
 ### Added
 - Added Threads to the social connections services [#37977]
@@ -749,6 +753,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated package dependencies. [#24470]
 
+[0.54.6]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.54.5...v0.54.6
 [0.54.5]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.54.4...v0.54.5
 [0.54.4]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.54.3...v0.54.4
 [0.54.3]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.54.2...v0.54.3

projects/js-packages/publicize-components/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize-components",
-	"version": "0.54.6-alpha",
+	"version": "0.54.6",
 	"description": "A library of JS components required by the Publicize editor plugin",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme",
 	"bugs": {

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.2] - 2024-06-25
+### Changed
+- Internal updates.
+
 ## [2.10.1] - 2024-06-12
 ### Changed
 - Updated package dependencies. [#37796]
@@ -1115,6 +1119,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.2]: https://github.com/Automattic/jetpack-connection/compare/v2.10.1...v2.10.2
 [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

projects/packages/connection/changelog/port-wpcomsh-1904

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add blog_id to tracks data

projects/packages/connection/composer.json

@@ -70,7 +70,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "2.10.x-dev"
+			"dev-trunk": "2.11.x-dev"
 		},
 		"dependencies": {
 			"test-only": [

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

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '2.10.2-alpha';
+	const PACKAGE_VERSION = '2.11.0-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

projects/packages/connection/src/class-tracking.php

@@ -252,6 +252,7 @@ private function tracks_build_event_obj( $user, $event_name, $properties = array
 
 		$blog_details = array(
 			'blog_lang' => isset( $properties['blog_lang'] ) ? $properties['blog_lang'] : get_bloginfo( 'language' ),
+			'blog_id'   => \Jetpack_Options::get_option( 'id' ),
 		);
 
 		$timestamp        = ( false !== $event_timestamp_millis ) ? $event_timestamp_millis : round( microtime( true ) * 1000 );

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.39.0] - 2024-06-26
+### Added
+- Remove Update Services section in Writing Setting if is_agency_managed_site [#38038]
+
+## [5.38.1] - 2024-06-25
+### Removed
+- Remove use of `gutenberg_can_edit_post_type()`. Its replacement has been in WP Core since 6.1. [#38015]
+
 ## [5.38.0] - 2024-06-25
 ### Added
 - Hide admin interface if is_agency_managed_site [#38006]
@@ -918,6 +926,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[5.39.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.38.1...v5.39.0
+[5.38.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.38.0...v5.38.1
 [5.38.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.37.0...v5.38.0
 [5.37.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.36.0...v5.37.0
 [5.36.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.35.4...v5.36.0

projects/packages/jetpack-mu-wpcom/changelog/add-readymade-template-launchpad-task-list

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add a new launchpad task list for the readymade template flow

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

@@ -60,7 +60,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "5.38.x-dev"
+			"dev-trunk": "5.40.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

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

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.38.1-alpha",
+	"version": "5.40.0-alpha",
 	"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.38.1-alpha';
+	const PACKAGE_VERSION = '5.40.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;

projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php

@@ -256,6 +256,21 @@ function wpcom_launchpad_get_task_list_definitions() {
 			),
 			'is_enabled_callback' => 'wpcom_launchpad_get_fullscreen_enabled',
 		),
+		'readymade-template'      => array(
+			'get_title'           => function () {
+				return __( 'Next steps for your site', 'jetpack-mu-wpcom' );
+			},
+			'task_ids'            => array(
+				'verify_domain_email',
+				'plan_completed',
+				'setup_free',
+				'design_selected',
+				'domain_upsell',
+				'design_edited',
+				'site_launched',
+			),
+			'is_enabled_callback' => 'wpcom_launchpad_get_fullscreen_enabled',
+		),
 		'ai-assembler'            => array(
 			'get_title'           => function () {
 				return __( 'Next steps for your site', 'jetpack-mu-wpcom' );

projects/packages/jetpack-mu-wpcom/src/features/replace-site-visibility/replace-site-visibility.php

@@ -57,21 +57,28 @@ function replace_site_visibility() {
 add_action( 'blog_privacy_selector', 'replace_site_visibility' );
 
 /**
- * Hide the "Site visibility" setting entirely if is_agency_managed_site is true.
+ * Hide the "Site visibility" setting in Reading Settings if is_agency_managed_site is true.
  */
 function wpcom_hide_site_visibility_setting() {
 	if ( ! is_agency_managed_site() ) {
 		return;
 	}
-	// Check if the current page is the reading settings page
+	// Check if the current page is the Reading Settings page.
 	$screen = get_current_screen();
 	if ( $screen->id === 'options-reading' ) {
 		echo '<style>
             .option-site-visibility {
-                display: none;
+                display: none !important;
             }
         </style>';
 	}
 }
 add_action( 'admin_head', 'wpcom_hide_site_visibility_setting' );
 
+/**
+ * Remove the "Update Services" section in Writing Settings if is_agency_managed_site is true.
+ */
+function wpcom_remove_update_services_section() {
+	return ! is_agency_managed_site();
+}
+add_filter( 'enable_update_services_configuration', 'wpcom_remove_update_services_section' );

projects/packages/masterbar/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).
 
+## [0.2.3] - 2024-06-26
+### Fixed
+- For sites with Classic view, don't load the masterbar package except the admin color schemes functionality. [#38020]
+
+## [0.2.2] - 2024-06-25
+### Fixed
+- Masterbar: Fix missing private badge on admin menu for private WoA sites [#38026]
+
 ## [0.2.1] - 2024-06-25
 ### Fixed
 - Profile: Restore profile fields on Classic interface [#38016]
@@ -34,6 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies. [#37669]
 - Updated package dependencies. [#37706]
 
+[0.2.3]: https://github.com/Automattic/jetpack-masterbar/compare/v0.2.2...v0.2.3
+[0.2.2]: https://github.com/Automattic/jetpack-masterbar/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/Automattic/jetpack-masterbar/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/Automattic/jetpack-masterbar/compare/v0.1.0...v0.1.1

projects/packages/masterbar/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-masterbar",
-	"version": "0.2.2-alpha",
+	"version": "0.2.4-alpha",
 	"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": {

projects/packages/masterbar/src/class-main.php

@@ -14,7 +14,7 @@
  */
 class Main {
 
-	const PACKAGE_VERSION = '0.2.2-alpha';
+	const PACKAGE_VERSION = '0.2.4-alpha';
 
 	/**
 	 * Initializer.
@@ -27,22 +27,25 @@ public static function init() {
 			return;
 		}
 
-		$host                    = new Host();
-		$should_use_nav_redesign = function_exists( 'wpcom_is_nav_redesign_enabled' ) && wpcom_is_nav_redesign_enabled();
+		new Admin_Color_Schemes();
 
-		if ( ! $should_use_nav_redesign && ! $host->is_wpcom_simple() ) {
-			new Masterbar();
+		if ( function_exists( 'wpcom_is_nav_redesign_enabled' ) && wpcom_is_nav_redesign_enabled() ) {
+			return;
 		}
 
-		new Admin_Color_Schemes();
+		$host = new Host();
+
+		if ( ! $host->is_wpcom_simple() ) {
+			new Masterbar();
+		}
 
 		if ( $host->is_wpcom_platform() ) {
 			new Inline_Help();
 			require_once __DIR__ . '/wp-posts-list/bootstrap.php';
 			require_once __DIR__ . '/nudges/bootstrap.php';
 		}
 
-		if ( $host->is_woa_site() && ! $should_use_nav_redesign ) {
+		if ( $host->is_woa_site() ) {
 			require_once __DIR__ . '/profile-edit/bootstrap.php';
 		}
 
@@ -53,7 +56,7 @@ public static function init() {
 		 *
 		 * @param bool $load_admin_menu_class Load Jetpack's custom admin menu functionality. Default to false.
 		 */
-		if ( ! $should_use_nav_redesign && apply_filters( 'jetpack_load_admin_menu_class', false ) ) {
+		if ( apply_filters( 'jetpack_load_admin_menu_class', false ) ) {
 			require_once __DIR__ . '/admin-menu/load.php';
 		}
 

projects/packages/masterbar/tests/php/test-class-admin-color-schemes.php

@@ -53,8 +53,7 @@ public function set_up() {
 		);
 
 		if ( 'test_enqueue_core_color_schemes_overrides_for_classic_sites' === $this->getName() ) {
-			Functions\expect( 'wpcom_is_nav_redesign_enabled' )
-				->andReturn( true );
+			Functions\when( 'wpcom_is_nav_redesign_enabled' )->justReturn( true );
 		}
 
 		new Admin_Color_Schemes();

projects/packages/masterbar/tests/php/test-class-main.php

@@ -8,6 +8,7 @@
 namespace Automattic\Jetpack\Masterbar;
 
 use Automattic\Jetpack\Status\Cache;
+use Brain\Monkey\Functions;
 use WorDBless\BaseTestCase;
 
 /**
@@ -16,6 +17,15 @@
  * @covers Automattic\Jetpack\Masterbar\Main
  */
 class Test_Main extends BaseTestCase {
+	/**
+	 * Test setup.
+	 *
+	 * @before
+	 */
+	public function set_up() {
+		Functions\when( 'wpcom_is_nav_redesign_enabled' )->justReturn( false );
+	}
+
 	/**
 	 * Returning the environment into its initial state.
 	 *

projects/packages/my-jetpack/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).
 
+## [4.25.4] - 2024-06-26
+### Fixed
+- Move historically active modules sync to admin_init [#38041]
+
 ## [4.25.3] - 2024-06-24
 ### Added
 - Add more default args for tracks events [#37974]
@@ -1534,6 +1538,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created package
 
+[4.25.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.25.3...4.25.4
 [4.25.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.25.2...4.25.3
 [4.25.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.25.1...4.25.2
 [4.25.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.25.0...4.25.1