Unverified Commit f72dc6a0 authored by Janka Uryga's avatar Janka Uryga Committed by GitHub

refactor: types for collected cache info in route modules (#71434)

adds types for `renderOpts.collectedRevalidate` & friends (only used in
route modules). nicer than doing `(context.renderOpts as any)`
everywhere
parent 1d3ffea6
...@@ -126,13 +126,13 @@ export async function exportAppRoute( ...@@ -126,13 +126,13 @@ export async function exportAppRoute(
await afterRunner.executeAfter() await afterRunner.executeAfter()
const revalidate = const revalidate =
typeof (context.renderOpts as any).collectedRevalidate === 'undefined' || typeof context.renderOpts.collectedRevalidate === 'undefined' ||
(context.renderOpts as any).collectedRevalidate >= INFINITE_CACHE context.renderOpts.collectedRevalidate >= INFINITE_CACHE
? false ? false
: (context.renderOpts as any).collectedRevalidate : context.renderOpts.collectedRevalidate
const headers = toNodeOutgoingHttpHeaders(response.headers) const headers = toNodeOutgoingHttpHeaders(response.headers)
const cacheTags = (context.renderOpts as any).collectedTags const cacheTags = context.renderOpts.collectedTags
if (cacheTags) { if (cacheTags) {
headers[NEXT_CACHE_TAGS_HEADER] = cacheTags headers[NEXT_CACHE_TAGS_HEADER] = cacheTags
......
...@@ -2506,7 +2506,7 @@ export default abstract class Server< ...@@ -2506,7 +2506,7 @@ export default abstract class Server<
context.renderOpts as any context.renderOpts as any
).fetchMetrics ).fetchMetrics
const cacheTags = (context.renderOpts as any).collectedTags const cacheTags = context.renderOpts.collectedTags
// If the request is for a static response, we can cache it so long // If the request is for a static response, we can cache it so long
// as it's not edge. // as it's not edge.
...@@ -2525,12 +2525,10 @@ export default abstract class Server< ...@@ -2525,12 +2525,10 @@ export default abstract class Server<
} }
const revalidate = const revalidate =
typeof (context.renderOpts as any).collectedRevalidate === typeof context.renderOpts.collectedRevalidate === 'undefined' ||
'undefined' || context.renderOpts.collectedRevalidate >= INFINITE_CACHE
(context.renderOpts as any).collectedRevalidate >=
INFINITE_CACHE
? false ? false
: (context.renderOpts as any).collectedRevalidate : context.renderOpts.collectedRevalidate
// Create the cache entry for the response. // Create the cache entry for the response.
const cacheEntry: ResponseCacheEntry = { const cacheEntry: ResponseCacheEntry = {
......
...@@ -100,10 +100,18 @@ export type AppRouteModule = typeof import('../../../build/templates/app-route') ...@@ -100,10 +100,18 @@ export type AppRouteModule = typeof import('../../../build/templates/app-route')
*/ */
export interface AppRouteRouteHandlerContext extends RouteModuleHandleContext { export interface AppRouteRouteHandlerContext extends RouteModuleHandleContext {
renderOpts: WorkStoreContext['renderOpts'] & renderOpts: WorkStoreContext['renderOpts'] &
Pick<RenderOptsPartial, 'onInstrumentationRequestError'> Pick<RenderOptsPartial, 'onInstrumentationRequestError'> &
CollectedCacheInfo
prerenderManifest: DeepReadonly<PrerenderManifest> prerenderManifest: DeepReadonly<PrerenderManifest>
} }
type CollectedCacheInfo = {
collectedTags?: string
collectedRevalidate?: number
collectedExpire?: number
collectedStale?: number
}
/** /**
* AppRouteHandlerFnContext is the context that is passed to the handler as the * AppRouteHandlerFnContext is the context that is passed to the handler as the
* second argument. * second argument.
...@@ -590,12 +598,10 @@ export class AppRouteRouteModule extends RouteModule< ...@@ -590,12 +598,10 @@ export class AppRouteRouteModule extends RouteModule<
]) ])
if (prerenderStore) { if (prerenderStore) {
;(context.renderOpts as any).collectedTags = context.renderOpts.collectedTags = prerenderStore.tags?.join(',')
prerenderStore.tags?.join(',') context.renderOpts.collectedRevalidate = prerenderStore.revalidate
;(context.renderOpts as any).collectedRevalidate = context.renderOpts.collectedExpire = prerenderStore.expire
prerenderStore.revalidate context.renderOpts.collectedStale = prerenderStore.stale
;(context.renderOpts as any).collectedExpire = prerenderStore.expire
;(context.renderOpts as any).collectedStale = prerenderStore.stale
} }
// It's possible cookies were set in the handler, so we need // It's possible cookies were set in the handler, so we need
......
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