@solidjs/router 0.14.8 → 0.14.9

package/dist/data/cache.js

@@ -184,7 +184,7 @@ cache.set = (key, value) => {
 cache.clear = () => getCache().clear();
 function matchKey(key, keys) {
     for (let k of keys) {
-        if (key.startsWith(k))
+        if (k && key.startsWith(k))
             return true;
     }
     return false;

package/dist/data/events.js

@@ -59,7 +59,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
                 return;
             const [a, url] = res;
             transformUrl && (url.pathname = transformUrl(url.pathname));
-            router.preloadRoute(url, { preloadData: a.getAttribute("preload") !== "false" });
+            router.preloadRoute(url, a.getAttribute("preload") !== "false");
         }
         function handleAnchorMove(evt) {
             clearTimeout(preloadTimeout);
@@ -71,7 +71,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
                 return;
             transformUrl && (url.pathname = transformUrl(url.pathname));
             preloadTimeout = setTimeout(() => {
-                router.preloadRoute(url, { preloadData: a.getAttribute("preload") !== "false" });
+                router.preloadRoute(url, a.getAttribute("preload") !== "false");
                 lastElement = a;
             }, 20);
         }

package/dist/data/response.js

@@ -12,7 +12,7 @@ export function redirect(url, init = 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,
         headers: headers
@@ -22,7 +22,7 @@ export function redirect(url, init = 302) {
 export function reload(init = {}) {
     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,
         headers
@@ -31,7 +31,7 @@ export function reload(init = {}) {
 export function json(data, init = {}) {
     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), {
         ...responseInit,

package/dist/index.js

@@ -244,7 +244,10 @@ const useHref = to => {
 const useNavigate = () => useRouter().navigatorFactory();
 const useLocation = () => useRouter().location;
 const useIsRouting = () => useRouter().isRouting;
-const usePreloadRoute = () => useRouter().preloadRoute;
+const usePreloadRoute = () => {
+  const pre = useRouter().preloadRoute;
+  return (url, options = {}) => pre(url instanceof URL ? url : new URL(url, mockBase), options.preloadData);
+};
 const useMatch = (path, matchFilters) => {
   const location = useLocation();
   const matchers = createMemo(() => expandOptionals(path()).map(path => createMatcher(path, undefined, matchFilters)));
@@ -585,7 +588,7 @@ function createRouterContext(integration, branches, getContext, options = {}) {
       referrers.length = 0;
     }
   }
-  function preloadRoute(url, options = {}) {
+  function preloadRoute(url, preloadData) {
     const matches = getRouteMatches(branches(), url.pathname);
     const prevIntent = intent;
     intent = "preload";
@@ -599,7 +602,7 @@ function createRouterContext(integration, branches, getContext, options = {}) {
         preload
       } = route;
       inPreloadFn = true;
-      options.preloadData && preload && runWithOwner(getContext(), () => preload({
+      preloadData && preload && runWithOwner(getContext(), () => preload({
         params,
         location: {
           pathname: url.pathname,
@@ -1032,7 +1035,7 @@ cache.set = (key, value) => {
 cache.clear = () => getCache().clear();
 function matchKey(key, keys) {
   for (let k of keys) {
-    if (key.startsWith(k)) return true;
+    if (k && key.startsWith(k)) return true;
   }
   return false;
 }
@@ -1226,9 +1229,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
       if (!res) return;
       const [a, url] = res;
       transformUrl && (url.pathname = transformUrl(url.pathname));
-      router.preloadRoute(url, {
-        preloadData: a.getAttribute("preload") !== "false"
-      });
+      router.preloadRoute(url, a.getAttribute("preload") !== "false");
     }
     function handleAnchorMove(evt) {
       clearTimeout(preloadTimeout);
@@ -1238,9 +1239,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
       if (lastElement === a) return;
       transformUrl && (url.pathname = transformUrl(url.pathname));
       preloadTimeout = setTimeout(() => {
-        router.preloadRoute(url, {
-          preloadData: a.getAttribute("preload") !== "false"
-        });
+        router.preloadRoute(url, a.getAttribute("preload") !== "false");
         lastElement = a;
       }, 20);
     }
@@ -1612,7 +1611,7 @@ function redirect(url, init = 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,
     headers: headers
@@ -1625,7 +1624,7 @@ function reload(init = {}) {
     ...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,
     headers
@@ -1637,7 +1636,7 @@ function json(data, init = {}) {
     ...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), {
     ...responseInit,

package/dist/routing.d.ts

@@ -9,8 +9,8 @@ export declare const useHref: (to: () => string | undefined) => Accessor<string
 export declare const useNavigate: () => Navigator;
 export declare const useLocation: <S = unknown>() => Location<S>;
 export declare const useIsRouting: () => () => boolean;
-export declare const usePreloadRoute: () => (url: URL, options: {
-    preloadData?: boolean | undefined;
+export declare const usePreloadRoute: () => (url: string | URL, options?: {
+    preloadData?: boolean;
 }) => void;
 export declare const useMatch: <S extends string>(path: () => S, matchFilters?: MatchFilters<S> | undefined) => Accessor<import("./types.js").PathMatch | undefined>;
 export declare const useCurrentMatches: () => () => RouteMatch[];

package/dist/routing.js

@@ -23,7 +23,10 @@ export const useHref = (to) => {
 export const useNavigate = () => useRouter().navigatorFactory();
 export const useLocation = () => useRouter().location;
 export const useIsRouting = () => useRouter().isRouting;
-export const usePreloadRoute = () => useRouter().preloadRoute;
+export const usePreloadRoute = () => {
+    const pre = useRouter().preloadRoute;
+    return (url, options = {}) => pre(url instanceof URL ? url : new URL(url, mockBase), options.preloadData);
+};
 export const useMatch = (path, matchFilters) => {
     const location = useLocation();
     const matchers = createMemo(() => expandOptionals(path()).map(path => createMatcher(path, undefined, matchFilters)));
@@ -348,7 +351,7 @@ export function createRouterContext(integration, branches, getContext, options =
             referrers.length = 0;
         }
     }
-    function preloadRoute(url, options = {}) {
+    function preloadRoute(url, preloadData) {
         const matches = getRouteMatches(branches(), url.pathname);
         const prevIntent = intent;
         intent = "preload";
@@ -359,7 +362,7 @@ export function createRouterContext(integration, branches, getContext, options =
                 route.component.preload();
             const { preload } = route;
             inPreloadFn = true;
-            options.preloadData &&
+            preloadData &&
                 preload &&
                 runWithOwner(getContext(), () => preload({
                     params,

package/dist/types.d.ts

@@ -139,9 +139,7 @@ export interface RouterContext {
     renderPath(path: string): string;
     parsePath(str: string): string;
     beforeLeave: BeforeLeaveLifecycle;
-    preloadRoute: (url: URL, options: {
-        preloadData?: boolean;
-    }) => void;
+    preloadRoute: (url: URL, preloadData?: boolean) => void;
     singleFlight: boolean;
     submissions: Signal<Submission<any, any>[]>;
 }

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.14.8",
+  "version": "0.14.9",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",