@angular/cli 12.0.0 → 12.0.4

package/commands/add-impl.js

@@ -173,9 +173,9 @@ class AddCommand extends schematic_command_1.SchematicCommand {
         if (savePackage === false) {
             // Temporary packages are located in a different directory
             // Hence we need to resolve them using the temp path
-            const { status, tempPath } = await install_package_1.installTempPackage(packageIdentifier.raw, packageManager, options.registry ? [`--registry="${options.registry}"`] : undefined);
+            const { status, tempNodeModules } = await install_package_1.installTempPackage(packageIdentifier.raw, packageManager, options.registry ? [`--registry="${options.registry}"`] : undefined);
             const resolvedCollectionPath = require.resolve(path_1.join(collectionName, 'package.json'), {
-                paths: [tempPath],
+                paths: [tempNodeModules],
             });
             if (status !== 0) {
                 return status;

package/commands/e2e-impl.d.ts

@@ -11,6 +11,6 @@ import { Schema as E2eCommandSchema } from './e2e';
 export declare class E2eCommand extends ArchitectCommand<E2eCommandSchema> {
     readonly target = "e2e";
     readonly multiTarget = true;
-    readonly missingTargetError = "\nCannot find \"e2e\" target for the specified project.\n\nYou should add a package that implements end-to-end testing capabilities.\n\nFor example:\n  WebdriverIO: ng add @wdio/schematics\n\nMore options will be added to the list as they become available.\n";
+    readonly missingTargetError = "\nCannot find \"e2e\" target for the specified project.\n\nYou should add a package that implements end-to-end testing capabilities.\n\nFor example:\n  Cypress: ng add @cypress/schematic\n  WebdriverIO: ng add @wdio/schematics\n\nMore options will be added to the list as they become available.\n";
     initialize(options: E2eCommandSchema & Arguments): Promise<number | void>;
 }

package/commands/e2e-impl.js

@@ -20,6 +20,7 @@ Cannot find "e2e" target for the specified project.
 You should add a package that implements end-to-end testing capabilities.
 
 For example:
+  Cypress: ng add @cypress/schematic
   WebdriverIO: ng add @wdio/schematics
 
 More options will be added to the list as they become available.

package/commands/update-impl.js

@@ -475,6 +475,21 @@ class UpdateCommand extends command_1.Command {
             packageManager: this.packageManager,
             packages: packagesToUpdate,
         });
+        if (success) {
+            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,
+                });
+            }
+            catch { }
+            const result = await install_package_1.installAllPackages(this.packageManager, options.force ? ['--force'] : [], this.context.root);
+            if (result !== 0) {
+                return result;
+            }
+        }
         if (success && options.createCommits) {
             const committed = this.commit(`Angular CLI update for packages - ${packagesToUpdate.join(', ')}`);
             if (!committed) {

package/lib/config/schema.json

@@ -1690,7 +1690,7 @@
           "type": "object",
           "properties": {
             "includePaths": {
-              "description": "Paths to include. Paths will be resolved to project root.",
+              "description": "Paths to include. Paths will be resolved to workspace root.",
               "type": "array",
               "items": {
                 "type": "string"
@@ -2186,7 +2186,7 @@
         },
         "proxyConfig": {
           "type": "string",
-          "description": "Proxy configuration file."
+          "description": "Proxy configuration file. For more information, see https://angular.io/guide/build#proxying-to-a-backend-server."
         },
         "ssl": {
           "type": "boolean",
@@ -2471,7 +2471,7 @@
           "type": "object",
           "properties": {
             "includePaths": {
-              "description": "Paths to include. Paths will be resolved to project root.",
+              "description": "Paths to include. Paths will be resolved to workspace root.",
               "type": "array",
               "items": {
                 "type": "string"
@@ -2746,7 +2746,7 @@
           "type": "object",
           "properties": {
             "includePaths": {
-              "description": "Paths to include. Paths will be resolved to project root.",
+              "description": "Paths to include. Paths will be resolved to workspace root.",
               "type": "array",
               "items": {
                 "type": "string"

package/models/architect-command.js

@@ -185,6 +185,7 @@ class ArchitectCommand extends command_1.Command {
         return success ? 0 : 1;
     }
     async runArchitectTarget(options) {
+        var _a;
         const extra = options['--'] || [];
         try {
             const targetSpec = this._makeTargetSpecifier(options);
@@ -206,7 +207,7 @@ class ArchitectCommand extends command_1.Command {
                 const newErrors = [];
                 for (const schemaError of e.errors) {
                     if (schemaError.keyword === 'additionalProperties') {
-                        const unknownProperty = schemaError.params.additionalProperty;
+                        const unknownProperty = (_a = schemaError.params) === null || _a === void 0 ? void 0 : _a.additionalProperty;
                         if (unknownProperty in options) {
                             const dashes = unknownProperty.length === 1 ? '-' : '--';
                             this.logger.fatal(`Unknown option: '${dashes}${unknownProperty}'`);
@@ -252,6 +253,7 @@ class ArchitectCommand extends command_1.Command {
         }
     }
     _makeTargetSpecifier(commandOptions) {
+        var _a, _b, _c;
         let project, target, configuration;
         if (commandOptions.target) {
             [project, target, configuration] = commandOptions.target.split(':');
@@ -263,9 +265,14 @@ class ArchitectCommand extends command_1.Command {
             project = commandOptions.project;
             target = this.target;
             if (commandOptions.prod) {
+                const defaultConfig = project &&
+                    target &&
+                    ((_c = (_b = (_a = this.workspace) === null || _a === void 0 ? void 0 : _a.projects.get(project)) === null || _b === void 0 ? void 0 : _b.targets.get(target)) === null || _c === void 0 ? void 0 : _c.defaultConfiguration);
+                this.logger.warn(defaultConfig === 'production'
+                    ? 'Option "--prod" is deprecated: No need to use this option as this builder defaults to configuration "production".'
+                    : 'Option "--prod" is deprecated: Use "--configuration production" instead.');
                 // The --prod flag will always be the first configuration, available to be overwritten
                 // by following configurations.
-                this.logger.warn('Option "--prod" is deprecated: Use "--configuration production" instead.');
                 configuration = 'production';
             }
             if (commandOptions.configuration) {

package/models/schematic-engine-host.js

@@ -33,14 +33,17 @@ function shouldWrapSchematic(schematicFile) {
                 return true;
         }
     }
+    const normalizedSchematicFile = schematicFile.replace(/\\/g, '/');
     // Never wrap the internal update schematic when executed directly
     // It communicates with the update command via `global`
-    if (/[\/\\]node_modules[\/\\]@angular[\/\\]cli[\/\\]/.test(schematicFile)) {
+    // But we still want to redirect schematics located in `@angular/cli/node_modules`.
+    if (normalizedSchematicFile.includes('node_modules/@angular/cli/') &&
+        !normalizedSchematicFile.includes('node_modules/@angular/cli/node_modules/')) {
         return false;
     }
     // Default is only first-party Angular schematic packages
     // Angular schematics are safe to use in the wrapped VM context
-    return /[\/\\]node_modules[\/\\]@(?:angular|schematics|nguniversal)[\/\\]/.test(schematicFile);
+    return /\/node_modules\/@(?:angular|schematics|nguniversal)\//.test(normalizedSchematicFile);
 }
 class SchematicEngineHost extends tools_1.NodeModulesEngineHost {
     _resolveReferenceString(refString, parentPath) {
@@ -94,10 +97,8 @@ const legacyModules = {
  * @param exportName An optional name of a specific export to return. Otherwise, return all exports.
  */
 function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
-    const { createRequire, createRequireFromPath } = require('module');
-    // Node.js 10.x does not support `createRequire` so fallback to `createRequireFromPath`
-    // `createRequireFromPath` is deprecated in 12+ and can be removed once 10.x support is removed
-    const scopedRequire = (createRequire === null || createRequire === void 0 ? void 0 : createRequire(schematicFile)) || createRequireFromPath(schematicFile);
+    const { createRequire } = require('module');
+    const scopedRequire = createRequire(schematicFile);
     const customRequire = function (id) {
         if (legacyModules[id]) {
             // Provide compatibility modules for older versions of @angular/cdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "12.0.0",
+  "version": "12.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.1200.0",
-    "@angular-devkit/core": "12.0.0",
-    "@angular-devkit/schematics": "12.0.0",
-    "@schematics/angular": "12.0.0",
+    "@angular-devkit/architect": "0.1200.4",
+    "@angular-devkit/core": "12.0.4",
+    "@angular-devkit/schematics": "12.0.4",
+    "@schematics/angular": "12.0.4",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.1",
@@ -40,7 +40,7 @@
     "jsonc-parser": "3.0.0",
     "npm-package-arg": "8.1.2",
     "npm-pick-manifest": "6.1.1",
-    "open": "8.0.7",
+    "open": "8.0.2",
     "ora": "5.4.0",
     "pacote": "11.3.2",
     "resolve": "1.20.0",
@@ -52,16 +52,16 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "12.0.0",
-      "@angular-devkit/architect": "0.1200.0",
-      "@angular-devkit/build-angular": "12.0.0",
-      "@angular-devkit/build-webpack": "0.1200.0",
-      "@angular-devkit/core": "12.0.0",
-      "@angular-devkit/schematics": "12.0.0"
+      "@angular/cli": "12.0.4",
+      "@angular-devkit/architect": "0.1200.4",
+      "@angular-devkit/build-angular": "12.0.4",
+      "@angular-devkit/build-webpack": "0.1200.4",
+      "@angular-devkit/core": "12.0.4",
+      "@angular-devkit/schematics": "12.0.4"
     }
   },
   "engines": {
-    "node": "^12.14.1 || ^14.0.0",
+    "node": "^12.14.1 || >=14.0.0",
     "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   }

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

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularMajorCompatGuarantee = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const npa = require("npm-package-arg");
 const semver = require("semver");
 const npm_1 = require("./npm");
@@ -218,9 +217,7 @@ function _performUpdate(tree, context, infoMap, logger, migrateOnly) {
     const newContent = JSON.stringify(packageJson, null, 2);
     if (packageJsonContent.toString() != newContent || migrateOnly) {
         if (!migrateOnly) {
-            // If something changed, also hook up the task.
             tree.overwrite('/package.json', JSON.stringify(packageJson, null, 2));
-            context.addTask(new tasks_1.NodePackageInstallTask());
         }
         const externalMigrations = [];
         // Run the migrate schematics with the list of packages to use. The collection contains

package/utilities/install-package.d.ts

@@ -7,9 +7,10 @@
  */
 import { PackageManager } from '../lib/config/workspace-schema';
 import { NgAddSaveDepedency } from '../utilities/package-metadata';
+export declare function installAllPackages(packageManager?: PackageManager, extraArgs?: string[], cwd?: string): Promise<1 | 0>;
 export declare function installPackage(packageName: string, packageManager?: PackageManager, save?: Exclude<NgAddSaveDepedency, false>, extraArgs?: string[], cwd?: string): Promise<1 | 0>;
 export declare function installTempPackage(packageName: string, packageManager?: PackageManager, extraArgs?: string[]): Promise<{
     status: 1 | 0;
-    tempPath: string;
+    tempNodeModules: string;
 }>;
 export declare function runTempPackageBin(packageName: string, packageManager?: PackageManager, args?: string[]): Promise<number>;

package/utilities/install-package.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTempPackageBin = exports.installTempPackage = exports.installPackage = void 0;
+exports.runTempPackageBin = exports.installTempPackage = exports.installPackage = exports.installAllPackages = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const os_1 = require("os");
@@ -15,6 +15,39 @@ const path_1 = require("path");
 const rimraf = require("rimraf");
 const workspace_schema_1 = require("../lib/config/workspace-schema");
 const spinner_1 = require("./spinner");
+async function installAllPackages(packageManager = workspace_schema_1.PackageManager.Npm, extraArgs = [], cwd = process.cwd()) {
+    const packageManagerArgs = getPackageManagerArguments(packageManager);
+    const installArgs = [];
+    if (packageManagerArgs.installAll) {
+        installArgs.push(packageManagerArgs.installAll);
+    }
+    installArgs.push(packageManagerArgs.silent);
+    const spinner = new spinner_1.Spinner();
+    spinner.start('Installing packages...');
+    const bufferedOutput = [];
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        const childProcess = child_process_1.spawn(packageManager, [...installArgs, ...extraArgs], {
+            stdio: 'pipe',
+            shell: true,
+            cwd,
+        }).on('close', (code) => {
+            if (code === 0) {
+                spinner.succeed('Packages successfully installed.');
+                resolve(0);
+            }
+            else {
+                spinner.stop();
+                bufferedOutput.forEach(({ stream, data }) => stream.write(data));
+                spinner.fail('Package install failed, see above.');
+                reject(1);
+            }
+        });
+        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => bufferedOutput.push({ stream: process.stdout, data: data }));
+        (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => bufferedOutput.push({ stream: process.stderr, data: data }));
+    });
+}
+exports.installAllPackages = installAllPackages;
 async function installPackage(packageName, packageManager = workspace_schema_1.PackageManager.Npm, save = true, extraArgs = [], cwd = process.cwd()) {
     const packageManagerArgs = getPackageManagerArguments(packageManager);
     const installArgs = [
@@ -86,19 +119,19 @@ async function installTempPackage(packageName, packageManager = workspace_schema
     ];
     return {
         status: await installPackage(packageName, packageManager, true, installArgs, tempPath),
-        tempPath,
+        tempNodeModules,
     };
 }
 exports.installTempPackage = installTempPackage;
 async function runTempPackageBin(packageName, packageManager = workspace_schema_1.PackageManager.Npm, args = []) {
-    const { status: code, tempPath } = await installTempPackage(packageName, packageManager);
+    const { status: code, tempNodeModules } = await installTempPackage(packageName, packageManager);
     if (code !== 0) {
         return code;
     }
     // Remove version/tag etc... from package name
     // Ex: @angular/cli@latest -> @angular/cli
     const packageNameNoVersion = packageName.substring(0, packageName.lastIndexOf('@'));
-    const pkgLocation = path_1.join(tempPath, packageNameNoVersion);
+    const pkgLocation = path_1.join(tempNodeModules, packageNameNoVersion);
     const packageJsonPath = path_1.join(pkgLocation, 'package.json');
     // Get a binary location for this package
     let binPath;
@@ -115,10 +148,8 @@ async function runTempPackageBin(packageName, packageManager = workspace_schema_
     if (!binPath) {
         throw new Error(`Cannot locate bin for temporary package: ${packageNameNoVersion}.`);
     }
-    const argv = [binPath, ...args];
-    const { status, error } = child_process_1.spawnSync('node', argv, {
+    const { status, error } = child_process_1.spawnSync(process.execPath, [binPath, ...args], {
         stdio: 'inherit',
-        shell: true,
         env: {
             ...process.env,
             NG_DISABLE_VERSION_CHECK: 'true',
@@ -146,6 +177,7 @@ function getPackageManagerArguments(packageManager) {
                 silent: '--silent',
                 saveDev: '--save-dev',
                 install: 'add',
+                installAll: 'install',
                 prefix: '--prefix',
                 noLockfile: '--no-lockfile',
             };
@@ -154,6 +186,7 @@ function getPackageManagerArguments(packageManager) {
                 silent: '--quiet',
                 saveDev: '--save-dev',
                 install: 'install',
+                installAll: 'install',
                 prefix: '--prefix',
                 noLockfile: '--no-package-lock',
             };