Skip to content

Commit

Permalink
Backport mu-wpcom-plugin 2.0.13, jetpack 13.1-a.1 Changes (#35043)
Browse files Browse the repository at this point in the history
* Changelog and readme.txt edits.

* Init new cycle

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/7532989763
  • Loading branch information
samiff authored and matticbot committed Jan 15, 2024
1 parent 0a965a0 commit 9929d15
Show file tree
Hide file tree
Showing 9 changed files with 155 additions and 161 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"automattic/jetpack-composer-plugin": "^2.0.0",
"automattic/jetpack-config": "^2.0.0",
"automattic/jetpack-identity-crisis": "^0.14.1",
"automattic/jetpack-my-jetpack": "^4.4.0-alpha",
"automattic/jetpack-my-jetpack": "^4.4.0",
"automattic/jetpack-plugins-installer": "^0.3.1",
"automattic/jetpack-sync": "^2.4.1-alpha"
"automattic/jetpack-sync": "^2.4.1"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.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,14 +5,11 @@ 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.4.0-alpha] - unreleased

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

## [4.4.0] - 2024-01-15
### Changed
- add plan check to My Jetpack Akismet product card
- Prevent new users from seeing JITMs
- To avoid displaying the Welcome banner to every user, now we only display it to new users.
- add plan check to My Jetpack Akismet product card [#34905]
- Prevent new users from seeing JITMs [#34927]
- To avoid displaying the Welcome banner to every user, now we only display it to new users. [#34883]

## [4.3.0] - 2024-01-08
### Added
Expand Down Expand Up @@ -1192,7 +1189,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[4.4.0-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.3.0...4.4.0-alpha
[4.4.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.3.0...4.4.0
[4.3.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.2.1...4.3.0
[4.2.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.2.0...4.2.1
[4.2.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.1.4...4.2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '4.4.0-alpha';
const PACKAGE_VERSION = '4.4.0';

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

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

## [2.4.1] - 2024-01-15
### Added
- Options: synchronize block status option.
- Options: synchronize block status option. [#34989]

### Changed
- Sync: Dedicated sync now disabled for high queue lags only if test request fails.
- Sync: Dedicated sync now disabled for high queue lags only if test request fails. [#34888]

### Fixed
- Added `is_array` check to `get_items_to_send` to make sure no fatals are thrown on non-array values.
- Jetpack Sync: Fixed buffer sanitization in Sync close endpoint
- Jetpack Sync: Fix restoring post global before enqueuing a post action.
- Added `is_array` check to `get_items_to_send` to make sure no fatals are thrown on non-array values. [#31552]
- Jetpack Sync: Fixed buffer sanitization in Sync close endpoint [#34961]
- Jetpack Sync: Fix restoring post global before enqueuing a post action. [#34990]

## [2.4.0] - 2024-01-04
### Removed
Expand Down Expand Up @@ -1029,7 +1026,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[2.4.1-alpha]: https://github.com/Automattic/jetpack-sync/compare/v2.4.0...v2.4.1-alpha
[2.4.1]: https://github.com/Automattic/jetpack-sync/compare/v2.4.0...v2.4.1
[2.4.0]: https://github.com/Automattic/jetpack-sync/compare/v2.3.0...v2.4.0
[2.3.0]: https://github.com/Automattic/jetpack-sync/compare/v2.2.1...v2.3.0
[2.2.1]: https://github.com/Automattic/jetpack-sync/compare/v2.2.0...v2.2.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '2.4.1-alpha';
const PACKAGE_VERSION = '2.4.1';

const PACKAGE_SLUG = 'sync';

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 @@ -38,7 +38,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '4.4.0-alpha1704919024',
'ver' => '4.4.0',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand All @@ -50,7 +50,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '2.4.1-alpha1705315531',
'ver' => '2.4.1',
),
),
);
52 changes: 26 additions & 26 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": "103d8f8a06b89a0b97e4b7388515abdbff1b852c"
"reference": "f3dfe2eb914c7c248cdc8fb9cfaf90c5875749ce"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -60,7 +60,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "59492de572dad78b714083a9f5b9615c73f20df7"
"reference": "da43fc46f17e026d8331e91123650da5e6895628"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -125,7 +125,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "5bb8b2347ac136e3ac4fb26aedc32680b41ff7d6"
"reference": "e7c8da404f09cc09a1ce7494d72c2d77aabb8cb2"
},
"require": {
"automattic/jetpack-constants": "^2.0.0",
Expand Down Expand Up @@ -194,7 +194,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "8f2eef4fd5c7a159f43e2f41cded3b0b02260e28"
"reference": "0d6ec48d2a0ed76a46b00e4545dadffb1ef49a95"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0",
Expand Down Expand Up @@ -260,7 +260,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "6ff56188bb14a5c6a94ba5e59d23bfa4a59d6209"
"reference": "9adf072089c81b3fca26629ae4e6988d992512db"
},
"require": {
"composer-plugin-api": "^2.1.0",
Expand Down Expand Up @@ -320,7 +320,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "544b0d5b6015814460ba948c448990dae60a3cd9"
"reference": "00825e0ce13c5f29f7e6010afe00fd8a2566e9e0"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -365,7 +365,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "aa067113918b698361ce7d1fa819ad36eb54323f"
"reference": "f576ea37d09658112c25544492111dc37f91a07d"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.0",
Expand Down Expand Up @@ -444,7 +444,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "e9cd42905cd4cfb9100e02c744f7226b32953095"
"reference": "3c19620975764a950b5a36ae8afc0a6342415408"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -498,7 +498,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "c0215afe029c1d5f05402acc29d906be553c729a"
"reference": "add958e5cf9c0a0c11f52c2859d551fa84b4dcf1"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -551,7 +551,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
"reference": "80429b2300aa57160ed818e12b835e8d188a819e"
"reference": "a4e7a6006c441c565055f268831330cf2d289665"
},
"require": {
"automattic/jetpack-assets": "^2.0.4",
Expand Down Expand Up @@ -630,7 +630,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "d98e41ce498ff75c8f042cf1b571ebb1a7c4d3ee"
"reference": "52308f04ab6aa3541bf7bff16157ac4dcf8056a3"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -688,7 +688,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "4e2c7474563e7bb56bdba76798edc70d81c60354"
"reference": "ca03ccdd2ebf546563863e105674d2128e58c608"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.0",
Expand Down Expand Up @@ -763,7 +763,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "c98cc073d050c5e3ca88d8ee34250953b7955c3e"
"reference": "acd991f8aedef75eb114528108b5a95ce3caa22b"
},
"require": {
"automattic/jetpack-connection": "^2.1.1",
Expand Down Expand Up @@ -825,7 +825,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "c2059907ca5710030618f91c07c3eef95305cb3b"
"reference": "01ae633ec0c68732cc38747776e8cc2eedc3e700"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -873,12 +873,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "4.4.0-alpha.1704919024",
"version_normalized": "4.4.0.0-alpha1704919024",
"version": "4.4.0",
"version_normalized": "4.4.0.0",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "8639a19bc7b5dbd9337e34ce803c33f5f1eba1ee"
"reference": "c08b8dbb783fdb658eda5d203cfaa97898274e86"
},
"require": {
"automattic/jetpack-admin-ui": "^0.3.1",
Expand Down Expand Up @@ -970,7 +970,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "54d5329d28c30a7a16bf98f5895463e7cf686b49"
"reference": "14774d75049bcbec123e927f1858ff6b2602bb02"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1031,7 +1031,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "e4580be41bd9bcc9d18e03272f0a4bf4e092019e"
"reference": "c542b3298ac86aad546256f3b7e8cfd5e6762e26"
},
"require": {
"automattic/jetpack-connection": "^2.1.1",
Expand Down Expand Up @@ -1099,7 +1099,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "079bdcb0fad4c05b91cbc6db8efa66f81e096ac9"
"reference": "b912929eb73f74198dc17e96a5715171ae28a1ba"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.0",
Expand Down Expand Up @@ -1154,7 +1154,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "7f1ff24e8bcc189ccc33117d2c6d79be9716efab"
"reference": "39c6d6543858124267d29a9f016311b9545298c2"
},
"require": {
"automattic/jetpack-status": "^2.0.2",
Expand Down Expand Up @@ -1209,7 +1209,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "b93ddb349daabd74d77042d9ad3076be2e3e0faf"
"reference": "f4d42c9d91fa0dfd491bb12b30a25e0961803638"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1263,7 +1263,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "c9f867ba48bf881ceb4cd749434620c4bd9ee80e"
"reference": "c0192ef2689cbb3c0d08ff63cc8cea04e8f90404"
},
"require": {
"automattic/jetpack-constants": "^2.0.0",
Expand Down Expand Up @@ -1314,12 +1314,12 @@
},
{
"name": "automattic/jetpack-sync",
"version": "2.4.1-alpha.1705315531",
"version_normalized": "2.4.1.0-alpha1705315531",
"version": "2.4.1",
"version_normalized": "2.4.1.0",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "82963415dc984f6dea6ec925c599a3a5b4d147bb"
"reference": "818a3338b8537420247a3691c012adc264d722ac"
},
"require": {
"automattic/jetpack-connection": "^2.1.1",
Expand Down
Loading

0 comments on commit 9929d15

Please sign in to comment.