@angular/cli 14.0.3 → 14.0.6

package/lib/config/schema.json

@@ -23,7 +23,7 @@
     "defaultProject": {
       "type": "string",
       "description": "Default project name used in commands.",
-      "x-deprecated": "The project to use will be determined from the current working directory."
+      "deprecated": true
     },
     "projects": {
       "type": "object",
@@ -46,7 +46,7 @@
         "defaultCollection": {
           "description": "The default schematics collection to use.",
           "type": "string",
-          "x-deprecated": "Use 'schematicCollections' instead."
+          "deprecated": true
         },
         "schematicCollections": {
           "type": "array",
@@ -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",
+          "deprecated": true
+        },
+        "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
@@ -186,7 +263,7 @@
           "defaultCollection": {
             "description": "The default schematics collection to use.",
             "type": "string",
-            "x-deprecated": "Use 'schematicCollections' instead."
+            "deprecated": true
           },
           "schematicCollections": {
             "type": "array",
@@ -585,14 +662,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"
@@ -620,20 +696,17 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the application?"
+          }
         },
         "inlineStyle": {
           "description": "Include styles inline in the root component.ts file. Only CSS styles can be included inline. Default is false, meaning that an external styles file is created and referenced in the root component.ts file.",
           "type": "boolean",
-          "alias": "s",
-          "x-user-analytics": 9
+          "alias": "s"
         },
         "inlineTemplate": {
           "description": "Include template inline in the root component.ts file. Default is false, meaning that an external template file is created and referenced in the root component.ts file. ",
           "type": "boolean",
-          "alias": "t",
-          "x-user-analytics": 10
+          "alias": "t"
         },
         "viewEncapsulation": {
           "description": "The view encapsulation strategy to use in the new application.",
@@ -642,15 +715,12 @@
             "None",
             "ShadowDom"
           ],
-          "type": "string",
-          "x-user-analytics": 11
+          "type": "string"
         },
         "routing": {
           "type": "boolean",
           "description": "Create a routing NgModule.",
-          "default": false,
-          "x-prompt": "Would you like to add Angular routing?",
-          "x-user-analytics": 17
+          "default": false
         },
         "prefix": {
           "type": "string",
@@ -668,37 +738,13 @@
             "scss",
             "sass",
             "less"
-          ],
-          "x-prompt": {
-            "message": "Which stylesheet format would you like to use?",
-            "type": "list",
-            "items": [
-              {
-                "value": "css",
-                "label": "CSS"
-              },
-              {
-                "value": "scss",
-                "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]"
-              },
-              {
-                "value": "sass",
-                "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]"
-              },
-              {
-                "value": "less",
-                "label": "Less   [ http://lesscss.org                                             ]"
-              }
-            ]
-          },
-          "x-user-analytics": 5
+          ]
         },
         "skipTests": {
           "description": "Do not create \"spec.ts\" test files for the application.",
           "type": "boolean",
           "default": false,
-          "alias": "S",
-          "x-user-analytics": 12
+          "alias": "S"
         },
         "skipPackageJson": {
           "type": "boolean",
@@ -708,8 +754,7 @@
         "minimal": {
           "description": "Create a bare-bones project without any testing frameworks. (Use for learning purposes only.)",
           "type": "boolean",
-          "default": false,
-          "x-user-analytics": 14
+          "default": false
         },
         "skipInstall": {
           "description": "Skip installing dependency packages.",
@@ -719,8 +764,7 @@
         "strict": {
           "description": "Creates an application with stricter bundle budgets settings.",
           "type": "boolean",
-          "default": true,
-          "x-user-analytics": 7
+          "default": true
         }
       }
     },
@@ -736,8 +780,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the class?"
+          }
         },
         "path": {
           "type": "string",
@@ -758,8 +801,7 @@
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new class.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         },
         "type": {
           "type": "string",
@@ -795,8 +837,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the component?"
+          }
         },
         "displayBlock": {
           "description": "Specifies if the style will contain `:host { display: block; }`.",
@@ -808,21 +849,18 @@
           "description": "Include styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file.",
           "type": "boolean",
           "default": false,
-          "alias": "s",
-          "x-user-analytics": 9
+          "alias": "s"
         },
         "inlineTemplate": {
           "description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file.",
           "type": "boolean",
           "default": false,
-          "alias": "t",
-          "x-user-analytics": 10
+          "alias": "t"
         },
         "standalone": {
           "description": "Whether the generated component is standalone.",
           "type": "boolean",
-          "default": false,
-          "x-user-analytics": 15
+          "default": false
         },
         "viewEncapsulation": {
           "description": "The view encapsulation strategy to use in the new component.",
@@ -832,8 +870,7 @@
             "ShadowDom"
           ],
           "type": "string",
-          "alias": "v",
-          "x-user-analytics": 11
+          "alias": "v"
         },
         "changeDetection": {
           "description": "The change detection strategy to use in the new component.",
@@ -869,8 +906,7 @@
             "sass",
             "less",
             "none"
-          ],
-          "x-user-analytics": 5
+          ]
         },
         "type": {
           "type": "string",
@@ -880,8 +916,7 @@
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new component.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         },
         "flat": {
           "type": "boolean",
@@ -891,8 +926,7 @@
         "skipImport": {
           "type": "boolean",
           "description": "Do not import this component into the owning NgModule.",
-          "default": false,
-          "x-user-analytics": 18
+          "default": false
         },
         "selector": {
           "type": "string",
@@ -912,8 +946,7 @@
         "export": {
           "type": "boolean",
           "default": false,
-          "description": "The declaring NgModule exports this component.",
-          "x-user-analytics": 19
+          "description": "The declaring NgModule exports this component."
         }
       }
     },
@@ -929,8 +962,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the directive?"
+          }
         },
         "path": {
           "type": "string",
@@ -965,14 +997,12 @@
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new class.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         },
         "skipImport": {
           "type": "boolean",
           "description": "Do not import this directive into the owning NgModule.",
-          "default": false,
-          "x-user-analytics": 18
+          "default": false
         },
         "selector": {
           "type": "string",
@@ -982,8 +1012,7 @@
         "standalone": {
           "description": "Whether the generated directive is standalone.",
           "type": "boolean",
-          "default": false,
-          "x-user-analytics": 15
+          "default": false
         },
         "flat": {
           "type": "boolean",
@@ -998,8 +1027,7 @@
         "export": {
           "type": "boolean",
           "default": false,
-          "description": "The declaring NgModule exports this directive.",
-          "x-user-analytics": 19
+          "description": "The declaring NgModule exports this directive."
         }
       }
     },
@@ -1015,8 +1043,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the enum?"
+          }
         },
         "path": {
           "type": "string",
@@ -1052,14 +1079,12 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the guard?"
+          }
         },
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new guard.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         },
         "flat": {
           "type": "boolean",
@@ -1098,8 +1123,7 @@
           },
           "default": [
             "CanActivate"
-          ],
-          "x-prompt": "Which interfaces would you like to implement?"
+          ]
         }
       }
     },
@@ -1115,8 +1139,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the interceptor?"
+          }
         },
         "path": {
           "type": "string",
@@ -1142,8 +1165,7 @@
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new interceptor.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         }
       }
     },
@@ -1159,8 +1181,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the interface?"
+          }
         },
         "path": {
           "type": "string",
@@ -1196,7 +1217,6 @@
       "title": "Library Options Schema",
       "type": "object",
       "description": "Creates a new, generic library project in the current workspace.",
-      "long-description": "./library-long.md",
       "additionalProperties": false,
       "properties": {
         "name": {
@@ -1206,8 +1226,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the library?"
+          }
         },
         "entryFile": {
           "type": "string",
@@ -1251,8 +1270,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the pipe?"
+          }
         },
         "path": {
           "type": "string",
@@ -1278,20 +1296,17 @@
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new pipe.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         },
         "skipImport": {
           "type": "boolean",
           "default": false,
-          "description": "Do not import this pipe into the owning NgModule.",
-          "x-user-analytics": 18
+          "description": "Do not import this pipe into the owning NgModule."
         },
         "standalone": {
           "description": "Whether the generated pipe is standalone.",
           "type": "boolean",
-          "default": false,
-          "x-user-analytics": 15
+          "default": false
         },
         "module": {
           "type": "string",
@@ -1301,8 +1316,7 @@
         "export": {
           "type": "boolean",
           "default": false,
-          "description": "The declaring NgModule exports this pipe.",
-          "x-user-analytics": 19
+          "description": "The declaring NgModule exports this pipe."
         }
       }
     },
@@ -1322,8 +1336,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the new workspace and initial project?"
+          }
         },
         "skipInstall": {
           "description": "Do not install dependency packages.",
@@ -1374,14 +1387,12 @@
         "inlineStyle": {
           "description": "Include styles inline in the component TS file. By default, an external styles file is created and referenced in the component TypeScript file.",
           "type": "boolean",
-          "alias": "s",
-          "x-user-analytics": 9
+          "alias": "s"
         },
         "inlineTemplate": {
           "description": "Include template inline in the component TS file. By default, an external template file is created and referenced in the component TypeScript file.",
           "type": "boolean",
-          "alias": "t",
-          "x-user-analytics": 10
+          "alias": "t"
         },
         "viewEncapsulation": {
           "description": "The view encapsulation strategy to use in the initial project.",
@@ -1390,8 +1401,7 @@
             "None",
             "ShadowDom"
           ],
-          "type": "string",
-          "x-user-analytics": 11
+          "type": "string"
         },
         "version": {
           "type": "string",
@@ -1403,8 +1413,7 @@
         },
         "routing": {
           "type": "boolean",
-          "description": "Generate a routing module for the initial project.",
-          "x-user-analytics": 17
+          "description": "Generate a routing module for the initial project."
         },
         "prefix": {
           "type": "string",
@@ -1422,15 +1431,13 @@
             "scss",
             "sass",
             "less"
-          ],
-          "x-user-analytics": 5
+          ]
         },
         "skipTests": {
           "description": "Do not generate \"spec.ts\" test files for the new project.",
           "type": "boolean",
           "default": false,
-          "alias": "S",
-          "x-user-analytics": 12
+          "alias": "S"
         },
         "createApplication": {
           "description": "Create a new initial application project in the 'src' folder of the new workspace. When false, creates an empty workspace with no initial application. You can then use the generate application command so that all applications are created in the projects folder.",
@@ -1440,14 +1447,12 @@
         "minimal": {
           "description": "Create a workspace without any testing frameworks. (Use for learning purposes only.)",
           "type": "boolean",
-          "default": false,
-          "x-user-analytics": 14
+          "default": false
         },
         "strict": {
           "description": "Creates a workspace with stricter type checking and stricter bundle budgets settings. This setting helps improve maintainability and catch bugs ahead of time. For more information, see https://angular.io/guide/strict-mode",
           "type": "boolean",
-          "default": true,
-          "x-user-analytics": 7
+          "default": true
         },
         "packageManager": {
           "description": "The package manager used to install dependencies.",
@@ -1473,14 +1478,12 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the resolver?"
+          }
         },
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new resolver.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         },
         "flat": {
           "type": "boolean",
@@ -1517,8 +1520,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the service?"
+          }
         },
         "path": {
           "type": "string",
@@ -1543,8 +1545,7 @@
         "skipTests": {
           "type": "boolean",
           "description": "Do not create \"spec.ts\" test files for the new service.",
-          "default": false,
-          "x-user-analytics": 12
+          "default": false
         }
       }
     },
@@ -1576,8 +1577,7 @@
           "$default": {
             "$source": "argv",
             "index": 0
-          },
-          "x-prompt": "What name would you like to use for the worker?"
+          }
         },
         "snippet": {
           "type": "boolean",
@@ -1744,7 +1744,6 @@
         },
         "optimization": {
           "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
-          "x-user-analytics": 16,
           "default": true,
           "oneOf": [
             {
@@ -1827,7 +1826,6 @@
         "aot": {
           "type": "boolean",
           "description": "Build using Ahead of Time compilation.",
-          "x-user-analytics": 13,
           "default": true
         },
         "sourceMap": {
@@ -1882,7 +1880,7 @@
         "deployUrl": {
           "type": "string",
           "description": "URL where files will be deployed.",
-          "x-deprecated": "Use \"baseHref\" option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
+          "deprecated": true
         },
         "verbose": {
           "type": "boolean",
@@ -2692,7 +2690,6 @@
         },
         "optimization": {
           "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking and dead-code elimination. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
-          "x-user-analytics": 16,
           "default": true,
           "oneOf": [
             {
@@ -2770,7 +2767,7 @@
         "deployUrl": {
           "type": "string",
           "description": "URL where files will be deployed.",
-          "x-deprecated": "Use \"baseHref\" browser builder option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
+          "deprecated": true
         },
         "verbose": {
           "type": "boolean",

package/lib/init.js

@@ -63,6 +63,7 @@ let forceExit = false;
         return (await Promise.resolve().then(() => __importStar(require('./cli')))).default;
     }
     let cli;
+    const rawCommandName = process.argv[2];
     try {
         // No error implies a projectLocalCli, which will load whatever
         // version of ng-cli you have installed in a local package.json
@@ -84,6 +85,10 @@ let forceExit = false;
         // Ensure older versions of the CLI fully exit
         if ((0, semver_1.major)(localVersion) < 14) {
             forceExit = true;
+            // Versions prior to 14 didn't implement completion command.
+            if (rawCommandName === 'completion') {
+                return null;
+            }
         }
         let isGlobalGreater = false;
         try {
@@ -93,7 +98,6 @@ let forceExit = false;
             // eslint-disable-next-line  no-console
             console.error('Version mismatch check skipped. Unable to compare local version: ' + error);
         }
-        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
@@ -125,14 +129,10 @@ let forceExit = false;
     }
     return cli;
 })()
-    .then((cli) => {
-    return cli({
-        cliArgs: process.argv.slice(2),
-        inputStream: process.stdin,
-        outputStream: process.stdout,
-    });
-})
-    .then((exitCode) => {
+    .then((cli) => cli === null || cli === void 0 ? void 0 : cli({
+    cliArgs: process.argv.slice(2),
+}))
+    .then((exitCode = 0) => {
     if (forceExit) {
         process.exit(exitCode);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.3",
+  "version": "14.0.6",
   "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.3",
-    "@angular-devkit/core": "14.0.3",
-    "@angular-devkit/schematics": "14.0.3",
-    "@schematics/angular": "14.0.3",
+    "@angular-devkit/architect": "0.1400.6",
+    "@angular-devkit/core": "14.0.6",
+    "@angular-devkit/schematics": "14.0.6",
+    "@schematics/angular": "14.0.6",
     "@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.3",
-      "@angular-devkit/architect": "0.1400.3",
-      "@angular-devkit/build-angular": "14.0.3",
-      "@angular-devkit/build-webpack": "0.1400.3",
-      "@angular-devkit/core": "14.0.3",
-      "@angular-devkit/schematics": "14.0.3"
+      "@angular/cli": "14.0.6",
+      "@angular-devkit/architect": "0.1400.6",
+      "@angular-devkit/build-angular": "14.0.6",
+      "@angular-devkit/build-webpack": "0.1400.6",
+      "@angular-devkit/core": "14.0.6",
+      "@angular-devkit/schematics": "14.0.6"
     }
   },
   "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

@@ -161,15 +161,11 @@ 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);
+            // Handle options which have been defined in the schema with `no` prefix.
             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(dashedName, {
@@ -188,8 +184,7 @@ 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.
+        // Handle options which have been defined in the schema with `no` prefix.
         if (booleanOptionsWithNoPrefix.size) {
             localYargs.middleware((options) => {
                 for (const key of booleanOptionsWithNoPrefix) {

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

@@ -136,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('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/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

@@ -72,8 +72,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,
         })
@@ -189,7 +188,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],
@@ -511,23 +510,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;
             }
@@ -739,6 +722,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/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);