Skip to content

refactor(rsc): replace raw string code with function string #866

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −14
Draft

refactor(rsc): replace raw string code with function string #866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3d2bc4
refactor(rsc): replace raw string code with function string
hi-ogawa Sep 16, 2025
e042488
Merge branch 'main' into 09-16-refactor_rsc_replace_raw_string_code_w…
hi-ogawa Sep 17, 2025
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
36 changes: 22 additions & 14 deletions packages/plugin-rsc/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,23 +1009,31 @@ window.__vite_plugin_react_preamble_installed__ = true;
code += `await import(${JSON.stringify(resolvedEntry.id)});`
// server css is normally removed via `RemoveDuplicateServerCss` on useEffect.
// this also makes sure they are removed on hmr in case initial rendering failed.
code += /* js */ `
const ssrCss = document.querySelectorAll("link[rel='stylesheet']");
import.meta.hot.on("vite:beforeUpdate", () => {
ssrCss.forEach(node => {
if (node.dataset.precedence?.startsWith("vite-rsc/client-references")) {
node.remove();
}
});
});
`
code += `
import.meta.hot.on("vite:beforeUpdate", ${() => {
const nodes = document.querySelectorAll<HTMLElement>(
"link[rel='stylesheet']",
)
nodes.forEach((node) => {
if (
node.dataset.precedence?.startsWith(
'vite-rsc/client-references',
)
) {
node.remove()
}
})
}});
`
// close error overlay after syntax error is fixed and hmr is triggered.
// https://github.com/vitejs/vite/blob/8033e5bf8d3ff43995d0620490ed8739c59171dd/packages/vite/src/client/client.ts#L318-L320
code += `
import.meta.hot.on("rsc:update", () => {
document.querySelectorAll("vite-error-overlay").forEach((n) => n.close())
});
`
import.meta.hot.on("rsc:update", ${() => {
document
.querySelectorAll<HTMLDialogElement>('vite-error-overlay')
.forEach((n) => n.close())
}});
`
return code
},
),
Expand Down
Loading