<!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>[44245] trunk: Build Tools: Add non-minified `@wordpress` scripts to the build output.</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/44245">44245</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/44245","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-16 23:27:36 +0000 (Sun, 16 Dec 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: Add non-minified `@wordpress` scripts to the build output.
Props atimmer.
Merges <a href="https://core.trac.wordpress.org/changeset/43886">[43886]</a> to trunk.
See <a href="https://core.trac.wordpress.org/ticket/45156">#45156</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunktoolswebpackpackagesjs">trunk/tools/webpack/packages.js</a></li>
<li><a href="#trunkwebpackconfigjs">trunk/webpack.config.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk 2018-12-16 23:23:38 UTC (rev 44244)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk 2018-12-16 23:27:36 UTC (rev 44245)
</ins><a id="trunk"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43860,43862,43867-43883,43885,43887,43892,43898-43900,43902,43904,43909,43912,43926-43929,43954,43956,43961-43963,44014,44017
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43860,43862,43867-43883,43885-43887,43892,43898-43900,43902,43904,43909,43912,43926-43929,43954,43956,43961-43963,44014,44017
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2018-12-16 23:23:38 UTC (rev 44244)
+++ trunk/Gruntfile.js 2018-12-16 23:27:36 UTC (rev 44245)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> autoprefixer = require( 'autoprefixer' ),
</span><span class="cx" style="display: block; padding: 0 10px"> nodesass = require( 'node-sass' ),
</span><span class="cx" style="display: block; padding: 0 10px"> phpUnitWatchGroup = grunt.option( 'group' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themeFiles = [
+ 'wp-content/themes/index.php',
+ 'wp-content/themes/twenty*/**'
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> buildFiles = [
</span><span class="cx" style="display: block; padding: 0 10px"> '*.php',
</span><span class="cx" style="display: block; padding: 0 10px"> '*.txt',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,12 +23,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/**', // Include everything in wp-includes.
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/**', // Include everything in wp-admin.
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/index.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-content/themes/index.php',
- 'wp-content/themes/twenty*/**',
</del><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/index.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/hello.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/akismet/**'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ].concat( themeFiles ),
</ins><span class="cx" style="display: block; padding: 0 10px"> cleanFiles = [],
</span><span class="cx" style="display: block; padding: 0 10px"> changedFiles = {
</span><span class="cx" style="display: block; padding: 0 10px"> php: []
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,6 +129,42 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ symlink: {
+ expanded: {
+ files: [
+ {
+ expand: true,
+ overwrite: true,
+ cwd: SOURCE_DIR,
+ src: [
+ 'wp-admin/*',
+ 'wp-content/uploads/',
+ 'wp-content/index.php',
+ 'wp-content/plugins/*',
+ 'wp-includes/*',
+ '*.php',
+ '*.txt',
+ '*.html',
+ '!wp-load.php',
+ '!wp-admin/css',
+ '!wp-content/themes',
+ '!wp-includes/css',
+ '!wp-includes/version.php', // Exclude version.php
+ '!wp-includes/formatting.php', // Exclude formatting.php
+ '!wp-includes/embed.php', // Exclude formatting.php
+ '!index.php', '!wp-admin/index.php',
+ '!_index.php', '!wp-admin/_index.php'
+ ],
+ dest: BUILD_DIR
+ },
+ {
+ 'build/wp-config-sample.php': ['wp-config-sample.php'],
+ 'build/index.php': ['src/_index.php'],
+ 'build/wp-admin/index.php': ['src/wp-admin/_index.php']
+ }
+ ]
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> copy: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,6 +176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '!js/**', // JavaScript is extracted into separate copy tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> '!.{svn,git}', // Exclude version control folders.
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/version.php', // Exclude version.php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!wp-admin/css/**/*', // Exclude the CSS
+ '!wp-includes/css/**/*', // Exclude the CSS
</ins><span class="cx" style="display: block; padding: 0 10px"> '!index.php', '!wp-admin/index.php',
</span><span class="cx" style="display: block; padding: 0 10px"> '!_index.php', '!wp-admin/_index.php'
</span><span class="cx" style="display: block; padding: 0 10px"> ] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,6 +193,23 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ css: {
+ dot: true,
+ expand: true,
+ cwd: SOURCE_DIR,
+ src: [
+ 'wp-admin/**/*.css',
+ 'wp-includes/**/*.css'
+ ],
+ dest: BUILD_DIR
+ },
+ themes: {
+ dot: true,
+ expand: true,
+ cwd: SOURCE_DIR,
+ src: themeFiles,
+ dest: BUILD_DIR
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> 'npm-packages': {
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'build/wp-includes/js/backbone.js': ['./node_modules/backbone/backbone.js'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,6 +398,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> src: SOURCE_DIR + 'wp-includes/version.php',
</span><span class="cx" style="display: block; padding: 0 10px"> dest: BUILD_DIR + 'wp-includes/version.php'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'php-buildFiles': {
+ files: {
+ 'build/wp-includes/formatting.php': ['src/wp-includes/formatting.php'],
+ 'build/wp-includes/embed.php': ['src/wp-includes/embed.php'],
+ 'build/wp-load.php': ['src/wp-load.php'],
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> dynamic: {
</span><span class="cx" style="display: block; padding: 0 10px"> dot: true,
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,6 +770,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> webpack: {
</span><span class="cx" style="display: block; padding: 0 10px"> prod: webpackConfig( { environment: 'production' } ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ devProdTarget: webpackConfig( { environment: 'development', forceBuildTarget: 'build/wp-includes' } ),
</ins><span class="cx" style="display: block; padding: 0 10px"> dev: webpackConfig( { environment: 'development' } ),
</span><span class="cx" style="display: block; padding: 0 10px"> watch: webpackConfig( { environment: 'development', watch: true } )
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,7 +1223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'watch', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.args.length || this.args.indexOf( 'webpack' ) > -1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.task.run( 'build' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.task.run( 'build:dev' );
</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"> if ( 'watch:phpunit' === grunt.cli.tasks[ 0 ] || 'undefined' !== typeof grunt.option( 'phpunit' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1307,6 +1372,13 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'uglify:all', [
+ 'uglify:core',
+ 'uglify:embed',
+ 'uglify:jqueryui',
+ 'uglify:imgareaselect'
+ ] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'copy:js', [
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:npm-packages',
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:vendor-js',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1314,11 +1386,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:includes-js'
</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">- grunt.registerTask( 'uglify:all', [
- 'uglify:core',
- 'uglify:embed',
- 'uglify:jqueryui',
- 'uglify:imgareaselect'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'copyOrSymlink', function() {
+ var task = grunt.option( 'symlink' ) === true ? 'symlink:expanded' : 'copy:files';
+ grunt.task.run( task );
+ } );
+
+ grunt.registerTask( 'copy:all', [
+ 'copyOrSymlink',
+ 'copy:php-buildFiles',
+ 'copy:css',
+ 'copy:themes',
+ 'copy:wp-admin-css-compat-rtl',
+ 'copy:wp-admin-css-compat-min',
+ 'copy:version',
+ 'copy:js'
</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"> grunt.registerTask( 'build:tinymce', [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,16 +1419,26 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.registerTask( 'copy:all', [
- 'copy:files',
- 'copy:wp-admin-css-compat-rtl',
- 'copy:wp-admin-css-compat-min',
- 'copy:version',
- 'copy:js'
- ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'clean-all', function() {
+ if ( grunt.option( 'symlink' ) === true ) {
+ // clean all symlinks
+ try {
+ var delSymlinks = require('del-symlinks');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.registerTask( 'build', [
- 'clean:all',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var result = delSymlinks.sync(['./build/**']);
+ grunt.log.writeln( '>> ' + result.length + ' symlinks cleaned.' );
+ } catch ( e ) {
+ grunt.verbose.error( 'Error:', e.message );
+ grunt.fail.warn( "Failed to delete symlinks. If you're on Windows, " +
+ "running as administrator could resolve this issue.");
+ }
+ }
+
+ grunt.task.run( 'clean:all' );
+ } );
+
+ grunt.registerTask( 'build:all', [
+ 'clean-all',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'copy:all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'file_append',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cssmin:core',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1362,10 +1453,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'includes:embed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'usebanner',
</span><span class="cx" style="display: block; padding: 0 10px"> 'webpack:prod',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'webpack:dev',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'webpack:devProdTarget',
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'build', function() {
+ grunt.task.run( 'build:all' );
+ } );
+
+ grunt.registerTask( 'build:dev', function() {
+ try {
+ // Try creating a symlink.
+ fs.symlinkSync( './symlink', './symlinktest');
+ grunt.option( 'symlink', true );
+ // If succeeded, remove it again.
+ fs.unlinkSync( './symlinktest' );
+ } catch( e ) {
+ grunt.verbose.error( 'Error:', e.message );
+ grunt.log.error( "Failed to delete symlinks. Falling back to copying " +
+ "files instead. If you're on Windows, " +
+ "running as administrator could resolve this issue.");
+ } finally {
+ grunt.task.run( 'build:all' );
+ }
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'prerelease', [
</span><span class="cx" style="display: block; padding: 0 10px"> 'format:php:error',
</span><span class="cx" style="display: block; padding: 0 10px"> 'precommit:php',
</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 2018-12-16 23:23:38 UTC (rev 44244)
+++ trunk/tools/webpack/packages.js 2018-12-16 23:27:36 UTC (rev 44245)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,10 +49,10 @@
</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">-module.exports = function( env = { environment: 'production', watch: false } ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = function( env = { environment: 'production', watch: false, forceBuildTarget: false } ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> const mode = env.environment;
</span><span class="cx" style="display: block; padding: 0 10px"> const suffix = mode === 'production' ? '.min' : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const buildTarget = ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const buildTarget = env.forceBuildTarget ? env.forceBuildTarget : ( 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></pre></div>
<a id="trunkwebpackconfigjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/webpack.config.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/webpack.config.js 2018-12-16 23:23:38 UTC (rev 44244)
+++ trunk/webpack.config.js 2018-12-16 23:27:36 UTC (rev 44245)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const mediaConfig = require( './tools/webpack/media' );
</span><span class="cx" style="display: block; padding: 0 10px"> const packagesConfig = require( './tools/webpack/packages' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = function( env = { environment: "production", watch: false } ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = function( env = { environment: "production", watch: false, forceBuildTarget: false } ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! env.watch ) {
</span><span class="cx" style="display: block; padding: 0 10px"> env.watch = false;
</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">+ if ( ! env.forceBuildTarget ) {
+ env.forceBuildTarget = false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> const config = [
</span><span class="cx" style="display: block; padding: 0 10px"> mediaConfig( env ),
</span><span class="cx" style="display: block; padding: 0 10px"> packagesConfig( env ),
</span></span></pre>
</div>
</div>
</body>
</html>