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
230571cd
Unverified
Commit
230571cd
authored
Nov 14, 2022
by
Tim Neutkens
Committed by
GitHub
Nov 14, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add additional item to RSC payload, preparing for head.tsx on navigation (#42791)
parent
3a0065d7
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
29 deletions
+37
-29
app-router.tsx
packages/next/client/components/app-router.tsx
+3
-3
layout-router.tsx
packages/next/client/components/layout-router.tsx
+2
-2
reducer.ts
packages/next/client/components/reducer.ts
+25
-20
app-render.tsx
packages/next/server/app-render.tsx
+3
-0
app-router-context.ts
packages/next/shared/lib/app-router-context.ts
+4
-4
No files found.
packages/next/client/components/app-router.tsx
View file @
230571cd
...
@@ -180,7 +180,7 @@ function Router({
...
@@ -180,7 +180,7 @@ function Router({
previousTree
,
previousTree
,
overrideCanonicalUrl
,
overrideCanonicalUrl
,
cache
:
{
cache
:
{
status
:
CacheStates
.
LAZYINITIALIZED
,
status
:
CacheStates
.
LAZY
_
INITIALIZED
,
data
:
null
,
data
:
null
,
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
@@ -206,7 +206,7 @@ function Router({
...
@@ -206,7 +206,7 @@ function Router({
forceOptimisticNavigation
,
forceOptimisticNavigation
,
navigateType
,
navigateType
,
cache
:
{
cache
:
{
status
:
CacheStates
.
LAZYINITIALIZED
,
status
:
CacheStates
.
LAZY
_
INITIALIZED
,
data
:
null
,
data
:
null
,
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
@@ -268,7 +268,7 @@ function Router({
...
@@ -268,7 +268,7 @@ function Router({
// TODO-APP: revisit if this needs to be passed.
// TODO-APP: revisit if this needs to be passed.
cache
:
{
cache
:
{
status
:
CacheStates
.
LAZYINITIALIZED
,
status
:
CacheStates
.
LAZY
_
INITIALIZED
,
data
:
null
,
data
:
null
,
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
...
packages/next/client/components/layout-router.tsx
View file @
230571cd
...
@@ -146,7 +146,7 @@ export function InnerLayoutRouter({
...
@@ -146,7 +146,7 @@ export function InnerLayoutRouter({
// TODO-APP: verify if this can be null based on user code
// TODO-APP: verify if this can be null based on user code
childProp
.
current
!==
null
childProp
.
current
!==
null
)
{
)
{
if
(
childNode
&&
childNode
.
status
===
CacheStates
.
LAZYINITIALIZED
)
{
if
(
childNode
&&
childNode
.
status
===
CacheStates
.
LAZY
_
INITIALIZED
)
{
// @ts-expect-error TODO-APP: handle changing of the type
// @ts-expect-error TODO-APP: handle changing of the type
childNode
.
status
=
CacheStates
.
READY
childNode
.
status
=
CacheStates
.
READY
// @ts-expect-error TODO-APP: handle changing of the type
// @ts-expect-error TODO-APP: handle changing of the type
...
@@ -181,7 +181,7 @@ export function InnerLayoutRouter({
...
@@ -181,7 +181,7 @@ export function InnerLayoutRouter({
* Flight data fetch kicked off during render and put into the cache.
* Flight data fetch kicked off during render and put into the cache.
*/
*/
childNodes
.
set
(
path
,
{
childNodes
.
set
(
path
,
{
status
:
CacheStates
.
DATAFETCH
,
status
:
CacheStates
.
DATA
_
FETCH
,
data
:
fetchServerResponse
(
new
URL
(
url
,
location
.
origin
),
refetchTree
),
data
:
fetchServerResponse
(
new
URL
(
url
,
location
.
origin
),
refetchTree
),
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
...
packages/next/client/components/reducer.ts
View file @
230571cd
...
@@ -35,8 +35,10 @@ function createRecordFromThenable(thenable: any) {
...
@@ -35,8 +35,10 @@ function createRecordFromThenable(thenable: any) {
/**
/**
* Read record value or throw Promise if it's not resolved yet.
* Read record value or throw Promise if it's not resolved yet.
*/
*/
function
readRecordValue
(
thenable
:
any
)
{
function
readRecordValue
<
T
>
(
thenable
:
Promise
<
T
>
):
T
{
// @ts-expect-error TODO: fix type
if
(
thenable
.
status
===
'fulfilled'
)
{
if
(
thenable
.
status
===
'fulfilled'
)
{
// @ts-expect-error TODO: fix type
return
thenable
.
value
return
thenable
.
value
}
else
{
}
else
{
throw
thenable
throw
thenable
...
@@ -97,7 +99,7 @@ function fillLazyItemsTillLeafWithHead(
...
@@ -97,7 +99,7 @@ function fillLazyItemsTillLeafWithHead(
let
parallelRouteCacheNode
=
new
Map
(
existingParallelRoutesCacheNode
)
let
parallelRouteCacheNode
=
new
Map
(
existingParallelRoutesCacheNode
)
parallelRouteCacheNode
.
delete
(
cacheKey
)
parallelRouteCacheNode
.
delete
(
cacheKey
)
const
newCacheNode
:
CacheNode
=
{
const
newCacheNode
:
CacheNode
=
{
status
:
CacheStates
.
LAZYINITIALIZED
,
status
:
CacheStates
.
LAZY
_
INITIALIZED
,
data
:
null
,
data
:
null
,
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
@@ -116,7 +118,7 @@ function fillLazyItemsTillLeafWithHead(
...
@@ -116,7 +118,7 @@ function fillLazyItemsTillLeafWithHead(
}
}
const
newCacheNode
:
CacheNode
=
{
const
newCacheNode
:
CacheNode
=
{
status
:
CacheStates
.
LAZYINITIALIZED
,
status
:
CacheStates
.
LAZY
_
INITIALIZED
,
data
:
null
,
data
:
null
,
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
@@ -139,7 +141,7 @@ function fillCacheWithNewSubTreeData(
...
@@ -139,7 +141,7 @@ function fillCacheWithNewSubTreeData(
existingCache
:
CacheNode
,
existingCache
:
CacheNode
,
flightDataPath
:
FlightDataPath
flightDataPath
:
FlightDataPath
):
void
{
):
void
{
const
isLastEntry
=
flightDataPath
.
length
<=
4
const
isLastEntry
=
flightDataPath
.
length
<=
5
const
[
parallelRouteKey
,
segment
]
=
flightDataPath
const
[
parallelRouteKey
,
segment
]
=
flightDataPath
const
segmentForCache
=
Array
.
isArray
(
segment
)
?
segment
[
1
]
:
segment
const
segmentForCache
=
Array
.
isArray
(
segment
)
?
segment
[
1
]
:
segment
...
@@ -290,7 +292,7 @@ function fillCacheWithPrefetchedSubTreeData(
...
@@ -290,7 +292,7 @@ function fillCacheWithPrefetchedSubTreeData(
existingCache
:
CacheNode
,
existingCache
:
CacheNode
,
flightDataPath
:
FlightDataPath
flightDataPath
:
FlightDataPath
):
void
{
):
void
{
const
isLastEntry
=
flightDataPath
.
length
<=
4
const
isLastEntry
=
flightDataPath
.
length
<=
5
const
[
parallelRouteKey
,
segment
]
=
flightDataPath
const
[
parallelRouteKey
,
segment
]
=
flightDataPath
const
segmentForCache
=
Array
.
isArray
(
segment
)
?
segment
[
1
]
:
segment
const
segmentForCache
=
Array
.
isArray
(
segment
)
?
segment
[
1
]
:
segment
...
@@ -370,7 +372,7 @@ function fillCacheWithDataProperty(
...
@@ -370,7 +372,7 @@ function fillCacheWithDataProperty(
childCacheNode
===
existingChildCacheNode
childCacheNode
===
existingChildCacheNode
)
{
)
{
childSegmentMap
.
set
(
segment
,
{
childSegmentMap
.
set
(
segment
,
{
status
:
CacheStates
.
DATAFETCH
,
status
:
CacheStates
.
DATA
_
FETCH
,
data
:
fetchResponse
(),
data
:
fetchResponse
(),
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
@@ -383,7 +385,7 @@ function fillCacheWithDataProperty(
...
@@ -383,7 +385,7 @@ function fillCacheWithDataProperty(
// Start fetch in the place where the existing cache doesn't have the data yet.
// Start fetch in the place where the existing cache doesn't have the data yet.
if
(
!
childCacheNode
)
{
if
(
!
childCacheNode
)
{
childSegmentMap
.
set
(
segment
,
{
childSegmentMap
.
set
(
segment
,
{
status
:
CacheStates
.
DATAFETCH
,
status
:
CacheStates
.
DATA
_
FETCH
,
data
:
fetchResponse
(),
data
:
fetchResponse
(),
subTreeData
:
null
,
subTreeData
:
null
,
parallelRoutes
:
new
Map
(),
parallelRoutes
:
new
Map
(),
...
@@ -972,7 +974,7 @@ function clientReducer(
...
@@ -972,7 +974,7 @@ function clientReducer(
}
}
// Unwrap cache data with `use` to suspend here (in the reducer) until the fetch resolves.
// Unwrap cache data with `use` to suspend here (in the reducer) until the fetch resolves.
const
[
flightData
,
canonicalUrlOverride
]
=
readRecordValue
(
cache
.
data
)
const
[
flightData
,
canonicalUrlOverride
]
=
readRecordValue
(
cache
.
data
!
)
// Handle case when navigating to page in `pages` from `app`
// Handle case when navigating to page in `pages` from `app`
if
(
typeof
flightData
===
'string'
)
{
if
(
typeof
flightData
===
'string'
)
{
...
@@ -995,10 +997,11 @@ function clientReducer(
...
@@ -995,10 +997,11 @@ function clientReducer(
const
flightDataPath
=
flightData
[
0
]
const
flightDataPath
=
flightData
[
0
]
// The one before last item is the router state tree patch
// The one before last item is the router state tree patch
const
[
treePatch
,
subTreeData
]
=
flightDataPath
.
slice
(
-
2
)
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const
[
treePatch
,
subTreeData
,
head
]
=
flightDataPath
.
slice
(
-
3
)
// Path without the last segment, router state, and the subTreeData
// Path without the last segment, router state, and the subTreeData
const
flightSegmentPath
=
flightDataPath
.
slice
(
0
,
-
3
)
const
flightSegmentPath
=
flightDataPath
.
slice
(
0
,
-
4
)
// Create new tree based on the flightSegmentPath and router state patch
// Create new tree based on the flightSegmentPath and router state patch
const
newTree
=
applyRouterStatePatchToTree
(
const
newTree
=
applyRouterStatePatchToTree
(
...
@@ -1022,7 +1025,7 @@ function clientReducer(
...
@@ -1022,7 +1025,7 @@ function clientReducer(
mutable
.
patchedTree
=
newTree
mutable
.
patchedTree
=
newTree
mutable
.
mpaNavigation
=
isNavigatingToNewRootLayout
(
state
.
tree
,
newTree
)
mutable
.
mpaNavigation
=
isNavigatingToNewRootLayout
(
state
.
tree
,
newTree
)
if
(
flightDataPath
.
length
===
2
)
{
if
(
flightDataPath
.
length
===
3
)
{
cache
.
subTreeData
=
subTreeData
cache
.
subTreeData
=
subTreeData
}
else
{
}
else
{
// Copy subTreeData for the root node of the cache.
// Copy subTreeData for the root node of the cache.
...
@@ -1119,13 +1122,14 @@ function clientReducer(
...
@@ -1119,13 +1122,14 @@ function clientReducer(
// TODO-APP: Currently the Flight data can only have one item but in the future it can have multiple paths.
// TODO-APP: Currently the Flight data can only have one item but in the future it can have multiple paths.
const
flightDataPath
=
flightData
[
0
]
const
flightDataPath
=
flightData
[
0
]
// Slices off the last segment (which is at -3) as it doesn't exist in the tree yet
// Slices off the last segment (which is at -4) as it doesn't exist in the tree yet
const
treePath
=
flightDataPath
.
slice
(
0
,
-
3
)
const
flightSegmentPath
=
flightDataPath
.
slice
(
0
,
-
4
)
const
[
treePatch
,
subTreeData
]
=
flightDataPath
.
slice
(
-
2
)
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const
[
treePatch
,
subTreeData
,
head
]
=
flightDataPath
.
slice
(
-
3
)
const
newTree
=
applyRouterStatePatchToTree
(
const
newTree
=
applyRouterStatePatchToTree
(
// TODO-APP: remove ''
// TODO-APP: remove ''
[
''
,
...
tree
Path
],
[
''
,
...
flightSegment
Path
],
state
.
tree
,
state
.
tree
,
treePatch
treePatch
)
)
...
@@ -1146,7 +1150,7 @@ function clientReducer(
...
@@ -1146,7 +1150,7 @@ function clientReducer(
mutable
.
mpaNavigation
=
isNavigatingToNewRootLayout
(
state
.
tree
,
newTree
)
mutable
.
mpaNavigation
=
isNavigatingToNewRootLayout
(
state
.
tree
,
newTree
)
// Root refresh
// Root refresh
if
(
flightDataPath
.
length
===
2
)
{
if
(
flightDataPath
.
length
===
3
)
{
cache
.
subTreeData
=
subTreeData
cache
.
subTreeData
=
subTreeData
}
else
{
}
else
{
// Copy subTreeData for the root node of the cache.
// Copy subTreeData for the root node of the cache.
...
@@ -1244,7 +1248,7 @@ function clientReducer(
...
@@ -1244,7 +1248,7 @@ function clientReducer(
])
])
)
)
}
}
const
[
flightData
,
canonicalUrlOverride
]
=
readRecordValue
(
cache
.
data
)
const
[
flightData
,
canonicalUrlOverride
]
=
readRecordValue
(
cache
.
data
!
)
// Handle case when navigating to page in `pages` from `app`
// Handle case when navigating to page in `pages` from `app`
if
(
typeof
flightData
===
'string'
)
{
if
(
typeof
flightData
===
'string'
)
{
...
@@ -1265,7 +1269,7 @@ function clientReducer(
...
@@ -1265,7 +1269,7 @@ function clientReducer(
const
flightDataPath
=
flightData
[
0
]
const
flightDataPath
=
flightData
[
0
]
// FlightDataPath with more than two items means unexpected Flight data was returned
// FlightDataPath with more than two items means unexpected Flight data was returned
if
(
flightDataPath
.
length
!==
2
)
{
if
(
flightDataPath
.
length
!==
3
)
{
// TODO-APP: handle this case better
// TODO-APP: handle this case better
console
.
log
(
'REFRESH FAILED'
)
console
.
log
(
'REFRESH FAILED'
)
return
state
return
state
...
@@ -1330,7 +1334,8 @@ function clientReducer(
...
@@ -1330,7 +1334,8 @@ function clientReducer(
const
flightDataPath
=
flightData
[
0
]
const
flightDataPath
=
flightData
[
0
]
// The one before last item is the router state tree patch
// The one before last item is the router state tree patch
const
[
treePatch
,
subTreeData
]
=
flightDataPath
.
slice
(
-
2
)
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const
[
treePatch
,
subTreeData
,
head
]
=
flightDataPath
.
slice
(
-
3
)
// TODO-APP: Verify if `null` can't be returned from user code.
// TODO-APP: Verify if `null` can't be returned from user code.
// If subTreeData is null the prefetch did not provide a component tree.
// If subTreeData is null the prefetch did not provide a component tree.
...
@@ -1338,7 +1343,7 @@ function clientReducer(
...
@@ -1338,7 +1343,7 @@ function clientReducer(
fillCacheWithPrefetchedSubTreeData
(
state
.
cache
,
flightDataPath
)
fillCacheWithPrefetchedSubTreeData
(
state
.
cache
,
flightDataPath
)
}
}
const
flightSegmentPath
=
flightDataPath
.
slice
(
0
,
-
2
)
const
flightSegmentPath
=
flightDataPath
.
slice
(
0
,
-
3
)
const
newTree
=
applyRouterStatePatchToTree
(
const
newTree
=
applyRouterStatePatchToTree
(
// TODO-APP: remove ''
// TODO-APP: remove ''
...
...
packages/next/server/app-render.tsx
View file @
230571cd
...
@@ -1425,6 +1425,9 @@ export async function renderToHTMLOrFlight(
...
@@ -1425,6 +1425,9 @@ export async function renderToHTMLOrFlight(
)
)
).
Component
).
Component
),
),
isPrefetch
&&
!
Boolean
(
loaderTreeToFilter
[
2
].
loading
)
?
null
:
(
<>
{
null
}
</>
// TODO: change this to head tags.
),
]
]
}
}
...
...
packages/next/shared/lib/app-router-context.ts
View file @
230571cd
...
@@ -8,8 +8,8 @@ export type ChildSegmentMap = Map<string, CacheNode>
...
@@ -8,8 +8,8 @@ export type ChildSegmentMap = Map<string, CacheNode>
// eslint-disable-next-line no-shadow
// eslint-disable-next-line no-shadow
export
enum
CacheStates
{
export
enum
CacheStates
{
LAZYINITIALIZED
=
'LAZYINITIALIZED'
,
LAZY
_
INITIALIZED
=
'LAZYINITIALIZED'
,
DATAFETCH
=
'DATAFETCH'
,
DATA
_
FETCH
=
'DATAFETCH'
,
READY
=
'READY'
,
READY
=
'READY'
,
}
}
...
@@ -18,7 +18,7 @@ export enum CacheStates {
...
@@ -18,7 +18,7 @@ export enum CacheStates {
*/
*/
export
type
CacheNode
=
export
type
CacheNode
=
|
{
|
{
status
:
CacheStates
.
DATAFETCH
status
:
CacheStates
.
DATA
_
FETCH
/**
/**
* In-flight request for this node.
* In-flight request for this node.
*/
*/
...
@@ -52,7 +52,7 @@ export type CacheNode =
...
@@ -52,7 +52,7 @@ export type CacheNode =
parallelRoutes
:
Map
<
string
,
ChildSegmentMap
>
parallelRoutes
:
Map
<
string
,
ChildSegmentMap
>
}
}
|
{
|
{
status
:
CacheStates
.
LAZYINITIALIZED
status
:
CacheStates
.
LAZY
_
INITIALIZED
data
:
null
data
:
null
head
?:
React
.
ReactNode
head
?:
React
.
ReactNode
subTreeData
:
null
subTreeData
:
null
...
...
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