fix: correctly resolve external dependencies loaded by custom environ…

…ments
vitest-dev · Sep 28, 2023 · 4e5ee6d · 4e5ee6d
1 parent 6a66b35
commit 4e5ee6d
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 80 deletions.
diff --git a/packages/vitest/src/runtime/child.ts b/packages/vitest/src/runtime/child.ts
@@ -54,9 +54,8 @@ async function init(ctx: ChildContext) {
 
   const environment = await loadEnvironment(ctx.environment.name, {
     root: ctx.config.root,
-    fetchModule(id) {
-      return rpc.fetch(id, 'ssr')
-    },
+    fetchModule: id => rpc.fetch(id, 'ssr'),
+    resolveId: (id, importer) => rpc.resolveId(id, importer, 'ssr'),
   })
   if (ctx.environment.transformMode)
     environment.transformMode = ctx.environment.transformMode

diff --git a/packages/vitest/src/runtime/vm.ts b/packages/vitest/src/runtime/vm.ts
@@ -39,9 +39,8 @@ export async function run(ctx: WorkerContext) {
 
   const environment = await loadEnvironment(ctx.environment.name, {
     root: ctx.config.root,
-    fetchModule(id) {
-      return rpc.fetch(id, 'ssr')
-    },
+    fetchModule: id => rpc.fetch(id, 'ssr'),
+    resolveId: (id, importer) => rpc.resolveId(id, importer, 'ssr'),
   })
 
   if (!environment.setupVM) {

diff --git a/packages/vitest/src/runtime/worker.ts b/packages/vitest/src/runtime/worker.ts
@@ -37,9 +37,8 @@ async function init(ctx: WorkerContext) {
 
   const environment = await loadEnvironment(ctx.environment.name, {
     root: ctx.config.root,
-    fetchModule(id) {
-      return rpc.fetch(id, 'ssr')
-    },
+    fetchModule: id => rpc.fetch(id, 'ssr'),
+    resolveId: (id, importer) => rpc.resolveId(id, importer, 'ssr'),
   })
   if (ctx.environment.transformMode)
     environment.transformMode = ctx.environment.transformMode

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/env-custom/package.json b/test/env-custom/package.json
@@ -6,6 +6,8 @@
     "coverage": "vitest run --coverage"
   },
   "devDependencies": {
+    "@types/debug": "^4.1.8",
+    "debug": "^4.3.4",
     "vitest": "workspace:*",
     "vitest-environment-custom": "file:./vitest-environment-custom"
   }

diff --git a/test/env-custom/vitest-environment-custom/index.ts b/test/env-custom/vitest-environment-custom/index.ts
@@ -1,6 +1,10 @@
 import vm from 'node:vm'
+import debug from 'debug'
 import type { Environment } from 'vitest'
 
+// test that external packages (debug) are loaded correctly
+const log = debug('test:env')
+
 export default <Environment>{
   name: 'custom',
   transformMode: 'ssr',
@@ -28,6 +32,9 @@ export default <Environment>{
       teardown() {
         delete global.testEnvironment
         delete global.option
+
+        if (global.__exists)
+          log('should not log')
       },
     }
   },