<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54307] trunk/tools/webpack: Tools: Fix running `build` scripts on Windows does not generate CSS files for blocks</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54307">54307</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54307","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-26 11:20:43 +0000 (Mon, 26 Sep 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/56616">#56616</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktoolswebpackblocksjs">trunk/tools/webpack/blocks.js</a></li>
<li><a href="#trunktoolswebpackpackagesjs">trunk/tools/webpack/packages.js</a></li>
<li><a href="#trunktoolswebpacksharedjs">trunk/tools/webpack/shared.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktoolswebpackblocksjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/webpack/blocks.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/webpack/blocks.js 2022-09-26 10:15:17 UTC (rev 54306)
+++ trunk/tools/webpack/blocks.js 2022-09-26 11:20:43 UTC (rev 54307)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> const { DefinePlugin } = require( 'webpack' );
</span><span class="cx" style="display: block; padding: 0 10px"> const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const { join } = require( 'path' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress dependencies
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Internal dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const { stylesTransform, baseConfig, baseDir } = require( './shared' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const { normalizeJoin, stylesTransform, baseConfig, baseDir } = require( './shared' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
</span><span class="cx" style="display: block; padding: 0 10px"> const mode = env.environment;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,18 +130,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const blockPHPCopies = Object.keys( blockPHPFiles ).map( ( filename ) => ( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- from: join( baseDir, `node_modules/@wordpress/${ filename }` ),
- to: join( baseDir, `src/${ blockPHPFiles[ filename ] }` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ from: normalizeJoin(baseDir, `node_modules/@wordpress/${ filename }` ),
+ to: normalizeJoin(baseDir, `src/${ blockPHPFiles[ filename ] }` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const blockMetadataCopies = Object.keys( blockMetadataFiles ).map( ( filename ) => ( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- from: join( baseDir, `node_modules/@wordpress/${ filename }` ),
- to: join( baseDir, `src/${ blockMetadataFiles[ filename ] }` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ from: normalizeJoin(baseDir, `node_modules/@wordpress/${ filename }` ),
+ to: normalizeJoin(baseDir, `src/${ blockMetadataFiles[ filename ] }` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const blockStylesheetCopies = blockFolders.map( ( blockName ) => ( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- from: join( baseDir, `node_modules/@wordpress/block-library/build-style/${ blockName }/*.css` ),
- to: join( baseDir, `${ buildTarget }/blocks/${ blockName }/[name]${ suffix }.css` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ from: normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-style/${ blockName }/*.css` ),
+ to: normalizeJoin(baseDir, `${ buildTarget }/blocks/${ blockName }/[name]${ suffix }.css` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: stylesTransform( mode ),
</span><span class="cx" style="display: block; padding: 0 10px"> noErrorOnMissing: true,
</span><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,14 +149,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const config = {
</span><span class="cx" style="display: block; padding: 0 10px"> ...baseConfig( env ),
</span><span class="cx" style="display: block; padding: 0 10px"> entry: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '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` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file/view': normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-module/file/view` ),
+ 'navigation/view': normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view` ),
+ 'navigation/view-modal': normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view-modal` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> output: {
</span><span class="cx" style="display: block; padding: 0 10px"> devtoolNamespace: 'wp',
</span><span class="cx" style="display: block; padding: 0 10px"> filename: `[name]${ suffix }.js`,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: join( baseDir, `${ buildTarget }/blocks` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: normalizeJoin(baseDir, `${ buildTarget }/blocks` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> plugins: [
</span><span class="cx" style="display: block; padding: 0 10px"> new DefinePlugin( {
</span></span></pre></div>
<a id="trunktoolswebpackpackagesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/webpack/packages.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/webpack/packages.js 2022-09-26 10:15:17 UTC (rev 54306)
+++ trunk/tools/webpack/packages.js 2022-09-26 11:20:43 UTC (rev 54307)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> const LiveReloadPlugin = require( 'webpack-livereload-plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> const UglifyJS = require( 'uglify-js' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const { join } = require( 'path' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress dependencies
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Internal dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const { stylesTransform, baseConfig, baseDir } = require( './shared' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const { normalizeJoin, stylesTransform, baseConfig, baseDir } = require( './shared' );
</ins><span class="cx" style="display: block; padding: 0 10px"> const { dependencies } = require( '../../package' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const exportDefaultPackages = [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,8 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function mapVendorCopies( vendors, buildTarget ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return Object.keys( vendors ).map( ( filename ) => ( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- from: join( baseDir, `node_modules/${ vendors[ filename ] }` ),
- to: join( baseDir, `${ buildTarget }/js/dist/vendor/${ filename }` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ from: normalizeJoin(baseDir, `node_modules/${ vendors[ filename ] }` ),
+ to: normalizeJoin(baseDir, `${ buildTarget }/js/dist/vendor/${ filename }` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,15 +114,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> let vendorCopies = mode === "development" ? developmentCopies : [ ...minifiedCopies, ...minifyCopies ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> let cssCopies = packages.map( ( packageName ) => ( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- from: join( baseDir, `node_modules/@wordpress/${ packageName }/build-style/*.css` ),
- to: join( baseDir, `${ buildTarget }/css/dist/${ packageName }/[name]${ suffix }.css` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ from: normalizeJoin(baseDir, `node_modules/@wordpress/${ packageName }/build-style/*.css` ),
+ to: normalizeJoin(baseDir, `${ buildTarget }/css/dist/${ packageName }/[name]${ suffix }.css` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: stylesTransform( mode ),
</span><span class="cx" style="display: block; padding: 0 10px"> noErrorOnMissing: true,
</span><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const phpCopies = Object.keys( phpFiles ).map( ( filename ) => ( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- from: join( baseDir, `node_modules/@wordpress/${ filename }` ),
- to: join( baseDir, `src/${ phpFiles[ filename ] }` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ from: normalizeJoin(baseDir, `node_modules/@wordpress/${ filename }` ),
+ to: normalizeJoin(baseDir, `src/${ phpFiles[ filename ] }` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const config = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ...baseConfig( env ),
</span><span class="cx" style="display: block; padding: 0 10px"> entry: packages.reduce( ( memo, packageName ) => {
</span><span class="cx" style="display: block; padding: 0 10px"> memo[ packageName ] = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- import: join( baseDir, `node_modules/@wordpress/${ packageName }` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ import: normalizeJoin(baseDir, `node_modules/@wordpress/${ packageName }` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> library: {
</span><span class="cx" style="display: block; padding: 0 10px"> name: [ 'wp', camelCaseDash( packageName ) ],
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'window',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> output: {
</span><span class="cx" style="display: block; padding: 0 10px"> devtoolNamespace: 'wp',
</span><span class="cx" style="display: block; padding: 0 10px"> filename: `[name]${ suffix }.js`,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: join( baseDir, `${ buildTarget }/js/dist` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: normalizeJoin(baseDir, `${ buildTarget }/js/dist` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> plugins: [
</span><span class="cx" style="display: block; padding: 0 10px"> new DefinePlugin( {
</span></span></pre></div>
<a id="trunktoolswebpacksharedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/webpack/shared.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/webpack/shared.js 2022-09-26 10:15:17 UTC (rev 54306)
+++ trunk/tools/webpack/shared.js 2022-09-26 11:20:43 UTC (rev 54307)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,8 +69,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return content;
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const normalizeJoin = ( ...paths ) => join( ...paths ).replace( /\\/g, '/' );
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> module.exports = {
</span><span class="cx" style="display: block; padding: 0 10px"> baseDir,
</span><span class="cx" style="display: block; padding: 0 10px"> baseConfig,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ normalizeJoin,
</ins><span class="cx" style="display: block; padding: 0 10px"> stylesTransform,
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre>
</div>
</div>
</body>
</html>