@solidjs/router 0.12.1 → 0.12.2

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 = {}
@@ -467,7 +467,6 @@ function createRouterContext(integration, getBranches, options = {}) {
       }
     });
   });
-  const owner = getOwner();
   return {
     base: baseRoute,
     location,
@@ -581,7 +580,7 @@ function createRouterContext(integration, getBranches, options = {}) {
       const {
         load
       } = route;
-      preloadData && load && runWithOwner(owner, () => load({
+      preloadData && load && runWithOwner(getContext(), () => load({
         params,
         location: {
           pathname: url.pathname,
@@ -648,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
   });
@@ -656,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();
         }
-      });
+      })];
     }
   });
 };

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,4 +1,4 @@
-import { getOwner, runWithOwner } from "solid-js";
+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";
@@ -184,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);
@@ -237,7 +237,6 @@ export function createRouterContext(integration, getBranches, options = {}) {
             }
         });
     });
-    const owner = getOwner();
     return {
         base: baseRoute,
         location,
@@ -336,7 +335,7 @@ export function createRouterContext(integration, getBranches, options = {}) {
             const { load } = route;
             preloadData &&
                 load &&
-                runWithOwner(owner, () => load({
+                runWithOwner(getContext(), () => load({
                     params,
                     location: {
                         pathname: url.pathname,

package/package.json

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