@solidjs/router 0.17.0-next.0 → 0.17.0-next.1

package/dist/index.js

@@ -606,9 +606,10 @@ function createRouterContext(integration, branches, getContext, options = {}) {
   const renderPath = utils.renderPath || (p => p);
   const beforeLeave = utils.beforeLeave || createBeforeLeave();
   const basePath = resolvePath("", options.base || "");
+  const initialSource = untrack(source);
   if (basePath === undefined) {
     throw new Error(`${basePath} is not a valid base path`);
-  } else if (basePath && !source().value) {
+  } else if (basePath && !initialSource.value) {
     setSource({
       value: basePath,
       replace: true,
@@ -855,17 +856,29 @@ function createRouteContext(router, parent, outlet, match) {
   return route;
 }
 
-const createRouterComponent = router => props => {
+const createRouterComponent = router => function IntegratedRouter(props) {
   const {
-    base
-  } = props;
-  const routeDefs = children(() => props.children);
-  const branches = createMemo(() => createBranches(routeDefs(), props.base || ""));
+    base,
+    singleFlight,
+    transformUrl,
+    root,
+    rootPreload,
+    routeChildren
+  } = untrack(() => ({
+    base: props.base,
+    singleFlight: props.singleFlight,
+    transformUrl: props.transformUrl,
+    root: props.root,
+    rootPreload: props.rootPreload,
+    routeChildren: props.children
+  }));
+  const routeDefs = children(() => routeChildren);
+  const branches = createMemo(() => createBranches(routeDefs(), base || ""));
   let context;
   const routerState = createRouterContext(router, branches, () => context, {
     base,
-    singleFlight: props.singleFlight,
-    transformUrl: props.transformUrl
+    singleFlight,
+    transformUrl
   });
   router.create && router.create(routerState);
   return createComponent$1(RouterContextObj, {
@@ -873,12 +886,8 @@ const createRouterComponent = router => props => {
     get children() {
       return createComponent$1(Root, {
         routerState: routerState,
-        get root() {
-          return props.root;
-        },
-        get preload() {
-          return props.rootPreload;
-        },
+        root: root,
+        preload: rootPreload,
         get children() {
           return [memo(() => (context = getOwner()) && null), createComponent$1(Routes, {
             routerState: routerState,
@@ -973,7 +982,8 @@ function Routes(props) {
     prevMatches = nextMatches;
     return next;
   }, undefined);
-  return createOutlet(() => routeStates() && root)();
+  const outlet = createOutlet(() => routeStates() && root);
+  return memo(outlet);
 }
 const createOutlet = child => {
   return () => {

package/dist/routers/components.jsx

@@ -2,19 +2,26 @@
 import { children, createMemo, createRoot, getOwner, merge, untrack } from "solid-js";
 import { getRequestEvent, isServer } from "@solidjs/web";
 import { createBranches, createRouteContext, createRouterContext, getIntent, getRouteMatches, RouteContextObj, RouterContextObj, setInPreloadFn } from "../routing.js";
-export const createRouterComponent = (router) => (props) => {
-    const { base } = props;
-    const routeDefs = children(() => props.children);
-    const branches = createMemo(() => createBranches(routeDefs(), props.base || ""));
+export const createRouterComponent = (router) => function IntegratedRouter(props) {
+    const { base, singleFlight, transformUrl, root, rootPreload, routeChildren } = untrack(() => ({
+        base: props.base,
+        singleFlight: props.singleFlight,
+        transformUrl: props.transformUrl,
+        root: props.root,
+        rootPreload: props.rootPreload,
+        routeChildren: props.children
+    }));
+    const routeDefs = children(() => routeChildren);
+    const branches = createMemo(() => createBranches(routeDefs(), base || ""));
     let context;
     const routerState = createRouterContext(router, branches, () => context, {
         base,
-        singleFlight: props.singleFlight,
-        transformUrl: props.transformUrl,
+        singleFlight,
+        transformUrl,
     });
     router.create && router.create(routerState);
     return (<RouterContextObj value={routerState}>
-      <Root routerState={routerState} root={props.root} preload={props.rootPreload}>
+      <Root routerState={routerState} root={root} preload={rootPreload}>
         {(context = getOwner()) && null}
         <Routes routerState={routerState} branches={branches()}/>
       </Root>
@@ -91,7 +98,8 @@ function Routes(props) {
         prevMatches = nextMatches;
         return next;
     }, undefined);
-    return createOutlet(() => routeStates() && root)();
+    const outlet = createOutlet(() => routeStates() && root);
+    return <>{outlet()}</>;
 }
 const createOutlet = (child) => {
     return () => {

package/dist/routing.js

@@ -354,10 +354,11 @@ export function createRouterContext(integration, branches, getContext, options =
     const renderPath = utils.renderPath || (p => p);
     const beforeLeave = utils.beforeLeave || createBeforeLeave();
     const basePath = resolvePath("", options.base || "");
+    const initialSource = untrack(source);
     if (basePath === undefined) {
         throw new Error(`${basePath} is not a valid base path`);
     }
-    else if (basePath && !source().value) {
+    else if (basePath && !initialSource.value) {
         setSource({ value: basePath, replace: true, scroll: false });
     }
     const [isRouting, setIsRouting] = createSignal(false, { pureWrite: true });

package/package.json

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