@cmssy/react 4.4.0 → 4.6.0

package/dist/index.cjs

@@ -184,163 +184,6 @@ async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context,
     })
   );
 }
-async function CmssyServerPage({
-  page,
-  blocks,
-  locale = "en",
-  defaultLocale = "en",
-  enabledLocales,
-  forms,
-  auth,
-  workspace
-}) {
-  if (!page) return null;
-  const map = buildBlockMap(blocks);
-  const loaderMap = buildLoaderMap(blocks);
-  const context = buildBlockContext(
-    locale,
-    defaultLocale,
-    enabledLocales,
-    false,
-    forms,
-    { auth, workspace }
-  );
-  const resolved = await resolveBlocks(
-    page.blocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales
-  );
-  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: page.blocks.map(
-    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
-      context,
-      data: resolved[i]?.data,
-      resolvedContent: resolved[i]?.content,
-      enabledLocales
-    })
-  ) });
-}
-async function CmssyServerLayout({
-  groups,
-  blocks,
-  position,
-  locale = "en",
-  defaultLocale = "en",
-  enabledLocales
-}) {
-  const group = groups.find((g) => g.position === position);
-  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
-  if (layoutBlocks.length === 0) return null;
-  const map = buildBlockMap(blocks);
-  const loaderMap = buildLoaderMap(blocks);
-  const context = buildBlockContext(locale, defaultLocale, enabledLocales);
-  const resolved = await resolveBlocks(
-    layoutBlocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales
-  );
-  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: layoutBlocks.map(
-    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
-      context,
-      data: resolved[i]?.data,
-      resolvedContent: resolved[i]?.content,
-      enabledLocales
-    })
-  ) });
-}
-
-// src/bridge/protocol.ts
-var PROTOCOL_VERSION = 2;
-function isProtocolCompatible(version) {
-  return version === PROTOCOL_VERSION;
-}
-
-// src/bridge/messages.ts
-function normalizeOrigin(origin) {
-  const trimmed = origin.trim();
-  if (trimmed === "*") return "*";
-  try {
-    return new URL(trimmed).origin;
-  } catch {
-    return trimmed;
-  }
-}
-function postToEditor(target, editorOrigin, message) {
-  target.postMessage(message, normalizeOrigin(editorOrigin));
-}
-function isOriginAllowed(origin, allowed) {
-  const list = Array.isArray(allowed) ? allowed : [allowed];
-  const actual = normalizeOrigin(origin);
-  return list.some((candidate) => {
-    const expected = normalizeOrigin(candidate);
-    return expected === "*" || expected === actual;
-  });
-}
-function isObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function parseEditorMessage(data, origin, expectedOrigin) {
-  if (!isOriginAllowed(origin, expectedOrigin)) return null;
-  if (!isObject(data)) return null;
-  switch (data.type) {
-    case "cmssy:select":
-      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:select",
-        protocolVersion: PROTOCOL_VERSION,
-        blockId: data.blockId
-      } : null;
-    case "cmssy:patch":
-      return typeof data.blockId === "string" && isObject(data.content) && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:patch",
-        blockId: data.blockId,
-        content: data.content,
-        protocolVersion: PROTOCOL_VERSION,
-        ...isObject(data.style) ? { style: data.style } : {},
-        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
-        ...typeof data.layoutPosition === "string" ? { layoutPosition: data.layoutPosition } : {}
-      } : null;
-    case "cmssy:parent-ready":
-      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:parent-ready", protocolVersion: PROTOCOL_VERSION } : null;
-    case "cmssy:insert":
-      return typeof data.blockId === "string" && typeof data.blockType === "string" && isObject(data.content) && typeof data.index === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:insert",
-        protocolVersion: PROTOCOL_VERSION,
-        blockId: data.blockId,
-        blockType: data.blockType,
-        content: data.content,
-        ...isObject(data.style) ? { style: data.style } : {},
-        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
-        index: data.index
-      } : null;
-    case "cmssy:reorder":
-      return Array.isArray(data.blockIds) && data.blockIds.every((id) => typeof id === "string") && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:reorder",
-        protocolVersion: PROTOCOL_VERSION,
-        blockIds: data.blockIds
-      } : null;
-    case "cmssy:remove":
-      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:remove",
-        protocolVersion: PROTOCOL_VERSION,
-        blockId: data.blockId
-      } : null;
-    case "cmssy:drag-over":
-      return typeof data.y === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:drag-over",
-        protocolVersion: PROTOCOL_VERSION,
-        y: data.y
-      } : null;
-    case "cmssy:drag-end":
-      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:drag-end", protocolVersion: PROTOCOL_VERSION } : null;
-    default:
-      return null;
-  }
-}
 
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
@@ -717,6 +560,247 @@ var SUBMIT_FORM_MUTATION = `mutation SubmitForm($formId: ID!, $input: SubmitForm
   }
 }`;
 
+// src/data/site-locales.ts
+var TTL_MS = 6e4;
+var MAX_ENTRIES = 64;
+var cache = /* @__PURE__ */ new Map();
+async function resolveSiteLocales(config, options) {
+  const key = `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+  const cached = cache.get(key);
+  if (cached && cached.expires > Date.now()) return cached.value;
+  cache.delete(key);
+  let value;
+  try {
+    const data = await graphqlRequest(
+      config,
+      SITE_CONFIG_QUERY,
+      { workspaceSlug: config.workspaceSlug },
+      { ...options, public: true, retry: options?.retry ?? {} },
+      "site config"
+    );
+    const siteConfig = data.public?.siteConfig ?? null;
+    const defaultLocale = siteConfig?.defaultLanguage || "en";
+    const enabled = siteConfig?.enabledLanguages ?? [];
+    value = {
+      defaultLocale,
+      locales: enabled.length > 0 ? enabled : [defaultLocale]
+    };
+  } catch {
+    value = { defaultLocale: "en", locales: ["en"] };
+  }
+  if (cache.size >= MAX_ENTRIES) cache.clear();
+  cache.set(key, { value, expires: Date.now() + TTL_MS });
+  return value;
+}
+function splitLocaleFromPath(path, siteLocales) {
+  const first = path?.[0];
+  if (first && first !== siteLocales.defaultLocale && siteLocales.locales.includes(first)) {
+    return { locale: first, path: path.slice(1) };
+  }
+  return { locale: siteLocales.defaultLocale, path };
+}
+
+// src/components/resolve-render-locale.ts
+var warned2 = false;
+async function resolveRenderLocale({
+  locale,
+  defaultLocale,
+  enabledLocales,
+  config
+}) {
+  if (locale && defaultLocale) return { locale, defaultLocale, enabledLocales };
+  if (config) {
+    const site = await resolveSiteLocales(config);
+    return {
+      locale: locale ?? defaultLocale ?? site.defaultLocale,
+      defaultLocale: defaultLocale ?? site.defaultLocale,
+      enabledLocales: enabledLocales ?? site.locales
+    };
+  }
+  if (process.env.NODE_ENV !== "production" && !warned2) {
+    warned2 = true;
+    console.warn(
+      '[cmssy] Rendering in "en": no locale was passed and no config was given to look the workspace\'s default language up. Pass `locale` (from the route) or `config`, or a workspace whose default language is not English will render its chrome in the wrong one.'
+    );
+  }
+  return {
+    locale: locale ?? defaultLocale ?? "en",
+    defaultLocale: defaultLocale ?? "en",
+    enabledLocales
+  };
+}
+async function CmssyServerPage({
+  page,
+  blocks,
+  locale: localeProp,
+  defaultLocale: defaultLocaleProp,
+  enabledLocales: enabledLocalesProp,
+  config,
+  forms,
+  auth,
+  workspace
+}) {
+  if (!page) return null;
+  const { locale, defaultLocale, enabledLocales } = await resolveRenderLocale({
+    locale: localeProp,
+    defaultLocale: defaultLocaleProp,
+    enabledLocales: enabledLocalesProp,
+    config
+  });
+  const map = buildBlockMap(blocks);
+  const loaderMap = buildLoaderMap(blocks);
+  const context = buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    false,
+    forms,
+    { auth, workspace }
+  );
+  const resolved = await resolveBlocks(
+    page.blocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales
+  );
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: page.blocks.map(
+    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
+      context,
+      data: resolved[i]?.data,
+      resolvedContent: resolved[i]?.content,
+      enabledLocales
+    })
+  ) });
+}
+async function CmssyServerLayout({
+  groups,
+  blocks,
+  position,
+  locale: localeProp,
+  defaultLocale: defaultLocaleProp,
+  enabledLocales: enabledLocalesProp,
+  config
+}) {
+  const { locale, defaultLocale, enabledLocales } = await resolveRenderLocale({
+    locale: localeProp,
+    defaultLocale: defaultLocaleProp,
+    enabledLocales: enabledLocalesProp,
+    config
+  });
+  const group = groups.find((g) => g.position === position);
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
+  if (layoutBlocks.length === 0) return null;
+  const map = buildBlockMap(blocks);
+  const loaderMap = buildLoaderMap(blocks);
+  const context = buildBlockContext(locale, defaultLocale, enabledLocales);
+  const resolved = await resolveBlocks(
+    layoutBlocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales
+  );
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: layoutBlocks.map(
+    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
+      context,
+      data: resolved[i]?.data,
+      resolvedContent: resolved[i]?.content,
+      enabledLocales
+    })
+  ) });
+}
+
+// src/bridge/protocol.ts
+var PROTOCOL_VERSION = 2;
+function isProtocolCompatible(version) {
+  return version === PROTOCOL_VERSION;
+}
+
+// src/bridge/messages.ts
+function normalizeOrigin(origin) {
+  const trimmed = origin.trim();
+  if (trimmed === "*") return "*";
+  try {
+    return new URL(trimmed).origin;
+  } catch {
+    return trimmed;
+  }
+}
+function postToEditor(target, editorOrigin, message) {
+  target.postMessage(message, normalizeOrigin(editorOrigin));
+}
+function isOriginAllowed(origin, allowed) {
+  const list = Array.isArray(allowed) ? allowed : [allowed];
+  const actual = normalizeOrigin(origin);
+  return list.some((candidate) => {
+    const expected = normalizeOrigin(candidate);
+    return expected === "*" || expected === actual;
+  });
+}
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseEditorMessage(data, origin, expectedOrigin) {
+  if (!isOriginAllowed(origin, expectedOrigin)) return null;
+  if (!isObject(data)) return null;
+  switch (data.type) {
+    case "cmssy:select":
+      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:select",
+        protocolVersion: PROTOCOL_VERSION,
+        blockId: data.blockId
+      } : null;
+    case "cmssy:patch":
+      return typeof data.blockId === "string" && isObject(data.content) && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:patch",
+        blockId: data.blockId,
+        content: data.content,
+        protocolVersion: PROTOCOL_VERSION,
+        ...isObject(data.style) ? { style: data.style } : {},
+        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
+        ...typeof data.layoutPosition === "string" ? { layoutPosition: data.layoutPosition } : {}
+      } : null;
+    case "cmssy:parent-ready":
+      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:parent-ready", protocolVersion: PROTOCOL_VERSION } : null;
+    case "cmssy:insert":
+      return typeof data.blockId === "string" && typeof data.blockType === "string" && isObject(data.content) && typeof data.index === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:insert",
+        protocolVersion: PROTOCOL_VERSION,
+        blockId: data.blockId,
+        blockType: data.blockType,
+        content: data.content,
+        ...isObject(data.style) ? { style: data.style } : {},
+        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
+        index: data.index
+      } : null;
+    case "cmssy:reorder":
+      return Array.isArray(data.blockIds) && data.blockIds.every((id) => typeof id === "string") && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:reorder",
+        protocolVersion: PROTOCOL_VERSION,
+        blockIds: data.blockIds
+      } : null;
+    case "cmssy:remove":
+      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:remove",
+        protocolVersion: PROTOCOL_VERSION,
+        blockId: data.blockId
+      } : null;
+    case "cmssy:drag-over":
+      return typeof data.y === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:drag-over",
+        protocolVersion: PROTOCOL_VERSION,
+        y: data.y
+      } : null;
+    case "cmssy:drag-end":
+      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:drag-end", protocolVersion: PROTOCOL_VERSION } : null;
+    default:
+      return null;
+  }
+}
+
 // src/data/settings-client.ts
 async function fetchSiteConfig(config, options = {}) {
   const data = await graphqlRequest(
@@ -824,46 +908,6 @@ async function resolveForms(config, blocks, locale, defaultLocale, options) {
   return forms;
 }
 
-// src/data/site-locales.ts
-var TTL_MS = 6e4;
-var MAX_ENTRIES = 64;
-var cache = /* @__PURE__ */ new Map();
-async function resolveSiteLocales(config, options) {
-  const key = `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
-  const cached = cache.get(key);
-  if (cached && cached.expires > Date.now()) return cached.value;
-  cache.delete(key);
-  let value;
-  try {
-    const data = await graphqlRequest(
-      config,
-      SITE_CONFIG_QUERY,
-      { workspaceSlug: config.workspaceSlug },
-      { ...options, public: true, retry: options?.retry ?? {} },
-      "site config"
-    );
-    const siteConfig = data.public?.siteConfig ?? null;
-    const defaultLocale = siteConfig?.defaultLanguage || "en";
-    const enabled = siteConfig?.enabledLanguages ?? [];
-    value = {
-      defaultLocale,
-      locales: enabled.length > 0 ? enabled : [defaultLocale]
-    };
-  } catch {
-    value = { defaultLocale: "en", locales: ["en"] };
-  }
-  if (cache.size >= MAX_ENTRIES) cache.clear();
-  cache.set(key, { value, expires: Date.now() + TTL_MS });
-  return value;
-}
-function splitLocaleFromPath(path, siteLocales) {
-  const first = path?.[0];
-  if (first && first !== siteLocales.defaultLocale && siteLocales.locales.includes(first)) {
-    return { locale: first, path: path.slice(1) };
-  }
-  return { locale: siteLocales.defaultLocale, path };
-}
-
 // src/data/localize-href.ts
 var PROTOCOL_OR_RELATIVE = /^([a-z][a-z0-9+.-]*:|\/\/)/i;
 function isExternalHref(href) {

package/dist/index.d.cts

@@ -191,6 +191,11 @@ interface CmssyServerPageProps {
     defaultLocale?: string;
     /** All languages enabled on the workspace; exposed to blocks via context.locale.enabled. */
     enabledLocales?: string[];
+    /**
+     * The workspace, so the languages can be looked up when they are not passed.
+     * Without it the SDK has to guess, and its guess is "en".
+     */
+    config?: CmssyClientConfig;
     /** Form definitions referenced by page blocks, exposed via context.forms. */
     forms?: Record<string, CmssyFormDefinition>;
     /** Member auth state, exposed via context.auth. Resolved by createCmssyPage. */
@@ -203,23 +208,29 @@ interface CmssyServerPageProps {
  * loader server-side before rendering, so it must be rendered in a server
  * component tree (as `createCmssyPage` does) - not in a client component.
  */
-declare function CmssyServerPage({ page, blocks, locale, defaultLocale, enabledLocales, forms, auth, workspace, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
     position: string;
+    /** The language to render in. Omit it and the workspace's default is used. */
     locale?: string;
     defaultLocale?: string;
     /** All languages enabled on the workspace; exposed to blocks via context.locale.enabled. */
     enabledLocales?: string[];
+    /**
+     * The workspace, so the languages can be looked up when they are not passed.
+     * Without it the SDK has to guess, and its guess is "en".
+     */
+    config?: CmssyClientConfig;
 }
 /**
  * Async React Server Component. Like CmssyServerPage it runs each block's
  * loader server-side before rendering, so a header block can list categories
  * the same way a page block can. Must be rendered in a server component tree.
  */
-declare function CmssyServerLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerLayout({ groups, blocks, position, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface PostTarget {
     postMessage: (message: unknown, targetOrigin: string) => void;

package/dist/index.d.ts

@@ -191,6 +191,11 @@ interface CmssyServerPageProps {
     defaultLocale?: string;
     /** All languages enabled on the workspace; exposed to blocks via context.locale.enabled. */
     enabledLocales?: string[];
+    /**
+     * The workspace, so the languages can be looked up when they are not passed.
+     * Without it the SDK has to guess, and its guess is "en".
+     */
+    config?: CmssyClientConfig;
     /** Form definitions referenced by page blocks, exposed via context.forms. */
     forms?: Record<string, CmssyFormDefinition>;
     /** Member auth state, exposed via context.auth. Resolved by createCmssyPage. */
@@ -203,23 +208,29 @@ interface CmssyServerPageProps {
  * loader server-side before rendering, so it must be rendered in a server
  * component tree (as `createCmssyPage` does) - not in a client component.
  */
-declare function CmssyServerPage({ page, blocks, locale, defaultLocale, enabledLocales, forms, auth, workspace, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
     position: string;
+    /** The language to render in. Omit it and the workspace's default is used. */
     locale?: string;
     defaultLocale?: string;
     /** All languages enabled on the workspace; exposed to blocks via context.locale.enabled. */
     enabledLocales?: string[];
+    /**
+     * The workspace, so the languages can be looked up when they are not passed.
+     * Without it the SDK has to guess, and its guess is "en".
+     */
+    config?: CmssyClientConfig;
 }
 /**
  * Async React Server Component. Like CmssyServerPage it runs each block's
  * loader server-side before rendering, so a header block can list categories
  * the same way a page block can. Must be rendered in a server component tree.
  */
-declare function CmssyServerLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerLayout({ groups, blocks, position, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface PostTarget {
     postMessage: (message: unknown, targetOrigin: string) => void;

package/dist/index.js

@@ -182,163 +182,6 @@ async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context,
     })
   );
 }
-async function CmssyServerPage({
-  page,
-  blocks,
-  locale = "en",
-  defaultLocale = "en",
-  enabledLocales,
-  forms,
-  auth,
-  workspace
-}) {
-  if (!page) return null;
-  const map = buildBlockMap(blocks);
-  const loaderMap = buildLoaderMap(blocks);
-  const context = buildBlockContext(
-    locale,
-    defaultLocale,
-    enabledLocales,
-    false,
-    forms,
-    { auth, workspace }
-  );
-  const resolved = await resolveBlocks(
-    page.blocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales
-  );
-  return /* @__PURE__ */ jsx(Fragment, { children: page.blocks.map(
-    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
-      context,
-      data: resolved[i]?.data,
-      resolvedContent: resolved[i]?.content,
-      enabledLocales
-    })
-  ) });
-}
-async function CmssyServerLayout({
-  groups,
-  blocks,
-  position,
-  locale = "en",
-  defaultLocale = "en",
-  enabledLocales
-}) {
-  const group = groups.find((g) => g.position === position);
-  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
-  if (layoutBlocks.length === 0) return null;
-  const map = buildBlockMap(blocks);
-  const loaderMap = buildLoaderMap(blocks);
-  const context = buildBlockContext(locale, defaultLocale, enabledLocales);
-  const resolved = await resolveBlocks(
-    layoutBlocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales
-  );
-  return /* @__PURE__ */ jsx(Fragment, { children: layoutBlocks.map(
-    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
-      context,
-      data: resolved[i]?.data,
-      resolvedContent: resolved[i]?.content,
-      enabledLocales
-    })
-  ) });
-}
-
-// src/bridge/protocol.ts
-var PROTOCOL_VERSION = 2;
-function isProtocolCompatible(version) {
-  return version === PROTOCOL_VERSION;
-}
-
-// src/bridge/messages.ts
-function normalizeOrigin(origin) {
-  const trimmed = origin.trim();
-  if (trimmed === "*") return "*";
-  try {
-    return new URL(trimmed).origin;
-  } catch {
-    return trimmed;
-  }
-}
-function postToEditor(target, editorOrigin, message) {
-  target.postMessage(message, normalizeOrigin(editorOrigin));
-}
-function isOriginAllowed(origin, allowed) {
-  const list = Array.isArray(allowed) ? allowed : [allowed];
-  const actual = normalizeOrigin(origin);
-  return list.some((candidate) => {
-    const expected = normalizeOrigin(candidate);
-    return expected === "*" || expected === actual;
-  });
-}
-function isObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function parseEditorMessage(data, origin, expectedOrigin) {
-  if (!isOriginAllowed(origin, expectedOrigin)) return null;
-  if (!isObject(data)) return null;
-  switch (data.type) {
-    case "cmssy:select":
-      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:select",
-        protocolVersion: PROTOCOL_VERSION,
-        blockId: data.blockId
-      } : null;
-    case "cmssy:patch":
-      return typeof data.blockId === "string" && isObject(data.content) && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:patch",
-        blockId: data.blockId,
-        content: data.content,
-        protocolVersion: PROTOCOL_VERSION,
-        ...isObject(data.style) ? { style: data.style } : {},
-        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
-        ...typeof data.layoutPosition === "string" ? { layoutPosition: data.layoutPosition } : {}
-      } : null;
-    case "cmssy:parent-ready":
-      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:parent-ready", protocolVersion: PROTOCOL_VERSION } : null;
-    case "cmssy:insert":
-      return typeof data.blockId === "string" && typeof data.blockType === "string" && isObject(data.content) && typeof data.index === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:insert",
-        protocolVersion: PROTOCOL_VERSION,
-        blockId: data.blockId,
-        blockType: data.blockType,
-        content: data.content,
-        ...isObject(data.style) ? { style: data.style } : {},
-        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
-        index: data.index
-      } : null;
-    case "cmssy:reorder":
-      return Array.isArray(data.blockIds) && data.blockIds.every((id) => typeof id === "string") && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:reorder",
-        protocolVersion: PROTOCOL_VERSION,
-        blockIds: data.blockIds
-      } : null;
-    case "cmssy:remove":
-      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:remove",
-        protocolVersion: PROTOCOL_VERSION,
-        blockId: data.blockId
-      } : null;
-    case "cmssy:drag-over":
-      return typeof data.y === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
-        type: "cmssy:drag-over",
-        protocolVersion: PROTOCOL_VERSION,
-        y: data.y
-      } : null;
-    case "cmssy:drag-end":
-      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:drag-end", protocolVersion: PROTOCOL_VERSION } : null;
-    default:
-      return null;
-  }
-}
 
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
@@ -715,6 +558,247 @@ var SUBMIT_FORM_MUTATION = `mutation SubmitForm($formId: ID!, $input: SubmitForm
   }
 }`;
 
+// src/data/site-locales.ts
+var TTL_MS = 6e4;
+var MAX_ENTRIES = 64;
+var cache = /* @__PURE__ */ new Map();
+async function resolveSiteLocales(config, options) {
+  const key = `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+  const cached = cache.get(key);
+  if (cached && cached.expires > Date.now()) return cached.value;
+  cache.delete(key);
+  let value;
+  try {
+    const data = await graphqlRequest(
+      config,
+      SITE_CONFIG_QUERY,
+      { workspaceSlug: config.workspaceSlug },
+      { ...options, public: true, retry: options?.retry ?? {} },
+      "site config"
+    );
+    const siteConfig = data.public?.siteConfig ?? null;
+    const defaultLocale = siteConfig?.defaultLanguage || "en";
+    const enabled = siteConfig?.enabledLanguages ?? [];
+    value = {
+      defaultLocale,
+      locales: enabled.length > 0 ? enabled : [defaultLocale]
+    };
+  } catch {
+    value = { defaultLocale: "en", locales: ["en"] };
+  }
+  if (cache.size >= MAX_ENTRIES) cache.clear();
+  cache.set(key, { value, expires: Date.now() + TTL_MS });
+  return value;
+}
+function splitLocaleFromPath(path, siteLocales) {
+  const first = path?.[0];
+  if (first && first !== siteLocales.defaultLocale && siteLocales.locales.includes(first)) {
+    return { locale: first, path: path.slice(1) };
+  }
+  return { locale: siteLocales.defaultLocale, path };
+}
+
+// src/components/resolve-render-locale.ts
+var warned2 = false;
+async function resolveRenderLocale({
+  locale,
+  defaultLocale,
+  enabledLocales,
+  config
+}) {
+  if (locale && defaultLocale) return { locale, defaultLocale, enabledLocales };
+  if (config) {
+    const site = await resolveSiteLocales(config);
+    return {
+      locale: locale ?? defaultLocale ?? site.defaultLocale,
+      defaultLocale: defaultLocale ?? site.defaultLocale,
+      enabledLocales: enabledLocales ?? site.locales
+    };
+  }
+  if (process.env.NODE_ENV !== "production" && !warned2) {
+    warned2 = true;
+    console.warn(
+      '[cmssy] Rendering in "en": no locale was passed and no config was given to look the workspace\'s default language up. Pass `locale` (from the route) or `config`, or a workspace whose default language is not English will render its chrome in the wrong one.'
+    );
+  }
+  return {
+    locale: locale ?? defaultLocale ?? "en",
+    defaultLocale: defaultLocale ?? "en",
+    enabledLocales
+  };
+}
+async function CmssyServerPage({
+  page,
+  blocks,
+  locale: localeProp,
+  defaultLocale: defaultLocaleProp,
+  enabledLocales: enabledLocalesProp,
+  config,
+  forms,
+  auth,
+  workspace
+}) {
+  if (!page) return null;
+  const { locale, defaultLocale, enabledLocales } = await resolveRenderLocale({
+    locale: localeProp,
+    defaultLocale: defaultLocaleProp,
+    enabledLocales: enabledLocalesProp,
+    config
+  });
+  const map = buildBlockMap(blocks);
+  const loaderMap = buildLoaderMap(blocks);
+  const context = buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    false,
+    forms,
+    { auth, workspace }
+  );
+  const resolved = await resolveBlocks(
+    page.blocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales
+  );
+  return /* @__PURE__ */ jsx(Fragment, { children: page.blocks.map(
+    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
+      context,
+      data: resolved[i]?.data,
+      resolvedContent: resolved[i]?.content,
+      enabledLocales
+    })
+  ) });
+}
+async function CmssyServerLayout({
+  groups,
+  blocks,
+  position,
+  locale: localeProp,
+  defaultLocale: defaultLocaleProp,
+  enabledLocales: enabledLocalesProp,
+  config
+}) {
+  const { locale, defaultLocale, enabledLocales } = await resolveRenderLocale({
+    locale: localeProp,
+    defaultLocale: defaultLocaleProp,
+    enabledLocales: enabledLocalesProp,
+    config
+  });
+  const group = groups.find((g) => g.position === position);
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
+  if (layoutBlocks.length === 0) return null;
+  const map = buildBlockMap(blocks);
+  const loaderMap = buildLoaderMap(blocks);
+  const context = buildBlockContext(locale, defaultLocale, enabledLocales);
+  const resolved = await resolveBlocks(
+    layoutBlocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales
+  );
+  return /* @__PURE__ */ jsx(Fragment, { children: layoutBlocks.map(
+    (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
+      context,
+      data: resolved[i]?.data,
+      resolvedContent: resolved[i]?.content,
+      enabledLocales
+    })
+  ) });
+}
+
+// src/bridge/protocol.ts
+var PROTOCOL_VERSION = 2;
+function isProtocolCompatible(version) {
+  return version === PROTOCOL_VERSION;
+}
+
+// src/bridge/messages.ts
+function normalizeOrigin(origin) {
+  const trimmed = origin.trim();
+  if (trimmed === "*") return "*";
+  try {
+    return new URL(trimmed).origin;
+  } catch {
+    return trimmed;
+  }
+}
+function postToEditor(target, editorOrigin, message) {
+  target.postMessage(message, normalizeOrigin(editorOrigin));
+}
+function isOriginAllowed(origin, allowed) {
+  const list = Array.isArray(allowed) ? allowed : [allowed];
+  const actual = normalizeOrigin(origin);
+  return list.some((candidate) => {
+    const expected = normalizeOrigin(candidate);
+    return expected === "*" || expected === actual;
+  });
+}
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseEditorMessage(data, origin, expectedOrigin) {
+  if (!isOriginAllowed(origin, expectedOrigin)) return null;
+  if (!isObject(data)) return null;
+  switch (data.type) {
+    case "cmssy:select":
+      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:select",
+        protocolVersion: PROTOCOL_VERSION,
+        blockId: data.blockId
+      } : null;
+    case "cmssy:patch":
+      return typeof data.blockId === "string" && isObject(data.content) && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:patch",
+        blockId: data.blockId,
+        content: data.content,
+        protocolVersion: PROTOCOL_VERSION,
+        ...isObject(data.style) ? { style: data.style } : {},
+        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
+        ...typeof data.layoutPosition === "string" ? { layoutPosition: data.layoutPosition } : {}
+      } : null;
+    case "cmssy:parent-ready":
+      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:parent-ready", protocolVersion: PROTOCOL_VERSION } : null;
+    case "cmssy:insert":
+      return typeof data.blockId === "string" && typeof data.blockType === "string" && isObject(data.content) && typeof data.index === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:insert",
+        protocolVersion: PROTOCOL_VERSION,
+        blockId: data.blockId,
+        blockType: data.blockType,
+        content: data.content,
+        ...isObject(data.style) ? { style: data.style } : {},
+        ...isObject(data.advanced) ? { advanced: data.advanced } : {},
+        index: data.index
+      } : null;
+    case "cmssy:reorder":
+      return Array.isArray(data.blockIds) && data.blockIds.every((id) => typeof id === "string") && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:reorder",
+        protocolVersion: PROTOCOL_VERSION,
+        blockIds: data.blockIds
+      } : null;
+    case "cmssy:remove":
+      return typeof data.blockId === "string" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:remove",
+        protocolVersion: PROTOCOL_VERSION,
+        blockId: data.blockId
+      } : null;
+    case "cmssy:drag-over":
+      return typeof data.y === "number" && data.protocolVersion === PROTOCOL_VERSION ? {
+        type: "cmssy:drag-over",
+        protocolVersion: PROTOCOL_VERSION,
+        y: data.y
+      } : null;
+    case "cmssy:drag-end":
+      return data.protocolVersion === PROTOCOL_VERSION ? { type: "cmssy:drag-end", protocolVersion: PROTOCOL_VERSION } : null;
+    default:
+      return null;
+  }
+}
+
 // src/data/settings-client.ts
 async function fetchSiteConfig(config, options = {}) {
   const data = await graphqlRequest(
@@ -822,46 +906,6 @@ async function resolveForms(config, blocks, locale, defaultLocale, options) {
   return forms;
 }
 
-// src/data/site-locales.ts
-var TTL_MS = 6e4;
-var MAX_ENTRIES = 64;
-var cache = /* @__PURE__ */ new Map();
-async function resolveSiteLocales(config, options) {
-  const key = `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
-  const cached = cache.get(key);
-  if (cached && cached.expires > Date.now()) return cached.value;
-  cache.delete(key);
-  let value;
-  try {
-    const data = await graphqlRequest(
-      config,
-      SITE_CONFIG_QUERY,
-      { workspaceSlug: config.workspaceSlug },
-      { ...options, public: true, retry: options?.retry ?? {} },
-      "site config"
-    );
-    const siteConfig = data.public?.siteConfig ?? null;
-    const defaultLocale = siteConfig?.defaultLanguage || "en";
-    const enabled = siteConfig?.enabledLanguages ?? [];
-    value = {
-      defaultLocale,
-      locales: enabled.length > 0 ? enabled : [defaultLocale]
-    };
-  } catch {
-    value = { defaultLocale: "en", locales: ["en"] };
-  }
-  if (cache.size >= MAX_ENTRIES) cache.clear();
-  cache.set(key, { value, expires: Date.now() + TTL_MS });
-  return value;
-}
-function splitLocaleFromPath(path, siteLocales) {
-  const first = path?.[0];
-  if (first && first !== siteLocales.defaultLocale && siteLocales.locales.includes(first)) {
-    return { locale: first, path: path.slice(1) };
-  }
-  return { locale: siteLocales.defaultLocale, path };
-}
-
 // src/data/localize-href.ts
 var PROTOCOL_OR_RELATIVE = /^([a-z][a-z0-9+.-]*:|\/\/)/i;
 function isExternalHref(href) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "4.4.0",
+  "version": "4.6.0",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",