Skip to content

fix(fullstack): Resolve suspense before the head chunk when streaming is disabled #3829

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
jkelleyrtp merged 1 commit into from
Mar 5, 2025
Merged

fix(fullstack): Resolve suspense before the head chunk when streaming is disabled #3829

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: 7 additions & 7 deletions packages/fullstack/src/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,13 @@ impl SsrRendererPool {
// poll the future, which may call server_context()
with_server_context(server_context.clone(), || virtual_dom.rebuild_in_place());

// If streaming is disabled, wait for the virtual dom to finish all suspense work
// before rendering anything
if streaming_mode == StreamingMode::Disabled {
ProvideServerContext::new(virtual_dom.wait_for_suspense(), server_context.clone())
.await
}

let mut pre_body = String::new();

if let Err(err) = wrapper.render_head(&mut pre_body, &virtual_dom) {
Expand Down Expand Up @@ -218,13 +225,6 @@ impl SsrRendererPool {
};
}

// If streaming is disabled, wait for the virtual dom to finish all suspense work
// before rendering anything
if streaming_mode == StreamingMode::Disabled {
ProvideServerContext::new(virtual_dom.wait_for_suspense(), server_context.clone())
.await
}

// Render the initial frame with loading placeholders
let mut initial_frame = renderer.render(&virtual_dom);

Expand Down
Loading