Skip to content

Remove hacky stream.locked check, declare as byte stream instead #23387

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
sebmarkbage merged 1 commit into from
Mar 1, 2022
Merged

Remove hacky stream.locked check, declare as byte stream instead #23387

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
9 changes: 2 additions & 7 deletions packages/react-dom/src/server/ReactDOMFizzServerBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,9 @@ function renderToReadableStream(
return new Promise((resolve, reject) => {
function onCompleteShell() {
const stream = new ReadableStream({
type: 'bytes',
pull(controller) {
// Pull is called immediately even if the stream is not passed to anything.
// That's buffering too early. We want to start buffering once the stream
// is actually used by something so we can give it the best result possible
// at that point.
if (stream.locked) {
startFlowing(request, controller);
}
startFlowing(request, controller);
},
cancel(reason) {},
});
Expand Down
9 changes: 2 additions & 7 deletions packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,12 @@ function renderToReadableStream(
options ? options.onError : undefined,
);
const stream = new ReadableStream({
type: 'bytes',
start(controller) {
startWork(request);
},
pull(controller) {
// Pull is called immediately even if the stream is not passed to anything.
// That's buffering too early. We want to start buffering once the stream
// is actually used by something so we can give it the best result possible
// at that point.
if (stream.locked) {
startFlowing(request, controller);
}
startFlowing(request, controller);
},
cancel(reason) {},
});
Expand Down