Backport mu-wpcom-plugin 1.7.10, jetpack 12.9-a.3 Changes (#34089)

* Update changelogs * Changelog edits. * Update versions Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6852775762
Automattic · Nov 13, 2023 · 45820e8 · 45820e8
1 parent d3b17d2
commit 45820e8
Show file tree

Hide file tree

Showing 24 changed files with 232 additions and 242 deletions.
diff --git a/composer.json b/composer.json
@@ -7,12 +7,12 @@
 		"automattic/jetpack-autoloader": "^2.12.0",
 		"automattic/jetpack-composer-plugin": "^1.1.14",
 		"automattic/jetpack-config": "^1.15.4",
-		"automattic/jetpack-connection": "^1.60.0-alpha",
+		"automattic/jetpack-connection": "^1.60.0",
 		"automattic/jetpack-identity-crisis": "^0.11.2",
-		"automattic/jetpack-my-jetpack": "^3.12.1-alpha",
-		"automattic/jetpack-search": "^0.39.6-alpha",
+		"automattic/jetpack-my-jetpack": "^3.12.1",
+		"automattic/jetpack-search": "^0.39.6",
 		"automattic/jetpack-stats": "^0.6.6",
-		"automattic/jetpack-status": "^1.19.0-alpha",
+		"automattic/jetpack-status": "^1.19.0",
 		"automattic/jetpack-sync": "^1.60.1",
 		"automattic/jetpack-plugins-installer": "^0.2.5"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
@@ -5,12 +5,9 @@ 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.60.0-alpha] - unreleased
-
-This is an alpha version! The changes listed here are not final.
-
+## [1.60.0] - 2023-11-13
 ### Added
-- Added source as query param to the Jetpack connect url
+- Added a 'source' query param to the Jetpack connect URL. [#33984]
 
 ## [1.59.0] - 2023-11-08
 ### Added
@@ -911,7 +908,7 @@ This is an alpha version! The changes listed here are not final.
 
 - Separate the connection library into its own package.
 
-[1.60.0-alpha]: https://github.com/Automattic/jetpack-connection/compare/v1.59.0...v1.60.0-alpha
+[1.60.0]: https://github.com/Automattic/jetpack-connection/compare/v1.59.0...v1.60.0
 [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

diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -8,7 +8,7 @@
 		"automattic/jetpack-admin-ui": "^0.2.24",
 		"automattic/jetpack-constants": "^1.6.23",
 		"automattic/jetpack-roles": "^1.4.25",
-		"automattic/jetpack-status": "^1.19.0-alpha",
+		"automattic/jetpack-status": "^1.19.0",
 		"automattic/jetpack-redirect": "^1.7.27"
 	},
 	"require-dev": {

diff --git a/jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php b/jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.60.0-alpha';
+	const PACKAGE_VERSION = '1.60.0';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/jetpack_vendor/automattic/jetpack-device-detection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-device-detection/CHANGELOG.md
@@ -5,12 +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).
 
-## [1.5.0-alpha] - unreleased
+## [1.5.1-alpha] - unreleased
 
 This is an alpha version! The changes listed here are not final.
 
+## [1.5.0] - 2023-11-13
 ### Added
-- Allow cookieinformationscanner and facebookexternalhit to be detected as bots
+- Added 'cookieinformationscanner' and 'facebookexternalhit' to the bot user agent list. [#34026]
 
 ## [1.4.27] - 2023-08-23
 ### Changed
@@ -170,7 +171,8 @@ This is an alpha version! The changes listed here are not final.
 
 - Moving jetpack_is_mobile into a package
 
-[1.5.0-alpha]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.27...v1.5.0-alpha
+[1.5.1-alpha]: https://github.com/Automattic/jetpack-device-detection/compare/v1.5.0...v1.5.1-alpha
+[1.5.0]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.27...v1.5.0
 [1.4.27]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.26...v1.4.27
 [1.4.26]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.25...v1.4.26
 [1.4.25]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.24...v1.4.25

diff --git a/jetpack_vendor/automattic/jetpack-identity-crisis/composer.json b/jetpack_vendor/automattic/jetpack-identity-crisis/composer.json
@@ -4,9 +4,9 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-connection": "^1.60.0-alpha",
+		"automattic/jetpack-connection": "^1.60.0",
 		"automattic/jetpack-constants": "^1.6.23",
-		"automattic/jetpack-status": "^1.19.0-alpha",
+		"automattic/jetpack-status": "^1.19.0",
 		"automattic/jetpack-logo": "^1.6.3",
 		"automattic/jetpack-assets": "^1.18.14"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-jitm/composer.json b/jetpack_vendor/automattic/jetpack-jitm/composer.json
@@ -6,12 +6,12 @@
 	"require": {
 		"automattic/jetpack-a8c-mc-stats": "^1.4.22",
 		"automattic/jetpack-assets": "^1.18.14",
-		"automattic/jetpack-connection": "^1.60.0-alpha",
-		"automattic/jetpack-device-detection": "^1.5.0-alpha",
+		"automattic/jetpack-connection": "^1.60.0",
+		"automattic/jetpack-device-detection": "^1.5.1-alpha",
 		"automattic/jetpack-logo": "^1.6.3",
 		"automattic/jetpack-partner": "^1.7.25",
 		"automattic/jetpack-redirect": "^1.7.27",
-		"automattic/jetpack-status": "^1.19.0-alpha"
+		"automattic/jetpack-status": "^1.19.0"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",

diff --git a/jetpack_vendor/automattic/jetpack-licensing/composer.json b/jetpack_vendor/automattic/jetpack-licensing/composer.json
@@ -4,7 +4,7 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-connection": "^1.60.0-alpha"
+		"automattic/jetpack-connection": "^1.60.0"
 	},
 	"require-dev": {
 		"automattic/wordbless": "@dev",

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -5,13 +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.1-alpha] - unreleased
-
-This is an alpha version! The changes listed here are not final.
-
+## [3.12.1] - 2023-11-13
 ### Changed
-- AI Assistant: Change image and text for interstitial based on tiers
-- AI Assistant: Remove TOS notice from interstitial page
+- AI Assistant: Updated the text and image for the interstitial based on AI plan tiers. [#33981]
+- AI Assistant: Removed the ToS notice from the interstitial page. [#34076]
 
 ## [3.12.0] - 2023-11-08
 ### Added
@@ -1097,7 +1094,7 @@ This is an alpha version! The changes listed here are not final.
 ### Added
 - Created package
 
-[3.12.1-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.12.0...3.12.1-alpha
+[3.12.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.12.0...3.12.1
 [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

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json b/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
@@ -6,7 +6,7 @@
 	"require": {
 		"automattic/jetpack-admin-ui": "^0.2.24",
 		"automattic/jetpack-assets": "^1.18.14",
-		"automattic/jetpack-connection": "^1.60.0-alpha",
+		"automattic/jetpack-connection": "^1.60.0",
 		"automattic/jetpack-jitm": "^2.5.2",
 		"automattic/jetpack-licensing": "^1.8.4",
 		"automattic/jetpack-plugins-installer": "^0.2.5",
@@ -18,7 +18,7 @@
 		"yoast/phpunit-polyfills": "1.1.0",
 		"automattic/jetpack-changelogger": "^3.3.11",
 		"automattic/wordbless": "@dev",
-		"automattic/jetpack-videopress": "^0.20.0"
+		"automattic/jetpack-videopress": "^0.20.1"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

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

diff --git a/jetpack_vendor/automattic/jetpack-partner/composer.json b/jetpack_vendor/automattic/jetpack-partner/composer.json
@@ -4,8 +4,8 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-connection": "^1.60.0-alpha",
-		"automattic/jetpack-status": "^1.19.0-alpha"
+		"automattic/jetpack-connection": "^1.60.0",
+		"automattic/jetpack-status": "^1.19.0"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",

diff --git a/jetpack_vendor/automattic/jetpack-redirect/composer.json b/jetpack_vendor/automattic/jetpack-redirect/composer.json
@@ -4,7 +4,7 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-status": "^1.19.0-alpha"
+		"automattic/jetpack-status": "^1.19.0"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",

diff --git a/jetpack_vendor/automattic/jetpack-search/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-search/CHANGELOG.md
@@ -5,12 +5,9 @@ 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.39.6-alpha] - unreleased
-
-This is an alpha version! The changes listed here are not final.
-
+## [0.39.6] - 2023-11-13
 ### Fixed
-- Search: use classic search for iOS<16
+- Switched to classic search for iOS 15 or lower. [#33929]
 
 ## [0.39.5] - 2023-11-03
 
@@ -839,7 +836,7 @@ This is an alpha version! The changes listed here are not final.
 - 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.39.6-alpha]: https://github.com/Automattic/jetpack-search/compare/v0.39.5...v0.39.6-alpha
+[0.39.6]: https://github.com/Automattic/jetpack-search/compare/v0.39.5...v0.39.6
 [0.39.5]: https://github.com/Automattic/jetpack-search/compare/v0.39.4...v0.39.5
 [0.39.4]: https://github.com/Automattic/jetpack-search/compare/v0.39.3...v0.39.4
 [0.39.3]: https://github.com/Automattic/jetpack-search/compare/v0.39.2...v0.39.3

diff --git a/jetpack_vendor/automattic/jetpack-search/composer.json b/jetpack_vendor/automattic/jetpack-search/composer.json
@@ -4,12 +4,12 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-connection": "^1.60.0-alpha",
+		"automattic/jetpack-connection": "^1.60.0",
 		"automattic/jetpack-assets": "^1.18.14",
 		"automattic/jetpack-constants": "^1.6.23",
-		"automattic/jetpack-status": "^1.19.0-alpha",
+		"automattic/jetpack-status": "^1.19.0",
 		"automattic/jetpack-config": "^1.15.4",
-		"automattic/jetpack-my-jetpack": "^3.12.1-alpha"
+		"automattic/jetpack-my-jetpack": "^3.12.1"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^3.3.11",

diff --git a/jetpack_vendor/automattic/jetpack-search/src/class-package.php b/jetpack_vendor/automattic/jetpack-search/src/class-package.php
@@ -11,7 +11,7 @@
  * Search package general information
  */
 class Package {
-	const VERSION = '0.39.6-alpha';
+	const VERSION = '0.39.6';
 	const SLUG    = 'search';
 
 	/**

diff --git a/jetpack_vendor/automattic/jetpack-stats/composer.json b/jetpack_vendor/automattic/jetpack-stats/composer.json
@@ -5,9 +5,9 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"automattic/jetpack-assets": "^1.18.14",
-		"automattic/jetpack-connection": "^1.60.0-alpha",
+		"automattic/jetpack-connection": "^1.60.0",
 		"automattic/jetpack-constants": "^1.6.23",
-		"automattic/jetpack-status": "^1.19.0-alpha"
+		"automattic/jetpack-status": "^1.19.0"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",

diff --git a/jetpack_vendor/automattic/jetpack-status/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-status/CHANGELOG.md
@@ -5,12 +5,9 @@ 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.19.0-alpha] - unreleased
-
-This is an alpha version! The changes listed here are not final.
-
+## [1.19.0] - 2023-11-13
 ### Added
-- Added a new method that returns "source" query param from the URL
+- Added Host::get_source_query() to return the 'source' query param from the current URL. [#33984]
 
 ## [1.18.5] - 2023-09-25
 ### Changed
@@ -292,7 +289,7 @@ This is an alpha version! The changes listed here are not final.
 
 - Packages: Introduce a status package
 
-[1.19.0-alpha]: https://github.com/Automattic/jetpack-status/compare/v1.18.5...v1.19.0-alpha
+[1.19.0]: https://github.com/Automattic/jetpack-status/compare/v1.18.5...v1.19.0
 [1.18.5]: https://github.com/Automattic/jetpack-status/compare/v1.18.4...v1.18.5
 [1.18.4]: https://github.com/Automattic/jetpack-status/compare/v1.18.3...v1.18.4
 [1.18.3]: https://github.com/Automattic/jetpack-status/compare/v1.18.2...v1.18.3

diff --git a/jetpack_vendor/automattic/jetpack-sync/composer.json b/jetpack_vendor/automattic/jetpack-sync/composer.json
@@ -4,13 +4,13 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-connection": "^1.60.0-alpha",
+		"automattic/jetpack-connection": "^1.60.0",
 		"automattic/jetpack-constants": "^1.6.23",
 		"automattic/jetpack-identity-crisis": "^0.11.2",
 		"automattic/jetpack-password-checker": "^0.2.14",
 		"automattic/jetpack-ip": "^0.1.6",
 		"automattic/jetpack-roles": "^1.4.25",
-		"automattic/jetpack-status": "^1.19.0-alpha"
+		"automattic/jetpack-status": "^1.19.0"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^3.3.11",

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -18,7 +18,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '1.60.0-alpha1699613065',
+      'ver' => '1.60.0',
     ),
     'jetpack-idc' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-identity-crisis',
@@ -38,7 +38,7 @@
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '3.12.1-alpha1699648364',
+      'ver' => '3.12.1',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
@@ -50,7 +50,7 @@
     ),
     'jetpack-search-pkg' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-search',
-      'ver' => '0.39.6-alpha1699854388',
+      'ver' => '0.39.6',
     ),
     'jetpack-stats' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-stats',

diff --git a/vendor/automattic/jetpack-plans/composer.json b/vendor/automattic/jetpack-plans/composer.json
@@ -4,12 +4,12 @@
 	"type": "library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-connection": "^1.60.0-alpha"
+		"automattic/jetpack-connection": "^1.60.0"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",
 		"automattic/jetpack-changelogger": "^3.3.11",
-		"automattic/jetpack-status": "^1.19.0-alpha",
+		"automattic/jetpack-status": "^1.19.0",
 		"automattic/wordbless": "@dev"
 	},
 	"suggest": {