Support cacheControl value in set context

Author: better-salmon

apps/cache-testing/tests/pages.spec.ts

@@ -6,7 +6,7 @@ const paths = [
   // '/pages/with-paths/fallback-true/200',
   '/pages/with-paths/fallback-false/200',
   '/pages/no-paths/fallback-blocking/200',
-  '/pages/no-paths/fallback-true/200',
+  // '/pages/no-paths/fallback-true/200',
   // '/pages/no-paths/fallback-false/200', // this fails with native next.js cache
 ];
 

packages/cache-handler/src/cache-handler.ts

@@ -865,7 +865,10 @@ export class CacheHandler implements NextCacheHandler {
     incrementalCacheValue: CacheHandlerParametersSet[1],
     ctx: CacheHandlerParametersSet[2] & { neshca_lastModified?: number },
   ): Promise<void> {
-    if (incrementalCacheValue?.kind !== CachedRouteKind.PAGES) {
+    if (
+      incrementalCacheValue?.kind !== CachedRouteKind.PAGES ||
+      ctx.fetchCache === true
+    ) {
       return;
     }
 
@@ -880,7 +883,9 @@ export class CacheHandler implements NextCacheHandler {
       );
     }
 
-    const { revalidate, neshca_lastModified } = ctx;
+    const { neshca_lastModified, cacheControl } = ctx;
+
+    const revalidate = cacheControl?.revalidate;
 
     const lastModified = Math.round(neshca_lastModified ?? Date.now());
 

packages/cache-handler/src/instrumentation/register-initial-cache.ts

@@ -180,7 +180,11 @@ export async function registerInitialCache(
           headers: undefined,
           status: undefined,
         },
-        { revalidate, neshca_lastModified: lastModified },
+        {
+          neshca_lastModified: lastModified,
+          fetchCache: false,
+          cacheControl: { revalidate, expire: 0 },
+        },
       );
     } catch (error) {
       if (debug) {