From 44b93cd71fe6945c4f131ad15cf7c6a96d86f419 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Wed, 18 May 2022 11:48:17 +0000
Subject: [PATCH] fix(@angular/cli): resolve relative schematic from
 `angular.json` instead of current working directory

Relative schematics referenced in `angular.json` `schematicCollections` and `defaultCollection` were always resolved from the current working directory, which is not correct and caused the collection not to be resolved when the this is different from the location of the workspace config.

Closes #23136
---
 packages/angular/cli/models/schematic-command.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 884ba71f7d9d..fdda9b9d5905 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -21,6 +21,7 @@ import {
 } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
 import * as systemPath from 'path';
+import { resolve } from 'path';
 import { colors } from '../utilities/color';
 import { getProjectByCwd, getSchematicDefaults, getWorkspace } from '../utilities/config';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
@@ -373,6 +374,12 @@ export abstract class SchematicCommand<
   }
 
   protected async getDefaultSchematicCollection(): Promise<string> {
+    // Resolve relative collections from the location of `angular.json`
+    const resolveRelativeCollection = (collectionName: string) =>
+      collectionName.charAt(0) === '.'
+        ? resolve(this.context.root, collectionName)
+        : collectionName;
+
     let workspace = await getWorkspace('local');
 
     if (workspace) {
@@ -380,13 +387,13 @@ export abstract class SchematicCommand<
       if (project && workspace.getProjectCli(project)) {
         const value = workspace.getProjectCli(project)['defaultCollection'];
         if (typeof value == 'string') {
-          return value;
+          return resolveRelativeCollection(value);
         }
       }
       if (workspace.getCli()) {
         const value = workspace.getCli()['defaultCollection'];
         if (typeof value == 'string') {
-          return value;
+          return resolveRelativeCollection(value);
         }
       }
     }
@@ -395,7 +402,7 @@ export abstract class SchematicCommand<
     if (workspace && workspace.getCli()) {
       const value = workspace.getCli()['defaultCollection'];
       if (typeof value == 'string') {
-        return value;
+        return resolveRelativeCollection(value);
       }
     }