test: mark cache field

Author: blueMountain007

packages/libs/lambda-at-edge/src/default-handler.ts

@@ -1107,7 +1107,7 @@ const handleOriginResponse = async ({
           .replace(".json", ".html")}`,
         Body: html,
         ContentType: "text/html",
-        CacheControl: "public, max-age=0, s-maxage=2678400, must-revalidate"
+        CacheControl: "public, max-age=0, s-maxage=2678401, must-revalidate"
       };
 
       debug(region);
@@ -1178,7 +1178,7 @@ const handleOriginResponse = async ({
               CacheControl ??
               (hasFallback.fallback // Use cache-control from S3 response if possible, otherwise use defaults
                 ? "public, max-age=0, s-maxage=0, must-revalidate" // fallback should never be cached
-                : "public, max-age=0, s-maxage=2678400, must-revalidate")
+                : "public, max-age=0, s-maxage=2678411, must-revalidate")
           }
         ]
       },
@@ -1343,7 +1343,7 @@ export const generatePermanentPageResponse = async (
       "cache-control": [
         {
           key: "Cache-Control",
-          value: "public, max-age=0, s-maxage=2678400, must-revalidate"
+          value: "public, max-age=0, s-maxage=2678402, must-revalidate"
         }
       ]
     },

packages/libs/lambda-at-edge/src/services/s3.service.ts

@@ -68,7 +68,7 @@ export class S3Service {
         Body: body,
         Bucket: this.options.bucketName,
         ContentType: contentType,
-        CacheControl: "public, max-age=0, s-maxage=2678400, must-revalidate"
+        CacheControl: "public, max-age=0, s-maxage=2678403, must-revalidate"
       })
     );
   }

packages/libs/s3-static-assets/src/index.ts

@@ -6,7 +6,12 @@ import filterOutDirectories from "./lib/filterOutDirectories";
 import {
   IMMUTABLE_CACHE_CONTROL_HEADER,
   SERVER_NO_CACHE_CACHE_CONTROL_HEADER,
-  SERVER_CACHE_CONTROL_HEADER
+  SERVER_CACHE_CONTROL_HEADER,
+  SERVER_CACHE_CONTROL_HEADER1,
+  SERVER_CACHE_CONTROL_HEADER2,
+  SERVER_CACHE_CONTROL_HEADER3,
+  SERVER_CACHE_CONTROL_HEADER4,
+  SERVER_CACHE_CONTROL_HEADER5
 } from "./lib/constants";
 import S3ClientFactory, { Credentials } from "./lib/s3";
 import pathToPosix from "./lib/pathToPosix";
@@ -137,7 +142,7 @@ const uploadStaticAssetsFromBuild = async (
           filePath: fileItem.path,
           cacheControl: isAbTestPath
             ? SERVER_NO_CACHE_CACHE_CONTROL_HEADER
-            : SERVER_CACHE_CONTROL_HEADER
+            : SERVER_CACHE_CONTROL_HEADER1
         });
       }
     });
@@ -248,7 +253,7 @@ const uploadStaticAssets = async (
           )
         ),
         filePath: pageFilePath,
-        cacheControl: SERVER_CACHE_CONTROL_HEADER
+        cacheControl: SERVER_CACHE_CONTROL_HEADER2
       });
     });
 
@@ -273,7 +278,7 @@ const uploadStaticAssets = async (
         withBasePath(prerenderManifest.routes[key].dataRoute.slice(1))
       ),
       filePath: pageFilePath,
-      cacheControl: SERVER_CACHE_CONTROL_HEADER
+      cacheControl: SERVER_CACHE_CONTROL_HEADER3
     });
   });
 
@@ -293,7 +298,7 @@ const uploadStaticAssets = async (
         withBasePath(path.posix.join("static-pages", relativePageFilePath))
       ),
       filePath: pageFilePath,
-      cacheControl: SERVER_CACHE_CONTROL_HEADER
+      cacheControl: SERVER_CACHE_CONTROL_HEADER4
     });
   });
 
@@ -313,7 +318,7 @@ const uploadStaticAssets = async (
           withBasePath(path.posix.join("static-pages", fallback))
         ),
         filePath: pageFilePath,
-        cacheControl: SERVER_CACHE_CONTROL_HEADER
+        cacheControl: SERVER_CACHE_CONTROL_HEADER5
       });
     });
 

packages/libs/s3-static-assets/src/lib/constants.ts

@@ -2,7 +2,22 @@ export const IMMUTABLE_CACHE_CONTROL_HEADER =
   "public, max-age=31536000, immutable";
 
 export const SERVER_CACHE_CONTROL_HEADER =
-  "public, max-age=0, s-maxage=2678400, must-revalidate";
+  "public, max-age=0, s-maxage=2678404, must-revalidate";
+
+export const SERVER_CACHE_CONTROL_HEADER1 =
+  "public, max-age=0, s-maxage=2678405, must-revalidate";
+
+export const SERVER_CACHE_CONTROL_HEADER2 =
+  "public, max-age=0, s-maxage=2678406, must-revalidate";
+
+export const SERVER_CACHE_CONTROL_HEADER3 =
+  "public, max-age=0, s-maxage=2678407, must-revalidate";
+
+export const SERVER_CACHE_CONTROL_HEADER4 =
+  "public, max-age=0, s-maxage=2678408, must-revalidate";
+
+export const SERVER_CACHE_CONTROL_HEADER5 =
+  "public, max-age=0, s-maxage=2678409, must-revalidate";
 
 export const DEFAULT_PUBLIC_DIR_CACHE_CONTROL =
   "public, max-age=31536000, must-revalidate";