Unverified Commit 38887136 authored by Andrew Clark's avatar Andrew Clark Committed by GitHub

createFromFetch -> createFromReadableStream (#72418)

The only difference between createFromFetch and createFromReadableStream
is that createFromFetch accepts a promise for a fetch, and
createFromReadableStream accepts a Flight ReadableStream (e.g.
response.body).

Since we're doing other stuff with the response object anyway there's
not much point using the slightly higher-level form.
parent bb00a091
......@@ -2,8 +2,8 @@
// @ts-ignore
// eslint-disable-next-line import/no-extraneous-dependencies
// import { createFromFetch } from 'react-server-dom-webpack/client'
const { createFromFetch } = (
// import { createFromReadableStream } from 'react-server-dom-webpack/client'
const { createFromReadableStream } = (
!!process.env.NEXT_RUNTIME
? // eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-webpack/client.edge')
......@@ -195,7 +195,7 @@ export async function fetchServerResponse(
// If fetch returns something different than flight response handle it like a mpa navigation
// If the fetch was not 200, we also handle it like a mpa navigation
if (!isFlightResponse || !res.ok) {
if (!isFlightResponse || !res.ok || !res.body) {
// in case the original URL came with a hash, preserve it before redirecting to the new URL
if (url.hash) {
responseUrl.hash = url.hash
......@@ -213,8 +213,8 @@ export async function fetchServerResponse(
}
// Handle the `fetch` readable stream that can be unwrapped by `React.use`.
const response: NavigationFlightResponse = await createFromFetch(
Promise.resolve(res),
const response: NavigationFlightResponse = await createFromReadableStream(
res.body,
{ callServer, findSourceMapURL }
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment