Skip to content

[pull] main from facebook:main #331

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 2 commits into from
Oct 11, 2025
Merged

[pull] main from facebook:main #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d446597
[Flight] Fix preload `as` attribute for stylesheets (#34760)
unstubbable Oct 10, 2025
ead9218
[Flight] Avoid unnecessary indirection when serializing debug info (#…
unstubbable Oct 10, 2025
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
2 changes: 1 addition & 1 deletion packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ function processLink(props: Object, formatContext: FormatContext): void {
return;
}
case 'stylesheet': {
preload(href, 'stylesheet', {
preload(href, 'style', {
crossOrigin: props.crossOrigin,
integrity: props.integrity,
nonce: props.nonce,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,7 @@ describe('ReactFlightDOM', () => {
media="(orientation: landscape)"
/>
<link rel="modulepreload" href="module-resource" />
<link rel="preload" as="stylesheet" href="css-resource" />
<link rel="preload" as="style" href="css-resource" />
</head>
<body>
<p>hello world</p>
Expand Down
56 changes: 56 additions & 0 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3051,4 +3051,60 @@ describe('ReactFlightDOMBrowser', () => {
`);
}
});

it('should resolve a cycle between debug info and the value it produces when using a debug channel', async () => {
// Same as `should resolve a cycle between debug info and the value it produces`, but using a debug channel.

function Inner({style}) {
return <div style={style} />;
}

function Component({style}) {
return <Inner style={style} />;
}

const style = {};
const element = <Component style={style} />;
style.element = element;

let debugReadableStreamController;

const debugReadableStream = new ReadableStream({
start(controller) {
debugReadableStreamController = controller;
},
});

const rscStream = await serverAct(() =>
ReactServerDOMServer.renderToReadableStream(element, webpackMap, {
debugChannel: {
writable: new WritableStream({
write(chunk) {
debugReadableStreamController.enqueue(chunk);
},
close() {
debugReadableStreamController.close();
},
}),
},
}),
);

function ClientRoot({response}) {
return use(response);
}

const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
debugChannel: {readable: debugReadableStream},
});

const container = document.createElement('div');
const root = ReactDOMClient.createRoot(container);

await act(() => {
root.render(<ClientRoot response={response} />);
});

expect(container.innerHTML).toBe('<div></div>');
});
});
23 changes: 15 additions & 8 deletions packages/react-server/src/ReactFlightServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4300,14 +4300,21 @@ function emitDebugChunk(

const json: string = serializeDebugModel(request, 500, debugInfo);
if (request.debugDestination !== null) {
// Outline the actual timing information to the debug channel.
const outlinedId = request.nextChunkId++;
const debugRow = outlinedId.toString(16) + ':' + json + '\n';
request.pendingDebugChunks++;
request.completedDebugChunks.push(stringToChunk(debugRow));
const row =
serializeRowHeader('D', id) + '"$' + outlinedId.toString(16) + '"\n';
request.completedRegularChunks.push(stringToChunk(row));
if (json[0] === '"' && json[1] === '$') {
// This is already an outlined reference so we can just emit it directly,
// without an unnecessary indirection.
const row = serializeRowHeader('D', id) + json + '\n';
request.completedRegularChunks.push(stringToChunk(row));
} else {
// Outline the debug information to the debug channel.
const outlinedId = request.nextChunkId++;
const debugRow = outlinedId.toString(16) + ':' + json + '\n';
request.pendingDebugChunks++;
request.completedDebugChunks.push(stringToChunk(debugRow));
const row =
serializeRowHeader('D', id) + '"$' + outlinedId.toString(16) + '"\n';
request.completedRegularChunks.push(stringToChunk(row));
}
} else {
const row = serializeRowHeader('D', id) + json + '\n';
request.completedRegularChunks.push(stringToChunk(row));
Expand Down
Loading