Changeset 43978

Timestamp:

12/11/2018 04:38:21 PM (6 years ago)

Author:

atimmer

Message:

Build tools: Combine webpack config files.

This prepares us for building the Gutenberg packages.

Merges [43687] to trunk.
See #45065.

Location:

trunk

Files:

• . (modified) (1 prop)
• Gruntfile.js (modified) (3 diffs)
• webpack.config.dev.js (deleted)
• webpack.config.js (copied) (copied from branches/5.0/webpack.config.js) (2 diffs)
• webpack.config.prod.js (deleted)

trunk/Gruntfile.js

@@ -1 +1 @@
 /* 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) {
@@ -705 +704 @@
         },
         webpack: {
-            prod: webpackConfig,
-            dev: webpackDevConfig
+            prod: webpackConfig( { environment: 'production' } ),
+            dev: webpackConfig( { environment: 'development' } )
         },
         concat: {
@@ -1091 +1090 @@
                 files: [
                     'Gruntfile.js',
-                    'webpack-dev.config.js',
                     'webpack.config.js'
                 ]

trunk/webpack.config.js

@@ -1 @@
-var path         = require( 'path' ),
-    SOURCE_DIR   = 'src/',
-    mediaEntries  = {},
-    mediaBuilds  = [ 'audiovideo', 'grid', 'models', 'views' ],
-    webpack      = require( 'webpack' );
+var path            = require( 'path' ),
+    webpack         = require( 'webpack' ),
+    admin_files     = {},
+    include_files   = {};
 
-mediaBuilds.forEach( function ( build ) {
-    var path = SOURCE_DIR + 'wp-includes/js/media';
-    mediaEntries[ build ] = './' + path + '/' + build + '.manifest.js';
-} );
+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" } ) {
@@ -15 +20 @@
     const mediaConfig = {
         cache: true,
-        entry: mediaEntries,
+        entry: Object.assign( admin_files, include_files ),
         output: {
-            path: path.join( __dirname, 'src/wp-includes/js' ),
-            filename: 'media-[name].js'
-        }
+            filename: '[name]',
+        },
+        plugins: [
+            new webpack.optimize.UglifyJsPlugin({
+                include: /\.min\.js$/,
+                minimize: true
+            })
+        ]
     };
 
-    if ( mode === 'development' ) {
-        mediaConfig.watch = true;
-    }
-
     if ( mode === 'production' ) {
-        mediaConfig.plugins = [
-            new webpack.optimize.ModuleConcatenationPlugin()
-        ];
+        mediaConfig.plugins.push( new webpack.optimize.ModuleConcatenationPlugin() );
     }