Merge pull request #8392 from vkrol/cherry-pick-terser-to-webpack-4

Cherry-pick terser to webpack 4
webpack · Nov 19, 2018 · e1df721 · e1df721
2 parents a230148 + a818def
commit e1df721
Show file tree

Hide file tree

Showing 21 changed files with 219 additions and 194 deletions.
diff --git a/benchmark/createBenchmark.js b/benchmark/createBenchmark.js
@@ -15,7 +15,7 @@ webpack(
 		},
 		plugins: [
 			new webpack.NamedModulesPlugin(),
-			new webpack.IgnorePlugin(/^(fsevents|uglify-js)$/),
+			new webpack.IgnorePlugin(/^(fsevents|terser)$/),
 			new webpack.NormalModuleReplacementPlugin(
 				/^.\/loadLoader$/,
 				path.resolve(__dirname, "./createBenchmark/loadLoader")

diff --git a/examples/code-splitted-css-bundle/README.md b/examples/code-splitted-css-bundle/README.md
@@ -101,7 +101,7 @@ Child extract-text-webpack-plugin ../../node_modules/extract-text-webpack-plugin
          + 1 hidden module
 ```
 
-## Minimized (uglify-js, no zip)
+## Minimized (terser, no zip)
 
 ```
 Hash: edbe0e91ba86d814d855

diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -302,10 +302,10 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.minimizer", "make", options => [
 			{
 				apply: compiler => {
-					// Lazy load the uglifyjs plugin
-					const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+					// Lazy load the Terser plugin
+					const TerserPlugin = require("terser-webpack-plugin");
 					const SourceMapDevToolPlugin = require("./SourceMapDevToolPlugin");
-					new UglifyJsPlugin({
+					new TerserPlugin({
 						cache: true,
 						parallel: true,
 						sourceMap:

diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "node-libs-browser": "^2.0.0",
     "schema-utils": "^0.4.4",
     "tapable": "^1.1.0",
-    "uglifyjs-webpack-plugin": "^1.2.4",
+    "terser-webpack-plugin": "^1.1.0",
     "watchpack": "^1.5.0",
     "webpack-sources": "^1.3.0"
   },

diff --git a/test/TestCases.template.js b/test/TestCases.template.js
@@ -5,14 +5,14 @@ const path = require("path");
 const fs = require("fs");
 const vm = require("vm");
 const mkdirp = require("mkdirp");
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+const TerserPlugin = require("terser-webpack-plugin");
 const checkArrayExpectation = require("./checkArrayExpectation");
 const createLazyTestEnv = require("./helpers/createLazyTestEnv");
 
 const Stats = require("../lib/Stats");
 const webpack = require("../lib/webpack");
 
-const uglifyJsForTesting = new UglifyJsPlugin({
+const terserForTesting = new TerserPlugin({
 	cache: false,
 	parallel: false,
 	sourceMap: true
@@ -31,12 +31,12 @@ const DEFAULT_OPTIMIZATIONS = {
 	concatenateModules: false,
 	namedModules: false,
 	hashedModuleIds: false,
-	minimizer: [uglifyJsForTesting]
+	minimizer: [terserForTesting]
 };
 
 const NO_EMIT_ON_ERRORS_OPTIMIZATIONS = {
 	noEmitOnErrors: false,
-	minimizer: [uglifyJsForTesting]
+	minimizer: [terserForTesting]
 };
 
 const casesPath = path.join(__dirname, "cases");

diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
diff --git a/test/cases/parsing/optional-catch-binding/test.filter.js b/test/cases/parsing/optional-catch-binding/test.filter.js
@@ -1,7 +1,7 @@
 const supportsOptionalCatchBinding = require("../../../helpers/supportsOptionalCatchBinding");
 
 module.exports = function(config) {
-	// XXX: Disable this test if UglifyJS is used because it does not support ES 2019
+	// XXX: Disable this test if Terser is used because it does not support ES 2019
 	if (config.mode === "production") {
 		return false;
 	}

diff --git a/test/checkArrayExpectation.js b/test/checkArrayExpectation.js
@@ -17,7 +17,7 @@ module.exports = function checkArrayExpectation(
 	}
 	let array = object[`${kind}s`].slice().sort();
 	if (kind === "warning")
-		array = array.filter(item => !/from UglifyJs/.test(item));
+		array = array.filter(item => !/from Terser/.test(item));
 	if (fs.existsSync(path.join(testDirectory, `${filename}.js`))) {
 		const expectedFilename = path.join(testDirectory, `${filename}.js`);
 		const expected = require(expectedFilename);

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,5 +1,5 @@
 var webpack = require("../../../../");
-var UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+var TerserPlugin = require("terser-webpack-plugin");
 module.exports = {
 	node: {
 		__dirname: false,
@@ -14,7 +14,7 @@ module.exports = {
 	},
 	optimization: {
 		minimizer: [
-			new UglifyJsPlugin({
+			new TerserPlugin({
 				sourceMap: true
 			})
 		]

diff --git a/...Cases/plugins/uglifyjs-plugin/compress.js → ...igCases/plugins/terser-plugin/compress.js b/...Cases/plugins/uglifyjs-plugin/compress.js → ...igCases/plugins/terser-plugin/compress.js
diff --git a/...gCases/plugins/uglifyjs-plugin/extract.js → ...figCases/plugins/terser-plugin/extract.js b/...gCases/plugins/uglifyjs-plugin/extract.js → ...figCases/plugins/terser-plugin/extract.js
diff --git a/...onfigCases/plugins/uglifyjs-plugin/ie8.js → .../configCases/plugins/terser-plugin/ie8.js b/...onfigCases/plugins/uglifyjs-plugin/ie8.js → .../configCases/plugins/terser-plugin/ie8.js
diff --git a/...figCases/plugins/uglifyjs-plugin/index.js → ...onfigCases/plugins/terser-plugin/index.js b/...figCases/plugins/uglifyjs-plugin/index.js → ...onfigCases/plugins/terser-plugin/index.js
diff --git a/...nfigCases/plugins/uglifyjs-plugin/test.js → ...configCases/plugins/terser-plugin/test.js b/...nfigCases/plugins/uglifyjs-plugin/test.js → ...configCases/plugins/terser-plugin/test.js
diff --git a/...gCases/plugins/uglifyjs-plugin/vendors.js → ...figCases/plugins/terser-plugin/vendors.js b/...gCases/plugins/uglifyjs-plugin/vendors.js → ...figCases/plugins/terser-plugin/vendors.js
diff --git a/...plugins/uglifyjs-plugin/webpack.config.js → ...s/plugins/terser-plugin/webpack.config.js b/...plugins/uglifyjs-plugin/webpack.config.js → ...s/plugins/terser-plugin/webpack.config.js
@@ -1,4 +1,4 @@
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+const TerserPlugin = require("terser-webpack-plugin");
 module.exports = {
 	node: {
 		__dirname: false,
@@ -17,21 +17,21 @@ module.exports = {
 	optimization: {
 		minimize: true,
 		minimizer: [
-			new UglifyJsPlugin({
+			new TerserPlugin({
 				cache: false,
 				parallel: false,
 				exclude: ["vendors.js", "extract.js"]
 			}),
-			new UglifyJsPlugin({
+			new TerserPlugin({
 				cache: false,
 				parallel: false,
 				extractComments: true,
 				include: ["extract.js"]
 			}),
-			new UglifyJsPlugin({
+			new TerserPlugin({
 				cache: false,
 				parallel: false,
-				uglifyOptions: {
+				terserOptions: {
 					compress: {
 						passes: 2
 					}

diff --git a/test/statsCases/filter-warnings/webpack.config.js b/test/statsCases/filter-warnings/webpack.config.js
@@ -1,4 +1,4 @@
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+const TerserPlugin = require("terser-webpack-plugin");
 const baseConfig = {
 	mode: "production",
 	entry: "./index",
@@ -8,9 +8,9 @@ const baseConfig = {
 	optimization: {
 		minimize: true,
 		minimizer: [
-			new UglifyJsPlugin({
+			new TerserPlugin({
 				sourceMap: true,
-				uglifyOptions: {
+				terserOptions: {
 					compress: {
 						warnings: true
 					},
@@ -34,11 +34,11 @@ const baseConfig = {
 
 module.exports = [
 	undefined,
-	"UglifyJs",
-	/UglifyJs/,
+	"Terser",
+	/Terser/,
 	warnings => true,
-	["UglifyJs"],
-	[/UglifyJs/],
+	["Terser"],
+	[/Terser/],
 	[warnings => true],
 	"should not filter",
 	/should not filter/,

diff --git a/test/statsCases/warnings-uglifyjs/a.js → test/statsCases/warnings-terser/a.js b/test/statsCases/warnings-uglifyjs/a.js → test/statsCases/warnings-terser/a.js
diff --git a/test/statsCases/warnings-uglifyjs/index.js → test/statsCases/warnings-terser/index.js b/test/statsCases/warnings-uglifyjs/index.js → test/statsCases/warnings-terser/index.js
diff --git a/...Cases/warnings-uglifyjs/webpack.config.js → ...tsCases/warnings-terser/webpack.config.js b/...Cases/warnings-uglifyjs/webpack.config.js → ...tsCases/warnings-terser/webpack.config.js
@@ -1,4 +1,4 @@
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+const TerserPlugin = require("terser-webpack-plugin");
 module.exports = {
 	mode: "production",
 	entry: "./index",
@@ -8,9 +8,9 @@ module.exports = {
 	optimization: {
 		minimize: true,
 		minimizer: [
-			new UglifyJsPlugin({
+			new TerserPlugin({
 				sourceMap: true,
-				uglifyOptions: {
+				terserOptions: {
 					compress: {
 						warnings: true
 					},
@@ -21,7 +21,7 @@ module.exports = {
 					},
 					warnings: true
 				},
-				warningsFilter(filename) {
+				warningsFilter(message, filename) {
 					return /a\.js$/.test(filename);
 				}
 			})