From 36c95fb89735733c6d5cf2cdf4c6922550e6cbcc Mon Sep 17 00:00:00 2001
From: Danny Brown <danny.ri.brown@gmail.com>
Date: Wed, 4 Sep 2019 15:58:51 -0400
Subject: [PATCH] ci: parallize terser (#864)

* ci: parallize terser

* Missing NODE_ENV set

* show progress for demo build
---
 extensions/cornerstone/package.json     |  4 ++--
 platform/viewer/.webpack/webpack.pwa.js | 22 +++++++++-------------
 platform/viewer/package.json            | 10 +++++-----
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index 8bb0ef54c..8fe838f57 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -20,9 +20,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "cross-env NODE_ENV=production webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
     "dev:cornerstone": "yarn run dev",
-    "build": "webpack --config .webpack/webpack.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:package": "yarn run build",
     "prepublishOnly": "yarn run build",
     "start": "yarn run dev"
diff --git a/platform/viewer/.webpack/webpack.pwa.js b/platform/viewer/.webpack/webpack.pwa.js
index ba4c1f94c..fa3941b51 100644
--- a/platform/viewer/.webpack/webpack.pwa.js
+++ b/platform/viewer/.webpack/webpack.pwa.js
@@ -49,19 +49,6 @@ module.exports = (env, argv) => {
     optimization: {
       minimize: isProdBuild,
       sideEffects: true,
-      //   // TODO: For more granular minimize
-      //   // minimizer: [
-      //   //   new TerserJSPlugin({
-      //   //     sourceMap: true,
-      //   //     terserOptions: {
-      //   //       sourceMap: {
-      //   //         file: '[name].map',
-      //   //         url: 'https://my-host/[url]',
-      //   //       },
-      //   //     },
-      //   //   }),
-      //   //   new OptimizeCSSAssetsPlugin({}),
-      //   // ],
     },
     module: {
       rules: [...extractStyleChunksRule(isProdBuild)],
@@ -126,6 +113,15 @@ module.exports = (env, argv) => {
 
   if (!isProdBuild) {
     mergedConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
+
+    //
+    mergedConfig.optimization.minimizer = [
+      new TerserJSPlugin({
+        sourceMap: true,
+        parallel: true,
+      }),
+      new OptimizeCSSAssetsPlugin({}),
+    ];
   }
 
   return mergedConfig;
diff --git a/platform/viewer/package.json b/platform/viewer/package.json
index 288d99278..185499891 100644
--- a/platform/viewer/package.json
+++ b/platform/viewer/package.json
@@ -17,13 +17,13 @@
   },
   "proxy": "http://localhost:8042",
   "scripts": {
-    "build:package": "cross-env NODE_ENV=production node --max_old_space_size=8192 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.commonjs.js",
-    "build:viewer": "cross-env NODE_ENV=production node --max_old_space_size=8192 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
-    "build:viewer:ci": "cross-env NODE_ENV=production PUBLIC_URL=/pwa/ APP_CONFIG=config/netlify.js node --max_old_space_size=8192 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
-    "build:viewer:demo": "cross-env NODE_ENV=production APP_CONFIG=config/demo.js HTML_TEMPLATE=rollbar.html node --max_old_space_size=8192 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
+    "build:package": "cross-env NODE_ENV=production node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.commonjs.js",
+    "build:viewer": "cross-env NODE_ENV=production node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
+    "build:viewer:ci": "cross-env NODE_ENV=production PUBLIC_URL=/pwa/ APP_CONFIG=config/netlify.js node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
+    "build:viewer:demo": "cross-env NODE_ENV=production APP_CONFIG=config/demo.js HTML_TEMPLATE=rollbar.html node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --progress --config .webpack/webpack.pwa.js",
     "build:viewer:package": "yarn run build:package",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js -w",
-    "dev:orthanc": "cross-env NODE_ENV=developmen APP_CONFIG=config/docker_nginx-orthanc.js react-scripts start",
+    "dev:orthanc": "cross-env NODE_ENV=development APP_CONFIG=config/docker_nginx-orthanc.js react-scripts start",
     "dev:viewer": "yarn run dev",
     "start": "yarn run dev",
     "orthanc:up": "docker-compose -f docker/Nginx-Orthanc/docker-compose.yml up",