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

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, REVALIDATE_HEADER } from "@solidjs/web";
 import { GET, decodeResponse, getServerFunctionMetadata, isServerFunction } from "@solidjs/web/server-functions";
-import { useRouter, useRoute, getIntent, getInPreloadFn } from "../routing.js";
+import { useRouter, getIntent, getInPreloadFn } from "../routing.js";
 const LocationHeader = "Location";
 const PRELOAD_TIMEOUT = 5000;
 const CACHE_TIMEOUT = 180000;
@@ -59,7 +59,6 @@ export function query(fn, name) {
         const inPreloadFn = getInPreloadFn();
         const owner = getOwner();
         const router = owner ? useRouter() : undefined;
-        const route = owner ? useRoute() : undefined;
         const navigate = router && router.navigatorFactory();
         const now = Date.now();
         const key = name + hashKey(args);
@@ -84,27 +83,17 @@ export function query(fn, name) {
             tracking = true;
             onCleanup(() => cached[4].count--);
         }
-        // A read under a route section the in-flight navigation is leaving keeps
-        // its invalidated value instead of refetching: this render is disposed at
-        // commit and never paints, and refiring would put a second request on
-        // what single flight promises is one. The entry stays a cache miss, so
-        // the fetch happens at its next real use — a later navigation's preload
-        // or read — unless the flight payload seeds it first. Retained sections
-        // still refetch here, inside the navigation's transition, so the
-        // redirect commits with fresh data.
-        const leaving = cached && !cached[0] && route && router.leaving?.(route);
         if (cached &&
-            (cached[0]
-                ? isServer ||
-                    intent === "native" ||
-                    cached[4].count ||
-                    Date.now() - cached[0] < PRELOAD_TIMEOUT
-                : leaving)) {
+            cached[0] &&
+            (isServer ||
+                intent === "native" ||
+                cached[4].count ||
+                Date.now() - cached[0] < PRELOAD_TIMEOUT)) {
             if (tracking) {
                 cached[4].count++;
                 cached[4][0](); // track
             }
-            if (!leaving && cached[3] === "preload" && intent !== "preload") {
+            if (cached[3] === "preload" && intent !== "preload") {
                 cached[0] = now;
             }
             let res = cached[1];
@@ -113,7 +102,7 @@ export function query(fn, name) {
                     "then" in cached[1]
                         ? cached[1].then(handleResponse(false), handleResponse(true))
                         : handleResponse(false)(cached[1]);
-                !leaving && !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
+                !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
             }
             inPreloadFn && "then" in res && res.catch(() => { });
             return res;

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];
     }
@@ -1165,12 +1168,6 @@ function createRouterContext(integration, branches, getContext, options = {}) {
     get pendingTarget() {
       return lastTransitionTarget;
     },
-    leaving(route) {
-      const t = lastTransitionTarget;
-      if (!t || !route.retained) return false;
-      const pathname = t.value.split(/[?#]/, 1)[0];
-      return !route.retained(options.transformUrl ? options.transformUrl(pathname) : pathname);
-    },
     renderPath,
     parsePath,
     navigatorFactory,
@@ -1375,13 +1372,6 @@ function createRouteContext(router, parent, outlet, match, matches = () => [matc
     pattern,
     params,
     path,
-    retained(target) {
-      const m = match();
-      const p = m.route.matcher(target);
-      // params derive from the matched path, so equal paths mean this
-      // section instance (layouts match prefixes via partial matchers)
-      return !!p && p.path === m.path;
-    },
     outlet: () => component ? createComponent(component, {
       params,
       location,
@@ -2197,7 +2187,6 @@ function query(fn, name) {
     const inPreloadFn = getInPreloadFn();
     const owner = getOwner();
     const router = owner ? useRouter() : undefined;
-    const route = owner ? useRoute() : undefined;
     const navigate = router && router.navigatorFactory();
     const now = Date.now();
     const key = name + hashKey(args);
@@ -2221,28 +2210,18 @@ function query(fn, name) {
       tracking = true;
       onCleanup(() => cached[4].count--);
     }
-
-    // A read under a route section the in-flight navigation is leaving keeps
-    // its invalidated value instead of refetching: this render is disposed at
-    // commit and never paints, and refiring would put a second request on
-    // what single flight promises is one. The entry stays a cache miss, so
-    // the fetch happens at its next real use — a later navigation's preload
-    // or read — unless the flight payload seeds it first. Retained sections
-    // still refetch here, inside the navigation's transition, so the
-    // redirect commits with fresh data.
-    const leaving = cached && !cached[0] && route && router.leaving?.(route);
-    if (cached && (cached[0] ? isServer || intent === "native" || cached[4].count || Date.now() - cached[0] < PRELOAD_TIMEOUT : leaving)) {
+    if (cached && cached[0] && (isServer || intent === "native" || cached[4].count || Date.now() - cached[0] < PRELOAD_TIMEOUT)) {
       if (tracking) {
         cached[4].count++;
         cached[4][0](); // track
       }
-      if (!leaving && cached[3] === "preload" && intent !== "preload") {
+      if (cached[3] === "preload" && intent !== "preload") {
         cached[0] = now;
       }
       let res = cached[1];
       if (intent !== "preload") {
         res = "then" in cached[1] ? cached[1].then(handleResponse(false), handleResponse(true)) : handleResponse(false)(cached[1]);
-        !leaving && !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
+        !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
       }
       inPreloadFn && "then" in res && res.catch(() => {});
       return res;

package/dist/routing.js

@@ -621,13 +621,6 @@ export function createRouterContext(integration, branches, getContext, options =
         get pendingTarget() {
             return lastTransitionTarget;
         },
-        leaving(route) {
-            const t = lastTransitionTarget;
-            if (!t || !route.retained)
-                return false;
-            const pathname = t.value.split(/[?#]/, 1)[0];
-            return !route.retained(options.transformUrl ? options.transformUrl(pathname) : pathname);
-        },
         renderPath,
         parsePath,
         navigatorFactory,
@@ -815,13 +808,6 @@ export function createRouteContext(router, parent, outlet, match, matches = () =
         pattern,
         params,
         path,
-        retained(target) {
-            const m = match();
-            const p = m.route.matcher(target);
-            // params derive from the matched path, so equal paths mean this
-            // section instance (layouts match prefixes via partial matchers)
-            return !!p && p.path === m.path;
-        },
         outlet: () => component
             ? createComponent(component, {
                 params,

package/dist/types.d.ts

@@ -6,6 +6,7 @@ declare module "@solidjs/web" {
             status?: number;
             statusText?: string;
             headers: Headers;
+            committed?: boolean;
         };
         router?: {
             matches?: OutputMatch[];
@@ -244,8 +245,6 @@ export interface RouteContext {
     path: () => string;
     outlet: () => JSX.Element;
     resolvePath(to: string): string | undefined;
-    /** Whether this route section still matches `target` (same matched path), i.e. survives a navigation there. Absent on the base route, which always survives. */
-    retained?(target: string): boolean;
 }
 export interface RouterUtils {
     renderPath(path: string): string;
@@ -264,8 +263,6 @@ export interface RouterContext {
     isRouting: () => boolean;
     /** The target of the in-flight navigation transition, if any. Not reactive. */
     readonly pendingTarget?: LocationChange;
-    /** Whether `route` is a section the in-flight navigation is leaving. False when no navigation is pending. */
-    leaving?(route: RouteContext): boolean;
     matches: () => RouteMatch[];
     renderPath(path: string): string;
     parsePath(str: string): string;

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.13",
+  "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",