@schematics/angular 21.0.0-next.4 → 21.0.0-next.6

package/ai-config/index.js

@@ -11,6 +11,10 @@ exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
 const schema_1 = require("./schema");
 const AI_TOOLS = {
+    agents: {
+        rulesName: 'AGENTS.md',
+        directory: '.',
+    },
     gemini: {
         rulesName: 'GEMINI.md',
         directory: '.gemini',
@@ -39,19 +43,32 @@ const AI_TOOLS = {
     },
 };
 function default_1({ tool }) {
-    if (!tool) {
-        return (0, schematics_1.noop)();
-    }
-    const rules = tool
-        .filter((tool) => tool !== schema_1.Tool.None)
-        .map((selectedTool) => AI_TOOLS[selectedTool])
-        .map(({ rulesName, directory, frontmatter }) => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
-        (0, schematics_1.applyTemplates)({
-            ...schematics_1.strings,
-            rulesName,
-            frontmatter,
-        }),
-        (0, schematics_1.move)(directory),
-    ])));
-    return (0, schematics_1.chain)(rules);
+    return (tree, context) => {
+        if (!tool) {
+            return (0, schematics_1.noop)();
+        }
+        const rules = tool
+            .filter((tool) => tool !== schema_1.Tool.None)
+            .map((selectedTool) => {
+            const { rulesName, directory, frontmatter } = AI_TOOLS[selectedTool];
+            const path = `${directory}/${rulesName}`;
+            if (tree.exists(path)) {
+                const toolName = schematics_1.strings.classify(selectedTool);
+                context.logger.warn(`Skipping configuration file for '${toolName}' at '${path}' because it already exists.\n` +
+                    'This is to prevent overwriting a potentially customized file. ' +
+                    'If you want to regenerate it with Angular recommended defaults, please delete the existing file and re-run the command.\n' +
+                    'You can review the latest recommendations at https://angular.dev/ai/develop-with-ai.');
+                return (0, schematics_1.noop)();
+            }
+            return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+                (0, schematics_1.applyTemplates)({
+                    ...schematics_1.strings,
+                    rulesName,
+                    frontmatter,
+                }),
+                (0, schematics_1.move)(directory),
+            ]));
+        });
+        return (0, schematics_1.chain)(rules);
+    };
 }

package/ai-config/schema.d.ts

@@ -11,6 +11,7 @@ export type Schema = {
     tool?: Tool[];
 };
 export declare enum Tool {
+    Agents = "agents",
     Claude = "claude",
     Copilot = "copilot",
     Cursor = "cursor",

package/ai-config/schema.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tool = void 0;
 var Tool;
 (function (Tool) {
+    Tool["Agents"] = "agents";
     Tool["Claude"] = "claude";
     Tool["Copilot"] = "copilot";
     Tool["Cursor"] = "cursor";

package/ai-config/schema.json

@@ -18,6 +18,10 @@
             "value": "none",
             "label": "None"
           },
+          {
+            "value": "agents",
+            "label": "Agents.md      [ https://agents.md/                                               ]"
+          },
           {
             "value": "claude",
             "label": "Claude         [ https://docs.anthropic.com/en/docs/claude-code/memory            ]"
@@ -47,7 +51,7 @@
       "description": "Specifies which AI tools to generate configuration files for. These file are used to improve the outputs of AI tools by following the best practices.",
       "items": {
         "type": "string",
-        "enum": ["none", "gemini", "copilot", "claude", "cursor", "jetbrains", "windsurf"]
+        "enum": ["none", "gemini", "copilot", "claude", "cursor", "jetbrains", "windsurf", "agents"]
       }
     }
   }

package/application/files/module-files/src/app/app-module.ts.template

@@ -1,4 +1,4 @@
-import { NgModule, provideBrowserGlobalErrorListeners<% if(zoneless) { %>, provideZonelessChangeDetection<% } %> } from '@angular/core';
+import { NgModule, provideBrowserGlobalErrorListeners } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 <% if (routing) { %>
 import { AppRoutingModule } from './app-routing-module';<% } %>
@@ -13,8 +13,7 @@ import { App } from './app';
     AppRoutingModule<% } %>
   ],
   providers: [
-    provideBrowserGlobalErrorListeners()<% if (zoneless) { %>,
-    provideZonelessChangeDetection()<% } %>
+    provideBrowserGlobalErrorListeners()
   ],
   bootstrap: [App]
 })

package/application/files/module-files/src/app/app__suffix__.spec.ts.template

@@ -1,5 +1,4 @@
-<% if(zoneless) { %>import { provideZonelessChangeDetection } from '@angular/core';
-<% } %>import { TestBed } from '@angular/core/testing';<% if (routing) { %>
+import { TestBed } from '@angular/core/testing';<% if (routing) { %>
 import { RouterModule } from '@angular/router';<% } %>
 import { App } from './app';
 
@@ -11,8 +10,7 @@ describe('App', () => {
       ],<% } %>
       declarations: [
         App
-      ],<% if(zoneless) { %>
-      providers: [provideZonelessChangeDetection()]<% } %>
+      ],
     }).compileComponents();
   });
 
@@ -22,9 +20,9 @@ describe('App', () => {
     expect(app).toBeTruthy();
   });
 
-  it('should render title', () => {
+  it('should render title', <% if(zoneless) { %> async <% } %>() => {
     const fixture = TestBed.createComponent(App);
-    fixture.detectChanges();
+    <%= zoneless ? 'await fixture.whenStable();' : 'fixture.detectChanges();' %>
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain('Hello, <%= name %>');
   });

package/application/files/standalone-files/src/app/app.config.ts.template

@@ -1,12 +1,12 @@
-import { ApplicationConfig, provideBrowserGlobalErrorListeners, <% if(!zoneless) { %>provideZoneChangeDetection<% } else { %>provideZonelessChangeDetection<% } %> } from '@angular/core';<% if (routing) { %>
+import { ApplicationConfig, provideBrowserGlobalErrorListeners<% if(!zoneless) { %>, provideZoneChangeDetection<% } %> } from '@angular/core';<% if (routing) { %>
 import { provideRouter } from '@angular/router';
 
 import { routes } from './app.routes';<% } %>
 
 export const appConfig: ApplicationConfig = {
   providers: [
-    provideBrowserGlobalErrorListeners(),
-    <% if(zoneless) { %>provideZonelessChangeDetection()<% } else { %>provideZoneChangeDetection({ eventCoalescing: true })<% } %>,
+    provideBrowserGlobalErrorListeners(),<% if(!zoneless) { %>
+    provideZoneChangeDetection({ eventCoalescing: true }),<% } %>
     <% if (routing) {%>provideRouter(routes)<% } %>
   ]
 };

package/application/files/standalone-files/src/app/app__suffix__.spec.ts.template

@@ -1,12 +1,10 @@
-<% if(zoneless) { %>import { provideZonelessChangeDetection } from '@angular/core';
-<% } %>import { TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { App } from './app';
 
 describe('App', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [App],<% if(zoneless) { %>
-      providers: [provideZonelessChangeDetection()]<% } %>
+      imports: [App],
     }).compileComponents();
   });
 
@@ -16,9 +14,9 @@ describe('App', () => {
     expect(app).toBeTruthy();
   });
 
-  it('should render title', () => {
+  it('should render title', <% if(zoneless) { %> async <% } %>() => {
     const fixture = TestBed.createComponent(App);
-    fixture.detectChanges();
+    <%= zoneless ? 'await fixture.whenStable();' : 'fixture.detectChanges();' %>
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain('Hello, <%= name %>');
   });

package/application/schema.json

@@ -126,7 +126,7 @@
       "description": "Generate an application that does not use `zone.js`.",
       "x-prompt": "Do you want to create a 'zoneless' application without zone.js?",
       "type": "boolean",
-      "default": false
+      "default": true
     },
     "fileNameStyleGuide": {
       "type": "string",

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template

@@ -14,7 +14,7 @@ describe('<%= classifiedName %>', () => {
 
     fixture = TestBed.createComponent(<%= classifiedName %>);
     component = fixture.componentInstance;
-    fixture.detectChanges();
+    <%= zoneless ? 'await fixture.whenStable();' : 'fixture.detectChanges();' %>
   });
 
   it('should create', () => {

package/component/index.js

@@ -12,6 +12,7 @@ const add_declaration_to_ng_module_1 = require("../utility/add-declaration-to-ng
 const find_module_1 = require("../utility/find-module");
 const parse_name_1 = require("../utility/parse-name");
 const project_1 = require("../utility/project");
+const project_targets_1 = require("../utility/project-targets");
 const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
@@ -40,6 +41,7 @@ exports.default = (0, project_1.createProjectSchematic)((options, { project, tre
     const classifiedName = schematics_1.strings.classify(options.name) +
         (options.addTypeToClassName && options.type ? schematics_1.strings.classify(options.type) : '');
     (0, validation_1.validateClassName)(classifiedName);
+    const zoneless = (0, project_targets_1.isZonelessApp)(project);
     const skipStyleFile = options.inlineStyle || options.style === schema_1.Style.None;
     const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
         options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
@@ -52,6 +54,7 @@ exports.default = (0, project_1.createProjectSchematic)((options, { project, tre
             ...options,
             // Add a new variable for the classified name, conditionally including the type
             classifiedName,
+            zoneless,
         }),
         !options.type
             ? (0, schematics_1.forEach)(((file) => {

package/migrations/migration-collection.json

@@ -13,6 +13,11 @@
       "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."
+    },
+    "update-typescript-lib": {
+      "version": "21.0.0",
+      "factory": "./update-typescript-lib/migration",
+      "description": "Updates the 'lib' property in tsconfig files to use 'es2022' or a more modern version."
     }
   }
 }

package/migrations/update-typescript-lib/migration.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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-typescript-lib/migration.js

@@ -0,0 +1,79 @@
+"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, context) => {
+        // Workspace level tsconfig
+        if (host.exists('tsconfig.json')) {
+            updateLib(host, 'tsconfig.json');
+        }
+        const workspace = await (0, workspace_1.getWorkspace)(host);
+        // Find all tsconfig which are references used by builders
+        for (const [, project] of workspace.projects) {
+            for (const [targetName, target] of project.targets) {
+                if (!target.options) {
+                    continue;
+                }
+                // Update all other known CLI builders that use a tsconfig
+                const tsConfigs = [target.options, ...Object.values(target.configurations || {})]
+                    .filter((opt) => typeof opt?.tsConfig === 'string')
+                    .map((opt) => opt.tsConfig);
+                const uniqueTsConfigs = new Set(tsConfigs);
+                for (const tsConfig of uniqueTsConfigs) {
+                    if (host.exists(tsConfig)) {
+                        updateLib(host, tsConfig);
+                    }
+                    else {
+                        context.logger.warn(`'${tsConfig}' referenced in the '${targetName}' target does not exist.`);
+                    }
+                }
+            }
+        }
+    };
+}
+function updateLib(host, tsConfigPath) {
+    const json = new json_file_1.JSONFile(host, tsConfigPath);
+    const jsonPath = ['compilerOptions', 'lib'];
+    const lib = json.get(jsonPath);
+    if (!lib || !Array.isArray(lib)) {
+        return;
+    }
+    const esLibs = lib.filter((l) => typeof l === 'string' && l.toLowerCase().startsWith('es'));
+    const hasDom = lib.some((l) => typeof l === 'string' && l.toLowerCase() === 'dom');
+    if (esLibs.length === 0) {
+        return;
+    }
+    const esLibToVersion = new Map();
+    for (const l of esLibs) {
+        const version = l.toLowerCase().match(/^es(next|(\d+))$/)?.[1];
+        if (version) {
+            esLibToVersion.set(l, version === 'next' ? Infinity : Number(version));
+        }
+    }
+    if (esLibToVersion.size === 0) {
+        return;
+    }
+    const latestEsLib = [...esLibToVersion.entries()].sort(([, v1], [, v2]) => v2 - v1)[0];
+    const latestVersion = latestEsLib[1];
+    if (hasDom) {
+        if (latestVersion <= 2022) {
+            json.remove(jsonPath);
+        }
+        return;
+    }
+    // No 'dom' with 'es' libs, so update 'es' lib.
+    if (latestVersion < 2022) {
+        const newLibs = lib.filter((l) => !esLibToVersion.has(l));
+        newLibs.push('es2022');
+        json.modify(jsonPath, newLibs);
+    }
+}

package/migrations/use-application-builder/migration.js

@@ -270,6 +270,7 @@ function default_1() {
             rootJson.modify(['compilerOptions', 'esModuleInterop'], true);
             rootJson.modify(['compilerOptions', 'downlevelIteration'], undefined);
             rootJson.modify(['compilerOptions', 'allowSyntheticDefaultImports'], undefined);
+            rootJson.modify(['compilerOptions', 'moduleResolution'], 'bundler');
         }),
     ]);
 }

package/ng-new/schema.d.ts

@@ -124,6 +124,7 @@ export type Schema = {
     zoneless?: boolean;
 };
 export declare enum AiConfig {
+    Agents = "agents",
     Claude = "claude",
     Copilot = "copilot",
     Cursor = "cursor",

package/ng-new/schema.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewEncapsulation = exports.Style = exports.PackageManager = exports.FileNameStyleGuide = exports.AiConfig = void 0;
 var AiConfig;
 (function (AiConfig) {
+    AiConfig["Agents"] = "agents";
     AiConfig["Claude"] = "claude";
     AiConfig["Copilot"] = "copilot";
     AiConfig["Cursor"] = "cursor";

package/ng-new/schema.json

@@ -149,7 +149,7 @@
       "description": "Specifies which AI tools to generate configuration files for. These file are used to improve the outputs of AI tools by following the best practices.",
       "items": {
         "type": "string",
-        "enum": ["none", "gemini", "copilot", "claude", "cursor", "jetbrains", "windsurf"]
+        "enum": ["none", "gemini", "copilot", "claude", "cursor", "jetbrains", "windsurf", "agents"]
       }
     },
     "fileNameStyleGuide": {

package/package.json

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

package/ssr/files/application-builder/server.ts.template

@@ -48,10 +48,10 @@ app.use((req, res, next) => {
 });
 
 /**
- * Start the server if this module is the main entry point.
+ * Start the server if this module is the main entry point, or it is ran via PM2.
  * The server listens on the port defined by the `PORT` environment variable, or defaults to 4000.
  */
-if (isMainModule(import.meta.url)) {
+if (isMainModule(import.meta.url) || process.env['pm_id']) {
   const port = process.env['PORT'] || 4000;
   app.listen(port, (error) => {
     if (error) {

package/ssr/files/server-builder/server.ts.template

@@ -1,5 +1,3 @@
-import 'zone.js/node';
-
 import { APP_BASE_HREF } from '@angular/common';
 import { CommonEngine } from '@angular/ssr/node';
 import express from 'express';

package/utility/latest-versions/package.json

@@ -8,7 +8,7 @@
     "@types/node": "^20.17.19",
     "browser-sync": "^3.0.0",
     "express": "^5.1.0",
-    "jasmine-core": "~5.10.0",
+    "jasmine-core": "~5.11.0",
     "jasmine-spec-reporter": "~7.0.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",

package/utility/latest-versions.js

@@ -16,7 +16,7 @@ exports.latestVersions = {
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^21.0.0-next.0',
     NgPackagr: '^21.0.0-next.0',
-    DevkitBuildAngular: '^21.0.0-next.4',
-    AngularBuild: '^21.0.0-next.4',
-    AngularSSR: '^21.0.0-next.4',
+    DevkitBuildAngular: '^21.0.0-next.6',
+    AngularBuild: '^21.0.0-next.6',
+    AngularSSR: '^21.0.0-next.6',
 };

package/utility/project-targets.d.ts

@@ -9,3 +9,4 @@ import { SchematicsException } from '@angular-devkit/schematics';
 import { ProjectDefinition } from './workspace';
 export declare function targetBuildNotFoundError(): SchematicsException;
 export declare function isUsingApplicationBuilder(project: ProjectDefinition): boolean;
+export declare function isZonelessApp(project: ProjectDefinition): boolean;

package/utility/project-targets.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.targetBuildNotFoundError = targetBuildNotFoundError;
 exports.isUsingApplicationBuilder = isUsingApplicationBuilder;
+exports.isZonelessApp = isZonelessApp;
 const schematics_1 = require("@angular-devkit/schematics");
 const workspace_models_1 = require("./workspace-models");
 function targetBuildNotFoundError() {
@@ -19,3 +20,12 @@ function isUsingApplicationBuilder(project) {
     const isUsingApplicationBuilder = buildBuilder === workspace_models_1.Builders.Application || buildBuilder === workspace_models_1.Builders.BuildApplication;
     return isUsingApplicationBuilder;
 }
+function isZonelessApp(project) {
+    const buildTarget = project.targets.get('build');
+    if (!buildTarget?.options?.polyfills) {
+        return true;
+    }
+    const polyfills = buildTarget.options.polyfills;
+    const polyfillsList = Array.isArray(polyfills) ? polyfills : [polyfills];
+    return !polyfillsList.includes('zone.js');
+}

package/workspace/files/__dot__gitignore.template

@@ -36,6 +36,7 @@ yarn-error.log
 /libpeerconnection.log
 testem.log
 /typings
+__screenshots__/
 
 # System files
 .DS_Store

package/workspace/files/package.json.template

@@ -21,6 +21,7 @@
     ]
   },
   "private": true,
+  <% if (packageManagerWithVersion) { %>"packageManager": "<%= packageManagerWithVersion %>",<% } %>
   "dependencies": {
     "@angular/common": "<%= latestVersions.Angular %>",
     "@angular/compiler": "<%= latestVersions.Angular %>",

package/workspace/index.js

@@ -9,15 +9,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
+const node_child_process_1 = require("node:child_process");
 const latest_versions_1 = require("../utility/latest-versions");
 function default_1(options) {
-    return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
-        options.minimal ? (0, schematics_1.filter)((path) => !path.endsWith('editorconfig.template')) : (0, schematics_1.noop)(),
-        (0, schematics_1.applyTemplates)({
-            utils: schematics_1.strings,
-            ...options,
-            'dot': '.',
-            latestVersions: latest_versions_1.latestVersions,
-        }),
-    ]));
+    return () => {
+        const packageManager = options.packageManager;
+        let packageManagerWithVersion;
+        if (packageManager) {
+            let packageManagerVersion;
+            try {
+                packageManagerVersion = (0, node_child_process_1.execSync)(`${packageManager} --version`, {
+                    encoding: 'utf8',
+                    stdio: 'pipe',
+                    env: {
+                        ...process.env,
+                        //  NPM updater notifier will prevents the child process from closing until it timeout after 3 minutes.
+                        NO_UPDATE_NOTIFIER: '1',
+                        NPM_CONFIG_UPDATE_NOTIFIER: 'false',
+                    },
+                }).trim();
+            }
+            catch { }
+            if (packageManagerVersion) {
+                packageManagerWithVersion = `${packageManager}@${packageManagerVersion}`;
+            }
+        }
+        return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+            options.minimal ? (0, schematics_1.filter)((path) => !path.endsWith('editorconfig.template')) : (0, schematics_1.noop)(),
+            (0, schematics_1.applyTemplates)({
+                utils: schematics_1.strings,
+                ...options,
+                'dot': '.',
+                latestVersions: latest_versions_1.latestVersions,
+                packageManagerWithVersion,
+            }),
+        ]));
+    };
 }

package/workspace/schema.json

@@ -40,7 +40,10 @@
     "packageManager": {
       "description": "The package manager to use for installing dependencies.",
       "type": "string",
-      "enum": ["npm", "yarn", "pnpm", "bun"]
+      "enum": ["npm", "yarn", "pnpm", "bun"],
+      "$default": {
+        "$source": "packageManager"
+      }
     }
   },
   "required": ["name", "version"]