@angular/cli 18.0.0-rc.2 → 18.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "18.0.0-rc.2",
+  "version": "18.0.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,35 +25,35 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1800.0-rc.2",
-    "@angular-devkit/core": "18.0.0-rc.2",
-    "@angular-devkit/schematics": "18.0.0-rc.2",
-    "@schematics/angular": "18.0.0-rc.2",
+    "@angular-devkit/architect": "0.1800.0",
+    "@angular-devkit/core": "18.0.0",
+    "@angular-devkit/schematics": "18.0.0",
+    "@schematics/angular": "18.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "ini": "4.1.2",
-    "inquirer": "9.2.20",
+    "inquirer": "9.2.22",
     "jsonc-parser": "3.2.1",
     "npm-package-arg": "11.0.2",
     "npm-pick-manifest": "9.0.1",
     "ora": "5.4.1",
     "pacote": "18.0.6",
     "resolve": "1.22.8",
-    "semver": "7.6.1",
+    "semver": "7.6.2",
     "symbol-observable": "4.0.0",
     "yargs": "17.7.2"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/build": "18.0.0-rc.2",
-      "@angular/cli": "18.0.0-rc.2",
-      "@angular/ssr": "18.0.0-rc.2",
-      "@angular-devkit/architect": "0.1800.0-rc.2",
-      "@angular-devkit/build-angular": "18.0.0-rc.2",
-      "@angular-devkit/build-webpack": "0.1800.0-rc.2",
-      "@angular-devkit/core": "18.0.0-rc.2",
-      "@angular-devkit/schematics": "18.0.0-rc.2"
+      "@angular/cli": "18.0.0",
+      "@angular/build": "18.0.0",
+      "@angular/ssr": "18.0.0",
+      "@angular-devkit/architect": "0.1800.0",
+      "@angular-devkit/build-angular": "18.0.0",
+      "@angular-devkit/build-webpack": "0.1800.0",
+      "@angular-devkit/core": "18.0.0",
+      "@angular-devkit/schematics": "18.0.0"
     }
   },
   "engines": {

package/src/analytics/analytics.js

@@ -13,7 +13,7 @@ const crypto_1 = require("crypto");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const environment_options_1 = require("../utilities/environment-options");
-const load_esm_1 = require("../utilities/load-esm");
+const prompt_1 = require("../utilities/prompt");
 const tty_1 = require("../utilities/tty");
 /* eslint-disable no-console */
 /**
@@ -67,22 +67,14 @@ async function promptAnalytics(context, global, force = false) {
         throw new Error(`Could not find a ${level} workspace. Are you in a project?`);
     }
     if (force || (0, tty_1.isTTY)()) {
-        const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
-        const answers = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'analytics',
-                message: core_1.tags.stripIndents `
-           Would you like to share pseudonymous usage data about this project with the Angular Team
-           at Google under Google's Privacy Policy at https://policies.google.com/privacy. For more
-           details and how to change this setting, see https://angular.io/analytics.
+        const answer = await (0, prompt_1.askConfirmation)(`
+Would you like to share pseudonymous usage data about this project with the Angular Team
+at Google under Google's Privacy Policy at https://policies.google.com/privacy. For more
+details and how to change this setting, see https://angular.io/analytics.
 
-         `,
-                default: false,
-            },
-        ]);
-        await setAnalyticsConfig(global, answers.analytics);
-        if (answers.analytics) {
+  `, false);
+        await setAnalyticsConfig(global, answer);
+        if (answer) {
             console.log('');
             console.log(core_1.tags.stripIndent `
          Thank you for sharing pseudonymous usage data. Should you change your mind, the following

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

@@ -139,8 +139,8 @@ class CommandModule {
             return undefined;
         }
         const userId = await (0, analytics_1.getAnalyticsUserId)(this.context, 
-        // Don't prompt for `ng update` and `ng analytics` commands.
-        ['update', 'analytics'].includes(this.commandName));
+        // Don't prompt on `ng update`, 'ng version' or `ng analytics`.
+        ['version', 'update', 'analytics'].includes(this.commandName));
         return userId ? new analytics_collector_1.AnalyticsCollector(this.context, userId) : undefined;
     }
     /**

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

@@ -18,6 +18,7 @@ const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const error_1 = require("../utilities/error");
 const package_manager_1 = require("../utilities/package-manager");
+const version_1 = require("../utilities/version");
 const command_module_1 = require("./command-module");
 const command_1 = require("./utilities/command");
 const json_help_1 = require("./utilities/json-help");
@@ -70,6 +71,8 @@ async function runCommand(args, logger) {
         const usageInstance = localYargs.getInternalMethods().getUsageInstance();
         usageInstance.help = () => (0, json_help_1.jsonHelpUsage)();
     }
+    // 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));
     await localYargs
         .scriptName('ng')
         // https://github.com/yargs/yargs/blob/main/docs/advanced.md#customizing-yargs-parser

package/src/commands/update/cli.js

@@ -62,7 +62,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
     scope = command_module_1.CommandScope.In;
     shouldReportAnalytics = false;
     command = 'update [packages..]';
-    describe = 'Updates your workspace and its dependencies. See https://update.angular.io/.';
+    describe = 'Updates your workspace and its dependencies. See https://update.angular.dev/.';
     longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
     builder(localYargs) {
         return localYargs
@@ -514,14 +514,14 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                         // Before version 6, the major versions were not always sequential.
                         // Example @angular/core skipped version 3, @angular/cli skipped versions 2-5.
                         logger.error(`Updating multiple major versions of '${name}' at once is not supported. Please migrate each major version individually.\n` +
-                            `For more information about the update process, see https://update.angular.io/.`);
+                            `For more information about the update process, see https://update.angular.dev/.`);
                     }
                     else {
                         const nextMajorVersionFromCurrent = currentMajorVersion + 1;
                         logger.error(`Updating multiple major versions of '${name}' at once is not supported. Please migrate each major version individually.\n` +
                             `Run 'ng update ${name}@${nextMajorVersionFromCurrent}' in your workspace directory ` +
                             `to update to latest '${nextMajorVersionFromCurrent}.x' version of '${name}'.\n\n` +
-                            `For more information about the update process, see https://update.angular.io/?v=${currentMajorVersion}.0-${nextMajorVersionFromCurrent}.0`);
+                            `For more information about the update process, see https://update.angular.dev/?v=${currentMajorVersion}.0-${nextMajorVersionFromCurrent}.0`);
                     }
                     return 1;
                 }
@@ -785,7 +785,6 @@ class UpdateCommandModule extends command_module_1.CommandModule {
         const { logger } = this.context;
         const numberOfMigrations = optionalMigrations.length;
         logger.info(`This package has ${numberOfMigrations} optional migration${numberOfMigrations > 1 ? 's' : ''} that can be executed.`);
-        logger.info(''); // Extra trailing newline.
         if (!(0, tty_1.isTTY)()) {
             for (const migration of optionalMigrations) {
                 const { title } = getMigrationTitleAndDescription(migration);
@@ -795,10 +794,12 @@ class UpdateCommandModule extends command_module_1.CommandModule {
             }
             return undefined;
         }
+        logger.info('Optional migrations may be skipped and executed after the update process, if preferred.');
+        logger.info(''); // Extra trailing newline.
         const answer = await (0, prompt_1.askChoices)(`Select the migrations that you'd like to run`, optionalMigrations.map((migration) => {
-            const { title } = getMigrationTitleAndDescription(migration);
+            const { title, documentation } = getMigrationTitleAndDescription(migration);
             return {
-                name: title,
+                name: `[${color_1.colors.white(migration.name)}] ${title}${documentation ? ` (${documentation})` : ''}`,
                 value: migration.name,
             };
         }), null);
@@ -866,5 +867,8 @@ function getMigrationTitleAndDescription(migration) {
     return {
         title: title.endsWith('.') ? title : title + '.',
         description: description.join('.\n  '),
+        documentation: migration.documentation
+            ? new URL(migration.documentation, 'https://angular.dev').href
+            : undefined,
     };
 }

package/src/commands/update/long-description.md

@@ -19,4 +19,4 @@ For example, use the following command to take the latest 10.x.x version and use
 ng update @angular/cli@^10 @angular/core@^10
 ```
 
-For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.io/).
+For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.dev/).

package/src/utilities/completion.js

@@ -41,7 +41,7 @@ const config_1 = require("../utilities/config");
 const environment_options_1 = require("../utilities/environment-options");
 const tty_1 = require("../utilities/tty");
 const error_1 = require("./error");
-const load_esm_1 = require("./load-esm");
+const prompt_1 = require("./prompt");
 /**
  * Checks if it is appropriate to prompt the user to setup autocompletion. If not, does nothing. If
  * so prompts and sets up autocompletion for the user. Returns an exit code if the program should
@@ -118,8 +118,8 @@ async function shouldPromptForAutocompletionSetup(command, config) {
     if (environment_options_1.forceAutocomplete !== undefined) {
         return environment_options_1.forceAutocomplete;
     }
-    // Don't prompt on `ng update` or `ng completion`.
-    if (command === 'update' || command === 'completion') {
+    // Don't prompt on `ng update`, 'ng version' or `ng completion`.
+    if (['version', 'update', 'completion'].includes(command)) {
         return false;
     }
     // Non-interactive and continuous integration systems don't care about autocompletion.
@@ -159,24 +159,14 @@ async function shouldPromptForAutocompletionSetup(command, config) {
     return true;
 }
 async function promptForAutocompletion() {
-    // Dynamically load `inquirer` so users don't have to pay the cost of parsing and executing it for
-    // the 99% of builds that *don't* prompt for autocompletion.
-    const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
-    const { autocomplete } = await inquirer.prompt([
-        {
-            name: 'autocomplete',
-            type: 'confirm',
-            message: `
+    const autocomplete = await (0, prompt_1.askConfirmation)(`
 Would you like to enable autocompletion? This will set up your terminal so pressing TAB while typing
 Angular CLI commands will show possible options and autocomplete arguments. (Enabling autocompletion
 will modify configuration files in your home directory.)
-      `
-                .split('\n')
-                .join(' ')
-                .trim(),
-            default: true,
-        },
-    ]);
+        `
+        .split('\n')
+        .join(' ')
+        .trim(), true);
     return autocomplete;
 }
 /**

package/src/utilities/version.js

@@ -25,5 +25,5 @@ class Version {
     }
 }
 // TODO(bazel): Convert this to use build-time version stamping after flipping the build script to use bazel
-// export const VERSION = new Version('18.0.0-rc.2');
+// export const VERSION = new Version('18.0.0');
 exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);