eddev 2.0.0-beta.16 → 2.0.0-beta.161

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

@@ -0,0 +1,47 @@
+import { useMemo } from "react";
+import { useRoute } from "../hooks/useRoute";
+import { useRouter } from "../hooks/useRouter";
+import { useRouterState } from "../hooks/useRouterState";
+import { getLinkHandlerMode } from "../utils";
+/**
+ * Display a back button that will navigate to the previous page in the router's history.
+ *
+ * This will allow you to render a back button on the condition that the back button will not send the user to a different website.
+ */
+export function BackButton(props) {
+    const router = useRouter();
+    const prevRoute = useRouterState((state) => state.history[state.history.length - 2]);
+    const contextRoute = useRoute();
+    const activeRoute = useRouterState((state) => state.activeRoute);
+    const route = props.mode === "global" ? activeRoute : contextRoute;
+    const backAction = useMemo(() => {
+        if (prevRoute && (!props.filter || props.filter(prevRoute))) {
+            return (e) => {
+                const { mode } = getLinkHandlerMode(e, prevRoute.uri);
+                if (mode === "navigate") {
+                    e.preventDefault();
+                    history.back();
+                    // history.length
+                }
+                else if (mode === "ignore") {
+                    e.preventDefault();
+                }
+            };
+        }
+        else if (props.fallbackHref) {
+            return (e) => {
+                const { mode } = getLinkHandlerMode(e, props.fallbackHref);
+                if (mode === "navigate") {
+                    e.preventDefault();
+                    router.navigate(props.fallbackHref);
+                }
+                else if (mode === "ignore") {
+                    e.preventDefault();
+                }
+            };
+        }
+    }, [route, props.filter, props.fallbackHref]);
+    if (backAction) {
+        return props.render ? props.render({ route: prevRoute, onClick: backAction }) : null;
+    }
+}

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

@@ -1,4 +1,9 @@
 import { PropsWithChildren } from "react";
-type Props = PropsWithChildren<{}>;
+import { type RouterAPI } from "../types.js";
+type Props = PropsWithChildren<{
+    routerRef?: React.MutableRefObject<RouterAPI | null>;
+    onReady?: () => void;
+}>;
 export declare function BrowserRouter(props: Props): import("react/jsx-runtime").JSX.Element;
 export {};
+//# sourceMappingURL=BrowserRouter.d.ts.map

package/dist/app/lib/routing/components/BrowserRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuD,MAAM,OAAO,CAAA;AAK9F,OAAO,EAML,KAAK,SAAS,EAGf,MAAM,aAAa,CAAA;AAWpB,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAC,CAAA;AAuEF,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,2CAobzC"}

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

@@ -1,11 +1,20 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState, useTransition } from "react";
-import { isRelative, parseURL, resolveURL } from "ufo";
-import { RouterContext, RouterStateContext } from "../context.js";
+import { isEqual, isRelative, parseURL, resolveURL } from "ufo";
+import { clientMetaTags, RouterContext, RouterStateContext } from "../context.js";
+import { $routeMetaStore } from "../hooks/useRouteMeta.js";
 import { RouteLoader } from "../loader.js";
-import { getLinkHandlerMode, normalizeRoute, parseQuery, stringifyRouteLink } from "../utils.js";
+import { getLinkHandlerMode, getRouteMeta, isSamePathname, normalizeRoute, parseQuery, stringifyRouteLink, } from "../utils.js";
 import { AppRenderer } from "./RouteRenderer.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) {
@@ -23,7 +32,10 @@ if (env.client && !env.admin) {
         search: "",
         query: {},
         view: initialData.view,
+        meta: getRouteMeta(initialData),
     });
+    history.replaceState(historyStateForRoute(initialRoute), "", document.location.href);
+    $routeMetaStore.data = getRouteMeta(initialData);
 }
 function parseHrefPath(url) {
     if (isRelative(url)) {
@@ -54,14 +66,9 @@ 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);
-    // const [activeRoute, setActiveRoute] = useState<RouteState>(initialRoute)
     const [transitioning, startTransition] = useTransition();
     const [routerState, setRouterState] = useState(() => ({
         activeRoute: initialRoute,
@@ -79,6 +86,16 @@ export function BrowserRouter(props) {
                 ...state,
                 ...update,
             };
+            if (state?.activeRoute?.meta?.tags) {
+                if (env.serverless) {
+                    clientMetaTags.setMetaTags(state.activeRoute.meta.tags ?? []);
+                }
+                else {
+                    const title = state.activeRoute.meta.tags.find((tag) => tag.tagName === "title")?.inner;
+                    if (title)
+                        document.title = title;
+                }
+            }
             setRouterState(state);
         };
         const internals = {
@@ -181,11 +198,20 @@ export function BrowserRouter(props) {
             });
             if (cancelled)
                 return;
-            const data = await loader.loadRouteData(parseHrefPath(args.url));
-            if (!data.view) {
-                console.error("No `view` property in route data");
-                return;
-            }
+            const data = await loader.loadRouteData(parseHrefPath(args.url)).catch((err) => {
+                emitEvent({ type: "error", url: args.url, error: err, critical: true });
+                return {
+                    view: "_error",
+                    viewType: "react",
+                    appData: loader.appData,
+                    viewData: {
+                        data: {
+                            code: 500,
+                            error: err,
+                        },
+                    },
+                };
+            });
             const lazyComponent = loader.getRouteComponent(data.view);
             if (!lazyComponent) {
                 console.error(`No component found for view: ${data.view}`);
@@ -196,11 +222,12 @@ export function BrowserRouter(props) {
                     hash: link.hash,
                     search: "",
                     query: link.query,
-                    pathname: link.pathname,
+                    pathname: data.canonical ?? link.pathname,
                     view: data.view,
                     props: data.viewData?.data ?? {},
                     component: lazyComponent,
                     returnState: args.restoreState ?? {},
+                    meta: getRouteMeta(data),
                 });
             setState({
                 pendingRoute: route,
@@ -229,6 +256,15 @@ export function BrowserRouter(props) {
                     lastRoute: currentRoute,
                     link,
                 });
+                $routeMetaStore.data = route.meta;
+                // Update the 'Edit Page' button, if there is one
+                if (route.meta.editLink) {
+                    const button = document.querySelector("#wp-admin-bar-edit a");
+                    if (button) {
+                        button.setAttribute("href", route.meta.editLink);
+                        button.innerHTML = "Edit Page";
+                    }
+                }
             };
             startTransition(() => {
                 pendingRoute.current = route;
@@ -240,6 +276,7 @@ export function BrowserRouter(props) {
         }
         const api = {
             loader: loader,
+            hostname: window?._PAGE_DATA?.hostname,
             async navigate(url) {
                 doRouteTransition({
                     url: url,
@@ -247,6 +284,9 @@ export function BrowserRouter(props) {
                     goingBack: false,
                 });
             },
+            getState() {
+                return state;
+            },
             replaceHash(hash) {
                 replaceRoute({
                     ...getActiveRoute(),
@@ -257,6 +297,7 @@ export function BrowserRouter(props) {
                 replaceRoute({
                     ...getActiveRoute(),
                     query,
+                    returnState: captureState(),
                 });
             },
             async prefetch(url) {
@@ -265,7 +306,7 @@ export function BrowserRouter(props) {
                     if (loader.hasRouteData(link.pathname))
                         return;
                     emitEvent({ type: "preload:start", currentRoute: getActiveRoute(), link });
-                    const data = await loader.loadRouteData(link.pathname).then((data) => {
+                    await loader.loadRouteData(link.pathname).then((data) => {
                         emitEvent({ type: "preload:data-ready", currentRoute: getActiveRoute(), link, data });
                     });
                 }
@@ -297,9 +338,24 @@ export function BrowserRouter(props) {
                     subscribers.delete(fn);
                 };
             },
-            handleClickEvent(e, originalHref) {
-                const { mode, href } = getLinkHandlerMode(e, originalHref);
-                if (mode === "ignore") {
+            handleClickEvent(e, originalHref, preferBack) {
+                const { mode, href, isSameUrl } = getLinkHandlerMode(e, originalHref, state.activeRoute);
+                let cancelled = false;
+                if (href) {
+                    emitEvent({
+                        type: "clicked",
+                        currentRoute: getActiveRoute(),
+                        link: parseRouteLink(href),
+                        mode,
+                        href,
+                        isSameUrl,
+                        cancel() {
+                            cancelled = true;
+                        },
+                    });
+                }
+                console.log(mode, href, isSameUrl);
+                if (mode === "ignore" || cancelled) {
                     e.preventDefault();
                     return;
                 }
@@ -308,10 +364,53 @@ export function BrowserRouter(props) {
                 }
                 else if (mode === "navigate" && href) {
                     e.preventDefault();
+                    if (preferBack) {
+                        const lastState = state.history.length > 1 && state.history[state.history.length - 2];
+                        if (lastState) {
+                            const doesMatch = preferBack === "exact" ? isEqual(href, lastState.uri) : isSamePathname(href, lastState.uri);
+                            if (doesMatch) {
+                                history.back();
+                                return;
+                            }
+                        }
+                    }
                     api.navigate(href);
                 }
             },
             emitEvent,
+            restoreRoute(route) {
+                const stack = state.history;
+                // Is the route in our history stack? (going back)
+                const index = stack.findIndex((item) => item.id === route.id);
+                if (index >= 0) {
+                    return doRouteTransition({
+                        url: route.uri,
+                        route,
+                        goingBack: true,
+                        history: stack.slice(0, index),
+                        restoreState: route.returnState,
+                        shouldPush: false,
+                    });
+                }
+                // Is the route in our history _cache_? (probably going forward)
+                if (historyCache.has(route.id)) {
+                    return doRouteTransition({
+                        url: route.uri,
+                        route,
+                        goingBack: false,
+                        history: stack,
+                        restoreState: route.returnState,
+                        shouldPush: false,
+                    });
+                }
+                return doRouteTransition({
+                    url: route.uri,
+                    goingBack: false,
+                    history: stack,
+                    restoreState: route.returnState,
+                    shouldPush: false,
+                });
+            },
         };
         return {
             api,
@@ -340,6 +439,7 @@ export function BrowserRouter(props) {
         // Handle popState
         // const router = useRouterStore.getState()
         const onPopState = (e) => {
+            // console.log("Popped", e.state)
             internals.poppedState?.(document.location.href, e.state ?? {});
         };
         window.addEventListener("popstate", onPopState);
@@ -347,5 +447,8 @@ export function BrowserRouter(props) {
             window.removeEventListener("popstate", onPopState);
         };
     }, []);
+    useEffect(() => {
+        props.onReady?.();
+    }, []);
     return (_jsx(RouterContext.Provider, { value: api, children: _jsx(RouterStateContext.Provider, { value: routerState, children: _jsx(AppRenderer, {}) }) }));
 }

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

@@ -8,5 +8,6 @@ type Props = PropsWithChildren<{
  *
  * The optional 'fallback' prop can be used to show a loading state or placeholder content while the client bundle is loading.
  */
-export declare function ClientOnly(props: Props): string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<import("react").ReactNode> | null;
+export declare function ClientOnly(props: Props): string | number | boolean | Iterable<import("react").ReactNode> | import("react/jsx-runtime").JSX.Element | null;
 export {};
+//# sourceMappingURL=ClientOnly.d.ts.map

package/dist/app/lib/routing/components/ClientOnly.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClientOnly.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/ClientOnly.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAGnD,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,qEAAqE;IACrE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B,CAAC,CAAA;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,oHAMtC"}

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

@@ -8,7 +8,7 @@ import { useIsSSR } from "../hooks/useIsSSR.js";
  */
 export function ClientOnly(props) {
     const mounted = useIsSSR();
-    if (!mounted)
+    if (mounted)
         return props.fallback ?? null;
     return _jsx(Fragment, { children: props.children });
 }

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

@@ -1,9 +1,25 @@
-import { ComponentPropsWithRef, ElementType, ReactElement } from "react";
+import { ComponentPropsWithRef, ElementType, MouseEvent, ReactElement } from "react";
 type Props<T extends ElementType = "a"> = NoInfer<Omit<ComponentPropsWithRef<T>, "href">> & {
     href?: string | null;
     target?: string | null;
     as?: T;
+    preferBack?: boolean | "exact";
 };
+export declare function useLinkProps<T extends ElementType = "a">(props: Exclude<Props<T>, "as">, ref?: React.Ref<HTMLAnchorElement>): ({
+    ref: import("react").Ref<HTMLAnchorElement> | undefined;
+} & Exclude<Props<T>, "as"> & {
+    href: string | undefined;
+    onClick: (e: MouseEvent) => void;
+}) | ({
+    ref: import("react").Ref<HTMLAnchorElement> | undefined;
+    "data-active": boolean | "path" | "query" | "exact" | undefined;
+    "data-child-active": boolean | undefined;
+    "data-pending": "path" | "query" | "exact" | undefined;
+} & Exclude<Props<T>, "as"> & {
+    href: string;
+    onMouseEnter: (e: MouseEvent) => void;
+    onClick: (e: MouseEvent) => void;
+});
 export declare const Link: <T extends ElementType = "a">(props: Props<T>) => ReactElement;
 /**
  * Provides information about the given href parameter, such as whether it is active, whether a child page is active, or whether it is loading.
@@ -24,3 +40,4 @@ export declare function useLinkState(href: string): {
     pending: "path" | "query" | "exact" | undefined;
 };
 export {};
+//# sourceMappingURL=Link.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/Link.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAsC,MAAM,OAAO,CAAA;AASxH,KAAK,KAAK,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG;IAC1F,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,EAAE,CAAC,EAAE,CAAC,CAAA;IACN,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CAC/B,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EACtD,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAC9B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;;;;iBAOjB,UAAU;;;;;;;;sBAgBP,UAAU;iBASf,UAAU;GAK1B;AAED,eAAO,MAAM,IAAI,EAIX,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,CAAA;AAKpE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;EA6BxC"}

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

@@ -1,33 +1,50 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { forwardRef, useMemo } from "react";
+import { createElement, forwardRef, useMemo } from "react";
 import { parseURL, resolveURL, withoutTrailingSlash } from "ufo";
 import { useIsSSR } from "../hooks/useIsSSR.js";
 import { useRouter } from "../hooks/useRouter.js";
-import { isSameOrigin } from "../utils.js";
+import { addTrailingSlash, getLinkHandlerMode, isSameOrigin } from "../utils.js";
 import { useRoute } from "../hooks/useRoute.js";
 import { useRouterState } from "../hooks/useRouterState.js";
-export const Link = forwardRef((props, ref) => {
-    const Comp = props.as || "a";
+export function useLinkProps(props, ref) {
     if (env.admin) {
-        return (_jsx(Comp, { ref: ref, ...props, href: props.href ?? undefined, onClick: (e) => {
+        return {
+            ref: ref,
+            ...props,
+            href: props.href ?? undefined,
+            onClick: (e) => {
                 props.onClick?.(e);
                 e.preventDefault();
-            } }));
-    }
-    else {
-        const preload = useRouter((r) => r.preload);
-        const handleClickEvent = useRouter((r) => r.handleClickEvent);
-        const state = useLinkState(props.href ?? "");
-        return (_jsx(Comp, { ref: ref, "data-active": state.active ?? undefined, "data-child-active": state.childActive ?? undefined, "data-pending": state.pending ?? undefined, ...props, href: props.href ?? undefined, onMouseEnter: (e) => {
-                if (props.onMouseEnter) {
-                    props.onMouseEnter(e);
-                }
-                preload(props.href);
-            }, onClick: (e) => {
-                props.onClick?.(e);
-                handleClickEvent(e, props.href ?? undefined);
-            } }));
+            },
+        };
     }
+    const router = useRouter();
+    const state = useLinkState(props.href ?? "");
+    return {
+        ref: ref,
+        "data-active": state.active ?? undefined,
+        "data-child-active": state.childActive ?? undefined,
+        "data-pending": state.pending ?? undefined,
+        ...props,
+        href: addTrailingSlash(props.href),
+        onMouseEnter: (e) => {
+            if (props.onMouseEnter) {
+                props.onMouseEnter(e);
+            }
+            const mode = getLinkHandlerMode(e, props.href);
+            if (mode.mode === "navigate") {
+                router.preload(props.href);
+            }
+        },
+        onClick: (e) => {
+            props.onClick?.(e);
+            router.handleClickEvent(e, props.href ?? undefined, props.preferBack);
+        },
+    };
+}
+export const Link = forwardRef(({ preferBack, as, ...props }, ref) => {
+    const Comp = as || "a";
+    const finalProps = useLinkProps(props, ref);
+    return createElement(Comp, finalProps);
 });
 // @ts-ignore
 Link.displayName = "Link";

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

@@ -0,0 +1,10 @@
+import { HTMLProps, JSX } from "react";
+type Props<T extends keyof JSX.IntrinsicElements> = {
+    as?: T;
+} & HTMLProps<T>;
+/**
+ * Use this component to wrap any HTML element that contains <a> tags that are not already handled by the router.
+ */
+export declare function NativeLinkHandler<T extends keyof JSX.IntrinsicElements = "div">({ as, ...props }: Props<T>): import("react/jsx-runtime").JSX.Element;
+export {};
+//# sourceMappingURL=NativeLinkHandler.d.ts.map

package/dist/app/lib/routing/components/NativeLinkHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeLinkHandler.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/NativeLinkHandler.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAGtD,KAAK,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,CAAC,iBAAiB,IAAI;IAClD,EAAE,CAAC,EAAE,CAAC,CAAA;CACP,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;AAEhB;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,CAAC,iBAAiB,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,2CAqB1G"}

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

@@ -0,0 +1,23 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useRouter } from "../hooks/useRouter";
+/**
+ * Use this component to wrap any HTML element that contains <a> tags that are not already handled by the router.
+ */
+export function NativeLinkHandler({ as, ...props }) {
+    const handleClickEvent = useRouter((r) => r.handleClickEvent);
+    const Comp = (as ?? "div");
+    return (_jsx(Comp, { ...props, onClick: (e) => {
+            if (props.onClick)
+                props.onClick(e);
+            if (e.target instanceof HTMLAnchorElement) {
+                const link = e.target;
+                handleClickEvent?.(e, link.href);
+            }
+            else if (e.target instanceof HTMLElement) {
+                const link = e.target.closest("a");
+                if (link) {
+                    handleClickEvent?.(e, link.href);
+                }
+            }
+        } }));
+}

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

@@ -7,3 +7,4 @@ export declare function RouteDisplay(props: {
 export declare namespace RouteDisplay {
     var displayName: string;
 }
+//# sourceMappingURL=RouteRenderer.d.ts.map

package/dist/app/lib/routing/components/RouteRenderer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RouteRenderer.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/RouteRenderer.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAOxC,eAAO,MAAM,WAAW,oFAatB,CAAA;AAEF,wBAAgB,SAAS,4CAGxB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAAE,KAAK,EAAE,UAAU,CAAA;CAAE,2CAcxD;yBAde,YAAY"}

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo, Suspense, useMemo } from "react";
+import { memo, useMemo } from "react";
+import { RouteErrorBoundary } from "../../../utils/RouteErrorBoundary.js";
 import { RouteItemContext } from "../context.js";
 import { useRouter } from "../hooks/useRouter.js";
 import { useRouterState } from "../hooks/useRouterState.js";
@@ -9,7 +10,7 @@ export const AppRenderer = memo(() => {
     const app = useMemo(() => {
         return (_jsx(AppComponent, { ...appData, children: _jsx(MainRoute, {}) }));
     }, [AppComponent, appData]);
-    return (_jsx(Suspense, { children: _jsx(RouteItemContext.Provider, { value: activeRoute, children: app }) }));
+    return _jsx(RouteItemContext.Provider, { value: activeRoute, children: app });
 });
 export function MainRoute() {
     const activeRoute = useRouterState((s) => s.activeRoute);
@@ -22,7 +23,7 @@ export function RouteDisplay(props) {
     }
     return useMemo(() => {
         let child = !!Component && _jsx(Component, { ...props.route.props });
-        return _jsx(RouteItemContext.Provider, { value: props.route, children: child });
+        return (_jsx(RouteErrorBoundary, { route: props.route, children: _jsx(RouteItemContext.Provider, { value: props.route, children: child }) }));
     }, [Component, props.route, props.route]);
 }
 RouteDisplay.displayName = "RouteDisplay";

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

@@ -2,8 +2,10 @@ import { PropsWithChildren } from "react";
 import { RouteLoader } from "../loader.js";
 import { RouteState } from "../types.js";
 type Props = PropsWithChildren<{
+    hostname?: string;
     route: RouteState;
     loader: RouteLoader;
 }>;
 export declare function SSRRouter(props: Props): import("react/jsx-runtime").JSX.Element;
 export {};
+//# sourceMappingURL=SSRRouter.d.ts.map

package/dist/app/lib/routing/components/SSRRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SSRRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/SSRRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAY,MAAM,OAAO,CAAA;AAInD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAGxC,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,UAAU,CAAA;IACjB,MAAM,EAAE,WAAW,CAAA;CACpB,CAAC,CAAA;AAEF,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,2CAgBrC"}

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

@@ -1,5 +1,4 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { RouterContext, RouterStateContext } from "../context.js";
 import { useRouter } from "../hooks/useRouter.js";
 import { useRouterState } from "../hooks/useRouterState.js";
@@ -8,7 +7,8 @@ export function SSRRouter(props) {
     const router = useRouter();
     const routerState = useRouterState();
     router.loader = props.loader;
+    router.hostname = props.hostname;
     routerState.history = [props.route];
     routerState.activeRoute = props.route;
-    return (_jsx(Suspense, { children: _jsx(RouterContext.Provider, { value: router, children: _jsx(RouterStateContext.Provider, { value: routerState, children: _jsx(AppRenderer, {}) }) }) }));
+    return (_jsx(RouterContext.Provider, { value: router, children: _jsx(RouterStateContext.Provider, { value: routerState, children: _jsx(AppRenderer, {}) }) }));
 }

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

@@ -13,3 +13,4 @@ type Props = {
  */
 export declare function ScrollRestoration(props: Props): null;
 export {};
+//# sourceMappingURL=ScrollRestoration.d.ts.map

package/dist/app/lib/routing/components/ScrollRestoration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScrollRestoration.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/ScrollRestoration.tsx"],"names":[],"mappings":"AAEA,KAAK,KAAK,GAAG;IACX,2FAA2F;IAC3F,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAA;IACxF,4CAA4C;IAC5C,SAAS,CAAC,EAAE,cAAc,CAAA;CAC3B,CAAA;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,QAiC7C"}

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

@@ -11,7 +11,10 @@ export function ScrollRestoration(props) {
         }));
     useRouterEvents((event) => {
         if (event.type === "navigate:changed") {
-            // console.log("Changed! Restoring scroll", event.currentRoute)
+            // If the pathname and search term are the same, then we're on the same page
+            const isSameRoute = event.currentRoute.pathname === event.lastRoute.pathname && event.currentRoute.search === event.lastRoute.search;
+            if (isSameRoute)
+                return;
             if (event.currentRoute.returnState) {
                 restore({
                     top: event.currentRoute.returnState.scrollTop ?? 0,

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

@@ -1,5 +1,9 @@
-import { Context } from "react";
-import { RouterAPI, RouterAPIState } from "./types.js";
-export declare const RouterContext: Context<RouterAPI>;
-export declare const RouterStateContext: Context<RouterAPIState>;
-export declare const RouteItemContext: Context<import("./types.js").TypedRouteState<"_unknown", {}>>;
+import { RouteMetaTag, RouterAPI, RouterAPIState } from "./types.js";
+export declare const RouterContext: import("react").Context<RouterAPI>;
+export declare const RouterStateContext: import("react").Context<RouterAPIState>;
+export declare const RouteItemContext: import("react").Context<import("./types.js").TypedRouteState<"_unknown", {}>>;
+export declare const clientMetaTags: {
+    tags: null | RouteMetaTag[];
+    setMetaTags(tags: RouteMetaTag[]): void;
+};
+//# sourceMappingURL=context.d.ts.map

package/dist/app/lib/routing/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAc,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAkBhF,eAAO,MAAM,aAAa,oCAgBxB,CAAA;AAEF,eAAO,MAAM,kBAAkB,yCAI7B,CAAA;AAEF,eAAO,MAAM,gBAAgB,+EAAwC,CAAA;AAErE,eAAO,MAAM,cAAc;UACX,IAAI,GAAG,YAAY,EAAE;sBACjB,YAAY,EAAE;CAGhC,CAAA"}