Skip to content

Commit 8fcd402

Browse files
committed
fix(@angular/cli): revert following @clydin comments
1 parent 8fec989 commit 8fcd402

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

packages/@angular/cli/custom-typings.d.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,3 @@ interface IWebpackDevServerConfigurationOptions {
2424
public?: string;
2525
disableHostCheck?: boolean;
2626
}
27-
28-
29-
interface NodeModule {
30-
paths: string[];
31-
}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
2323
const { projectRoot, buildOptions, appConfig } = wco;
2424

2525
const appRoot = path.resolve(projectRoot, appConfig.root);
26-
const projectRootNodeModules = path.resolve(projectRoot, 'node_modules');
27-
const nodeModules = module.paths.slice(0, module.paths.indexOf(projectRootNodeModules) + 1);
26+
const nodeModules = path.resolve(projectRoot, 'node_modules');
2827

2928
let extraPlugins: any[] = [];
3029
let extraRules: any[] = [];
@@ -68,12 +67,12 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
6867
devtool: buildOptions.sourcemaps ? 'source-map' : false,
6968
resolve: {
7069
extensions: ['.ts', '.js'],
71-
modules: [appRoot, 'node_modules', projectRootNodeModules],
70+
modules: ['node_modules', nodeModules],
7271
},
7372
resolveLoader: {
74-
modules: nodeModules
73+
modules: [nodeModules, 'node_modules']
7574
},
76-
context: projectRoot,
75+
context: __dirname,
7776
entry: entryPoints,
7877
output: {
7978
path: path.resolve(projectRoot, buildOptions.outputPath),
@@ -83,7 +82,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
8382
},
8483
module: {
8584
rules: [
86-
{ enforce: 'pre', test: /\.js$/, loader: 'source-map-loader', exclude: nodeModules },
85+
{ enforce: 'pre', test: /\.js$/, loader: 'source-map-loader', exclude: [nodeModules] },
8786
{ test: /\.json$/, loader: 'json-loader' },
8887
{ test: /\.html$/, loader: 'raw-loader' },
8988
{ test: /\.(eot|svg)$/, loader: `file-loader?name=[name]${hashFormat.file}.[ext]` },

0 commit comments

Comments
 (0)