<!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>[43978] trunk: Build tools: Combine webpack config files.</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/43978">43978</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/43978","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-11 16:38:21 +0000 (Tue, 11 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: Combine webpack config files.
This prepares us for building the Gutenberg packages.
Merges <a href="https://core.trac.wordpress.org/changeset/43687">[43687]</a> to trunk.
See <a href="https://core.trac.wordpress.org/ticket/45065">#45065</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwebpackconfigjs">trunk/webpack.config.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwebpackconfigdevjs">trunk/webpack.config.dev.js</a></li>
<li><a href="#trunkwebpackconfigprodjs">trunk/webpack.config.prod.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk 2018-12-11 16:12:13 UTC (rev 43977)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk 2018-12-11 16:38:21 UTC (rev 43978)
</ins><a id="trunk"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43681-43682,43684-43686,43726
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43681-43682,43684-43687,43726
</ins><span class="cx" style="display: block; padding: 0 10px"> /trunk:18512
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2018-12-11 16:12:13 UTC (rev 43977)
+++ trunk/Gruntfile.js 2018-12-11 16:38:21 UTC (rev 43978)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint node:true */
</span><span class="cx" style="display: block; padding: 0 10px"> /* globals Set */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var webpackConfig = require( './webpack.config.prod' );
-var webpackDevConfig = require( './webpack.config.dev' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var webpackConfig = require( './webpack.config' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = function(grunt) {
</span><span class="cx" style="display: block; padding: 0 10px"> var path = require('path'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,8 +703,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"> webpack: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- prod: webpackConfig,
- dev: webpackDevConfig
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ prod: webpackConfig( { environment: 'production' } ),
+ dev: webpackConfig( { environment: 'development' } )
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> concat: {
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1090,7 +1089,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> config: {
</span><span class="cx" style="display: block; padding: 0 10px"> files: [
</span><span class="cx" style="display: block; padding: 0 10px"> 'Gruntfile.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'webpack-dev.config.js',
</del><span class="cx" style="display: block; padding: 0 10px"> 'webpack.config.js'
</span><span class="cx" style="display: block; padding: 0 10px"> ]
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre></div>
<a id="trunkwebpackconfigdevjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/webpack.config.dev.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/webpack.config.dev.js 2018-12-11 16:12:13 UTC (rev 43977)
+++ trunk/webpack.config.dev.js 2018-12-11 16:38:21 UTC (rev 43978)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,32 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var path = require( 'path' ),
- webpack = require( 'webpack' ),
- admin_files = {},
- include_files = {};
-
-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'],
-};
-
-module.exports = [
- {
- cache: true,
- watch: false,
- entry: Object.assign( admin_files, include_files ),
- output: {
- filename: '[name]',
- },
- plugins: [
- new webpack.optimize.UglifyJsPlugin({
- include: /\.min\.js$/,
- minimize: true
- })
- ]
- }
-];
</del></span></pre></div>
<a id="trunkwebpackconfigjsfromrev43687branches50webpackconfigjs"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/webpack.config.js (from rev 43687, branches/5.0/webpack.config.js)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/webpack.config.js (rev 0)
+++ trunk/webpack.config.js 2018-12-11 16:38:21 UTC (rev 43978)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,39 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var path = require( 'path' ),
+ webpack = require( 'webpack' ),
+ admin_files = {},
+ include_files = {};
+
+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'],
+};
+
+module.exports = function( env = { environment: "production" } ) {
+ const mode = env.environment;
+
+ const mediaConfig = {
+ cache: true,
+ entry: Object.assign( admin_files, include_files ),
+ output: {
+ filename: '[name]',
+ },
+ plugins: [
+ new webpack.optimize.UglifyJsPlugin({
+ include: /\.min\.js$/,
+ minimize: true
+ })
+ ]
+ };
+
+ if ( mode === 'production' ) {
+ mediaConfig.plugins.push( new webpack.optimize.ModuleConcatenationPlugin() );
+ }
+
+ return mediaConfig;
+};
</ins></span></pre></div>
<a id="trunkwebpackconfigprodjs"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/webpack.config.prod.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/webpack.config.prod.js 2018-12-11 16:12:13 UTC (rev 43977)
+++ trunk/webpack.config.prod.js 2018-12-11 16:38:21 UTC (rev 43978)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,33 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var path = require( 'path' ),
- webpack = require( 'webpack' ),
- admin_files = {},
- include_files = {};
-
-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'],
-};
-
-module.exports = [
- {
- cache: true,
- watch: false,
- entry: Object.assign( admin_files, include_files ),
- output: {
- filename: '[name]',
- },
- plugins: [
- new webpack.optimize.ModuleConcatenationPlugin(),
- new webpack.optimize.UglifyJsPlugin({
- include: /\.min\.js$/,
- minimize: true
- })
- ]
- }
-];
</del></span></pre>
</div>
</div>
</body>
</html>