Changeset 54289 for trunk/src/wp-includes/script-loader.php

Timestamp:

09/23/2022 08:25:45 AM (4 years ago)

Author:

gziolo

Message:

Build: Improve how combined assets are generated

Allows to revert changes applied in [54277] - temporary workaround for the failing Test NPM CI check on Windows.

Improvements included:

• generate combined asset files for both production and development
• store in the repository only the production version of the combined assets for packages, we use everything else only in development
• to make unit tests work, ensure that they ignore react fast refresh and use the production version of combined assets that are present in the source code

Props bernhard-reiter, jsnajdr, clorith, wildworks.
Fixes #56615.

File:

• trunk/src/wp-includes/script-loader.php (modified) (3 diffs)

trunk/src/wp-includes/script-loader.php

@@ -228 +228 @@
         ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG
         || empty( $scripts->registered['react'] )
+        || defined( 'WP_RUN_CORE_TESTS' )
     ) {
         return;
@@ -265 +266 @@
  */
 function wp_default_packages_scripts( $scripts ) {
-    $suffix = wp_scripts_get_suffix();
-
+    $suffix = defined( 'WP_RUN_CORE_TESTS' ) ? '.min' : wp_scripts_get_suffix();
     /*
      * Expects multidimensional array like:
@@ -274 +274 @@
      *     'api-fetch.js' => array(...
      */
-    $assets = include ABSPATH . WPINC . '/assets/script-loader-packages.php';
-
-    foreach ( $assets as $package_name => $package_data ) {
-        $basename = basename( $package_name, '.js' );
+    $assets = include ABSPATH . WPINC . "/assets/script-loader-packages{$suffix}.php";
+
+    foreach ( $assets as $file_name => $package_data ) {
+        $basename = str_replace( $suffix . '.js', '', basename( $file_name ) );
         $handle   = 'wp-' . $basename;
         $path     = "/wp-includes/js/dist/{$basename}{$suffix}.js";