Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 13:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve fs paths relative to build directory

Browse Source
This commit is contained in:
Daniel Roe 2024-10-06 19:47:21 +02:00
parent 1299e858df
commit 1795ae0ddb
No known key found for this signature in database
GPG Key ID: CBC814C393D93268
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/nuxt/src/core/plugins/virtual.ts
View File

@ -1,5 +1,5 @@
import { resolveAlias, useNuxt } from '@nuxt/kit' import { findPath, resolveAlias, useNuxt } from '@nuxt/kit'
import { dirname, isAbsolute, join, resolve } from 'pathe' import { dirname, isAbsolute, resolve } from 'pathe'
import { createUnplugin } from 'unplugin' import { createUnplugin } from 'unplugin'
const PREFIX = '\0virtual:nuxt:' const PREFIX = '\0virtual:nuxt:'
@ -27,7 +27,7 @@ export const VirtualFSPlugin = (nuxt = useNuxt(), options: VirtualFSPluginOption
return { return {
name: 'nuxt:virtual', name: 'nuxt:virtual',
enforce: 'pre', enforce: 'pre',
resolveId (id, importer) { async resolveId (id, importer) {
const _id = id const _id = id
id = resolveAlias(id, alias) id = resolveAlias(id, alias)
@ -41,14 +41,18 @@ export const VirtualFSPlugin = (nuxt = useNuxt(), options: VirtualFSPluginOption
return PREFIX + resolvedId return PREFIX + resolvedId
} }
if (importer && !isAbsolute(id)) { if (importer && /^\.{1,2}\//.test(id)) {
if (importer.startsWith(PREFIX)) { const path = resolve(dirname(withoutPrefix(importer)), id)
importer = importer.slice(PREFIX.length) const resolved = resolveWithExt(path)
}
const resolved = resolveWithExt(join(dirname(importer), id))
if (resolved) { if (resolved) {
return PREFIX + resolved return PREFIX + resolved
} }
if (importer.startsWith(PREFIX)) {
const fsPath = await findPath(path, { fallbackToOriginal: false })
if (fsPath) {
return fsPath
}
}
} }
}, },
@ -58,9 +62,13 @@ export const VirtualFSPlugin = (nuxt = useNuxt(), options: VirtualFSPluginOption
load (id) { load (id) {
return { return {
code: nuxt.vfs[id.slice(PREFIX.length)] || '', code: nuxt.vfs[withoutPrefix(id)] || '',
map: null, map: null,
} }
}, },
} }
}) })
function withoutPrefix (id: string) {
return id.startsWith(PREFIX) ? id.slice(PREFIX.length) : id
}