@solidjs/router 0.12.0 → 0.12.2

package/dist/data/cache.js

@@ -87,8 +87,8 @@ export function cache(fn, name) {
             let res = cached[1];
             if (intent !== "preload") {
                 res =
-                    "then" in (cached[1])
-                        ? (cached[1]).then(handleResponse(false), handleResponse(true))
+                    "then" in cached[1]
+                        ? cached[1].then(handleResponse(false), handleResponse(true))
                         : handleResponse(false)(cached[1]);
                 !isServer && intent === "navigate" && startTransition(() => cached[3][1](cached[0])); // update version
             }
@@ -97,15 +97,6 @@ export function cache(fn, name) {
         let res = !isServer && sharedConfig.context && sharedConfig.has(key)
             ? sharedConfig.load(key) // hydrating
             : fn(...args);
-        // serialize on server
-        if (isServer &&
-            sharedConfig.context &&
-            sharedConfig.context.async &&
-            !sharedConfig.context.noHydrate) {
-            const e = getRequestEvent();
-            e && e.router.dataOnly && (e.router.data[key] = res);
-            (!e || !e.serverOnly) && sharedConfig.context.serialize(key, res);
-        }
         if (cached) {
             cached[0] = now;
             cached[1] = res;
@@ -120,12 +111,25 @@ export function cache(fn, name) {
             cached[3].count++;
             cached[3][0](); // track
         }
+        if (isServer) {
+            const e = getRequestEvent();
+            e && e.router.dataOnly && (e.router.data[key] = res);
+            return res;
+        }
         if (intent !== "preload") {
             res =
-                "then" in (res)
-                    ? (res).then(handleResponse(false), handleResponse(true))
+                "then" in res
+                    ? res.then(handleResponse(false), handleResponse(true))
                     : handleResponse(false)(res);
         }
+        // serialize on server
+        if (isServer &&
+            sharedConfig.context &&
+            sharedConfig.context.async &&
+            !sharedConfig.context.noHydrate) {
+            const e = getRequestEvent();
+            (!e || !e.serverOnly) && sharedConfig.context.serialize(key, res);
+        }
         return res;
         function handleResponse(error) {
             return async (v) => {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isServer, getRequestEvent, createComponent as createComponent$1, delegateEvents, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
+import { isServer, getRequestEvent, createComponent as createComponent$1, memo, delegateEvents, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
 import { getOwner, runWithOwner, createMemo, createContext, onCleanup, useContext, untrack, createSignal, createRenderEffect, on, startTransition, resetErrorBoundaries, createComponent, children, mergeProps, createRoot, Show, getListener, sharedConfig, $TRACK, splitProps, createResource } from 'solid-js';
 import { createStore, reconcile, unwrap } from 'solid-js/store';
 
@@ -406,7 +406,7 @@ let intent;
 function getIntent() {
   return intent;
 }
-function createRouterContext(integration, getBranches, options = {}) {
+function createRouterContext(integration, getContext, getBranches, options = {}) {
   const {
     signal: [source, setSource],
     utils = {}
@@ -577,7 +577,10 @@ function createRouterContext(integration, getBranches, options = {}) {
         params
       } = matches[match];
       route.component && route.component.preload && route.component.preload();
-      preloadData && route.load && route.load({
+      const {
+        load
+      } = route;
+      preloadData && load && runWithOwner(getContext(), () => load({
         params,
         location: {
           pathname: url.pathname,
@@ -588,7 +591,7 @@ function createRouterContext(integration, getBranches, options = {}) {
           key: ""
         },
         intent: "preload"
-      });
+      }));
     }
     intent = prevIntent;
   }
@@ -644,7 +647,8 @@ const createRouterComponent = router => props => {
     load: props.rootLoad,
     children: routeDefs()
   } : routeDefs(), props.base || ""));
-  const routerState = createRouterContext(router, branches, {
+  let context;
+  const routerState = createRouterContext(router, () => context, branches, {
     base,
     singleFlight: props.singleFlight
   });
@@ -652,12 +656,12 @@ const createRouterComponent = router => props => {
   return createComponent$1(RouterContextObj.Provider, {
     value: routerState,
     get children() {
-      return createComponent$1(Routes, {
+      return [memo(() => (context = getOwner()) && null), createComponent$1(Routes, {
         routerState: routerState,
         get branches() {
           return branches();
         }
-      });
+      })];
     }
   });
 };
@@ -926,13 +930,6 @@ function cache(fn, name) {
     }
     let res = !isServer && sharedConfig.context && sharedConfig.has(key) ? sharedConfig.load(key) // hydrating
     : fn(...args);
-
-    // serialize on server
-    if (isServer && sharedConfig.context && sharedConfig.context.async && !sharedConfig.context.noHydrate) {
-      const e = getRequestEvent();
-      e && e.router.dataOnly && (e.router.data[key] = res);
-      (!e || !e.serverOnly) && sharedConfig.context.serialize(key, res);
-    }
     if (cached) {
       cached[0] = now;
       cached[1] = res;
@@ -946,9 +943,19 @@ function cache(fn, name) {
       cached[3].count++;
       cached[3][0](); // track
     }
+    if (isServer) {
+      const e = getRequestEvent();
+      e && e.router.dataOnly && (e.router.data[key] = res);
+      return res;
+    }
     if (intent !== "preload") {
       res = "then" in res ? res.then(handleResponse(false), handleResponse(true)) : handleResponse(false)(res);
     }
+    // serialize on server
+    if (isServer && sharedConfig.context && sharedConfig.context.async && !sharedConfig.context.noHydrate) {
+      const e = getRequestEvent();
+      (!e || !e.serverOnly) && sharedConfig.context.serialize(key, res);
+    }
     return res;
     function handleResponse(error) {
       return async v => {

package/dist/routers/components.jsx

@@ -1,15 +1,17 @@
 /*@refresh skip*/
 import { getRequestEvent, isServer } from "solid-js/web";
-import { children, createMemo, createRoot, mergeProps, on, Show } from "solid-js";
+import { children, createMemo, createRoot, getOwner, mergeProps, on, Show } from "solid-js";
 import { createBranches, createRouteContext, createRouterContext, getRouteMatches, RouteContextObj, RouterContextObj } from "../routing.js";
 import { createMemoObject, extractSearchParams } from "../utils.js";
 export const createRouterComponent = (router) => (props) => {
     const { base } = props;
     const routeDefs = children(() => props.children);
     const branches = createMemo(() => createBranches(props.root ? { component: props.root, load: props.rootLoad, children: routeDefs() } : routeDefs(), props.base || ""));
-    const routerState = createRouterContext(router, branches, { base, singleFlight: props.singleFlight });
+    let context;
+    const routerState = createRouterContext(router, () => context, branches, { base, singleFlight: props.singleFlight });
     router.create && router.create(routerState);
     return (<RouterContextObj.Provider value={routerState}>
+      {(context = getOwner()) && null}
       <Routes routerState={routerState} branches={branches()}/>
     </RouterContextObj.Provider>);
 };

package/dist/routing.d.ts

@@ -19,7 +19,7 @@ export declare function createBranches(routeDef: RouteDefinition | RouteDefiniti
 export declare function getRouteMatches(branches: Branch[], location: string): RouteMatch[];
 export declare function createLocation(path: Accessor<string>, state: Accessor<any>): Location;
 export declare function getIntent(): Intent | undefined;
-export declare function createRouterContext(integration: RouterIntegration, getBranches?: () => Branch[], options?: {
+export declare function createRouterContext(integration: RouterIntegration, getContext?: () => any, getBranches?: () => Branch[], options?: {
     base?: string;
     singleFlight?: boolean;
 }): RouterContext;

package/dist/routing.js

@@ -1,3 +1,4 @@
+import { runWithOwner } from "solid-js";
 import { createComponent, createContext, createMemo, createRenderEffect, createSignal, on, onCleanup, untrack, useContext, startTransition, resetErrorBoundaries } from "solid-js";
 import { isServer, getRequestEvent } from "solid-js/web";
 import { createBeforeLeave } from "./lifecycle.js";
@@ -183,7 +184,7 @@ let intent;
 export function getIntent() {
     return intent;
 }
-export function createRouterContext(integration, getBranches, options = {}) {
+export function createRouterContext(integration, getContext, getBranches, options = {}) {
     const { signal: [source, setSource], utils = {} } = integration;
     const parsePath = utils.parsePath || (p => p);
     const renderPath = utils.renderPath || (p => p);
@@ -331,9 +332,10 @@ export function createRouterContext(integration, getBranches, options = {}) {
             route.component &&
                 route.component.preload &&
                 route.component.preload();
+            const { load } = route;
             preloadData &&
-                route.load &&
-                route.load({
+                load &&
+                runWithOwner(getContext(), () => load({
                     params,
                     location: {
                         pathname: url.pathname,
@@ -344,7 +346,7 @@ export function createRouterContext(integration, getBranches, options = {}) {
                         key: ""
                     },
                     intent: "preload"
-                });
+                }));
         }
         intent = prevIntent;
     }

package/package.json

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