From 97c23f9ed2dabf9fbf96a775648dc1b293b0e08c Mon Sep 17 00:00:00 2001
From: Dan Bucholtz <dan.bucholtz@gmail.com>
Date: Fri, 18 Nov 2016 22:58:22 -0600
Subject: [PATCH] fix(webpack): fix path resolution

fix path resolution
---
 config/webpack.config.js | 4 ++--
 src/webpack.ts           | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/webpack.config.js b/config/webpack.config.js
index cc0c87cb..6330e79e 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -63,14 +63,14 @@ module.exports = {
 
   resolve: {
     extensions: ['.js', '.ts', '.json'],
-    modules: [path.resolve('{{ROOT}}', 'node_modules')]
+    modules: [path.resolve('node_modules')]
   },
 
   module: {
     loaders: [
       {
         test: /\.json$/,
-        loader: 'json-loader'
+        loader: 'json'
       }
     ].concat(getSourcemapLoader())
   },
diff --git a/src/webpack.ts b/src/webpack.ts
index bd9bde93..4e6e18c2 100644
--- a/src/webpack.ts
+++ b/src/webpack.ts
@@ -209,9 +209,15 @@ export interface WebpackConfig {
   devtool: string;
   entry: string;
   output: WebpackOutputObject;
+  resolve: WebpackResolveObject;
 }
 
 export interface WebpackOutputObject {
   path: string;
   filename: string;
 }
+
+export interface WebpackResolveObject {
+  extensions: string[];
+  modules: string[];
+}