fix: mark prerendered content as less stale now that expire setting is enforced for marking for blocking re-render

Author: pieh

src/build/content/prerendered.ts

@@ -59,6 +59,7 @@ const routeToFilePath = (path: string) => {
 const buildPagesCacheValue = async (
   path: string,
   initialRevalidateSeconds: number | false | undefined,
+  initialExpireSeconds: number | undefined,
   shouldUseEnumKind: boolean,
   shouldSkipJson = false,
 ): Promise<NetlifyCachedPageValue> => ({
@@ -68,6 +69,12 @@ const buildPagesCacheValue = async (
   headers: undefined,
   status: undefined,
   revalidate: initialRevalidateSeconds,
+  cacheControl: initialRevalidateSeconds
+    ? {
+        revalidate: initialRevalidateSeconds,
+        expire: initialExpireSeconds,
+      }
+    : undefined,
 })
 
 const RSC_SEGMENTS_DIR_SUFFIX = '.segments'
@@ -157,10 +164,20 @@ const buildRouteCacheValue = async (
 
 const buildFetchCacheValue = async (
   path: string,
-): Promise<CachedFetchValueForMultipleVersions> => ({
-  kind: 'FETCH',
-  ...JSON.parse(await readFile(path, 'utf-8')),
-})
+): Promise<{ value: CachedFetchValueForMultipleVersions; lastModified: number }> => {
+  const data = JSON.parse(await readFile(path, 'utf-8')) as Omit<
+    CachedFetchValueForMultipleVersions,
+    'kind'
+  >
+
+  return {
+    value: {
+      kind: 'FETCH',
+      ...data,
+    },
+    lastModified: Date.now() - (data?.revalidate ?? 31536000000),
+  }
+}
 
 /**
  * Upload prerendered content to the blob store
@@ -201,7 +218,7 @@ export const copyPrerenderedContent = async (ctx: PluginContext): Promise<void>
           ([route, meta]): Promise<void> =>
             limitConcurrentPrerenderContentHandling(async () => {
               const lastModified = meta.initialRevalidateSeconds
-                ? Date.now() - 31536000000
+                ? Date.now() - meta.initialRevalidateSeconds * 1000
                 : Date.now()
               const key = routeToFilePath(route)
               let value: NetlifyIncrementalCacheValue
@@ -218,6 +235,7 @@ export const copyPrerenderedContent = async (ctx: PluginContext): Promise<void>
                   value = await buildPagesCacheValue(
                     join(ctx.publishDir, 'server/pages', key),
                     meta.initialRevalidateSeconds,
+                    meta.initialExpireSeconds,
                     shouldUseEnumKind,
                   )
                   break
@@ -256,6 +274,7 @@ export const copyPrerenderedContent = async (ctx: PluginContext): Promise<void>
             const value = await buildPagesCacheValue(
               join(ctx.publishDir, 'server/pages', key),
               undefined,
+              undefined,
               shouldUseEnumKind,
               true, // there is no corresponding json file for fallback, so we are skipping it for this entry
             )
@@ -310,9 +329,8 @@ export const copyFetchContent = async (ctx: PluginContext): Promise<void> => {
 
     await Promise.all(
       paths.map(async (key): Promise<void> => {
-        const lastModified = Date.now() - 31536000000
         const path = join(ctx.publishDir, 'cache/fetch-cache', key)
-        const value = await buildFetchCacheValue(path)
+        const { value, lastModified } = await buildFetchCacheValue(path)
         await writeCacheEntry(key, value, lastModified, ctx)
       }),
     )