archive-gh-me/vitest
1
0
Fork 0
mirror of https://github.com/vitest-dev/vitest.git synced 2026-02-01 17:36:51 +00:00
Code Issues Projects Releases Wiki Activity

fix: correctly resolve vitest import if inline: true is set (#7856)

Browse Source
This commit is contained in:
Vladimir 2025-04-24 18:20:26 +02:00 committed by GitHub
parent 8b2b61f6fd
commit a83f3bf6f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
packages/vitest/src/runtime/execute.ts
View File

@ -91,6 +91,36 @@ function listenForErrors(state: () => WorkerGlobalState) {
})
}
const relativeIds: Record<string, string> = {}
function getVitestImport(id: string, state: () => WorkerGlobalState) {
if (externalizeMap.has(id)) {
return { externalize: externalizeMap.get(id)! }
}
// always externalize Vitest because we import from there before running tests
// so we already have it cached by Node.js
const root = state().config.root
const relativeRoot = relativeIds[root] ?? (relativeIds[root] = normalizedDistDir.slice(root.length))
if (
// full dist path
id.includes(distDir)
|| id.includes(normalizedDistDir)
// "relative" to root path:
// /node_modules/.pnpm/vitest/dist
|| (relativeRoot && relativeRoot !== '/' && id.startsWith(relativeRoot))
) {
const { path } = toFilePath(id, root)
const externalize = pathToFileURL(path).toString()
externalizeMap.set(id, externalize)
return { externalize }
}
if (bareVitestRegexp.test(id)) {
externalizeMap.set(id, id)
return { externalize: id }
}
return null
}
export async function startVitestExecutor(options: ContextExecutorOptions): Promise<VitestExecutor> {
const state = (): WorkerGlobalState =>
// @ts-expect-error injected untyped global
@ -109,20 +139,9 @@ export async function startVitestExecutor(options: ContextExecutorOptions): Prom
return await createVitestExecutor({
async fetchModule(id) {
if (externalizeMap.has(id)) {
return { externalize: externalizeMap.get(id)! }
}
// always externalize Vitest because we import from there before running tests
// so we already have it cached by Node.js
if (id.includes(distDir) || id.includes(normalizedDistDir)) {
const { path } = toFilePath(id, state().config.root)
const externalize = pathToFileURL(path).toString()
externalizeMap.set(id, externalize)
return { externalize }
}
if (bareVitestRegexp.test(id)) {
externalizeMap.set(id, id)
return { externalize: id }
const vitest = getVitestImport(id, state)
if (vitest) {
return vitest
}
const result = await rpc().fetch(id, getTransformMode())