Stronger check and override of comments in UglifyJsPlugin options

dashed · dashed · commit 4024689e6345 · 2015-07-26T21:26:27.000-04:00
Fixes webpack#324
diff --git a/lib/optimize/UglifyJsPlugin.js b/lib/optimize/UglifyJsPlugin.js
@@ -92,7 +92,7 @@ UglifyJsPlugin.prototype.apply = function(compiler) {
 						ast.mangle_names(options.mangle || {});
 					}
 					var output = {};
-					output.comments = options.comments || /^\**!|@preserve|@license/;
+					output.comments = Object.prototype.hasOwnProperty.call(options, "comments") ? options.comments : /^\**!|@preserve|@license/;
 					output.beautify = options.beautify;
 					for(var k in options.output) {
 						output[k] = options.output[k];
diff --git a/test/configCases/plugins/uglifyjs-plugin/index.js b/test/configCases/plugins/uglifyjs-plugin/index.js
@@ -0,0 +1,19 @@
+it("should contain no comments in out chunk", function() {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+	source.should.not.match(/[^\"]comment should be stripped test\.1[^\"]/);
+	source.should.not.match(/[^\"]comment should be stripped test\.2[^\"]/);
+	source.should.not.match(/[^\"]comment should be stripped test\.3[^\"]/);
+});
+
+it("should contain comments in vendors chunk", function() {
+	var fs = require("fs"),
+		path = require("path");
+	var source = fs.readFileSync(path.join(__dirname, "vendors.js"), "utf-8");
+	source.should.containEql("comment should not be stripped vendors.1");
+	source.should.containEql("// comment should not be stripped vendors.2");
+	source.should.containEql(" * comment should not be stripped vendors.3");
+});
+
+
+require.include("./test.js");
diff --git a/test/configCases/plugins/uglifyjs-plugin/test.js b/test/configCases/plugins/uglifyjs-plugin/test.js
@@ -0,0 +1,11 @@
+/** @preserve comment should be stripped test.1 */
+
+var foo = {};
+
+// comment should be stripped test.2
+
+/**
+ * comment should be stripped test.3
+ */
+
+module.exports = foo;
diff --git a/test/configCases/plugins/uglifyjs-plugin/vendors.js b/test/configCases/plugins/uglifyjs-plugin/vendors.js
@@ -0,0 +1,11 @@
+/** @preserve comment should not be stripped vendors.1 */
+
+var bar = {};
+
+// comment should not be stripped vendors.2
+
+/**
+ * comment should not be stripped vendors.3
+ */
+
+module.exports = bar;
diff --git a/test/configCases/plugins/uglifyjs-plugin/webpack.config.js b/test/configCases/plugins/uglifyjs-plugin/webpack.config.js
@@ -0,0 +1,20 @@
+var webpack = require("../../../../");
+module.exports = {
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	entry: {
+		bundle0: ["./index.js"],
+		vendors: ["./vendors.js"]
+	},
+	output: {
+		filename: "[name].js"
+	},
+	plugins: [
+		new webpack.optimize.UglifyJsPlugin({
+			comments: false,
+			exclude: ["vendors.js"]
+		})
+	]
+};

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ UglifyJsPlugin.prototype.apply = function(compiler) {`
`92`	`92`	`ast.mangle_names(options.mangle \|\| {});`
`93`	`93`	`}`
`94`	`94`	`var output = {};`
`95`		`- output.comments = options.comments \|\| /^\**!\|@preserve\|@license/;`
	`95`	`+ output.comments = Object.prototype.hasOwnProperty.call(options, "comments") ? options.comments : /^\**!\|@preserve\|@license/;`
`96`	`96`	`output.beautify = options.beautify;`
`97`	`97`	`for(var k in options.output) {`
`98`	`98`	`output[k] = options.output[k];`