@angular/cli 14.0.0-next.5 → 14.0.0-next.8

package/lib/cli/index.d.ts

@@ -7,6 +7,5 @@
  */
 export { VERSION } from '../../src/utilities/version';
 export default function (options: {
-    testing?: boolean;
     cliArgs: string[];
 }): Promise<number>;

package/lib/cli/index.js

@@ -13,13 +13,10 @@ const util_1 = require("util");
 const command_module_1 = require("../../src/command-builder/command-module");
 const command_runner_1 = require("../../src/command-builder/command-runner");
 const color_1 = require("../../src/utilities/color");
-const config_1 = require("../../src/utilities/config");
+const environment_options_1 = require("../../src/utilities/environment-options");
 const log_file_1 = require("../../src/utilities/log-file");
-const project_1 = require("../../src/utilities/project");
 var version_1 = require("../../src/utilities/version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
-const debugEnv = process.env['NG_DEBUG'];
-const isDebug = debugEnv !== undefined && debugEnv !== '0' && debugEnv.toLowerCase() !== 'false';
 /* eslint-disable no-console */
 async function default_1(options) {
     // This node version check ensures that the requirements of the project instance of the CLI are met
@@ -30,7 +27,7 @@ async function default_1(options) {
             'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n');
         return 3;
     }
-    const logger = (0, node_1.createConsoleLogger)(isDebug, process.stdout, process.stderr, {
+    const logger = (0, node_1.createConsoleLogger)(environment_options_1.ngDebug, process.stdout, process.stderr, {
         info: (s) => (color_1.colors.enabled ? s : (0, color_1.removeColor)(s)),
         debug: (s) => (color_1.colors.enabled ? s : (0, color_1.removeColor)(s)),
         warn: (s) => (color_1.colors.enabled ? color_1.colors.bold.yellow(s) : (0, color_1.removeColor)(s)),
@@ -47,27 +44,8 @@ async function default_1(options) {
     console.error = function (...args) {
         logger.error((0, util_1.format)(...args));
     };
-    let workspace;
-    const workspaceFile = (0, project_1.findWorkspaceFile)();
-    if (workspaceFile === null) {
-        const [, localPath] = (0, config_1.getWorkspaceRaw)('local');
-        if (localPath !== null) {
-            logger.fatal(`An invalid configuration file was found ['${localPath}'].` +
-                ' Please delete the file before running the command.');
-            return 1;
-        }
-    }
-    else {
-        try {
-            workspace = await config_1.AngularWorkspace.load(workspaceFile);
-        }
-        catch (e) {
-            logger.fatal(`Unable to read workspace file '${workspaceFile}': ${e.message}`);
-            return 1;
-        }
-    }
     try {
-        return await (0, command_runner_1.runCommand)(options.cliArgs, logger, workspace);
+        return await (0, command_runner_1.runCommand)(options.cliArgs, logger);
     }
     catch (err) {
         if (err instanceof command_module_1.CommandModuleError) {
@@ -97,11 +75,6 @@ async function default_1(options) {
         else {
             logger.fatal('An unexpected error occurred: ' + JSON.stringify(err));
         }
-        if (options.testing) {
-            // eslint-disable-next-line no-debugger
-            debugger;
-            throw err;
-        }
         return 1;
     }
 }

package/lib/config/schema.json

@@ -22,7 +22,8 @@
     },
     "defaultProject": {
       "type": "string",
-      "description": "Default project name used in commands."
+      "description": "Default project name used in commands.",
+      "x-deprecated": "The project to use will be determined from the current working directory."
     },
     "projects": {
       "type": "object",
@@ -44,7 +45,16 @@
       "properties": {
         "defaultCollection": {
           "description": "The default schematics collection to use.",
-          "type": "string"
+          "type": "string",
+          "x-deprecated": "Use 'schematicCollections' instead."
+        },
+        "schematicCollections": {
+          "type": "array",
+          "description": "The list of schematic collections to use.",
+          "items": {
+            "type": "string",
+            "uniqueItems": true
+          }
         },
         "packageManager": {
           "description": "Specify which package manager tool to use.",
@@ -175,7 +185,16 @@
         "cli": {
           "defaultCollection": {
             "description": "The default schematics collection to use.",
-            "type": "string"
+            "type": "string",
+            "x-deprecated": "Use 'schematicCollections' instead."
+          },
+          "schematicCollections": {
+            "type": "array",
+            "description": "The list of schematic collections to use.",
+            "items": {
+              "type": "string",
+              "uniqueItems": true
+            }
           }
         },
         "schematics": {
@@ -586,7 +605,7 @@
     "SchematicsAngularApplicationSchema": {
       "title": "Angular Application Options Schema",
       "type": "object",
-      "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
+      "description": "Generates a new basic application definition in the \"projects\" subfolder of the workspace.",
       "additionalProperties": false,
       "properties": {
         "projectRoot": {
@@ -1524,12 +1543,12 @@
       "properties": {
         "browserTarget": {
           "type": "string",
-          "description": "A browser builder target use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+          "description": "A browser builder target use for rendering the application shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
           "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
         },
         "serverTarget": {
           "type": "string",
-          "description": "A server builder target use for rendering the app shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+          "description": "A server builder target use for rendering the application shell in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
           "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
         },
         "appModuleBundle": {
@@ -2183,7 +2202,7 @@
         },
         "servePath": {
           "type": "string",
-          "description": "The pathname where the app will be served."
+          "description": "The pathname where the application will be served."
         },
         "disableHostCheck": {
           "type": "boolean",

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

@@ -3,6 +3,7 @@ export interface Schema {
     cli?: CliOptions;
     /**
      * Default project name used in commands.
+     * @deprecated The project to use will be determined from the current working directory.
      */
     defaultProject?: string;
     /**
@@ -31,6 +32,10 @@ export interface CliOptions {
      * Specify which package manager tool to use.
      */
     packageManager?: PackageManager;
+    /**
+     * The list of schematic collections to use.
+     */
+    schematicCollections?: string[];
     /**
      * Control CLI specific console warnings
      */
@@ -114,7 +119,7 @@ export interface SchematicOptions {
     "@schematics/angular:web-worker"?: AngularWebWorkerOptionsSchema;
 }
 /**
- * Generates a new basic app definition in the "projects" subfolder of the workspace.
+ * Generates a new basic application definition in the "projects" subfolder of the workspace.
  */
 export interface AngularApplicationOptionsSchema {
     /**

package/lib/init.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -33,6 +37,7 @@ const path = __importStar(require("path"));
 const semver_1 = require("semver");
 const color_1 = require("../src/utilities/color");
 const config_1 = require("../src/utilities/config");
+const environment_options_1 = require("../src/utilities/environment-options");
 const version_1 = require("../src/utilities/version");
 (async () => {
     var _a;
@@ -43,15 +48,11 @@ const version_1 = require("../src/utilities/version");
      * See: https://github.com/browserslist/browserslist/blob/819c4337456996d19db6ba953014579329e9c6e1/node.js#L324
      */
     process.env.BROWSERSLIST_IGNORE_OLD_DATA = '1';
-    const disableVersionCheckEnv = process.env['NG_DISABLE_VERSION_CHECK'];
     /**
      * Disable CLI version mismatch checks and forces usage of the invoked CLI
      * instead of invoking the local installed version.
      */
-    const disableVersionCheck = disableVersionCheckEnv !== undefined &&
-        disableVersionCheckEnv !== '0' &&
-        disableVersionCheckEnv.toLowerCase() !== 'false';
-    if (disableVersionCheck) {
+    if (environment_options_1.disableVersionCheck) {
         return (await Promise.resolve().then(() => __importStar(require('./cli')))).default;
     }
     let cli;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.5",
+  "version": "14.0.0-next.8",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -14,9 +14,6 @@
     "Angular DevKit",
     "angular-cli"
   ],
-  "scripts": {
-    "postinstall": "node ./bin/postinstall/script.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
@@ -28,36 +25,36 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.5",
-    "@angular-devkit/core": "14.0.0-next.5",
-    "@angular-devkit/schematics": "14.0.0-next.5",
-    "@schematics/angular": "14.0.0-next.5",
+    "@angular-devkit/architect": "0.1400.0-next.8",
+    "@angular-devkit/core": "14.0.0-next.8",
+    "@angular-devkit/schematics": "14.0.0-next.8",
+    "@schematics/angular": "14.0.0-next.8",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
-    "debug": "4.3.3",
+    "debug": "4.3.4",
     "ini": "2.0.0",
-    "inquirer": "8.2.1",
+    "inquirer": "8.2.2",
     "jsonc-parser": "3.0.0",
-    "npm-package-arg": "9.0.0",
-    "npm-pick-manifest": "7.0.0",
+    "npm-package-arg": "9.0.2",
+    "npm-pick-manifest": "7.0.1",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "13.0.3",
+    "pacote": "13.1.0",
     "resolve": "1.22.0",
     "semver": "7.3.5",
     "symbol-observable": "4.0.0",
     "uuid": "8.3.2",
-    "yargs": "17.3.1"
+    "yargs": "17.4.0"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-next.5",
-      "@angular-devkit/architect": "0.1400.0-next.5",
-      "@angular-devkit/build-angular": "14.0.0-next.5",
-      "@angular-devkit/build-webpack": "0.1400.0-next.5",
-      "@angular-devkit/core": "14.0.0-next.5",
-      "@angular-devkit/schematics": "14.0.0-next.5"
+      "@angular/cli": "14.0.0-next.8",
+      "@angular-devkit/architect": "0.1400.0-next.8",
+      "@angular-devkit/build-angular": "14.0.0-next.8",
+      "@angular-devkit/build-webpack": "0.1400.0-next.8",
+      "@angular-devkit/core": "14.0.0-next.8",
+      "@angular-devkit/schematics": "14.0.0-next.8"
     }
   },
   "engines": {

package/src/analytics/analytics-collector.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -68,6 +72,8 @@ class AnalyticsCollector {
         this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.CpuSpeed] = Math.floor(os.cpus()[0].speed);
         this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.RamInGigabytes] = Math.round(os.totalmem() / (1024 * 1024 * 1024));
         this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.NodeVersion] = nodeVersion;
+        this.parameters['cd' + core_1.analytics.NgCliAnalyticsDimensions.AngularCLIMajorVersion] =
+            version_1.VERSION.major;
     }
     event(ec, ea, options = {}) {
         const { label: el, value: ev, metrics, dimensions } = options;

package/src/analytics/analytics.d.ts

@@ -19,42 +19,29 @@ export declare const analyticsPackageSafelist: (string | RegExp)[];
 export declare function isPackageNameSafeForAnalytics(name: string): boolean;
 /**
  * Set analytics settings. This does not work if the user is not inside a project.
- * @param level Which config to use. "global" for user-level, and "local" for project-level.
+ * @param global Which config to use. "global" for user-level, and "local" for project-level.
  * @param value Either a user ID, true to generate a new User ID, or false to disable analytics.
  */
-export declare function setAnalyticsConfig(level: 'global' | 'local', value: string | boolean): void;
+export declare function setAnalyticsConfig(global: boolean, value: string | boolean): void;
 /**
  * Prompt the user for usage gathering permission.
  * @param force Whether to ask regardless of whether or not the user is using an interactive shell.
  * @return Whether or not the user was shown a prompt.
  */
-export declare function promptGlobalAnalytics(force?: boolean): Promise<boolean>;
+export declare function promptAnalytics(global: boolean, force?: boolean): Promise<boolean>;
 /**
- * Prompt the user for usage gathering permission for the local project. Fails if there is no
- * local workspace.
- * @param force Whether to ask regardless of whether or not the user is using an interactive shell.
- * @return Whether or not the user was shown a prompt.
- */
-export declare function promptProjectAnalytics(force?: boolean): Promise<boolean>;
-export declare function hasGlobalAnalyticsConfiguration(): Promise<boolean>;
-/**
- * Get the global analytics object for the user. This returns an instance of UniversalAnalytics,
- * or undefined if analytics are disabled.
- *
- * If any problem happens, it is considered the user has been opting out of analytics.
- */
-export declare function getGlobalAnalytics(): Promise<AnalyticsCollector | undefined>;
-export declare function hasWorkspaceAnalyticsConfiguration(): Promise<boolean>;
-/**
- * Get the workspace analytics object for the user. This returns an instance of AnalyticsCollector,
- * or undefined if analytics are disabled.
+ * Get the analytics object for the user.
  *
- * If any problem happens, it is considered the user has been opting out of analytics.
+ * @returns
+ * - `AnalyticsCollector` when enabled.
+ * - `analytics.NoopAnalytics` when disabled.
+ * - `undefined` when not configured.
  */
-export declare function getWorkspaceAnalytics(): Promise<AnalyticsCollector | undefined>;
+export declare function getAnalytics(level: 'local' | 'global'): Promise<AnalyticsCollector | analytics.NoopAnalytics | undefined>;
 /**
  * Return the usage analytics sharing setting, which is either a property string (GA-XXXXXXX-XX),
  * or undefined if no sharing.
  */
 export declare function getSharedAnalytics(): Promise<AnalyticsCollector | undefined>;
 export declare function createAnalytics(workspace: boolean, skipPrompt?: boolean): Promise<analytics.Analytics>;
+export declare function getAnalyticsInfoString(): Promise<string>;