@angular/cli 12.2.0-next.3 → 12.2.2

package/commands/add-impl.d.ts

@@ -12,6 +12,7 @@ export declare class AddCommand extends SchematicCommand<AddCommandSchema> {
     readonly allowPrivateSchematics = true;
     initialize(options: AddCommandSchema & Arguments): Promise<void>;
     run(options: AddCommandSchema & Arguments): Promise<number | void>;
+    private isProjectVersionValid;
     reportAnalytics(paths: string[], options: AddCommandSchema & Arguments, dimensions?: (boolean | number | string)[], metrics?: (boolean | number | string)[]): Promise<void>;
     private isPackageInstalled;
     private executeSchematic;

package/commands/add-impl.js

@@ -6,10 +6,14 @@
  * 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
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddCommand = void 0;
 const core_1 = require("@angular-devkit/core");
 const tools_1 = require("@angular-devkit/schematics/tools");
+const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
 const path_1 = require("path");
 const semver_1 = require("semver");
 const workspace_schema_1 = require("../lib/config/workspace-schema");
@@ -22,7 +26,6 @@ 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");
-const npa = require('npm-package-arg');
 class AddCommand extends schematic_command_1.SchematicCommand {
     constructor() {
         super(...arguments);
@@ -46,28 +49,16 @@ class AddCommand extends schematic_command_1.SchematicCommand {
         }
         let packageIdentifier;
         try {
-            packageIdentifier = npa(options.collection);
+            packageIdentifier = npm_package_arg_1.default(options.collection);
         }
         catch (e) {
             this.logger.error(e.message);
             return 1;
         }
-        if (packageIdentifier.registry && this.isPackageInstalled(packageIdentifier.name)) {
-            let validVersion = false;
-            const installedVersion = await this.findProjectVersion(packageIdentifier.name);
-            if (installedVersion) {
-                if (packageIdentifier.type === 'range') {
-                    validVersion = semver_1.satisfies(installedVersion, packageIdentifier.fetchSpec);
-                }
-                else if (packageIdentifier.type === 'version') {
-                    const v1 = semver_1.valid(packageIdentifier.fetchSpec);
-                    const v2 = semver_1.valid(installedVersion);
-                    validVersion = v1 !== null && v1 === v2;
-                }
-                else if (!packageIdentifier.rawSpec) {
-                    validVersion = true;
-                }
-            }
+        if (packageIdentifier.name &&
+            packageIdentifier.registry &&
+            this.isPackageInstalled(packageIdentifier.name)) {
+            const validVersion = await this.isProjectVersionValid(packageIdentifier);
             if (validVersion) {
                 // Already installed so just run schematic
                 this.logger.info('Skipping installation: Package already installed');
@@ -79,7 +70,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
         const packageManager = await package_manager_1.getPackageManager(this.context.root);
         const usingYarn = packageManager === workspace_schema_1.PackageManager.Yarn;
         spinner.info(`Using package manager: ${color_1.colors.grey(packageManager)}`);
-        if (packageIdentifier.type === 'tag' && !packageIdentifier.rawSpec) {
+        if (packageIdentifier.name && packageIdentifier.type === 'tag' && !packageIdentifier.rawSpec) {
             // only package name provided; search for viable version
             // plus special cases for packages that did not have peer deps setup
             spinner.start('Searching for compatible package version...');
@@ -103,13 +94,13 @@ class AddCommand extends schematic_command_1.SchematicCommand {
                     if (version &&
                         ((semver_1.validRange(version) && semver_1.intersects(version, '7', semverOptions)) ||
                             (semver_1.valid(version) && semver_1.satisfies(version, '7', semverOptions)))) {
-                        packageIdentifier = npa.resolve('@angular/pwa', '0.12');
+                        packageIdentifier = npm_package_arg_1.default.resolve('@angular/pwa', '0.12');
                     }
                 }
                 else {
-                    packageIdentifier = npa.resolve(latestManifest.name, latestManifest.version);
+                    packageIdentifier = npm_package_arg_1.default.resolve(latestManifest.name, latestManifest.version);
                 }
-                spinner.succeed(`Found compatible package version: ${color_1.colors.grey(packageIdentifier)}.`);
+                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
@@ -118,7 +109,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
                 let newIdentifier;
                 for (const versionManifest of versionManifests) {
                     if (!(await this.hasMismatchedPeer(versionManifest))) {
-                        newIdentifier = npa.resolve(packageIdentifier.name, versionManifest.version);
+                        newIdentifier = npm_package_arg_1.default.resolve(packageIdentifier.name, versionManifest.version);
                         break;
                     }
                 }
@@ -127,19 +118,19 @@ class AddCommand extends schematic_command_1.SchematicCommand {
                 }
                 else {
                     packageIdentifier = newIdentifier;
-                    spinner.succeed(`Found compatible package version: ${color_1.colors.grey(packageIdentifier)}.`);
+                    spinner.succeed(`Found compatible package version: ${color_1.colors.grey(packageIdentifier.toString())}.`);
                 }
             }
             else {
-                packageIdentifier = npa.resolve(latestManifest.name, latestManifest.version);
-                spinner.succeed(`Found compatible package version: ${color_1.colors.grey(packageIdentifier)}.`);
+                packageIdentifier = npm_package_arg_1.default.resolve(latestManifest.name, latestManifest.version);
+                spinner.succeed(`Found compatible package version: ${color_1.colors.grey(packageIdentifier.toString())}.`);
             }
         }
         let collectionName = packageIdentifier.name;
         let savePackage;
         try {
             spinner.start('Loading package information from registry...');
-            const manifest = await package_metadata_1.fetchPackageManifest(packageIdentifier, this.logger, {
+            const manifest = await package_metadata_1.fetchPackageManifest(packageIdentifier.toString(), this.logger, {
                 registry: options.registry,
                 verbose: options.verbose,
                 usingYarn,
@@ -161,7 +152,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
             const confirmationResponse = await prompt_1.askConfirmation(`\nThe package ${color_1.colors.blue(packageIdentifier.raw)} will be installed and executed.\n` +
                 'Would you like to proceed?', true, false);
             if (!confirmationResponse) {
-                if (!tty_1.isTTY) {
+                if (!tty_1.isTTY()) {
                     this.logger.error('No terminal detected. ' +
                         `'--skip-confirmation' can be used to bypass installation confirmation. ` +
                         `Ensure package name is correct prior to '--skip-confirmation' option usage.`);
@@ -190,6 +181,27 @@ class AddCommand extends schematic_command_1.SchematicCommand {
         }
         return this.executeSchematic(collectionName, options['--']);
     }
+    async isProjectVersionValid(packageIdentifier) {
+        if (!packageIdentifier.name) {
+            return false;
+        }
+        let validVersion = false;
+        const installedVersion = await this.findProjectVersion(packageIdentifier.name);
+        if (installedVersion) {
+            if (packageIdentifier.type === 'range' && packageIdentifier.fetchSpec) {
+                validVersion = semver_1.satisfies(installedVersion, packageIdentifier.fetchSpec);
+            }
+            else if (packageIdentifier.type === 'version') {
+                const v1 = semver_1.valid(packageIdentifier.fetchSpec);
+                const v2 = semver_1.valid(installedVersion);
+                validVersion = v1 !== null && v1 === v2;
+            }
+            else if (!packageIdentifier.rawSpec) {
+                validVersion = true;
+            }
+        }
+        return validVersion;
+    }
     async reportAnalytics(paths, options, dimensions = [], metrics = []) {
         const collection = options.collection;
         // Add the collection if it's safe listed.
@@ -267,7 +279,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
         for (const peer in manifest.peerDependencies) {
             let peerIdentifier;
             try {
-                peerIdentifier = npa.resolve(peer, manifest.peerDependencies[peer]);
+                peerIdentifier = npm_package_arg_1.default.resolve(peer, manifest.peerDependencies[peer]);
             }
             catch {
                 this.logger.warn(`Invalid peer dependency ${peer} found in package.`);

package/commands/e2e-long.md

@@ -1,2 +1,4 @@
-Must be executed from within a workspace directory.
-When a project name is not supplied, it will execute for all projects.
+The command takes an optional project name, as specified in the `projects` section of the `angular.json` workspace configuration file.
+When a project name is not supplied, executes the `e2e` builder for the default project.
+
+To use the `ng e2e` command, use `ng add` to add a package that implements end-to-end testing capabilities. Adding the package automatically updates your workspace configuration, adding an `e2e` [CLI builder](guide/cli-builder).

package/commands/update-impl.js

@@ -25,12 +25,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateCommand = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
+const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
 const path = __importStar(require("path"));
 const semver = __importStar(require("semver"));
 const workspace_schema_1 = require("../lib/config/workspace-schema");
@@ -43,7 +47,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 npa = require('npm-package-arg');
 const pickManifest = require('npm-pick-manifest');
 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');
@@ -238,7 +241,7 @@ class UpdateCommand extends command_1.Command {
         const packages = [];
         for (const request of options['--'] || []) {
             try {
-                const packageIdentifier = npa(request);
+                const packageIdentifier = npm_package_arg_1.default(request);
                 // only registry identifiers are supported
                 if (!packageIdentifier.registry) {
                     this.logger.error(`Package '${request}' is not a registry package identifer.`);

package/lib/config/schema.json

@@ -612,7 +612,7 @@
           "x-user-analytics": 10
         },
         "viewEncapsulation": {
-          "description": "The view encapsulation strategy to use in the new app.",
+          "description": "The view encapsulation strategy to use in the new application.",
           "enum": [
             "Emulated",
             "None",

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

@@ -152,7 +152,7 @@ export interface AngularApplicationOptionsSchema {
      */
     style?: SchematicsAngularApplicationStyle;
     /**
-     * The view encapsulation strategy to use in the new app.
+     * The view encapsulation strategy to use in the new application.
      */
     viewEncapsulation?: ViewEncapsulation;
 }
@@ -166,7 +166,7 @@ export declare enum SchematicsAngularApplicationStyle {
     Scss = "scss"
 }
 /**
- * The view encapsulation strategy to use in the new app.
+ * The view encapsulation strategy to use in the new application.
  *
  * The view encapsulation strategy to use in the new component.
  *

package/lib/config/workspace-schema.js

@@ -26,7 +26,7 @@ var SchematicsAngularApplicationStyle;
     SchematicsAngularApplicationStyle["Scss"] = "scss";
 })(SchematicsAngularApplicationStyle = exports.SchematicsAngularApplicationStyle || (exports.SchematicsAngularApplicationStyle = {}));
 /**
- * The view encapsulation strategy to use in the new app.
+ * The view encapsulation strategy to use in the new application.
  *
  * The view encapsulation strategy to use in the new component.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "12.2.0-next.3",
+  "version": "12.2.2",
   "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.1202.0-next.3",
-    "@angular-devkit/core": "12.2.0-next.3",
-    "@angular-devkit/schematics": "12.2.0-next.3",
-    "@schematics/angular": "12.2.0-next.3",
+    "@angular-devkit/architect": "0.1202.2",
+    "@angular-devkit/core": "12.2.2",
+    "@angular-devkit/schematics": "12.2.2",
+    "@schematics/angular": "12.2.2",
     "@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": "12.2.0-next.3",
-      "@angular-devkit/architect": "0.1202.0-next.3",
-      "@angular-devkit/build-angular": "12.2.0-next.3",
-      "@angular-devkit/build-webpack": "0.1202.0-next.3",
-      "@angular-devkit/core": "12.2.0-next.3",
-      "@angular-devkit/schematics": "12.2.0-next.3"
+      "@angular/cli": "12.2.2",
+      "@angular-devkit/architect": "0.1202.2",
+      "@angular-devkit/build-angular": "12.2.2",
+      "@angular-devkit/build-webpack": "0.1202.2",
+      "@angular-devkit/core": "12.2.2",
+      "@angular-devkit/schematics": "12.2.2"
     }
   },
   "engines": {

package/utilities/package-metadata.js

@@ -87,7 +87,7 @@ function readOptions(logger, yarn = false, showPotentials = false) {
             // Normalize RC options that are needed by 'npm-registry-fetch'.
             // See: https://github.com/npm/npm-registry-fetch/blob/ebddbe78a5f67118c1f7af2e02c8a22bcaf9e850/index.js#L99-L126
             const rcConfig = yarn ? lockfile.parse(data) : ini.parse(data);
-            rcOptions = normalizeOptions(rcConfig, location);
+            rcOptions = normalizeOptions(rcConfig, location, rcOptions);
         }
     }
     const envVariablesOptions = {};
@@ -108,14 +108,11 @@ function readOptions(logger, yarn = false, showPotentials = false) {
         normalizedName = normalizedName.replace(/(?!^)_/g, '-'); // don't replace _ at the start of the key.s
         envVariablesOptions[normalizedName] = value;
     }
-    return {
-        ...rcOptions,
-        ...normalizeOptions(envVariablesOptions),
-    };
+    return normalizeOptions(envVariablesOptions, undefined, rcOptions);
 }
-function normalizeOptions(rawOptions, location = process.cwd()) {
+function normalizeOptions(rawOptions, location = process.cwd(), existingNormalizedOptions = {}) {
     var _a;
-    const options = {};
+    const options = { ...existingNormalizedOptions };
     for (const [key, value] of Object.entries(rawOptions)) {
         let substitutedValue = value;
         // Substitute any environment variable references.