eddev 2.3.31 → 2.4.0-beta.2

package/dist/app/entry/ssr-root-client.d.ts

@@ -1,7 +1,5 @@
-import { ReactNode } from "react";
 import { RouteMetaTag } from "../lib/routing/types.js";
 export declare function SSRClientRoot(props: {
-    assets: ReactNode;
     metaTags: RouteMetaTag[];
 }): import("react").JSX.Element;
 //# sourceMappingURL=ssr-root-client.d.ts.map

package/dist/app/entry/ssr-root-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-root-client.d.ts","sourceRoot":"","sources":["../../../src/app/entry/ssr-root-client.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiC,MAAM,OAAO,CAAA;AAIhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAKtD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,+BAYnF"}
+{"version":3,"file":"ssr-root-client.d.ts","sourceRoot":"","sources":["../../../src/app/entry/ssr-root-client.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAKtD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,+BAYhE"}

package/dist/app/lib/blocks/block-debugger.d.ts.map

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

package/dist/app/lib/blocks/block-debugger.js

@@ -14,6 +14,18 @@ if (env.client && !env.admin) {
     window.pageStructure = pageStructureRoot;
 }
 export const BlockDebugContext = createContext(pageStructureRoot);
+/**
+ * Keeps `useId` stable between server rendering and hydration.
+ *
+ * React folds "this component called useId" (and how many times) into the ids generated for everything
+ * rendered below it. The client-only debug paths below call `useId`, directly and through its-fine's
+ * `useFiber`, so their server paths must make the same number of calls. Otherwise every `useId` inside a
+ * block (eg. Radix's trigger/content ids) differs between the SSR markup and the hydrated page.
+ */
+function useMatchingIdCalls(count) {
+    for (let i = 0; i < count; i++)
+        useId();
+}
 export function usePageStructureNode(initial) {
     const id = useId();
     if (!env.client || env.admin) {
@@ -30,6 +42,7 @@ export function usePageStructureNode(initial) {
 }
 export function useDebugNode(label, initial) {
     if (!env.client || env.admin) {
+        useMatchingIdCalls(2); // useFiber() + useId()
         return {
             log: console.log.bind(console, `[Debug: ${label}]`),
             ...initial,
@@ -67,8 +80,10 @@ export function useDebugNode(label, initial) {
     return node.data;
 }
 export function DebugNode(props) {
-    if (!env.client || env.admin)
+    if (!env.client || env.admin) {
+        useMatchingIdCalls(2); // useFiber() + useId()
         return _jsx(Fragment, { children: props.children });
+    }
     const fiber = useFiber();
     const parent = useContext(BlockDebugContext);
     const id = useId();
@@ -136,8 +151,10 @@ function createGetElements(fiber) {
     };
 }
 export function BlockDebug(props) {
-    if (!env.client || env.admin)
+    if (!env.client || env.admin) {
+        useMatchingIdCalls(2); // useFiber() + usePageStructureNode()
         return _jsx(Fragment, { children: props.children });
+    }
     const fiber = useFiber();
     const blockContext = useBlockContext();
     const node = usePageStructureNode({

package/dist/app/lib/devtools/components/panels/StructurePanel.js

@@ -62,7 +62,7 @@ function StructureNode(props) {
         label = _jsxs(_Fragment, { children: [globeIcon, " App"] });
     }
     else if (node.type === "route") {
-        label = (_jsxs(_Fragment, { children: [routesIcon, " Route:", " ", _jsxs("em", { children: [node.route.uri, " ", node.route.view ? _jsxs(_Fragment, { children: ["(", node.route.view, ")"] }) : null] })] }));
+        label = (_jsxs(_Fragment, { children: [routesIcon, " Route:", " ", _jsxs("em", { className: "line-clamp-1 max-w-[200px]", children: [node.route.uri, " ", node.route.view ? _jsxs(_Fragment, { children: ["(", node.route.view, ")"] }) : null] })] }));
         labelColor = "text-blue-400";
     }
     else if (node.type === "blocks") {

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

@@ -0,0 +1,45 @@
+/**
+ * Client asset lookups for server rendering.
+ *
+ * The generated `manifest/assets.ts` (server only) fills this in using the `?assets` imports provided by
+ * Nitro's Vite plugin, so the server knows which scripts and stylesheets each entry, view and block needs.
+ */
+/** A `<link>` to emit. `href` is required; any other attributes (eg. `data-vite-dev-id` in dev) are copied. */
+export type AssetLink = {
+    href: string;
+} & Record<string, string>;
+export type AssetSet = {
+    /** The module script to boot, for entries */
+    entry?: string;
+    /** JS chunks to `modulepreload` */
+    js: AssetLink[];
+    /** Stylesheets */
+    css: AssetLink[];
+};
+export type ServerAssets = {
+    /** The public site's client entry, booted by the SSR page */
+    client: AssetSet & {
+        entry: string;
+    };
+    /** The admin bundle, injected into proxied wp-admin pages. */
+    admin: AssetSet & {
+        entry: string;
+        /** Dev only: extra tags for the head (the admin dev server's Vite client and React refresh preamble) */
+        head?: string[];
+        /**
+         * Dev only: the admin bundle's stylesheets, linked in the head so blocks don't render unstyled.
+         * Vite's client adopts these links (by `data-vite-dev-id`) for hot reloading.
+         */
+        devStylesheets?: () => AssetLink[] | Promise<AssetLink[]>;
+    };
+    /** Dynamically imported views and blocks, keyed by project-relative file name (eg. `views/page.tsx`) */
+    modules: Record<string, AssetSet | undefined>;
+};
+export type AssetTag = {
+    tag: "link" | "script" | "style";
+    attrs: Record<string, string | boolean>;
+    children?: string;
+};
+/** Converts an asset set into `<link>` tags: stylesheets first, then module preloads. */
+export declare function getAssetTags(assets: AssetSet | undefined): AssetTag[];
+//# sourceMappingURL=assets.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../../src/app/server/assets.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,+GAA+G;AAC/G,MAAM,MAAM,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAEjE,MAAM,MAAM,QAAQ,GAAG;IACrB,6CAA6C;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mCAAmC;IACnC,EAAE,EAAE,SAAS,EAAE,CAAA;IACf,kBAAkB;IAClB,GAAG,EAAE,SAAS,EAAE,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,6DAA6D;IAC7D,MAAM,EAAE,QAAQ,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACpC,8DAA8D;IAC9D,KAAK,EAAE,QAAQ,GAAG;QAChB,KAAK,EAAE,MAAM,CAAA;QACb,wGAAwG;QACxG,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;QACf;;;WAGG;QACH,cAAc,CAAC,EAAE,MAAM,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;KAC1D,CAAA;IACD,wGAAwG;IACxG,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,yFAAyF;AACzF,wBAAgB,YAAY,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,EAAE,CAQrE"}

package/dist/app/server/assets.js

@@ -0,0 +1,15 @@
+/**
+ * Client asset lookups for server rendering.
+ *
+ * The generated `manifest/assets.ts` (server only) fills this in using the `?assets` imports provided by
+ * Nitro's Vite plugin, so the server knows which scripts and stylesheets each entry, view and block needs.
+ */
+/** Converts an asset set into `<link>` tags: stylesheets first, then module preloads. */
+export function getAssetTags(assets) {
+    if (!assets)
+        return [];
+    return [
+        ...assets.css.map((link) => ({ tag: "link", attrs: { rel: "stylesheet", fetchPriority: "high", ...link, key: link.href } })),
+        ...assets.js.map((link) => ({ tag: "link", attrs: { rel: "modulepreload", ...link, key: link.href } })),
+    ];
+}

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

@@ -1,6 +1,10 @@
+export * from "./assets.js";
 export * from "./proxy-wp-admin.js";
 export * from "./render-ai-page.js";
 export * from "./render-ssr-page.js";
 export * from "./rpc.js";
+export * from "./rpc-handler.js";
+export * from "./server-app.js";
 export * from "./server-context.js";
+export type { RequestHeaders } from "./utils/request.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/app/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,UAAU,CAAA;AACxB,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/app/server/index.js

@@ -1,5 +1,8 @@
+export * from "./assets.js";
 export * from "./proxy-wp-admin.js";
 export * from "./render-ai-page.js";
 export * from "./render-ssr-page.js";
 export * from "./rpc.js";
+export * from "./rpc-handler.js";
+export * from "./server-app.js";
 export * from "./server-context.js";

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

@@ -1,3 +1,7 @@
-import { EventHandlerRequest, H3Event } from "vinxi/http";
-export declare function proxyWpAdmin(event: H3Event<EventHandlerRequest>): Promise<Response>;
+/**
+ * Proxies a request through to the WordPress origin, rewriting origin URLs in text responses.
+ * For HTML responses, the admin bundle's tags are injected into the `VITE_HEADER`/`VITE_FOOTER`
+ * placeholders printed by the PHP side.
+ */
+export declare function proxyWpAdmin(req: Request): Promise<Response>;
 //# sourceMappingURL=proxy-wp-admin.d.ts.map

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

@@ -1 +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,qBAwHrE"}
+{"version":3,"file":"proxy-wp-admin.d.ts","sourceRoot":"","sources":["../../../src/app/server/proxy-wp-admin.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAkGlE"}

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

@@ -1,17 +1,20 @@
-/// <reference types="vinxi/types/server" />
 import { splitSetCookieString } from "cookie-es";
-import { getProxyRequestHeaders, getRequestURL, getWebRequest } from "vinxi/http";
-import { ServerContext } from "./server-context.js";
+import { getAssetTags } from "./assets.js";
 import { renderErrorPage } from "./render-ssr-page.js";
-export async function proxyWpAdmin(event) {
+import { ServerContext } from "./server-context.js";
+import { getProxyRequestHeaders, getRequestURL } from "./utils/request.js";
+/**
+ * Proxies a request through to the WordPress origin, rewriting origin URLs in text responses.
+ * For HTML responses, the admin bundle's tags are injected into the `VITE_HEADER`/`VITE_FOOTER`
+ * placeholders printed by the PHP side.
+ */
+export async function proxyWpAdmin(req) {
     const serverContext = ServerContext.main;
-    const req = getWebRequest(event);
-    const reqUrl = getRequestURL(event);
+    const reqUrl = getRequestURL(req);
     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",
@@ -23,19 +26,10 @@ export async function proxyWpAdmin(event) {
     }
     const proxyUrl = serverContext.getOriginUrl(reqUrl.href);
     // Prepare request headers to be sent to the origin server
-    const proxyHeaders = getProxyRequestHeaders(event);
+    const proxyHeaders = getProxyRequestHeaders(req);
     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,
@@ -65,10 +59,8 @@ export async function proxyWpAdmin(event) {
     res.headers.set("document-isolation-policy", "none");
     // 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);
-        }
+    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
@@ -76,21 +68,14 @@ export async function proxyWpAdmin(event) {
         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();
-            // @ts-ignore
-            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 admin = serverContext.runtime.assets.admin;
+            const devStylesheets = (await admin.devStylesheets?.()) ?? [];
+            const viteHeader = [
+                ...getAssetTags({ ...admin, css: [...admin.css, ...devStylesheets] }).map(renderAsset),
+                ...(admin.head ?? []),
+            ].join("\n");
+            const viteFooter = renderAsset({ tag: "script", attrs: { type: "module", src: admin.entry }, children: "" });
             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);
@@ -105,36 +90,23 @@ export async function proxyWpAdmin(event) {
     return new Response(body, res);
 }
 function printElement(element, props, innerText) {
+    const attrs = Object.entries(props)
+        .filter(([, value]) => value !== false && value !== undefined)
+        .map(([key, value]) => (value === true ? ` ${key}` : ` ${key}="${String(value).replace(/"/g, "&quot;")}"`))
+        .join("");
     if (typeof innerText === "string") {
-        return `<${element}${Object.entries(props)
-            .map(([key, value]) => ` ${key}="${value}"`)
-            .join("")}>${innerText}</${element}>`;
+        return `<${element}${attrs}>${innerText}</${element}>`;
     }
     else {
-        return `<${element}${Object.entries(props)
-            .map(([key, value]) => ` ${key}="${value}"`)
-            .join("")} />`;
+        return `<${element}${attrs} />`;
     }
 }
-function renderAsset({ tag, attrs: { key, ...attrs } = {}, children, }) {
+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 ?? "");
-            }
+            return printElement("script", attrs, children ?? "");
         case "link":
-            return printElement("link", { ...attrs, key: key });
-        case "style":
-            return printElement("style", {
-                ...attrs,
-                key: key,
-            }, children ?? "");
+            return printElement("link", attrs);
     }
     return "";
 }

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

@@ -1,4 +1,5 @@
 import type { ErrorRouteProps, RouteDataWithTrackers } from "../lib/routing/types.js";
+import { type AssetTag } from "./assets.js";
 type SSRArgs = {
     pathname: string;
     hostname?: string;
@@ -22,11 +23,6 @@ type RenderErrorPageArgs = {
     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 declare function renderAsset({ tag, attrs, children }: AssetTag): string;
 export {};
 //# sourceMappingURL=render-ssr-page.d.ts.map

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

@@ -1 +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,wDAoI/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,CA6GpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,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"}
+{"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;AAErF,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAA;AAOzD,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,wDAgI/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,CA6GpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,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,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,QAAQ,UA8B7D"}

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

@@ -6,12 +6,15 @@ import { MetaTags } from "../entry/MetaTags.js";
 import { SSRRoot } from "../entry/ssr-root.js";
 import { RouteLoader } from "../lib/routing/loader.js";
 import { ServerRenderResponseContext } from "../utils/ssr-response-data.js";
+import { getAssetTags } from "./assets.js";
 import { ServerContext } from "./server-context.js";
 import { SecureHeaderBuilder } from "./utils/content-security.js";
+/** Preload key for the client entry. Other keys are view/block file names registered via `dynamic()`. */
+const CLIENT_ENTRY = "$client";
 export async function getSsrStream(args) {
-    const clientManifest = ServerContext.main.runtime.getManifest("client");
+    const assets = ServerContext.main.runtime.assets;
     const ssrResponse = {
-        preloadAssets: new Set([clientManifest.handler]),
+        preloadAssets: new Set([CLIENT_ENTRY]),
         includedAssets: new Set(),
         queryCache: new Map(),
     };
@@ -32,9 +35,9 @@ export async function getSsrStream(args) {
                 console.log("Error occurred after shell ready", err, errInfo);
                 console.error(err);
             },
-            bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
+            bootstrapModules: [assets.client.entry],
             nonce: args.nonce,
-            bootstrapScriptContent: `\nwindow.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify({
+            bootstrapScriptContent: `\nwindow._PAGE_DATA = ${JSON.stringify({
                 ...args.initialData,
                 trackers: undefined,
                 hostname: args.hostname,
@@ -67,10 +70,8 @@ export async function getSsrStream(args) {
                 stream.pipe(writableStream);
             });
             for (const input of ssrResponse.preloadAssets) {
-                const assets = await clientManifest.inputs[input].assets();
-                // controller.enqueue(new TextEncoder().encode(`\n<!-- for ${input} -->`))
-                for (const _asset of assets) {
-                    const asset = _asset;
+                const tags = getAssetTags(input === CLIENT_ENTRY ? assets.client : assets.modules[input]);
+                for (const asset of tags) {
                     if (args.nonce)
                         asset.attrs.nonce = args.nonce;
                     // Ensure that each asset is only included once

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

@@ -0,0 +1,14 @@
+import type { AnyRouter } from "@trpc/server";
+import { type FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch";
+export type RPCHandlerOptions = {
+    router: AnyRouter;
+    createContext: (opts: FetchCreateContextFnOptions) => any;
+};
+/**
+ * Handles a request to one of the project's `server/routes` procedures.
+ *
+ * URLs use slashes (`/api/search/quickSearch/`), which are converted to tRPC's dotted names.
+ * A procedure may return a `Response`, which is sent as-is instead of the tRPC envelope.
+ */
+export declare function handleRPCRequest(originalReq: Request, opts: RPCHandlerOptions): Promise<Response>;
+//# sourceMappingURL=rpc-handler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-handler.d.ts","sourceRoot":"","sources":["../../../src/app/server/rpc-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAuB,KAAK,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AAInG,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,SAAS,CAAA;IACjB,aAAa,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,GAAG,CAAA;CAC1D,CAAA;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,CA2CvG"}

package/dist/app/server/rpc-handler.js

@@ -0,0 +1,63 @@
+import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
+import { parseURL, stringifyParsedURL } from "ufo";
+import { ServerContext } from "./server-context.js";
+/**
+ * Handles a request to one of the project's `server/routes` procedures.
+ *
+ * URLs use slashes (`/api/search/quickSearch/`), which are converted to tRPC's dotted names.
+ * A procedure may return a `Response`, which is sent as-is instead of the tRPC envelope.
+ */
+export async function handleRPCRequest(originalReq, opts) {
+    const serverContext = ServerContext.main;
+    // Handle CORS
+    const corsHeaders = serverContext.getCorsHeaders(originalReq.headers.get("origin") ?? originalReq.headers.get("referer") ?? "");
+    if (originalReq.method === "OPTIONS") {
+        return new Response("OK", { status: 204, statusText: "No Content.", headers: corsHeaders });
+    }
+    // Update URLs with dots, which tRPC prefers
+    const parsed = parseURL(originalReq.url);
+    parsed.pathname = "/" + parsed.pathname.replace(/(^\/|\/$)/g, "").replace(/\//g, ".");
+    const req = new Request(stringifyParsedURL(parsed), originalReq);
+    let earlyResponse;
+    const defaultResponse = await fetchRequestHandler({
+        endpoint: "/",
+        req,
+        router: opts.router,
+        createContext: async (ctxOpts) => {
+            return {
+                ...(await opts.createContext(ctxOpts)),
+                searchParams: ctxOpts.info.url?.searchParams,
+                server: serverContext,
+            };
+        },
+        onError: (err) => console.error(err),
+        batching: { enabled: false },
+        // If a Response object is returned by a route, it will be sent as the response
+        responseMeta(meta) {
+            const value = meta?.data?.[0]?.["result"]?.["data"];
+            if (value instanceof Response) {
+                earlyResponse = value;
+            }
+            return {};
+        },
+    });
+    const response = earlyResponse ?? defaultResponse;
+    return withCors(response, corsHeaders);
+}
+function withCors(response, corsHeaders) {
+    if (!Object.keys(corsHeaders).length)
+        return response;
+    try {
+        for (const [key, value] of Object.entries(corsHeaders)) {
+            response.headers.set(key, value);
+        }
+        return response;
+    }
+    catch {
+        // Some responses have immutable headers
+        const headers = new Headers(response.headers);
+        for (const [key, value] of Object.entries(corsHeaders))
+            headers.set(key, value);
+        return new Response(response.body, { status: response.status, statusText: response.statusText, headers });
+    }
+}

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

@@ -0,0 +1,22 @@
+import type { ServerAssets } from "./assets.js";
+import { type RPCHandlerOptions } from "./rpc-handler.js";
+export type ServerAppOptions = {
+    /** The project's `server/routes` procedures */
+    rpc: RPCHandlerOptions;
+    /** Client asset lookups, generated per build */
+    assets: ServerAssets;
+    /** Set when Vercel skew protection is enabled for the deployment */
+    skewProtection?: {
+        deploymentId: string;
+    };
+};
+export type ServerApp = {
+    fetch(req: Request): Promise<Response>;
+};
+/**
+ * The serverless app: route data, named queries and mutations, RPC procedures, WordPress proxying
+ * and server-rendered pages. Nitro calls `fetch` for every request that isn't a static asset or
+ * handled by a route rule (eg. the `/wp-content/**` proxies).
+ */
+export declare function createServerApp(opts: ServerAppOptions): ServerApp;
+//# sourceMappingURL=server-app.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"server-app.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-app.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI/C,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAI3E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+CAA+C;IAC/C,GAAG,EAAE,iBAAiB,CAAA;IACtB,gDAAgD;IAChD,MAAM,EAAE,YAAY,CAAA;IACpB,oEAAoE;IACpE,cAAc,CAAC,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;CACvC,CAAA;AAQD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,SAAS,CAuLjE"}