Build tools: Combine webpack config files.

atimmer · atimmer · commit f173141c5b8a · 2018-12-11T16:38:21.000Z
This prepares us for building the Gutenberg packages. Merges [43687] to trunk. See #45065. git-svn-id: https://develop.svn.wordpress.org/trunk@43978 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,7 +1,6 @@
 /* jshint node:true */
 /* globals Set */
-var webpackConfig = require( './webpack.config.prod' );
-var webpackDevConfig = require( './webpack.config.dev' );
+var webpackConfig = require( './webpack.config' );
 
 module.exports = function(grunt) {
 	var path = require('path'),
@@ -704,8 +703,8 @@ module.exports = function(grunt) {
 			}
 		},
 		webpack: {
-			prod: webpackConfig,
-			dev: webpackDevConfig
+			prod: webpackConfig( { environment: 'production' } ),
+			dev: webpackConfig( { environment: 'development' } )
 		},
 		concat: {
 			tinymce: {
@@ -1090,7 +1089,6 @@ module.exports = function(grunt) {
 			config: {
 				files: [
 					'Gruntfile.js',
-					'webpack-dev.config.js',
 					'webpack.config.js'
 				]
 			},
diff --git a/webpack.config.js b/webpack.config.js
@@ -14,10 +14,11 @@ include_files = {
 	'build/wp-includes/js/media-views.min.js': ['./src/js/_enqueues/wp/media/views.js'],
 };
 
-module.exports = [
-	{
+module.exports = function( env = { environment: "production" } ) {
+	const mode = env.environment;
+
+	const mediaConfig = {
 		cache: true,
-		watch: false,
 		entry: Object.assign( admin_files, include_files ),
 		output: {
 			filename: '[name]',
@@ -28,5 +29,11 @@ module.exports = [
 				minimize: true
 			})
 		]
+	};
+
+	if ( mode === 'production' ) {
+		mediaConfig.plugins.push( new webpack.optimize.ModuleConcatenationPlugin() );
 	}
-];
+
+	return mediaConfig;
+};
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
