Skip to content

Commit be7a716

Browse files
douglasduteilhansl
authored andcommitted
fix(@angular/cli): resolve in all available node_modules
When @angular/cli dependencies (like @ngtool/webpack for example) are installed in its node_modules (as node_modules/@angular/cli/node_modules for example) webpack isn't seeing them.
1 parent 0a6b796 commit be7a716

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

packages/@angular/cli/models/webpack-configs/common.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
7070
modules: ['node_modules', nodeModules],
7171
},
7272
resolveLoader: {
73-
modules: [nodeModules]
73+
modules: [nodeModules, 'node_modules']
7474
},
75-
context: projectRoot,
75+
context: __dirname,
7676
entry: entryPoints,
7777
output: {
7878
path: path.resolve(projectRoot, buildOptions.outputPath),
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { createDir, moveFile } from '../../utils/fs';
2+
import { ng } from '../../utils/process';
3+
4+
export default async function () {
5+
await createDir('node_modules/@angular/cli/node_modules');
6+
await moveFile(
7+
'node_modules/@ngtools',
8+
'node_modules/@angular/cli/node_modules/@ngtools'
9+
);
10+
11+
await ng('build');
12+
}

0 commit comments

Comments
 (0)