test(configCases/uglifyjs-plugin): update to new options interface (options.uglifyOptions)

michael-ciniawsky · michael-ciniawsky · commit 7b9eb0cff982 · 2017-11-23T22:08:48.000+01:00
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "source-map": "^0.5.3",
     "supports-color": "^4.2.1",
     "tapable": "^0.2.8",
-    "uglifyjs-webpack-plugin": "^1.0.0",
+    "uglifyjs-webpack-plugin": "^1.1.1",
     "watchpack": "^1.4.0",
     "webpack-sources": "^1.0.1",
     "yargs": "^8.0.2"
diff --git a/test/configCases/plugins/uglifyjs-plugin/extract.js b/test/configCases/plugins/uglifyjs-plugin/extract.js
@@ -1,7 +1,9 @@
-/** @preserve comment should be extracted extract-test.1 */
-
 var foo = {};
 
+// ⚠️ move the following comment back to the top
+// https://github.com/mishoo/UglifyJS2/issues/2500
+/** @preserve comment should be extracted extract-test.1 */
+
 // comment should be stripped extract-test.2
 
 /*!
diff --git a/test/configCases/plugins/uglifyjs-plugin/index.js b/test/configCases/plugins/uglifyjs-plugin/index.js
@@ -1,54 +1,65 @@
-it("should contain no comments in out chunk", function() {
-	var fs = require("fs");
-	var source = fs.readFileSync(__filename, "utf-8");
+it("should contain no comments in out chunk", () => {
+	const fs = require("fs");
+
+	const 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");
+	const fs = require("fs");
+	const path = require("path");
+
+	const 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");
 });
 
-// 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 r(t){return function(n){try{t()}catch(t){n(t)}}}");
-});
-
 it("should extract comments to separate file", function() {
-	var fs = require("fs"),
-		path = require("path");
-	var source = fs.readFileSync(path.join(__dirname, "extract.js.LICENSE"), "utf-8");
+	const fs = require("fs");
+	const path = require("path");
+
+	const source = fs.readFileSync(path.join(__dirname, "extract.js.LICENSE"), "utf-8");
+
 	source.should.containEql("comment should be extracted extract-test.1");
 	source.should.not.containEql("comment should be stripped extract-test.2");
 	source.should.containEql("comment should be extracted extract-test.3");
 	source.should.not.containEql("comment should be stripped extract-test.4");
 });
 
 it("should remove extracted comments and insert a banner", function() {
-	var fs = require("fs"),
-		path = require("path");
-	var source = fs.readFileSync(path.join(__dirname, "extract.js"), "utf-8");
+	const fs = require("fs");
+	const path = require("path");
+
+	const source = fs.readFileSync(path.join(__dirname, "extract.js"), "utf-8");
+
 	source.should.not.containEql("comment should be extracted extract-test.1");
 	source.should.not.containEql("comment should be stripped extract-test.2");
 	source.should.not.containEql("comment should be extracted extract-test.3");
 	source.should.not.containEql("comment should be stripped extract-test.4");
 	source.should.containEql("/*! For license information please see extract.js.LICENSE */");
 });
 
+it("should pass mangle options", function() {
+	const fs = require("fs");
+	const path = require("path");
+
+	const source = fs.readFileSync(path.join(__dirname, "ie8.js"), "utf-8");
+
+	source.should.containEql("t.exports=function(t){return function(n){try{t()}catch(t){n(t)}}}");
+});
+
 it("should pass compress options", function() {
-	var fs = require("fs"),
-		path = require("path");
-	var source = fs.readFileSync(path.join(__dirname, "compress.js"), "utf-8");
-	source.should.containEql("function e(){var o=2;o=3,console.log(1+o),console.log(o+3),console.log(4),console.log(1+o+3)}");
+	const fs = require("fs");
+	const path = require("path");
+
+	const source = fs.readFileSync(path.join(__dirname, "compress.js"), "utf-8");
+
+	source.should.containEql("o.exports=function(){console.log(4),console.log(6),console.log(4),console.log(7)}");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/plugins/uglifyjs-plugin/webpack.config.js b/test/configCases/plugins/uglifyjs-plugin/webpack.config.js
@@ -1,13 +1,14 @@
-var webpack = require("../../../../");
+const webpack = require("../../../../");
+
 module.exports = {
 	node: {
 		__dirname: false,
 		__filename: false
 	},
 	entry: {
+		ie8: ["./ie8.js"],
 		bundle0: ["./index.js"],
 		vendors: ["./vendors.js"],
-		ie8: ["./ie8.js"],
 		extract: ["./extract.js"],
 		compress: ["./compress.js"]
 	},
@@ -16,28 +17,26 @@ module.exports = {
 	},
 	plugins: [
 		new webpack.optimize.UglifyJsPlugin({
-			comments: false,
-			exclude: ["vendors.js", "extract.js"],
-			mangle: {
-				screw_ie8: false
-			}
+			exclude: [
+				"vendors.js",
+				"extract.js"
+			]
 		}),
 		new webpack.optimize.UglifyJsPlugin({
 			extractComments: true,
-			include: ["extract.js"],
-			mangle: {
-				screw_ie8: false
-			}
+			include: [
+				"extract.js"
+			]
 		}),
 		new webpack.optimize.UglifyJsPlugin({
-			include: ["compress.js"],
-			compress: {
-				conditionals: true,
-				evaluate: true,
-				passes: 2,
-				reduce_vars: true,
-				unused: true
-			}
-		}),
+			uglifyOptions: {
+				compress: {
+					passes: 2
+				}
+			},
+			include: [
+				"compress.js"
+			]
+		})
 	]
 };
diff --git a/yarn.lock b/yarn.lock
