Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: path resolve edge #19486

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: path resolve edge #19486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion packages/vite/src/node/plugins/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,19 @@ export function resolvePlugin(
startsWithWordCharRE.test(id))
) {
const basedir = importer ? path.dirname(importer) : process.cwd()
const fsPath = path.resolve(basedir, id)
const { file, postfix } = splitFileAndPostfix(id)
let fsPath
if (postfix) {
fsPath = path.resolve(basedir, file)
if (postfix.startsWith('#')) {
fsPath += `/${postfix}`
} else {
fsPath += postfix
}
} else {
fsPath = path.resolve(basedir, id)
}

// handle browser field mapping for relative imports

const normalizedFsPath = normalizePath(fsPath)
Expand Down
7 changes: 6 additions & 1 deletion packages/vite/src/node/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,12 @@ export const isCaseInsensitiveFS = testCaseInsensitiveFS()
const VOLUME_RE = /^[A-Z]:/i

export function normalizePath(id: string): string {
return path.posix.normalize(isWindows ? slash(id) : id)
const { file, postfix } = splitFileAndPostfix(id)
let normalize = path.posix.normalize(isWindows ? slash(file) : file)
if (postfix) {
normalize += postfix
}
return normalize
}

export function fsPathFromId(id: string): string {
Expand Down