Skip to content

Commit f3eb893

Browse files
huozhihuozhi
committed
Revert "Track navigation timestamp on CacheNode (#77251)"
This reverts commit 5195704.
1 parent c3b572d commit f3eb893

33 files changed

+48
-390
lines changed

‎packages/next/src/client/app-index.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,9 @@ const pendingActionQueue: Promise<AppRouterActionQueue> = new Promise(
171171
// and before any components have hydrated.
172172
setAppBuildId(initialRSCPayload.b)
173173

174-
const initialTimestamp = Date.now()
175-
176174
resolve(
177175
createMutableActionQueue(
178176
createInitialRouterState({
179-
navigatedAt: initialTimestamp,
180177
initialFlightData: initialRSCPayload.f,
181178
initialCanonicalUrlParts: initialRSCPayload.c,
182179
initialParallelRoutes: new Map(),

‎packages/next/src/client/components/app-router.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ export function createEmptyCacheNode(): CacheNode {
149149
prefetchHead: null,
150150
parallelRoutes: new Map(),
151151
loading: null,
152-
navigatedAt: -1,
153152
}
154153
}
155154

‎packages/next/src/client/components/layout-router.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,6 @@ function InnerLayoutRouter({
381381
// TODO-APP: remove ''
382382
const refetchTree = walkAddRefetch(['', ...segmentPath], fullTree)
383383
const includeNextUrl = hasInterceptionRouteInCurrentTree(fullTree)
384-
const navigatedAt = Date.now()
385384
cacheNode.lazyData = lazyData = fetchServerResponse(
386385
new URL(url, location.origin),
387386
{
@@ -394,7 +393,6 @@ function InnerLayoutRouter({
394393
type: ACTION_SERVER_PATCH,
395394
previousTree: fullTree,
396395
serverResponse,
397-
navigatedAt,
398396
})
399397
})
400398

@@ -567,7 +565,6 @@ export default function OuterLayoutRouter({
567565
prefetchHead: null,
568566
parallelRoutes: new Map(),
569567
loading: null,
570-
navigatedAt: -1,
571568
}
572569

573570
// Flight data fetch kicked off during render and put into the cache.

‎packages/next/src/client/components/router-reducer/aliased-prefetch-navigations.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import type { Mutable, ReadonlyReducerState } from './router-reducer-types'
2424
* more granular segment map and so the router will be able to simply re-use the loading segment for the new navigation.
2525
*/
2626
export function handleAliasedPrefetchEntry(
27-
navigatedAt: number,
2827
state: ReadonlyReducerState,
2928
flightData: string | NormalizedFlightData[],
3029
url: URL,
@@ -86,7 +85,6 @@ export function handleAliasedPrefetchEntry(
8685

8786
// Construct a new tree and apply the aliased loading state for each parallel route
8887
fillNewTreeWithOnlyLoadingSegments(
89-
navigatedAt,
9088
newCache,
9189
currentCache,
9290
treePatch,
@@ -101,7 +99,6 @@ export function handleAliasedPrefetchEntry(
10199

102100
// copy the loading state only into the leaf node (the part that changed)
103101
fillCacheWithNewSubTreeDataButOnlyLoading(
104-
navigatedAt,
105102
newCache,
106103
currentCache,
107104
normalizedFlightData
@@ -149,7 +146,6 @@ function hasLoadingComponentInSeedData(seedData: CacheNodeSeedData | null) {
149146
}
150147

151148
function fillNewTreeWithOnlyLoadingSegments(
152-
navigatedAt: number,
153149
newCache: CacheNode,
154150
existingCache: CacheNode,
155151
routerState: FlightRouterState,
@@ -184,7 +180,6 @@ function fillNewTreeWithOnlyLoadingSegments(
184180
prefetchHead: null,
185181
parallelRoutes: new Map(),
186182
loading,
187-
navigatedAt,
188183
}
189184
} else {
190185
// No data available for this node. This will trigger a lazy fetch
@@ -197,7 +192,6 @@ function fillNewTreeWithOnlyLoadingSegments(
197192
prefetchHead: null,
198193
parallelRoutes: new Map(),
199194
loading: null,
200-
navigatedAt: -1,
201195
}
202196
}
203197

@@ -209,7 +203,6 @@ function fillNewTreeWithOnlyLoadingSegments(
209203
}
210204

211205
fillNewTreeWithOnlyLoadingSegments(
212-
navigatedAt,
213206
newCacheNode,
214207
existingCache,
215208
parallelRouteState,

‎packages/next/src/client/components/router-reducer/apply-flight-data.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import type { PrefetchCacheEntry } from './router-reducer-types'
55
import type { NormalizedFlightData } from '../../flight-data-helpers'
66

77
export function applyFlightData(
8-
navigatedAt: number,
98
existingCache: CacheNode,
109
cache: CacheNode,
1110
flightData: NormalizedFlightData,
@@ -31,7 +30,6 @@ export function applyFlightData(
3130
// old behavior — no PPR value.
3231
cache.prefetchRsc = null
3332
fillLazyItemsTillLeafWithHead(
34-
navigatedAt,
3533
cache,
3634
existingCache,
3735
treePatch,
@@ -49,13 +47,7 @@ export function applyFlightData(
4947
cache.parallelRoutes = new Map(existingCache.parallelRoutes)
5048
cache.loading = existingCache.loading
5149
// Create a copy of the existing cache with the rsc applied.
52-
fillCacheWithNewSubTreeData(
53-
navigatedAt,
54-
cache,
55-
existingCache,
56-
flightData,
57-
prefetchEntry
58-
)
50+
fillCacheWithNewSubTreeData(cache, existingCache, flightData, prefetchEntry)
5951
}
6052

6153
return true

‎packages/next/src/client/components/router-reducer/clear-cache-node-data-for-segment-path.test.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import React from 'react'
22
import { clearCacheNodeDataForSegmentPath } from './clear-cache-node-data-for-segment-path'
33
import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'
44

5-
const navigatedAt = -1
6-
75
describe('clearCacheNodeDataForSegmentPath', () => {
86
it('should clear the data property', () => {
97
const pathname = '/dashboard/settings'
@@ -15,7 +13,6 @@ describe('clearCacheNodeDataForSegmentPath', () => {
1513
.flat()
1614

1715
const cache: CacheNode = {
18-
navigatedAt,
1916
lazyData: null,
2017
rsc: null,
2118
prefetchRsc: null,
@@ -25,7 +22,6 @@ describe('clearCacheNodeDataForSegmentPath', () => {
2522
loading: null,
2623
}
2724
const existingCache: CacheNode = {
28-
navigatedAt,
2925
lazyData: null,
3026
rsc: <>Root layout</>,
3127
prefetchRsc: null,
@@ -39,7 +35,6 @@ describe('clearCacheNodeDataForSegmentPath', () => {
3935
[
4036
'linking',
4137
{
42-
navigatedAt,
4338
lazyData: null,
4439
rsc: <>Linking</>,
4540
prefetchRsc: null,
@@ -53,7 +48,6 @@ describe('clearCacheNodeDataForSegmentPath', () => {
5348
[
5449
'',
5550
{
56-
navigatedAt,
5751
lazyData: null,
5852
rsc: <>Page</>,
5953
prefetchRsc: null,
@@ -80,21 +74,18 @@ describe('clearCacheNodeDataForSegmentPath', () => {
8074
"head": null,
8175
"lazyData": null,
8276
"loading": null,
83-
"navigatedAt": -1,
8477
"parallelRoutes": Map {
8578
"children" => Map {
8679
"linking" => {
8780
"head": null,
8881
"lazyData": null,
8982
"loading": null,
90-
"navigatedAt": -1,
9183
"parallelRoutes": Map {
9284
"children" => Map {
9385
"" => {
9486
"head": null,
9587
"lazyData": null,
9688
"loading": null,
97-
"navigatedAt": -1,
9889
"parallelRoutes": Map {},
9990
"prefetchHead": null,
10091
"prefetchRsc": null,
@@ -114,7 +105,6 @@ describe('clearCacheNodeDataForSegmentPath', () => {
114105
"head": null,
115106
"lazyData": null,
116107
"loading": null,
117-
"navigatedAt": -1,
118108
"parallelRoutes": Map {},
119109
"prefetchHead": null,
120110
"prefetchRsc": null,

‎packages/next/src/client/components/router-reducer/clear-cache-node-data-for-segment-path.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export function clearCacheNodeDataForSegmentPath(
4444
prefetchHead: null,
4545
parallelRoutes: new Map(),
4646
loading: null,
47-
navigatedAt: -1,
4847
})
4948
}
5049
return
@@ -61,7 +60,6 @@ export function clearCacheNodeDataForSegmentPath(
6160
prefetchHead: null,
6261
parallelRoutes: new Map(),
6362
loading: null,
64-
navigatedAt: -1,
6563
})
6664
}
6765
return

‎packages/next/src/client/components/router-reducer/create-initial-router-state.test.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ const getInitialRouterStateTree = (): FlightRouterState => [
1919
true,
2020
]
2121

22-
const navigatedAt = Date.now()
23-
2422
describe('createInitialRouterState', () => {
2523
it('should return the correct initial router state', () => {
2624
const initialTree = getInitialRouterStateTree()
@@ -34,7 +32,6 @@ describe('createInitialRouterState', () => {
3432
const initialParallelRoutes: CacheNode['parallelRoutes'] = new Map()
3533

3634
const state = createInitialRouterState({
37-
navigatedAt,
3835
initialFlightData: [[initialTree, ['', children, {}, null]]],
3936
initialCanonicalUrlParts: initialCanonicalUrl.split('/'),
4037
initialParallelRoutes,
@@ -45,7 +42,6 @@ describe('createInitialRouterState', () => {
4542
})
4643

4744
const state2 = createInitialRouterState({
48-
navigatedAt,
4945
initialFlightData: [[initialTree, ['', children, {}, null]]],
5046
initialCanonicalUrlParts: initialCanonicalUrl.split('/'),
5147
initialParallelRoutes,
@@ -56,7 +52,6 @@ describe('createInitialRouterState', () => {
5652
})
5753

5854
const expectedCache: CacheNode = {
59-
navigatedAt,
6055
lazyData: null,
6156
rsc: children,
6257
prefetchRsc: null,
@@ -70,15 +65,13 @@ describe('createInitialRouterState', () => {
7065
[
7166
'linking',
7267
{
73-
navigatedAt,
7468
parallelRoutes: new Map([
7569
[
7670
'children',
7771
new Map([
7872
[
7973
'',
8074
{
81-
navigatedAt,
8275
lazyData: null,
8376
rsc: null,
8477
prefetchRsc: null,

‎packages/next/src/client/components/router-reducer/create-initial-router-state.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { addRefreshMarkerToActiveParallelSegments } from './refetch-inactive-par
1010
import { getFlightDataPartsFromPath } from '../../flight-data-helpers'
1111

1212
export interface InitialRouterStateParameters {
13-
navigatedAt: number
1413
initialCanonicalUrlParts: string[]
1514
initialParallelRoutes: CacheNode['parallelRoutes']
1615
initialFlightData: FlightDataPath[]
@@ -21,7 +20,6 @@ export interface InitialRouterStateParameters {
2120
}
2221

2322
export function createInitialRouterState({
24-
navigatedAt,
2523
initialFlightData,
2624
initialCanonicalUrlParts,
2725
initialParallelRoutes,
@@ -54,7 +52,6 @@ export function createInitialRouterState({
5452
// The cache gets seeded during the first render. `initialParallelRoutes` ensures the cache from the first render is there during the second render.
5553
parallelRoutes: initialParallelRoutes,
5654
loading,
57-
navigatedAt,
5855
}
5956

6057
const canonicalUrl =
@@ -72,7 +69,6 @@ export function createInitialRouterState({
7269
// When the cache hasn't been seeded yet we fill the cache with the head.
7370
if (initialParallelRoutes === null || initialParallelRoutes.size === 0) {
7471
fillLazyItemsTillLeafWithHead(
75-
navigatedAt,
7672
cache,
7773
undefined,
7874
initialTree,

‎packages/next/src/client/components/router-reducer/fill-cache-with-new-subtree-data.test.tsx

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const getFlightData = (): NormalizedFlightData[] => {
2020
describe('fillCacheWithNewSubtreeData', () => {
2121
it('should apply rsc and head property', () => {
2222
const cache: CacheNode = {
23-
navigatedAt: -1,
2423
lazyData: null,
2524
rsc: null,
2625
prefetchRsc: null,
@@ -30,7 +29,6 @@ describe('fillCacheWithNewSubtreeData', () => {
3029
parallelRoutes: new Map(),
3130
}
3231
const existingCache: CacheNode = {
33-
navigatedAt: -1,
3432
lazyData: null,
3533
rsc: <>Root layout</>,
3634
prefetchRsc: null,
@@ -44,7 +42,6 @@ describe('fillCacheWithNewSubtreeData', () => {
4442
[
4543
'linking',
4644
{
47-
navigatedAt: -1,
4845
lazyData: null,
4946
rsc: <>Linking</>,
5047
prefetchRsc: null,
@@ -58,7 +55,6 @@ describe('fillCacheWithNewSubtreeData', () => {
5855
[
5956
'',
6057
{
61-
navigatedAt: -1,
6258
lazyData: null,
6359
rsc: <>Page</>,
6460
prefetchRsc: null,
@@ -87,16 +83,9 @@ describe('fillCacheWithNewSubtreeData', () => {
8783
// Mirrors the way router-reducer values are passed in.
8884
const normalizedFlightData = flightData[0]
8985

90-
const navigatedAt = -1
91-
fillCacheWithNewSubTreeData(
92-
navigatedAt,
93-
cache,
94-
existingCache,
95-
normalizedFlightData
96-
)
86+
fillCacheWithNewSubTreeData(cache, existingCache, normalizedFlightData)
9787

9888
const expectedCache: CacheNode = {
99-
navigatedAt: -1,
10089
lazyData: null,
10190
rsc: null,
10291
prefetchRsc: null,
@@ -110,7 +99,6 @@ describe('fillCacheWithNewSubtreeData', () => {
11099
[
111100
'linking',
112101
{
113-
navigatedAt: -1,
114102
lazyData: null,
115103
rsc: <>Linking</>,
116104
prefetchRsc: null,
@@ -125,7 +113,6 @@ describe('fillCacheWithNewSubtreeData', () => {
125113
[
126114
'',
127115
{
128-
navigatedAt: -1,
129116
lazyData: null,
130117
rsc: <>Page</>,
131118
prefetchRsc: null,
@@ -138,7 +125,6 @@ describe('fillCacheWithNewSubtreeData', () => {
138125
[
139126
'about',
140127
{
141-
navigatedAt: -1,
142128
lazyData: null,
143129
head: null,
144130
prefetchHead: null,

0 commit comments

Comments
 (0)