Ticket #48154: 48154.diff

Gruntfile.js

@@ -117 +117 @@
                                 WORKING_DIR + 'wp-includes/js/'
                         ],
                         'webpack-assets': [
-                                WORKING_DIR + 'wp-includes/js/**/*.asset.php'
+                                WORKING_DIR + 'wp-includes/js/dist/assets.php'
                         ],
                         dynamic: {
                                 dot: true,
@@ -356 +356 @@
                                 ]
                         },
                         'webpack-assets': {
-                                expand: true,
-                                cwd: WORKING_DIR + 'wp-includes/js/',
-                                src: 'dist/*.asset.php',
-                                dest: WORKING_DIR + 'wp-includes/assets/'
+                                files: [
+                                        {
+                                                src: WORKING_DIR + 'wp-includes/js/dist/assets.php',
+                                                dest: SOURCE_DIR + 'wp-includes/assets/script-loader-deps.php'
+                                        },
+                                        {
+                                                src:  WORKING_DIR + 'wp-includes/js/dist/assets.php',
+                                                dest: BUILD_DIR + 'wp-includes/assets/script-loader-deps.php'
+                                        }
+                                ]
                         },
                         version: {
                                 options: {

package-lock.json

@@ -2525 +2525 @@
                         }
                 },
                 "@wordpress/dependency-extraction-webpack-plugin": {
-                        "version": "2.2.0",
-                        "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-2.2.0.tgz",
-                        "integrity": "sha512-74zJPfSohTfcNtNG/Y0VmE/ow1sG6wCEl7A7xN3VdhMRFUOfpfGV2XifBA9UjDoxY/IAbf80WDqiuA7MzcDMKw==",
+                        "version": "2.3.0",
+                        "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-2.3.0.tgz",
+                        "integrity": "sha512-FwEN0PuFr3Q5IdDLgerkIspiHkePNbzem71R3RlUevaSmnw+iH9/0Jzg4uIQ8KCMBpbrn1gAmhgdaTgTDn3EfQ==",
                         "dev": true,
                         "requires": {
                                 "json2php": "^0.0.4",

package.json

@@ -26 +26 @@
         ],
         "devDependencies": {
                 "@wordpress/custom-templated-path-webpack-plugin": "1.6.0",
-                "@wordpress/dependency-extraction-webpack-plugin": "2.2.0",
+                "@wordpress/dependency-extraction-webpack-plugin": "2.3.0",
                 "@wordpress/e2e-test-utils": "4.3.0",
                 "@wordpress/library-export-default-webpack-plugin": "1.6.0",
                 "@wordpress/scripts": "6.2.0",

src/wp-includes/script-loader.php

@@ -231 +231 @@
 function wp_default_packages_scripts( &$scripts ) {
         $suffix = wp_scripts_get_suffix();
 
-        $packages = array(
-                'a11y',
-                'annotations',
-                'api-fetch',
-                'autop',
-                'blob',
-                'block-directory',
-                'block-editor',
-                'block-library',
-                'block-serialization-default-parser',
-                'blocks',
-                'components',
-                'compose',
-                'core-data',
-                'data',
-                'data-controls',
-                'date',
-                'deprecated',
-                'dom',
-                'dom-ready',
-                'edit-post',
-                'editor',
-                'element',
-                'escape-html',
-                'format-library',
-                'hooks',
-                'html-entities',
-                'i18n',
-                'is-shallow-equal',
-                'keyboard-shortcuts',
-                'keycodes',
-                'list-reusable-blocks',
-                'media-utils',
-                'notices',
-                'nux',
-                'plugins',
-                'primitives',
-                'priority-queue',
-                'redux-routine',
-                'rich-text',
-                'shortcode',
-                'server-side-render',
-                'token-list',
-                'url',
-                'viewport',
-                'warning',
-                'wordcount',
-        );
+        // Expects an array of: `'a11y.js' => array('dependencies' => array(...), 'version' => '...'),`.
+        $assets   = include ABSPATH . WPINC . '/assets/script-loader-deps.php';
+        $packages = array_keys( $assets );
 
         $package_translations = array(
                 'api-fetch',
@@ -296 +251 @@
         );
 
         foreach ( $packages as $package ) {
-                $handle = 'wp-' . $package;
-                $path   = "/wp-includes/js/dist/$package$suffix.js";
+                $basename = basename( $package, '.js' );
+                $handle   = 'wp-' . $basename;
+                $path     = "/wp-includes/js/dist/$basename$suffix.js";
 
-                if ( ! file_exists( ABSPATH . $path ) ) {
-                        continue;
+                if ( ! empty( $assets[ $package ]['dependencies'] ) ) {
+                        $dependencies = $assets[ $package ]['dependencies'];
+                } else {
+                        $dependencies = array();
                 }
 
-                $asset_file   = require ABSPATH . WPINC . "/assets/dist/$package$suffix.asset.php";
-                $dependencies = $asset_file['dependencies'];
-
                 // Add dependencies that cannot be detected and generated by build tools.
                 switch ( $handle ) {
                         case 'wp-block-library':
@@ -316 +271 @@
                                 break;
                 }
 
-                $scripts->add( $handle, $path, $dependencies, $asset_file['version'], 1 );
+                $scripts->add( $handle, $path, $dependencies, $assets[ $package ]['version'], 1 );
 
-                if ( in_array( $package, $package_translations, true ) ) {
+                if ( in_array( $basename, $package_translations, true ) ) {
                         $scripts->set_translations( $handle );
                 }
         }

tools/webpack/packages.js

@@ -246 +246 @@
                         } ),
                         new DependencyExtractionPlugin( {
                                 injectPolyfill: true,
+                                combineAssets: true,
                         } ),
                         new CopyWebpackPlugin(
                                 [