Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype

* 'v2-prototype' of github.com:0xProject/0x-monorepo:
  Update artifacts
  Update yarn.lock
  Fix warnings in Metacoin
  Upgrade UglifyJS to include ES6 support
  Add CancelOrder and MatchOrder types
  Add missing return types
  Ignore classnames linter rule

2 files changed, 10 insertions, 3 deletions

diff --git a/packages/website/package.json b/packages/website/package.json
index 3ef66d269..8b34cd743 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -88,6 +88,7 @@
         "tslint": "5.8.0",
         "tslint-config-0xproject": "^0.0.2",
         "typescript": "2.7.1",
+        "uglifyjs-webpack-plugin": "^1.2.5",
         "webpack": "^3.1.0",
         "webpack-dev-middleware": "^1.10.0",
         "webpack-dev-server": "^2.5.0"
diff --git a/packages/website/webpack.config.js b/packages/website/webpack.config.js
index e28e9e064..f9abeb27c 100644
--- a/packages/website/webpack.config.js
+++ b/packages/website/webpack.config.js
@@ -1,5 +1,6 @@
 const path = require('path');
 const webpack = require('webpack');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
 module.exports = {
     entry: ['./ts/index.tsx'],
@@ -76,9 +77,14 @@ module.exports = {
                           NODE_ENV: JSON.stringify(process.env.NODE_ENV),
                       },
                   }),
-                  new webpack.optimize.UglifyJsPlugin({
-                      mangle: {
-                          except: ['BigNumber'],
+                  // TODO: Revert to webpack bundled version with webpack v4.
+                  // The v3 series bundled version does not support ES6 and
+                  // fails to build.
+                  new UglifyJsPlugin({
+                      uglifyOptions: {
+                          mangle: {
+                              reserved: ['BigNumber'],
+                          },
                       },
                   }),
               ]