Skip to content

Commit

Permalink
Backport jetpack 13.9-beta Changes (#39587)
Browse files Browse the repository at this point in the history
* Changelog and readme.txt edits.

* Amend readme.txt

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11120940219

Upstream-Ref: Automattic/jetpack@33d102e
  • Loading branch information
zinigor authored and matticbot committed Oct 1, 2024
1 parent 7fb22f5 commit 33e7674
Show file tree
Hide file tree
Showing 26 changed files with 282 additions and 297 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"automattic/jetpack-autoloader": "^3.1.0",
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-my-jetpack": "^4.35.9-alpha",
"automattic/jetpack-sync": "^3.13.2-alpha",
"automattic/jetpack-backup": "^3.4.12-alpha",
"automattic/jetpack-my-jetpack": "^4.35.9",
"automattic/jetpack-sync": "^3.13.2",
"automattic/jetpack-backup": "^3.4.12",
"automattic/jetpack-status": "^4.0.2"
},
"require-dev": {
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-a8c-mc-stats/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

## [2.0.3-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [2.0.3] - 2024-09-30
### Fixed
- Added a check for function presence to avoid fatal errors.
- Added a check for function presence to avoid fatal errors. [#39581]

## [2.0.2] - 2024-08-23
### Changed
Expand Down Expand Up @@ -146,7 +143,7 @@ This is an alpha version! The changes listed here are not final.

- Creates the MC Stats package

[2.0.3-alpha]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.2...v2.0.3-alpha
[2.0.3]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.2...v2.0.3
[2.0.2]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.1...v2.0.2
[2.0.1]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.0...v2.0.1
[2.0.0]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.22...v2.0.0
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-backup/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

## [3.4.12-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [3.4.12] - 2024-09-30
### Changed
- Update dependencies.
- Update dependencies. [#39528]

## [3.4.11] - 2024-09-23
### Changed
Expand Down Expand Up @@ -712,7 +709,7 @@ This is an alpha version! The changes listed here are not final.

- Add API endpoints and Jetpack Backup package for managing Help…

[3.4.12-alpha]: https://github.com/Automattic/jetpack-backup/compare/v3.4.11...v3.4.12-alpha
[3.4.12]: https://github.com/Automattic/jetpack-backup/compare/v3.4.11...v3.4.12
[3.4.11]: https://github.com/Automattic/jetpack-backup/compare/v3.4.10...v3.4.11
[3.4.10]: https://github.com/Automattic/jetpack-backup/compare/v3.4.9...v3.4.10
[3.4.9]: https://github.com/Automattic/jetpack-backup/compare/v3.4.8...v3.4.9
Expand Down
6 changes: 3 additions & 3 deletions jetpack_vendor/automattic/jetpack-backup/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"automattic/jetpack-backup-helper-script-manager": "^0.2.7",
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-connection": "^5.1.1-alpha",
"automattic/jetpack-my-jetpack": "^4.35.9-alpha",
"automattic/jetpack-sync": "^3.13.2-alpha",
"automattic/jetpack-connection": "^5.1.1",
"automattic/jetpack-my-jetpack": "^4.35.9",
"automattic/jetpack-sync": "^3.13.2",
"automattic/jetpack-status": "^4.0.2"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '3.4.12-alpha';
const PACKAGE_VERSION = '3.4.12';

const PACKAGE_SLUG = 'backup';

Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-boost-core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.1-alpha"
"automattic/jetpack-connection": "^5.1.1"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
11 changes: 4 additions & 7 deletions jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

## [5.1.1-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [5.1.1] - 2024-09-30
### Changed
- In 'connect_url_redirect' hook, redirect to 'redirect_after_auth` url if already connected (for connect_after_checkout flow).
- My Jetpack Welcome Flow: Display default recommendations upfront first, then offer optional survey for customized recommendations.
- In 'connect_url_redirect' hook, redirect to 'redirect_after_auth` url if already connected (for connect_after_checkout flow). [#39573]
- My Jetpack Welcome Flow: Display default recommendations upfront first, then offer optional survey for customized recommendations. [#39485]

## [5.1.0] - 2024-09-25
### Changed
Expand Down Expand Up @@ -1219,7 +1216,7 @@ This is an alpha version! The changes listed here are not final.

- Separate the connection library into its own package.

[5.1.1-alpha]: https://github.com/Automattic/jetpack-connection/compare/v5.1.0...v5.1.1-alpha
[5.1.1]: https://github.com/Automattic/jetpack-connection/compare/v5.1.0...v5.1.1
[5.1.0]: https://github.com/Automattic/jetpack-connection/compare/v5.0.0...v5.1.0
[5.0.0]: https://github.com/Automattic/jetpack-connection/compare/v4.0.4...v5.0.0
[4.0.4]: https://github.com/Automattic/jetpack-connection/compare/v4.0.3...v4.0.4
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.3-alpha",
"automattic/jetpack-a8c-mc-stats": "^2.0.3",
"automattic/jetpack-admin-ui": "^0.4.5",
"automattic/jetpack-assets": "^2.3.8",
"automattic/jetpack-constants": "^2.0.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '5.1.1-alpha';
const PACKAGE_VERSION = '5.1.1';

const PACKAGE_SLUG = 'connection';

Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-explat/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.1-alpha"
"automattic/jetpack-connection": "^5.1.1"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.3-alpha",
"automattic/jetpack-a8c-mc-stats": "^2.0.3",
"automattic/jetpack-assets": "^2.3.8",
"automattic/jetpack-connection": "^5.1.1-alpha",
"automattic/jetpack-connection": "^5.1.1",
"automattic/jetpack-device-detection": "^2.1.5",
"automattic/jetpack-logo": "^2.0.4",
"automattic/jetpack-redirect": "^2.0.4",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-licensing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.1-alpha"
"automattic/jetpack-connection": "^5.1.1"
},
"require-dev": {
"automattic/wordbless": "@dev",
Expand Down
15 changes: 6 additions & 9 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +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).

## [4.35.9-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [4.35.9] - 2024-09-30
### Changed
- Fix parameters to allow for connectAfterCheckout flow from recommendation card
- My Jetpack Welcome Flow: Display default recommendations upfront first, then offer optional survey for customized recommendations.
- Fix parameters to allow for connectAfterCheckout flow from recommendation card [#39578]
- My Jetpack Welcome Flow: Display default recommendations upfront first, then offer optional survey for customized recommendations. [#39485]

### Fixed
- Fixed a bug where the purchases and highlights APIs were being called without a valid Jetpack connection
- My Jetpack: visual update to make the GlobalNotice component look better on mobile.
- Fixed a bug where the purchases and highlights APIs were being called without a valid Jetpack connection [#39522]
- My Jetpack: visual update to make the GlobalNotice component look better on mobile. [#39537]

## [4.35.8] - 2024-09-25
### Changed
Expand Down Expand Up @@ -1758,7 +1755,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[4.35.9-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.8...4.35.9-alpha
[4.35.9]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.8...4.35.9
[4.35.8]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.7...4.35.8
[4.35.7]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.6...4.35.7
[4.35.6]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.5...4.35.6
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"automattic/jetpack-admin-ui": "^0.4.5",
"automattic/jetpack-assets": "^2.3.8",
"automattic/jetpack-boost-speed-score": "^0.3.12",
"automattic/jetpack-connection": "^5.1.1-alpha",
"automattic/jetpack-connection": "^5.1.1",
"automattic/jetpack-explat": "^0.1.9",
"automattic/jetpack-jitm": "^3.1.23",
"automattic/jetpack-licensing": "^2.0.10",
Expand All @@ -17,7 +17,7 @@
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-plans": "^0.4.11",
"automattic/jetpack-status": "^4.0.2",
"automattic/jetpack-sync": "^3.13.2-alpha",
"automattic/jetpack-sync": "^3.13.2",
"automattic/jetpack-protect-status": "^0.2.0"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '4.35.9-alpha';
const PACKAGE_VERSION = '4.35.9';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.3-alpha",
"automattic/jetpack-a8c-mc-stats": "^2.0.3",
"automattic/jetpack-status": "^4.0.2"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.1-alpha",
"automattic/jetpack-connection": "^5.1.1",
"automattic/jetpack-plugins-installer": "^0.4.3",
"automattic/jetpack-sync": "^3.13.2-alpha",
"automattic/jetpack-sync": "^3.13.2",
"automattic/jetpack-protect-models": "^0.3.0",
"automattic/jetpack-plans": "^0.4.11"
},
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

## [3.13.2-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [3.13.2] - 2024-09-30
### Fixed
- Jetpack Sync: Fix a bug in syncing HPOS 'woocommerce_delete_order' actions
- Jetpack Sync: Fix a bug in syncing HPOS 'woocommerce_delete_order' actions [#39562]

## [3.13.1] - 2024-09-23
### Changed
Expand Down Expand Up @@ -1302,7 +1299,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[3.13.2-alpha]: https://github.com/Automattic/jetpack-sync/compare/v3.13.1...v3.13.2-alpha
[3.13.2]: https://github.com/Automattic/jetpack-sync/compare/v3.13.1...v3.13.2
[3.13.1]: https://github.com/Automattic/jetpack-sync/compare/v3.13.0...v3.13.1
[3.13.0]: https://github.com/Automattic/jetpack-sync/compare/v3.12.0...v3.13.0
[3.12.0]: https://github.com/Automattic/jetpack-sync/compare/v3.11.0...v3.12.0
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.1-alpha",
"automattic/jetpack-connection": "^5.1.1",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-password-checker": "^0.3.2",
"automattic/jetpack-ip": "^0.3.0",
Expand All @@ -16,7 +16,7 @@
"automattic/jetpack-changelogger": "^4.2.6",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-search": "@dev",
"automattic/jetpack-waf": "^0.20.0-alpha",
"automattic/jetpack-waf": "^0.20.0",
"automattic/wordbless": "@dev"
},
"suggest": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '3.13.2-alpha';
const PACKAGE_VERSION = '3.13.2';

const PACKAGE_SLUG = 'sync';

Expand Down
8 changes: 4 additions & 4 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
),
'jetpack-backup-pkg' => array(
'path' => 'jetpack_vendor/automattic/jetpack-backup',
'ver' => '3.4.12-alpha1727274022',
'ver' => '3.4.12',
),
'jetpack-boost-core' => array(
'path' => 'jetpack_vendor/automattic/jetpack-boost-core',
Expand All @@ -30,7 +30,7 @@
),
'jetpack-connection' => array(
'path' => 'jetpack_vendor/automattic/jetpack-connection',
'ver' => '5.1.1-alpha1727702895',
'ver' => '5.1.1',
),
'jetpack-explat' => array(
'path' => 'jetpack_vendor/automattic/jetpack-explat',
Expand All @@ -50,7 +50,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '4.35.9-alpha1727706537',
'ver' => '4.35.9',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand All @@ -70,7 +70,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '3.13.2-alpha1727690398',
'ver' => '3.13.2',
),
),
);
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-plans/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.1-alpha"
"automattic/jetpack-connection": "^5.1.1"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
Loading

0 comments on commit 33e7674

Please sign in to comment.