eddev 2.0.0-beta.4 → 2.0.0-beta.41

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;
@@ -31,10 +31,12 @@ export class RouteLoader {
         const origin = parseURL(sampleUrl);
         let propsPath = withTrailingSlash(pathname);
         let query = {};
-        if (opts.serverless) {
-            query["_debug"] = opts.debug ? "1" : "0";
-            query["_props"] = opts.appData ? "all" : "1";
-            query["_ssr"] = "1";
+        if (env.serverless && env.client) {
+            propsPath = "/_data/route" + propsPath;
+            query = {};
+            // query["_debug"] = opts.debug ? "1" : "0"
+            // query["_props"] = opts.appData ? "all" : "1"
+            // query["_ssr"] = "1"
         }
         else {
             query["_debug"] = opts.debug ? "1" : "0";

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?: RouteMetaTag[];
+    body?: RouteMetaTag[];
+    footer?: RouteMetaTag[];
+};
 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;
@@ -100,13 +110,17 @@ export type RouterAPI = {
     /** Replace the hash */
     replaceHash: (hash: string) => void;
     /** Handle link clicking events */
-    handleClickEvent(e: PointerOrMouseEvent, href?: string): 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 */
     subscribe: (subscribe: RouterSubscriber) => () => void;
     /** This function is used by the routing system automatically */
     emitEvent: (event: RouterEvent) => void;
+    /** Returns the current RouterState */
+    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,6 +145,12 @@ 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]>;

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

@@ -1,6 +1,7 @@
 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";
@@ -12,4 +13,5 @@ export declare function normalizeRoute(route: Partialize<RouteState, "uri" | "re
 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 {};

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
@@ -92,3 +97,9 @@ 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 ?? [],
+    };
+}

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

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

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

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

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

@@ -0,0 +1,2 @@
+import { Hono } from "hono";
+export declare function defineRouter(): Hono;

package/dist/app/server/defineRouter.js

@@ -0,0 +1,4 @@
+import { Hono } from "hono";
+export function defineRouter() {
+    return new Hono();
+}

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

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

package/dist/app/server/index.js

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

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

@@ -0,0 +1,3 @@
+import { EventHandlerRequest, H3Event } from "vinxi/http";
+import { ServerContext } from "./server-context.js";
+export declare function proxyWpAdmin(event: H3Event<EventHandlerRequest>, serverContext: ServerContext): Promise<Response>;

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

@@ -0,0 +1,105 @@
+/// <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;
+    const req = getWebRequest(event);
+    const proxyUrl = serverContext.getOriginUrl(getRequestURL(event).href);
+    // Prepare request headers to be sent to the origin server
+    const proxyHeaders = getProxyRequestHeaders(event);
+    proxyHeaders["X-ED-Dev-Proxy"] = "true";
+    // Forward the request to the origin server
+    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",
+        cache: "no-cache",
+    });
+    const contentType = response.headers.get("content-type");
+    let body;
+    let res = { status: response.status, statusText: response.statusText, headers: new Headers() };
+    const cookies = [];
+    response.headers.forEach((value, key) => {
+        if (key === "content-encoding" || key === "content-length" || key === "transfer-encoding") {
+            return;
+        }
+        if (key === "set-cookie") {
+            cookies.push(...splitSetCookieString(value));
+            return;
+        }
+        if (key === "location" && replaceUrls) {
+            value = replaceUrls(value);
+        }
+        res.headers.set(key, value);
+    });
+    // Set cookies in the response headers
+    // TODO: May need to rewrite cookie domain here before setting.
+    if (cookies.length > 0) {
+        for (const cookie of cookies) {
+            res.headers.append("set-cookie", cookie);
+        }
+    }
+    // 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()) ?? "");
+        }
+        // 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.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({
+                tag: "script",
+                attrs: {
+                    type: "module",
+                    src: clientManifest.inputs[clientManifest.handler].output.path,
+                },
+                children: "",
+            }));
+        }
+    }
+    else {
+        // Otherwise just stream the response as is
+        body = response.body;
+    }
+    return new Response(body, res);
+}
+function printElement(element, props, innerText) {
+    if (typeof innerText === "string") {
+        return `<${element}${Object.entries(props)
+            .map(([key, value]) => ` ${key}="${value}"`)
+            .join("")}>${innerText}</${element}>`;
+    }
+    else {
+        return `<${element}${Object.entries(props)
+            .map(([key, value]) => ` ${key}="${value}"`)
+            .join("")} />`;
+    }
+}
+function renderAsset({ tag, attrs: { key, ...attrs } = {}, children, }) {
+    switch (tag) {
+        case "script":
+            if (attrs.src) {
+                return printElement("script", { ...attrs, key: attrs.src }, "");
+            }
+            else {
+                return printElement("script", {
+                    ...attrs,
+                    key: key,
+                }, children ?? "");
+            }
+        case "link":
+            return printElement("link", { ...attrs, key: key });
+        case "style":
+            return printElement("style", {
+                ...attrs,
+                key: key,
+            }, children ?? "");
+    }
+    return "";
+}

package/dist/app/server/render-ssr-page.d.ts

@@ -0,0 +1,5 @@
+import type { RouteData, TrackerTags } from "../lib/routing/types.js";
+import { ServerContext } from "./server-context.js";
+export declare function renderPageToSSRStream(pathname: string, initialData: RouteData & {
+    trackers?: TrackerTags;
+}, serverContext: ServerContext): Promise<unknown>;

package/dist/app/server/render-ssr-page.js

@@ -0,0 +1,31 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { renderAsset } from "@vinxi/react";
+import { Suspense } from "react";
+import { renderToPipeableStream } from "react-dom/server";
+import { SSRRoot } from "../entry/ssr-root.js";
+import { RouteLoader } from "../lib/routing/loader.js";
+export async function renderPageToSSRStream(pathname, initialData, serverContext) {
+    const clientManifest = serverContext.runtime.getManifest("client");
+    const assets = await clientManifest.inputs[clientManifest.handler].assets();
+    const jsx = (_jsx(SSRRoot, { assets: _jsx(Suspense, { children: assets.map((m) => renderAsset(m)) }), metaTags: initialData?.meta?.head || [], pathname: pathname, initialData: initialData, loader: new RouteLoader() }));
+    const stream = await new Promise(async (resolve, reject) => {
+        // console.log("Rendering to pipable")
+        const stream = renderToPipeableStream(jsx, {
+            onShellReady() {
+                // console.log("Shell ready")
+                resolve(stream);
+            },
+            onShellError(err) {
+                console.log("onShellError", err);
+                resolve("An error occurred");
+            },
+            onError(err, errInfo) {
+                console.log("Error occurred after shell ready", err, errInfo);
+                console.error(err);
+            },
+            bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
+            bootstrapScriptContent: `window.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify(initialData)};`,
+        });
+    });
+    return stream;
+}

package/dist/app/server/server-context.d.ts

@@ -0,0 +1,50 @@
+import { RequestHeaders } from "vinxi/http";
+import { UrlReplacerConf } from "./utils/replace-host.js";
+import { Manifest } from "vinxi/dist/types/types/manifest";
+import { TrackerTags } from "../lib/routing/types.js";
+export type ServerContextArgs = {
+    dev: boolean;
+    origin: string;
+    replaceUrls?: UrlReplacerConf;
+};
+export type ServerContextRuntime = {
+    getManifest: (name: string) => Manifest;
+};
+/**
+ * Data returned from WordPress origin /_appdata route
+ */
+type ServerAppData = {
+    appData: any;
+    trackers: TrackerTags;
+};
+export declare class ServerContext {
+    dev: boolean;
+    origin: string;
+    replaceUrls?: (text: string) => string;
+    constructor(conf: ServerContextArgs);
+    get runtime(): ServerContextRuntime;
+    static setRuntime(rt: ServerContextRuntime): void;
+    getOriginUrl(url: string): string;
+    fetchOrigin(url: string, opts?: RequestInit & {
+        replaceUrls?: boolean;
+    }): Promise<Response>;
+    fetchRouteData(req: {
+        pathname: string;
+        query?: Record<string, any>;
+        headers?: RequestHeaders;
+        withAppData?: boolean;
+    }): Promise<Response>;
+    fetchAppData(): Promise<ServerAppData>;
+    extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("vinxi/http").HTTPHeaderName, string | undefined>>;
+    fetchNamedQuery(req: {
+        name: string;
+        params: object;
+        headers: RequestHeaders;
+    }): Promise<Response>;
+    fetchMutation(req: {
+        name: string;
+        body: object;
+        headers: RequestHeaders;
+    }): Promise<Response>;
+}
+export {};

package/dist/app/server/server-context.js

@@ -0,0 +1,145 @@
+import { parseURL, stringifyParsedURL, withQuery } from "ufo";
+import { filterHeader } from "./utils/headers.js";
+import { createUrlReplacer } from "./utils/replace-host.js";
+const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", /woocommerce/];
+const PROXY_REQUEST_HEADERS = [
+    "content-type",
+    "accept",
+    "accept-encoding",
+    "accept-language",
+    "origin",
+    "referer",
+    "user-agent",
+    "authorization",
+    "woocommerce-session",
+];
+let runtime;
+export class ServerContext {
+    dev;
+    origin;
+    replaceUrls;
+    constructor(conf) {
+        this.dev = conf.dev;
+        this.origin = conf.origin;
+        if (conf.replaceUrls) {
+            this.replaceUrls = createUrlReplacer(conf.replaceUrls);
+        }
+    }
+    get runtime() {
+        return runtime;
+    }
+    static setRuntime(rt) {
+        runtime = rt;
+    }
+    getOriginUrl(url) {
+        const parsed = parseURL(url);
+        const parsedOrigin = parseURL(this.origin);
+        parsed.host = parsedOrigin.host;
+        parsed.protocol = parsedOrigin.protocol;
+        return stringifyParsedURL(parsed);
+    }
+    async fetchOrigin(url, opts) {
+        url = this.getOriginUrl(url);
+        const response = await fetch(url, {
+            ...opts,
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+                ...opts?.headers,
+            },
+        });
+        if (!response.ok) {
+            return response;
+        }
+        // console.log("Response headers", response.headers)
+        const headers = {};
+        response.headers.forEach((value, key) => {
+            if (filterHeader(key, PROXY_RESPONSE_HEADERS)) {
+                headers[key] = value;
+            }
+        });
+        // console.log("Returning headers", headers)
+        let text = await response.text();
+        if (opts?.replaceUrls && this.replaceUrls) {
+            text = this.replaceUrls(text);
+        }
+        return new Response(text, {
+            status: response.status,
+            statusText: response.statusText,
+            headers,
+        });
+    }
+    async fetchRouteData(req) {
+        const fetchUrl = withQuery(req.pathname, {
+            ...req.query,
+            _props: "1",
+            _ssr: "1",
+            _debug: this.dev ? "1" : undefined,
+        });
+        // console.log("Fetching route data", req.pathname)
+        const result = this.fetchOrigin(fetchUrl, {
+            cache: "no-cache",
+            replaceUrls: true,
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+        });
+        // console.log("Finished fetching route data")
+        return result;
+    }
+    async fetchAppData() {
+        // console.log("Fetching app data")
+        const response = await this.fetchOrigin("/_appdata", {
+            cache: "no-cache",
+            replaceUrls: true,
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+        });
+        // console.log("Decoding app data")
+        const result = await response.json();
+        // console.log("Done with app done")
+        return result;
+    }
+    extractRequestHeaders(req) {
+        const headers = {};
+        if (req) {
+            for (let key of PROXY_REQUEST_HEADERS) {
+                if (req[key]) {
+                    headers[key] = req[key];
+                }
+            }
+        }
+        return headers;
+    }
+    async fetchNamedQuery(req) {
+        const url = `/wp-json/ed/v1/query/${req.name}?params=${encodeURIComponent(JSON.stringify(req.params))}`;
+        return this.fetchOrigin(url, {
+            cache: "no-cache",
+            replaceUrls: true,
+            headers: {
+                ...this.extractRequestHeaders(req.headers),
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+            redirect: "manual",
+        });
+    }
+    async fetchMutation(req) {
+        const url = `/wp-json/ed/v1/mutation/${req.name}`;
+        return this.fetchOrigin(url, {
+            method: "POST",
+            cache: "no-cache",
+            replaceUrls: true,
+            headers: {
+                ...this.extractRequestHeaders(req.headers),
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+            body: JSON.stringify(req.body),
+            redirect: "manual",
+        });
+    }
+}

package/dist/app/server/utils/headers.d.ts

@@ -2,3 +2,4 @@ export declare function filterHeader(key: string, allowed: (string | RegExp)[]):
 export declare const BRANDED_HEADERS: {
     "X-Powered-By": string;
 };
+export declare function extractHeaders(rawHeaders: Headers): Record<string, string>;

package/dist/app/server/utils/headers.js

@@ -9,3 +9,20 @@ export function filterHeader(key, allowed) {
 export const BRANDED_HEADERS = {
     "X-Powered-By": "ed.studio",
 };
+const IGNORE_REQUEST_HEADERS = [
+    "host",
+    "connection",
+    "accept-encoding",
+    "accept-language",
+    "origin",
+    "referer",
+    "user-agent",
+];
+export function extractHeaders(rawHeaders) {
+    const headers = {};
+    rawHeaders.forEach((value, key) => {
+        headers[key] = value;
+    });
+    IGNORE_REQUEST_HEADERS.forEach((key) => delete headers[key]);
+    return headers;
+}

package/dist/app/server/utils/replace-host.d.ts

@@ -1,8 +1,10 @@
 export type UrlReplacerConf = {
     from: string;
     to: string;
-    https: boolean;
-    ignoreUploads: boolean;
-    ignorePlugins: boolean;
+    /** A dictionary of prefixes (eg /wp-content), and whether to replace them (true/false) */
+    prefixes: {
+        prefix: string;
+        replace: boolean;
+    }[];
 };
-export declare function createUrlReplacer(conf: UrlReplacerConf): (value: string) => string;
+export declare function createUrlReplacer(conf: UrlReplacerConf): (text: string) => string;

package/dist/app/server/utils/replace-host.js

@@ -1,14 +1,61 @@
 export function createUrlReplacer(conf) {
-    const from = conf.from;
-    const to = conf.to;
-    const https = conf.https;
-    const ignoreUploads = conf.ignoreUploads;
-    const ignorePlugins = conf.ignorePlugins;
-    const replaceTargetString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\/");
-    const replaceTargetEscapedString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\\\/");
-    const replaceTarget = new RegExp(replaceTargetString, "g");
-    const replaceTargetEscaped = new RegExp(replaceTargetEscapedString, "g");
-    return (value) => {
-        return value.replaceAll(replaceTarget, to).replace(replaceTargetEscaped, to.replaceAll("/", "\\/"));
+    // Create a regular expression to match the URL
+    // Note that that the regex doesn't necessarily match the entire URL
+    const lookup = new RegExp(conf.from.replace(/https?[:\\\/]+/, "https?[:\\/\\\\]+") + "([a-z0-9\\-_/\\\\]+)", "ig");
+    return (text) => {
+        return text.replace(lookup, (url) => {
+            // Strip out the origin, to create a relative path
+            const path = url.replace(/https?:[\/\\]+[^\/\\]+/, "");
+            const isEscaped = url.includes(":\\/\\/");
+            const key = "/" +
+                path
+                    .split(/[\/\\]+/g)
+                    .filter((v) => v)
+                    .join("/");
+            for (let item of conf.prefixes) {
+                if (key.startsWith(item.prefix)) {
+                    if (item.replace) {
+                        return url;
+                    }
+                    else {
+                        return path;
+                    }
+                }
+            }
+            return path;
+            // if (path.startsWith("/wp-content/uploads/")) {
+            //   if (!conf.ignoreUploads) {
+            //     return path
+            //   } else {
+            //     return url
+            //   }
+            //   // } else if (path.startsWith("/wp-content/themes/")) {
+            //   //   if (settings?.uploads === "proxy") {
+            //   //     return path
+            //   //   } else if (settings?.uploads === "remote") {
+            //   //     return url
+            //   //   }
+            //   // } else if (path.startsWith("/wp-content/plugins/")) {
+            //   //   if (settings?.uploads === "proxy") {
+            //   //     return path
+            //   //   } else if (settings?.uploads === "remote") {
+            //   //     return url
+            //   //   }
+            // } else {
+            //   return path
+            // }
+        });
     };
+    // const from = conf.from
+    // const to = conf.to
+    // const https = conf.https
+    // const ignoreUploads = conf.ignoreUploads
+    // const ignorePlugins = conf.ignorePlugins
+    // const replaceTargetString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\/")
+    // const replaceTargetEscapedString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\\\/")
+    // const replaceTarget = new RegExp(replaceTargetString, "g")
+    // const replaceTargetEscaped = new RegExp(replaceTargetEscapedString, "g")
+    // return (value: string) => {
+    //   return value.replaceAll(replaceTarget, to).replace(replaceTargetEscaped, to.replaceAll("/", "\\/"))
+    // }
 }

package/dist/node/cli/cli-worker.d.ts

@@ -1,5 +1,5 @@
 import { Worker } from "node:worker_threads";
-import { StatefulLog } from "../utils/statefulLog.js";
+import { StatefulLog } from "../utils/stateful-log.js";
 type WorkerMode = "admin" | "frontend" | "graphql" | "serverless";
 export declare class CLIWorker {
     worker: Worker;