Skip to content

Commit

Permalink
Backport jetpack 14.1-beta Changes (#40415)
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/12124983869

Upstream-Ref: Automattic/jetpack@b7ea553
  • Loading branch information
tbradsha authored and matticbot committed Dec 2, 2024
1 parent 209c996 commit 94b4174
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 122 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"automattic/jetpack-autoloader": "^5.0.0",
"automattic/jetpack-composer-plugin": "^4.0.0",
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-my-jetpack": "^5.1.0-alpha",
"automattic/jetpack-my-jetpack": "^5.1.0",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-transport-helper": "^0.3.0-alpha",
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-licensing/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.0.2-alpha] - unreleased

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

## [3.0.2] - 2024-12-02
### Changed
- Exclude revoked licenses from results when filtering unattached licenses in `Licensing::get_user_licenses()`. Only unattached and valid licenses are now returned.
- Exclude revoked licenses from results when filtering unattached licenses in `Licensing::get_user_licenses()`. Only unattached and valid licenses are now returned. [#40215]

## [3.0.1] - 2024-11-25
### Changed
Expand Down Expand Up @@ -315,7 +312,7 @@ This is an alpha version! The changes listed here are not final.

- Licensing: Add support for Jetpack licenses

[3.0.2-alpha]: https://github.com/Automattic/jetpack-licensing/compare/v3.0.1...v3.0.2-alpha
[3.0.2]: https://github.com/Automattic/jetpack-licensing/compare/v3.0.1...v3.0.2
[3.0.1]: https://github.com/Automattic/jetpack-licensing/compare/v3.0.0...v3.0.1
[3.0.0]: https://github.com/Automattic/jetpack-licensing/compare/v2.0.12...v3.0.0
[2.0.12]: https://github.com/Automattic/jetpack-licensing/compare/v2.0.11...v2.0.12
Expand Down
17 changes: 7 additions & 10 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,19 @@ 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.0-alpha] - unreleased

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

## [5.1.0] - 2024-12-02
### Added
- My Jetpack: add animation during site connection to make it less confusing to users connecting their site for the first time.
- My Jetpack: add loading animation to recommendations step.
- Add animation during site connection. [#40343]
- Add "loading" animation to recommendations step. [#40405]

### Changed
- My Jetpack: fix usage of random() in animation to prevent build step from generating a different CSS file every time.
- Fix usage of random() in animation to prevent build step from generating a different CSS file every time. [#40413]

### Removed
- My Jetpack: remove experiment code.
- Remove experiment code. [#40406]

### Fixed
- Fix My Jetpack recommendation card styling on mobile
- Fix My Jetpack recommendation card styling on mobile [#40370]

## [5.0.4] - 2024-11-28
### Added
Expand Down Expand Up @@ -1855,7 +1852,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[5.1.0-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.4...5.1.0-alpha
[5.1.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.4...5.1.0
[5.0.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.3...5.0.4
[5.0.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.2...5.0.3
[5.0.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.1...5.0.2
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"automattic/jetpack-connection": "^6.1.0",
"automattic/jetpack-explat": "^0.2.1",
"automattic/jetpack-jitm": "^4.0.1",
"automattic/jetpack-licensing": "^3.0.2-alpha",
"automattic/jetpack-licensing": "^3.0.2",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-redirect": "^3.0.1",
"automattic/jetpack-constants": "^3.0.1",
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 = '5.1.0-alpha';
const PACKAGE_VERSION = '5.1.0';

/**
* HTML container ID for the IDC screen on My Jetpack page.
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 @@ -42,11 +42,11 @@
),
'jetpack-licensing' => array(
'path' => 'jetpack_vendor/automattic/jetpack-licensing',
'ver' => '3.0.2-alpha1732893809',
'ver' => '3.0.2',
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.1.0-alpha1733154944',
'ver' => '5.1.0',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
68 changes: 34 additions & 34 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": "c20070292f938fc73c15f896cdd3ef9f677b918d"
"reference": "fbb590d9bc76fc1ea558a4e6b82708b9821041dd"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "96225bd5416c2002a42695a4dae7b17e9488b821"
"reference": "dc93ee5ba48b4daa0644910f259fd37da94b63b6"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "64df9218a32052cb0610338de7b9fe1037b0a772"
"reference": "4c0ef515224f64e8da190edd0fb9b5a95112c620"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "365322a1db87bae2b93d2355e5a5ad727f181d27"
"reference": "e901009b17902028ec17f59b79be8ea1f1511ffd"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-backup-helper-script-manager",
"reference": "0184facc086a3e67bdf58a090c0aa0e2ffb1ddd2"
"reference": "d4b1298931919e657d1c3772d3295bb6f8b20c7b"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -337,7 +337,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "50271a686684830958705c04f2766c033048d4c2"
"reference": "831094ea58576fce52f371da3c8ebba56d32d455"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -408,7 +408,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "0c7edb5101a2b9f7edd48aebfc35d57e69b6b08b"
"reference": "f252b28f97f167d0091bcef84c497b3801d07d59"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.2",
Expand Down Expand Up @@ -487,7 +487,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "1a569309dac3b34c6734593c63177e1aabb45cc3"
"reference": "2b8145faa29d9e3011dffdc6fb0d9addcde1a613"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -550,7 +550,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "e15b1826ca5b00cea40a6552390cc361f5b596c3"
"reference": "6567b443f15d6465e09ffd72833722c11597f70f"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -625,7 +625,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "1d8ece15d6cfeb075a686b72515af696ad81e0b3"
"reference": "438671ae505e659775616194bc4522eaba1884ce"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -718,7 +718,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "b3ee2c1c6a9a2adb58afdb46111f1743c565ea89"
"reference": "a074e46dc2fdb1894660ee8d102455c70587df45"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -775,7 +775,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "3ef536cf185bc37897e6430b1bf1334e695110e7"
"reference": "8a1aab51a63a2c2765bf6a9b86ad798d66dc4a39"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -831,7 +831,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "14a7a461462cda74d24d7c233b546377ff6f3b77"
"reference": "bb88e9d884953b1ab03f9c9d1f051518f0463fec"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -909,7 +909,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "4302db83d8b15d82abcc6c9f54797c7f447773c8"
"reference": "0d564e98fa9be5ca1ef8ee92ed063b5f54217752"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -970,7 +970,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "bac7694e286c3bbd656f36807195fe21fdb1b4cb"
"reference": "18392603cc3622d8dafbff694f596f100008d60d"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1043,12 +1043,12 @@
},
{
"name": "automattic/jetpack-licensing",
"version": "3.0.2-alpha.1732893809",
"version_normalized": "3.0.2.0-alpha1732893809",
"version": "3.0.2",
"version_normalized": "3.0.2.0",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "9543ec846f637feffd83f331b89fc9ca3422a78d"
"reference": "c6c5ed24037b79d45036a1c21bf71dfedd7254d8"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -1113,7 +1113,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "71b5e4a5f4189c0581a4c62c954c389bed53143c"
"reference": "8e26323750b041e5921acca574d910e72c2b0841"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1164,12 +1164,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "5.1.0-alpha.1733154944",
"version_normalized": "5.1.0.0-alpha1733154944",
"version": "5.1.0",
"version_normalized": "5.1.0.0",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "c4f49ea93e05e4b7eb4e89c0b2bb47787f835a3c"
"reference": "309067f2223bd428165d3166913aee86fab21f32"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand All @@ -1179,7 +1179,7 @@
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-explat": "^0.2.1",
"automattic/jetpack-jitm": "^4.0.1",
"automattic/jetpack-licensing": "^3.0.2-alpha",
"automattic/jetpack-licensing": "^3.0.2",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-protect-status": "^0.3.1",
Expand Down Expand Up @@ -1274,7 +1274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "9bb985e81808163edb0efe218726e4dc904695f5"
"reference": "3449e7149a93774f058c1ea36ad3878a21255a65"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1338,7 +1338,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "7606bebf6ac9448279a14d4acc4fc78d79883a6e"
"reference": "975cc2dd64a251edcc4a2dd8c2a0f4577b3a9192"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -1409,7 +1409,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "22d21221d0ea3f8174440a4b1b5b52d599f90458"
"reference": "cd1a5b2bf5b36a13e18288dc2d55c7f6779028f0"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1468,7 +1468,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "a85a4091dbe67b316915f160222aa58451219d01"
"reference": "25d7b39f7479d4b37b83bbd5e9d6c88f08804dd6"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1541,7 +1541,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "0b2b8e5bc897f751243e87d9a06e1b5e2c9025d5"
"reference": "973a59810ab15e0fa226fe53ea882f7acd87a6da"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -1619,7 +1619,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "3fc6dcf4c1b254d5d576f040e02707c904a0a263"
"reference": "e78b18792da13cdf1ce1a4945cbd340dac8b8887"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1677,7 +1677,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "1ede591ba9a5d45f797c890e53ca76f03e06291d"
"reference": "5f97e6dccea70df1d677588050f9a40280534bae"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1734,7 +1734,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "fa71b5ae491e93b93f569f89ca2163087b0b5bc1"
"reference": "cb3e15cf617000b22b3899f536d5a10ce508c72e"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1801,7 +1801,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "cd7cf0f9a8d453a16b915092867936872eb3112e"
"reference": "eb31edce58244392f3ad649d430a873f0c7848f4"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -1882,7 +1882,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-transport-helper",
"reference": "4538079b5b143f609273a2eebf5653d9dc240b6b"
"reference": "c064762f116b0f0c00ac8c692fff775dfc8ed512"
},
"require": {
"automattic/jetpack-backup-helper-script-manager": "^0.3.1",
Expand Down Expand Up @@ -1960,7 +1960,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-waf",
"reference": "76edb042fe8d094ad52df1cb839dbba6d5f00b60"
"reference": "d1c38e379bf19ac25027acc493b009dc101497cc"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down
Loading

0 comments on commit 94b4174

Please sign in to comment.