Skip to content

fix: streaming race condition #6495

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
schiller-manuel merged 1 commit into from
Jan 24, 2026
Merged

fix: streaming race condition #6495

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
8 changes: 5 additions & 3 deletions packages/router-core/src/ssr/transformStreamWithRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,13 @@ export function transformStreamWithRouter(
const html = router.serverSsr?.takeBufferedHtml()
if (!html) return

if (isAppRendering) {
// Buffer for insertion at next valid position
if (isAppRendering || leftover) {
// Buffer when app is still rendering OR when there's leftover content
// that hasn't been flushed yet. This prevents race conditions where
// injected HTML appears before buffered app content
pendingRouterHtmlParts.push(html)
} else {
// App is done rendering, write directly to output
// App done rendering and no leftover - safe to write directly for better streaming
safeEnqueue(html)
}
})
Expand Down
Loading