Skip to content

fix: add fallback for resolving url #7223

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

Closed
Bigfish8 wants to merge 2 commits into from
Closed

fix: add fallback for resolving url #7223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4372a1e
fix: resolve url
Mar 8, 2022
0a66133
Merge branch 'main' into resolve-url
Bigfish8 Mar 8, 2022
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
23 changes: 15 additions & 8 deletions packages/vite/src/node/plugins/importAnalysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
url: string,
pos: number
): Promise<[string, string]> => {
const rawUrl = url
if (base !== '/' && url.startsWith(base)) {
url = url.replace(base, '/')
}
Expand All @@ -214,20 +215,26 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
}
}

const resolved = await this.resolve(url, importerFile)
let resolved = await this.resolve(url, importerFile)

if (!resolved) {
// in ssr, we should let node handle the missing modules
if (ssr) {
return [url, url]
}
this.error(
`Failed to resolve import "${url}" from "${path.relative(
process.cwd(),
importerFile
)}". Does the file exist?`,
pos
)
// #7220
// fallback to rawUrl
// to aviod rawUrl conflicting with base config
resolved = await this.resolve(rawUrl, importerFile)
if (!resolved) {
this.error(
`Failed to resolve import "${url}" from "${path.relative(
process.cwd(),
importerFile
)}". Does the file exist?`,
pos
)
}
}

const isRelative = url.startsWith('.')
Expand Down