Skip to content

Commit fc7aa22

Browse files
committed
refactor(@angular/cli): use process.versions.pnp to determine if PNP is used in warnOnMissingNodeModules
Instead of checking for existence of PNP config files we now use `process.versions.pnp`. See https://yarnpkg.com/advanced/pnpapi#processversionspnp
1 parent a391b5f commit fc7aa22

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

packages/angular/cli/src/command-builder/architect-base-command-module.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,17 +200,13 @@ export abstract class ArchitectBaseCommandModule<T extends object>
200200
return;
201201
}
202202

203-
// Check for a `node_modules` directory (npm, yarn non-PnP, etc.)
204-
if (existsSync(resolve(basePath, 'node_modules'))) {
203+
// Check if yarn PnP is used. https://yarnpkg.com/advanced/pnpapi#processversionspnp
204+
if (process.versions.pnp) {
205205
return;
206206
}
207207

208-
// Check for yarn PnP files
209-
if (
210-
existsSync(resolve(basePath, '.pnp.js')) ||
211-
existsSync(resolve(basePath, '.pnp.cjs')) ||
212-
existsSync(resolve(basePath, '.pnp.mjs'))
213-
) {
208+
// Check for a `node_modules` directory (npm, yarn non-PnP, etc.)
209+
if (existsSync(resolve(basePath, 'node_modules'))) {
214210
return;
215211
}
216212

0 commit comments

Comments
 (0)