Merge pull request webpack#3926 from eu81273/webpack-1

sokra · web-flow · commit f66f02497a9c · 2017-01-12T08:45:29.000+01:00
Pass mangle options to ast.figure_out_scope in uglify
diff --git a/lib/optimize/UglifyJsPlugin.js b/lib/optimize/UglifyJsPlugin.js
@@ -88,7 +88,7 @@ UglifyJsPlugin.prototype.apply = function(compiler) {
 						ast = ast.transform(compress);
 					}
 					if(options.mangle !== false) {
-						ast.figure_out_scope();
+						ast.figure_out_scope(options.mangle || {});
 						ast.compute_char_frequency(options.mangle || {});
 						ast.mangle_names(options.mangle || {});
 						if(options.mangle && options.mangle.props) {
diff --git a/test/configCases/plugins/uglifyjs-plugin/ie8.js b/test/configCases/plugins/uglifyjs-plugin/ie8.js
@@ -0,0 +1,9 @@
+function t(a,b) {
+    try {
+        throw a+a;
+    } catch(x) {
+        b(x);
+    }
+}
+
+module.exports = t;
diff --git a/test/configCases/plugins/uglifyjs-plugin/index.js b/test/configCases/plugins/uglifyjs-plugin/index.js
@@ -15,5 +15,13 @@ it("should contain comments in vendors chunk", function() {
 	source.should.containEql(" * comment should not be stripped vendors.3");
 });
 
+// this test is based off https://github.com/mishoo/UglifyJS2/blob/master/test/compress/screw-ie8.js
+it("should pass mangle options", function() {
+	var fs = require("fs"),
+		path = require("path");
+	var source = fs.readFileSync(path.join(__dirname, "ie8.js"), "utf-8");
+	source.should.containEql("function o(t,r){try{throw t+t}catch(o){r(o)}}");
+});
+
 
 require.include("./test.js");
diff --git a/test/configCases/plugins/uglifyjs-plugin/webpack.config.js b/test/configCases/plugins/uglifyjs-plugin/webpack.config.js
@@ -6,15 +6,19 @@ module.exports = {
 	},
 	entry: {
 		bundle0: ["./index.js"],
-		vendors: ["./vendors.js"]
+		vendors: ["./vendors.js"],
+		ie8: ["./ie8.js"]
 	},
 	output: {
 		filename: "[name].js"
 	},
 	plugins: [
 		new webpack.optimize.UglifyJsPlugin({
 			comments: false,
-			exclude: ["vendors.js"]
+			exclude: ["vendors.js"],
+			mangle: {
+				screw_ie8: false
+			}
 		})
 	]
 };

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ UglifyJsPlugin.prototype.apply = function(compiler) {`
`88`	`88`	`ast = ast.transform(compress);`
`89`	`89`	`}`
`90`	`90`	`if(options.mangle !== false) {`
`91`		`- ast.figure_out_scope();`
	`91`	`+ ast.figure_out_scope(options.mangle \|\| {});`
`92`	`92`	`ast.compute_char_frequency(options.mangle \|\| {});`
`93`	`93`	`ast.mangle_names(options.mangle \|\| {});`
`94`	`94`	`if(options.mangle && options.mangle.props) {`