@angular/cli 14.0.0-next.6 → 14.0.0-next.7

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": {

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
      */

package/lib/init.js

@@ -37,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;
@@ -47,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.6",
+  "version": "14.0.0-next.7",
   "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,17 +25,17 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.6",
-    "@angular-devkit/core": "14.0.0-next.6",
-    "@angular-devkit/schematics": "14.0.0-next.6",
-    "@schematics/angular": "14.0.0-next.6",
+    "@angular-devkit/architect": "0.1400.0-next.7",
+    "@angular-devkit/core": "14.0.0-next.7",
+    "@angular-devkit/schematics": "14.0.0-next.7",
+    "@schematics/angular": "14.0.0-next.7",
     "@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.1",
+    "npm-package-arg": "9.0.2",
     "npm-pick-manifest": "7.0.0",
     "open": "8.4.0",
     "ora": "5.4.1",
@@ -47,17 +44,17 @@
     "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.6",
-      "@angular-devkit/architect": "0.1400.0-next.6",
-      "@angular-devkit/build-angular": "14.0.0-next.6",
-      "@angular-devkit/build-webpack": "0.1400.0-next.6",
-      "@angular-devkit/core": "14.0.0-next.6",
-      "@angular-devkit/schematics": "14.0.0-next.6"
+      "@angular/cli": "14.0.0-next.7",
+      "@angular-devkit/architect": "0.1400.0-next.7",
+      "@angular-devkit/build-angular": "14.0.0-next.7",
+      "@angular-devkit/build-webpack": "0.1400.0-next.7",
+      "@angular-devkit/core": "14.0.0-next.7",
+      "@angular-devkit/schematics": "14.0.0-next.7"
     }
   },
   "engines": {

package/src/analytics/analytics-collector.js

@@ -72,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.js

@@ -36,14 +36,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAnalyticsInfoString = exports.createAnalytics = exports.getSharedAnalytics = exports.getAnalytics = exports.promptAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = exports.AnalyticsProperties = void 0;
 const core_1 = require("@angular-devkit/core");
 const debug_1 = __importDefault(require("debug"));
-const inquirer = __importStar(require("inquirer"));
 const uuid_1 = require("uuid");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
+const environment_options_1 = require("../utilities/environment-options");
 const tty_1 = require("../utilities/tty");
 const version_1 = require("../utilities/version");
 const analytics_collector_1 = require("./analytics-collector");
-const analytics_environment_options_1 = require("./analytics-environment-options");
 /* eslint-disable no-console */
 const analyticsDebug = (0, debug_1.default)('ng:analytics'); // Generate analytics, including settings and users.
 let _defaultAngularCliPropertyCache;
@@ -120,7 +119,8 @@ async function promptAnalytics(global, force = false) {
         throw new Error(`Could not find a ${level} workspace. Are you in a project?`);
     }
     if (force || (0, tty_1.isTTY)()) {
-        const answers = await inquirer.prompt([
+        const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
+        const answers = await prompt([
             {
                 type: 'confirm',
                 name: 'analytics',
@@ -170,7 +170,7 @@ exports.promptAnalytics = promptAnalytics;
  */
 async function getAnalytics(level) {
     analyticsDebug('getAnalytics');
-    if (analytics_environment_options_1.analyticsDisabled) {
+    if (environment_options_1.analyticsDisabled) {
         analyticsDebug('NG_CLI_ANALYTICS is false');
         return new core_1.analytics.NoopAnalytics();
     }
@@ -211,7 +211,7 @@ exports.getAnalytics = getAnalytics;
  */
 async function getSharedAnalytics() {
     analyticsDebug('getSharedAnalytics');
-    if (analytics_environment_options_1.analyticsShareDisabled) {
+    if (environment_options_1.analyticsShareDisabled) {
         analyticsDebug('NG_CLI_ANALYTICS is false');
         return undefined;
     }
@@ -245,25 +245,26 @@ async function createAnalytics(workspace, skipPrompt = false) {
         return globalConfig;
     }
     let config = globalConfig;
-    // Not disabled globally, check locally.
-    if (workspace) {
-        let localConfig = await getAnalytics('local');
-        if (localConfig === undefined) {
+    // Not disabled globally, check locally or not set globally and command is run outside of workspace example: `ng new`
+    if (workspace || globalConfig === undefined) {
+        const level = workspace ? 'local' : 'global';
+        let localOrGlobalConfig = await getAnalytics(level);
+        if (localOrGlobalConfig === undefined) {
             if (!skipPrompt) {
-                // local is not unset, prompt user.
+                // config is unset, prompt user.
                 // TODO: This should honor the `no-interactive` option.
                 // It is currently not an `ng` option but rather only an option for specific commands.
                 // The concept of `ng`-wide options are needed to cleanly handle this.
-                await promptAnalytics(false);
-                localConfig = await getAnalytics('local');
+                await promptAnalytics(!workspace /** global */);
+                localOrGlobalConfig = await getAnalytics(level);
             }
         }
-        if (localConfig instanceof core_1.analytics.NoopAnalytics) {
-            return localConfig;
+        if (localOrGlobalConfig instanceof core_1.analytics.NoopAnalytics) {
+            return localOrGlobalConfig;
         }
-        else if (localConfig) {
+        else if (localOrGlobalConfig) {
             // Favor local settings over global when defined.
-            config = localConfig;
+            config = localOrGlobalConfig;
         }
     }
     // Get shared analytics

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

@@ -94,13 +94,13 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
             return allProjectsForTargetName;
         }
         else {
+            if (allProjectsForTargetName.length === 1) {
+                return allProjectsForTargetName;
+            }
             const maybeProject = (0, config_1.getProjectByCwd)(workspace);
             if (maybeProject && allProjectsForTargetName.includes(maybeProject)) {
                 return [maybeProject];
             }
-            if (allProjectsForTargetName.length === 1) {
-                return allProjectsForTargetName;
-            }
         }
         return undefined;
     }

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

@@ -7,8 +7,8 @@
  */
 import { analytics, logging } from '@angular-devkit/core';
 import { ArgumentsCamelCase, Argv, CamelCaseKey, CommandModule as YargsCommandModule } from 'yargs';
-import { PackageManager } from '../../lib/config/workspace-schema';
 import { AngularWorkspace } from '../utilities/config';
+import { PackageManagerUtils } from '../utilities/package-manager';
 import { Option } from './utilities/json-schema';
 export declare type Options<T> = {
     [key in keyof T as CamelCaseKey<key>]: T[key];
@@ -25,8 +25,9 @@ export interface CommandContext {
     currentDirectory: string;
     root: string;
     workspace?: AngularWorkspace;
+    globalConfiguration?: AngularWorkspace;
     logger: logging.Logger;
-    packageManager: PackageManager;
+    packageManager: PackageManagerUtils;
     /** Arguments parsed in free-from without parser configuration. */
     args: {
         positional: string[];

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

@@ -6,5 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import { AngularWorkspace } from '../utilities/config';
-export declare function runCommand(args: string[], logger: logging.Logger, workspace: AngularWorkspace | undefined): Promise<number>;
+export declare function runCommand(args: string[], logger: logging.Logger): Promise<number>;

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

@@ -16,54 +16,71 @@ const helpers_1 = require("yargs/helpers");
 const cli_1 = require("../commands/add/cli");
 const cli_2 = require("../commands/analytics/cli");
 const cli_3 = require("../commands/build/cli");
-const cli_4 = require("../commands/config/cli");
-const cli_5 = require("../commands/deploy/cli");
-const cli_6 = require("../commands/doc/cli");
-const cli_7 = require("../commands/e2e/cli");
-const cli_8 = require("../commands/extract-i18n/cli");
-const cli_9 = require("../commands/generate/cli");
-const cli_10 = require("../commands/lint/cli");
-const cli_11 = require("../commands/make-this-awesome/cli");
-const cli_12 = require("../commands/new/cli");
-const cli_13 = require("../commands/run/cli");
-const cli_14 = require("../commands/serve/cli");
-const cli_15 = require("../commands/test/cli");
-const cli_16 = require("../commands/update/cli");
-const cli_17 = require("../commands/version/cli");
+const cli_4 = require("../commands/cache/cli");
+const cli_5 = require("../commands/config/cli");
+const cli_6 = require("../commands/deploy/cli");
+const cli_7 = require("../commands/doc/cli");
+const cli_8 = require("../commands/e2e/cli");
+const cli_9 = require("../commands/extract-i18n/cli");
+const cli_10 = require("../commands/generate/cli");
+const cli_11 = require("../commands/lint/cli");
+const cli_12 = require("../commands/make-this-awesome/cli");
+const cli_13 = require("../commands/new/cli");
+const cli_14 = require("../commands/run/cli");
+const cli_15 = require("../commands/serve/cli");
+const cli_16 = require("../commands/test/cli");
+const cli_17 = require("../commands/update/cli");
+const cli_18 = require("../commands/version/cli");
 const color_1 = require("../utilities/color");
+const config_1 = require("../utilities/config");
 const package_manager_1 = require("../utilities/package-manager");
 const command_module_1 = require("./command-module");
 const command_1 = require("./utilities/command");
 const json_help_1 = require("./utilities/json-help");
 const COMMANDS = [
-    cli_17.VersionCommandModule,
-    cli_6.DocCommandModule,
-    cli_11.AwesomeCommandModule,
-    cli_4.ConfigCommandModule,
+    cli_18.VersionCommandModule,
+    cli_7.DocCommandModule,
+    cli_12.AwesomeCommandModule,
+    cli_5.ConfigCommandModule,
     cli_2.AnalyticsCommandModule,
     cli_1.AddCommandModule,
-    cli_9.GenerateCommandModule,
+    cli_10.GenerateCommandModule,
     cli_3.BuildCommandModule,
-    cli_7.E2eCommandModule,
-    cli_15.TestCommandModule,
-    cli_14.ServeCommandModule,
-    cli_8.ExtractI18nCommandModule,
-    cli_5.DeployCommandModule,
-    cli_10.LintCommandModule,
-    cli_12.NewCommandModule,
-    cli_16.UpdateCommandModule,
-    cli_13.RunCommandModule,
+    cli_8.E2eCommandModule,
+    cli_16.TestCommandModule,
+    cli_15.ServeCommandModule,
+    cli_9.ExtractI18nCommandModule,
+    cli_6.DeployCommandModule,
+    cli_11.LintCommandModule,
+    cli_13.NewCommandModule,
+    cli_17.UpdateCommandModule,
+    cli_14.RunCommandModule,
+    cli_4.CacheCommandModule,
 ].sort(); // Will be sorted by class name.
 const yargsParser = helpers_1.Parser;
-async function runCommand(args, logger, workspace) {
-    var _a, _b, _c;
+async function runCommand(args, logger) {
+    var _a, _b;
     const { $0, _: positional, help = false, jsonHelp = false, ...rest } = yargsParser(args, { boolean: ['help', 'json-help'], alias: { 'collection': 'c' } });
+    let workspace;
+    let globalConfiguration;
+    try {
+        [workspace, globalConfiguration] = await Promise.all([
+            (0, config_1.getWorkspace)('local'),
+            (0, config_1.getWorkspace)('global'),
+        ]);
+    }
+    catch (e) {
+        logger.fatal(e.message);
+        return 1;
+    }
+    const root = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.basePath) !== null && _a !== void 0 ? _a : process.cwd();
     const context = {
+        globalConfiguration,
         workspace,
         logger,
         currentDirectory: process.cwd(),
-        root: (_a = workspace === null || workspace === void 0 ? void 0 : workspace.basePath) !== null && _a !== void 0 ? _a : process.cwd(),
-        packageManager: await (0, package_manager_1.getPackageManager)((_b = workspace === null || workspace === void 0 ? void 0 : workspace.basePath) !== null && _b !== void 0 ? _b : process.cwd()),
+        root,
+        packageManager: new package_manager_1.PackageManagerUtils({ globalConfiguration, workspace, root }),
         args: {
             positional: positional.map((v) => v.toString()),
             options: {
@@ -130,6 +147,6 @@ async function runCommand(args, logger, workspace) {
     })
         .wrap(yargs_1.default.terminalWidth())
         .parseAsync();
-    return (_c = process.exitCode) !== null && _c !== void 0 ? _c : 0;
+    return (_b = process.exitCode) !== null && _b !== void 0 ? _b : 0;
 }
 exports.runCommand = runCommand;

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

@@ -10,6 +10,7 @@ import { FileSystemCollectionDescription, FileSystemSchematicDescription, NodeWo
 import { Argv } from 'yargs';
 import { CommandModule, CommandModuleImplementation, CommandScope, Options, OtherOptions } from './command-module';
 import { Option } from './utilities/json-schema';
+export declare const DEFAULT_SCHEMATICS_COLLECTION = "@schematics/angular";
 export interface SchematicsCommandArgs {
     interactive: boolean;
     force: boolean;
@@ -30,8 +31,8 @@ export declare abstract class SchematicsCommandModule extends CommandModule<Sche
     protected getOrCreateWorkflowForBuilder(collectionName: string): NodeWorkflow;
     private _workflowForExecution;
     protected getOrCreateWorkflowForExecution(collectionName: string, options: SchematicsExecutionOptions): Promise<NodeWorkflow>;
-    private _defaultSchematicCollection;
-    protected getDefaultSchematicCollection(): Promise<string>;
+    private _schematicCollections;
+    protected getSchematicCollections(): Promise<Set<string>>;
     protected parseSchematicInfo(schematic: string | undefined): [collectionName: string | undefined, schematicName: string | undefined];
     protected runSchematic(options: {
         executionOptions: SchematicsExecutionOptions;
@@ -39,6 +40,7 @@ export declare abstract class SchematicsCommandModule extends CommandModule<Sche
         collectionName: string;
         schematicName: string;
     }): Promise<number>;
+    private defaultProjectDeprecationWarningShown;
     private getProjectName;
     private getResolvePaths;
 }