@angular/cli 13.0.0 → 13.0.4

package/commands/new.md

@@ -5,7 +5,7 @@ All prompts can safely be allowed to default.
 
 - The new workspace folder is given the specified project name, and contains configuration files at the top level.
 
-- By default, the files for a new initial application (with the same name as the workspace) are placed in the `src/` subfolder. Corresponding end-to-end tests are placed in the `e2e/` subfolder.
+- By default, the files for a new initial application (with the same name as the workspace) are placed in the `src/` subfolder.
 
 - The new application's configuration appears in the `projects` section of the `angular.json` workspace configuration file, under its project name.
 

package/commands/update-impl.d.ts

@@ -30,8 +30,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.
+     * 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 checkCLILatestVersion;
+    private checkCLIVersion;
+    private getCLIUpdateRunnerVersion;
 }

package/commands/update-impl.js

@@ -48,8 +48,6 @@ const log_file_1 = require("../utilities/log-file");
 const package_manager_1 = require("../utilities/package-manager");
 const package_metadata_1 = require("../utilities/package-metadata");
 const package_tree_1 = require("../utilities/package-tree");
-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');
 const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, '../src/commands/update/schematic/collection.json');
 /**
  * Disable CLI version mismatch checks and forces usage of the invoked CLI
@@ -59,6 +57,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);
@@ -217,10 +216,14 @@ class UpdateCommand extends command_1.Command {
     async run(options) {
         var _a;
         await (0, 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 (0, install_package_1.runTempPackageBin)(`@angular/cli@${options.next ? 'next' : 'latest'}`, 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 (0, install_package_1.runTempPackageBin)(`@angular/cli@${cliVersionToInstall}`, this.packageManager, process.argv.slice(2));
+            }
         }
         const logVerbose = (message) => {
             if (options.verbose) {
@@ -346,8 +349,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
@@ -371,9 +373,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);
@@ -381,18 +383,9 @@ class UpdateCommand extends command_1.Command {
                     this.logger.error(`"from" value [${options.from}] is not a valid version.`);
                     return 1;
                 }
-                success = await this.executeMigrations(packageName, migrations, from, options.to || packageNode.version, 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, from, options.to || packageNode.version, options.createCommits);
             }
-            return 1;
+            return result ? 0 : 1;
         }
         const requests = [];
         // Validate packages actually are part of the workspace
@@ -467,7 +460,7 @@ class UpdateCommand extends command_1.Command {
                 this.logger.info(`Package '${packageName}' is already up to date.`);
                 continue;
             }
-            if (node.package && /^@(?:angular|nguniversal)\//.test(node.package.name)) {
+            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];
@@ -598,11 +591,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;
     }
@@ -667,16 +655,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.
+     * 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 checkCLILatestVersion(verbose = false, next = false) {
-        const installedCLIVersion = version_1.VERSION.full;
-        const LatestCLIManifest = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${next ? 'next' : 'latest'}`, this.logger, {
+    async checkCLIVersion(packagesToUpdate, verbose = false, next = false) {
+        const { version } = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${this.getCLIUpdateRunnerVersion(packagesToUpdate, next)}`, this.logger, {
             verbose,
             usingYarn: this.packageManager === workspace_schema_1.PackageManager.Yarn,
         });
-        return semver.lt(installedCLIVersion, LatestCLIManifest.version);
+        return version_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 version_1.VERSION.major;
     }
 }
 exports.UpdateCommand = UpdateCommand;

package/lib/init.js

@@ -84,7 +84,9 @@ const config_1 = require("../utilities/config");
         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(() => __importStar(require('./cli')));
             }
             else if (await (0, config_1.isWarningEnabled)('versionMismatch')) {

package/models/schematic-engine-host.js

@@ -109,9 +109,21 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
             return legacyModules[id];
         }
         else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {
+            // Files should not redirect `@angular/core` and instead use the direct
+            // dependency if available. This allows old major version migrations to continue to function
+            // even though the latest major version may have breaking changes in `@angular/core`.
+            if (id.startsWith('@angular-devkit/core')) {
+                try {
+                    return schematicRequire(id);
+                }
+                catch (e) {
+                    if (e.code !== 'MODULE_NOT_FOUND') {
+                        throw e;
+                    }
+                }
+            }
             // Resolve from inside the `@angular/cli` project
-            const packagePath = require.resolve(id);
-            return hostRequire(packagePath);
+            return hostRequire(id);
         }
         else if (id.startsWith('.') || id.startsWith('@angular/cdk')) {
             // Wrap relative files inside the schematic collection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "13.0.0",
+  "version": "13.0.4",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1300.0",
-    "@angular-devkit/core": "13.0.0",
-    "@angular-devkit/schematics": "13.0.0",
-    "@schematics/angular": "13.0.0",
+    "@angular-devkit/architect": "0.1300.4",
+    "@angular-devkit/core": "13.0.4",
+    "@angular-devkit/schematics": "13.0.4",
+    "@schematics/angular": "13.0.4",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.2",
@@ -51,12 +51,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "13.0.0",
-      "@angular-devkit/architect": "0.1300.0",
-      "@angular-devkit/build-angular": "13.0.0",
-      "@angular-devkit/build-webpack": "0.1300.0",
-      "@angular-devkit/core": "13.0.0",
-      "@angular-devkit/schematics": "13.0.0"
+      "@angular/cli": "13.0.4",
+      "@angular-devkit/architect": "0.1300.4",
+      "@angular-devkit/build-angular": "13.0.4",
+      "@angular-devkit/build-webpack": "0.1300.4",
+      "@angular-devkit/core": "13.0.4",
+      "@angular-devkit/schematics": "13.0.4"
     }
   },
   "engines": {

package/src/commands/update/schematic/index.js

@@ -356,18 +356,13 @@ function _usageMessage(options, infoMap, logger) {
             target,
         };
     })
-        .filter(({ info, version, target }) => {
-        return target && semver.compare(info.installed.version, version) < 0;
-    })
-        .filter(({ target }) => {
-        return target['ng-update'];
-    })
+        .filter(({ info, version, target }) => (target === null || target === void 0 ? void 0 : target['ng-update']) && semver.compare(info.installed.version, version) < 0)
         .map(({ name, info, version, tag, target }) => {
-        var _a, _b;
+        var _a;
         // Look for packageGroup.
-        const packageGroup = (_a = target['ng-update']) === null || _a === void 0 ? void 0 : _a['packageGroup'];
+        const packageGroup = target['ng-update']['packageGroup'];
         if (packageGroup) {
-            const packageGroupName = packageGroup === null || packageGroup === void 0 ? void 0 : packageGroup[0];
+            const packageGroupName = target['ng-update']['packageGroupName'] || packageGroup[0];
             if (packageGroupName) {
                 if (packageGroups.has(name)) {
                     return null;
@@ -379,7 +374,7 @@ function _usageMessage(options, infoMap, logger) {
         }
         let command = `ng update ${name}`;
         if (!tag) {
-            command += `@${((_b = semver.parse(version)) === null || _b === void 0 ? void 0 : _b.major) || version}`;
+            command += `@${((_a = semver.parse(version)) === null || _a === void 0 ? void 0 : _a.major) || version}`;
         }
         else if (tag == 'next') {
             command += ' --next';