@angular/cli 10.2.3 → 10.2.4

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

@@ -16,6 +16,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 install_package_1 = require("../tasks/install-package");
@@ -27,8 +28,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.
@@ -37,6 +36,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);
@@ -58,7 +58,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) {
@@ -86,11 +86,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 = [];
                 }
             }
@@ -126,7 +126,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;
@@ -185,6 +185,7 @@ class UpdateCommand extends command_1.Command {
     }
     // tslint:disable-next-line:no-big-function
     async run(options) {
+        var _a;
         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
@@ -204,11 +205,14 @@ class UpdateCommand extends command_1.Command {
             }
             throw e;
         }
-        // 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 packages = [];
         for (const request of options['--'] || []) {
@@ -219,7 +223,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;
                 }
@@ -322,7 +326,7 @@ class UpdateCommand extends command_1.Command {
                 // Allow running migrations on transitively installed dependencies
                 // There can technically be nested multiple versions
                 // TODO: If multiple, this should find all versions and ask which one to use
-                const child = packageTree.children.find(c => c.name === packageName);
+                const child = packageTree.children.find((c) => c.name === packageName);
                 if (child) {
                     packageNode = child;
                 }
@@ -348,8 +352,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
@@ -373,9 +376,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);
@@ -384,18 +387,9 @@ class UpdateCommand extends command_1.Command {
                     return 1;
                 }
                 const migrationRange = new semver.Range('>' + from + ' <=' + (options.to || packageNode.package.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.package.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
@@ -466,10 +460,32 @@ class UpdateCommand extends command_1.Command {
                 this.logger.error(`Package specified by '${requestIdentifier.raw}' does not exist within the registry.`);
                 return 1;
             }
-            if (manifest.version === node.package.version) {
+            if (manifest.version === ((_a = node.package) === null || _a === void 0 ? void 0 : _a.version)) {
                 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) {
@@ -502,9 +518,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;
     }
@@ -549,7 +562,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;
@@ -566,16 +582,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/cli/index.d.ts

@@ -1,3 +1,4 @@
+export { VERSION, Version } from '../../models/version';
 export default function (options: {
     testing?: boolean;
     cliArgs: string[];

package/lib/cli/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Version = exports.VERSION = void 0;
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -14,6 +15,9 @@ const color_1 = require("../../utilities/color");
 const config_1 = require("../../utilities/config");
 const log_file_1 = require("../../utilities/log-file");
 const project_1 = require("../../utilities/project");
+var version_1 = require("../../models/version");
+Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
+Object.defineProperty(exports, "Version", { enumerable: true, get: function () { return version_1.Version; } });
 const debugEnv = process.env['NG_DEBUG'];
 const isDebug = debugEnv !== undefined &&
     debugEnv !== '0' &&

package/lib/init.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -7,34 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+Object.defineProperty(exports, "__esModule", { value: true });
 require("symbol-observable");
 // symbol polyfill must go first
 // tslint:disable-next-line:ordered-imports import-groups
-const core_1 = require("@angular-devkit/core");
 const fs = require("fs");
 const path = require("path");
 const semver_1 = require("semver");
-const stream_1 = require("stream");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
-const packageJson = require('../package.json');
-function _fromPackageJson(cwd = process.cwd()) {
-    do {
-        const packageJsonPath = path.join(cwd, 'node_modules/@angular/cli/package.json');
-        if (fs.existsSync(packageJsonPath)) {
-            const content = fs.readFileSync(packageJsonPath, 'utf-8');
-            if (content) {
-                const { version } = JSON.parse(content);
-                if (version) {
-                    return new semver_1.SemVer(version);
-                }
-            }
-        }
-        // Check the parent.
-        cwd = path.dirname(cwd);
-    } while (cwd != path.dirname(cwd));
-    return null;
-}
+const cli_1 = require("./cli");
 // Check if we need to profile this CLI run.
 if (process.env['NG_CLI_PROFILING']) {
     let profiler;
@@ -60,6 +41,7 @@ if (process.env['NG_CLI_PROFILING']) {
     process.on('uncaughtException', () => exitHandler({ exit: true }));
 }
 (async () => {
+    var _a;
     /**
      * Disable Browserslist old data warning as otherwise with every release we'd need to update this dependency
      * which is cumbersome considering we pin versions and the warning is not user actionable.
@@ -80,43 +62,50 @@ if (process.env['NG_CLI_PROFILING']) {
     }
     let cli;
     try {
+        // No error implies a projectLocalCli, which will load whatever
+        // version of ng-cli you have installed in a local package.json
         const projectLocalCli = require.resolve('@angular/cli', { paths: [process.cwd()] });
-        // This was run from a global, check local version.
-        const globalVersion = new semver_1.SemVer(packageJson['version']);
-        let localVersion;
-        let shouldWarn = false;
+        cli = await Promise.resolve().then(() => require(projectLocalCli));
+        const globalVersion = new semver_1.SemVer(cli_1.VERSION.full);
+        // Older versions might not have the VERSION export
+        let localVersion = (_a = cli.VERSION) === null || _a === void 0 ? void 0 : _a.full;
+        if (!localVersion) {
+            try {
+                const localPackageJson = fs.readFileSync(path.join(path.dirname(projectLocalCli), '../../package.json'), 'utf-8');
+                localVersion = JSON.parse(localPackageJson).version;
+            }
+            catch (error) {
+                // tslint:disable-next-line:no-console
+                console.error('Version mismatch check skipped. Unable to retrieve local version: ' + error);
+            }
+        }
+        let isGlobalGreater = false;
         try {
-            localVersion = _fromPackageJson();
-            shouldWarn = localVersion != null && globalVersion.compare(localVersion) > 0;
+            isGlobalGreater = !!localVersion && globalVersion.compare(localVersion) > 0;
         }
-        catch (e) {
-            // tslint:disable-next-line no-console
-            console.error(e);
-            shouldWarn = true;
+        catch (error) {
+            // tslint:disable-next-line:no-console
+            console.error('Version mismatch check skipped. Unable to compare local version: ' + error);
         }
-        if (shouldWarn && await config_1.isWarningEnabled('versionMismatch')) {
-            const warning = color_1.colors.yellow(core_1.tags.stripIndents `
-      Your global Angular CLI version (${globalVersion}) is greater than your local
-      version (${localVersion}). The local Angular CLI version is used.
-
-      To disable this warning use "ng config -g cli.warnings.versionMismatch false".
-      `);
-            // Don't show warning colorised on `ng completion`
-            if (process.argv[2] !== 'completion') {
-                // tslint:disable-next-line no-console
-                console.error(warning);
+        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' &&
+                cli.VERSION &&
+                cli.VERSION.major - globalVersion.major <= 1) {
+                cli = await Promise.resolve().then(() => require('./cli'));
             }
-            else {
-                // tslint:disable-next-line no-console
-                console.error(warning);
-                process.exit(1);
+            else if (await config_1.isWarningEnabled('versionMismatch')) {
+                // Otherwise, use local version and warn if global is newer than local
+                const warning = `Your global Angular CLI version (${globalVersion}) is greater than your local ` +
+                    `version (${localVersion}). The local Angular CLI version is used.\n\n` +
+                    'To disable this warning use "ng config -g cli.warnings.versionMismatch false".';
+                // tslint:disable-next-line:no-console
+                console.error(color_1.colors.yellow(warning));
             }
         }
-        // No error implies a projectLocalCli, which will load whatever
-        // version of ng-cli you have installed in a local package.json
-        cli = await Promise.resolve().then(() => require(projectLocalCli));
     }
-    catch (_a) {
+    catch (_b) {
         // If there is an error, resolve could not find the ng-cli
         // library from a package.json. Instead, include it from a relative
         // path to this script file (which is likely a globally installed
@@ -127,26 +116,19 @@ if (process.env['NG_CLI_PROFILING']) {
         cli = cli['default'];
     }
     return cli;
-})().then(cli => {
-    // This is required to support 1.x local versions with a 6+ global
-    let standardInput;
-    try {
-        standardInput = process.stdin;
-    }
-    catch (e) {
-        process.stdin = new stream_1.Duplex();
-        standardInput = process.stdin;
-    }
+})()
+    .then((cli) => {
     return cli({
         cliArgs: process.argv.slice(2),
-        inputStream: standardInput,
+        inputStream: process.stdin,
         outputStream: process.stdout,
     });
-}).then((exitCode) => {
+})
+    .then((exitCode) => {
     process.exit(exitCode);
 })
     .catch((err) => {
-    // tslint:disable-next-line no-console
+    // tslint:disable-next-line:no-console
     console.error('Unknown error: ' + err.toString());
     process.exit(127);
 });

package/models/version.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export declare class Version {
+    readonly full: string;
+    readonly major: string;
+    readonly minor: string;
+    readonly patch: string;
+    constructor(full: string);
+}
+export declare const VERSION: Version;

package/models/version.js

@@ -0,0 +1,24 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VERSION = exports.Version = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+// Same structure as used in framework packages
+class Version {
+    constructor(full) {
+        this.full = full;
+        this.major = full.split('.')[0];
+        this.minor = full.split('.')[1];
+        this.patch = full.split('.').slice(2).join('.');
+    }
+}
+exports.Version = Version;
+// TODO: Convert this to use build-time version stamping once implemented in the build system
+exports.VERSION = new Version(JSON.parse(fs_1.readFileSync(path_1.resolve(__dirname, '../package.json'), 'utf-8')).version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "10.2.3",
+  "version": "10.2.4",
   "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.1002.3",
-    "@angular-devkit/core": "10.2.3",
-    "@angular-devkit/schematics": "10.2.3",
-    "@schematics/angular": "10.2.3",
-    "@schematics/update": "0.1002.3",
+    "@angular-devkit/architect": "0.1002.4",
+    "@angular-devkit/core": "10.2.4",
+    "@angular-devkit/schematics": "10.2.4",
+    "@schematics/angular": "10.2.4",
+    "@schematics/update": "0.1002.4",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.1.1",
@@ -52,12 +52,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@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"
+      "@angular/cli": "10.2.4",
+      "@angular-devkit/build-angular": "0.1002.4",
+      "@angular-devkit/build-ng-packagr": "0.1002.4",
+      "@angular-devkit/build-webpack": "0.1002.4",
+      "@angular-devkit/core": "10.2.4",
+      "@angular-devkit/schematics": "10.2.4"
     }
   },
   "engines": {