@angular/cli 12.0.1 → 12.0.5

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"
@@ -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}'`);

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.1",
+  "version": "12.0.5",
   "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.1",
-    "@angular-devkit/core": "12.0.1",
-    "@angular-devkit/schematics": "12.0.1",
-    "@schematics/angular": "12.0.1",
+    "@angular-devkit/architect": "0.1200.5",
+    "@angular-devkit/core": "12.0.5",
+    "@angular-devkit/schematics": "12.0.5",
+    "@schematics/angular": "12.0.5",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.1",
@@ -52,16 +52,16 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "12.0.1",
-      "@angular-devkit/architect": "0.1200.1",
-      "@angular-devkit/build-angular": "12.0.1",
-      "@angular-devkit/build-webpack": "0.1200.1",
-      "@angular-devkit/core": "12.0.1",
-      "@angular-devkit/schematics": "12.0.1"
+      "@angular/cli": "12.0.5",
+      "@angular-devkit/architect": "0.1200.5",
+      "@angular-devkit/build-angular": "12.0.5",
+      "@angular-devkit/build-webpack": "0.1200.5",
+      "@angular-devkit/core": "12.0.5",
+      "@angular-devkit/schematics": "12.0.5"
     }
   },
   "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/npm.js

@@ -17,6 +17,7 @@ const pacote = require('pacote');
 const npmPackageJsonCache = new Map();
 let npmrc;
 function readOptions(logger, yarn = false, showPotentials = false) {
+    var _a;
     const cwd = process.cwd();
     const baseFilename = yarn ? 'yarnrc' : 'npmrc';
     const dotFilename = '.' + baseFilename;
@@ -31,8 +32,8 @@ function readOptions(logger, yarn = false, showPotentials = false) {
         }
     }
     const defaultConfigLocations = [
-        path.join(globalPrefix, 'etc', baseFilename),
-        path.join(os_1.homedir(), dotFilename),
+        (!yarn && process.env.NPM_CONFIG_GLOBALCONFIG) || path.join(globalPrefix, 'etc', baseFilename),
+        (!yarn && process.env.NPM_CONFIG_USERCONFIG) || path.join(os_1.homedir(), dotFilename),
     ];
     const projectConfigLocations = [path.join(cwd, dotFilename)];
     const root = path.parse(cwd).root;
@@ -53,27 +54,45 @@ function readOptions(logger, yarn = false, showPotentials = false) {
             // See: https://github.com/npm/npm-registry-fetch/blob/ebddbe78a5f67118c1f7af2e02c8a22bcaf9e850/index.js#L99-L126
             const rcConfig = yarn ? lockfile.parse(data) : ini.parse(data);
             for (const [key, value] of Object.entries(rcConfig)) {
+                let substitutedValue = value;
+                // Substitute any environment variable references.
+                if (typeof value === 'string') {
+                    substitutedValue = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+                }
                 switch (key) {
+                    // Unless auth options are scope with the registry url it appears that npm-registry-fetch ignores them,
+                    // even though they are documented.
+                    // https://github.com/npm/npm-registry-fetch/blob/8954f61d8d703e5eb7f3d93c9b40488f8b1b62ac/README.md
+                    // https://github.com/npm/npm-registry-fetch/blob/8954f61d8d703e5eb7f3d93c9b40488f8b1b62ac/auth.js#L45-L91
+                    case '_authToken':
+                    case 'token':
+                    case 'username':
+                    case 'password':
+                    case '_auth':
+                    case 'auth':
+                        (_a = options['forceAuth']) !== null && _a !== void 0 ? _a : (options['forceAuth'] = {});
+                        options['forceAuth'][key] = substitutedValue;
+                        break;
                     case 'noproxy':
                     case 'no-proxy':
-                        options['noProxy'] = value;
+                        options['noProxy'] = substitutedValue;
                         break;
                     case 'maxsockets':
-                        options['maxSockets'] = value;
+                        options['maxSockets'] = substitutedValue;
                         break;
                     case 'https-proxy':
                     case 'proxy':
-                        options['proxy'] = value;
+                        options['proxy'] = substitutedValue;
                         break;
                     case 'strict-ssl':
-                        options['strictSSL'] = value;
+                        options['strictSSL'] = substitutedValue;
                         break;
                     case 'local-address':
-                        options['localAddress'] = value;
+                        options['localAddress'] = substitutedValue;
                         break;
                     case 'cafile':
-                        if (typeof value === 'string') {
-                            const cafile = path.resolve(path.dirname(location), value);
+                        if (typeof substitutedValue === 'string') {
+                            const cafile = path.resolve(path.dirname(location), substitutedValue);
                             try {
                                 options['ca'] = fs_1.readFileSync(cafile, 'utf8').replace(/\r?\n/g, '\n');
                             }
@@ -81,21 +100,11 @@ function readOptions(logger, yarn = false, showPotentials = false) {
                         }
                         break;
                     default:
-                        options[key] = value;
+                        options[key] = substitutedValue;
                         break;
                 }
             }
         }
-        else if (showPotentials) {
-            logger.info(`Trying '${location}'...not found.`);
-        }
-    }
-    // Substitute any environment variable references
-    for (const key in options) {
-        const value = options[key];
-        if (typeof value === 'string') {
-            options[key] = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
-        }
     }
     return options;
 }

package/utilities/install-package.js

@@ -148,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',

package/utilities/package-metadata.js

@@ -30,6 +30,7 @@ function ensureNpmrc(logger, usingYarn, verbose) {
     }
 }
 function readOptions(logger, yarn = false, showPotentials = false) {
+    var _a;
     const cwd = process.cwd();
     const baseFilename = yarn ? 'yarnrc' : 'npmrc';
     const dotFilename = '.' + baseFilename;
@@ -66,27 +67,45 @@ function readOptions(logger, yarn = false, showPotentials = false) {
             // See: https://github.com/npm/npm-registry-fetch/blob/ebddbe78a5f67118c1f7af2e02c8a22bcaf9e850/index.js#L99-L126
             const rcConfig = yarn ? lockfile.parse(data) : ini.parse(data);
             for (const [key, value] of Object.entries(rcConfig)) {
+                let substitutedValue = value;
+                // Substitute any environment variable references.
+                if (typeof value === 'string') {
+                    substitutedValue = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+                }
                 switch (key) {
+                    // Unless auth options are scope with the registry url it appears that npm-registry-fetch ignores them,
+                    // even though they are documented.
+                    // https://github.com/npm/npm-registry-fetch/blob/8954f61d8d703e5eb7f3d93c9b40488f8b1b62ac/README.md
+                    // https://github.com/npm/npm-registry-fetch/blob/8954f61d8d703e5eb7f3d93c9b40488f8b1b62ac/auth.js#L45-L91
+                    case '_authToken':
+                    case 'token':
+                    case 'username':
+                    case 'password':
+                    case '_auth':
+                    case 'auth':
+                        (_a = options['forceAuth']) !== null && _a !== void 0 ? _a : (options['forceAuth'] = {});
+                        options['forceAuth'][key] = substitutedValue;
+                        break;
                     case 'noproxy':
                     case 'no-proxy':
-                        options['noProxy'] = value;
+                        options['noProxy'] = substitutedValue;
                         break;
                     case 'maxsockets':
-                        options['maxSockets'] = value;
+                        options['maxSockets'] = substitutedValue;
                         break;
                     case 'https-proxy':
                     case 'proxy':
-                        options['proxy'] = value;
+                        options['proxy'] = substitutedValue;
                         break;
                     case 'strict-ssl':
-                        options['strictSSL'] = value;
+                        options['strictSSL'] = substitutedValue;
                         break;
                     case 'local-address':
-                        options['localAddress'] = value;
+                        options['localAddress'] = substitutedValue;
                         break;
                     case 'cafile':
-                        if (typeof value === 'string') {
-                            const cafile = path.resolve(path.dirname(location), value);
+                        if (typeof substitutedValue === 'string') {
+                            const cafile = path.resolve(path.dirname(location), substitutedValue);
                             try {
                                 options['ca'] = fs_1.readFileSync(cafile, 'utf8').replace(/\r?\n/g, '\n');
                             }
@@ -94,21 +113,11 @@ function readOptions(logger, yarn = false, showPotentials = false) {
                         }
                         break;
                     default:
-                        options[key] = value;
+                        options[key] = substitutedValue;
                         break;
                 }
             }
         }
-        else if (showPotentials) {
-            logger.info(`Trying '${location}'...not found.`);
-        }
-    }
-    // Substitute any environment variable references
-    for (const key in options) {
-        const value = options[key];
-        if (typeof value === 'string') {
-            options[key] = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
-        }
     }
     return options;
 }