From 5e1fe36311605980beef1599e4157bffc90a2107 Mon Sep 17 00:00:00 2001
From: dai1ooleet0aesei <tdsna8viep7x5nsh@protonmail.com>
Date: Sun, 8 Dec 2024 15:59:39 +0100
Subject: [PATCH] feat(@angular-devkit/architect): require build schemas from
 modules

---
 .../node/node-modules-architect-host.ts        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 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 682c3917af16..c7ee4d85f576 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -193,7 +193,7 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
     }
 
     // Determine builder option schema path (relative within package only)
-    const schemaPath = builder.schema && path.normalize(builder.schema);
+    let schemaPath = builder.schema && path.normalize(builder.schema);
     if (!schemaPath) {
       throw new Error('Could not find the schema for builder ' + builderStr);
     }
@@ -203,7 +203,21 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
       );
     }
 
-    const schemaText = readFileSync(path.join(buildersManifestDirectory, schemaPath), 'utf-8');
+    // The file could be either a package reference or in the local manifest directory.
+    // Node resolution is tried first then reading the file from the manifest directory if resolution fails.
+    try {
+      schemaPath = localRequire.resolve(schemaPath, {
+        paths: [buildersManifestDirectory],
+      });
+    } catch (e) {
+      if ((e as NodeJS.ErrnoException).code === 'MODULE_NOT_FOUND') {
+        schemaPath = path.join(buildersManifestDirectory, schemaPath);
+      } else {
+        throw e;
+      }
+    }
+
+    const schemaText = readFileSync(schemaPath, 'utf-8');
 
     return Promise.resolve({
       name: builderStr,