@cmssy/next 16.0.0 → 16.1.0

package/README.md

@@ -45,10 +45,29 @@ the live-edit bridge. A published build does **not** require `editorOrigin`.
 
 ```ts
 // app/api/draft/route.ts
-import { createDraftRoute } from "@cmssy/next";
+import { createDraftRoute } from "@cmssy/next/server";
 export const GET = createDraftRoute(cmssy);
 ```
 
+## Cache, and expire it on publish
+
+```ts
+// app/[[...path]]/page.tsx
+export const revalidate = 3600;
+const cache = { revalidate };
+export default createCmssyPage(cmssy, blocks, { editor: CmssyEditor, cache });
+
+// app/api/revalidate/route.ts
+import { createCmssyRevalidateRoute } from "@cmssy/next/server";
+export const POST = createCmssyRevalidateRoute({
+  secret: process.env.CMSSY_WEBHOOK_SECRET,
+});
+```
+
+`cache` puts the SDK's published reads into the Next data cache under the
+`cmssy-content` tag; the route expires that tag for a verified `content.changed`
+webhook. Draft mode and the editor always read live.
+
 ## Edit-mode CSP
 
 ```ts
@@ -93,9 +112,13 @@ re-exported from `@cmssy/next` (and `@cmssy/core`).
 
 ## Exports
 
-`createCmssyPage`, `createDraftRoute`, `cmssyCspHeaders` / `applyCmssyCsp`,
-`isCmssyEditRequest` / `isCmssyEditMode`, `createCmssyLocaleMiddleware` /
-`resolveLocaleFromPathname`, and the `CmssyConfig` type.
+`@cmssy/next/server`: `createCmssyPage`, `createCmssyEditPage`,
+`createDraftRoute`, `createCmssyRevalidateRoute`, `CmssyLayoutSlot`,
+`resolveCmssyLayout`, `isCmssyEditMode`. `@cmssy/next/middleware`:
+`createCmssyProxy`, `cmssyEditRewrite`, `applyCmssyCsp`, `isCmssyEditRequest`.
+Root: `defineCmssyConfig`, `localizeHref`, `nextRetryMode`, `cmssyCachedFetch`,
+`CMSSY_CONTENT_TAG` and the types. The full list, with signatures, is in
+[docs/reference/sdk-api.md](../../docs/reference/sdk-api.md).
 
 ## License
 

package/dist/{index-ZUEbpOlo.d.cts → index-D6hhjPH3.d.cts}

@@ -1,4 +1,4 @@
-import { CmssyRetryMode, RetryOption, CmssyConfig } from '@cmssy/core';
+import { CmssyRetryMode, FetchLike, RetryOption, CmssyConfig } from '@cmssy/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ComponentType } from 'react';
 import { CmssyPageData, CmssyFormDefinition, BlockDefinition } from '@cmssy/react';
@@ -7,6 +7,13 @@ import { EditBridgeConfig } from '@cmssy/react/client';
 declare const NEXT_BUILD_PHASE = "phase-production-build";
 declare function nextRetryMode(): CmssyRetryMode;
 
+declare const CMSSY_CONTENT_TAG = "cmssy-content";
+interface CmssyDataCacheOptions {
+    revalidate: number | false;
+    tags?: string[];
+}
+declare function cmssyCachedFetch(cache: CmssyDataCacheOptions): FetchLike;
+
 interface CmssyEditorProps {
     page: CmssyPageData;
     locale: string;
@@ -28,6 +35,7 @@ interface CreateCmssyPageOptions {
     path?: string;
     appContext?: CmssyAppContext;
     retry?: RetryOption;
+    cache?: CmssyDataCacheOptions;
 }
 interface CatchAllParams {
     path?: string[];
@@ -40,4 +48,4 @@ interface CatchAllProps {
 declare function createCmssyPage(config: CmssyConfig, blocks: BlockDefinition[], options?: CreateCmssyPageOptions): ({ params, searchParams, }: CatchAllProps) => Promise<react_jsx_runtime.JSX.Element>;
 declare function createCmssyEditPage(config: CmssyConfig, blocks: BlockDefinition[], options?: CreateCmssyPageOptions): ({ params, searchParams, }: CatchAllProps) => Promise<react_jsx_runtime.JSX.Element>;
 
-export { type CmssyAppContext as C, NEXT_BUILD_PHASE as N, type CmssyEditorProps as a, type CreateCmssyPageOptions as b, createCmssyEditPage as c, createCmssyPage as d, nextRetryMode as n };
+export { type CmssyDataCacheOptions as C, NEXT_BUILD_PHASE as N, CMSSY_CONTENT_TAG as a, type CmssyAppContext as b, type CmssyEditorProps as c, type CreateCmssyPageOptions as d, cmssyCachedFetch as e, createCmssyEditPage as f, createCmssyPage as g, nextRetryMode as n };

package/dist/{index-ZUEbpOlo.d.ts → index-D6hhjPH3.d.ts}

@@ -1,4 +1,4 @@
-import { CmssyRetryMode, RetryOption, CmssyConfig } from '@cmssy/core';
+import { CmssyRetryMode, FetchLike, RetryOption, CmssyConfig } from '@cmssy/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ComponentType } from 'react';
 import { CmssyPageData, CmssyFormDefinition, BlockDefinition } from '@cmssy/react';
@@ -7,6 +7,13 @@ import { EditBridgeConfig } from '@cmssy/react/client';
 declare const NEXT_BUILD_PHASE = "phase-production-build";
 declare function nextRetryMode(): CmssyRetryMode;
 
+declare const CMSSY_CONTENT_TAG = "cmssy-content";
+interface CmssyDataCacheOptions {
+    revalidate: number | false;
+    tags?: string[];
+}
+declare function cmssyCachedFetch(cache: CmssyDataCacheOptions): FetchLike;
+
 interface CmssyEditorProps {
     page: CmssyPageData;
     locale: string;
@@ -28,6 +35,7 @@ interface CreateCmssyPageOptions {
     path?: string;
     appContext?: CmssyAppContext;
     retry?: RetryOption;
+    cache?: CmssyDataCacheOptions;
 }
 interface CatchAllParams {
     path?: string[];
@@ -40,4 +48,4 @@ interface CatchAllProps {
 declare function createCmssyPage(config: CmssyConfig, blocks: BlockDefinition[], options?: CreateCmssyPageOptions): ({ params, searchParams, }: CatchAllProps) => Promise<react_jsx_runtime.JSX.Element>;
 declare function createCmssyEditPage(config: CmssyConfig, blocks: BlockDefinition[], options?: CreateCmssyPageOptions): ({ params, searchParams, }: CatchAllProps) => Promise<react_jsx_runtime.JSX.Element>;
 
-export { type CmssyAppContext as C, NEXT_BUILD_PHASE as N, type CmssyEditorProps as a, type CreateCmssyPageOptions as b, createCmssyEditPage as c, createCmssyPage as d, nextRetryMode as n };
+export { type CmssyDataCacheOptions as C, NEXT_BUILD_PHASE as N, CMSSY_CONTENT_TAG as a, type CmssyAppContext as b, type CmssyEditorProps as c, type CreateCmssyPageOptions as d, cmssyCachedFetch as e, createCmssyEditPage as f, createCmssyPage as g, nextRetryMode as n };

package/dist/index.cjs

@@ -11,6 +11,19 @@ function nextRetryMode() {
   return phase === NEXT_BUILD_PHASE ? "build" : "interactive";
 }
 
+// src/data-cache.ts
+var CMSSY_CONTENT_TAG = "cmssy-content";
+function cmssyContentTags(tags = []) {
+  return [.../* @__PURE__ */ new Set([CMSSY_CONTENT_TAG, ...tags])];
+}
+function cmssyCachedFetch(cache) {
+  const next = {
+    revalidate: cache.revalidate,
+    tags: cmssyContentTags(cache.tags)
+  };
+  return (url, init) => fetch(url, { ...init, next });
+}
+
 Object.defineProperty(exports, "CMSSY_EDIT_HEADER", {
   enumerable: true,
   get: function () { return core.CMSSY_EDIT_HEADER; }
@@ -55,5 +68,7 @@ Object.defineProperty(exports, "verifyCmssyWebhook", {
   enumerable: true,
   get: function () { return core.verifyCmssyWebhook; }
 });
+exports.CMSSY_CONTENT_TAG = CMSSY_CONTENT_TAG;
 exports.NEXT_BUILD_PHASE = NEXT_BUILD_PHASE;
+exports.cmssyCachedFetch = cmssyCachedFetch;
 exports.nextRetryMode = nextRetryMode;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyLayout, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRetryMode, CmssyWebhookError, CmssyWebhookEvent, DEFAULT_CMSSY_EDITOR_ORIGINS, LayoutRegion, RetryOption, RetryPolicy, VerifyCmssyWebhookOptions, defineCmssyConfig, defineCmssyLayout, localizeHref, resolveEditorOrigin, verifyCmssyWebhook } from '@cmssy/core';
-export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, n as nextRetryMode } from './index-ZUEbpOlo.cjs';
+export { a as CMSSY_CONTENT_TAG, b as CmssyAppContext, C as CmssyDataCacheOptions, c as CmssyEditorProps, d as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, e as cmssyCachedFetch, n as nextRetryMode } from './index-D6hhjPH3.cjs';
 import 'react/jsx-runtime';
 import 'react';
 import '@cmssy/react';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyLayout, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRetryMode, CmssyWebhookError, CmssyWebhookEvent, DEFAULT_CMSSY_EDITOR_ORIGINS, LayoutRegion, RetryOption, RetryPolicy, VerifyCmssyWebhookOptions, defineCmssyConfig, defineCmssyLayout, localizeHref, resolveEditorOrigin, verifyCmssyWebhook } from '@cmssy/core';
-export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, n as nextRetryMode } from './index-ZUEbpOlo.js';
+export { a as CMSSY_CONTENT_TAG, b as CmssyAppContext, C as CmssyDataCacheOptions, c as CmssyEditorProps, d as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, e as cmssyCachedFetch, n as nextRetryMode } from './index-D6hhjPH3.js';
 import 'react/jsx-runtime';
 import 'react';
 import '@cmssy/react';

package/dist/index.js

@@ -9,4 +9,17 @@ function nextRetryMode() {
   return phase === NEXT_BUILD_PHASE ? "build" : "interactive";
 }
 
-export { NEXT_BUILD_PHASE, nextRetryMode };
+// src/data-cache.ts
+var CMSSY_CONTENT_TAG = "cmssy-content";
+function cmssyContentTags(tags = []) {
+  return [.../* @__PURE__ */ new Set([CMSSY_CONTENT_TAG, ...tags])];
+}
+function cmssyCachedFetch(cache) {
+  const next = {
+    revalidate: cache.revalidate,
+    tags: cmssyContentTags(cache.tags)
+  };
+  return (url, init) => fetch(url, { ...init, next });
+}
+
+export { CMSSY_CONTENT_TAG, NEXT_BUILD_PHASE, cmssyCachedFetch, nextRetryMode };

package/dist/server.cjs

@@ -9,6 +9,7 @@ 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 cache = require('next/cache');
 
 // src/server.ts
 
@@ -18,6 +19,19 @@ function nextRetryMode() {
   const phase = typeof process !== "undefined" ? process.env?.NEXT_PHASE : void 0;
   return phase === NEXT_BUILD_PHASE ? "build" : "interactive";
 }
+
+// src/data-cache.ts
+var CMSSY_CONTENT_TAG = "cmssy-content";
+function cmssyContentTags(tags = []) {
+  return [.../* @__PURE__ */ new Set([CMSSY_CONTENT_TAG, ...tags])];
+}
+function cmssyCachedFetch(cache) {
+  const next = {
+    revalidate: cache.revalidate,
+    tags: cmssyContentTags(cache.tags)
+  };
+  return (url, init) => fetch(url, { ...init, next });
+}
 function hasEditFlag(value) {
   return Array.isArray(value) ? value.includes("1") : value === "1";
 }
@@ -49,7 +63,8 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     workspaceSlug: config.workspaceSlug
   };
   const client = react.createCmssyClient(clientConfig);
-  const requestOptions = { retry: options?.retry ?? nextRetryMode() };
+  const retryOptions = { retry: options?.retry ?? nextRetryMode() };
+  const cachedFetch = options?.cache ? cmssyCachedFetch(options.cache) : void 0;
   const fixedPath = options?.path?.split("/").map((segment) => segment.trim()).filter(Boolean);
   return async function CmssyCatchAllPage({
     params,
@@ -70,6 +85,7 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     }
     const editMode = isEnabled || editorActive;
     const devAllowed = internal.isDevelopment() && Boolean(config.devToken?.trim());
+    const requestOptions = cachedFetch && !editMode && !devAllowed ? { ...retryOptions, fetch: cachedFetch } : retryOptions;
     const siteLocales = await internal.resolveSiteLocales(clientConfig, requestOptions);
     const { defaultLocale, locales: enabledLocales } = siteLocales;
     const split = internal.splitLocaleFromPath(path, siteLocales);
@@ -253,10 +269,49 @@ function createDraftRoute(config) {
     navigation.redirect(location);
   };
 }
+var SIGNATURE_HEADER = "x-cmssy-signature";
+function createCmssyRevalidateRoute(config) {
+  const tags = cmssyContentTags(config.tags);
+  const secrets = (Array.isArray(config.secret) ? config.secret : [config.secret]).filter((secret) => Boolean(secret));
+  return async function POST(request) {
+    if (secrets.length === 0) {
+      return new Response(
+        "cmssy: createCmssyRevalidateRoute has no signing secret - set CMSSY_WEBHOOK_SECRET to the secret cmssy shows for this webhook and pass it as `secret`",
+        { status: 500 }
+      );
+    }
+    const body = await request.text();
+    try {
+      await core.verifyCmssyWebhook({
+        body,
+        signatureHeader: request.headers.get(SIGNATURE_HEADER),
+        secret: secrets,
+        toleranceSeconds: config.toleranceSeconds
+      });
+    } catch (err) {
+      if (err instanceof core.CmssyWebhookError) {
+        return new Response(err.message, { status: 401 });
+      }
+      throw err;
+    }
+    for (const tag of tags) cache.revalidateTag(tag, { expire: 0 });
+    return Response.json({ revalidated: tags });
+  };
+}
 async function isCmssyEditMode() {
   const h = await headers.headers();
   return h.get(core.CMSSY_EDIT_HEADER) === "1";
 }
+function resolveCmssyLayout(config, options) {
+  const { cache, ...rest } = options;
+  const live = rest.editMode || rest.preview === true;
+  const fetchImpl = rest.fetch ?? (cache && !live ? cmssyCachedFetch(cache) : void 0);
+  return react.resolveCmssyLayout(config, {
+    ...rest,
+    retry: rest.retry ?? nextRetryMode(),
+    ...fetchImpl ? { fetch: fetchImpl } : {}
+  });
+}
 async function CmssyLayoutSlot({
   config,
   blocks,
@@ -269,9 +324,10 @@ async function CmssyLayoutSlot({
   editable,
   appContext,
   retry,
+  cache,
   children
 }) {
-  const layout = await react.resolveCmssyLayout(config, {
+  const layout = await resolveCmssyLayout(config, {
     region,
     blocks,
     editMode,
@@ -279,25 +335,23 @@ async function CmssyLayoutSlot({
     editable,
     ...page !== void 0 ? { page } : {},
     appContext,
-    retry: retry ?? nextRetryMode(),
+    retry,
+    cache,
     ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
   });
   if (!children) return layout.element;
   const { groups, settings, page: routed, element } = layout;
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: children({ groups, settings, page: routed, element }) });
 }
-function resolveCmssyLayout2(config, options) {
-  return react.resolveCmssyLayout(config, {
-    ...options,
-    retry: options.retry ?? nextRetryMode()
-  });
-}
 
+exports.CMSSY_CONTENT_TAG = CMSSY_CONTENT_TAG;
 exports.CmssyLayoutSlot = CmssyLayoutSlot;
 exports.NEXT_BUILD_PHASE = NEXT_BUILD_PHASE;
+exports.cmssyCachedFetch = cmssyCachedFetch;
 exports.createCmssyEditPage = createCmssyEditPage;
 exports.createCmssyPage = createCmssyPage;
+exports.createCmssyRevalidateRoute = createCmssyRevalidateRoute;
 exports.createDraftRoute = createDraftRoute;
 exports.isCmssyEditMode = isCmssyEditMode;
 exports.nextRetryMode = nextRetryMode;
-exports.resolveCmssyLayout = resolveCmssyLayout2;
+exports.resolveCmssyLayout = resolveCmssyLayout;

package/dist/server.d.cts

@@ -1,10 +1,11 @@
-export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, c as createCmssyEditPage, d as createCmssyPage, n as nextRetryMode } from './index-ZUEbpOlo.cjs';
+import { C as CmssyDataCacheOptions } from './index-D6hhjPH3.cjs';
+export { a as CMSSY_CONTENT_TAG, b as CmssyAppContext, c as CmssyEditorProps, d as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, e as cmssyCachedFetch, f as createCmssyEditPage, g as createCmssyPage, n as nextRetryMode } from './index-D6hhjPH3.cjs';
 import { CmssyConfig, CmssyRegionOf, RetryOption } from '@cmssy/core';
 export { CmssyRetryMode, RetryOption, RetryPolicy } from '@cmssy/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ComponentType, ReactNode } from 'react';
-import { BlockDefinition, CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
-export { CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
+import { BlockDefinition, CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions as ResolveCmssyLayoutOptions$1 } from '@cmssy/react';
+export { CmssyLayoutEditableProps, CmssyLayoutResolution } from '@cmssy/react';
 import '@cmssy/react/client';
 
 type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
@@ -12,6 +13,13 @@ type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
 };
 declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Request) => Promise<Response>;
 
+interface CmssyRevalidateRouteConfig {
+    secret: string | string[] | undefined;
+    tags?: string[];
+    toleranceSeconds?: number;
+}
+declare function createCmssyRevalidateRoute(config: CmssyRevalidateRouteConfig): (request: Request) => Promise<Response>;
+
 declare function isCmssyEditMode(): Promise<boolean>;
 
 type CmssyLayoutSlotRenderProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = Pick<CmssyLayoutResolution<C, P>, "groups" | "settings" | "page" | "element">;
@@ -25,6 +33,7 @@ interface CmssyLayoutSlotBaseProps<C extends CmssyConfig, P extends CmssyRegionO
     editable: ComponentType<CmssyLayoutEditableProps>;
     appContext?: Record<string, unknown>;
     retry?: RetryOption;
+    cache?: CmssyDataCacheOptions;
     children?: (layout: CmssyLayoutSlotRenderProps<C, P>) => ReactNode;
 }
 type CmssyLayoutSlotLocaleSource = {
@@ -35,8 +44,11 @@ type CmssyLayoutSlotLocaleSource = {
     path?: never;
 };
 type CmssyLayoutSlotProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = CmssyLayoutSlotBaseProps<C, P> & CmssyLayoutSlotLocaleSource;
-declare function CmssyLayoutSlot<C extends CmssyConfig, P extends CmssyRegionOf<C>>({ config, blocks, region, path, locale: explicitLocale, editMode, preview, page, editable, appContext, retry, children, }: CmssyLayoutSlotProps<C, P>): Promise<react_jsx_runtime.JSX.Element>;
+declare function CmssyLayoutSlot<C extends CmssyConfig, P extends CmssyRegionOf<C>>({ config, blocks, region, path, locale: explicitLocale, editMode, preview, page, editable, appContext, retry, cache, children, }: CmssyLayoutSlotProps<C, P>): Promise<react_jsx_runtime.JSX.Element>;
 
+type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = ResolveCmssyLayoutOptions$1<C, P> & {
+    cache?: CmssyDataCacheOptions;
+};
 declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegionOf<C>>(config: C, options: ResolveCmssyLayoutOptions<C, P>): Promise<CmssyLayoutResolution<C, P>>;
 
-export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, type CmssyLayoutSlotRenderProps, createDraftRoute, isCmssyEditMode, resolveCmssyLayout };
+export { CmssyDataCacheOptions, type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, type CmssyLayoutSlotRenderProps, type CmssyRevalidateRouteConfig, type ResolveCmssyLayoutOptions, createCmssyRevalidateRoute, createDraftRoute, isCmssyEditMode, resolveCmssyLayout };

package/dist/server.d.ts

@@ -1,10 +1,11 @@
-export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, c as createCmssyEditPage, d as createCmssyPage, n as nextRetryMode } from './index-ZUEbpOlo.js';
+import { C as CmssyDataCacheOptions } from './index-D6hhjPH3.js';
+export { a as CMSSY_CONTENT_TAG, b as CmssyAppContext, c as CmssyEditorProps, d as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, e as cmssyCachedFetch, f as createCmssyEditPage, g as createCmssyPage, n as nextRetryMode } from './index-D6hhjPH3.js';
 import { CmssyConfig, CmssyRegionOf, RetryOption } from '@cmssy/core';
 export { CmssyRetryMode, RetryOption, RetryPolicy } from '@cmssy/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ComponentType, ReactNode } from 'react';
-import { BlockDefinition, CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
-export { CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
+import { BlockDefinition, CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions as ResolveCmssyLayoutOptions$1 } from '@cmssy/react';
+export { CmssyLayoutEditableProps, CmssyLayoutResolution } from '@cmssy/react';
 import '@cmssy/react/client';
 
 type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
@@ -12,6 +13,13 @@ type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
 };
 declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Request) => Promise<Response>;
 
+interface CmssyRevalidateRouteConfig {
+    secret: string | string[] | undefined;
+    tags?: string[];
+    toleranceSeconds?: number;
+}
+declare function createCmssyRevalidateRoute(config: CmssyRevalidateRouteConfig): (request: Request) => Promise<Response>;
+
 declare function isCmssyEditMode(): Promise<boolean>;
 
 type CmssyLayoutSlotRenderProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = Pick<CmssyLayoutResolution<C, P>, "groups" | "settings" | "page" | "element">;
@@ -25,6 +33,7 @@ interface CmssyLayoutSlotBaseProps<C extends CmssyConfig, P extends CmssyRegionO
     editable: ComponentType<CmssyLayoutEditableProps>;
     appContext?: Record<string, unknown>;
     retry?: RetryOption;
+    cache?: CmssyDataCacheOptions;
     children?: (layout: CmssyLayoutSlotRenderProps<C, P>) => ReactNode;
 }
 type CmssyLayoutSlotLocaleSource = {
@@ -35,8 +44,11 @@ type CmssyLayoutSlotLocaleSource = {
     path?: never;
 };
 type CmssyLayoutSlotProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = CmssyLayoutSlotBaseProps<C, P> & CmssyLayoutSlotLocaleSource;
-declare function CmssyLayoutSlot<C extends CmssyConfig, P extends CmssyRegionOf<C>>({ config, blocks, region, path, locale: explicitLocale, editMode, preview, page, editable, appContext, retry, children, }: CmssyLayoutSlotProps<C, P>): Promise<react_jsx_runtime.JSX.Element>;
+declare function CmssyLayoutSlot<C extends CmssyConfig, P extends CmssyRegionOf<C>>({ config, blocks, region, path, locale: explicitLocale, editMode, preview, page, editable, appContext, retry, cache, children, }: CmssyLayoutSlotProps<C, P>): Promise<react_jsx_runtime.JSX.Element>;
 
+type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = ResolveCmssyLayoutOptions$1<C, P> & {
+    cache?: CmssyDataCacheOptions;
+};
 declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegionOf<C>>(config: C, options: ResolveCmssyLayoutOptions<C, P>): Promise<CmssyLayoutResolution<C, P>>;
 
-export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, type CmssyLayoutSlotRenderProps, createDraftRoute, isCmssyEditMode, resolveCmssyLayout };
+export { CmssyDataCacheOptions, type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, type CmssyLayoutSlotRenderProps, type CmssyRevalidateRouteConfig, type ResolveCmssyLayoutOptions, createCmssyRevalidateRoute, createDraftRoute, isCmssyEditMode, resolveCmssyLayout };

package/dist/server.js

@@ -1,12 +1,13 @@
 import 'server-only';
 import { draftMode, headers } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
-import { createCmssyClient, CmssyServerPage, resolveCmssyLayout } from '@cmssy/react';
+import { createCmssyClient, CmssyServerPage, resolveCmssyLayout as resolveCmssyLayout$1 } from '@cmssy/react';
 import { CmssyLocaleProvider } from '@cmssy/react/internal';
 import { blocksToSchemas, resolveEditorBlockData } from '@cmssy/react/internal-server';
 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 { CMSSY_SECRET_QUERY_PARAM, resolveEditorOrigin, verifyCmssyWebhook, CmssyWebhookError, CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM } from '@cmssy/core';
 import { jsx, Fragment } from 'react/jsx-runtime';
+import { revalidateTag } from 'next/cache';
 
 // src/server.ts
 
@@ -16,6 +17,19 @@ function nextRetryMode() {
   const phase = typeof process !== "undefined" ? process.env?.NEXT_PHASE : void 0;
   return phase === NEXT_BUILD_PHASE ? "build" : "interactive";
 }
+
+// src/data-cache.ts
+var CMSSY_CONTENT_TAG = "cmssy-content";
+function cmssyContentTags(tags = []) {
+  return [.../* @__PURE__ */ new Set([CMSSY_CONTENT_TAG, ...tags])];
+}
+function cmssyCachedFetch(cache) {
+  const next = {
+    revalidate: cache.revalidate,
+    tags: cmssyContentTags(cache.tags)
+  };
+  return (url, init) => fetch(url, { ...init, next });
+}
 function hasEditFlag(value) {
   return Array.isArray(value) ? value.includes("1") : value === "1";
 }
@@ -47,7 +61,8 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     workspaceSlug: config.workspaceSlug
   };
   const client = createCmssyClient(clientConfig);
-  const requestOptions = { retry: options?.retry ?? nextRetryMode() };
+  const retryOptions = { retry: options?.retry ?? nextRetryMode() };
+  const cachedFetch = options?.cache ? cmssyCachedFetch(options.cache) : void 0;
   const fixedPath = options?.path?.split("/").map((segment) => segment.trim()).filter(Boolean);
   return async function CmssyCatchAllPage({
     params,
@@ -68,6 +83,7 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     }
     const editMode = isEnabled || editorActive;
     const devAllowed = isDevelopment() && Boolean(config.devToken?.trim());
+    const requestOptions = cachedFetch && !editMode && !devAllowed ? { ...retryOptions, fetch: cachedFetch } : retryOptions;
     const siteLocales = await resolveSiteLocales(clientConfig, requestOptions);
     const { defaultLocale, locales: enabledLocales } = siteLocales;
     const split = splitLocaleFromPath(path, siteLocales);
@@ -251,10 +267,49 @@ function createDraftRoute(config) {
     redirect(location);
   };
 }
+var SIGNATURE_HEADER = "x-cmssy-signature";
+function createCmssyRevalidateRoute(config) {
+  const tags = cmssyContentTags(config.tags);
+  const secrets = (Array.isArray(config.secret) ? config.secret : [config.secret]).filter((secret) => Boolean(secret));
+  return async function POST(request) {
+    if (secrets.length === 0) {
+      return new Response(
+        "cmssy: createCmssyRevalidateRoute has no signing secret - set CMSSY_WEBHOOK_SECRET to the secret cmssy shows for this webhook and pass it as `secret`",
+        { status: 500 }
+      );
+    }
+    const body = await request.text();
+    try {
+      await verifyCmssyWebhook({
+        body,
+        signatureHeader: request.headers.get(SIGNATURE_HEADER),
+        secret: secrets,
+        toleranceSeconds: config.toleranceSeconds
+      });
+    } catch (err) {
+      if (err instanceof CmssyWebhookError) {
+        return new Response(err.message, { status: 401 });
+      }
+      throw err;
+    }
+    for (const tag of tags) revalidateTag(tag, { expire: 0 });
+    return Response.json({ revalidated: tags });
+  };
+}
 async function isCmssyEditMode() {
   const h = await headers();
   return h.get(CMSSY_EDIT_HEADER) === "1";
 }
+function resolveCmssyLayout(config, options) {
+  const { cache, ...rest } = options;
+  const live = rest.editMode || rest.preview === true;
+  const fetchImpl = rest.fetch ?? (cache && !live ? cmssyCachedFetch(cache) : void 0);
+  return resolveCmssyLayout$1(config, {
+    ...rest,
+    retry: rest.retry ?? nextRetryMode(),
+    ...fetchImpl ? { fetch: fetchImpl } : {}
+  });
+}
 async function CmssyLayoutSlot({
   config,
   blocks,
@@ -267,6 +322,7 @@ async function CmssyLayoutSlot({
   editable,
   appContext,
   retry,
+  cache,
   children
 }) {
   const layout = await resolveCmssyLayout(config, {
@@ -277,18 +333,13 @@ async function CmssyLayoutSlot({
     editable,
     ...page !== void 0 ? { page } : {},
     appContext,
-    retry: retry ?? nextRetryMode(),
+    retry,
+    cache,
     ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
   });
   if (!children) return layout.element;
   const { groups, settings, page: routed, element } = layout;
   return /* @__PURE__ */ jsx(Fragment, { children: children({ groups, settings, page: routed, element }) });
 }
-function resolveCmssyLayout2(config, options) {
-  return resolveCmssyLayout(config, {
-    ...options,
-    retry: options.retry ?? nextRetryMode()
-  });
-}
 
-export { CmssyLayoutSlot, NEXT_BUILD_PHASE, createCmssyEditPage, createCmssyPage, createDraftRoute, isCmssyEditMode, nextRetryMode, resolveCmssyLayout2 as resolveCmssyLayout };
+export { CMSSY_CONTENT_TAG, CmssyLayoutSlot, NEXT_BUILD_PHASE, cmssyCachedFetch, createCmssyEditPage, createCmssyPage, createCmssyRevalidateRoute, createDraftRoute, isCmssyEditMode, nextRetryMode, resolveCmssyLayout };

package/package.json

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