fix(vm): fix external module resolve error with deps optimizer query (#10024)

hi-ogawa · claude · web-flow · commit 9dbf477864a1 · 2026-03-30T10:24:27.000+02:00
Co-authored-by: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/packages/utils/src/helpers.ts b/packages/utils/src/helpers.ts
@@ -65,6 +65,14 @@ export function cleanUrl(url: string): string {
   return url.replace(postfixRE, '')
 }
 
+export function splitFileAndPostfix(path: string): {
+  file: string
+  postfix: string
+} {
+  const file = cleanUrl(path)
+  return { file, postfix: path.slice(file.length) }
+}
+
 const externalRE = /^(?:[a-z]+:)?\/\//
 export const isExternalUrl = (url: string): boolean => externalRE.test(url)
 
diff --git a/packages/vitest/src/runtime/external-executor.ts b/packages/vitest/src/runtime/external-executor.ts
@@ -5,7 +5,7 @@ import type { VMModule } from './vm/types'
 import fs from 'node:fs'
 import { isBuiltin } from 'node:module'
 import { fileURLToPath, pathToFileURL } from 'node:url'
-import { isBareImport } from '@vitest/utils/helpers'
+import { isBareImport, splitFileAndPostfix } from '@vitest/utils/helpers'
 import { findNearestPackageData } from '@vitest/utils/resolver'
 import { extname, normalize } from 'pathe'
 import { CommonjsExecutor } from './vm/commonjs-executor'
@@ -125,7 +125,8 @@ export class ExternalModulesExecutor {
       return { type: 'data', url: identifier, path: identifier }
     }
 
-    const extension = extname(identifier)
+    const { file, postfix } = splitFileAndPostfix(identifier)
+    const extension = extname(file)
     if (extension === '.node' || isBuiltin(identifier)) {
       return { type: 'builtin', url: identifier, path: identifier }
     }
@@ -138,10 +139,8 @@ export class ExternalModulesExecutor {
     }
 
     const isFileUrl = identifier.startsWith('file://')
-    const pathUrl = isFileUrl
-      ? fileURLToPath(identifier.split('?')[0])
-      : identifier
-    const fileUrl = isFileUrl ? identifier : pathToFileURL(pathUrl).toString()
+    const pathUrl = isFileUrl ? fileURLToPath(file) : file
+    const fileUrl = isFileUrl ? identifier : `${pathToFileURL(file)}${postfix}`
 
     let type: 'module' | 'commonjs' | 'vite' | 'wasm'
     if (this.vite.canResolve(fileUrl)) {
diff --git a/test/cli/fixtures/optimize-deps/vitest.config.ts b/test/cli/fixtures/optimize-deps/vitest.config.ts
@@ -0,0 +1,24 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  optimizeDeps: {
+    include: ["@test/test-dep-url"],
+  },
+  ssr: {
+    optimizeDeps: {
+      include: ["@test/test-dep-url"],
+    },
+  },
+  test: {
+    deps: {
+      optimizer: {
+        client: {
+          enabled: true,
+        },
+        ssr: {
+          enabled: true,
+        },
+      },
+    },
+  },
+});
diff --git a/test/cli/test/optimize-deps.test.ts b/test/cli/test/optimize-deps.test.ts
@@ -1,33 +1,16 @@
 import { expect, test } from 'vitest'
 import { runVitest } from '../../test-utils'
 
-test('optimize deps optimizes them into node_modules/.vite', async () => {
-  const { errorTree, stderr } = await runVitest({
-    root: './fixtures/optimize-deps',
-    deps: {
-      optimizer: {
-        client: {
-          enabled: true,
-        },
-        ssr: {
-          enabled: true,
-        },
-      },
-    },
-    $viteConfig: {
-      optimizeDeps: {
-        include: ['@test/test-dep-url'],
-      },
-      ssr: {
-        optimizeDeps: {
-          include: ['@test/test-dep-url'],
-        },
-      },
-    },
-  })
+test.for(['forks', 'threads', 'vmThreads', 'vmForks'])(
+  'optimize deps optimizes them into node_modules/.vite - %s',
+  async (pool) => {
+    const { errorTree, stderr } = await runVitest({
+      root: './fixtures/optimize-deps',
+      pool,
+    })
 
-  expect(stderr).toBe('')
-  expect(errorTree()).toMatchInlineSnapshot(`
+    expect(stderr).toBe('')
+    expect(errorTree()).toMatchInlineSnapshot(`
     {
       "ssr.test.ts": {
         "import.meta.url": "passed",
@@ -37,4 +20,5 @@ test('optimize deps optimizes them into node_modules/.vite', async () => {
       },
     }
   `)
-})
+  },
+)
