@angular/cli 14.0.1 → 14.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.1",
+  "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.1",
-    "@angular-devkit/core": "14.0.1",
-    "@angular-devkit/schematics": "14.0.1",
-    "@schematics/angular": "14.0.1",
+    "@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.1",
-      "@angular-devkit/architect": "0.1400.1",
-      "@angular-devkit/build-angular": "14.0.1",
-      "@angular-devkit/build-webpack": "0.1400.1",
-      "@angular-devkit/core": "14.0.1",
-      "@angular-devkit/schematics": "14.0.1"
+      "@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) {
@@ -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/command-module.d.ts

@@ -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,7 +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(getEpilogue(!!workspace)))
+        .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)
@@ -162,17 +155,3 @@ async function runCommand(args, logger) {
     return (_b = process.exitCode) !== null && _b !== void 0 ? _b : 0;
 }
 exports.runCommand = runCommand;
-function getEpilogue(isInsideWorkspace) {
-    let message;
-    if (isInsideWorkspace) {
-        message =
-            'The above commands are available when running the Angular CLI inside a workspace.' +
-                'More commands are available when running outside a workspace.\n';
-    }
-    else {
-        message =
-            'The above commands are available when running the Angular CLI outside a workspace.' +
-                'More commands are available when running inside a workspace.\n';
-    }
-    return message + 'For more information, see https://angular.io/cli/.\n';
-}

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;
@@ -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;
+    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();
@@ -30,4 +31,3 @@ class CacheCleanModule extends command_module_1.CommandModule {
     }
 }
 exports.CacheCleanModule = CacheCleanModule;
-CacheCleanModule.scope = command_module_1.CommandScope.In;

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;
+    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 = [
@@ -36,4 +37,3 @@ class CacheCommandModule extends command_module_1.CommandModule {
     run(_options) { }
 }
 exports.CacheCommandModule = CacheCommandModule;
-CacheCommandModule.scope = command_module_1.CommandScope.In;

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;
+    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();
@@ -80,4 +81,3 @@ class CacheInfoCommandModule extends command_module_1.CommandModule {
     }
 }
 exports.CacheInfoCommandModule = CacheInfoCommandModule;
-CacheInfoCommandModule.scope = command_module_1.CommandScope.In;

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;
+    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;
+    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;
@@ -25,13 +26,13 @@ class CacheDisableModule extends command_module_1.CommandModule {
     }
 }
 exports.CacheDisableModule = CacheDisableModule;
-CacheDisableModule.scope = command_module_1.CommandScope.In;
 class CacheEnableModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
         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;
@@ -41,4 +42,3 @@ class CacheEnableModule extends command_module_1.CommandModule {
     }
 }
 exports.CacheEnableModule = CacheEnableModule;
-CacheEnableModule.scope = command_module_1.CommandScope.In;

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/.';
@@ -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.
  */