fix: import nx from the correct location when cwd is different than t…

…he workspace root (#2109)
nrwl · Apr 29, 2024 · 744c8be · 744c8be
1 parent 92e7763
commit 744c8be
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts b/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts
@@ -210,6 +210,7 @@ async function executeInitGenerator(dependency: string, workspacePath: string) {
       cwd: workspacePath,
       displayCommand: command,
       encapsulatedNx: false,
+      workspacePath,
     })
   );
   tasks.executeTask(task);

diff --git a/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts b/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts
@@ -98,6 +98,7 @@ export class NxCommandsTreeProvider extends AbstractTreeProvider<NxCommandsTreeI
           cwd: workspacePath,
           displayCommand: prefixedCommand,
           encapsulatedNx: isEncapsulatedNx,
+          workspacePath,
         })
       );
       tasks.executeTask(task);

diff --git a/libs/vscode/tasks/src/lib/cli-task.ts b/libs/vscode/tasks/src/lib/cli-task.ts
@@ -42,6 +42,7 @@ export class CliTask extends Task {
             ? join(workspacePath, definition.cwd)
             : workspacePath,
           encapsulatedNx: isEncapsulatedNx,
+          workspacePath,
         },
         packageManagerCommands
       )

diff --git a/libs/vscode/tasks/src/lib/nx-task.ts b/libs/vscode/tasks/src/lib/nx-task.ts
@@ -45,6 +45,7 @@ export class NxTask extends Task {
         displayCommand,
         cwd: cwd ? join(workspacePath, cwd) : workspacePath,
         encapsulatedNx: isEncapsulatedNx,
+        workspacePath,
       })
     );
     return task;

diff --git a/libs/vscode/utils/src/lib/shell-execution.ts b/libs/vscode/utils/src/lib/shell-execution.ts
@@ -8,6 +8,7 @@ export interface ShellConfig {
   cwd: string;
   displayCommand: string;
   encapsulatedNx: boolean;
+  workspacePath: string;
 }
 
 export async function getShellExecutionForConfig(
@@ -24,7 +25,7 @@ export async function getShellExecutionForConfig(
   } else {
     const { detectPackageManager, getPackageManagerCommand } =
       await importNxPackagePath<typeof import('nx/src/utils/package-manager')>(
-        config.cwd,
+        config.workspacePath,
         'src/utils/package-manager'
       );
     const pmc =