@emberkit/core 0.6.0 → 0.6.1

package/dist/index.d.ts

@@ -13,7 +13,7 @@ export { compileMDX, compileSync, useMDX } from './mdx/index.js';
 export { DataCache, createCache, getCached, setCache, prefetch } from './cache/index.js';
 export { LazyInView, hydrateLazyInView, clearLazyRegistry } from './viewport/index.js';
 export { renderToHTMLString } from './ssr/helpers/render-html.js';
-export { drainHeadContent } from './meta/head-registry.js';
+export { drainHeadContent, clearHeadContent } from './meta/head-registry.js';
 export { Head } from './meta/index.js';
 export type { HeadProps } from './meta/index.js';
 export { generateMeta, buildRouteHeadFromMetadata, generateBreadcrumbs, generateArticleSchema, generateProductSchema, } from './meta/index.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,QAAsB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,GACP,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnF,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1E,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEjG,YAAY,EAAE,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACzF,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,QAAsB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,GACP,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnF,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1E,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEjG,YAAY,EAAE,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACzF,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErF"}

package/dist/index.js

@@ -12,7 +12,7 @@ export { compileMDX, compileSync, useMDX } from './mdx/index.js';
 export { DataCache, createCache, getCached, setCache, prefetch } from './cache/index.js';
 export { LazyInView, hydrateLazyInView, clearLazyRegistry } from './viewport/index.js';
 export { renderToHTMLString } from './ssr/helpers/render-html.js';
-export { drainHeadContent } from './meta/head-registry.js';
+export { drainHeadContent, clearHeadContent } from './meta/head-registry.js';
 export { Head } from './meta/index.js';
 export { generateMeta, buildRouteHeadFromMetadata, generateBreadcrumbs, generateArticleSchema, generateProductSchema, } from './meta/index.js';
 export function defineConfig(config) {

package/dist/vite-plugin/index.js

@@ -1145,11 +1145,29 @@ function siteConfigToHeadOptions(site) {
 function generateSSREntry(site) {
     const siteHeadOptions = siteConfigToHeadOptions(site);
     return `
-import { routes, notFoundRoute, errorRoute } from 'virtual:emberkit-routes';
-import { createElement, buildRouteHeadFromMetadata } from '@emberkit/core';
+import { routes, rootLayout, notFoundRoute, errorRoute } from 'virtual:emberkit-routes';
+import {
+  createElement,
+  buildRouteHeadFromMetadata,
+  drainHeadContent,
+  clearHeadContent,
+} from '@emberkit/core';
 
 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 matchRoute = (routes, pathname) => {
   const normalizedPath = pathname.replace(/\\/+$/, '') || '/';
   
@@ -1282,14 +1300,18 @@ export async function render(url, server) {
   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) {
@@ -1318,9 +1340,18 @@ export async function render(url, server) {
     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>';
@@ -1405,10 +1436,19 @@ function generateRoutesCode(files, routeDir) {
     const routeEntries = [];
     let notFoundRoute = 'null';
     let errorRoute = 'null';
+    let rootLayout = 'null';
     for (const file of files) {
         const relativePath = relative(routeDir, file).replace(/\\/g, '/');
         const ext = file.split('.').pop() ?? '';
         const isMarkdown = ext === 'md' || ext === 'mdx';
+        const importPath = file.replace(/\\/g, '/');
+        if (relativePath === '_layout.tsx' ||
+            relativePath === '_layout.ts' ||
+            relativePath === '_layout.jsx' ||
+            relativePath === '_layout.js') {
+            rootLayout = `() => import(${JSON.stringify(importPath)})`;
+            continue;
+        }
         // Check for special error pages
         if (relativePath === '404.tsx' || relativePath === '404.ts' || relativePath === '404.jsx' || relativePath === '404.js') {
             const importPath = file.replace(/\\/g, '/');
@@ -1441,7 +1481,6 @@ function generateRoutesCode(files, routeDir) {
         else {
             routePath = '/' + routePath;
         }
-        const importPath = file.replace(/\\/g, '/');
         const entry = isMarkdown
             ? `  { path: ${JSON.stringify(routePath)}, component: () => import(${JSON.stringify(importPath)}), isMarkdown: true }`
             : `  { path: ${JSON.stringify(routePath)}, component: () => import(${JSON.stringify(importPath)}) }`;
@@ -1451,6 +1490,7 @@ function generateRoutesCode(files, routeDir) {
     // the correct priority order (defense-in-depth alongside runtime scoring).
     routeEntries.sort((a, b) => scoreRoutePath(b.path) - scoreRoutePath(a.path));
     return `export const routes = [\n${routeEntries.map((r) => r.entry).join(',\n')}\n];
+export const rootLayout = ${rootLayout};
 export const notFoundRoute = ${notFoundRoute};
 export const errorRoute = ${errorRoute};`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emberkit/core",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "private": false,
   "description": "Lightweight TypeScript-first JSX framework core",