<!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>[43760] branches/5.0/tools/webpack/packages.js: Build Tools: Copy package JavaScript and CSS into `wp-includes`.</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/43760">43760</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/43760","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-10-19 06:05:13 +0000 (Fri, 19 Oct 2018)</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'>Build Tools: Copy package JavaScript and CSS into `wp-includes`.
- `grunt webpack:dev` now copies packages JS into `/src/wp-includes/js/dist`, and CSS into `/src/wp-includes/css/dist`.
- `grunt webpack:prod` does the same, but into `/build` instead of `/src`.
- `grunt build` now runs the `webpack:prod` task.
Props atimmer, pento.
Fixes <a href="https://core.trac.wordpress.org/ticket/45119">#45119</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches50gitignore">branches/5.0/.gitignore</a></li>
<li><a href="#branches50Gruntfilejs">branches/5.0/Gruntfile.js</a></li>
<li><a href="#branches50srcwpincludesscriptloaderphp">branches/5.0/src/wp-includes/script-loader.php</a></li>
<li><a href="#branches50toolswebpackpackagesjs">branches/5.0/tools/webpack/packages.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches50srcwpincludescss">branches/5.0/src/wp-includes/css/</a></li>
<li><a href="#branches50srcwpincludesjs">branches/5.0/src/wp-includes/js/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches50gitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/.gitignore 2018-10-19 05:51:07 UTC (rev 43759)
+++ branches/5.0/.gitignore 2018-10-19 06:05:13 UTC (rev 43760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,6 +18,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /wp-cli.local.yml
</span><span class="cx" style="display: block; padding: 0 10px"> /jsdoc
</span><span class="cx" style="display: block; padding: 0 10px"> /vendor
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/src/wp-includes/js/dist
+/src/wp-includes/css/dist
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Files and folders that get created in wp-content
</span><span class="cx" style="display: block; padding: 0 10px"> /src/wp-content/blogs.dir
</span></span></pre></div>
<a id="branches50Gruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/Gruntfile.js 2018-10-19 05:51:07 UTC (rev 43759)
+++ branches/5.0/Gruntfile.js 2018-10-19 06:05:13 UTC (rev 43760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,6 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'includes:emoji',
</span><span class="cx" style="display: block; padding: 0 10px"> 'includes:embed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'usebanner',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'webpack:prod',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'jsvalidate:build'
</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">Index: branches/5.0/src/wp-includes/css
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.0/src/wp-includes/css 2018-10-19 05:51:07 UTC (rev 43759)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.0/src/wp-includes/css 2018-10-19 06:05:13 UTC (rev 43760)
</ins></span></pre></div>
<a id="branches50srcwpincludescss"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.0/src/wp-includes/css</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:ignore</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+dist
+
</ins><span class="cx" style="display: block; padding: 0 10px">Index: branches/5.0/src/wp-includes/js
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.0/src/wp-includes/js 2018-10-19 05:51:07 UTC (rev 43759)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.0/src/wp-includes/js 2018-10-19 06:05:13 UTC (rev 43760)
</ins><a id="branches50srcwpincludesjs"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.0/src/wp-includes/js</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:ignore</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+dist
+
</ins><a id="branches50srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/script-loader.php 2018-10-19 05:51:07 UTC (rev 43759)
+++ branches/5.0/src/wp-includes/script-loader.php 2018-10-19 06:05:13 UTC (rev 43760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dependencies = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = "/js/dist/vendor/$handle$dev_suffix.js";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = "/wp-includes/js/dist/vendor/$handle$dev_suffix.js";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( $handle, $path, $dependencies, false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $packages_dependencies as $package => $dependencies ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $handle = 'wp-' . $package;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = "/js/dist/$package$suffix.js";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = "/wp-includes/js/dist/$package$suffix.js";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( $handle, $path, $dependencies, false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1607,12 +1607,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $styles->add( 'wp-editor-font', $fonts_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $styles->add( 'wp-block-library-theme', '/styles/dist/block-library/theme.css' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $styles->add( 'wp-block-library-theme', '/wp-includes/css/dist/block-library/theme.css' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $styles->add_data( 'wp-block-library-theme', 'rtl', 'replace' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $styles->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-edit-blocks',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/styles/dist/block-library/editor.css',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '/wp-includes/css/dist/block-library/editor.css',
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-components',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-editor',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1633,7 +1633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $package_styles as $package => $dependencies ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $handle = 'wp-' . $package;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = '/styles/dist/' . $package . '/style.css';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = '/wp-includes/css/dist/' . $package . '/style.css';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $styles->add( $handle, $path, $dependencies );
</span><span class="cx" style="display: block; padding: 0 10px"> $styles->add_data( $handle, 'rtl', 'replace' );
</span></span></pre></div>
<a id="branches50toolswebpackpackagesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/tools/webpack/packages.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/tools/webpack/packages.js 2018-10-19 05:51:07 UTC (rev 43759)
+++ branches/5.0/tools/webpack/packages.js 2018-10-19 06:05:13 UTC (rev 43760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,20 +37,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Maps vendors to copy commands for the CopyWebpackPlugin.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {Object} vendors Vendors to include in the vendor folder.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {Object} vendors Vendors to include in the vendor folder.
+ * @param {string} buildTarget The folder in which to build the packages.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {Object[]} Copy object suitable for the CopyWebpackPlugin.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function mapVendorCopies( vendors ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function mapVendorCopies( vendors, buildTarget ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return Object.keys( vendors ).map( ( filename ) => ( {
</span><span class="cx" style="display: block; padding: 0 10px"> from: join( baseDir, `node_modules/${ vendors[ filename ] }` ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- to: join( baseDir, `build/js/dist/vendor/${ filename }` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ to: join( 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="cx" style="display: block; padding: 0 10px"> module.exports = function( env = { environment: 'production', watch: false } ) {
</span><span class="cx" style="display: block; padding: 0 10px"> const mode = env.environment;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const suffix = mode === 'production' ? '.min': '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const suffix = mode === 'production' ? '.min' : '';
+ const buildTarget = ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const packages = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'api-fetch',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,9 +145,9 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const developmentCopies = mapVendorCopies( vendors );
- const minifiedCopies = mapVendorCopies( minifiedVendors );
- const minifyCopies = mapVendorCopies( minifyVendors ).map( ( copyCommand ) => {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const developmentCopies = mapVendorCopies( vendors, buildTarget );
+ const minifiedCopies = mapVendorCopies( minifiedVendors, buildTarget );
+ const minifyCopies = mapVendorCopies( minifyVendors, buildTarget ).map( ( copyCommand ) => {
</ins><span class="cx" style="display: block; padding: 0 10px"> return {
</span><span class="cx" style="display: block; padding: 0 10px"> ...copyCommand,
</span><span class="cx" style="display: block; padding: 0 10px"> transform: ( content ) => {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +160,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> from: join( baseDir, `node_modules/@wordpress/${ packageName }/build-style/*.css` ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- to: join( baseDir, `build/styles/dist/${ packageName }/` ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ to: join( baseDir, `${ buildTarget }/css/dist/${ packageName }/` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> flatten: true,
</span><span class="cx" style="display: block; padding: 0 10px"> transform: ( content ) => {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( config.mode === 'production' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +192,7 @@
</span><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"> filename: `[basename]${ suffix }.js`,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: join( baseDir, 'build/js/dist' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: join( baseDir, `${ buildTarget }/js/dist` ),
</ins><span class="cx" style="display: block; padding: 0 10px"> library: {
</span><span class="cx" style="display: block; padding: 0 10px"> root: [ 'wp', '[name]' ]
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre>
</div>
</div>
</body>
</html>