@cmssy/next 11.0.0 → 11.1.1

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) {
@@ -261,13 +260,15 @@ async function CmssyLayoutSlot({
   editable: Editable,
   appContext
 }) {
-  const [groups, siteLocales] = await Promise.all([
-    internal.fetchLayouts(config, page, {
-      previewSecret: editMode ? config.draftSecret : void 0
-    }),
-    locale.resolveSiteLocales(config)
-  ]);
-  const locale$1 = explicitLocale ?? locale.splitLocaleFromPath(path ?? [], siteLocales).locale;
+  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,
@@ -275,37 +276,26 @@ 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
     }
   );

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 } from '@cmssy/core/internal/locale';
 
 // src/server.ts
 function hasEditFlag(value) {
@@ -259,13 +258,15 @@ async function CmssyLayoutSlot({
   editable: Editable,
   appContext
 }) {
-  const [groups, siteLocales] = await Promise.all([
-    fetchLayouts(config, page, {
-      previewSecret: editMode ? config.draftSecret : void 0
-    }),
-    resolveSiteLocales$1(config)
-  ]);
-  const locale = explicitLocale ?? splitLocaleFromPath$1(path ?? [], siteLocales).locale;
+  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,
@@ -274,36 +275,25 @@ 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
     }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "11.0.0",
+  "version": "11.1.1",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -51,7 +51,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^11.0.0",
+    "@cmssy/react": "^11.1.1",
     "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": "11.0.0"
+    "@cmssy/react": "11.1.1"
   },
   "dependencies": {
     "@cmssy/types": "0.32.0",
     "server-only": "^0.0.1",
-    "@cmssy/core": "11.0.0"
+    "@cmssy/core": "11.1.1"
   },
   "scripts": {
     "build": "tsup",