Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-includes/media.php

@@ -6608,17 +6608,6 @@ function wp_set_client_side_media_processing_flag(): void {
 	if ( null !== $chromium_version && $chromium_version >= 137 ) {
 		wp_add_inline_script( 'wp-block-editor', 'window.__documentIsolationPolicy = true;', 'before' );
 	}
-
-	/*
-	 * Register the @wordpress/vips/worker script module as a dynamic dependency
-	 * of the wp-upload-media classic script. This ensures it is included in the
-	 * import map so that the dynamic import() in upload-media.js can resolve it.
-	 */
-	wp_scripts()->add_data(
-		'wp-upload-media',
-		'module_dependencies',
-		array( '@wordpress/vips/worker' )
-	);
 }
 
 /**

src/wp-includes/script-modules.php

@@ -211,9 +211,10 @@ function wp_default_script_modules() {
 			wp_interactivity()->add_client_navigation_support_to_script_module( $script_module_id );
 		}
 
-		// VIPS files are always minified — the non-minified versions are not
-		// shipped because they are ~10MB of inlined WASM with no debugging value.
-		if ( str_starts_with( $file_name, 'vips/' ) ) {
+		// VIPS files and the video-conversion worker are always minified — the
+		// non-minified versions are not shipped because they consist of large
+		// inlined WASM/worker code with no debugging value.
+		if ( str_starts_with( $file_name, 'vips/' ) || 'video-conversion/worker.js' === $file_name ) {
 			$file_name = str_replace( '.js', '.min.js', $file_name );
 		} elseif ( '' !== $suffix ) {
 			$file_name = str_replace( '.js', $suffix . '.js', $file_name );

tests/phpunit/tests/media/wpCrossOriginIsolation.php

@@ -315,6 +315,52 @@ public function test_client_side_processing_enabled_on_localhost() {
 		);
 	}
 
+	/**
+	 * Verifies that setting the client-side media processing flag does not
+	 * clobber the script module dependencies of the upload-media script.
+	 *
+	 * Re-registering `@wordpress/vips/worker` via WP_Scripts::add_data(),
+	 * which overwrites rather than merges, dropped the module dependencies
+	 * declared in the packages asset file. This removed
+	 * `@wordpress/video-conversion/worker` from the import map and broke
+	 * animated GIF to video conversion.
+	 *
+	 * @ticket 65664
+	 *
+	 * @covers ::wp_set_client_side_media_processing_flag
+	 */
+	public function test_set_flag_preserves_upload_media_module_dependencies() {
+		add_filter( 'wp_client_side_media_processing_enabled', '__return_true' );
+
+		$before = wp_scripts()->get_data( 'wp-upload-media', 'module_dependencies' );
+
+		wp_set_client_side_media_processing_flag();
+
+		$after = wp_scripts()->get_data( 'wp-upload-media', 'module_dependencies' );
+
+		$this->assertSame(
+			$before,
+			$after,
+			'The module dependencies of the upload-media script should not be modified.'
+		);
+
+		$ids = array();
+		foreach ( (array) $after as $module ) {
+			$ids[] = is_array( $module ) ? $module['id'] : $module;
+		}
+
+		$this->assertContains(
+			'@wordpress/vips/worker',
+			$ids,
+			'The vips worker should be a module dependency of the upload-media script.'
+		);
+		$this->assertContains(
+			'@wordpress/video-conversion/worker',
+			$ids,
+			'The video-conversion worker should be a module dependency of the upload-media script.'
+		);
+	}
+
 	/**
 	 * Verifies that cross-origin elements get crossorigin="anonymous" added.
 	 *

tests/phpunit/tests/script-modules/wpScriptModules.php

@@ -1850,6 +1850,50 @@ public function test_default_script_modules() {
 		);
 	}
 
+	/**
+	 * Tests that every default script module points to a file that exists on
+	 * disk, both with and without SCRIPT_DEBUG.
+	 *
+	 * Some files are only shipped minified (large inlined WASM or worker
+	 * code with no debugging value). Those must be special-cased in
+	 * wp_default_script_modules() so the non-minified URL is never used;
+	 * otherwise the import map points to a non-existent file under
+	 * SCRIPT_DEBUG. The exceptions below must mirror that special case.
+	 *
+	 * @ticket 65664
+	 *
+	 * @covers ::wp_default_script_modules
+	 */
+	public function test_default_script_module_files_exist() {
+		$assets_file = ABSPATH . WPINC . '/assets/script-modules-packages.php';
+		if ( ! file_exists( $assets_file ) ) {
+			$this->markTestSkipped( 'The script modules packages asset file is not available.' );
+		}
+
+		$assets = include $assets_file;
+		$this->assertNotEmpty( $assets, 'The script modules packages asset file should not be empty.' );
+
+		foreach ( array_keys( $assets ) as $file_name ) {
+			// Files only shipped minified; mirrors wp_default_script_modules().
+			if ( str_starts_with( $file_name, 'vips/' ) || 'video-conversion/worker.js' === $file_name ) {
+				$file_name = str_replace( '.js', '.min.js', $file_name );
+			}
+
+			$min_file_name = str_ends_with( $file_name, '.min.js' )
+				? $file_name
+				: substr( $file_name, 0, -3 ) . '.min.js';
+
+			$this->assertFileExists(
+				ABSPATH . WPINC . "/js/dist/script-modules/{$file_name}",
+				"The script module file used with SCRIPT_DEBUG enabled should exist for '{$file_name}'."
+			);
+			$this->assertFileExists(
+				ABSPATH . WPINC . "/js/dist/script-modules/{$min_file_name}",
+				"The minified script module file should exist for '{$file_name}'."
+			);
+		}
+	}
+
 	/**
 	 * Tests expected priority is used when a dependent is registered but not enqueued.
 	 *