<!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>[44359] trunk: Build tools: Allow building WordPress to `src`.</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/44359">44359</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/44359","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>atimmer</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-24 13:28:22 +0000 (Mon, 24 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: Allow building WordPress to `src`.
After the JavaScript reorganization in <a href="https://core.trac.wordpress.org/changeset/43309">[43309]</a>, it was no longer possible to test WordPress from the `src` folder. That meant a build step was required to test PHP modifications. That is suboptimal as even a simple copy is slower than a web server just serving the new file.
We achieve building to `src` by setting a `WORKING_DIR` constant in the Gruntfile that is `build` by default, but changes to `src` when the `--dev` flag is present on any Grunt command. We provide sensible defaults so some commands, such as copying `version.php`, always build to `build`.
Because testing from `build` is no longer required, we change the messages present in `index.php` and `wp-admin/index.php` to be more broadly about building WordPress.
We also change the webpack config to have more straightforward behavior based on the `buildTarget` argument. It only determines the build target now and has no implicit behavior anymore. `grunt build` still works as it worked before, to make sure that the build server produces the same `wordpress.zip` we are used to.
We do all this instead of a symlink setup because symlinks don't work on every platform.
Props omarreiss, netweb, flixos90, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/44492">#44492</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgitignore">trunk/.gitignore</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkpackagelockjson">trunk/package-lock.json</a></li>
<li><a href="#trunksrcindexphp">trunk/src/index.php</a></li>
<li><a href="#trunksrcwpadminindexphp">trunk/src/wp-admin/index.php</a></li>
<li><a href="#trunksrcwpincludesclasswpblockparserphp">trunk/src/wp-includes/class-wp-block-parser.php</a></li>
<li><a href="#trunktoolswebpackmediajs">trunk/tools/webpack/media.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="#trunksrcwpadmin">trunk/src/wp-admin/</a></li>
<li><a href="#trunksrcwpadmincss">trunk/src/wp-admin/css/</a></li>
<li><a href="#trunksrcwpadmincsscolorsblue">trunk/src/wp-admin/css/colors/blue/</a></li>
<li><a href="#trunksrcwpadmincsscolorscoffee">trunk/src/wp-admin/css/colors/coffee/</a></li>
<li><a href="#trunksrcwpadmincsscolorsectoplasm">trunk/src/wp-admin/css/colors/ectoplasm/</a></li>
<li><a href="#trunksrcwpadmincsscolorslight">trunk/src/wp-admin/css/colors/light/</a></li>
<li><a href="#trunksrcwpadmincsscolorsmidnight">trunk/src/wp-admin/css/colors/midnight/</a></li>
<li><a href="#trunksrcwpadmincsscolorsocean">trunk/src/wp-admin/css/colors/ocean/</a></li>
<li><a href="#trunksrcwpadmincsscolorssunrise">trunk/src/wp-admin/css/colors/sunrise/</a></li>
<li><a href="#trunksrcwpincludescss">trunk/src/wp-includes/css/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.gitignore 2018-12-21 21:35:48 UTC (rev 44358)
+++ trunk/.gitignore 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /jsdoc
</span><span class="cx" style="display: block; padding: 0 10px"> /src/wp-includes/js
</span><span class="cx" style="display: block; padding: 0 10px"> /src/wp-includes/css/dist
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/src/wp-admin/css/*.min.css
+/src/wp-admin/css/*-rtl.css
+/src/wp-includes/css/*.min.css
+/src/wp-admin/css/colors/*/*.css
</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="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-21 21:35:48 UTC (rev 44358)
+++ trunk/Gruntfile.js 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> spawn = require( 'child_process' ).spawnSync,
</span><span class="cx" style="display: block; padding: 0 10px"> SOURCE_DIR = 'src/',
</span><span class="cx" style="display: block; padding: 0 10px"> BUILD_DIR = 'build/',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WORKING_DIR = grunt.option( 'dev' ) ? SOURCE_DIR : BUILD_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> BANNER_TEXT = '/*! This file is auto-generated */',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,16 +25,8 @@
</span><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">- ],
- cleanFiles = [],
- changedFiles = {
- php: []
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- buildFiles.forEach( function( buildFile ) {
- cleanFiles.push( BUILD_DIR + buildFile );
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'watch:phpunit' === grunt.cli.tasks[ 0 ] && ! phpUnitWatchGroup ) {
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.log.writeln();
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.fail.fatal(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +74,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> colors: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/css/colors/*/colors.css'
</span><span class="cx" style="display: block; padding: 0 10px"> ]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,9 +89,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- BUILD_DIR + 'wp-admin/css/*.min.css',
- BUILD_DIR + 'wp-includes/css/*.min.css',
- BUILD_DIR + 'wp-admin/css/colors/*/*.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WORKING_DIR + 'wp-admin/css/*.min.css',
+ WORKING_DIR + 'wp-includes/css/*.min.css',
+ WORKING_DIR + 'wp-admin/css/colors/*/*.css'
</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">@@ -105,16 +98,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clean: {
</span><span class="cx" style="display: block; padding: 0 10px"> plugins: [BUILD_DIR + 'wp-content/plugins'],
</span><span class="cx" style="display: block; padding: 0 10px"> themes: [BUILD_DIR + 'wp-content/themes'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- all: [
- cleanFiles,
- SOURCE_DIR + 'wp-includes/js/dist',
- SOURCE_DIR + 'wp-includes/css/dist'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ files: buildFiles.map( function( file ) {
+ return BUILD_DIR + file;
+ }),
+ css: [
+ WORKING_DIR + 'wp-admin/css/*.min.css',
+ WORKING_DIR + 'wp-admin/css/*rtl*',
+ WORKING_DIR + 'wp-includes/css/*.min.css',
+ WORKING_DIR + 'wp-includes/css/*rtl*',
+ WORKING_DIR + 'wp-admin/css/colors/**/*.css'
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- js: [BUILD_DIR + 'wp-admin/js/', BUILD_DIR + 'wp-includes/js/'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ js: [
+ WORKING_DIR + 'wp-admin/js/',
+ WORKING_DIR + 'wp-includes/js/'
+ ],
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> src: []
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce: ['<%= concat.tinymce.dest %>'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,8 +126,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> files: [
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> append: 'jQuery.noConflict();',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- input: './build/wp-includes/js/jquery/jquery.js',
- output: './build/wp-includes/js/jquery/jquery.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ input: WORKING_DIR + 'wp-includes/js/jquery/jquery.js',
+ output: WORKING_DIR + 'wp-includes/js/jquery/jquery.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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,24 +154,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> dest: BUILD_DIR
</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">- 'build/index.php': ['src/_index.php'],
- 'build/wp-admin/index.php': ['src/wp-admin/_index.php']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [BUILD_DIR + 'index.php']: ['src/_index.php'],
+ [BUILD_DIR + 'wp-admin/index.php']: ['src/wp-admin/_index.php']
</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"> 'npm-packages': {
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'build/wp-includes/js/backbone.js': ['./node_modules/backbone/backbone.js'],
- 'build/wp-includes/js/hoverIntent.js': ['./node_modules/jquery-hoverintent/jquery.hoverIntent.js'],
- 'build/wp-includes/js/imagesloaded.min.js': ['./node_modules/imagesloaded/imagesloaded.pkgd.min.js'],
- 'build/wp-includes/js/jquery/jquery-migrate.js': ['./node_modules/jquery-migrate/dist/jquery-migrate.js'],
- 'build/wp-includes/js/jquery/jquery-migrate.min.js': ['./node_modules/jquery-migrate/dist/jquery-migrate.min.js'],
- 'build/wp-includes/js/jquery/jquery.form.js': ['./node_modules/jquery-form/src/jquery.form.js'],
- 'build/wp-includes/js/jquery/jquery.form.min.js': ['./node_modules/jquery-form/dist/jquery.form.min.js'],
- 'build/wp-includes/js/jquery/jquery.js': ['./node_modules/jquery/dist/jquery.min.js'],
- 'build/wp-includes/js/masonry.min.js': ['./node_modules/masonry-layout/dist/masonry.pkgd.min.js'],
- 'build/wp-includes/js/twemoji.js': ['./node_modules/twemoji/2/twemoji.js'],
- 'build/wp-includes/js/underscore.min.js': ['./node_modules/underscore/underscore-min.js']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ WORKING_DIR + 'wp-includes/js/backbone.js' ]: [ './node_modules/backbone/backbone.js' ],
+ [ WORKING_DIR + 'wp-includes/js/hoverIntent.js' ]: [ './node_modules/jquery-hoverintent/jquery.hoverIntent.js' ],
+ [ WORKING_DIR + 'wp-includes/js/imagesloaded.min.js' ]: [ './node_modules/imagesloaded/imagesloaded.pkgd.min.js' ],
+ [ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.js' ],
+ [ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.min.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.min.js' ],
+ [ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
+ [ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.min.js' ]: [ './node_modules/jquery-form/dist/jquery.form.min.js' ],
+ [ WORKING_DIR + 'wp-includes/js/jquery/jquery.js' ]: [ './node_modules/jquery/dist/jquery.min.js' ],
+ [ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
+ [ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/2/twemoji.js' ],
+ [ WORKING_DIR + 'wp-includes/js/underscore.min.js' ]: [ './node_modules/underscore/underscore-min.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"> 'vendor-js': {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '!jquery/jquery.masonry.js',
</span><span class="cx" style="display: block; padding: 0 10px"> '!tinymce/tinymce.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">- dest: 'build/wp-includes/js/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-includes/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"> expand: true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +198,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'farbtastic.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'iris.min.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">- dest: 'build/wp-admin/js/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-admin/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"> expand: true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,102 +206,102 @@
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'suggest*'
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: 'build/wp-includes/js/jquery/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-includes/js/jquery/'
</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"> 'admin-js': {
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'build/wp-admin/js/accordion.js': ['./src/js/_enqueues/lib/accordion.js'],
- 'build/wp-admin/js/code-editor.js': ['./src/js/_enqueues/wp/code-editor.js'],
- 'build/wp-admin/js/color-picker.js': ['./src/js/_enqueues/lib/color-picker.js'],
- 'build/wp-admin/js/comment.js': ['./src/js/_enqueues/admin/comment.js'],
- 'build/wp-admin/js/common.js': ['./src/js/_enqueues/admin/common.js'],
- 'build/wp-admin/js/custom-background.js': ['./src/js/_enqueues/admin/custom-background.js'],
- 'build/wp-admin/js/custom-header.js': ['./src/js/_enqueues/admin/custom-header.js'],
- 'build/wp-admin/js/customize-controls.js': ['./src/js/_enqueues/wp/customize/controls.js'],
- 'build/wp-admin/js/customize-nav-menus.js': ['./src/js/_enqueues/wp/customize/nav-menus.js'],
- 'build/wp-admin/js/customize-widgets.js': ['./src/js/_enqueues/wp/customize/widgets.js'],
- 'build/wp-admin/js/dashboard.js': ['./src/js/_enqueues/wp/dashboard.js'],
- 'build/wp-admin/js/edit-comments.js': ['./src/js/_enqueues/admin/edit-comments.js'],
- 'build/wp-admin/js/editor-expand.js': ['./src/js/_enqueues/wp/editor/dfw.js'],
- 'build/wp-admin/js/editor.js': ['./src/js/_enqueues/wp/editor/base.js'],
- 'build/wp-admin/js/gallery.js': ['./src/js/_enqueues/lib/gallery.js'],
- 'build/wp-admin/js/image-edit.js': ['./src/js/_enqueues/lib/image-edit.js'],
- 'build/wp-admin/js/inline-edit-post.js': ['./src/js/_enqueues/admin/inline-edit-post.js'],
- 'build/wp-admin/js/inline-edit-tax.js': ['./src/js/_enqueues/admin/inline-edit-tax.js'],
- 'build/wp-admin/js/language-chooser.js': ['./src/js/_enqueues/lib/language-chooser.js'],
- 'build/wp-admin/js/link.js': ['./src/js/_enqueues/admin/link.js'],
- 'build/wp-admin/js/media-gallery.js': ['./src/js/_enqueues/deprecated/media-gallery.js'],
- 'build/wp-admin/js/media-upload.js': ['./src/js/_enqueues/admin/media-upload.js'],
- 'build/wp-admin/js/media.js': ['./src/js/_enqueues/admin/media.js'],
- 'build/wp-admin/js/nav-menu.js': ['./src/js/_enqueues/lib/nav-menu.js'],
- 'build/wp-admin/js/password-strength-meter.js': ['./src/js/_enqueues/wp/password-strength-meter.js'],
- 'build/wp-admin/js/plugin-install.js': ['./src/js/_enqueues/admin/plugin-install.js'],
- 'build/wp-admin/js/post.js': ['./src/js/_enqueues/admin/post.js'],
- 'build/wp-admin/js/postbox.js': ['./src/js/_enqueues/admin/postbox.js'],
- 'build/wp-admin/js/revisions.js': ['./src/js/_enqueues/wp/revisions.js'],
- 'build/wp-admin/js/set-post-thumbnail.js': ['./src/js/_enqueues/admin/set-post-thumbnail.js'],
- 'build/wp-admin/js/svg-painter.js': ['./src/js/_enqueues/wp/svg-painter.js'],
- 'build/wp-admin/js/tags-box.js': ['./src/js/_enqueues/admin/tags-box.js'],
- 'build/wp-admin/js/tags-suggest.js': ['./src/js/_enqueues/admin/tags-suggest.js'],
- 'build/wp-admin/js/tags.js': ['./src/js/_enqueues/admin/tags.js'],
- 'build/wp-admin/js/theme-plugin-editor.js': ['./src/js/_enqueues/wp/theme-plugin-editor.js'],
- 'build/wp-admin/js/theme.js': ['./src/js/_enqueues/wp/theme.js'],
- 'build/wp-admin/js/updates.js': ['./src/js/_enqueues/wp/updates.js'],
- 'build/wp-admin/js/user-profile.js': ['./src/js/_enqueues/admin/user-profile.js'],
- 'build/wp-admin/js/user-suggest.js': ['./src/js/_enqueues/lib/user-suggest.js'],
- 'build/wp-admin/js/widgets/custom-html-widgets.js': ['./src/js/_enqueues/wp/widgets/custom-html.js'],
- 'build/wp-admin/js/widgets/media-audio-widget.js': ['./src/js/_enqueues/wp/widgets/media-audio.js'],
- 'build/wp-admin/js/widgets/media-gallery-widget.js': ['./src/js/_enqueues/wp/widgets/media-gallery.js'],
- 'build/wp-admin/js/widgets/media-image-widget.js': ['./src/js/_enqueues/wp/widgets/media-image.js'],
- 'build/wp-admin/js/widgets/media-video-widget.js': ['./src/js/_enqueues/wp/widgets/media-video.js'],
- 'build/wp-admin/js/widgets/media-widgets.js': ['./src/js/_enqueues/wp/widgets/media.js'],
- 'build/wp-admin/js/widgets/text-widgets.js': ['./src/js/_enqueues/wp/widgets/text.js'],
- 'build/wp-admin/js/widgets.js': ['./src/js/_enqueues/admin/widgets.js'],
- 'build/wp-admin/js/word-count.js': ['./src/js/_enqueues/wp/utils/word-count.js'],
- 'build/wp-admin/js/wp-fullscreen-stub.js': ['./src/js/_enqueues/deprecated/fullscreen-stub.js'],
- 'build/wp-admin/js/xfn.js': ['./src/js/_enqueues/admin/xfn.js']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ WORKING_DIR + 'wp-admin/js/accordion.js' ]: [ './src/js/_enqueues/lib/accordion.js' ],
+ [ WORKING_DIR + 'wp-admin/js/code-editor.js' ]: [ './src/js/_enqueues/wp/code-editor.js' ],
+ [ WORKING_DIR + 'wp-admin/js/color-picker.js' ]: [ './src/js/_enqueues/lib/color-picker.js' ],
+ [ WORKING_DIR + 'wp-admin/js/comment.js' ]: [ './src/js/_enqueues/admin/comment.js' ],
+ [ WORKING_DIR + 'wp-admin/js/common.js' ]: [ './src/js/_enqueues/admin/common.js' ],
+ [ WORKING_DIR + 'wp-admin/js/custom-background.js' ]: [ './src/js/_enqueues/admin/custom-background.js' ],
+ [ WORKING_DIR + 'wp-admin/js/custom-header.js' ]: [ './src/js/_enqueues/admin/custom-header.js' ],
+ [ WORKING_DIR + 'wp-admin/js/customize-controls.js' ]: [ './src/js/_enqueues/wp/customize/controls.js' ],
+ [ WORKING_DIR + 'wp-admin/js/customize-nav-menus.js' ]: [ './src/js/_enqueues/wp/customize/nav-menus.js' ],
+ [ WORKING_DIR + 'wp-admin/js/customize-widgets.js' ]: [ './src/js/_enqueues/wp/customize/widgets.js' ],
+ [ WORKING_DIR + 'wp-admin/js/dashboard.js' ]: [ './src/js/_enqueues/wp/dashboard.js' ],
+ [ WORKING_DIR + 'wp-admin/js/edit-comments.js' ]: [ './src/js/_enqueues/admin/edit-comments.js' ],
+ [ WORKING_DIR + 'wp-admin/js/editor-expand.js' ]: [ './src/js/_enqueues/wp/editor/dfw.js' ],
+ [ WORKING_DIR + 'wp-admin/js/editor.js' ]: [ './src/js/_enqueues/wp/editor/base.js' ],
+ [ WORKING_DIR + 'wp-admin/js/gallery.js' ]: [ './src/js/_enqueues/lib/gallery.js' ],
+ [ WORKING_DIR + 'wp-admin/js/image-edit.js' ]: [ './src/js/_enqueues/lib/image-edit.js' ],
+ [ WORKING_DIR + 'wp-admin/js/inline-edit-post.js' ]: [ './src/js/_enqueues/admin/inline-edit-post.js' ],
+ [ WORKING_DIR + 'wp-admin/js/inline-edit-tax.js' ]: [ './src/js/_enqueues/admin/inline-edit-tax.js' ],
+ [ WORKING_DIR + 'wp-admin/js/language-chooser.js' ]: [ './src/js/_enqueues/lib/language-chooser.js' ],
+ [ WORKING_DIR + 'wp-admin/js/link.js' ]: [ './src/js/_enqueues/admin/link.js' ],
+ [ WORKING_DIR + 'wp-admin/js/media-gallery.js' ]: [ './src/js/_enqueues/deprecated/media-gallery.js' ],
+ [ WORKING_DIR + 'wp-admin/js/media-upload.js' ]: [ './src/js/_enqueues/admin/media-upload.js' ],
+ [ WORKING_DIR + 'wp-admin/js/media.js' ]: [ './src/js/_enqueues/admin/media.js' ],
+ [ WORKING_DIR + 'wp-admin/js/nav-menu.js' ]: [ './src/js/_enqueues/lib/nav-menu.js' ],
+ [ WORKING_DIR + 'wp-admin/js/password-strength-meter.js' ]: [ './src/js/_enqueues/wp/password-strength-meter.js' ],
+ [ WORKING_DIR + 'wp-admin/js/plugin-install.js' ]: [ './src/js/_enqueues/admin/plugin-install.js' ],
+ [ WORKING_DIR + 'wp-admin/js/post.js' ]: [ './src/js/_enqueues/admin/post.js' ],
+ [ WORKING_DIR + 'wp-admin/js/postbox.js' ]: [ './src/js/_enqueues/admin/postbox.js' ],
+ [ WORKING_DIR + 'wp-admin/js/revisions.js' ]: [ './src/js/_enqueues/wp/revisions.js' ],
+ [ WORKING_DIR + 'wp-admin/js/set-post-thumbnail.js' ]: [ './src/js/_enqueues/admin/set-post-thumbnail.js' ],
+ [ WORKING_DIR + 'wp-admin/js/svg-painter.js' ]: [ './src/js/_enqueues/wp/svg-painter.js' ],
+ [ WORKING_DIR + 'wp-admin/js/tags-box.js' ]: [ './src/js/_enqueues/admin/tags-box.js' ],
+ [ WORKING_DIR + 'wp-admin/js/tags-suggest.js' ]: [ './src/js/_enqueues/admin/tags-suggest.js' ],
+ [ WORKING_DIR + 'wp-admin/js/tags.js' ]: [ './src/js/_enqueues/admin/tags.js' ],
+ [ WORKING_DIR + 'wp-admin/js/theme-plugin-editor.js' ]: [ './src/js/_enqueues/wp/theme-plugin-editor.js' ],
+ [ WORKING_DIR + 'wp-admin/js/theme.js' ]: [ './src/js/_enqueues/wp/theme.js' ],
+ [ WORKING_DIR + 'wp-admin/js/updates.js' ]: [ './src/js/_enqueues/wp/updates.js' ],
+ [ WORKING_DIR + 'wp-admin/js/user-profile.js' ]: [ './src/js/_enqueues/admin/user-profile.js' ],
+ [ WORKING_DIR + 'wp-admin/js/user-suggest.js' ]: [ './src/js/_enqueues/lib/user-suggest.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets/custom-html-widgets.js' ]: [ './src/js/_enqueues/wp/widgets/custom-html.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets/media-audio-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-audio.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets/media-gallery-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-gallery.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets/media-image-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-image.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets/media-video-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-video.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets/media-widgets.js' ]: [ './src/js/_enqueues/wp/widgets/media.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets/text-widgets.js' ]: [ './src/js/_enqueues/wp/widgets/text.js' ],
+ [ WORKING_DIR + 'wp-admin/js/widgets.js' ]: [ './src/js/_enqueues/admin/widgets.js' ],
+ [ WORKING_DIR + 'wp-admin/js/word-count.js' ]: [ './src/js/_enqueues/wp/utils/word-count.js' ],
+ [ WORKING_DIR + 'wp-admin/js/wp-fullscreen-stub.js' ]: [ './src/js/_enqueues/deprecated/fullscreen-stub.js' ],
+ [ WORKING_DIR + 'wp-admin/js/xfn.js' ]: [ './src/js/_enqueues/admin/xfn.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"> 'includes-js': {
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'build/wp-includes/js/admin-bar.js': ['./src/js/_enqueues/lib/admin-bar.js'],
- 'build/wp-includes/js/api-request.js': ['./src/js/_enqueues/wp/api-request.js'],
- 'build/wp-includes/js/autosave.js': ['./src/js/_enqueues/wp/autosave.js'],
- 'build/wp-includes/js/comment-reply.js': ['./src/js/_enqueues/lib/comment-reply.js'],
- 'build/wp-includes/js/customize-base.js': ['./src/js/_enqueues/wp/customize/base.js'],
- 'build/wp-includes/js/customize-loader.js': ['./src/js/_enqueues/wp/customize/loader.js'],
- 'build/wp-includes/js/customize-models.js': ['./src/js/_enqueues/wp/customize/models.js'],
- 'build/wp-includes/js/customize-preview-nav-menus.js': ['./src/js/_enqueues/wp/customize/preview-nav-menus.js'],
- 'build/wp-includes/js/customize-preview-widgets.js': ['./src/js/_enqueues/wp/customize/preview-widgets.js'],
- 'build/wp-includes/js/customize-preview.js': ['./src/js/_enqueues/wp/customize/preview.js'],
- 'build/wp-includes/js/customize-selective-refresh.js': ['./src/js/_enqueues/wp/customize/selective-refresh.js'],
- 'build/wp-includes/js/customize-views.js': ['./src/js/_enqueues/wp/customize/views.js'],
- 'build/wp-includes/js/heartbeat.js': ['./src/js/_enqueues/wp/heartbeat.js'],
- 'build/wp-includes/js/mce-view.js': ['./src/js/_enqueues/wp/mce-view.js'],
- 'build/wp-includes/js/media-editor.js': ['./src/js/_enqueues/wp/media/editor.js'],
- 'build/wp-includes/js/quicktags.js': ['./src/js/_enqueues/lib/quicktags.js'],
- 'build/wp-includes/js/shortcode.js': ['./src/js/_enqueues/wp/shortcode.js'],
- 'build/wp-includes/js/utils.js': ['./src/js/_enqueues/lib/cookies.js'],
- 'build/wp-includes/js/wp-a11y.js': ['./src/js/_enqueues/wp/a11y.js'],
- 'build/wp-includes/js/wp-ajax-response.js': ['./src/js/_enqueues/lib/ajax-response.js'],
- 'build/wp-includes/js/wp-api.js': ['./src/js/_enqueues/wp/api.js'],
- 'build/wp-includes/js/wp-auth-check.js': ['./src/js/_enqueues/lib/auth-check.js'],
- 'build/wp-includes/js/wp-backbone.js': ['./src/js/_enqueues/wp/backbone.js'],
- 'build/wp-includes/js/wp-custom-header.js': ['./src/js/_enqueues/wp/custom-header.js'],
- 'build/wp-includes/js/wp-embed-template.js': ['./src/js/_enqueues/lib/embed-template.js'],
- 'build/wp-includes/js/wp-embed.js': ['./src/js/_enqueues/wp/embed.js'],
- 'build/wp-includes/js/wp-emoji-loader.js': ['./src/js/_enqueues/lib/emoji-loader.js'],
- 'build/wp-includes/js/wp-emoji.js': ['./src/js/_enqueues/wp/emoji.js'],
- 'build/wp-includes/js/wp-list-revisions.js': ['./src/js/_enqueues/lib/list-revisions.js'],
- 'build/wp-includes/js/wp-lists.js': ['./src/js/_enqueues/lib/lists.js'],
- 'build/wp-includes/js/wp-pointer.js': ['./src/js/_enqueues/lib/pointer.js'],
- 'build/wp-includes/js/wp-sanitize.js': ['./src/js/_enqueues/wp/sanitize.js'],
- 'build/wp-includes/js/wp-util.js': ['./src/js/_enqueues/wp/util.js'],
- 'build/wp-includes/js/wpdialog.js': ['./src/js/_enqueues/lib/dialog.js'],
- 'build/wp-includes/js/wplink.js': ['./src/js/_enqueues/lib/link.js'],
- 'build/wp-includes/js/zxcvbn-async.js': ['./src/js/_enqueues/lib/zxcvbn-async.js']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ WORKING_DIR + 'wp-includes/js/admin-bar.js' ]: [ './src/js/_enqueues/lib/admin-bar.js' ],
+ [ WORKING_DIR + 'wp-includes/js/api-request.js' ]: [ './src/js/_enqueues/wp/api-request.js' ],
+ [ WORKING_DIR + 'wp-includes/js/autosave.js' ]: [ './src/js/_enqueues/wp/autosave.js' ],
+ [ WORKING_DIR + 'wp-includes/js/comment-reply.js' ]: [ './src/js/_enqueues/lib/comment-reply.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-base.js' ]: [ './src/js/_enqueues/wp/customize/base.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-loader.js' ]: [ './src/js/_enqueues/wp/customize/loader.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-models.js' ]: [ './src/js/_enqueues/wp/customize/models.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-preview-nav-menus.js' ]: [ './src/js/_enqueues/wp/customize/preview-nav-menus.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-preview-widgets.js' ]: [ './src/js/_enqueues/wp/customize/preview-widgets.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-preview.js' ]: [ './src/js/_enqueues/wp/customize/preview.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-selective-refresh.js' ]: [ './src/js/_enqueues/wp/customize/selective-refresh.js' ],
+ [ WORKING_DIR + 'wp-includes/js/customize-views.js' ]: [ './src/js/_enqueues/wp/customize/views.js' ],
+ [ WORKING_DIR + 'wp-includes/js/heartbeat.js' ]: [ './src/js/_enqueues/wp/heartbeat.js' ],
+ [ WORKING_DIR + 'wp-includes/js/mce-view.js' ]: [ './src/js/_enqueues/wp/mce-view.js' ],
+ [ WORKING_DIR + 'wp-includes/js/media-editor.js' ]: [ './src/js/_enqueues/wp/media/editor.js' ],
+ [ WORKING_DIR + 'wp-includes/js/quicktags.js' ]: [ './src/js/_enqueues/lib/quicktags.js' ],
+ [ WORKING_DIR + 'wp-includes/js/shortcode.js' ]: [ './src/js/_enqueues/wp/shortcode.js' ],
+ [ WORKING_DIR + 'wp-includes/js/utils.js' ]: [ './src/js/_enqueues/lib/cookies.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-a11y.js' ]: [ './src/js/_enqueues/wp/a11y.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-ajax-response.js' ]: [ './src/js/_enqueues/lib/ajax-response.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-api.js' ]: [ './src/js/_enqueues/wp/api.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-auth-check.js' ]: [ './src/js/_enqueues/lib/auth-check.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-backbone.js' ]: [ './src/js/_enqueues/wp/backbone.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-custom-header.js' ]: [ './src/js/_enqueues/wp/custom-header.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-embed-template.js' ]: [ './src/js/_enqueues/lib/embed-template.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-embed.js' ]: [ './src/js/_enqueues/wp/embed.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-emoji-loader.js' ]: [ './src/js/_enqueues/lib/emoji-loader.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-emoji.js' ]: [ './src/js/_enqueues/wp/emoji.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-list-revisions.js' ]: [ './src/js/_enqueues/lib/list-revisions.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-lists.js' ]: [ './src/js/_enqueues/lib/lists.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-pointer.js' ]: [ './src/js/_enqueues/lib/pointer.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-sanitize.js' ]: [ './src/js/_enqueues/wp/sanitize.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wp-util.js' ]: [ './src/js/_enqueues/wp/util.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wpdialog.js' ]: [ './src/js/_enqueues/lib/dialog.js' ],
+ [ WORKING_DIR + 'wp-includes/js/wplink.js' ]: [ './src/js/_enqueues/lib/link.js' ],
+ [ WORKING_DIR + 'wp-includes/js/zxcvbn-async.js' ]: [ './src/js/_enqueues/lib/zxcvbn-async.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"> 'wp-admin-css-compat-rtl': {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +311,7 @@
</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"> src: SOURCE_DIR + 'wp-admin/css/wp-admin.css',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-admin/css/wp-admin-rtl.css'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin-css-compat-min': {
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,11 +322,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> files: [
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> src: SOURCE_DIR + 'wp-admin/css/wp-admin.css',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR + 'wp-admin/css/wp-admin.min.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-admin/css/wp-admin.min.css'
</ins><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">- src: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css',
- dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.min.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src: WORKING_DIR + 'wp-admin/css/wp-admin-rtl.css',
+ dest: WORKING_DIR + 'wp-admin/css/wp-admin-rtl.min.css'
</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">@@ -350,7 +351,7 @@
</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="cx" style="display: block; padding: 0 10px"> cwd: SOURCE_DIR,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> src: []
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> 'dynamic-js': {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> colors: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: SOURCE_DIR,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.css',
</span><span class="cx" style="display: block; padding: 0 10px"> src: ['wp-admin/css/colors/*/colors.scss'],
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,8 +389,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> core: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.css',
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/css/*.css',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,19 +399,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/mediaelement/wp-mediaelement.css'
</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">- dist: {
- expand: true,
- cwd: BUILD_DIR,
- dest: BUILD_DIR,
- ext: '.min.css',
- src: [
- 'wp-includes/css/dist/*/*.css'
- ]
- },
</del><span class="cx" style="display: block; padding: 0 10px"> rtl: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.css',
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/css/*-rtl.css',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,8 +412,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> colors: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.css',
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/css/colors/*/*.css'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> core: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: SOURCE_DIR,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '-rtl.css',
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/css/*.css',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,8 +490,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> colors: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '-rtl.css',
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/css/colors/*/colors.css'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -508,7 +500,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> dynamic: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: SOURCE_DIR,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '-rtl.css',
</span><span class="cx" style="display: block; padding: 0 10px"> src: []
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,8 +654,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> core: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/js/**/*.js',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,8 +682,8 @@
</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"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> src: ['wp-includes/js/wp-embed.js']
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,26 +694,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: 'node_modules/jquery-ui/ui/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR + 'wp-includes/js/jquery/ui/',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-includes/js/jquery/ui/',
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> src: ['*.js']
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> imgareaselect: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src: BUILD_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.js',
- dest: BUILD_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.min.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src: WORKING_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.js',
+ dest: WORKING_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.min.js'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> dynamic: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cwd: BUILD_DIR,
- dest: BUILD_DIR,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cwd: WORKING_DIR,
+ dest: WORKING_DIR,
</ins><span class="cx" style="display: block; padding: 0 10px"> ext: '.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> src: []
</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"> webpack: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- prod: webpackConfig( { environment: 'production' } ),
- devProdTarget: webpackConfig( { environment: 'development', forceBuildTarget: 'build/wp-includes' } ),
- dev: webpackConfig( { environment: 'development' } ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ prod: webpackConfig( { environment: 'production', buildTarget: WORKING_DIR } ),
+ dev: webpackConfig( { environment: 'development', buildTarget: WORKING_DIR } ),
</ins><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="cx" style="display: block; padding: 0 10px"> concat: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,28 +720,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> separator: '\n',
</span><span class="cx" style="display: block; padding: 0 10px"> process: function( src, filepath ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '// Source: ' + filepath.replace( BUILD_DIR, '' ) + '\n' + src;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return '// Source: ' + filepath.replace( WORKING_DIR, '' ) + '\n' + src;
</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"> src: [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- BUILD_DIR + 'wp-includes/js/tinymce/tinymce.min.js',
- BUILD_DIR + 'wp-includes/js/tinymce/themes/modern/theme.min.js',
- BUILD_DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WORKING_DIR + 'wp-includes/js/tinymce/tinymce.min.js',
+ WORKING_DIR + 'wp-includes/js/tinymce/themes/modern/theme.min.js',
+ WORKING_DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js'
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> emoji: {
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> separator: '\n',
</span><span class="cx" style="display: block; padding: 0 10px"> process: function( src, filepath ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '// Source: ' + filepath.replace( BUILD_DIR, '' ) + '\n' + src;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return '// Source: ' + filepath.replace( WORKING_DIR, '' ) + '\n' + src;
</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"> src: [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- BUILD_DIR + 'wp-includes/js/twemoji.min.js',
- BUILD_DIR + 'wp-includes/js/wp-emoji.min.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WORKING_DIR + 'wp-includes/js/twemoji.min.js',
+ WORKING_DIR + 'wp-includes/js/wp-emoji.min.js'
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR + 'wp-includes/js/wp-emoji-release.min.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-includes/js/wp-emoji-release.min.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"> compress: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +751,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> level: 9
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> src: '<%= concat.tinymce.dest %>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dest: WORKING_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz'
</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"> patch:{
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -961,9 +952,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> build: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span><span class="cx" style="display: block; padding: 0 10px"> src: [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- BUILD_DIR + 'wp-{admin,includes}/**/*.js',
- BUILD_DIR + 'wp-content/themes/twenty*/**/*.js',
- '!' + BUILD_DIR + 'wp-includes/js/dist/vendor/*.js'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WORKING_DIR + 'wp-{admin,includes}/**/*.js',
+ WORKING_DIR + 'wp-content/themes/twenty*/**/*.js',
+ '!' + WORKING_DIR + 'wp-includes/js/dist/vendor/*.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"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1344,6 +1335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'build:js', [
</span><span class="cx" style="display: block; padding: 0 10px"> 'clean:js',
</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"> 'webpack:dev',
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'file_append',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1353,35 +1345,41 @@
</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',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'build:css', [
+ 'clean:css',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'copy:wp-admin-css-compat-rtl',
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:wp-admin-css-compat-min',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'copy:version',
- 'copy:js'
- ] );
-
- grunt.registerTask( 'build', [
- 'clean:all',
- 'copy:all',
- 'file_append',
</del><span class="cx" style="display: block; padding: 0 10px"> 'cssmin:core',
</span><span class="cx" style="display: block; padding: 0 10px"> 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rtl',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cssmin:rtl',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cssmin:colors',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'uglify:all',
- 'build:tinymce',
- 'concat:emoji',
- 'includes:emoji',
- 'includes:embed',
- 'usebanner',
- 'webpack:prod',
- 'webpack:devProdTarget',
- 'cssmin:dist',
- 'jsvalidate:build'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'usebanner'
</ins><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:files', [
+ 'clean:files',
+ 'copy:files',
+ 'copy:version',
+ ] );
+
+ grunt.registerTask( 'build', function() {
+ if ( grunt.option( 'dev' ) ) {
+ grunt.task.run( [
+ 'build:js',
+ 'build:css',
+ ] );
+ } else {
+ grunt.task.run( [
+ 'build:files',
+ 'build:js',
+ 'build:css',
+ 'includes:emoji',
+ 'includes:embed',
+ ] );
+ }
+ } );
+
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1469,7 +1467,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( minimatch.match( config.src, relative, {} ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> dest = config.dest + relative;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src = [ path.relative( BUILD_DIR, dest ) ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src = [ path.relative( WORKING_DIR, dest ) ];
</ins><span class="cx" style="display: block; padding: 0 10px"> files[ dest ] = [ filepath ];
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1485,7 +1483,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If a file in the mapping matches then set the variables for our dynamic tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( dest && configs.hasOwnProperty( dest ) && configs[ dest ][0] === './' + filepath ) {
</span><span class="cx" style="display: block; padding: 0 10px"> files[ dest ] = configs[ dest ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src = [ path.relative( BUILD_DIR, dest ) ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src = [ path.relative( WORKING_DIR, dest ) ];
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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">@@ -1523,11 +1521,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // For javascript also minify and validate the changed file.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( target === 'js-enqueues' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.config( [ 'uglify', 'dynamic', 'src' ], src );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return BUILD_DIR + dir; } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return WORKING_DIR + dir; } ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // For webpack only validate the file, minification is handled by webpack itself.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( target === 'js-webpack' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return BUILD_DIR + dir; } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return WORKING_DIR + dir; } ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // For css run the rtl task on just the changed file.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( target === 'rtl' ) {
</span></span></pre></div>
<a id="trunkpackagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package-lock.json 2018-12-21 21:35:48 UTC (rev 44358)
+++ trunk/package-lock.json 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2508,7 +2508,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "browserify-rsa": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "4.0.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2841,7 +2841,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "chalk": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.1.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "ansi-styles": "^2.2.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5049,7 +5049,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "events": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.1.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11120,7 +11120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "onetime": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.1.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11200,7 +11200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "os-locale": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.4.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12997,7 +12997,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "regjsgen": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "0.2.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "regjsparser": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13579,7 +13579,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dependencies": {
</span><span class="cx" style="display: block; padding: 0 10px"> "source-map": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "0.4.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span></span></pre></div>
<a id="trunksrcindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/index.php 2018-12-21 21:35:48 UTC (rev 44358)
+++ trunk/src/index.php 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">- * Note: this file exists only to remind developers to run WordPress from the
- * build directory. For the real index.php that gets built and boots WordPress,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: this file exists only to remind developers to build the assets.
+ * For the real index.php that gets built and boots WordPress,
</ins><span class="cx" style="display: block; padding: 0 10px"> * please refer to _index.php.
</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">@@ -11,6 +11,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'ABSPATH', dirname( __FILE__ ) . '/' );
</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 ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {
+ require_once ABSPATH . '/_index.php';
+ return;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'WPINC', 'wp-includes' );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/load.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,18 +31,34 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Die with an error message
</span><span class="cx" style="display: block; padding: 0 10px"> $die = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
- __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
- 'WordPress',
- '<code>src</code>',
- '<code>build</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %1$s: WordPress */
+ __( 'You are running %1$s without JavaScript and CSS files. These need to be built.' ),
+ 'WordPress'
</ins><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$die .= '<p>' . sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running ');
+$die .= '<code style="color: green;">npm install</code>.</p>';
+
+$die .= '<ul>';
+$die .= '<li>' . sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can build %s by running:' ),
- 'WordPress'
-) . '</p>';
-$die .= '<p><code>npm install && grunt build</code></p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'To build %s while developing run:' ),
+ 'WordPress'
+ ) . '<br /><br />';
+$die .= '<code style="color: green;">grunt build --dev</code></li>';
+$die .= '<li>' . sprintf(
+ __( 'To build files automatically when changing the source files run:' ),
+ 'WordPress'
+ ) . '<br /><br />';
+$die .= '<code style="color: green;">grunt watch</code></li>';
+$die .= '<li>' . sprintf(
+ __( 'To create a production build of %s run:' ),
+ 'WordPress'
+ ) . '<br /><br />';
+$die .= '<code style="color: green;">grunt build</code></li>';
+$die .= '</ul>';
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: NPM URL, %2$s: Grunt URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin
</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/src/wp-admin 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin 2018-12-24 13:28:22 UTC (rev 44359)
</ins></span></pre></div>
<a id="trunksrcwpadmin"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin</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">+js
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/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">--- trunk/src/wp-admin/css 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincss"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/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">+*.min.css
+*-rtl.css
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/css/colors/blue
</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/src/wp-admin/css/colors/blue 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css/colors/blue 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincsscolorsblue"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/css/colors/blue</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">+*.css
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/css/colors/coffee
</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/src/wp-admin/css/colors/coffee 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css/colors/coffee 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincsscolorscoffee"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/css/colors/coffee</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">+*.css
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/css/colors/ectoplasm
</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/src/wp-admin/css/colors/ectoplasm 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css/colors/ectoplasm 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincsscolorsectoplasm"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/css/colors/ectoplasm</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">+*.css
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/css/colors/light
</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/src/wp-admin/css/colors/light 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css/colors/light 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincsscolorslight"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/css/colors/light</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">+*.css
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/css/colors/midnight
</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/src/wp-admin/css/colors/midnight 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css/colors/midnight 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincsscolorsmidnight"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/css/colors/midnight</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">+*.css
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/css/colors/ocean
</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/src/wp-admin/css/colors/ocean 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css/colors/ocean 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincsscolorsocean"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/css/colors/ocean</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">+*.css
</ins><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/css/colors/sunrise
</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/src/wp-admin/css/colors/sunrise 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/css/colors/sunrise 2018-12-24 13:28:22 UTC (rev 44359)
</ins><a id="trunksrcwpadmincsscolorssunrise"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/css/colors/sunrise</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">+*.css
</ins><a id="trunksrcwpadminindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/index.php 2018-12-21 21:35:48 UTC (rev 44358)
+++ trunk/src/wp-admin/index.php 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">- * Note: this file exists only to remind developers to run WordPress from the
- * build directory. For the real wp-admin/index.php that gets built and boots
- * the WordPress admin, please refer to wp-admin/_index.php.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: this file exists only to remind developers to build the assets.
+ * For the real wp-admin/index.php that gets built and boots WordPress,
+ * please refer to wp-admin/_index.php.
</ins><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 ( file_exists( dirname( __FILE__ ) . '/../wp-includes/js/dist/edit-post.js' ) ) {
+ require_once dirname( __FILE__ ) . '/_index.php';
+ return;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** Define ABSPATH as this file's directory */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'ABSPATH', dirname( __FILE__ ) . '/../' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,24 +31,40 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Die with an error message
</span><span class="cx" style="display: block; padding: 0 10px"> $die = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
- __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
- 'WordPress',
- '<code>src</code>',
- '<code>build</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %1$s: WordPress */
+ __( 'You are running %1$s without JavaScript and CSS files. These need to be built.' ),
+ 'WordPress'
</ins><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$die .= '<p>' . sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running ');
+$die .= '<code style="color: green;">npm install</code>.</p>';
+
+$die .= '<ul>';
+$die .= '<li>' . sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can build %s by running:' ),
- 'WordPress'
-) . '</p>';
-$die .= '<p><code>npm install && grunt build</code></p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'To build %s while developing run:' ),
+ 'WordPress'
+ ) . '<br /><br />';
+$die .= '<code style="color: green;">grunt build --dev</code></li>';
+$die .= '<li>' . sprintf(
+ __( 'To build files automatically when changing the source files run:' ),
+ 'WordPress'
+ ) . '<br /><br />';
+$die .= '<code style="color: green;">grunt watch</code></li>';
+$die .= '<li>' . sprintf(
+ __( 'To create a production build of %s run:' ),
+ 'WordPress'
+ ) . '<br /><br />';
+$die .= '<code style="color: green;">grunt build</code></li>';
+$die .= '</ul>';
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: NPM URL, %2$s: Grunt URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
- 'https://www.npmjs.com/',
- 'https://gruntjs.com/',
- __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
-) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
+ 'https://www.npmjs.com/',
+ 'https://gruntjs.com/',
+ __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $die, __( 'WordPress › Error' ) );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpblockparserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-block-parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-parser.php 2018-12-21 21:35:48 UTC (rev 44358)
+++ trunk/src/wp-includes/class-wp-block-parser.php 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,10 +63,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $innerContent;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->blockName = $name;
- $this->attrs = $attrs;
- $this->innerBlocks = $innerBlocks;
- $this->innerHTML = $innerHTML;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->blockName = $name;
+ $this->attrs = $attrs;
+ $this->innerBlocks = $innerBlocks;
+ $this->innerHTML = $innerHTML;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->innerContent = $innerContent;
</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">@@ -269,17 +269,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === $stack_depth ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $leading_html_start ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->output[] = (array) self::freeform(
- substr(
- $this->document,
- $leading_html_start,
- $start_offset - $leading_html_start
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->output[] = (array) self::freeform( substr(
+ $this->document,
+ $leading_html_start,
+ $start_offset - $leading_html_start
+ ) );
</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"> $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->offset = $start_offset + $token_length;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->offset = $start_offset + $token_length;
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">@@ -294,16 +292,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'block-opener':
</span><span class="cx" style="display: block; padding: 0 10px"> // track all newly-opened blocks on the stack
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_push(
- $this->stack,
- new WP_Block_Parser_Frame(
- new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
- $start_offset,
- $token_length,
- $start_offset + $token_length,
- $leading_html_start
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_push( $this->stack, new WP_Block_Parser_Frame(
+ new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
+ $start_offset,
+ $token_length,
+ $start_offset + $token_length,
+ $leading_html_start
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->offset = $start_offset + $token_length;
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,11 +329,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * otherwise we're nested and we have to close out the current
</span><span class="cx" style="display: block; padding: 0 10px"> * block and add it as a new innerBlock to the parent
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stack_top = array_pop( $this->stack );
- $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
- $stack_top->block->innerHTML .= $html;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stack_top = array_pop( $this->stack );
+ $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
+ $stack_top->block->innerHTML .= $html;
</ins><span class="cx" style="display: block; padding: 0 10px"> $stack_top->block->innerContent[] = $html;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stack_top->prev_offset = $start_offset + $token_length;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stack_top->prev_offset = $start_offset + $token_length;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_inner_block(
</span><span class="cx" style="display: block; padding: 0 10px"> $stack_top->block,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,15 +391,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'no-more-tokens', null, null, null, null );
</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">- list( $match, $started_at ) = $matches[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $match, $started_at ) = $matches[ 0 ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $length = strlen( $match );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_closer = isset( $matches['closer'] ) && -1 !== $matches['closer'][1];
- $is_void = isset( $matches['void'] ) && -1 !== $matches['void'][1];
- $namespace = $matches['namespace'];
- $namespace = ( isset( $namespace ) && -1 !== $namespace[1] ) ? $namespace[0] : 'core/';
- $name = $namespace . $matches['name'][0];
- $has_attrs = isset( $matches['attrs'] ) && -1 !== $matches['attrs'][1];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_closer = isset( $matches[ 'closer' ] ) && -1 !== $matches[ 'closer' ][ 1 ];
+ $is_void = isset( $matches[ 'void' ] ) && -1 !== $matches[ 'void' ][ 1 ];
+ $namespace = $matches[ 'namespace' ];
+ $namespace = ( isset( $namespace ) && -1 !== $namespace[ 1 ] ) ? $namespace[ 0 ] : 'core/';
+ $name = $namespace . $matches[ 'name' ][ 0 ];
+ $has_attrs = isset( $matches[ 'attrs' ] ) && -1 !== $matches[ 'attrs' ][ 1 ];
</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"> * Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +406,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * are associative arrays. If we use `array()` we get a JSON `[]`
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $attrs = $has_attrs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ? json_decode( $matches['attrs'][0], /* as-associative */ true )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ? json_decode( $matches[ 'attrs' ][ 0 ], /* as-associative */ true )
</ins><span class="cx" style="display: block; padding: 0 10px"> : $this->empty_attrs;
</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">@@ -476,17 +471,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|null $last_offset last byte offset into document if continuing form earlier output
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $this->stack[ count( $this->stack ) - 1 ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = $this->stack[ count( $this->stack ) - 1 ];
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent->block->innerBlocks[] = (array) $block;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $html ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent->block->innerHTML .= $html;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent->block->innerHTML .= $html;
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent->block->innerContent[] = $html;
</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"> $parent->block->innerContent[] = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length;
</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">@@ -505,18 +500,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> : substr( $this->document, $prev_offset );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $html ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stack_top->block->innerHTML .= $html;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stack_top->block->innerHTML .= $html;
</ins><span class="cx" style="display: block; padding: 0 10px"> $stack_top->block->innerContent[] = $html;
</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"> if ( isset( $stack_top->leading_html_start ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->output[] = (array) self::freeform(
- substr(
- $this->document,
- $stack_top->leading_html_start,
- $stack_top->token_start - $stack_top->leading_html_start
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->output[] = (array) self::freeform( substr(
+ $this->document,
+ $stack_top->leading_html_start,
+ $stack_top->token_start - $stack_top->leading_html_start
+ ) );
</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"> $this->output[] = (array) $stack_top->block;
</span><span class="cx" style="display: block; padding: 0 10px">Index: trunk/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">--- trunk/src/wp-includes/css 2018-12-21 21:35:48 UTC (rev 44358)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-includes/css 2018-12-24 13:28:22 UTC (rev 44359)
</ins></span></pre></div>
<a id="trunksrcwpincludescss"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-includes/css</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:ignore</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> dist
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+*.min.css
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><a id="trunktoolswebpackmediajs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/webpack/media.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/webpack/media.js 2018-12-21 21:35:48 UTC (rev 44358)
+++ trunk/tools/webpack/media.js 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,23 +1,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const UglifyJsPlugin = require( 'uglifyjs-webpack-plugin' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var path = require( 'path' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- admin_files = {},
- include_files = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ admin_files = {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-include_files = {
- 'build/wp-includes/js/media-audiovideo.js': ['./src/js/_enqueues/wp/media/audiovideo.js'],
- 'build/wp-includes/js/media-audiovideo.min.js': ['./src/js/_enqueues/wp/media/audiovideo.js'],
- 'build/wp-includes/js/media-grid.js': ['./src/js/_enqueues/wp/media/grid.js'],
- 'build/wp-includes/js/media-grid.min.js': ['./src/js/_enqueues/wp/media/grid.js'],
- 'build/wp-includes/js/media-models.js': ['./src/js/_enqueues/wp/media/models.js'],
- 'build/wp-includes/js/media-models.min.js': ['./src/js/_enqueues/wp/media/models.js'],
- 'build/wp-includes/js/media-views.js': ['./src/js/_enqueues/wp/media/views.js'],
- 'build/wp-includes/js/media-views.min.js': ['./src/js/_enqueues/wp/media/views.js'],
-};
-
</del><span class="cx" style="display: block; padding: 0 10px"> const baseDir = path.join( __dirname, '../../' );
</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, buildTarget: false } ) {
+ const include_files = {
+ [ env.buildTarget + 'wp-includes/js/media-audiovideo.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'],
+ [ env.buildTarget + 'wp-includes/js/media-audiovideo.min.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'],
+ [ env.buildTarget + 'wp-includes/js/media-grid.js' ]: ['./src/js/_enqueues/wp/media/grid.js'],
+ [ env.buildTarget + 'wp-includes/js/media-grid.min.js' ]: ['./src/js/_enqueues/wp/media/grid.js'],
+ [ env.buildTarget + 'wp-includes/js/media-models.js' ]: ['./src/js/_enqueues/wp/media/models.js'],
+ [ env.buildTarget + 'wp-includes/js/media-models.min.js' ]: ['./src/js/_enqueues/wp/media/models.js'],
+ [ env.buildTarget + 'wp-includes/js/media-views.js' ]: ['./src/js/_enqueues/wp/media/views.js'],
+ [ env.buildTarget + 'wp-includes/js/media-views.min.js' ]: ['./src/js/_enqueues/wp/media/views.js'],
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const mediaConfig = {
</span><span class="cx" style="display: block; padding: 0 10px"> mode: "production",
</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-21 21:35:48 UTC (rev 44358)
+++ trunk/tools/webpack/packages.js 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,10 +49,11 @@
</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, forceBuildTarget: false } ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = function( env = { environment: 'production', watch: false, buildTarget: 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 = env.forceBuildTarget ? env.forceBuildTarget : ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ let buildTarget = env.buildTarget ? env.buildTarget : ( mode === 'production' ? 'build' : 'src' );
+ buildTarget = buildTarget + '/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">@@ -165,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> to: join( baseDir, `${ buildTarget }/css/dist/${ packageName }/` ),
</span><span class="cx" style="display: block; padding: 0 10px"> flatten: true,
</span><span class="cx" style="display: block; padding: 0 10px"> transform: ( content ) => {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( config.mode === 'production' && ! env.forceBuildTarget ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( mode === 'production' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return postcss( [
</span><span class="cx" style="display: block; padding: 0 10px"> require( 'cssnano' )( {
</span><span class="cx" style="display: block; padding: 0 10px"> preset: 'default',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,6 +177,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"> return content;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+ transformPath: ( targetPath, sourcePath ) => {
+ if ( mode === 'production' ) {
+ return targetPath.replace( /\.css$/, '.min.css' );
+ }
+
+ return targetPath;
</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">@@ -268,7 +276,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> config.devtool = process.env.SOURCEMAP || 'source-map';
</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">- if ( env.forceBuildTarget ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( mode === 'development' && env.buildTarget === 'build/' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete config.devtool;
</span><span class="cx" style="display: block; padding: 0 10px"> config.mode = 'production';
</span><span class="cx" style="display: block; padding: 0 10px"> config.optimization = {
</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-21 21:35:48 UTC (rev 44358)
+++ trunk/webpack.config.js 2018-12-24 13:28:22 UTC (rev 44359)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,13 +1,13 @@
</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, forceBuildTarget: false } ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = function( env = { environment: "production", watch: false, buildTarget: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! env.forceBuildTarget ) {
- env.forceBuildTarget = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! env.buildTarget ) {
+ env.buildTarget = ( env.mode === 'production' ? 'build/' : 'src/' );
</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></pre>
</div>
</div>
</body>
</html>