Commit 7a8a6944 authored by Jimmy Lai's avatar Jimmy Lai

fix: preserve DCE for node stream runtime guards

parent 9d0a1820
......@@ -7,46 +7,53 @@ export {
decodeFormState,
} from 'react-server-dom-webpack/server'
type RenderToPipeableStream = (...args: any[]) => any
type PrerenderToNodeStream = (...args: any[]) => Promise<{
prelude: import('node:stream').Readable
}>
// Use dynamic require to avoid Turbopack failing to resolve this as a named
// export from the vendored CJS module.
/* eslint-disable import/no-extraneous-dependencies */
export const renderToPipeableStream:
| typeof import('react-server-dom-webpack/server.node').renderToPipeableStream
| undefined =
process.env.NEXT_RUNTIME !== 'edge'
? (
require('react-server-dom-webpack/server.node') as typeof import('react-server-dom-webpack/server.node')
).renderToPipeableStream
: undefined
/* eslint-enable import/no-extraneous-dependencies */
export let renderToPipeableStream: RenderToPipeableStream | undefined
if (process.env.NEXT_RUNTIME === 'nodejs') {
/* eslint-disable import/no-extraneous-dependencies */
renderToPipeableStream = (
require('react-server-dom-webpack/server.node') as typeof import('react-server-dom-webpack/server.node')
).renderToPipeableStream
/* eslint-enable import/no-extraneous-dependencies */
} else {
renderToPipeableStream = undefined
}
// eslint-disable-next-line import/no-extraneous-dependencies
export { prerender } from 'react-server-dom-webpack/static'
// Use dynamic require to avoid Turbopack failing to resolve this as a named
// export from the vendored CJS module.
/* eslint-disable import/no-extraneous-dependencies */
export const prerenderToNodeStream:
| typeof import('react-server-dom-webpack/static').prerenderToNodeStream
| undefined =
process.env.NEXT_RUNTIME !== 'edge'
? (
require('react-server-dom-webpack/static') as typeof import('react-server-dom-webpack/static')
).prerenderToNodeStream
: undefined
/* eslint-enable import/no-extraneous-dependencies */
export let prerenderToNodeStream: PrerenderToNodeStream | undefined
if (process.env.NEXT_RUNTIME === 'nodejs') {
/* eslint-disable import/no-extraneous-dependencies */
prerenderToNodeStream = (
require('react-server-dom-webpack/static') as typeof import('react-server-dom-webpack/static')
).prerenderToNodeStream
/* eslint-enable import/no-extraneous-dependencies */
} else {
prerenderToNodeStream = undefined
}
// chainNodeStreams is used by the app-page.ts build template for PPR resume.
// We export it from here (pre-compiled runtime bundle) because the template
// cannot use relative requires (webpack resolves them from the project root).
export const chainNodeStreams:
export let chainNodeStreams:
| typeof import('../stream-utils/node-stream-helpers').chainNodeStreams
| undefined =
process.env.NEXT_RUNTIME !== 'edge'
? (
require('../stream-utils/node-stream-helpers') as typeof import('../stream-utils/node-stream-helpers')
).chainNodeStreams
: undefined
| undefined
if (process.env.NEXT_RUNTIME === 'nodejs') {
chainNodeStreams = (
require('../stream-utils/node-stream-helpers') as typeof import('../stream-utils/node-stream-helpers')
).chainNodeStreams
} else {
chainNodeStreams = undefined
}
// TODO: Just re-export `* as ReactServer`
export { captureOwnerStack, createElement, Fragment } from 'react'
......@@ -81,7 +88,8 @@ export { taintObjectReference } from './rsc/taint'
export { collectSegmentData } from './collect-segment-data'
export const InstantValidation =
process.env.NODE_ENV === 'development' && process.env.NEXT_RUNTIME !== 'edge'
process.env.NODE_ENV === 'development' &&
process.env.NEXT_RUNTIME === 'nodejs'
? (require('./instant-validation/instant-validation') as typeof import('./instant-validation/instant-validation'))
: undefined
......
......@@ -154,9 +154,9 @@ export async function pipeNodeReadableToResponse(
res: ServerResponse,
waitUntilForEnd?: Promise<unknown>
) {
// Guard so webpack can DCE node:stream require for edge builds.
// pipe-readable.ts is imported by render-result.ts which is bundled into edge.
if (process.env.NEXT_RUNTIME !== 'edge') {
// Guard so webpack can DCE node:stream require for non-node builds.
// pipe-readable.ts is imported by render-result.ts and can be seen by browser bundles.
if (process.env.NEXT_RUNTIME === 'nodejs') {
try {
const { errored, destroyed } = res
if (errored || destroyed) return
......
......@@ -205,7 +205,7 @@ export default class RenderResult<
}
if (
process.env.NEXT_RUNTIME !== 'edge' &&
process.env.NEXT_RUNTIME === 'nodejs' &&
this.isNodeReadable(this.response)
) {
const { nodeStreamToString } =
......@@ -368,7 +368,7 @@ export default class RenderResult<
// If the response is a Node.js Readable, pipe directly without
// going through web stream conversion.
if (
process.env.NEXT_RUNTIME !== 'edge' &&
process.env.NEXT_RUNTIME === 'nodejs' &&
this.isNodeReadable(this.response)
) {
const { pipeNodeReadableToResponse } =
......@@ -388,7 +388,7 @@ export default class RenderResult<
public async pipeToNodeWritable(
writable: import('node:stream').Writable
): Promise<void> {
if (process.env.NEXT_RUNTIME !== 'edge') {
if (process.env.NEXT_RUNTIME === 'nodejs') {
const { pipeline } =
require('node:stream/promises') as typeof import('node:stream/promises')
......
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