@angular/cli 14.1.0-next.2 → 14.1.0-next.3

package/lib/config/schema.json

@@ -74,7 +74,8 @@
               "description": "Show a warning when the global version is newer than the local one.",
               "type": "boolean"
             }
-          }
+          },
+          "additionalProperties": false
         },
         "analytics": {
           "type": [
@@ -96,7 +97,8 @@
               "type": "string",
               "format": "uuid"
             }
-          }
+          },
+          "additionalProperties": false
         },
         "cache": {
           "description": "Control disk cache.",
@@ -119,7 +121,82 @@
               "description": "Cache base path.",
               "type": "string"
             }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "cliGlobalOptions": {
+      "type": "object",
+      "properties": {
+        "defaultCollection": {
+          "description": "The default schematics collection to use.",
+          "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.",
+          "type": "string",
+          "enum": [
+            "npm",
+            "cnpm",
+            "yarn",
+            "pnpm"
+          ]
+        },
+        "warnings": {
+          "description": "Control CLI specific console warnings",
+          "type": "object",
+          "properties": {
+            "versionMismatch": {
+              "description": "Show a warning when the global version is newer than the local one.",
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        },
+        "analytics": {
+          "type": [
+            "boolean",
+            "string"
+          ],
+          "description": "Share anonymous usage data with the Angular Team at Google."
+        },
+        "analyticsSharing": {
+          "type": "object",
+          "properties": {
+            "tracking": {
+              "description": "Analytics sharing info tracking ID.",
+              "type": "string",
+              "pattern": "^(GA|UA)?-\\d+-\\d+$"
+            },
+            "uuid": {
+              "description": "Analytics sharing info universally unique identifier.",
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          "additionalProperties": false
+        },
+        "completion": {
+          "type": "object",
+          "description": "Angular CLI completion settings.",
+          "properties": {
+            "prompted": {
+              "type": "boolean",
+              "description": "Whether the user has been prompted to add completion command prompt."
+            }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -608,14 +685,13 @@
       "type": "object",
       "properties": {
         "$schema": {
-          "type": "string",
-          "format": "uri"
+          "type": "string"
         },
         "version": {
           "$ref": "#/definitions/fileVersion"
         },
         "cli": {
-          "$ref": "#/definitions/cliOptions"
+          "$ref": "#/definitions/cliGlobalOptions"
         },
         "schematics": {
           "$ref": "#/definitions/schematicOptions"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.1.0-next.2",
+  "version": "14.1.0-next.3",
   "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.2",
-    "@angular-devkit/core": "14.1.0-next.2",
-    "@angular-devkit/schematics": "14.1.0-next.2",
-    "@schematics/angular": "14.1.0-next.2",
+    "@angular-devkit/architect": "0.1401.0-next.3",
+    "@angular-devkit/core": "14.1.0-next.3",
+    "@angular-devkit/schematics": "14.1.0-next.3",
+    "@schematics/angular": "14.1.0-next.3",
     "@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.2",
-      "@angular-devkit/architect": "0.1401.0-next.2",
-      "@angular-devkit/build-angular": "14.1.0-next.2",
-      "@angular-devkit/build-webpack": "0.1401.0-next.2",
-      "@angular-devkit/core": "14.1.0-next.2",
-      "@angular-devkit/schematics": "14.1.0-next.2"
+      "@angular/cli": "14.1.0-next.3",
+      "@angular-devkit/architect": "0.1401.0-next.3",
+      "@angular-devkit/build-angular": "14.1.0-next.3",
+      "@angular-devkit/build-webpack": "0.1401.0-next.3",
+      "@angular-devkit/core": "14.1.0-next.3",
+      "@angular-devkit/schematics": "14.1.0-next.3"
     }
   },
   "engines": {

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/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);