Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
7a8a6944
Commit
7a8a6944
authored
Feb 09, 2026
by
Jimmy Lai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: preserve DCE for node stream runtime guards
parent
9d0a1820
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
34 deletions
+42
-34
entry-base.ts
packages/next/src/server/app-render/entry-base.ts
+36
-28
pipe-readable.ts
packages/next/src/server/pipe-readable.ts
+3
-3
render-result.ts
packages/next/src/server/render-result.ts
+3
-3
No files found.
packages/next/src/server/app-render/entry-base.ts
View file @
7a8a6944
...
@@ -7,46 +7,53 @@ export {
...
@@ -7,46 +7,53 @@ export {
decodeFormState
,
decodeFormState
,
}
from
'react-server-dom-webpack/server'
}
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
// Use dynamic require to avoid Turbopack failing to resolve this as a named
// export from the vendored CJS module.
// export from the vendored CJS module.
/* eslint-disable import/no-extraneous-dependencies */
export
let
renderToPipeableStream
:
RenderToPipeableStream
|
undefined
export
const
renderToPipeableStream
:
if
(
process
.
env
.
NEXT_RUNTIME
===
'nodejs'
)
{
|
typeof
import
(
'react-server-dom-webpack/server.node'
).
renderToPipeableStream
/* eslint-disable import/no-extraneous-dependencies */
|
undefined
=
renderToPipeableStream
=
(
process
.
env
.
NEXT_RUNTIME
!==
'edge'
?
(
require
(
'react-server-dom-webpack/server.node'
)
as
typeof
import
(
'react-server-dom-webpack/server.node'
)
require
(
'react-server-dom-webpack/server.node'
)
as
typeof
import
(
'react-server-dom-webpack/server.node'
)
).
renderToPipeableStream
).
renderToPipeableStream
:
undefined
/* eslint-enable import/no-extraneous-dependencies */
/* eslint-enable import/no-extraneous-dependencies */
}
else
{
renderToPipeableStream
=
undefined
}
// eslint-disable-next-line import/no-extraneous-dependencies
// eslint-disable-next-line import/no-extraneous-dependencies
export
{
prerender
}
from
'react-server-dom-webpack/static'
export
{
prerender
}
from
'react-server-dom-webpack/static'
// Use dynamic require to avoid Turbopack failing to resolve this as a named
// Use dynamic require to avoid Turbopack failing to resolve this as a named
// export from the vendored CJS module.
// export from the vendored CJS module.
/* eslint-disable import/no-extraneous-dependencies */
export
let
prerenderToNodeStream
:
PrerenderToNodeStream
|
undefined
export
const
prerenderToNodeStream
:
if
(
process
.
env
.
NEXT_RUNTIME
===
'nodejs'
)
{
|
typeof
import
(
'react-server-dom-webpack/static'
).
prerenderToNodeStream
/* eslint-disable import/no-extraneous-dependencies */
|
undefined
=
prerenderToNodeStream
=
(
process
.
env
.
NEXT_RUNTIME
!==
'edge'
?
(
require
(
'react-server-dom-webpack/static'
)
as
typeof
import
(
'react-server-dom-webpack/static'
)
require
(
'react-server-dom-webpack/static'
)
as
typeof
import
(
'react-server-dom-webpack/static'
)
).
prerenderToNodeStream
).
prerenderToNodeStream
:
undefined
/* eslint-enable import/no-extraneous-dependencies */
/* eslint-enable import/no-extraneous-dependencies */
}
else
{
prerenderToNodeStream
=
undefined
}
// chainNodeStreams is used by the app-page.ts build template for PPR resume.
// 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
// We export it from here (pre-compiled runtime bundle) because the template
// cannot use relative requires (webpack resolves them from the project root).
// cannot use relative requires (webpack resolves them from the project root).
export
cons
t
chainNodeStreams
:
export
le
t
chainNodeStreams
:
|
typeof
import
(
'../stream-utils/node-stream-helpers'
).
chainNodeStreams
|
typeof
import
(
'../stream-utils/node-stream-helpers'
).
chainNodeStreams
|
undefined
=
|
undefined
process
.
env
.
NEXT_RUNTIME
!==
'edge'
if
(
process
.
env
.
NEXT_RUNTIME
===
'nodejs'
)
{
?
(
chainNodeStreams
=
(
require
(
'../stream-utils/node-stream-helpers'
)
as
typeof
import
(
'../stream-utils/node-stream-helpers'
)
require
(
'../stream-utils/node-stream-helpers'
)
as
typeof
import
(
'../stream-utils/node-stream-helpers'
)
).
chainNodeStreams
).
chainNodeStreams
:
undefined
}
else
{
chainNodeStreams
=
undefined
}
// TODO: Just re-export `* as ReactServer`
// TODO: Just re-export `* as ReactServer`
export
{
captureOwnerStack
,
createElement
,
Fragment
}
from
'react'
export
{
captureOwnerStack
,
createElement
,
Fragment
}
from
'react'
...
@@ -81,7 +88,8 @@ export { taintObjectReference } from './rsc/taint'
...
@@ -81,7 +88,8 @@ export { taintObjectReference } from './rsc/taint'
export
{
collectSegmentData
}
from
'./collect-segment-data'
export
{
collectSegmentData
}
from
'./collect-segment-data'
export
const
InstantValidation
=
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'
))
?
(
require
(
'./instant-validation/instant-validation'
)
as
typeof
import
(
'./instant-validation/instant-validation'
))
:
undefined
:
undefined
...
...
packages/next/src/server/pipe-readable.ts
View file @
7a8a6944
...
@@ -154,9 +154,9 @@ export async function pipeNodeReadableToResponse(
...
@@ -154,9 +154,9 @@ export async function pipeNodeReadableToResponse(
res
:
ServerResponse
,
res
:
ServerResponse
,
waitUntilForEnd
?:
Promise
<
unknown
>
waitUntilForEnd
?:
Promise
<
unknown
>
)
{
)
{
// Guard so webpack can DCE node:stream require for
edg
e builds.
// Guard so webpack can DCE node:stream require for
non-nod
e builds.
// pipe-readable.ts is imported by render-result.ts
which is bundled into edge
.
// pipe-readable.ts is imported by render-result.ts
and can be seen by browser bundles
.
if
(
process
.
env
.
NEXT_RUNTIME
!==
'edge
'
)
{
if
(
process
.
env
.
NEXT_RUNTIME
===
'nodejs
'
)
{
try
{
try
{
const
{
errored
,
destroyed
}
=
res
const
{
errored
,
destroyed
}
=
res
if
(
errored
||
destroyed
)
return
if
(
errored
||
destroyed
)
return
...
...
packages/next/src/server/render-result.ts
View file @
7a8a6944
...
@@ -205,7 +205,7 @@ export default class RenderResult<
...
@@ -205,7 +205,7 @@ export default class RenderResult<
}
}
if
(
if
(
process
.
env
.
NEXT_RUNTIME
!==
'edge
'
&&
process
.
env
.
NEXT_RUNTIME
===
'nodejs
'
&&
this
.
isNodeReadable
(
this
.
response
)
this
.
isNodeReadable
(
this
.
response
)
)
{
)
{
const
{
nodeStreamToString
}
=
const
{
nodeStreamToString
}
=
...
@@ -368,7 +368,7 @@ export default class RenderResult<
...
@@ -368,7 +368,7 @@ export default class RenderResult<
// If the response is a Node.js Readable, pipe directly without
// If the response is a Node.js Readable, pipe directly without
// going through web stream conversion.
// going through web stream conversion.
if
(
if
(
process
.
env
.
NEXT_RUNTIME
!==
'edge
'
&&
process
.
env
.
NEXT_RUNTIME
===
'nodejs
'
&&
this
.
isNodeReadable
(
this
.
response
)
this
.
isNodeReadable
(
this
.
response
)
)
{
)
{
const
{
pipeNodeReadableToResponse
}
=
const
{
pipeNodeReadableToResponse
}
=
...
@@ -388,7 +388,7 @@ export default class RenderResult<
...
@@ -388,7 +388,7 @@ export default class RenderResult<
public
async
pipeToNodeWritable
(
public
async
pipeToNodeWritable
(
writable
:
import
(
'node:stream'
).
Writable
writable
:
import
(
'node:stream'
).
Writable
):
Promise
<
void
>
{
):
Promise
<
void
>
{
if
(
process
.
env
.
NEXT_RUNTIME
!==
'edge
'
)
{
if
(
process
.
env
.
NEXT_RUNTIME
===
'nodejs
'
)
{
const
{
pipeline
}
=
const
{
pipeline
}
=
require
(
'node:stream/promises'
)
as
typeof
import
(
'node:stream/promises'
)
require
(
'node:stream/promises'
)
as
typeof
import
(
'node:stream/promises'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment