@cmssy/next 10.10.0 → 11.1.0

package/dist/server.cjs

@@ -9,7 +9,6 @@ var internalServer = require('@cmssy/react/internal-server');
 var internal = require('@cmssy/core/internal');
 var core = require('@cmssy/core');
 var jsxRuntime = require('react/jsx-runtime');
-var locale = require('@cmssy/core/internal/locale');
 
 // src/server.ts
 function hasEditFlag(value) {
@@ -255,18 +254,21 @@ async function CmssyLayoutSlot({
   blocks,
   position,
   path,
+  locale: explicitLocale,
+  editMode,
   page = "/",
   editable: Editable,
   appContext
 }) {
-  const editMode = await isCmssyEditMode();
-  const [groups, siteLocales] = await Promise.all([
-    internal.fetchLayouts(config, page, {
-      previewSecret: editMode ? config.draftSecret : void 0
-    }),
-    locale.resolveSiteLocales(config)
-  ]);
-  const locale$1 = path ? locale.splitLocaleFromPath(path, siteLocales).locale : await localeFromHeader(siteLocales.defaultLocale);
+  const resolved = await react.resolveCmssyLayoutSlot(config, {
+    position,
+    blocks,
+    editMode,
+    page,
+    appContext,
+    ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
+  });
+  const { groups, locale, defaultLocale, enabledLocales } = resolved;
   if (!editMode) {
     return /* @__PURE__ */ jsxRuntime.jsx(
       react.CmssyServerLayout,
@@ -274,45 +276,30 @@ async function CmssyLayoutSlot({
         groups,
         blocks,
         position,
-        locale: locale$1,
-        defaultLocale: siteLocales.defaultLocale,
-        enabledLocales: siteLocales.locales,
+        locale,
+        defaultLocale,
+        enabledLocales,
         config,
         appContext
       }
     );
   }
-  const origin = core.resolveEditorOrigin(config.editorOrigin);
-  const editorData = await react.resolveEditorLayoutBlockData({
-    groups,
-    blocks,
-    position,
-    locale: locale$1,
-    defaultLocale: siteLocales.defaultLocale,
-    enabledLocales: siteLocales.locales,
-    isPreview: true,
-    config,
-    appContext
-  });
+  const origin = resolved.editorOrigin;
   return /* @__PURE__ */ jsxRuntime.jsx(
     Editable,
     {
       groups,
       position,
-      locale: locale$1,
-      defaultLocale: siteLocales.defaultLocale,
-      enabledLocales: siteLocales.locales,
+      locale,
+      defaultLocale,
+      enabledLocales,
       edit: { editorOrigin: (Array.isArray(origin) ? origin[0] : origin) ?? "" },
-      data: editorData.data,
-      resolvedContent: editorData.content,
+      data: resolved.data,
+      resolvedContent: resolved.resolvedContent,
       appContext
     }
   );
 }
-async function localeFromHeader(defaultLocale) {
-  const { headers: headers3 } = await import('next/headers');
-  return (await headers3()).get(locale.CMSSY_LOCALE_HEADER) || defaultLocale;
-}
 
 exports.CmssyLayoutSlot = CmssyLayoutSlot;
 exports.createCmssyEditPage = createCmssyEditPage;

package/dist/server.d.cts

@@ -12,7 +12,7 @@ declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Requ
 
 declare function isCmssyEditMode(): Promise<boolean>;
 
-interface CmssyLayoutSlotProps {
+interface CmssyLayoutSlotBaseProps {
     config: CmssyConfig;
     blocks: BlockDefinition[];
     /**
@@ -22,16 +22,15 @@ interface CmssyLayoutSlotProps {
      */
     position: LayoutPosition;
     /**
-     * The catch-all segments of the route rendering this slot, **as routed**.
-     * The language prefix in them IS the language, and reading it here keeps the
-     * route statically renderable.
+     * Whether to render through the edit bridge. A parameter rather than a
+     * lookup: every way of asking the request - `headers()`, `draftMode()` - is a
+     * dynamic API, and one read makes the whole route uncacheable. The route
+     * segment already knows the answer, so it passes it.
      *
-     * Omit it only where there are no params to read - a root layout - and the
-     * language falls back to the header the middleware set, which means calling
-     * `headers()` and giving up static rendering for the whole route. The version
-     * of this component removed in 10.0 had no choice about that; this one does.
+     * Required on purpose. A slot that guessed `false` in an edit route would
+     * wrap draft content in published chrome, and nothing would report it.
      */
-    path?: string[];
+    editMode: boolean;
     /** The page whose layout to render. Defaults to the site-wide header/footer. */
     page?: string;
     /**
@@ -58,6 +57,24 @@ interface CmssyLayoutSlotProps {
     /** Forwarded untouched to every block as `context.app`. */
     appContext?: Record<string, unknown>;
 }
+/**
+ * Where the language comes from - one of two, never neither.
+ *
+ * `path` is the catch-all segments **as routed**: the language prefix in them
+ * IS the language, and reading it costs the route nothing. A caller with no
+ * params (a root layout) has to resolve the language itself and pass `locale`;
+ * there is deliberately no fallback to the request header, because a static
+ * route never sees the header the proxy set and would render the wrong
+ * language while looking like it worked.
+ */
+type CmssyLayoutSlotLocaleSource = {
+    path: string[];
+    locale?: never;
+} | {
+    locale: string;
+    path?: never;
+};
+type CmssyLayoutSlotProps = CmssyLayoutSlotBaseProps & CmssyLayoutSlotLocaleSource;
 /**
  * The site-wide header and footer, which are layout **blocks** rather than
  * markup the app owns. Rendered the way each mode needs them:
@@ -72,6 +89,6 @@ interface CmssyLayoutSlotProps {
  * app that wrote this by hand between 10.0 and 10.9 got at least one of the
  * three wrong, which is why it is back.
  */
-declare function CmssyLayoutSlot({ config, blocks, position, path, page, editable: Editable, appContext, }: CmssyLayoutSlotProps): Promise<react_jsx_runtime.JSX.Element>;
+declare function CmssyLayoutSlot({ config, blocks, position, path, locale: explicitLocale, editMode, page, editable: Editable, appContext, }: CmssyLayoutSlotProps): Promise<react_jsx_runtime.JSX.Element>;
 
 export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, createDraftRoute, isCmssyEditMode };

package/dist/server.d.ts

@@ -12,7 +12,7 @@ declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Requ
 
 declare function isCmssyEditMode(): Promise<boolean>;
 
-interface CmssyLayoutSlotProps {
+interface CmssyLayoutSlotBaseProps {
     config: CmssyConfig;
     blocks: BlockDefinition[];
     /**
@@ -22,16 +22,15 @@ interface CmssyLayoutSlotProps {
      */
     position: LayoutPosition;
     /**
-     * The catch-all segments of the route rendering this slot, **as routed**.
-     * The language prefix in them IS the language, and reading it here keeps the
-     * route statically renderable.
+     * Whether to render through the edit bridge. A parameter rather than a
+     * lookup: every way of asking the request - `headers()`, `draftMode()` - is a
+     * dynamic API, and one read makes the whole route uncacheable. The route
+     * segment already knows the answer, so it passes it.
      *
-     * Omit it only where there are no params to read - a root layout - and the
-     * language falls back to the header the middleware set, which means calling
-     * `headers()` and giving up static rendering for the whole route. The version
-     * of this component removed in 10.0 had no choice about that; this one does.
+     * Required on purpose. A slot that guessed `false` in an edit route would
+     * wrap draft content in published chrome, and nothing would report it.
      */
-    path?: string[];
+    editMode: boolean;
     /** The page whose layout to render. Defaults to the site-wide header/footer. */
     page?: string;
     /**
@@ -58,6 +57,24 @@ interface CmssyLayoutSlotProps {
     /** Forwarded untouched to every block as `context.app`. */
     appContext?: Record<string, unknown>;
 }
+/**
+ * Where the language comes from - one of two, never neither.
+ *
+ * `path` is the catch-all segments **as routed**: the language prefix in them
+ * IS the language, and reading it costs the route nothing. A caller with no
+ * params (a root layout) has to resolve the language itself and pass `locale`;
+ * there is deliberately no fallback to the request header, because a static
+ * route never sees the header the proxy set and would render the wrong
+ * language while looking like it worked.
+ */
+type CmssyLayoutSlotLocaleSource = {
+    path: string[];
+    locale?: never;
+} | {
+    locale: string;
+    path?: never;
+};
+type CmssyLayoutSlotProps = CmssyLayoutSlotBaseProps & CmssyLayoutSlotLocaleSource;
 /**
  * The site-wide header and footer, which are layout **blocks** rather than
  * markup the app owns. Rendered the way each mode needs them:
@@ -72,6 +89,6 @@ interface CmssyLayoutSlotProps {
  * app that wrote this by hand between 10.0 and 10.9 got at least one of the
  * three wrong, which is why it is back.
  */
-declare function CmssyLayoutSlot({ config, blocks, position, path, page, editable: Editable, appContext, }: CmssyLayoutSlotProps): Promise<react_jsx_runtime.JSX.Element>;
+declare function CmssyLayoutSlot({ config, blocks, position, path, locale: explicitLocale, editMode, page, editable: Editable, appContext, }: CmssyLayoutSlotProps): Promise<react_jsx_runtime.JSX.Element>;
 
 export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, createDraftRoute, isCmssyEditMode };

package/dist/server.js

@@ -1,13 +1,12 @@
 import 'server-only';
 import { draftMode, headers } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
-import { createCmssyClient, CmssyServerPage, CmssyServerLayout, resolveEditorLayoutBlockData } from '@cmssy/react';
+import { createCmssyClient, CmssyServerPage, resolveCmssyLayoutSlot, CmssyServerLayout } from '@cmssy/react';
 import { CmssyLocaleProvider } from '@cmssy/react/internal';
 import { resolveEditorBlockData } from '@cmssy/react/internal-server';
-import { isDevelopment, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, toCspOrigin, cmssySecretsMatch, fetchLayouts } from '@cmssy/core/internal';
+import { isDevelopment, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, toCspOrigin, cmssySecretsMatch } from '@cmssy/core/internal';
 import { CMSSY_SECRET_QUERY_PARAM, resolveEditorOrigin, CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM } from '@cmssy/core';
 import { jsx } from 'react/jsx-runtime';
-import { resolveSiteLocales as resolveSiteLocales$1, splitLocaleFromPath as splitLocaleFromPath$1, CMSSY_LOCALE_HEADER } from '@cmssy/core/internal/locale';
 
 // src/server.ts
 function hasEditFlag(value) {
@@ -253,18 +252,21 @@ async function CmssyLayoutSlot({
   blocks,
   position,
   path,
+  locale: explicitLocale,
+  editMode,
   page = "/",
   editable: Editable,
   appContext
 }) {
-  const editMode = await isCmssyEditMode();
-  const [groups, siteLocales] = await Promise.all([
-    fetchLayouts(config, page, {
-      previewSecret: editMode ? config.draftSecret : void 0
-    }),
-    resolveSiteLocales$1(config)
-  ]);
-  const locale = path ? splitLocaleFromPath$1(path, siteLocales).locale : await localeFromHeader(siteLocales.defaultLocale);
+  const resolved = await resolveCmssyLayoutSlot(config, {
+    position,
+    blocks,
+    editMode,
+    page,
+    appContext,
+    ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
+  });
+  const { groups, locale, defaultLocale, enabledLocales } = resolved;
   if (!editMode) {
     return /* @__PURE__ */ jsx(
       CmssyServerLayout,
@@ -273,43 +275,28 @@ async function CmssyLayoutSlot({
         blocks,
         position,
         locale,
-        defaultLocale: siteLocales.defaultLocale,
-        enabledLocales: siteLocales.locales,
+        defaultLocale,
+        enabledLocales,
         config,
         appContext
       }
     );
   }
-  const origin = resolveEditorOrigin(config.editorOrigin);
-  const editorData = await resolveEditorLayoutBlockData({
-    groups,
-    blocks,
-    position,
-    locale,
-    defaultLocale: siteLocales.defaultLocale,
-    enabledLocales: siteLocales.locales,
-    isPreview: true,
-    config,
-    appContext
-  });
+  const origin = resolved.editorOrigin;
   return /* @__PURE__ */ jsx(
     Editable,
     {
       groups,
       position,
       locale,
-      defaultLocale: siteLocales.defaultLocale,
-      enabledLocales: siteLocales.locales,
+      defaultLocale,
+      enabledLocales,
       edit: { editorOrigin: (Array.isArray(origin) ? origin[0] : origin) ?? "" },
-      data: editorData.data,
-      resolvedContent: editorData.content,
+      data: resolved.data,
+      resolvedContent: resolved.resolvedContent,
       appContext
     }
   );
 }
-async function localeFromHeader(defaultLocale) {
-  const { headers: headers3 } = await import('next/headers');
-  return (await headers3()).get(CMSSY_LOCALE_HEADER) || defaultLocale;
-}
 
 export { CmssyLayoutSlot, createCmssyEditPage, createCmssyPage, createDraftRoute, isCmssyEditMode };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "10.10.0",
+  "version": "11.1.0",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -51,7 +51,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^10.0.0",
+    "@cmssy/react": "^11.1.0",
     "next": ">=15",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0"
@@ -65,12 +65,12 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "10.10.0"
+    "@cmssy/react": "11.1.0"
   },
   "dependencies": {
     "@cmssy/types": "0.32.0",
     "server-only": "^0.0.1",
-    "@cmssy/core": "10.10.0"
+    "@cmssy/core": "11.1.0"
   },
   "scripts": {
     "build": "tsup",