From 57d57b42111f8fbc254d84ab4958d2da5df8024b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 1 May 2024 16:00:25 -0400
Subject: [PATCH] fix(@angular-devkit/architect): resolve builder aliases from
 containing package

When resolving a builder alias, the base path for the resolution will now
use the containing package. This prevents potential resolution failure due
to varying package manager installation strategies.
---
 .../architect/node/node-modules-architect-host.ts  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index 2ac907a14d7c..814d452403bb 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -126,7 +126,11 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
    * @param builderStr The name of the builder to be used.
    * @returns All the info needed for the builder itself.
    */
-  resolveBuilder(builderStr: string, seenBuilders?: Set<string>): Promise<NodeModulesBuilderInfo> {
+  resolveBuilder(
+    builderStr: string,
+    basePath = this._root,
+    seenBuilders?: Set<string>,
+  ): Promise<NodeModulesBuilderInfo> {
     if (seenBuilders?.has(builderStr)) {
       throw new Error(
         'Circular builder alias references detected: ' + [...seenBuilders, builderStr],
@@ -140,7 +144,7 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
 
     // Resolve and load the builders manifest from the package's `builders` field, if present
     const packageJsonPath = localRequire.resolve(packageName + '/package.json', {
-      paths: [this._root],
+      paths: [basePath],
     });
 
     const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8')) as { builders?: string };
@@ -170,7 +174,11 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
 
     // Resolve alias reference if entry is a string
     if (typeof builder === 'string') {
-      return this.resolveBuilder(builder, (seenBuilders ?? new Set()).add(builderStr));
+      return this.resolveBuilder(
+        builder,
+        path.dirname(packageJsonPath),
+        (seenBuilders ?? new Set()).add(builderStr),
+      );
     }
 
     // Determine builder implementation path (relative within package only)