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 06bd6bf commit ec49eda
Show file tree
Hide file tree
Showing 11 changed files with 130 additions and 121 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-connection": "^6.2.0-alpha",
"automattic/jetpack-my-jetpack": "^5.1.1",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-sync": "^4.1.0-alpha",
"automattic/jetpack-status": "^5.0.1"
},
"require-dev": {
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 @@ -66,7 +66,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '4.0.2',
'ver' => '4.1.0-alpha1733498965',
),
),
);
62 changes: 31 additions & 31 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": "bfce4c70ab081270ff49e701e4276b5c501b627c"
"reference": "1cd3f232de6e56717fbd682ebe65b65ca7c240d4"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "59e3e25693daf2bb63c42b6c78a147713f815c62"
"reference": "8a4fce312e84233068ecd96ad61fd1e151d244cb"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "e940769a15c2a6ebd882a00c87124f07b5fcdbea"
"reference": "93480f85c1eb7d6102c7e2eff83bf3e587948ee2"
},
"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": "712d75707f87795347268925bf91b49b20aab886"
"reference": "44d6a892555810d994b062314bf2111db0104f9d"
},
"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": "0cf126aafbf5f05189ab79774fca52b6c2b217ef"
"reference": "97860cd944f0603599896a2c43500a714cf895d3"
},
"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": "cb0464e2be6ac8d59fdc49319478404c2aeb5222"
"reference": "89e3576c1d9e7c36e94042ed3c256acee8424b24"
},
"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": "c8b82a2f7768d4dd4be3807d8c0bc3bc18f6c7a2"
"reference": "3b3c6b0d298fd307fdaebb1d50bcb56866bcd718"
},
"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": "e589a6bd4264eea8165354330e4ad8cd1bf98976"
"reference": "46f50e804fdfe7392b1257faeee3c16d575c6ac7"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "cab529deb25f646d9e1eaa18492b16a2e06ab214"
"reference": "8c1c85dbe5b10e6568e7636eee0d41750a050b02"
},
"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": "7827a565fcfe50a6b1712dc00278ae93978a2558"
"reference": "4f8321bde88abc9e52228e260b2027bbbdb2e6bd"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "eed745d1c77f1d5b40f024ebabb032d737d5af2f"
"reference": "2b5bb4c09e4da3540e638c3209963db1e90f75f1"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "e8435fd3cbf74af45e4c7417f9895bf3b99256af"
"reference": "895d48b292a8d1f34c9172e9eda1a35ccc546199"
},
"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-ip",
"reference": "bc9e15c2b6a6886def1cd472c36067a1fd114ea2"
"reference": "8eb7ca99e94d3240081a87f1f87972e4a532ac72"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -907,7 +907,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "7c26cf88c34c19699481e7eb045c8fea47fe6d8f"
"reference": "354dd5e0e1a1a56cee36662bac077d65e4f4f730"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -985,7 +985,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "86c3d65edae73fad2ba1537a4fea73181b7f9cd7"
"reference": "7c8dbb414972e6423951ea1e6a288e3be8b5cdfd"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -1050,7 +1050,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "8dfce4609e08d5d8d550931b78d3248cd70e347c"
"reference": "faff49ba4feec4e809920a04253cec7a7cbdeac6"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1106,7 +1106,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "2fbfad9dd38145cecce586bab42eaf7d7d92604f"
"reference": "d0df10853e43546dec7b77aaab229b3c37431251"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand All @@ -1122,7 +1122,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 @@ -1211,7 +1211,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "ea6dae3b5c42e7a905e42a1ca9d43d7283ce23b1"
"reference": "aa9aed0cdc0737c33f939e4f84169529419d02b8"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1275,7 +1275,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "fb9498b137c76fed5a9aaebc64e43b8b27fbec34"
"reference": "a77c00c7163a61ba7b5402284b63e86e2b91ed6d"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -1346,7 +1346,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "bda026b7f5ff729322f01a8fb4c6b49c0baa19f5"
"reference": "74e891992525ade75e1fff787dff1278cf909fc4"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1405,7 +1405,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "059eefa395a0b80c57c72b42555e53487afce424"
"reference": "1aad52355da5fd775f1dbfac9bf258bcc4644d15"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1478,14 +1478,14 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "39a54a49deb5476675b500980ef2655509827944"
"reference": "40f0c02fbd663a5132885ce397a0e071bdea16e6"
},
"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 @@ -1556,7 +1556,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "b6c981cda1c065513c3eafa2fe15d88a565c8ad4"
"reference": "7ae0819449ea1d0b3fb1fc887032d638fa412ee0"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1614,7 +1614,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "b363f4282865e7b40d84e562cda786290a1e3ab6"
"reference": "0a972829945a84b72ab9acfcc39b8be4e3558d47"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1671,7 +1671,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "07f9daadd7ae236269be6356f05e2f904d68b2e7"
"reference": "9e8e7b76f5d8ab797e1c6a111f94d4c47169e54c"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1733,12 +1733,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": "328c6d7eb24286004577aad440c007bc5797a1f6"
"reference": "9a77c2e6027f0fd51db027a94113acc1f3c78659"
},
"require": {
"automattic/jetpack-connection": "^6.2.0-alpha",
Expand Down Expand Up @@ -1771,7 +1771,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
Loading

0 comments on commit ec49eda

Please sign in to comment.