Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add state comparison to router (#38422)
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)
- Loading branch information
Showing
6 changed files
with
168 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
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 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
import { NextResponse } from 'next/server' | ||
|
||
export function middleware() { | ||
return NextResponse.next() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
module.exports = { | ||
// rewrites() { | ||
// return [ | ||
// { | ||
// source: '/rewrite', | ||
// destination: '/?foo=bar', | ||
// }, | ||
// ] | ||
// }, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import { useEffect } from 'react' | ||
import { useRouter } from 'next/router' | ||
|
||
export default function Index() { | ||
const { query } = useRouter() | ||
|
||
useEffect(() => { | ||
window.__renders = window.__renders || [] | ||
window.__renders.push(query.foo) | ||
}) | ||
|
||
return <p>A page should not be rerendered if unnecessary.</p> | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* eslint-env jest */ | ||
|
||
import { join } from 'path' | ||
import { | ||
findPort, | ||
killApp, | ||
launchApp, | ||
nextBuild, | ||
nextStart, | ||
} from 'next-test-utils' | ||
import webdriver from 'next-webdriver' | ||
|
||
const appDir = join(__dirname, '../') | ||
|
||
let appPort | ||
let app | ||
|
||
const runTests = () => { | ||
describe('with middleware', () => { | ||
it('should not trigger unncessary rerenders when middleware is used', async () => { | ||
const browser = await webdriver(appPort, '/') | ||
await new Promise((resolve) => setTimeout(resolve, 100)) | ||
|
||
expect(await browser.eval('window.__renders')).toEqual([undefined]) | ||
}) | ||
}) | ||
|
||
describe('with rewrites', () => { | ||
// TODO: Figure out the `isReady` issue. | ||
it.skip('should not trigger unncessary rerenders when rewrites are used', async () => {}) | ||
it.skip('should rerender with the correct query parameter if present with rewrites', async () => {}) | ||
}) | ||
} | ||
|
||
describe('router rerender', () => { | ||
describe('dev mode', () => { | ||
beforeAll(async () => { | ||
appPort = await findPort() | ||
app = await launchApp(appDir, appPort) | ||
}) | ||
afterAll(() => killApp(app)) | ||
|
||
runTests() | ||
}) | ||
|
||
describe('production mode', () => { | ||
beforeAll(async () => { | ||
await nextBuild(appDir) | ||
appPort = await findPort() | ||
app = await nextStart(appDir, appPort) | ||
}) | ||
afterAll(() => killApp(app)) | ||
|
||
runTests() | ||
}) | ||
}) |