Skip to content

Commit

Permalink
Backport changes for Jetpack 13.8-beta (#39185)
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/10670952164

Upstream-Ref: Automattic/jetpack@41437f3
  • Loading branch information
anomiex authored and matticbot committed Sep 2, 2024
1 parent 61c09e4 commit 918c190
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 141 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-connection": "^2.12.5",
"automattic/jetpack-my-jetpack": "^4.34.0-alpha",
"automattic/jetpack-search": "^0.45.0-alpha",
"automattic/jetpack-my-jetpack": "^4.34.0",
"automattic/jetpack-search": "^0.45.0",
"automattic/jetpack-stats": "^0.13.1",
"automattic/jetpack-status": "^3.3.4",
"automattic/jetpack-sync": "^3.9.0"
Expand Down
13 changes: 5 additions & 8 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +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.34.0-alpha] - unreleased

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

## [4.34.0] - 2024-09-02
### Changed
- My Jetpack: show over quota notice and period usage counter for unlimited plans
- We update Welcome Flow A/B experiment to test other things
- My Jetpack: show over quota notice and period usage counter for unlimited plans [#39129]
- We update Welcome Flow A/B experiment to test other things [#39154]

### Fixed
- My Jetpack: change Jetpack AI post checkout URL so the redirect works
- My Jetpack: change Jetpack AI post checkout URL so the redirect works [#39166]

## [4.33.1] - 2024-08-29
### Changed
Expand Down Expand Up @@ -1690,7 +1687,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[4.34.0-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.33.1...4.34.0-alpha
[4.34.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.33.1...4.34.0
[4.33.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.33.0...4.33.1
[4.33.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.4...4.33.0
[4.32.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.3...4.32.4
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.34.0-alpha';
const PACKAGE_VERSION = '4.34.0';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
15 changes: 6 additions & 9 deletions jetpack_vendor/automattic/jetpack-search/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@ 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.45.0-alpha] - unreleased

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

## [0.45.0] - 2024-09-02
### Added
- Search: allow customizing highlighted fields
- Search: allow customizing highlighted fields [#39053]

### Changed
- Admin menu: change order of Jetpack sub-menu items
- Updated package dependencies.
- Admin menu: change order of Jetpack sub-menu items [#39095]
- Updated package dependencies. [#39111]

### Fixed
- Search: Use the user's locale when formatting request limits.
- Search: Use the user's locale when formatting request limits. [#38946]

## [0.44.17] - 2024-08-26
### Changed
Expand Down Expand Up @@ -1025,7 +1022,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.45.0-alpha]: https://github.com/Automattic/jetpack-search/compare/v0.44.17...v0.45.0-alpha
[0.45.0]: https://github.com/Automattic/jetpack-search/compare/v0.44.17...v0.45.0
[0.44.17]: https://github.com/Automattic/jetpack-search/compare/v0.44.16...v0.44.17
[0.44.16]: https://github.com/Automattic/jetpack-search/compare/v0.44.15...v0.44.16
[0.44.15]: https://github.com/Automattic/jetpack-search/compare/v0.44.14...v0.44.15
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-status": "^3.3.4",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-my-jetpack": "^4.34.0-alpha",
"automattic/jetpack-my-jetpack": "^4.34.0",
"automattic/jetpack-sync": "^3.9.0"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Search package general information
*/
class Package {
const VERSION = '0.45.0-alpha';
const VERSION = '0.45.0';
const SLUG = 'search';

/**
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '4.34.0-alpha1725039408',
'ver' => '4.34.0',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand All @@ -66,7 +66,7 @@
),
'jetpack-search-pkg' => array(
'path' => 'jetpack_vendor/automattic/jetpack-search',
'ver' => '0.45.0-alpha1724905418',
'ver' => '0.45.0',
),
'jetpack-stats' => array(
'path' => 'jetpack_vendor/automattic/jetpack-stats',
Expand Down
66 changes: 33 additions & 33 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "7f192f627800522a1fcfb58b01c56d8426f27053"
"reference": "5ad7d47c9dd0a6ce8d2e75a1774910adc78b827a"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -60,7 +60,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "37351af7826ad4e5fc6d8e4f4db01490873b9740"
"reference": "5582cf9558f65e1279aa1c72c23174276d1ad588"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -125,7 +125,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "2dab941f5fef4339366340b772986bd5beea859f"
"reference": "69f153a6c9d1b53f7c55d757f390f04e370ba334"
},
"require": {
"automattic/jetpack-constants": "^2.0.4",
Expand Down Expand Up @@ -194,7 +194,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "11d2a992f2cc840bff651b47240f905e3d80b767"
"reference": "bac19423aca5ee1f315162aacea16eee52c4ff5b"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0",
Expand Down Expand Up @@ -261,7 +261,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "60af0c810b5eb4c786338bda022233494d4c8ced"
"reference": "6706612701abe9b59adbdeb7b83ac2b112e18cd7"
},
"require": {
"automattic/jetpack-connection": "^2.12.5",
Expand Down Expand Up @@ -329,7 +329,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "bf31cad197dfb164a37a4eb77f0712ccaa266476"
"reference": "9b6420f2386ea882711552f54179b5b6b492a7c3"
},
"require": {
"automattic/jetpack-boost-core": "^0.2.9",
Expand Down Expand Up @@ -405,7 +405,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "b36266e03a3e679d2bd171c077795c0646645a3e"
"reference": "2fc013b7bea849ba7d96ecb6ba59268b3e1122c6"
},
"require": {
"composer-plugin-api": "^2.1.0",
Expand Down Expand Up @@ -465,7 +465,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "7f360236facff94a04ef5fdae1f960582ebdfd33"
"reference": "ac645f0009ec75239287af6a6ea9c324a210c2a9"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -540,7 +540,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "e9c8573865aaefa86d2c8b2eab5e3edc1b2cd21e"
"reference": "4a92b0d48d361ba1e4cd59b9b322c1fda782f370"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
Expand Down Expand Up @@ -627,7 +627,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "30bcb2816bcb8eb73f04ef2690eac30c05807010"
"reference": "8a0f0c37f27d34fb364a3954eeda177a89282957"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -681,7 +681,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "74d06c1f078661b35e4da8f7e6c86c6d05bf0a9e"
"reference": "d2ff92165c9623f0a6505d15a0df0f9815c5b4a4"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -734,7 +734,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "9d401ba3e2ef9c5d67a91ed757653870c66a83fc"
"reference": "311f38b091530c94a131f9b4f66b5570eb698e07"
},
"require": {
"automattic/jetpack-connection": "^2.12.5",
Expand Down Expand Up @@ -809,7 +809,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "46019b9d13bdec3dc9086cad426c8e604994995c"
"reference": "76084367c24c2dc6e0874055f6e7025bfd62cc02"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -867,7 +867,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "325eade91046ab25a7735210472ec56ed77ca876"
"reference": "77778576a43db0627c183394c5c0451f97cf630a"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
Expand Down Expand Up @@ -942,7 +942,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "e919140490ce1e8f05f66c37253b06529dc3a548"
"reference": "a5f515339ec543defab8a591235819f4e633fb35"
},
"require": {
"automattic/jetpack-connection": "^2.12.5",
Expand Down Expand Up @@ -1004,7 +1004,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "442fd4951724a86d5ca6937e46625095ea07cf08"
"reference": "7a472e1d13ff04804a1182d97ef5d077f4beb54e"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1052,12 +1052,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "4.34.0-alpha.1725039408",
"version_normalized": "4.34.0.0-alpha1725039408",
"version": "4.34.0",
"version_normalized": "4.34.0.0",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "ba941f650d4db6b8dbeb31f901164a28fabac8ea"
"reference": "8c1a4c09bb3ca57962a3ba9726982e505f635a0c"
},
"require": {
"automattic/jetpack-admin-ui": "^0.4.4",
Expand Down Expand Up @@ -1159,7 +1159,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "a42e9f1dd94ab4282d2ca9ee1e4add198f8d4402"
"reference": "c6d3365d085bb03e8ab3be18f69254b96ec4c4fb"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1220,7 +1220,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "93ef2a4468c4d6ce0eb37da217050e5da55b40a7"
"reference": "e68e1d4d1069b80b6ce98326b97ddcc3dc4007f0"
},
"require": {
"automattic/jetpack-connection": "^2.12.5",
Expand Down Expand Up @@ -1288,7 +1288,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "41dc0c899b44f3b43f89124541ff359db90e9424"
"reference": "3a237ce0d8d0703d3ec5cf6886a9530032cd19d2"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
Expand Down Expand Up @@ -1344,7 +1344,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "d3256a6945e471aeb93c5c9cd61eb96f7cb3cc60"
"reference": "4176807a8791ce5f9b6cb56c36cf6f7e2bd807a8"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1414,7 +1414,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "45f4c946774f23620932aaefbf8234edeb4dc9ac"
"reference": "2b537a835864e3c74022359278e653b6df273379"
},
"require": {
"automattic/jetpack-connection": "^2.12.5",
Expand Down Expand Up @@ -1489,7 +1489,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "1b3b5916a5cd67145d6fd3486f58d17f72ad9806"
"reference": "95785a850949774883ca78b46cfa332d93ad69b9"
},
"require": {
"automattic/jetpack-status": "^3.3.4",
Expand Down Expand Up @@ -1544,7 +1544,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "27d75e30f2c00057746e9095d6ccf8db5bc3c4ca"
"reference": "1c902be96b7f4254ae156427a5300eb15868e7f2"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1593,19 +1593,19 @@
},
{
"name": "automattic/jetpack-search",
"version": "0.45.0-alpha.1724905418",
"version_normalized": "0.45.0.0-alpha1724905418",
"version": "0.45.0",
"version_normalized": "0.45.0.0",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "3f55cae9409426b4e676eefd6b133bba48008468"
"reference": "d46d9fb85de711d1aeac88162ed2b87ed8edeeb9"
},
"require": {
"automattic/jetpack-assets": "^2.3.5",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-connection": "^2.12.5",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-my-jetpack": "^4.34.0-alpha",
"automattic/jetpack-my-jetpack": "^4.34.0",
"automattic/jetpack-status": "^3.3.4",
"automattic/jetpack-sync": "^3.9.0",
"php": ">=7.0"
Expand Down Expand Up @@ -1686,7 +1686,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "75288e04e5811abece459fceee8c87ed8ecefeac"
"reference": "d0a231bfe4f1bcf2eb07d421eef34a3e52256699"
},
"require": {
"automattic/jetpack-connection": "^2.12.5",
Expand Down Expand Up @@ -1753,7 +1753,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "57e26733ae3d4a13ad6c78f286a951e8a60b321f"
"reference": "81ec92dbb626fd5b7c727968f25a8a2438f153ad"
},
"require": {
"automattic/jetpack-constants": "^2.0.4",
Expand Down Expand Up @@ -1817,7 +1817,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "a19e5fdef9783af95c9c33bd31c91e169b5ea9ec"
"reference": "660a9d854b912e5fd0bea9c48f39b65a8d8ef607"
},
"require": {
"automattic/jetpack-connection": "^2.12.5",
Expand Down
Loading

0 comments on commit 918c190

Please sign in to comment.