@solidjs/router 2.0.0-next.17 → 2.0.0-next.19

package/dist/routers/components.jsx

@@ -1,5 +1,5 @@
 /*@refresh skip*/
-import { createMemo, createRoot, getOwner, onCleanup, runWithOwner, untrack } from "solid-js";
+import { createMemo, createRoot, getOwner, onCleanup, runWithOwner, untrack, Show } from "solid-js";
 import { getRequestEvent, isServer } from "@solidjs/web";
 import { createRouteContext, getIntent, getRouteMatches, resolveLazySubtree, RouteContextObj, setInPreloadFn, unresolvedLazyMatches } from "../routing.js";
 export function Root(props) {
@@ -104,13 +104,17 @@ export function Routes(props) {
     return <>{outlet()}</>;
 }
 const createOutlet = (child) => {
-    return () => {
-        const c = child();
-        if (c) {
-            return <RouteContextObj value={c}>{c.outlet()}</RouteContextObj>;
-        }
-        return undefined;
-    };
+    // Keyed on the context's identity (#588). `when` compiles to a lazy prop
+    // getter, so child() is tracked inside Show's memo — the outlet function
+    // reads nothing reactive and Show owns the subtree. Levels whose context is
+    // reference-reused (parent layouts) keep their subtree across navigations;
+    // a changed context must re-create the provider, not just re-render under
+    // it: a context value is registered once at provider creation
+    // (setContext(provider, props.value)), so non-keyed reuse would leave new
+    // route content reading the previous level's context.
+    return () => (<Show when={child()} keyed>
+      {c => <RouteContextObj value={c}>{c.outlet()}</RouteContextObj>}
+    </Show>);
 };
 // for data only mode with single flight mutations
 function dataOnly(event, routerState, branches) {

package/dist/routing.js

@@ -5,6 +5,7 @@ import { DEV } from "solid-js";
 import { createComponent, createContext, createMemo, createSignal, isPending, NotReadyError, untrack, useContext } from "solid-js";
 import { clearFlashCookie, getRequestEvent, hasFlashCookie, isServer } from "@solidjs/web";
 import { mockBase, comparablePath, createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals } from "./utils.js";
+import { HREF } from "./paths.js";
 const MAX_REDIRECTS = 100;
 /** Consider this API opaque and internal. It is likely to change in the future. */
 export const RouterContextObj = createContext();
@@ -262,15 +263,20 @@ const encodeSegment = (s) => encodeURIComponent(s).replace(/%(2B|40|3A|24|26|2C|
 const lazyBoundaries = new WeakMap();
 // Module scope: boundary resolution is global, deterministic state (same
 // thunk -> same routes), shared by every factory instance and the server's
-// flight collector.
+// flight collector. The counter is the source of truth; the client mirrors
+// it into a signal for subscription. Server render is pure (signal writes
+// are inert as of solid 2.0.0-rc.3): there the plain counter serves reads,
+// and re-runs come from the parked computation's promise retry, not from
+// reactivity.
+let lazyTreeCounter = 0;
 const [lazyTreeVersion, setLazyTreeVersion] = createSignal(0);
 /** Reactive read of the lazy-subtree version — recompile compiled branches when it changes. */
 export function trackLazySubtrees() {
-    return lazyTreeVersion();
+    return isServer ? lazyTreeCounter : lazyTreeVersion();
 }
 /** Non-reactive read, for cache-busting outside the reactive graph (server collectors). */
 export function peekLazySubtrees() {
-    return untrack(lazyTreeVersion);
+    return lazyTreeCounter;
 }
 function getLazyBoundary(thunk) {
     let record = lazyBoundaries.get(thunk);
@@ -314,7 +320,8 @@ export function resolveLazySubtree(record) {
                 m.routes ||
                 [];
         record.resolved = routes;
-        setLazyTreeVersion(v => v + 1);
+        lazyTreeCounter++;
+        isServer || setLazyTreeVersion(lazyTreeCounter);
         return record.resolved;
     }, e => {
         // ?? Error(): a held undefined would read as "no failure" and refire
@@ -694,9 +701,20 @@ export function createRouterContext(integration, branches, getContext, options =
                 }
                 return;
             }
-            // typed path proxy nodes coerce to their href
+            // A paths node carries its logical path under the Href brand — read
+            // that rather than coercing: toString() renders the *display* href
+            // (eg. hash mode's `#` prefix), which is for the DOM, not for routing.
+            // Foreign Href-branded values without the slot still coerce.
             if (typeof to !== "string")
-                to = to.toString();
+                to = to[HREF] || to.toString();
+            // Display hrefs can still arrive as plain strings: terminating paths
+            // calls type as `string`, and redirect Location headers round-trip
+            // through here. Under hash mode those start with `#` — a spelling no
+            // logical path uses — so map them back through the integration's
+            // parser, exactly like the anchor click handler does. Elsewhere
+            // parsePath is identity and `#...` keeps its URL meaning below.
+            if (to[0] === "#")
+                to = parsePath(to);
             const { replace, resolve, scroll, state: nextState } = {
                 replace: false,
                 resolve: true,

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.17",
+  "version": "2.0.0-next.19",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -37,22 +37,22 @@
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-node-resolve": "15.3.0",
     "@rollup/plugin-terser": "0.4.4",
-    "@solidjs/vite-plugin": "3.0.0-next.28",
-    "@solidjs/web": "^2.0.0-rc.1",
+    "@solidjs/vite-plugin": "3.0.0-next.35",
+    "@solidjs/web": "^2.0.0-rc.4",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.0",
-    "babel-preset-solid": "^2.0.0-rc.1",
+    "babel-preset-solid": "^2.0.0-rc.2",
     "jsdom": "^25.0.1",
     "prettier": "^3.4.1",
     "rollup": "^4.27.4",
-    "solid-js": "^2.0.0-rc.1",
+    "solid-js": "^2.0.0-rc.4",
     "typescript": "^5.7.2",
-    "vite": "^6.0.0",
-    "vitest": "^2.1.6"
+    "vite": "^8.2.2",
+    "vitest": "^4.1.11"
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-rc.1",
-    "solid-js": "^2.0.0-rc.1"
+    "@solidjs/web": "^2.0.0-rc.4",
+    "solid-js": "^2.0.0-rc.4"
   },
   "scripts": {
     "build": "rm -rf dist && tsc && rollup -c",