eddev 2.0.0-beta.15 → 2.0.0-beta.152

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

@@ -1,13 +1,15 @@
-export * from "./types";
-export * from "./components/Link";
-export * from "./components/ScrollRestoration";
-export * from "./components/RouteRenderer";
-export * from "./components/ClientOnly";
-export * from "./hooks/useRoute";
-export * from "./hooks/useRouteTransition";
-export * from "./hooks/useRouter";
-export * from "./hooks/useRouterEvents";
-export * from "./hooks/useRouterState";
-export * from "./hooks/useRestorableState";
-export * from "./hooks/useIsSSR";
-export * from "./hooks/useSearchParams";
+export * from "./types.js";
+export * from "./components/Link.js";
+export * from "./components/ScrollRestoration.js";
+export * from "./components/RouteRenderer.js";
+export * from "./components/ClientOnly.js";
+export * from "./components/BackButton.js";
+export * from "./hooks/useRoute.js";
+export * from "./hooks/useRouteTransition.js";
+export * from "./hooks/useRouter.js";
+export * from "./hooks/useRouterEvents.js";
+export * from "./hooks/useRouterState.js";
+export * from "./hooks/useRestorableState.js";
+export * from "./hooks/useIsSSR.js";
+export * from "./hooks/useSearchParams.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAE1B,cAAc,sBAAsB,CAAA;AACpC,cAAc,mCAAmC,CAAA;AACjD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,4BAA4B,CAAA;AAE1C,cAAc,qBAAqB,CAAA;AACnC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,2BAA2B,CAAA;AACzC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,qBAAqB,CAAA;AACnC,cAAc,4BAA4B,CAAA"}

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

@@ -1,13 +1,14 @@
-export * from "./types";
-export * from "./components/Link";
-export * from "./components/ScrollRestoration";
-export * from "./components/RouteRenderer";
-export * from "./components/ClientOnly";
-export * from "./hooks/useRoute";
-export * from "./hooks/useRouteTransition";
-export * from "./hooks/useRouter";
-export * from "./hooks/useRouterEvents";
-export * from "./hooks/useRouterState";
-export * from "./hooks/useRestorableState";
-export * from "./hooks/useIsSSR";
-export * from "./hooks/useSearchParams";
+export * from "./types.js";
+export * from "./components/Link.js";
+export * from "./components/ScrollRestoration.js";
+export * from "./components/RouteRenderer.js";
+export * from "./components/ClientOnly.js";
+export * from "./components/BackButton.js";
+export * from "./hooks/useRoute.js";
+export * from "./hooks/useRouteTransition.js";
+export * from "./hooks/useRouter.js";
+export * from "./hooks/useRouterEvents.js";
+export * from "./hooks/useRouterState.js";
+export * from "./hooks/useRestorableState.js";
+export * from "./hooks/useIsSSR.js";
+export * from "./hooks/useSearchParams.js";

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

@@ -1,6 +1,6 @@
 import { FunctionComponent, PropsWithChildren } from "react";
-import { DynamicComponent } from "../dynamic/dynamic";
-import { RouteData } from "./types";
+import { DynamicComponent } from "../dynamic/dynamic.js";
+import { RouteData } from "./types.js";
 export type RouteCacheEntry = {
     data: RouteData;
     component: FunctionComponent;
@@ -28,3 +28,4 @@ export declare class RouteLoader {
     getRouteComponent<K extends keyof ViewProps>(view: K): DynamicComponent<FunctionComponent<ViewProps[K]>>;
     get appComponent(): DynamicComponent<FunctionComponent<PropsWithChildren<AppData>>>;
 }
+//# sourceMappingURL=loader.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAGtC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAA;IACf,SAAS,EAAE,iBAAiB,CAAA;CAC7B,CAAA;AAED,qBAAa,UAAW,SAAQ,KAAK;IAE1B,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,MAAM;gBADlB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM;CAI5B;AAED,qBAAa,WAAW;IACtB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAY;IACpD,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAY;IAC1D,OAAO,EAAE,OAAO,CAAQ;IACxB,OAAO,CAAC,SAAS,CAAgD;IACjE,OAAO,CAAC,YAAY,CAA2C;IAE/D,EAAE,SAAgB;IAElB,YAAY,CAAC,IAAI,EAAE,OAAO,KAAK;IAI/B,oBAAoB,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM;IAI5D,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,WAAW;IAyBnB,YAAY,CAAC,QAAQ,EAAE,MAAM;IAKvB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAiD9E,UAAU,CAAC,OAAO,EAAE,OAAO;IAI3B,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAKnD,iBAAiB,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,IAAI,EAAE,CAAC,GACT,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAG5F,IAAI,YAAY,IAC6B,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAC3G;CACF"}

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

@@ -1,5 +1,5 @@
 import { parseURL, stringifyParsedURL, stringifyQuery, withTrailingSlash } from "ufo";
-import { viewManifestReader } from "../internal";
+import { viewManifestReader } from "../internal/read-view-manifest.js";
 export class RouteError extends Error {
     message;
     statusCode;
@@ -56,6 +56,7 @@ export class RouteLoader {
         return this.entries.has(cacheKey);
     }
     async loadRouteData(pathname, withAppData = false) {
+        pathname = withTrailingSlash(pathname);
         const cacheKey = this.getKey(pathname);
         // Cached value?
         if (this.entries.has(cacheKey))
@@ -65,27 +66,35 @@ export class RouteLoader {
             serverless: env.serverless,
             debug: env.dev,
         });
-        const promise = this.fetchImpl(requestUrl, {})
-            .then((response) => response.text())
-            .then((text) => {
+        const promise = this.fetchImpl(requestUrl)
+            .then(async (response) => {
+            if (response.redirected) {
+                return { redirect: response.url };
+            }
+            let text = await response.text();
             if (this.processProps) {
                 text = this.processProps(text);
             }
             try {
-                return JSON.parse(text);
+                const payload = JSON.parse(text);
+                if (!payload.view && !payload.redirect) {
+                    throw new RouteError(`Invalid route data for '${pathname}'`, 500);
+                }
+                return payload;
             }
             catch (err) {
                 throw new RouteError(`JSON parse error for route '${pathname}':\n${err?.message}`, 500);
             }
         })
-            .then((data) => {
+            .then(async (data) => {
             if (data.redirect) {
-                const redirect = data.redirect;
-                data = this.loadRouteData(redirect).then((data) => {
-                    data.canonical = redirect;
-                    return data;
-                });
+                const redirect = parseURL(data.redirect).pathname;
+                data = await this.loadRouteData(redirect);
+                data.canonical = redirect;
             }
+            return data;
+        })
+            .then((data) => {
             this.entries.set(cacheKey, new Promise((resolve) => resolve(data)));
             return data;
         });

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

@@ -1,9 +1,16 @@
 import { FunctionComponent } from "react";
-import type { RouteLoader } from "./loader";
-import { LinkHandlerMode, PointerOrMouseEvent } from "./utils";
-export type ParsedRouteTags = Record<"title" | "meta" | "script" | "style" | "link", {
-    [key: string]: string;
-}[]>;
+import type { RouteLoader } from "./loader.js";
+import { LinkHandlerMode, PointerOrMouseEvent } from "./utils.js";
+export type RouteMetaTag = {
+    tagName: string;
+    attributes: Record<string, string>;
+    inner?: string;
+};
+export type TrackerTags = {
+    head?: string;
+    body?: string;
+    footer?: string;
+};
 export interface RouteData {
     view: string;
     editLink?: string;
@@ -13,10 +20,13 @@ export interface RouteData {
     redirect?: string;
     canonical?: string;
     meta?: {
-        head: ParsedRouteTags;
-        footer: ParsedRouteTags;
+        head: RouteMetaTag[];
+        footer: RouteMetaTag[];
     };
 }
+export interface RouteDataWithTrackers extends RouteData {
+    trackers?: TrackerTags;
+}
 export type RouteReturnState<T = {}> = {
     scrollTop: number;
     scrollLeft: number;
@@ -73,7 +83,8 @@ export type RouterEvent = {
     data: RouteData;
 } | {
     type: "error";
-    critical: false;
+    critical: boolean;
+    url?: string;
     error: Error;
 };
 export type RouterSubscriber = (event: RouterEvent) => void;
@@ -99,14 +110,24 @@ export type RouterAPI = {
     replaceQuery: (search: Record<string, string | string[]>) => void;
     /** Replace the hash */
     replaceHash: (hash: string) => void;
-    /** Handle link clicking events */
-    handleClickEvent(e: PointerOrMouseEvent, href?: string): void;
+    /**
+     * Handle a click event, potentially triggering a route change.
+     *
+     * @param e A pointer or mouse event.
+     * @param href An optional URL. This must be provided if no `href` property exists on the clicked element
+     * @param preferBack If set, clicking this link will send the user 'back', when clicking a link to the previous history item.
+     */
+    handleClickEvent(e: PointerOrMouseEvent, href?: string, preferBack?: boolean | "exact"): void;
     /** A reference to the route loader (mostly for internal use) */
     loader: RouteLoader;
     /** Subscribe to events */
     subscribe: (subscribe: RouterSubscriber) => () => void;
     /** This function is used by the routing system automatically */
     emitEvent: (event: RouterEvent) => void;
+    /** Returns the current RouterAPIState */
+    getState: () => RouterAPIState | null;
+    /** Go back to a previous route in the history stack, or push it onto the stack if it isn't currently on the stack. */
+    restoreRoute: (route: RouteState) => void;
 };
 export type TypedRouteState<T, TProps> = {
     /** A unique ID, representing this history item. */
@@ -131,8 +152,28 @@ export type TypedRouteState<T, TProps> = {
     component: FunctionComponent<TProps>;
     /** The props for this route, to be passed to the component. */
     props: TProps;
+    /** Loaded metadata for this route */
+    meta: RouteMeta;
+};
+export type RouteMeta = {
+    title?: string;
+    tags?: RouteMetaTag[];
 };
 export type RouteState = {
     [K in keyof ViewProps]: TypedRouteState<K, ViewProps[K]>;
 }[keyof ViewProps];
 export type AnyRouteState = TypedRouteState<string, any>;
+export type ErrorRouteProps = {
+    /** The HTTP status code for this error */
+    statusCode: number;
+    /** The title of the message (eg. Not Found) */
+    title?: string;
+    /** A message which can be shown to the user, specific to this error */
+    userMessage?: string;
+    /** Detailed error information, which can be displayed to developers or passed to monitoring services */
+    report?: {
+        message: string;
+        details: any;
+    };
+};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/types.ts"],"names":[],"mappings":"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"}

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

@@ -1,15 +1,19 @@
 import { MouseEvent as ReactMouseEvent, PointerEvent as ReactPointerEvent } from "react";
-import { RouteLink, RouteState } from "./types";
+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";
     href?: string;
 };
-export declare function getLinkHandlerMode(e?: PointerOrMouseEvent, href?: string): LinkHandlerMode;
+export declare function getLinkHandlerMode(e?: PointerOrMouseEvent, href?: string, currentRoute?: RouteState): LinkHandlerMode;
 type Partialize<T, TKeys extends keyof T> = Partial<Pick<T, TKeys>> & Omit<T, TKeys>;
 export declare function normalizeRoute(route: Partialize<RouteState, "uri" | "returnState" | "key">): RouteState;
 export declare function stringifyRouteLink(route: RouteLink): string;
 export declare function parseQuery(query: string): Record<string, string | string[]>;
 export declare function stringifyQuery(query: any): string;
+export declare function getRouteMeta(data: RouteData): RouteMeta;
+export declare function addTrailingSlash(path?: string | null): string;
 export {};
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAExF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAExE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,WAQvC;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,WAIlD;AAED,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,YAAY,GAAG,eAAe,GAAG,iBAAiB,CAAA;AAEjG,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvF,wBAAgB,kBAAkB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,UAAU,GAAG,eAAe,CA+DrH;AAED,KAAK,UAAU,CAAC,CAAC,EAAE,KAAK,SAAS,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;AAEpF,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,GAAG,aAAa,GAAG,KAAK,CAAC,GAAG,UAAU,CAavG;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,UAMlD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAI3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,UAOxC;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,CAKvD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,UAKpD"}

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

@@ -1,5 +1,5 @@
-import { parseURL, resolveURL, stringifyParsedURL, withoutTrailingSlash } from "ufo";
-import { stringify as qsStringify, parse as qsParse } from "qs";
+import { parse as qsParse, stringify as qsStringify } from "qs";
+import { parseURL, resolveURL, stringifyParsedURL, withoutTrailingSlash, withTrailingSlash } from "ufo";
 export function isSameOrigin(url) {
     if (typeof document === "undefined") {
         return url.startsWith("/");
@@ -10,7 +10,12 @@ export function isSameOrigin(url) {
         return parsed.protocol === document.location.protocol && parsed.host === document.location.host;
     }
 }
-export function getLinkHandlerMode(e, href) {
+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, currentRoute) {
     try {
         // Attempt to get the link element, if there is one
         let eventTarget = null;
@@ -31,7 +36,11 @@ export function getLinkHandlerMode(e, href) {
         if (!href)
             return { mode: "native", href };
         // Resolve the URL and check if it's the same origin
-        const resolved = href.startsWith("http") ? href : resolveURL(document.location.href, href);
+        const resolved = href.startsWith("http")
+            ? href
+            : href.startsWith("/")
+                ? resolveURL(document.location.origin, href)
+                : resolveURL(document.location.href, href);
         const parsed = parseURL(resolved);
         const isSameOrigin = parsed.host?.replace(/:.+/, "") === document.location.host.replace(/:.+/, "");
         // External links should be handled natively
@@ -52,6 +61,17 @@ export function getLinkHandlerMode(e, href) {
         // Starts with /wp-, use native (wp-content, wp-admin etc)
         if (parsed.pathname.startsWith("/wp-"))
             return { mode: "native", href };
+        // If pathname+query are identical, but the hash is different, then allow the browser to handle it
+        if (currentRoute &&
+            isSamePathname(currentRoute.pathname, parsed.pathname) &&
+            currentRoute.search === parsed.search) {
+            if (currentRoute.hash !== parsed.hash) {
+                return { mode: "native", href };
+            }
+            else {
+                return { mode: "ignore", href };
+            }
+        }
         return { mode: "navigate", href };
     }
     catch (err) {
@@ -76,6 +96,7 @@ export function normalizeRoute(route) {
 export function stringifyRouteLink(route) {
     return stringifyParsedURL({
         ...route,
+        pathname: withTrailingSlash(route.pathname),
         search: stringifyQuery(route.query),
     });
 }
@@ -92,3 +113,15 @@ export function stringifyQuery(query) {
         arrayFormat: "brackets",
     });
 }
+export function getRouteMeta(data) {
+    return {
+        title: data.meta?.head.find((tag) => tag.tagName === "title")?.inner,
+        tags: data.meta?.head ?? [],
+    };
+}
+export function addTrailingSlash(path) {
+    if (path?.match(/\./)) {
+        return path;
+    }
+    return withTrailingSlash(path ?? undefined, true);
+}

package/dist/app/lib/{hooks → runtime}/apiConfig.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Configuration options for manipulating how the client interacts with the GraphQL API
+ */
 export type APIConfigStore = {
     /**
      * Any value, which will be used as part of the cache key for each query.
@@ -11,8 +14,14 @@ export type APIConfigStore = {
      */
     customQueryFetchOptions?: (type: "query" | "mutation", queryName: string, queryArgs: any, url: string, opts: RequestInit) => RequestInit | Promise<RequestInit>;
     /**
-     * Update aspects of the API client
+     * Allows you to hook into the response of a query or mutation.
      */
+    onResponse?: (response: Response, type: "query" | "mutation", queryName: string, queryArgs: any, url: string, opts: RequestInit) => void;
     set: (config: Partial<APIConfigStore>) => void;
+    /**
+     * WordPress API key, for use on the server only
+     **/
+    apiKey?: string;
 };
-export declare const useAPIConfig: import("zustand").UseBoundStore<import("zustand").StoreApi<APIConfigStore>>;
+export declare const apiConfig: APIConfigStore;
+//# sourceMappingURL=apiConfig.d.ts.map

package/dist/app/lib/runtime/apiConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apiConfig.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/runtime/apiConfig.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;;;QAII;IACJ,cAAc,CAAC,EAAE,GAAG,CAAA;IACpB;;;OAGG;IACH,uBAAuB,CAAC,EAAE,CACxB,IAAI,EAAE,OAAO,GAAG,UAAU,EAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,GAAG,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,KACd,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IACvC;;OAEG;IACH,UAAU,CAAC,EAAE,CACX,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,OAAO,GAAG,UAAU,EAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,GAAG,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,KACd,IAAI,CAAA;IACT,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI,CAAA;IAE9C;;QAEI;IACJ,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,SAAS,gBAIpB,CAAA"}

package/dist/app/lib/runtime/apiConfig.js

@@ -0,0 +1,6 @@
+import { proxy } from "valtio";
+export const apiConfig = proxy({
+    set: (config) => {
+        Object.assign(apiConfig, config);
+    },
+});

package/dist/app/lib/runtime/errorHandling.d.ts

@@ -0,0 +1,40 @@
+import { ContentBlock } from "../blocks";
+import { ReactNode } from "react";
+import { RouteState } from "../routing";
+export type ErrorEvent = {
+    /** The runtime error that occurred */
+    error: Error;
+    /** The Component stack (not available in renderBlockError) */
+    componentStack?: string;
+} & ({
+    type: "block";
+    /** The block which had an error, including it's type information, props, content and children */
+    block: ContentBlock;
+} | {
+    type: "route";
+    /** The route which had an error */
+    route: RouteState;
+});
+/**
+ * Configuration options for manipulating how the client interacts with the GraphQL API
+ */
+export type ErrorHandlingConfig = {
+    /**
+     * Triggered when a runtime error occurs in a block
+     * @param event The error event, containing the error and block information
+     **/
+    onReactError?(event: ErrorEvent): void;
+    /**
+     * Triggered when a React rendering error occurs, and allows you to return some JSX to render as a fallback.
+     * If not provided, the block will be hidden from the user.
+     * @param error The error event, containing the error and contextual information
+     * @param defaultDisplay The default display for the block — in development, this will display the error message. In production, this will be `null`.
+     */
+    renderFallback?(event: ErrorEvent, defaultDisplay: ReactNode): ReactNode;
+    /**
+     * Update the error handling configuration all at once
+     */
+    set: (config: Partial<ErrorHandlingConfig>) => void;
+};
+export declare const errorHandling: ErrorHandlingConfig;
+//# sourceMappingURL=errorHandling.d.ts.map

package/dist/app/lib/runtime/errorHandling.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errorHandling.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/runtime/errorHandling.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,MAAM,MAAM,UAAU,GAAG;IACvB,sCAAsC;IACtC,KAAK,EAAE,KAAK,CAAA;IACZ,8DAA8D;IAC9D,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,GAAG,CACA;IACE,IAAI,EAAE,OAAO,CAAA;IACb,iGAAiG;IACjG,KAAK,EAAE,YAAY,CAAA;CACpB,GACD;IACE,IAAI,EAAE,OAAO,CAAA;IACb,mCAAmC;IACnC,KAAK,EAAE,UAAU,CAAA;CAClB,CACJ,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;QAGI;IACJ,YAAY,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;IACtC;;;;;OAKG;IACH,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,GAAG,SAAS,CAAA;IAExE;;OAEG;IACH,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAA;CACpD,CAAA;AAED,eAAO,MAAM,aAAa,qBAIxB,CAAA"}

package/dist/app/lib/runtime/errorHandling.js

@@ -0,0 +1,6 @@
+import { proxy } from "valtio";
+export const errorHandling = proxy({
+    set: (config) => {
+        Object.assign(errorHandling, config);
+    },
+});

package/dist/app/lib/runtime/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./apiConfig";
+export * from "./errorHandling";
+//# sourceMappingURL=index.d.ts.map

package/dist/app/lib/runtime/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/runtime/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA"}

package/dist/app/lib/runtime/index.js

@@ -0,0 +1,2 @@
+export * from "./apiConfig";
+export * from "./errorHandling";

package/dist/app/lib/views/defineView.d.ts

@@ -1,4 +1,5 @@
 import { ComponentType, PropsWithChildren, ReactNode } from "react";
-type ExtendedViewProps<TName extends keyof ViewProps> = TName extends "_app" ? PropsWithChildren<ViewProps[TName]> : ViewProps[TName];
+type ExtendedViewProps<TName extends keyof ViewProps> = TName extends "_app" ? PropsWithChildren<ViewProps[TName]> : TName extends "_error" ? ViewProps[TName] : ViewProps[TName];
 export declare function defineView<Name extends keyof ViewProps>(name: Name, component: (props: ExtendedViewProps<Name>) => ReactNode): ComponentType<ExtendedViewProps<Name>>;
 export {};
+//# sourceMappingURL=defineView.d.ts.map

package/dist/app/lib/views/defineView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineView.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/views/defineView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEnE,KAAK,iBAAiB,CAAC,KAAK,SAAS,MAAM,SAAS,IAAI,KAAK,SAAS,MAAM,GACxE,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GACnC,KAAK,SAAS,QAAQ,GACpB,SAAS,CAAC,KAAK,CAAC,GAChB,SAAS,CAAC,KAAK,CAAC,CAAA;AAEtB,wBAAgB,UAAU,CAAC,IAAI,SAAS,MAAM,SAAS,EACrD,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,SAAS,GACvD,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAExC"}

package/dist/app/lib/views/index.d.ts

@@ -1 +1,2 @@
-export * from "./defineView";
+export * from "./defineView.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/app/lib/views/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/views/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA"}

package/dist/app/lib/views/index.js

@@ -1 +1 @@
-export * from "./defineView";
+export * from "./defineView.js";

package/dist/app/server/index.d.ts

@@ -1,3 +1,5 @@
 export * from "./render-ssr-page.js";
 export * from "./server-context.js";
 export * from "./proxy-wp-admin.js";
+export * from "./rpc.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/app/server/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/app/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,UAAU,CAAA"}

package/dist/app/server/index.js

@@ -1,3 +1,4 @@
 export * from "./render-ssr-page.js";
 export * from "./server-context.js";
 export * from "./proxy-wp-admin.js";
+export * from "./rpc.js";

package/dist/app/server/proxy-wp-admin.d.ts

@@ -1,3 +1,3 @@
 import { EventHandlerRequest, H3Event } from "vinxi/http";
-import { ServerContext } from "./server-context";
-export declare function proxyWpAdmin(event: H3Event<EventHandlerRequest>, serverContext: ServerContext): Promise<Response>;
+export declare function proxyWpAdmin(event: H3Event<EventHandlerRequest>): Promise<Response>;
+//# sourceMappingURL=proxy-wp-admin.d.ts.map

package/dist/app/server/proxy-wp-admin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-wp-admin.d.ts","sourceRoot":"","sources":["../../../src/app/server/proxy-wp-admin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAwD,OAAO,EAAE,MAAM,YAAY,CAAA;AAI/G,wBAAsB,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBA4GrE"}

package/dist/app/server/proxy-wp-admin.js

@@ -1,21 +1,48 @@
 /// <reference types="vinxi/types/server" />
 import { splitSetCookieString } from "cookie-es";
 import { getProxyRequestHeaders, getRequestURL, getWebRequest } from "vinxi/http";
-export async function proxyWpAdmin(event, serverContext) {
-    const replaceUrls = serverContext.replaceUrls;
+import { ServerContext } from "./server-context.js";
+import { renderErrorPage } from "./render-ssr-page.js";
+export async function proxyWpAdmin(event) {
+    const serverContext = ServerContext.main;
     const req = getWebRequest(event);
-    const proxyUrl = serverContext.getOriginUrl(getRequestURL(event).href);
+    const reqUrl = getRequestURL(event);
+    const serverlessConfig = serverContext.config.serverless;
+    if (!serverContext.dev) {
+        if (reqUrl.pathname.toLowerCase().match(/\/+(graphql|xmlrpc|\.php|wp\-(admin|login|json|cron))/)) {
+            if (serverlessConfig.admin === "hide") {
+                //
+                return renderErrorPage({
+                    statusCode: 404,
+                    title: "Not found",
+                    userMessage: "The requested resource could not be found.",
+                    pathname: reqUrl.pathname,
+                });
+            }
+        }
+    }
+    const proxyUrl = serverContext.getOriginUrl(reqUrl.href);
     // Prepare request headers to be sent to the origin server
     const proxyHeaders = getProxyRequestHeaders(event);
     proxyHeaders["X-ED-Dev-Proxy"] = "true";
+    const followRedirects = !reqUrl.pathname.match(/\.[a-z0-9]$/) && !reqUrl.pathname.match(/(^\/wp-|\.php$)/);
     // Forward the request to the origin server
+    // console.log("Proxying request", proxyUrl, {
+    //   method: req.method,
+    //   referrer: req.referrer,
+    //   referrerPolicy: req.referrerPolicy,
+    //   headers: proxyHeaders,
+    //   // body: req.method.match(/get|head|options/i) ? undefined : await req.blob(),
+    //   redirect: followRedirects ? "follow" : "manual",
+    //   cache: "no-cache",
+    // })
     const response = await fetch(proxyUrl, {
         method: req.method,
         referrer: req.referrer,
         referrerPolicy: req.referrerPolicy,
         headers: proxyHeaders,
         body: req.method.match(/get|head|options/i) ? undefined : await req.blob(),
-        redirect: "manual",
+        redirect: followRedirects ? "follow" : "manual",
         cache: "no-cache",
     });
     const contentType = response.headers.get("content-type");
@@ -30,8 +57,8 @@ export async function proxyWpAdmin(event, serverContext) {
             cookies.push(...splitSetCookieString(value));
             return;
         }
-        if (key === "location" && replaceUrls) {
-            value = replaceUrls(value);
+        if (key === "location") {
+            value = serverContext.replaceUrls(value);
         }
         res.headers.set(key, value);
     });
@@ -45,22 +72,25 @@ export async function proxyWpAdmin(event, serverContext) {
     // Replace URLs pointing to the origin server from the response itself
     // This is only done for text-based content types, like application/json, text/plain, text/html etc
     if (contentType?.match(/(application|text)\//)) {
-        if (replaceUrls) {
-            body = replaceUrls((await response.text()) ?? "");
-        }
+        body = serverContext.replaceUrls((await response.text()) ?? "", reqUrl.origin);
         // If the content type is text/html, inject the Vite assets into the response — assuming the placeholder comments are found
         if (contentType.startsWith("text/html")) {
-            const clientManifest = serverContext.getManifest("admin");
+            const clientManifest = serverContext.runtime.getManifest("admin");
             const assets = await clientManifest.inputs[clientManifest.handler].assets();
-            body = body.replace("<!---VITE_HEADER--->", () => assets.map((asset) => renderAsset(asset)).join("\n"));
-            body = body.replace("<!---VITE_FOOTER--->", () => renderAsset({
+            const getViteHeader = () => assets.map((asset) => renderAsset(asset)).join("\n");
+            const getViteFooter = () => renderAsset({
                 tag: "script",
                 attrs: {
                     type: "module",
                     src: clientManifest.inputs[clientManifest.handler].output.path,
                 },
                 children: "",
-            }));
+            });
+            const encodeForJSON = (str) => JSON.stringify(str).slice(1, -1).replaceAll("/", "\\/");
+            body = body.replaceAll("<!---VITE_HEADER--->", getViteHeader());
+            body = body.replaceAll("<!---VITE_FOOTER--->", getViteFooter());
+            body = body.replaceAll("<script id='vite-iframe-header'><\\/script>", encodeForJSON(getViteHeader()));
+            body = body.replaceAll("<script id='vite-iframe-footer'><\\/script>", encodeForJSON(getViteFooter()));
         }
     }
     else {