@solidjs/router 2.0.0-next.12 → 2.0.0-next.14

package/dist/data/action.js

@@ -330,7 +330,11 @@ function applyResponseMetadata(metadata, navigate, flightData) {
     cacheKeyOp(keys, entry => (entry[0] = 0));
     // set cache
     flightData && Object.keys(flightData).forEach(k => query.set(k, flightData[k]));
-    // trigger revalidation
+    // trigger revalidation inside the same transition as the navigation, so
+    // the redirect commits atomically with fresh data: surviving consumers
+    // (shared layouts) the flight payload didn't seed refetch and hold the
+    // commit rather than painting stale and updating after. Seeded entries
+    // are fresh again by now, so the sweep re-reads them from cache.
     revalidate(keys, false);
 }
 async function handleResponse(response, error, navigate, metadataHandled) {

package/dist/data/events.js

@@ -35,6 +35,10 @@ export function setupNativeEvents({ preload = true, explicitLinks = false, actio
             if (a.hasAttribute("download") || (rel && rel.includes("external")))
                 return;
             const url = svg ? new URL(href, document.baseURI) : new URL(href);
+            // Skip non-http(s) schemes (blob:, mailto:, tel:, data:, ...). blob: URLs
+            // inherit the page origin, so the origin check below won't reject them. #382
+            if (url.protocol !== "https:" && url.protocol !== "http:")
+                return;
             if (url.origin !== window.location.origin ||
                 (basePath && url.pathname && !url.pathname.toLowerCase().startsWith(basePath.toLowerCase())))
                 return;

package/dist/data/query.js

@@ -1,7 +1,7 @@
 import { createSignal, getObserver, getOwner, onCleanup, sharedConfig } from "solid-js";
-import { getRequestEvent, isResponseEnvelope, isServer } from "@solidjs/web";
+import { getRequestEvent, isResponseEnvelope, isServer, REVALIDATE_HEADER } from "@solidjs/web";
 import { GET, decodeResponse, getServerFunctionMetadata, isServerFunction } from "@solidjs/web/server-functions";
-import { useNavigate, getIntent, getInPreloadFn } from "../routing.js";
+import { useRouter, getIntent, getInPreloadFn } from "../routing.js";
 const LocationHeader = "Location";
 const PRELOAD_TIMEOUT = 5000;
 const CACHE_TIMEOUT = 180000;
@@ -58,7 +58,8 @@ export function query(fn, name) {
         const intent = getIntent();
         const inPreloadFn = getInPreloadFn();
         const owner = getOwner();
-        const navigate = owner ? useNavigate() : undefined;
+        const router = owner ? useRouter() : undefined;
+        const navigate = router && router.navigatorFactory();
         const now = Date.now();
         const key = name + hashKey(args);
         let cached = cache.get(key);
@@ -171,14 +172,28 @@ export function query(fn, name) {
                     }
                     const url = v.headers.get(LocationHeader);
                     if (url !== null) {
+                        // invalidate the redirect's revalidation keys before navigating so
+                        // the destination's preloads see the miss and fetch fresh (#580 thread)
+                        const keys = !isServer && v.headers.get(REVALIDATE_HEADER)?.split(",");
+                        keys && cacheKeyOp(keys, entry => (entry[0] = 0));
                         // client + server relative redirect
-                        if (navigate && url.startsWith("/"))
+                        const soft = navigate && url.startsWith("/");
+                        if (soft)
                             navigate(url, { replace: true });
                         else if (!isServer)
                             window.location.href = url;
                         else if (e)
                             e.response.status = 302;
-                        return;
+                        // sweep the live signals inside the same transition as the
+                        // navigation: surviving consumers (shared layouts) refetch and
+                        // hold the commit, so the destination never paints stale data
+                        keys && revalidate(keys, false);
+                        // Hold the read pending on the client: the navigation unmounts this
+                        // consumer, and resolving `undefined` instead hands a missing value
+                        // to whatever renders before the transition commits (a downstream
+                        // `.map()` crashes). The server keeps resolving — its render can't
+                        // await a navigation and the 302 discards the body anyway.
+                        return isServer ? undefined : new Promise(() => { });
                     }
                     if (hasEnveloped)
                         v = enveloped;

package/dist/index.js

@@ -336,6 +336,9 @@ function setupNativeEvents({
       const rel = (a.getAttribute("rel") || "").split(/\s+/);
       if (a.hasAttribute("download") || rel && rel.includes("external")) return;
       const url = svg ? new URL(href, document.baseURI) : new URL(href);
+      // Skip non-http(s) schemes (blob:, mailto:, tel:, data:, ...). blob: URLs
+      // inherit the page origin, so the origin check below won't reject them. #382
+      if (url.protocol !== "https:" && url.protocol !== "http:") return;
       if (url.origin !== window.location.origin || basePath && url.pathname && !url.pathname.toLowerCase().startsWith(basePath.toLowerCase())) return;
       return [a, url];
     }
@@ -1191,7 +1194,6 @@ function createRouterContext(integration, branches, getContext, options = {}) {
       }
       // typed path proxy nodes coerce to their href
       if (typeof to !== "string") to = to.toString();
-      const queryOnly = !to || to[0] === "?";
       const {
         replace,
         resolve,
@@ -1199,11 +1201,21 @@ function createRouterContext(integration, branches, getContext, options = {}) {
         state: nextState
       } = {
         replace: false,
-        resolve: !queryOnly,
+        resolve: true,
         scroll: true,
         ...options
       };
-      const resolvedTo = resolve ? route.resolvePath(to) : resolvePath(queryOnly && location.pathname || "", to);
+
+      // A string means what the same string means as an href. Leading "/"
+      // stays base-prefixed; anything else resolves URL-style against the
+      // current location — `new URL` collapses `..` and handles `?`/`#`-only
+      // references natively (#502). A cross-origin result (scheme or
+      // protocol-relative input) falls through as unroutable.
+      let resolvedTo;
+      if (!resolve) resolvedTo = resolvePath((!to || to[0] === "?") && location.pathname || "", to);else if (to[0] === "/") resolvedTo = route.resolvePath(to);else {
+        const url = new URL(to, mockBase + location.pathname + location.search + location.hash);
+        resolvedTo = url.origin === mockBase ? url.pathname + url.search + url.hash : undefined;
+      }
       if (resolvedTo === undefined) {
         throw new Error(`Path '${to}' is not a routable path`);
       } else if (referrers.length >= MAX_REDIRECTS) {
@@ -2174,7 +2186,8 @@ function query(fn, name) {
     const intent = getIntent();
     const inPreloadFn = getInPreloadFn();
     const owner = getOwner();
-    const navigate = owner ? useNavigate() : undefined;
+    const router = owner ? useRouter() : undefined;
+    const navigate = router && router.navigatorFactory();
     const now = Date.now();
     const key = name + hashKey(args);
     let cached = cache.get(key);
@@ -2267,11 +2280,28 @@ function query(fn, name) {
           }
           const url = v.headers.get(LocationHeader);
           if (url !== null) {
+            // invalidate the redirect's revalidation keys before navigating so
+            // the destination's preloads see the miss and fetch fresh (#580 thread)
+            const keys = !isServer && v.headers.get(REVALIDATE_HEADER)?.split(",");
+            keys && cacheKeyOp(keys, entry => entry[0] = 0);
+
             // client + server relative redirect
-            if (navigate && url.startsWith("/")) navigate(url, {
+            const soft = navigate && url.startsWith("/");
+            if (soft) navigate(url, {
               replace: true
             });else if (!isServer) window.location.href = url;else if (e) e.response.status = 302;
-            return;
+
+            // sweep the live signals inside the same transition as the
+            // navigation: surviving consumers (shared layouts) refetch and
+            // hold the commit, so the destination never paints stale data
+            keys && revalidate(keys, false);
+
+            // Hold the read pending on the client: the navigation unmounts this
+            // consumer, and resolving `undefined` instead hands a missing value
+            // to whatever renders before the transition commits (a downstream
+            // `.map()` crashes). The server keeps resolving — its render can't
+            // await a navigation and the 302 discards the body anyway.
+            return isServer ? undefined : new Promise(() => {});
           }
           if (hasEnveloped) v = enveloped;else if (v.body) {
             // responses the transport hands over whole (revalidation) carry a
@@ -2660,7 +2690,11 @@ function applyResponseMetadata(metadata, navigate, flightData) {
   cacheKeyOp(keys, entry => entry[0] = 0);
   // set cache
   flightData && Object.keys(flightData).forEach(k => query.set(k, flightData[k]));
-  // trigger revalidation
+  // trigger revalidation inside the same transition as the navigation, so
+  // the redirect commits atomically with fresh data: surviving consumers
+  // (shared layouts) the flight payload didn't seed refetch and hold the
+  // commit rather than painting stale and updating after. Seeded entries
+  // are fresh again by now, so the sweep re-reads them from cache.
   revalidate(keys, false);
 }
 async function handleResponse(response, error, navigate, metadataHandled) {

package/dist/routing.js

@@ -650,16 +650,27 @@ export function createRouterContext(integration, branches, getContext, options =
             // typed path proxy nodes coerce to their href
             if (typeof to !== "string")
                 to = to.toString();
-            const queryOnly = !to || to[0] === "?";
             const { replace, resolve, scroll, state: nextState } = {
                 replace: false,
-                resolve: !queryOnly,
+                resolve: true,
                 scroll: true,
                 ...options
             };
-            const resolvedTo = resolve
-                ? route.resolvePath(to)
-                : resolvePath((queryOnly && location.pathname) || "", to);
+            // A string means what the same string means as an href. Leading "/"
+            // stays base-prefixed; anything else resolves URL-style against the
+            // current location — `new URL` collapses `..` and handles `?`/`#`-only
+            // references natively (#502). A cross-origin result (scheme or
+            // protocol-relative input) falls through as unroutable.
+            let resolvedTo;
+            if (!resolve)
+                resolvedTo = resolvePath(((!to || to[0] === "?") && location.pathname) || "", to);
+            else if (to[0] === "/")
+                resolvedTo = route.resolvePath(to);
+            else {
+                const url = new URL(to, mockBase + location.pathname + location.search + location.hash);
+                resolvedTo =
+                    url.origin === mockBase ? url.pathname + url.search + url.hash : undefined;
+            }
             if (resolvedTo === undefined) {
                 throw new Error(`Path '${to}' is not a routable path`);
             }

package/dist/types.d.ts

@@ -6,6 +6,7 @@ declare module "@solidjs/web" {
             status?: number;
             statusText?: string;
             headers: Headers;
+            committed?: boolean;
         };
         router?: {
             matches?: OutputMatch[];
@@ -74,6 +75,12 @@ export interface Location<S = unknown> extends Path {
     key: string;
 }
 export interface NavigateOptions<S = unknown> {
+    /**
+     * Resolve the target like an href: leading-`/` paths are prefixed with the
+     * router base, anything else resolves URL-style against the current
+     * location (`..` collapses, `?`/`#`-only strings keep the path). `false`
+     * takes the string as the final path. Defaults to `true`.
+     */
     resolve: boolean;
     replace: boolean;
     scroll: boolean;

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.12",
+  "version": "2.0.0-next.14",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -31,7 +31,7 @@
   ],
   "sideEffects": false,
   "devDependencies": {
-    "@solidjs/web": "2.0.0-beta.28",
+    "@solidjs/web": "2.0.0-beta.30",
     "@babel/core": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
     "@changesets/cli": "^2.27.10",
@@ -40,19 +40,19 @@
     "@rollup/plugin-terser": "0.4.4",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.0",
-    "babel-preset-solid": "2.0.0-beta.28",
+    "babel-preset-solid": "2.0.0-beta.30",
     "jsdom": "^25.0.1",
     "prettier": "^3.4.1",
     "rollup": "^4.27.4",
-    "solid-js": "2.0.0-beta.28",
+    "solid-js": "2.0.0-beta.30",
     "typescript": "^5.7.2",
     "vite": "^6.0.0",
     "vite-plugin-solid": "3.0.0-next.10",
     "vitest": "^2.1.6"
   },
   "peerDependencies": {
-    "@solidjs/web": ">=2.0.0-beta.28 <2.0.0-experimental.0",
-    "solid-js": ">=2.0.0-beta.28 <2.0.0-experimental.0"
+    "@solidjs/web": ">=2.0.0-beta.30 <2.0.0-experimental.0",
+    "solid-js": ">=2.0.0-beta.30 <2.0.0-experimental.0"
   },
   "scripts": {
     "build": "rm -rf dist && tsc && rollup -c",