@farbenmeer/router 0.6.0 → 0.6.2

package/dist/index.d.ts

@@ -6,4 +6,5 @@ export { usePathname } from "./use-pathname";
 export { useSearchParams } from "./use-search-params";
 export { useHash } from "./use-hash";
 export { useParams } from "./use-params";
+export { Switch } from "./switch";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}

package/dist/index.js

@@ -6,3 +6,4 @@ export { usePathname } from "./use-pathname";
 export { useSearchParams } from "./use-search-params";
 export { useHash } from "./use-hash";
 export { useParams } from "./use-params";
+export { Switch } from "./switch";

package/dist/mock-history.d.ts

@@ -4,5 +4,6 @@ export declare function mockHistory(pathname?: string): {
         pushState: import("vitest").Mock<(_state: any, _unused: string, url: string) => void>;
         replaceState: import("vitest").Mock<(_state: any, _unused: string, url: string) => void>;
     };
+    back(): void;
 };
 //# sourceMappingURL=mock-history.d.ts.map

package/dist/mock-history.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock-history.d.ts","sourceRoot":"","sources":["../src/mock-history.ts"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CAAC,QAAQ,SAAM;;;kDAMV,GAAG,WAAW,MAAM,OAAO,MAAM;qDAG9B,GAAG,WAAW,MAAM,OAAO,MAAM;;EAKnE"}
+{"version":3,"file":"mock-history.d.ts","sourceRoot":"","sources":["../src/mock-history.ts"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CAAC,QAAQ,SAAM;;;kDAOV,GAAG,WAAW,MAAM,OAAO,MAAM;qDAI9B,GAAG,WAAW,MAAM,OAAO,MAAM;;;EAanE"}

package/dist/mock-history.js

@@ -1,15 +1,25 @@
 import { vi } from "vitest";
 export function mockHistory(pathname = "/") {
     const location = new URL(pathname, "http://localhost:3000");
+    const stack = [location.href];
     return {
         location,
         history: {
             pushState: vi.fn((_state, _unused, url) => {
                 location.href = new URL(url, location.href).href;
+                stack.push(location.href);
             }),
             replaceState: vi.fn((_state, _unused, url) => {
                 location.href = new URL(url, location.href).href;
+                stack[stack.length - 1] = location.href;
             }),
         },
+        back() {
+            if (stack.length > 1) {
+                stack.pop();
+                location.href = stack[stack.length - 1];
+                window.dispatchEvent(new PopStateEvent("popstate"));
+            }
+        },
     };
 }

package/dist/path.js

@@ -27,7 +27,7 @@ export function compilePathRegex(path) {
     const pattern = path
         .replaceAll(/\*(\w+)/g, "(?<$1>.+)") // *name -> named capture group
         .replaceAll(/\*/g, ".+") // * -> match everything including /
-        .replaceAll(/:(\w+)/g, "(?<$1>[\\w-]+)"); // :param -> named capture group
+        .replaceAll(/:(\w+)/g, "(?<$1>[^\\/]+)"); // :param -> named capture group
     // If pattern contains a wildcard, it already matches everything - use exact match
     if (path.includes("*")) {
         return new RegExp(`^(${pattern})$`);
@@ -43,7 +43,7 @@ export function compileExactPathRegex(path) {
     const pattern = path
         .replaceAll(/\*(\w+)/g, "(?<$1>.+)") // *name -> named capture group
         .replaceAll(/\*/g, ".+") // * -> match everything including /
-        .replaceAll(/:(\w+)/g, "(?<$1>[\\w-]+)"); // :param -> named capture group
+        .replaceAll(/:(\w+)/g, "(?<$1>[^\\/]+)"); // :param -> named capture group
     return new RegExp(`^(${pattern})$`);
 }
 export function buildFullPath(parentPath, path) {

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAU3E,UAAU,KAAK;IACb,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,OAAO,CAAC,EAAE;QACR,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5D,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;KAChE,CAAC;CACH;AAED,wBAAgB,MAAM,CAAC,EACrB,OAAwB,EACxB,QAA0B,EAC1B,QAAQ,GACT,EAAE,KAAK,2CAwCP"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiD,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAUtF,UAAU,KAAK;IACb,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,OAAO,CAAC,EAAE;QACR,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5D,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;KAChE,CAAC;CACH;AAED,wBAAgB,MAAM,CAAC,EACrB,OAAwB,EACxB,QAA0B,EAC1B,QAAQ,GACT,EAAE,KAAK,2CAoDP"}

package/dist/router.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { startTransition, useMemo, useState } from "react";
+import { startTransition, useEffect, useMemo, useState } from "react";
 import { HashContext, PathnameContext, RouterContext, SearchParamsContext, } from "./context";
 import { ImmutableSearchParams } from "./immutable-search-params";
 import { removeTrailingSlash } from "./path";
@@ -7,6 +7,17 @@ export function Router({ history = window.history, location = window.location, c
     const [pathname, setPathname] = useState(removeTrailingSlash(location.pathname));
     const [searchParams, setSearchParams] = useState(new ImmutableSearchParams(location.search));
     const [hash, setHash] = useState(location.hash);
+    useEffect(() => {
+        const handlePopstate = () => {
+            startTransition(() => {
+                setPathname(removeTrailingSlash(location.pathname));
+                setSearchParams(new ImmutableSearchParams(location.search));
+                setHash(location.hash);
+            });
+        };
+        window.addEventListener("popstate", handlePopstate);
+        return () => window.removeEventListener("popstate", handlePopstate);
+    }, [location]);
     const routerContextValue = useMemo(() => ({
         push: (url) => {
             history.pushState(null, "", url);

package/dist/switch.js

@@ -34,7 +34,7 @@ export function Switch({ children }) {
                 ];
         }
         return null;
-    }, [routeMeta]);
+    }, [routeMeta, pathname]);
     if (!match) {
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farbenmeer/router",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "author": {
     "name": "Michel Smola",
     "email": "michel.smola@farbenmeer.de"
@@ -25,6 +25,7 @@
     "@vitest/browser-playwright": "^4.0.16",
     "react": "^19.1.1",
     "vitest": "^4.0.16",
+    "playwright": "^1.58.1",
     "vitest-browser-react": "^2.0.2"
   },
   "peerDependencies": {
@@ -34,6 +35,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "release": "pnpm run build && pnpm publish",
-    "test": "vitest"
+    "test": "vitest",
+    "ci-setup": "playwright install --with-deps"
   }
 }