Fix connection assets for WPCOM Simple sites (#39201)

* Fix connection assets for WPCOM Simple sites * Fix up versions Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10683693638 Upstream-Ref: Automattic/jetpack@3bef458
Automattic · Sep 3, 2024 · 2417045 · 2417045
1 parent 0c30661
commit 2417045
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 110 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
@@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
 ### Changed
 - Updated connection js to load its bundle via connection package
 
+### Fixed
+- Fixed connection assets for wpcom simple sites
+
 ## [2.12.5] - 2024-08-29
 ### Changed
 - Sync: Remove the checksum for active plugins if present when sync is not active, so it gets recalculated when sync gets activated [#39098]

diff --git a/jetpack_vendor/automattic/jetpack-connection/actions.php b/jetpack_vendor/automattic/jetpack-connection/actions.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Action Hooks for Jetpack connection assets.
+ *
+ * @package automattic/jetpack-connection
+ */
+
+// If WordPress's plugin API is available already, use it. If not,
+// drop data into `$wp_filter` for `WP_Hook::build_preinitialized_hooks()`.
+if ( function_exists( 'add_action' ) ) {
+	add_action(
+		'plugins_loaded',
+		array( Automattic\Jetpack\Connection\Connection_Assets::class, 'configure' ),
+		1
+	);
+} else {
+	global $wp_filter;
+	// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+	$wp_filter['plugins_loaded'][1][] = array(
+		'accepted_args' => 0,
+		'function'      => array( Automattic\Jetpack\Connection\Connection_Assets::class, 'configure' ),
+	);
+}
diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -23,6 +23,9 @@
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
 	},
 	"autoload": {
+		"files": [
+			"actions.php"
+		],
 		"classmap": [
 			"legacy",
 			"src/",

diff --git a/jetpack_vendor/automattic/jetpack-connection/src/class-manager.php b/jetpack_vendor/automattic/jetpack-connection/src/class-manager.php
@@ -155,8 +155,6 @@ public static function configure() {
 
 		// Initial Partner management.
 		Partner::init();
-
-		Connection_Assets::configure();
 	}
 
 	/**

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -26,7 +26,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '2.13.0-alpha1725337798',
+      'ver' => '2.13.0-alpha1725369288',
     ),
     'jetpack-explat' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-explat',

diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
@@ -7,4 +7,5 @@
 
 return array(
     '3773ef3f09c37da5478d578e32b03a4b' => $baseDir . '/jetpack_vendor/automattic/jetpack-assets/actions.php',
+    '7372b7fb88a9723cf5b76d456eb0b738' => $baseDir . '/jetpack_vendor/automattic/jetpack-connection/actions.php',
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -8,6 +8,7 @@ class ComposerStaticInitb462338fb66be23595d68a93345c9e3d_jetpack_searchⓥ3_0_0_
 {
     public static $files = array (
         '3773ef3f09c37da5478d578e32b03a4b' => __DIR__ . '/../..' . '/jetpack_vendor/automattic/jetpack-assets/actions.php',
+        '7372b7fb88a9723cf5b76d456eb0b738' => __DIR__ . '/../..' . '/jetpack_vendor/automattic/jetpack-connection/actions.php',
     );
 
     public static $prefixLengthsPsr4 = array (

diff --git 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": "12c84b7d01a25e96e315f8209f9713a91f608dfd"
+                "reference": "8a00d16639fae8637bcc835dae7735b4eb0eb657"
             },
             "require": {
                 "php": ">=7.0"
@@ -60,7 +60,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "4e7985c79ac68d7b817da7e2bb43e7a662ed19a3"
+                "reference": "f92cb115704bee6cf4a57a3e3452100ab40a7cfc"
             },
             "require": {
                 "php": ">=7.0"
@@ -125,7 +125,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "03ed082a6b99c8fa5204f9d5c6f5a5847d4ddfbe"
+                "reference": "69a69f23b8a0dad6755126af5682e6ce5c5cbcab"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.4",
@@ -194,7 +194,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "2d9b5ac394bd86ff768de43538a770b485c5df2a"
+                "reference": "5f47f9c5ced07be35a027e8d6dce7f9c087e3141"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0",
@@ -261,7 +261,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
-                "reference": "5c492aae5248558ca802f4b042693e9d1ac2e5b4"
+                "reference": "a4791350935f433c069d310fd6ffebcbd1b37a46"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.13.0-alpha",
@@ -329,7 +329,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
-                "reference": "71f63199a1a2f33f7b60b5d22cc3bd7391cf0b13"
+                "reference": "0671d85a67044d2ad978d2500c974b9886f65539"
             },
             "require": {
                 "automattic/jetpack-boost-core": "^0.2.9",
@@ -405,7 +405,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "0df9d5731a45edf22a37f8756c852f427fbf4c71"
+                "reference": "678a2c1dbe76f52a04c2c647e53aad7518cdbbc4"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0",
@@ -465,7 +465,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "203c775127d23dc63bfb9d54ba283e12424b5078"
+                "reference": "fe17d636400738514cbbedec274f3e098b0bbdb0"
             },
             "require": {
                 "php": ">=7.0"
@@ -535,12 +535,12 @@
         },
         {
             "name": "automattic/jetpack-connection",
-            "version": "2.13.0-alpha.1725337798",
-            "version_normalized": "2.13.0.0-alpha1725337798",
+            "version": "2.13.0-alpha.1725369288",
+            "version_normalized": "2.13.0.0-alpha1725369288",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "5909d7a40e94253c0219081f0cecde575e1053b9"
+                "reference": "200288f0ee642a800762a0a05913fbdeb4c0a589"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.2",
@@ -584,6 +584,9 @@
             },
             "installation-source": "dist",
             "autoload": {
+                "files": [
+                    "actions.php"
+                ],
                 "classmap": [
                     "legacy",
                     "src/",
@@ -627,7 +630,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "0084dd7b7bce80dd6f7f4759db551ba96ed13e2c"
+                "reference": "d4d4ffd666982ea1e3c0233276b2e88fe9eed1d5"
             },
             "require": {
                 "php": ">=7.0"
@@ -681,7 +684,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "497c8aeb8ca5d8c8eae76248279af17b6a72da24"
+                "reference": "63aaf9b650144f2ccc8d04c338b24afab0c9e1ad"
             },
             "require": {
                 "php": ">=7.0"
@@ -734,7 +737,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-explat",
-                "reference": "a630ce7bb97c7826bbbbe51eee59557e3d00d5e8"
+                "reference": "3f3de71209c3787b9b9d62c1ab0fcfbef0da682e"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.13.0-alpha",
@@ -809,7 +812,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "bf329b0c1f1826416d22dd28b3a4d6c3237b6f41"
+                "reference": "014537090e6126f3e852ad2c884f7906a271eda0"
             },
             "require": {
                 "php": ">=7.0"
@@ -867,7 +870,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "3a58b9ffcf45ad335a38fcd24b198389522b71b5"
+                "reference": "6396cc84b1a94b8bd7a4679ac272e31eef218251"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.2",
@@ -942,7 +945,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "3bafff31d69feba66978622c5fd29ee676df3ce0"
+                "reference": "1713955c13bb8c57b02d8a28792fe08011a42b72"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.13.0-alpha",
@@ -1004,7 +1007,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "dc66ef48331a69dfa43f9d78cf66710b94ebaee5"
+                "reference": "27aacedf2632caefa2231d381872c826ed9a9a65"
             },
             "require": {
                 "php": ">=7.0"
@@ -1057,7 +1060,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "f4d19bfd807f8dbd1e5725782ef267250c26b6a7"
+                "reference": "14c1f6f2c83d05592ce52086255a1494fa2d1db2"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.4.4",
@@ -1159,7 +1162,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "8f89a94cbbab7a300539bf9d4ff30764de59f174"
+                "reference": "00771b8aa7692a0470d5998f33f058d264aefb1b"
             },
             "require": {
                 "php": ">=7.0"
@@ -1220,7 +1223,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "74e4448ca1830bc4374f0df95edfcc35e5e8b983"
+                "reference": "4ea84e97f90e1a18b447672e284d94ee627f198f"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.13.0-alpha",
@@ -1288,7 +1291,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "9daaeeb8aafee9a59a4d8a3e5d80f198d9304c53"
+                "reference": "1f0c225341bf0dba49a33c6d7fd56751d458f655"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.2",
@@ -1344,7 +1347,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
-                "reference": "298e50e7c97de77002a82e18f19160dfb25cc90d"
+                "reference": "47ddaef9c86bebdd514b3015078c6e5617be6ad2"
             },
             "require": {
                 "php": ">=7.0"
@@ -1414,7 +1417,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
-                "reference": "1305a24ca81e9ad319edb38ad7905516cdb29d75"
+                "reference": "dc6d36ef5a38e8b771c0d8ff7bb38eb4f8636780"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.13.0-alpha",
@@ -1489,7 +1492,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "41dcac3cdc5293267d996c28f8bb85881f0f46b1"
+                "reference": "f43045f47b0fd8d5ca1fc4f95e89f69714915f76"
             },
             "require": {
                 "automattic/jetpack-status": "^3.3.4",
@@ -1544,7 +1547,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "3a322aa82f1d8cc1c58992a93038b1bfaef9eaa3"
+                "reference": "95672074f209872f306308d151ac12e1e61740c4"
             },
             "require": {
                 "php": ">=7.0"
@@ -1598,7 +1601,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-search",
-                "reference": "2d6887de4818c56b17daa45288905ded6de2bc31"
+                "reference": "810a07f14894ee5683be8cbef1197b462fb9afa2"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.3.5",
@@ -1686,7 +1689,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats",
-                "reference": "8c9d987cf27623e82dd819eb0948eff079fb6dd5"
+                "reference": "cddce205fd9d8ebf2c380e84e8b3e688376005aa"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.13.0-alpha",
@@ -1753,7 +1756,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "b79427070553ec4934c4279ca30481b6dda3e2da"
+                "reference": "05b3bdcfa0986670e0d151d933bf819db2b28b58"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.4",
@@ -1817,7 +1820,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "8e33dbe8eff6bff4cd052b7f64031c3061085368"
+                "reference": "4da02821da3af25dce337d49e06d4ae5364edacc"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.13.0-alpha",
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,8 +155,6 @@ public static function configure() { @@
     		// Initial Partner management.
     		Partner::init();
-    		Connection_Assets::configure();
     	}
     	/**
@@ Expand Down @@