@solidjs/router 0.10.9 → 0.11.0

package/dist/routers/components.d.ts

@@ -1,5 +1,5 @@
 import type { Component, JSX } from "solid-js";
-import type { MatchFilters, RouteLoadFunc, RouteDefinition, RouterIntegration, RouteSectionProps } from "../types";
+import type { MatchFilters, RouteLoadFunc, RouteDefinition, RouterIntegration, RouteSectionProps } from "../types.ts";
 export type BaseRouterProps = {
     base?: string;
     /**

package/dist/routers/components.jsx

@@ -1,8 +1,8 @@
 /*@refresh skip*/
 import { getRequestEvent, isServer } from "solid-js/web";
 import { children, createMemo, createRoot, mergeProps, on, Show } from "solid-js";
-import { createBranches, createRouteContext, createRouterContext, getRouteMatches, RouteContextObj, RouterContextObj } from "../routing";
-import { createMemoObject } from "../utils";
+import { createBranches, createRouteContext, createRouterContext, getRouteMatches, RouteContextObj, RouterContextObj } from "../routing.js";
+import { createMemoObject } from "../utils.js";
 export const createRouterComponent = (router) => (props) => {
     const { base } = props;
     const routeDefs = children(() => props.children);
@@ -18,13 +18,14 @@ function Routes(props) {
     if (isServer) {
         const e = getRequestEvent();
         e &&
-            (e.routerMatches || (e.routerMatches = [])).push(matches().map(({ route, path, params }) => ({
-                path: route.originalPath,
-                pattern: route.pattern,
-                match: path,
-                params,
-                metadata: route.metadata
-            })));
+            ((e.router || (e.router = {})).matches ||
+                (e.router.matches = matches().map(({ route, path, params }) => ({
+                    path: route.originalPath,
+                    pattern: route.pattern,
+                    match: path,
+                    params,
+                    metadata: route.metadata
+                }))));
     }
     const params = createMemoObject(() => {
         const m = matches();

package/dist/routers/createRouter.d.ts

@@ -1,10 +1,10 @@
-import type { LocationChange, RouterContext, RouterUtils } from "../types";
+import type { LocationChange, RouterContext, RouterUtils } from "../types.ts";
 export declare function createRouter(config: {
     get: () => string | LocationChange;
     set: (next: LocationChange) => void;
     init?: (notify: (value?: string | LocationChange) => void) => () => void;
     create?: (router: RouterContext) => void;
     utils?: Partial<RouterUtils>;
-}): (props: import("./components").BaseRouterProps) => import("solid-js").JSX.Element;
+}): (props: import("./components.jsx").BaseRouterProps) => import("solid-js").JSX.Element;
 export declare function bindEvent(target: EventTarget, type: string, handler: EventListener): () => void;
 export declare function scrollToHash(hash: string, fallbackTop?: boolean): void;

package/dist/routers/createRouter.js

@@ -1,5 +1,5 @@
 import { createSignal, onCleanup } from "solid-js";
-import { createRouterComponent } from "./components";
+import { createRouterComponent } from "./components.jsx";
 function intercept([value, setValue], get, set) {
     return [get ? () => get(value()) : value, set ? (v) => setValue(set(v)) : setValue];
 }

package/dist/routers/index.d.ts

@@ -1,11 +1,11 @@
-export { Route } from "./components";
-export type { BaseRouterProps, RouteProps } from "./components";
-export { createRouter } from "./createRouter";
-export { Router } from "./Router";
-export type { RouterProps } from "./Router";
-export { HashRouter } from "./HashRouter";
-export type { HashRouterProps } from "./HashRouter";
-export { MemoryRouter, createMemoryHistory } from "./MemoryRouter";
-export type { MemoryRouterProps, MemoryHistory } from "./MemoryRouter";
-export { StaticRouter } from "./StaticRouter";
-export type { StaticRouterProps } from "./StaticRouter";
+export { Route } from "./components.jsx";
+export type { BaseRouterProps, RouteProps } from "./components.jsx";
+export { createRouter } from "./createRouter.js";
+export { Router } from "./Router.js";
+export type { RouterProps } from "./Router.js";
+export { HashRouter } from "./HashRouter.js";
+export type { HashRouterProps } from "./HashRouter.js";
+export { MemoryRouter, createMemoryHistory } from "./MemoryRouter.js";
+export type { MemoryRouterProps, MemoryHistory } from "./MemoryRouter.js";
+export { StaticRouter } from "./StaticRouter.js";
+export type { StaticRouterProps } from "./StaticRouter.js";

package/dist/routers/index.js

@@ -1,6 +1,6 @@
-export { Route } from "./components";
-export { createRouter } from "./createRouter";
-export { Router } from "./Router";
-export { HashRouter } from "./HashRouter";
-export { MemoryRouter, createMemoryHistory } from "./MemoryRouter";
-export { StaticRouter } from "./StaticRouter";
+export { Route } from "./components.jsx";
+export { createRouter } from "./createRouter.js";
+export { Router } from "./Router.js";
+export { HashRouter } from "./HashRouter.js";
+export { MemoryRouter, createMemoryHistory } from "./MemoryRouter.js";
+export { StaticRouter } from "./StaticRouter.js";

package/dist/routing.d.ts

@@ -1,5 +1,5 @@
 import { JSX, Accessor } from "solid-js";
-import type { BeforeLeaveEventArgs, Branch, Intent, Location, MatchFilters, NavigateOptions, Navigator, Params, Route, RouteContext, RouteDefinition, RouteMatch, RouterContext, RouterIntegration, SetParams } from "./types";
+import type { BeforeLeaveEventArgs, Branch, Intent, Location, MatchFilters, NavigateOptions, Navigator, Params, Route, RouteContext, RouteDefinition, RouteMatch, RouterContext, RouterIntegration, SetParams } from "./types.js";
 export declare const RouterContextObj: import("solid-js").Context<RouterContext | undefined>;
 export declare const RouteContextObj: import("solid-js").Context<RouteContext | undefined>;
 export declare const useRouter: () => RouterContext;
@@ -9,7 +9,7 @@ export declare const useHref: (to: () => string | undefined) => Accessor<string
 export declare const useNavigate: () => Navigator;
 export declare const useLocation: <S = unknown>() => Location<S>;
 export declare const useIsRouting: () => () => boolean;
-export declare const useMatch: <S extends string>(path: () => S, matchFilters?: MatchFilters<S> | undefined) => Accessor<import("./types").PathMatch | undefined>;
+export declare const useMatch: <S extends string>(path: () => S, matchFilters?: MatchFilters<S> | undefined) => Accessor<import("./types.js").PathMatch | undefined>;
 export declare const useParams: <T extends Params>() => T;
 export declare const useSearchParams: <T extends Params>() => [Partial<T>, (params: SetParams, options?: Partial<NavigateOptions>) => void];
 export declare const useBeforeLeave: (listener: (e: BeforeLeaveEventArgs) => void) => void;

package/dist/routing.js

@@ -1,7 +1,7 @@
 import { createComponent, createContext, createMemo, createRenderEffect, createSignal, on, onCleanup, untrack, useContext, startTransition, resetErrorBoundaries } from "solid-js";
 import { isServer, getRequestEvent } from "solid-js/web";
-import { createBeforeLeave } from "./lifecycle";
-import { createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals } from "./utils";
+import { createBeforeLeave } from "./lifecycle.js";
+import { mockBase, createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals } from "./utils.js";
 const MAX_REDIRECTS = 100;
 export const RouterContextObj = createContext();
 export const RouteContextObj = createContext();
@@ -68,9 +68,12 @@ export function createRoutes(routeDef, base = "") {
         for (const originalPath of expandOptionals(path)) {
             const path = joinPaths(base, originalPath);
             let pattern = isLeaf ? path : path.split("/*", 1)[0];
-            pattern = pattern.split("/").map((s) => {
-                return (s.startsWith(':') || s.startsWith('*')) ? s : encodeURIComponent(s);
-            }).join("/");
+            pattern = pattern
+                .split("/")
+                .map((s) => {
+                return s.startsWith(":") || s.startsWith("*") ? s : encodeURIComponent(s);
+            })
+                .join("/");
             acc.push({
                 ...shared,
                 originalPath,
@@ -140,7 +143,7 @@ export function getRouteMatches(branches, location) {
     return [];
 }
 export function createLocation(path, state) {
-    const origin = new URL("http://sar");
+    const origin = new URL(mockBase);
     const url = createMemo(prev => {
         const path_ = path();
         try {
@@ -252,7 +255,7 @@ export function createRouterContext(integration, getBranches, options = {}) {
                     // A delta of 0 means stay at the current location, so it is ignored
                 }
                 else if (utils.go) {
-                    beforeLeave.confirm(to, options) && utils.go(to);
+                    utils.go(to);
                 }
                 else {
                     console.warn("Router integration does not support relative routing");
@@ -276,8 +279,7 @@ export function createRouterContext(integration, getBranches, options = {}) {
             if (resolvedTo !== current || nextState !== state()) {
                 if (isServer) {
                     const e = getRequestEvent();
-                    e &&
-                        (e.response = new Response(null, { status: 302, headers: { Location: resolvedTo } }));
+                    e && (e.response = { status: 302, headers: new Headers({ Location: resolvedTo }) });
                     setSource({ value: resolvedTo, replace, scroll, state: nextState });
                 }
                 else if (beforeLeave.confirm(resolvedTo, options)) {
@@ -347,7 +349,7 @@ export function createRouterContext(integration, getBranches, options = {}) {
     }
     function initFromFlash() {
         const e = getRequestEvent();
-        return e && e.initialSubmission ? [e.initialSubmission] : [];
+        return e && e.router && e.router.submission ? [e.router.submission] : [];
     }
 }
 export function createRouteContext(router, parent, outlet, match, params) {

package/dist/types.d.ts

@@ -1,10 +1,16 @@
 import type { Component, JSX, Signal } from "solid-js";
 declare module "solid-js/web" {
     interface RequestEvent {
-        response?: Response;
-        routerMatches?: OutputMatch[][];
-        routerCache?: Map<any, any>;
-        initialSubmission?: Submission<any, any>;
+        response?: {
+            status?: number;
+            statusText?: string;
+            headers: Headers;
+        };
+        router?: {
+            matches?: OutputMatch[];
+            cache?: Map<string, CacheEntry>;
+            submission?: Submission<any, any>;
+        };
         serverOnly?: boolean;
     }
 }
@@ -151,3 +157,6 @@ export type Submission<T, U> = {
 export interface MaybePreloadableComponent extends Component {
     preload?: () => void;
 }
+export type CacheEntry = [number, any, Intent | undefined, Signal<number> & {
+    count: number;
+}];

package/dist/utils.d.ts

@@ -1,4 +1,5 @@
-import type { MatchFilters, Params, PathMatch, Route, SetParams } from "./types";
+import type { MatchFilters, Params, PathMatch, Route, SetParams } from "./types.ts";
+export declare const mockBase = "http://sr";
 export declare const redirectStatusCodes: Set<number>;
 export declare function normalizePath(path: string, omitSlash?: boolean): string;
 export declare function resolvePath(base: string, path: string, from?: string): string | undefined;

package/dist/utils.js

@@ -1,6 +1,7 @@
 import { createMemo, getOwner, runWithOwner } from "solid-js";
 const hasSchemeRegex = /^(?:[a-z0-9]+:)?\/\//i;
 const trimPathRegex = /^\/+|(\/)\/+$/g;
+export const mockBase = "http://sr";
 export const redirectStatusCodes = new Set([204, 301, 302, 303, 307, 308]);
 export function normalizePath(path, omitSlash = false) {
     const s = path.replace(trimPathRegex, "$1");

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.10.9",
+  "version": "0.11.0",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -29,34 +29,31 @@
   ],
   "sideEffects": false,
   "devDependencies": {
-    "@babel/core": "^7.18.13",
-    "@babel/preset-typescript": "^7.18.6",
-    "@rollup/plugin-babel": "6.0.3",
-    "@rollup/plugin-node-resolve": "15.0.1",
-    "@rollup/plugin-terser": "0.2.0",
-    "@types/jest": "^29.0.0",
-    "@types/node": "^20.9.0",
-    "babel-jest": "^29.0.1",
+    "@babel/core": "^7.23.9",
+    "@babel/preset-typescript": "^7.23.3",
+    "@changesets/cli": "^2.27.1",
+    "@rollup/plugin-babel": "6.0.4",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@rollup/plugin-terser": "0.4.4",
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.11.14",
     "babel-preset-solid": "^1.8.6",
-    "jest": "^29.0.1",
-    "jest-environment-jsdom": "^29.2.1",
-    "prettier": "^2.7.1",
-    "rollup": "^3.7.5",
-    "solid-jest": "^0.2.0",
+    "jsdom": "^24.0.0",
+    "prettier": "^2.7.0",
+    "rollup": "^4.9.6",
     "solid-js": "^1.8.7",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3",
+    "vite": "^5.0.12",
+    "vite-plugin-solid": "^2.9.1",
+    "vitest": "^1.2.2"
   },
   "peerDependencies": {
     "solid-js": "^1.8.6"
   },
-  "jest": {
-    "preset": "solid-jest/preset/browser"
-  },
   "scripts": {
     "build": "tsc && rollup -c",
-    "test": "jest && npm run test:types",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage && npm run test:types",
+    "test": "vitest run && npm run test:types",
+    "test:watch": "vitest",
     "test:types": "tsc --project tsconfig.test.json",
     "pretty": "prettier --write \"{src,test}/**/*.{ts,tsx}\""
   }