eddev 2.0.0-beta.100 → 2.0.0-beta.102

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+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";
@@ -9,17 +9,9 @@ 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 preloadAssets = new Set([clientManifest.handler]);
+    const includedAssets = new Set();
+    const jsx = (_jsx(AssetCaptureContext.Provider, { value: preloadAssets, 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, {
@@ -42,7 +34,7 @@ export async function getSsrStream(args) {
             })};\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] || "";
     })
@@ -67,16 +59,21 @@ export async function getSsrStream(args) {
                 });
                 stream.pipe(writableStream);
             });
-            for (const asset of dynamicAssets) {
-                const assets = await clientManifest.inputs[asset].assets();
+            for (const input of preloadAssets) {
+                const assets = await clientManifest.inputs[input].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)) }))));
+                controller.enqueue(new TextEncoder().encode(`\n<!-- for ${input} -->`));
+                controller.enqueue(new TextEncoder().encode(`\n<!-- ${JSON.stringify(assets)} -->\n`));
+                for (const _asset of assets) {
+                    const asset = _asset;
+                    if (preloadAssets.has(asset.key))
+                        continue;
+                    controller.enqueue(new TextEncoder().encode(renderToString(renderAsset(asset)) + "\n"));
+                    preloadAssets.add(asset.key);
+                }
             }
             // console.log("ASSETS", await clientManifest)
             controller.enqueue(new TextEncoder().encode(middle));

package/package.json

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