Changeset 47352

Timestamp:

02/24/2020 09:20:49 PM (7 years ago)

Author:

azaozz

Message:

Build Tools:

• Update the DependencyExtractionWebpackPlugin to 2.3.0 and set it to output a single assets file.
• Grunt: copy the assets file to both SOURCE_DIR and BUILD_DIR as wp-includes/assets/script-loader-packages.php.
• "Unignore" the wp-includes/assets directory. Its content will be committed similarly to wp-includes/blocks.
• Update wp_default_packages_scripts() to use the above file. This also removes the hard-coded lists of packages and packages with translations.

Props gziolo, pbearne, johnbillion, isabel_brison, ocean90, azaozz.
Fixes #48154.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• Gruntfile.js (modified) (2 diffs)
• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/wp-includes (modified) (1 prop)
• src/wp-includes/assets (added)
• src/wp-includes/assets/script-loader-packages.php (added)
• src/wp-includes/script-loader.php (modified) (2 diffs)
• tools/webpack/packages.js (modified) (1 diff)

trunk/.gitignore

@@ -25 +25 @@
 /src/wp-admin/css/colors/*/*.css
 /src/wp-admin/js
-/src/wp-includes/assets
 /src/wp-includes/js
 /src/wp-includes/css/dist

trunk/Gruntfile.js

@@ -118 +118 @@
                         ],
                         'webpack-assets': [
-                                WORKING_DIR + 'wp-includes/js/**/*.asset.php'
+                                WORKING_DIR + 'wp-includes/js/dist/assets.php'
                         ],
                         dynamic: {
@@ -357 +357 @@
                         },
                         '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-packages.php'
+                                        },
+                                        {
+                                                src:  WORKING_DIR + 'wp-includes/js/dist/assets.php',
+                                                dest: BUILD_DIR + 'wp-includes/assets/script-loader-packages.php'
+                                        }
+                                ]
                         },
                         version: {

trunk/package-lock.json

@@ -2526 +2526 @@
                 },
                 "@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": {

trunk/package.json

@@ -27 +27 @@
         "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",

trunk/src/wp-includes

@@ -1 @@
-assets
+
 js

@@ -1 @@
-assets
+
 js

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

@@ -232 +232 @@
         $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',
-        );
-
-        $package_translations = array(
-                'api-fetch',
-                'blocks',
-                'block-directory',
-                'block-editor',
-                'block-library',
-                'components',
-                'edit-post',
-                'editor',
-                'format-library',
-                'keycodes',
-                'list-reusable-blocks',
-                'nux',
-        );
-
-        foreach ( $packages as $package ) {
-                $handle = 'wp-' . $package;
-                $path   = "/wp-includes/js/dist/$package$suffix.js";
-
-                if ( ! file_exists( ABSPATH . $path ) ) {
-                        continue;
-                }
-
-                $asset_file   = require ABSPATH . WPINC . "/assets/dist/$package$suffix.asset.php";
-                $dependencies = $asset_file['dependencies'];
+        // Expects multidimensional array like:
+        //      'a11y.js' => array('dependencies' => array(...), 'version' => '...'),
+        //      'annotations.js' => array('dependencies' => array(...), 'version' => '...'),
+        //      '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' );
+                $handle   = 'wp-' . $basename;
+                $path     = "/wp-includes/js/dist/{$basename}{$suffix}.js";
+
+                if ( ! empty( $package_data['dependencies'] ) ) {
+                        $dependencies = $package_data['dependencies'];
+                } else {
+                        $dependencies = array();
+                }
 
                 // Add dependencies that cannot be detected and generated by build tools.
@@ -317 +259 @@
                 }
 
-                $scripts->add( $handle, $path, $dependencies, $asset_file['version'], 1 );
-
-                if ( in_array( $package, $package_translations, true ) ) {
+                $scripts->add( $handle, $path, $dependencies, $package_data['version'], 1 );
+
+                if ( in_array( 'wp-i18n', $dependencies, true ) ) {
                         $scripts->set_translations( $handle );
                 }

trunk/tools/webpack/packages.js

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

@@ -1 @@
-assets
+
 js