Skip to content

Commit 157beac

Browse files
hanslMRHarrison
authored andcommitted
fix(webpack): remove usage of __dirname from the config. (angular#3422)
1 parent 8e722c3 commit 157beac

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

packages/angular-cli/models/webpack-build-common.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,12 @@ export function getWebpackCommonConfig(
5858
devtool: sourcemap ? 'source-map' : false,
5959
resolve: {
6060
extensions: ['.ts', '.js'],
61-
modules: [nodeModules]
61+
modules: [nodeModules],
6262
},
63-
context: path.resolve(__dirname, './'),
63+
resolveLoader: {
64+
modules: [path.resolve(projectRoot, 'node_modules')]
65+
},
66+
context: projectRoot,
6467
entry: entry,
6568
output: {
6669
path: path.resolve(projectRoot, appConfig.outDir),

packages/angular-cli/models/webpack-build-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig, test
5656

5757
return {
5858
devtool: testConfig.sourcemap ? 'inline-source-map' : 'eval',
59-
context: path.resolve(__dirname, './'),
59+
context: projectRoot,
6060
resolve: {
6161
extensions: ['.ts', '.js'],
6262
plugins: [

0 commit comments

Comments
 (0)