@emberkit/cli 0.6.9 → 0.7.1

package/dist/commands/build.js

@@ -59,7 +59,7 @@ export async function build(_args) {
             log("info", "Building client bundle...");
             await buildClient(root, outDir, viteConfig, customLogger);
             log("info", "Building SSR bundle...");
-            await buildSSR(root, outDir, viteConfig, customLogger);
+            await buildSSR(root, outDir, viteConfig, customLogger, emberkitConfig);
             log("info", "Generating SSR manifest...");
             await generateManifest(root, outDir, mode);
             if (mode === "hybrid") {
@@ -72,7 +72,7 @@ export async function build(_args) {
             log("info", "Building static site...");
             await buildClient(root, outDir, viteConfig, customLogger);
             log("info", "Building SSR bundle for pre-rendering...");
-            await buildSSR(root, outDir, viteConfig, customLogger);
+            await buildSSR(root, outDir, viteConfig, customLogger, emberkitConfig);
             log("info", "Generating manifest...");
             await generateManifest(root, outDir, mode);
             log("info", "Pre-rendering all routes...");
@@ -113,13 +113,48 @@ async function buildClient(root, outDir, viteConfig, customLogger) {
     };
     await viteBuild(clientConfig);
 }
-function getServerEntryShim() {
-    return `import { routes, notFoundRoute, errorRoute } from 'virtual:emberkit-routes';
-import { createElement } from '@emberkit/core';
+function siteConfigToHeadOptions(site) {
+    const config = site;
+    if (!config?.url) {
+        return "null";
+    }
+    return JSON.stringify({
+        siteUrl: config.url,
+        siteName: config.name,
+        titleSuffix: config.titleSuffix,
+        defaultDescription: config.description,
+        defaultOgImage: config.ogImage,
+        twitterSite: config.twitterSite,
+    });
+}
+function getServerEntryShim(site) {
+    const siteHeadOptions = siteConfigToHeadOptions(site);
+    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) => {
@@ -247,19 +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) {
-        if (mod.metadata.title) {
-          headContent += '<title>' + escapeHtml(mod.metadata.title) + '</title>\\n';
-        }
-        if (mod.metadata.description) {
-          headContent += '<meta name="description" content="' + escapeHtml(mod.metadata.description) + '">\\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) {
@@ -288,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>';
@@ -319,7 +362,7 @@ export async function render(url) {
 }
 `;
 }
-async function resolveSSREntry(root) {
+async function resolveSSREntry(root, emberkitConfig) {
     const userEntryTs = join(root, "src", "entry-server.ts");
     const userEntryTsx = join(root, "src", "entry-server.tsx");
     if (existsSync(userEntryTs)) {
@@ -331,11 +374,12 @@ async function resolveSSREntry(root) {
     const cacheDir = join(root, "node_modules", ".cache", "emberkit");
     mkdirSync(cacheDir, { recursive: true });
     const shimPath = join(cacheDir, "server-entry.js");
-    writeFileSync(shimPath, getServerEntryShim(), "utf-8");
+    const site = emberkitConfig?.site;
+    writeFileSync(shimPath, getServerEntryShim(site), "utf-8");
     return shimPath;
 }
-async function buildSSR(root, outDir, viteConfig, customLogger) {
-    const ssrEntry = await resolveSSREntry(root);
+async function buildSSR(root, outDir, viteConfig, customLogger, emberkitConfig) {
+    const ssrEntry = await resolveSSREntry(root, emberkitConfig);
     const ssrConfig = {
         ...viteConfig,
         root,

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.4.0",
-    ui: "^2.0.0",
-    icons: "^2.0.0",
-    cli: "^0.6.9",
+    core: "^0.6.1",
+    ui: "^4.0.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.6.9",
+  "version": "0.7.1",
   "type": "module",
   "private": false,
   "description": "CLI tool for EmberKit projects",