eddev 2.0.0-beta.29 → 2.0.0-beta.30

package/dist/app/lib/routing/components/BrowserRouter.js

@@ -3,10 +3,18 @@ import { useEffect, useMemo, useRef, useState, useTransition } from "react";
 import { isEqual, isRelative, parseURL, resolveURL } from "ufo";
 import { RouterContext, RouterStateContext } from "../context.js";
 import { RouteLoader } from "../loader.js";
-import { getLinkHandlerMode, getRouteMeta, normalizeRoute, parseQuery, stringifyRouteLink } from "../utils.js";
+import { getLinkHandlerMode, getRouteMeta, isSamePathname, normalizeRoute, parseQuery, stringifyRouteLink, } from "../utils.js";
 import { AppRenderer } from "./RouteRenderer.js";
 import { $routeMetaStore } from "../hooks/useRouteMeta.js";
+// Create a global RouteLoader instance
 const loader = new RouteLoader();
+// Create a unique ID for each history entry
+let historyStamp = String(new Date().getTime());
+let historyIndex = 0;
+function getHistoryId() {
+    return historyStamp + historyIndex++;
+}
+// Set up the initial route data
 let initialRoute;
 let initialRouteHydrated = false;
 if (env.client && !env.admin) {
@@ -58,10 +66,6 @@ function historyStateForRoute(route) {
         state: route.returnState,
     };
 }
-let index = 0;
-function getHistoryId() {
-    return String(index++);
-}
 let lastRouterState = null;
 export function BrowserRouter(props) {
     const pendingRoute = useRef(null);
@@ -319,9 +323,12 @@ export function BrowserRouter(props) {
                     e.preventDefault();
                     if (preferBack) {
                         const lastState = state.history.length > 1 && state.history[state.history.length - 2];
-                        if (lastState && isEqual(href, lastState.uri)) {
-                            history.back();
-                            return;
+                        if (lastState) {
+                            const doesMatch = preferBack === "exact" ? isEqual(href, lastState.uri) : isSamePathname(href, lastState.uri);
+                            if (doesMatch) {
+                                history.back();
+                                return;
+                            }
                         }
                     }
                     api.navigate(href);

package/dist/app/lib/routing/components/Link.d.ts

@@ -3,7 +3,7 @@ type Props<T extends ElementType = "a"> = NoInfer<Omit<ComponentPropsWithRef<T>,
     href?: string | null;
     target?: string | null;
     as?: T;
-    preferBack?: boolean;
+    preferBack?: boolean | "exact";
 };
 export declare const Link: <T extends ElementType = "a">(props: Props<T>) => ReactElement;
 /**

package/dist/app/lib/routing/types.d.ts

@@ -102,7 +102,7 @@ export type RouterAPI = {
     /** Replace the hash */
     replaceHash: (hash: string) => void;
     /** Handle link clicking events */
-    handleClickEvent(e: PointerOrMouseEvent, href?: string, preferBack?: boolean): void;
+    handleClickEvent(e: PointerOrMouseEvent, href?: string, preferBack?: boolean | "exact"): void;
     /** A reference to the route loader (mostly for internal use) */
     loader: RouteLoader;
     /** Subscribe to events */

package/dist/app/lib/routing/utils.d.ts

@@ -1,6 +1,7 @@
 import { MouseEvent as ReactMouseEvent, PointerEvent as ReactPointerEvent } from "react";
 import { RouteData, RouteLink, RouteMeta, RouteState } from "./types.js";
 export declare function isSameOrigin(url: string): boolean;
+export declare function isSamePathname(a: string, b: string): boolean;
 export type PointerOrMouseEvent = MouseEvent | PointerEvent | ReactMouseEvent | ReactPointerEvent;
 export type LinkHandlerMode = {
     mode: "ignore" | "navigate" | "native";

package/dist/app/lib/routing/utils.js

@@ -10,6 +10,11 @@ export function isSameOrigin(url) {
         return parsed.protocol === document.location.protocol && parsed.host === document.location.host;
     }
 }
+export function isSamePathname(a, b) {
+    const left = parseURL(a).pathname.replace(/\/$/, "").toLocaleLowerCase();
+    const right = parseURL(b).pathname.replace(/\/$/, "").toLocaleLowerCase();
+    return left === right;
+}
 export function getLinkHandlerMode(e, href) {
     try {
         // Attempt to get the link element, if there is one

package/dist/node/cli/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.29";
+export declare const VERSION = "2.0.0-beta.30";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.29";
+export const VERSION = "2.0.0-beta.30";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.30",
   "description": "",
   "main": "index.js",
   "type": "module",