@angular/core 21.0.0-next.4 → 21.0.0-next.5

package/fesm2022/rxjs-interop.mjs

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/fesm2022/signal.mjs

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/fesm2022/testing.mjs

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/fesm2022/weak_ref.mjs

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/graph.d.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -2194,6 +2194,7 @@ declare function linkedSignal<S, D>(options: {
         value: NoInfer<D>;
     }) => D;
     equal?: ValueEqualityFn<NoInfer<D>>;
+    debugName?: string;
 }): WritableSignal<D>;
 
 /**
@@ -3525,7 +3526,6 @@ declare class TemplateRef<C> {
  *
  * ```angular-ts
  * @Component({
- *   standalone: true,
  *   selector: 'dynamic',
  *   template: `<span>This is a content of a dynamic component.</span>`,
  * })
@@ -3534,7 +3534,6 @@ declare class TemplateRef<C> {
  * }
  *
  * @Component({
- *   standalone: true,
  *   selector: 'app',
  *   template: `<main>Hi! This is the main content.</main>`,
  * })
@@ -4770,6 +4769,7 @@ declare const enum RuntimeErrorCode {
     MISSING_INJECTION_TOKEN = 208,
     INVALID_MULTI_PROVIDER = -209,
     MISSING_DOCUMENT = 210,
+    INVALID_APP_ID = 211,
     MULTIPLE_COMPONENTS_MATCH = -300,
     EXPORT_NOT_FOUND = -301,
     PIPE_NOT_FOUND = -302,
@@ -4789,7 +4789,7 @@ declare const enum RuntimeErrorCode {
     INVALID_BINDING_TARGET = 316,
     INVALID_SET_INPUT_CALL = 317,
     MULTIPLE_PLATFORMS = 400,
-    PLATFORM_NOT_FOUND = 401,
+    PLATFORM_NOT_FOUND = -401,
     MISSING_REQUIRED_INJECTABLE_IN_BOOTSTRAP = 402,
     BOOTSTRAP_COMPONENTS_NOT_FOUND = -403,
     PLATFORM_ALREADY_DESTROYED = 404,
@@ -6383,12 +6383,12 @@ declare function ɵɵdeferHydrateOnViewport(): void;
 declare function ɵɵadvance(delta?: number): void;
 
 /**
- * Update an ARIA attribute by either its attribute or property name on a selected element.
+ * Update an ARIA attribute on a selected element.
  *
- * If the property name also exists as an input property on any of the element's directives, those
- * inputs will be set instead of the element property.
+ * If the attribute name also exists as an input property on any of the element's directives, those
+ * inputs will be set instead of the element attribute.
  *
- * @param name Name of the ARIA attribute or property (beginning with `aria`).
+ * @param name Name of the ARIA attribute (beginning with `aria-`).
  * @param value New value to write.
  * @returns This function returns itself so that it may be chained.
  *
@@ -9099,7 +9099,6 @@ declare const depsTracker: DepsTracker;
  *
  * ```angular-ts
  * @Component({
- *   standalone: true,
  *   template: `Hello {{ name }}!`
  * })
  * class HelloComponent {
@@ -9107,7 +9106,6 @@ declare const depsTracker: DepsTracker;
  * }
  *
  * @Component({
- *   standalone: true,
  *   template: `<div id="hello-component-host"></div>`
  * })
  * class RootComponent {}
@@ -9144,7 +9142,7 @@ declare const depsTracker: DepsTracker;
  * `[[element1, element2], [element3]]`: projects `element1` and `element2` into one `<ng-content>`,
  * and `element3` into a separate `<ng-content>`.
  *  * `directives` (optional): Directives that should be applied to the component.
- *  * `binding` (optional): Bindings to apply to the root component.
+ *  * `bindings` (optional): Bindings to apply to the root component.
  * @returns ComponentRef instance that represents a given Component.
  *
  * @publicApi
@@ -9208,7 +9206,6 @@ interface ComponentMirror<C> {
  *
  * ```angular-ts
  * @Component({
- *   standalone: true,
  *   selector: 'foo-component',
  *   template: `
  *     <ng-content></ng-content>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/core",
-  "version": "21.0.0-next.4",
+  "version": "21.0.0-next.5",
   "description": "Angular - the core framework",
   "author": "angular",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@angular/compiler": "21.0.0-next.4",
+    "@angular/compiler": "21.0.0-next.5",
     "rxjs": "^6.5.3 || ^7.4.0",
     "zone.js": "~0.15.0"
   },

package/primitives/di/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/primitives/event-dispatch/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/primitives/signals/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -106,7 +106,6 @@ interface Watch {
     [SIGNAL]: WatchNode;
 }
 interface WatchNode extends ReactiveNode {
-    hasRun: boolean;
     fn: ((onCleanup: WatchCleanupRegisterFn) => void) | null;
     schedule: ((watch: Watch) => void) | null;
     cleanupFn: WatchCleanupFn;

package/rxjs-interop/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/schematics/bundles/add-bootstrap-context-to-server-main.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,12 +8,12 @@
 
 require('@angular-devkit/core');
 require('node:path/posix');
-var project_paths = require('./project_paths-Cz4x-QiT.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-Clg7WX1w.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
 var ts = require('typescript');
 require('os');
-var apply_import_manager = require('./apply_import_manager-DroqamMP.cjs');
-require('./index-BI97t1U8.cjs');
+var apply_import_manager = require('./apply_import_manager-Bx60Uquz.cjs');
+require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
 require('@angular-devkit/schematics');

package/schematics/bundles/application-config-core.cjs

@@ -1,19 +1,19 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var project_tsconfig_paths = require('./project_tsconfig_paths-Clg7WX1w.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
 require('typescript');
 require('os');
-var apply_import_manager = require('./apply_import_manager-DroqamMP.cjs');
-require('./index-BI97t1U8.cjs');
+var apply_import_manager = require('./apply_import_manager-Bx60Uquz.cjs');
+require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-Cz4x-QiT.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
 var imports = require('./imports-DwPXlGFl.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');

package/schematics/bundles/{apply_import_manager-DroqamMP.cjs → apply_import_manager-Bx60Uquz.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,8 +8,8 @@
 
 var ts = require('typescript');
 require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-Clg7WX1w.cjs');
-var project_paths = require('./project_paths-Cz4x-QiT.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
 
 /**
  * Applies import manager changes, and writes them as replacements the

package/schematics/bundles/bootstrap-options-migration.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,14 +8,14 @@
 
 require('@angular-devkit/core');
 require('node:path/posix');
-var project_paths = require('./project_paths-Cz4x-QiT.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
 require('os');
 var ts = require('typescript');
-var project_tsconfig_paths = require('./project_tsconfig_paths-Clg7WX1w.cjs');
-var index = require('./index-BI97t1U8.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var index = require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var apply_import_manager = require('./apply_import_manager-DroqamMP.cjs');
+var apply_import_manager = require('./apply_import_manager-Bx60Uquz.cjs');
 var property_name = require('./property_name-BBwFuqMe.cjs');
 var imports = require('./imports-DwPXlGFl.cjs');
 var symbol = require('./symbol-BObKoqes.cjs');
@@ -27,34 +27,6 @@ require('url');
 const CORE_PACKAGE = '@angular/core';
 const PROVIDE_ZONE_CHANGE_DETECTION = 'provideZoneChangeDetection';
 const ZONE_CD_PROVIDER = `${PROVIDE_ZONE_CHANGE_DETECTION}()`;
-const NoopNgZone = `
-// TODO ADD WARNING MESSAGE
-export class NoopNgZone implements NgZone {
-  readonly hasPendingMicrotasks = false;
-  readonly hasPendingMacrotasks = false;
-  readonly isStable = true;
-  readonly onUnstable = new EventEmitter<any>();
-  readonly onMicrotaskEmpty = new EventEmitter<any>();
-  readonly onStable = new EventEmitter<any>();
-  readonly onError = new EventEmitter<any>();
-
-  run<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any): T {
-    return fn.apply(applyThis, applyArgs);
-  }
-
-  runGuarded<T>(fn: (...args: any[]) => any, applyThis?: any, applyArgs?: any): T {
-    return fn.apply(applyThis, applyArgs);
-  }
-
-  runOutsideAngular<T>(fn: (...args: any[]) => T): T {
-    return fn();
-  }
-
-  runTask<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any, name?: string): T {
-    return fn.apply(applyThis, applyArgs);
-  }
-}
-`;
 class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
     async analyze(info) {
         let replacements = [];
@@ -65,11 +37,12 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
             // * `platformBrowser().bootstrapModule(AppModule)`
             // * `platformBrowserDynamic().bootstrapModule(AppModule)`
             // * `TestBed.initTestEnvironment([AppModule], platformBrowserTesting())`
+            // * `getTestBed.initTestEnvironment([AppModule], platformBrowserTesting())`
             const specifiers = getSpecifiers(sourceFile);
             // If none of the imports related to bootstraping are present, we can skip the file.
             if (specifiers === null)
                 continue;
-            const { bootstrapAppSpecifier, platformBrowserDynamicSpecifier, platformBrowserSpecifier, testBedSpecifier, createApplicationSpecifier, } = specifiers;
+            const { bootstrapAppSpecifier, platformBrowserDynamicSpecifier, platformBrowserSpecifier, testBedSpecifier, createApplicationSpecifier, getTestBedSpecifier, } = specifiers;
             const typeChecker = info.program.getTypeChecker();
             const isCreateApplicationNode = (node) => {
                 return (ts.isCallExpression(node) &&
@@ -93,23 +66,8 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
                 return (ts.isCallExpression(node) &&
                     ts.isPropertyAccessExpression(node.expression) &&
                     node.expression.name.text === 'initTestEnvironment' &&
-                    symbol.isReferenceToImport(typeChecker, node.expression.expression, testBedSpecifier));
-            };
-            const NgModuleWithBootstrapPropMetadataLiteral = (node) => {
-                const moduleClass = node;
-                const ngModule = findNgModule(moduleClass, reflector);
-                if (!ngModule)
-                    return;
-                const ngModuleMetadata = evaluator.evaluate(ngModule);
-                if (!(ngModuleMetadata instanceof Map)) {
-                    return;
-                }
-                if (ngModuleMetadata.has('bootstrap') &&
-                    Array.isArray(ngModuleMetadata.get('bootstrap')) &&
-                    ngModuleMetadata.get('bootstrap').length > 0) {
-                    return ngModule;
-                }
-                return;
+                    (symbol.isReferenceToImport(typeChecker, node.expression.expression, testBedSpecifier) ||
+                        symbol.isReferenceToImport(typeChecker, node.expression.expression, getTestBedSpecifier)));
             };
             const reflector = new project_tsconfig_paths.TypeScriptReflectionHost(typeChecker);
             const evaluator = new index.PartialEvaluator(reflector, typeChecker, null);
@@ -126,13 +84,6 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
                 else if (isTestBedInitEnvironmentNode(node)) {
                     this.analyzeTestBedInitEnvironment(node, sourceFile, info, typeChecker, importManager, replacements);
                 }
-                else if (ts.isClassDeclaration(node)) {
-                    // This case is specific for handling G3 where the NgModule metadata might not be inspectable when it's in a different build target.
-                    const ngModuleLiteral = NgModuleWithBootstrapPropMetadataLiteral(node);
-                    if (ngModuleLiteral) {
-                        this.analyzeModuleWithBootstrapProp(ngModuleLiteral, sourceFile, info, typeChecker, importManager, replacements);
-                    }
-                }
                 node.forEachChild(walk);
             };
             sourceFile.forEachChild(walk);
@@ -309,23 +260,6 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
                 }
             }
             else if (typeof ngZoneOption === 'string' && ngZoneOption === 'noop') {
-                importManager.addImport({
-                    exportModuleSpecifier: CORE_PACKAGE,
-                    exportSymbolName: 'NgZone',
-                    requestedFile: moduleSourceFile,
-                });
-                // The migration specifically relies on this being longer than ZoneChangeDetectionModule
-                // As we take the "longest" change in case of duplicate replacements.
-                const moduleName = 'ZonelessChangeDetectionModule';
-                replacements.push(new project_paths.Replacement(moduleProjectFile, new project_paths.TextUpdate({
-                    position: moduleClass.getStart() - 1,
-                    end: moduleClass.getStart() - 1,
-                    toInsert: `${NoopNgZone}\n@NgModule({providers: [{provide: NgZone, useClass: NoopNgZone}]})\nexport class ${moduleName} {}\n\n`,
-                })));
-                const importsNode = property_name.findLiteralProperty(ngModule, 'imports');
-                if (importsNode && ts.isPropertyAssignment(importsNode)) {
-                    insertZoneCDModule(importsNode.initializer, moduleProjectFile, replacements, moduleName);
-                }
                 return;
             }
             else if (ngZoneOption && typeof ngZoneOption !== 'string') {
@@ -394,21 +328,6 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
         addZoneCDModule(ZONE_CD_PROVIDER, moduleProjectFile, insertPosition, replacements);
         insertZoneCDModule(ngModules, moduleProjectFile, replacements, 'ZoneChangeDetectionModule');
     }
-    analyzeModuleWithBootstrapProp(ngModuleProps, sourceFile, info, typeChecker, importManager, replacements) {
-        if (sourceFile.getText().includes('ZoneChangeDetectionModule')) {
-            // If the file already contains the ZoneChangeDetectionModule, we can skip it.
-            return;
-        }
-        const hasExistingChangeDetectionProvider = hasChangeDetectionProvider(ngModuleProps, typeChecker);
-        if (hasExistingChangeDetectionProvider)
-            return;
-        importManager.addImport({
-            exportModuleSpecifier: CORE_PACKAGE,
-            exportSymbolName: PROVIDE_ZONE_CHANGE_DETECTION,
-            requestedFile: sourceFile,
-        });
-        addProvidersToNgModule(project_paths.projectFile(sourceFile, info), sourceFile, ngModuleProps, ZONE_CD_PROVIDER, replacements);
-    }
 }
 function addProvidersToNgModule(projectFile, moduleSourceFile, ngModule, providersText, replacements) {
     //                             ObjLiteral => callExp => Decorator => ClassExpression
@@ -629,13 +548,15 @@ function getSpecifiers(sourceFile) {
     const platformBrowserDynamicSpecifier = imports.getImportSpecifier(sourceFile, '@angular/platform-browser-dynamic', 'platformBrowserDynamic');
     const platformBrowserSpecifier = imports.getImportSpecifier(sourceFile, '@angular/platform-browser', 'platformBrowser');
     const testBedSpecifier = imports.getImportSpecifier(sourceFile, '@angular/core/testing', 'TestBed');
+    const getTestBedSpecifier = imports.getImportSpecifier(sourceFile, '@angular/core/testing', 'getTestBed');
     const ngModuleSpecifier = imports.getImportSpecifier(sourceFile, '@angular/core', 'NgModule');
     if (!createApplicationSpecifier &&
         !bootstrapAppSpecifier &&
         !platformBrowserDynamicSpecifier &&
         !platformBrowserSpecifier &&
         !testBedSpecifier &&
-        !ngModuleSpecifier) {
+        !ngModuleSpecifier &&
+        !getTestBedSpecifier) {
         return null;
     }
     return {
@@ -645,6 +566,7 @@ function getSpecifiers(sourceFile) {
         platformBrowserSpecifier,
         testBedSpecifier,
         ngModuleSpecifier,
+        getTestBedSpecifier,
     };
 }
 /**

package/schematics/bundles/cleanup-unused-imports.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,14 +8,14 @@
 
 require('@angular-devkit/core');
 require('node:path/posix');
-var project_paths = require('./project_paths-Cz4x-QiT.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
 var ts = require('typescript');
 require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-Clg7WX1w.cjs');
-var index = require('./index-BI97t1U8.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var index = require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var apply_import_manager = require('./apply_import_manager-DroqamMP.cjs');
+var apply_import_manager = require('./apply_import_manager-Bx60Uquz.cjs');
 require('@angular-devkit/schematics');
 require('fs');
 require('module');

package/schematics/bundles/{compiler_host-aKaS4KRz.cjs → compiler_host-Aouk-n4F.cjs}

@@ -1,13 +1,13 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var ts = require('typescript');
-var project_tsconfig_paths = require('./project_tsconfig_paths-Clg7WX1w.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
 require('os');
 var p = require('path');
 

package/schematics/bundles/control-flow-migration.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.4
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,10 +8,10 @@
 
 var schematics = require('@angular-devkit/schematics');
 var p = require('path');
-var compiler_host = require('./compiler_host-aKaS4KRz.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-Clg7WX1w.cjs');
+var compiler_host = require('./compiler_host-Aouk-n4F.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
 var ts = require('typescript');
-var parse_html = require('./parse_html-CeQjkdOK.cjs');
+var parse_html = require('./parse_html-7Wl_HDnw.cjs');
 require('os');
 require('fs');
 require('module');
@@ -410,6 +410,7 @@ const endMarkerRegex = new RegExp(endMarker, 'gm');
 const startI18nMarkerRegex = new RegExp(startI18nMarker, 'gm');
 const endI18nMarkerRegex = new RegExp(endI18nMarker, 'gm');
 const replaceMarkerRegex = new RegExp(`${startMarker}|${endMarker}`, 'gm');
+const PRIORITY_WEIGHT_TEMPLATE_REFERENCE_BY_OUTLET = 2;
 /**
  * Analyzes a source file to find file that need to be migrated and the text ranges within them.
  * @param sourceFile File to be analyzed.
@@ -689,34 +690,6 @@ function getTemplates(template) {
     }
     return new Map();
 }
-function countTemplateUsage(nodes, templateName) {
-    let count = 0;
-    let isReferencedInTemplateOutlet = false;
-    for (const node of nodes) {
-        if (node.attrs) {
-            for (const attr of node.attrs) {
-                if (attr.name === '*ngTemplateOutlet' && attr.value === templateName.slice(1)) {
-                    isReferencedInTemplateOutlet = true;
-                    break;
-                }
-                if (attr.name.trim() === templateName) {
-                    count++;
-                }
-            }
-        }
-        if (node.children) {
-            if (node.name === 'for') {
-                for (const child of node.children) {
-                    if (child.value?.includes(templateName.slice(1))) {
-                        count++;
-                    }
-                }
-            }
-            count += countTemplateUsage(node.children, templateName);
-        }
-    }
-    return isReferencedInTemplateOutlet ? count + 2 : count;
-}
 function updateTemplates(template, templates) {
     const updatedTemplates = getTemplates(template);
     for (let [key, tmpl] of updatedTemplates) {
@@ -740,9 +713,10 @@ function processNgTemplates(template, sourceFile) {
     try {
         const templates = getTemplates(template);
         // swap placeholders and remove
-        for (const [name, t] of templates) {
-            const replaceRegex = new RegExp(getPlaceholder(name.slice(1)), 'g');
-            const forRegex = new RegExp(getPlaceholder(name.slice(1), PlaceholderKind.Alternate), 'g');
+        for (const [nameWithHash, t] of templates) {
+            const name = nameWithHash.slice(1);
+            const replaceRegex = new RegExp(getPlaceholder(name), 'g');
+            const forRegex = new RegExp(getPlaceholder(nameWithHash.slice(1), PlaceholderKind.Alternate), 'g');
             const forMatches = [...template.matchAll(forRegex)];
             const matches = [...forMatches, ...template.matchAll(replaceRegex)];
             let safeToRemove = true;
@@ -767,7 +741,12 @@ function processNgTemplates(template, sourceFile) {
                     template = template.replace(replaceRegex, t.children);
                 }
                 const dist = matches.filter((obj, index, self) => index === self.findIndex((t) => t.input === obj.input));
-                if ((t.count === dist.length || t.count - matches.length === 1) && safeToRemove) {
+                // Check if template is used by ngTemplateOutlet in addition to control flow
+                const hasTemplateOutletUsage = checkForTemplateOutletUsage(template, nameWithHash.slice(1));
+                // Only remove template if it's safe to do so AND not used by ngTemplateOutlet
+                if ((t.count === dist.length || t.count - matches.length === 1) &&
+                    safeToRemove &&
+                    !hasTemplateOutletUsage) {
                     const refsInComponentFile = getViewChildOrViewChildrenNames(sourceFile);
                     if (refsInComponentFile?.length > 0) {
                         const templateRefs = getTemplateReferences(template);
@@ -797,6 +776,59 @@ function processNgTemplates(template, sourceFile) {
         return { migrated: template, err: err };
     }
 }
+function analyzeTemplateUsage(nodes, templateName) {
+    let count = 0;
+    let isReferencedInTemplateOutlet = false;
+    const templateNameWithHash = `#${templateName}`;
+    function traverseNodes(nodeList) {
+        for (const node of nodeList) {
+            if (node.attrs) {
+                for (const attr of node.attrs) {
+                    if ((attr.name === '*ngTemplateOutlet' || attr.name === '[ngTemplateOutlet]') &&
+                        attr.value === templateName) {
+                        isReferencedInTemplateOutlet = true;
+                    }
+                    if (attr.name.trim() === templateNameWithHash) {
+                        count++;
+                    }
+                }
+            }
+            if (node.children) {
+                if (node.name === 'for') {
+                    for (const child of node.children) {
+                        if (child.value?.includes(templateName)) {
+                            count++;
+                        }
+                    }
+                }
+                traverseNodes(node.children);
+            }
+        }
+    }
+    traverseNodes(nodes);
+    return {
+        isReferencedInTemplateOutlet,
+        totalCount: isReferencedInTemplateOutlet
+            ? count + PRIORITY_WEIGHT_TEMPLATE_REFERENCE_BY_OUTLET
+            : count,
+    };
+}
+/**
+ * Checks if a template is used by ngTemplateOutlet directive
+ */
+function checkForTemplateOutletUsage(template, templateName) {
+    const parsed = parse_html.parseTemplate(template);
+    if (parsed.tree === undefined) {
+        return false;
+    }
+    const result = analyzeTemplateUsage(parsed.tree.rootNodes, templateName);
+    return result.isReferencedInTemplateOutlet;
+}
+function countTemplateUsage(nodes, templateNameWithHash) {
+    const templateName = templateNameWithHash.slice(1);
+    const result = analyzeTemplateUsage(nodes, templateName);
+    return result.totalCount;
+}
 function getViewChildOrViewChildrenNames(sourceFile) {
     const names = [];
     function visit(node) {
@@ -821,11 +853,11 @@ function getTemplateReferences(template) {
     if (parsed.tree === undefined) {
         return [];
     }
-    const references = [];
+    const templateNameRefWithoutHash = [];
     function visitNodes(nodes) {
         for (const node of nodes) {
             if (node?.name === 'ng-template') {
-                references.push(...node.attrs?.map((ref) => ref?.name?.slice(1)));
+                templateNameRefWithoutHash.push(...node.attrs?.map((ref) => ref?.name?.slice(1)));
             }
             if (node.children) {
                 visitNodes(node.children);
@@ -833,7 +865,7 @@ function getTemplateReferences(template) {
         }
     }
     visitNodes(parsed.tree.rootNodes);
-    return references;
+    return templateNameRefWithoutHash;
 }
 function replaceRemainingPlaceholders(template) {
     const pattern = '.*';