@nx/workspace 20.2.0-beta.5 → 20.2.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.2.0-beta.5",
+  "version": "20.2.0-beta.7",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,12 +38,12 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.2.0-beta.5",
+    "@nx/devkit": "20.2.0-beta.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.2.0-beta.5"
+    "nx": "20.2.0-beta.7"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/generate-preset.js

@@ -9,6 +9,7 @@ const get_npm_package_version_1 = require("../utils/get-npm-package-version");
 const path_1 = require("path");
 const yargsParser = require("yargs-parser");
 const child_process_1 = require("child_process");
+const installation_directory_1 = require("nx/src/utils/installation-directory");
 function addPresetDependencies(host, options) {
     const { dependencies, dev } = getPresetDependencies(options);
     return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
@@ -20,17 +21,22 @@ function generatePreset(host, opts) {
             interactive: true,
         },
     });
-    const spawnOptions = {
+    const newWorkspaceRoot = (0, path_1.join)(host.root, opts.directory);
+    const forkOptions = {
         stdio: 'inherit',
-        shell: true,
-        cwd: (0, path_1.join)(host.root, opts.directory),
-        windowsHide: false,
+        cwd: newWorkspaceRoot,
     };
     const pmc = (0, devkit_1.getPackageManagerCommand)();
-    const executable = `${pmc.exec} nx`;
+    const nxInstallationPaths = (0, installation_directory_1.getNxRequirePaths)(newWorkspaceRoot);
+    const nxBinForNewWorkspaceRoot = require.resolve('nx/bin/nx', {
+        paths: nxInstallationPaths,
+    });
     const args = getPresetArgs(opts);
     return new Promise((resolve, reject) => {
-        (0, child_process_1.spawn)(executable, args, spawnOptions).on('close', (code) => {
+        // This needs to be `fork` instead of `spawn` because `spawn` is failing on Windows with pnpm + yarn
+        // The root cause is unclear. Spawn causes the `@nx/workspace:preset` generator to be called twice
+        // and the second time it fails with `Project {projectName} already exists.`
+        (0, child_process_1.fork)(nxBinForNewWorkspaceRoot, args, forkOptions).on('close', (code) => {
             if (code === 0) {
                 resolve();
             }