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

package/schematics/bundles/property_name-BBwFuqMe.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/schematics/bundles/route-lazy-loading.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -9,8 +9,8 @@
 var schematics = require('@angular-devkit/schematics');
 var fs = require('fs');
 var p = require('path');
-var compiler_host = require('./compiler_host-Aouk-n4F.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var compiler_host = require('./compiler_host-C1KRWoxv.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-BbVhi4fG.cjs');
 var ts = require('typescript');
 var property_name = require('./property_name-BBwFuqMe.cjs');
 require('os');

package/schematics/bundles/router-current-navigation.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,11 +8,11 @@
 
 var ts = require('typescript');
 require('os');
-require('./project_tsconfig_paths-DX9KHLn9.cjs');
-require('./index-Bb6iejCd.cjs');
+require('./project_tsconfig_paths-BbVhi4fG.cjs');
+require('./index-BFENxhdR.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
+var project_paths = require('./project_paths-EiOrjlNS.cjs');
 var imports = require('./imports-DwPXlGFl.cjs');
 var symbol = require('./symbol-BObKoqes.cjs');
 require('@angular-devkit/core');

package/schematics/bundles/router-last-successful-navigation.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,11 +8,11 @@
 
 var ts = require('typescript');
 require('os');
-require('./project_tsconfig_paths-DX9KHLn9.cjs');
-require('./index-Bb6iejCd.cjs');
+require('./project_tsconfig_paths-BbVhi4fG.cjs');
+require('./index-BFENxhdR.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
+var project_paths = require('./project_paths-EiOrjlNS.cjs');
 var imports = require('./imports-DwPXlGFl.cjs');
 var symbol = require('./symbol-BObKoqes.cjs');
 require('@angular-devkit/core');

package/schematics/bundles/self-closing-tags-migration.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,13 +8,13 @@
 
 var ts = require('typescript');
 require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
-require('./index-Bb6iejCd.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-BbVhi4fG.cjs');
+require('./index-BFENxhdR.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
-var ng_component_template = require('./ng_component_template-B4M8mTyv.cjs');
-var parse_html = require('./parse_html-7Wl_HDnw.cjs');
+var project_paths = require('./project_paths-EiOrjlNS.cjs');
+var ng_component_template = require('./ng_component_template-AYs8YXuT.cjs');
+var parse_html = require('./parse_html-6-AB4O-A.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('fs');

package/schematics/bundles/signal-input-migration.cjs

@@ -1,22 +1,22 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var migrate_ts_type_references = require('./migrate_ts_type_references-By2ZtKls.cjs');
+var migrate_ts_type_references = require('./migrate_ts_type_references-CemH7A8e.cjs');
 var ts = require('typescript');
 require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
-var index$1 = require('./index-Bb6iejCd.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-BbVhi4fG.cjs');
+var index$1 = require('./index-BFENxhdR.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
-var index = require('./index-BZQb51Qf.cjs');
+var project_paths = require('./project_paths-EiOrjlNS.cjs');
+var index = require('./index-DYqR8Lpq.cjs');
 var assert = require('assert');
-var apply_import_manager = require('./apply_import_manager-Bx60Uquz.cjs');
+var apply_import_manager = require('./apply_import_manager-D_4NSuRa.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('./leading_space-D9nQ8UQC.cjs');
@@ -969,6 +969,12 @@ function populateKnownInputsFromGlobalData(knownInputs, globalData) {
  * @returns Replacements for converting the input.
  */
 function convertToSignalInput(node, { resolvedMetadata: metadata, resolvedType, preferShorthandIfPossible, originalInputDecorator, initialValue, leadingTodoText, }, info, checker, importManager, result) {
+    // Check for 'this' references in initializer before doing anything else
+    if (node.initializer &&
+        (ts.isArrowFunction(node.initializer) || ts.isFunctionExpression(node.initializer)) &&
+        containsThisReferences(node.initializer)) {
+        return []; // Skip migration for this input by returning empty replacements
+    }
     let optionsLiteral = null;
     // We need an options array for the input because:
     //   - the input is either aliased,
@@ -1038,7 +1044,23 @@ function convertToSignalInput(node, { resolvedMetadata: metadata, resolvedType,
     if (!modifiersWithoutInputDecorator?.some((s) => s.kind === ts.SyntaxKind.ReadonlyKeyword)) {
         modifiersWithoutInputDecorator.push(ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword));
     }
-    const newNode = ts.factory.createPropertyDeclaration(modifiersWithoutInputDecorator, node.name, undefined, undefined, inputInitializer);
+    // Skip migration if the input is a function that references class members via 'this'
+    if (inputInitializer &&
+        (ts.isArrowFunction(inputInitializer) || ts.isFunctionExpression(inputInitializer))) {
+        if (containsThisReferences(inputInitializer)) {
+            return []; // Skip migration for this input by returning empty replacements
+        }
+    }
+    let finalInitializer = inputInitializer;
+    if (inputInitializer === undefined) {
+        if (preferShorthandIfPossible === null) {
+            finalInitializer = ts.factory.createIdentifier('undefined');
+        }
+        else {
+            resolvedType = preferShorthandIfPossible.originalType;
+        }
+    }
+    const newNode = ts.factory.createPropertyDeclaration(modifiersWithoutInputDecorator, node.name, undefined, undefined, finalInitializer);
     const newPropertyText = result.printer.printNode(ts.EmitHint.Unspecified, newNode, node.getSourceFile());
     const replacements = [];
     if (leadingTodoText !== null) {
@@ -1082,6 +1104,43 @@ function extractTransformOfInput(transform, resolvedType, checker) {
         leadingTodoText,
     };
 }
+/**
+ * Checks if a function node contains any references to 'this'.
+ * This is used to skip migration for functions that reference class members.
+ */
+function containsThisReferences(node) {
+    let hasThis = false;
+    const visit = (node) => {
+        if (hasThis)
+            return;
+        if (node.kind === ts.SyntaxKind.ThisKeyword) {
+            hasThis = true;
+            return;
+        }
+        if (ts.isPropertyAccessExpression(node)) {
+            const expr = node.expression;
+            if (ts.isIdentifier(expr) && expr.text === 'this') {
+                hasThis = true;
+                return;
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
+        if (node.body) {
+            if (node.body.kind === ts.SyntaxKind.Block) {
+                node.body.statements.forEach(visit);
+            }
+            else {
+                visit(node.body);
+            }
+        }
+    }
+    else {
+        ts.forEachChild(node, visit);
+    }
+    return hasThis;
+}
 
 /**
  * Phase that migrates `@Input()` declarations to signal inputs and

package/schematics/bundles/signal-queries-migration.cjs

@@ -1,22 +1,22 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-BbVhi4fG.cjs');
 var ts = require('typescript');
 require('os');
-var index$1 = require('./index-Bb6iejCd.cjs');
+var index$1 = require('./index-BFENxhdR.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
-var apply_import_manager = require('./apply_import_manager-Bx60Uquz.cjs');
-var migrate_ts_type_references = require('./migrate_ts_type_references-By2ZtKls.cjs');
+var project_paths = require('./project_paths-EiOrjlNS.cjs');
+var apply_import_manager = require('./apply_import_manager-D_4NSuRa.cjs');
+var migrate_ts_type_references = require('./migrate_ts_type_references-CemH7A8e.cjs');
 var assert = require('assert');
-var index = require('./index-BZQb51Qf.cjs');
+var index = require('./index-DYqR8Lpq.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('fs');

package/schematics/bundles/signals.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -10,7 +10,7 @@ var schematics = require('@angular-devkit/schematics');
 var signalQueriesMigration = require('./signal-queries-migration.cjs');
 var signalInputMigration = require('./signal-input-migration.cjs');
 var outputMigration = require('./output-migration.cjs');
-require('./project_tsconfig_paths-DX9KHLn9.cjs');
+require('./project_tsconfig_paths-BbVhi4fG.cjs');
 require('typescript');
 require('os');
 require('fs');
@@ -18,14 +18,14 @@ require('module');
 require('path');
 require('url');
 require('@angular-devkit/core');
-require('./index-Bb6iejCd.cjs');
+require('./index-BFENxhdR.cjs');
 require('node:path');
-require('./project_paths-Dr2s3Pq3.cjs');
+require('./project_paths-EiOrjlNS.cjs');
 require('node:path/posix');
-require('./apply_import_manager-Bx60Uquz.cjs');
-require('./migrate_ts_type_references-By2ZtKls.cjs');
+require('./apply_import_manager-D_4NSuRa.cjs');
+require('./migrate_ts_type_references-CemH7A8e.cjs');
 require('assert');
-require('./index-BZQb51Qf.cjs');
+require('./index-DYqR8Lpq.cjs');
 require('./leading_space-D9nQ8UQC.cjs');
 
 function migrate(options) {

package/schematics/bundles/standalone-migration.cjs

@@ -1,18 +1,18 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var schematics = require('@angular-devkit/schematics');
-var index = require('./index-Bb6iejCd.cjs');
+var index = require('./index-BFENxhdR.cjs');
 var fs = require('fs');
 var p = require('path');
 var ts = require('typescript');
-var compiler_host = require('./compiler_host-Aouk-n4F.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var compiler_host = require('./compiler_host-C1KRWoxv.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-BbVhi4fG.cjs');
 var ng_decorators = require('./ng_decorators-BI0uV7KI.cjs');
 var nodes = require('./nodes-B16H9JUd.cjs');
 var symbol = require('./symbol-BObKoqes.cjs');
@@ -477,33 +477,42 @@ function moveDeclarationsToImports(literal, allDeclarations, typeChecker, templa
         ts.isArrayLiteralExpression(prop.initializer) &&
         prop.initializer.elements.hasTrailingComma);
     // Separate the declarations that we want to keep and ones we need to copy into the `imports`.
-    if (ts.isPropertyAssignment(declarationsProp)) {
-        // If the declarations are an array, we can analyze it to
-        // find any classes from the current migration.
-        if (ts.isArrayLiteralExpression(declarationsProp.initializer)) {
-            for (const el of declarationsProp.initializer.elements) {
-                if (ts.isIdentifier(el)) {
-                    const correspondingClass = findClassDeclaration(el, typeChecker);
-                    if (!correspondingClass ||
-                        // Check whether the declaration is either standalone already or is being converted
-                        // in this migration. We need to check if it's standalone already, in order to correct
-                        // some cases where the main app and the test files are being migrated in separate
-                        // programs.
-                        isStandaloneDeclaration(correspondingClass, allDeclarations, templateTypeChecker)) {
-                        declarationsToCopy.push(el);
+    if (ts.isPropertyAssignment(declarationsProp) ||
+        ts.isShorthandPropertyAssignment(declarationsProp)) {
+        // Handle both regular and shorthand property assignments
+        if (ts.isPropertyAssignment(declarationsProp)) {
+            // If the declarations are an array, we can analyze it to
+            // find any classes from the current migration.
+            if (ts.isArrayLiteralExpression(declarationsProp.initializer)) {
+                for (const el of declarationsProp.initializer.elements) {
+                    if (ts.isIdentifier(el)) {
+                        const correspondingClass = findClassDeclaration(el, typeChecker);
+                        if (!correspondingClass ||
+                            // Check whether the declaration is either standalone already or is being converted
+                            // in this migration. We need to check if it's standalone already, in order to correct
+                            // some cases where the main app and the test files are being migrated in separate
+                            // programs.
+                            isStandaloneDeclaration(correspondingClass, allDeclarations, templateTypeChecker)) {
+                            declarationsToCopy.push(el);
+                        }
+                        else {
+                            declarationsToPreserve.push(el);
+                        }
                     }
                     else {
-                        declarationsToPreserve.push(el);
+                        declarationsToCopy.push(el);
                     }
                 }
-                else {
-                    declarationsToCopy.push(el);
-                }
+            }
+            else {
+                // Otherwise create a spread that will be copied into the `imports`.
+                declarationsToCopy.push(ts.factory.createSpreadElement(declarationsProp.initializer));
             }
         }
         else {
-            // Otherwise create a spread that will be copied into the `imports`.
-            declarationsToCopy.push(ts.factory.createSpreadElement(declarationsProp.initializer));
+            // For shorthand properties, treat them as unanalyzable and use spread syntax
+            // shorthand properties were being ignored, now they're detected and treated as spreads
+            declarationsToCopy.push(ts.factory.createSpreadElement(declarationsProp.name));
         }
     }
     // If there are no `imports`, create them with the declarations we want to copy.
@@ -511,35 +520,38 @@ function moveDeclarationsToImports(literal, allDeclarations, typeChecker, templa
         properties.push(ts.factory.createPropertyAssignment('imports', ts.factory.createArrayLiteralExpression(ts.factory.createNodeArray(declarationsToCopy, hasAnyArrayTrailingComma && declarationsToCopy.length > 2))));
     }
     for (const prop of literal.properties) {
-        if (!isNamedPropertyAssignment(prop)) {
+        if (!isNamedPropertyAssignment(prop) && !ts.isShorthandPropertyAssignment(prop)) {
             properties.push(prop);
             continue;
         }
         // If we have declarations to preserve, update the existing property, otherwise drop it.
         if (prop === declarationsProp) {
             if (declarationsToPreserve.length > 0) {
-                const hasTrailingComma = ts.isArrayLiteralExpression(prop.initializer)
+                const hasTrailingComma = ts.isPropertyAssignment(prop) && ts.isArrayLiteralExpression(prop.initializer)
                     ? prop.initializer.elements.hasTrailingComma
                     : hasAnyArrayTrailingComma;
-                properties.push(ts.factory.updatePropertyAssignment(prop, prop.name, ts.factory.createArrayLiteralExpression(ts.factory.createNodeArray(declarationsToPreserve, hasTrailingComma && declarationsToPreserve.length > 2))));
+                properties.push(ts.factory.createPropertyAssignment(prop.name, ts.factory.createArrayLiteralExpression(ts.factory.createNodeArray(declarationsToPreserve, hasTrailingComma && declarationsToPreserve.length > 2))));
             }
             continue;
         }
         // If we have an `imports` array and declarations
         // that should be copied, we merge the two arrays.
         if (prop === importsProp && declarationsToCopy.length > 0) {
-            let initializer;
-            if (ts.isArrayLiteralExpression(prop.initializer)) {
-                initializer = ts.factory.updateArrayLiteralExpression(prop.initializer, ts.factory.createNodeArray([...prop.initializer.elements, ...declarationsToCopy], prop.initializer.elements.hasTrailingComma));
-            }
-            else {
-                initializer = ts.factory.createArrayLiteralExpression(ts.factory.createNodeArray([ts.factory.createSpreadElement(prop.initializer), ...declarationsToCopy], 
-                // Expect the declarations to be greater than 1 since
-                // we have the pre-existing initializer already.
-                hasAnyArrayTrailingComma && declarationsToCopy.length > 1));
+            // Only regular property assignments have initializers that we can merge
+            if (ts.isPropertyAssignment(prop)) {
+                let initializer;
+                if (ts.isArrayLiteralExpression(prop.initializer)) {
+                    initializer = ts.factory.updateArrayLiteralExpression(prop.initializer, ts.factory.createNodeArray([...prop.initializer.elements, ...declarationsToCopy], prop.initializer.elements.hasTrailingComma));
+                }
+                else {
+                    initializer = ts.factory.createArrayLiteralExpression(ts.factory.createNodeArray([ts.factory.createSpreadElement(prop.initializer), ...declarationsToCopy], 
+                    // Expect the declarations to be greater than 1 since
+                    // we have the pre-existing initializer already.
+                    hasAnyArrayTrailingComma && declarationsToCopy.length > 1));
+                }
+                properties.push(ts.factory.updatePropertyAssignment(prop, prop.name, initializer));
+                continue;
             }
-            properties.push(ts.factory.updatePropertyAssignment(prop, prop.name, initializer));
-            continue;
         }
         // Retain any remaining properties.
         properties.push(prop);
@@ -649,8 +661,14 @@ function findImportLocation(target, inContext, importMode, typeChecker) {
  * but not `declarations: []`.
  */
 function hasNgModuleMetadataElements(node) {
-    return (ts.isPropertyAssignment(node) &&
-        (!ts.isArrayLiteralExpression(node.initializer) || node.initializer.elements.length > 0));
+    if (ts.isPropertyAssignment(node)) {
+        return !ts.isArrayLiteralExpression(node.initializer) || node.initializer.elements.length > 0;
+    }
+    if (ts.isShorthandPropertyAssignment(node)) {
+        // For shorthand properties, we assume they have elements since they reference a variable
+        return true;
+    }
+    return false;
 }
 /** Finds all modules whose declarations can be migrated. */
 function findNgModuleClassesToMigrate(sourceFile, typeChecker) {
@@ -827,6 +845,7 @@ function analyzeTestingModules(testObjects, typeChecker) {
         const importsProp = findLiteralProperty(obj, 'imports');
         const importElements = importsProp &&
             hasNgModuleMetadataElements(importsProp) &&
+            ts.isPropertyAssignment(importsProp) &&
             ts.isArrayLiteralExpression(importsProp.initializer)
             ? importsProp.initializer.elements.filter((el) => {
                 // Filter out calls since they may be a `ModuleWithProviders`.
@@ -871,6 +890,7 @@ function extractDeclarationsFromTestObject(obj, typeChecker) {
     const declarations = findLiteralProperty(obj, 'declarations');
     if (declarations &&
         hasNgModuleMetadataElements(declarations) &&
+        ts.isPropertyAssignment(declarations) &&
         ts.isArrayLiteralExpression(declarations.initializer)) {
         for (const element of declarations.initializer.elements) {
             const declaration = findClassDeclaration(element, typeChecker);
@@ -951,7 +971,7 @@ function pruneNgModules(program, host, basePath, rootFileNames, sourceFiles, pri
         }
         node.forEachChild(walk);
     });
-    replaceInComponentImportsArray(componentImportArrays, classesToRemove, tracker, typeChecker, templateTypeChecker, declarationImportRemapper);
+    replaceInComponentImportsArray(componentImportArrays, classesToRemove, removalLocations, tracker, typeChecker, templateTypeChecker, declarationImportRemapper);
     replaceInTestImportsArray(testArrays, removalLocations, classesToRemove, tracker, typeChecker, templateTypeChecker, declarationImportRemapper);
     // We collect all the places where we need to remove references first before generating the
     // removal instructions since we may have to remove multiple references from one node.
@@ -1057,12 +1077,13 @@ function collectChangeLocations(ngModule, removalLocations, componentImportArray
  * Replaces all the leftover modules in component `imports` arrays with their exports.
  * @param componentImportArrays All the imports arrays and their nodes that represent NgModules.
  * @param classesToRemove Set of classes that were marked for removal.
+ * @param removalLocations Tracks the different places from which imports should be removed.
  * @param tracker
  * @param typeChecker
  * @param templateTypeChecker
  * @param importRemapper
  */
-function replaceInComponentImportsArray(componentImportArrays, classesToRemove, tracker, typeChecker, templateTypeChecker, importRemapper) {
+function replaceInComponentImportsArray(componentImportArrays, classesToRemove, removalLocations, tracker, typeChecker, templateTypeChecker, importRemapper) {
     for (const [array, toReplace] of componentImportArrays.getEntries()) {
         const closestClass = nodes.closestNode(array, ts.isClassDeclaration);
         if (!closestClass) {
@@ -1070,16 +1091,35 @@ function replaceInComponentImportsArray(componentImportArrays, classesToRemove,
         }
         const replacements = new UniqueItemTracker();
         const usedImports = new Set(findTemplateDependencies(closestClass, templateTypeChecker).map((ref) => ref.node));
+        const nodesToRemove = new Set();
         for (const node of toReplace) {
             const moduleDecl = findClassDeclaration(node, typeChecker);
             if (moduleDecl) {
                 const moduleMeta = templateTypeChecker.getNgModuleMetadata(moduleDecl);
                 if (moduleMeta) {
+                    let hasUsedExports = false;
                     moduleMeta.exports.forEach((exp) => {
                         if (usedImports.has(exp.node)) {
                             replacements.track(node, exp);
+                            hasUsedExports = true;
                         }
                     });
+                    // If none of the module's exports are used, track the node for removal
+                    if (!hasUsedExports) {
+                        nodesToRemove.add(node);
+                    }
+                    else if (ts.isIdentifier(node)) {
+                        // Track the import statement for removal when replacing with exports
+                        const symbol = typeChecker.getSymbolAtLocation(node);
+                        const declarations = symbol?.declarations;
+                        if (declarations) {
+                            for (const declaration of declarations) {
+                                if (ts.isImportSpecifier(declaration)) {
+                                    removalLocations.imports.track(declaration.parent, declaration);
+                                }
+                            }
+                        }
+                    }
                 }
                 else {
                     // It's unlikely not to have module metadata at this point, but just in
@@ -1088,12 +1128,13 @@ function replaceInComponentImportsArray(componentImportArrays, classesToRemove,
                 }
             }
         }
-        replaceModulesInImportsArray(array, replacements, tracker, templateTypeChecker, importRemapper);
+        replaceModulesInImportsArray(array, replacements, nodesToRemove, tracker, templateTypeChecker, importRemapper);
     }
 }
 /**
  * Replaces all the leftover modules in testing `imports` arrays with their exports.
  * @param testImportArrays All test `imports` arrays and their nodes that represent modules.
+ * @param removalLocations Tracks the different places from which imports should be removed.
  * @param classesToRemove Classes marked for removal by the migration.
  * @param tracker
  * @param typeChecker
@@ -1103,6 +1144,7 @@ function replaceInComponentImportsArray(componentImportArrays, classesToRemove,
 function replaceInTestImportsArray(testImportArrays, removalLocations, classesToRemove, tracker, typeChecker, templateTypeChecker, importRemapper) {
     for (const [array, toReplace] of testImportArrays.getEntries()) {
         const replacements = new UniqueItemTracker();
+        const nodesToRemove = new Set();
         for (const node of toReplace) {
             const moduleDecl = findClassDeclaration(node, typeChecker);
             if (moduleDecl) {
@@ -1113,6 +1155,18 @@ function replaceInTestImportsArray(testImportArrays, removalLocations, classesTo
                     const exports = moduleMeta.exports.filter((exp) => !classesToRemove.has(exp.node));
                     if (exports.length > 0) {
                         exports.forEach((exp) => replacements.track(node, exp));
+                        // Track the import statement for removal when replacing with exports
+                        if (ts.isIdentifier(node)) {
+                            const symbol = typeChecker.getSymbolAtLocation(node);
+                            const declarations = symbol?.declarations;
+                            if (declarations) {
+                                for (const declaration of declarations) {
+                                    if (ts.isImportSpecifier(declaration)) {
+                                        removalLocations.imports.track(declaration.parent, declaration);
+                                    }
+                                }
+                            }
+                        }
                     }
                     else {
                         removalLocations.arrays.track(array, node);
@@ -1125,19 +1179,21 @@ function replaceInTestImportsArray(testImportArrays, removalLocations, classesTo
                 }
             }
         }
-        replaceModulesInImportsArray(array, replacements, tracker, templateTypeChecker, importRemapper);
+        replaceModulesInImportsArray(array, replacements, nodesToRemove, tracker, templateTypeChecker, importRemapper);
     }
 }
 /**
  * Replaces any leftover modules in an `imports` arrays with a set of specified exports
  * @param array Imports array which is being migrated.
  * @param replacements Map of NgModule references to their exports.
+ * @param nodesToRemove Set of nodes that should be removed without replacement (unused modules).
  * @param tracker
+ * @param typeChecker
  * @param templateTypeChecker
  * @param importRemapper
  */
-function replaceModulesInImportsArray(array, replacements, tracker, templateTypeChecker, importRemapper) {
-    if (replacements.isEmpty()) {
+function replaceModulesInImportsArray(array, replacements, nodesToRemove, tracker, templateTypeChecker, importRemapper) {
+    if (replacements.isEmpty() && nodesToRemove.size === 0) {
         return;
     }
     const newElements = [];
@@ -1148,6 +1204,10 @@ function replaceModulesInImportsArray(array, replacements, tracker, templateType
         }
     }
     for (const element of array.elements) {
+        // Check if this element should be removed entirely (unused module)
+        if (nodesToRemove.has(element)) {
+            continue;
+        }
         const replacementRefs = replacements.get(element);
         if (!replacementRefs) {
             newElements.push(element);

package/schematics/bundles/symbol-BObKoqes.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.5
+ * @license Angular v21.0.0-next.7
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */

package/schematics/migrations.json

@@ -3,8 +3,7 @@
     "control-flow-migration": {
       "version": "21.0.0",
       "description": "Converts the entire application to block control flow syntax",
-      "factory": "./bundles/control-flow-migration.cjs#migrate",
-      "optional": true
+      "factory": "./bundles/control-flow-migration.cjs#migrate"
     },
     "router-current-navigation": {
       "version": "21.0.0",

package/{api.d.d.ts → types/_api-chunk.d.ts}

@@ -1,10 +1,10 @@
 /**
- * @license Angular v21.0.0-next.5
- * (c) 2010-2025 Google LLC. https://angular.io/
+ * @license Angular v21.0.0-next.7
+ * (c) 2010-2025 Google LLC. https://angular.dev/
  * License: MIT
  */
 
-import { OutputRef, OutputRefSubscription, DestroyRef, Signal, WritableSignal, ValueEqualityFn, Injector } from './chrome_dev_tools_performance.d.js';
+import { OutputRef, OutputRefSubscription, DestroyRef, Signal, WritableSignal, ValueEqualityFn, Injector } from './_chrome_dev_tools_performance-chunk.js';
 
 /**
  * An `OutputEmitterRef` is created by the `output()` function and can be

package/{chrome_dev_tools_performance.d.d.ts → types/_chrome_dev_tools_performance-chunk.d.ts}

@@ -1,11 +1,11 @@
 /**
- * @license Angular v21.0.0-next.5
- * (c) 2010-2025 Google LLC. https://angular.io/
+ * @license Angular v21.0.0-next.7
+ * (c) 2010-2025 Google LLC. https://angular.dev/
  * License: MIT
  */
 
-import { SIGNAL } from './graph.d.js';
-import { EventContract } from './event_dispatcher.d.js';
+import { SIGNAL } from './_formatter-chunk.js';
+import { EventContract } from './_event_dispatcher-chunk.js';
 
 /**
  * A reactive value which notifies consumers of any changes.