49d5e362d4
Lands #37431 again, but it only solves the re-render issue completely for the middleware case (closes #38267), not the `rewrites` case (#37139). For `rewrites`, the blocker is `isReady` always being `false` initially and to match the markup on hydration we can't simply work around it without a re-render. Need to come up with another fix. ## Bug - [x] Related issues linked using `fixes #number` - [x] Integration tests added - [ ] Errors have helpful link attached, see `contributing.md` ## Feature - [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Documentation added - [ ] Telemetry added. In case of a feature if it's used or not. - [ ] Errors have helpful link attached, see `contributing.md` ## Documentation / Examples - [ ] Make sure the linting passes by running `pnpm lint` - [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
32 lines
886 B
TypeScript
32 lines
886 B
TypeScript
import type { default as Router } from '../router'
|
|
|
|
export function compareRouterStates(a: Router['state'], b: Router['state']) {
|
|
const stateKeys = Object.keys(a)
|
|
if (stateKeys.length !== Object.keys(b).length) return false
|
|
|
|
for (let i = stateKeys.length; i--; ) {
|
|
const key = stateKeys[i]
|
|
if (key === 'query') {
|
|
const queryKeys = Object.keys(a.query)
|
|
if (queryKeys.length !== Object.keys(b.query).length) {
|
|
return false
|
|
}
|
|
for (let j = queryKeys.length; j--; ) {
|
|
const queryKey = queryKeys[j]
|
|
if (
|
|
!b.query.hasOwnProperty(queryKey) ||
|
|
a.query[queryKey] !== b.query[queryKey]
|
|
) {
|
|
return false
|
|
}
|
|
}
|
|
} else if (
|
|
!b.hasOwnProperty(key) ||
|
|
a[key as keyof Router['state']] !== b[key as keyof Router['state']]
|
|
) {
|
|
return false
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|