@angular/cli 18.1.0-next.3 → 18.1.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "18.1.0-next.3",
+  "version": "18.1.0-rc.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,16 +25,16 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1801.0-next.3",
-    "@angular-devkit/core": "18.1.0-next.3",
-    "@angular-devkit/schematics": "18.1.0-next.3",
+    "@angular-devkit/architect": "0.1801.0-rc.0",
+    "@angular-devkit/core": "18.1.0-rc.0",
+    "@angular-devkit/schematics": "18.1.0-rc.0",
     "@inquirer/prompts": "5.0.6",
-    "@listr2/prompt-adapter-inquirer": "2.0.12",
-    "@schematics/angular": "18.1.0-next.3",
+    "@listr2/prompt-adapter-inquirer": "2.0.13",
+    "@schematics/angular": "18.1.0-rc.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "4.1.3",
-    "jsonc-parser": "3.2.1",
-    "listr2": "8.2.2",
+    "jsonc-parser": "3.3.1",
+    "listr2": "8.2.3",
     "npm-package-arg": "11.0.2",
     "npm-pick-manifest": "9.0.1",
     "pacote": "18.0.6",
@@ -46,14 +46,14 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "18.1.0-next.3",
-      "@angular/build": "18.1.0-next.3",
-      "@angular/ssr": "18.1.0-next.3",
-      "@angular-devkit/architect": "0.1801.0-next.3",
-      "@angular-devkit/build-angular": "18.1.0-next.3",
-      "@angular-devkit/build-webpack": "0.1801.0-next.3",
-      "@angular-devkit/core": "18.1.0-next.3",
-      "@angular-devkit/schematics": "18.1.0-next.3"
+      "@angular/cli": "18.1.0-rc.0",
+      "@angular/build": "18.1.0-rc.0",
+      "@angular/ssr": "18.1.0-rc.0",
+      "@angular-devkit/architect": "0.1801.0-rc.0",
+      "@angular-devkit/build-angular": "18.1.0-rc.0",
+      "@angular-devkit/build-webpack": "0.1801.0-rc.0",
+      "@angular-devkit/core": "18.1.0-rc.0",
+      "@angular-devkit/schematics": "18.1.0-rc.0"
     }
   },
   "packageManager": "yarn@4.3.0",

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

@@ -47,7 +47,7 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
     scope = command_module_1.CommandScope.In;
     missingTargetChoices;
     async runSingleTarget(target, options) {
-        const architectHost = await this.getArchitectHost();
+        const architectHost = this.getArchitectHost();
         let builderName;
         try {
             builderName = await architectHost.getBuilderNameForTarget(target);

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

@@ -6,14 +6,39 @@
  * 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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArchitectCommandModule = void 0;
@@ -21,133 +46,142 @@ const config_1 = require("../utilities/config");
 const memoize_1 = require("../utilities/memoize");
 const architect_base_command_module_1 = require("./architect-base-command-module");
 const command_module_1 = require("./command-module");
-class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBaseCommandModule {
-    async builder(argv) {
-        const project = this.getArchitectProject();
-        const { jsonHelp, getYargsCompletions, help } = this.context.args.options;
-        const localYargs = argv
-            .positional('project', {
-            describe: 'The name of the project to build. Can be an application or a library.',
-            type: 'string',
-            // Hide choices from JSON help so that we don't display them in AIO.
-            choices: jsonHelp ? undefined : this.getProjectChoices(),
-        })
-            .option('configuration', {
-            describe: `One or more named builder configurations as a comma-separated ` +
-                `list as specified in the "configurations" section in angular.json.\n` +
-                `The builder uses the named configurations to run the given target.\n` +
-                `For more information, see https://angular.dev/reference/configs/workspace-config#alternate-build-configurations.`,
-            alias: 'c',
-            type: 'string',
-            // Show only in when using --help and auto completion because otherwise comma seperated configuration values will be invalid.
-            // Also, hide choices from JSON help so that we don't display them in AIO.
-            choices: (getYargsCompletions || help) && !jsonHelp && project
-                ? this.getConfigurationChoices(project)
-                : undefined,
-        })
-            .strict();
-        if (!project) {
-            return localYargs;
+let ArchitectCommandModule = (() => {
+    let _classSuper = architect_base_command_module_1.ArchitectBaseCommandModule;
+    let _instanceExtraInitializers = [];
+    let _getProjectNamesByTarget_decorators;
+    return class ArchitectCommandModule extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getProjectNamesByTarget_decorators = [memoize_1.memoize];
+            __esDecorate(this, null, _getProjectNamesByTarget_decorators, { kind: "method", name: "getProjectNamesByTarget", static: false, private: false, access: { has: obj => "getProjectNamesByTarget" in obj, get: obj => obj.getProjectNamesByTarget }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
-        const target = this.getArchitectTarget();
-        const schemaOptions = await this.getArchitectTargetOptions({
-            project,
-            target,
-        });
-        return this.addSchemaOptionsToCommand(localYargs, schemaOptions);
-    }
-    async run(options) {
-        const target = this.getArchitectTarget();
-        const { configuration = '', project, ...architectOptions } = options;
-        if (!project) {
-            // This runs each target sequentially.
-            // Running them in parallel would jumble the log messages.
-            let result = 0;
-            const projectNames = this.getProjectNamesByTarget(target);
-            if (!projectNames) {
-                return this.onMissingTarget('Cannot determine project or target for command.');
-            }
-            for (const project of projectNames) {
-                result |= await this.runSingleTarget({ configuration, target, project }, architectOptions);
+        async builder(argv) {
+            const project = this.getArchitectProject();
+            const { jsonHelp, getYargsCompletions, help } = this.context.args.options;
+            const localYargs = argv
+                .positional('project', {
+                describe: 'The name of the project to build. Can be an application or a library.',
+                type: 'string',
+                // Hide choices from JSON help so that we don't display them in AIO.
+                choices: jsonHelp ? undefined : this.getProjectChoices(),
+            })
+                .option('configuration', {
+                describe: `One or more named builder configurations as a comma-separated ` +
+                    `list as specified in the "configurations" section in angular.json.\n` +
+                    `The builder uses the named configurations to run the given target.\n` +
+                    `For more information, see https://angular.dev/reference/configs/workspace-config#alternate-build-configurations.`,
+                alias: 'c',
+                type: 'string',
+                // Show only in when using --help and auto completion because otherwise comma seperated configuration values will be invalid.
+                // Also, hide choices from JSON help so that we don't display them in AIO.
+                choices: (getYargsCompletions || help) && !jsonHelp && project
+                    ? this.getConfigurationChoices(project)
+                    : undefined,
+            })
+                .strict();
+            if (!project) {
+                return localYargs;
             }
-            return result;
-        }
-        else {
-            return await this.runSingleTarget({ configuration, target, project }, architectOptions);
+            const target = this.getArchitectTarget();
+            const schemaOptions = await this.getArchitectTargetOptions({
+                project,
+                target,
+            });
+            return this.addSchemaOptionsToCommand(localYargs, schemaOptions);
         }
-    }
-    getArchitectProject() {
-        const { options, positional } = this.context.args;
-        const [, projectName] = positional;
-        if (projectName) {
-            return projectName;
-        }
-        // Yargs allows positional args to be used as flags.
-        if (typeof options['project'] === 'string') {
-            return options['project'];
-        }
-        const target = this.getArchitectTarget();
-        const projectFromTarget = this.getProjectNamesByTarget(target);
-        return projectFromTarget?.length ? projectFromTarget[0] : undefined;
-    }
-    getProjectNamesByTarget(target) {
-        const workspace = this.getWorkspaceOrThrow();
-        const allProjectsForTargetName = [];
-        for (const [name, project] of workspace.projects) {
-            if (project.targets.has(target)) {
-                allProjectsForTargetName.push(name);
+        async run(options) {
+            const target = this.getArchitectTarget();
+            const { configuration = '', project, ...architectOptions } = options;
+            if (!project) {
+                // This runs each target sequentially.
+                // Running them in parallel would jumble the log messages.
+                let result = 0;
+                const projectNames = this.getProjectNamesByTarget(target);
+                if (!projectNames) {
+                    return this.onMissingTarget('Cannot determine project or target for command.');
+                }
+                for (const project of projectNames) {
+                    result |= await this.runSingleTarget({ configuration, target, project }, architectOptions);
+                }
+                return result;
+            }
+            else {
+                return await this.runSingleTarget({ configuration, target, project }, architectOptions);
             }
         }
-        if (allProjectsForTargetName.length === 0) {
-            return undefined;
-        }
-        if (this.multiTarget) {
-            // For multi target commands, we always list all projects that have the target.
-            return allProjectsForTargetName;
+        getArchitectProject() {
+            const { options, positional } = this.context.args;
+            const [, projectName] = positional;
+            if (projectName) {
+                return projectName;
+            }
+            // Yargs allows positional args to be used as flags.
+            if (typeof options['project'] === 'string') {
+                return options['project'];
+            }
+            const target = this.getArchitectTarget();
+            const projectFromTarget = this.getProjectNamesByTarget(target);
+            return projectFromTarget?.length ? projectFromTarget[0] : undefined;
         }
-        else {
-            if (allProjectsForTargetName.length === 1) {
+        getProjectNamesByTarget(target) {
+            const workspace = this.getWorkspaceOrThrow();
+            const allProjectsForTargetName = [];
+            for (const [name, project] of workspace.projects) {
+                if (project.targets.has(target)) {
+                    allProjectsForTargetName.push(name);
+                }
+            }
+            if (allProjectsForTargetName.length === 0) {
+                return undefined;
+            }
+            if (this.multiTarget) {
+                // For multi target commands, we always list all projects that have the target.
                 return allProjectsForTargetName;
             }
-            const maybeProject = (0, config_1.getProjectByCwd)(workspace);
-            if (maybeProject) {
-                return allProjectsForTargetName.includes(maybeProject) ? [maybeProject] : undefined;
+            else {
+                if (allProjectsForTargetName.length === 1) {
+                    return allProjectsForTargetName;
+                }
+                const maybeProject = (0, config_1.getProjectByCwd)(workspace);
+                if (maybeProject) {
+                    return allProjectsForTargetName.includes(maybeProject) ? [maybeProject] : undefined;
+                }
+                const { getYargsCompletions, help } = this.context.args.options;
+                if (!getYargsCompletions && !help) {
+                    // Only issue the below error when not in help / completion mode.
+                    throw new command_module_1.CommandModuleError('Cannot determine project for command.\n' +
+                        'This is a multi-project workspace and more than one project supports this command. ' +
+                        `Run "ng ${this.command}" to execute the command for a specific project or change the current ` +
+                        'working directory to a project directory.\n\n' +
+                        `Available projects are:\n${allProjectsForTargetName
+                            .sort()
+                            .map((p) => `- ${p}`)
+                            .join('\n')}`);
+                }
             }
-            const { getYargsCompletions, help } = this.context.args.options;
-            if (!getYargsCompletions && !help) {
-                // Only issue the below error when not in help / completion mode.
-                throw new command_module_1.CommandModuleError('Cannot determine project for command.\n' +
-                    'This is a multi-project workspace and more than one project supports this command. ' +
-                    `Run "ng ${this.command}" to execute the command for a specific project or change the current ` +
-                    'working directory to a project directory.\n\n' +
-                    `Available projects are:\n${allProjectsForTargetName
-                        .sort()
-                        .map((p) => `- ${p}`)
-                        .join('\n')}`);
+            return undefined;
+        }
+        /** @returns a sorted list of project names to be used for auto completion. */
+        getProjectChoices() {
+            const { workspace } = this.context;
+            return workspace ? [...workspace.projects.keys()].sort() : undefined;
+        }
+        /** @returns a sorted list of configuration names to be used for auto completion. */
+        getConfigurationChoices(project) {
+            const projectDefinition = this.context.workspace?.projects.get(project);
+            if (!projectDefinition) {
+                return undefined;
             }
+            const target = this.getArchitectTarget();
+            const configurations = projectDefinition.targets.get(target)?.configurations;
+            return configurations ? Object.keys(configurations).sort() : undefined;
         }
-        return undefined;
-    }
-    /** @returns a sorted list of project names to be used for auto completion. */
-    getProjectChoices() {
-        const { workspace } = this.context;
-        return workspace ? [...workspace.projects.keys()].sort() : undefined;
-    }
-    /** @returns a sorted list of configuration names to be used for auto completion. */
-    getConfigurationChoices(project) {
-        const projectDefinition = this.context.workspace?.projects.get(project);
-        if (!projectDefinition) {
-            return undefined;
+        constructor() {
+            super(...arguments);
+            __runInitializers(this, _instanceExtraInitializers);
         }
-        const target = this.getArchitectTarget();
-        const configurations = projectDefinition.targets.get(target)?.configurations;
-        return configurations ? Object.keys(configurations).sort() : undefined;
-    }
-}
+    };
+})();
 exports.ArchitectCommandModule = ArchitectCommandModule;
-__decorate([
-    memoize_1.memoize,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Object)
-], ArchitectCommandModule.prototype, "getProjectNamesByTarget", null);