Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

app-router: tweak prefetch cache status heuristics #53864

Merged
merged 4 commits into from
Aug 20, 2023
Merged

app-router: tweak prefetch cache status heuristics #53864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b312ef
update test
feedthejim Aug 10, 2023
a9dd3a2
switch heuristics
feedthejim Aug 10, 2023
eb203b5
switch heuristics agian
feedthejim Aug 11, 2023
420d4cc
Merge branch 'canary' into feedthejim/tweak-client-caching
kodiakhq[bot] Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/next/src/client/components/router-reducer/reducers/navigate-reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,11 @@ export function navigateReducer(
// Unwrap cache data with `use` to suspend here (in the reducer) until the fetch resolves.
const [flightData, canonicalUrlOverride] = readRecordValue(data!)

// important: we should only mark the cache node as dirty after we unsuspend from the call above
prefetchValues.lastUsedTime = Date.now()
// we only want to mark this once
if (!prefetchValues.lastUsedTime) {
// important: we should only mark the cache node as dirty after we unsuspend from the call above
prefetchValues.lastUsedTime = Date.now()
}

// Handle case when navigating to page in `pages` from `app`
if (typeof flightData === 'string') {
Expand Down
16 changes: 14 additions & 2 deletions test/e2e/app-dir/app-client-cache/client-cache.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ createNextDescribe(

expect(number).toBe(randomNumber)

await browser.eval(fastForwardTo, 30 * 1000)
await browser.eval(fastForwardTo, 5 * 1000)

await browser.elementByCss('[href="/"]').click()

Expand All @@ -314,7 +314,19 @@ createNextDescribe(
.waitForElementByCss('#random-number')
.text()

expect(newNumber).not.toBe(randomNumber)
expect(newNumber).toBe(randomNumber)

await browser.eval(fastForwardTo, 30 * 1000)

await browser.elementByCss('[href="/"]').click()

const newNumber2 = await browser
.elementByCss('[href="/1"]')
.click()
.waitForElementByCss('#random-number')
.text()

expect(newNumber2).not.toBe(newNumber)
})
it('should refetch below the fold after 30 seconds', async () => {
const randomLoadingNumber = await browser
Expand Down
Loading