fix: better pnp.cjs resolution in workspace (#491)

package.json

@@ -251,6 +251,7 @@
     "changelogithub": "^0.13.3",
     "eslint": "^9.7.0",
     "execa": "^8.0.1",
+    "find-up": "^7.0.0",
     "get-port": "^6.1.2",
     "istanbul-to-vscode": "^2.1.0",
     "micromatch": "^4.0.5",

src/api/child_process.ts

@@ -1,6 +1,5 @@
 import { type ChildProcess, fork } from 'node:child_process'
 import { pathToFileURL } from 'node:url'
-import { dirname } from 'node:path'
 import * as vscode from 'vscode'
 import { gte } from 'semver'
 import { findNode, formatPkg, getNodeJsVersion, showVitestError } from '../utils'
@@ -55,7 +54,7 @@ async function createChildVitestProcess(pkg: VitestPackage) {
         NODE_ENV: env.NODE_ENV ?? process.env.NODE_ENV ?? 'test',
       },
       stdio: 'overlapped',
-      cwd: pnp ? dirname(pnp) : pkg.cwd,
+      cwd: pkg.cwd,
     },
   )
 

src/api/resolve.ts

@@ -1,5 +1,6 @@
 import type * as vscode from 'vscode'
 import { dirname, resolve } from 'pathe'
+import { findUpSync } from 'find-up'
 import { getConfig } from '../config'
 import { normalizeDriveLetter } from '../worker/utils'
 
@@ -52,14 +53,15 @@ export function resolveVitestPackagePath(cwd: string, folder: vscode.WorkspaceFo
 
 export function resolveVitestPnpPackagePath(cwd: string) {
   try {
-    const pnpPath = require.resolve('./.pnp.cjs', {
-      paths: [cwd],
-    })
+    const pnpPath = findUpSync(['.pnp.js', '.pnp.cjs'], { cwd })
+    if (pnpPath == null) {
+      return null
+    }
     const pnpApi = _require(pnpPath)
     const vitestNodePath = pnpApi.resolveRequest('vitest/node', normalizeDriveLetter(cwd))
     return {
       pnpLoader: require.resolve('./.pnp.loader.mjs', {
-        paths: [cwd],
+        paths: [dirname(pnpPath)],
       }),
       pnpPath,
       vitestNodePath,