Merge pull request webpack#6123 from webpack/feature/minimize-production

sokra · web-flow · commit c64fd70ec453 · 2017-12-14T01:01:24.000+01:00
Switch on minimizing in production mode by default
diff --git a/lib/OptionsDefaulter.js b/lib/OptionsDefaulter.js
@@ -8,7 +8,7 @@ const getProperty = (obj, name) => {
 	name = name.split(".");
 	for(let i = 0; i < name.length - 1; i++) {
 		obj = obj[name[i]];
-		if(typeof obj !== "object" || !obj) return;
+		if(typeof obj !== "object" || !obj || Array.isArray(obj)) return;
 	}
 	return obj[name.pop()];
 };
@@ -17,6 +17,7 @@ const setProperty = (obj, name, value) => {
 	name = name.split(".");
 	for(let i = 0; i < name.length - 1; i++) {
 		if(typeof obj[name[i]] !== "object" && typeof obj[name[i]] !== "undefined") return;
+		if(Array.isArray(obj[name[i]])) return;
 		if(!obj[name[i]]) obj[name[i]] = {};
 		obj = obj[name[i]];
 	}
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -314,6 +314,11 @@ class WebpackOptionsApply extends OptionsApply {
 				"process.env.NODE_ENV": JSON.stringify(options.optimization.nodeEnv)
 			}));
 		}
+		if(options.optimization.minimize) {
+			for(const minimizer of options.optimization.minimizer) {
+				compiler.apply(minimizer);
+			}
+		}
 
 		if(options.performance) {
 			compiler.apply(new SizeLimitsPlugin(options.performance));
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -138,6 +138,16 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.namedModules", "make", options => options.mode === "development");
 		this.set("optimization.namedChunks", "make", options => options.mode === "development");
 		this.set("optimization.portableRecords", "make", options => !!(options.recordsInputPath || options.recordsOutputPath || options.recordsPath));
+		this.set("optimization.minimize", "make", options => options.mode === "production");
+		this.set("optimization.minimizer", "make", options => [{
+			apply: compiler => {
+				// Lazy load the uglifyjs plugin
+				const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+				new UglifyJsPlugin({
+					sourceMap: options.devtool && /source-?map/.test(options.devtool)
+				}).apply(compiler);
+			}
+		}]);
 		this.set("optimization.nodeEnv", "make", options => options.mode);
 
 		this.set("resolve", "call", value => Object.assign({}, value));
diff --git a/lib/optimize/UglifyJsPlugin.js b/lib/optimize/UglifyJsPlugin.js
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -112,8 +112,7 @@ exportPlugins(exports.optimize = {}, {
 	"MinChunkSizePlugin": () => require("./optimize/MinChunkSizePlugin"),
 	"ModuleConcatenationPlugin": () => require("./optimize/ModuleConcatenationPlugin"),
 	"SideEffectsFlagPlugin": () => require("./optimize/SideEffectsFlagPlugin"),
-	"OccurrenceOrderPlugin": () => require("./optimize/OccurrenceOrderPlugin"),
-	"UglifyJsPlugin": () => require("./optimize/UglifyJsPlugin")
+	"OccurrenceOrderPlugin": () => require("./optimize/OccurrenceOrderPlugin")
 });
 exportPlugins(exports.web = {}, {
 	"JsonpTemplatePlugin": () => require("./web/JsonpTemplatePlugin"),
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1279,6 +1279,25 @@
           "description": "Generate records with relative paths to be able to move the context folder",
           "type": "boolean"
         },
+        "minimize": {
+          "description": "Enable minimizing the output. Uses optimization.minimizer.",
+          "type": "boolean"
+        },
+        "minimizer": {
+          "description": "Minimizer(s) to use for minimizing the output",
+          "type": "array",
+          "items": {
+            "description": "Plugin of type object or instanceof Function",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/common.pluginObject"
+              },
+              {
+                "$ref": "#/definitions/common.pluginFunction"
+              }
+            ]
+          }
+        },
         "nodeEnv": {
           "description": "Set process.env.NODE_ENV to a specific value",
           "anyOf": [
diff --git a/test/Compiler.test.js b/test/Compiler.test.js
@@ -18,6 +18,9 @@ describe("Compiler", () => {
 		options.context = path.join(__dirname, "fixtures");
 		if(noOutputPath) options.output.path = "/";
 		options.output.pathinfo = true;
+		options.optimization = {
+			minimize: false
+		};
 		const logs = {
 			mkdirp: [],
 			writeFile: [],
diff --git a/test/Integration.test.js b/test/Integration.test.js
@@ -49,6 +49,9 @@ describe("Integration", function() {
 			amd: {
 				fromOptions: true
 			},
+			optimization: {
+				minimize: false
+			},
 			resolve: {
 				// cannot resolve should outside the outermost node_modules
 				// so it is injected here
diff --git a/test/NodeTemplatePlugin.test.js b/test/NodeTemplatePlugin.test.js
@@ -20,10 +20,7 @@ describe("NodeTemplatePlugin", () => {
 				library: "abc",
 				libraryTarget: "commonjs",
 			},
-			entry: "./entry",
-			plugins: [
-				new webpack.optimize.UglifyJsPlugin()
-			]
+			entry: "./entry"
 		}, (err, stats) => {
 			if(err) return err;
 			stats.hasErrors().should.be.not.ok();
@@ -61,8 +58,7 @@ describe("NodeTemplatePlugin", () => {
 			plugins: [
 				new webpack.optimize.LimitChunkCountPlugin({
 					maxChunks: 1
-				}),
-				new webpack.optimize.UglifyJsPlugin()
+				})
 			]
 		}, (err, stats) => {
 			if(err) return err;
diff --git a/test/StatsTestCases.test.js b/test/StatsTestCases.test.js
@@ -34,6 +34,8 @@ describe("StatsTestCases", () => {
 				if(!options.output) options.output = options.output || {};
 				if(!options.output.path) options.output.path = path.join(outputBase, testName);
 				if(!options.plugins) options.plugins = [];
+				if(!options.optimization) options.optimization = {};
+				if(options.optimization.minimize === undefined) options.optimization.minimize = false;
 				// To support deprecated loaders
 				// TODO remove in webpack 5
 				options.plugins.push(new webpack.LoaderOptionsPlugin({
diff --git a/test/TestCases.test.js b/test/TestCases.test.js
@@ -43,7 +43,7 @@ describe("TestCases", () => {
 		name: "normal",
 	}, {
 		name: "production",
-		mode: "production"
+		mode: "production",
 	}, {
 		name: "development",
 		mode: "development",
@@ -90,29 +90,16 @@ describe("TestCases", () => {
 	}, {
 		name: "devtool-cheap-source-map",
 		devtool: "cheap-source-map"
-	}, {
-		name: "minimized",
-		mode: "production",
-		minimize: true,
-		plugins: [
-			new webpack.optimize.UglifyJsPlugin({
-				sourceMap: false
-			})
-		]
 	}, {
 		name: "minimized-source-map",
 		mode: "production",
 		devtool: "eval-cheap-module-source-map",
-		minimize: true,
-		plugins: [
-			new webpack.optimize.UglifyJsPlugin()
-		]
+		minimize: true
 	}, {
 		name: "minimized-hashed-modules",
 		mode: "production",
 		minimize: true,
 		plugins: [
-			new webpack.optimize.UglifyJsPlugin(),
 			new webpack.HashedModuleIdsPlugin()
 		]
 	}, {
@@ -122,7 +109,6 @@ describe("TestCases", () => {
 		minimize: true,
 		plugins: [
 			new webpack.HotModuleReplacementPlugin(),
-			new webpack.optimize.UglifyJsPlugin(),
 			new webpack.NamedModulesPlugin(),
 			new webpack.NamedChunksPlugin()
 		]
diff --git a/test/binCases/plugins/uglifyjsplugin-empty-args/test.opts b/test/binCases/plugins/uglifyjsplugin-empty-args/test.opts
@@ -3,4 +3,4 @@
 --output-filename [name].js
 --output-chunk-filename [id].chunk.js
 --target async-node
---plugin webpack/lib/optimize/UglifyJsPlugin
+--plugin uglifyjs-webpack-plugin
diff --git a/test/browsertest/middlewareTest.js b/test/browsertest/middlewareTest.js
@@ -37,7 +37,6 @@ app.configure(function() {
 			chunkFilename: "[chunkhash].chunk.js"
 		},
 		plugins: [
-			new webpack.optimize.UglifyJsPlugin(),
 			new webpack.HotModuleReplacementPlugin()
 		]
 	}), {
diff --git a/test/cases/parsing/harmony-tdz/index.js b/test/cases/parsing/harmony-tdz/index.js
@@ -3,6 +3,6 @@ import value, { exception } from "./module";
 it("should have a TDZ for exported const values", function() {
 	(typeof exception).should.be.eql("object");
 	exception.should.be.instanceof(Error);
-	exception.message.should.be.eql("value is not defined");
+	exception.message.should.match(/ is not defined$/);
 	value.should.be.eql("value");
 });
diff --git a/test/configCases/code-generation/use-strict/webpack.config.js b/test/configCases/code-generation/use-strict/webpack.config.js
@@ -4,6 +4,7 @@ module.exports = {
 		__filename: false
 	},
 	optimization: {
-		concatenateModules: false
+		concatenateModules: false,
+		minimize: false
 	}
 };
diff --git a/test/configCases/externals/externals-in-commons-chunk/webpack.config.js b/test/configCases/externals/externals-in-commons-chunk/webpack.config.js
@@ -18,6 +18,9 @@ module.exports = {
 		__dirname: false,
 		__filename: false
 	},
+	optimization: {
+		minimize: false
+	},
 	plugins: [
 		new webpack.optimize.CommonsChunkPlugin({
 			name: "common"
diff --git a/test/configCases/extract-text/issue-14/webpack.config.js b/test/configCases/extract-text/issue-14/webpack.config.js
@@ -12,6 +12,9 @@ module.exports = {
 			}
 		]
 	},
+	optimization: {
+		minimize: false
+	},
 	plugins: [
 		new ETP("style.css")
 	]
diff --git a/test/configCases/filename-template/module-filename-template/webpack.config.js b/test/configCases/filename-template/module-filename-template/webpack.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+	mode: "development",
 	output: {
 		devtoolLineToLine: true,
 		devtoolModuleFilenameTemplate: function(info) {
diff --git a/test/configCases/performance/many-async-imports/webpack.config.js b/test/configCases/performance/many-async-imports/webpack.config.js
@@ -1 +1,5 @@
-module.exports = {};
+module.exports = {
+	optimization: {
+		minimize: false
+	}
+};
diff --git a/test/configCases/performance/many-exports/webpack.config.js b/test/configCases/performance/many-exports/webpack.config.js
@@ -1 +1,5 @@
-module.exports = {};
+module.exports = {
+	optimization: {
+		minimize: false
+	}
+};
diff --git a/test/configCases/plugins/source-map-dev-tool-plugin/webpack.config.js b/test/configCases/plugins/source-map-dev-tool-plugin/webpack.config.js
@@ -1,4 +1,5 @@
 var webpack = require("../../../../");
+var UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 module.exports = {
 	node: {
 		__dirname: false,
@@ -11,6 +12,13 @@ module.exports = {
 	output: {
 		filename: "[name].js"
 	},
+	optimization: {
+		minimizer: [
+			new UglifyJsPlugin({
+				sourceMap: true
+			})
+		]
+	},
 	plugins: [
 		new webpack.SourceMapDevToolPlugin({
 			filename: "sourcemaps/[file].map",
diff --git a/test/configCases/plugins/uglifyjs-plugin/webpack.config.js b/test/configCases/plugins/uglifyjs-plugin/webpack.config.js
@@ -1,5 +1,4 @@
-const webpack = require("../../../../");
-
+const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 module.exports = {
 	node: {
 		__dirname: false,
@@ -15,28 +14,31 @@ module.exports = {
 	output: {
 		filename: "[name].js"
 	},
-	plugins: [
-		new webpack.optimize.UglifyJsPlugin({
-			exclude: [
-				"vendors.js",
-				"extract.js"
-			]
-		}),
-		new webpack.optimize.UglifyJsPlugin({
-			extractComments: true,
-			include: [
-				"extract.js"
-			]
-		}),
-		new webpack.optimize.UglifyJsPlugin({
-			uglifyOptions: {
-				compress: {
-					passes: 2
-				}
-			},
-			include: [
-				"compress.js"
-			]
-		})
-	]
+	optimization: {
+		minimize: true,
+		minimizer: [
+			new UglifyJsPlugin({
+				exclude: [
+					"vendors.js",
+					"extract.js"
+				]
+			}),
+			new UglifyJsPlugin({
+				extractComments: true,
+				include: [
+					"extract.js"
+				]
+			}),
+			new UglifyJsPlugin({
+				uglifyOptions: {
+					compress: {
+						passes: 2
+					}
+				},
+				include: [
+					"compress.js"
+				]
+			})
+		]
+	}
 };
diff --git a/test/configCases/source-map/exclude-chunks-source-map/webpack.config.js b/test/configCases/source-map/exclude-chunks-source-map/webpack.config.js
@@ -1,5 +1,7 @@
 var webpack = require("../../../../");
 module.exports = {
+	mode: "development",
+	devtool: false,
 	node: {
 		__dirname: false,
 		__filename: false
diff --git a/test/configCases/source-map/line-to-line/webpack.config.js b/test/configCases/source-map/line-to-line/webpack.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+	mode: "development",
 	output: {
 		devtoolLineToLine: true
 	},
diff --git a/test/configCases/source-map/module-names/webpack.config.js b/test/configCases/source-map/module-names/webpack.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+	mode: "development",
 	output: {
 		chunkFilename: "[name].js",
 		devtoolModuleFilenameTemplate: "module",
diff --git a/test/configCases/source-map/namespace-source-path.library/webpack.config.js b/test/configCases/source-map/namespace-source-path.library/webpack.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+	mode: "development",
 	output: {
 		library: "mylibrary"
 	},
diff --git a/test/configCases/source-map/namespace-source-path/webpack.config.js b/test/configCases/source-map/namespace-source-path/webpack.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+	mode: "development",
 	output: {
 		devtoolNamespace: "mynamespace"
 	},
diff --git a/test/configCases/source-map/nosources/webpack.config.js b/test/configCases/source-map/nosources/webpack.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+	mode: "development",
 	node: {
 		__dirname: false,
 		__filename: false
diff --git a/test/configCases/source-map/relative-source-map-path/webpack.config.js b/test/configCases/source-map/relative-source-map-path/webpack.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+	mode: "development",
 	output: {
 		chunkFilename: "js/chunks/c.js"
 	},
diff --git a/test/configCases/source-map/source-map-filename-contenthash/webpack.config.js b/test/configCases/source-map/source-map-filename-contenthash/webpack.config.js
diff --git a/test/configCases/source-map/sources-array-production/webpack.config.js b/test/configCases/source-map/sources-array-production/webpack.config.js
diff --git a/test/statsCases/filter-warnings/webpack.config.js b/test/statsCases/filter-warnings/webpack.config.js
diff --git a/test/statsCases/warnings-uglifyjs/webpack.config.js b/test/statsCases/warnings-uglifyjs/webpack.config.js
