Skip to content
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

Jump to bottom

Use renderToString for flush effects #35999

Merged
merged 2 commits into from Apr 8, 2022
Merged

Use renderToString for flush effects #35999

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
a91ffcb
Use renderToString for flush effects
huozhi Apr 8, 2022
f694e2e
Merge branch 'canary' into simplify-flush-effects-call
huozhi Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/next/server/node-web-streams-helper.ts
View file
Open in desktop
Expand Up @@ -118,11 +118,11 @@ export function createBufferedTransformStream(): TransformStream<
}

export function createFlushEffectStream(
handleFlushEffect: () => Promise<string>
handleFlushEffect: () => string
): TransformStream<Uint8Array, Uint8Array> {
return new TransformStream({
async transform(chunk, controller) {
const flushedChunk = encodeText(await handleFlushEffect())
transform(chunk, controller) {
const flushedChunk = encodeText(handleFlushEffect())

controller.enqueue(flushedChunk)
controller.enqueue(chunk)
Expand Down Expand Up @@ -154,7 +154,7 @@ export async function continueFromInitialStream({
suffix?: string
dataStream?: ReadableStream<Uint8Array>
generateStaticHTML: boolean
flushEffectHandler?: () => Promise<string>
flushEffectHandler?: () => string
renderStream: ReadableStream<Uint8Array> & {
allReady?: Promise<void>
}
Expand Down Expand Up @@ -193,7 +193,7 @@ export async function renderToStream({
suffix?: string
dataStream?: ReadableStream<Uint8Array>
generateStaticHTML: boolean
flushEffectHandler?: () => Promise<string>
flushEffectHandler?: () => string
}): Promise<ReadableStream<Uint8Array>> {
const renderStream = await renderToInitialStream({ ReactDOMServer, element })
return continueFromInitialStream({
Expand Down
23 changes: 9 additions & 14 deletions packages/next/server/render.tsx
View file
Open in desktop
Expand Up @@ -1430,25 +1430,20 @@ export async function renderToHTML(

const bodyResult = async (suffix: string) => {
// 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 = [
styledJsxFlushEffect,
...(flushEffects || []),
]
const flushEffectStream = await renderToStream({
ReactDOMServer,
element: (
<>
{allFlushEffects.map((flushEffect, i) => (
<React.Fragment key={i}>{flushEffect()}</React.Fragment>
))}
</>
),
generateStaticHTML: true,
})
const flushed = await streamToString(flushEffectStream)
const flushed = ReactDOMServer.renderToString(
<>
{allFlushEffects.map((flushEffect, i) => (
<React.Fragment key={i}>{flushEffect()}</React.Fragment>
))}
</>
)
return flushed
}

Expand Down