npm - @useavalon/avalon - Versions diffs - 0.1.1 → 0.1.2 - Mend

@useavalon/avalon 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/src/nitro/renderer.ts +24 -11

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@useavalon/avalon",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "Multi-framework islands architecture for the modern web",
 	"license": "MIT",
 	"type": "module",

package/src/nitro/renderer.ts CHANGED Viewed

@@ -44,6 +44,8 @@ import {
 	discoverErrorPages,
 	type ErrorHandlerOptions,
 } from './error-handler.ts';
+import { h } from 'preact';
+import preactRenderToString from 'preact-render-to-string';
 /**
  * Resolved page route information
@@ -626,17 +628,27 @@ async function renderPageComponent(
 	context: NitroRenderContext,
 	_options: SSRRenderOptions,
 ): Promise<string> {
-	// This would integrate with the existing renderToHtml function
-	// For now, return a basic structure showing the integration point
+	const Component = pageModule.default as (props?: Record<string, unknown>) => unknown;
+	const metadata = pageModule.metadata || {};
-	// In the real implementation, this would:
-	// 1. Import and use renderToHtml from '../render/ssr.ts'
-	// 2. Create a RouteConfig from the pageModule
-	// 3. Apply layouts using the layout resolver
-	// 4. Return the fully rendered HTML
+	// Call the page component (supports async components)
+	let vnode: unknown;
+	try {
+		const result = Component(pageProps);
+		vnode = result instanceof Promise ? await result : result;
+	} catch (err) {
+		console.error('[renderer] Error calling page component:', err);
+		vnode = h('div', null, 'Error rendering page');
+	}
-	const componentName = (pageModule.default as { name?: string })?.name || 'Page';
-	const metadata = pageModule.metadata || {};
+	// Render the vnode to HTML string using Preact SSR
+	let pageHtml: string;
+	try {
+		pageHtml = preactRenderToString(vnode as any);
+	} catch (err) {
+		console.error('[renderer] Error in preactRenderToString:', err);
+		pageHtml = '<div>Error rendering page</div>';
+	}
 	return `<!DOCTYPE html>
 <html lang="en">
@@ -647,9 +659,10 @@ async function renderPageComponent(
     ${metadata.description ? `<meta name="description" content="${escapeHtml(String(metadata.description))}">` : ''}
   </head>
   <body>
-    <div id="app" data-page="${escapeHtml(String(componentName))}" data-props='${escapeHtml(JSON.stringify(pageProps))}'>
-      <!-- Page content rendered by Avalon SSR pipeline -->
+    <div id="app">
+      ${pageHtml}
     </div>
+    <script type="module" src="/src/client/main.js"></script>
   </body>
 </html>`;
 }