Skip to content

Commit 1f6d6a6

Browse files
committed
fix router state mismatch
1 parent e5507ff commit 1f6d6a6

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

packages/next/src/client/flight-data-helpers.test.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { prepareFlightRouterStateForRequest } from './flight-data-helpers'
22
import type { FlightRouterState } from '../server/app-render/types'
3-
import { HasLoadingBoundary } from '../server/app-render/types'
43

54
describe('prepareFlightRouterStateForRequest', () => {
65
describe('HMR refresh handling', () => {
@@ -11,7 +10,6 @@ describe('prepareFlightRouterStateForRequest', () => {
1110
'/some/url',
1211
'refresh',
1312
true,
14-
1,
1513
]
1614

1715
const result = prepareFlightRouterStateForRequest(flightRouterState, true)
@@ -154,22 +152,6 @@ describe('prepareFlightRouterStateForRequest', () => {
154152
expect(decoded[4]).toBe(false)
155153
})
156154

157-
it('should preserve hasLoadingBoundary', () => {
158-
const flightRouterState: FlightRouterState = [
159-
'segment',
160-
{},
161-
null,
162-
null,
163-
undefined,
164-
1, // HasLoadingBoundary value
165-
]
166-
167-
const result = prepareFlightRouterStateForRequest(flightRouterState)
168-
const decoded = JSON.parse(decodeURIComponent(result))
169-
170-
expect(decoded[5]).toBe(1)
171-
})
172-
173155
it('should handle minimal FlightRouterState (only segment and parallelRoutes)', () => {
174156
const flightRouterState: FlightRouterState = ['segment', {}]
175157

@@ -267,20 +249,17 @@ describe('prepareFlightRouterStateForRequest', () => {
267249
'/modal/path',
268250
'refresh',
269251
false,
270-
HasLoadingBoundary.SegmentHasLoadingBoundary,
271252
],
272253
},
273254
'/dashboard/url',
274255
'refetch',
275256
true,
276-
1,
277257
],
278258
sidebar: [['slug', 'user-123', 'd'], {}, '/sidebar/url', null],
279259
},
280260
'/main/url',
281261
'inside-shared-layout',
282262
true,
283-
1,
284263
]
285264

286265
const result = prepareFlightRouterStateForRequest(complexState)
@@ -291,7 +270,6 @@ describe('prepareFlightRouterStateForRequest', () => {
291270
expect(decoded[2]).toBeNull() // URL stripped
292271
expect(decoded[3]).toBe('inside-shared-layout') // server marker preserved
293272
expect(decoded[4]).toBe(true) // isRootLayout preserved
294-
expect(decoded[5]).toBe(1) // hasLoadingBoundary preserved
295273

296274
// Children route checks
297275
const childrenRoute = decoded[1].children
@@ -305,7 +283,6 @@ describe('prepareFlightRouterStateForRequest', () => {
305283
expect(modalRoute[2]).toBeNull() // URL stripped
306284
expect(modalRoute[3]).toBeNull() // 'refresh' marker stripped
307285
expect(modalRoute[4]).toBe(false) // isRootLayout preserved
308-
expect(modalRoute[5]).toBe(HasLoadingBoundary.SegmentHasLoadingBoundary) // hasLoadingBoundary preserved
309286

310287
// Sidebar route (dynamic segment) checks
311288
const sidebarRoute = decoded[1].sidebar

packages/next/src/client/flight-data-helpers.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ function stripClientOnlyDataFromFlightRouterState(
113113
_url, // Intentionally unused - URLs are client-only
114114
refreshMarker,
115115
isRootLayout,
116-
hasLoadingBoundary,
117116
] = flightRouterState
118117

119118
// __PAGE__ segments are always fetched from the server, so there's
@@ -138,9 +137,6 @@ function stripClientOnlyDataFromFlightRouterState(
138137
if (isRootLayout !== undefined) {
139138
result[4] = isRootLayout
140139
}
141-
if (hasLoadingBoundary !== undefined) {
142-
result[5] = hasLoadingBoundary
143-
}
144140

145141
return result
146142
}

0 commit comments

Comments
 (0)