From d52c1310b28a574f9ef4fe558cfe1ef508a64d7c Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Thu, 23 Aug 2018 14:40:29 -0700
Subject: Update uglify plugin to support es6

---
 packages/0x.js/package.json      |  3 ++-
 packages/0x.js/webpack.config.js | 13 ++++++++++---
 yarn.lock                        | 13 +++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 755de9e18..54a896bfc 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -17,7 +17,7 @@
     "scripts": {
         "watch_without_deps": "tsc -w",
         "build": "yarn build:all",
-        "build:all": "run-p build:umd:prod build:commonjs; exit 0;",
+        "build:all": "run-p build:umd:prod build:commonjs",
         "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
         "test:circleci": "run-s test:coverage",
         "test": "yarn run_mocha",
@@ -70,6 +70,7 @@
         "tslint": "5.11.0",
         "typedoc": "0.12.0",
         "typescript": "3.0.1",
+        "uglifyjs-webpack-plugin": "^1.3.0",
         "webpack": "^3.1.0"
     },
     "dependencies": {
diff --git a/packages/0x.js/webpack.config.js b/packages/0x.js/webpack.config.js
index 2c1fe81a7..982e076ee 100644
--- a/packages/0x.js/webpack.config.js
+++ b/packages/0x.js/webpack.config.js
@@ -3,6 +3,7 @@
  */
 const _ = require('lodash');
 const webpack = require('webpack');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const path = require('path');
 const production = process.env.NODE_ENV === 'production';
 
@@ -27,10 +28,16 @@ module.exports = {
     },
     devtool: 'source-map',
     plugins: [
-        new webpack.optimize.UglifyJsPlugin({
-            minimize: true,
+        // TODO: Revert to webpack bundled version with webpack v4.
+        // The v3 series bundled version does not support ES6 and
+        // fails to build.
+        new UglifyJsPlugin({
             sourceMap: true,
-            include: /\.min\.js$/,
+            uglifyOptions: {
+                mangle: {
+                    reserved: ['BigNumber'],
+                },
+            },
         }),
     ],
     module: {
diff --git a/yarn.lock b/yarn.lock
index a0b738eb9..0777f91af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13929,6 +13929,19 @@ uglifyjs-webpack-plugin@^1.2.5:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+uglifyjs-webpack-plugin@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    schema-utils "^0.4.5"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 uid-number@0.0.6, uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-- 
cgit v1.2.3