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

Disable cache in testmode #63265

Merged
merged 1 commit into from
Mar 14, 2024
+19 −6
Merged

Disable cache in testmode #63265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions packages/next/src/server/lib/incremental-cache/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export class CacheHandler {

export class IncrementalCache implements IncrementalCacheType {
dev?: boolean
disableForTestmode?: boolean
cacheHandler?: CacheHandler
hasCustomCacheHandler: boolean
prerenderManifest: PrerenderManifest
Expand Down Expand Up @@ -142,6 +143,7 @@ export class IncrementalCache implements IncrementalCacheType {
maxMemoryCacheSize = parseInt(process.env.__NEXT_TEST_MAX_ISR_CACHE, 10)
}
this.dev = dev
this.disableForTestmode = process.env.NEXT_PRIVATE_TEST_PROXY === 'true'
// this is a hack to avoid Webpack knowing this is equal to this.minimalMode
// because we replace this.minimalMode to true in production bundles.
const minimalModeKey = 'minimalMode'
Expand Down Expand Up @@ -441,9 +443,10 @@ export class IncrementalCache implements IncrementalCacheType {
// we don't leverage the prerender cache in dev mode
// so that getStaticProps is always called for easier debugging
if (
this.dev &&
(ctx.kindHint !== 'fetch' ||
this.requestHeaders['cache-control'] === 'no-cache')
this.disableForTestmode ||
(this.dev &&
(ctx.kindHint !== 'fetch' ||
this.requestHeaders['cache-control'] === 'no-cache'))
) {
return null
}
Expand Down Expand Up @@ -560,7 +563,7 @@ export class IncrementalCache implements IncrementalCacheType {
})
}

if (this.dev && !ctx.fetchCache) return
if (this.disableForTestmode || (this.dev && !ctx.fetchCache)) return
// FetchCache has upper limit of 2MB per-entry currently
const itemSize = JSON.stringify(data).length
if (
Expand Down
14 changes: 12 additions & 2 deletions test/e2e/testmode/testmode.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ createNextDescribe(
proxyServer.close()
})

const fetchForTest = async (url: string) => {
const fetchForTest = async (url: string, testData?: string) => {
return next.fetch(url, {
headers: {
'Next-Test-Proxy-Port': String(proxyServer.port),
'Next-Test-Data': 'test1',
'Next-Test-Data': testData ?? 'test1',
},
})
}
Expand All @@ -53,6 +53,16 @@ createNextDescribe(
expect(html).toContain('<pre>test1</pre>')
})

it('should avoid fetch cache', async () => {
const html1 = await (await fetchForTest('/app/rsc-fetch')).text()
expect(html1).toContain('<pre>test1</pre>')

const html2 = await (
await fetchForTest('/app/rsc-fetch', 'test2')
).text()
expect(html2).toContain('<pre>test2</pre>')
})

it('should handle RSC with http.get in serverless function', async () => {
const html = await (await fetchForTest('/app/rsc-httpget')).text()
expect(html).toContain('<pre>test1</pre>')
Expand Down