@angular/cli 17.0.0-rc.1 → 17.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "17.0.0-rc.1",
+  "version": "17.0.0-rc.2",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1700.0-rc.1",
-    "@angular-devkit/core": "17.0.0-rc.1",
-    "@angular-devkit/schematics": "17.0.0-rc.1",
-    "@schematics/angular": "17.0.0-rc.1",
+    "@angular-devkit/architect": "0.1700.0-rc.2",
+    "@angular-devkit/core": "17.0.0-rc.2",
+    "@angular-devkit/schematics": "17.0.0-rc.2",
+    "@schematics/angular": "17.0.0-rc.2",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "ini": "4.1.1",
-    "inquirer": "8.2.6",
+    "inquirer": "9.2.11",
     "jsonc-parser": "3.2.0",
     "npm-package-arg": "11.0.1",
     "npm-pick-manifest": "9.0.0",
@@ -47,13 +47,13 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "17.0.0-rc.1",
-      "@angular/ssr": "17.0.0-rc.1",
-      "@angular-devkit/architect": "0.1700.0-rc.1",
-      "@angular-devkit/build-angular": "17.0.0-rc.1",
-      "@angular-devkit/build-webpack": "0.1700.0-rc.1",
-      "@angular-devkit/core": "17.0.0-rc.1",
-      "@angular-devkit/schematics": "17.0.0-rc.1"
+      "@angular/cli": "17.0.0-rc.2",
+      "@angular/ssr": "17.0.0-rc.2",
+      "@angular-devkit/architect": "0.1700.0-rc.2",
+      "@angular-devkit/build-angular": "17.0.0-rc.2",
+      "@angular-devkit/build-webpack": "0.1700.0-rc.2",
+      "@angular-devkit/core": "17.0.0-rc.2",
+      "@angular-devkit/schematics": "17.0.0-rc.2"
     }
   },
   "engines": {

package/src/analytics/analytics.js

@@ -6,29 +6,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAnalyticsInfoString = exports.getAnalyticsUserId = exports.promptAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = void 0;
 const core_1 = require("@angular-devkit/core");
@@ -36,6 +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 tty_1 = require("../utilities/tty");
 /* eslint-disable no-console */
 /**
@@ -89,8 +67,8 @@ 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 { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
-        const answers = await prompt([
+        const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
+        const answers = await inquirer.prompt([
             {
                 type: 'confirm',
                 name: 'analytics',

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

@@ -6,35 +6,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/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 __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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -48,6 +25,7 @@ const analytics_1 = require("../analytics/analytics");
 const analytics_parameters_1 = require("../analytics/analytics-parameters");
 const config_1 = require("../utilities/config");
 const error_1 = require("../utilities/error");
+const load_esm_1 = require("../utilities/load-esm");
 const memoize_1 = require("../utilities/memoize");
 const tty_1 = require("../utilities/tty");
 const command_module_1 = require("./command-module");
@@ -203,8 +181,8 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                     return question;
                 });
                 if (questions.length) {
-                    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
-                    return prompt(questions);
+                    const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
+                    return inquirer.prompt(questions);
                 }
                 else {
                     return {};

package/src/utilities/completion.js

@@ -41,6 +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");
 /**
  * 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
@@ -160,8 +161,8 @@ async function shouldPromptForAutocompletionSetup(command, config) {
 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 { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
-    const { autocomplete } = await prompt([
+    const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
+    const { autocomplete } = await inquirer.prompt([
         {
             name: 'autocomplete',
             type: 'confirm',

package/src/utilities/load-esm.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @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.io/license
+ */
+/**
+ * This uses a dynamic import to load a module which may be ESM.
+ * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
+ * will currently, unconditionally downlevel dynamic import into a require call.
+ * require calls cannot load ESM code and will result in a runtime error. To workaround
+ * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
+ * Once TypeScript provides support for keeping the dynamic import this workaround can
+ * be dropped.
+ *
+ * @param modulePath The path of the module to load.
+ * @returns A Promise that resolves to the dynamically imported module.
+ */
+export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;

package/src/utilities/load-esm.js

@@ -0,0 +1,26 @@
+"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.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadEsmModule = void 0;
+/**
+ * This uses a dynamic import to load a module which may be ESM.
+ * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
+ * will currently, unconditionally downlevel dynamic import into a require call.
+ * require calls cannot load ESM code and will result in a runtime error. To workaround
+ * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
+ * Once TypeScript provides support for keeping the dynamic import this workaround can
+ * be dropped.
+ *
+ * @param modulePath The path of the module to load.
+ * @returns A Promise that resolves to the dynamically imported module.
+ */
+function loadEsmModule(modulePath) {
+    return new Function('modulePath', `return import(modulePath);`)(modulePath);
+}
+exports.loadEsmModule = loadEsmModule;

package/src/utilities/prompt.js

@@ -6,31 +6,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.askChoices = exports.askQuestion = exports.askConfirmation = void 0;
+const load_esm_1 = require("./load-esm");
 const tty_1 = require("./tty");
 async function askConfirmation(message, defaultResponse, noTTYResponse) {
     if (!(0, tty_1.isTTY)()) {
@@ -43,8 +21,8 @@ async function askConfirmation(message, defaultResponse, noTTYResponse) {
         message,
         default: defaultResponse,
     };
-    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
-    const answers = await prompt([question]);
+    const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
+    const answers = await inquirer.prompt([question]);
     return answers['confirmation'];
 }
 exports.askConfirmation = askConfirmation;
@@ -60,8 +38,8 @@ async function askQuestion(message, choices, defaultResponseIndex, noTTYResponse
         choices,
         default: defaultResponseIndex,
     };
-    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
-    const answers = await prompt([question]);
+    const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
+    const answers = await inquirer.prompt([question]);
     return answers['answer'];
 }
 exports.askQuestion = askQuestion;
@@ -76,8 +54,8 @@ async function askChoices(message, choices, noTTYResponse) {
         message,
         choices,
     };
-    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
-    const answers = await prompt([question]);
+    const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
+    const answers = await inquirer.prompt([question]);
     return answers['answer'];
 }
 exports.askChoices = askChoices;

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('17.0.0-rc.1');
+// export const VERSION = new Version('17.0.0-rc.2');
 exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);