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

Jump to bottom

fix(ssr): strip NULL_BYTE_PLACEHOLDER before import #9124

Merged
merged 3 commits into from Jul 18, 2022
Merged

fix(ssr): strip NULL_BYTE_PLACEHOLDER before import #9124

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cb4b25
fix(ssr): strip NULL_BYTE_PLACEHOLDER before import
sapphi-red Jul 14, 2022
2d91f25
Revert "fix(ssr): strip NULL_BYTE_PLACEHOLDER before import"
sapphi-red Jul 18, 2022
22556b1
fix(ssr): convert to rollup URL in instantiateModule
sapphi-red Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/vite/src/node/ssr/ssrModuleLoader.ts
View file
Open in desktop
Expand Up @@ -137,7 +137,8 @@ async function instantiateModule(
if (dep[0] !== '.' && dep[0] !== '/') {
return nodeImport(dep, mod.file!, resolveOptions)
}
dep = unwrapId(dep)
// convert to rollup URL because `pendingImports`, `moduleGraph.urlToModuleMap` requires that
dep = unwrapId(dep).replace(NULL_BYTE_PLACEHOLDER, '\0')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC, this may be the only line needed to do the fix. And it isn't needed because we call ssrLoadModule, but because we check pendingImports and moduleGraph.urlToModuleMap.get(dep), and both should be in the rollup URL space.

if (!isCircular(dep) && !pendingImports.get(dep)?.some(isCircular)) {
pendingDeps.push(dep)
if (pendingDeps.length === 1) {
Expand Down