From 16051481515ac641bd51afca344939abdfd21c97 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:23:42 +0100
Subject: [PATCH] Modules API: Script Modules add deregister option. (#58830)

* Add deregister module function

* Sync with core PR
---
 .../wordpress-6.5/class-wp-script-modules.php | 12 +++++++
 lib/compat/wordpress-6.5/scripts-modules.php  | 13 ++++++++
 lib/experimental/interactivity-api.php        | 22 -------------
 lib/interactivity-api.php                     | 32 +++++++++++++++++++
 lib/load.php                                  |  2 +-
 5 files changed, 58 insertions(+), 23 deletions(-)
 delete mode 100644 lib/experimental/interactivity-api.php
 create mode 100644 lib/interactivity-api.php

diff --git a/lib/compat/wordpress-6.5/class-wp-script-modules.php b/lib/compat/wordpress-6.5/class-wp-script-modules.php
index 205b50cd532596..4d3280f1db0b97 100644
--- a/lib/compat/wordpress-6.5/class-wp-script-modules.php
+++ b/lib/compat/wordpress-6.5/class-wp-script-modules.php
@@ -152,6 +152,18 @@ public function dequeue( string $id ) {
 			unset( $this->enqueued_before_registered[ $id ] );
 		}
 
+		/**
+		 * Removes a registered script module.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string $id The identifier of the script module.
+		 */
+		public function deregister( string $id ) {
+			unset( $this->registered[ $id ] );
+			unset( $this->enqueued_before_registered[ $id ] );
+		}
+
 		/**
 		 * Adds the hooks to print the import map, enqueued script modules and script
 		 * module preloads.
diff --git a/lib/compat/wordpress-6.5/scripts-modules.php b/lib/compat/wordpress-6.5/scripts-modules.php
index 8fd8978d9e8f5d..c4a1690b6986f0 100644
--- a/lib/compat/wordpress-6.5/scripts-modules.php
+++ b/lib/compat/wordpress-6.5/scripts-modules.php
@@ -207,3 +207,16 @@ function wp_dequeue_script_module( string $id ) {
 		wp_script_modules()->dequeue( $id );
 	}
 }
+
+if ( ! function_exists( 'wp_deregister_script_module' ) ) {
+	/**
+	 * Deregisters the script module.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $id The identifier of the script module.
+	 */
+	function wp_deregister_script_module( string $id ) {
+		wp_script_modules()->deregister( $id );
+	}
+}
diff --git a/lib/experimental/interactivity-api.php b/lib/experimental/interactivity-api.php
deleted file mode 100644
index 5d0f694dca3692..00000000000000
--- a/lib/experimental/interactivity-api.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Overrides URLs to load the Gutenberg interactivity script modules instead of
- * the WordPress Core ones.
- *
- * This function checks the URL for specific script modules and overrides the
- * default URL to point to the Gutenberg plugin. It supports both the
- * interactivity and interactivity-router scripts, with or without the `.min`
- * suffix.
- *
- * @param string $url The URL of the enqueued script.
- * @return string The new Gutenberg URL if it's a match, or the WordPress Core URL otherwise.
- */
-function gutenberg_interactivity_override_script_module_urls( $url ) {
-	$pattern = '/wp-includes\/js\/dist\/interactivity(-router)?(\.min)?\.js/';
-	if ( preg_match( $pattern, $url, $matches ) ) {
-		return gutenberg_url( '/build/interactivity/' . ( ( isset( $matches[1] ) && $matches[1] ) ? 'router' : 'index' ) . '.min.js' );
-	}
-	return $url;
-}
-
-add_filter( 'includes_url', 'gutenberg_interactivity_override_script_module_urls', 10, 3 );
diff --git a/lib/interactivity-api.php b/lib/interactivity-api.php
new file mode 100644
index 00000000000000..da349e1c033760
--- /dev/null
+++ b/lib/interactivity-api.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Interactivity API functions specific for the Gutenberg editor plugin.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Deregisters the Core Interactivity API Modules and replace them
+ * with the ones from the Gutenberg plugin.
+ */
+function gutenberg_reregister_interactivity_script_modules() {
+	$default_version = defined( 'GUTENBERG_VERSION' ) && ! SCRIPT_DEBUG ? GUTENBERG_VERSION : time();
+	wp_deregister_script_module( '@wordpress/interactivity' );
+	wp_deregister_script_module( '@wordpress/interactivity-router' );
+
+	wp_register_script_module(
+		'@wordpress/interactivity',
+		gutenberg_url( '/build/interactivity/index.min.js' ),
+		array(),
+		$default_version
+	);
+
+	wp_register_script_module(
+		'@wordpress/interactivity-router',
+		gutenberg_url( '/build/interactivity/router.min.js' ),
+		array( '@wordpress/interactivity' ),
+		$default_version
+	);
+}
+
+add_action( 'init', 'gutenberg_reregister_interactivity_script_modules' );
diff --git a/lib/load.php b/lib/load.php
index 47d41fb50b3b5f..454bc3325f612d 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -133,7 +133,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/l10n.php';
 require __DIR__ . '/experimental/synchronization.php';
 require __DIR__ . '/experimental/script-modules.php';
-require __DIR__ . '/experimental/interactivity-api.php';
 
 if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 	require __DIR__ . '/experimental/disable-tinymce.php';
@@ -192,6 +191,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/client-assets.php';
 require __DIR__ . '/demo.php';
 require __DIR__ . '/experiments-page.php';
+require __DIR__ . '/interactivity-api.php';
 
 // Copied package PHP files.
 if ( is_dir( __DIR__ . '/../build/style-engine' ) ) {