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
ee6c3690
Unverified
Commit
ee6c3690
authored
Aug 22, 2023
by
Shu Ding
Committed by
GitHub
Aug 22, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code clean up (#54405)
Refactored some small places.
parent
6d769d0e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
25 deletions
+21
-25
router-server.ts
packages/next/src/server/lib/router-server.ts
+10
-11
render.tsx
packages/next/src/server/render.tsx
+7
-7
node-web-streams-helper.ts
...s/next/src/server/stream-utils/node-web-streams-helper.ts
+4
-7
No files found.
packages/next/src/server/lib/router-server.ts
View file @
ee6c3690
...
@@ -184,7 +184,7 @@ export async function initialize(opts: {
...
@@ -184,7 +184,7 @@ export async function initialize(opts: {
},
},
}
as
any
)
}
as
any
)
if
(
!!
config
.
experimental
.
appDir
)
{
// 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_PORT
=
ipcPort
+
''
process
.
env
.
__NEXT_PRIVATE_ROUTER_IPC_KEY
=
ipcValidationKey
process
.
env
.
__NEXT_PRIVATE_ROUTER_IPC_KEY
=
ipcValidationKey
process
.
env
.
__NEXT_PRIVATE_PREBUNDLED_REACT
=
config
.
experimental
process
.
env
.
__NEXT_PRIVATE_PREBUNDLED_REACT
=
config
.
experimental
...
@@ -194,7 +194,6 @@ export async function initialize(opts: {
...
@@ -194,7 +194,6 @@ export async function initialize(opts: {
renderWorkers
.
app
=
renderWorkers
.
app
=
require
(
'./render-server'
)
as
typeof
import
(
'./render-server'
)
require
(
'./render-server'
)
as
typeof
import
(
'./render-server'
)
}
const
{
initialEnv
}
=
require
(
'@next/env'
)
as
typeof
import
(
'@next/env'
)
const
{
initialEnv
}
=
require
(
'@next/env'
)
as
typeof
import
(
'@next/env'
)
renderWorkers
.
pages
=
await
createWorker
(
renderWorkers
.
pages
=
await
createWorker
(
...
...
packages/next/src/server/render.tsx
View file @
ee6c3690
...
@@ -73,7 +73,7 @@ import { allowedStatusCodes, getRedirectStatus } from '../lib/redirect-status'
...
@@ -73,7 +73,7 @@ import { allowedStatusCodes, getRedirectStatus } from '../lib/redirect-status'
import
RenderResult
,
{
type
RenderResultMetadata
}
from
'./render-result'
import
RenderResult
,
{
type
RenderResultMetadata
}
from
'./render-result'
import
isError
from
'../lib/is-error'
import
isError
from
'../lib/is-error'
import
{
import
{
streamFrom
Array
,
streamFrom
String
,
streamToString
,
streamToString
,
chainStreams
,
chainStreams
,
renderToInitialStream
,
renderToInitialStream
,
...
@@ -1315,7 +1315,7 @@ export async function renderToHTMLImpl(
...
@@ -1315,7 +1315,7 @@ export async function renderToHTMLImpl(
const
{
docProps
}
=
documentInitialPropsRes
as
any
const
{
docProps
}
=
documentInitialPropsRes
as
any
// includes suffix in initial html stream
// includes suffix in initial html stream
bodyResult
=
(
suffix
:
string
)
=>
bodyResult
=
(
suffix
:
string
)
=>
createBodyResult
(
streamFrom
Array
([
docProps
.
html
,
suffix
]
))
createBodyResult
(
streamFrom
String
(
docProps
.
html
+
suffix
))
}
else
{
}
else
{
const
stream
=
await
renderShell
(
App
,
Component
)
const
stream
=
await
renderShell
(
App
,
Component
)
bodyResult
=
(
suffix
:
string
)
=>
createBodyResult
(
stream
,
suffix
)
bodyResult
=
(
suffix
:
string
)
=>
createBodyResult
(
stream
,
suffix
)
...
@@ -1497,17 +1497,17 @@ export async function renderToHTMLImpl(
...
@@ -1497,17 +1497,17 @@ export async function renderToHTMLImpl(
'<next-js-internal-body-render-target></next-js-internal-body-render-target>'
'<next-js-internal-body-render-target></next-js-internal-body-render-target>'
)
)
const
prefix
:
Array
<
string
>
=
[]
let
prefix
=
''
if
(
!
documentHTML
.
startsWith
(
DOCTYPE
))
{
if
(
!
documentHTML
.
startsWith
(
DOCTYPE
))
{
prefix
.
push
(
DOCTYPE
)
prefix
+=
DOCTYPE
}
}
prefix
.
push
(
renderTargetPrefix
)
prefix
+=
renderTargetPrefix
if
(
inAmpMode
)
{
if
(
inAmpMode
)
{
prefix
.
push
(
'<!-- __NEXT_DATA__ -->'
)
prefix
+=
'<!-- __NEXT_DATA__ -->'
}
}
const
streams
=
[
const
streams
=
[
streamFrom
Array
(
prefix
),
streamFrom
String
(
prefix
),
await
documentResult
.
bodyResult
(
renderTargetSuffix
),
await
documentResult
.
bodyResult
(
renderTargetSuffix
),
]
]
...
...
packages/next/src/server/stream-utils/node-web-streams-helper.ts
View file @
ee6c3690
...
@@ -45,7 +45,7 @@ export function cloneTransformStream(source: TransformStream) {
...
@@ -45,7 +45,7 @@ export function cloneTransformStream(source: TransformStream) {
controller
.
enqueue
(
value
)
controller
.
enqueue
(
value
)
}
}
},
},
// skip
the its own written
chunks
// skip
all piped
chunks
transform
()
{},
transform
()
{},
})
})
...
@@ -67,12 +67,10 @@ export function chainStreams<T>(
...
@@ -67,12 +67,10 @@ export function chainStreams<T>(
return
readable
return
readable
}
}
export
function
streamFrom
Array
(
strings
:
string
[]
):
ReadableStream
<
Uint8Array
>
{
export
function
streamFrom
String
(
str
:
string
):
ReadableStream
<
Uint8Array
>
{
return
new
ReadableStream
({
return
new
ReadableStream
({
start
(
controller
)
{
start
(
controller
)
{
for
(
const
str
of
strings
)
{
controller
.
enqueue
(
encodeText
(
str
))
controller
.
enqueue
(
encodeText
(
str
))
}
controller
.
close
()
controller
.
close
()
},
},
})
})
...
@@ -107,7 +105,7 @@ export function createBufferedTransformStream(): TransformStream<
...
@@ -107,7 +105,7 @@ export function createBufferedTransformStream(): TransformStream<
const
flushBuffer
=
(
controller
:
TransformStreamDefaultController
)
=>
{
const
flushBuffer
=
(
controller
:
TransformStreamDefaultController
)
=>
{
if
(
!
pendingFlush
)
{
if
(
!
pendingFlush
)
{
pendingFlush
=
new
Promise
((
resolve
)
=>
{
pendingFlush
=
new
Promise
((
resolve
)
=>
{
setTimeout
(
async
()
=>
{
setTimeout
(()
=>
{
controller
.
enqueue
(
bufferedBytes
)
controller
.
enqueue
(
bufferedBytes
)
bufferedBytes
=
new
Uint8Array
()
bufferedBytes
=
new
Uint8Array
()
pendingFlush
=
null
pendingFlush
=
null
...
@@ -115,7 +113,6 @@ export function createBufferedTransformStream(): TransformStream<
...
@@ -115,7 +113,6 @@ export function createBufferedTransformStream(): TransformStream<
},
0
)
},
0
)
})
})
}
}
return
pendingFlush
}
}
return
new
TransformStream
({
return
new
TransformStream
({
...
...
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