Merge branch 'master' into addSignOrderHashAndTests

# Conflicts:
#	package.json
#	src/globals.d.ts
#	test/0x.js_test.ts

1 files changed, 10 insertions, 4 deletions

diff --git a/webpack.config.js b/webpack.config.js
index 67af51f7a..03a7c6cac 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,14 +1,20 @@
 /**
  * This is to generate the umd bundle only
  */
+const lodash = require('lodash');
 const webpack = require('webpack');
 const path = require('path');
+const production = process.env.NODE_ENV === 'production';
+
+let entry = {
+    '0x': './src/0x.js.ts',
+};
+if (production) {
+    entry = _.assign({}, entry, {'0x.min': './src/0x.js.ts'});
+}
 
 module.exports = {
-    entry: {
-        '0x': './src/ts/0x.js.ts',
-        '0x.min': './src/ts/0x.js.ts'
-    },
+    entry,
     output: {
         path: path.resolve(__dirname, '_bundles'),
         filename: '[name].js',