Skip to content

[Flight] Fix markup types for server references #35634

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
eps1lon merged 1 commit into from
Jan 26, 2026
+3 −3
Merged

[Flight] Fix markup types for server references #35634

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions packages/react-client/src/forks/ReactFlightClientConfig.markup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export * from 'react-client/src/ReactClientConsoleConfigPlain';
export type ModuleLoading = null;
export type ServerConsumerModuleMap = null;
export opaque type ServerManifest = null;
export opaque type ServerReferenceId = string;
export type ServerReferenceId = string;
export opaque type ClientReferenceMetadata = null;
export opaque type ClientReference<T> = null; // eslint-disable-line no-unused-vars

Expand All @@ -43,7 +43,7 @@ export function resolveClientReference<T>(

export function resolveServerReference<T>(
config: ServerManifest,
id: mixed,
id: ServerReferenceId,
): ClientReference<T> {
throw new Error(
'renderToHTML should not have emitted Server References. This is a bug in React.',
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server/src/ReactFlightActionServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function bindArgs(fn: any, args: any) {
function loadServerReference<T>(
bundlerConfig: ServerManifest,
metaData: {
id: string,
id: ServerReferenceId,
bound: null | Promise<Array<any>>,
},
): Promise<T> {
Expand Down
Loading