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

Timestamp:

02/24/2020 09:20:49 PM (6 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/src/wp-includes

Files:

• . (modified) (1 prop)
• script-loader.php (modified) (2 diffs)

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 );
                 }

@@ -1 @@
-assets
+
 js