fix crash when headers is an array (#220)

khuezy · web-flow · commit bfd7afab5b0a · 2023-09-08T05:45:43.000-07:00
diff --git a/packages/open-next/src/adapters/plugins/routing/util.ts b/packages/open-next/src/adapters/plugins/routing/util.ts
@@ -54,14 +54,19 @@ export function fixCacheHeaderForHtmlPages(
   }
 }
 
-export function fixSWRCacheHeader(headers: Record<string, string | undefined>) {
+export function fixSWRCacheHeader(
+  headers: Record<string, string | string[] | undefined>,
+) {
   // WORKAROUND: `NextServer` does not set correct SWR cache headers — https://github.com/serverless-stack/open-next#workaround-nextserver-does-not-set-correct-swr-cache-headers
-  if (headers["cache-control"]) {
-    headers["cache-control"] = headers["cache-control"].replace(
-      /\bstale-while-revalidate(?!=)/,
-      "stale-while-revalidate=2592000", // 30 days
-    );
+  let cacheControl = headers["cache-control"];
+  if (!cacheControl) return;
+  if (Array.isArray(cacheControl)) {
+    cacheControl = cacheControl.join(",");
   }
+  headers["cache-control"] = cacheControl.replace(
+    /\bstale-while-revalidate(?!=)/,
+    "stale-while-revalidate=2592000", // 30 days
+  );
 }
 
 export function addOpenNextHeader(headers: Record<string, string | undefined>) {

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,19 @@ export function fixCacheHeaderForHtmlPages(`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-export function fixSWRCacheHeader(headers: Record<string, string \| undefined>) {`
	`57`	`+export function fixSWRCacheHeader(`
	`58`	`+ headers: Record<string, string \| string[] \| undefined>,`
	`59`	`+) {`
`58`	`60`	// WORKAROUND: `NextServer` does not set correct SWR cache headers — https://github.com/serverless-stack/open-next#workaround-nextserver-does-not-set-correct-swr-cache-headers
`59`		`- if (headers["cache-control"]) {`
`60`		`- headers["cache-control"] = headers["cache-control"].replace(`
`61`		`- /\bstale-while-revalidate(?!=)/,`
`62`		`- "stale-while-revalidate=2592000", // 30 days`
`63`		`- );`
	`61`	`+ let cacheControl = headers["cache-control"];`
	`62`	`+ if (!cacheControl) return;`
	`63`	`+ if (Array.isArray(cacheControl)) {`
	`64`	`+ cacheControl = cacheControl.join(",");`
`64`	`65`	`}`
	`66`	`+ headers["cache-control"] = cacheControl.replace(`
	`67`	`+ /\bstale-while-revalidate(?!=)/,`
	`68`	`+ "stale-while-revalidate=2592000", // 30 days`
	`69`	`+ );`
`65`	`70`	`}`
`66`	`71`
`67`	`72`	`export function addOpenNextHeader(headers: Record<string, string \| undefined>) {`