Skip to content

fix: buffer rsc:update payloads arriving before dev client mounts #161

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

Merged
uhyo merged 2 commits into from
Jul 21, 2026
Merged

fix: buffer rsc:update payloads arriving before dev client mounts #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33333c3
fix: buffer rsc:update payloads arriving before dev client mounts
claude Jul 21, 2026
de3c074
refactor: initialize setPayload with a pending-buffer setter
claude Jul 21, 2026
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
12 changes: 11 additions & 1 deletion packages/static/src/client/entry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ import { withBasePath } from "../util/basePath";
import { ssr as ssrEnabled } from "virtual:funstack/config";

async function devMain() {
let setPayload: (v: RscPayload) => void;
// Holds an update that arrived before the component mounted; the mount
// effect applies it so early rsc:update events are not dropped.
let pendingPayload: RscPayload | undefined;
let setPayload: (v: RscPayload) => void = (v) => {
pendingPayload = v;
};

const initialPayload = await createFromReadableStream<RscPayload>(rscStream);

Expand All @@ -27,6 +32,11 @@ async function devMain() {

useEffect(() => {
setPayload = (v) => startTransition(() => setPayload_(v));
if (pendingPayload !== undefined) {
const payload = pendingPayload;
pendingPayload = undefined;
setPayload(payload);
}
}, [setPayload_]);

return payload.root;
Expand Down