From 04afea84c995e4d661fa78af323316e776fc8e2e Mon Sep 17 00:00:00 2001 From: manzoorwanijk Date: Mon, 21 Oct 2024 04:15:56 +0000 Subject: [PATCH] Fix site specific features passed to front-end for simple sites (#39817) * Add `Current_Plan::get_simple_site_specific_features()` method * Pass the features for simple sites to the script data * Create siteHasFeature utility * Add changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11432946410 Upstream-Ref: Automattic/jetpack@cc5911ceac9a978facdb5187a75590603f556338 --- composer.lock | 66 +++++++++---------- .../build/jetpack-script-data.asset.php | 2 +- .../build/jetpack-script-data.js | 2 +- vendor/automattic/jetpack-assets/package.json | 2 +- vendor/automattic/jetpack-blaze/composer.json | 2 +- .../jetpack-masterbar/composer.json | 2 +- vendor/automattic/jetpack-plans/CHANGELOG.md | 8 +++ .../jetpack-plans/src/class-current-plan.php | 45 ++++++++++++- .../jetpack-stats-admin/composer.json | 2 +- .../scheduled-updates/composer.json | 2 +- vendor/composer/installed.json | 64 +++++++++--------- vendor/composer/installed.php | 56 ++++++++-------- 12 files changed, 152 insertions(+), 101 deletions(-) diff --git a/composer.lock b/composer.lock index bf891a30..48d75cad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "97a61d6dc75eba8b93994bb3588d8433", + "content-hash": "6996b215d14dab03710a8632001f9157", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "7ffbb000c4e4c0513af105b5093f7f4d5d6286e3" + "reference": "38afb29a439487657a12eb3e4da1132ffc23d849" }, "require": { "php": ">=7.0" @@ -62,7 +62,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "3744648a1d63e255d4a74d16087fc693dde6f20d" + "reference": "91ba348c64b01036de453decdbc6653d85bc4cec" }, "require": { "php": ">=7.0" @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "b7d875a70885a6757929822def4069e6ea293571" + "reference": "0f3b4990416ddc6c653a70da94e3e095eaa9ce06" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -190,13 +190,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "4c2112804c9ea620fdf72566cc7cb759fcfbfb3b" + "reference": "c77b735198df038621c7831099c035c0606fe0f9" }, "require": { "automattic/jetpack-assets": "^2.3.10", "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-redirect": "^2.0.4", "automattic/jetpack-status": "^4.0.2", "automattic/jetpack-sync": "^3.14.2", @@ -268,7 +268,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "cd089d7a64116e0a7c0e8bc0132ba3df92a57dcc" + "reference": "5ba7d5f7e8d82213db3f35c21048aab1786a101a" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -327,7 +327,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "555c7e8f8e25f6d2b29915d3c99f5d9a355ae7cc" + "reference": "89d7f240ac2fb8508c2923109b09d03456dcdd18" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -389,7 +389,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "2dccbe91e3baf31ec54836a7ecd0aa32380eca42" + "reference": "9fc72599d67fb9c2b9247d1c43578008b1856da0" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -457,7 +457,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "8c4e5bf1ff7b9ea44ab5980fdcdd784071f6773a" + "reference": "4803bd91b7ed7753ed21c6470160f9f0575625f5" }, "require": { "php": ">=7.0" @@ -494,7 +494,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "17bb9392f31f6a4a9f5003bb90481881fed82e73" + "reference": "09dcbf26d99b3ab36d77065e403b3fd13d47fa5d" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -581,7 +581,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "823784c880e11d9c1d8ed48160d26daec2cde13a" + "reference": "0e25aa7c1fad7af60e97c160e16f408a69600542" }, "require": { "php": ">=7.0" @@ -632,7 +632,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "2894b9a2a19a5114ddabeec98a9aa3976e507676" + "reference": "d32b4ba7d0f2f8e7b7303c268f32afdffd689c95" }, "require": { "php": ">=7.0" @@ -682,7 +682,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "babf403b4c2d267f100a68c4fd300edd39ee5be7" + "reference": "326bef0c65fdda310b1375e2d959c052045ae590" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -750,7 +750,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "6d71660b80a4701168901bc4a1216e0e6a040729" + "reference": "d30b5bf3b705fc212ae41678a9475f877a9fba23" }, "require": { "php": ">=7.0" @@ -805,7 +805,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "31027ea969b852640109b786df6534374f4f41d5" + "reference": "20866847b44dd06617bf698cc38923ca5de7208c" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -877,7 +877,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "ba0841fdbdb4c2d06e94bf1398c76ba6156bbdae" + "reference": "3c8a537edf0ca43cc0bbbfe5611855308e3d907d" }, "require": { "php": ">=7.0" @@ -927,7 +927,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "330271390fb5a62d7d9aebe166872ba2e3c9650d" + "reference": "ab549be836432e228c426b51966e104c314a04d4" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -937,7 +937,7 @@ "automattic/jetpack-device-detection": "^2.1.5", "automattic/jetpack-jitm": "^3.1.26", "automattic/jetpack-logo": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-status": "^4.0.2", "php": ">=7.0" }, @@ -1006,7 +1006,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "e67d6b1da8d04d331dd3c8a530e99afd6ecd2e1c" + "reference": "244ad4b77b5142a72085737a8a77ac50572b3232" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -1086,7 +1086,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "93f495b04c79b4166e7f9dceee829896ec44b0eb" + "reference": "a6601103248641dc6ecda290e81ed4c96ecd350d" }, "require": { "php": ">=7.0" @@ -1140,11 +1140,11 @@ }, { "name": "automattic/jetpack-plans", - "version": "0.4.11", + "version": "0.4.12-alpha.1729483278", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "2c0ec9baaf954e2ca01ba100c6e8ceac19d428a7" + "reference": "ac8c4b2c55d29d04bbbafc0d4dd85b10973c4c21" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", @@ -1209,7 +1209,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "0cb9a5b3f385ebbe0f6332fd90273f22a54f3c2c" + "reference": "95c4543f743bb2731585fe08e0732d08f3a3cb73" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -1261,7 +1261,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "ed228795ac1eb4cc14b32977045cd8b6ed5af36f" + "reference": "40fcd781b5d31b60b0c1c952f1a537a808bf9af6" }, "require": { "php": ">=7.0" @@ -1312,7 +1312,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "6d6966df7762011367bfff7c212d83261f1708f0" + "reference": "d5e28bbb3115892aac02a13e97507f53f0b268a7" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", @@ -1376,13 +1376,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "dda38d5b22b2bb8c4867c2024717e35500132888" + "reference": "6e51259edc911482eb0af7e311fed4f8f1bc2cce" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", "automattic/jetpack-jitm": "^3.1.26", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-stats": "^0.13.3", "automattic/jetpack-status": "^4.0.2", "php": ">=7.0" @@ -1446,7 +1446,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "73530428e38113bc0cfcd74405bcac7b2b9aec3e" + "reference": "86a79e0d420f8721a96ec6d4fcf4bf8f5df98505" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -1507,7 +1507,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "50a1ae95dcad8784f501c4bff9d324b8c5f7566d" + "reference": "35954e8308daaae913435adc5b8ebccd7bacb5ce" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", @@ -1582,12 +1582,12 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "e2e5e873e12ba292ea2d15e023160490ca5d8daa" + "reference": "f6f10149ba1f599724c0587986754116799c23d6" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-status": "^4.0.2", "automattic/jetpack-sync": "^3.14.2", "php": ">=7.0" @@ -1731,7 +1731,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "0936f7acda8d2f577db20f26f93dcce35f6c3f80" + "reference": "f0181faecd9202699387907cc5748567281bd4b6" }, "require": { "php": ">=7.0", diff --git a/vendor/automattic/jetpack-assets/build/jetpack-script-data.asset.php b/vendor/automattic/jetpack-assets/build/jetpack-script-data.asset.php index af7fa2e6..239621ab 100644 --- a/vendor/automattic/jetpack-assets/build/jetpack-script-data.asset.php +++ b/vendor/automattic/jetpack-assets/build/jetpack-script-data.asset.php @@ -1 +1 @@ - array(), 'version' => '0274966690f87adbeccb'); + array(), 'version' => '0d9b7c1c5507602fae89'); diff --git a/vendor/automattic/jetpack-assets/build/jetpack-script-data.js b/vendor/automattic/jetpack-assets/build/jetpack-script-data.js index c445d9f2..a4d67bcf 100644 --- a/vendor/automattic/jetpack-assets/build/jetpack-script-data.js +++ b/vendor/automattic/jetpack-assets/build/jetpack-script-data.js @@ -1 +1 @@ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.JetpackScriptDataModule=t():e.JetpackScriptDataModule=t()}(self,(()=>(()=>{var e={729:(e,t,r)=>{"use strict";r.r(t),r.d(t,{getActiveFeatures:()=>a.mH,getAdminUrl:()=>a.hT,getJetpackAdminPageUrl:()=>a.oQ,getMyJetpackUrl:()=>a.e5,getScriptData:()=>a.au,getSiteData:()=>a.sV});var o=r(428),n={};for(const e in o)"default"!==e&&(n[e]=()=>o[e]);r.d(t,n);var a=r(336)},428:()=>{},336:(e,t,r)=>{"use strict";function o(){return window.JetpackScriptData}function n(){return o().site}function a(e=""){return`${o().site.admin_url}${e}`}function i(e=""){return a(`admin.php?page=jetpack${e}`)}function u(e=""){return a(`admin.php?page=my-jetpack${e}`)}function p(){return o().site.plan?.features?.active??[]}r.d(t,{au:()=>o,e5:()=>u,hT:()=>a,mH:()=>p,oQ:()=>i,sV:()=>n})}},t={};function r(o){var n=t[o];if(void 0!==n)return n.exports;var a=t[o]={exports:{}};return e[o](a,a.exports,r),a.exports}r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var o in t)r.o(t,o)&&!r.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:t[o]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var o={};return(()=>{"use strict";r.r(o);var e=r(729),t={};for(const r in e)"default"!==r&&(t[r]=()=>e[r]);r.d(o,t)})(),o})())); \ No newline at end of file +!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.JetpackScriptDataModule=t():e.JetpackScriptDataModule=t()}(self,(()=>(()=>{var e={729:(e,t,r)=>{"use strict";r.r(t),r.d(t,{getActiveFeatures:()=>a.mH,getAdminUrl:()=>a.hT,getJetpackAdminPageUrl:()=>a.oQ,getMyJetpackUrl:()=>a.e5,getScriptData:()=>a.au,getSiteData:()=>a.sV,siteHasFeature:()=>a.IT});var n=r(428),o={};for(const e in n)"default"!==e&&(o[e]=()=>n[e]);r.d(t,o);var a=r(336)},428:()=>{},336:(e,t,r)=>{"use strict";function n(){return window.JetpackScriptData}function o(){return n().site}function a(e=""){return`${n().site.admin_url}${e}`}function i(e=""){return a(`admin.php?page=jetpack${e}`)}function u(e=""){return a(`admin.php?page=my-jetpack${e}`)}function c(){return n().site.plan?.features?.active??[]}function p(e){return c().includes(e)}r.d(t,{IT:()=>p,au:()=>n,e5:()=>u,hT:()=>a,mH:()=>c,oQ:()=>i,sV:()=>o})}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var a=t[n]={exports:{}};return e[n](a,a.exports,r),a.exports}r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var n={};return(()=>{"use strict";r.r(n);var e=r(729),t={};for(const r in e)"default"!==r&&(t[r]=()=>e[r]);r.d(n,t)})(),n})())); \ No newline at end of file diff --git a/vendor/automattic/jetpack-assets/package.json b/vendor/automattic/jetpack-assets/package.json index b1a5a98d..aba1685f 100644 --- a/vendor/automattic/jetpack-assets/package.json +++ b/vendor/automattic/jetpack-assets/package.json @@ -11,7 +11,7 @@ "validate": "pnpm exec validate-es build/" }, "dependencies": { - "@automattic/jetpack-script-data": "^0.1.2", + "@automattic/jetpack-script-data": "^0.1.3-alpha", "react": "18.3.1" }, "devDependencies": { diff --git a/vendor/automattic/jetpack-blaze/composer.json b/vendor/automattic/jetpack-blaze/composer.json index da6473dd..000143d2 100644 --- a/vendor/automattic/jetpack-blaze/composer.json +++ b/vendor/automattic/jetpack-blaze/composer.json @@ -8,7 +8,7 @@ "automattic/jetpack-assets": "^2.3.10", "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-redirect": "^2.0.4", "automattic/jetpack-status": "^4.0.2", "automattic/jetpack-sync": "^3.14.2" diff --git a/vendor/automattic/jetpack-masterbar/composer.json b/vendor/automattic/jetpack-masterbar/composer.json index 6ce55fc8..297e69e0 100644 --- a/vendor/automattic/jetpack-masterbar/composer.json +++ b/vendor/automattic/jetpack-masterbar/composer.json @@ -12,7 +12,7 @@ "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-jitm": "^3.1.26", "automattic/jetpack-logo": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-status": "^4.0.2" }, "require-dev": { diff --git a/vendor/automattic/jetpack-plans/CHANGELOG.md b/vendor/automattic/jetpack-plans/CHANGELOG.md index bdb192c7..fc786e11 100644 --- a/vendor/automattic/jetpack-plans/CHANGELOG.md +++ b/vendor/automattic/jetpack-plans/CHANGELOG.md @@ -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). +## [0.4.12-alpha] - unreleased + +This is an alpha version! The changes listed here are not final. + +### Fixed +- Fixed the site features for Simple sites + ## [0.4.11] - 2024-09-23 ### Changed - Update dependencies. @@ -154,6 +161,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated - Moved the options class into Connection. [#24095] +[0.4.12-alpha]: https://github.com/Automattic/jetpack-plans/compare/v0.4.11...v0.4.12-alpha [0.4.11]: https://github.com/Automattic/jetpack-plans/compare/v0.4.10...v0.4.11 [0.4.10]: https://github.com/Automattic/jetpack-plans/compare/v0.4.9...v0.4.10 [0.4.9]: https://github.com/Automattic/jetpack-plans/compare/v0.4.8...v0.4.9 diff --git a/vendor/automattic/jetpack-plans/src/class-current-plan.php b/vendor/automattic/jetpack-plans/src/class-current-plan.php index f6e7c6e3..cef57d52 100644 --- a/vendor/automattic/jetpack-plans/src/class-current-plan.php +++ b/vendor/automattic/jetpack-plans/src/class-current-plan.php @@ -21,6 +21,14 @@ class Current_Plan { */ private static $active_plan_cache; + /** + * Simple Site-specific features available. + * Their calculation can be expensive and slow, so we're caching it for the request. + * + * @var array Site-specific features + */ + private static $simple_site_specific_features = array(); + /** * The name of the option that will store the site's plan. * @@ -374,7 +382,7 @@ function_exists( 'wpcom_feature_exists' ) && return true; } - // As of 05 2023 - all plans support Earn features (minus 'simple-payments') + // As of 05 2023 - all plans support Earn features (minus 'simple-payments'). if ( in_array( $feature, array( 'donations', 'recurring-payments', 'premium-content/container' ), true ) ) { return true; } @@ -390,4 +398,39 @@ function_exists( 'wpcom_feature_exists' ) && return false; } + + /** + * Retrieve site-specific features for Simple sites. + * + * See Jetpack_Gutenberg::get_site_specific_features() + * + * @return array + */ + public static function get_simple_site_specific_features() { + $is_simple_site = defined( 'IS_WPCOM' ) && constant( 'IS_WPCOM' ); + + if ( ! $is_simple_site ) { + return array( + 'active' => array(), + 'available' => array(), + ); + } + + $current_blog_id = get_current_blog_id(); + + // Return the cached value if it exists. + if ( isset( self::$simple_site_specific_features[ $current_blog_id ] ) ) { + return self::$simple_site_specific_features[ $current_blog_id ]; + } + + if ( ! class_exists( '\Store_Product_List' ) ) { + require WP_CONTENT_DIR . '/admin-plugins/wpcom-billing/store-product-list.php'; + } + + $simple_site_specific_features = \Store_Product_List::get_site_specific_features_data( $current_blog_id ); + + self::$simple_site_specific_features[ $current_blog_id ] = $simple_site_specific_features; + + return $simple_site_specific_features; + } } diff --git a/vendor/automattic/jetpack-stats-admin/composer.json b/vendor/automattic/jetpack-stats-admin/composer.json index 7f43b522..3220638c 100644 --- a/vendor/automattic/jetpack-stats-admin/composer.json +++ b/vendor/automattic/jetpack-stats-admin/composer.json @@ -7,7 +7,7 @@ "php": ">=7.0", "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-stats": "^0.13.3", "automattic/jetpack-status": "^4.0.2", "automattic/jetpack-jitm": "^3.1.26" diff --git a/vendor/automattic/scheduled-updates/composer.json b/vendor/automattic/scheduled-updates/composer.json index 37bcbb55..cd8c4783 100644 --- a/vendor/automattic/scheduled-updates/composer.json +++ b/vendor/automattic/scheduled-updates/composer.json @@ -7,7 +7,7 @@ "php": ">=7.0", "automattic/jetpack-status": "^4.0.2", "automattic/jetpack-sync": "^3.14.2", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-constants": "^2.0.4", "automattic/jetpack-connection": "^5.1.4-alpha" }, diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 01788314..aae1eed6 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7,7 +7,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "7ffbb000c4e4c0513af105b5093f7f4d5d6286e3" + "reference": "38afb29a439487657a12eb3e4da1132ffc23d849" }, "require": { "php": ">=7.0" @@ -60,7 +60,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "3744648a1d63e255d4a74d16087fc693dde6f20d" + "reference": "91ba348c64b01036de453decdbc6653d85bc4cec" }, "require": { "php": ">=7.0" @@ -125,7 +125,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "b7d875a70885a6757929822def4069e6ea293571" + "reference": "0f3b4990416ddc6c653a70da94e3e095eaa9ce06" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -194,13 +194,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "4c2112804c9ea620fdf72566cc7cb759fcfbfb3b" + "reference": "c77b735198df038621c7831099c035c0606fe0f9" }, "require": { "automattic/jetpack-assets": "^2.3.10", "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-redirect": "^2.0.4", "automattic/jetpack-status": "^4.0.2", "automattic/jetpack-sync": "^3.14.2", @@ -275,7 +275,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "cd089d7a64116e0a7c0e8bc0132ba3df92a57dcc" + "reference": "5ba7d5f7e8d82213db3f35c21048aab1786a101a" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -337,7 +337,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "555c7e8f8e25f6d2b29915d3c99f5d9a355ae7cc" + "reference": "89d7f240ac2fb8508c2923109b09d03456dcdd18" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -402,7 +402,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "2dccbe91e3baf31ec54836a7ecd0aa32380eca42" + "reference": "9fc72599d67fb9c2b9247d1c43578008b1856da0" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -473,7 +473,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "8c4e5bf1ff7b9ea44ab5980fdcdd784071f6773a" + "reference": "4803bd91b7ed7753ed21c6470160f9f0575625f5" }, "require": { "php": ">=7.0" @@ -513,7 +513,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "17bb9392f31f6a4a9f5003bb90481881fed82e73" + "reference": "09dcbf26d99b3ab36d77065e403b3fd13d47fa5d" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -603,7 +603,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "823784c880e11d9c1d8ed48160d26daec2cde13a" + "reference": "0e25aa7c1fad7af60e97c160e16f408a69600542" }, "require": { "php": ">=7.0" @@ -657,7 +657,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "2894b9a2a19a5114ddabeec98a9aa3976e507676" + "reference": "d32b4ba7d0f2f8e7b7303c268f32afdffd689c95" }, "require": { "php": ">=7.0" @@ -710,7 +710,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "babf403b4c2d267f100a68c4fd300edd39ee5be7" + "reference": "326bef0c65fdda310b1375e2d959c052045ae590" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -781,7 +781,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "6d71660b80a4701168901bc4a1216e0e6a040729" + "reference": "d30b5bf3b705fc212ae41678a9475f877a9fba23" }, "require": { "php": ">=7.0" @@ -839,7 +839,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "31027ea969b852640109b786df6534374f4f41d5" + "reference": "20866847b44dd06617bf698cc38923ca5de7208c" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -914,7 +914,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "ba0841fdbdb4c2d06e94bf1398c76ba6156bbdae" + "reference": "3c8a537edf0ca43cc0bbbfe5611855308e3d907d" }, "require": { "php": ">=7.0" @@ -967,7 +967,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "330271390fb5a62d7d9aebe166872ba2e3c9650d" + "reference": "ab549be836432e228c426b51966e104c314a04d4" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -977,7 +977,7 @@ "automattic/jetpack-device-detection": "^2.1.5", "automattic/jetpack-jitm": "^3.1.26", "automattic/jetpack-logo": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-status": "^4.0.2", "php": ">=7.0" }, @@ -1049,7 +1049,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "e67d6b1da8d04d331dd3c8a530e99afd6ecd2e1c" + "reference": "244ad4b77b5142a72085737a8a77ac50572b3232" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -1132,7 +1132,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "93f495b04c79b4166e7f9dceee829896ec44b0eb" + "reference": "a6601103248641dc6ecda290e81ed4c96ecd350d" }, "require": { "php": ">=7.0" @@ -1188,12 +1188,12 @@ }, { "name": "automattic/jetpack-plans", - "version": "0.4.11", - "version_normalized": "0.4.11.0", + "version": "0.4.12-alpha.1729483278", + "version_normalized": "0.4.12.0-alpha1729483278", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "2c0ec9baaf954e2ca01ba100c6e8ceac19d428a7" + "reference": "ac8c4b2c55d29d04bbbafc0d4dd85b10973c4c21" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", @@ -1261,7 +1261,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "0cb9a5b3f385ebbe0f6332fd90273f22a54f3c2c" + "reference": "95c4543f743bb2731585fe08e0732d08f3a3cb73" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -1316,7 +1316,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "ed228795ac1eb4cc14b32977045cd8b6ed5af36f" + "reference": "40fcd781b5d31b60b0c1c952f1a537a808bf9af6" }, "require": { "php": ">=7.0" @@ -1370,7 +1370,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "6d6966df7762011367bfff7c212d83261f1708f0" + "reference": "d5e28bbb3115892aac02a13e97507f53f0b268a7" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", @@ -1437,13 +1437,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "dda38d5b22b2bb8c4867c2024717e35500132888" + "reference": "6e51259edc911482eb0af7e311fed4f8f1bc2cce" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", "automattic/jetpack-jitm": "^3.1.26", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-stats": "^0.13.3", "automattic/jetpack-status": "^4.0.2", "php": ">=7.0" @@ -1510,7 +1510,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "73530428e38113bc0cfcd74405bcac7b2b9aec3e" + "reference": "86a79e0d420f8721a96ec6d4fcf4bf8f5df98505" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -1574,7 +1574,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "50a1ae95dcad8784f501c4bff9d324b8c5f7566d" + "reference": "35954e8308daaae913435adc5b8ebccd7bacb5ce" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", @@ -1652,12 +1652,12 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "e2e5e873e12ba292ea2d15e023160490ca5d8daa" + "reference": "f6f10149ba1f599724c0587986754116799c23d6" }, "require": { "automattic/jetpack-connection": "^5.1.4-alpha", "automattic/jetpack-constants": "^2.0.4", - "automattic/jetpack-plans": "^0.4.11", + "automattic/jetpack-plans": "^0.4.12-alpha", "automattic/jetpack-status": "^4.0.2", "automattic/jetpack-sync": "^3.14.2", "php": ">=7.0" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 9d5809ec..a50f012f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'automattic/jetpack-a8c-mc-stats' => array( 'pretty_version' => '2.0.3', 'version' => '2.0.3.0', - 'reference' => '7ffbb000c4e4c0513af105b5093f7f4d5d6286e3', + 'reference' => '38afb29a439487657a12eb3e4da1132ffc23d849', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-a8c-mc-stats', 'aliases' => array(), @@ -22,7 +22,7 @@ 'automattic/jetpack-admin-ui' => array( 'pretty_version' => '0.4.5', 'version' => '0.4.5.0', - 'reference' => '3744648a1d63e255d4a74d16087fc693dde6f20d', + 'reference' => '91ba348c64b01036de453decdbc6653d85bc4cec', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-admin-ui', 'aliases' => array(), @@ -31,7 +31,7 @@ 'automattic/jetpack-assets' => array( 'pretty_version' => '2.3.10', 'version' => '2.3.10.0', - 'reference' => 'b7d875a70885a6757929822def4069e6ea293571', + 'reference' => '0f3b4990416ddc6c653a70da94e3e095eaa9ce06', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-assets', 'aliases' => array(), @@ -40,7 +40,7 @@ 'automattic/jetpack-blaze' => array( 'pretty_version' => '0.23.2-alpha.1729133444', 'version' => '0.23.2.0-alpha1729133444', - 'reference' => '4c2112804c9ea620fdf72566cc7cb759fcfbfb3b', + 'reference' => 'c77b735198df038621c7831099c035c0606fe0f9', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blaze', 'aliases' => array(), @@ -49,7 +49,7 @@ 'automattic/jetpack-blocks' => array( 'pretty_version' => '2.0.6', 'version' => '2.0.6.0', - 'reference' => 'cd089d7a64116e0a7c0e8bc0132ba3df92a57dcc', + 'reference' => '5ba7d5f7e8d82213db3f35c21048aab1786a101a', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blocks', 'aliases' => array(), @@ -58,7 +58,7 @@ 'automattic/jetpack-calypsoify' => array( 'pretty_version' => '0.1.7-alpha.1728505205', 'version' => '0.1.7.0-alpha1728505205', - 'reference' => '555c7e8f8e25f6d2b29915d3c99f5d9a355ae7cc', + 'reference' => '89d7f240ac2fb8508c2923109b09d03456dcdd18', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-calypsoify', 'aliases' => array(), @@ -67,7 +67,7 @@ 'automattic/jetpack-classic-theme-helper' => array( 'pretty_version' => '0.6.4', 'version' => '0.6.4.0', - 'reference' => '2dccbe91e3baf31ec54836a7ecd0aa32380eca42', + 'reference' => '9fc72599d67fb9c2b9247d1c43578008b1856da0', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-classic-theme-helper', 'aliases' => array(), @@ -76,7 +76,7 @@ 'automattic/jetpack-compat' => array( 'pretty_version' => '3.0.2', 'version' => '3.0.2.0', - 'reference' => '8c4e5bf1ff7b9ea44ab5980fdcdd784071f6773a', + 'reference' => '4803bd91b7ed7753ed21c6470160f9f0575625f5', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-compat', 'aliases' => array(), @@ -85,7 +85,7 @@ 'automattic/jetpack-connection' => array( 'pretty_version' => '5.1.4-alpha.1729191608', 'version' => '5.1.4.0-alpha1729191608', - 'reference' => '17bb9392f31f6a4a9f5003bb90481881fed82e73', + 'reference' => '09dcbf26d99b3ab36d77065e403b3fd13d47fa5d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-connection', 'aliases' => array(), @@ -94,7 +94,7 @@ 'automattic/jetpack-constants' => array( 'pretty_version' => '2.0.4', 'version' => '2.0.4.0', - 'reference' => '823784c880e11d9c1d8ed48160d26daec2cde13a', + 'reference' => '0e25aa7c1fad7af60e97c160e16f408a69600542', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-constants', 'aliases' => array(), @@ -103,7 +103,7 @@ 'automattic/jetpack-device-detection' => array( 'pretty_version' => '2.1.5', 'version' => '2.1.5.0', - 'reference' => '2894b9a2a19a5114ddabeec98a9aa3976e507676', + 'reference' => 'd32b4ba7d0f2f8e7b7303c268f32afdffd689c95', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-device-detection', 'aliases' => array(), @@ -112,7 +112,7 @@ 'automattic/jetpack-google-analytics' => array( 'pretty_version' => '0.2.4', 'version' => '0.2.4.0', - 'reference' => 'babf403b4c2d267f100a68c4fd300edd39ee5be7', + 'reference' => '326bef0c65fdda310b1375e2d959c052045ae590', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-google-analytics', 'aliases' => array(), @@ -121,7 +121,7 @@ 'automattic/jetpack-ip' => array( 'pretty_version' => '0.3.0', 'version' => '0.3.0.0', - 'reference' => '6d71660b80a4701168901bc4a1216e0e6a040729', + 'reference' => 'd30b5bf3b705fc212ae41678a9475f877a9fba23', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-ip', 'aliases' => array(), @@ -130,7 +130,7 @@ 'automattic/jetpack-jitm' => array( 'pretty_version' => '3.1.26', 'version' => '3.1.26.0', - 'reference' => '31027ea969b852640109b786df6534374f4f41d5', + 'reference' => '20866847b44dd06617bf698cc38923ca5de7208c', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-jitm', 'aliases' => array(), @@ -139,7 +139,7 @@ 'automattic/jetpack-logo' => array( 'pretty_version' => '2.0.4', 'version' => '2.0.4.0', - 'reference' => 'ba0841fdbdb4c2d06e94bf1398c76ba6156bbdae', + 'reference' => '3c8a537edf0ca43cc0bbbfe5611855308e3d907d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-logo', 'aliases' => array(), @@ -148,7 +148,7 @@ 'automattic/jetpack-masterbar' => array( 'pretty_version' => '0.9.6', 'version' => '0.9.6.0', - 'reference' => '330271390fb5a62d7d9aebe166872ba2e3c9650d', + 'reference' => 'ab549be836432e228c426b51966e104c314a04d4', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-masterbar', 'aliases' => array(), @@ -157,7 +157,7 @@ 'automattic/jetpack-mu-wpcom' => array( 'pretty_version' => '5.65.0-alpha.1729172823', 'version' => '5.65.0.0-alpha1729172823', - 'reference' => 'e67d6b1da8d04d331dd3c8a530e99afd6ecd2e1c', + 'reference' => '244ad4b77b5142a72085737a8a77ac50572b3232', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(), @@ -175,16 +175,16 @@ 'automattic/jetpack-password-checker' => array( 'pretty_version' => '0.3.2', 'version' => '0.3.2.0', - 'reference' => '93f495b04c79b4166e7f9dceee829896ec44b0eb', + 'reference' => 'a6601103248641dc6ecda290e81ed4c96ecd350d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-password-checker', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-plans' => array( - 'pretty_version' => '0.4.11', - 'version' => '0.4.11.0', - 'reference' => '2c0ec9baaf954e2ca01ba100c6e8ceac19d428a7', + 'pretty_version' => '0.4.12-alpha.1729483278', + 'version' => '0.4.12.0-alpha1729483278', + 'reference' => 'ac8c4b2c55d29d04bbbafc0d4dd85b10973c4c21', 'type' => 'library', 'install_path' => __DIR__ . '/../automattic/jetpack-plans', 'aliases' => array(), @@ -193,7 +193,7 @@ 'automattic/jetpack-redirect' => array( 'pretty_version' => '2.0.4', 'version' => '2.0.4.0', - 'reference' => '0cb9a5b3f385ebbe0f6332fd90273f22a54f3c2c', + 'reference' => '95c4543f743bb2731585fe08e0732d08f3a3cb73', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-redirect', 'aliases' => array(), @@ -202,7 +202,7 @@ 'automattic/jetpack-roles' => array( 'pretty_version' => '2.0.3', 'version' => '2.0.3.0', - 'reference' => 'ed228795ac1eb4cc14b32977045cd8b6ed5af36f', + 'reference' => '40fcd781b5d31b60b0c1c952f1a537a808bf9af6', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-roles', 'aliases' => array(), @@ -211,7 +211,7 @@ 'automattic/jetpack-stats' => array( 'pretty_version' => '0.13.3', 'version' => '0.13.3.0', - 'reference' => '6d6966df7762011367bfff7c212d83261f1708f0', + 'reference' => 'd5e28bbb3115892aac02a13e97507f53f0b268a7', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats', 'aliases' => array(), @@ -220,7 +220,7 @@ 'automattic/jetpack-stats-admin' => array( 'pretty_version' => '0.22.3-alpha.1728956261', 'version' => '0.22.3.0-alpha1728956261', - 'reference' => 'dda38d5b22b2bb8c4867c2024717e35500132888', + 'reference' => '6e51259edc911482eb0af7e311fed4f8f1bc2cce', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats-admin', 'aliases' => array(), @@ -229,7 +229,7 @@ 'automattic/jetpack-status' => array( 'pretty_version' => '4.0.2', 'version' => '4.0.2.0', - 'reference' => '73530428e38113bc0cfcd74405bcac7b2b9aec3e', + 'reference' => '86a79e0d420f8721a96ec6d4fcf4bf8f5df98505', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-status', 'aliases' => array(), @@ -238,7 +238,7 @@ 'automattic/jetpack-sync' => array( 'pretty_version' => '3.14.2', 'version' => '3.14.2.0', - 'reference' => '50a1ae95dcad8784f501c4bff9d324b8c5f7566d', + 'reference' => '35954e8308daaae913435adc5b8ebccd7bacb5ce', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-sync', 'aliases' => array(), @@ -247,7 +247,7 @@ 'automattic/scheduled-updates' => array( 'pretty_version' => '0.13.4', 'version' => '0.13.4.0', - 'reference' => 'e2e5e873e12ba292ea2d15e023160490ca5d8daa', + 'reference' => 'f6f10149ba1f599724c0587986754116799c23d6', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/scheduled-updates', 'aliases' => array(),