Leverage the module_dependencies arg to add espree to importmap

Author: westonruter

src/wp-includes/general-template.php

@@ -4045,7 +4045,6 @@ function wp_enqueue_code_editor( $args ) {
 
 	wp_enqueue_script( 'code-editor' );
 	wp_enqueue_style( 'code-editor' );
-	wp_enqueue_script_module( 'wp-codemirror' ); // Hack to get importmap printed with espree.
 
 	if ( isset( $settings['codemirror']['mode'] ) ) {
 		$mode = $settings['codemirror']['mode'];

src/wp-includes/script-loader.php

@@ -1196,6 +1196,7 @@ function wp_default_scripts( $scripts ) {
 	);
 
 	$scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.65.20' );
+	did_action( 'init' ) && $scripts->add_data( 'wp-codemirror', 'module_dependencies', array( 'espree' ) );
 	$scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' );
 	$scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.1' ); // Deprecated. Use 'espree' script module.
 	$scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); // Deprecated.

src/wp-includes/script-modules.php

@@ -201,18 +201,6 @@ function wp_default_script_modules() {
 		array(),
 		'9.6.1'
 	);
-
-	// The following is a workaround for classic scripts not yet being able to depend on modules. See <https://core.trac.wordpress.org/ticket/61500>.
-	wp_register_script_module(
-		'wp-codemirror',
-		'', // An empty string is a hack to cause the dependencies to be printed in the importmap without a dependent script being printed.
-		array(
-			array(
-				'id'     => 'espree',
-				'import' => 'dynamic',
-			),
-		)
-	);
 }
 
 /**