Merge 3371e87 into e200c7f

microsoft · Jan 29, 2020 · 872b7aa · 872b7aa
2 parents e200c7f + 3371e87
commit 872b7aa
Show file tree

Hide file tree

Showing 12 changed files with 1,817 additions and 8,295 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/client/package.json b/packages/app/client/package.json
@@ -59,7 +59,7 @@
     "babel-jest": "24.8.0",
     "babel-loader": "^8.0.6",
     "babel-preset-react-app": "^3.1.1",
-    "copy-webpack-plugin": "^4.5.1",
+    "copy-webpack-plugin": "5.0.5",
     "coveralls": "^3.0.1",
     "cross-env": "^5.1.3",
     "css-loader": "^1.0.1",
@@ -87,10 +87,9 @@
     "rimraf": "^2.6.2",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.21.0",
-    "terser": "^4.0.0",
+    "terser-webpack-plugin": "2.3.3",
     "typescript": "3.1.1",
     "typings-for-css-modules-loader": "^1.7.0",
-    "uglifyjs-webpack-plugin": "^2.1.3",
     "url-loader": "^1.0.1",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.2",

diff --git a/packages/app/client/webpack.config.js b/packages/app/client/webpack.config.js
@@ -34,7 +34,7 @@
 const path = require('path');
 
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserWebpackPlugin = require('terser-webpack-plugin');
 
 const webpack = require('webpack');
 const { DllPlugin, DllReferencePlugin, NamedModulesPlugin, DefinePlugin, WatchIgnorePlugin } = webpack;
@@ -166,26 +166,12 @@ const buildConfig = mode => {
   } else {
     config.optimization = {
       minimizer: [
-        new UglifyJsPlugin({
+        new TerserWebpackPlugin({
           cache: true,
-          cacheKeys(defaultCacheKeys) {
-            delete defaultCacheKeys['uglify-js'];
+          cacheKeys: defaultCacheKeys => {
+            delete defaultCacheKeys['terser'];
 
-            return Object.assign({}, defaultCacheKeys, { 'uglify-js': require('uglify-js/package.json').version });
-          },
-          minify(file, sourceMap) {
-            // https://github.com/mishoo/UglifyJS2#minify-options
-            const uglifyJsOptions = {
-              /* your `uglify-js` package options */
-            };
-
-            if (sourceMap) {
-              uglifyJsOptions.sourceMap = {
-                content: sourceMap,
-              };
-            }
-
-            return require('terser').minify(file, uglifyJsOptions);
+            return Object.assign({}, defaultCacheKeys, { terser: require('terser/package.json').version });
           },
         }),
       ],

diff --git a/packages/app/main/package.json b/packages/app/main/package.json
@@ -144,7 +144,7 @@
     "fs-extra": "^6.0.1",
     "got": "^7.1.0",
     "http-status-codes": "^1.3.0",
-    "https-proxy-agent": "2.2.1",
+    "https-proxy-agent": "2.2.3",
     "jest-fetch-mock": "^1.6.2",
     "jsonwebtoken": "^8.3.0",
     "keytar": "^4.7.0",