@angular/cli 13.0.0-rc.1 → 13.1.0-next.0

package/commands/add-impl.js

@@ -26,6 +26,15 @@ const package_metadata_1 = require("../utilities/package-metadata");
 const prompt_1 = require("../utilities/prompt");
 const spinner_1 = require("../utilities/spinner");
 const tty_1 = require("../utilities/tty");
+/**
+ * The set of packages that should have certain versions excluded from consideration
+ * when attempting to find a compatible version for a package.
+ * The key is a package name and the value is a SemVer range of versions to exclude.
+ */
+const packageVersionExclusions = {
+    // @angular/localize@9.x versions do not have peer dependencies setup
+    '@angular/localize': '9.x',
+};
 class AddCommand extends schematic_command_1.SchematicCommand {
     constructor() {
         super(...arguments);
@@ -39,6 +48,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
             return super.initialize(options);
         }
     }
+    // eslint-disable-next-line max-lines-per-function
     async run(options) {
         var _a;
         await (0, package_manager_1.ensureCompatibleNpm)(this.context.root);
@@ -86,7 +96,12 @@ class AddCommand extends schematic_command_1.SchematicCommand {
                 spinner.fail('Unable to load package information from registry: ' + e.message);
                 return 1;
             }
+            // Start with the version tagged as `latest` if it exists
             const latestManifest = packageMetadata.tags['latest'];
+            if (latestManifest) {
+                packageIdentifier = npm_package_arg_1.default.resolve(latestManifest.name, latestManifest.version);
+            }
+            // Adjust the version based on name and peer dependencies
             if (latestManifest && Object.keys(latestManifest.peerDependencies).length === 0) {
                 if (latestManifest.name === '@angular/pwa') {
                     const version = await this.findProjectVersion('@angular/cli');
@@ -97,24 +112,36 @@ class AddCommand extends schematic_command_1.SchematicCommand {
                         packageIdentifier = npm_package_arg_1.default.resolve('@angular/pwa', '0.12');
                     }
                 }
-                else {
-                    packageIdentifier = npm_package_arg_1.default.resolve(latestManifest.name, latestManifest.version);
-                }
                 spinner.succeed(`Found compatible package version: ${color_1.colors.grey(packageIdentifier.toString())}.`);
             }
             else if (!latestManifest || (await this.hasMismatchedPeer(latestManifest))) {
                 // 'latest' is invalid so search for most recent matching package
-                const versionManifests = Object.values(packageMetadata.versions).filter((value) => !(0, semver_1.prerelease)(value.version) && !value.deprecated);
+                const versionExclusions = packageVersionExclusions[packageMetadata.name];
+                const versionManifests = Object.values(packageMetadata.versions).filter((value) => {
+                    // Prerelease versions are not stable and should not be considered by default
+                    if ((0, semver_1.prerelease)(value.version)) {
+                        return false;
+                    }
+                    // Deprecated versions should not be used or considered
+                    if (value.deprecated) {
+                        return false;
+                    }
+                    // Excluded package versions should not be considered
+                    if (versionExclusions && (0, semver_1.satisfies)(value.version, versionExclusions)) {
+                        return false;
+                    }
+                    return true;
+                });
                 versionManifests.sort((a, b) => (0, semver_1.rcompare)(a.version, b.version, true));
                 let newIdentifier;
                 for (const versionManifest of versionManifests) {
                     if (!(await this.hasMismatchedPeer(versionManifest))) {
-                        newIdentifier = npm_package_arg_1.default.resolve(packageIdentifier.name, versionManifest.version);
+                        newIdentifier = npm_package_arg_1.default.resolve(versionManifest.name, versionManifest.version);
                         break;
                     }
                 }
                 if (!newIdentifier) {
-                    spinner.warn("Unable to find compatible package.  Using 'latest'.");
+                    spinner.warn("Unable to find compatible package.  Using 'latest' tag.");
                 }
                 else {
                     packageIdentifier = newIdentifier;
@@ -122,7 +149,6 @@ class AddCommand extends schematic_command_1.SchematicCommand {
                 }
             }
             else {
-                packageIdentifier = npm_package_arg_1.default.resolve(latestManifest.name, latestManifest.version);
                 spinner.succeed(`Found compatible package version: ${color_1.colors.grey(packageIdentifier.toString())}.`);
             }
         }

package/commands/update-impl.js

@@ -215,7 +215,7 @@ class UpdateCommand extends command_1.Command {
     }
     // eslint-disable-next-line max-lines-per-function
     async run(options) {
-        var _a, _b;
+        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))) {
@@ -463,30 +463,32 @@ class UpdateCommand extends command_1.Command {
                 this.logger.error(`Package specified by '${requestIdentifier.raw}' does not exist within the registry.`);
                 return 1;
             }
-            if (((_a = node.package) === null || _a === void 0 ? void 0 : _a.name) === '@angular/cli') {
-                // Migrations for non LTS versions of Angular CLI are no longer included in @schematics/angular v12.
+            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|nguniversal)\//.test(node.package.name)) {
+                const { name, version } = node.package;
                 const toBeInstalledMajorVersion = +manifest.version.split('.')[0];
-                const currentMajorVersion = +node.package.version.split('.')[0];
-                if (currentMajorVersion < 10 && toBeInstalledMajorVersion >= 12) {
-                    const updateVersions = {
-                        1: 6,
-                        6: 7,
-                        7: 8,
-                        8: 9,
-                        9: 10,
-                    };
-                    const updateTo = updateVersions[currentMajorVersion];
-                    this.logger.error('Updating multiple major versions at once is not recommended. ' +
-                        `Run 'ng update @angular/cli@${updateTo}' in your workspace directory ` +
-                        `to update to latest '${updateTo}.x' version of '@angular/cli'.\n\n` +
-                        'For more information about the update process, see https://update.angular.io/.');
+                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;
                 }
             }
-            if (manifest.version === ((_b = node.package) === null || _b === void 0 ? void 0 : _b.version)) {
-                this.logger.info(`Package '${packageName}' is already up to date.`);
-                continue;
-            }
             packagesToUpdate.push(requestIdentifier.toString());
         }
         if (packagesToUpdate.length === 0) {

package/lib/config/schema.json

@@ -1648,7 +1648,7 @@
                         "inlineCritical": {
                           "type": "boolean",
                           "description": "Extract and inline critical CSS definitions to improve first paint time.",
-                          "default": false
+                          "default": true
                         }
                       },
                       "additionalProperties": false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "13.0.0-rc.1",
+  "version": "13.1.0-next.0",
   "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-rc.1",
-    "@angular-devkit/core": "13.0.0-rc.1",
-    "@angular-devkit/schematics": "13.0.0-rc.1",
-    "@schematics/angular": "13.0.0-rc.1",
+    "@angular-devkit/architect": "0.1301.0-next.0",
+    "@angular-devkit/core": "13.1.0-next.0",
+    "@angular-devkit/schematics": "13.1.0-next.0",
+    "@schematics/angular": "13.1.0-next.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.2",
@@ -40,7 +40,7 @@
     "jsonc-parser": "3.0.0",
     "npm-package-arg": "8.1.5",
     "npm-pick-manifest": "6.1.1",
-    "open": "8.3.0",
+    "open": "8.4.0",
     "ora": "5.4.1",
     "pacote": "12.0.2",
     "resolve": "1.20.0",
@@ -51,12 +51,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "13.0.0-rc.1",
-      "@angular-devkit/architect": "0.1300.0-rc.1",
-      "@angular-devkit/build-angular": "13.0.0-rc.1",
-      "@angular-devkit/build-webpack": "0.1300.0-rc.1",
-      "@angular-devkit/core": "13.0.0-rc.1",
-      "@angular-devkit/schematics": "13.0.0-rc.1"
+      "@angular/cli": "13.1.0-next.0",
+      "@angular-devkit/architect": "0.1301.0-next.0",
+      "@angular-devkit/build-angular": "13.1.0-next.0",
+      "@angular-devkit/build-webpack": "0.1301.0-next.0",
+      "@angular-devkit/core": "13.1.0-next.0",
+      "@angular-devkit/schematics": "13.1.0-next.0"
     }
   },
   "engines": {

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

@@ -320,13 +320,34 @@ function _usageMessage(options, infoMap, logger) {
     const packageGroups = new Map();
     const packagesToUpdate = [...infoMap.entries()]
         .map(([name, info]) => {
-        const tag = options.next
+        var _a, _b;
+        let tag = options.next
             ? info.npmPackageJson['dist-tags']['next']
                 ? 'next'
                 : 'latest'
             : 'latest';
-        const version = info.npmPackageJson['dist-tags'][tag];
-        const target = info.npmPackageJson.versions[version];
+        let version = info.npmPackageJson['dist-tags'][tag];
+        let target = info.npmPackageJson.versions[version];
+        const versionDiff = semver.diff(info.installed.version, version);
+        if (versionDiff !== 'patch' &&
+            versionDiff !== 'minor' &&
+            /^@(?:angular|nguniversal)\//.test(name)) {
+            const installedMajorVersion = (_a = semver.parse(info.installed.version)) === null || _a === void 0 ? void 0 : _a.major;
+            const toInstallMajorVersion = (_b = semver.parse(version)) === null || _b === void 0 ? void 0 : _b.major;
+            if (installedMajorVersion !== undefined &&
+                toInstallMajorVersion !== undefined &&
+                installedMajorVersion < toInstallMajorVersion - 1) {
+                const nextMajorVersion = `${installedMajorVersion + 1}.`;
+                const nextMajorVersions = Object.keys(info.npmPackageJson.versions)
+                    .filter((v) => v.startsWith(nextMajorVersion))
+                    .sort((a, b) => (a > b ? -1 : 1));
+                if (nextMajorVersions.length) {
+                    version = nextMajorVersions[0];
+                    target = info.npmPackageJson.versions[version];
+                    tag = '';
+                }
+            }
+        }
         return {
             name,
             info,
@@ -342,10 +363,11 @@ function _usageMessage(options, infoMap, logger) {
         return target['ng-update'];
     })
         .map(({ name, info, version, tag, target }) => {
+        var _a, _b;
         // Look for packageGroup.
-        if (target['ng-update'] && target['ng-update']['packageGroup']) {
-            const packageGroup = target['ng-update']['packageGroup'];
-            const packageGroupName = target['ng-update']['packageGroupName'] || target['ng-update']['packageGroup'][0];
+        const packageGroup = (_a = target['ng-update']) === null || _a === void 0 ? void 0 : _a['packageGroup'];
+        if (packageGroup) {
+            const packageGroupName = packageGroup === null || packageGroup === void 0 ? void 0 : packageGroup[0];
             if (packageGroupName) {
                 if (packageGroups.has(name)) {
                     return null;
@@ -356,7 +378,10 @@ function _usageMessage(options, infoMap, logger) {
             }
         }
         let command = `ng update ${name}`;
-        if (tag == 'next') {
+        if (!tag) {
+            command += `@${((_b = semver.parse(version)) === null || _b === void 0 ? void 0 : _b.major) || version}`;
+        }
+        else if (tag == 'next') {
             command += ' --next';
         }
         return [name, `${info.installed.version} -> ${version} `, command];

package/utilities/spinner.js

@@ -40,7 +40,7 @@ class Spinner {
         this.spinner.fail(text && color_1.colors.redBright(text));
     }
     warn(text) {
-        this.spinner.fail(text && color_1.colors.yellowBright(text));
+        this.spinner.warn(text && color_1.colors.yellowBright(text));
     }
     stop() {
         this.spinner.stop();