@solidjs/router 0.16.0 → 0.17.0-next.0

package/dist/data/events.js

@@ -1,8 +1,8 @@
-import { delegateEvents } from "solid-js/web";
+import { delegateEvents } from "@solidjs/web";
 import { onCleanup } from "solid-js";
 import { actions } from "./action.js";
 import { mockBase } from "../utils.js";
-export function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "/_server", transformUrl) {
+export function setupNativeEvents({ preload = true, explicitLinks = false, actionBase = "/_server", transformUrl } = {}) {
     return (router) => {
         const basePath = router.base.path();
         const navigateFromRoute = router.navigatorFactory(router.base);
@@ -65,7 +65,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
             clearTimeout(preloadTimeout);
             const res = handleAnchor(evt);
             if (!res)
-                return lastElement = null;
+                return (lastElement = null);
             const [a, url] = res;
             if (lastElement === a)
                 return;

package/dist/data/index.d.ts

@@ -1,4 +1,3 @@
-export { createAsync, createAsyncStore, type AccessorWithLatest } from "./createAsync.js";
-export { action, useSubmission, useSubmissions, useAction, type Action } from "./action.js";
-export { query, revalidate, cache, type CachedFunction } from "./query.js";
+export { action, useSubmissions, useAction, type Action } from "./action.js";
+export { query, revalidate, type CachedFunction } from "./query.js";
 export { redirect, reload, json } from "./response.js";

package/dist/data/index.js

@@ -1,4 +1,3 @@
-export { createAsync, createAsyncStore } from "./createAsync.js";
-export { action, useSubmission, useSubmissions, useAction } from "./action.js";
-export { query, revalidate, cache } from "./query.js";
+export { action, useSubmissions, useAction } from "./action.js";
+export { query, revalidate } from "./query.js";
 export { redirect, reload, json } from "./response.js";

package/dist/data/query.d.ts

@@ -2,7 +2,7 @@ import type { CacheEntry, NarrowResponse } from "../types.js";
 /**
  * Revalidates the given cache entry/entries.
  */
-export declare function revalidate(key?: string | string[] | void, force?: boolean): Promise<void>;
+export declare function revalidate(key?: string | string[] | void, force?: boolean): void;
 export declare function cacheKeyOp(key: string | string[] | void, fn: (cacheEntry: CacheEntry) => void): void;
 export type CachedFunction<T extends (...args: any) => any> = T extends (...args: infer A) => infer R ? ([] extends {
     [K in keyof A]-?: A[K];
@@ -18,6 +18,4 @@ export declare namespace query {
     export var clear: () => void;
     export { _a as delete };
 }
-/** @deprecated use query instead */
-export declare const cache: typeof query;
 export declare function hashKey<T extends Array<any>>(args: T): string;

package/dist/data/query.js

@@ -1,5 +1,5 @@
-import { createSignal, getListener, getOwner, onCleanup, sharedConfig, startTransition } from "solid-js";
-import { getRequestEvent, isServer } from "solid-js/web";
+import { createSignal, getObserver, getOwner, onCleanup, sharedConfig } from "solid-js";
+import { getRequestEvent, isServer } from "@solidjs/web";
 import { useNavigate, getIntent, getInPreloadFn } from "../routing.js";
 const LocationHeader = "Location";
 const PRELOAD_TIMEOUT = 5000;
@@ -28,12 +28,10 @@ function getCache() {
  * Revalidates the given cache entry/entries.
  */
 export function revalidate(key, force = true) {
-    return startTransition(() => {
-        const now = Date.now();
-        cacheKeyOp(key, entry => {
-            force && (entry[0] = 0); //force cache miss
-            entry[4][1](now); // retrigger live signals
-        });
+    const now = Date.now();
+    cacheKeyOp(key, entry => {
+        force && (entry[0] = 0); //force cache miss
+        entry[4][1](now); // retrigger live signals
     });
 }
 export function cacheKeyOp(key, fn) {
@@ -72,7 +70,7 @@ export function query(fn, name) {
                 }
             }
         }
-        if (getListener() && !isServer) {
+        if (getObserver() && !isServer) {
             tracking = true;
             onCleanup(() => cached[4].count--);
         }
@@ -95,7 +93,7 @@ export function query(fn, name) {
                     "then" in cached[1]
                         ? cached[1].then(handleResponse(false), handleResponse(true))
                         : handleResponse(false)(cached[1]);
-                !isServer && intent === "navigate" && startTransition(() => cached[4][1](cached[0])); // update version
+                !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
             }
             inPreloadFn && "then" in res && res.catch(() => { });
             return res;
@@ -112,7 +110,7 @@ export function query(fn, name) {
             cached[0] = now;
             cached[1] = res;
             cached[3] = intent;
-            !isServer && intent === "navigate" && startTransition(() => cached[4][1](cached[0])); // update version
+            !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
         }
         else {
             cache.set(key, (cached = [now, res, , intent, createSignal(now)]));
@@ -159,9 +157,7 @@ export function query(fn, name) {
                     if (url !== null) {
                         // client + server relative redirect
                         if (navigate && url.startsWith("/"))
-                            startTransition(() => {
-                                navigate(url, { replace: true });
-                            });
+                            navigate(url, { replace: true });
                         else if (!isServer)
                             window.location.href = url;
                         else if (e)
@@ -203,8 +199,6 @@ query.set = (key, value) => {
 };
 query.delete = (key) => getCache().delete(key);
 query.clear = () => getCache().clear();
-/** @deprecated use query instead */
-export const cache = query;
 function matchKey(key, keys) {
     for (let k of keys) {
         if (k && key.startsWith(k))

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export * from "./routers/index.js";
 export * from "./components.jsx";
 export * from "./lifecycle.js";
-export { useHref, useIsRouting, useLocation, useMatch, useCurrentMatches, useNavigate, useParams, useResolvedPath, useSearchParams, useBeforeLeave, usePreloadRoute } from "./routing.js";
+export { useHref, useIsRouting, useLocation, useMatch, useCurrentMatches, useNavigate, useParams, useResolvedPath, useSearchParams, useBeforeLeave, usePreloadRoute, RouterContextObj as RouterContext } from "./routing.js";
 export { mergeSearchString as _mergeSearchString } from "./utils.js";
 export * from "./data/index.js";
-export type { Location, LocationChange, SearchParams, MatchFilter, MatchFilters, NavigateOptions, Navigator, OutputMatch, Params, PathMatch, RouteSectionProps, RoutePreloadFunc, RoutePreloadFuncArgs, RouteDefinition, RouteDescription, RouteMatch, RouterIntegration, RouterUtils, SetParams, Submission, BeforeLeaveEventArgs, RouteLoadFunc, RouteLoadFuncArgs, RouterResponseInit, CustomResponse } from "./types.js";
+export type { Location, LocationChange, SearchParams, MatchFilter, MatchFilters, NavigateOptions, Navigator, OutputMatch, Params, PathMatch, RouteSectionProps, RoutePreloadFunc, RoutePreloadFuncArgs, RouteDefinition, RouteDescription, RouteMatch, RouterIntegration, RouterUtils, SetParams, Submission, BeforeLeaveEventArgs, RouterResponseInit, CustomResponse } from "./types.js";