support empty array/string to mean no revalidation

solidjs · Oct 10, 2024 · 6dd0473 · 6dd0473
1 parent ce21d77
commit 6dd0473
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/hip-weeks-rhyme.md b/.changeset/hip-weeks-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+support empty array/string to mean no revalidation
diff --git a/src/data/cache.ts b/src/data/cache.ts
@@ -222,7 +222,7 @@ cache.clear = () => getCache().clear();
 
 function matchKey(key: string, keys: string[]) {
   for (let k of keys) {
-    if (key.startsWith(k)) return true;
+    if (k && key.startsWith(k)) return true;
   }
   return false;
 }

diff --git a/src/data/response.ts b/src/data/response.ts
@@ -14,7 +14,7 @@ export function redirect(url: string, init: number | RouterResponseInit = 302) {
 
   const headers = new Headers(responseInit.headers);
   headers.set("Location", url);
-  revalidate && headers.set("X-Revalidate", revalidate.toString());
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
 
   const response = new Response(null, {
     ...responseInit,
@@ -27,7 +27,7 @@ export function redirect(url: string, init: number | RouterResponseInit = 302) {
 export function reload(init: RouterResponseInit = {}) {
   const { revalidate, ...responseInit } = init;
   const headers = new Headers(responseInit.headers);
-  revalidate && headers.set("X-Revalidate", revalidate.toString());
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
 
   return new Response(null, {
     ...responseInit,
@@ -38,7 +38,7 @@ export function reload(init: RouterResponseInit = {}) {
 export function json<T>(data: T, init: RouterResponseInit = {}) {
   const { revalidate, ...responseInit } = init;
   const headers = new Headers(responseInit.headers);
-  revalidate && headers.set("X-Revalidate", revalidate.toString());
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
   headers.set("Content-Type", "application/json");
 
   const response = new Response(JSON.stringify(data), {