From 4a5ca162c36a4ed9292ae2bf7e9eb8c31cadd349 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 4 Nov 2021 12:48:15 -0400
Subject: [PATCH] fix(@angular/cli): avoid redirecting @angular/core in Angular
 migrations

Files should not redirect `@angular/core` and instead use the direct dependency of the `@schematics/angular` package. This allows old major version migrations to continue to function even though the latest major version may have breaking changes in `@angular/core`.
---
 .../angular/cli/models/schematic-engine-host.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/models/schematic-engine-host.ts b/packages/angular/cli/models/schematic-engine-host.ts
index 0c5bc7fe12..57d678321d 100644
--- a/packages/angular/cli/models/schematic-engine-host.ts
+++ b/packages/angular/cli/models/schematic-engine-host.ts
@@ -129,10 +129,21 @@ function wrap(
       // Provide compatibility modules for older versions of @angular/cdk
       return legacyModules[id];
     } else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {
-      // Resolve from inside the `@angular/cli` project
-      const packagePath = require.resolve(id);
+      // Files should not redirect `@angular/core` and instead use the direct
+      // dependency if available. This allows old major version migrations to continue to function
+      // even though the latest major version may have breaking changes in `@angular/core`.
+      if (id.startsWith('@angular-devkit/core')) {
+        try {
+          return schematicRequire(id);
+        } catch (e) {
+          if (e.code !== 'MODULE_NOT_FOUND') {
+            throw e;
+          }
+        }
+      }
 
-      return hostRequire(packagePath);
+      // Resolve from inside the `@angular/cli` project
+      return hostRequire(id);
     } else if (id.startsWith('.') || id.startsWith('@angular/cdk')) {
       // Wrap relative files inside the schematic collection
       // Also wrap `@angular/cdk`, it contains helper utilities that import core schematic packages