Fix back button behavior in some cases

charlie-hadden · Nov 18, 2023 · 60fb324 · 60fb324
1 parent fc78862
commit 60fb324
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.changeset/eighty-cars-repeat.md b/.changeset/eighty-cars-repeat.md
@@ -0,0 +1,5 @@
+---
+"astro-suspense": patch
+---
+
+Set vary header to avoid incorrect back button behavior.
diff --git a/packages/astro-suspense/src/middleware.ts b/packages/astro-suspense/src/middleware.ts
@@ -36,14 +36,25 @@ export const onRequest = defineMiddleware(async (ctx, next) => {
       ...response,
       headers: {
         ...response.headers,
+        vary: [response.headers.get("vary"), "astro-suspense-transition"]
+          .filter(Boolean)
+          .join("\n"),
         "content-type": "text/astro-suspense-transition-stream",
       },
     });
   }
 
   const stream = transformStream(ctx.locals.suspensePromises, response.body);
 
-  return new Response(stream, response);
+  return new Response(stream, {
+    ...response,
+    headers: {
+      ...response.headers,
+      vary: [response.headers.get("vary"), "astro-suspense-transition"]
+        .filter(Boolean)
+        .join("\n"),
+    },
+  });
 });
 
 function transformStream(