@angular/cli 14.0.0-rc.1 → 14.0.0

package/lib/config/schema.json

@@ -742,6 +742,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the class, relative to the workspace root.",
           "visible": false
         },
@@ -773,6 +776,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the component file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
           "visible": false
         },
@@ -929,6 +935,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface that defines the directive, relative to the workspace root.",
           "visible": false
         },
@@ -1012,6 +1021,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the enum definition, relative to the current workspace.",
           "visible": false
         },
@@ -1057,6 +1069,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface that defines the guard, relative to the current workspace.",
           "visible": false
         },
@@ -1106,6 +1121,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interceptor, relative to the workspace root.",
           "visible": false
         },
@@ -1147,6 +1165,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface, relative to the workspace root.",
           "visible": false
         },
@@ -1236,6 +1257,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the pipe, relative to the workspace root.",
           "visible": false
         },
@@ -1466,6 +1490,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface that defines the resolver, relative to the current workspace.",
           "visible": false
         },
@@ -1495,7 +1522,9 @@
         },
         "path": {
           "type": "string",
-          "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the service, relative to the workspace root.",
           "visible": false
         },
@@ -1528,6 +1557,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the worker file, relative to the current workspace.",
           "visible": false
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-rc.1",
+  "version": "14.0.0",
   "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.1",
-    "@angular-devkit/core": "14.0.0-rc.1",
-    "@angular-devkit/schematics": "14.0.0-rc.1",
-    "@schematics/angular": "14.0.0-rc.1",
+    "@angular-devkit/architect": "0.1400.0",
+    "@angular-devkit/core": "14.0.0",
+    "@angular-devkit/schematics": "14.0.0",
+    "@schematics/angular": "14.0.0",
     "@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.1",
-      "@angular-devkit/architect": "0.1400.0-rc.1",
-      "@angular-devkit/build-angular": "14.0.0-rc.1",
-      "@angular-devkit/build-webpack": "0.1400.0-rc.1",
-      "@angular-devkit/core": "14.0.0-rc.1",
-      "@angular-devkit/schematics": "14.0.0-rc.1"
+      "@angular/cli": "14.0.0",
+      "@angular-devkit/architect": "0.1400.0",
+      "@angular-devkit/build-angular": "14.0.0",
+      "@angular-devkit/build-webpack": "0.1400.0",
+      "@angular-devkit/core": "14.0.0",
+      "@angular-devkit/schematics": "14.0.0"
     }
   },
   "engines": {

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

@@ -148,9 +148,8 @@ class CommandModule {
      * **Note:** This method should be called from the command bundler method.
      */
     addSchemaOptionsToCommand(localYargs, options) {
-        const workingDir = (0, core_1.normalize)(path.relative(this.context.root, process.cwd()));
         for (const option of options) {
-            const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, hidden, name, choices, format, } = option;
+            const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, hidden, name, choices, } = option;
             const sharedOptions = {
                 alias,
                 hidden,
@@ -160,10 +159,6 @@ 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 } : {}),
             };
-            // Special case for schematics
-            if (workingDir && format === 'path' && name === 'path' && hidden) {
-                sharedOptions.default = workingDir;
-            }
             if (positional === undefined) {
                 localYargs = localYargs.option(core_1.strings.dasherize(name), {
                     type,

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

@@ -120,8 +120,10 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             engineHostCreator: (options) => new schematic_engine_host_1.SchematicEngineHost(options.resolvePaths),
         });
         workflow.registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
-        workflow.registry.addSmartDefaultProvider('projectName', () => this.getProjectName());
         workflow.registry.useXDeprecatedProvider((msg) => logger.warn(msg));
+        workflow.registry.addSmartDefaultProvider('projectName', () => this.getProjectName());
+        const workingDir = (0, core_1.normalize)((0, path_1.relative)(this.context.root, process.cwd()));
+        workflow.registry.addSmartDefaultProvider('workingDirectory', () => workingDir === '' ? undefined : workingDir);
         let shouldReportAnalytics = true;
         workflow.engineHost.registerOptionsTransform(async (schematic, options) => {
             var _a;
@@ -135,6 +137,28 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                     schematic.name.replace(/\//g, '_'),
                 ]);
             }
+            // TODO: The below should be removed in version 15 when we change 1P schematics to use the `workingDirectory smart default`.
+            // Handle `"format": "path"` options.
+            const schema = schematic === null || schematic === void 0 ? void 0 : schematic.schemaJson;
+            if (!options || !schema || !(0, core_1.isJsonObject)(schema)) {
+                return options;
+            }
+            if (!('path' in options && options['path'] === undefined)) {
+                return options;
+            }
+            const properties = schema === null || schema === void 0 ? void 0 : schema['properties'];
+            if (!properties || !(0, core_1.isJsonObject)(properties)) {
+                return options;
+            }
+            const property = properties['path'];
+            if (!property || !(0, core_1.isJsonObject)(property)) {
+                return options;
+            }
+            if (property['format'] === 'path' && !property['$default']) {
+                options['path'] = workingDir || undefined;
+                this.context.logger.warn(`The 'path' option in '${schematic === null || schematic === void 0 ? void 0 : schematic.schema}' is using deprecated behaviour.` +
+                    `'workingDirectory' smart default provider should be used instead.`);
+            }
             return options;
         });
         if (options.interactive !== false && (0, tty_1.isTTY)()) {
@@ -304,9 +328,9 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         if (typeof defaultProjectName === 'string' && defaultProjectName) {
             if (!this.defaultProjectDeprecationWarningShown) {
                 logger.warn(core_1.tags.oneLine `
-            DEPRECATED: The 'defaultProject' workspace option has been deprecated.
-            The project to use will be determined from the current working directory.
-          `);
+             DEPRECATED: The 'defaultProject' workspace option has been deprecated.
+             The project to use will be determined from the current working directory.
+           `);
                 this.defaultProjectDeprecationWarningShown = true;
             }
             return defaultProjectName;

package/src/commands/completion/long-description.md

@@ -4,7 +4,7 @@ discover and use CLI commands without lots of memorization.
 
 ![A demo of Angular CLI autocompletion in a terminal. The user types several partial `ng` commands,
 using autocompletion to finish several arguments and list contextual options.
-](/generated/images/guide/cli/completion.gif)
+](generated/images/guide/cli/completion.gif)
 
 ## Automated setup
 
@@ -13,11 +13,8 @@ Simply answer "Yes" and the CLI will take care of the rest.
 
 ```
 $ ng serve
-? Would you like to enable autocompletion? This will set up your terminal so pressing TAB while
-typing Angular CLI commands will show possible options and autocomplete arguments. (Enabling
-autocompletion will modify configuration files in your home directory.) Yes
-Appended `source <(ng completion script)` to `/home/my-username/.bashrc`. Restart your terminal or
-run:
+? Would you like to enable autocompletion? This will set up your terminal so pressing TAB while typing Angular CLI commands will show possible options and autocomplete arguments. (Enabling autocompletion will modify configuration files in your home directory.) Yes
+Appended `source <(ng completion script)` to `/home/my-username/.bashrc`. Restart your terminal or run:
 
 source <(ng completion script)
 

package/src/commands/update/cli.js

@@ -122,7 +122,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
             alias: ['C'],
             default: false,
         })
-            .check(({ packages, next, 'allow-dirty': allowDirty, 'migrate-only': migrateOnly }) => {
+            .check(({ packages, 'allow-dirty': allowDirty, 'migrate-only': migrateOnly }) => {
             const { logger } = this.context;
             // This allows the user to easily reset any changes from the update.
             if ((packages === null || packages === void 0 ? void 0 : packages.length) && !this.checkCleanGit()) {
@@ -137,9 +137,6 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 if ((packages === null || packages === void 0 ? void 0 : packages.length) !== 1) {
                     throw new command_module_1.CommandModuleError(`A single package must be specified when using the 'migrate-only' option.`);
                 }
-                if (next) {
-                    logger.warn(`'next' option has no effect when using 'migrate-only' option.`);
-                }
             }
             return true;
         })
@@ -513,7 +510,23 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 });
             }
             catch { }
-            const installationSuccess = await this.context.packageManager.installAll(options.force ? ['--force'] : [], this.context.root);
+            let forceInstall = options.force;
+            // 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);
             if (!installationSuccess) {
                 return 1;
             }

package/src/utilities/package-manager.js

@@ -61,24 +61,20 @@ class PackageManagerUtils {
     /** Install a single package. */
     async install(packageName, save = true, extraArgs = [], cwd) {
         const packageManagerArgs = this.getArguments();
-        const installArgs = [
-            packageManagerArgs.install,
-            packageName,
-            packageManagerArgs.silent,
-        ];
+        const installArgs = [packageManagerArgs.install, packageName];
         if (save === 'devDependencies') {
             installArgs.push(packageManagerArgs.saveDev);
         }
-        return this.run([...installArgs, ...extraArgs], cwd);
+        return this.run([...installArgs, ...extraArgs], { cwd, silent: true });
     }
     /** Install all packages. */
     async installAll(extraArgs = [], cwd) {
         const packageManagerArgs = this.getArguments();
-        const installArgs = [packageManagerArgs.silent];
+        const installArgs = [];
         if (packageManagerArgs.installAll) {
             installArgs.push(packageManagerArgs.installAll);
         }
-        return this.run([...installArgs, ...extraArgs], cwd);
+        return this.run([...installArgs, ...extraArgs], { cwd, silent: true });
     }
     /** Install a single package temporary. */
     async installTemp(packageName, extraArgs) {
@@ -123,7 +119,6 @@ class PackageManagerUtils {
         switch (this.name) {
             case workspace_schema_1.PackageManager.Yarn:
                 return {
-                    silent: '--silent',
                     saveDev: '--dev',
                     install: 'add',
                     prefix: '--modules-folder',
@@ -131,7 +126,6 @@ class PackageManagerUtils {
                 };
             case workspace_schema_1.PackageManager.Pnpm:
                 return {
-                    silent: '--silent',
                     saveDev: '--save-dev',
                     install: 'add',
                     installAll: 'install',
@@ -140,7 +134,6 @@ class PackageManagerUtils {
                 };
             default:
                 return {
-                    silent: '--quiet',
                     saveDev: '--save-dev',
                     install: 'install',
                     installAll: 'install',
@@ -149,14 +142,16 @@ class PackageManagerUtils {
                 };
         }
     }
-    async run(args, cwd = process.cwd()) {
+    async run(args, options = {}) {
+        const { cwd = process.cwd(), silent = false } = options;
         const spinner = new spinner_1.Spinner();
         spinner.start('Installing packages...');
         return new Promise((resolve) => {
             var _a, _b;
             const bufferedOutput = [];
             const childProcess = (0, child_process_1.spawn)(this.name, args, {
-                stdio: 'pipe',
+                // Always pipe stderr to allow for failures to be reported
+                stdio: silent ? ['ignore', 'ignore', 'pipe'] : 'pipe',
                 shell: true,
                 cwd,
             }).on('close', (code) => {