@solidjs/router 0.10.5 → 0.10.7

package/README.md

@@ -609,7 +609,7 @@ const updateTodo = action(async (todo: Todo) => {
 
 ## Config Based Routing
 
-You don't have to use JSX to set up your routes; you can pass an object:
+You don't have to use JSX to set up your routes; you can pass an array of route definitions:
 
 ```jsx
 import { lazy } from "solid-js";
@@ -655,6 +655,21 @@ render(() =>
 );
 ```
 
+Also you can pass a single route definition object for a single route:
+
+```jsx
+import { lazy } from "solid-js";
+import { render } from "solid-js/web";
+import { Router } from "@solidjs/router";
+
+const route = {
+  path: "/",
+  component: lazy(() => import("/pages/index.js"))
+};
+
+render(() => <Router>{route}</Router>, document.getElementById("app"));
+```
+
 ## Alternative Routers
 
 ### Hash Mode Router
@@ -697,7 +712,7 @@ This is the main Router component for the browser.
 
 | prop | type | description |
 |-----|----|----|
-| children | `JSX.Element` or `RouteDefinition[]` | The route definitions |
+| children | `JSX.Element`, `RouteDefinition`, or `RouteDefinition[]` | The route definitions |
 | root | Component | Top level layout component |
 | base | string | Base url to use for matching routes |
 | actionBase | string | Root url for server actions, default: `/_server` |
@@ -874,7 +889,7 @@ The biggest changes are around removed APIs that need to be replaced.
 
 ### `<Outlet>`, `<Routes>`, `useRoutes`
 
-This is no longer used and instead will use `props.children` passed from into the page components for outlets. This keeps the outlet directly passed from its page and avoids oddness of trying to use context across Islands boundaries. Nested `<Routes>` components inherently cause waterfalls and are `<Outlets>` themselves so they have the same concerns. We do not want to encourage the pattern and if you must do it you can always nest `<Router>`s with appropriate base path.
+This is no longer used and instead will use `props.children` passed from into the page components for outlets. This keeps the outlet directly passed from its page and avoids oddness of trying to use context across Islands boundaries. Nested `<Routes>` components inherently cause waterfalls and are `<Outlets>` themselves so they have the same concerns.
 
 Keep in mind no `<Routes>` means the `<Router>` API is different. The `<Router>` acts as the `<Routes>` component and its children can only be `<Route>` components. Your top-level layout should go in the root prop of the router [as shown above](#configure-your-routes)
 

package/dist/data/action.js

@@ -66,8 +66,8 @@ export function action(fn, name) {
         return p;
     }
     const url = fn.url ||
-        (name && `action:${name}`) ||
-        (!isServer ? `action:${hashString(fn.toString())}` : "");
+        (name && `https://action/${name}`) ||
+        (!isServer ? `https://action/${hashString(fn.toString())}` : "");
     return toAction(mutate, url);
 }
 function toAction(fn, url) {
@@ -82,7 +82,7 @@ function toAction(fn, url) {
         };
         const uri = new URL(url, "http://sar");
         uri.searchParams.set("args", hashKey(args));
-        return toAction(newFn, (uri.protocol === "action:" ? uri.protocol : "") + uri.pathname + uri.search);
+        return toAction(newFn, (uri.origin === "https://action" ? uri.origin : "") + uri.pathname + uri.search);
     };
     fn.url = url;
     if (!isServer) {

package/dist/data/cache.d.ts

@@ -10,6 +10,7 @@ export type CachedFunction<T extends (...args: any) => U | Response, U> = T & {
 export declare function cache<T extends (...args: any) => U | Response, U>(fn: T, name: string, options?: ReconcileOptions): CachedFunction<T, U>;
 export declare namespace cache {
     var set: (key: string, value: any) => void;
+    var clear: () => any;
 }
 export declare function hashKey<T extends Array<any>>(args: T): string;
 export {};

package/dist/data/cache.js

@@ -70,12 +70,12 @@ export function cache(fn, name, options) {
                 cached[0] = now;
             }
             let res = cached[1];
-            if (!isServer && intent === "navigate") {
+            if (!isServer && intent !== "preload") {
                 res =
                     "then" in cached[1]
                         ? cached[1].then(handleResponse(false), handleResponse(true))
                         : handleResponse(false)(cached[1]);
-                startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
+                intent === "navigate" && startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
             }
             return res;
         }
@@ -124,7 +124,7 @@ export function cache(fn, name, options) {
                     return;
                 }
                 if (error)
-                    throw error;
+                    throw v;
                 if (isServer)
                     return v;
                 setStore(key, reconcile(v, options));
@@ -156,6 +156,7 @@ cache.set = (key, value) => {
     else
         cache.set(key, (cached = [now, value, , new Set(version ? [version] : [])]));
 };
+cache.clear = () => getCache().clear();
 function matchKey(key, keys) {
     for (let k of keys) {
         if (key.startsWith(k))

package/dist/data/events.js

@@ -87,7 +87,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
                 : evt.target.action;
             if (!actionRef)
                 return;
-            if (!actionRef.startsWith("action:")) {
+            if (!actionRef.startsWith("https://action/")) {
                 const url = new URL(actionRef);
                 actionRef = router.parsePath(url.pathname + url.search);
                 if (!actionRef.startsWith(actionBase))
@@ -99,6 +99,8 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
             if (handler) {
                 evt.preventDefault();
                 const data = new FormData(evt.target);
+                if (evt.submitter && evt.submitter.name)
+                    data.append(evt.submitter.name, evt.submitter.value);
                 handler.call(router, data);
             }
         }

package/dist/data/index.d.ts

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

package/dist/data/index.js

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

package/dist/index.js

@@ -22,7 +22,10 @@ function createBeforeLeave() {
       from: l.location,
       retry: force => {
         force && (ignore = true);
-        l.navigate(to, options);
+        l.navigate(to, {
+          ...options,
+          resolve: false
+        });
       }
     });
     return !e.defaultPrevented;
@@ -830,9 +833,9 @@ function cache(fn, name, options) {
         cached[0] = now;
       }
       let res = cached[1];
-      if (!isServer && intent === "navigate") {
+      if (!isServer && intent !== "preload") {
         res = "then" in cached[1] ? cached[1].then(handleResponse(false), handleResponse(true)) : handleResponse(false)(cached[1]);
-        startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
+        intent === "navigate" && startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
       }
 
       return res;
@@ -875,7 +878,7 @@ function cache(fn, name, options) {
           }
           return;
         }
-        if (error) throw error;
+        if (error) throw v;
         if (isServer) return v;
         setStore(key, reconcile(v, options));
         return store[key];
@@ -905,6 +908,7 @@ cache.set = (key, value) => {
     version && cached[3].add(version);
   } else cache.set(key, cached = [now, value,, new Set(version ? [version] : [])]);
 };
+cache.clear = () => getCache().clear();
 function matchKey(key, keys) {
   for (let k of keys) {
     if (key.startsWith(k)) return true;
@@ -984,7 +988,7 @@ function action(fn, name) {
     p.then(handler, handler);
     return p;
   }
-  const url = fn.url || name && `action:${name}` || (!isServer ? `action:${hashString(fn.toString())}` : "");
+  const url = fn.url || name && `https://action/${name}` || (!isServer ? `https://action/${hashString(fn.toString())}` : "");
   return toAction(mutate, url);
 }
 function toAction(fn, url) {
@@ -998,7 +1002,7 @@ function toAction(fn, url) {
     };
     const uri = new URL(url, "http://sar");
     uri.searchParams.set("args", hashKey(args));
-    return toAction(newFn, (uri.protocol === "action:" ? uri.protocol : "") + uri.pathname + uri.search);
+    return toAction(newFn, (uri.origin === "https://action" ? uri.origin : "") + uri.pathname + uri.search);
   };
   fn.url = url;
   if (!isServer) {
@@ -1094,7 +1098,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
     function handleFormSubmit(evt) {
       let actionRef = evt.submitter && evt.submitter.hasAttribute("formaction") ? evt.submitter.formAction : evt.target.action;
       if (!actionRef) return;
-      if (!actionRef.startsWith("action:")) {
+      if (!actionRef.startsWith("https://action/")) {
         const url = new URL(actionRef);
         actionRef = router.parsePath(url.pathname + url.search);
         if (!actionRef.startsWith(actionBase)) return;
@@ -1104,6 +1108,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
       if (handler) {
         evt.preventDefault();
         const data = new FormData(evt.target);
+        if (evt.submitter && evt.submitter.name) data.append(evt.submitter.name, evt.submitter.value);
         handler.call(router, data);
       }
     }
@@ -1392,5 +1397,17 @@ function redirect(url, init = 302) {
   });
   return response;
 }
+function reload(init) {
+  const {
+    revalidate,
+    ...responseInit
+  } = init;
+  return new Response(null, {
+    ...responseInit,
+    ...(revalidate ? {
+      headers: new Headers(responseInit.headers).set("X-Revalidate", revalidate.toString())
+    } : {})
+  });
+}
 
-export { A, HashRouter, MemoryRouter, Navigate, Route, Router, StaticRouter, mergeSearchString as _mergeSearchString, action, cache, createAsync, createBeforeLeave, createMemoryHistory, createRouter, redirect, revalidate, useAction, useBeforeLeave, useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useSubmission, useSubmissions };
+export { A, HashRouter, MemoryRouter, Navigate, Route, Router, StaticRouter, mergeSearchString as _mergeSearchString, action, cache, createAsync, createBeforeLeave, createMemoryHistory, createRouter, redirect, reload, revalidate, useAction, useBeforeLeave, useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useSubmission, useSubmissions };

package/dist/lifecycle.js

@@ -20,7 +20,7 @@ export function createBeforeLeave() {
                 from: l.location,
                 retry: (force) => {
                     force && (ignore = true);
-                    l.navigate(to, options);
+                    l.navigate(to, { ...options, resolve: false });
                 }
             });
         return !e.defaultPrevented;

package/dist/routers/components.d.ts

@@ -2,6 +2,9 @@ import type { Component, JSX } from "solid-js";
 import type { MatchFilters, RouteLoadFunc, RouteDefinition, RouterIntegration, RouteSectionProps } from "../types";
 export type BaseRouterProps = {
     base?: string;
+    /**
+     * A component that wraps the content of every route.
+     */
     root?: Component<RouteSectionProps>;
     children?: JSX.Element | RouteDefinition | RouteDefinition[];
 };
@@ -14,4 +17,4 @@ export type RouteProps<S extends string, T = unknown> = {
     component?: Component<RouteSectionProps<T>>;
     metadata?: Record<string, any>;
 };
-export declare const Route: <S extends string>(props: RouteProps<S, unknown>) => JSX.Element;
+export declare const Route: <S extends string, T = unknown>(props: RouteProps<S, T>) => JSX.Element;

package/dist/routing.d.ts

@@ -11,7 +11,7 @@ export declare const useLocation: <S = unknown>() => Location<S>;
 export declare const useIsRouting: () => () => boolean;
 export declare const useMatch: <S extends string>(path: () => S, matchFilters?: MatchFilters<S> | undefined) => Accessor<import("./types").PathMatch | undefined>;
 export declare const useParams: <T extends Params>() => T;
-export declare const useSearchParams: <T extends Params>() => [T, (params: SetParams, options?: Partial<NavigateOptions>) => void];
+export declare const useSearchParams: <T extends Params>() => [Partial<T>, (params: SetParams, options?: Partial<NavigateOptions>) => void];
 export declare const useBeforeLeave: (listener: (e: BeforeLeaveEventArgs) => void) => void;
 export declare function createRoutes(routeDef: RouteDefinition, base?: string): Route[];
 export declare function createBranch(routes: Route[], index?: number): Branch;

package/package.json

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