Remove wp_script_modules function

src/wp-includes/class-wp-script-modules.php

@@ -30,6 +30,31 @@ class WP_Script_Modules {
 	 */
 	private $enqueued_before_registered = array();
 
+	/**
+	 * Container for the main instance of the class.
+	 *
+	 * @since 6.5.0
+	 * @var WP_Script_Modules|null
+	 */
+	private static $instance = null;
+
+	/**
+	 * Utility method to retrieve the main instance of the class.
+	 *
+	 * The instance will be created if it does not exist yet.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return WP_Script_Modules The main instance.
+	 */
+	public static function get_instance(): WP_Script_Modules {
+		if ( null === self::$instance ) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
+
 	/**
 	 * Registers the script module if no script module with that script module
 	 * identifier has already been registered.

src/wp-includes/script-modules.php

@@ -8,25 +8,6 @@
  * @subpackage Script Modules
  */
 
-/**
- * Retrieves the main WP_Script_Modules instance.
- *
- * This function provides access to the WP_Script_Modules instance, creating one
- * if it doesn't exist yet.
- *
- * @since 6.5.0
- *
- * @return WP_Script_Modules The main WP_Script_Modules instance.
- */
-function wp_script_modules(): WP_Script_Modules {
-	static $instance = null;
-	if ( is_null( $instance ) ) {
-		$instance = new WP_Script_Modules();
-		$instance->add_hooks();
-	}
-	return $instance;
-}
-
 /**
  * Registers the script module if no script module with that script module
  * identifier has already been registered.
@@ -59,7 +40,7 @@ function wp_script_modules(): WP_Script_Modules {
  *                                    If $version is set to null, no version is added.
  */
 function wp_register_script_module( string $id, string $src, array $deps = array(), $version = false ) {
-	wp_script_modules()->register( $id, $src, $deps, $version );
+	WP_Script_Modules::get_instance()->register( $id, $src, $deps, $version );
 }
 
 /**
@@ -96,7 +77,7 @@ function wp_register_script_module( string $id, string $src, array $deps = array
  *                                    If $version is set to null, no version is added.
  */
 function wp_enqueue_script_module( string $id, string $src = '', array $deps = array(), $version = false ) {
-	wp_script_modules()->enqueue( $id, $src, $deps, $version );
+	WP_Script_Modules::get_instance()->enqueue( $id, $src, $deps, $version );
 }
 
 /**
@@ -107,5 +88,5 @@ function wp_enqueue_script_module( string $id, string $src = '', array $deps = a
  * @param string $id The identifier of the script module.
  */
 function wp_dequeue_script_module( string $id ) {
-	wp_script_modules()->dequeue( $id );
+	WP_Script_Modules::get_instance()->dequeue( $id );
 }

src/wp-settings.php

@@ -375,6 +375,8 @@
 require ABSPATH . WPINC . '/class-wp-script-modules.php';
 require ABSPATH . WPINC . '/script-modules.php';
 
+WP_Script_Modules::get_instance()->add_hooks();
+
 $GLOBALS['wp_embed'] = new WP_Embed();
 
 /**