Skip to content

fix(@angular-devkit/build-angular): prefer workspace node_modules #18411

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

Closed
wants to merge 1 commit into from
Closed

fix(@angular-devkit/build-angular): prefer workspace node_modules #18411

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
23 changes: 14 additions & 9 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 @@ -353,12 +353,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
];
}

// 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 = findAllNodeModules(__dirname, projectRoot);
loaderNodeModules.unshift('node_modules');

const extraMinimizers = [];
if (stylesOptimization) {
extraMinimizers.push(
Expand Down Expand Up @@ -485,22 +479,33 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
resolve: {
extensions: ['.ts', '.tsx', '.mjs', '.js'],
symlinks: !buildOptions.preserveSymlinks,
modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
modules: [
wco.tsConfig.options.baseUrl || projectRoot,
// Prefer workspace level node_modules
path.resolve(root, 'node_modules'),
'node_modules',
],
plugins: [
PnpWebpackPlugin,
new DedupeModuleResolvePlugin({ verbose: buildOptions.verbose }),
],
},
resolveLoader: {
symlinks: !buildOptions.preserveSymlinks,
modules: loaderNodeModules,
modules: [
// 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.
...findAllNodeModules(__dirname, root),
'node_modules',
],
plugins: [PnpWebpackPlugin.moduleLoader(module)],
},
context: projectRoot,
entry: entryPoints,
output: {
futureEmitAssets: true,
path: path.resolve(root, buildOptions.outputPath as string),
path: path.resolve(root, buildOptions.outputPath),
publicPath: buildOptions.deployUrl,
filename: `[name]${targetInFileName}${hashFormat.chunk}.js`,
},
Expand Down
2 changes: 1 addition & 1 deletion ...ngular_devkit/build_angular/src/angular-cli-files/plugins/dedupe-module-resolve-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class DedupeModuleResolvePlugin {
apply(resolver: any) {
resolver
.getHook('before-described-relative')
.tapPromise('DedupeModuleResolvePlugin', async (request: NormalModuleFactoryRequest) => {
.tap('DedupeModuleResolvePlugin', (request: NormalModuleFactoryRequest) => {
if (request.relativePath !== '.') {
return;
}
Expand Down
4 changes: 2 additions & 2 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 @@ -9,7 +9,7 @@ import { existsSync } from 'fs';
import * as path from 'path';
import { isDirectory } from './is-directory';

export function findUp(names: string | string[], from: string, stopOnNodeModules = false) {
export function findUp(names: string | string[], from: string, stopOnNodeModules = false): string | null {
if (!Array.isArray(names)) {
names = [names];
}
Expand Down Expand Up @@ -37,7 +37,7 @@ export function findUp(names: string | string[], from: string, stopOnNodeModules
return null;
}

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

let current = from;
Expand Down