From 3af54e5bb81d85b8a88d9417c35bc4df6a243a25 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Tue, 10 Nov 2026 23:47:54 +0000
Subject: [PATCH 1/2] I18N: Print translations for the script modules that
 scripts depend on.

`WP_Script_Modules::print_script_module_translations()` only covered the enqueued script modules and their dependencies. A script module that only a script imports, declared in the script's `module_dependencies`, is added to the import map and loads, but its translations were never printed, so its strings showed untranslated.

The method now covers the enqueued script modules and the script modules in the import map, which includes the script module dependencies of scripts and their dependencies. `WP_Script_Modules::print_script_module_data()` already covered these script modules, and both methods now get them from the same private `get_loadable_script_module_ids()` method, which sorts them with `get_sorted_dependencies()`. This way both methods always cover the same script modules, in the same order, with dependencies before the script modules that depend on them. A script module that is both enqueued and imported by a script gets its translations printed once.

Since the import map is now built three times per page, a missing script module dependency of a script triggers the `_doing_it_wrong()` notice once per script.

Fixes #66591.
---
 src/wp-includes/class-wp-script-modules.php   |  65 +++-
 .../tests/script-modules/wpScriptModules.php  | 312 ++++++++++++++++++
 2 files changed, 360 insertions(+), 17 deletions(-)

diff --git a/src/wp-includes/class-wp-script-modules.php b/src/wp-includes/class-wp-script-modules.php
index 180b42362db1a..31e72469a02fd 100644
--- a/src/wp-includes/class-wp-script-modules.php
+++ b/src/wp-includes/class-wp-script-modules.php
@@ -92,6 +92,18 @@ class WP_Script_Modules {
 	 */
 	private $modules_with_missing_dependencies = array();
 
+	/**
+	 * List of handles for scripts encountered which have missing script module dependencies.
+	 *
+	 * A handle is added to this list when it is discovered to have script module dependencies that are not
+	 * registered. At this time, a warning is emitted with {@see _doing_it_wrong()}. The handle is then added to this
+	 * list, so that duplicate warnings don't occur.
+	 *
+	 * @since 7.2.0
+	 * @var string[]
+	 */
+	private $scripts_with_missing_module_dependencies = array();
+
 	/**
 	 * Registers the script module if no script module with that script module
 	 * identifier has already been registered.
@@ -367,7 +379,8 @@ public function set_translations( string $id, string $domain = 'default', string
 	}
 
 	/**
-	 * Prints translations for all enqueued script modules.
+	 * Prints translations for the enqueued script modules and for the script
+	 * modules in the import map.
 	 *
 	 * Outputs inline `<script>` tags that call `wp.i18n.setLocaleData()` with
 	 * the translated strings for each script module. This must run before
@@ -379,10 +392,11 @@ public function set_translations( string $id, string $domain = 'default', string
 	 * {@see WP_Script_Modules::set_translations()}.
 	 *
 	 * @since 7.0.0
+	 * @since 7.2.0 Translations of the script module dependencies ('module_dependencies') of scripts, and of their
+	 *              dependencies, are now printed.
 	 */
 	public function print_script_module_translations(): void {
-		// Collect all module IDs that will be on the page (enqueued + their dependencies).
-		$module_ids = $this->get_sorted_dependencies( $this->queue );
+		$module_ids = $this->get_loadable_script_module_ids();
 
 		$set_locale_data_js_function = <<<'JS'
 		( domain, translations ) => {
@@ -684,7 +698,10 @@ private function get_import_map(): array {
 						}
 					}
 
-					if ( count( $missing_module_dependencies ) > 0 ) {
+					if (
+						count( $missing_module_dependencies ) > 0 &&
+						! in_array( $handle, $this->scripts_with_missing_module_dependencies, true )
+					) {
 						_doing_it_wrong(
 							'WP_Scripts::add_data',
 							sprintf(
@@ -696,6 +713,7 @@ private function get_import_map(): array {
 							),
 							'7.0.0'
 						);
+						$this->scripts_with_missing_module_dependencies[] = $handle;
 					}
 				}
 
@@ -723,6 +741,27 @@ private function get_import_map(): array {
 		return array( 'imports' => $imports );
 	}
 
+	/**
+	 * Gets the IDs of the script modules that can load on the page, sorted based on their dependencies.
+	 *
+	 * These are the enqueued script modules and the script modules in the import map: the dependencies of the
+	 * enqueued script modules, the script module dependencies ('module_dependencies') of scripts, and the
+	 * dependencies of those. Dependencies come before the script modules that depend on them, and a script module
+	 * with a dependency that is not registered is left out.
+	 *
+	 * @since 7.2.0
+	 *
+	 * @return string[] Sorted list of script module IDs.
+	 */
+	private function get_loadable_script_module_ids(): array {
+		return $this->get_sorted_dependencies(
+			array_merge(
+				$this->queue,
+				array_keys( $this->get_import_map()['imports'] )
+			)
+		);
+	}
+
 	/**
 	 * Retrieves the list of script modules marked for enqueue.
 	 *
@@ -1014,21 +1053,13 @@ private function get_src( string $id ): string {
 	 * form `wp-script-module-data-{$module_id}`.
 	 */
 	public function print_script_module_data(): void {
-		$modules = array();
-		foreach ( array_unique( $this->queue ) as $id ) {
-			if ( '@wordpress/a11y' === $id ) {
-				$this->a11y_available = true;
-			}
-			$modules[ $id ] = true;
-		}
-		foreach ( array_keys( $this->get_import_map()['imports'] ) as $id ) {
-			if ( '@wordpress/a11y' === $id ) {
-				$this->a11y_available = true;
-			}
-			$modules[ $id ] = true;
+		$module_ids = $this->get_loadable_script_module_ids();
+
+		if ( in_array( '@wordpress/a11y', $module_ids, true ) ) {
+			$this->a11y_available = true;
 		}
 
-		foreach ( array_keys( $modules ) as $module_id ) {
+		foreach ( $module_ids as $module_id ) {
 			/**
 			 * Filters data associated with a given Script Module.
 			 *
diff --git a/tests/phpunit/tests/script-modules/wpScriptModules.php b/tests/phpunit/tests/script-modules/wpScriptModules.php
index c2d30c2a94346..2fdce3c4c7baa 100644
--- a/tests/phpunit/tests/script-modules/wpScriptModules.php
+++ b/tests/phpunit/tests/script-modules/wpScriptModules.php
@@ -2924,4 +2924,316 @@ static function ( $translations, $file, $handle, $domain ) use ( &$seen_domain )
 		$this->assertSame( 'my-plugin', $seen_domain, 'load_script_module_textdomain() should be called with the overridden domain.' );
 		$this->assertStringContainsString( 'Hola', $output, 'Output should contain the translated string loaded under the overridden domain.' );
 	}
+
+	/**
+	 * Provides translations for the given script modules through the `pre_load_script_translations` filter.
+	 *
+	 * @param string[] $ids Script module IDs.
+	 */
+	private function add_script_module_translations( array $ids ): void {
+		add_filter(
+			'pre_load_script_translations',
+			static function ( $translations, $file, $handle ) use ( $ids ) {
+				if ( ! in_array( $handle, $ids, true ) ) {
+					return $translations;
+				}
+				return wp_json_encode(
+					array(
+						'locale_data' => array(
+							'messages' => array(
+								''                   => array(
+									'domain' => 'messages',
+									'lang'   => 'es',
+								),
+								"Hello from $handle" => array( "Hola desde $handle" ),
+							),
+						),
+					)
+				);
+			},
+			10,
+			3
+		);
+	}
+
+	/**
+	 * Gets the IDs of the script modules that the given markup prints script tags for.
+	 *
+	 * @param string $markup Markup printed by print_script_module_translations() or print_script_module_data().
+	 * @param string $prefix Prefix of the script tag IDs, which the script module ID follows.
+	 * @return string[] Script module IDs, in the order their script tags are printed.
+	 */
+	private function get_printed_script_module_ids( string $markup, string $prefix ): array {
+		$ids       = array();
+		$processor = new WP_HTML_Tag_Processor( $markup );
+		while ( $processor->next_tag( 'SCRIPT' ) ) {
+			$id = $processor->get_attribute( 'id' );
+			if ( is_string( $id ) && str_starts_with( $id, $prefix ) ) {
+				$ids[] = substr( $id, strlen( $prefix ) );
+			}
+		}
+		return $ids;
+	}
+
+	/**
+	 * Tests that print_script_module_translations() outputs translations for a script module that only a script
+	 * depends on, after the translations of the static and dynamic dependencies of that script module.
+	 *
+	 * @ticket 66591
+	 *
+	 * @dataProvider data_module_dependencies_of_script
+	 *
+	 * @covers WP_Script_Modules::print_script_module_translations
+	 * @covers WP_Script_Modules::get_loadable_script_module_ids
+	 *
+	 * @param array $module_dependencies The 'module_dependencies' of the script.
+	 */
+	public function test_print_script_module_translations_includes_module_dependencies_of_scripts( array $module_dependencies ) {
+		$this->script_modules->register( 'static-dependency', '/wp-includes/js/static-dependency.js' );
+		$this->script_modules->register( 'dynamic-dependency', '/wp-includes/js/dynamic-dependency.js' );
+		$this->script_modules->register(
+			'imported-module',
+			'/wp-includes/js/imported-module.js',
+			array(
+				'static-dependency',
+				array(
+					'id'     => 'dynamic-dependency',
+					'import' => 'dynamic',
+				),
+			)
+		);
+		wp_enqueue_script(
+			'script',
+			'/script.js',
+			array(),
+			false,
+			array(
+				'in_footer'           => true,
+				'module_dependencies' => $module_dependencies,
+			)
+		);
+		$this->add_script_module_translations( array( 'imported-module', 'static-dependency', 'dynamic-dependency' ) );
+
+		$output = get_echo( array( $this->script_modules, 'print_script_module_translations' ) );
+
+		$this->assertSame(
+			array( 'static-dependency', 'dynamic-dependency', 'imported-module' ),
+			$this->get_printed_script_module_ids( $output, 'wp-script-module-translation-data-' ),
+			'Translations should be printed once for each dependency of the imported script module, and then for the imported script module.'
+		);
+		$this->assertStringContainsString( 'Hola desde imported-module', $output, 'Output should contain the translations of the imported script module.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array<string, array{ 0: array<string|array<string, string>> }>
+	 */
+	public static function data_module_dependencies_of_script(): array {
+		return array(
+			'module ID'      => array( array( 'imported-module' ) ),
+			'static import'  => array(
+				array(
+					array(
+						'id'     => 'imported-module',
+						'import' => 'static',
+					),
+				),
+			),
+			'dynamic import' => array(
+				array(
+					array(
+						'id'     => 'imported-module',
+						'import' => 'dynamic',
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * Tests that print_script_module_translations() outputs translations for the script module dependencies of a
+	 * script that is only a dependency of the enqueued script.
+	 *
+	 * @ticket 66591
+	 *
+	 * @covers WP_Script_Modules::print_script_module_translations
+	 * @covers WP_Script_Modules::get_loadable_script_module_ids
+	 */
+	public function test_print_script_module_translations_includes_module_dependencies_of_script_dependencies() {
+		$this->script_modules->register( 'imported-module', '/wp-includes/js/imported-module.js' );
+		wp_register_script(
+			'script-dependency',
+			'/script-dependency.js',
+			array(),
+			false,
+			array(
+				'in_footer'           => true,
+				'module_dependencies' => array( 'imported-module' ),
+			)
+		);
+		wp_enqueue_script( 'script', '/script.js', array( 'script-dependency' ), false, array( 'in_footer' => true ) );
+		$this->add_script_module_translations( array( 'imported-module' ) );
+
+		$output = get_echo( array( $this->script_modules, 'print_script_module_translations' ) );
+
+		$this->assertSame( array( 'imported-module' ), $this->get_printed_script_module_ids( $output, 'wp-script-module-translation-data-' ) );
+	}
+
+	/**
+	 * Tests that print_script_module_translations() outputs nothing for the script module dependencies of a script
+	 * that is not enqueued.
+	 *
+	 * @ticket 66591
+	 *
+	 * @covers WP_Script_Modules::print_script_module_translations
+	 * @covers WP_Script_Modules::get_loadable_script_module_ids
+	 */
+	public function test_print_script_module_translations_outputs_nothing_for_module_dependencies_of_script_not_enqueued() {
+		$this->script_modules->register( 'imported-module', '/wp-includes/js/imported-module.js' );
+		wp_register_script(
+			'script',
+			'/script.js',
+			array(),
+			false,
+			array(
+				'in_footer'           => true,
+				'module_dependencies' => array( 'imported-module' ),
+			)
+		);
+		$this->add_script_module_translations( array( 'imported-module' ) );
+
+		$output = get_echo( array( $this->script_modules, 'print_script_module_translations' ) );
+
+		$this->assertEmpty( $output );
+	}
+
+	/**
+	 * Tests that print_script_module_translations() outputs the translations of a script module once when it is both
+	 * enqueued and a script module dependency of a script.
+	 *
+	 * @ticket 66591
+	 *
+	 * @covers WP_Script_Modules::print_script_module_translations
+	 * @covers WP_Script_Modules::get_loadable_script_module_ids
+	 */
+	public function test_print_script_module_translations_outputs_once_for_enqueued_module_dependency_of_script() {
+		$this->script_modules->register( 'imported-module', '/wp-includes/js/imported-module.js' );
+		$this->script_modules->enqueue( 'imported-module' );
+		wp_enqueue_script(
+			'script',
+			'/script.js',
+			array(),
+			false,
+			array(
+				'in_footer'           => true,
+				'module_dependencies' => array( 'imported-module' ),
+			)
+		);
+		$this->add_script_module_translations( array( 'imported-module' ) );
+
+		$output = get_echo( array( $this->script_modules, 'print_script_module_translations' ) );
+
+		$this->assertSame( array( 'imported-module' ), $this->get_printed_script_module_ids( $output, 'wp-script-module-translation-data-' ) );
+	}
+
+	/**
+	 * Tests that a missing script module dependency of a script triggers a single _doing_it_wrong() notice, even
+	 * though the import map, the translations and the data all look the script module dependencies up.
+	 *
+	 * @ticket 66591
+	 *
+	 * @covers WP_Script_Modules::get_import_map
+	 * @covers WP_Script_Modules::print_import_map
+	 * @covers WP_Script_Modules::print_script_module_translations
+	 * @covers WP_Script_Modules::print_script_module_data
+	 */
+	public function test_missing_module_dependency_of_script_triggers_doing_it_wrong_once() {
+		$this->setExpectedIncorrectUsage( 'WP_Scripts::add_data' );
+
+		$notices = 0;
+		add_action(
+			'doing_it_wrong_run',
+			static function ( $function_name ) use ( &$notices ) {
+				if ( 'WP_Scripts::add_data' === $function_name ) {
+					++$notices;
+				}
+			}
+		);
+		wp_enqueue_script(
+			'script',
+			'/script.js',
+			array(),
+			false,
+			array(
+				'in_footer'           => true,
+				'module_dependencies' => array( 'does-not-exist' ),
+			)
+		);
+
+		get_echo( array( $this->script_modules, 'print_import_map' ) );
+		get_echo( array( $this->script_modules, 'print_script_module_translations' ) );
+		get_echo( array( $this->script_modules, 'print_script_module_data' ) );
+
+		$this->assertSame( 1, $notices, 'The missing script module dependency should trigger a single notice.' );
+	}
+
+	/**
+	 * Tests that print_script_module_translations() and print_script_module_data() output for the same script
+	 * modules, in the same order: the enqueued ones and the ones in the import map, with dependencies before the
+	 * script modules that depend on them.
+	 *
+	 * @ticket 66591
+	 *
+	 * @covers WP_Script_Modules::print_script_module_translations
+	 * @covers WP_Script_Modules::print_script_module_data
+	 * @covers WP_Script_Modules::get_loadable_script_module_ids
+	 */
+	public function test_print_script_module_translations_and_data_output_for_the_same_script_modules() {
+		$sorted_loadable_ids = array( 'enqueued-dependency', 'enqueued-module', 'imported-dependency', 'imported-module' );
+		$all_ids             = array_merge( $sorted_loadable_ids, array( 'not-loadable' ) );
+
+		$this->script_modules->register( 'enqueued-dependency', '/wp-includes/js/enqueued-dependency.js' );
+		$this->script_modules->register( 'enqueued-module', '/wp-includes/js/enqueued-module.js', array( 'enqueued-dependency' ) );
+		$this->script_modules->enqueue( 'enqueued-module' );
+		$this->script_modules->register( 'imported-dependency', '/wp-includes/js/imported-dependency.js' );
+		$this->script_modules->register( 'imported-module', '/wp-includes/js/imported-module.js', array( 'imported-dependency' ) );
+		$this->script_modules->register( 'not-loadable', '/wp-includes/js/not-loadable.js' );
+		wp_enqueue_script(
+			'script',
+			'/script.js',
+			array(),
+			false,
+			array(
+				'in_footer'           => true,
+				'module_dependencies' => array( 'imported-module' ),
+			)
+		);
+		$this->add_script_module_translations( $all_ids );
+		foreach ( $all_ids as $id ) {
+			add_filter(
+				"script_module_data_{$id}",
+				static function ( $data ) {
+					$data['foo'] = 'bar';
+					return $data;
+				}
+			);
+		}
+
+		$translation_ids = $this->get_printed_script_module_ids(
+			get_echo( array( $this->script_modules, 'print_script_module_translations' ) ),
+			'wp-script-module-translation-data-'
+		);
+		$data_ids        = $this->get_printed_script_module_ids(
+			get_echo( array( $this->script_modules, 'print_script_module_data' ) ),
+			'wp-script-module-data-'
+		);
+
+		$this->assertSame(
+			$sorted_loadable_ids,
+			$translation_ids,
+			'Translations should be printed for the enqueued script module and the script module that a script depends on, each after its dependency.'
+		);
+		$this->assertSame( $translation_ids, $data_ids, 'Data should be printed for the same script modules as translations, in the same order.' );
+	}
 }

From c2f21ff9d73779e93743da82a1730438f60a6725 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Tue, 10 Nov 2026 23:48:26 +0000
Subject: [PATCH 2/2] Script Loader: Rename the script module dependencies
 variable in `WP_Script_Modules::get_import_map()`.

Renames the variable that holds the script module dependencies of scripts to `$script_module_dependencies` and updates the comments to say "scripts", the name used in the rest of the codebase. There is no change in behavior.

See #66591.
---
 src/wp-includes/class-wp-script-modules.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/class-wp-script-modules.php b/src/wp-includes/class-wp-script-modules.php
index 31e72469a02fd..ea41075aa32d1 100644
--- a/src/wp-includes/class-wp-script-modules.php
+++ b/src/wp-includes/class-wp-script-modules.php
@@ -648,7 +648,7 @@ public function print_import_map() {
 	 * Returns the import map array.
 	 *
 	 * @since 6.5.0
-	 * @since 7.0.0 Script module dependencies ('module_dependencies') of classic scripts are now included.
+	 * @since 7.0.0 Script module dependencies ('module_dependencies') of scripts are now included.
 	 *
 	 * @global WP_Scripts $wp_scripts
 	 *
@@ -660,8 +660,8 @@ private function get_import_map(): array {
 
 		$imports = array();
 
-		// Identify script modules that are dependencies of classic scripts.
-		$classic_script_module_dependencies = array();
+		// Identify script modules that are dependencies of scripts.
+		$script_module_dependencies = array();
 		if ( $wp_scripts instanceof WP_Scripts ) {
 			$handles = array_merge(
 				$wp_scripts->queue,
@@ -694,7 +694,7 @@ private function get_import_map(): array {
 						if ( ! isset( $this->registered[ $id ] ) ) {
 							$missing_module_dependencies[] = $id;
 						} else {
-							$classic_script_module_dependencies[] = $id;
+							$script_module_dependencies[] = $id;
 						}
 					}
 
@@ -728,8 +728,8 @@ private function get_import_map(): array {
 		// Note: the script modules in $this->queue are not included in the importmap because they get printed as scripts.
 		$ids = array_unique(
 			array_merge(
-				$classic_script_module_dependencies,
-				array_keys( $this->get_dependencies( array_merge( $this->queue, $classic_script_module_dependencies ) ) )
+				$script_module_dependencies,
+				array_keys( $this->get_dependencies( array_merge( $this->queue, $script_module_dependencies ) ) )
 			)
 		);
 		foreach ( $ids as $id ) {