Unverified Commit fcac2e2b authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Move fetch revalidate config under next options (#41505)

x-ref:
[slack-thread](https://vercel.slack.com/archives/C035J346QQL/p1665425741387879)
parent 1e47930d
...@@ -207,9 +207,8 @@ function patchFetch(ComponentMod: any) { ...@@ -207,9 +207,8 @@ function patchFetch(ComponentMod: any) {
const staticGenerationAsyncStorage = ComponentMod.staticGenerationAsyncStorage const staticGenerationAsyncStorage = ComponentMod.staticGenerationAsyncStorage
const origFetch = (global as any).fetch const origFetch = globalThis.fetch
globalThis.fetch = async (url, opts) => {
;(global as any).fetch = async (init: any, opts: any) => {
const staticGenerationStore = const staticGenerationStore =
'getStore' in staticGenerationAsyncStorage 'getStore' in staticGenerationAsyncStorage
? staticGenerationAsyncStorage.getStore() ? staticGenerationAsyncStorage.getStore()
...@@ -225,20 +224,31 @@ function patchFetch(ComponentMod: any) { ...@@ -225,20 +224,31 @@ function patchFetch(ComponentMod: any) {
// TODO: ensure this error isn't logged to the user // TODO: ensure this error isn't logged to the user
// seems it's slipping through currently // seems it's slipping through currently
throw new DynamicServerError( throw new DynamicServerError(
`no-store fetch ${init}${pathname ? ` ${pathname}` : ''}` `no-store fetch ${url}${pathname ? ` ${pathname}` : ''}`
) )
} }
const hasNextConfig = 'next' in opts
const next = (hasNextConfig && opts.next) || {}
if ( if (
typeof opts.revalidate === 'number' && typeof next.revalidate === 'number' &&
(typeof fetchRevalidate === 'undefined' || (typeof fetchRevalidate === 'undefined' ||
opts.revalidate < fetchRevalidate) next.revalidate < fetchRevalidate)
) { ) {
staticGenerationStore.fetchRevalidate = opts.revalidate staticGenerationStore.fetchRevalidate = next.revalidate
// TODO: ensure this error isn't logged to the user
// seems it's slipping through currently
throw new DynamicServerError(
`revalidate: ${next.revalidate} fetch ${url}${
pathname ? ` ${pathname}` : ''
}`
)
} }
if (hasNextConfig) delete opts.next
} }
} }
return origFetch(init, opts) return origFetch(url, opts)
} }
} }
......
...@@ -32,3 +32,12 @@ declare module '*.module.scss' { ...@@ -32,3 +32,12 @@ declare module '*.module.scss' {
interface Window { interface Window {
MSInputMethodContext?: unknown MSInputMethodContext?: unknown
} }
type NextFetchRequestConfig = {
revalidate?: number
}
declare function fetch(
url: RequestInfo,
opts: RequestInit & { next?: NextFetchRequestConfig }
): Promise<Response>
...@@ -59,7 +59,8 @@ describe('app-dir static/dynamic handling', () => { ...@@ -59,7 +59,8 @@ describe('app-dir static/dynamic handling', () => {
'blog/tim/first-post.rsc', 'blog/tim/first-post.rsc',
'dynamic-no-gen-params-ssr/[slug]/page.js', 'dynamic-no-gen-params-ssr/[slug]/page.js',
'dynamic-no-gen-params/[slug]/page.js', 'dynamic-no-gen-params/[slug]/page.js',
'ssr-auto/page.js', 'ssr-auto/cache-no-store/page.js',
'ssr-auto/fetch-revalidate-zero/page.js',
'ssr-forced/page.js', 'ssr-forced/page.js',
]) ])
}) })
...@@ -264,8 +265,9 @@ describe('app-dir static/dynamic handling', () => { ...@@ -264,8 +265,9 @@ describe('app-dir static/dynamic handling', () => {
expect(await browser.eval('window.beforeNav')).toBe(1) expect(await browser.eval('window.beforeNav')).toBe(1)
}) })
it('should ssr dynamically when detected automatically', async () => { it('should ssr dynamically when detected automatically with fetch cache option', async () => {
const initialRes = await fetchViaHTTP(next.url, '/ssr-auto', undefined, { const pathname = '/ssr-auto/cache-no-store'
const initialRes = await fetchViaHTTP(next.url, pathname, undefined, {
redirect: 'manual', redirect: 'manual',
}) })
expect(initialRes.status).toBe(200) expect(initialRes.status).toBe(200)
...@@ -273,12 +275,12 @@ describe('app-dir static/dynamic handling', () => { ...@@ -273,12 +275,12 @@ describe('app-dir static/dynamic handling', () => {
const initialHtml = await initialRes.text() const initialHtml = await initialRes.text()
const initial$ = cheerio.load(initialHtml) const initial$ = cheerio.load(initialHtml)
expect(initial$('#page').text()).toBe('/ssr-auto') expect(initial$('#page').text()).toBe(pathname)
const initialDate = initial$('#date').text() const initialDate = initial$('#date').text()
expect(initialHtml).toContain('Example Domain') expect(initialHtml).toContain('Example Domain')
const secondRes = await fetchViaHTTP(next.url, '/ssr-auto', undefined, { const secondRes = await fetchViaHTTP(next.url, pathname, undefined, {
redirect: 'manual', redirect: 'manual',
}) })
expect(secondRes.status).toBe(200) expect(secondRes.status).toBe(200)
...@@ -286,7 +288,38 @@ describe('app-dir static/dynamic handling', () => { ...@@ -286,7 +288,38 @@ describe('app-dir static/dynamic handling', () => {
const secondHtml = await secondRes.text() const secondHtml = await secondRes.text()
const second$ = cheerio.load(secondHtml) const second$ = cheerio.load(secondHtml)
expect(second$('#page').text()).toBe('/ssr-auto') expect(second$('#page').text()).toBe(pathname)
const secondDate = second$('#date').text()
expect(secondHtml).toContain('Example Domain')
expect(secondDate).not.toBe(initialDate)
})
// TODO-APP: support fetch revalidate case for dynamic rendering
it.skip('should ssr dynamically when detected automatically with fetch revalidate option', async () => {
const pathname = '/ssr-auto/fetch-revalidate-zero'
const initialRes = await fetchViaHTTP(next.url, pathname, undefined, {
redirect: 'manual',
})
expect(initialRes.status).toBe(200)
const initialHtml = await initialRes.text()
const initial$ = cheerio.load(initialHtml)
expect(initial$('#page').text()).toBe(pathname)
const initialDate = initial$('#date').text()
expect(initialHtml).toContain('Example Domain')
const secondRes = await fetchViaHTTP(next.url, pathname, undefined, {
redirect: 'manual',
})
expect(secondRes.status).toBe(200)
const secondHtml = await secondRes.text()
const second$ = cheerio.load(secondHtml)
expect(second$('#page').text()).toBe(pathname)
const secondDate = second$('#date').text() const secondDate = second$('#date').text()
expect(secondHtml).toContain('Example Domain') expect(secondHtml).toContain('Example Domain')
......
import { cache, use } from '../../lib/utils' import { cache, use } from '../../../lib/utils'
export default function Page() { export default function Page() {
const getData = () => const getData = () =>
...@@ -12,7 +12,7 @@ export default function Page() { ...@@ -12,7 +12,7 @@ export default function Page() {
return ( return (
<> <>
<p id="page">/ssr-auto</p> <p id="page">/ssr-auto/cache-no-store</p>
<div id="example-dat">{data}</div> <div id="example-dat">{data}</div>
<p id="date">{Date.now()}</p> <p id="date">{Date.now()}</p>
</> </>
......
export default function Page() {
return <p>loading...</p>
}
import { cache, use } from '../../../lib/utils'
export default function Page() {
const getData = () =>
fetch('https://example.vercel.sh', {
next: { revalidate: 0 },
})
.then((res) => res.text())
.then((text) => new Promise((res) => setTimeout(() => res(text), 1000)))
const dataPromise = cache(getData)
const data = use(dataPromise)
return (
<>
<p id="page">/ssr-auto/fetch-revalidate-zero</p>
<div id="example-dat">{data}</div>
<p id="date">{Date.now()}</p>
</>
)
}
// TODO-APP: remove revalidate config once next.revalidate is supported
export const config = {
revalidate: 0,
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment