mirror of
https://github.com/hanzoai/next.js.git
synced 2026-09-24 17:00:51 +00:00
Zack TannerandGitHub
3be4ec6592
When using `fetch('', { cache: 'force-cache', { next: { revalidate: 5 } })` on a page that bailed out of ISR, we were effectively ignoring both values and treating the fetch as uncacheable, for several reasons:
- When `cache` and `revalidate` are both specified, we were assuming any combination of the two values is invalid, and we'd unset both the revalidate & fetch configs. In actuality these two properties are only problematic when they convey different caching semantics. This check was modified to instead only warn & unset on conflicting values, specifically `cache: 'no-store` and `revalidate: >0` as well as `cache: 'force-cache'` and `revalidate: 0`.
- When `force-dynamic` was set, we'd opt into no-store behavior on the fetch even if the fetch had an explicit cache config, which is incorrect.
Fixes #71881
77 lines
2.7 KiB
TypeScript
77 lines
2.7 KiB
TypeScript
import { retry } from 'next-test-utils'
|
|
import { nextTestSetup } from 'e2e-utils'
|
|
|
|
describe('app-dir - fetch warnings', () => {
|
|
const { next, skipped, isNextDev } = nextTestSetup({
|
|
skipDeployment: true,
|
|
files: __dirname,
|
|
})
|
|
|
|
if (skipped) {
|
|
return
|
|
}
|
|
|
|
beforeAll(async () => {
|
|
// we don't need verbose logging (enabled by default in this Next app) for these tests to work
|
|
// we avoid enabling it since it's not currently compatible with Turbopack.
|
|
await next.stop()
|
|
await next.deleteFile('next.config.js')
|
|
await next.start()
|
|
await next.fetch('/cache-revalidate')
|
|
})
|
|
|
|
if (isNextDev) {
|
|
describe('force-cache and revalidate: 0', () => {
|
|
it('should log when request input is a string', async () => {
|
|
await retry(() => {
|
|
expect(next.cliOutput).toInclude(`
|
|
│ GET https://next-data-api-endpoint.vercel.app/api/random?request-string
|
|
│ │ ⚠ Specified "cache: force-cache" and "revalidate: 0", only one should be specified.`)
|
|
})
|
|
})
|
|
|
|
it('should log when request input is a Request instance', async () => {
|
|
await retry(() => {
|
|
expect(next.cliOutput).toInclude(`
|
|
│ GET https://next-data-api-endpoint.vercel.app/api/random?request-input-cache-override
|
|
│ │ ⚠ Specified "cache: force-cache" and "revalidate: 0", only one should be specified.`)
|
|
})
|
|
})
|
|
|
|
it('should not log when not overriding cache within the Request object', async () => {
|
|
await retry(() => {
|
|
expect(next.cliOutput).not.toInclude(`
|
|
│ GET https://next-data-api-endpoint.vercel.app/api/random?request-input
|
|
│ │ ⚠ Specified "cache:`)
|
|
})
|
|
})
|
|
})
|
|
|
|
describe('no-store and revalidate > 0', () => {
|
|
it('should log when request input is a string', async () => {
|
|
await retry(() => {
|
|
expect(next.cliOutput).toInclude(`
|
|
│ GET https://next-data-api-endpoint.vercel.app/api/random?no-store-request-string
|
|
│ │ ⚠ Specified "cache: no-store" and "revalidate: 3", only one should be specified.`)
|
|
})
|
|
})
|
|
|
|
it('should log when request input is a Request instance', async () => {
|
|
await retry(() => {
|
|
expect(next.cliOutput).toInclude(`
|
|
│ GET https://next-data-api-endpoint.vercel.app/api/random?no-store-request-input-cache-override
|
|
│ │ ⚠ Specified "cache: no-store" and "revalidate: 3", only one should be specified.`)
|
|
})
|
|
})
|
|
})
|
|
} else {
|
|
it('should not log fetch warnings in production', async () => {
|
|
await retry(() => {
|
|
expect(next.cliOutput).not.toInclude(
|
|
'⚠ Specified "cache: force-cache" and "revalidate: 3", only one should be specified.'
|
|
)
|
|
})
|
|
})
|
|
}
|
|
})
|