@angular/cli 10.1.7 → 10.2.3

package/commands/add-impl.js

@@ -35,6 +35,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
     }
     async run(options) {
         var _a;
+        await package_manager_1.ensureCompatibleNpm(this.workspace.root);
         if (!options.collection) {
             this.logger.fatal(`The "ng add" command requires a name argument to be specified eg. ` +
                 `${color_1.colors.yellow('ng add [name] ')}. For more details, use "ng help".`);

package/commands/update-impl.js

@@ -185,6 +185,7 @@ class UpdateCommand extends command_1.Command {
     }
     // tslint:disable-next-line:no-big-function
     async run(options) {
+        await package_manager_1.ensureCompatibleNpm(this.workspace.root);
         // Check if the @angular-devkit/schematics package can be resolved from the workspace root
         // This works around issues with packages containing migrations that cannot directly depend on the package
         // This check can be removed once the schematic runtime handles this situation

package/commands/update-long.md

@@ -4,14 +4,19 @@ Perform a basic update to the current stable release of the core framework and C
 ng update @angular/cli @angular/core
 ```
 
-To update to the next beta or pre-release version, use the `--next=true` option.
+To update to the next beta or pre-release version, use the `--next` option.
 
 To update from one major version to another, use the format
-`ng update @angular/cli@^<major_version> @angular/core@^<major_version>`.
+
+```
+ng update @angular/cli@^<major_version> @angular/core@^<major_version>
+```
 
 We recommend that you always update to the latest patch version, as it contains fixes we released since the initial major release.
-For example, use the following command to take the latest 9.x.x version and use that to update.
+For example, use the following command to take the latest 10.x.x version and use that to update.
 
-`ng update @angular/cli@^9 @angular/core@^9`
+```
+ng update @angular/cli@^10 @angular/core@^10
+```
 
 For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.io/).

package/models/interface.d.ts

@@ -129,6 +129,11 @@ export interface Option {
      * If this is falsey, do not report this option.
      */
     userAnalytics?: number;
+    /**
+     * Deprecation. If this flag is not false a warning will be shown on the console. Either `true`
+     * or a string to show the user as a notice.
+    */
+    deprecated?: boolean | string;
 }
 /**
  * Scope of the command.

package/models/schematic-command.js

@@ -398,6 +398,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": "10.1.7",
+  "version": "10.2.3",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,15 +28,15 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1001.7",
-    "@angular-devkit/core": "10.1.7",
-    "@angular-devkit/schematics": "10.1.7",
-    "@schematics/angular": "10.1.7",
-    "@schematics/update": "0.1001.7",
+    "@angular-devkit/architect": "0.1002.3",
+    "@angular-devkit/core": "10.2.3",
+    "@angular-devkit/schematics": "10.2.3",
+    "@schematics/angular": "10.2.3",
+    "@schematics/update": "0.1002.3",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.1.1",
-    "ini": "1.3.5",
+    "ini": "1.3.6",
     "inquirer": "7.3.3",
     "npm-package-arg": "8.0.1",
     "npm-pick-manifest": "6.1.0",
@@ -52,17 +52,17 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "10.1.7",
-      "@angular-devkit/build-angular": "0.1001.7",
-      "@angular-devkit/build-ng-packagr": "0.1001.7",
-      "@angular-devkit/build-webpack": "0.1001.7",
-      "@angular-devkit/core": "10.1.7",
-      "@angular-devkit/schematics": "10.1.7"
+      "@angular/cli": "10.2.3",
+      "@angular-devkit/build-angular": "0.1002.3",
+      "@angular-devkit/build-ng-packagr": "0.1002.3",
+      "@angular-devkit/build-webpack": "0.1002.3",
+      "@angular-devkit/core": "10.2.3",
+      "@angular-devkit/schematics": "10.2.3"
     }
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": ">= 6.11.0",
+    "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },
   "husky": {

package/utilities/json-schema.js

@@ -199,6 +199,10 @@ async function parseJsonSchemaToOptions(registry, schema) {
         const hidden = !!current.hidden || !visible;
         const xUserAnalytics = current['x-user-analytics'];
         const userAnalytics = typeof xUserAnalytics == 'number' ? xUserAnalytics : undefined;
+        // Deprecated is set only if it's true or a string.
+        const xDeprecated = current['x-deprecated'];
+        const deprecated = (xDeprecated === true || typeof xDeprecated === 'string')
+            ? xDeprecated : undefined;
         const option = {
             name,
             description: '' + (current.description === undefined ? '' : current.description),
@@ -210,6 +214,7 @@ async function parseJsonSchemaToOptions(registry, schema) {
             ...format !== undefined ? { format } : {},
             hidden,
             ...userAnalytics ? { userAnalytics } : {},
+            ...deprecated !== undefined ? { deprecated } : {},
             ...positional !== undefined ? { positional } : {},
         };
         options.push(option);

package/utilities/package-manager.d.ts

@@ -2,3 +2,7 @@ import { PackageManager } from '../lib/config/schema';
 export declare function supportsYarn(): boolean;
 export declare function supportsNpm(): boolean;
 export declare function getPackageManager(root: string): Promise<PackageManager>;
+/**
+ * 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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
+exports.ensureCompatibleNpm = exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -11,6 +11,7 @@ exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
 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,3 +57,27 @@ async function getPackageManager(root) {
     return packageManager || schema_1.PackageManager.Npm;
 }
 exports.getPackageManager = getPackageManager;
+/**
+ * Checks if the npm version is a supported 7.x version.  If not, display a warning.
+ */
+async function ensureCompatibleNpm(root) {
+    if ((await getPackageManager(root)) !== schema_1.PackageManager.Npm) {
+        return;
+    }
+    try {
+        const versionText = child_process_1.execSync('npm --version', { encoding: 'utf8', stdio: 'pipe' }).trim();
+        const version = semver_1.valid(versionText);
+        if (!version) {
+            return;
+        }
+        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 (_a) {
+        // npm is not installed
+    }
+}
+exports.ensureCompatibleNpm = ensureCompatibleNpm;