@cmssy/next 18.0.0 → 19.1.0

package/dist/server.cjs

@@ -10,6 +10,27 @@ var internalServer = require('@cmssy/react/internal-server');
 var internal = require('@cmssy/core/internal');
 var jsxRuntime = require('react/jsx-runtime');
 var cache = require('next/cache');
+var React = require('react');
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 // src/server.ts
 
@@ -25,10 +46,10 @@ var CMSSY_CONTENT_TAG = "cmssy-content";
 function cmssyContentTags(tags = []) {
   return [.../* @__PURE__ */ new Set([CMSSY_CONTENT_TAG, ...tags])];
 }
-function cmssyCachedFetch(cache) {
+function cmssyCachedFetch(cache2) {
   const next = {
-    revalidate: cache.revalidate,
-    tags: cmssyContentTags(cache.tags)
+    revalidate: cache2.revalidate,
+    tags: cmssyContentTags(cache2.tags)
   };
   return (url, init) => fetch(url, { ...init, next });
 }
@@ -345,13 +366,24 @@ async function isCmssyEditMode() {
   const h = await headers.headers();
   return h.get(core.CMSSY_EDIT_HEADER) === "1";
 }
+function resolvePerRequest(cache2) {
+  if (typeof cache2 === "function") return cache2;
+  return (factory) => factory;
+}
+var perRequest = resolvePerRequest(
+  React__namespace.cache
+);
+
+// src/preset/resolve-cmssy-layout.ts
+var requestLayoutStore = perRequest(internal.createCmssyLayoutStore);
 function resolveCmssyLayout(config, options) {
-  const { cache, ...rest } = options;
+  const { cache: cache2, ...rest } = options;
   const live = rest.editMode || rest.preview === true;
-  const fetchImpl = rest.fetch ?? (cache && !live ? cmssyCachedFetch(cache) : void 0);
+  const fetchImpl = rest.fetch ?? (cache2 && !live ? cmssyCachedFetch(cache2) : void 0);
   return react.resolveCmssyLayout(config, {
     ...rest,
     retry: rest.retry ?? nextRetryMode(),
+    layoutStore: rest.layoutStore ?? requestLayoutStore(),
     ...fetchImpl ? { fetch: fetchImpl } : {}
   });
 }
@@ -367,7 +399,7 @@ async function CmssyLayoutSlot({
   editable,
   appContext,
   retry,
-  cache,
+  cache: cache2,
   children
 }) {
   const layout = await resolveCmssyLayout(config, {
@@ -379,7 +411,7 @@ async function CmssyLayoutSlot({
     ...page !== void 0 ? { page } : {},
     appContext,
     retry,
-    cache,
+    cache: cache2,
     ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
   });
   if (!children) return layout.element;

package/dist/server.js

@@ -5,9 +5,10 @@ import { createCmssyClient, CmssyServerPage, resolveCmssyLayout as resolveCmssyL
 import { mintCmssyEditToken, CMSSY_SECRET_QUERY_PARAM, resolveEditorOrigin, verifyCmssyWebhook, CmssyWebhookError, CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM } from '@cmssy/core';
 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 { createCmssyLayoutStore, isDevelopment, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, toCspOrigin, cmssySecretsMatch } from '@cmssy/core/internal';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { revalidateTag } from 'next/cache';
+import * as React from 'react';
 
 // src/server.ts
 
@@ -23,10 +24,10 @@ var CMSSY_CONTENT_TAG = "cmssy-content";
 function cmssyContentTags(tags = []) {
   return [.../* @__PURE__ */ new Set([CMSSY_CONTENT_TAG, ...tags])];
 }
-function cmssyCachedFetch(cache) {
+function cmssyCachedFetch(cache2) {
   const next = {
-    revalidate: cache.revalidate,
-    tags: cmssyContentTags(cache.tags)
+    revalidate: cache2.revalidate,
+    tags: cmssyContentTags(cache2.tags)
   };
   return (url, init) => fetch(url, { ...init, next });
 }
@@ -343,13 +344,24 @@ async function isCmssyEditMode() {
   const h = await headers();
   return h.get(CMSSY_EDIT_HEADER) === "1";
 }
+function resolvePerRequest(cache2) {
+  if (typeof cache2 === "function") return cache2;
+  return (factory) => factory;
+}
+var perRequest = resolvePerRequest(
+  React.cache
+);
+
+// src/preset/resolve-cmssy-layout.ts
+var requestLayoutStore = perRequest(createCmssyLayoutStore);
 function resolveCmssyLayout(config, options) {
-  const { cache, ...rest } = options;
+  const { cache: cache2, ...rest } = options;
   const live = rest.editMode || rest.preview === true;
-  const fetchImpl = rest.fetch ?? (cache && !live ? cmssyCachedFetch(cache) : void 0);
+  const fetchImpl = rest.fetch ?? (cache2 && !live ? cmssyCachedFetch(cache2) : void 0);
   return resolveCmssyLayout$1(config, {
     ...rest,
     retry: rest.retry ?? nextRetryMode(),
+    layoutStore: rest.layoutStore ?? requestLayoutStore(),
     ...fetchImpl ? { fetch: fetchImpl } : {}
   });
 }
@@ -365,7 +377,7 @@ async function CmssyLayoutSlot({
   editable,
   appContext,
   retry,
-  cache,
+  cache: cache2,
   children
 }) {
   const layout = await resolveCmssyLayout(config, {
@@ -377,7 +389,7 @@ async function CmssyLayoutSlot({
     ...page !== void 0 ? { page } : {},
     appContext,
     retry,
-    cache,
+    cache: cache2,
     ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
   });
   if (!children) return layout.element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "18.0.0",
+  "version": "19.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": "^18.0.0",
+    "@cmssy/react": "^19.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": "18.0.0"
+    "@cmssy/react": "19.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.54.0",
+    "@cmssy/types": "0.59.0",
     "server-only": "^0.0.1",
-    "@cmssy/core": "18.0.0"
+    "@cmssy/core": "19.1.0"
   },
   "scripts": {
     "build": "tsup",