Skip to content

Commit 5f2b656

Browse files
tbradshamatticbot
authored andcommitted
Backport jetpack 15.7-beta changes (#47960)
Co-authored-by: tbradsha <32492176+tbradsha@users.noreply.github.com> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/24047748109 Upstream-Ref: Automattic/jetpack@19534d2
1 parent ae3855e commit 5f2b656

File tree

32 files changed

+346
-351
lines changed

32 files changed

+346
-351
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
"license": "GPL-2.0-or-later",
66
"require": {
77
"ext-json": "*",
8-
"automattic/jetpack-assets": "^4.3.30",
9-
"automattic/jetpack-admin-ui": "^0.7.0-alpha",
8+
"automattic/jetpack-assets": "^4.3.31",
9+
"automattic/jetpack-admin-ui": "^0.7.0",
1010
"automattic/jetpack-autoloader": "^5.0.16",
1111
"automattic/jetpack-composer-plugin": "^4.0.5",
1212
"automattic/jetpack-config": "^3.1.1",
13-
"automattic/jetpack-my-jetpack": "^5.34.1-alpha",
13+
"automattic/jetpack-my-jetpack": "^5.34.1",
1414
"automattic/jetpack-plugins-installer": "^0.5.7",
15-
"automattic/jetpack-sync": "^4.35.0-alpha",
15+
"automattic/jetpack-sync": "^4.35.0",
1616
"automattic/jetpack-transport-helper": "^0.3.5-alpha",
1717
"automattic/jetpack-plans": "^0.11.3",
1818
"automattic/jetpack-waf": "^0.28.2",

jetpack_vendor/automattic/jetpack-account-protection/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "GPL-2.0-or-later",
66
"require": {
77
"php": ">=7.2",
8-
"automattic/jetpack-connection": "^8.2.0-alpha",
8+
"automattic/jetpack-connection": "^8.2.0",
99
"automattic/jetpack-logo": "^3.0.5",
1010
"automattic/jetpack-constants": "^3.0.8",
1111
"automattic/jetpack-status": "^6.1.2"

jetpack_vendor/automattic/jetpack-admin-ui/CHANGELOG.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,17 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [0.7.0-alpha] - unreleased
9-
10-
This is an alpha version! The changes listed here are not final.
11-
8+
## [0.7.0] - 2026-04-06
129
### Added
13-
- Add "Upgrade Jetpack" menu item for free users in the Jetpack admin menu.
14-
- Admin: Record Tracks when the Jetpack sidebar "Upgrade Jetpack" link is clicked.
10+
- Add "Upgrade Jetpack" menu item for free users in the Jetpack admin menu. [#47418]
11+
- Admin: Record Tracks when the Jetpack sidebar "Upgrade Jetpack" link is clicked. [#47937]
1512

1613
### Changed
17-
- Comment: update Tracks event prop names to be lowercase.
18-
- Update design of the sidebar upsell.
14+
- Comment: Update Tracks event prop names to be lowercase. [#47955]
15+
- Update design of the sidebar upsell. [#47909]
1916

2017
### Fixed
21-
- Fix upgrade menu item color on problematic admin color schemes and add build pipeline for CSS assets.
18+
- Fix upgrade menu item color on problematic admin color schemes and add build pipeline for CSS assets. [#47903]
2219

2320
## [0.6.0] - 2026-03-30
2421
### Changed
@@ -235,7 +232,7 @@ This is an alpha version! The changes listed here are not final.
235232
### Fixed
236233
- Fixing menu visibility issues.
237234

238-
[0.7.0-alpha]: https://github.com/Automattic/jetpack-admin-ui/compare/0.6.0...0.7.0-alpha
235+
[0.7.0]: https://github.com/Automattic/jetpack-admin-ui/compare/0.6.0...0.7.0
239236
[0.6.0]: https://github.com/Automattic/jetpack-admin-ui/compare/0.5.12...0.6.0
240237
[0.5.12]: https://github.com/Automattic/jetpack-admin-ui/compare/0.5.11...0.5.12
241238
[0.5.11]: https://github.com/Automattic/jetpack-admin-ui/compare/0.5.10...0.5.11

jetpack_vendor/automattic/jetpack-admin-ui/src/class-admin-menu.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class Admin_Menu {
1919

20-
const PACKAGE_VERSION = '0.7.0-alpha';
20+
const PACKAGE_VERSION = '0.7.0';
2121

2222
/**
2323
* Slug used for the upgrade menu item and redirect URL.

jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [4.3.31] - 2026-04-06
9+
### Changed
10+
- Update dependencies. [#42554]
11+
812
## [4.3.30] - 2026-03-30
913
### Changed
1014
- Update package dependencies. [#47799]
@@ -808,6 +812,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
808812

809813
- Statically access asset tools
810814

815+
[4.3.31]: https://github.com/Automattic/jetpack-assets/compare/v4.3.30...v4.3.31
811816
[4.3.30]: https://github.com/Automattic/jetpack-assets/compare/v4.3.29...v4.3.30
812817
[4.3.29]: https://github.com/Automattic/jetpack-assets/compare/v4.3.28...v4.3.29
813818
[4.3.28]: https://github.com/Automattic/jetpack-assets/compare/v4.3.27...v4.3.28

jetpack_vendor/automattic/jetpack-boost-core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "GPL-2.0-or-later",
66
"require": {
77
"php": ">=7.2",
8-
"automattic/jetpack-connection": "^8.2.0-alpha"
8+
"automattic/jetpack-connection": "^8.2.0"
99
},
1010
"require-dev": {
1111
"yoast/phpunit-polyfills": "^4.0.0",

jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [8.2.0-alpha] - unreleased
9-
10-
This is an alpha version! The changes listed here are not final.
11-
8+
## [8.2.0] - 2026-04-06
129
### Added
13-
- Add SSO details to the Connection details card.
14-
- Add WordPress.com connector card for the WP 7.0+ Settings > Connectors screen with connection details and disconnect support.
15-
- Connection: Display inline error notices for site registration, authorization, and disconnect failures in the WordPress.com Connectors card.
10+
- Add SSO details to the Connection details card. [#47861]
11+
- Add WordPress.com connector card for the WP 7.0+ Settings > Connectors screen with connection details and disconnect support. [#47792]
12+
- Connection: Display inline error notices for site registration, authorization, and disconnect failures in the WordPress.com Connectors card. [#47865]
1613

1714
### Changed
18-
- Connector card: Prevent site disconnection and owner account unlinking on WoA and VIP sites.
15+
- Connector card: Prevent site disconnection and owner account unlinking on Wordpress.com and VIP sites. [#47862]
1916

2017
### Fixed
21-
- Connection Details: Fix layout of the connection details modal to properly handle varying URL lengths and screen sizes.
22-
- Fix connection flow in connector card when using Gutenberg and ensure modals always show on disconnection.
23-
- Update Woo logo on connector card.
18+
- Connection Details: Fix layout of the connection details modal to properly handle varying URL lengths and screen sizes. [#47879]
19+
- Fix connection flow in connector card when using Gutenberg and ensure modals always show on disconnection. [#47902]
20+
- Update Woo logo on connector card. [#47884]
2421

2522
## [8.1.0] - 2026-03-30
2623
### Changed
@@ -1777,7 +1774,7 @@ This is an alpha version! The changes listed here are not final.
17771774

17781775
- Separate the connection library into its own package.
17791776

1780-
[8.2.0-alpha]: https://github.com/Automattic/jetpack-connection/compare/v8.1.0...v8.2.0-alpha
1777+
[8.2.0]: https://github.com/Automattic/jetpack-connection/compare/v8.1.0...v8.2.0
17811778
[8.1.0]: https://github.com/Automattic/jetpack-connection/compare/v8.0.5...v8.1.0
17821779
[8.0.5]: https://github.com/Automattic/jetpack-connection/compare/v8.0.4...v8.0.5
17831780
[8.0.4]: https://github.com/Automattic/jetpack-connection/compare/v8.0.3...v8.0.4

jetpack_vendor/automattic/jetpack-connection/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"require": {
77
"php": ">=7.2",
88
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
9-
"automattic/jetpack-admin-ui": "^0.7.0-alpha",
10-
"automattic/jetpack-assets": "^4.3.30",
9+
"automattic/jetpack-admin-ui": "^0.7.0",
10+
"automattic/jetpack-assets": "^4.3.31",
1111
"automattic/jetpack-constants": "^3.0.8",
1212
"automattic/jetpack-roles": "^3.0.8",
1313
"automattic/jetpack-status": "^6.1.2",

jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
class Package_Version {
1414

15-
const PACKAGE_VERSION = '8.2.0-alpha';
15+
const PACKAGE_VERSION = '8.2.0';
1616

1717
const PACKAGE_SLUG = 'connection';
1818

jetpack_vendor/automattic/jetpack-connection/src/connectors/class-wpcom-connector.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* WordPress.com connector card handler.
1919
*
20-
* @since 8.2.0-alpha
20+
* @since 8.2.0
2121
*/
2222
class Wpcom_Connector {
2323

@@ -69,7 +69,7 @@ public static function init() {
6969
* The wp_connectors_init action is available in WordPress 7.0+.
7070
* On older versions this action never fires, so the hook is safely a no-op.
7171
*
72-
* @since 8.2.0-alpha
72+
* @since 8.2.0
7373
*
7474
* @param \WP_Connector_Registry $registry Connector registry instance.
7575
*/
@@ -92,7 +92,7 @@ public static function register_connector( $registry ) {
9292
/**
9393
* Enqueue the connectors card script module on the Settings > Connectors page.
9494
*
95-
* @since 8.2.0-alpha
95+
* @since 8.2.0
9696
*/
9797
public static function enqueue_script_module() {
9898
$screen = get_current_screen();
@@ -134,7 +134,7 @@ public static function enqueue_script_module() {
134134
/**
135135
* Build the data passed to the script module via the script_module_data_ filter.
136136
*
137-
* @since 8.2.0-alpha
137+
* @since 8.2.0
138138
*
139139
* @param array $data Existing script module data.
140140
* @return array Filtered script module data.
@@ -337,7 +337,7 @@ private static function get_connectors_page_path() {
337337
* the auth webhook fails. The transient is read on the next
338338
* Connectors page load so the JS card can display the error.
339339
*
340-
* @since 8.2.0-alpha
340+
* @since 8.2.0
341341
*
342342
* @param \WP_Error $error Authorization error.
343343
*/

0 commit comments

Comments
 (0)