eddev 2.0.0-beta.102 → 2.0.0-beta.104

package/dist/app/lib/routing/components/BrowserRouter.js

@@ -199,7 +199,7 @@ export function BrowserRouter(props) {
             if (cancelled)
                 return;
             const data = await loader.loadRouteData(parseHrefPath(args.url)).catch((err) => {
-                emitEvent({ type: "error", error: err, critical: true });
+                emitEvent({ type: "error", url: args.url, error: err, critical: true });
                 return {
                     view: "_error",
                     viewType: "react",

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

@@ -84,6 +84,7 @@ export type RouterEvent = {
 } | {
     type: "error";
     critical: boolean;
+    url?: string;
     error: Error;
 };
 export type RouterSubscriber = (event: RouterEvent) => void;

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

@@ -7,6 +7,7 @@ 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]);
@@ -61,18 +62,20 @@ export async function getSsrStream(args) {
             });
             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 ${input} -->`));
                 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(renderAsset(asset)) + "\n"));
-                    preloadAssets.add(asset.key);
+                    preloadAssets.add(key);
+                    // Render the asset
+                    controller.enqueue(new TextEncoder().encode(renderToString(_jsx(Fragment, { children: renderAsset(asset) }))));
                 }
             }
             // console.log("ASSETS", await clientManifest)

package/package.json

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