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
b2614f26
Commit
b2614f26
authored
Oct 15, 2025
by
Janka Uryga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
label as Prefetch/Prefetchable depending on prefetch config
parent
06015036
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
13 deletions
+61
-13
app-render.tsx
packages/next/src/server/app-render/app-render.tsx
+15
-3
staged-validation.tsx
packages/next/src/server/app-render/staged-validation.tsx
+32
-0
cache-components.dev-warmup.test.ts
...components-dev-warmup/cache-components.dev-warmup.test.ts
+14
-10
No files found.
packages/next/src/server/app-render/app-render.tsx
View file @
b2614f26
...
@@ -212,6 +212,7 @@ import { createPromiseWithResolvers } from '../../shared/lib/promise-with-resolv
...
@@ -212,6 +212,7 @@ import { createPromiseWithResolvers } from '../../shared/lib/promise-with-resolv
import
{
ImageConfigContext
}
from
'../../shared/lib/image-config-context.shared-runtime'
import
{
ImageConfigContext
}
from
'../../shared/lib/image-config-context.shared-runtime'
import
{
imageConfigDefault
}
from
'../../shared/lib/image-config'
import
{
imageConfigDefault
}
from
'../../shared/lib/image-config'
import
{
RenderStage
,
StagedRenderingController
}
from
'./staged-rendering'
import
{
RenderStage
,
StagedRenderingController
}
from
'./staged-rendering'
import
{
anySegmentHasRuntimePrefetchEnabled
}
from
'./staged-validation'
export
type
GetDynamicParamFromSegment
=
(
export
type
GetDynamicParamFromSegment
=
(
// [slug] / [[slug]] / [...slug]
// [slug] / [[slug]] / [...slug]
...
@@ -2768,7 +2769,16 @@ async function renderWithRestartOnCacheMissInDev(
...
@@ -2768,7 +2769,16 @@ async function renderWithRestartOnCacheMissInDev(
getPayload
:
(
requestStore
:
RequestStore
)
=>
Promise
<
RSCPayload
>
,
getPayload
:
(
requestStore
:
RequestStore
)
=>
Promise
<
RSCPayload
>
,
onError
:
(
error
:
unknown
)
=>
void
onError
:
(
error
:
unknown
)
=>
void
)
{
)
{
const
{
htmlRequestId
,
renderOpts
,
requestId
}
=
ctx
const
{
htmlRequestId
,
renderOpts
,
requestId
,
componentMod
:
{
routeModule
:
{
userland
:
{
loaderTree
},
},
},
}
=
ctx
const
{
const
{
clientReferenceManifest
,
clientReferenceManifest
,
ComponentMod
,
ComponentMod
,
...
@@ -2777,6 +2787,9 @@ async function renderWithRestartOnCacheMissInDev(
...
@@ -2777,6 +2787,9 @@ async function renderWithRestartOnCacheMissInDev(
}
=
renderOpts
}
=
renderOpts
assertClientReferenceManifest
(
clientReferenceManifest
)
assertClientReferenceManifest
(
clientReferenceManifest
)
const
hasRuntimePrefetch
=
await
anySegmentHasRuntimePrefetchEnabled
(
loaderTree
)
// If the render is restarted, we'll recreate a fresh request store
// If the render is restarted, we'll recreate a fresh request store
let
requestStore
:
RequestStore
=
initialRequestStore
let
requestStore
:
RequestStore
=
initialRequestStore
...
@@ -2786,8 +2799,7 @@ async function renderWithRestartOnCacheMissInDev(
...
@@ -2786,8 +2799,7 @@ async function renderWithRestartOnCacheMissInDev(
case
RenderStage
.
Static
:
case
RenderStage
.
Static
:
return
'Prerender'
return
'Prerender'
case
RenderStage
.
Runtime
:
case
RenderStage
.
Runtime
:
// TODO: only label as "Prefetch" if the page has a `prefetch` config.
return
hasRuntimePrefetch
?
'Prefetch'
:
'Prefetchable'
return
'Prefetch'
case
RenderStage
.
Dynamic
:
case
RenderStage
.
Dynamic
:
return
'Server'
return
'Server'
default
:
default
:
...
...
packages/next/src/server/app-render/staged-validation.tsx
0 → 100644
View file @
b2614f26
import
{
getLayoutOrPageModule
}
from
'../lib/app-dir-module'
import
type
{
LoaderTree
}
from
'../lib/app-dir-module'
import
{
parseLoaderTree
}
from
'../../shared/lib/router/utils/parse-loader-tree'
import
type
{
AppSegmentConfig
}
from
'../../build/segment-config/app/app-segment-config'
export
async
function
anySegmentHasRuntimePrefetchEnabled
(
tree
:
LoaderTree
):
Promise
<
boolean
>
{
const
{
mod
:
layoutOrPageMod
}
=
await
getLayoutOrPageModule
(
tree
)
// TODO(restart-on-cache-miss): Does this work correctly for client page/layout modules?
const
prefetchConfig
=
layoutOrPageMod
?
(
layoutOrPageMod
as
AppSegmentConfig
).
unstable_prefetch
:
undefined
/** Whether this segment should use a runtime prefetch instead of a static prefetch. */
const
hasRuntimePrefetch
=
prefetchConfig
?.
mode
===
'runtime'
if
(
hasRuntimePrefetch
)
{
return
true
}
const
{
parallelRoutes
}
=
parseLoaderTree
(
tree
)
for
(
const
parallelRouteKey
in
parallelRoutes
)
{
const
parallelRoute
=
parallelRoutes
[
parallelRouteKey
]
const
hasChildRuntimePrefetch
=
await
anySegmentHasRuntimePrefetchEnabled
(
parallelRoute
)
if
(
hasChildRuntimePrefetch
)
{
return
true
}
}
return
false
}
test/development/app-dir/cache-components-dev-warmup/cache-components.dev-warmup.test.ts
View file @
b2614f26
...
@@ -29,7 +29,7 @@ describe('cache-components-dev-warmup', () => {
...
@@ -29,7 +29,7 @@ describe('cache-components-dev-warmup', () => {
)
{
)
{
// Match logs that contain the message, with any environment.
// Match logs that contain the message, with any environment.
const
logPattern
=
new
RegExp
(
const
logPattern
=
new
RegExp
(
`^(?=.*\\b
${
message
}
\\b)(?=.*\\b(Cache|Prerender|Prefetch|Server)\\b).*`
`^(?=.*\\b
${
message
}
\\b)(?=.*\\b(Cache|Prerender|Prefetch|
Prefetchable|
Server)\\b).*`
)
)
const
logMessages
=
logs
.
map
((
log
)
=>
log
.
message
)
const
logMessages
=
logs
.
map
((
log
)
=>
log
.
message
)
const
messages
=
logMessages
.
filter
((
message
)
=>
logPattern
.
test
(
message
))
const
messages
=
logMessages
.
filter
((
message
)
=>
logPattern
.
test
(
message
))
...
@@ -175,12 +175,12 @@ describe('cache-components-dev-warmup', () => {
...
@@ -175,12 +175,12 @@ describe('cache-components-dev-warmup', () => {
// Private caches are dynamic holes in static prerenders,
// Private caches are dynamic holes in static prerenders,
// so they shouldn't resolve in the static stage.
// so they shouldn't resolve in the static stage.
assertLog
(
logs
,
'after private cache read - page'
,
'Prefetch'
)
assertLog
(
logs
,
'after private cache read - page'
,
'Prefetch
able
'
)
assertLog
(
logs
,
'after private cache read - layout'
,
'Prefetch'
)
assertLog
(
logs
,
'after private cache read - layout'
,
'Prefetch
able
'
)
assertLog
(
assertLog
(
logs
,
logs
,
'after successive private cache reads - page'
,
'after successive private cache reads - page'
,
'Prefetch'
'Prefetch
able
'
)
)
assertLog
(
logs
,
'after uncached fetch - layout'
,
'Server'
)
assertLog
(
logs
,
'after uncached fetch - layout'
,
'Server'
)
...
@@ -204,8 +204,12 @@ describe('cache-components-dev-warmup', () => {
...
@@ -204,8 +204,12 @@ describe('cache-components-dev-warmup', () => {
// Short lived caches are dynamic holes in static prerenders,
// Short lived caches are dynamic holes in static prerenders,
// so they shouldn't resolve in the static stage.
// so they shouldn't resolve in the static stage.
assertLog
(
logs
,
'after short-lived cache read - page'
,
'Prefetch'
)
assertLog
(
logs
,
'after short-lived cache read - page'
,
'Prefetchable'
)
assertLog
(
logs
,
'after short-lived cache read - layout'
,
'Prefetch'
)
assertLog
(
logs
,
'after short-lived cache read - layout'
,
'Prefetchable'
)
assertLog
(
logs
,
'after uncached fetch - layout'
,
'Server'
)
assertLog
(
logs
,
'after uncached fetch - layout'
,
'Server'
)
assertLog
(
logs
,
'after uncached fetch - page'
,
'Server'
)
assertLog
(
logs
,
'after uncached fetch - page'
,
'Server'
)
...
@@ -247,10 +251,10 @@ describe('cache-components-dev-warmup', () => {
...
@@ -247,10 +251,10 @@ describe('cache-components-dev-warmup', () => {
assertLog
(
logs
,
'after cache read - page'
,
'Prerender'
)
assertLog
(
logs
,
'after cache read - page'
,
'Prerender'
)
// TODO: we should only label this as "Prefetch" if there's a prefetch config.
// TODO: we should only label this as "Prefetch" if there's a prefetch config.
assertLog
(
logs
,
`after cookies`
,
'Prefetch'
)
assertLog
(
logs
,
`after cookies`
,
'Prefetch
able
'
)
assertLog
(
logs
,
`after headers`
,
'Prefetch'
)
assertLog
(
logs
,
`after headers`
,
'Prefetch
able
'
)
assertLog
(
logs
,
`after params`
,
'Prefetch'
)
assertLog
(
logs
,
`after params`
,
'Prefetch
able
'
)
assertLog
(
logs
,
`after searchParams`
,
'Prefetch'
)
assertLog
(
logs
,
`after searchParams`
,
'Prefetch
able
'
)
assertLog
(
logs
,
'after connection'
,
'Server'
)
assertLog
(
logs
,
'after connection'
,
'Server'
)
}
}
...
...
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