feat(pack): 将 uglify-js 升级到 uglify-js2

Author: yuhaoju

lib/modules/minWorker.js

@@ -3,8 +3,7 @@
 var path = require('path');
 var fs = require('fs');
 var crypto = require('crypto');
-var jsParser = require('uglify-js').parser;
-var jsUglify = require('uglify-js').uglify;
+var UglifyJS = require('uglify-js');
 var cssUglify = require('uglifycss');
 var extend = require('extend');
 
@@ -25,17 +24,18 @@ process.on('message', function (m) {
             // variable name mangling
             var willMangle = true;
             var uglifyjsOpts = buildOpts.uglifyjs || {};
-            var isCliArgvCloseMangle = typeof opt.min === 'string' && opt.min.split('=')[0] === 'mangle' && opt.min.split('=')[1] === 'false';
             var isBuildOptsCloseMangle = uglifyjsOpts.mangle === false;
-            if (isCliArgvCloseMangle || isBuildOptsCloseMangle) {
+            var isCliArgvCloseMangle = typeof opt.min === 'string' && opt.min.split('=')[0] === 'mangle' && opt.min.split('=')[1] === 'false';
+            if (isBuildOptsCloseMangle || isCliArgvCloseMangle) {
                 willMangle = false;
             }
 
             try {
-                var ast = jsParser.parse(content);
-                ast = willMangle ? jsUglify.ast_mangle(ast, uglifyjsOpts.mangle) : ast;
-                ast = uglifyjsOpts.squeeze ? jsUglify.ast_squeeze(ast, uglifyjsOpts.squeeze) : ast;
-                minifiedCode = jsUglify.gen_code(ast, uglifyjsOpts.genCode);
+                var minifyResult = UglifyJS.minify(content, extend({
+                    fromString: true,
+                    mangle: willMangle
+                }, uglifyjsOpts));
+                minifiedCode = minifyResult.code;
             } catch (e) {
                 response.error = extend(true, e, { assetName: assetName });
             }

package.json

@@ -53,7 +53,7 @@
     "shelljs": "^0.7.5",
     "style-loader": "^0.13.1",
     "through2": "^2.0.1",
-    "uglify-js": "^1.3.5",
+    "uglify-js": "2.7.5",
     "uglifycss": "0.0.25",
     "webpack": "1.14.0",
     "webpack-dev-middleware": "1.9.0",

src/modules/minWorker.js

@@ -1,8 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const crypto = require('crypto');
-const jsParser = require('uglify-js').parser;
-const jsUglify = require('uglify-js').uglify;
+const UglifyJS = require('uglify-js');
 const cssUglify = require('uglifycss');
 const extend = require('extend');
 
@@ -23,17 +22,22 @@ process.on('message', function(m) {
             // variable name mangling
             let willMangle = true;
             const uglifyjsOpts = buildOpts.uglifyjs || {};
-            const isCliArgvCloseMangle = typeof opt.min === 'string' && opt.min.split('=')[0] === 'mangle' && opt.min.split('=')[1] === 'false';
             const isBuildOptsCloseMangle = uglifyjsOpts.mangle === false;
-            if (isCliArgvCloseMangle || isBuildOptsCloseMangle) {
+            const isCliArgvCloseMangle = typeof opt.min === 'string' && opt.min.split('=')[0] === 'mangle'
+                                        && opt.min.split('=')[1] === 'false';
+            if (isBuildOptsCloseMangle || isCliArgvCloseMangle) {
                 willMangle = false;
             }
 
             try {
-                let ast = jsParser.parse(content);
-                ast = willMangle ? jsUglify.ast_mangle(ast, uglifyjsOpts.mangle) : ast;
-                ast = uglifyjsOpts.squeeze ? jsUglify.ast_squeeze(ast, uglifyjsOpts.squeeze) : ast;
-                minifiedCode = jsUglify.gen_code(ast, uglifyjsOpts.genCode);
+                const minifyResult = UglifyJS.minify(content, extend(
+                    {
+                        fromString: true,
+                        mangle: willMangle
+                    },
+                    uglifyjsOpts
+                ));
+                minifiedCode = minifyResult.code;
             } catch(e) {
                 response.error = extend(true, e, {assetName: assetName});
             }

yarn.lock

@@ -5096,7 +5096,7 @@ typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.npm.taobao.orgtypedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@2.7.x, uglify-js@^2.6, uglify-js@~2.7.3:
+uglify-js@2.7.5, uglify-js@2.7.x, uglify-js@^2.6, uglify-js@~2.7.3:
   version "2.7.5"
   resolved "https://registry.npm.taobao.orguglify-js/download/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
   dependencies:
@@ -5105,10 +5105,6 @@ uglify-js@2.7.x, uglify-js@^2.6, uglify-js@~2.7.3:
     uglify-to-browserify "~1.0.0"
     yargs "~3.10.0"
 
-uglify-js@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.npm.taobao.orguglify-js/download/uglify-js-1.3.5.tgz#4b5bfff9186effbaa888e4c9e94bd9fc4c94929d"
-
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.npm.taobao.orguglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"