eddev 2.0.0-beta.99 → 2.1.1

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

@@ -1 +1,2 @@
 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/server/index.d.ts

@@ -1,5 +1,6 @@
-export * from "./render-ssr-page.js";
-export * from "./server-context.js";
 export * from "./proxy-wp-admin.js";
-export * from "./defineRouter.js";
+export * from "./render-ai-page.js";
+export * from "./render-ssr-page.js";
 export * from "./rpc.js";
+export * from "./server-context.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,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,UAAU,CAAA;AACxB,cAAc,qBAAqB,CAAA"}

package/dist/app/server/index.js

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

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

@@ -1,2 +1,3 @@
 import { EventHandlerRequest, H3Event } from "vinxi/http";
 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,qBA+GrE"}

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

@@ -9,12 +9,14 @@ export async function proxyWpAdmin(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 (reqUrl.pathname.toLowerCase().match(/\/+(graphql|xmlrpc|\.php|wp\-(admin|login|json|cron))/)) {
             if (serverlessConfig.admin === "hide") {
+                //
                 return renderErrorPage({
-                    code: 404,
+                    statusCode: 404,
+                    title: "Not found",
+                    userMessage: "The requested resource could not be found.",
                     pathname: reqUrl.pathname,
-                    title: "Not Found",
                 });
             }
         }
@@ -23,8 +25,17 @@ export async function proxyWpAdmin(event) {
     // 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]$/);
+    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,
@@ -75,11 +86,14 @@ export async function proxyWpAdmin(event) {
                 },
                 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()));
+            const encodeForJSON = (str) => JSON.stringify(str).slice(1, -1).replaceAll("/", "\\/");
+            const viteHeader = getViteHeader();
+            const viteFooter = getViteFooter();
+            const baseDirective = `<base href="${reqUrl.origin}">`;
+            body = body.replaceAll("<!---VITE_HEADER--->", viteHeader);
+            body = body.replaceAll("<!---VITE_FOOTER--->", viteFooter);
+            body = body.replaceAll("<script id='vite-iframe-header'><\\/script>", encodeForJSON(baseDirective + viteHeader));
+            body = body.replaceAll("<script id='vite-iframe-footer'><\\/script>", encodeForJSON(viteFooter));
         }
     }
     else {

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

@@ -0,0 +1,13 @@
+type RenderArgs = {
+    pathname: string;
+    statusCode?: number;
+    newOrigin?: string;
+    propData?: Record<string, any>;
+};
+export type IndexablePage = {
+    shouldIndex: boolean;
+    contents: string;
+};
+export declare function renderPageForIndexing(args: RenderArgs): Promise<IndexablePage>;
+export {};
+//# sourceMappingURL=render-ai-page.d.ts.map

package/dist/app/server/render-ai-page.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render-ai-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ai-page.tsx"],"names":[],"mappings":"AAmGA,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CA4CpF"}

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

@@ -0,0 +1,102 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Suspense } from "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 { ServerContext } from "./server-context.js";
+import { parseHTML } from "linkedom";
+async function getAiSsrStream(args) {
+    const jsx = (_jsx(Suspense, { children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, initialData: args.initialData, loader: new RouteLoader(), isAI: true }) }));
+    const stream = await new Promise(async (resolve, reject) => {
+        // console.log("Rendering to pipable")
+        const stream = renderToPipeableStream(jsx, {
+            identifierPrefix: "ed",
+            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);
+            },
+        });
+    });
+    const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", children: [_jsxs("head", { children: ["%%$%%", _jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] })] }), _jsx("body", { children: _jsx("div", { id: "root", children: "%%$%%" }) })] })).split("%%$%%");
+    const inner = await new Promise((resolve, reject) => {
+        let buffer = [];
+        const writableStream = new Writable({
+            emitClose: true,
+            write(chunk, encoding, callback) {
+                buffer.push(new TextDecoder().decode(chunk));
+                callback();
+            },
+            final(callback) {
+                resolve(buffer.join("\n"));
+                callback();
+            },
+        });
+        stream.pipe(writableStream);
+    });
+    const renderedContent = initial + "\n" + middle + "\n" + inner + "\n" + end;
+    return processRenderedContent(renderedContent);
+}
+function processRenderedContent(content) {
+    const { document } = parseHTML(content);
+    // Immediately remove unnecessary tags
+    document.querySelectorAll("script, link, style, svg, img, video, [data-ai-hidden]").forEach((el) => {
+        el.remove();
+    });
+    document.querySelectorAll("*").forEach((el) => {
+        el.removeAttribute("style");
+        el.removeAttribute("class");
+    });
+    const pageContents = document.querySelectorAll("#ai-page-contents");
+    document.body.innerHTML = "";
+    document.body.append(...Array.from(pageContents));
+    return document.toString();
+}
+export async function renderPageForIndexing(args) {
+    const serverContext = ServerContext.main;
+    let responseInit = {};
+    const [{ appData }, response] = await Promise.all([
+        serverContext.fetchAppData({
+            newOrigin: args.newOrigin,
+        }),
+        serverContext.fetchRouteData({
+            pathname: args.pathname,
+            newOrigin: args.newOrigin,
+        }),
+    ]);
+    let data = await response.json();
+    data.appData = appData;
+    if (args.propData) {
+        data = {
+            ...data,
+            ...args.propData,
+        };
+    }
+    responseInit.status = response.status;
+    if (data.redirect) {
+        return {
+            shouldIndex: false,
+            contents: "",
+        };
+    }
+    const headers = new Headers();
+    headers.set("Content-Type", "text/html; charset=utf-8");
+    responseInit.headers = headers;
+    const result = await getAiSsrStream({
+        ...args,
+        initialData: data,
+    });
+    return {
+        shouldIndex: true,
+        contents: result,
+    };
+}

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

@@ -1,21 +1,32 @@
-import type { RouteDataWithTrackers } from "../lib/routing/types.js";
+import type { ErrorRouteProps, RouteDataWithTrackers } from "../lib/routing/types.js";
 type SSRArgs = {
     pathname: string;
+    hostname?: string;
     initialData: RouteDataWithTrackers;
+    nonce?: string;
 };
-export declare function getSsrStream(args: SSRArgs): Promise<ReadableStream<Uint8Array>>;
+export declare function getSsrStream(args: SSRArgs): Promise<ReadableStream<Uint8Array<ArrayBufferLike>>>;
 type RenderArgs = {
     pathname: string;
     statusCode?: number;
     newOrigin?: string;
+    hostname?: string;
+    propData?: Record<string, any>;
+    bypass?: boolean;
 };
 export declare function renderPage(args: RenderArgs): Promise<Response>;
 type RenderErrorPageArgs = {
     pathname: string;
-    code: number;
-    title: string;
+    hostname?: string;
     newOrigin?: string;
-    realError?: Error;
-};
+    realError?: any;
+} & ErrorRouteProps;
 export declare function renderErrorPage(args: RenderErrorPageArgs): Promise<Response>;
+type Asset = {
+    tag: string;
+    attrs: Record<string, string | boolean>;
+    children?: string;
+};
+export declare function renderAsset({ tag, attrs, children }: Asset): string;
 export {};
+//# sourceMappingURL=render-ssr-page.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAyH/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsGpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA8B1D"}

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

@@ -1,5 +1,5 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { renderAsset } from "@vinxi/react";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Suspense } from "react";
 import { renderToPipeableStream, renderToString } from "react-dom/server";
 import { Writable } from "stream";
 import { MetaTags } from "../entry/MetaTags.js";
@@ -7,22 +7,16 @@ 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";
+import { SecureHeaderBuilder } from "./utils/content-security.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 preloadAssets = new Set([clientManifest.handler]);
+    const includedAssets = new Set();
+    const jsx = (_jsx(Suspense, { children: _jsx(AssetCaptureContext.Provider, { value: preloadAssets, children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, hostname: args.hostname, initialData: args.initialData, loader: new RouteLoader() }) }) }));
     const stream = await new Promise(async (resolve, reject) => {
         // console.log("Rendering to pipable")
         const stream = renderToPipeableStream(jsx, {
+            identifierPrefix: "ed",
             onShellReady() {
                 // console.log("Shell ready")
                 resolve(stream);
@@ -36,20 +30,22 @@ export async function getSsrStream(args) {
                 console.error(err);
             },
             bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
+            nonce: args.nonce,
             bootstrapScriptContent: `\nwindow.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify({
                 ...args.initialData,
                 trackers: undefined,
+                hostname: args.hostname,
             })};\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%%"] })] }))
+    const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", children: [_jsxs("head", { children: ["%%$%%", _jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] }), "%%trackers_head%%"] }), _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));
+            controller.enqueue(new TextEncoder().encode("<!doctype html>" + initial));
             const inner = await new Promise((resolve, reject) => {
                 let buffer = [];
                 const writableStream = new Writable({
@@ -67,15 +63,30 @@ export async function getSsrStream(args) {
                 });
                 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<script>${JSON.stringify(assets)}</script>`))
-                controller.enqueue(new TextEncoder().encode(renderToString(_jsx(_Fragment, { children: assets.map((a) => renderAsset(asset)) }))));
+            for (const input of preloadAssets) {
+                const assets = await clientManifest.inputs[input].assets();
+                // controller.enqueue(new TextEncoder().encode(`\n<!-- for ${input} -->`))
+                for (const _asset of assets) {
+                    const asset = _asset;
+                    if (args.nonce)
+                        asset.attrs.nonce = args.nonce;
+                    // Ensure that each asset is only included once
+                    const key = asset?.attrs?.key;
+                    if (!key) {
+                        throw new Error("Asset must have a key: " + JSON.stringify(asset));
+                    }
+                    if (includedAssets.has(key))
+                        continue;
+                    includedAssets.add(key);
+                    // Render the asset
+                    try {
+                        const tag = renderAsset(asset);
+                        controller.enqueue(new TextEncoder().encode(tag + "\n"));
+                    }
+                    catch (err) {
+                        controller.enqueue(new TextEncoder().encode(`\n<!-- ${JSON.stringify(err)} -->\n`));
+                    }
+                }
             }
             // console.log("ASSETS", await clientManifest)
             controller.enqueue(new TextEncoder().encode(middle));
@@ -90,33 +101,57 @@ export async function getSsrStream(args) {
 }
 export async function renderPage(args) {
     const serverContext = ServerContext.main;
-    let headers = new Headers();
+    const cspHeaders = new SecureHeaderBuilder(serverContext.config);
+    const responseHeaders = new Headers();
     let responseInit = {
-        headers,
+        headers: responseHeaders,
     };
     try {
         const [{ appData, trackers }, response] = await Promise.all([
-            serverContext.fetchAppData(),
+            serverContext.fetchAppData({ bypass: args.bypass, newOrigin: args.newOrigin }),
             serverContext.fetchRouteData({
                 pathname: args.pathname,
                 newOrigin: args.newOrigin,
+                bypass: args.bypass,
             }),
         ]);
+        if (trackers) {
+            cspHeaders.addTrackingTags(trackers);
+        }
         let data;
         try {
             data = await response.json();
             data.appData = appData;
-            data.trackers = trackers;
+            data.trackers = cspHeaders.addTrackingTags(trackers);
+            if (args.propData) {
+                data = {
+                    ...data,
+                    ...args.propData,
+                };
+            }
+            if (data.meta?.head)
+                data.meta.head = cspHeaders.addMetaTags(data.meta.head);
+            if (data.meta?.footer)
+                data.meta.footer = cspHeaders.addMetaTags(data.meta.footer);
             responseInit.status = response.status;
+            response.headers.forEach((value, key) => {
+                if (key.toLowerCase().startsWith("x-ed-")) {
+                    responseHeaders.set(key, value);
+                }
+            });
         }
         catch (err) {
+            console.log("Error rendering", err);
             console.error(err);
             return renderErrorPage({
                 pathname: args.pathname,
-                code: 500,
-                newOrigin: args.newOrigin,
-                realError: err,
+                statusCode: 500,
                 title: "Internal Server Error",
+                newOrigin: args.newOrigin,
+                report: {
+                    details: err,
+                    message: err.message,
+                },
             });
         }
         if (data.redirect) {
@@ -127,10 +162,16 @@ export async function renderPage(args) {
                 },
             });
         }
-        headers.set("Content-Type", "text/html; charset=utf-8");
+        cspHeaders.getHeaders().forEach((value, key) => {
+            responseHeaders.set(key, value);
+        });
+        responseHeaders.set("Content-Type", "text/html; charset=utf-8");
+        responseHeaders.set("X-Ed-Rendered-At", new Date().toUTCString());
         const stream = await getSsrStream({
             ...args,
+            hostname: args.hostname,
             initialData: data,
+            nonce: cspHeaders.nonce,
         });
         return new Response(stream, responseInit);
     }
@@ -139,9 +180,9 @@ export async function renderPage(args) {
         if (args.statusCode !== 500) {
             return renderErrorPage({
                 pathname: args.pathname,
-                code: 500,
-                newOrigin: args.newOrigin,
+                statusCode: 500,
                 realError: err,
+                newOrigin: args.newOrigin,
                 title: "Internal Server Error",
             });
         }
@@ -157,9 +198,53 @@ export async function renderPage(args) {
     }
 }
 export async function renderErrorPage(args) {
+    const props = {
+        statusCode: args.statusCode,
+        report: args.report ?? {
+            message: args.realError?.message,
+            details: args.realError,
+        },
+        title: args.title,
+        userMessage: args.userMessage,
+    };
     return renderPage({
         pathname: "/_error",
-        statusCode: args.code,
+        statusCode: args.statusCode,
         newOrigin: args.newOrigin,
+        propData: props,
+        hostname: args.hostname,
     });
 }
+export function renderAsset({ tag, attrs, children }) {
+    const formatAttributes = (attributes) => {
+        return Object.entries(attributes)
+            .map(([attr, value]) => {
+            if (value === true) {
+                return attr;
+            }
+            else if (value !== false && value != null) {
+                return `${attr}="${String(value).replace(/"/g, "&quot;")}"`;
+            }
+            return "";
+        })
+            .filter(Boolean)
+            .join(" ");
+    };
+    switch (tag) {
+        case "script":
+            if (attrs.src) {
+                return `<script ${formatAttributes(attrs)}></script>`;
+            }
+            else {
+                return `<script ${formatAttributes(attrs)}>${children ?? ""}</script>`;
+            }
+        case "link":
+            if (attrs.rel === "stylesheet" && !attrs.media)
+                attrs.media = "screen";
+            return `<link ${formatAttributes(attrs)} />`;
+        case "style":
+            return `<style ${formatAttributes(attrs)}>${children ?? ""}</style>`;
+        default:
+            return "";
+    }
+}

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

@@ -1,56 +1,33 @@
 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>;
-};
+import superjson from "superjson";
+import { ServerContext } from "./server-context";
+export declare const rpcApi: import("@trpc/server").TRPCRootObject<RPCContext, object, {
+    transformer: typeof superjson;
+}, {
+    ctx: RPCContext;
+    meta: object;
+    errorShape: import("@trpc/server").TRPCDefaultErrorShape;
+    transformer: true;
+}>;
 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>;
+    middleware: <$ContextOverrides>(fn: import("@trpc/server").TRPCMiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server").TRPCMiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
+    procedure: import("@trpc/server").TRPCProcedureBuilder<RPCContext, object, object, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, 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<{
+export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server").TRPCBuiltRouter<{
     ctx: RPCContext;
     meta: object;
-    errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+    errorShape: import("@trpc/server").TRPCDefaultErrorShape;
     transformer: true;
-}, T>;
+}, import("@trpc/server").TRPCDecorateCreateRouterOptions<T>>;
 export type InferRPCServerContext<TFunc extends null | ((opts: FetchCreateContextFnOptions) => any)> = {
     req: Request;
+    searchParams: URLSearchParams;
     resHeaders: Headers;
+    server: ServerContext;
 } & (TFunc extends (opts: FetchCreateContextFnOptions) => infer T ? T : {});
 export {};
+//# sourceMappingURL=rpc.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/app/server/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,SAAS,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,eAAO,MAAM,MAAM;;;;;;;EAEjB,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,CAAA;AAE/E,eAAO,MAAM,GAAG;;;WAGP,CAAC,SAAS,YAAY,UAAU,CAAC,GAAG,CAAC;CAG7C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,IAAI,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,GAC7C,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,CAE1C;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC;;;;;8DAElE;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,2BAA2B,KAAK,GAAG,CAAC,IAAI;IACrG,GAAG,EAAE,OAAO,CAAA;IACZ,YAAY,EAAE,eAAe,CAAA;IAC7B,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,aAAa,CAAA;CACtB,GAAG,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,2BAA2B,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA"}