@angular/cli 9.1.14 → 9.1.15

package/commands/new-impl.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematic_command_1 = require("../models/schematic-command");
-const package_manager_1 = require("../utilities/package-manager");
 class NewCommand extends schematic_command_1.SchematicCommand {
     constructor() {
         super(...arguments);
@@ -20,7 +19,6 @@ class NewCommand extends schematic_command_1.SchematicCommand {
         return super.initialize(options);
     }
     async run(options) {
-        await package_manager_1.ensureCompatibleNpm(this.workspace.root);
         // Register the version of the CLI in the registry.
         const packageJson = require('../package.json');
         const version = packageJson.version;

package/models/schematic-command.js

@@ -397,6 +397,13 @@ class SchematicCommand extends command_1.Command {
                 error = false;
             }
         });
+        // Temporary compatibility check for NPM 7
+        if (collectionName === '@schematics/angular' && schematicName === 'ng-new') {
+            if (!input.skipInstall &&
+                (input.packageManager === undefined || input.packageManager === 'npm')) {
+                await package_manager_1.ensureCompatibleNpm(this.workspace.root);
+            }
+        }
         return new Promise(resolve => {
             workflow
                 .execute({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "9.1.14",
+  "version": "9.1.15",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.901.14",
-    "@angular-devkit/core": "9.1.14",
-    "@angular-devkit/schematics": "9.1.14",
-    "@schematics/angular": "9.1.14",
-    "@schematics/update": "0.901.14",
+    "@angular-devkit/architect": "0.901.15",
+    "@angular-devkit/core": "9.1.15",
+    "@angular-devkit/schematics": "9.1.15",
+    "@schematics/angular": "9.1.15",
+    "@schematics/update": "0.901.15",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.1.1",
@@ -52,17 +52,17 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "9.1.14",
-      "@angular-devkit/build-angular": "0.901.14",
-      "@angular-devkit/build-ng-packagr": "0.901.14",
-      "@angular-devkit/build-webpack": "0.901.14",
-      "@angular-devkit/core": "9.1.14",
-      "@angular-devkit/schematics": "9.1.14"
+      "@angular/cli": "9.1.15",
+      "@angular-devkit/build-angular": "0.901.15",
+      "@angular-devkit/build-ng-packagr": "0.901.15",
+      "@angular-devkit/build-webpack": "0.901.15",
+      "@angular-devkit/core": "9.1.15",
+      "@angular-devkit/schematics": "9.1.15"
     }
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": "^6.11.0",
+    "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },
   "husky": {

package/utilities/package-manager.d.ts

@@ -3,6 +3,6 @@ export declare function supportsYarn(): boolean;
 export declare function supportsNpm(): boolean;
 export declare function getPackageManager(root: string): Promise<PackageManager>;
 /**
- * Checks if the npm version is version 6.x.  If not, display a message and exit.
+ * Checks if the npm version is a supported 7.x version.  If not, display a warning.
  */
 export declare function ensureCompatibleNpm(root: string): Promise<void>;

package/utilities/package-manager.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const semver_1 = require("semver");
 const schema_1 = require("../lib/config/schema");
 const config_1 = require("./config");
 function supports(name) {
@@ -56,26 +57,25 @@ async function getPackageManager(root) {
 }
 exports.getPackageManager = getPackageManager;
 /**
- * Checks if the npm version is version 6.x.  If not, display a message and exit.
+ * Checks if the npm version is a supported 7.x version.  If not, display a warning.
  */
 async function ensureCompatibleNpm(root) {
-    var _a;
     if ((await getPackageManager(root)) !== schema_1.PackageManager.Npm) {
         return;
     }
     try {
-        const version = child_process_1.execSync('npm --version', { encoding: 'utf8', stdio: 'pipe' }).trim();
-        const major = Number((_a = version.match(/^(\d+)\./)) === null || _a === void 0 ? void 0 : _a[1]);
-        if (major === 6) {
+        const versionText = child_process_1.execSync('npm --version', { encoding: 'utf8', stdio: 'pipe' }).trim();
+        const version = semver_1.valid(versionText);
+        if (!version) {
             return;
         }
-        // tslint:disable-next-line: no-console
-        console.error(`npm version ${version} detected.\n` +
-            'The Angular CLI currently requires npm version 6.\n\n' +
-            'Please install a compatible version to proceed (`npm install --global npm@6`).\n');
-        process.exit(3);
+        if (semver_1.satisfies(version, '>=7 <7.5.6')) {
+            // tslint:disable-next-line: no-console
+            console.warn(`npm version ${version} detected.` +
+                ' When using npm 7 with the Angular CLI, npm version 7.5.6 or higher is recommended.');
+        }
     }
-    catch (_b) {
+    catch (_a) {
         // npm is not installed
     }
 }