@angular/core 21.0.0-next.8 → 21.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/core",
-  "version": "21.0.0-next.8",
+  "version": "21.0.0-rc.0",
   "description": "Angular - the core framework",
   "author": "angular",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@angular/compiler": "21.0.0-next.8",
+    "@angular/compiler": "21.0.0-rc.0",
     "rxjs": "^6.5.3 || ^7.4.0",
     "zone.js": "~0.15.0"
   },
@@ -84,6 +84,12 @@
       "@angular/service-worker"
     ]
   },
+  "angular": {
+    "bestPractices": {
+      "format": "markdown",
+      "path": "./resources/best-practices.md"
+    }
+  },
   "schematics": "./schematics/collection.json",
   "sideEffects": false,
   "module": "./fesm2022/core.mjs",

package/resources/best-practices.md

@@ -0,0 +1,56 @@
+You are an expert in TypeScript, Angular, and scalable web application development. You write functional, maintainable, performant, and accessible code following Angular and TypeScript best practices.
+
+## TypeScript Best Practices
+
+- Use strict type checking
+- Prefer type inference when the type is obvious
+- Avoid the `any` type; use `unknown` when type is uncertain
+
+## Angular Best Practices
+
+- Always use standalone components over NgModules
+- Must NOT set `standalone: true` inside Angular decorators. It's the default in Angular v20+.
+- Use signals for state management
+- Implement lazy loading for feature routes
+- Do NOT use the `@HostBinding` and `@HostListener` decorators. Put host bindings inside the `host` object of the `@Component` or `@Directive` decorator instead
+- Use `NgOptimizedImage` for all static images.
+  - `NgOptimizedImage` does not work for inline base64 images.
+
+## Accessibility Requirements
+
+- It MUST pass all AXE checks.
+- It MUST follow all WCAG AA minimums, including focus management, color contrast, and ARIA attributes.
+
+### Components
+
+- Keep components small and focused on a single responsibility
+- Use `input()` and `output()` functions instead of decorators
+- Use `computed()` for derived state
+- Set `changeDetection: ChangeDetectionStrategy.OnPush` in `@Component` decorator
+- Prefer inline templates for small components
+- Prefer Reactive forms instead of Template-driven ones
+- Do NOT use `ngClass`, use `class` bindings instead
+- Do NOT use `ngStyle`, use `style` bindings instead
+- When using external templates/styles, use paths relative to the component TS file.
+
+## State Management
+
+- Use signals for local component state
+- Use `computed()` for derived state
+- Keep state transformations pure and predictable
+- Do NOT use `mutate` on signals, use `update` or `set` instead
+
+## Templates
+
+- Keep templates simple and avoid complex logic
+- Use native control flow (`@if`, `@for`, `@switch`) instead of `*ngIf`, `*ngFor`, `*ngSwitch`
+- Use the async pipe to handle observables
+- Do not assume globals like (`new Date()`) are available. 
+- Do not write arrow functions in templates (they are not supported).
+- Do not write Regular expressions in templates (they are not supported).
+
+## Services
+
+- Design services around a single responsibility
+- Use the `providedIn: 'root'` option for singleton services
+- Use the `inject()` function instead of constructor injection

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

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.8
+ * @license Angular v21.0.0-rc.0
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,26 +8,15 @@
 
 require('@angular-devkit/core');
 require('node:path/posix');
-var project_paths = require('./project_paths-C6g3lqjX.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-CdhVNYMk.cjs');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
+var migrations = require('@angular/compiler-cli/private/migrations');
 var ts = require('typescript');
-require('os');
-var apply_import_manager = require('./apply_import_manager-CBLmogDD.cjs');
-require('./index-BnmACOsq.cjs');
-require('path');
+var apply_import_manager = require('./apply_import_manager-1Zs_gpB6.cjs');
+require('@angular/compiler-cli');
 require('node:path');
 require('@angular-devkit/schematics');
-require('fs');
-require('module');
-require('url');
+require('./project_tsconfig_paths-CDVxT6Ov.cjs');
 
-/*!
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.dev/license
- */
 function findArrowFunction(node) {
     let current = node;
     while (current) {
@@ -75,7 +64,7 @@ class AddBootstrapContextToServerMainMigration extends project_paths.TsurgeFunne
                     })));
                 }
             }
-            importManager ??= new project_tsconfig_paths.ImportManager({
+            importManager ??= new migrations.ImportManager({
                 generateUniqueIdentifier: () => null,
                 shouldUseSingleQuotes: () => true,
             });
@@ -116,13 +105,6 @@ class AddBootstrapContextToServerMainMigration extends project_paths.TsurgeFunne
     }
 }
 
-/*!
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.dev/license
- */
 function migrate() {
     return async (tree) => {
         await project_paths.runMigrationInDevkit({

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

@@ -1,26 +1,22 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.8
+ * @license Angular v21.0.0-rc.0
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var project_tsconfig_paths = require('./project_tsconfig_paths-CdhVNYMk.cjs');
+var migrations = require('@angular/compiler-cli/private/migrations');
+var apply_import_manager = require('./apply_import_manager-1Zs_gpB6.cjs');
+require('@angular/compiler-cli');
 require('typescript');
-require('os');
-var apply_import_manager = require('./apply_import_manager-CBLmogDD.cjs');
-require('./index-BnmACOsq.cjs');
-require('path');
 require('node:path');
-var project_paths = require('./project_paths-C6g3lqjX.cjs');
-var imports = require('./imports-DwPXlGFl.cjs');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
+var imports = require('./imports-DP72APSx.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
-require('fs');
-require('module');
-require('url');
 require('@angular-devkit/schematics');
+require('./project_tsconfig_paths-CDVxT6Ov.cjs');
 
 /** Migration that moves the import of `ApplicationConfig` from `platform-browser` to `core`. */
 class ApplicationConfigCoreMigration extends project_paths.TsurgeFunnelMigration {
@@ -32,7 +28,7 @@ class ApplicationConfigCoreMigration extends project_paths.TsurgeFunnelMigration
             if (!specifier) {
                 continue;
             }
-            importManager ??= new project_tsconfig_paths.ImportManager({
+            importManager ??= new migrations.ImportManager({
                 // Prevent the manager from trying to generate a non-conflicting import.
                 generateUniqueIdentifier: () => null,
                 shouldUseSingleQuotes: () => true,
@@ -76,13 +72,6 @@ class ApplicationConfigCoreMigration extends project_paths.TsurgeFunnelMigration
     }
 }
 
-/*!
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.dev/license
- */
 function migrate() {
     return async (tree) => {
         await project_paths.runMigrationInDevkit({

package/schematics/bundles/{apply_import_manager-CBLmogDD.cjs → apply_import_manager-1Zs_gpB6.cjs}

@@ -1,15 +1,14 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.8
+ * @license Angular v21.0.0-rc.0
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var ts = require('typescript');
-require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-CdhVNYMk.cjs');
-var project_paths = require('./project_paths-C6g3lqjX.cjs');
+var compilerCli = require('@angular/compiler-cli');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
 
 /**
  * Applies import manager changes, and writes them as replacements the
@@ -23,7 +22,7 @@ function applyImportManagerChanges(importManager, replacements, sourceFiles, inf
     newImports.forEach((newImports, fileName) => {
         newImports.forEach((newImport) => {
             const printedImport = printer.printNode(ts.EmitHint.Unspecified, newImport, pathToFile.get(fileName));
-            replacements.push(new project_paths.Replacement(project_paths.projectFile(project_tsconfig_paths.absoluteFrom(fileName), info), new project_paths.TextUpdate({ position: 0, end: 0, toInsert: `${printedImport}\n` })));
+            replacements.push(new project_paths.Replacement(project_paths.projectFile(compilerCli.absoluteFrom(fileName), info), new project_paths.TextUpdate({ position: 0, end: 0, toInsert: `${printedImport}\n` })));
         });
     });
     // Capture updated imports

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

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.8
+ * @license Angular v21.0.0-rc.0
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,29 +8,31 @@
 
 require('@angular-devkit/core');
 require('node:path/posix');
-var project_paths = require('./project_paths-C6g3lqjX.cjs');
-require('os');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
+require('@angular/compiler-cli');
+var migrations = require('@angular/compiler-cli/private/migrations');
 var ts = require('typescript');
-var project_tsconfig_paths = require('./project_tsconfig_paths-CdhVNYMk.cjs');
-var index = require('./index-BnmACOsq.cjs');
-require('path');
 require('node:path');
-var apply_import_manager = require('./apply_import_manager-CBLmogDD.cjs');
+var apply_import_manager = require('./apply_import_manager-1Zs_gpB6.cjs');
 var property_name = require('./property_name-BBwFuqMe.cjs');
-var imports = require('./imports-DwPXlGFl.cjs');
+var imports = require('./imports-DP72APSx.cjs');
 var symbol = require('./symbol-BObKoqes.cjs');
 require('@angular-devkit/schematics');
-require('fs');
-require('module');
-require('url');
+require('./project_tsconfig_paths-CDVxT6Ov.cjs');
 
 const CORE_PACKAGE = '@angular/core';
 const PROVIDE_ZONE_CHANGE_DETECTION = 'provideZoneChangeDetection';
 const ZONE_CD_PROVIDER = `${PROVIDE_ZONE_CHANGE_DETECTION}()`;
+const SAFE_TO_REMOVE_OPTIONS = [
+    'ignoreChangesOutsideZone',
+    'ngZoneRunCoalescing',
+    'ngZoneEventCoalescing',
+];
+const BOOTSTRAP_OPTIONS = ['ngZone', ...SAFE_TO_REMOVE_OPTIONS];
 class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
     async analyze(info) {
         let replacements = [];
-        const importManager = new project_tsconfig_paths.ImportManager();
+        const importManager = new migrations.ImportManager();
         for (const sourceFile of info.sourceFiles) {
             // We need to migration either
             // * `bootstrapApplication(App)
@@ -42,7 +44,7 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
             // 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, getTestBedSpecifier, } = specifiers;
+            const { bootstrapAppSpecifier, testBedSpecifier, createApplicationSpecifier, getTestBedSpecifier, } = specifiers;
             const typeChecker = info.program.getTypeChecker();
             const isCreateApplicationNode = (node) => {
                 return (ts.isCallExpression(node) &&
@@ -58,9 +60,7 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
                 return (ts.isCallExpression(node) &&
                     ts.isPropertyAccessExpression(node.expression) &&
                     node.expression.name.text === 'bootstrapModule' &&
-                    ts.isCallExpression(node.expression.expression) &&
-                    (symbol.isReferenceToImport(typeChecker, node.expression.expression.expression, platformBrowserSpecifier) ||
-                        symbol.isReferenceToImport(typeChecker, node.expression.expression.expression, platformBrowserDynamicSpecifier)));
+                    node.arguments.length > 0);
             };
             const isTestBedInitEnvironmentNode = (node) => {
                 return (ts.isCallExpression(node) &&
@@ -69,8 +69,8 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
                     (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);
+            const reflector = new migrations.TypeScriptReflectionHost(typeChecker);
+            const evaluator = new migrations.PartialEvaluator(reflector, typeChecker, null);
             const walk = (node) => {
                 if (isBootstrapAppNode(node)) {
                     this.analyzeBootstrapApplication(node, sourceFile, info, typeChecker, importManager, replacements);
@@ -88,15 +88,12 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
             };
             sourceFile.forEachChild(walk);
         }
-        // The combine method might not run when there is a single target.
-        // So we deduplicate here
-        replacements = deduplicateReplacements(replacements);
         apply_import_manager.applyImportManagerChanges(importManager, replacements, info.sourceFiles, info);
         return project_paths.confirmAsSerializable({ replacements });
     }
     async combine(unitA, unitB) {
         const combined = [...unitA.replacements, ...unitB.replacements];
-        return project_paths.confirmAsSerializable({ replacements: deduplicateReplacements(combined) });
+        return project_paths.confirmAsSerializable({ replacements: combined });
     }
     async globalMeta(data) {
         return project_paths.confirmAsSerializable(data);
@@ -201,7 +198,7 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
     analyzeBootstrapModule(node, sourceFile, reflector, evaluator, info, typeChecker, importManager, replacements) {
         const moduleIdentifier = node.arguments[0];
         const moduleType = evaluator.evaluate(moduleIdentifier);
-        if (!(moduleType instanceof project_tsconfig_paths.Reference) || !ts.isClassDeclaration(moduleType.node)) {
+        if (!(moduleType instanceof migrations.Reference) || !ts.isClassDeclaration(moduleType.node)) {
             return;
         }
         const moduleClass = moduleType.node;
@@ -209,27 +206,42 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
         if (!ngModule) {
             return;
         }
-        const moduleSourceFile = moduleClass.getSourceFile();
-        const moduleProjectFile = project_paths.projectFile(moduleSourceFile, info);
-        if (moduleSourceFile.getText().includes('ZoneChangeDetectionModule')) {
-            // If the file already contains the ZoneChangeDetectionModule, we can skip it.
-            return;
-        }
-        // Always remove the options argument
-        replacements.push(new project_paths.Replacement(project_paths.projectFile(sourceFile, info), new project_paths.TextUpdate({ position: moduleIdentifier.getEnd(), end: node.getEnd() - 1, toInsert: '' })));
+        const optionsNode = node.arguments[1];
+        const file = project_paths.projectFile(sourceFile, info);
+        replacements.push(new project_paths.Replacement(file, new project_paths.TextUpdate({
+            position: moduleIdentifier.getEnd(),
+            end: node.getEnd() - 1,
+            toInsert: '',
+        })));
         const hasExistingChangeDetectionProvider = hasChangeDetectionProvider(ngModule, typeChecker);
         if (hasExistingChangeDetectionProvider) {
             return;
         }
         // Let's try to understand the bootstrap options.
-        const optionsNode = node.arguments[1];
-        const options = optionsNode && ts.isObjectLiteralExpression(optionsNode)
-            ? evaluator.evaluate(optionsNode)
-            : null;
+        let options = optionsNode ? evaluator.evaluate(optionsNode) : null;
+        let extraOptions = new Map();
         let zoneCdProvider = ZONE_CD_PROVIDER;
         let zoneInstanceProvider = null;
+        if (Array.isArray(options)) {
+            const mergedOptions = options.reduce((acc, item) => {
+                if (item instanceof Map) {
+                    for (const [k, v] of item) {
+                        acc.set(k, v);
+                        if (!SAFE_TO_REMOVE_OPTIONS.includes(k)) {
+                            extraOptions.set(k, v);
+                        }
+                    }
+                }
+                return acc;
+            }, new Map());
+            options = mergedOptions;
+        }
         if (options instanceof Map) {
-            const ngZoneOption = options.get('ngZone');
+            [...options.entries()].forEach(([k, v]) => {
+                if (!BOOTSTRAP_OPTIONS.includes(k) && typeof v !== 'string') {
+                    extraOptions.set(k, v);
+                }
+            });
             if (options.has('ngZoneRunCoalescing') || options.has('ngZoneEventCoalescing')) {
                 const config = [];
                 if (options.get('ngZoneRunCoalescing')) {
@@ -240,27 +252,18 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
                 }
                 zoneCdProvider = `${PROVIDE_ZONE_CHANGE_DETECTION}(${config.length > 0 ? `{ ${config.join(', ')} }` : ''})`;
             }
-            if (ngZoneOption instanceof project_tsconfig_paths.Reference) {
-                importManager.addImport({
-                    exportModuleSpecifier: CORE_PACKAGE,
-                    exportSymbolName: 'NgZone',
-                    requestedFile: moduleSourceFile,
-                });
+            const ngZoneOption = options.get('ngZone');
+            if (ngZoneOption instanceof migrations.Reference) {
                 const clazz = ngZoneOption.node;
                 if (ts.isClassDeclaration(clazz) && clazz.name) {
-                    const customZoneSourceFile = clazz.getSourceFile();
-                    const exportModuleSpecifier = ngZoneOption.bestGuessOwningModule?.specifier ??
-                        imports.getRelativePath(moduleSourceFile.fileName, customZoneSourceFile.fileName);
-                    importManager.addImport({
-                        exportModuleSpecifier,
-                        exportSymbolName: clazz.name.text,
-                        requestedFile: moduleSourceFile,
-                    });
                     zoneInstanceProvider = `{provide: NgZone, useClass: ${clazz.name.text}}`;
+                    removePropertiesFromLiteral(file, optionsNode, ['ngZone'], replacements);
                 }
             }
-            else if (typeof ngZoneOption === 'string' && ngZoneOption === 'noop') {
-                return;
+            else if (typeof ngZoneOption === 'string') {
+                if (ngZoneOption === 'noop') {
+                    return;
+                }
             }
             else if (ngZoneOption && typeof ngZoneOption !== 'string') {
                 // This is a case where we're not able to migrate automatically
@@ -276,13 +279,8 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
                 });
                 if (ngZoneValue) {
                     // We re-add the ngZone option
-                    replacements.push(new project_paths.Replacement(project_paths.projectFile(sourceFile, info), new project_paths.TextUpdate({
-                        position: moduleIdentifier.getEnd(),
-                        end: node.getEnd() - 1,
-                        toInsert: `, {ngZone: ${ngZoneValue}}`,
-                    })));
+                    extraOptions.set('ngZone', ngZoneValue);
                 }
-                // And add the TODO
                 replacements.push(new project_paths.Replacement(project_paths.projectFile(sourceFile, info), new project_paths.TextUpdate({
                     position: node.getStart() - 1,
                     end: node.getStart() - 1,
@@ -294,14 +292,20 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
         if (zoneInstanceProvider) {
             providers.push(zoneInstanceProvider);
         }
-        if (providers.length > 0) {
-            importManager.addImport({
-                exportModuleSpecifier: CORE_PACKAGE,
-                exportSymbolName: PROVIDE_ZONE_CHANGE_DETECTION,
-                requestedFile: moduleSourceFile,
-            });
-            addProvidersToNgModule(moduleProjectFile, moduleSourceFile, ngModule, providers.join(',\n'), replacements);
-        }
+        importManager.addImport({
+            exportModuleSpecifier: CORE_PACKAGE,
+            exportSymbolName: PROVIDE_ZONE_CHANGE_DETECTION,
+            requestedFile: sourceFile,
+        });
+        // if we only use the key, we use the a shorthand asignment
+        const extraOptionsStr = [...extraOptions.entries()]
+            .map(([k, v]) => (k != v ? `${k}: ${v},` : `${k},`))
+            .join(', ');
+        replacements.push(new project_paths.Replacement(file, new project_paths.TextUpdate({
+            position: moduleIdentifier.end,
+            end: moduleIdentifier.end,
+            toInsert: `, { applicationProviders: [${providers.join(', ')}], ${extraOptionsStr}}`,
+        })));
     }
     analyzeTestBedInitEnvironment(callExpr, sourceFile, info, typeChecker, importManager, replacements) {
         const hasExistingChangeDetectionProvider = hasChangeDetectionProvider(callExpr, typeChecker);
@@ -329,30 +333,6 @@ class BootstrapOptionsMigration extends project_paths.TsurgeFunnelMigration {
         insertZoneCDModule(ngModules, moduleProjectFile, replacements, 'ZoneChangeDetectionModule');
     }
 }
-function addProvidersToNgModule(projectFile, moduleSourceFile, ngModule, providersText, replacements) {
-    //                             ObjLiteral => callExp => Decorator => ClassExpression
-    const moduleClassDeclaration = ngModule.parent.parent.parent;
-    const insertPosition = moduleClassDeclaration.getStart(moduleSourceFile, true) - 1;
-    addZoneCDModule(providersText, projectFile, insertPosition, replacements);
-    const importsNode = property_name.findLiteralProperty(ngModule, 'imports');
-    if (importsNode && ts.isPropertyAssignment(importsNode)) {
-        insertZoneCDModule(importsNode.initializer, projectFile, replacements, 'ZoneChangeDetectionModule');
-    }
-    else {
-        const text = `imports: [ZoneChangeDetectionModule]`;
-        const toInsert = `${text},\n`;
-        let position = ngModule.getStart() + 1;
-        if (ngModule.properties.length > 0) {
-            const firstProperty = ngModule.properties[0];
-            position = firstProperty.getStart();
-        }
-        replacements.push(new project_paths.Replacement(projectFile, new project_paths.TextUpdate({
-            position,
-            end: position,
-            toInsert,
-        })));
-    }
-}
 function addZoneCDModule(providersText, projectFile, location, replacements) {
     const newModuleText = `\n@NgModule({ providers: [ ${providersText} ] })
 export class ZoneChangeDetectionModule {}\n\n`;
@@ -465,7 +445,7 @@ function addProvidersToBootstrapOption(projectFile, optionsNode, providersText,
 function findNgModule(node, reflector) {
     const decorators = reflector.getDecoratorsOfDeclaration(node);
     if (decorators) {
-        const ngModuleDecorator = project_tsconfig_paths.getAngularDecorators(decorators, ['NgModule'], true)[0];
+        const ngModuleDecorator = migrations.getAngularDecorators(decorators, ['NgModule'], true)[0];
         if (ngModuleDecorator &&
             ngModuleDecorator.args &&
             ngModuleDecorator.args.length > 0 &&
@@ -552,7 +532,6 @@ function getSpecifiers(sourceFile) {
     const ngModuleSpecifier = imports.getImportSpecifier(sourceFile, '@angular/core', 'NgModule');
     if (!createApplicationSpecifier &&
         !bootstrapAppSpecifier &&
-        !platformBrowserDynamicSpecifier &&
         !platformBrowserSpecifier &&
         !testBedSpecifier &&
         !ngModuleSpecifier &&
@@ -569,46 +548,6 @@ function getSpecifiers(sourceFile) {
         getTestBedSpecifier,
     };
 }
-/**
- * Removes duplicate replacements and for replacements at the same position, takes the longest one.
- */
-function deduplicateReplacements(replacements) {
-    if (replacements.length <= 1) {
-        return replacements;
-    }
-    // Group replacements by file and position
-    const groupedByFileAndPosition = new Map();
-    for (const replacement of replacements) {
-        const fileKey = replacement.projectFile.id;
-        const position = replacement.update.data.position;
-        if (!groupedByFileAndPosition.has(fileKey)) {
-            groupedByFileAndPosition.set(fileKey, new Map());
-        }
-        const fileReplacements = groupedByFileAndPosition.get(fileKey);
-        if (!fileReplacements.has(position)) {
-            fileReplacements.set(position, []);
-        }
-        fileReplacements.get(position).push(replacement);
-    }
-    const result = [];
-    for (const fileReplacements of groupedByFileAndPosition.values()) {
-        for (const positionReplacements of fileReplacements.values()) {
-            if (positionReplacements.length === 1) {
-                result.push(positionReplacements[0]);
-            }
-            else {
-                // For multiple replacements at the same position, take the one with the longest content
-                const longestReplacement = positionReplacements.reduce((longest, current) => {
-                    const longestLength = longest.update.data.toInsert.length;
-                    const currentLength = current.update.data.toInsert.length;
-                    return currentLength > longestLength ? current : longest;
-                });
-                result.push(longestReplacement);
-            }
-        }
-    }
-    return result;
-}
 /**
  * In the case we're looking to insert a new ZoneChangeDetectionModule, we need to check if we already inserted one.
  *
@@ -624,6 +563,28 @@ function replacementsHaveZoneCdModule(rootRelativePath, replacements, text) {
             exisitingText.length >= text.length);
     });
 }
+function removePropertiesFromLiteral(projectFile, literal, propertyNames, replacements) {
+    const syntaxList = literal.getChildren().find((ch) => ch.kind === ts.SyntaxKind.SyntaxList);
+    const optionsElements = syntaxList.getChildren();
+    const optionsToRemove = [];
+    optionsElements.forEach((node, i, children) => {
+        if (ts.isPropertyAssignment(node) &&
+            ts.isIdentifier(node.name) &&
+            propertyNames.includes(node.name.text)) {
+            // Look ahead for comma
+            const next = children[i + 1];
+            if (next && next.kind === ts.SyntaxKind.CommaToken) {
+                optionsToRemove.push({ start: node.getStart(), end: next.getEnd() });
+            }
+            else {
+                optionsToRemove.push({ start: node.getStart(), end: node.getEnd() });
+            }
+        }
+    });
+    optionsToRemove.forEach((toRemove) => {
+        replacements.push(new project_paths.Replacement(projectFile, new project_paths.TextUpdate({ position: toRemove.start, end: toRemove.end, toInsert: '' })));
+    });
+}
 
 function migrate() {
     return async (tree) => {

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

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.8
+ * @license Angular v21.0.0-rc.0
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,18 +8,14 @@
 
 require('@angular-devkit/core');
 require('node:path/posix');
-var project_paths = require('./project_paths-C6g3lqjX.cjs');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
 var ts = require('typescript');
-require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-CdhVNYMk.cjs');
-var index = require('./index-BnmACOsq.cjs');
-require('path');
+var compilerCli = require('@angular/compiler-cli');
+var migrations = require('@angular/compiler-cli/private/migrations');
 require('node:path');
-var apply_import_manager = require('./apply_import_manager-CBLmogDD.cjs');
+var apply_import_manager = require('./apply_import_manager-1Zs_gpB6.cjs');
 require('@angular-devkit/schematics');
-require('fs');
-require('module');
-require('url');
+require('./project_tsconfig_paths-CDVxT6Ov.cjs');
 
 /** Migration that cleans up unused imports from a project. */
 class UnusedImportsMigration extends project_paths.TsurgeFunnelMigration {
@@ -29,7 +25,7 @@ class UnusedImportsMigration extends project_paths.TsurgeFunnelMigration {
             extendedDiagnostics: {
                 checks: {
                     // Ensure that the diagnostic is enabled.
-                    unusedStandaloneImports: index.DiagnosticCategoryLabel.Warning,
+                    unusedStandaloneImports: migrations.DiagnosticCategoryLabel.Warning,
                 },
             },
         });
@@ -43,7 +39,7 @@ class UnusedImportsMigration extends project_paths.TsurgeFunnelMigration {
             if (diag.file !== undefined &&
                 diag.start !== undefined &&
                 diag.length !== undefined &&
-                diag.code === project_tsconfig_paths.ngErrorCode(project_tsconfig_paths.ErrorCode.UNUSED_STANDALONE_IMPORTS)) {
+                diag.code === compilerCli.ngErrorCode(compilerCli.ErrorCode.UNUSED_STANDALONE_IMPORTS)) {
                 // Skip files that aren't owned by this compilation unit.
                 if (!info.sourceFiles.includes(diag.file)) {
                     return;
@@ -193,7 +189,7 @@ class UnusedImportsMigration extends project_paths.TsurgeFunnelMigration {
     generateReplacements(sourceFile, removalLocations, usages, info, replacements) {
         const { fullRemovals, partialRemovals, allRemovedIdentifiers } = removalLocations;
         const { importedSymbols, identifierCounts } = usages;
-        const importManager = new project_tsconfig_paths.ImportManager();
+        const importManager = new migrations.ImportManager();
         const sourceText = sourceFile.getFullText();
         // Replace full arrays with empty ones. This allows preserves more of the user's formatting.
         fullRemovals.forEach((node) => {