Fix/bug with critical error when main jetpack plugin not installed (#…

…41192) * Fix critical error on standalones when Jetpack is not installed * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12890909920 Upstream-Ref: Automattic/jetpack@ad9b2bc
Automattic · Jan 21, 2025 · 40e6194 · 40e6194
1 parent 94dbc61
commit 40e6194
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 100 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
 ### Added
 - Adding new modal based interstitial component.
 
+### Fixed
+- Fix bug where My Jetpack would throw critical error if only a standalone plugin is not installed
+
 ## [5.3.3] - 2025-01-20
 ### Added
 - Add caching for the red bubble alerts for My Jetpack. [#41131]

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php b/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php
@@ -240,6 +240,13 @@ public static function enqueue_scripts() {
 		$waf_config    = array();
 		$waf_supported = false;
 
+		$sandboxed_domain = '';
+		$is_dev_version   = false;
+		if ( class_exists( 'Jetpack' ) ) {
+			$is_dev_version   = Jetpack::is_development_version();
+			$sandboxed_domain = defined( 'JETPACK__SANDBOX_DOMAIN' ) ? JETPACK__SANDBOX_DOMAIN : '';
+		}
+
 		if ( class_exists( 'Automattic\Jetpack\Waf\Waf_Runner' ) ) {
 			$waf_config    = Waf_Runner::get_config();
 			$waf_supported = Waf_Runner::is_supported_environment();
@@ -292,8 +299,8 @@ public static function enqueue_scripts() {
 				'isStatsModuleActive'    => $modules->is_active( 'stats' ),
 				'isUserFromKnownHost'    => self::is_user_from_known_host(),
 				'isCommercial'           => self::is_commercial_site(),
-				'sandboxedDomain'        => JETPACK__SANDBOX_DOMAIN,
-				'isDevVersion'           => Jetpack::is_development_version(),
+				'sandboxedDomain'        => $sandboxed_domain,
+				'isDevVersion'           => $is_dev_version,
 				'isAtomic'               => ( new Status_Host() )->is_woa_site(),
 				'jetpackManage'          => array(
 					'isEnabled'       => Jetpack_Manage::could_use_jp_manage(),

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -46,7 +46,7 @@
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '5.4.0-alpha1737416369',
+      'ver' => '5.4.0-alpha1737475385',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

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": "68f88c864312cb01c8cdccaf0bcd45e729d5f5de"
+                "reference": "a3afa6f12f95166db90b8d78b748a73d4771d4f6"
             },
             "require": {
                 "php": ">=7.2"
@@ -63,7 +63,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "842ea4df4db7cce96d62211199eef4ad7e46470b"
+                "reference": "6f71d39bdd5f3e181c22b0b5cede9a0d365fd872"
             },
             "require": {
                 "php": ">=7.2"
@@ -131,7 +131,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "b269f20e64610b51fd7797d7129c774d12e6d3a2"
+                "reference": "6d10c5d404b745acd60bdddef88b71acb619380e"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -203,7 +203,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "089c76b9eac5dff4e4046ba82be0240c7969450f"
+                "reference": "2597b667da08b4667ada7f7893c5dfea2b978c57"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -274,7 +274,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-backup-helper-script-manager",
-                "reference": "6df21a5427e1d80bbb582321c4e666820b6081da"
+                "reference": "30122c22997b45757b8bd34562f435ffe2ecf06e"
             },
             "require": {
                 "php": ">=7.2"
@@ -337,7 +337,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
-                "reference": "207c93a99ff2d435758bd442458fce20c1e1ed86"
+                "reference": "fc51bcb19ec72ef73f63416d61b237bf3b3d0abc"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0",
@@ -408,7 +408,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
-                "reference": "bed8137f10ce621626890dfc4fe1f47247dda893"
+                "reference": "bfcf9b2b21b6317fe12b4ba7f2f025839b57544c"
             },
             "require": {
                 "automattic/jetpack-boost-core": "^0.3.3",
@@ -487,7 +487,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "7272ae0c23c427ed08d67e9469da57b4852de18e"
+                "reference": "aba461aec69b77296a6a105824f2a45e990288d8"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -550,7 +550,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "3c777963579f410baeb8e989adcf70a0f1eda1b1"
+                "reference": "3bd38cca153793ebe0cfe42bcedc3baf9d54e737"
             },
             "require": {
                 "php": ">=7.2"
@@ -625,7 +625,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "5a457de45bed3224be678e6559816615281bf6b1"
+                "reference": "776893ab24ea4ed962415b1aff33d9c7579371c3"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -718,7 +718,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "0523386aeceaed34dc4b9bace311974cf52fd7ca"
+                "reference": "81e2f150b9384e985ed3ec707010fc57450b7a8c"
             },
             "require": {
                 "php": ">=7.2"
@@ -775,7 +775,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "b79ed9dd5916db7658f52156ffa1e75b630ffbc6"
+                "reference": "61a9c177166bd644651ae7fa03edfa7e7c7d4477"
             },
             "require": {
                 "php": ">=7.2"
@@ -831,7 +831,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-explat",
-                "reference": "16f9f888725a5bb8edf7e7027554713e54c5898f"
+                "reference": "92caa6847b50da172198666d4fd3091243fdc8ff"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0",
@@ -909,7 +909,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "090237f39fa9e33378151f33e90a17374eff4d02"
+                "reference": "f3bdb2bc945fe537c51d717122fd68cd8fb6c437"
             },
             "require": {
                 "php": ">=7.2"
@@ -970,7 +970,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "0202fa5230211022d3c810696adbd478a07b2e40"
+                "reference": "40d09788152699c81460ae121dcfd39066422ea5"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1048,7 +1048,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "d0f82677f2063bdb3e196323cb6dcec0e9c550fe"
+                "reference": "40255ef6d06aeaf48e0d5d1d67a8dab231f83224"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0",
@@ -1113,7 +1113,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "fb1c099a5cb3801131e8ab8c698ec1c28893b87a"
+                "reference": "323f5cad1bc03aa5acc8184fabd8943a82a2f54c"
             },
             "require": {
                 "php": ">=7.2"
@@ -1164,12 +1164,12 @@
         },
         {
             "name": "automattic/jetpack-my-jetpack",
-            "version": "5.4.0-alpha.1737416369",
-            "version_normalized": "5.4.0.0-alpha1737416369",
+            "version": "5.4.0-alpha.1737475385",
+            "version_normalized": "5.4.0.0-alpha1737475385",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "8ca668479e96809f3a4e4cbe25cbf57acee0a950"
+                "reference": "cc33ad28575cad763873dab4c4b4fe227573b5a7"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.5.1",
@@ -1274,7 +1274,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "75010aa1ad1e94933deb26544901c6e0f7d835f7"
+                "reference": "c535bddf1b34ac8d319e8cd4ab3de89beb1a2147"
             },
             "require": {
                 "php": ">=7.2"
@@ -1338,7 +1338,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "8affe0afa65bf7713f3975cb5fb14ebfcabdb91a"
+                "reference": "07ce6cdfbf1c14a5c9083b4e61407b642c359b4f"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0",
@@ -1409,7 +1409,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "22b9e5e6267d05569840339c525428d27dadffd1"
+                "reference": "3f845fcd2651d9af6d0ccd8768ed8ce97ecca1e7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1468,7 +1468,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
-                "reference": "7b412bb1775b795d6d6aab0352a8c5f4bcfb7afe"
+                "reference": "a1d365d01711d772de6c45938596f2ab7ee4857b"
             },
             "require": {
                 "php": ">=7.2"
@@ -1541,7 +1541,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
-                "reference": "33c066c0d93331e66aac3697bb2a03280551fa38"
+                "reference": "f896a50f9839edd296880a761927503ed61a1b45"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0",
@@ -1619,7 +1619,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "577fa69b70633ae83f2aa10f6d459d0f864e748d"
+                "reference": "db2eefefea68ad9f7677328c7c750e896d21200f"
             },
             "require": {
                 "automattic/jetpack-status": "^5.0.2",
@@ -1677,7 +1677,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "33e33bd591cbfd18e2aaa44f16376c8b422db42c"
+                "reference": "bc8210b9bec542be153d7542f7f6c7f98001f8e0"
             },
             "require": {
                 "php": ">=7.2"
@@ -1734,7 +1734,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "3fb16c4416488bc31fa006057ae542e688ed0d74"
+                "reference": "77be92f0bd7d491c819de8a3a5ef13b418bfdf00"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -1801,7 +1801,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "e37d010da729decaae018b3e11298a057a952290"
+                "reference": "be2b9123782d7d0b80c96ae5f3d4d777ac36326c"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0",
@@ -1882,7 +1882,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-transport-helper",
-                "reference": "c314b77067a16b557a6e971a92db316aa5d89979"
+                "reference": "1d24d130d4d7ac4f54c6776393576eff4a5e6c9e"
             },
             "require": {
                 "automattic/jetpack-backup-helper-script-manager": "^0.3.1",
@@ -1960,7 +1960,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-waf",
-                "reference": "d828d7cc89a712b1e6815cbb70a54f83f61bd301"
+                "reference": "c2e554080d23b01df91d3e48886dfe4473cc22fb"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.3.0",