@angular/cli 13.0.0-next.8 → 13.0.0-rc.2

package/bin/ng.js

@@ -24,8 +24,8 @@ try {
 // These may not support ES2015 features such as const/let/async/await/etc.
 // These would then crash with a hard to diagnose error message.
 var version = process.versions.node.split('.').map((part) => Number(part));
-if (version[0] % 2 === 1 && version[0] > 14) {
-  // Allow new odd numbered releases with a warning (currently v15+)
+if (version[0] % 2 === 1 && version[0] > 16) {
+  // Allow new odd numbered releases with a warning (currently v17+)
   console.warn(
     'Node.js version ' +
       process.version +
@@ -38,15 +38,17 @@ if (version[0] % 2 === 1 && version[0] > 14) {
 } else if (
   version[0] < 12 ||
   version[0] === 13 ||
+  version[0] === 15 ||
   (version[0] === 12 && version[1] < 20) ||
-  (version[0] === 14 && version[1] < 15)
+  (version[0] === 14 && version[1] < 15) ||
+  (version[0] === 16 && version[1] < 10)
 ) {
-  // Error and exit if less than 12.20 or 13.x or less than 14.15
+  // Error and exit if less than 12.20 or 13.x or less than 14.15 or 15.x or less than 16.10
   console.error(
     'Node.js version ' +
       process.version +
       ' detected.\n' +
-      'The Angular CLI requires a minimum Node.js version of either v12.20 or v14.15.\n\n' +
+      'The Angular CLI requires a minimum Node.js version of either v12.20, v14.15, or v16.10.\n\n' +
       'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n',
   );
 

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/config-impl.js

@@ -20,7 +20,10 @@ const validCliPaths = new Map([
     ['cli.packageManager', undefined],
     ['cli.analytics', undefined],
     ['cli.analyticsSharing.tracking', undefined],
-    ['cli.analyticsSharing.uuid', (v) => (v ? `${v}` : (0, uuid_1.v4)())],
+    ['cli.analyticsSharing.uuid', (v) => (v === '' ? (0, uuid_1.v4)() : `${v}`)],
+    ['cli.cache.enabled', undefined],
+    ['cli.cache.environment', undefined],
+    ['cli.cache.path', undefined],
 ]);
 /**
  * Splits a JSON path string into fragments. Fragments can be used to get the value referenced
@@ -54,7 +57,6 @@ function parseJsonPath(path) {
     return result.filter((fragment) => fragment != null);
 }
 function normalizeValue(value) {
-    var _a, _b;
     const valueString = `${value}`.trim();
     switch (valueString) {
         case 'true':
@@ -69,7 +71,16 @@ function normalizeValue(value) {
     if (isFinite(+valueString)) {
         return +valueString;
     }
-    return (_b = (_a = (0, json_file_1.parseJson)(valueString)) !== null && _a !== void 0 ? _a : value) !== null && _b !== void 0 ? _b : undefined;
+    try {
+        // We use `JSON.parse` instead of `parseJson` because the latter will parse UUIDs
+        // and convert them into a numberic entities.
+        // Example: 73b61974-182c-48e4-b4c6-30ddf08c5c98 -> 73.
+        // These values should never contain comments, therefore using `JSON.parse` is safe.
+        return JSON.parse(valueString);
+    }
+    catch {
+        return value;
+    }
 }
 class ConfigCommand extends command_1.Command {
     async run(options) {

package/commands/update-impl.js

@@ -163,7 +163,7 @@ class UpdateCommand extends command_1.Command {
      */
     async executeMigrations(packageName, collectionPath, from, to, commit) {
         const collection = this.workflow.engine.createCollection(collectionPath);
-        const migrationRange = new semver.Range('>' + (semver.prerelease(from) ? from.split('-')[0] + '-0' : from) + ' <=' + to);
+        const migrationRange = new semver.Range('>' + (semver.prerelease(from) ? from.split('-')[0] + '-0' : from) + ' <=' + to.split('-')[0]);
         const migrations = [];
         for (const name of collection.listSchematicNames()) {
             const schematic = this.workflow.engine.createSchematic(name, collection);
@@ -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) {
@@ -503,10 +505,21 @@ class UpdateCommand extends command_1.Command {
             try {
                 // Remove existing node modules directory to provide a stronger guarantee that packages
                 // will be hoisted into the correct locations.
-                await fs.promises.rmdir(path.join(this.context.root, 'node_modules'), {
-                    recursive: true,
-                    maxRetries: 3,
-                });
+                // The below should be removed and replaced with just `rm` when support for Node.Js 12 is removed.
+                const { rm, rmdir } = fs.promises;
+                if (rm) {
+                    await rm(path.join(this.context.root, 'node_modules'), {
+                        force: true,
+                        recursive: true,
+                        maxRetries: 3,
+                    });
+                }
+                else {
+                    await rmdir(path.join(this.context.root, 'node_modules'), {
+                        recursive: true,
+                        maxRetries: 3,
+                    });
+                }
             }
             catch { }
             const result = await (0, install_package_1.installAllPackages)(this.packageManager, options.force ? ['--force'] : [], this.context.root);

package/commands/version-impl.js

@@ -19,7 +19,7 @@ const package_manager_1 = require("../utilities/package-manager");
 /**
  * Major versions of Node.js that are officially supported by Angular.
  */
-const SUPPORTED_NODE_MAJORS = [12, 14];
+const SUPPORTED_NODE_MAJORS = [12, 14, 16];
 class VersionCommand extends command_1.Command {
     constructor() {
         super(...arguments);

package/lib/cli/index.js

@@ -24,9 +24,9 @@ const isDebug = debugEnv !== undefined && debugEnv !== '0' && debugEnv.toLowerCa
 async function default_1(options) {
     // This node version check ensures that the requirements of the project instance of the CLI are met
     const version = process.versions.node.split('.').map((part) => Number(part));
-    if (version[0] < 12 || (version[0] === 12 && version[1] < 14)) {
+    if (version[0] < 12 || (version[0] === 12 && version[1] < 20)) {
         process.stderr.write(`Node.js version ${process.version} detected.\n` +
-            'The Angular CLI requires a minimum v12.14.\n\n' +
+            'The Angular CLI requires a minimum v12.20.\n\n' +
             'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n');
         return 3;
     }

package/lib/config/schema.json

@@ -79,10 +79,34 @@
             "tracking": {
               "description": "Analytics sharing info tracking ID.",
               "type": "string",
-              "pattern": "^GA-\\d+-\\d+$"
+              "pattern": "^(GA|UA)?-\\d+-\\d+$"
             },
             "uuid": {
               "description": "Analytics sharing info universally unique identifier.",
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        },
+        "cache": {
+          "description": "Control disk cache.",
+          "type": "object",
+          "properties": {
+            "environment": {
+              "description": "Configure in which environment disk cache is enabled.",
+              "type": "string",
+              "enum": [
+                "local",
+                "ci",
+                "all"
+              ]
+            },
+            "enabled": {
+              "description": "Configure whether disk caching is enabled.",
+              "type": "boolean"
+            },
+            "path": {
+              "description": "Cache base path.",
               "type": "string"
             }
           }

package/lib/config/workspace-schema.d.ts

@@ -19,6 +19,10 @@ export interface CliOptions {
      */
     analytics?: Analytics;
     analyticsSharing?: AnalyticsSharing;
+    /**
+     * Control disk cache.
+     */
+    cache?: Cache;
     /**
      * The default schematics collection to use.
      */
@@ -46,6 +50,31 @@ export interface AnalyticsSharing {
      */
     uuid?: string;
 }
+/**
+ * Control disk cache.
+ */
+export interface Cache {
+    /**
+     * Configure whether disk caching is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Configure in which environment disk cache is enabled.
+     */
+    environment?: Environment;
+    /**
+     * Cache base path.
+     */
+    path?: string;
+}
+/**
+ * Configure in which environment disk cache is enabled.
+ */
+export declare enum Environment {
+    All = "all",
+    Ci = "ci",
+    Local = "local"
+}
 /**
  * Specify which package manager tool to use.
  *

package/lib/config/workspace-schema.js

@@ -2,7 +2,16 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Implement = exports.SchematicsAngularComponentStyle = exports.ChangeDetection = exports.ViewEncapsulation = exports.SchematicsAngularApplicationStyle = exports.PackageManager = void 0;
+exports.Implement = exports.SchematicsAngularComponentStyle = exports.ChangeDetection = exports.ViewEncapsulation = exports.SchematicsAngularApplicationStyle = exports.PackageManager = exports.Environment = void 0;
+/**
+ * Configure in which environment disk cache is enabled.
+ */
+var Environment;
+(function (Environment) {
+    Environment["All"] = "all";
+    Environment["Ci"] = "ci";
+    Environment["Local"] = "local";
+})(Environment = exports.Environment || (exports.Environment = {}));
 /**
  * Specify which package manager tool to use.
  *

package/models/analytics.js

@@ -182,7 +182,7 @@ async function promptProjectAnalytics(force = false) {
         if (answers.analytics) {
             console.log('');
             console.log(core_1.tags.stripIndent `
-        Thank you for sharing anonymous usage data. Would you change your mind, the following
+        Thank you for sharing anonymous usage data. Should you change your mind, the following
         command will disable this feature entirely:
 
             ${color_1.colors.yellow('ng analytics project off')}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "13.0.0-next.8",
+  "version": "13.0.0-rc.2",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,21 +28,21 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1300.0-next.8",
-    "@angular-devkit/core": "13.0.0-next.8",
-    "@angular-devkit/schematics": "13.0.0-next.8",
-    "@schematics/angular": "13.0.0-next.8",
+    "@angular-devkit/architect": "0.1300.0-rc.2",
+    "@angular-devkit/core": "13.0.0-rc.2",
+    "@angular-devkit/schematics": "13.0.0-rc.2",
+    "@schematics/angular": "13.0.0-rc.2",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.2",
     "ini": "2.0.0",
-    "inquirer": "8.1.5",
+    "inquirer": "8.2.0",
     "jsonc-parser": "3.0.0",
     "npm-package-arg": "8.1.5",
     "npm-pick-manifest": "6.1.1",
-    "open": "8.2.1",
+    "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "11.3.5",
+    "pacote": "12.0.2",
     "resolve": "1.20.0",
     "semver": "7.3.5",
     "symbol-observable": "4.0.0",
@@ -51,17 +51,17 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "13.0.0-next.8",
-      "@angular-devkit/architect": "0.1300.0-next.8",
-      "@angular-devkit/build-angular": "13.0.0-next.8",
-      "@angular-devkit/build-webpack": "0.1300.0-next.8",
-      "@angular-devkit/core": "13.0.0-next.8",
-      "@angular-devkit/schematics": "13.0.0-next.8"
+      "@angular/cli": "13.0.0-rc.2",
+      "@angular-devkit/architect": "0.1300.0-rc.2",
+      "@angular-devkit/build-angular": "13.0.0-rc.2",
+      "@angular-devkit/build-webpack": "0.1300.0-rc.2",
+      "@angular-devkit/core": "13.0.0-rc.2",
+      "@angular-devkit/schematics": "13.0.0-rc.2"
     }
   },
   "engines": {
-    "node": "^12.20.0 || >=14.0.0",
-    "npm": "^6.11.0 || ^7.5.6",
+    "node": "^12.20.0 || ^14.15.0 || >=16.10.0",
+    "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   }
 }

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();