Skip to content

fix(@angular-devkit/build-angular): improve webpack loader resolution #13687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyliau merged 1 commit into from
Feb 19, 2019
Merged

fix(@angular-devkit/build-angular): improve webpack loader resolution #13687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import { AssetPatternObject } from '../../../browser/schema';
import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
import { findUp } from '../../utilities/find-up';
import { isDirectory } from '../../utilities/is-directory';
import { findAllNodeModules, findUp } from '../../utilities/find-up';
import { requireProjectModule } from '../../utilities/require-project-module';
import { BuildOptions, WebpackConfigOptions } from '../build-options';
import { getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
Expand Down Expand Up @@ -201,15 +200,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
// Allow loaders to be in a node_modules nested inside the devkit/build-angular package.
// This is important in case loaders do not get hoisted.
// If this file moves to another location, alter potentialNodeModules as well.
const loaderNodeModules = ['node_modules'];
const buildAngularNodeModules = findUp('node_modules', __dirname);
if (buildAngularNodeModules
&& isDirectory(buildAngularNodeModules)
&& buildAngularNodeModules !== nodeModules
&& buildAngularNodeModules.startsWith(nodeModules)
) {
loaderNodeModules.push(buildAngularNodeModules);
}
const loaderNodeModules = findAllNodeModules(__dirname, projectRoot);
loaderNodeModules.unshift('node_modules');

// Load rxjs path aliases.
// https://github.com/ReactiveX/rxjs/blob/master/doc/lettable-operators.md#build-and-treeshaking
Expand Down
26 changes: 22 additions & 4 deletions packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-up.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
// tslint:disable
// TODO: cleanup this file, it's copied as is from Angular CLI.

import * as path from 'path';
import { existsSync } from 'fs';
import * as path from 'path';
import { isDirectory } from './is-directory';

export function findUp(names: string | string[], from: string, stopOnNodeModules = false) {
if (!Array.isArray(names)) {
Expand Down Expand Up @@ -38,3 +36,23 @@ export function findUp(names: string | string[], from: string, stopOnNodeModules

return null;
}

export function findAllNodeModules(from: string, root?: string) {
const nodeModules: string[] = [];

let current = from;
while (current && current !== root) {
const potential = path.join(current, 'node_modules');
if (existsSync(potential) && isDirectory(potential)) {
nodeModules.push(potential);
}

const next = path.dirname(current);
if (next === current) {
break;
}
current = next;
}

return nodeModules;
}