fix: properly re-evaluate actual modules of mocked external (#9898)

hi-ogawa · web-flow · commit ae5ec03ef980 · 2026-03-18T20:49:57.000+01:00
diff --git a/packages/vitest/src/runtime/moduleRunner/startVitestModuleRunner.ts b/packages/vitest/src/runtime/moduleRunner/startVitestModuleRunner.ts
@@ -135,7 +135,7 @@ export function startVitestModuleRunner(options: ContextModuleRunnerOptions): Vi
 
           // if module is invalidated, the worker will be recreated,
           // so cached is always true in a single worker
-          if (options?.cached) {
+          if (!isImportActual && options?.cached) {
             return { cache: true }
           }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/cli/deps/dep-simple/index.js b/test/cli/deps/dep-simple/index.js
@@ -0,0 +1 @@
+export default 'test-dep-simple'
diff --git a/test/cli/deps/dep-simple/package.json b/test/cli/deps/dep-simple/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "test-dep-simple",
+  "type": "module",
+  "private": true,
+  "exports": "./index.js"
+}
diff --git a/test/cli/package.json b/test/cli/package.json
@@ -30,6 +30,7 @@
     "obug": "^2.1.1",
     "playwright": "catalog:",
     "test-dep-invalid": "link:./deps/dep-invalid",
+    "test-dep-simple": "file:./deps/dep-simple",
     "tinyspy": "catalog:",
     "typescript": "catalog:",
     "unplugin-swc": "^1.5.9",
diff --git a/test/cli/test/mocking.test.ts b/test/cli/test/mocking.test.ts
@@ -391,3 +391,152 @@ test('mock works without loading original', () => {
     }
   `)
 })
+
+test.for([
+  'node',
+  'playwright',
+  'webdriverio',
+])('repeating mock, importActual, and resetModules (%s)', async (mode) => {
+  const { stderr, errorTree } = await runInlineTests({
+    // external
+    './external.test.ts': `
+import { expect, test, vi } from "vitest"
+
+test("external", async () => {
+  vi.doMock(import("test-dep-simple"), async (importActual) => {
+    const lib = await importActual();
+    return lib;
+  })
+  const lib1: any = await import("test-dep-simple")
+  expect(lib1.default).toBe("test-dep-simple")
+
+  vi.resetModules();
+  vi.doMock(import("test-dep-simple"), async (importActual) => {
+    const lib = await importActual();
+    return lib;
+  })
+  const lib2: any = await import("test-dep-simple")
+  expect(lib2.default).toBe("test-dep-simple")
+  expect.soft(lib1 !== lib2).toBe(true)
+
+  vi.resetModules();
+  vi.doMock(import("test-dep-simple"), async () => ({ mocked: true }));
+  const lib3 = await import("test-dep-simple");
+  expect(lib3).toMatchObject({ mocked: true })
+
+  const lib4 = await vi.importActual("test-dep-simple");
+  expect(lib4.default).toBe("test-dep-simple")
+  const lib5 = await vi.importActual("test-dep-simple");
+  expect(lib4).toBe(lib5)
+});
+    `,
+    // builtin module
+    './builtin.test.ts': `
+import { expect, test, vi } from "vitest"
+
+test("builtin", async () => {
+  vi.doMock(import("node:path"), async (importActual) => {
+    const lib = await importActual();
+    return lib;
+  })
+  const lib1: any = await import("node:path")
+  expect(lib1).toHaveProperty('join')
+
+  vi.resetModules();
+  vi.doMock(import("node:path"), async (importActual) => {
+    const lib = await importActual();
+    return lib;
+  })
+  const lib2: any = await import("node:path")
+  expect(lib2).toHaveProperty('join')
+  expect.soft(lib1 !== lib2).toBe(true)
+
+  vi.resetModules();
+  vi.doMock(import("node:path"), async () => ({ mocked: true }));
+  const lib3 = await import("node:path");
+  expect(lib3).toMatchObject({ mocked: true })
+
+  const lib4 = await vi.importActual("node:path");
+  expect(lib4).toHaveProperty('join')
+  const lib5 = await vi.importActual("node:path");
+  expect(lib4).toBe(lib5)
+});
+    `,
+    // local module
+    './local.test.ts': `
+import { expect, test, vi } from "vitest"
+
+test("local", async () => {
+  vi.doMock(import("./local.js"), async (importActual) => {
+    const lib = await importActual();
+    return lib;
+  })
+  const lib1: any = await import("./local.js")
+  expect(lib1).toHaveProperty('local')
+
+  vi.resetModules();
+  vi.doMock(import("./local.js"), async (importActual) => {
+    const lib = await importActual();
+    return lib;
+  })
+  const lib2: any = await import("./local.js")
+  expect(lib2).toHaveProperty('local')
+  expect.soft(lib1 !== lib2).toBe(true)
+
+  vi.resetModules();
+  vi.doMock(import("./local.js"), async () => ({ mocked: true }));
+  const lib3 = await import("./local.js");
+  expect(lib3).toMatchObject({ mocked: true })
+
+  const lib4 = await vi.importActual("./local.js");
+  expect(lib4).toHaveProperty('local')
+  const lib5 = await vi.importActual("./local.js");
+  expect(lib4).toBe(lib5)
+});
+    `,
+    './local.js': `export const local = 'local'`,
+  }, modeToConfig(mode))
+
+  if (mode === 'webdriverio' || mode === 'playwright') {
+    // browser mode doesn't support resetModules nor node builtin
+    expect(errorTree()).toMatchInlineSnapshot(`
+      {
+        "builtin.test.ts": {
+          "builtin": [
+            "Cannot convert a Symbol value to a string",
+          ],
+        },
+        "external.test.ts": {
+          "external": [
+            "expected false to be true // Object.is equality",
+            "expected { default: 'test-dep-simple', …(1) } to match object { mocked: true }
+      (1 matching property omitted from actual)",
+          ],
+        },
+        "local.test.ts": {
+          "local": [
+            "expected false to be true // Object.is equality",
+            "expected { local: 'local', …(1) } to match object { mocked: true }
+      (1 matching property omitted from actual)",
+          ],
+        },
+      }
+    `)
+    return
+  }
+
+  expect(stderr).toMatchInlineSnapshot(`""`)
+  expect(errorTree()).toMatchInlineSnapshot(`
+    {
+      "builtin.test.ts": {
+        "builtin": "passed",
+      },
+      "external.test.ts": {
+        "external": "passed",
+      },
+      "local.test.ts": {
+        "local": "passed",
+      },
+    }
+  `)
+})

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ export function startVitestModuleRunner(options: ContextModuleRunnerOptions): Vi`
`135`	`135`
`136`	`136`	`// if module is invalidated, the worker will be recreated,`
`137`	`137`	`// so cached is always true in a single worker`
`138`		`- if (options?.cached) {`
	`138`	`+ if (!isImportActual && options?.cached) {`
`139`	`139`	`return { cache: true }`
`140`	`140`	`}`
`141`	`141`