From 216f0e32377332084c10ae0c6b06f7850df0a8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Rosiek?= <swr@kmd.dk>
Date: Tue, 22 Aug 2017 08:47:10 +0200
Subject: [PATCH] Added ability to load files relative to the app root

---
 templates/ReactReduxSpa/tsconfig.json     | 2 +-
 templates/ReactReduxSpa/webpack.config.js | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/templates/ReactReduxSpa/tsconfig.json b/templates/ReactReduxSpa/tsconfig.json
index 0a2eb677..59e25b2d 100644
--- a/templates/ReactReduxSpa/tsconfig.json
+++ b/templates/ReactReduxSpa/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
+    "baseUrl": "ClientApp",
     "moduleResolution": "node",
     "target": "es5",
     "jsx": "react",
diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/ReactReduxSpa/webpack.config.js
index 5a613b81..5e61336b 100644
--- a/templates/ReactReduxSpa/webpack.config.js
+++ b/templates/ReactReduxSpa/webpack.config.js
@@ -10,7 +10,13 @@ module.exports = (env) => {
     // Configuration in common to both client-side and server-side bundles
     const sharedConfig = () => ({
         stats: { modules: false },
-        resolve: { extensions: ['.js', '.jsx', '.ts', '.tsx'] },
+        resolve: { 
+            extensions: ['.js', '.jsx', '.ts', '.tsx'],
+            modules: [
+                path.resolve('./ClientApp'),
+                path.resolve('./node_modules')                
+            ]
+        },
         output: {
             filename: '[name].js',
             publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix