@angular/cli 11.2.14 → 11.2.18

package/commands/update-impl.d.ts

@@ -23,8 +23,9 @@ export declare class UpdateCommand extends Command<UpdateCommandSchema> {
     private commit;
     private checkCleanGit;
     /**
-     * Checks if the current installed CLI version is older than the latest version.
-     * @returns `true` when the installed version is older.
-    */
-    private checkCLILatestVersion;
+     * Checks if the current installed CLI version is older or newer than a compatible version.
+     * @returns the version to install or null when there is no update to install.
+     */
+    private checkCLIVersion;
+    private getCLIUpdateRunnerVersion;
 }

package/commands/update-impl.js

@@ -14,6 +14,7 @@ const child_process_1 = require("child_process");
 const fs = require("fs");
 const path = require("path");
 const semver = require("semver");
+const cli_1 = require("../lib/cli");
 const schema_1 = require("../lib/config/schema");
 const command_1 = require("../models/command");
 const schematic_engine_host_1 = require("../models/schematic-engine-host");
@@ -26,8 +27,6 @@ const package_tree_1 = require("../utilities/package-tree");
 const npa = require('npm-package-arg');
 const pickManifest = require('npm-pick-manifest');
 const oldConfigFileNames = ['.angular-cli.json', 'angular-cli.json'];
-const NG_VERSION_9_POST_MSG = color_1.colors.cyan('\nYour project has been updated to Angular version 9!\n' +
-    'For more info, please see: https://v9.angular.io/guide/updating-to-version-9');
 /**
  * Disable CLI version mismatch checks and forces usage of the invoked CLI
  * instead of invoking the local installed version.
@@ -36,6 +35,7 @@ const disableVersionCheckEnv = process.env['NG_DISABLE_VERSION_CHECK'];
 const disableVersionCheck = disableVersionCheckEnv !== undefined &&
     disableVersionCheckEnv !== '0' &&
     disableVersionCheckEnv.toLowerCase() !== 'false';
+const ANGULAR_PACKAGES_REGEXP = /^@(?:angular|nguniversal)\//;
 class UpdateCommand extends command_1.Command {
     constructor() {
         super(...arguments);
@@ -57,7 +57,7 @@ class UpdateCommand extends command_1.Command {
         let error = false;
         let logs = [];
         const files = new Set();
-        const reporterSubscription = this.workflow.reporter.subscribe(event => {
+        const reporterSubscription = this.workflow.reporter.subscribe((event) => {
             // Strip leading slash to prevent confusion.
             const eventPath = event.path.startsWith('/') ? event.path.substr(1) : event.path;
             switch (event.kind) {
@@ -85,11 +85,11 @@ class UpdateCommand extends command_1.Command {
                     break;
             }
         });
-        const lifecycleSubscription = this.workflow.lifeCycle.subscribe(event => {
+        const lifecycleSubscription = this.workflow.lifeCycle.subscribe((event) => {
             if (event.kind == 'end' || event.kind == 'post-tasks-start') {
                 if (!error) {
                     // Output the logging queue, no error happened.
-                    logs.forEach(log => this.logger.info(`  ${log}`));
+                    logs.forEach((log) => this.logger.info(`  ${log}`));
                     logs = [];
                 }
             }
@@ -125,7 +125,7 @@ class UpdateCommand extends command_1.Command {
      */
     async executeMigration(packageName, collectionPath, migrationName, commit) {
         const collection = this.workflow.engine.createCollection(collectionPath);
-        const name = collection.listSchematicNames().find(name => name === migrationName);
+        const name = collection.listSchematicNames().find((name) => name === migrationName);
         if (!name) {
             this.logger.error(`Cannot find migration '${migrationName}' in '${packageName}'.`);
             return false;
@@ -161,7 +161,8 @@ class UpdateCommand extends command_1.Command {
     async executePackageMigrations(migrations, packageName, commit = false) {
         for (const migration of migrations) {
             const [title, ...description] = migration.description.split('. ');
-            this.logger.info(color_1.colors.cyan(color_1.colors.symbols.pointer) + ' ' +
+            this.logger.info(color_1.colors.cyan(color_1.colors.symbols.pointer) +
+                ' ' +
                 color_1.colors.bold(title.endsWith('.') ? title : title + '.'));
             if (description.length) {
                 this.logger.info('  ' + description.join('.\n  '));
@@ -191,11 +192,14 @@ class UpdateCommand extends command_1.Command {
     async run(options) {
         var _a;
         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));
+        // Check if the current installed CLI version is older than the latest compatible version.
+        if (!disableVersionCheck) {
+            const cliVersionToInstall = await this.checkCLIVersion(options['--'], options.verbose, options.next);
+            if (cliVersionToInstall) {
+                this.logger.warn('The installed Angular CLI version is outdated.\n' +
+                    `Installing a temporary Angular CLI versioned ${cliVersionToInstall} to perform the update.`);
+                return install_package_1.runTempPackageBin(`@angular/cli@${cliVersionToInstall}`, this.logger, this.packageManager, process.argv.slice(2));
+            }
         }
         const logVerbose = (message) => {
             if (options.verbose) {
@@ -222,7 +226,7 @@ class UpdateCommand extends command_1.Command {
                     this.logger.error(`Package '${request}' is not a registry package identifer.`);
                     return 1;
                 }
-                if (packages.some(v => v.name === packageIdentifier.name)) {
+                if (packages.some((v) => v.name === packageIdentifier.name)) {
                     this.logger.error(`Duplicate package '${packageIdentifier.name}' specified.`);
                     return 1;
                 }
@@ -331,8 +335,7 @@ class UpdateCommand extends command_1.Command {
             // Normalize slashes
             migrations = migrations.replace(/\\/g, '/');
             if (migrations.startsWith('../')) {
-                this.logger.error('Package contains an invalid migrations field. ' +
-                    'Paths outside the package root are not permitted.');
+                this.logger.error('Package contains an invalid migrations field. Paths outside the package root are not permitted.');
                 return 1;
             }
             // Check if it is a package-local location
@@ -356,9 +359,9 @@ class UpdateCommand extends command_1.Command {
                     return 1;
                 }
             }
-            let success = false;
+            let result;
             if (typeof options.migrateOnly == 'string') {
-                success = await this.executeMigration(packageName, migrations, options.migrateOnly, options.createCommits);
+                result = await this.executeMigration(packageName, migrations, options.migrateOnly, options.createCommits);
             }
             else {
                 const from = coerceVersionNumber(options.from);
@@ -367,18 +370,9 @@ class UpdateCommand extends command_1.Command {
                     return 1;
                 }
                 const migrationRange = new semver.Range('>' + from + ' <=' + (options.to || packageNode.version));
-                success = await this.executeMigrations(packageName, migrations, migrationRange, options.createCommits);
-            }
-            if (success) {
-                if (packageName === '@angular/core'
-                    && options.from
-                    && +options.from.split('.')[0] < 9
-                    && (options.to || packageNode.version).split('.')[0] === '9') {
-                    this.logger.info(NG_VERSION_9_POST_MSG);
-                }
-                return 0;
+                result = await this.executeMigrations(packageName, migrations, migrationRange, options.createCommits);
             }
-            return 1;
+            return result ? 0 : 1;
         }
         const requests = [];
         // Validate packages actually are part of the workspace
@@ -453,6 +447,28 @@ class UpdateCommand extends command_1.Command {
                 this.logger.info(`Package '${packageName}' is already up to date.`);
                 continue;
             }
+            if (node.package && ANGULAR_PACKAGES_REGEXP.test(node.package.name)) {
+                const { name, version } = node.package;
+                const toBeInstalledMajorVersion = +manifest.version.split('.')[0];
+                const currentMajorVersion = +version.split('.')[0];
+                if (toBeInstalledMajorVersion - currentMajorVersion > 1) {
+                    // Only allow updating a single version at a time.
+                    if (currentMajorVersion < 6) {
+                        // Before version 6, the major versions were not always sequential.
+                        // Example @angular/core skipped version 3, @angular/cli skipped versions 2-5.
+                        this.logger.error(`Updating multiple major versions of '${name}' at once is not supported. Please migrate each major version individually.\n` +
+                            `For more information about the update process, see https://update.angular.io/.`);
+                    }
+                    else {
+                        const nextMajorVersionFromCurrent = currentMajorVersion + 1;
+                        this.logger.error(`Updating multiple major versions of '${name}' at once is not supported. Please migrate each major version individually.\n` +
+                            `Run 'ng update ${name}@${nextMajorVersionFromCurrent}' in your workspace directory ` +
+                            `to update to latest '${nextMajorVersionFromCurrent}.x' version of '${name}'.\n\n` +
+                            `For more information about the update process, see https://update.angular.io/?v=${currentMajorVersion}.0-${nextMajorVersionFromCurrent}.0`);
+                    }
+                    return 1;
+                }
+            }
             packagesToUpdate.push(requestIdentifier.toString());
         }
         if (packagesToUpdate.length === 0) {
@@ -537,9 +553,6 @@ class UpdateCommand extends command_1.Command {
                     return 0;
                 }
             }
-            if (migrations.some(m => m.package === '@angular/core' && m.to.split('.')[0] === '9' && +m.from.split('.')[0] < 9)) {
-                this.logger.info(NG_VERSION_9_POST_MSG);
-            }
         }
         return success ? 0 : 1;
     }
@@ -584,7 +597,10 @@ class UpdateCommand extends command_1.Command {
     }
     checkCleanGit() {
         try {
-            const topLevel = child_process_1.execSync('git rev-parse --show-toplevel', { encoding: 'utf8', stdio: 'pipe' });
+            const topLevel = child_process_1.execSync('git rev-parse --show-toplevel', {
+                encoding: 'utf8',
+                stdio: 'pipe',
+            });
             const result = child_process_1.execSync('git status --porcelain', { encoding: 'utf8', stdio: 'pipe' });
             if (result.trim().length === 0) {
                 return true;
@@ -601,16 +617,38 @@ class UpdateCommand extends command_1.Command {
         return true;
     }
     /**
-     * Checks if the current installed CLI version is older than the latest version.
-     * @returns `true` when the installed version is older.
-    */
-    async checkCLILatestVersion(verbose = false, next = false) {
-        const { version: installedCLIVersion } = require('../package.json');
-        const LatestCLIManifest = await package_metadata_1.fetchPackageManifest(`@angular/cli@${next ? 'next' : 'latest'}`, this.logger, {
+     * Checks if the current installed CLI version is older or newer than a compatible version.
+     * @returns the version to install or null when there is no update to install.
+     */
+    async checkCLIVersion(packagesToUpdate, verbose = false, next = false) {
+        const { version } = await package_metadata_1.fetchPackageManifest(`@angular/cli@${this.getCLIUpdateRunnerVersion(packagesToUpdate, next)}`, this.logger, {
             verbose,
             usingYarn: this.packageManager === schema_1.PackageManager.Yarn,
         });
-        return semver.lt(installedCLIVersion, LatestCLIManifest.version);
+        return cli_1.VERSION.full === version ? null : version;
+    }
+    getCLIUpdateRunnerVersion(packagesToUpdate, next) {
+        var _a, _b;
+        if (next) {
+            return 'next';
+        }
+        const updatingAngularPackage = packagesToUpdate === null || packagesToUpdate === void 0 ? void 0 : packagesToUpdate.find((r) => ANGULAR_PACKAGES_REGEXP.test(r));
+        if (updatingAngularPackage) {
+            // If we are updating any Angular package we can update the CLI to the target version because
+            // migrations for @angular/core@13 can be executed using Angular/cli@13.
+            // This is same behaviour as `npx @angular/cli@13 update @angular/core@13`.
+            // `@angular/cli@13` -> ['', 'angular/cli', '13']
+            // `@angular/cli` -> ['', 'angular/cli']
+            const tempVersion = coerceVersionNumber(updatingAngularPackage.split('@')[2]);
+            return (_b = (_a = semver.parse(tempVersion)) === null || _a === void 0 ? void 0 : _a.major) !== null && _b !== void 0 ? _b : 'latest';
+        }
+        // When not updating an Angular package we cannot determine which schematic runtime the migration should to be executed in.
+        // Typically, we can assume that the `@angular/cli` was updated previously.
+        // Example: Angular official packages are typically updated prior to NGRX etc...
+        // Therefore, we only update to the latest patch version of the installed major version of the Angular CLI.
+        // This is important because we might end up in a scenario where locally Angular v12 is installed, updating NGRX from 11 to 12.
+        // We end up using Angular ClI v13 to run the migrations if we run the migrations using the CLI installed major version + 1 logic.
+        return cli_1.VERSION.major;
     }
 }
 exports.UpdateCommand = UpdateCommand;

package/lib/init.js

@@ -90,7 +90,9 @@ if (process.env['NG_CLI_PROFILING']) {
         if (isGlobalGreater) {
             // If using the update command and the global version is greater, use the newer update command
             // This allows improvements in update to be used in older versions that do not have bootstrapping
-            if (process.argv[2] === 'update') {
+            if (process.argv[2] === 'update' &&
+                cli.VERSION &&
+                cli.VERSION.major - globalVersion.major <= 1) {
                 cli = await Promise.resolve().then(() => require('./cli'));
             }
             else if (await config_1.isWarningEnabled('versionMismatch')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "11.2.14",
+  "version": "11.2.18",
   "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.14",
-    "@angular-devkit/core": "11.2.14",
-    "@angular-devkit/schematics": "11.2.14",
-    "@schematics/angular": "11.2.14",
-    "@schematics/update": "0.1102.14",
+    "@angular-devkit/architect": "0.1102.18",
+    "@angular-devkit/core": "11.2.18",
+    "@angular-devkit/schematics": "11.2.18",
+    "@schematics/angular": "11.2.18",
+    "@schematics/update": "0.1102.18",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.1",
@@ -54,12 +54,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "11.2.14",
-      "@angular-devkit/architect": "0.1102.14",
-      "@angular-devkit/build-angular": "0.1102.14",
-      "@angular-devkit/build-webpack": "0.1102.14",
-      "@angular-devkit/core": "11.2.14",
-      "@angular-devkit/schematics": "11.2.14"
+      "@angular/cli": "11.2.18",
+      "@angular-devkit/architect": "0.1102.18",
+      "@angular-devkit/build-angular": "0.1102.18",
+      "@angular-devkit/build-webpack": "0.1102.18",
+      "@angular-devkit/core": "11.2.18",
+      "@angular-devkit/schematics": "11.2.18"
     }
   },
   "engines": {