@angular/cli 20.0.0-next.0 → 20.0.0-next.2

package/lib/config/schema.json

@@ -1023,10 +1023,6 @@
           "type": "boolean",
           "default": false
         },
-        "serverRouting": {
-          "description": "Set up a server application using the Server Routing and App Engine APIs (Developer Preview).",
-          "type": "boolean"
-        },
         "experimentalZoneless": {
           "description": "Generate an application that does not use `zone.js`.",
           "type": "boolean",
@@ -1176,8 +1172,7 @@
         },
         "type": {
           "type": "string",
-          "description": "Append a custom type to the component's filename. For example, if you set the type to `container`, the file will be named `my-component.container.ts`.",
-          "default": "Component"
+          "description": "Append a custom type to the component's filename. For example, if you set the type to `container`, the file will be named `my-component.container.ts`."
         },
         "skipTests": {
           "type": "boolean",
@@ -1218,6 +1213,11 @@
           "type": "boolean",
           "default": false,
           "description": "Use a default export for the component in its TypeScript file instead of a named export."
+        },
+        "ngHtml": {
+          "type": "boolean",
+          "default": true,
+          "description": "Generate component template files with an '.ng.html' file extension instead of '.html'. The '.ng.html' file extension is recommended by the Angular style guide."
         }
       }
     },
@@ -1299,6 +1299,10 @@
           "type": "boolean",
           "default": false,
           "description": "Automatically export the directive from the specified NgModule, making it accessible to other modules in the application."
+        },
+        "type": {
+          "type": "string",
+          "description": "Append a custom type to the directive's filename. For example, if you set the type to `directive`, the file will be named `example.directive.ts`."
         }
       }
     },
@@ -1759,10 +1763,6 @@
           "description": "Configure the initial application for Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering).",
           "type": "boolean"
         },
-        "serverRouting": {
-          "description": "Create a server application in the initial project using the Server Routing and App Engine APIs (Developer Preview).",
-          "type": "boolean"
-        },
         "experimentalZoneless": {
           "description": "Create an initial application that does not utilize `zone.js`.",
           "type": "boolean",
@@ -1855,6 +1855,10 @@
           "type": "boolean",
           "description": "Skip the generation of a unit test file `spec.ts` for the service.",
           "default": false
+        },
+        "type": {
+          "type": "string",
+          "description": "Append a custom type to the service's filename. For example, if you set the type to `service`, the file will be named `my-service.service.ts`."
         }
       }
     },
@@ -2095,7 +2099,7 @@
           "additionalProperties": false
         },
         "externalDependencies": {
-          "description": "Exclude the listed external dependencies from being bundled into the bundle. Instead, the created bundle relies on these dependencies to be available during runtime.",
+          "description": "Exclude the listed external dependencies from being bundled into the bundle. Instead, the created bundle relies on these dependencies to be available during runtime. Note: `@foo/bar` marks all paths within the `@foo/bar` package as external, including sub-paths like `@foo/bar/baz`.",
           "type": "array",
           "items": {
             "type": "string"
@@ -3919,7 +3923,7 @@
               "type": "object",
               "properties": {
                 "exclude": {
-                  "description": "List of package imports that should not be prebundled by the development server. The packages will be bundled into the application code itself.",
+                  "description": "List of package imports that should not be prebundled by the development server. The packages will be bundled into the application code itself. Note: specifying `@foo/bar` marks all paths within the `@foo/bar` package as excluded, including sub-paths like `@foo/bar/baz`.",
                   "type": "array",
                   "items": {
                     "type": "string"
@@ -4044,7 +4048,7 @@
         },
         "forceEsbuild": {
           "type": "boolean",
-          "description": "Force the development server to use the 'browser-esbuild' builder when building. This is a developer preview option for the esbuild-based build system.",
+          "description": "Force the development server to use the 'browser-esbuild' builder when building.",
           "default": false
         },
         "prebundle": {

package/lib/config/workspace-schema.d.ts

@@ -148,11 +148,6 @@ export type AngularApplicationOptionsSchema = {
      * and modules for managing navigation between different views in your application.
      */
     routing?: boolean;
-    /**
-     * Set up a server application using the Server Routing and App Engine APIs (Developer
-     * Preview).
-     */
-    serverRouting?: boolean;
     /**
      * Skip the automatic installation of packages. You will need to manually install the
      * dependencies later.
@@ -303,6 +298,11 @@ export type AngularComponentOptionsSchema = {
      * `my-component.component.css`.
      */
     name: string;
+    /**
+     * Generate component template files with an '.ng.html' file extension instead of '.html'.
+     * The '.ng.html' file extension is recommended by the Angular style guide.
+     */
+    ngHtml?: boolean;
     /**
      * The path where the component files should be created, relative to the current workspace.
      * If not provided, a folder with the same name as the component will be created in the
@@ -437,6 +437,11 @@ export type AngularDirectiveOptionsSchema = {
      * other standalone components or directives.
      */
     standalone?: boolean;
+    /**
+     * Append a custom type to the directive's filename. For example, if you set the type to
+     * `directive`, the file will be named `example.directive.ts`.
+     */
+    type?: string;
 };
 /**
  * Creates a new enum in your project. Enums (enumerations) are a way to define a set of
@@ -703,11 +708,6 @@ export type AngularNgNewOptionsSchema = {
      * modules for managing navigation between different views in your application.
      */
     routing?: boolean;
-    /**
-     * Create a server application in the initial project using the Server Routing and App
-     * Engine APIs (Developer Preview).
-     */
-    serverRouting?: boolean;
     /**
      * Do not initialize a Git repository in the new workspace. By default, a Git repository is
      * initialized to help you track changes to your project.
@@ -882,6 +882,11 @@ export type AngularServiceOptionsSchema = {
      * Skip the generation of a unit test file `spec.ts` for the service.
      */
     skipTests?: boolean;
+    /**
+     * Append a custom type to the service's filename. For example, if you set the type to
+     * `service`, the file will be named `my-service.service.ts`.
+     */
+    type?: string;
 };
 /**
  * Creates a new web worker in your project. Web workers allow you to run JavaScript code in

package/lib/init.js

@@ -42,7 +42,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 require("symbol-observable");
 // symbol polyfill must go first
-const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const node_module_1 = require("node:module");
 const path = __importStar(require("node:path"));
 const semver_1 = require("semver");
@@ -89,7 +89,7 @@ let forceExit = false;
         let localVersion = cli.VERSION?.full;
         if (!localVersion) {
             try {
-                const localPackageJson = await node_fs_1.promises.readFile(path.join(path.dirname(projectLocalCli), '../../package.json'), 'utf-8');
+                const localPackageJson = await (0, promises_1.readFile)(path.join(path.dirname(projectLocalCli), '../../package.json'), 'utf-8');
                 localVersion = JSON.parse(localPackageJson).version;
             }
             catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "20.0.0-next.0",
+  "version": "20.0.0-next.2",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,12 +25,12 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.2000.0-next.0",
-    "@angular-devkit/core": "20.0.0-next.0",
-    "@angular-devkit/schematics": "20.0.0-next.0",
-    "@inquirer/prompts": "7.3.2",
+    "@angular-devkit/architect": "0.2000.0-next.2",
+    "@angular-devkit/core": "20.0.0-next.2",
+    "@angular-devkit/schematics": "20.0.0-next.2",
+    "@inquirer/prompts": "7.4.0",
     "@listr2/prompt-adapter-inquirer": "2.0.18",
-    "@schematics/angular": "20.0.0-next.0",
+    "@schematics/angular": "20.0.0-next.2",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "5.0.0",
     "jsonc-parser": "3.3.1",
@@ -46,16 +46,17 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "20.0.0-next.0",
-      "@angular/build": "20.0.0-next.0",
-      "@angular/ssr": "20.0.0-next.0",
-      "@angular-devkit/architect": "0.2000.0-next.0",
-      "@angular-devkit/build-angular": "20.0.0-next.0",
-      "@angular-devkit/build-webpack": "0.2000.0-next.0",
-      "@angular-devkit/core": "20.0.0-next.0",
-      "@angular-devkit/schematics": "20.0.0-next.0"
+      "@angular/cli": "20.0.0-next.2",
+      "@angular/build": "20.0.0-next.2",
+      "@angular/ssr": "20.0.0-next.2",
+      "@angular-devkit/architect": "0.2000.0-next.2",
+      "@angular-devkit/build-angular": "20.0.0-next.2",
+      "@angular-devkit/build-webpack": "0.2000.0-next.2",
+      "@angular-devkit/core": "20.0.0-next.2",
+      "@angular-devkit/schematics": "20.0.0-next.2"
     }
   },
+  "packageManager": "pnpm@9.15.6",
   "engines": {
     "node": "^20.11.1 || >=22.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/src/command-builder/schematics-command-module.js

@@ -178,21 +178,16 @@ let SchematicsCommandModule = (() => {
             workflow.registry.addSmartDefaultProvider('projectName', () => this.getProjectName());
             const workingDir = (0, core_1.normalize)((0, node_path_1.relative)(this.context.root, process.cwd()));
             workflow.registry.addSmartDefaultProvider('workingDirectory', () => workingDir === '' ? undefined : workingDir);
-            let shouldReportAnalytics = true;
             workflow.engineHost.registerOptionsTransform(async (schematic, options) => {
-                // Report analytics
-                if (shouldReportAnalytics) {
-                    shouldReportAnalytics = false;
-                    const { collection: { name: collectionName }, name: schematicName, } = schematic;
-                    const analytics = (0, analytics_1.isPackageNameSafeForAnalytics)(collectionName)
-                        ? await this.getAnalytics()
-                        : undefined;
-                    analytics?.reportSchematicRunEvent({
-                        [analytics_parameters_1.EventCustomDimension.SchematicCollectionName]: collectionName,
-                        [analytics_parameters_1.EventCustomDimension.SchematicName]: schematicName,
-                        ...this.getAnalyticsParameters(options),
-                    });
-                }
+                const { collection: { name: collectionName }, name: schematicName, } = schematic;
+                const analytics = (0, analytics_1.isPackageNameSafeForAnalytics)(collectionName)
+                    ? await this.getAnalytics()
+                    : undefined;
+                analytics?.reportSchematicRunEvent({
+                    [analytics_parameters_1.EventCustomDimension.SchematicCollectionName]: collectionName,
+                    [analytics_parameters_1.EventCustomDimension.SchematicName]: schematicName,
+                    ...this.getAnalyticsParameters(options),
+                });
                 return options;
             });
             if (options.interactive !== false && (0, tty_1.isTTY)()) {

package/src/commands/cache/clean/cli.js

@@ -8,7 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheCleanModule = void 0;
-const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const command_module_1 = require("../../../command-builder/command-module");
 const utilities_1 = require("../utilities");
 class CacheCleanModule extends command_module_1.CommandModule {
@@ -21,7 +21,7 @@ class CacheCleanModule extends command_module_1.CommandModule {
     }
     run() {
         const { path } = (0, utilities_1.getCacheConfig)(this.context.workspace);
-        return node_fs_1.promises.rm(path, {
+        return (0, promises_1.rm)(path, {
             force: true,
             recursive: true,
             maxRetries: 3,

package/src/commands/cache/info/cli.js

@@ -6,10 +6,43 @@
  * 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.CacheInfoCommandModule = void 0;
 const core_1 = require("@angular-devkit/core");
-const node_fs_1 = require("node:fs");
+const fs = __importStar(require("node:fs/promises"));
 const node_path_1 = require("node:path");
 const command_module_1 = require("../../../command-builder/command-module");
 const environment_options_1 = require("../../../utilities/environment-options");
@@ -40,12 +73,12 @@ class CacheInfoCommandModule extends command_module_1.CommandModule {
             const dirPath = directoriesStack.pop();
             let entries = [];
             try {
-                entries = await node_fs_1.promises.readdir(dirPath);
+                entries = await fs.readdir(dirPath);
             }
             catch { }
             for (const entry of entries) {
                 const entryPath = (0, node_path_1.join)(dirPath, entry);
-                const stats = await node_fs_1.promises.stat(entryPath);
+                const stats = await fs.stat(entryPath);
                 if (stats.isDirectory()) {
                     directoriesStack.push(entryPath);
                 }

package/src/utilities/completion.js

@@ -45,7 +45,7 @@ exports.initializeAutocomplete = initializeAutocomplete;
 exports.hasGlobalCliInstall = hasGlobalCliInstall;
 const core_1 = require("@angular-devkit/core");
 const node_child_process_1 = require("node:child_process");
-const node_fs_1 = require("node:fs");
+const fs = __importStar(require("node:fs/promises"));
 const path = __importStar(require("node:path"));
 const node_process_1 = require("node:process");
 const color_1 = require("../utilities/color");
@@ -162,7 +162,7 @@ async function shouldPromptForAutocompletionSetup(command, config) {
     }
     // Check each RC file if they already use `ng completion script` in any capacity and don't prompt.
     for (const rcFile of rcFiles) {
-        const contents = await node_fs_1.promises.readFile(rcFile, 'utf-8').catch(() => undefined);
+        const contents = await fs.readFile(rcFile, 'utf-8').catch(() => undefined);
         if (contents?.includes('ng completion script')) {
             return false;
         }
@@ -206,11 +206,11 @@ async function initializeAutocomplete() {
         throw new Error(`Unknown \`$SHELL\` environment variable value (${shell}). Angular CLI autocompletion only supports Bash or Zsh.`);
     }
     // Get the first file that already exists or fallback to a new file of the first candidate.
-    const candidates = await Promise.allSettled(runCommandCandidates.map((rcFile) => node_fs_1.promises.access(rcFile).then(() => rcFile)));
+    const candidates = await Promise.allSettled(runCommandCandidates.map((rcFile) => fs.access(rcFile).then(() => rcFile)));
     const rcFile = candidates.find((result) => result.status === 'fulfilled')?.value ?? runCommandCandidates[0];
     // Append Angular autocompletion setup to RC file.
     try {
-        await node_fs_1.promises.appendFile(rcFile, '\n\n# Load Angular CLI autocompletion.\nsource <(ng completion script)\n');
+        await fs.appendFile(rcFile, '\n\n# Load Angular CLI autocompletion.\nsource <(ng completion script)\n');
     }
     catch (err) {
         (0, error_1.assertIsError)(err);

package/src/utilities/version.js

@@ -22,4 +22,4 @@ class Version {
         this.patch = patch;
     }
 }
-exports.VERSION = new Version('20.0.0-next.0');
+exports.VERSION = new Version('20.0.0-next.2');