Improve webpack configuration for the development scripts

WordPress · Apr 11, 2022 · b1f7065 · b1f7065
1 parent 4f67b8e
commit b1f7065
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/wp-includes/assets/development/react-refresh-entry.php b/src/wp-includes/assets/development/react-refresh-entry.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-react-refresh-runtime'), 'version' => '8151afc94a5ebc73b7a8229f0d7ee352');
diff --git a/src/wp-includes/assets/development/react-refresh-runtime.php b/src/wp-includes/assets/development/react-refresh-runtime.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => '4fb86f241c3b2d9d9e0411b507079823');
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
@@ -224,7 +224,10 @@ function wp_get_script_polyfill( $scripts, $tests ) {
  * @param WP_Scripts $scripts WP_Scripts object.
  */
 function wp_register_development_scripts( $scripts ) {
-	if ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) {
+	if (
+		! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG
+		|| empty( $scripts->registered['react'] )
+	) {
 		return;
 	}
 
@@ -234,7 +237,10 @@ function wp_register_development_scripts( $scripts ) {
 	);
 
 	foreach ( $development_scripts as $script_name ) {
-		$assets = include ABSPATH . WPINC . "/js/dist/development/$script_name.php";
+		$assets = include ABSPATH . WPINC . "/assets/development/$script_name.php";
+		if ( ! is_array( $assets ) ) {
+			return;
+		}
 		$scripts->add(
 			'wp-' . $script_name,
 			"/wp-includes/js/dist/development/$script_name.js",
@@ -244,7 +250,7 @@ function wp_register_development_scripts( $scripts ) {
 	}
 
 	// See https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/docs/TROUBLESHOOTING.md#externalising-react.
-	$scripts->query( 'react' )->deps[] = 'wp-react-refresh-entry';
+	$scripts->registered['react']->deps[] = 'wp-react-refresh-entry';
 }
 
 /**

diff --git a/tools/webpack/development.js b/tools/webpack/development.js
@@ -34,7 +34,9 @@ module.exports = function( env = { environment: 'production', buildTarget: false
 				'react-refresh-entry':
 				'@pmmmwh/react-refresh-webpack-plugin/client/ReactRefreshEntry.js',
 			},
-			plugins: [ new DependencyExtractionWebpackPlugin() ],
+			plugins: [ new DependencyExtractionWebpackPlugin( {
+				outputFilename: '../../../assets/development/[name].php',
+			} ) ],
 		},
 		{
 			...sharedConfig,
@@ -51,6 +53,7 @@ module.exports = function( env = { environment: 'production', buildTarget: false
 			plugins: [
 				new DependencyExtractionWebpackPlugin( {
 					useDefaults: false,
+					outputFilename: '../../../assets/development/[name].php'
 				} ),
 			],
 		},