eddev 2.0.0-beta.92 → 2.0.0-beta.94

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

@@ -7,9 +7,9 @@ export type RouteMetaTag = {
     inner?: string;
 };
 export type TrackerTags = {
-    head?: RouteMetaTag[];
-    body?: RouteMetaTag[];
-    footer?: RouteMetaTag[];
+    head?: string;
+    body?: string;
+    footer?: string;
 };
 export interface RouteData {
     view: string;

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

@@ -2,12 +2,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { renderAsset } from "@vinxi/react";
 import { Suspense } from "react";
 import { renderToPipeableStream, renderToString } from "react-dom/server";
-import { SSRRoot } from "../entry/ssr-root.js";
-import { RouteLoader } from "../lib/routing/loader.js";
-import { ServerContext } from "./server-context.js";
 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();
@@ -37,10 +37,17 @@ export async function getSsrStream(args) {
                 console.error(err);
             },
             bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
-            bootstrapScriptContent: `window.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify(args.initialData)};\nwindow._TRACKERS = ${JSON.stringify(args.initialData.trackers)};`,
+            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 ?? [] }), _jsx(MetaTags, { tags: args.initialData.trackers?.head ?? [] }), assets.map((m) => renderAsset(m)), "%%%%"] }), _jsxs("body", { children: [_jsx(MetaTags, { tags: args.initialData.trackers?.body ?? [] }), _jsx("div", { id: "_root", children: "%%%%" }), _jsx(MetaTags, { tags: args.initialData.trackers?.footer ?? [] })] })] })).split("%%%%");
+    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));
@@ -61,14 +68,13 @@ export async function getSsrStream(args) {
                 });
                 stream.pipe(writableStream);
             });
-            console.log(clientManifest.json());
             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<!-- for ${asset} -->`))
                 // controller.enqueue(new TextEncoder().encode(`\n<script>${JSON.stringify(assets)}</script>`))
                 // controller.enqueue(
                 //   new TextEncoder().encode(renderToString(<>{assets.map((a) => renderAsset(asset as any))}</>)),
@@ -116,6 +122,14 @@ export async function renderPage(args) {
                 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,

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

@@ -3,7 +3,7 @@ import { fetchWP } from "../../node/utils/fetch-wp.js";
 import { filterHeader } from "./utils/headers.js";
 import { createUrlReplacer } from "./utils/replace-host.js";
 import { pageCache, queryCache, swr } from "./utils/swr-cache.js";
-const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", /woocommerce/];
+const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", /woocommerce/, "location"];
 const PROXY_REQUEST_HEADERS = [
     "content-type",
     "accept",
@@ -115,8 +115,8 @@ export class ServerContext {
                     ctx.metadata.ttl = preferredCacheDuration * 1000;
                 }
                 let resultStatus = result.status;
-                let resultHeaders = result.headers;
-                let resultData = await result.json();
+                let resultHeaders = new Headers(result.headers);
+                let resultData = {};
                 // Special case for redirects
                 if (result.headers.get("location")) {
                     let location = result.headers.get("location");
@@ -125,12 +125,13 @@ export class ServerContext {
                         location = this.replaceUrls(location);
                     }
                     resultHeaders.delete("location");
-                    resultData = {
-                        redirect: location,
-                        status: status,
-                        data: "",
+                    return {
+                        status: 200,
+                        headers: resultHeaders,
+                        data: JSON.stringify({ redirect: location, status: status }),
                     };
                 }
+                resultData = await result.json();
                 if (resultData && typeof resultData === "object") {
                     resultData.__generated = new Date().toISOString();
                 }

package/dist/node/cli/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.89";
+export declare const VERSION = "2.0.0-beta.94";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.89";
+export const VERSION = "2.0.0-beta.94";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.92",
+  "version": "2.0.0-beta.94",
   "description": "",
   "main": "index.js",
   "type": "module",