@angular/cli 12.0.3 → 12.0.4

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.3",
+  "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.3",
-    "@angular-devkit/core": "12.0.3",
-    "@angular-devkit/schematics": "12.0.3",
-    "@schematics/angular": "12.0.3",
+    "@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",
@@ -52,12 +52,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "12.0.3",
-      "@angular-devkit/architect": "0.1200.3",
-      "@angular-devkit/build-angular": "12.0.3",
-      "@angular-devkit/build-webpack": "0.1200.3",
-      "@angular-devkit/core": "12.0.3",
-      "@angular-devkit/schematics": "12.0.3"
+      "@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": {

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