@cmssy/cli 12.14.1 → 12.14.2

package/assets/init/astro/src/cmssy/layout-slot.tsx

@@ -63,6 +63,8 @@ export default function LayoutSlot({
             locale={locale}
             defaultLocale={defaultLocale}
             context={context}
+            resolvedContent={resolvedContent?.[block.id]}
+            data={data?.[block.id]}
           />
         ))}
     </>

package/assets/init/astro/src/pages/[...path].astro

@@ -1,6 +1,9 @@
 ---
 import { loadCmssyPage } from "@cmssy/astro";
-import { resolveEditorBlockData } from "@cmssy/react";
+import {
+  resolveEditorBlockData,
+  resolveEditorLayoutBlockData,
+} from "@cmssy/react";
 import { cmssy } from "../cmssy.config";
 import { blocks } from "../cmssy/blocks";
 import { Blocks } from "../components/Blocks";
@@ -27,6 +30,19 @@ const { data: blockData, content: blockContent } = await resolveEditorBlockData(
   enabledLocales,
   config: cmssy,
 });
+
+const layoutSlot = {
+  groups: layouts,
+  blocks,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  config: cmssy,
+};
+const [header, footer] = await Promise.all([
+  resolveEditorLayoutBlockData({ ...layoutSlot, position: "header" }),
+  resolveEditorLayoutBlockData({ ...layoutSlot, position: "footer" }),
+]);
 ---
 
 <html lang={locale}>
@@ -41,6 +57,8 @@ const { data: blockData, content: blockContent } = await resolveEditorBlockData(
       locale={locale}
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
+      data={header.data}
+      resolvedContent={header.content}
     />
     {
       page ? (
@@ -62,6 +80,8 @@ const { data: blockData, content: blockContent } = await resolveEditorBlockData(
       locale={locale}
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
+      data={footer.data}
+      resolvedContent={footer.content}
     />
   </body>
 </html>

package/assets/init/remix/app/cmssy/layout-slot.tsx

@@ -63,6 +63,8 @@ export function LayoutSlot({
             locale={locale}
             defaultLocale={defaultLocale}
             context={context}
+            resolvedContent={resolvedContent?.[block.id]}
+            data={data?.[block.id]}
           />
         ))}
     </>

package/assets/init/remix/app/routes/page.tsx

@@ -3,7 +3,9 @@ import {
   buildBlockContext,
   buildBlockMap,
   resolveEditorBlockData,
+  resolveEditorLayoutBlockData,
   type EditorBlockData,
+  type ResolveLayoutBlockDataOptions,
 } from "@cmssy/react";
 import { createCmssyHeaders, createCmssyLoader } from "@cmssy/remix";
 import { cmssy } from "../../cmssy.config";
@@ -14,6 +16,16 @@ import type { Route } from "./+types/page";
 
 const cmssyLoader = createCmssyLoader(cmssy, { blocks });
 
+type Position = "header" | "footer";
+
+async function resolveSlot(
+  options: Omit<ResolveLayoutBlockDataOptions, "position">,
+  position: Position,
+) {
+  const resolved = await resolveEditorLayoutBlockData({ ...options, position });
+  return { data: resolved.data, resolvedContent: resolved.content };
+}
+
 export async function loader(args: Route.LoaderArgs) {
   const data = await cmssyLoader(args);
   const resolved: EditorBlockData = data.isEdit
@@ -27,7 +39,27 @@ export async function loader(args: Route.LoaderArgs) {
         config: cmssy,
       });
 
-  return { ...data, blockData: resolved.data, blockContent: resolved.content };
+  const slotOptions = {
+    groups: data.layouts,
+    blocks,
+    locale: data.locale,
+    defaultLocale: data.defaultLocale,
+    enabledLocales: data.enabledLocales,
+    config: cmssy,
+  };
+  const [header, footer] = data.isEdit
+    ? [data.editorData?.header, data.editorData?.footer]
+    : await Promise.all([
+        resolveSlot(slotOptions, "header"),
+        resolveSlot(slotOptions, "footer"),
+      ]);
+
+  return {
+    ...data,
+    blockData: resolved.data,
+    blockContent: resolved.content,
+    layoutData: { header, footer },
+  };
 }
 
 export const headers = createCmssyHeaders(cmssy);
@@ -42,7 +74,7 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
     isEdit,
     editorOrigin,
     diagnostics,
-    editorData,
+    layoutData,
     blockData,
     blockContent,
   } = loaderData;
@@ -51,7 +83,7 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
     return <div dangerouslySetInnerHTML={{ __html: diagnostics }} />;
   }
 
-  const slot = (position: "header" | "footer") => (
+  const slot = (position: Position) => (
     <LayoutSlot
       groups={layouts}
       position={position}
@@ -59,8 +91,8 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
       edit={isEdit ? { editorOrigin } : undefined}
-      data={editorData?.[position]?.data}
-      resolvedContent={editorData?.[position]?.resolvedContent}
+      data={layoutData[position]?.data}
+      resolvedContent={layoutData[position]?.resolvedContent}
     />
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "12.14.1",
+  "version": "12.14.2",
   "description": "The cmssy CLI: `cmssy init` wires cmssy into an existing Next.js, Astro or React Router app; `cmssy link` connects it to a workspace and verifies the editor wiring.",
   "keywords": [
     "cmssy",
@@ -27,7 +27,7 @@
     "assets"
   ],
   "dependencies": {
-    "@cmssy/core": "12.14.1"
+    "@cmssy/core": "12.14.2"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",