Skip to content

[Flight] Consistently flag debugOwner field #30400

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
merged 1 commit into from
Jul 20, 2024
+6 −6
Merged

[Flight] Consistently flag debugOwner field #30400

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
12 changes: 6 additions & 6 deletions packages/react-server/src/ReactFlightServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ function serializeThenable(
task.keyPath, // the server component sequence continues through Promise-as-a-child.
task.implicitSlot,
request.abortableTasks,
__DEV__ && enableOwnerStacks ? task.debugOwner : null,
__DEV__ ? task.debugOwner : null,
__DEV__ && enableOwnerStacks ? task.debugStack : null,
__DEV__ && enableOwnerStacks ? task.debugTask : null,
);
Expand Down Expand Up @@ -750,7 +750,7 @@ function serializeReadableStream(
task.keyPath,
task.implicitSlot,
request.abortableTasks,
__DEV__ && enableOwnerStacks ? task.debugOwner : null,
__DEV__ ? task.debugOwner : null,
__DEV__ && enableOwnerStacks ? task.debugStack : null,
__DEV__ && enableOwnerStacks ? task.debugTask : null,
);
Expand Down Expand Up @@ -849,7 +849,7 @@ function serializeAsyncIterable(
task.keyPath,
task.implicitSlot,
request.abortableTasks,
__DEV__ && enableOwnerStacks ? task.debugOwner : null,
__DEV__ ? task.debugOwner : null,
__DEV__ && enableOwnerStacks ? task.debugStack : null,
__DEV__ && enableOwnerStacks ? task.debugTask : null,
);
Expand Down Expand Up @@ -1572,7 +1572,7 @@ function outlineTask(request: Request, task: Task): ReactJSONValue {
task.keyPath, // unlike outlineModel this one carries along context
task.implicitSlot,
request.abortableTasks,
__DEV__ && enableOwnerStacks ? task.debugOwner : null,
__DEV__ ? task.debugOwner : null,
__DEV__ && enableOwnerStacks ? task.debugStack : null,
__DEV__ && enableOwnerStacks ? task.debugTask : null,
);
Expand Down Expand Up @@ -1799,8 +1799,8 @@ function createTask(
>): any);
if (__DEV__) {
task.environmentName = request.environmentName();
task.debugOwner = debugOwner;
if (enableOwnerStacks) {
task.debugOwner = debugOwner;
task.debugStack = debugStack;
task.debugTask = debugTask;
}
Expand Down Expand Up @@ -2167,7 +2167,7 @@ function renderModel(
task.keyPath,
task.implicitSlot,
request.abortableTasks,
__DEV__ && enableOwnerStacks ? task.debugOwner : null,
__DEV__ ? task.debugOwner : null,
__DEV__ && enableOwnerStacks ? task.debugStack : null,
__DEV__ && enableOwnerStacks ? task.debugTask : null,
);
Expand Down