My Jetpack: Use Jetpack Modules (#33523)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6467010143
Automattic · Oct 10, 2023 · 26c2407 · 26c2407
1 parent 7e50f60
commit 26c2407
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 81 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -14,6 +14,7 @@ This is an alpha version! The changes listed here are not final.
 - Updated package dependencies.
 
 ### Fixed
+- My Jetpack: Fix fatal error
 - My Jetpack: fix Stats card status when not connected
 
 ## [3.8.0] - 2023-10-03

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php b/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php
@@ -16,11 +16,11 @@
 use Automattic\Jetpack\Constants as Jetpack_Constants;
 use Automattic\Jetpack\JITMS\JITM;
 use Automattic\Jetpack\Licensing;
+use Automattic\Jetpack\Modules;
 use Automattic\Jetpack\Plugins_Installer;
 use Automattic\Jetpack\Status;
 use Automattic\Jetpack\Terms_Of_Service;
 use Automattic\Jetpack\Tracking;
-use Jetpack;
 
 /**
  * The main Initializer class that registers the admin menu and eneuque the assets.
@@ -158,6 +158,7 @@ public static function enqueue_scripts() {
 				'textdomain' => 'jetpack-my-jetpack',
 			)
 		);
+		$modules = new Modules();
 		wp_localize_script(
 			'my_jetpack_main_app',
 			'myJetpackInitialState',
@@ -179,7 +180,7 @@ public static function enqueue_scripts() {
 				'adminUrl'              => esc_url( admin_url() ),
 				'IDCContainerID'        => static::get_idc_container_id(),
 				'userIsAdmin'           => current_user_can( 'manage_options' ),
-				'isStatsModuleActive'   => Jetpack::is_module_active( 'stats' ),
+				'isStatsModuleActive'   => $modules->is_active( 'stats' ),
 			)
 		);
 

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -38,7 +38,7 @@
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '3.8.1-alpha1696922761',
+      'ver' => '3.8.1-alpha1696928189',
     ),
     '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": "2a0438f133706f3bc91957ae68c918f6cf780fed"
+                "reference": "79b0af2c9c22959ef23cd486338ed547715edd53"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -57,7 +57,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "0d7f059338bb489bae6a0480c36b2286ca9d7f3c"
+                "reference": "8ad1e5aec1eb0ef20e3972ef43b93cc15416052b"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -119,7 +119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "c5edcfa557d39a8a21fa59546f9850eb3aa7708a"
+                "reference": "5b901c97bba302773fd9aa3bb17f7dc794414385"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -187,7 +187,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "cedccb097e35465ce2c4d4e84381de25e54743d8"
+                "reference": "fd667b4a67e94a38b4ca94e0b41a312c4bb65f45"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -252,7 +252,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "11b8945c25c5d0315b51427ee5f366cd60107cbf"
+                "reference": "65070475220057598845e7cdd4d5935fc0e4cec3"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -311,7 +311,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "ffb5ea2577cf02b46efcab3f33ab12d4c9f35d89"
+                "reference": "489d6953fb6d105374c10e2edcafa53dbcd09c45"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11"
@@ -353,7 +353,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "dcbcf39c7fb622bd9cb815cb97bc4f9f1453831d"
+                "reference": "5eb0bd5e31719fd700b6604ba3463e2279ab916b"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -431,7 +431,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "6c50bf030708b4b0a55a0f9c623ad089d951d260"
+                "reference": "a0192de614bbbc137517b71fd956946edf1ca17d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -482,7 +482,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "406d9088fdafc0eb4eef77a38ca1bc2fa7c8059e"
+                "reference": "4cd14223870010595bdb9bd7218ae71fa511e090"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -532,7 +532,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
-                "reference": "e957b5c7c2c9a4ac0cbe0d9a66f09573e7374334"
+                "reference": "3482276fb5e11030925367ccf9aaf7e4d47eaf96"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.12-alpha",
@@ -610,7 +610,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "2a28ef0c4f6a22583d32a4b929215ec9035df9bd"
+                "reference": "50afba1d40ba290741c14ac55e06cd1ad02b46b2"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -665,7 +665,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "4437cf29eeb9ab64fc9162723a0138c9821b1f03"
+                "reference": "9a4f13302da42ca6aa860e5b9c68a68642d2b44a"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -740,7 +740,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "ade6c1a8cecc8cee5d51ca8ea163503cb4972495"
+                "reference": "31b675901299c8951a86877d5493c42829f162bf"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.1-alpha"
@@ -801,7 +801,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "e32a5b01d7b8343b00151bbfec5fed5352ed658f"
+                "reference": "b96786a943f736bf55fef6b14ebaf8ea07080d08"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -846,12 +846,12 @@
         },
         {
             "name": "automattic/jetpack-my-jetpack",
-            "version": "3.8.1-alpha.1696922761",
-            "version_normalized": "3.8.1.0-alpha1696922761",
+            "version": "3.8.1-alpha.1696928189",
+            "version_normalized": "3.8.1.0-alpha1696928189",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "d5d69b45df24c04dc78aa831f116cb74926d55da"
+                "reference": "f6a0bc6deb4cf97551d312148879f6077580c36d"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.2.23",
@@ -941,7 +941,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-partner",
-                "reference": "823a4c7a9bc27d75dc5c2c9a83013fa4007d944f"
+                "reference": "a54b42dc6a8f616d81970132cdb78158a2e07825"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.1-alpha",
@@ -1003,7 +1003,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "c2594217a40eca5d2598e2b006d2002602b4c30f"
+                "reference": "8d5f076a59a4630b1f5e2a9ce3679a79911de28a"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1061,7 +1061,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "af891c09d51cf842b271b22b439331a683a28446"
+                "reference": "cd47f2ba86ad3b34ee5477041ae8b2f9295df294"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22"
@@ -1115,7 +1115,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "f6576fa76ca19e2b55c55aa87064039c9a71227c"
+                "reference": "a125db017366ac806dfb9fb003a5eedaf77b4bd5"
             },
             "require": {
                 "automattic/jetpack-status": "^1.18.5"
@@ -1169,7 +1169,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "70e4c1c8f0570356544db129b2c70ebb52ff6b06"
+                "reference": "a662a722a6ddfcd4b10f50eeddedac422b70bb53"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1220,7 +1220,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-search",
-                "reference": "9b220a971c83fb9dd271455f330dd65cd1811b90"
+                "reference": "1e44b11c5883ebe9b0cd857e2579df1906727245"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.12-alpha",
@@ -1306,7 +1306,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats",
-                "reference": "a98784c94a40af55d565d89ddc22a529dd655a95"
+                "reference": "958fa8170d6f8952ab79d5a8ddcb5a58c0d1fbc5"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.12-alpha",
@@ -1370,7 +1370,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "97c3dda681e19e5fd37c226b0c732c16e68342d0"
+                "reference": "ee6719966e2b5f418264a966bca8c65aaeb916f8"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -1425,7 +1425,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "7f27c61f94fe2ea84d2de7f2acf2955ef92e6c3c"
+                "reference": "b63777921c2455f146756c59495e07a07c4763f2"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.1-alpha",