@angular/cli 20.0.4 → 20.1.0-next.1

package/lib/config/schema.json

@@ -1118,7 +1118,7 @@
         },
         "name": {
           "type": "string",
-          "description": "The name for the new component. This will be used to create the component's class, template, and stylesheet files. For example, if you provide `my-component`, the files will be named `my-component.ts`, `my-component.html`, and `my-component.css`.",
+          "description": "The name for the new component. This will be used to create the component's class, template, and stylesheet files. For example, if you provide `my-component`, the files will be named `my-component.component.ts`, `my-component.component.html`, and `my-component.component.css`.",
           "$default": {
             "$source": "argv",
             "index": 0
@@ -1131,13 +1131,13 @@
           "alias": "b"
         },
         "inlineStyle": {
-          "description": "Include the component's styles directly in the `component.ts` file. By default, a separate stylesheet file (e.g., `my-component.css`) is created.",
+          "description": "Include the component's styles directly in the `component.ts` file. By default, a separate stylesheet file (e.g., `my-component.component.css`) is created.",
           "type": "boolean",
           "default": false,
           "alias": "s"
         },
         "inlineTemplate": {
-          "description": "Include the component's HTML template directly in the `component.ts` file. By default, a separate template file (e.g., `my-component.html`) is created.",
+          "description": "Include the component's HTML template directly in the `component.ts` file. By default, a separate template file (e.g., `my-component.component.html`) is created.",
           "type": "boolean",
           "default": false,
           "alias": "t"
@@ -2240,7 +2240,7 @@
           ]
         },
         "loader": {
-          "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `empty` considers the content to be empty and not include it in bundles.",
+          "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `dataurl` inlines the content as a data URL with best guess of MIME type; `base64` inlines the content as a Base64-encoded string; `empty` considers the content to be empty and not include it in bundles.",
           "type": "object",
           "patternProperties": {
             "^\\.\\S+$": {
@@ -2248,6 +2248,8 @@
                 "text",
                 "binary",
                 "file",
+                "dataurl",
+                "base64",
                 "empty"
               ]
             }
@@ -4317,6 +4319,30 @@
           },
           "default": []
         },
+        "codeCoverageReporters": {
+          "type": "array",
+          "description": "Reporters to use for code coverage results.",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/AngularBuildBuildersUnitTestSchema/definitions/coverage-reporters"
+              },
+              {
+                "type": "array",
+                "minItems": 1,
+                "maxItems": 2,
+                "items": [
+                  {
+                    "$ref": "#/definitions/AngularBuildBuildersUnitTestSchema/definitions/coverage-reporters"
+                  },
+                  {
+                    "type": "object"
+                  }
+                ]
+              }
+            ]
+          }
+        },
         "reporters": {
           "type": "array",
           "description": "Test runner reporters to use. Directly passed to the test runner.",
@@ -4330,7 +4356,19 @@
           "minLength": 1
         }
       },
-      "additionalProperties": false
+      "additionalProperties": false,
+      "definitions": {
+        "coverage-reporters": {
+          "enum": [
+            "html",
+            "lcov",
+            "lcovonly",
+            "text",
+            "text-summary",
+            "cobertura"
+          ]
+        }
+      }
     },
     "AngularBuildBuildersKarmaSchema": {
       "title": "Karma Target",
@@ -4499,7 +4537,7 @@
           "default": []
         },
         "loader": {
-          "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `empty` considers the content to be empty and not include it in bundles.",
+          "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `dataurl` inlines the content as a data URL with best guess of MIME type; `base64` inlines the content as a Base64-encoded string; `empty` considers the content to be empty and not include it in bundles.",
           "type": "object",
           "patternProperties": {
             "^\\.\\S+$": {
@@ -4507,6 +4545,8 @@
                 "text",
                 "binary",
                 "file",
+                "dataurl",
+                "base64",
                 "empty"
               ]
             }

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

@@ -278,12 +278,12 @@ export type AngularComponentOptionsSchema = {
     flat?: boolean;
     /**
      * Include the component's styles directly in the `component.ts` file. By default, a
-     * separate stylesheet file (e.g., `my-component.css`) is created.
+     * separate stylesheet file (e.g., `my-component.component.css`) is created.
      */
     inlineStyle?: boolean;
     /**
      * Include the component's HTML template directly in the `component.ts` file. By default, a
-     * separate template file (e.g., `my-component.html`) is created.
+     * separate template file (e.g., `my-component.component.html`) is created.
      */
     inlineTemplate?: boolean;
     /**
@@ -294,7 +294,8 @@ export type AngularComponentOptionsSchema = {
     /**
      * The name for the new component. This will be used to create the component's class,
      * template, and stylesheet files. For example, if you provide `my-component`, the files
-     * will be named `my-component.ts`, `my-component.html`, and `my-component.css`.
+     * will be named `my-component.component.ts`, `my-component.component.html`, and
+     * `my-component.component.css`.
      */
     name: string;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "20.0.4",
+  "version": "20.1.0-next.1",
   "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.4",
-    "@angular-devkit/core": "20.0.4",
-    "@angular-devkit/schematics": "20.0.4",
-    "@inquirer/prompts": "7.5.1",
+    "@angular-devkit/architect": "0.2001.0-next.1",
+    "@angular-devkit/core": "20.1.0-next.1",
+    "@angular-devkit/schematics": "20.1.0-next.1",
+    "@inquirer/prompts": "7.5.3",
     "@listr2/prompt-adapter-inquirer": "2.0.22",
-    "@schematics/angular": "20.0.4",
+    "@schematics/angular": "20.1.0-next.1",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "5.0.0",
     "jsonc-parser": "3.3.1",
@@ -40,19 +40,19 @@
     "pacote": "21.0.0",
     "resolve": "1.22.10",
     "semver": "7.7.2",
-    "yargs": "17.7.2"
+    "yargs": "18.0.0"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "20.0.4",
-      "@angular/build": "20.0.4",
-      "@angular/ssr": "20.0.4",
-      "@angular-devkit/architect": "0.2000.4",
-      "@angular-devkit/build-angular": "20.0.4",
-      "@angular-devkit/build-webpack": "0.2000.4",
-      "@angular-devkit/core": "20.0.4",
-      "@angular-devkit/schematics": "20.0.4"
+      "@angular/cli": "20.1.0-next.1",
+      "@angular/build": "20.1.0-next.1",
+      "@angular/ssr": "20.1.0-next.1",
+      "@angular-devkit/architect": "0.2001.0-next.1",
+      "@angular-devkit/build-angular": "20.1.0-next.1",
+      "@angular-devkit/build-webpack": "0.2001.0-next.1",
+      "@angular-devkit/core": "20.1.0-next.1",
+      "@angular-devkit/schematics": "20.1.0-next.1"
     }
   },
   "packageManager": "pnpm@9.15.9",

package/src/command-builder/command-module.d.ts

@@ -30,6 +30,7 @@ export interface CommandContext {
     globalConfiguration: AngularWorkspace;
     logger: logging.Logger;
     packageManager: PackageManagerUtils;
+    yargsInstance: Argv<{}>;
     /** Arguments parsed in free-from without parser configuration. */
     args: {
         positional: string[];

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

@@ -73,15 +73,11 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandModuleError = exports.CommandModule = exports.CommandScope = void 0;
 const core_1 = require("@angular-devkit/core");
 const node_fs_1 = require("node:fs");
 const path = __importStar(require("node:path"));
-const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const analytics_1 = require("../analytics/analytics");
 const analytics_collector_1 = require("../analytics/analytics-collector");
@@ -232,7 +228,7 @@ let CommandModule = (() => {
         }
         reportCommandRunAnalytics(analytics) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const internalMethods = yargs_1.default.getInternalMethods();
+            const internalMethods = this.context.yargsInstance.getInternalMethods();
             // $0 generate component [name] -> generate_component
             // $0 add <collection> -> add
             const fullCommand = internalMethods.getUsageInstance().getUsage()[0][0]

package/src/command-builder/command-runner.js

@@ -45,11 +45,13 @@ async function runCommand(args, logger) {
         return 1;
     }
     const root = workspace?.basePath ?? process.cwd();
+    const localYargs = (0, yargs_1.default)(args);
     const context = {
         globalConfiguration,
         workspace,
         logger,
         currentDirectory: process.cwd(),
+        yargsInstance: localYargs,
         root,
         packageManager: new package_manager_1.PackageManagerUtils({ globalConfiguration, workspace, root }),
         args: {
@@ -62,14 +64,13 @@ async function runCommand(args, logger) {
             },
         },
     };
-    let localYargs = (0, yargs_1.default)(args);
     for (const CommandModule of await getCommandsToRegister(positional[0])) {
-        localYargs = (0, command_1.addCommandModuleToYargs)(localYargs, CommandModule, context);
+        (0, command_1.addCommandModuleToYargs)(CommandModule, context);
     }
     if (jsonHelp) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const usageInstance = localYargs.getInternalMethods().getUsageInstance();
-        usageInstance.help = () => (0, json_help_1.jsonHelpUsage)();
+        usageInstance.help = () => (0, json_help_1.jsonHelpUsage)(localYargs);
     }
     // Add default command to support version option when no subcommand is specified
     localYargs.command('*', false, (builder) => builder.version('version', 'Show Angular CLI version.', version_1.VERSION.full));
@@ -104,7 +105,7 @@ async function runCommand(args, logger) {
         .epilogue('For more information, see https://angular.dev/cli/.\n')
         .demandCommand(1, command_1.demandCommandFailureMessage)
         .recommendCommands()
-        .middleware(normalize_options_middleware_1.normalizeOptionsMiddleware)
+        .middleware((0, normalize_options_middleware_1.createNormalizeOptionsMiddleware)(localYargs))
         .version(false)
         .showHelpOnFail(false)
         .strict()

package/src/command-builder/utilities/command.d.ts

@@ -5,10 +5,9 @@
  * 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 { Argv } from 'yargs';
 import { CommandContext, CommandModule, CommandModuleImplementation } from '../command-module';
 export declare const demandCommandFailureMessage = "You need to specify a command before moving on. Use '--help' to view the available commands.";
 export type CommandModuleConstructor = Partial<CommandModuleImplementation> & {
     new (context: CommandContext): Partial<CommandModuleImplementation> & CommandModule;
 };
-export declare function addCommandModuleToYargs<T extends object, U extends CommandModuleConstructor>(localYargs: Argv<T>, commandModule: U, context: CommandContext): Argv<T>;
+export declare function addCommandModuleToYargs<U extends CommandModuleConstructor>(commandModule: U, context: CommandContext): void;

package/src/command-builder/utilities/command.js

@@ -11,11 +11,11 @@ exports.demandCommandFailureMessage = void 0;
 exports.addCommandModuleToYargs = addCommandModuleToYargs;
 const command_module_1 = require("../command-module");
 exports.demandCommandFailureMessage = `You need to specify a command before moving on. Use '--help' to view the available commands.`;
-function addCommandModuleToYargs(localYargs, commandModule, context) {
+function addCommandModuleToYargs(commandModule, context) {
     const cmd = new commandModule(context);
     const { args: { options: { jsonHelp }, }, workspace, } = context;
     const describe = jsonHelp ? cmd.fullDescribe : cmd.describe;
-    return localYargs.command({
+    context.yargsInstance.command({
         command: cmd.command,
         aliases: cmd.aliases,
         describe: 

package/src/command-builder/utilities/json-help.d.ts

@@ -5,6 +5,7 @@
  * 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 { Argv } from 'yargs';
 interface JsonHelpOption {
     name: string;
     type?: string;
@@ -32,5 +33,5 @@ export interface JsonHelp extends JsonHelpDescription {
     options: JsonHelpOption[];
     subcommands?: JsonHelpSubcommand[];
 }
-export declare function jsonHelpUsage(): string;
+export declare function jsonHelpUsage(localYargs: Argv): string;
 export {};

package/src/command-builder/utilities/json-help.js

@@ -6,22 +6,18 @@
  * 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.jsonHelpUsage = jsonHelpUsage;
-const yargs_1 = __importDefault(require("yargs"));
 const yargsDefaultCommandRegExp = /^\$0|\*/;
-function jsonHelpUsage() {
+function jsonHelpUsage(localYargs) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const localYargs = yargs_1.default;
-    const { deprecatedOptions, alias: aliases, array, string, boolean, number, choices, demandedOptions, default: defaultVal, hiddenOptions = [], } = localYargs.getOptions();
-    const internalMethods = localYargs.getInternalMethods();
+    const localYargsInstance = localYargs;
+    const { deprecatedOptions, alias: aliases, array, string, boolean, number, choices, demandedOptions, default: defaultVal, hiddenOptions = [], } = localYargsInstance.getOptions();
+    const internalMethods = localYargsInstance.getInternalMethods();
     const usageInstance = internalMethods.getUsageInstance();
     const context = internalMethods.getContext();
     const descriptions = usageInstance.getDescriptions();
-    const groups = localYargs.getGroups();
+    const groups = localYargsInstance.getGroups();
     const positional = groups[usageInstance.getPositionalGroupName()];
     const hidden = new Set(hiddenOptions);
     const normalizeOptions = [];
@@ -68,7 +64,7 @@ function jsonHelpUsage() {
     const otherSubcommands = subcommands.filter((s) => !s.default);
     const output = {
         name: [...context.commands].pop(),
-        command: `${command?.replace(yargsDefaultCommandRegExp, localYargs['$0'])}${defaultSubCommand}`,
+        command: `${command?.replace(yargsDefaultCommandRegExp, localYargsInstance['$0'])}${defaultSubCommand}`,
         ...parseDescription(rawDescription),
         options: normalizeOptions.sort((a, b) => a.name.localeCompare(b.name)),
         subcommands: otherSubcommands.length ? otherSubcommands : undefined,

package/src/command-builder/utilities/normalize-options-middleware.d.ts

@@ -5,7 +5,7 @@
  * 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 * as yargs from 'yargs';
+import type { Arguments, Argv } from 'yargs';
 /**
  * A Yargs middleware that normalizes non Array options when the argument has been provided multiple times.
  *
@@ -15,4 +15,4 @@ import * as yargs from 'yargs';
  *
  * See: https://github.com/yargs/yargs-parser/pull/163#issuecomment-516566614
  */
-export declare function normalizeOptionsMiddleware(args: yargs.Arguments): void;
+export declare function createNormalizeOptionsMiddleware(localeYargs: Argv): (args: Arguments) => void;

package/src/command-builder/utilities/normalize-options-middleware.js

@@ -6,42 +6,8 @@
  * 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.normalizeOptionsMiddleware = normalizeOptionsMiddleware;
-const yargs = __importStar(require("yargs"));
+exports.createNormalizeOptionsMiddleware = createNormalizeOptionsMiddleware;
 /**
  * A Yargs middleware that normalizes non Array options when the argument has been provided multiple times.
  *
@@ -51,18 +17,20 @@ const yargs = __importStar(require("yargs"));
  *
  * See: https://github.com/yargs/yargs-parser/pull/163#issuecomment-516566614
  */
-function normalizeOptionsMiddleware(args) {
-    // `getOptions` is not included in the types even though it's public API.
-    // https://github.com/yargs/yargs/issues/2098
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const { array } = yargs.getOptions();
-    const arrayOptions = new Set(array);
-    for (const [key, value] of Object.entries(args)) {
-        if (key !== '_' && Array.isArray(value) && !arrayOptions.has(key)) {
-            const newValue = value.pop();
-            // eslint-disable-next-line no-console
-            console.warn(`Option '${key}' has been specified multiple times. The value '${newValue}' will be used.`);
-            args[key] = newValue;
+function createNormalizeOptionsMiddleware(localeYargs) {
+    return (args) => {
+        // `getOptions` is not included in the types even though it's public API.
+        // https://github.com/yargs/yargs/issues/2098
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const { array } = localeYargs.getOptions();
+        const arrayOptions = new Set(array);
+        for (const [key, value] of Object.entries(args)) {
+            if (key !== '_' && Array.isArray(value) && !arrayOptions.has(key)) {
+                const newValue = value.pop();
+                // eslint-disable-next-line no-console
+                console.warn(`Option '${key}' has been specified multiple times. The value '${newValue}' will be used.`);
+                args[key] = newValue;
+            }
         }
-    }
+    };
 }

package/src/commands/analytics/cli.js

@@ -24,7 +24,7 @@ class AnalyticsCommandModule extends command_module_1.CommandModule {
             cli_2.AnalyticsPromptModule,
         ].sort(); // sort by class name.
         for (const module of subcommands) {
-            localYargs = (0, command_1.addCommandModuleToYargs)(localYargs, module, this.context);
+            (0, command_1.addCommandModuleToYargs)(module, this.context);
         }
         return localYargs.demandCommand(1, command_1.demandCommandFailureMessage).strict();
     }

package/src/commands/cache/cli.js

@@ -26,7 +26,7 @@ class CacheCommandModule extends command_module_1.CommandModule {
             cli_2.CacheInfoCommandModule,
         ].sort();
         for (const module of subcommands) {
-            localYargs = (0, command_1.addCommandModuleToYargs)(localYargs, module, this.context);
+            (0, command_1.addCommandModuleToYargs)(module, this.context);
         }
         return localYargs.demandCommand(1, command_1.demandCommandFailureMessage).strict();
     }

package/src/commands/completion/cli.js

@@ -6,12 +6,8 @@
  * 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 });
 const node_path_1 = require("node:path");
-const yargs_1 = __importDefault(require("yargs"));
 const command_module_1 = require("../../command-builder/command-module");
 const command_1 = require("../../command-builder/utilities/command");
 const color_1 = require("../../utilities/color");
@@ -22,7 +18,8 @@ class CompletionCommandModule extends command_module_1.CommandModule {
     describe = 'Set up Angular CLI autocompletion for your terminal.';
     longDescriptionPath = (0, node_path_1.join)(__dirname, 'long-description.md');
     builder(localYargs) {
-        return (0, command_1.addCommandModuleToYargs)(localYargs, CompletionScriptCommandModule, this.context);
+        (0, command_1.addCommandModuleToYargs)(CompletionScriptCommandModule, this.context);
+        return localYargs;
     }
     async run() {
         let rcFile;
@@ -58,6 +55,6 @@ class CompletionScriptCommandModule extends command_module_1.CommandModule {
         return localYargs;
     }
     run() {
-        yargs_1.default.showCompletionScript();
+        this.context.yargsInstance.showCompletionScript();
     }
 }

package/src/utilities/version.js

@@ -22,4 +22,4 @@ class Version {
         this.patch = patch;
     }
 }
-exports.VERSION = new Version('20.0.4');
+exports.VERSION = new Version('20.1.0-next.1');