@uniweb/build 0.6.7 → 0.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -51,7 +51,7 @@
   },
   "optionalDependencies": {
     "@uniweb/schemas": "0.2.1",
-    "@uniweb/runtime": "0.5.16",
+    "@uniweb/runtime": "0.5.17",
     "@uniweb/content-reader": "1.1.2"
   },
   "peerDependencies": {

package/src/prerender.js

@@ -502,6 +502,22 @@ function renderBlock(block) {
     ...block.properties,
   }
 
+  // Resolve inherited entity data (mirrors BlockRenderer.jsx)
+  // EntityStore walks page/site hierarchy to find data matching meta.inheritData
+  const entityStore = block.website?.entityStore
+  if (entityStore) {
+    const resolved = entityStore.resolve(block, meta)
+    if (resolved.status === 'ready' && resolved.data) {
+      const merged = { ...content.data }
+      for (const key of Object.keys(resolved.data)) {
+        if (merged[key] === undefined) {
+          merged[key] = resolved.data[key]
+        }
+      }
+      content.data = merged
+    }
+  }
+
   // Background handling (mirrors BlockRenderer.jsx)
   const { background, ...wrapperProps } = getWrapperProps(block)
 

package/src/site/content-collector.js

@@ -1113,6 +1113,11 @@ async function loadFoundationVars(foundationPath) {
  * Layout panels (header, footer, left, right) are persistent regions
  * that appear on every page. They live in layout/ parallel to pages/.
  *
+ * Supports two forms:
+ *   - Folder: layout/header/ (directory with .md files, like a page)
+ *   - File shorthand: layout/header.md (single markdown file)
+ * Folder takes priority when both exist.
+ *
  * @param {string} layoutDir - Path to layout directory
  * @param {string} siteRoot - Path to site root
  * @returns {Promise<Object>} { header, footer, left, right }
@@ -1125,19 +1130,35 @@ async function collectLayoutPanels(layoutDir, siteRoot) {
   const knownPanels = ['header', 'footer', 'left', 'right']
   const entries = await readdir(layoutDir)
 
-  for (const entry of entries) {
-    if (!knownPanels.includes(entry)) continue
-    const entryPath = join(layoutDir, entry)
-    const stats = await stat(entryPath)
-    if (!stats.isDirectory()) continue
-
-    const pageResult = await processPage(entryPath, entry, siteRoot, {
-      isIndex: false,
-      parentRoute: '/layout'
-    })
+  for (const panel of knownPanels) {
+    // Folder form (higher priority)
+    if (entries.includes(panel)) {
+      const entryPath = join(layoutDir, panel)
+      const stats = await stat(entryPath)
+      if (stats.isDirectory()) {
+        const pageResult = await processPage(entryPath, panel, siteRoot, {
+          isIndex: false,
+          parentRoute: '/layout'
+        })
+        if (pageResult) {
+          result[panel] = pageResult.page
+        }
+        continue
+      }
+    }
 
-    if (pageResult) {
-      result[entry] = pageResult.page
+    // File shorthand: layout/header.md
+    const mdFile = `${panel}.md`
+    if (entries.includes(mdFile)) {
+      const filePath = join(layoutDir, mdFile)
+      const { section } = await processMarkdownFile(filePath, '1', siteRoot, panel)
+      result[panel] = {
+        route: `/layout/${panel}`,
+        title: panel.charAt(0).toUpperCase() + panel.slice(1),
+        description: '',
+        layout: { header: true, footer: true, leftPanel: true, rightPanel: true },
+        sections: [section]
+      }
     }
   }