Changeset 54307

Timestamp:

09/26/2022 11:20:43 AM (22 months ago)

Author:

gziolo

Message:

Tools: Fix running build scripts on Windows does not generate CSS files for blocks

Starting with WordPress 6.0, when running npm run build or npm run build:dev, no CSS files were generated for the blocks within wp-includes/blocks/**.

Props wildworks, clorith, sergeybiryukov.
Fixes #56616.

Location:

trunk/tools/webpack

Files:

• blocks.js (modified) (4 diffs)
• packages.js (modified) (7 diffs)
• shared.js (modified) (1 diff)

trunk/tools/webpack/blocks.js

@@ -4 +4 @@
 const { DefinePlugin } = require( 'webpack' );
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
-const { join } = require( 'path' );
 
 /**
@@ -14 +13 @@
  * Internal dependencies
  */
-const { stylesTransform, baseConfig, baseDir } = require( './shared' );
+const { stylesTransform, baseConfig, baseDir } = require( './shared' );
 
 module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
@@ -132 +131 @@
 
     const blockPHPCopies = Object.keys( blockPHPFiles ).map( ( filename ) => ( {
-        from: join( baseDir, `node_modules/@wordpress/${ filename }` ),
-        to: join( baseDir, `src/${ blockPHPFiles[ filename ] }` ),
+        from: baseDir, `node_modules/@wordpress/${ filename }` ),
+        to: baseDir, `src/${ blockPHPFiles[ filename ] }` ),
     } ) );
 
     const blockMetadataCopies = Object.keys( blockMetadataFiles ).map( ( filename ) => ( {
-        from: join( baseDir, `node_modules/@wordpress/${ filename }` ),
-        to: join( baseDir, `src/${ blockMetadataFiles[ filename ] }` ),
+        from: baseDir, `node_modules/@wordpress/${ filename }` ),
+        to: baseDir, `src/${ blockMetadataFiles[ filename ] }` ),
     } ) );
 
     const blockStylesheetCopies = blockFolders.map( ( blockName ) => ( {
-        from: join( baseDir, `node_modules/@wordpress/block-library/build-style/${ blockName }/*.css` ),
-        to: join( baseDir, `${ buildTarget }/blocks/${ blockName }/[name]${ suffix }.css` ),
+        from: baseDir, `node_modules/@wordpress/block-library/build-style/${ blockName }/*.css` ),
+        to: baseDir, `${ buildTarget }/blocks/${ blockName }/[name]${ suffix }.css` ),
         transform: stylesTransform( mode ),
         noErrorOnMissing: true,
@@ -151 +150 @@
         ...baseConfig( env ),
         entry: {
-            'file/view': join( baseDir, `node_modules/@wordpress/block-library/build-module/file/view` ),
-            'navigation/view': join( baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view` ),
-            'navigation/view-modal': join( baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view-modal` ),
+            'file/view': baseDir, `node_modules/@wordpress/block-library/build-module/file/view` ),
+            'navigation/view': baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view` ),
+            'navigation/view-modal': baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view-modal` ),
         },
         output: {
             devtoolNamespace: 'wp',
             filename: `[name]${ suffix }.js`,
-            path: join( baseDir, `${ buildTarget }/blocks` ),
+            path: baseDir, `${ buildTarget }/blocks` ),
         },
         plugins: [

trunk/tools/webpack/packages.js

@@ -6 +6 @@
 const LiveReloadPlugin = require( 'webpack-livereload-plugin' );
 const UglifyJS = require( 'uglify-js' );
-const { join } = require( 'path' );
 
 /**
@@ -19 +18 @@
  * Internal dependencies
  */
-const { stylesTransform, baseConfig, baseDir } = require( './shared' );
+const { stylesTransform, baseConfig, baseDir } = require( './shared' );
 const { dependencies } = require( '../../package' );
 
@@ -43 +42 @@
 function mapVendorCopies( vendors, buildTarget ) {
     return Object.keys( vendors ).map( ( filename ) => ( {
-        from: join( baseDir, `node_modules/${ vendors[ filename ] }` ),
-        to: join( baseDir, `${ buildTarget }/js/dist/vendor/${ filename }` ),
+        from: baseDir, `node_modules/${ vendors[ filename ] }` ),
+        to: baseDir, `${ buildTarget }/js/dist/vendor/${ filename }` ),
     } ) );
 }
@@ -116 +115 @@
 
     let cssCopies = packages.map( ( packageName ) => ( {
-        from: join( baseDir, `node_modules/@wordpress/${ packageName }/build-style/*.css` ),
-        to: join( baseDir, `${ buildTarget }/css/dist/${ packageName }/[name]${ suffix }.css` ),
+        from: baseDir, `node_modules/@wordpress/${ packageName }/build-style/*.css` ),
+        to: baseDir, `${ buildTarget }/css/dist/${ packageName }/[name]${ suffix }.css` ),
         transform: stylesTransform( mode ),
         noErrorOnMissing: true,
@@ -123 +122 @@
 
     const phpCopies = Object.keys( phpFiles ).map( ( filename ) => ( {
-        from: join( baseDir, `node_modules/@wordpress/${ filename }` ),
-        to: join( baseDir, `src/${ phpFiles[ filename ] }` ),
+        from: baseDir, `node_modules/@wordpress/${ filename }` ),
+        to: baseDir, `src/${ phpFiles[ filename ] }` ),
     } ) );
 
@@ -131 +130 @@
         entry: packages.reduce( ( memo, packageName ) => {
             memo[ packageName ] = {
-                import: join( baseDir, `node_modules/@wordpress/${ packageName }` ),
+                import: baseDir, `node_modules/@wordpress/${ packageName }` ),
                 library: {
                     name: [ 'wp', camelCaseDash( packageName ) ],
@@ -146 +145 @@
             devtoolNamespace: 'wp',
             filename: `[name]${ suffix }.js`,
-            path: join( baseDir, `${ buildTarget }/js/dist` ),
+            path: baseDir, `${ buildTarget }/js/dist` ),
         },
         plugins: [

trunk/tools/webpack/shared.js

@@ -70 +70 @@
 };
 
+
+
+
 module.exports = {
     baseDir,
     baseConfig,
+
     stylesTransform,
 };