@angular/cli 14.1.0-next.1 → 14.1.0-next.4

package/lib/init.js

@@ -93,10 +93,12 @@ let forceExit = false;
             // eslint-disable-next-line  no-console
             console.error('Version mismatch check skipped. Unable to compare local version: ' + error);
         }
-        if (isGlobalGreater) {
+        const rawCommandName = process.argv[2];
+        // When using the completion command, don't show the warning as otherwise this will break completion.
+        if (isGlobalGreater && rawCommandName !== 'completion') {
             // If using the update command and the global version is greater, use the newer update command
             // This allows improvements in update to be used in older versions that do not have bootstrapping
-            if (process.argv[2] === 'update' &&
+            if (rawCommandName === 'update' &&
                 cli.VERSION &&
                 cli.VERSION.major - globalVersion.major <= 1) {
                 cli = await Promise.resolve().then(() => __importStar(require('./cli')));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.1.0-next.1",
+  "version": "14.1.0-next.4",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,22 +25,22 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1401.0-next.1",
-    "@angular-devkit/core": "14.1.0-next.1",
-    "@angular-devkit/schematics": "14.1.0-next.1",
-    "@schematics/angular": "14.1.0-next.1",
+    "@angular-devkit/architect": "0.1401.0-next.4",
+    "@angular-devkit/core": "14.1.0-next.4",
+    "@angular-devkit/schematics": "14.1.0-next.4",
+    "@schematics/angular": "14.1.0-next.4",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "debug": "4.3.4",
     "ini": "3.0.0",
     "inquirer": "8.2.4",
     "jsonc-parser": "3.0.0",
-    "npm-package-arg": "9.0.2",
+    "npm-package-arg": "9.1.0",
     "npm-pick-manifest": "7.0.1",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "13.6.0",
-    "resolve": "1.22.0",
+    "pacote": "13.6.1",
+    "resolve": "1.22.1",
     "semver": "7.3.7",
     "symbol-observable": "4.0.0",
     "uuid": "8.3.2",
@@ -49,12 +49,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.1.0-next.1",
-      "@angular-devkit/architect": "0.1401.0-next.1",
-      "@angular-devkit/build-angular": "14.1.0-next.1",
-      "@angular-devkit/build-webpack": "0.1401.0-next.1",
-      "@angular-devkit/core": "14.1.0-next.1",
-      "@angular-devkit/schematics": "14.1.0-next.1"
+      "@angular/cli": "14.1.0-next.4",
+      "@angular-devkit/architect": "0.1401.0-next.4",
+      "@angular-devkit/build-angular": "14.1.0-next.4",
+      "@angular-devkit/build-webpack": "0.1401.0-next.4",
+      "@angular-devkit/core": "14.1.0-next.4",
+      "@angular-devkit/schematics": "14.1.0-next.4"
     }
   },
   "engines": {

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

@@ -113,8 +113,14 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
             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.');
+                throw new command_module_1.CommandModuleError('Cannot determine project for command.\n' +
+                    'This is a multi-project workspace and more than one project supports this command. ' +
+                    `Run "ng ${this.command}" to execute the command for a specific project or change the current ` +
+                    'working directory to a project directory.\n\n' +
+                    `Available projects are:\n${allProjectsForTargetName
+                        .sort()
+                        .map((p) => `- ${p}`)
+                        .join('\n')}`);
             }
         }
         return undefined;

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

@@ -149,6 +149,7 @@ class CommandModule {
      * **Note:** This method should be called from the command bundler method.
      */
     addSchemaOptionsToCommand(localYargs, options) {
+        const booleanOptionsWithNoPrefix = new Set();
         for (const option of options) {
             const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, hidden, name, choices, } = option;
             const sharedOptions = {
@@ -160,14 +161,24 @@ class CommandModule {
                 // This should only be done when `--help` is used otherwise default will override options set in angular.json.
                 ...(this.context.args.options.help ? { default: defaultVal } : {}),
             };
+            // TODO(alanagius4): remove in a major version.
+            // the below is an interim workaround to handle options which have been defined in the schema with `no` prefix.
+            let dashedName = core_1.strings.dasherize(name);
+            if (type === 'boolean' && dashedName.startsWith('no-')) {
+                dashedName = dashedName.slice(3);
+                booleanOptionsWithNoPrefix.add(dashedName);
+                // eslint-disable-next-line no-console
+                console.warn(`Warning: '${name}' option has been declared with a 'no' prefix in the schema.` +
+                    'Please file an issue with the author of this package.');
+            }
             if (positional === undefined) {
-                localYargs = localYargs.option(core_1.strings.dasherize(name), {
+                localYargs = localYargs.option(dashedName, {
                     type,
                     ...sharedOptions,
                 });
             }
             else {
-                localYargs = localYargs.positional(core_1.strings.dasherize(name), {
+                localYargs = localYargs.positional(dashedName, {
                     type: type === 'array' || type === 'count' ? 'string' : type,
                     ...sharedOptions,
                 });
@@ -177,6 +188,18 @@ class CommandModule {
                 this.optionsWithAnalytics.set(name, userAnalytics);
             }
         }
+        // TODO(alanagius4): remove in a major version.
+        // the below is an interim workaround to handle options which have been defined in the schema with `no` prefix.
+        if (booleanOptionsWithNoPrefix.size) {
+            localYargs.middleware((options) => {
+                for (const key of booleanOptionsWithNoPrefix) {
+                    if (key in options) {
+                        options[`no-${key}`] = !options[key];
+                        delete options[key];
+                    }
+                }
+            }, false);
+        }
         return localYargs;
     }
     getWorkspaceOrThrow() {

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

@@ -138,7 +138,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'))
+        .epilogue('For more information, see https://angular.io/cli/.\n')
         .demandCommand(1, command_1.demandCommandFailureMessage)
         .recommendCommands()
         .middleware(normalize_options_middleware_1.normalizeOptionsMiddleware)

package/src/commands/config/cli.js

@@ -71,25 +71,10 @@ class ConfigCommandModule extends command_module_1.CommandModule {
         return 0;
     }
     async set(options) {
-        var _a;
+        var _a, _b;
         if (!((_a = options.jsonPath) === null || _a === void 0 ? void 0 : _a.trim())) {
             throw new command_module_1.CommandModuleError('Invalid Path.');
         }
-        const validGlobalCliPaths = new Set([
-            'cli.warnings.versionMismatch',
-            'cli.defaultCollection',
-            'cli.schematicCollections',
-            'cli.packageManager',
-            'cli.analytics',
-            'cli.analyticsSharing.tracking',
-            'cli.analyticsSharing.uuid',
-            'cli.completion.prompted',
-        ]);
-        if (options.global &&
-            !options.jsonPath.startsWith('schematics.') &&
-            !validGlobalCliPaths.has(options.jsonPath)) {
-            throw new command_module_1.CommandModuleError('Invalid Path.');
-        }
         const [config, configPath] = await (0, config_1.getWorkspaceRaw)(options.global ? 'global' : 'local');
         const { logger } = this.context;
         if (!config || !configPath) {
@@ -104,7 +89,7 @@ class ConfigCommandModule extends command_module_1.CommandModule {
             logger.error('Value cannot be found.');
             return 1;
         }
-        await (0, config_1.validateWorkspace)((0, json_file_1.parseJson)(config.content));
+        await (0, config_1.validateWorkspace)((0, json_file_1.parseJson)(config.content), (_b = options.global) !== null && _b !== void 0 ? _b : false);
         config.save();
         return 0;
     }

package/src/commands/new/cli.js

@@ -27,7 +27,7 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
             describe: 'A collection of schematics to use in generating the initial application.',
             type: 'string',
         });
-        const { options: { collectionNameFromArgs }, } = this.context.args;
+        const { options: { collection: collectionNameFromArgs }, } = this.context.args;
         const collectionName = typeof collectionNameFromArgs === 'string'
             ? collectionNameFromArgs
             : await this.getCollectionFromConfig();

package/src/commands/run/cli.js

@@ -30,6 +30,16 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
             // Also, hide choices from JSON help so that we don't display them in AIO.
             choices: (getYargsCompletions || help) && !jsonHelp ? this.getTargetChoices() : undefined,
         })
+            .middleware((args) => {
+            // TODO: remove in version 15.
+            const { configuration, target } = args;
+            if (typeof configuration === 'string' && target) {
+                const targetWithConfig = target.split(':', 2);
+                targetWithConfig.push(configuration);
+                throw new command_module_1.CommandModuleError('Unknown argument: configuration.\n' +
+                    `Provide the configuration as part of the target 'ng run ${targetWithConfig.join(':')}'.`);
+            }
+        }, true)
             .strict();
         const target = this.makeTargetSpecifier();
         if (!target) {

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

@@ -51,5 +51,6 @@ export declare class UpdateCommandModule extends CommandModule<UpdateCommandArgs
     private checkCLIVersion;
     private getCLIUpdateRunnerVersion;
     private runTempBinary;
+    private packageManagerForce;
 }
 export {};

package/src/commands/update/cli.js

@@ -73,8 +73,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
             array: true,
         })
             .option('force', {
-            description: 'Ignore peer dependency version mismatches. ' +
-                `Passes the '--force' flag to the package manager when installing packages.`,
+            description: 'Ignore peer dependency version mismatches.',
             type: 'boolean',
             default: false,
         })
@@ -191,7 +190,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
         logger.info(`Found ${rootDependencies.size} dependencies.`);
         const workflow = new tools_1.NodeWorkflow(this.context.root, {
             packageManager: packageManager.name,
-            packageManagerForce: options.force,
+            packageManagerForce: this.packageManagerForce(options.verbose),
             // __dirname -> favor @schematics/update from this package
             // Otherwise, use packages from the active workspace (migrations)
             resolvePaths: [__dirname, this.context.root],
@@ -518,23 +517,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 });
             }
             catch { }
-            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.
-            // Example error:
-            // npm ERR! Conflicting peer dependency: @angular/compiler-cli@14.0.0-rc.0
-            // npm ERR! node_modules/@angular/compiler-cli
-            // npm ERR!   peer @angular/compiler-cli@"^14.0.0 || ^14.0.0-rc" from @angular-devkit/build-angular@14.0.0-rc.0
-            // npm ERR!   node_modules/@angular-devkit/build-angular
-            // npm ERR!     dev @angular-devkit/build-angular@"~14.0.0-rc.0" from the root project
-            if (this.context.packageManager.name === workspace_schema_1.PackageManager.Npm &&
-                this.context.packageManager.version &&
-                semver.gte(this.context.packageManager.version, '7.0.0', { includePrerelease: true })) {
-                logVerbose('NPM 7+ detected -- enabling force option for package installation');
-                forceInstall = true;
-            }
-            const installationSuccess = await this.context.packageManager.installAll(forceInstall ? ['--force'] : [], this.context.root);
+            const installationSuccess = await this.context.packageManager.installAll(this.packageManagerForce(options.verbose) ? ['--force'] : [], this.context.root);
             if (!installationSuccess) {
                 return 1;
             }
@@ -749,6 +732,26 @@ class UpdateCommandModule extends command_module_1.CommandModule {
         }
         return status !== null && status !== void 0 ? status : 0;
     }
+    packageManagerForce(verbose) {
+        // 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.
+        // Example error:
+        // npm ERR! Conflicting peer dependency: @angular/compiler-cli@14.0.0-rc.0
+        // npm ERR! node_modules/@angular/compiler-cli
+        // npm ERR!   peer @angular/compiler-cli@"^14.0.0 || ^14.0.0-rc" from @angular-devkit/build-angular@14.0.0-rc.0
+        // npm ERR!   node_modules/@angular-devkit/build-angular
+        // npm ERR!     dev @angular-devkit/build-angular@"~14.0.0-rc.0" from the root project
+        if (this.context.packageManager.name === workspace_schema_1.PackageManager.Npm &&
+            this.context.packageManager.version &&
+            semver.gte(this.context.packageManager.version, '7.0.0', { includePrerelease: true })) {
+            if (verbose) {
+                this.context.logger.info('NPM 7+ detected -- enabling force option for package installation');
+            }
+            return true;
+        }
+        return false;
+    }
 }
 exports.UpdateCommandModule = UpdateCommandModule;
 /**

package/src/utilities/color.js

@@ -64,7 +64,6 @@ function removeColor(text) {
 }
 exports.removeColor = removeColor;
 // Create a separate instance to prevent unintended global changes to the color configuration
-// Create function is not defined in the typings. See: https://github.com/doowb/ansi-colors/pull/44
 const colors = ansiColors.create();
 exports.colors = colors;
 colors.enabled = supportColor();

package/src/utilities/config.d.ts

@@ -31,7 +31,7 @@ export declare function getWorkspace(level: 'local' | 'global'): Promise<Angular
  * 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 validateWorkspace(data: json.JsonObject, isGlobal: boolean): Promise<void>;
 export declare function getProjectByCwd(workspace: AngularWorkspace): string | null;
 export declare function getConfiguredPackageManager(): Promise<PackageManager | null>;
 export declare function getSchematicDefaults(collection: string, schematic: string, project?: string | null): Promise<{}>;

package/src/utilities/config.js

@@ -200,11 +200,18 @@ async function getWorkspaceRaw(level = 'local') {
     return [new json_file_1.JSONFile(configPath), configPath];
 }
 exports.getWorkspaceRaw = getWorkspaceRaw;
-async function validateWorkspace(data) {
+async function validateWorkspace(data, isGlobal) {
     const schema = (0, json_file_1.readAndParseJson)(exports.workspaceSchemaPath);
+    // We should eventually have a dedicated global config schema and use that to validate.
+    const schemaToValidate = isGlobal
+        ? {
+            '$ref': '#/definitions/global',
+            definitions: schema['definitions'],
+        }
+        : schema;
     const { formats } = await Promise.resolve().then(() => __importStar(require('@angular-devkit/schematics')));
     const registry = new core_1.json.schema.CoreSchemaRegistry(formats.standardFormats);
-    const validator = await registry.compile(schema).toPromise();
+    const validator = await registry.compile(schemaToValidate).toPromise();
     const { success, errors } = await validator(data).toPromise();
     if (!success) {
         throw new core_1.json.schema.SchemaValidationException(errors);