@angular/cli 14.0.0-rc.3 → 14.0.2

package/lib/cli/index.js

@@ -8,7 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-const node_1 = require("@angular-devkit/core/node");
+const core_1 = require("@angular-devkit/core");
 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");
@@ -17,22 +17,44 @@ const environment_options_1 = require("../../src/utilities/environment-options")
 const log_file_1 = require("../../src/utilities/log-file");
 var version_1 = require("../../src/utilities/version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
+const MIN_NODEJS_VERISON = [14, 15];
 /* 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
     const [major, minor] = process.versions.node.split('.').map((part) => Number(part));
-    if (major < 14 || (major === 14 && minor < 15)) {
+    if (major < MIN_NODEJS_VERISON[0] ||
+        (major === MIN_NODEJS_VERISON[0] && minor < MIN_NODEJS_VERISON[1])) {
         process.stderr.write(`Node.js version ${process.version} detected.\n` +
-            'The Angular CLI requires a minimum v14.15.\n\n' +
+            `The Angular CLI requires a minimum of v${MIN_NODEJS_VERISON[0]}.${MIN_NODEJS_VERISON[1]}.\n\n` +
             'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n');
         return 3;
     }
-    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)),
-        error: (s) => (color_1.colors.enabled ? color_1.colors.bold.red(s) : (0, color_1.removeColor)(s)),
-        fatal: (s) => (color_1.colors.enabled ? color_1.colors.bold.red(s) : (0, color_1.removeColor)(s)),
+    const colorLevels = {
+        info: (s) => s,
+        debug: (s) => s,
+        warn: (s) => color_1.colors.bold.yellow(s),
+        error: (s) => color_1.colors.bold.red(s),
+        fatal: (s) => color_1.colors.bold.red(s),
+    };
+    const logger = new core_1.logging.IndentLogger('cli-main-logger');
+    const logInfo = console.log;
+    const logError = console.error;
+    const loggerFinished = logger.forEach((entry) => {
+        if (!environment_options_1.ngDebug && entry.level === 'debug') {
+            return;
+        }
+        const color = color_1.colors.enabled ? colorLevels[entry.level] : color_1.removeColor;
+        const message = color(entry.message);
+        switch (entry.level) {
+            case 'warn':
+            case 'fatal':
+            case 'error':
+                logError(message);
+                break;
+            default:
+                logInfo(message);
+                break;
+        }
     });
     // Redirect console to logger
     console.info = console.log = function (...args) {
@@ -77,5 +99,9 @@ async function default_1(options) {
         }
         return 1;
     }
+    finally {
+        logger.complete();
+        await loggerFinished;
+    }
 }
 exports.default = default_1;

package/lib/init.js

@@ -39,6 +39,13 @@ 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");
+/**
+ * Angular CLI versions prior to v14 may not exit correctly if not forcibly exited
+ * via `process.exit()`. When bootstrapping, `forceExit` will be set to `true`
+ * if the local CLI version is less than v14 to prevent the CLI from hanging on
+ * exit in those cases.
+ */
+let forceExit = false;
 (async () => {
     var _a;
     /**
@@ -74,6 +81,10 @@ const version_1 = require("../src/utilities/version");
                 console.error('Version mismatch check skipped. Unable to retrieve local version: ' + error);
             }
         }
+        // Ensure older versions of the CLI fully exit
+        if ((0, semver_1.major)(localVersion) < 14) {
+            forceExit = true;
+        }
         let isGlobalGreater = false;
         try {
             isGlobalGreater = !!localVersion && globalVersion.compare(localVersion) > 0;
@@ -120,6 +131,9 @@ const version_1 = require("../src/utilities/version");
     });
 })
     .then((exitCode) => {
+    if (forceExit) {
+        process.exit(exitCode);
+    }
     process.exitCode = exitCode;
 })
     .catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-rc.3",
+  "version": "14.0.2",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,10 +25,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-rc.3",
-    "@angular-devkit/core": "14.0.0-rc.3",
-    "@angular-devkit/schematics": "14.0.0-rc.3",
-    "@schematics/angular": "14.0.0-rc.3",
+    "@angular-devkit/architect": "0.1400.2",
+    "@angular-devkit/core": "14.0.2",
+    "@angular-devkit/schematics": "14.0.2",
+    "@schematics/angular": "14.0.2",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.4",
@@ -49,12 +49,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-rc.3",
-      "@angular-devkit/architect": "0.1400.0-rc.3",
-      "@angular-devkit/build-angular": "14.0.0-rc.3",
-      "@angular-devkit/build-webpack": "0.1400.0-rc.3",
-      "@angular-devkit/core": "14.0.0-rc.3",
-      "@angular-devkit/schematics": "14.0.0-rc.3"
+      "@angular/cli": "14.0.2",
+      "@angular-devkit/architect": "0.1400.2",
+      "@angular-devkit/build-angular": "14.0.2",
+      "@angular-devkit/build-webpack": "0.1400.2",
+      "@angular-devkit/core": "14.0.2",
+      "@angular-devkit/schematics": "14.0.2"
     }
   },
   "engines": {

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

@@ -14,7 +14,7 @@ export interface MissingTargetChoice {
     value: string;
 }
 export declare abstract class ArchitectBaseCommandModule<T extends object> extends CommandModule<T> implements CommandModuleImplementation<T> {
-    static scope: CommandScope;
+    scope: CommandScope;
     protected shouldReportAnalytics: boolean;
     protected readonly missingTargetChoices: MissingTargetChoice[] | undefined;
     protected runSingleTarget(target: Target, options: OtherOptions): Promise<number>;

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

@@ -22,6 +22,7 @@ const json_schema_1 = require("./utilities/json-schema");
 class ArchitectBaseCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
+        this.scope = command_module_1.CommandScope.In;
         this.shouldReportAnalytics = false;
     }
     async runSingleTarget(target, options) {
@@ -104,7 +105,7 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
             (0, fs_1.existsSync)((0, path_1.resolve)(basePath, '.pnp.mjs'))) {
             return;
         }
-        this.context.logger.warn(`Node packages may not be installed. Try installing with '${this.context.packageManager} install'.`);
+        this.context.logger.warn(`Node packages may not be installed. Try installing with '${this.context.packageManager.name} install'.`);
     }
     getArchitectTarget() {
         return this.commandName;
@@ -162,4 +163,3 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
     }
 }
 exports.ArchitectBaseCommandModule = ArchitectBaseCommandModule;
-ArchitectBaseCommandModule.scope = command_module_1.CommandScope.In;

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

@@ -17,6 +17,7 @@ exports.ArchitectCommandModule = void 0;
 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();
@@ -73,13 +74,14 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         }
     }
     getArchitectProject() {
-        const workspace = this.context.workspace;
-        if (!workspace) {
-            return undefined;
-        }
-        const [, projectName] = this.context.args.positional;
+        const { options, positional } = this.context.args;
+        const [, projectName] = positional;
         if (projectName) {
-            return workspace.projects.has(projectName) ? projectName : undefined;
+            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);
@@ -105,8 +107,14 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
                 return allProjectsForTargetName;
             }
             const maybeProject = (0, config_1.getProjectByCwd)(workspace);
-            if (maybeProject && allProjectsForTargetName.includes(maybeProject)) {
-                return [maybeProject];
+            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. ' +
+                    'Pass the project name as a command line argument or change the current working directory to a project directory.');
             }
         }
         return undefined;

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

@@ -25,7 +25,7 @@ export interface CommandContext {
     currentDirectory: string;
     root: string;
     workspace?: AngularWorkspace;
-    globalConfiguration?: AngularWorkspace;
+    globalConfiguration: AngularWorkspace;
     logger: logging.Logger;
     packageManager: PackageManagerUtils;
     /** Arguments parsed in free-from without parser configuration. */
@@ -40,6 +40,8 @@ export interface CommandContext {
 }
 export declare type OtherOptions = Record<string, unknown>;
 export interface CommandModuleImplementation<T extends {} = {}> extends Omit<YargsCommandModule<{}, T>, 'builder' | 'handler'> {
+    /** Scope in which the command can be executed in. */
+    scope: CommandScope;
     /** Path used to load the long description for the command in JSON help text. */
     longDescriptionPath?: string;
     /** Object declaring the options the command accepts, or a function accepting and returning a yargs instance. */
@@ -58,7 +60,7 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
     abstract readonly describe: string | false;
     abstract readonly longDescriptionPath?: string;
     protected readonly shouldReportAnalytics: boolean;
-    static scope: CommandScope;
+    readonly scope: CommandScope;
     private readonly optionsWithAnalytics;
     constructor(context: CommandContext);
     /**

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

@@ -57,6 +57,7 @@ class CommandModule {
     constructor(context) {
         this.context = context;
         this.shouldReportAnalytics = true;
+        this.scope = CommandScope.Both;
         this.optionsWithAnalytics = new Map();
     }
     /**
@@ -186,7 +187,6 @@ class CommandModule {
         return workspace;
     }
 }
-CommandModule.scope = CommandScope.Both;
 __decorate([
     memoize_1.memoize
 ], CommandModule.prototype, "getAnalytics", null);

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

@@ -101,13 +101,6 @@ async function runCommand(args, logger) {
     };
     let localYargs = (0, yargs_1.default)(args);
     for (const CommandModule of COMMANDS) {
-        if (!jsonHelp) {
-            // Skip scope validation when running with '--json-help' since it's easier to generate the output for all commands this way.
-            const scope = CommandModule.scope;
-            if ((scope === command_module_1.CommandScope.In && !workspace) || (scope === command_module_1.CommandScope.Out && workspace)) {
-                continue;
-            }
-        }
         localYargs = (0, command_1.addCommandModuleToYargs)(localYargs, CommandModule, context);
     }
     if (jsonHelp) {
@@ -143,6 +136,7 @@ async function runCommand(args, logger) {
         'deprecated: %s': color_1.colors.yellow('deprecated:') + ' %s',
         'Did you mean %s?': 'Unknown command. Did you mean %s?',
     })
+        .epilogue(color_1.colors.gray('For more information, see https://angular.io/cli/.\n'))
         .demandCommand(1, command_1.demandCommandFailureMessage)
         .recommendCommands()
         .middleware(normalize_options_middleware_1.normalizeOptionsMiddleware)

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

@@ -21,7 +21,7 @@ export interface SchematicsExecutionOptions extends Options<SchematicsCommandArg
     packageRegistry?: string;
 }
 export declare abstract class SchematicsCommandModule extends CommandModule<SchematicsCommandArgs> implements CommandModuleImplementation<SchematicsCommandArgs> {
-    static scope: CommandScope;
+    scope: CommandScope;
     protected readonly allowPrivateSchematics: boolean;
     protected readonly shouldReportAnalytics = false;
     builder(argv: Argv): Promise<Argv<SchematicsCommandArgs>>;

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

@@ -52,6 +52,7 @@ exports.DEFAULT_SCHEMATICS_COLLECTION = '@schematics/angular';
 class SchematicsCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
+        this.scope = command_module_1.CommandScope.In;
         this.allowPrivateSchematics = false;
         this.shouldReportAnalytics = false;
         this.defaultProjectDeprecationWarningShown = false;
@@ -261,7 +262,7 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                 }
             }
         }
-        const value = (_a = getSchematicCollections(workspace === null || workspace === void 0 ? void 0 : workspace.getCli())) !== null && _a !== void 0 ? _a : getSchematicCollections(globalConfiguration === null || globalConfiguration === void 0 ? void 0 : globalConfiguration.getCli());
+        const value = (_a = getSchematicCollections(workspace === null || workspace === void 0 ? void 0 : workspace.getCli())) !== null && _a !== void 0 ? _a : getSchematicCollections(globalConfiguration.getCli());
         if (value) {
             return value;
         }
@@ -349,7 +350,6 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                 [__dirname, process.cwd()];
     }
 }
-SchematicsCommandModule.scope = command_module_1.CommandScope.In;
 __decorate([
     memoize_1.memoize
 ], SchematicsCommandModule.prototype, "getOrCreateWorkflowForBuilder", null);

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

@@ -8,10 +8,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCommandModuleToYargs = exports.demandCommandFailureMessage = void 0;
+const command_module_1 = require("../command-module");
 exports.demandCommandFailureMessage = `You need to specify a command before moving on. Use '--help' to view the available commands.`;
 function addCommandModuleToYargs(localYargs, commandModule, context) {
     const cmd = new commandModule(context);
-    const describe = context.args.options.jsonHelp ? cmd.fullDescribe : cmd.describe;
+    const { args: { options: { jsonHelp }, }, workspace, } = context;
+    const describe = jsonHelp ? cmd.fullDescribe : cmd.describe;
     return localYargs.command({
         command: cmd.command,
         aliases: cmd.aliases,
@@ -20,7 +22,16 @@ function addCommandModuleToYargs(localYargs, commandModule, context) {
         // Therefore, we get around this by adding a complex object as a string which we later parse when generating the help files.
         typeof describe === 'object' ? JSON.stringify(describe) : describe,
         deprecated: cmd.deprecated,
-        builder: (argv) => cmd.builder(argv),
+        builder: (argv) => {
+            // Skip scope validation when running with '--json-help' since it's easier to generate the output for all commands this way.
+            const isInvalidScope = !jsonHelp &&
+                ((cmd.scope === command_module_1.CommandScope.In && !workspace) ||
+                    (cmd.scope === command_module_1.CommandScope.Out && workspace));
+            if (isInvalidScope) {
+                throw new command_module_1.CommandModuleError(`This command is not available when running the Angular CLI ${workspace ? 'inside' : 'outside'} a workspace.`);
+            }
+            return cmd.builder(argv);
+        },
         handler: (args) => cmd.handler(args),
     });
 }

package/src/commands/cache/clean/cli.d.ts

@@ -11,7 +11,7 @@ export declare class CacheCleanModule extends CommandModule implements CommandMo
     command: string;
     describe: string;
     longDescriptionPath: string | undefined;
-    static scope: CommandScope.In;
+    scope: CommandScope;
     builder(localYargs: Argv): Argv;
     run(): Promise<void>;
 }

package/src/commands/cache/clean/cli.js

@@ -16,6 +16,7 @@ class CacheCleanModule extends command_module_1.CommandModule {
         super(...arguments);
         this.command = 'clean';
         this.describe = 'Deletes persistent disk cache from disk.';
+        this.scope = command_module_1.CommandScope.In;
     }
     builder(localYargs) {
         return localYargs.strict();

package/src/commands/cache/cli.d.ts

@@ -11,7 +11,7 @@ export declare class CacheCommandModule extends CommandModule implements Command
     command: string;
     describe: string;
     longDescriptionPath: string;
-    static scope: CommandScope.In;
+    scope: CommandScope;
     builder(localYargs: Argv): Argv;
     run(_options: Options<{}>): void;
 }

package/src/commands/cache/cli.js

@@ -20,6 +20,7 @@ class CacheCommandModule extends command_module_1.CommandModule {
         this.command = 'cache';
         this.describe = 'Configure persistent disk cache and retrieve cache statistics.';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
+        this.scope = command_module_1.CommandScope.In;
     }
     builder(localYargs) {
         const subcommands = [

package/src/commands/cache/info/cli.d.ts

@@ -11,7 +11,7 @@ export declare class CacheInfoCommandModule extends CommandModule implements Com
     command: string;
     describe: string;
     longDescriptionPath?: string | undefined;
-    static scope: CommandScope.In;
+    scope: CommandScope;
     builder(localYargs: Argv): Argv;
     run(): Promise<void>;
     private getSizeOfDirectory;

package/src/commands/cache/info/cli.js

@@ -19,6 +19,7 @@ class CacheInfoCommandModule extends command_module_1.CommandModule {
         super(...arguments);
         this.command = 'info';
         this.describe = 'Prints persistent disk cache configuration and statistics in the console.';
+        this.scope = command_module_1.CommandScope.In;
     }
     builder(localYargs) {
         return localYargs.strict();

package/src/commands/cache/settings/cli.d.ts

@@ -12,7 +12,7 @@ export declare class CacheDisableModule extends CommandModule implements Command
     aliases: string;
     describe: string;
     longDescriptionPath: string | undefined;
-    static scope: CommandScope.In;
+    scope: CommandScope;
     builder(localYargs: Argv): Argv;
     run(): Promise<void>;
 }
@@ -21,7 +21,7 @@ export declare class CacheEnableModule extends CommandModule implements CommandM
     aliases: string;
     describe: string;
     longDescriptionPath: string | undefined;
-    static scope: CommandScope.In;
+    scope: CommandScope;
     builder(localYargs: Argv): Argv;
     run(): Promise<void>;
 }

package/src/commands/cache/settings/cli.js

@@ -16,6 +16,7 @@ class CacheDisableModule extends command_module_1.CommandModule {
         this.command = 'disable';
         this.aliases = 'off';
         this.describe = 'Disables persistent disk cache for all projects in the workspace.';
+        this.scope = command_module_1.CommandScope.In;
     }
     builder(localYargs) {
         return localYargs;
@@ -31,6 +32,7 @@ class CacheEnableModule extends command_module_1.CommandModule {
         this.command = 'enable';
         this.aliases = 'on';
         this.describe = 'Enables disk cache for all projects in the workspace.';
+        this.scope = command_module_1.CommandScope.In;
     }
     builder(localYargs) {
         return localYargs;

package/src/commands/config/cli.js

@@ -41,7 +41,7 @@ class ConfigCommandModule extends command_module_1.CommandModule {
     }
     async run(options) {
         const level = options.global ? 'global' : 'local';
-        const [config] = (0, config_1.getWorkspaceRaw)(level);
+        const [config] = await (0, config_1.getWorkspaceRaw)(level);
         if (options.value == undefined) {
             if (!config) {
                 this.context.logger.error('No config found.');
@@ -90,7 +90,7 @@ class ConfigCommandModule extends command_module_1.CommandModule {
             !validGlobalCliPaths.has(options.jsonPath)) {
             throw new command_module_1.CommandModuleError('Invalid Path.');
         }
-        const [config, configPath] = (0, config_1.getWorkspaceRaw)(options.global ? 'global' : 'local');
+        const [config, configPath] = await (0, config_1.getWorkspaceRaw)(options.global ? 'global' : 'local');
         const { logger } = this.context;
         if (!config || !configPath) {
             throw new command_module_1.CommandModuleError('Confguration file cannot be found.');

package/src/commands/deploy/cli.js

@@ -19,10 +19,6 @@ class DeployCommandModule extends architect_command_module_1.ArchitectCommandMod
                 name: 'Amazon S3',
                 value: '@jefiozie/ngx-aws-deploy',
             },
-            {
-                name: 'Azure',
-                value: '@azure/ng-deploy',
-            },
             {
                 name: 'Firebase',
                 value: '@angular/fire',

package/src/commands/new/cli.d.ts

@@ -13,7 +13,7 @@ interface NewCommandArgs extends SchematicsCommandArgs {
 }
 export declare class NewCommandModule extends SchematicsCommandModule implements CommandModuleImplementation<NewCommandArgs> {
     private readonly schematicName;
-    static scope: CommandScope;
+    scope: CommandScope;
     protected allowPrivateSchematics: boolean;
     command: string;
     aliases: string;

package/src/commands/new/cli.js

@@ -15,6 +15,7 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
     constructor() {
         super(...arguments);
         this.schematicName = 'ng-new';
+        this.scope = command_module_1.CommandScope.Out;
         this.allowPrivateSchematics = true;
         this.command = 'new [name]';
         this.aliases = 'n';
@@ -79,4 +80,3 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
     }
 }
 exports.NewCommandModule = NewCommandModule;
-NewCommandModule.scope = command_module_1.CommandScope.Out;

package/src/commands/run/cli.d.ts

@@ -13,7 +13,7 @@ export interface RunCommandArgs {
     target: string;
 }
 export declare class RunCommandModule extends ArchitectBaseCommandModule<RunCommandArgs> implements CommandModuleImplementation<RunCommandArgs> {
-    static scope: CommandScope;
+    scope: CommandScope;
     command: string;
     describe: string;
     longDescriptionPath: string;

package/src/commands/run/cli.js

@@ -14,6 +14,7 @@ const command_module_1 = require("../../command-builder/command-module");
 class RunCommandModule extends architect_base_command_module_1.ArchitectBaseCommandModule {
     constructor() {
         super(...arguments);
+        this.scope = command_module_1.CommandScope.In;
         this.command = 'run <target>';
         this.describe = 'Runs an Architect target with an optional custom builder configuration defined in your project.';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
@@ -80,4 +81,3 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
     }
 }
 exports.RunCommandModule = RunCommandModule;
-RunCommandModule.scope = command_module_1.CommandScope.In;

package/src/commands/update/cli.d.ts

@@ -20,7 +20,7 @@ interface UpdateCommandArgs {
     'create-commits': boolean;
 }
 export declare class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {
-    static scope: CommandScope;
+    scope: CommandScope;
     protected shouldReportAnalytics: boolean;
     command: string;
     describe: string;

package/src/commands/update/cli.js

@@ -58,6 +58,7 @@ const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, 'schematic/collection.j
 class UpdateCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
+        this.scope = command_module_1.CommandScope.In;
         this.shouldReportAnalytics = false;
         this.command = 'update [packages..]';
         this.describe = 'Updates your workspace and its dependencies. See https://update.angular.io/.';
@@ -510,7 +511,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 });
             }
             catch { }
-            let forceInstall = options.force;
+            let forceInstall = false;
             // npm 7+ can fail due to it incorrectly resolving peer dependencies that have valid SemVer
             // ranges during an update. Update will set correct versions of dependencies within the
             // package.json file. The force option is set to workaround these errors.
@@ -740,7 +741,6 @@ class UpdateCommandModule extends command_module_1.CommandModule {
     }
 }
 exports.UpdateCommandModule = UpdateCommandModule;
-UpdateCommandModule.scope = command_module_1.CommandScope.In;
 /**
  * @return Whether or not the working directory has Git changes to commit.
  */

package/src/utilities/config.d.ts

@@ -21,9 +21,16 @@ export declare class AngularWorkspace {
     save(): Promise<void>;
     static load(workspaceFilePath: string): Promise<AngularWorkspace>;
 }
-export declare function getWorkspace(level?: 'local' | 'global'): Promise<AngularWorkspace | undefined>;
-export declare function createGlobalSettings(): string;
-export declare function getWorkspaceRaw(level?: 'local' | 'global'): [JSONFile | null, string | null];
+export declare function getWorkspace(level: 'global'): Promise<AngularWorkspace>;
+export declare function getWorkspace(level: 'local'): Promise<AngularWorkspace | undefined>;
+export declare function getWorkspace(level: 'local' | 'global'): Promise<AngularWorkspace | undefined>;
+/**
+ * This method will load the workspace configuration in raw JSON format.
+ * When `level` is `global` and file doesn't exists, it will be created.
+ *
+ * NB: This method is intended to be used only for `ng config`.
+ */
+export declare function getWorkspaceRaw(level?: 'local' | 'global'): Promise<[JSONFile | null, string | null]>;
 export declare function validateWorkspace(data: json.JsonObject): Promise<void>;
 export declare function getProjectByCwd(workspace: AngularWorkspace): string | null;
 export declare function getConfiguredPackageManager(): Promise<PackageManager | null>;

package/src/utilities/config.js

@@ -30,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWarningEnabled = exports.getSchematicDefaults = exports.getConfiguredPackageManager = exports.getProjectByCwd = exports.validateWorkspace = exports.getWorkspaceRaw = exports.createGlobalSettings = exports.getWorkspace = exports.AngularWorkspace = exports.workspaceSchemaPath = void 0;
+exports.isWarningEnabled = exports.getSchematicDefaults = exports.getConfiguredPackageManager = exports.getProjectByCwd = exports.validateWorkspace = exports.getWorkspaceRaw = exports.getWorkspace = exports.AngularWorkspace = exports.workspaceSchemaPath = void 0;
 const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const os = __importStar(require("os"));
@@ -71,6 +71,7 @@ function createWorkspaceHost() {
 exports.workspaceSchemaPath = path.join(__dirname, '../../lib/config/schema.json');
 const configNames = ['angular.json', '.angular.json'];
 const globalFileName = '.angular-config.json';
+const defaultGlobalFilePath = path.join(os.homedir(), globalFileName);
 function xdgConfigHome(home, configFile) {
     // https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
     const xdgConfigHome = process.env['XDG_CONFIG_HOME'] || path.join(home, '.config');
@@ -113,9 +114,8 @@ function globalFilePath() {
             `Please move the file to the new location ~/.config/angular/config.json`);
         return xdgConfigOld;
     }
-    const p = path.join(home, globalFileName);
-    if ((0, fs_1.existsSync)(p)) {
-        return p;
+    if ((0, fs_1.existsSync)(defaultGlobalFilePath)) {
+        return defaultGlobalFilePath;
     }
     return null;
 }
@@ -142,7 +142,7 @@ class AngularWorkspace {
         return project === null || project === void 0 ? void 0 : project.extensions['cli'];
     }
     save() {
-        return core_1.workspaces.writeWorkspace(this.workspace, createWorkspaceHost(), this.filePath);
+        return core_1.workspaces.writeWorkspace(this.workspace, createWorkspaceHost(), this.filePath, core_1.workspaces.WorkspaceFormat.JSON);
     }
     static async load(workspaceFilePath) {
         const result = await core_1.workspaces.readWorkspace(workspaceFilePath, createWorkspaceHost(), core_1.workspaces.WorkspaceFormat.JSON);
@@ -151,17 +151,21 @@ class AngularWorkspace {
 }
 exports.AngularWorkspace = AngularWorkspace;
 const cachedWorkspaces = new Map();
-async function getWorkspace(level = 'local') {
+async function getWorkspace(level) {
     if (cachedWorkspaces.has(level)) {
         return cachedWorkspaces.get(level);
     }
-    let configPath = level === 'local' ? projectFilePath() : globalFilePath();
+    const configPath = level === 'local' ? projectFilePath() : globalFilePath();
     if (!configPath) {
-        if (level === 'local') {
-            cachedWorkspaces.set(level, undefined);
-            return undefined;
+        if (level === 'global') {
+            // Unlike a local config, a global config is not mandatory.
+            // So we create an empty one in memory and keep it as such until it has been modified and saved.
+            const globalWorkspace = new AngularWorkspace({ extensions: {}, projects: new core_1.workspaces.ProjectDefinitionCollection() }, defaultGlobalFilePath);
+            cachedWorkspaces.set(level, globalWorkspace);
+            return globalWorkspace;
         }
-        configPath = createGlobalSettings();
+        cachedWorkspaces.set(level, undefined);
+        return undefined;
     }
     try {
         const workspace = await AngularWorkspace.load(configPath);
@@ -174,21 +178,20 @@ async function getWorkspace(level = 'local') {
     }
 }
 exports.getWorkspace = getWorkspace;
-function createGlobalSettings() {
-    const home = os.homedir();
-    if (!home) {
-        throw new Error('No home directory found.');
-    }
-    const globalPath = path.join(home, globalFileName);
-    (0, fs_1.writeFileSync)(globalPath, JSON.stringify({ version: 1 }));
-    return globalPath;
-}
-exports.createGlobalSettings = createGlobalSettings;
-function getWorkspaceRaw(level = 'local') {
+/**
+ * This method will load the workspace configuration in raw JSON format.
+ * When `level` is `global` and file doesn't exists, it will be created.
+ *
+ * NB: This method is intended to be used only for `ng config`.
+ */
+async function getWorkspaceRaw(level = 'local') {
     let configPath = level === 'local' ? projectFilePath() : globalFilePath();
     if (!configPath) {
         if (level === 'global') {
-            configPath = createGlobalSettings();
+            configPath = defaultGlobalFilePath;
+            // Config doesn't exist, force create it.
+            const globalWorkspace = await getWorkspace('global');
+            await globalWorkspace.save();
         }
         else {
             return [null, null];

package/src/utilities/package-manager.d.ts

@@ -8,7 +8,7 @@
 import { PackageManager } from '../../lib/config/workspace-schema';
 import { AngularWorkspace } from './config';
 export interface PackageManagerUtilsContext {
-    globalConfiguration?: AngularWorkspace;
+    globalConfiguration: AngularWorkspace;
     workspace?: AngularWorkspace;
     root: string;
 }

package/src/utilities/package-manager.js

@@ -82,7 +82,7 @@ class PackageManagerUtils {
         // clean up temp directory on process exit
         process.on('exit', () => {
             try {
-                (0, fs_1.rmdirSync)(tempPath, { recursive: true, maxRetries: 3 });
+                (0, fs_1.rmSync)(tempPath, { recursive: true, maxRetries: 3 });
             }
             catch { }
         });
@@ -268,7 +268,7 @@ class PackageManagerUtils {
             result !== null && result !== void 0 ? result : (result = getPackageManager(localWorkspace.extensions['cli']));
         }
         if (!result) {
-            result = getPackageManager(globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.extensions['cli']);
+            result = getPackageManager(globalWorkspace.extensions['cli']);
         }
         return result;
     }