Skip to content

fix: resolve the flight data before the RSC cancel in the react-router patch - #7

Merged
Mheaus merged 1 commit into
mainfrom
fix/react-router-patch-tee-cancel
Oct 10, 2026
Merged

Mheaus merged 1 commit into
mainfrom
fix/react-router-patch-tee-cancel

Conversation

@Mheaus

@Mheaus Mheaus commented Oct 10, 2026

Copy link
Copy Markdown
Member

#6 was merged before this commit reached its branch. It aligns patches/react-router@8.4.0.patch with the latest commit of remix-run/react-router#15612.

In production, the RSC stream is a tee() branch, and its cancel waits for the other branch. stop() now unblocks flush() before it cancels the RSC stream. Before this change, an abort during flush() kept the response open until the RSC render ended.

Verification on the demo production build, with requests that the client aborts after 1–30 ms:

  • 300 requests, one at a time: 0 stops;
  • 1,000 requests, 20 in parallel: 0 stops, no error in the log.

@Mheaus
Mheaus merged commit 155fc23 into main Oct 10, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant