Ticket #48154: 49154.diff

package.json

@@ -14 +14 @@
         "license": "GPL-2.0-or-later",
         "devDependencies": {
                 "@wordpress/custom-templated-path-webpack-plugin": "1.5.0",
+                "@wordpress/dependency-extraction-webpack-plugin": "2.0.0",
                 "@wordpress/e2e-test-utils": "2.4.0",
                 "@wordpress/library-export-default-webpack-plugin": "1.4.0",
                 "@wordpress/scripts": "5.0.0",
@@ -64 +65 @@
                 "@wordpress/api-fetch": "3.6.0",
                 "@wordpress/autop": "2.5.0",
                 "@wordpress/blob": "2.5.0",
+                "@wordpress/block-directory": "1.0.0",
                 "@wordpress/block-editor": "3.2.0",
                 "@wordpress/block-library": "2.9.0",
                 "@wordpress/block-serialization-default-parser": "3.4.0",

src/wp-includes/script-loader.php

@@ -223 +223 @@
 function wp_default_packages_scripts( &$scripts ) {
         $suffix = wp_scripts_get_suffix();
 
-        $packages_versions = array(
-                'a11y'                               => '2.5.0',
-                'annotations'                        => '1.7.0',
-                'api-fetch'                          => '3.6.0',
-                'autop'                              => '2.5.0',
-                'blob'                               => '2.5.0',
-                'block-editor'                       => '3.2.0',
-                'block-library'                      => '2.9.0',
-                'block-serialization-default-parser' => '3.4.0',
-                'blocks'                             => '6.7.0',
-                'components'                         => '8.3.0',
-                'compose'                            => '3.7.0',
-                'core-data'                          => '2.7.0',
-                'data'                               => '4.9.0',
-                'data-controls'                      => '1.3.0',
-                'date'                               => '3.5.0',
-                'deprecated'                         => '2.6.0',
-                'dom'                                => '2.5.0',
-                'dom-ready'                          => '2.5.0',
-                'edit-post'                          => '3.8.0',
-                'editor'                             => '9.7.0',
-                'element'                            => '2.8.0',
-                'escape-html'                        => '1.5.0',
-                'format-library'                     => '1.9.0',
-                'hooks'                              => '2.6.0',
-                'html-entities'                      => '2.5.0',
-                'i18n'                               => '3.6.0',
-                'is-shallow-equal'                   => '1.6.0',
-                'keycodes'                           => '2.6.0',
-                'list-reusable-blocks'               => '1.8.0',
-                'media-utils'                        => '1.2.0',
-                'notices'                            => '1.8.0',
-                'nux'                                => '3.7.0',
-                'plugins'                            => '2.7.0',
-                'priority-queue'                     => '1.3.0',
-                'redux-routine'                      => '3.6.0',
-                'rich-text'                          => '3.7.0',
-                'shortcode'                          => '2.4.0',
-                'server-side-render'                 => '1.3.0',
-                'token-list'                         => '1.6.0',
-                'url'                                => '2.8.0',
-                'viewport'                           => '2.8.0',
-                'wordcount'                          => '2.6.0',
-        );
-
-        $packages_dependencies = array(
-                'a11y'                               => array(
-                        'wp-dom-ready',
-                        'wp-polyfill',
-                ),
-                'annotations'                        => array(
-                        'lodash',
-                        'wp-data',
-                        'wp-hooks',
-                        'wp-i18n',
-                        'wp-polyfill',
-                        'wp-rich-text',
-                ),
-                'api-fetch'                          => array(
-                        'wp-i18n',
-                        'wp-polyfill',
-                        'wp-url',
-                ),
-                'autop'                              => array(
-                        'wp-polyfill',
-                ),
-                'blob'                               => array(
-                        'wp-polyfill',
-                ),
-                'block-editor'                       => array(
-                        'lodash',
-                        'wp-a11y',
-                        'wp-blob',
-                        'wp-blocks',
-                        'wp-components',
-                        'wp-compose',
-                        'wp-data',
-                        'wp-deprecated',
-                        'wp-dom',
-                        'wp-element',
-                        'wp-hooks',
-                        'wp-html-entities',
-                        'wp-i18n',
-                        'wp-is-shallow-equal',
-                        'wp-keycodes',
-                        'wp-polyfill',
-                        'wp-rich-text',
-                        'wp-token-list',
-                        'wp-url',
-                        'wp-viewport',
-                        'wp-wordcount',
-                ),
-                'block-library'                      => array(
-                        'editor',
-                        'lodash',
-                        'moment',
-                        'wp-a11y',
-                        'wp-api-fetch',
-                        'wp-autop',
-                        'wp-blob',
-                        'wp-block-editor',
-                        'wp-blocks',
-                        'wp-components',
-                        'wp-compose',
-                        'wp-core-data',
-                        'wp-data',
-                        'wp-date',
-                        'wp-deprecated',
-                        'wp-editor',
-                        'wp-element',
-                        'wp-i18n',
-                        'wp-is-shallow-equal',
-                        'wp-keycodes',
-                        'wp-polyfill',
-                        'wp-rich-text',
-                        'wp-server-side-render',
-                        'wp-url',
-                        'wp-viewport',
-                ),
-                'block-serialization-default-parser' => array(
-                        'wp-polyfill',
-                ),
-                'blocks'                             => array(
-                        'lodash',
-                        'wp-autop',
-                        'wp-blob',
-                        'wp-block-serialization-default-parser',
-                        'wp-compose',
-                        'wp-data',
-                        'wp-dom',
-                        'wp-element',
-                        'wp-hooks',
-                        'wp-html-entities',
-                        'wp-i18n',
-                        'wp-is-shallow-equal',
-                        'wp-polyfill',
-                        'wp-shortcode',
-                ),
-                'components'                         => array(
-                        'lodash',
-                        'moment',
-                        'wp-a11y',
-                        'wp-compose',
-                        'wp-deprecated',
-                        'wp-dom',
-                        'wp-element',
-                        'wp-hooks',
-                        'wp-i18n',
-                        'wp-is-shallow-equal',
-                        'wp-keycodes',
-                        'wp-polyfill',
-                        'wp-rich-text',
-                ),
-                'compose'                            => array(
-                        'lodash',
-                        'wp-element',
-                        'wp-is-shallow-equal',
-                        'wp-polyfill',
-                ),
-                'core-data'                          => array(
-                        'lodash',
-                        'wp-api-fetch',
-                        'wp-data',
-                        'wp-deprecated',
-                        'wp-is-shallow-equal',
-                        'wp-polyfill',
-                        'wp-url',
-                ),
-                'data'                               => array(
-                        'lodash',
-                        'wp-compose',
-                        'wp-deprecated',
-                        'wp-element',
-                        'wp-is-shallow-equal',
-                        'wp-polyfill',
-                        'wp-priority-queue',
-                        'wp-redux-routine',
-                ),
-                'data-controls'                      => array(
-                        'wp-api-fetch',
-                        'wp-data',
-                        'wp-polyfill',
-                ),
-                'date'                               => array(
-                        'moment',
-                        'wp-polyfill',
-                ),
-                'deprecated'                         => array(
-                        'wp-hooks',
-                        'wp-polyfill',
-                ),
-                'dom'                                => array(
-                        'lodash',
-                        'wp-polyfill',
-                ),
-                'dom-ready'                          => array(
-                        'wp-polyfill',
-                ),
-                'edit-post'                          => array(
-                        'lodash',
-                        'postbox',
-                        'media-models',
-                        'media-views',
-                        'wp-a11y',
-                        'wp-api-fetch',
-                        'wp-block-editor',
-                        'wp-block-library',
-                        'wp-blocks',
-                        'wp-components',
-                        'wp-compose',
-                        'wp-core-data',
-                        'wp-data',
-                        'wp-dom-ready',
-                        'wp-editor',
-                        'wp-element',
-                        'wp-hooks',
-                        'wp-i18n',
-                        'wp-keycodes',
-                        'wp-media-utils',
-                        'wp-notices',
-                        'wp-nux',
-                        'wp-plugins',
-                        'wp-polyfill',
-                        'wp-url',
-                        'wp-viewport',
-                ),
-                'editor'                             => array(
-                        'lodash',
-                        'wp-api-fetch',
-                        'wp-autop',
-                        'wp-block-editor',
-                        'wp-blocks',
-                        'wp-components',
-                        'wp-compose',
-                        'wp-core-data',
-                        'wp-data',
-                        'wp-data-controls',
-                        'wp-date',
-                        'wp-deprecated',
-                        'wp-element',
-                        'wp-hooks',
-                        'wp-html-entities',
-                        'wp-i18n',
-                        'wp-is-shallow-equal',
-                        'wp-keycodes',
-                        'wp-media-utils',
-                        'wp-notices',
-                        'wp-nux',
-                        'wp-polyfill',
-                        'wp-rich-text',
-                        'wp-server-side-render',
-                        'wp-url',
-                        'wp-viewport',
-                        'wp-wordcount',
-                ),
-                'element'                            => array(
-                        'lodash',
-                        'react',
-                        'react-dom',
-                        'wp-escape-html',
-                        'wp-polyfill',
-                ),
-                'escape-html'                        => array(
-                        'wp-polyfill',
-                ),
-                'format-library'                     => array(
-                        'lodash',
-                        'wp-block-editor',
-                        'wp-components',
-                        'wp-dom',
-                        'wp-element',
-                        'wp-html-entities',
-                        'wp-i18n',
-                        'wp-keycodes',
-                        'wp-polyfill',
-                        'wp-rich-text',
-                        'wp-url',
-                ),
-                'hooks'                              => array(
-                        'wp-polyfill',
-                ),
-                'html-entities'                      => array(
-                        'wp-polyfill',
-                ),
-                'i18n'                               => array(
-                        'wp-polyfill',
-                ),
-                'is-shallow-equal'                   => array(
-                        'wp-polyfill',
-                ),
-                'keycodes'                           => array(
-                        'lodash',
-                        'wp-i18n',
-                        'wp-polyfill',
-                ),
-                'list-reusable-blocks'               => array(
-                        'lodash',
-                        'wp-api-fetch',
-                        'wp-components',
-                        'wp-compose',
-                        'wp-element',
-                        'wp-i18n',
-                        'wp-polyfill',
-                ),
-                'media-utils'                        => array(
-                        'lodash',
-                        'wp-api-fetch',
-                        'wp-blob',
-                        'wp-element',
-                        'wp-i18n',
-                        'wp-polyfill',
-                ),
-                'notices'                            => array(
-                        'lodash',
-                        'wp-a11y',
-                        'wp-data',
-                        'wp-polyfill',
-                ),
-                'nux'                                => array(
-                        'lodash',
-                        'wp-components',
-                        'wp-compose',
-                        'wp-data',
-                        'wp-element',
-                        'wp-i18n',
-                        'wp-polyfill',
-                ),
-                'plugins'                            => array(
-                        'lodash',
-                        'wp-compose',
-                        'wp-element',
-                        'wp-hooks',
-                        'wp-polyfill',
-                ),
-                'priority-queue'                     => array(
-                        'wp-polyfill',
-                ),
-                'redux-routine'                      => array(
-                        'lodash',
-                        'wp-polyfill',
-                ),
-                'rich-text'                          => array(
-                        'lodash',
-                        'wp-compose',
-                        'wp-data',
-                        'wp-element',
-                        'wp-escape-html',
-                        'wp-hooks',
-                        'wp-is-shallow-equal',
-                        'wp-keycodes',
-                        'wp-polyfill',
-                ),
-                'server-side-render'                 => array(
-                        'lodash',
-                        'wp-api-fetch',
-                        'wp-components',
-                        'wp-data',
-                        'wp-deprecated',
-                        'wp-element',
-                        'wp-i18n',
-                        'wp-polyfill',
-                        'wp-url',
-                ),
-                'shortcode'                          => array(
-                        'lodash',
-                        'wp-polyfill',
-                ),
-                'token-list'                         => array(
-                        'lodash',
-                        'wp-polyfill',
-                ),
-                'url'                                => array(
-                        'wp-polyfill',
-                ),
-                'viewport'                           => array(
-                        'lodash',
-                        'wp-compose',
-                        'wp-data',
-                        'wp-polyfill',
-                ),
-                'wordcount'                          => array(
-                        'lodash',
-                        'wp-polyfill',
-                ),
+        $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',
+                'keycodes',
+                'list-reusable-blocks',
+                'media-utils',
+                'notices',
+                'nux',
+                'plugins',
+                'priority-queue',
+                'redux-routine',
+                'rich-text',
+                'shortcode',
+                'server-side-render',
+                'token-list',
+                'url',
+                'viewport',
+                'wordcount',
         );
 
         $package_translations = array(
                 'api-fetch',
                 'blocks',
+                'block-directory',
                 'block-editor',
                 'block-library',
                 'components',
@@ -623 +284 @@
                 'nux',
         );
 
-        foreach ( $packages_dependencies as $package => $dependencies ) {
-                $handle  = 'wp-' . $package;
-                $path    = "/wp-includes/js/dist/$package$suffix.js";
-                $version = $packages_versions[ $package ];
+        foreach ( $packages as $package ) {
+                $handle       = 'wp-' . $package;
+                $path         = "/wp-includes/js/dist/$package$suffix.js";
+                $asset_file   = include( ABSPATH . WPINC . "/js/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':
+                                array_push( $dependencies, 'editor' );
+                                break;
+                        case 'wp-edit-post':
+                                array_push( $dependencies, 'media-models', 'media-views', 'postbox', 'wp-dom-ready' );
+                                break;
+                }
 
-                $scripts->add( $handle, $path, $dependencies, $version, 1 );
+                $scripts->add( $handle, $path, $dependencies, $asset_file['version'], 1 );
 
                 if ( in_array( $package, $package_translations, true ) ) {
                         $scripts->set_translations( $handle );

tools/webpack/packages.js

@@ -1 +1 @@
 /**
  * External dependencies
  */
-const LiveReloadPlugin = require( 'webpack-livereload-plugin' );
+const { DefinePlugin } = require( 'webpack' );
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
+const LiveReloadPlugin = require( 'webpack-livereload-plugin' );
 const postcss = require( 'postcss' );
 const UglifyJS = require( 'uglify-js' );
 
@@ -13 +14 @@
  * WordPress dependencies
  */
 const CustomTemplatedPathPlugin = require( '@wordpress/custom-templated-path-webpack-plugin' );
+const DependencyExtractionPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
 const LibraryExportDefaultPlugin = require( '@wordpress/library-export-default-webpack-plugin' );
 
 /**
@@ -107 +109 @@
                 'block-library/src/tag-cloud/index.php': 'wp-includes/blocks/tag-cloud.php',
         };
 
-        const externals = {
-                react: 'React',
-                'react-dom': 'ReactDOM',
-                tinymce: 'tinymce',
-                moment: 'moment',
-                jquery: 'jQuery',
-                lodash: 'lodash',
-                'lodash-es': 'lodash',
-        };
-
-        packages.forEach( ( name ) => {
-                externals[ `@wordpress/${ name }` ] = {
-                        this: [ 'wp', camelCaseDash( name ) ],
-                };
-        } );
-
         const developmentCopies = mapVendorCopies( vendors, buildTarget );
         const minifiedCopies = mapVendorCopies( minifiedVendors, buildTarget );
         const minifyCopies = mapVendorCopies( minifyVendors, buildTarget ).map( ( copyCommand ) => {
@@ -184 +170 @@
                         },
                         libraryTarget: 'this',
                 },
-                externals,
                 resolve: {
                         modules: [
                                 baseDir,
@@ -204 +189 @@
                         ],
                 },
                 plugins: [
+                        new DefinePlugin( {
+                                // Inject the `GUTENBERG_PHASE` global, used for feature flagging.
+                                'process.env.GUTENBERG_PHASE': JSON.stringify( parseInt( process.env.npm_package_config_GUTENBERG_PHASE, 10 ) || 1 ),
+                        } ),
                         new LibraryExportDefaultPlugin( [
                                 'api-fetch',
                                 'deprecated',
@@ -242 +231 @@
                                         ...phpCopies,
                                 ],
                         ),
+                        new DependencyExtractionPlugin( { injectPolyfill: true } ),
                 ],
                 stats: {
                         children: false,