@schematics/angular 20.2.0 → 21.0.0-next.0

package/config/.browserslistrc

@@ -1,7 +1,7 @@
-Chrome >= 107
-ChromeAndroid >= 107
-Edge >= 107
-Firefox >= 104
-FirefoxAndroid >= 104
+Chrome >= 110
+ChromeAndroid >= 110
+Edge >= 110
+Firefox >= 110
+FirefoxAndroid >= 110
 Safari >= 16
 iOS >= 16

package/migrations/migration-collection.json

@@ -1,27 +1,7 @@
 {
   "schematics": {
-    "replace-provide-server-rendering-import": {
-      "version": "20.0.0",
-      "factory": "./replace-provide-server-rendering-import/migration",
-      "description": "Migrate imports of 'provideServerRendering' from '@angular/platform-server' to '@angular/ssr'."
-    },
-    "replace-provide-server-routing": {
-      "version": "20.0.0",
-      "factory": "./replace-provide-server-routing/migration",
-      "description": "Migrate 'provideServerRendering' to use 'withRoutes', and remove 'provideServerRouting' and 'provideServerRoutesConfig' from '@angular/ssr'."
-    },
-    "update-module-resolution": {
-      "version": "20.0.0",
-      "factory": "./update-module-resolution/migration",
-      "description": "Update 'moduleResolution' to 'bundler' in TypeScript configurations. You can read more about this, here: https://www.typescriptlang.org/tsconfig/#moduleResolution"
-    },
-    "previous-style-guide": {
-      "version": "20.0.0",
-      "factory": "./previous-style-guide/migration",
-      "description": "Update workspace generation defaults to maintain previous style guide behavior."
-    },
     "use-application-builder": {
-      "version": "20.0.0",
+      "version": "21.0.0",
       "factory": "./use-application-builder/migration",
       "description": "Migrate application projects to the new build system. Application projects that are using the '@angular-devkit/build-angular' package's 'browser' and/or 'browser-esbuild' builders will be migrated to use the new 'application' builder. You can read more about this, including known issues and limitations, here: https://angular.dev/tools/cli/build-system-migration",
       "optional": true,
@@ -29,7 +9,7 @@
       "documentation": "tools/cli/build-system-migration"
     },
     "remove-default-karma-config": {
-      "version": "20.2.0",
+      "version": "21.0.0",
       "factory": "./karma/migration",
       "description": "Remove any karma configuration files that only contain the default content. The default configuration is automatically available without a specific project file."
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "20.2.0",
+  "version": "21.0.0-next.0",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -22,15 +22,15 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "20.2.0",
-    "@angular-devkit/schematics": "20.2.0",
+    "@angular-devkit/core": "21.0.0-next.0",
+    "@angular-devkit/schematics": "21.0.0-next.0",
     "jsonc-parser": "3.3.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "packageManager": "pnpm@10.14.0",
+  "packageManager": "pnpm@10.15.0",
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/utility/latest-versions.js

@@ -14,9 +14,9 @@ const dependencies = require('./latest-versions/package.json')['dependencies'];
 exports.latestVersions = {
     ...dependencies,
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
-    Angular: '^20.2.0',
-    NgPackagr: '^20.2.0',
-    DevkitBuildAngular: '^20.2.0',
-    AngularBuild: '^20.2.0',
-    AngularSSR: '^20.2.0',
+    Angular: '^21.0.0-next.0',
+    NgPackagr: '^21.0.0-next.0',
+    DevkitBuildAngular: '^21.0.0-next.0',
+    AngularBuild: '^21.0.0-next.0',
+    AngularSSR: '^21.0.0-next.0',
 };

package/migrations/previous-style-guide/migration.d.ts

@@ -1,9 +0,0 @@
-/**
- * @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
- */
-import type { Rule } from '@angular-devkit/schematics';
-export default function (): Rule;

package/migrations/previous-style-guide/migration.js

@@ -1,42 +0,0 @@
-"use strict";
-/**
- * @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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const workspace_1 = require("../../utility/workspace");
-const TYPE_SCHEMATICS = ['component', 'directive', 'service'];
-const SEPARATOR_SCHEMATICS = ['guard', 'interceptor', 'module', 'pipe', 'resolver'];
-function default_1() {
-    return (0, workspace_1.updateWorkspace)((workspace) => {
-        let schematicsDefaults = workspace.extensions['schematics'];
-        // Ensure "schematics" field is an object
-        if (!schematicsDefaults ||
-            typeof schematicsDefaults !== 'object' ||
-            Array.isArray(schematicsDefaults)) {
-            schematicsDefaults = workspace.extensions['schematics'] = {};
-        }
-        // Add "type" value for each schematic to continue generating a type suffix.
-        // New default is an empty type value.
-        for (const schematicName of TYPE_SCHEMATICS) {
-            const schematic = (schematicsDefaults[`@schematics/angular:${schematicName}`] ??= {});
-            if (typeof schematic === 'object' && !Array.isArray(schematic) && !('type' in schematic)) {
-                schematic['type'] = schematicName;
-            }
-        }
-        // Add "typeSeparator" value for each schematic to continue generating "." before type.
-        // New default is an "-" type value.
-        for (const schematicName of SEPARATOR_SCHEMATICS) {
-            const schematic = (schematicsDefaults[`@schematics/angular:${schematicName}`] ??= {});
-            if (typeof schematic === 'object' &&
-                !Array.isArray(schematic) &&
-                !('typeSeparator' in schematic)) {
-                schematic['typeSeparator'] = '.';
-            }
-        }
-    });
-}

package/migrations/replace-provide-server-rendering-import/migration.d.ts

@@ -1,9 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-export default function (): Rule;

package/migrations/replace-provide-server-rendering-import/migration.js

@@ -1,98 +0,0 @@
-"use strict";
-/**
- * @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
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const typescript_1 = __importDefault(require("../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
-const dependency_1 = require("../../utility/dependency");
-const latest_versions_1 = require("../../utility/latest-versions");
-function* visit(directory) {
-    for (const path of directory.subfiles) {
-        if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
-            const entry = directory.file(path);
-            if (entry) {
-                const content = entry.content;
-                if (content.includes('provideServerRendering') &&
-                    content.includes('@angular/platform-server')) {
-                    // Only need to rename the import so we can just string replacements.
-                    yield [entry.path, content.toString()];
-                }
-            }
-        }
-    }
-    for (const path of directory.subdirs) {
-        if (path === 'node_modules' || path.startsWith('.')) {
-            continue;
-        }
-        yield* visit(directory.dir(path));
-    }
-}
-function default_1() {
-    return async (tree) => {
-        let rule;
-        for (const [filePath, content] of visit(tree.root)) {
-            let updatedContent = content;
-            const ssrImports = new Set();
-            const platformServerImports = new Set();
-            const sourceFile = typescript_1.default.createSourceFile(filePath, content, typescript_1.default.ScriptTarget.Latest, true);
-            sourceFile.forEachChild((node) => {
-                if (typescript_1.default.isImportDeclaration(node)) {
-                    const moduleSpecifier = node.moduleSpecifier.getText(sourceFile);
-                    if (moduleSpecifier.includes('@angular/platform-server')) {
-                        const importClause = node.importClause;
-                        if (importClause &&
-                            importClause.namedBindings &&
-                            typescript_1.default.isNamedImports(importClause.namedBindings)) {
-                            const namedImports = importClause.namedBindings.elements.map((e) => e.getText(sourceFile));
-                            namedImports.forEach((importName) => {
-                                if (importName === 'provideServerRendering') {
-                                    ssrImports.add(importName);
-                                }
-                                else {
-                                    platformServerImports.add(importName);
-                                }
-                            });
-                        }
-                        updatedContent = updatedContent.replace(node.getFullText(sourceFile), '');
-                    }
-                    else if (moduleSpecifier.includes('@angular/ssr')) {
-                        const importClause = node.importClause;
-                        if (importClause &&
-                            importClause.namedBindings &&
-                            typescript_1.default.isNamedImports(importClause.namedBindings)) {
-                            importClause.namedBindings.elements.forEach((e) => {
-                                ssrImports.add(e.getText(sourceFile));
-                            });
-                        }
-                        updatedContent = updatedContent.replace(node.getFullText(sourceFile), '');
-                    }
-                }
-            });
-            if (platformServerImports.size > 0) {
-                updatedContent =
-                    `import { ${Array.from(platformServerImports).sort().join(', ')} } from '@angular/platform-server';\n` +
-                        updatedContent;
-            }
-            if (ssrImports.size > 0) {
-                updatedContent =
-                    `import { ${Array.from(ssrImports).sort().join(', ')} } from '@angular/ssr';\n` +
-                        updatedContent;
-            }
-            if (content !== updatedContent) {
-                tree.overwrite(filePath, updatedContent);
-                if (rule === undefined) {
-                    rule = (0, dependency_1.addDependency)('@angular/ssr', latest_versions_1.latestVersions.AngularSSR);
-                }
-            }
-        }
-        return rule;
-    };
-}

package/migrations/replace-provide-server-routing/migration.d.ts

@@ -1,9 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-export default function (): Rule;

package/migrations/replace-provide-server-routing/migration.js

@@ -1,125 +0,0 @@
-"use strict";
-/**
- * @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
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const ts = __importStar(require("../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
-const dependencies_1 = require("../../utility/dependencies");
-function* visit(directory) {
-    for (const path of directory.subfiles) {
-        if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
-            const entry = directory.file(path);
-            if (entry) {
-                const content = entry.content;
-                if ((content.includes('provideServerRouting') ||
-                    content.includes('provideServerRoutesConfig')) &&
-                    content.includes('@angular/ssr')) {
-                    // Only need to rename the import so we can just string replacements.
-                    yield [entry.path, content.toString()];
-                }
-            }
-        }
-    }
-    for (const path of directory.subdirs) {
-        if (path === 'node_modules' || path.startsWith('.')) {
-            continue;
-        }
-        yield* visit(directory.dir(path));
-    }
-}
-function default_1() {
-    return async (tree) => {
-        if (!(0, dependencies_1.getPackageJsonDependency)(tree, '@angular/ssr')) {
-            return;
-        }
-        for (const [filePath, content] of visit(tree.root)) {
-            const recorder = tree.beginUpdate(filePath);
-            const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
-            function visit(node) {
-                if (ts.isPropertyAssignment(node) &&
-                    ts.isIdentifier(node.name) &&
-                    node.name.text === 'providers' &&
-                    ts.isArrayLiteralExpression(node.initializer)) {
-                    const providersArray = node.initializer;
-                    const newProviders = providersArray.elements
-                        .filter((el) => {
-                        return !(ts.isCallExpression(el) &&
-                            ts.isIdentifier(el.expression) &&
-                            el.expression.text === 'provideServerRendering');
-                    })
-                        .map((el) => {
-                        if (ts.isCallExpression(el) &&
-                            ts.isIdentifier(el.expression) &&
-                            (el.expression.text === 'provideServerRouting' ||
-                                el.expression.text === 'provideServerRoutesConfig')) {
-                            const [withRouteVal, ...others] = el.arguments.map((arg) => arg.getText());
-                            return `provideServerRendering(withRoutes(${withRouteVal})${others.length ? ', ' + others.join(', ') : ''})`;
-                        }
-                        return el.getText();
-                    });
-                    // Update the 'providers' array in the source file
-                    recorder.remove(providersArray.getStart(), providersArray.getWidth());
-                    recorder.insertRight(providersArray.getStart(), `[${newProviders.join(', ')}]`);
-                }
-                ts.forEachChild(node, visit);
-            }
-            // Visit all nodes to update 'providers'
-            visit(sourceFile);
-            // Update imports by removing 'provideServerRouting'
-            const importDecl = sourceFile.statements.find((stmt) => ts.isImportDeclaration(stmt) &&
-                ts.isStringLiteral(stmt.moduleSpecifier) &&
-                stmt.moduleSpecifier.text === '@angular/ssr');
-            if (importDecl?.importClause?.namedBindings) {
-                const namedBindings = importDecl?.importClause.namedBindings;
-                if (ts.isNamedImports(namedBindings)) {
-                    const elements = namedBindings.elements;
-                    const updatedElements = elements
-                        .map((el) => el.getText())
-                        .filter((x) => x !== 'provideServerRouting' && x !== 'provideServerRoutesConfig');
-                    updatedElements.push('withRoutes');
-                    recorder.remove(namedBindings.getStart(), namedBindings.getWidth());
-                    recorder.insertLeft(namedBindings.getStart(), `{ ${updatedElements.sort().join(', ')} }`);
-                }
-            }
-            tree.commitUpdate(recorder);
-        }
-    };
-}

package/migrations/update-module-resolution/migration.d.ts

@@ -1,9 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-export default function (): Rule;

package/migrations/update-module-resolution/migration.js

@@ -1,52 +0,0 @@
-"use strict";
-/**
- * @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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const json_file_1 = require("../../utility/json-file");
-const workspace_1 = require("../../utility/workspace");
-function default_1() {
-    return async (host) => {
-        const uniqueTsConfigs = new Set();
-        if (host.exists('tsconfig.json')) {
-            // Workspace level tsconfig
-            uniqueTsConfigs.add('tsconfig.json');
-        }
-        const workspace = await (0, workspace_1.getWorkspace)(host);
-        for (const [, target] of (0, workspace_1.allWorkspaceTargets)(workspace)) {
-            for (const [, opt] of (0, workspace_1.allTargetOptions)(target)) {
-                if (typeof opt?.tsConfig === 'string') {
-                    uniqueTsConfigs.add(opt.tsConfig);
-                }
-            }
-        }
-        for (const tsConfig of uniqueTsConfigs) {
-            if (host.exists(tsConfig)) {
-                updateModuleResolution(host, tsConfig);
-            }
-        }
-    };
-}
-function updateModuleResolution(host, tsConfigPath) {
-    const json = new json_file_1.JSONFile(host, tsConfigPath);
-    const jsonPath = ['compilerOptions'];
-    const compilerOptions = json.get(jsonPath);
-    if (compilerOptions && typeof compilerOptions === 'object') {
-        const { moduleResolution, module } = compilerOptions;
-        if (typeof moduleResolution !== 'string' || moduleResolution.toLowerCase() === 'bundler') {
-            return;
-        }
-        if (typeof module === 'string' && module.toLowerCase() === 'preserve') {
-            return;
-        }
-        json.modify(jsonPath, {
-            ...compilerOptions,
-            'moduleResolution': 'bundler',
-        });
-    }
-}