Unverified Commit ee6c3690 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Code clean up (#54405)

Refactored some small places.
parent 6d769d0e
......@@ -184,17 +184,16 @@ export async function initialize(opts: {
},
} as any)
if (!!config.experimental.appDir) {
process.env.__NEXT_PRIVATE_ROUTER_IPC_PORT = ipcPort + ''
process.env.__NEXT_PRIVATE_ROUTER_IPC_KEY = ipcValidationKey
process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = config.experimental
.serverActions
? 'experimental'
: 'next'
renderWorkers.app =
require('./render-server') as typeof import('./render-server')
}
// Set global environment variables for the app render server to use.
process.env.__NEXT_PRIVATE_ROUTER_IPC_PORT = ipcPort + ''
process.env.__NEXT_PRIVATE_ROUTER_IPC_KEY = ipcValidationKey
process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = config.experimental
.serverActions
? 'experimental'
: 'next'
renderWorkers.app =
require('./render-server') as typeof import('./render-server')
const { initialEnv } = require('@next/env') as typeof import('@next/env')
renderWorkers.pages = await createWorker(
......
......@@ -73,7 +73,7 @@ import { allowedStatusCodes, getRedirectStatus } from '../lib/redirect-status'
import RenderResult, { type RenderResultMetadata } from './render-result'
import isError from '../lib/is-error'
import {
streamFromArray,
streamFromString,
streamToString,
chainStreams,
renderToInitialStream,
......@@ -1315,7 +1315,7 @@ export async function renderToHTMLImpl(
const { docProps } = documentInitialPropsRes as any
// includes suffix in initial html stream
bodyResult = (suffix: string) =>
createBodyResult(streamFromArray([docProps.html, suffix]))
createBodyResult(streamFromString(docProps.html + suffix))
} else {
const stream = await renderShell(App, Component)
bodyResult = (suffix: string) => createBodyResult(stream, suffix)
......@@ -1497,17 +1497,17 @@ export async function renderToHTMLImpl(
'<next-js-internal-body-render-target></next-js-internal-body-render-target>'
)
const prefix: Array<string> = []
let prefix = ''
if (!documentHTML.startsWith(DOCTYPE)) {
prefix.push(DOCTYPE)
prefix += DOCTYPE
}
prefix.push(renderTargetPrefix)
prefix += renderTargetPrefix
if (inAmpMode) {
prefix.push('<!-- __NEXT_DATA__ -->')
prefix += '<!-- __NEXT_DATA__ -->'
}
const streams = [
streamFromArray(prefix),
streamFromString(prefix),
await documentResult.bodyResult(renderTargetSuffix),
]
......
......@@ -45,7 +45,7 @@ export function cloneTransformStream(source: TransformStream) {
controller.enqueue(value)
}
},
// skip the its own written chunks
// skip all piped chunks
transform() {},
})
......@@ -67,12 +67,10 @@ export function chainStreams<T>(
return readable
}
export function streamFromArray(strings: string[]): ReadableStream<Uint8Array> {
export function streamFromString(str: string): ReadableStream<Uint8Array> {
return new ReadableStream({
start(controller) {
for (const str of strings) {
controller.enqueue(encodeText(str))
}
controller.enqueue(encodeText(str))
controller.close()
},
})
......@@ -107,7 +105,7 @@ export function createBufferedTransformStream(): TransformStream<
const flushBuffer = (controller: TransformStreamDefaultController) => {
if (!pendingFlush) {
pendingFlush = new Promise((resolve) => {
setTimeout(async () => {
setTimeout(() => {
controller.enqueue(bufferedBytes)
bufferedBytes = new Uint8Array()
pendingFlush = null
......@@ -115,7 +113,6 @@ export function createBufferedTransformStream(): TransformStream<
}, 0)
})
}
return pendingFlush
}
return new TransformStream({
......
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