Unverified Commit cf206a83 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Resolve stream piper on complete shell for renderToReadableStream (#31186)

1. Align `renderToReadableStream` with `renderToNodeStream`, resolve promise of `NodeWritablePiper` only when `onCompleteShell` is called.
2. update webpack to disable chunk loading for web runtime

Item 1 is the preparation for middleware-ssr-loader. Then we can do the following there

```js
try {
   result = await renderToHTML(page)
} catch (e) {
   result = await renderToHTML(errorPage)
}
result.pipe(renderResult)
```
parent 45515716
...@@ -268,6 +268,7 @@ export function finalizeEntrypoint({ ...@@ -268,6 +268,7 @@ export function finalizeEntrypoint({
type: 'assign', type: 'assign',
}, },
runtime: MIDDLEWARE_SSR_RUNTIME_WEBPACK, runtime: MIDDLEWARE_SSR_RUNTIME_WEBPACK,
asyncChunks: false,
...entry, ...entry,
} }
return ssrMiddlewareEntry return ssrMiddlewareEntry
......
...@@ -75,6 +75,11 @@ export default class MiddlewarePlugin { ...@@ -75,6 +75,11 @@ export default class MiddlewarePlugin {
if (!location) { if (!location) {
continue continue
} }
const entryFiles = entrypoint
.getFiles()
.filter((file: string) => !file.endsWith('.hot-update.js'))
const files = ssrEntryInfo const files = ssrEntryInfo
? [ ? [
ssrEntryInfo.requireFlightManifest ssrEntryInfo.requireFlightManifest
...@@ -82,14 +87,9 @@ export default class MiddlewarePlugin { ...@@ -82,14 +87,9 @@ export default class MiddlewarePlugin {
: null, : null,
`server/${MIDDLEWARE_BUILD_MANIFEST}.js`, `server/${MIDDLEWARE_BUILD_MANIFEST}.js`,
`server/${MIDDLEWARE_REACT_LOADABLE_MANIFEST}.js`, `server/${MIDDLEWARE_REACT_LOADABLE_MANIFEST}.js`,
...entrypoint.getFiles().map((file) => 'server/' + file), ...entryFiles.map((file) => 'server/' + file),
] ].filter(nonNullable)
.filter(nonNullable) : entryFiles.map((file: string) =>
.filter((file: string) => !file.endsWith('.hot-update.js'))
: entrypoint
.getFiles()
.filter((file: string) => !file.endsWith('.hot-update.js'))
.map((file: string) =>
// we need to use the unminified version of the webpack runtime, // we need to use the unminified version of the webpack runtime,
// remove if we do start minifying middleware chunks // remove if we do start minifying middleware chunks
file.startsWith('static/chunks/webpack-') file.startsWith('static/chunks/webpack-')
......
...@@ -1469,31 +1469,22 @@ function renderToNodeStream( ...@@ -1469,31 +1469,22 @@ function renderToNodeStream(
function renderToReadableStream( function renderToReadableStream(
element: React.ReactElement element: React.ReactElement
): NodeWritablePiper { ): Promise<NodeWritablePiper> {
return (res, next) => { return new Promise((resolve, reject) => {
let bufferedString = '' let reader: any = null
let shellCompleted = false let resolved = false
const doResolve = () => {
const readable = (ReactDOMServer as any).renderToReadableStream(element, { if (resolved) return
onCompleteShell() { resolved = true
shellCompleted = true const piper: NodeWritablePiper = (res, next) => {
if (bufferedString) { const streamReader: ReadableStreamDefaultReader = reader
res.write(bufferedString)
bufferedString = ''
}
},
})
const reader = readable.getReader()
const decoder = new TextDecoder() const decoder = new TextDecoder()
const process = () => { const process = async () => {
reader.read().then(({ done, value }: any) => { streamReader.read().then(({ done, value }) => {
if (!done) { if (!done) {
const s = typeof value === 'string' ? value : decoder.decode(value) const s =
if (shellCompleted) { typeof value === 'string' ? value : decoder.decode(value)
res.write(s) res.write(s)
} else {
bufferedString += s
}
process() process()
} else { } else {
next() next()
...@@ -1502,6 +1493,24 @@ function renderToReadableStream( ...@@ -1502,6 +1493,24 @@ function renderToReadableStream(
} }
process() process()
} }
resolve(piper)
}
const readable = (ReactDOMServer as any).renderToReadableStream(element, {
onError(err: Error) {
if (!resolved) {
resolved = true
reject(err)
}
},
onCompleteShell() {
doResolve()
},
})
// Start reader and lock stream immediately to consume readable,
// Otherwise the bytes before `onCompleteShell` will be missed.
reader = readable.getReader()
})
} }
function chainPipers(pipers: NodeWritablePiper[]): NodeWritablePiper { function chainPipers(pipers: NodeWritablePiper[]): NodeWritablePiper {
......
...@@ -4,7 +4,7 @@ import dynamic from 'next/dynamic' ...@@ -4,7 +4,7 @@ import dynamic from 'next/dynamic'
let ssr let ssr
const suspense = false const suspense = false
const Hello = dynamic(() => import(/* webpackMode: "eager" */ './hello'), { const Hello = dynamic(() => import('./hello'), {
ssr, ssr,
suspense, suspense,
}) })
......
...@@ -162,8 +162,7 @@ describe('concurrentFeatures - dev', () => { ...@@ -162,8 +162,7 @@ describe('concurrentFeatures - dev', () => {
await killApp(context.server) await killApp(context.server)
}) })
// TODO: re-enabled test when update webpack with chunkLoading support it('should support React.lazy and dynamic imports', async () => {
it.skip('should support React.lazy and dynamic imports', async () => {
const html = await renderViaHTTP(context.appPort, '/dynamic-imports') const html = await renderViaHTTP(context.appPort, '/dynamic-imports')
expect(html).toContain('loading...') expect(html).toContain('loading...')
......
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