fix: manual and redirect mock shouldn't load or transform original module

packages/browser/src/node/plugin.ts

@@ -49,6 +49,20 @@ export default (parentServer: ParentBrowserProject, base = '/'): Plugin[] => {
           }
           next()
         })
+        // strip _vitest_original query added by importActual so that
+        // the plugin pipeline sees the original import id (e.g. virtual modules's load hook).
+        server.middlewares.use((req, _res, next) => {
+          if (
+            req.url?.includes('_vitest_original')
+            && parentServer.project.config.browser.provider?.name === 'playwright'
+          ) {
+            req.url = req.url
+              .replace(/[?&]_vitest_original(?=[&#]|$)/, '')
+              .replace(/[?&]ext\b[^&#]*/, '')
+              .replace(/\?$/, '')
+          }
+          next()
+        })
         server.middlewares.use(createOrchestratorMiddleware(parentServer))
         server.middlewares.use(createTesterMiddleware(parentServer))
 

packages/vitest/src/runtime/moduleRunner/bareModuleMocker.ts

@@ -192,6 +192,11 @@ export class BareModuleMocker implements TestModuleMocker {
     return registry.getById(fixLeadingSlashes(id))
   }
 
+  public getDependencyMockByUrl(url: string): MockedModule | undefined {
+    const registry = this.getMockerRegistry()
+    return registry.get(url)
+  }
+
   public findMockRedirect(mockPath: string, external: string | null): string | null {
     return findMockRedirect(this.root, mockPath, external)
   }

packages/vitest/src/runtime/moduleRunner/moduleMocker.ts

@@ -7,6 +7,7 @@ import vm from 'node:vm'
 import { AutomockedModule, RedirectedModule } from '@vitest/mocker'
 import { distDir } from '../../paths'
 import { BareModuleMocker } from './bareModuleMocker'
+import { injectQuery } from './utils'
 
 const spyModulePath = resolve(distDir, 'spy.js')
 
@@ -130,7 +131,7 @@ export class VitestMocker extends BareModuleMocker {
     callstack?: string[] | null,
   ): Promise<T> {
     const { url } = await this.resolveId(rawId, importer)
-    const node = await this.moduleRunner.fetchModule(url, importer)
+    const node = await this.moduleRunner.fetchModule(injectQuery(url, '_vitest_original'), importer)
     const result = await this.moduleRunner.cachedRequest(
       node.url,
       node,

packages/vitest/src/runtime/moduleRunner/moduleRunner.ts

@@ -11,6 +11,7 @@ import * as viteModuleRunner from 'vite/module-runner'
 import { Traces } from '../../utils/traces'
 import { VitestMocker } from './moduleMocker'
 import { VitestTransport } from './moduleTransport'
+import { injectQuery } from './utils'
 
 export type CreateImportMeta = (modulePath: string) => viteModuleRunner.ModuleRunnerImportMeta | Promise<viteModuleRunner.ModuleRunnerImportMeta>
 export const createNodeImportMeta: CreateImportMeta = (modulePath: string) => {
@@ -165,11 +166,24 @@ export class VitestModuleRunner
 
     let mocked: any
     if (mod.meta && 'mockedModule' in mod.meta) {
+      const mockedModule = mod.meta.mockedModule as MockedModule
+      const mockId = this.mocker.getMockPath(mod.id)
+      // bypass mock and force "importActual" behavior when:
+      // - mock was removed by doUnmock (stale mockedModule in meta)
+      // - self-import: mock factory/file is importing the module it's mocking
+      const isStale = !this.mocker.getDependencyMock(mod.id)
+      const isSelfImport = callstack.includes(mockId)
+        || callstack.includes(url)
+        || ('redirect' in mockedModule && callstack.includes(mockedModule.redirect))
+      if (isStale || isSelfImport) {
+        const node = await this.fetchModule(injectQuery(url, '_vitest_original'))
+        return this._cachedRequest(node.url, node, callstack, metadata)
+      }
       mocked = await this.mocker.requestWithMockedModule(
         url,
         mod,
         callstack,
-        mod.meta.mockedModule as MockedModule,
+        mockedModule,
       )
     }
     else {

packages/vitest/src/runtime/moduleRunner/startVitestModuleRunner.ts

@@ -12,6 +12,7 @@ import { getCachedVitestImport } from './cachedResolver'
 import { unwrapId, VitestModuleEvaluator } from './moduleEvaluator'
 import { VitestMocker } from './moduleMocker'
 import { VitestModuleRunner } from './moduleRunner'
+import { removeQuery } from './utils'
 
 const { readFileSync } = fs
 
@@ -95,6 +96,13 @@ export function startVitestModuleRunner(options: ContextModuleRunnerOptions): Vi
           return vitest
         }
 
+        // strip _vitest_original query added by importActual so that
+        // the plugin pipeline sees the original import id (e.g. virtual modules's load hook)
+        const isImportActual = id.includes('_vitest_original')
+        if (isImportActual) {
+          id = removeQuery(id, '_vitest_original')
+        }
+
         const rawId = unwrapId(id)
         resolvingModules.add(rawId)
 
@@ -103,15 +111,17 @@ export function startVitestModuleRunner(options: ContextModuleRunnerOptions): Vi
             await moduleRunner.mocker.resolveMocks()
           }
 
-          const resolvedMock = moduleRunner.mocker.getDependencyMock(rawId)
-          if (resolvedMock?.type === 'manual' || resolvedMock?.type === 'redirect') {
-            return {
-              code: '',
-              file: null,
-              id: resolvedMock.id,
-              url: resolvedMock.url,
-              invalidate: false,
-              mockedModule: resolvedMock,
+          if (!isImportActual) {
+            const resolvedMock = moduleRunner.mocker.getDependencyMockByUrl(id)
+            if (resolvedMock?.type === 'manual' || resolvedMock?.type === 'redirect') {
+              return {
+                code: '',
+                file: null,
+                id: resolvedMock.id,
+                url: resolvedMock.url,
+                invalidate: false,
+                mockedModule: resolvedMock,
+              }
             }
           }
 

packages/vitest/src/runtime/moduleRunner/utils.ts

@@ -0,0 +1,21 @@
+// copied from vite/src/shared/utils.ts
+const postfixRE = /[?#].*$/
+
+function cleanUrl(url: string): string {
+  return url.replace(postfixRE, '')
+}
+function splitFileAndPostfix(path: string): { file: string; postfix: string } {
+  const file = cleanUrl(path)
+  return { file, postfix: path.slice(file.length) }
+}
+
+export function injectQuery(url: string, queryToInject: string): string {
+  const { file, postfix } = splitFileAndPostfix(url)
+  return `${file}?${queryToInject}${postfix[0] === '?' ? `&${postfix.slice(1)}` : /* hash only */ postfix}`
+}
+
+export function removeQuery(url: string, queryToRemove: string): string {
+  return url
+    .replace(new RegExp(`[?&]${queryToRemove}(?=[&#]|$)`), '')
+    .replace(/\?$/, '')
+}