@angular/cli 11.1.0 → 11.1.4

package/commands/add-impl.js

@@ -35,6 +35,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
     }
     async run(options) {
         var _a;
+        await package_manager_1.ensureCompatibleNpm(this.context.root);
         if (!options.collection) {
             this.logger.fatal(`The "ng add" command requires a name argument to be specified eg. ` +
                 `${color_1.colors.yellow('ng add [name] ')}. For more details, use "ng help".`);

package/commands/doc-impl.js

@@ -45,11 +45,8 @@ class DocCommand extends command_1.Command {
         if (options.search) {
             searchUrl = `https://${domain}/docs?search=${options.keyword}`;
         }
-        // We should wrap `open` in a new Promise because `open` is already resolved
-        await new Promise(() => {
-            open(searchUrl, {
-                wait: false,
-            });
+        await open(searchUrl, {
+            wait: false,
         });
     }
 }

package/commands/new-impl.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewCommand = void 0;
 const schematic_command_1 = require("../models/schematic-command");
+const package_manager_1 = require("../utilities/package-manager");
 class NewCommand extends schematic_command_1.SchematicCommand {
     constructor() {
         super(...arguments);
@@ -13,6 +14,7 @@ class NewCommand extends schematic_command_1.SchematicCommand {
         return super.initialize(options);
     }
     async run(options) {
+        await package_manager_1.ensureCompatibleNpm(this.context.root);
         // Register the version of the CLI in the registry.
         const packageJson = require('../package.json');
         const version = packageJson.version;

package/commands/update-impl.js

@@ -188,6 +188,7 @@ class UpdateCommand extends command_1.Command {
     // tslint:disable-next-line:no-big-function
     async run(options) {
         var _a;
+        await package_manager_1.ensureCompatibleNpm(this.context.root);
         // Check if the @angular-devkit/schematics package can be resolved from the workspace root
         // This works around issues with packages containing migrations that cannot directly depend on the package
         // This check can be removed once the schematic runtime handles this situation
@@ -487,10 +488,32 @@ class UpdateCommand extends command_1.Command {
         const migrations = global.externalMigrations;
         if (success && migrations) {
             for (const migration of migrations) {
-                const result = await this.executeMigrations(migration.package, 
-                // Resolve the collection from the workspace root, as otherwise it will be resolved from the temp
+                // Resolve the package from the workspace root, as otherwise it will be resolved from the temp
                 // installed CLI version.
-                require.resolve(migration.collection, { paths: [this.context.root] }), new semver.Range('>' + migration.from + ' <=' + migration.to), options.createCommits);
+                const packagePath = require.resolve(migration.package, { paths: [this.context.root] });
+                let migrations;
+                // Check if it is a package-local location
+                const localMigrations = path.join(packagePath, migration.collection);
+                if (fs.existsSync(localMigrations)) {
+                    migrations = localMigrations;
+                }
+                else {
+                    // Try to resolve from package location.
+                    // This avoids issues with package hoisting.
+                    try {
+                        migrations = require.resolve(migration.collection, { paths: [packagePath] });
+                    }
+                    catch (e) {
+                        if (e.code === 'MODULE_NOT_FOUND') {
+                            this.logger.error(`Migrations for package (${migration.package}) were not found.`);
+                        }
+                        else {
+                            this.logger.error(`Unable to resolve migrations for package (${migration.package}).  [${e.message}]`);
+                        }
+                        return 1;
+                    }
+                }
+                const result = await this.executeMigrations(migration.package, migrations, new semver.Range('>' + migration.from + ' <=' + migration.to), options.createCommits);
                 if (!result) {
                     return 0;
                 }

package/lib/config/schema.json

@@ -751,7 +751,7 @@
                       ]
                     },
                     "fonts": {
-                      "description": "Enables optimization for fonts. This requires internet access.",
+                      "description": "Enables optimization for fonts. This option requires internet access. `HTTPS_PROXY` environment variable can be used to specify a proxy server.",
                       "default": true,
                       "oneOf": [
                         {
@@ -759,7 +759,7 @@
                           "properties": {
                             "inline": {
                               "type": "boolean",
-                              "description": "Reduce render blocking requests by inlining external Google fonts and icons CSS definitions in the application's HTML index file. This requires internet access.",
+                              "description": "Reduce render blocking requests by inlining external Google fonts and icons CSS definitions in the application's HTML index file. This option requires internet access. `HTTPS_PROXY` environment variable can be used to specify a proxy server.",
                               "default": true
                             }
                           },

package/models/schematic-command.js

@@ -409,7 +409,7 @@ class SchematicCommand extends command_1.Command {
                         this.logger.fatal('The Schematic workflow failed. See above.');
                     }
                     else if (debug) {
-                        this.logger.fatal(`An error occured:\n${err.message}\n${err.stack}`);
+                        this.logger.fatal(`An error occurred:\n${err.message}\n${err.stack}`);
                     }
                     else {
                         this.logger.fatal(err.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "11.1.0",
+  "version": "11.1.4",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1101.0",
-    "@angular-devkit/core": "11.1.0",
-    "@angular-devkit/schematics": "11.1.0",
-    "@schematics/angular": "11.1.0",
-    "@schematics/update": "0.1101.0",
+    "@angular-devkit/architect": "0.1101.4",
+    "@angular-devkit/core": "11.1.4",
+    "@angular-devkit/schematics": "11.1.4",
+    "@schematics/angular": "11.1.4",
+    "@schematics/update": "0.1101.4",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.1",
@@ -53,17 +53,17 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "11.1.0",
-      "@angular-devkit/architect": "0.1101.0",
-      "@angular-devkit/build-angular": "0.1101.0",
-      "@angular-devkit/build-webpack": "0.1101.0",
-      "@angular-devkit/core": "11.1.0",
-      "@angular-devkit/schematics": "11.1.0"
+      "@angular/cli": "11.1.4",
+      "@angular-devkit/architect": "0.1101.4",
+      "@angular-devkit/build-angular": "0.1101.4",
+      "@angular-devkit/build-webpack": "0.1101.4",
+      "@angular-devkit/core": "11.1.4",
+      "@angular-devkit/schematics": "11.1.4"
     }
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": ">= 6.11.0",
+    "npm": "^6.11.0",
     "yarn": ">= 1.13.0"
   }
 }

package/utilities/package-manager.d.ts

@@ -2,3 +2,7 @@ import { PackageManager } from '../lib/config/schema';
 export declare function supportsYarn(): boolean;
 export declare function supportsNpm(): boolean;
 export declare function getPackageManager(root: string): Promise<PackageManager>;
+/**
+ * Checks if the npm version is version 6.x.  If not, display a message and exit.
+ */
+export declare function ensureCompatibleNpm(root: string): Promise<void>;

package/utilities/package-manager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
+exports.ensureCompatibleNpm = exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -56,3 +56,28 @@ async function getPackageManager(root) {
     return packageManager || schema_1.PackageManager.Npm;
 }
 exports.getPackageManager = getPackageManager;
+/**
+ * Checks if the npm version is version 6.x.  If not, display a message and exit.
+ */
+async function ensureCompatibleNpm(root) {
+    var _a;
+    if ((await getPackageManager(root)) !== schema_1.PackageManager.Npm) {
+        return;
+    }
+    try {
+        const version = child_process_1.execSync('npm --version', { encoding: 'utf8', stdio: 'pipe' }).trim();
+        const major = Number((_a = version.match(/^(\d+)\./)) === null || _a === void 0 ? void 0 : _a[1]);
+        if (major === 6) {
+            return;
+        }
+        // tslint:disable-next-line: no-console
+        console.error(`npm version ${version} detected.\n` +
+            'The Angular CLI currently requires npm version 6.\n\n' +
+            'Please install a compatible version to proceed (`npm install --global npm@6`).\n');
+        process.exit(3);
+    }
+    catch (_b) {
+        // npm is not installed
+    }
+}
+exports.ensureCompatibleNpm = ensureCompatibleNpm;

package/utilities/package-metadata.js

@@ -81,7 +81,7 @@ function readOptions(logger, yarn = false, showPotentials = false) {
                         if (typeof value === 'string') {
                             const cafile = path.resolve(path.dirname(location), value);
                             try {
-                                options['ca'] = fs_1.readFileSync(cafile, 'utf8').replace(/\r?\n/, '\\n');
+                                options['ca'] = fs_1.readFileSync(cafile, 'utf8').replace(/\r?\n/g, '\n');
                             }
                             catch (_a) { }
                         }