eddev 2.0.0-beta.103 → 2.0.0-beta.105

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

@@ -18,4 +18,10 @@ type RenderErrorPageArgs = {
     realError?: Error;
 };
 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 {};

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

@@ -1,5 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } 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";
@@ -7,7 +6,6 @@ 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 { Fragment } from "react/jsx-runtime";
 export async function getSsrStream(args) {
     const clientManifest = ServerContext.main.runtime.getManifest("client");
     const preloadAssets = new Set([clientManifest.handler]);
@@ -66,10 +64,16 @@ export async function getSsrStream(args) {
                 controller.enqueue(new TextEncoder().encode(`\n<!-- ${JSON.stringify(assets)} -->\n`));
                 for (const _asset of assets) {
                     const asset = _asset;
-                    if (preloadAssets.has(asset.key))
+                    // 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 (preloadAssets.has(key))
                         continue;
-                    controller.enqueue(new TextEncoder().encode(renderToString(_jsx(Fragment, { children: renderAsset(asset) }))));
-                    preloadAssets.add(asset.key);
+                    preloadAssets.add(key);
+                    // Render the asset
+                    controller.enqueue(new TextEncoder().encode(renderAsset(asset)));
                 }
             }
             // console.log("ASSETS", await clientManifest)
@@ -158,3 +162,34 @@ export async function renderErrorPage(args) {
         newOrigin: args.newOrigin,
     });
 }
+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":
+            return `<link ${formatAttributes(attrs)} />`;
+        case "style":
+            return `<style ${formatAttributes(attrs)}>${children ?? ""}</style>`;
+        default:
+            return "";
+    }
+}

package/package.json

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