apply the right owner (who's aware of the router)

Author: ryansolid

.changeset/honest-peas-play.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+apply the right owner (who's aware of the router)

src/routers/components.tsx

@@ -1,8 +1,8 @@
 /*@refresh skip*/
 
-import type { Component, JSX } from "solid-js";
+import type { Component, JSX, Owner } from "solid-js";
 import { type RequestEvent, 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,
@@ -47,11 +47,13 @@ export const createRouterComponent = (router: RouterIntegration) => (props: Base
       props.base || ""
     )
   );
-  const routerState = createRouterContext(router, branches, { base, singleFlight: props.singleFlight });
+  let context: Owner;
+  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>
   );

src/routing.ts

@@ -268,6 +268,7 @@ export function getIntent() {
 
 export function createRouterContext(
   integration: RouterIntegration,
+  getContext?: () => any,
   getBranches?: () => Branch[],
   options: { base?: string, singleFlight?: boolean } = {}
 ): RouterContext {
@@ -330,8 +331,6 @@ export function createRouterContext(
     });
   });
 
-  const owner = getOwner();
-
   return {
     base: baseRoute,
     location,
@@ -445,7 +444,7 @@ export function createRouterContext(
       const { load } = route;
       preloadData &&
         load &&
-        runWithOwner(owner, () =>
+        runWithOwner(getContext!(), () =>
           load({
             params,
             location: {

test/router.spec.ts

@@ -4,6 +4,7 @@ import type { LocationChange } from "../src/types.js";
 import { createAsyncRoot, createCounter, waitFor } from "./helpers.js";
 
 const fakeBranches = () => []
+const fakeContext = () => ({})
 
 describe("Router should", () => {
   describe("have member `base` which should", () => {
@@ -18,15 +19,15 @@ describe("Router should", () => {
     test(`have a normalized version of the base path when defined`, () => {
       createRoot(() => {
         const signal = createSignal<LocationChange>({ value: "" });
-        const { base } = createRouterContext({ signal }, fakeBranches, { base: "base" });
+        const { base } = createRouterContext({ signal }, fakeContext, fakeBranches, { base: "base" });
         expect(base.path()).toBe("/base");
       });
     });
 
     test(`throw when the base path is invalid`, () => {
       createRoot(() => {
         const signal = createSignal<LocationChange>({ value: "" });
-        expect(() => createRouterContext({ signal }, fakeBranches, { base: "http://example.com" })).toThrow();
+        expect(() => createRouterContext({ signal }, fakeContext, fakeBranches, { base: "http://example.com" })).toThrow();
       });
     });
   });