Skip to content

Commit

Permalink
wpcom Features: add new Holiday Snow feature (#40478)
Browse files Browse the repository at this point in the history
This commit brings a new feature to the mu-wpcom package:

- That feature can be toggled via Settings > General in wp-admin.
- It is active from December 1st to January 4th by default.

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

Upstream-Ref: Automattic/jetpack@d416736
  • Loading branch information
jeherve authored and matticbot committed Dec 6, 2024
1 parent 9fded1b commit 0120d32
Show file tree
Hide file tree
Showing 11 changed files with 138 additions and 129 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"automattic/jetpack-plugin-deactivation": "^0.3.0",
"automattic/jetpack-schema": "^0.2.0",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-sync": "^4.1.0-alpha",
"automattic/jetpack-wp-js-data-sync": "^0.6.0",
"matthiasmullie/minify": "^1.3",
"tubalmartin/cssmin": "^4.1"
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 @@ -17,7 +17,7 @@
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-sync": "^4.1.0-alpha",
"automattic/jetpack-protect-status": "^0.4.0"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0-alpha",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-sync": "^4.1.0-alpha",
"automattic/jetpack-protect-models": "^0.4.1",
"automattic/jetpack-plans": "^0.5.1"
},
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +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.1.0-alpha] - unreleased

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

### Added
- WordPress.com Features: add Holiday Snow functionality.

## [4.0.2] - 2024-11-28
### Fixed
- Sync: Fixed bug in checksum histogram when max_range is PHP_INT_MAX [#40309]
Expand Down Expand Up @@ -1351,6 +1358,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Packages: Move sync to a classmapped package

[4.1.0-alpha]: https://github.com/Automattic/jetpack-sync/compare/v4.0.2...v4.1.0-alpha
[4.0.2]: https://github.com/Automattic/jetpack-sync/compare/v4.0.1...v4.0.2
[4.0.1]: https://github.com/Automattic/jetpack-sync/compare/v4.0.0...v4.0.1
[4.0.0]: https://github.com/Automattic/jetpack-sync/compare/v3.15.0...v4.0.0
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
"dev-trunk": "4.0.x-dev"
"dev-trunk": "4.1.x-dev"
},
"dependencies": {
"test-only": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class Defaults {
'jetpack_comment_form_color_scheme',
'jetpack_comment_likes_enabled',
'jetpack_excluded_extensions',
'jetpack_holiday_snow_enabled',
'jetpack_mailchimp',
'jetpack_options',
'jetpack_portfolio',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '4.0.2';
const PACKAGE_VERSION = '4.1.0-alpha';

const PACKAGE_SLUG = 'sync';

Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '4.0.2',
'ver' => '4.1.0-alpha1733498965',
),
'jetpack-wp-js-data-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-wp-js-data-sync',
Expand Down
70 changes: 35 additions & 35 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": "f2bccb001c95ebf13bbdc95203d0bf06802209a9"
"reference": "7d6486a81bcd4035bcb57e91a9bb6e119b23ec34"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "2b9085daf79ae00d591faa3feb2dc233d1059399"
"reference": "795c083c60e3137eb045b508dd3e96c81f1eb49c"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "e3a6ffe4bb220accdb5620009d9cef539b496914"
"reference": "0006bca205801a349edb96a6c8133bcb782d5274"
},
"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": "a9f84dab1f0668d24e298a787ad9b9adee0474a0"
"reference": "d5d50b56e632c68527c8ee2bc9910f56a508aa19"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "40aae99cbc18046329bc63c017f5aec54fbbb43c"
"reference": "82913a3ab3710fae79e77c47dc29c439dd7bd840"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -345,7 +345,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "fc57fc373eb2034802877fbdc08c87b50a715c64"
"reference": "6933878a33b52a7c7a83053452c44191f5786a4c"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.2",
Expand Down Expand Up @@ -424,7 +424,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "50f757f32eccdc381ce438ffa759db02c9edd1b8"
"reference": "bcaf34a9c9c9fa07a84ab64fa727f43d8d7429c5"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -487,7 +487,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "efb9d47fd3d7cfb8d72381fa7a81b8e877327569"
"reference": "4a2689d4581a22a055fa5653dd983bcc50a258eb"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "7abedc57d4483f066d76d2bebfed8be96e54149f"
"reference": "7423e3ca5cc30428f80b8867aedebfe120203da2"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -655,7 +655,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "8274a1c6c9b8be77118fc1a53596016a26732435"
"reference": "214fbe9e09576ca0acc71a4095069de6dec8fcb4"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "1a3e46ac6503a5f72d2d569e58ebc3fcc6a7ecea"
"reference": "a17a1ec6fbaacf9d2c915f4e482e8cca37a11f14"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "c39e46ad808e689c4e1d4c440612a37b09aab4b1"
"reference": "4bdf99840f4951cd1be8375750236d8d7b297e51"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -846,7 +846,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-image-cdn",
"reference": "c07f064e324ff8e58dc7c1eb82794bc4faeae83e"
"reference": "e2e11dff6861833810e66767fcee2f6bd9e16ff8"
},
"require": {
"automattic/jetpack-assets": "^4.0.1",
Expand Down Expand Up @@ -915,7 +915,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "6d5879d43bced9a1053938b0f04b9b518979c114"
"reference": "7933c6bd031996c31b2fcda984685300b4fa5b27"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -976,7 +976,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "ca90c4b86e8138e00b3cb4223146eb7f8b46e7ef"
"reference": "cd202e0bf5eb6684b31df328a30c599dd98215d7"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1054,7 +1054,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "6a060f96b4f4a006a73ed5ea4427b27c2680d098"
"reference": "0e8ca22d9668e078fd0f57cabdfd3a3c8c6cbf16"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -1119,7 +1119,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "b73eb4805b47b8098be87bf0ee2f943cf9c788ee"
"reference": "badfcd71ff3c9c8d1c16274d6155bb3d0ddd9ad2"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1175,7 +1175,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "401a4240f0f2106166e247380df4a9b21aca02fa"
"reference": "f085a8bcd89f319c3d3c331191abade1cd4621f8"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand All @@ -1191,7 +1191,7 @@
"automattic/jetpack-protect-status": "^0.4.0",
"automattic/jetpack-redirect": "^3.0.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-sync": "^4.1.0-alpha",
"php": ">=7.2"
},
"require-dev": {
Expand Down Expand Up @@ -1280,7 +1280,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "96a90c26a1790933e93f771ad60d91c4c845811c"
"reference": "d31c6f43238868fb9efa7706bb5940116e04edde"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1344,7 +1344,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "9b21208e29231df512ba8fb1bdc97fec83e0f059"
"reference": "24337f9093dfbdd353ac36d49d3829454474237c"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -1415,7 +1415,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugin-deactivation",
"reference": "da30a56d29c8fadfee20f743353b0190f1b4882a"
"reference": "8880eeed8e35308b882903f7390e370632333fea"
},
"require": {
"automattic/jetpack-assets": "^4.0.1",
Expand Down Expand Up @@ -1486,7 +1486,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "dd688b97d10b0ec4a8866cf68d1a057fbc491fa1"
"reference": "3aa1a5a94a2932bd9578e3c184d2680800454fce"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1545,7 +1545,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "360c82c78d95325c2ad4cb0754fd1160ae6173e3"
"reference": "4e30e1dfb673e73583099cc88a867831376b33aa"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1618,14 +1618,14 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "1028c9c5191be83d62fc7031a24638befa7dc3be"
"reference": "68221eb96cbe67b9ea6087c077b9a58bac7f8071"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-protect-models": "^0.4.1",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-sync": "^4.1.0-alpha",
"php": ">=7.2"
},
"require-dev": {
Expand Down Expand Up @@ -1696,7 +1696,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "836e86ab78c8b1b78ef47d5a533d2ab539a3dd2a"
"reference": "c974f76a967e1c97f3e62f74c511020987ce4d0a"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1754,7 +1754,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "6f7447113b6de00728bb7f00cafbdf61390cef1c"
"reference": "beda10e99534e999bd1726cacf3875c88c43ec2d"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1811,7 +1811,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-schema",
"reference": "9abd989fa0b7172dad5954b8e7d92412735d75b0"
"reference": "ea5520290314ddc1224c45ebe1ba518ab93273bf"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1884,7 +1884,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "2cb0267af04730bde963ef0f0a5c6b6c742a859b"
"reference": "eccfec11f977483c9e7f8171866a367e6530f608"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1946,12 +1946,12 @@
},
{
"name": "automattic/jetpack-sync",
"version": "4.0.2",
"version_normalized": "4.0.2.0",
"version": "4.1.0-alpha.1733498965",
"version_normalized": "4.1.0.0-alpha1733498965",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "9737a7648643d3b7543a550d498a6bfcf06fb7ff"
"reference": "1298938f81c190aeb9f6eaab3e77d7a443efc056"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -1984,7 +1984,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
"dev-trunk": "4.0.x-dev"
"dev-trunk": "4.1.x-dev"
},
"dependencies": {
"test-only": [
Expand Down Expand Up @@ -2032,7 +2032,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-wp-js-data-sync",
"reference": "9e029c32eea6630d437e2a43f7f459fbbeb7d27e"
"reference": "f6ecca1f3c11de35f4efaa5e43680a8568f1e959"
},
"require": {
"automattic/jetpack-schema": "^0.2.0",
Expand Down
Loading

0 comments on commit 0120d32

Please sign in to comment.