Move and refactor the interactive scritps registration

lib/client-assets.php

@@ -577,50 +577,3 @@ function gutenberg_register_vendor_scripts( $scripts ) {
 // Enqueue stored styles.
 add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_stored_styles' );
 add_action( 'wp_footer', 'gutenberg_enqueue_stored_styles', 1 );
-
-/**
- * Registers interactivity scripts for Gutenberg.
- *
- * This function registers interactivity scripts for Gutenberg when not in the
- * admin panel.
- */
-function gutenberg_register_interactivity_scripts() {
- 	if ( ! is_admin() )	 {
-		wp_register_script(
-			'interactivity-runtime',
-			plugins_url(
-				'../build/block-library/interactive-blocks/interactivity.min.js',
-				__FILE__
-			),
-			array( 'interactivity-vendors')
-		);
-
-		wp_register_script(
-			'interactivity-vendors',
-			plugins_url(
-				'../build/block-library/interactive-blocks/vendors.min.js',
-				__FILE__
-			)
-		);
- 	}
-}
-add_action( 'wp_enqueue_scripts', 'gutenberg_register_interactivity_scripts' );
-
-/**
-  * Adds the "defer" attribute to all the interactivity script tags.
-  *
-  * @param string $tag The generated script tag.
-  * @param string $handle The script's registered handle.
-	*
-  * @return string The modified script tag.
-	*/
-function add_defer_attribute( $tag, $handle ) {
-		if ( 0 === strpos( $handle, 'interactivity-' ) ) {
-			$p = new WP_HTML_Tag_Processor( $tag );
-			$p->next_tag( array( 'tag' => 'script' ) );
-			$p->set_attribute( 'defer', true );
-			return $p->get_updated_html();
-		}
-		return $tag;
-}
-add_filter( 'script_loader_tag', 'add_defer_attribute', 10, 2 );

lib/experimental/interactivity-api/script-loader.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Updates the script-loader.php file
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Registers interactivity runtime and vendor scripts to use with interactive blocks.
+ *
+ * @param WP_Scripts $scripts WP_Scripts instance.
+ */
+function gutenberg_register_interactivity_scripts( $scripts ) {
+	gutenberg_override_script(
+		$scripts,
+		'interactivity-runtime',
+		gutenberg_url(
+			'build/block-library/interactive-blocks/interactivity.min.js'
+		),
+		array( 'interactivity-vendors')
+	);
+
+	gutenberg_override_script(
+		$scripts,
+		'interactivity-vendors',
+		gutenberg_url(
+			'build/block-library/interactive-blocks/vendors.min.js'
+		)
+	);
+}
+add_action( 'wp_default_scripts', 'gutenberg_register_interactivity_scripts', 10, 1 );
+
+/**
+  * Adds the "defer" attribute to all the interactivity script tags.
+  *
+  * @param string $tag    The generated script tag.
+  * @param string $handle The script's registered handle.
+  *
+  * @return string The modified script tag.
+  */
+function gutenberg_interactivity_scripts_add_defer_attribute( $tag, $handle ) {
+		if ( 0 === strpos( $handle, 'interactivity-' ) ) {
+			$p = new WP_HTML_Tag_Processor( $tag );
+			$p->next_tag( array( 'tag' => 'script' ) );
+			$p->set_attribute( 'defer', true );
+			return $p->get_updated_html();
+		}
+		return $tag;
+}
+add_filter( 'script_loader_tag', 'gutenberg_interactivity_scripts_add_defer_attribute', 10, 2 );

lib/load.php

@@ -97,6 +97,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
 require __DIR__ . '/experimental/block-editor-settings.php';
 require __DIR__ . '/experimental/blocks.php';
+require __DIR__ . '/experimental/interactivity-api/script-loader.php';
 require __DIR__ . '/experimental/navigation-theme-opt-in.php';
 require __DIR__ . '/experimental/kses.php';
 require __DIR__ . '/experimental/l10n.php';