From fd2a94fa1b8fa5b4767b5f0f825ec364564d0efa Mon Sep 17 00:00:00 2001
From: Jason Baciulis <jason.baciulis@gmail.com>
Date: Sat, 16 Jun 2018 22:33:41 +0700
Subject: [PATCH] Add uglifyjs plugin (#2070)

* Add uglifyjs plugin and replace -p flag with --env.production
* Add uglifyjs plugin
* Configure UglifyJsPlugin to drop console and prevent eslint error
* Turn off no-console rule because uglifyjs plugin drops it in prod
---
 .eslintrc.js                                      |  2 +-
 package.json                                      |  3 ++-
 resources/assets/build/webpack.config.optimize.js | 10 ++++++++++
 yarn.lock                                         |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 62168f8f15..8dc91120d0 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -32,7 +32,7 @@ module.exports = {
     ]
   },
   "rules": {
-    "no-console": process.env.NODE_ENV === 'production' ? 2 : 0,
+    "no-console": 0,
     "comma-dangle": [
       "error",
       {
diff --git a/package.json b/package.json
index 0ad4526fb5..401d814a68 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
   },
   "scripts": {
     "build": "webpack --progress --config resources/assets/build/webpack.config.js",
-    "build:production": "webpack --progress -p --config resources/assets/build/webpack.config.js",
+    "build:production": "webpack --env.production --progress --config resources/assets/build/webpack.config.js",
     "build:profile": "webpack --progress --profile --json --config resources/assets/build/webpack.config.js",
     "start": "webpack --hide-modules --watch --config resources/assets/build/webpack.config.js",
     "rmdist": "rimraf dist",
@@ -94,6 +94,7 @@
     "stylelint": "^8.4.0",
     "stylelint-config-standard": "~18.2.0",
     "stylelint-webpack-plugin": "^0.10.1",
+    "uglifyjs-webpack-plugin": "^1.2.5",
     "url-loader": "^0.6.2",
     "webpack": "~3.10.0",
     "webpack-assets-manifest": "^1.0.0",
diff --git a/resources/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js
index 676525925c..d320bdcaa4 100644
--- a/resources/assets/build/webpack.config.optimize.js
+++ b/resources/assets/build/webpack.config.optimize.js
@@ -2,6 +2,7 @@
 
 const { default: ImageminPlugin } = require('imagemin-webpack-plugin');
 const imageminMozjpeg = require('imagemin-mozjpeg');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
 const config = require('./config');
 
@@ -21,5 +22,14 @@ module.exports = {
       plugins: [imageminMozjpeg({ quality: 75 })],
       disable: (config.enabled.watcher),
     }),
+    new UglifyJsPlugin({
+      uglifyOptions: {
+        ecma: 8,
+        compress: {
+          warnings: true,
+          drop_console: true,
+        },
+      },
+    }),
   ],
 };
diff --git a/yarn.lock b/yarn.lock
index bf06d3ddf3..dbd88c9221 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7914,7 +7914,7 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-uglifyjs-webpack-plugin@^1.2.4:
+uglifyjs-webpack-plugin@^1.2.4, uglifyjs-webpack-plugin@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
   dependencies: