diff --git a/client/webpack.config.js b/client/webpack.config.js index d4c570f2536c..e8c50b03b436 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -199,6 +199,9 @@ const webpackConfig = { safari10: false, } : { + compress: { + passes: 2, + }, mangle: true, } ), }, diff --git a/package.json b/package.json index 8b607b1ca04c..9ec5977d8310 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,6 @@ "@automattic/data-stores": "^1.0.0-alpha.1", "@automattic/effective-module-tree": "^0.1.0", "@automattic/format-currency": "^1.0.0-alpha.0", - "@automattic/wpcom-editing-toolkit": "^2.0.0", "@automattic/load-script": "^1.0.0", "@automattic/material-design-icons": "^1.0.0", "@automattic/media-library": "^1.0.0-alpha.0", @@ -182,6 +181,7 @@ "@automattic/webpack-inline-constant-exports-plugin": "^0.0.1", "@automattic/wp-babel-makepot": "^1.0.0", "@automattic/wpcom-block-editor": "^1.0.0-alpha.0", + "@automattic/wpcom-editing-toolkit": "^2.0.0", "@babel/cli": "^7.10.5", "@babel/core": "^7.11.1", "@babel/register": "^7.10.5", @@ -367,7 +367,7 @@ "stylelint": "^9.10.1", "supertest": "^4.0.2", "svgstore-cli": "^1.3.1", - "terser": "^5.0.0", + "terser": "^5.2.1", "ts-loader": "^6.2.1", "typescript": "^3.9.7", "vfile-message": "^2.0.4", diff --git a/packages/calypso-build/CHANGELOG.md b/packages/calypso-build/CHANGELOG.md index 5a0ba4f240c8..78f045734ed8 100644 --- a/packages/calypso-build/CHANGELOG.md +++ b/packages/calypso-build/CHANGELOG.md @@ -2,6 +2,7 @@ - add new `postCssOptions` option for the SASS loader, allowing more powerful customization of the PostCSS loader, deprecating the less capable `postCssConfig` option +- Updated terser-webpack-plugin to ^4.1.0 # 6.2.0 diff --git a/packages/calypso-build/package.json b/packages/calypso-build/package.json index aaaae30bd067..b1f4422ad7ef 100644 --- a/packages/calypso-build/package.json +++ b/packages/calypso-build/package.json @@ -67,7 +67,7 @@ "postcss-loader": "^3.0.0", "recursive-copy": "^2.0.10", "sass-loader": "^8.0.0", - "terser-webpack-plugin": "^3.0.1", + "terser-webpack-plugin": "^4.1.0", "thread-loader": "^2.1.3", "typescript": "^3.9.7", "webpack": "^4.44.1", diff --git a/yarn.lock b/yarn.lock index f6d6407329b5..7bd72733e346 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8297,29 +8297,6 @@ cacache@^13.0.1: ssri "^7.0.0" unique-filename "^1.1.1" -cacache@^15.0.3: - version "15.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.3.tgz#2225c2d1dd8e872339950d6a39c051e0e9334392" - integrity sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^5.1.1" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - move-file "^2.0.0" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.0" - tar "^6.0.2" - unique-filename "^1.1.1" - cacache@^15.0.5: version "15.0.5" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" @@ -16953,7 +16930,7 @@ jest-worker@^25.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^26.0.0, jest-worker@^26.1.0: +jest-worker@^26.1.0: version "26.2.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.2.1.tgz#5d630ab93f666b53f911615bc13e662b382bd513" integrity sha512-+XcGMMJDTeEGncRb5M5Zq9P7K4sQ1sirhjdOxsN1462h6lFo9w59bl2LVQmdGEEeU3m+maZCkS2Tcc9SfCHO4A== @@ -19070,13 +19047,6 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" -move-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/move-file/-/move-file-2.0.0.tgz#83ffa309b5d7f69d518b28e1333e2ffadf331e3e" - integrity sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ== - dependencies: - path-exists "^4.0.0" - ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -20292,13 +20262,6 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - p-limit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" @@ -24470,11 +24433,6 @@ serialize-javascript@^2.1.2: resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== -serialize-javascript@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e" - integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw== - serialize-javascript@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" @@ -26181,21 +26139,6 @@ terser-webpack-plugin@^2.1.2: terser "^4.4.3" webpack-sources "^1.4.3" -terser-webpack-plugin@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz#31928c9330a582fb5ec6f90805337289b85cb8fe" - integrity sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw== - dependencies: - cacache "^15.0.3" - find-cache-dir "^3.3.1" - jest-worker "^26.0.0" - p-limit "^2.3.0" - schema-utils "^2.6.6" - serialize-javascript "^3.0.0" - source-map "^0.6.1" - terser "^4.6.13" - webpack-sources "^1.4.3" - terser-webpack-plugin@^3.0.3: version "3.0.8" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.8.tgz#d1a53442a143e09e00c880e8d77c1e79cb05318b" @@ -26211,7 +26154,22 @@ terser-webpack-plugin@^3.0.3: terser "^4.8.0" webpack-sources "^1.4.3" -terser@^4.1.2, terser@^4.4.3, terser@^4.6.13, terser@^4.6.3, terser@^4.8.0: +terser-webpack-plugin@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz#6e9d6ae4e1a900d88ddce8da6a47507ea61f44bc" + integrity sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA== + dependencies: + cacache "^15.0.5" + find-cache-dir "^3.3.1" + jest-worker "^26.3.0" + p-limit "^3.0.2" + schema-utils "^2.6.6" + serialize-javascript "^4.0.0" + source-map "^0.6.1" + terser "^5.0.0" + webpack-sources "^1.4.3" + +terser@^4.1.2, terser@^4.4.3, terser@^4.6.3, terser@^4.8.0: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== @@ -26220,10 +26178,10 @@ terser@^4.1.2, terser@^4.4.3, terser@^4.6.13, terser@^4.6.3, terser@^4.8.0: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.0.0.tgz#269640e4e92f15d628de1e5f01c4c61e1ba3d765" - integrity sha512-olH2DwGINoSuEpSGd+BsPuAQaA3OrHnHnFL/rDB2TVNc3srUbz/rq/j2BlF4zDXI+JqAvGr86bIm1R2cJgZ3FA== +terser@^5.0.0, terser@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.2.1.tgz#40b971b8d28b4fe98c9e8c0d073ab48e7bb96cd8" + integrity sha512-/AOtjRtAMNGO0fIF6m8HfcvXTw/2AKpsOzDn36tA5RfhRdeXyb4RvHxJ5Pah7iL6dFkLk+gOnCaNHGwJPl6TrQ== dependencies: commander "^2.20.0" source-map "~0.6.1"