@cmssy/cli 11.0.0 → 11.1.0

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

@@ -15,6 +15,13 @@ export interface LayoutSlotProps {
   enabledLocales: string[];
   /** Set on a VERIFIED editor request; the loader reports it as `isEdit`. */
   edit?: { editorOrigin: string | string[] };
+  /**
+   * The editor's block data, both halves, straight from the loader. Without
+   * `resolvedContent` the canvas shows a relation field as the raw ids it
+   * stores - the site looks right and the editor cannot fill the header.
+   */
+  data?: Record<string, unknown>;
+  resolvedContent?: Record<string, Record<string, unknown>>;
 }
 
 /**
@@ -34,6 +41,8 @@ export default function LayoutSlot({
   defaultLocale,
   enabledLocales,
   edit,
+  data,
+  resolvedContent,
 }: LayoutSlotProps) {
   if (edit) {
     return (
@@ -44,6 +53,8 @@ export default function LayoutSlot({
         defaultLocale={defaultLocale}
         enabledLocales={enabledLocales}
         edit={edit}
+        data={data}
+        resolvedContent={resolvedContent}
         load={() => import("./blocks")}
       />
     );

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

@@ -1,15 +1,19 @@
 ---
 import { loadCmssyPage } from "@cmssy/astro";
 import { cmssy } from "../cmssy.config";
+import { blocks } from "../cmssy/blocks";
 import { Blocks } from "../components/Blocks";
 import LayoutSlot from "../cmssy/layout-slot";
 
 export const prerender = false;
 
+// `blocks` is what lets the loader resolve the editor's layout data. Drop it
+// and the site still renders - the editor just cannot fill the header.
 const { page, layouts, locale, defaultLocale, enabledLocales } = await loadCmssyPage(
   cmssy,
   Astro.request,
   Astro.url,
+  { blocks },
 );
 
 if (!page) {

package/assets/init/astro/src/pages/cmssy-edit/[...path].astro

@@ -1,6 +1,7 @@
 ---
 import { loadCmssyPage } from "@cmssy/astro";
 import { cmssy } from "../../cmssy.config";
+import { blocks } from "../../cmssy/blocks";
 import CmssyEditor from "../../cmssy/editor";
 import LayoutSlot from "../../cmssy/layout-slot";
 
@@ -8,11 +9,10 @@ import LayoutSlot from "../../cmssy/layout-slot";
 // must be dynamic: a prerendered page never sees the query string.
 export const prerender = false;
 
-const { page, layouts, locale, defaultLocale, enabledLocales } = await loadCmssyPage(
-  cmssy,
-  Astro.request,
-  Astro.url,
-);
+// `blocks` is what resolves the editor's layout data. Without it the editor
+// can select the header and not fill it, and a relation field shows raw ids.
+const { page, layouts, locale, defaultLocale, enabledLocales, editorData } =
+  await loadCmssyPage(cmssy, Astro.request, Astro.url, { blocks });
 const editorOrigin = cmssy.editorOrigin ?? "*";
 ---
 
@@ -30,6 +30,8 @@ const editorOrigin = cmssy.editorOrigin ?? "*";
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
       edit={{ editorOrigin }}
+      data={editorData?.header?.data}
+      resolvedContent={editorData?.header?.resolvedContent}
     />
     <CmssyEditor
       client:load
@@ -47,6 +49,8 @@ const editorOrigin = cmssy.editorOrigin ?? "*";
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
       edit={{ editorOrigin }}
+      data={editorData?.footer?.data}
+      resolvedContent={editorData?.footer?.resolvedContent}
     />
   </body>
 </html>

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

@@ -15,6 +15,13 @@ export interface LayoutSlotProps {
   enabledLocales: string[];
   /** Set on a VERIFIED editor request; the loader reports it as `isEdit`. */
   edit?: { editorOrigin: string | string[] };
+  /**
+   * The editor's block data, both halves, straight from the loader. Without
+   * `resolvedContent` the canvas shows a relation field as the raw ids it
+   * stores - the site looks right and the editor cannot fill the header.
+   */
+  data?: Record<string, unknown>;
+  resolvedContent?: Record<string, Record<string, unknown>>;
 }
 
 /**
@@ -31,6 +38,8 @@ export function LayoutSlot({
   defaultLocale,
   enabledLocales,
   edit,
+  data,
+  resolvedContent,
 }: LayoutSlotProps) {
   if (edit) {
     return (
@@ -41,6 +50,8 @@ export function LayoutSlot({
         defaultLocale={defaultLocale}
         enabledLocales={enabledLocales}
         edit={edit}
+        data={data}
+        resolvedContent={resolvedContent}
         load={() => import("./blocks")}
       />
     );

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

@@ -6,7 +6,9 @@ import { CmssyEditor } from "../cmssy/editor";
 import { LayoutSlot } from "../cmssy/layout-slot";
 import type { Route } from "./+types/page";
 
-export const loader = createCmssyLoader(cmssy);
+// `blocks` is what lets the loader resolve the editor's layout data. Drop it
+// and the site still renders - the editor just cannot fill the header.
+export const loader = createCmssyLoader(cmssy, { blocks });
 
 // Without these the admin cannot frame the site, and the editor shows an empty
 // box with no error anywhere.
@@ -22,6 +24,7 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
     isEdit,
     editorOrigin,
     diagnostics,
+    editorData,
   } = loaderData;
 
   if (diagnostics) {
@@ -38,6 +41,8 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
       edit={isEdit ? { editorOrigin } : undefined}
+      data={editorData?.[position]?.data}
+      resolvedContent={editorData?.[position]?.resolvedContent}
     />
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "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": "11.0.0"
+    "@cmssy/core": "11.1.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",