eddev 2.0.0-beta.105 → 2.0.0-beta.107

package/dist/app/entry/spa-root.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { DevUILoader } from "../lib/devtools/loader.js";
 import { BrowserRouter } from "../lib/routing/components/BrowserRouter.js";
 import { APIProvider } from "../utils/APIProvider.js";
 export function SPARoot() {
-    return (_jsxs(APIProvider, { children: [_jsx(Suspense, { children: _jsx(BrowserRouter, {}) }), _jsx(DevUILoader, {})] }));
+    return (_jsxs(APIProvider, { children: [_jsx(BrowserRouter, {}), _jsx(DevUILoader, {})] }));
 }

package/dist/app/entry/ssr-root-client.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Suspense, useEffect } from "react";
+import { useEffect } from "react";
 import { useSnapshot } from "valtio";
 import { BrowserRouter } from "../lib/routing/components/BrowserRouter.js";
 import { clientMetaTags } from "../lib/routing/context.js";
 import { APIProvider } from "../utils/APIProvider.js";
 export function SSRClientRoot(props) {
-    return (_jsxs(APIProvider, { children: [_jsx(DynamicMetaTags, {}), _jsx(Suspense, { children: _jsx(BrowserRouter, {}) })] }));
+    return (_jsxs(APIProvider, { children: [_jsx(DynamicMetaTags, {}), _jsx(BrowserRouter, {})] }));
 }
 function DynamicMetaTags() {
     const dynamicTags = useSnapshot(clientMetaTags).tags;

package/dist/app/entry/ssr-root.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { SSRRouter } from "../lib/routing/components/SSRRouter.js";
 import { getRouteMeta, normalizeRoute } from "../lib/routing/utils.js";
 import { APIProvider } from "../utils/APIProvider.js";
@@ -7,16 +6,16 @@ export function SSRRoot(props) {
     const loader = props.loader;
     loader.setAppData(props.initialData.appData.data);
     loader.populateRouteData(props.pathname, props.initialData);
-    return (_jsx(APIProvider, { children: _jsx(Suspense, { children: _jsx(SSRRouter, { loader: loader, route: normalizeRoute({
-                    id: "initial",
-                    component: loader.getRouteComponent(props.initialData.view),
-                    key: "",
-                    props: props.initialData.viewData.data,
-                    view: props.initialData.view,
-                    search: "",
-                    pathname: props.pathname,
-                    query: {},
-                    hash: "",
-                    meta: getRouteMeta(props.initialData),
-                }) }) }) }));
+    return (_jsx(APIProvider, { children: _jsx(SSRRouter, { loader: loader, route: normalizeRoute({
+                id: "initial",
+                component: loader.getRouteComponent(props.initialData.view),
+                key: "",
+                props: props.initialData.viewData.data,
+                view: props.initialData.view,
+                search: "",
+                pathname: props.pathname,
+                query: {},
+                hash: "",
+                meta: getRouteMeta(props.initialData),
+            }) }) }));
 }

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

@@ -6,11 +6,12 @@ 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 { Suspense } from "react";
 export async function getSsrStream(args) {
     const clientManifest = ServerContext.main.runtime.getManifest("client");
     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 jsx = (_jsx(Suspense, { children: _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, {
@@ -61,7 +62,6 @@ export async function getSsrStream(args) {
             for (const input of preloadAssets) {
                 const assets = await clientManifest.inputs[input].assets();
                 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;
                     // Ensure that each asset is only included once
@@ -69,11 +69,17 @@ export async function getSsrStream(args) {
                     if (!key) {
                         throw new Error("Asset must have a key: " + JSON.stringify(asset));
                     }
-                    if (preloadAssets.has(key))
+                    if (includedAssets.has(key))
                         continue;
-                    preloadAssets.add(key);
+                    includedAssets.add(key);
                     // Render the asset
-                    controller.enqueue(new TextEncoder().encode(renderAsset(asset)));
+                    try {
+                        const tag = renderAsset(asset);
+                        controller.enqueue(new TextEncoder().encode(tag + "\n"));
+                    }
+                    catch (err) {
+                        controller.enqueue(new TextEncoder().encode(`\n<!-- ${JSON.stringify(err)} -->\n`));
+                    }
                 }
             }
             // console.log("ASSETS", await clientManifest)

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.95";
+export declare const VERSION = "2.0.0-beta.106";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.95";
+export const VERSION = "2.0.0-beta.106";

package/dist/node/compiler/get-vite-config.js

@@ -68,7 +68,11 @@ export function reactPlugin() {
                                         if (t.isExpression(body)) {
                                             body = t.blockStatement([t.returnStatement(body)]);
                                         }
-                                        path.replaceWith(t.exportDefaultDeclaration(t.functionDeclaration(t.identifier(pascalCase(type + "-" + name)), args[1].params, body, args[1].generator, args[1].async)));
+                                        const componentName = pascalCase(type) + "_" + name.replace(/[^a-z0-9]/g, "_").replace(/_+/g, "_");
+                                        path.replaceWithMultiple([
+                                            t.exportDefaultDeclaration(t.functionDeclaration(t.identifier(componentName), args[1].params, body, args[1].generator, args[1].async)),
+                                            t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier(componentName), t.identifier("displayName")), t.stringLiteral(pascalCase(type) + "(" + name + ")"))),
+                                        ]);
                                     }
                                 }
                             }

package/dist/node/compiler/vinxi-codegen.js

@@ -133,13 +133,13 @@ export function createVinxiCodegen(opts) {
             window.$reactRoot ||
             hydrateRoot(
               document.getElementById('_root')!,
-              <SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA.meta.head} />,
+              <React.Suspense><SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA.meta.head} /></React.Suspense>,
             )
 
           if (import.meta.hot) {
             import.meta.hot.accept((mod) => {
               if (mod) {
-                const app = <SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA.meta.head} />
+                const app = <React.Suspense><SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA.meta.head} /></React.Suspense>
                 window.$reactRoot?.render(app)
               }
             })
@@ -170,7 +170,7 @@ export function createVinxiCodegen(opts) {
 
           devToolsStore.loadTailwindConfig = () => import('./manifest/tailwind-config')
 
-          createRoot(document.getElementById("root")!).render(<SPARoot />)
+          createRoot(document.getElementById("root")!).render(<React.Suspense><SPARoot /></React.Suspense>)
         `;
             }
         },

package/package.json

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