From df1400adc9cf9fcf86b7713d9a7ede068ac8b77e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Nov 2025 14:11:25 -0500
Subject: [PATCH] fix(@angular/cli): ensure dependencies are resolved correctly
 for node modules directory check

This commit updates the check for installed node packages in the Architect base command module. Instead of relying on the presence of a 'node_modules' directory or checking for Yarn PnP specifically, it now attempts to resolve '@angular/core' using 'createRequire'. This provides a more robust and agnostic way to verify if dependencies are installed, supporting various package managers and installation strategies.
---
 .../architect-base-command-module.ts              | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/angular/cli/src/command-builder/architect-base-command-module.ts b/packages/angular/cli/src/command-builder/architect-base-command-module.ts
index 566e0e62b209..fb3508777d74 100644
--- a/packages/angular/cli/src/command-builder/architect-base-command-module.ts
+++ b/packages/angular/cli/src/command-builder/architect-base-command-module.ts
@@ -12,8 +12,7 @@ import {
   WorkspaceNodeModulesArchitectHost,
 } from '@angular-devkit/architect/node';
 import { json } from '@angular-devkit/core';
-import { existsSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { createRequire } from 'node:module';
 import { isPackageNameSafeForAnalytics } from '../analytics/analytics';
 import { EventCustomDimension, EventCustomMetric } from '../analytics/analytics-parameters';
 import { assertIsError } from '../utilities/error';
@@ -210,15 +209,13 @@ export abstract class ArchitectBaseCommandModule<T extends object>
       return;
     }
 
-    // Check if yarn PnP is used. https://yarnpkg.com/advanced/pnpapi#processversionspnp
-    if (process.versions.pnp) {
-      return;
-    }
+    const workspaceResolve = createRequire(basePath + '/').resolve;
+
+    try {
+      workspaceResolve('@angular/core');
 
-    // Check for a `node_modules` directory (npm, yarn non-PnP, etc.)
-    if (existsSync(resolve(basePath, 'node_modules'))) {
       return;
-    }
+    } catch {}
 
     this.context.logger.warn(
       `Node packages may not be installed. Try installing with '${this.context.packageManager.name} install'.`,