fix(netlify): match ISR route rules when path has a query string (#2440)

unjs · May 16, 2024 · 6adc84c · 6adc84c
1 parent 944dcde
commit 6adc84c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/presets/netlify/runtime/netlify.ts b/src/presets/netlify/runtime/netlify.ts
@@ -14,7 +14,7 @@ const handler = async (req: Request): Promise<Response> => {
   });
 
   const headers = normalizeResponseHeaders({
-    ...getCacheHeaders(relativeUrl),
+    ...getCacheHeaders(url.pathname),
     ...r.headers,
   });
 

diff --git a/src/runtime/route-rules.ts b/src/runtime/route-rules.ts
@@ -81,6 +81,9 @@ type DeepReadonly<T> = T extends Record<string, any>
     ? ReadonlyArray<DeepReadonly<U>>
     : T;
 
+/**
+ * @param path - The path to match against route rules. This should not contain a query string.
+ */
 export function getRouteRulesForPath(
   path: string
 ): DeepReadonly<NitroRouteRules> {

diff --git a/test/presets/netlify.test.ts b/test/presets/netlify.test.ts
@@ -123,6 +123,15 @@ describe("nitro:preset:netlify", async () => {
           (headers as Record<string, string>)["netlify-cdn-cache-control"]
         ).not.toBeDefined();
       });
+      // Regression test for https://github.com/unjs/nitro/issues/2431
+      it("matches paths with a query string", async () => {
+        const { headers } = await callHandler({
+          url: "/rules/isr-ttl?foo=bar",
+        });
+        expect(
+          (headers as Record<string, string>)["netlify-cdn-cache-control"]
+        ).toBe("public, max-age=60, stale-while-revalidate=31536000");
+      });
     }
   );
 });