From c63cfb78238afc92c6850735bb7a3823c872b4a1 Mon Sep 17 00:00:00 2001 From: kangzj Date: Thu, 24 Oct 2024 04:53:46 +0000 Subject: [PATCH] Stats: Use option value instead of transient for cache buster (#39887) Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11492727627 Upstream-Ref: Automattic/jetpack@4f62ae4f60e73f0efc1bab71b0d65418446ff3df --- composer.lock | 60 +++++++++---------- .../automattic/jetpack-mu-wpcom/composer.json | 2 +- .../jetpack-stats-admin/CHANGELOG.md | 7 +++ .../jetpack-stats-admin/src/class-main.php | 2 +- .../src/class-odyssey-assets.php | 40 ++++++++++--- vendor/composer/installed.json | 58 +++++++++--------- vendor/composer/installed.php | 56 ++++++++--------- 7 files changed, 127 insertions(+), 98 deletions(-) diff --git a/composer.lock b/composer.lock index 03477ded..9fab5037 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": "02cf972b132d9afbda5ea92b1befddea", + "content-hash": "3c211dde7051fdfecda892df34574f00", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "579f79084de88cc534b4148e27c1781c1d88ffe2" + "reference": "08d88a48ab7614a77effeb7d118716443743607a" }, "require": { "php": ">=7.0" @@ -62,7 +62,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "74979ce39dcd3c4191bba1cee21e2695ca602ae5" + "reference": "797e1787655a1c637f3af0ec54d1281df6add40b" }, "require": { "php": ">=7.0" @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "1d28bfa5f633a1afbd45065f3208df0aebabaa50" + "reference": "0e07dac25886bdc4b24c68fc6d4338877e3db54c" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -190,7 +190,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "a182e573b2777e46dabdff493cff2e3aa10e37cf" + "reference": "3e9873c65894319a660c7e0e65cbb01d09cb5c2e" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -268,7 +268,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "2ddcb6fe364c0408fb5becb0e89ceb434a56a7eb" + "reference": "a7dd39d8a1d9fa05fa6d87f2325075ab020a19dc" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -327,7 +327,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "ee626bdb401b8ab255e6b3a4c92e4a2bc278807e" + "reference": "7e44e11ef8afa04b897cb495324d113535b1149f" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -389,7 +389,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "72425151806acdace5a6f6fbc04f510056bca3c1" + "reference": "ebdb3899b678acd57dad708509d77c494616dc80" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -457,7 +457,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "c24f2bd53436af4d5763a7e07b97ab9abec1ea90" + "reference": "269f0e2332e9df801a7d2af51bdb71f3c49e921d" }, "require": { "php": ">=7.0" @@ -494,7 +494,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "fb2eb68e8b5a823cab8634940d6d2526931c523e" + "reference": "5063c221ce0c83288be6d4fa3ee4f2c7e3478f41" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -581,7 +581,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "432f01c8b06c8e8bf31dcbf50fda2f444019487f" + "reference": "e6b84cace09b0847e1e709d4a55f60dc81537a19" }, "require": { "php": ">=7.0" @@ -632,7 +632,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "f06ab1f2c48b4efa75eb766604789f94c93c9230" + "reference": "c6e71c6bbd472fb0e50cff82f25c17e2b3da5942" }, "require": { "php": ">=7.0" @@ -682,7 +682,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "055d20f8b87a854289925a4908618813d42982ae" + "reference": "e8e78f15b58df7e3e2f7936cdb9528d48a8cf6b4" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -750,7 +750,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "26217ec2683de198d53713ac06a0de4c7cf7a86a" + "reference": "5a86ba34d27bfc8c5a17e8d57a47b7804f405749" }, "require": { "php": ">=7.0" @@ -805,7 +805,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "57f31e760aaa9e9cb1b77d6981106b545d1c1b6d" + "reference": "52116b79739871bcafe36d20a2b1b04ac3e1a711" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -877,7 +877,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "bbac55dcb335e2159b5011dddb82c188ebf8953e" + "reference": "7d56fc504e0a830a5a11f3ba212000dda9e30fda" }, "require": { "php": ">=7.0" @@ -927,7 +927,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "3953ee1173fd03afa5ff785a8aeae318046111d3" + "reference": "2b77cf75a7bf6522b781c450ae419ff48cdb5f72" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -1006,7 +1006,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "3903fccd0217c04725468677fd1b507a1d90dc56" + "reference": "f030c2f27d0d9c866f7e756f0ca0778340652c7a" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -1018,7 +1018,7 @@ "automattic/jetpack-google-analytics": "^0.2.4", "automattic/jetpack-masterbar": "^0.9.6", "automattic/jetpack-redirect": "^2.0.4", - "automattic/jetpack-stats-admin": "^0.22.3", + "automattic/jetpack-stats-admin": "^0.22.4-alpha", "automattic/jetpack-status": "^4.0.2", "automattic/scheduled-updates": "^0.13.4", "php": ">=7.0", @@ -1086,7 +1086,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "112e84f1d48c973b3a4bfb25ea9bc2f3947989b3" + "reference": "d6ba7e6d51e2a52c21cde667ab481d5263eeed09" }, "require": { "php": ">=7.0" @@ -1144,7 +1144,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "8f391490eb19e98a07630bb0a996b582db695774" + "reference": "21be11b230ffc7d10ee0e744d5468202746f39f8" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1209,7 +1209,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "57744169a401e80d6ffc54f766ccd99b5a42ef67" + "reference": "533bab8bc1d9846e919f886f1cec045235e30bc3" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -1261,7 +1261,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "7b3da3f8c9ab83a210c3bfd587407a844a6cdb27" + "reference": "3dc40337af205d765072430a693f6ed50b29de5b" }, "require": { "php": ">=7.0" @@ -1312,7 +1312,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "53035a38a6bd4366debf7664f0715e9cc508206a" + "reference": "973e69fb3e0ef1b18177530a0ad069bb4a1ceeb2" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1372,11 +1372,11 @@ }, { "name": "automattic/jetpack-stats-admin", - "version": "0.22.3", + "version": "0.22.4-alpha.1729744775", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "a8531b40b5ecfa6ed942aed99a4f4f9fbbc538f0" + "reference": "40e8d8fc497b40c7e40210cc81f15c725518667b" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1446,7 +1446,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "6d8462707304ee62155d72dd06d8f96192ef2a09" + "reference": "c5ee672d9662471fdf4b4d42b708dce3c6bb7ff4" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -1507,7 +1507,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "a59ce7fd3fe96a100c5100d7026a8fbc7d2422a2" + "reference": "01842b965bddc06c9cd0fef55beeb0c1ef81cdf6" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1582,7 +1582,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "c7c5c9a5bace7331ea534603f99393a8dfb4f892" + "reference": "89ad76e15c2da617a17d9bbad87ef25f4caa09f7" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1731,7 +1731,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "e498540f6426442a6ca9d37e61e7398a3b182f20" + "reference": "6abd7b11d474663d43ace8ebf59c0bb150ac5167" }, "require": { "php": ">=7.0", diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json index 167c8180..4b133ae3 100644 --- a/vendor/automattic/jetpack-mu-wpcom/composer.json +++ b/vendor/automattic/jetpack-mu-wpcom/composer.json @@ -12,7 +12,7 @@ "automattic/jetpack-connection": "^5.1.4", "automattic/jetpack-masterbar": "^0.9.6", "automattic/jetpack-redirect": "^2.0.4", - "automattic/jetpack-stats-admin": "^0.22.3", + "automattic/jetpack-stats-admin": "^0.22.4-alpha", "automattic/jetpack-status": "^4.0.2", "automattic/scheduled-updates": "^0.13.4", "automattic/jetpack-compat": "^3.0.2", diff --git a/vendor/automattic/jetpack-stats-admin/CHANGELOG.md b/vendor/automattic/jetpack-stats-admin/CHANGELOG.md index fc9c6b47..883dbd34 100644 --- a/vendor/automattic/jetpack-stats-admin/CHANGELOG.md +++ b/vendor/automattic/jetpack-stats-admin/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.22.4-alpha - unreleased + +This is an alpha version! The changes listed here are not final. + +### Changed +- Odyssey Stats cache busting: use optioin instead of transient + ## 0.22.3 - 2024-10-21 ### Changed - JITM: Expose function to render message. [#39714] diff --git a/vendor/automattic/jetpack-stats-admin/src/class-main.php b/vendor/automattic/jetpack-stats-admin/src/class-main.php index 34c931bd..c551eff3 100644 --- a/vendor/automattic/jetpack-stats-admin/src/class-main.php +++ b/vendor/automattic/jetpack-stats-admin/src/class-main.php @@ -22,7 +22,7 @@ class Main { /** * Stats version. */ - const VERSION = '0.22.3'; + const VERSION = '0.22.4-alpha'; /** * Singleton Main instance. diff --git a/vendor/automattic/jetpack-stats-admin/src/class-odyssey-assets.php b/vendor/automattic/jetpack-stats-admin/src/class-odyssey-assets.php index 8117e650..98d59fc3 100644 --- a/vendor/automattic/jetpack-stats-admin/src/class-odyssey-assets.php +++ b/vendor/automattic/jetpack-stats-admin/src/class-odyssey-assets.php @@ -75,36 +75,58 @@ public function load_admin_scripts( $asset_handle, $asset_name, $options = array /** * Returns cache buster string for assets. * Development mode doesn't need this, as it's handled by `Assets` class. + * + * @return string */ protected function get_cdn_asset_cache_buster() { + $now_in_ms = floor( microtime( true ) * 1000 ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended if ( isset( $_GET['force_refresh'] ) ) { - set_transient( self::ODYSSEY_STATS_CACHE_BUSTER_CACHE_KEY, floor( microtime( true ) * 1000 ), 15 * MINUTE_IN_SECONDS ); + update_option( self::ODYSSEY_STATS_CACHE_BUSTER_CACHE_KEY, $this->get_cache_buster_option_value( $now_in_ms ), false ); } // Use cached cache buster in production. - $remote_asset_version = get_transient( self::ODYSSEY_STATS_CACHE_BUSTER_CACHE_KEY ); + $remote_asset_version = get_option( self::ODYSSEY_STATS_CACHE_BUSTER_CACHE_KEY ); if ( ! empty( $remote_asset_version ) ) { - return $remote_asset_version; + $remote_asset_version = json_decode( $remote_asset_version, true ); + // If cache buster is cached and not expired (valid in 15 min), return it. + if ( ! empty( $remote_asset_version['cache_buster'] ) && $remote_asset_version['cached_at'] > $now_in_ms - MINUTE_IN_SECONDS * 1000 * 15 ) { + return $remote_asset_version['cache_buster']; + } } // If no cached cache buster, we fetch it from CDN and set to transient. - $response = wp_remote_get( sprintf( self::ODYSSEY_CDN_URL, self::ODYSSEY_STATS_VERSION, 'build_meta.json?t=' . time() ), array( 'timeout' => 5 ) ); + $response = wp_remote_get( sprintf( self::ODYSSEY_CDN_URL, self::ODYSSEY_STATS_VERSION, 'build_meta.json?t=' . $now_in_ms ), array( 'timeout' => 5 ) ); if ( is_wp_error( $response ) ) { - // fallback to the package version. - return Main::VERSION; + // fallback to current timestamp. + return (string) $now_in_ms; } $build_meta = json_decode( wp_remote_retrieve_body( $response ), true ); if ( ! empty( $build_meta['cache_buster'] ) ) { // Cache the cache buster for 15 mins. - set_transient( self::ODYSSEY_STATS_CACHE_BUSTER_CACHE_KEY, $build_meta['cache_buster'], 15 * MINUTE_IN_SECONDS ); + update_option( self::ODYSSEY_STATS_CACHE_BUSTER_CACHE_KEY, $this->get_cache_buster_option_value( $build_meta['cache_buster'] ), false ); return $build_meta['cache_buster']; } - // fallback to the package version. - return Main::VERSION; + // fallback to current timestamp. + return (string) $now_in_ms; + } + + /** + * Get the cache buster option value. + * + * @param string|int|float $cache_buster The cache buster. + * @return string|false + */ + protected function get_cache_buster_option_value( $cache_buster ) { + return wp_json_encode( + array( + 'cache_buster' => (string) $cache_buster, + 'cached_at' => floor( microtime( true ) * 1000 ), // milliseconds. + ) + ); } } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 37c1fbb7..15be136f 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": "579f79084de88cc534b4148e27c1781c1d88ffe2" + "reference": "08d88a48ab7614a77effeb7d118716443743607a" }, "require": { "php": ">=7.0" @@ -60,7 +60,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "74979ce39dcd3c4191bba1cee21e2695ca602ae5" + "reference": "797e1787655a1c637f3af0ec54d1281df6add40b" }, "require": { "php": ">=7.0" @@ -125,7 +125,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "1d28bfa5f633a1afbd45065f3208df0aebabaa50" + "reference": "0e07dac25886bdc4b24c68fc6d4338877e3db54c" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -194,7 +194,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "a182e573b2777e46dabdff493cff2e3aa10e37cf" + "reference": "3e9873c65894319a660c7e0e65cbb01d09cb5c2e" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -275,7 +275,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "2ddcb6fe364c0408fb5becb0e89ceb434a56a7eb" + "reference": "a7dd39d8a1d9fa05fa6d87f2325075ab020a19dc" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -337,7 +337,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "ee626bdb401b8ab255e6b3a4c92e4a2bc278807e" + "reference": "7e44e11ef8afa04b897cb495324d113535b1149f" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -402,7 +402,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "72425151806acdace5a6f6fbc04f510056bca3c1" + "reference": "ebdb3899b678acd57dad708509d77c494616dc80" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -473,7 +473,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "c24f2bd53436af4d5763a7e07b97ab9abec1ea90" + "reference": "269f0e2332e9df801a7d2af51bdb71f3c49e921d" }, "require": { "php": ">=7.0" @@ -513,7 +513,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "fb2eb68e8b5a823cab8634940d6d2526931c523e" + "reference": "5063c221ce0c83288be6d4fa3ee4f2c7e3478f41" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -603,7 +603,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "432f01c8b06c8e8bf31dcbf50fda2f444019487f" + "reference": "e6b84cace09b0847e1e709d4a55f60dc81537a19" }, "require": { "php": ">=7.0" @@ -657,7 +657,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "f06ab1f2c48b4efa75eb766604789f94c93c9230" + "reference": "c6e71c6bbd472fb0e50cff82f25c17e2b3da5942" }, "require": { "php": ">=7.0" @@ -710,7 +710,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "055d20f8b87a854289925a4908618813d42982ae" + "reference": "e8e78f15b58df7e3e2f7936cdb9528d48a8cf6b4" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -781,7 +781,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "26217ec2683de198d53713ac06a0de4c7cf7a86a" + "reference": "5a86ba34d27bfc8c5a17e8d57a47b7804f405749" }, "require": { "php": ">=7.0" @@ -839,7 +839,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "57f31e760aaa9e9cb1b77d6981106b545d1c1b6d" + "reference": "52116b79739871bcafe36d20a2b1b04ac3e1a711" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.3", @@ -914,7 +914,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "bbac55dcb335e2159b5011dddb82c188ebf8953e" + "reference": "7d56fc504e0a830a5a11f3ba212000dda9e30fda" }, "require": { "php": ">=7.0" @@ -967,7 +967,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "3953ee1173fd03afa5ff785a8aeae318046111d3" + "reference": "2b77cf75a7bf6522b781c450ae419ff48cdb5f72" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -1049,7 +1049,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "3903fccd0217c04725468677fd1b507a1d90dc56" + "reference": "f030c2f27d0d9c866f7e756f0ca0778340652c7a" }, "require": { "automattic/jetpack-assets": "^2.3.10", @@ -1061,7 +1061,7 @@ "automattic/jetpack-google-analytics": "^0.2.4", "automattic/jetpack-masterbar": "^0.9.6", "automattic/jetpack-redirect": "^2.0.4", - "automattic/jetpack-stats-admin": "^0.22.3", + "automattic/jetpack-stats-admin": "^0.22.4-alpha", "automattic/jetpack-status": "^4.0.2", "automattic/scheduled-updates": "^0.13.4", "php": ">=7.0", @@ -1132,7 +1132,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "112e84f1d48c973b3a4bfb25ea9bc2f3947989b3" + "reference": "d6ba7e6d51e2a52c21cde667ab481d5263eeed09" }, "require": { "php": ">=7.0" @@ -1193,7 +1193,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "8f391490eb19e98a07630bb0a996b582db695774" + "reference": "21be11b230ffc7d10ee0e744d5468202746f39f8" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1261,7 +1261,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "57744169a401e80d6ffc54f766ccd99b5a42ef67" + "reference": "533bab8bc1d9846e919f886f1cec045235e30bc3" }, "require": { "automattic/jetpack-status": "^4.0.2", @@ -1316,7 +1316,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "7b3da3f8c9ab83a210c3bfd587407a844a6cdb27" + "reference": "3dc40337af205d765072430a693f6ed50b29de5b" }, "require": { "php": ">=7.0" @@ -1370,7 +1370,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "53035a38a6bd4366debf7664f0715e9cc508206a" + "reference": "973e69fb3e0ef1b18177530a0ad069bb4a1ceeb2" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1432,12 +1432,12 @@ }, { "name": "automattic/jetpack-stats-admin", - "version": "0.22.3", - "version_normalized": "0.22.3.0", + "version": "0.22.4-alpha.1729744775", + "version_normalized": "0.22.4.0-alpha1729744775", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "a8531b40b5ecfa6ed942aed99a4f4f9fbbc538f0" + "reference": "40e8d8fc497b40c7e40210cc81f15c725518667b" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1510,7 +1510,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "6d8462707304ee62155d72dd06d8f96192ef2a09" + "reference": "c5ee672d9662471fdf4b4d42b708dce3c6bb7ff4" }, "require": { "automattic/jetpack-constants": "^2.0.4", @@ -1574,7 +1574,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "a59ce7fd3fe96a100c5100d7026a8fbc7d2422a2" + "reference": "01842b965bddc06c9cd0fef55beeb0c1ef81cdf6" }, "require": { "automattic/jetpack-connection": "^5.1.4", @@ -1652,7 +1652,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "c7c5c9a5bace7331ea534603f99393a8dfb4f892" + "reference": "89ad76e15c2da617a17d9bbad87ef25f4caa09f7" }, "require": { "automattic/jetpack-connection": "^5.1.4", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index e67645c1..8eebf7e2 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' => '579f79084de88cc534b4148e27c1781c1d88ffe2', + 'reference' => '08d88a48ab7614a77effeb7d118716443743607a', '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' => '74979ce39dcd3c4191bba1cee21e2695ca602ae5', + 'reference' => '797e1787655a1c637f3af0ec54d1281df6add40b', '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' => '1d28bfa5f633a1afbd45065f3208df0aebabaa50', + 'reference' => '0e07dac25886bdc4b24c68fc6d4338877e3db54c', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-assets', 'aliases' => array(), @@ -40,7 +40,7 @@ 'automattic/jetpack-blaze' => array( 'pretty_version' => '0.23.2', 'version' => '0.23.2.0', - 'reference' => 'a182e573b2777e46dabdff493cff2e3aa10e37cf', + 'reference' => '3e9873c65894319a660c7e0e65cbb01d09cb5c2e', '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' => '2ddcb6fe364c0408fb5becb0e89ceb434a56a7eb', + 'reference' => 'a7dd39d8a1d9fa05fa6d87f2325075ab020a19dc', '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' => 'ee626bdb401b8ab255e6b3a4c92e4a2bc278807e', + 'reference' => '7e44e11ef8afa04b897cb495324d113535b1149f', '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' => '72425151806acdace5a6f6fbc04f510056bca3c1', + 'reference' => 'ebdb3899b678acd57dad708509d77c494616dc80', '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' => 'c24f2bd53436af4d5763a7e07b97ab9abec1ea90', + 'reference' => '269f0e2332e9df801a7d2af51bdb71f3c49e921d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-compat', 'aliases' => array(), @@ -85,7 +85,7 @@ 'automattic/jetpack-connection' => array( 'pretty_version' => '5.1.4', 'version' => '5.1.4.0', - 'reference' => 'fb2eb68e8b5a823cab8634940d6d2526931c523e', + 'reference' => '5063c221ce0c83288be6d4fa3ee4f2c7e3478f41', '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' => '432f01c8b06c8e8bf31dcbf50fda2f444019487f', + 'reference' => 'e6b84cace09b0847e1e709d4a55f60dc81537a19', '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' => 'f06ab1f2c48b4efa75eb766604789f94c93c9230', + 'reference' => 'c6e71c6bbd472fb0e50cff82f25c17e2b3da5942', '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' => '055d20f8b87a854289925a4908618813d42982ae', + 'reference' => 'e8e78f15b58df7e3e2f7936cdb9528d48a8cf6b4', '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' => '26217ec2683de198d53713ac06a0de4c7cf7a86a', + 'reference' => '5a86ba34d27bfc8c5a17e8d57a47b7804f405749', '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' => '57f31e760aaa9e9cb1b77d6981106b545d1c1b6d', + 'reference' => '52116b79739871bcafe36d20a2b1b04ac3e1a711', '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' => 'bbac55dcb335e2159b5011dddb82c188ebf8953e', + 'reference' => '7d56fc504e0a830a5a11f3ba212000dda9e30fda', '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' => '3953ee1173fd03afa5ff785a8aeae318046111d3', + 'reference' => '2b77cf75a7bf6522b781c450ae419ff48cdb5f72', '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.1729519743', 'version' => '5.65.0.0-alpha1729519743', - 'reference' => '3903fccd0217c04725468677fd1b507a1d90dc56', + 'reference' => 'f030c2f27d0d9c866f7e756f0ca0778340652c7a', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(), @@ -175,7 +175,7 @@ 'automattic/jetpack-password-checker' => array( 'pretty_version' => '0.3.2', 'version' => '0.3.2.0', - 'reference' => '112e84f1d48c973b3a4bfb25ea9bc2f3947989b3', + 'reference' => 'd6ba7e6d51e2a52c21cde667ab481d5263eeed09', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-password-checker', 'aliases' => array(), @@ -184,7 +184,7 @@ 'automattic/jetpack-plans' => array( 'pretty_version' => '0.4.12', 'version' => '0.4.12.0', - 'reference' => '8f391490eb19e98a07630bb0a996b582db695774', + 'reference' => '21be11b230ffc7d10ee0e744d5468202746f39f8', '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' => '57744169a401e80d6ffc54f766ccd99b5a42ef67', + 'reference' => '533bab8bc1d9846e919f886f1cec045235e30bc3', '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' => '7b3da3f8c9ab83a210c3bfd587407a844a6cdb27', + 'reference' => '3dc40337af205d765072430a693f6ed50b29de5b', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-roles', 'aliases' => array(), @@ -211,16 +211,16 @@ 'automattic/jetpack-stats' => array( 'pretty_version' => '0.13.3', 'version' => '0.13.3.0', - 'reference' => '53035a38a6bd4366debf7664f0715e9cc508206a', + 'reference' => '973e69fb3e0ef1b18177530a0ad069bb4a1ceeb2', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-stats-admin' => array( - 'pretty_version' => '0.22.3', - 'version' => '0.22.3.0', - 'reference' => 'a8531b40b5ecfa6ed942aed99a4f4f9fbbc538f0', + 'pretty_version' => '0.22.4-alpha.1729744775', + 'version' => '0.22.4.0-alpha1729744775', + 'reference' => '40e8d8fc497b40c7e40210cc81f15c725518667b', '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' => '6d8462707304ee62155d72dd06d8f96192ef2a09', + 'reference' => 'c5ee672d9662471fdf4b4d42b708dce3c6bb7ff4', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-status', 'aliases' => array(), @@ -238,7 +238,7 @@ 'automattic/jetpack-sync' => array( 'pretty_version' => '3.14.3-alpha.1729575501', 'version' => '3.14.3.0-alpha1729575501', - 'reference' => 'a59ce7fd3fe96a100c5100d7026a8fbc7d2422a2', + 'reference' => '01842b965bddc06c9cd0fef55beeb0c1ef81cdf6', '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' => 'c7c5c9a5bace7331ea534603f99393a8dfb4f892', + 'reference' => '89ad76e15c2da617a17d9bbad87ef25f4caa09f7', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/scheduled-updates', 'aliases' => array(),