@angular/cli 11.2.0-rc.0 → 11.2.2

package/commands/add-impl.js

@@ -36,7 +36,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
     }
     async run(options) {
         var _a;
-        package_manager_1.ensureCompatibleNpm();
+        await package_manager_1.ensureCompatibleNpm(this.context.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/lint-long.md

@@ -4,4 +4,4 @@ When a project name is not supplied, it will execute for all projects.
 The default linting tool is [TSLint](https://palantir.github.io/tslint/), and the default configuration is specified in the project's `tslint.json` file.
 
 **Note**: TSLint has been discontinued and support has been deprecated in the Angular CLI. The options shown below are for the deprecated TSLint builder.
-To opt-in using the community driven ESLint builder, see [angular-eslint](https://github.com/angular-eslint/angular-eslint#migrating-from-codelyzer-and-tslint) README.
+To opt-in using the community driven ESLint builder, see [angular-eslint](https://github.com/angular-eslint/angular-eslint#migrating-an-angular-cli-project-from-codelyzer-and-tslint) README.

package/commands/new-impl.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewCommand = void 0;
 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);
@@ -14,7 +13,6 @@ class NewCommand extends schematic_command_1.SchematicCommand {
         return super.initialize(options);
     }
     async run(options) {
-        package_manager_1.ensureCompatibleNpm();
         // Register the version of the CLI in the registry.
         const packageJson = require('../package.json');
         const version = packageJson.version;

package/commands/update-impl.js

@@ -190,13 +190,18 @@ class UpdateCommand extends command_1.Command {
     // tslint:disable-next-line:no-big-function
     async run(options) {
         var _a;
-        package_manager_1.ensureCompatibleNpm();
+        await package_manager_1.ensureCompatibleNpm(this.context.root);
         // Check if the current installed CLI version is older than the latest version.
         if (!disableVersionCheck && await this.checkCLILatestVersion(options.verbose, options.next)) {
             this.logger.warn(`The installed local Angular CLI version is older than the latest ${options.next ? 'pre-release' : 'stable'} version.\n` +
                 'Installing a temporary version to perform the update.');
             return install_package_1.runTempPackageBin(`@angular/cli@${options.next ? 'next' : 'latest'}`, this.logger, this.packageManager, process.argv.slice(2));
         }
+        const logVerbose = (message) => {
+            if (options.verbose) {
+                this.logger.info(message);
+            }
+        };
         if (options.all) {
             const updateCmd = this.packageManager === schema_1.PackageManager.Yarn
                 ? `'yarn upgrade-interactive' or 'yarn upgrade'`
@@ -474,7 +479,37 @@ class UpdateCommand extends command_1.Command {
             for (const migration of migrations) {
                 // Resolve the package from the workspace root, as otherwise it will be resolved from the temp
                 // installed CLI version.
-                const packagePath = require.resolve(migration.package, { paths: [this.context.root] });
+                let packagePath;
+                logVerbose(`Resolving migration package '${migration.package}' from '${this.context.root}'...`);
+                try {
+                    try {
+                        packagePath = path.dirname(
+                        // This may fail if the `package.json` is not exported as an entry point
+                        require.resolve(path.join(migration.package, 'package.json'), {
+                            paths: [this.context.root],
+                        }));
+                    }
+                    catch (e) {
+                        if (e.code === 'MODULE_NOT_FOUND') {
+                            // Fallback to trying to resolve the package's main entry point
+                            packagePath = require.resolve(migration.package, { paths: [this.context.root] });
+                        }
+                        else {
+                            throw e;
+                        }
+                    }
+                }
+                catch (e) {
+                    if (e.code === 'MODULE_NOT_FOUND') {
+                        logVerbose(e.toString());
+                        this.logger.error(`Migrations for package (${migration.package}) were not found.` +
+                            ' The package could not be found in the workspace.');
+                    }
+                    else {
+                        this.logger.error(`Unable to resolve migrations for package (${migration.package}).  [${e.message}]`);
+                    }
+                    return 1;
+                }
                 let migrations;
                 // Check if it is a package-local location
                 const localMigrations = path.join(packagePath, migration.collection);

package/models/analytics.js

@@ -336,7 +336,7 @@ async function promptGlobalAnalytics(force = false) {
                 message: core_1.tags.stripIndents `
           Would you like to share anonymous usage data with the Angular Team at Google under
           Google’s Privacy Policy at https://policies.google.com/privacy? For more details and
-          how to change this setting, see http://angular.io/analytics.
+          how to change this setting, see https://angular.io/analytics.
         `,
                 default: false,
             },
@@ -390,7 +390,7 @@ async function promptProjectAnalytics(force = false) {
                 message: core_1.tags.stripIndents `
           Would you like to share anonymous usage data about this project with the Angular Team at
           Google under Google’s Privacy Policy at https://policies.google.com/privacy? For more
-          details and how to change this setting, see http://angular.io/analytics.
+          details and how to change this setting, see https://angular.io/analytics.
 
         `,
                 default: false,

package/models/schematic-command.js

@@ -383,6 +383,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.context.root);
+            }
+        }
         return new Promise(resolve => {
             workflow
                 .execute({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "11.2.0-rc.0",
+  "version": "11.2.2",
   "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.1102.0-rc.0",
-    "@angular-devkit/core": "11.2.0-rc.0",
-    "@angular-devkit/schematics": "11.2.0-rc.0",
-    "@schematics/angular": "11.2.0-rc.0",
-    "@schematics/update": "0.1102.0-rc.0",
+    "@angular-devkit/architect": "0.1102.2",
+    "@angular-devkit/core": "11.2.2",
+    "@angular-devkit/schematics": "11.2.2",
+    "@schematics/angular": "11.2.2",
+    "@schematics/update": "0.1102.2",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.1",
@@ -54,17 +54,17 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "11.2.0-rc.0",
-      "@angular-devkit/architect": "0.1102.0-rc.0",
-      "@angular-devkit/build-angular": "0.1102.0-rc.0",
-      "@angular-devkit/build-webpack": "0.1102.0-rc.0",
-      "@angular-devkit/core": "11.2.0-rc.0",
-      "@angular-devkit/schematics": "11.2.0-rc.0"
+      "@angular/cli": "11.2.2",
+      "@angular-devkit/architect": "0.1102.2",
+      "@angular-devkit/build-angular": "0.1102.2",
+      "@angular-devkit/build-webpack": "0.1102.2",
+      "@angular-devkit/core": "11.2.2",
+      "@angular-devkit/schematics": "11.2.2"
     }
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": "^6.11.0",
+    "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   }
 }

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(): void;
+export declare function ensureCompatibleNpm(root: string): Promise<void>;

package/utilities/package-manager.js

@@ -11,6 +11,7 @@ exports.ensureCompatibleNpm = exports.getPackageManager = exports.supportsNpm =
 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) {
@@ -57,23 +58,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.
  */
-function ensureCompatibleNpm() {
-    var _a;
+async function ensureCompatibleNpm(root) {
+    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
     }
 }