fix: fix importOriginal with optimizer and query import [backport to v4] (#10546)

hi-ogawa · davidhwilliams · David Harris · web-flow · commit a5180190c1be · 2026-06-09T10:45:33.000+02:00
Co-authored-by: David Harris &lt;38962781+davidhwilliams@users.noreply.github.com&gt;
Co-authored-by: David Harris &lt;dharris@teamraft.com&gt;
Co-authored-by: Hiroshi Ogawa &lt;4232207+hi-ogawa@users.noreply.github.com&gt;
Co-authored-by: Codex &lt;noreply@openai.com&gt;
Co-authored-by: Vladimir &lt;sleuths.slews0s@icloud.com&gt;
diff --git a/packages/vitest/src/runtime/moduleRunner/utils.ts b/packages/vitest/src/runtime/moduleRunner/utils.ts
@@ -1,5 +1,8 @@
-// copied from vite/src/shared/utils.ts
+// copied from vite
+// https://github.com/vitejs/vite/blob/4417b4f305623b2850bd6ae6553834c017694672/packages/vite/src/shared/utils.ts
+// https://github.com/vitejs/vite/blob/4417b4f305623b2850bd6ae6553834c017694672/packages/vite/src/node/utils.ts
 const postfixRE = /[?#].*$/
+const trailingSeparatorRE = /[?&]$/
 
 function cleanUrl(url: string): string {
   return url.replace(postfixRE, '')
@@ -16,6 +19,6 @@ export function injectQuery(url: string, queryToInject: string): string {
 
 export function removeQuery(url: string, queryToRemove: string): string {
   return url
-    .replace(new RegExp(`[?&]${queryToRemove}(?=[&#]|$)`), '')
-    .replace(/\?$/, '')
+    .replace(new RegExp(`([?&])${queryToRemove}(?:&|$)`), '$1')
+    .replace(trailingSeparatorRE, '')
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/cli/deps/dep-simple2/index.js b/test/cli/deps/dep-simple2/index.js
@@ -0,0 +1 @@
+export default 'test-dep-simple2'
diff --git a/test/cli/deps/dep-simple2/package.json b/test/cli/deps/dep-simple2/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "test-dep-simple2",
+  "type": "module",
+  "private": true,
+  "exports": "./index.js"
+}
diff --git a/test/cli/fixtures/optimize-deps-mock/basic.test.ts b/test/cli/fixtures/optimize-deps-mock/basic.test.ts
@@ -0,0 +1,40 @@
+import { expect, test, vi } from 'vitest'
+// @ts-expect-error no type
+import * as dep from "@test/test-dep-url"
+// @ts-expect-error no type
+import * as simple from "test-dep-simple"
+// @ts-expect-error no type
+import * as simple2 from "test-dep-simple2"
+
+// mock + optimized
+vi.mock('@test/test-dep-url', async (importOriginal) => {
+  const original = await importOriginal<any>()
+  return { ...original,  mocked: "ok" };
+})
+
+// mock + not optimized + no external
+vi.mock('test-dep-simple', async (importOriginal) => {
+  const original = await importOriginal<any>()
+  return { ...original,  mocked: "ok" };
+})
+
+// mock + not optimized + external
+vi.mock('test-dep-simple2', async (importOriginal) => {
+  const original = await importOriginal<any>()
+  return { ...original,  mocked: "ok" };
+})
+
+test('basic', () => {
+  expect.soft({...dep}).toEqual({
+    mocked: 'ok',
+    importMetaUrl: expect.stringContaining('/node_modules/.vite/vitest/')
+  })
+  expect({...simple}).toEqual({
+    mocked: 'ok',
+    default: 'test-dep-simple',
+  })
+  expect({...simple2}).toEqual({
+    mocked: 'ok',
+    default: 'test-dep-simple2',
+  })
+})
diff --git a/test/cli/fixtures/optimize-deps-mock/vitest.config.ts b/test/cli/fixtures/optimize-deps-mock/vitest.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  ssr: {
+    noExternal: ["test-dep-simple"],
+    optimizeDeps: {
+      include: ["@test/test-dep-url"],
+    },
+  },
+  test: {
+    deps: {
+      optimizer: {
+        ssr: {
+          enabled: true,
+        },
+      },
+    },
+  },
+})
diff --git a/test/cli/package.json b/test/cli/package.json
@@ -31,6 +31,7 @@
     "playwright": "catalog:",
     "test-dep-invalid": "link:./deps/dep-invalid",
     "test-dep-simple": "file:./deps/dep-simple",
+    "test-dep-simple2": "file:./deps/dep-simple2",
     "tinyspy": "catalog:",
     "typescript": "catalog:",
     "unplugin-swc": "^1.5.9",
diff --git a/test/cli/test/optimize-deps-mock.test.ts b/test/cli/test/optimize-deps-mock.test.ts
@@ -0,0 +1,21 @@
+import { expect, test } from 'vitest'
+import { runVitest } from '../../test-utils'
+
+test.for(['forks', 'threads', 'vmThreads', 'vmForks'])(
+  'optimize deps and mock - %s',
+  async (pool) => {
+    const { errorTree, stderr } = await runVitest({
+      root: './fixtures/optimize-deps-mock',
+      pool,
+    })
+
+    expect(stderr).toBe('')
+    expect(errorTree()).toMatchInlineSnapshot(`
+      {
+        "basic.test.ts": {
+          "basic": "passed",
+        },
+      }
+    `)
+  },
+)
diff --git a/test/core/test/mocking/import-actual-query-target.ts b/test/core/test/mocking/import-actual-query-target.ts
@@ -0,0 +1 @@
+export default 'import-actual-query-target'
diff --git a/test/core/test/mocking/import-actual-query.test.ts b/test/core/test/mocking/import-actual-query.test.ts
@@ -0,0 +1,20 @@
+import { expect, test, vi } from 'vitest'
+import * as target from './import-actual-query-target?raw'
+
+vi.mock(import('./import-actual-query-target?raw'), async (importOriginal) => {
+  const original = await importOriginal<any>()
+  return {
+    ...original,
+    mocked: 'ok',
+  }
+})
+
+test('importOriginal preserves query parameters', () => {
+  expect({ ...target }).toMatchInlineSnapshot(`
+    {
+      "default": "export default 'import-actual-query-target'
+    ",
+      "mocked": "ok",
+    }
+  `)
+})
diff --git a/test/tsconfig.json b/test/tsconfig.json
@@ -2,7 +2,8 @@
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "types": [
-      "node"
+      "node",
+      "vite/client"
     ]
   },
   "include": [

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export default 'import-actual-query-target'`