Merge pull request #1368 from aligent/fix/prerender_behaviour

Fix/prerender behaviour
aligent · May 14, 2024 · 87dc02a · 87dc02a
2 parents 1dbe700 + 5fcf558
commit 87dc02a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/packages/prerender-proxy/lib/handlers/cache-control.ts b/packages/prerender-proxy/lib/handlers/cache-control.ts
@@ -7,9 +7,8 @@ export const handler = async (
   const cacheKey = process.env.PRERENDER_CACHE_KEY || "x-prerender-requestid";
   const cacheMaxAge = process.env.PRERENDER_CACHE_MAX_AGE || "0";
   const response = event.Records[0].cf.response;
-
   if (response.headers[`${cacheKey}`]) {
-    response.headers["Cache-Control"] = [
+    response.headers["cache-control"] = [
       {
         key: "Cache-Control",
         value: `max-age=${cacheMaxAge}`,

diff --git a/packages/prerender-proxy/package.json b/packages/prerender-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aligent/cdk-prerender-proxy",
-  "version": "2.0.0",
+  "version": "2.1.4",
   "description": "Cloudfront Lambda@Edge constructs for integrating with prerender.io",
   "main": "index.js",
   "scripts": {

diff --git a/packages/static-hosting/lib/static-hosting.ts b/packages/static-hosting/lib/static-hosting.ts
@@ -317,8 +317,8 @@ export class StaticHosting extends Construct {
     const siteNameArray: Array<string> = [siteName];
     const enforceSSL = props.enforceSSL !== false;
     const enableStaticFileRemap = props.enableStaticFileRemap !== false;
-    const defaultRootObject = props.defaultRootObject ?? "/index.html";
-    const errorResponsePagePath = props.errorResponsePagePath ?? "/index.html";
+    const defaultRootObject = props.defaultRootObject ?? "index.html";
+    const errorResponsePagePath = props.errorResponsePagePath ?? "index.html";
     const defaultBehaviorEdgeLambdas = props.defaultBehaviorEdgeLambdas ?? [];
     const disableCSP = props.disableCSP === true;
 
@@ -427,14 +427,21 @@ export class StaticHosting extends Construct {
     const originRequestPolicy =
       props.defaultBehaviorRequestPolicy ||
       new OriginRequestPolicy(this, "S3OriginRequestPolicy", {
-        headerBehavior:
-          OriginRequestHeaderBehavior.allowList("x-forwarded-host"),
+        headerBehavior: OriginRequestHeaderBehavior.allowList(
+          "x-forwarded-host",
+          "x-request-prerender",
+          "x-prerender"
+        ),
       });
 
     const originCachePolicy =
       props.defaultBehaviorCachePolicy ||
       new CachePolicy(this, "S3OriginCachePolicy", {
-        headerBehavior: CacheHeaderBehavior.allowList("x-forwarded-host"),
+        headerBehavior: CacheHeaderBehavior.allowList(
+          "x-forwarded-host",
+          "x-request-prerender",
+          "x-prerender"
+        ),
         enableAcceptEncodingBrotli: true,
         enableAcceptEncodingGzip: true,
       });