From 1c91fc9c6fe71a0b2e3e1f90cc2c828e84c162bd Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Mon, 5 Dec 2016 17:33:13 -0800
Subject: [PATCH] fix(webpack): remove usage of __dirname from the config.

---
 packages/angular-cli/models/webpack-build-common.ts | 7 +++++--
 packages/angular-cli/models/webpack-build-test.js   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/angular-cli/models/webpack-build-common.ts b/packages/angular-cli/models/webpack-build-common.ts
index 27b85cfad977..2fdb0a9fe381 100644
--- a/packages/angular-cli/models/webpack-build-common.ts
+++ b/packages/angular-cli/models/webpack-build-common.ts
@@ -58,9 +58,12 @@ export function getWebpackCommonConfig(
     devtool: sourcemap ? 'source-map' : false,
     resolve: {
       extensions: ['.ts', '.js'],
-      modules: [nodeModules]
+      modules: [nodeModules],
     },
-    context: path.resolve(__dirname, './'),
+    resolveLoader: {
+      modules: [path.resolve(projectRoot, 'node_modules')]
+    },
+    context: projectRoot,
     entry: entry,
     output: {
       path: path.resolve(projectRoot, appConfig.outDir),
diff --git a/packages/angular-cli/models/webpack-build-test.js b/packages/angular-cli/models/webpack-build-test.js
index 5c1541044e69..a82057506a8c 100644
--- a/packages/angular-cli/models/webpack-build-test.js
+++ b/packages/angular-cli/models/webpack-build-test.js
@@ -56,7 +56,7 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig, test
 
   return {
     devtool: testConfig.sourcemap ? 'inline-source-map' : 'eval',
-    context: path.resolve(__dirname, './'),
+    context: projectRoot,
     resolve: {
       extensions: ['.ts', '.js'],
       plugins: [