@emberkit/cli 0.7.0 → 0.7.1

package/dist/commands/build.js

@@ -129,14 +129,32 @@ function siteConfigToHeadOptions(site) {
 }
 function getServerEntryShim(site) {
     const siteHeadOptions = siteConfigToHeadOptions(site);
-    return `import { routes, notFoundRoute, errorRoute } from 'virtual:emberkit-routes';
-import { createElement, buildRouteHeadFromMetadata } from '@emberkit/core';
-
-const siteHeadOptions = ${siteHeadOptions};
+    return `import { routes, rootLayout, notFoundRoute, errorRoute } from 'virtual:emberkit-routes';
+import {
+  createElement,
+  buildRouteHeadFromMetadata,
+  drainHeadContent,
+  clearHeadContent,
+} from '@emberkit/core';
 import { readFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+const siteHeadOptions = ${siteHeadOptions};
+
+const wrapWithRootLayout = async (RouteComponent) => {
+  if (!rootLayout) {
+    return RouteComponent;
+  }
+  const layoutMod = await rootLayout();
+  const Layout = layoutMod.default || layoutMod;
+  return (routeProps) =>
+    createElement(Layout, {
+      pathname: routeProps?.pathname,
+      children: createElement(RouteComponent, routeProps),
+    });
+};
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const routeToRegex = (routePath) => {
@@ -264,14 +282,18 @@ export async function render(url) {
   if (match) {
     try {
       const mod = await match.route.component();
-      const Component = mod.default || mod;
-
+      const Route = mod.default || mod;
+      clearHeadContent();
+      const Page = await wrapWithRootLayout(Route);
+      const element = createElement(Page, { params: match.params, pathname });
+      appHtml = renderToString(element);
+      const drained = drainHeadContent();
       if (mod.metadata) {
-        headContent += buildRouteHeadFromMetadata(mod.metadata, pathname, siteHeadOptions ?? undefined) + '\\n';
+        headContent =
+          buildRouteHeadFromMetadata(mod.metadata, pathname, siteHeadOptions ?? undefined) + '\\n';
+      } else if (drained) {
+        headContent = drained + '\\n';
       }
-
-      const element = createElement(Component, { params: match.params });
-      appHtml = renderToString(element);
     } catch (e) {
       console.error('[SSR] Failed to render route:', pathname, e);
       if (errorRoute) {
@@ -300,9 +322,18 @@ export async function render(url) {
     if (notFoundRoute) {
       try {
         const mod = await notFoundRoute();
-        const Component = mod.default || mod;
-        const element = createElement(Component, {});
+        const Route = mod.default || mod;
+        clearHeadContent();
+        const Page = await wrapWithRootLayout(Route);
+        const element = createElement(Page, {});
         appHtml = renderToString(element);
+        const drained = drainHeadContent();
+        if (drained) {
+          headContent = drained + '\\n';
+        } else if (mod.metadata) {
+          headContent =
+            buildRouteHeadFromMetadata(mod.metadata, pathname, siteHeadOptions ?? undefined) + '\\n';
+        }
       } catch (e) {
         console.error('[SSR] Failed to render 404 page:', e);
         appHtml = '<div style="padding: 20px;">404 - Page not found</div>';

package/dist/emberkit-package-versions.js

@@ -1,10 +1,10 @@
 // Semver ranges for @emberkit/* packages written into generated projects.
 // When releasing libraries, bump these to match packages/*/package.json "version".
 export const EMBERKIT_PACKAGE_VERSIONS = {
-    core: "^0.6.0",
+    core: "^0.6.1",
     ui: "^4.0.0",
-    icons: "^4.0.0",
-    cli: "^0.7.0",
+    icons: "^4.0.1",
+    cli: "^0.7.1",
     edge: "^0.2.4",
     tsconfig: "^0.2.1",
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emberkit/cli",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "type": "module",
   "private": false,
   "description": "CLI tool for EmberKit projects",