eddev 2.0.0-beta.1 → 2.0.0-beta.100

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

@@ -0,0 +1,39 @@
+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;

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,2 @@
+export * from "./apiConfig";
+export * from "./errorHandling";

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

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

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,5 @@
+export * from "./render-ssr-page.js";
+export * from "./server-context.js";
+export * from "./proxy-wp-admin.js";
+export * from "./defineRouter.js";
+export * from "./rpc.js";

package/dist/app/server/index.js

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

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

@@ -0,0 +1,2 @@
+import { EventHandlerRequest, H3Event } from "vinxi/http";
+export declare function proxyWpAdmin(event: H3Event<EventHandlerRequest>): Promise<Response>;

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

@@ -0,0 +1,124 @@
+/// <reference types="vinxi/types/server" />
+import { splitSetCookieString } from "cookie-es";
+import { getProxyRequestHeaders, getRequestURL, getWebRequest } from "vinxi/http";
+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 reqUrl = getRequestURL(event);
+    const serverlessConfig = serverContext.config.serverless;
+    if (!serverContext.dev) {
+        if (reqUrl.pathname.toLowerCase().match(/\/+(graphql|xmlrpc|index\.php|wp\-(admin|login|json))/)) {
+            if (serverlessConfig.admin === "hide") {
+                return renderErrorPage({
+                    code: 404,
+                    pathname: reqUrl.pathname,
+                    title: "Not Found",
+                });
+            }
+        }
+    }
+    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]$/);
+    // 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: followRedirects ? "follow" : "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") {
+            value = serverContext.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)\//)) {
+        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.runtime.getManifest("admin");
+            const assets = await clientManifest.inputs[clientManifest.handler].assets();
+            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).replace(/\"/g, "'");
+            body = body.replace(/<!---VITE_HEADER--->/g, getViteHeader);
+            body = body.replace(/<!---VITE_FOOTER--->/g, getViteFooter);
+            body = body.replace(/<!---VITE_HEADER_ENCODED--->/g, encodeForJSON(getViteHeader()));
+            body = body.replace(/<!---VITE_FOOTER_ENCODED--->/g, encodeForJSON(getViteFooter()));
+        }
+    }
+    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,21 @@
+import type { RouteDataWithTrackers } from "../lib/routing/types.js";
+type SSRArgs = {
+    pathname: string;
+    initialData: RouteDataWithTrackers;
+};
+export declare function getSsrStream(args: SSRArgs): Promise<ReadableStream<Uint8Array>>;
+type RenderArgs = {
+    pathname: string;
+    statusCode?: number;
+    newOrigin?: string;
+};
+export declare function renderPage(args: RenderArgs): Promise<Response>;
+type RenderErrorPageArgs = {
+    pathname: string;
+    code: number;
+    title: string;
+    newOrigin?: string;
+    realError?: Error;
+};
+export declare function renderErrorPage(args: RenderErrorPageArgs): Promise<Response>;
+export {};

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

@@ -0,0 +1,166 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { renderAsset } from "@vinxi/react";
+import { renderToPipeableStream, renderToString } from "react-dom/server";
+import { Writable } from "stream";
+import { MetaTags } from "../entry/MetaTags.js";
+import { SSRRoot } from "../entry/ssr-root.js";
+import { RouteLoader } from "../lib/routing/loader.js";
+import { AssetCaptureContext } from "../utils/asset-capture.js";
+import { ServerContext } from "./server-context.js";
+export async function getSsrStream(args) {
+    const clientManifest = ServerContext.main.runtime.getManifest("client");
+    const assets = await clientManifest.inputs[clientManifest.handler].assets();
+    // console.log(
+    //   "M",
+    //   assets.filter((f) => (f as any).tag === "script"),
+    //   clientManifest.inputs[clientManifest.handler],
+    // )
+    // for (let k in clientManifest.chunks) {
+    //   console.log(k)
+    // }
+    const dynamicAssets = new Set([]);
+    const jsx = (_jsx(AssetCaptureContext.Provider, { value: dynamicAssets, children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, initialData: args.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);
+                reject(err);
+            },
+            onError(err, errInfo) {
+                console.log("Error occurred after shell ready", err, errInfo);
+                console.error(err);
+            },
+            bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
+            bootstrapScriptContent: `\nwindow.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify({
+                ...args.initialData,
+                trackers: undefined,
+            })};\n`,
+        });
+    });
+    const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", children: [_jsxs("head", { children: [_jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] }), "%%trackers_head%%", assets.map((m) => renderAsset(m)), "%%$%%"] }), _jsxs("body", { children: ["%%trackers_body%%", _jsx("div", { id: "_root", children: "%%$%%" }), "%%trackers_footer%%"] })] }))
+        .replace(/%%trackers_(head|body|footer)%%/g, (_, name) => {
+        return args.initialData.trackers?.[name] || "";
+    })
+        .split("%%$%%");
+    return new ReadableStream({
+        async start(controller) {
+            controller.enqueue(new TextEncoder().encode(initial));
+            const inner = await new Promise((resolve, reject) => {
+                let buffer = [];
+                const writableStream = new Writable({
+                    emitClose: true,
+                    write(chunk, encoding, callback) {
+                        buffer.push(chunk);
+                        // controller.enqueue(chunk)
+                        callback();
+                    },
+                    final(callback) {
+                        resolve(buffer);
+                        // controller.close()
+                        callback();
+                    },
+                });
+                stream.pipe(writableStream);
+            });
+            for (const asset of dynamicAssets) {
+                const assets = await clientManifest.inputs[asset].assets();
+                // console.log(assets)
+                // console.log("A", assets.output, (await assets.assets())?.[0])
+                // const assets = await clientManifest.inputs[assets.output.path!]?.assets()
+                // console.log("F?", inputs)
+                controller.enqueue(new TextEncoder().encode(`\n<!-- for ${asset} -->`));
+                controller.enqueue(new TextEncoder().encode(`\n<!-- ${JSON.stringify(assets)} -->`));
+                // controller.enqueue(new TextEncoder().encode(`\n<script>${JSON.stringify(assets)}</script>`))
+                controller.enqueue(new TextEncoder().encode(renderToString(_jsx(_Fragment, { children: assets.map((a) => renderAsset(asset)) }))));
+            }
+            // console.log("ASSETS", await clientManifest)
+            controller.enqueue(new TextEncoder().encode(middle));
+            for (const chunk of inner) {
+                controller.enqueue(chunk);
+            }
+            controller.enqueue(new TextEncoder().encode(end));
+            // console.log("Assets", dynamicAssets)
+            controller.close();
+        },
+    });
+}
+export async function renderPage(args) {
+    const serverContext = ServerContext.main;
+    let headers = new Headers();
+    let responseInit = {
+        headers,
+    };
+    try {
+        const [{ appData, trackers }, response] = await Promise.all([
+            serverContext.fetchAppData(),
+            serverContext.fetchRouteData({
+                pathname: args.pathname,
+                newOrigin: args.newOrigin,
+            }),
+        ]);
+        let data;
+        try {
+            data = await response.json();
+            data.appData = appData;
+            data.trackers = trackers;
+            responseInit.status = response.status;
+        }
+        catch (err) {
+            console.error(err);
+            return renderErrorPage({
+                pathname: args.pathname,
+                code: 500,
+                newOrigin: args.newOrigin,
+                realError: err,
+                title: "Internal Server Error",
+            });
+        }
+        if (data.redirect) {
+            return new Response(null, {
+                status: data.status || 302,
+                headers: {
+                    Location: data.redirect,
+                },
+            });
+        }
+        headers.set("Content-Type", "text/html; charset=utf-8");
+        const stream = await getSsrStream({
+            ...args,
+            initialData: data,
+        });
+        return new Response(stream, responseInit);
+    }
+    catch (err) {
+        console.error(err);
+        if (args.statusCode !== 500) {
+            return renderErrorPage({
+                pathname: args.pathname,
+                code: 500,
+                newOrigin: args.newOrigin,
+                realError: err,
+                title: "Internal Server Error",
+            });
+        }
+        return new Response('<!DOCTYPE html><html><head><title>500 Internal Server Error</title></head><body><h1>500 Internal Server Error</h1><p>"' +
+            String(err) +
+            '"</p></body></html>', {
+            status: 500,
+            statusText: "Internal Server Error",
+            headers: {
+                "Content-Type": "text/html; charset=utf-8",
+            },
+        });
+    }
+}
+export async function renderErrorPage(args) {
+    return renderPage({
+        pathname: "/_error",
+        statusCode: args.code,
+        newOrigin: args.newOrigin,
+    });
+}

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

@@ -0,0 +1,56 @@
+import { AnyProcedure } from "@trpc/server";
+import { FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch";
+export declare const rpcApi: {
+    _config: import("@trpc/server/unstable-core-do-not-import").RootConfig<{
+        ctx: RPCContext;
+        meta: object;
+        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+        transformer: true;
+    }>;
+    procedure: import("@trpc/server/unstable-core-do-not-import").ProcedureBuilder<RPCContext, object, object, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, false>;
+    middleware: <$ContextOverrides>(fn: import("@trpc/server/unstable-core-do-not-import").MiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server/unstable-core-do-not-import").MiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
+    router: {
+        <TInput extends import("@trpc/server").RouterRecord>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
+            ctx: RPCContext;
+            meta: object;
+            errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+            transformer: true;
+        }, TInput>;
+        <TInput extends import("@trpc/server/unstable-core-do-not-import").CreateRouterOptions>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
+            ctx: RPCContext;
+            meta: object;
+            errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+            transformer: true;
+        }, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<TInput>>;
+    };
+    mergeRouters: typeof import("@trpc/server/unstable-core-do-not-import").mergeRouters;
+    createCallerFactory: <TRecord extends import("@trpc/server").RouterRecord>(router: Pick<import("@trpc/server/unstable-core-do-not-import").Router<{
+        ctx: RPCContext;
+        meta: object;
+        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+        transformer: true;
+    }, TRecord>, "_def">) => import("@trpc/server/unstable-core-do-not-import").RouterCaller<{
+        ctx: RPCContext;
+        meta: object;
+        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+        transformer: true;
+    }, TRecord>;
+};
+type RouterSchema = Record<string, Record<string, AnyProcedure> | AnyProcedure>;
+export declare const rpc: {
+    middleware: <$ContextOverrides>(fn: import("@trpc/server/unstable-core-do-not-import").MiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server/unstable-core-do-not-import").MiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
+    procedure: import("@trpc/server/unstable-core-do-not-import").ProcedureBuilder<RPCContext, object, object, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, false>;
+    router<T extends RouterSchema>(routes: T): T;
+};
+export declare function defineServerContext<T>(func: (opts: FetchCreateContextFnOptions) => T): (opts: FetchCreateContextFnOptions) => T;
+export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
+    ctx: RPCContext;
+    meta: object;
+    errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+    transformer: true;
+}, T>;
+export type InferRPCServerContext<TFunc extends null | ((opts: FetchCreateContextFnOptions) => any)> = {
+    req: Request;
+    resHeaders: Headers;
+} & (TFunc extends (opts: FetchCreateContextFnOptions) => infer T ? T : {});
+export {};

package/dist/app/server/rpc.js

@@ -0,0 +1,18 @@
+import { initTRPC } from "@trpc/server";
+import superjson from "superjson";
+export const rpcApi = initTRPC.context().create({
+    transformer: superjson,
+});
+export const rpc = {
+    middleware: rpcApi.middleware,
+    procedure: rpcApi.procedure,
+    router(routes) {
+        return routes;
+    },
+};
+export function defineServerContext(func) {
+    return func;
+}
+export function instantiateRouter(routes) {
+    return rpcApi.router(routes);
+}

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

@@ -0,0 +1,72 @@
+import { Manifest } from "vinxi/dist/types/types/manifest";
+import { RequestHeaders } from "vinxi/http";
+import type { EDConfig } from "../../node/project/config.js";
+import { TrackerTags } from "../lib/routing/types.js";
+import { UrlReplacerConf } from "./utils/replace-host.js";
+export type ServerContextArgs = {
+    dev: boolean;
+    origin: string;
+    replaceUrls?: UrlReplacerConf;
+    rpcBases?: string[];
+    config: EDConfig;
+};
+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;
+    _urlReplacer?: (text: string, origin?: string) => string;
+    rpcBases: string[];
+    config: EDConfig;
+    static main: ServerContext;
+    constructor(conf: ServerContextArgs);
+    replaceUrls(text: string, origin?: string): string;
+    get runtime(): ServerContextRuntime;
+    static setRuntime(rt: ServerContextRuntime): void;
+    getOriginUrl(url: string): string;
+    fetchOrigin(url: string, opts?: RequestInit & {
+        replaceUrls?: boolean;
+        newOrigin?: string;
+    }): Promise<Response>;
+    fetchRouteData(req: {
+        pathname: string;
+        headers?: RequestHeaders;
+        newOrigin?: string;
+    }): 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>;
+    get allowedCorsOrigins(): string[];
+    getCorsOrigin(originHeader: string): string | undefined;
+    getCorsHeaders(origin: string): {
+        "Access-Control-Allow-Methods"?: undefined;
+        "Access-Control-Allow-Origin"?: undefined;
+        "Access-Control-Allow-Credentials"?: undefined;
+        "Access-Control-Allow-Headers"?: undefined;
+        "Access-Control-Expose-Headers"?: undefined;
+    } | {
+        "Access-Control-Allow-Methods": string;
+        "Access-Control-Allow-Origin": string;
+        "Access-Control-Allow-Credentials": string;
+        "Access-Control-Allow-Headers": string;
+        "Access-Control-Expose-Headers": string;
+    };
+}
+export {};