fix: node build for es6

easy-team · Nov 22, 2018 · 6acfaf8 · 6acfaf8
1 parent 9a0a772
commit 6acfaf8
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 33 deletions.
diff --git a/lib/core/loader.js b/lib/core/loader.js
@@ -105,7 +105,7 @@ module.exports = {
 
   createPostCssLoader(loaderOptions) {
     const loader = 'postcss-loader';
-    let options = this.merge(this.webpackConfig.devtool ? { sourceMap: true } : {}, loaderOptions);
+    let options = this.merge(!this.ssr && this.webpackConfig.devtool ? { sourceMap: true } : {}, loaderOptions);
     const postcssFile = path.join(this.baseDir, 'postcss.config.js');
     if (!fs.existsSync(postcssFile)) {
       const config = { path: path.resolve(__dirname, '../../config/') };

diff --git a/lib/core/optimize.js b/lib/core/optimize.js
@@ -1,5 +1,6 @@
 'use strict';
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 module.exports = class WebpackOptimize {
   constructor(ctx) {
     this.ctx = ctx;
@@ -60,51 +61,113 @@ module.exports = class WebpackOptimize {
     };
   }
 
-  normalizeMinimizer() {
+  normalizeChunks() {
+    const { runtimeChunk, splitChunks } = this.optimization;
+    if (runtimeChunk) {
+      delete this.optimization.runtimeChunk;
+    }
+    if (splitChunks) {
+      delete this.optimization.splitChunks;
+    }
+  }
+
+  normalizeMinimizer(minimizer) {
     if (!this.ctx.prod && this.optimization.minimizer) {
       delete this.optimization.minimizer;
     }
-    // compatible old config
+    if (minimizer) {
+      this.optimization.minimizer = [].concat(minimizer);
+    }
+    return this.optimization;
+  }
+
+  getMinimizerOptions() {
     if (this.ctx.prod && !this.optimization.minimizer) {
       const uglifyJs = this.ctx.getConfigPlugin('uglifyJs');
-      if (uglifyJs) {
-        const args = this.ctx.utils.isObject(uglifyJs) ? uglifyJs.args || uglifyJs : {};
-        const options = this.ctx.merge({
-          cache: true,
-          parallel: 4,
-          sourceMap: !!this.ctx.devtool,
-          uglifyOptions: {
-            ie8: false,
-            warnings: false,
-            compress: {
-              dead_code: true,
-              drop_console: true,
-              drop_debugger: true
-            },
-            output: {
-              comments: false
-            }
-          }
-        }, args);
-        this.optimization.minimizer = [ new UglifyJsPlugin(options) ];
+      if (uglifyJs === true) {
+        return {};
+      }
+      if (this.ctx.utils.isObject(uglifyJs)) {
+        return uglifyJs.args || uglifyJs;
       }
     }
-    return this.optimization;
+    return null;
   }
 
-  getOptimization() {
-    const { runtimeChunk, splitChunks } = this.optimization;
-    if (runtimeChunk) {
-      delete this.optimization.runtimeChunk;
+  createUglifyJsMinimizer() {
+    const options = this.getMinimizerOptions();
+    if (options) {
+      delete options.terserOptions;
+      return this.createUglifyJsPlguin(options);
     }
-    if (splitChunks) {
-      delete this.optimization.splitChunks;
+    return null;
+  }
+
+  createTerserMinimizer() {
+    const options = this.getMinimizerOptions();
+    if (options) {
+      delete options.uglifyOptions;
+      return this.createTerserPlugin(options);
     }
-    return this.normalizeMinimizer();
+    return null;
+  }
+
+  createUglifyJsPlguin(options) {
+    const opt = this.ctx.merge({
+      cache: true,
+      parallel: 2,
+      sourceMap: !!this.ctx.devtool,
+      uglifyOptions: {
+        ie8: false,
+        safari10: false,
+        warnings: false,
+        compress: {
+          dead_code: true,
+          drop_console: true,
+          drop_debugger: true
+        },
+        output: {
+          comments: false
+        }
+      }
+    }, options);
+    return new UglifyJsPlugin(opt);
+  }
+
+  createTerserPlugin(options) {
+    const opt = this.ctx.merge({
+      cache: true,
+      parallel: 2,
+      sourceMap: !!this.ctx.devtool,
+      terserOptions: {
+        ie8: false,
+        safari10: false,
+        warnings: false,
+        compress: {
+          dead_code: true,
+          drop_console: true,
+          drop_debugger: true
+        },
+        output: {
+          comments: false
+        }
+      }
+    }, options);
+    return new TerserPlugin(opt);
+  }
+
+  getOptimization() {
+    return this.normalizeMinimizer(this.createUglifyJsMinimizer());
+  }
+
+  getDLLOptimization() {
+    this.normalizeChunks();
+    return this.normalizeMinimizer(this.createUglifyJsMinimizer());
   }
 
   getWebOptimization() {
-    const optimization = this.normalizeMinimizer();
+    const minimizer = this.createUglifyJsMinimizer();
+    const optimization = this.normalizeMinimizer(minimizer);
     return this.ctx.merge({
       namedModules: true,
       namedChunks: true,
@@ -126,6 +189,7 @@ module.exports = class WebpackOptimize {
   }
 
   getNodeOptimization() {
-    return this.getOptimization();
+    this.normalizeChunks();
+    return this.normalizeMinimizer(process.env.BABEL_ENV ? this.createTerserMinimizer() : this.createUglifyJsMinimizer());
   }
 };
diff --git a/lib/target/dll.js b/lib/target/dll.js
@@ -24,6 +24,10 @@ class WebpackDllBuilder extends WebpackBaseBuilder {
       this.addEntry(item.name, item.lib);
     });
   }
+
+  createOptimization() {
+    return this.webpackOptimize.getDLLOptimization();
+  }
 }
 WebpackDllBuilder.TYPE = 'client';
 WebpackDllBuilder.TARGET = 'web';

diff --git a/package.json b/package.json
@@ -56,6 +56,7 @@
     "service-worker-precache-webpack-plugin": "^1.0.0",
     "shelljs": "^0.7.4",
     "style-loader": "^0.18.2",
+    "terser-webpack-plugin": "^1.1.0",
     "thread-loader": "^1.1.5",
     "uglifyjs-webpack-plugin": "^2.0.1",
     "url-loader": "^0.5.8",