Use a dedicated assets class for connection assets

Automattic · Jul 17, 2024 · 636ef04 · 636ef04
1 parent d26a3cd
commit 636ef04
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 24 deletions.
diff --git a/projects/packages/connection/src/class-connection-assets.php b/projects/packages/connection/src/class-connection-assets.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Connection_Assets.
+ *
+ * @package automattic/jetpack-connection
+ */
+
+namespace Automattic\Jetpack\Connection;
+
+use Automattic\Jetpack\Assets;
+
+/**
+ * Connection_Assets class.
+ */
+class Connection_Assets {
+
+	/**
+	 * Initialize the class.
+	 */
+	public static function configure() {
+		add_action( 'wp_loaded', array( __CLASS__, 'register_assets' ) );
+	}
+
+	/**
+	 * Register assets.
+	 */
+	public static function register_assets() {
+		if ( ! wp_script_is( 'jetpack-connection', 'registered' ) ) {
+
+			Assets::register_script(
+				'jetpack-connection',
+				'../dist/jetpack-connection.js',
+				__FILE__,
+				array(
+					'in_footer'  => true,
+					'textdomain' => 'jetpack-idc',
+				)
+			);
+
+			Initial_State::render_script( 'jetpack-connection' );
+		}
+	}
+}
diff --git a/projects/packages/connection/src/class-manager.php b/projects/packages/connection/src/class-manager.php
@@ -8,7 +8,6 @@
 namespace Automattic\Jetpack\Connection;
 
 use Automattic\Jetpack\A8c_Mc_Stats;
-use Automattic\Jetpack\Assets;
 use Automattic\Jetpack\Constants;
 use Automattic\Jetpack\Heartbeat;
 use Automattic\Jetpack\Partner;
@@ -156,28 +155,6 @@ public static function configure() {
 
 		// Initial Partner management.
 		Partner::init();
-
-		add_action( 'init', array( __CLASS__, 'register_assets' ) );
-	}
-
-	/**
-	 * Register assets.
-	 */
-	public static function register_assets() {
-		if ( ! wp_script_is( 'jetpack-connection', 'registered' ) ) {
-
-			Assets::register_script(
-				'jetpack-connection',
-				'../dist/jetpack-connection.js',
-				__FILE__,
-				array(
-					'in_footer'  => true,
-					'textdomain' => 'jetpack-idc',
-				)
-			);
-
-			Initial_State::render_script( 'jetpack-connection' );
-		}
 	}
 
 	/**

diff --git a/projects/packages/publicize/src/class-publicize-assets.php b/projects/packages/publicize/src/class-publicize-assets.php
@@ -18,7 +18,7 @@ class Publicize_Assets {
 	 * Initialize the class.
 	 */
 	public static function configure() {
-		add_action( 'init', array( __CLASS__, 'register_assets' ) );
+		add_action( 'wp_loaded', array( __CLASS__, 'register_assets' ) );
 	}
 
 	/**

diff --git a/projects/plugins/jetpack/class.jetpack.php b/projects/plugins/jetpack/class.jetpack.php
@@ -911,6 +911,7 @@ public function configure() {
 
 		// Assets should be registered regardless of connection status.
 		\Automattic\Jetpack\Publicize\Publicize_Assets::configure();
+		\Automattic\Jetpack\Connection\Connection_Assets::configure();
 
 		$modules = new Automattic\Jetpack\Modules();
 		if ( $modules->is_active( 'publicize' ) && $this->connection_manager->has_connected_user() ) {

diff --git a/projects/plugins/social/src/class-jetpack-social.php b/projects/plugins/social/src/class-jetpack-social.php
@@ -79,6 +79,7 @@ function () {
 
 				// Assets should be registered regardless of connection status.
 				\Automattic\Jetpack\Publicize\Publicize_Assets::configure();
+				\Automattic\Jetpack\Connection\Connection_Assets::configure();
 
 				if ( ! $this->is_connected() ) {
 					return;