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

Use renderToString for flush effects (#35999)

Use render to string call to render flush effects instead of rendering with stream plus converting to string
parent d8623bb9
...@@ -118,11 +118,11 @@ export function createBufferedTransformStream(): TransformStream< ...@@ -118,11 +118,11 @@ export function createBufferedTransformStream(): TransformStream<
} }
export function createFlushEffectStream( export function createFlushEffectStream(
handleFlushEffect: () => Promise<string> handleFlushEffect: () => string
): TransformStream<Uint8Array, Uint8Array> { ): TransformStream<Uint8Array, Uint8Array> {
return new TransformStream({ return new TransformStream({
async transform(chunk, controller) { transform(chunk, controller) {
const flushedChunk = encodeText(await handleFlushEffect()) const flushedChunk = encodeText(handleFlushEffect())
controller.enqueue(flushedChunk) controller.enqueue(flushedChunk)
controller.enqueue(chunk) controller.enqueue(chunk)
...@@ -154,7 +154,7 @@ export async function continueFromInitialStream({ ...@@ -154,7 +154,7 @@ export async function continueFromInitialStream({
suffix?: string suffix?: string
dataStream?: ReadableStream<Uint8Array> dataStream?: ReadableStream<Uint8Array>
generateStaticHTML: boolean generateStaticHTML: boolean
flushEffectHandler?: () => Promise<string> flushEffectHandler?: () => string
renderStream: ReadableStream<Uint8Array> & { renderStream: ReadableStream<Uint8Array> & {
allReady?: Promise<void> allReady?: Promise<void>
} }
...@@ -193,7 +193,7 @@ export async function renderToStream({ ...@@ -193,7 +193,7 @@ export async function renderToStream({
suffix?: string suffix?: string
dataStream?: ReadableStream<Uint8Array> dataStream?: ReadableStream<Uint8Array>
generateStaticHTML: boolean generateStaticHTML: boolean
flushEffectHandler?: () => Promise<string> flushEffectHandler?: () => string
}): Promise<ReadableStream<Uint8Array>> { }): Promise<ReadableStream<Uint8Array>> {
const renderStream = await renderToInitialStream({ ReactDOMServer, element }) const renderStream = await renderToInitialStream({ ReactDOMServer, element })
return continueFromInitialStream({ return continueFromInitialStream({
......
...@@ -1430,25 +1430,20 @@ export async function renderToHTML( ...@@ -1430,25 +1430,20 @@ export async function renderToHTML(
const bodyResult = async (suffix: string) => { const bodyResult = async (suffix: string) => {
// this must be called inside bodyResult so appWrappers is // this must be called inside bodyResult so appWrappers is
// up to date when getWrappedApp is called // up to date when `wrapApp` is called
const flushEffectHandler = async () => { const flushEffectHandler = (): string => {
const allFlushEffects = [ const allFlushEffects = [
styledJsxFlushEffect, styledJsxFlushEffect,
...(flushEffects || []), ...(flushEffects || []),
] ]
const flushEffectStream = await renderToStream({ const flushed = ReactDOMServer.renderToString(
ReactDOMServer, <>
element: ( {allFlushEffects.map((flushEffect, i) => (
<> <React.Fragment key={i}>{flushEffect()}</React.Fragment>
{allFlushEffects.map((flushEffect, i) => ( ))}
<React.Fragment key={i}>{flushEffect()}</React.Fragment> </>
))} )
</>
),
generateStaticHTML: true,
})
const flushed = await streamToString(flushEffectStream)
return flushed return flushed
} }
......
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