Skip to content

[Flight] Ensure async info owners are outlined properly #34465

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
unstubbable merged 1 commit into from
Sep 11, 2025
Merged

[Flight] Ensure async info owners are outlined properly #34465

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
9 changes: 9 additions & 0 deletions packages/react-server/src/ReactFlightServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2384,6 +2384,11 @@ function visitAsyncNode(
// Promise that was ultimately awaited by the user space await.
serializeIONode(request, ioNode, awaited.promise);

// Ensure the owner is already outlined.
if (node.owner != null) {
outlineComponentInfo(request, node.owner);
}

// We log the environment at the time when the last promise pigned ping which may
// be later than what the environment was when we actually started awaiting.
const env = (0, request.environmentName)();
Expand Down Expand Up @@ -5133,6 +5138,10 @@ function forwardDebugInfo(
} else {
// Outline the IO info in case the same I/O is awaited in more than one place.
outlineIOInfo(request, ioInfo);
// Ensure the owner is already outlined.
if (info.owner != null) {
outlineComponentInfo(request, info.owner);
}
// We can't serialize the ConsoleTask/Error objects so we need to omit them before serializing.
let debugStack;
if (info.stack == null && info.debugStack != null) {
Expand Down
Loading