@angular/cli 14.0.0-rc.2 → 14.0.0-rc.3

package/package.json

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

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

@@ -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

@@ -510,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) => {