Merge branch 'master' of github.com:0xProject/0x.js

# Conflicts:
#	src/ts/0x.js.ts
#	src/ts/utils/utils.ts

1 files changed, 18 insertions, 8 deletions

diff --git a/webpack.config.js b/webpack.config.js
index 04822d79d..67af51f7a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -17,7 +17,7 @@ module.exports = {
         umdNamedDefine: true,
     },
     resolve: {
-        extensions: ['.ts', '.js'],
+        extensions: ['.ts', '.js', '.json'],
     },
     devtool: 'source-map',
     plugins: [
@@ -28,13 +28,23 @@ module.exports = {
         }),
     ],
     module: {
-        loaders: [{
-            test: /\.ts$/,
-            loader: 'awesome-typescript-loader',
-            exclude: /node_modules/,
-            query: {
-                declaration: false,
+        rules: [
+            {
+                test: /\.ts$/,
+                use: [
+                    {
+                        loader: 'awesome-typescript-loader',
+                        query: {
+                            declaration: false,
+                        },
+                    },
+                ],
+                exclude: /node_modules/,
             },
-        }],
+            {
+                test: /\.json$/,
+                loader: 'json-loader',
+            },
+        ],
     },
 };