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

package/schematics/bundles/property_name-BBwFuqMe.cjs

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @license Angular v21.0.0-next.5
  * (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.3
+ * @license Angular v21.0.0-next.5
  * (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-Df7s6Riz.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-bRwOJEk9.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 property_name = require('./property_name-BBwFuqMe.cjs');
 require('os');
@@ -208,7 +208,7 @@ function findRoutesArrayToMigrate(sourceFile, typeChecker) {
                 }
             }
         }
-        if (ts.isVariableDeclaration(node)) {
+        else if (ts.isVariableDeclaration(node)) {
             if (isAngularRoutesArray(node, typeChecker)) {
                 const initializer = node.initializer;
                 if (initializer &&
@@ -227,6 +227,33 @@ function findRoutesArrayToMigrate(sourceFile, typeChecker) {
                 }
             }
         }
+        else if (ts.isExportAssignment(node)) {
+            // Handles `export default routes`, `export default [...]` and `export default [...] as Routes`
+            let expression = node.expression;
+            if (ts.isAsExpression(expression)) {
+                expression = expression.expression;
+            }
+            if (ts.isArrayLiteralExpression(expression)) {
+                routesArrays.push({
+                    routeFilePath: sourceFile.fileName,
+                    array: expression,
+                    routeFileImports: sourceFile.statements.filter(ts.isImportDeclaration),
+                });
+            }
+            else if (ts.isIdentifier(expression)) {
+                manageRoutesExportedByDefault(routesArrays, typeChecker, expression, sourceFile);
+            }
+        }
+        else if (ts.isExportDeclaration(node)) {
+            // Handles cases like `export { routes as default }`
+            if (node.exportClause && ts.isNamedExports(node.exportClause)) {
+                for (const specifier of node.exportClause.elements) {
+                    if (specifier.name.text === 'default') {
+                        manageRoutesExportedByDefault(routesArrays, typeChecker, specifier.propertyName ?? specifier.name, sourceFile);
+                    }
+                }
+            }
+        }
         node.forEachChild(walk);
     });
     return routesArrays;
@@ -333,6 +360,23 @@ function createLoadComponentPropertyAssignment(componentImportPath, componentDec
         // will generate import('./path).then(m => m.componentName)
         ts.factory.createPropertyAccessExpression(createImportCallExpression(componentImportPath), 'then'), undefined, [createImportThenCallExpression(componentDeclarationName)])));
 }
+const manageRoutesExportedByDefault = (routesArrays, typeChecker, expression, sourceFile) => {
+    const symbol = typeChecker.getSymbolAtLocation(expression);
+    if (!symbol?.declarations) {
+        return;
+    }
+    for (const declaration of symbol.declarations) {
+        if (ts.isVariableDeclaration(declaration) &&
+            declaration.initializer &&
+            ts.isArrayLiteralExpression(declaration.initializer)) {
+            routesArrays.push({
+                routeFilePath: sourceFile.fileName,
+                array: declaration.initializer,
+                routeFileImports: sourceFile.statements.filter(ts.isImportDeclaration),
+            });
+        }
+    }
+};
 // import('./path)
 const createImportCallExpression = (componentImportPath) => ts.factory.createCallExpression(ts.factory.createIdentifier('import'), undefined, [
     ts.factory.createStringLiteral(componentImportPath, true),

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

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,13 +8,13 @@
 
 var ts = require('typescript');
 require('os');
-require('./project_tsconfig_paths-bRwOJEk9.cjs');
-require('./index-CBaykQBv.cjs');
+require('./project_tsconfig_paths-DX9KHLn9.cjs');
+require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-BJTqcWvC.cjs');
-var imports = require('./imports-26VeX8i-.cjs');
-var symbol = require('./symbol-VPWguRxr.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
+var imports = require('./imports-DwPXlGFl.cjs');
+var symbol = require('./symbol-BObKoqes.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('fs');

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

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,13 +8,13 @@
 
 var ts = require('typescript');
 require('os');
-require('./project_tsconfig_paths-bRwOJEk9.cjs');
-require('./index-CBaykQBv.cjs');
+require('./project_tsconfig_paths-DX9KHLn9.cjs');
+require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-BJTqcWvC.cjs');
-var imports = require('./imports-26VeX8i-.cjs');
-var symbol = require('./symbol-VPWguRxr.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
+var imports = require('./imports-DwPXlGFl.cjs');
+var symbol = require('./symbol-BObKoqes.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('fs');

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

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -8,21 +8,21 @@
 
 var ts = require('typescript');
 require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-bRwOJEk9.cjs');
-require('./index-CBaykQBv.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-BJTqcWvC.cjs');
-var ng_component_template = require('./ng_component_template-HYGPuVhy.cjs');
-var parse_html = require('./parse_html-CLFKoiOK.cjs');
+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');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('fs');
 require('module');
 require('url');
 require('@angular-devkit/schematics');
-require('./ng_decorators-CtYwz9Lw.cjs');
-require('./imports-26VeX8i-.cjs');
+require('./ng_decorators-BI0uV7KI.cjs');
+require('./imports-DwPXlGFl.cjs');
 require('./property_name-BBwFuqMe.cjs');
 
 function migrateTemplateToSelfClosingTags(template) {

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

@@ -1,22 +1,22 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var migrate_ts_type_references = require('./migrate_ts_type_references-C_gTvDtH.cjs');
+var migrate_ts_type_references = require('./migrate_ts_type_references-By2ZtKls.cjs');
 var ts = require('typescript');
 require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-bRwOJEk9.cjs');
-var index$1 = require('./index-CBaykQBv.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var index$1 = require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-BJTqcWvC.cjs');
-var index = require('./index-Clvp4COX.cjs');
+var project_paths = require('./project_paths-Dr2s3Pq3.cjs');
+var index = require('./index-BZQb51Qf.cjs');
 var assert = require('assert');
-var apply_import_manager = require('./apply_import_manager-tNexl58m.cjs');
+var apply_import_manager = require('./apply_import_manager-Bx60Uquz.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('./leading_space-D9nQ8UQC.cjs');
@@ -396,7 +396,15 @@ function extractSourceCodeInput(node, host, reflector, evaluator) {
                 isRequired = !!evaluatedInputOpts.get('required');
             }
             if (evaluatedInputOpts.has('transform') && evaluatedInputOpts.get('transform') != null) {
-                transformResult = parseTransformOfInput(evaluatedInputOpts, node, reflector);
+                const result = parseTransformOfInput(evaluatedInputOpts, node, reflector);
+                if (result === 'parsingError') {
+                    if (!host.config.bestEffortMode) {
+                        return null;
+                    }
+                }
+                else {
+                    transformResult = result;
+                }
             }
         }
     }
@@ -443,7 +451,7 @@ function parseTransformOfInput(evaluatedInputOpts, node, reflector) {
         // TODO: implement error handling.
         // See failing case: e.g. inherit_definition_feature_spec.ts
         console.error(`${e.node.getSourceFile().fileName}: ${e.toString()}`);
-        return null;
+        return 'parsingError';
     }
 }
 

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

@@ -1,22 +1,22 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @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-bRwOJEk9.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
 var ts = require('typescript');
 require('os');
-var index$1 = require('./index-CBaykQBv.cjs');
+var index$1 = require('./index-Bb6iejCd.cjs');
 require('path');
 require('node:path');
-var project_paths = require('./project_paths-BJTqcWvC.cjs');
-var apply_import_manager = require('./apply_import_manager-tNexl58m.cjs');
-var migrate_ts_type_references = require('./migrate_ts_type_references-C_gTvDtH.cjs');
+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 assert = require('assert');
-var index = require('./index-Clvp4COX.cjs');
+var index = require('./index-BZQb51Qf.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.3
+ * @license Angular v21.0.0-next.5
  * (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-bRwOJEk9.cjs');
+require('./project_tsconfig_paths-DX9KHLn9.cjs');
 require('typescript');
 require('os');
 require('fs');
@@ -18,14 +18,14 @@ require('module');
 require('path');
 require('url');
 require('@angular-devkit/core');
-require('./index-CBaykQBv.cjs');
+require('./index-Bb6iejCd.cjs');
 require('node:path');
-require('./project_paths-BJTqcWvC.cjs');
+require('./project_paths-Dr2s3Pq3.cjs');
 require('node:path/posix');
-require('./apply_import_manager-tNexl58m.cjs');
-require('./migrate_ts_type_references-C_gTvDtH.cjs');
+require('./apply_import_manager-Bx60Uquz.cjs');
+require('./migrate_ts_type_references-By2ZtKls.cjs');
 require('assert');
-require('./index-Clvp4COX.cjs');
+require('./index-BZQb51Qf.cjs');
 require('./leading_space-D9nQ8UQC.cjs');
 
 function migrate(options) {

package/schematics/bundles/standalone-migration.cjs

@@ -1,22 +1,22 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var schematics = require('@angular-devkit/schematics');
-var index = require('./index-CBaykQBv.cjs');
+var index = require('./index-Bb6iejCd.cjs');
 var fs = require('fs');
 var p = require('path');
 var ts = require('typescript');
-var compiler_host = require('./compiler_host-Df7s6Riz.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-bRwOJEk9.cjs');
-var ng_decorators = require('./ng_decorators-CtYwz9Lw.cjs');
+var compiler_host = require('./compiler_host-Aouk-n4F.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-DX9KHLn9.cjs');
+var ng_decorators = require('./ng_decorators-BI0uV7KI.cjs');
 var nodes = require('./nodes-B16H9JUd.cjs');
-var symbol = require('./symbol-VPWguRxr.cjs');
-var imports = require('./imports-26VeX8i-.cjs');
+var symbol = require('./symbol-BObKoqes.cjs');
+var imports = require('./imports-DwPXlGFl.cjs');
 require('os');
 require('module');
 require('url');
@@ -402,9 +402,16 @@ function getComponentImportExpressions(decl, allDeclarations, tracker, typeCheck
         const importLocation = findImportLocation(dep, decl, usedDependenciesInMigration.has(dep)
             ? project_tsconfig_paths.PotentialImportMode.ForceDirect
             : project_tsconfig_paths.PotentialImportMode.Normal, typeChecker);
-        if (importLocation && !seenImports.has(importLocation.symbolName)) {
-            seenImports.add(importLocation.symbolName);
-            resolvedDependencies.push(importLocation);
+        if (importLocation) {
+            // Create a unique key that includes both the symbol name and module specifier
+            // to handle cases where the same symbol name is imported from different modules
+            const importKey = importLocation.moduleSpecifier
+                ? `${importLocation.symbolName}::${importLocation.moduleSpecifier}`
+                : importLocation.symbolName;
+            if (!seenImports.has(importKey)) {
+                seenImports.add(importKey);
+                resolvedDependencies.push(importLocation);
+            }
         }
     }
     return potentialImportsToExpressions(resolvedDependencies, decl.getSourceFile(), tracker, importRemapper);

package/schematics/bundles/{symbol-VPWguRxr.cjs → symbol-BObKoqes.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.3
+ * @license Angular v21.0.0-next.5
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -13,7 +13,8 @@ function isReferenceToImport(typeChecker, node, importSpecifier) {
     // If this function is called on an identifier (should be most cases), we can quickly rule out
     // non-matches by comparing the identifier's string and the local name of the import specifier
     // which saves us some calls to the type checker.
-    if (ts.isIdentifier(node) && node.text !== importSpecifier.name.text) {
+    if (importSpecifier === null ||
+        (ts.isIdentifier(node) && node.text !== importSpecifier.name.text)) {
         return false;
     }
     const nodeSymbol = typeChecker.getTypeAtLocation(node).getSymbol();

package/schematics/collection.json

@@ -63,6 +63,12 @@
       "factory": "./bundles/ngclass-to-class-migration.cjs#migrate",
       "schema": "./migrations/ngclass-to-class-migration/schema.json",
       "aliases": ["ngclass-to-class"]
+    },
+    "ngstyle-to-style-migration": {
+      "description": "Updates usages of `ngStyle` directives to the `style` bindings where possible",
+      "factory": "./bundles/ngstyle-to-style-migration.cjs#migrate",
+      "schema": "./migrations/ngstyle-to-style-migration/schema.json",
+      "aliases": ["ngstyle-to-style"]
     }
   }
 }

package/schematics/migrations/ngstyle-to-style-migration/schema.json

@@ -0,0 +1,20 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "AngularNgStyleToStyleMigration",
+  "title": "Angular ngStyle to style Migration Schema",
+  "type": "object",
+  "properties": {
+    "path": {
+      "type": "string",
+      "description": "Path to the directory where all templates should be migrated.",
+      "x-prompt": "Which directory do you want to migrate?",
+      "default": "./"
+    },
+    "bestEffortMode": {
+      "type": "boolean",
+      "description": "Enables the migration of object references",
+      "x-prompt": "Should the migration also migrate object references?",
+      "default": false
+    }
+  }
+}

package/schematics/migrations.json

@@ -26,6 +26,11 @@
       "version": "21.0.0",
       "description": "Adds `BootstrapContext` to `bootstrapApplication` calls in `main.server.ts` to support server rendering.",
       "factory": "./bundles/add-bootstrap-context-to-server-main.cjs#migrate"
+    },
+    "bootstrap-options-migration": {
+      "version": "21.0.0",
+      "description": "Migrates deprecated bootstrap options to providers.",
+      "factory": "./bundles/bootstrap-options-migration.cjs#migrate"
     }
   }
 }

package/testing/index.d.ts

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

package/weak_ref.d.d.ts

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

package/schematics/bundles/parse_html-CLFKoiOK.cjs

@@ -1,41 +0,0 @@
-'use strict';
-/**
- * @license Angular v21.0.0-next.3
- * (c) 2010-2025 Google LLC. https://angular.io/
- * License: MIT
- */
-'use strict';
-
-var project_tsconfig_paths = require('./project_tsconfig_paths-bRwOJEk9.cjs');
-
-/**
- * parses the template string into the Html AST
- */
-function parseTemplate(template) {
-    let parsed;
-    try {
-        // Note: we use the HtmlParser here, instead of the `parseTemplate` function, because the
-        // latter returns an Ivy AST, not an HTML AST. The HTML AST has the advantage of preserving
-        // interpolated text as text nodes containing a mixture of interpolation tokens and text tokens,
-        // rather than turning them into `BoundText` nodes like the Ivy AST does. This allows us to
-        // easily get the text-only ranges without having to reconstruct the original text.
-        parsed = new project_tsconfig_paths.HtmlParser().parse(template, '', {
-            // Allows for ICUs to be parsed.
-            tokenizeExpansionForms: true,
-            // Explicitly disable blocks so that their characters are treated as plain text.
-            tokenizeBlocks: true,
-            preserveLineEndings: true,
-        });
-        // Don't migrate invalid templates.
-        if (parsed.errors && parsed.errors.length > 0) {
-            const errors = parsed.errors.map((e) => ({ type: 'parse', error: e }));
-            return { tree: undefined, errors };
-        }
-    }
-    catch (e) {
-        return { tree: undefined, errors: [{ type: 'parse', error: e }] };
-    }
-    return { tree: parsed, errors: [] };
-}
-
-exports.parseTemplate = parseTemplate;