Merge remote-tracking branch 'origin/trunk' into update/node-20

Automattic · Nov 8, 2023 · 94b8a78 · 94b8a78
2 parents d7226a9 + 679a21a
commit 94b8a78
Show file tree

Hide file tree

Showing 140 changed files with 614 additions and 1,218 deletions.
diff --git a/projects/js-packages/publicize-components/CHANGELOG.md b/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.41.3] - 2023-11-08
+### Fixed
+- Social: Fixed an issue where initial state of the Jetpack Social toggle is not in sync. [#33969]
+
 ## [0.41.2] - 2023-11-03
 ### Added
 - Added Facebook to Quick Share buttons. [#33934]
@@ -491,6 +495,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated package dependencies. [#24470]
 
+[0.41.3]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.41.2...v0.41.3
 [0.41.2]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.41.1...v0.41.2
 [0.41.1]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.41.0...v0.41.1
 [0.41.0]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.40.2...v0.41.0

diff --git a/projects/js-packages/publicize-components/changelog/fix-social-store-refresh-issue b/projects/js-packages/publicize-components/changelog/fix-social-store-refresh-issue
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize-components",
-	"version": "0.41.3-alpha",
+	"version": "0.41.3",
 	"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": {

diff --git a/projects/js-packages/shared-extension-utils/CHANGELOG.md b/projects/js-packages/shared-extension-utils/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.12.6] - 2023-11-08
+### Fixed
+- Mobile: Fix a regression preventing correct block registration on mobile. [#33890]
+
 ## [0.12.5] - 2023-11-03
 ### Changed
 - Update dependencies.
@@ -276,6 +280,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Core: prepare utility for release
 
+[0.12.6]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.12.5...0.12.6
 [0.12.5]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.12.4...0.12.5
 [0.12.4]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.12.3...0.12.4
 [0.12.3]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.12.2...0.12.3

diff --git a/projects/js-packages/shared-extension-utils/changelog/rnmobile-fix-broken-block-registration b/projects/js-packages/shared-extension-utils/changelog/rnmobile-fix-broken-block-registration
diff --git a/projects/js-packages/shared-extension-utils/package.json b/projects/js-packages/shared-extension-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-shared-extension-utils",
-	"version": "0.12.6-alpha",
+	"version": "0.12.6",
 	"description": "Utility functions used by the block editor extensions",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/shared-extension-utils/#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).
 
+## [1.59.0] - 2023-11-08
+### Added
+- Added a method to check if Jetpack is ready for uninstall cleanup. [#33920]
+
 ## [1.58.3] - 2023-11-03
 ### Fixed
 - Make sure scheme history option is an array. [#33905]
@@ -900,6 +904,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[1.59.0]: https://github.com/Automattic/jetpack-connection/compare/v1.58.3...v1.59.0
 [1.58.3]: https://github.com/Automattic/jetpack-connection/compare/v1.58.2...v1.58.3
 [1.58.2]: https://github.com/Automattic/jetpack-connection/compare/v1.58.1...v1.58.2
 [1.58.1]: https://github.com/Automattic/jetpack-connection/compare/v1.58.0...v1.58.1

diff --git a/projects/packages/connection/changelog/update-jetpack-no-disconnect-on-uninstall b/projects/packages/connection/changelog/update-jetpack-no-disconnect-on-uninstall
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 = '1.59.0-alpha';
+	const PACKAGE_VERSION = '1.59.0';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md b/projects/packages/jetpack-mu-wpcom/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).
 
+## [4.17.0] - 2023-11-08
+### Added
+- Added Launchpad tasks and task list to the Subscriber page. [#33948]
+
+### Changed
+- Updated the URL for the Add Subscribers launchpad task to trigger the "Add Subscribers" modal. [#33913]
+
 ## [4.16.2] - 2023-11-03
 ### Fixed
 - Launchpad hooks: Made more resilient against non-array values. [#33923]
@@ -418,6 +425,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[4.17.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.16.2...v4.17.0
 [4.16.2]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.16.1...v4.16.2
 [4.16.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.16.0...v4.16.1
 [4.16.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.15.1...v4.16.0

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-launchpad_is_task_complete_id_map b/projects/packages/jetpack-mu-wpcom/changelog/add-launchpad_is_task_complete_id_map
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Take id_map in consideration when checking if a task is completed inside wpcom_launchpad_is_task_option_completed.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-subscriber-launchpad-tasks b/projects/packages/jetpack-mu-wpcom/changelog/add-subscriber-launchpad-tasks
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-version-bumps b/projects/packages/jetpack-mu-wpcom/changelog/fix-version-bumps
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Version bumps
+
+
diff --git a/.../super-cache/changelog/init-release-cycle → .../changelog/update-docker-php-memory-limit b/.../super-cache/changelog/init-release-cycle → .../changelog/update-docker-php-memory-limit
@@ -1,5 +1,5 @@
 Significance: patch
 Type: changed
-Comment: Init 1.10.1-alpha
+Comment: Bump version
 
 
diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json
@@ -47,7 +47,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "4.17.x-dev"
+			"dev-trunk": "4.18.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "4.17.0-alpha",
+	"version": "4.18.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": {

diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -14,7 +14,7 @@
  */
 class Jetpack_Mu_Wpcom {
 
-	const PACKAGE_VERSION = '4.17.0-alpha';
+	const PACKAGE_VERSION = '4.18.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 
 	/**

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php
@@ -195,7 +195,7 @@ function wpcom_launchpad_get_task_definitions() {
 			'is_complete_callback' => 'wpcom_launchpad_is_task_option_completed',
 			'is_visible_callback'  => 'wpcom_launchpad_has_goal_import_subscribers',
 			'get_calypso_path'     => function ( $task, $default, $data ) {
-				return '/subscribers/' . $data['site_slug_encoded'];
+				return '/subscribers/' . $data['site_slug_encoded'] . '#add-subscribers';
 			},
 		),
 		'migrate_content'                 => array(
@@ -1071,6 +1071,9 @@ function wpcom_launchpad_is_task_option_completed( $task ) {
 	if ( ! empty( $checklist[ $task['id'] ] ) ) {
 		return true;
 	}
+	if ( isset( $task['id_map'] ) && ! empty( $checklist[ $task['id_map'] ] ) ) {
+		return true;
+	}
 	return false;
 }
 

diff --git a/projects/packages/my-jetpack/CHANGELOG.md b/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).
 
+## [3.12.0] - 2023-11-08
+### Added
+- Updated purchased state for VaultPress backup card on My Jetpack. [#33927]
+
 ## [3.11.1] - 2023-11-03
 
 ## [3.11.0] - 2023-10-30
@@ -1085,6 +1089,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created package
 
+[3.12.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.11.1...3.12.0
 [3.11.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.11.0...3.11.1
 [3.11.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.10.0...3.11.0
 [3.10.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.9.1...3.10.0

diff --git a/projects/packages/my-jetpack/changelog/update-vaultpress-backup-card-purchased-state b/projects/packages/my-jetpack/changelog/update-vaultpress-backup-card-purchased-state
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "3.12.0-alpha",
+	"version": "3.12.0",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme",
 	"bugs": {

diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
@@ -32,7 +32,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '3.12.0-alpha';
+	const PACKAGE_VERSION = '3.12.0';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.

diff --git 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.20.0] - 2023-11-08
+### Added
+- Added support for gated content in VideoPress. [#32154]
+
 ## [0.19.3] - 2023-11-03
 ### Changed
 - Updated package dependencies. [#33904]
@@ -1170,6 +1174,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created empty package [#24952]
 
+[0.20.0]: https://github.com/Automattic/jetpack-videopress/compare/v0.19.3...v0.20.0
 [0.19.3]: https://github.com/Automattic/jetpack-videopress/compare/v0.19.2...v0.19.3
 [0.19.2]: https://github.com/Automattic/jetpack-videopress/compare/v0.19.1...v0.19.2
 [0.19.1]: https://github.com/Automattic/jetpack-videopress/compare/v0.19.0...v0.19.1

diff --git a/projects/packages/videopress/changelog/add-videopress-content-gating b/projects/packages/videopress/changelog/add-videopress-content-gating
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-videopress",
-	"version": "0.20.0-alpha",
+	"version": "0.20.0",
 	"description": "VideoPress package",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",
 	"bugs": {

diff --git 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.20.0-alpha';
+	const PACKAGE_VERSION = '0.20.0';
 
 	const PACKAGE_SLUG = 'videopress';
 

diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 ### This is a list detailing changes for all Jetpack releases.
 
+## 12.9-a.1 - 2023-11-08
+### Enhancements
+- VideoPress: Added support for gated content. [#32154]
+- Subscribe modal: Updated the modal to not show when previewing post or theme. [#33967]
+- WoA: Updated the wording on the profile menu for WoA sites using the classic style. [#33982]
+
+### Improved compatibility
+- Added a check for connected plugins before cleaning up plugin options or uninstalling Jetpack. [#33920]
+
+### Bug fixes
+- WoA: Added back the "Stats" menu item for WoA sites in Calypso. [#33974]
+- Dashboard: Fixed the display of the settings for Markdown for comments. [#33880]
+- VaultPress: Fixed an issue with the VaultPress submenu not being registered when the standalone plugin is inactive and the product is active. [#33955]
+- Font Library: Fixed PHP warnings that happen when the font name is not defined. [#34005]
+- Related Posts: Ensured the Related Posts Block can be displayed properly. [#33994]
+- Mobile: Fix a regression preventing correct block registration on mobile. [#33890]
+
+### Other changes <!-- Non-user-facing changes go here. This section will not be copied to readme.txt. -->
+- AI Assistant: Added loading state to the usage panel. [#33942]
+- AI Assistant: Created a map for the AI Assistant feature data. [#33993]
+- AI Assistant: Registered 'isFetching' state in the plans store. [#33996]
+- Decouple tiers from subscribe_as_site_subscriber parameter. [#33773]
+- Jetpack: Reduxified AI Assistant feature. [#33985]
+- Jetpack Plans: Addressed TS issues with AI Assistant feature data. [#33986]
+- Plans: Introduced `plans` prop to plans store. [#33971]
+- Plans: Minor code refactoring for wordpress-com/plans store. [#33919]
+- Refactor Instagram Gallery block registration. [#33884]
+- Fixed a misspelled variable. [#33991]
+- Removed scssc 0.0.12 and replaced it with with ScssPhp 1.1.11. [#33928]
+- Rollback change. [#33973]
+
 ## 12.8 - 2023-11-06
 ### Enhancements
 - Added a notice for wp-admin settings pages when the wpcom_admin_interface option is set to wp-admin. [#33933]

diff --git a/projects/plugins/jetpack/_inc/lib/class-jetpack-ai-helper.php b/projects/plugins/jetpack/_inc/lib/class-jetpack-ai-helper.php
@@ -385,24 +385,6 @@ public static function get_ai_assistance_feature() {
 			$requests_limit = \OpenAI_Limit_Usage::get_free_requests_limit( $blog_id );
 			$requests_count = \OpenAI_Request_Count::get_count( $blog_id );
 
-			/*
-			 * Usage since the last plan purchase day
-			 */
-			$usage_period_start          = null;
-			$usage_next_period_start     = null;
-			$usage_period_requests_count = 0;
-
-			/*
-			 * Get current tier value, a number representing
-			 * the current tier of the site.
-			 *
-			 * - 0 represents a site with the free plan.
-			 * - 1 represents a site with the current, unlimited plan.
-			 * - 100, 200, 500 represents a site with the new plans,
-			 * with the respective number of allowed requests.
-			 */
-			$current_tier_value = $has_ai_assistant_feature ? 1 : 0;
-
 			// Check if the site requires an upgrade.
 			$require_upgrade = $is_over_limit && ! $has_ai_assistant_feature;
 
@@ -414,16 +396,10 @@ public static function get_ai_assistance_feature() {
 				'is-over-limit'        => $is_over_limit,
 				'requests-count'       => $requests_count,
 				'requests-limit'       => $requests_limit,
-				'usage-period'         => array(
-					'current-start'  => $usage_period_start,
-					'next-start'     => $usage_next_period_start,
-					'requests-count' => $usage_period_requests_count,
-				),
+				'usage-period'         => WPCOM\Jetpack_AI\Usage\Helper::get_period_data( $blog_id ),
 				'site-require-upgrade' => $require_upgrade,
 				'upgrade-type'         => $upgrade_type,
-				'current-tier'         => array(
-					'value' => $current_tier_value,
-				),
+				'current-tier'         => WPCOM\Jetpack_AI\Usage\Helper::get_current_tier( $blog_id ),
 				'tier-plans'           => WPCOM\Jetpack_AI\Usage\Helper::get_tier_plans_list(),
 			);
 		}

diff --git a/projects/plugins/jetpack/changelog/2023-11-03-20-11-20-806088 b/projects/plugins/jetpack/changelog/2023-11-03-20-11-20-806088
diff --git a/projects/plugins/jetpack/changelog/add-remove-user-of-subscribe_as_site_subscriber b/projects/plugins/jetpack/changelog/add-remove-user-of-subscribe_as_site_subscriber
diff --git a/projects/plugins/jetpack/changelog/add-videopress-content-gating b/projects/plugins/jetpack/changelog/add-videopress-content-gating
diff --git a/projects/plugins/jetpack/changelog/add-videopress-content-gating#3 b/projects/plugins/jetpack/changelog/add-videopress-content-gating#3
diff --git a/projects/plugins/jetpack/changelog/add-videopress-content-gating#5 b/projects/plugins/jetpack/changelog/add-videopress-content-gating#5
diff --git a/projects/plugins/jetpack/changelog/add-videopress-content-gating#6 b/projects/plugins/jetpack/changelog/add-videopress-content-gating#6
diff --git a/projects/plugins/jetpack/changelog/change-use-wpcom-helpers b/projects/plugins/jetpack/changelog/change-use-wpcom-helpers
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Use the new methods on WPCOM helper to build the AI assistant feature payload
diff --git a/projects/plugins/jetpack/changelog/fix-broken-related-posts-block b/projects/plugins/jetpack/changelog/fix-broken-related-posts-block