From d5a04c69baa2e275abf66d58969e0e0cb4c22141 Mon Sep 17 00:00:00 2001 From: James Benze Date: Mon, 13 Jan 2025 15:30:00 -0500 Subject: [PATCH] Add server context to suspense resolution (#3552) * Add server context to suspense resolution While this was done correctly in the streaming case, non-streaming suspense resolution didn't recieve the server context. This meant that anything that required the context after the point of suspension would find it missing. * fmt --------- Co-authored-by: Jonathan Kelley --- packages/fullstack/src/render.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/fullstack/src/render.rs b/packages/fullstack/src/render.rs index 345b5754ff..dde20ac048 100644 --- a/packages/fullstack/src/render.rs +++ b/packages/fullstack/src/render.rs @@ -221,7 +221,8 @@ impl SsrRendererPool { // If streaming is disabled, wait for the virtual dom to finish all suspense work // before rendering anything if streaming_mode == StreamingMode::Disabled { - virtual_dom.wait_for_suspense().await; + ProvideServerContext::new(virtual_dom.wait_for_suspense(), server_context.clone()) + .await } // Render the initial frame with loading placeholders