@cmssy/next 8.0.4 → 9.0.0

package/dist/middleware.cjs

@@ -77,16 +77,11 @@ function createCmssyProxy(config, options = {}) {
 var cmssyProxyMatcher = ["/((?!_next/|api/|.*\\..*).*)"];
 async function resolveLocaleFromPathname(config, pathname) {
   const segments = pathname.split("/").filter(Boolean);
-  const hasStaticLocales = !!config.enabledLocales?.length;
-  const fetched = config.defaultLocale && hasStaticLocales ? null : await react.resolveSiteLocales({
+  const siteLocales = await react.resolveSiteLocales({
     apiUrl: config.apiUrl,
     org: config.org,
     workspaceSlug: config.workspaceSlug
   });
-  const siteLocales = {
-    defaultLocale: config.defaultLocale ?? fetched.defaultLocale,
-    locales: hasStaticLocales ? config.enabledLocales : fetched.locales
-  };
   return react.splitLocaleFromPath(segments, siteLocales).locale;
 }
 function createCmssyLocaleMiddleware(config) {

package/dist/middleware.d.cts

@@ -73,9 +73,8 @@ declare function createCmssyEditMiddleware(config: {
 }): (request: NextRequest) => Promise<NextResponse>;
 
 /**
- * Resolves the active locale from a pathname's leading segment. Uses the
- * config's static `defaultLocale` + `enabledLocales` when both are set (no
- * network); otherwise fetches the workspace locales (cached).
+ * Resolves the active locale from a pathname's leading segment, against the
+ * workspace locales (fetched, cached 60s).
  */
 declare function resolveLocaleFromPathname(config: CmssyConfig, pathname: string): Promise<string>;
 /**

package/dist/middleware.d.ts

@@ -73,9 +73,8 @@ declare function createCmssyEditMiddleware(config: {
 }): (request: NextRequest) => Promise<NextResponse>;
 
 /**
- * Resolves the active locale from a pathname's leading segment. Uses the
- * config's static `defaultLocale` + `enabledLocales` when both are set (no
- * network); otherwise fetches the workspace locales (cached).
+ * Resolves the active locale from a pathname's leading segment, against the
+ * workspace locales (fetched, cached 60s).
  */
 declare function resolveLocaleFromPathname(config: CmssyConfig, pathname: string): Promise<string>;
 /**

package/dist/middleware.js

@@ -76,16 +76,11 @@ function createCmssyProxy(config, options = {}) {
 var cmssyProxyMatcher = ["/((?!_next/|api/|.*\\..*).*)"];
 async function resolveLocaleFromPathname(config, pathname) {
   const segments = pathname.split("/").filter(Boolean);
-  const hasStaticLocales = !!config.enabledLocales?.length;
-  const fetched = config.defaultLocale && hasStaticLocales ? null : await resolveSiteLocales({
+  const siteLocales = await resolveSiteLocales({
     apiUrl: config.apiUrl,
     org: config.org,
     workspaceSlug: config.workspaceSlug
   });
-  const siteLocales = {
-    defaultLocale: config.defaultLocale ?? fetched.defaultLocale,
-    locales: hasStaticLocales ? config.enabledLocales : fetched.locales
-  };
   return splitLocaleFromPath(segments, siteLocales).locale;
 }
 function createCmssyLocaleMiddleware(config) {

package/dist/server.cjs

@@ -80,17 +80,12 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     const devAllowed = core.isDevelopment() && Boolean(config.devToken?.trim());
     let locale;
     let pagePath = path;
-    let defaultLocale;
-    let enabledLocales = config.enabledLocales;
+    const siteLocales = await react.resolveSiteLocales(clientConfig);
+    const { defaultLocale, locales: enabledLocales } = siteLocales;
     if (config.resolveLocale) {
-      defaultLocale = config.defaultLocale ?? (await react.resolveSiteLocales(clientConfig)).defaultLocale;
       locale = await config.resolveLocale();
     } else {
-      const siteLocales = await react.resolveSiteLocales(clientConfig);
-      defaultLocale = config.defaultLocale ?? siteLocales.defaultLocale;
-      const locales = config.enabledLocales ?? siteLocales.locales;
-      enabledLocales = locales;
-      const split = react.splitLocaleFromPath(path, { defaultLocale, locales });
+      const split = react.splitLocaleFromPath(path, siteLocales);
       locale = split.locale;
       pagePath = split.path;
     }
@@ -119,7 +114,7 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     const localeContext = {
       current: locale,
       default: defaultLocale,
-      enabled: enabledLocales && enabledLocales.length > 0 ? enabledLocales : Array.from(/* @__PURE__ */ new Set([defaultLocale, locale]))
+      enabled: enabledLocales
     };
     if (editorActive && Editor) {
       const bridgeOrigin = resolveBridgeOrigin(config.editorOrigin);
@@ -236,18 +231,8 @@ function createCmssyNotFound(config, blocks, options) {
       if (!notFoundPageId) return fallback;
       const page = await react.fetchPageById(clientConfig, notFoundPageId);
       if (!page || page.blocks.length === 0) return fallback;
-      let locale;
-      let defaultLocale;
-      let enabledLocales = config.enabledLocales;
-      if (config.resolveLocale) {
-        defaultLocale = config.defaultLocale ?? "en";
-        locale = await config.resolveLocale();
-      } else {
-        const siteLocales = await react.resolveSiteLocales(clientConfig);
-        defaultLocale = config.defaultLocale ?? siteLocales.defaultLocale;
-        enabledLocales = config.enabledLocales ?? siteLocales.locales;
-        locale = defaultLocale;
-      }
+      const { defaultLocale, locales: enabledLocales } = await react.resolveSiteLocales(clientConfig);
+      const locale = config.resolveLocale ? await config.resolveLocale() : defaultLocale;
       const resolvedForms = await react.resolveForms(
         clientConfig,
         page.blocks,
@@ -258,7 +243,7 @@ function createCmssyNotFound(config, blocks, options) {
       const localeContext = {
         current: locale,
         default: defaultLocale,
-        enabled: enabledLocales && enabledLocales.length > 0 ? enabledLocales : Array.from(/* @__PURE__ */ new Set([defaultLocale, locale]))
+        enabled: enabledLocales
       };
       return /* @__PURE__ */ jsxRuntime.jsx(client.CmssyLocaleProvider, { value: localeContext, children: /* @__PURE__ */ jsxRuntime.jsx(
         react.CmssyServerPage,
@@ -391,10 +376,7 @@ async function buildCmssyMetadata(config, path, options = {}) {
     react.fetchSiteConfig(clientConfig).catch(() => null),
     resolveSeoBaseUrl(config, options.baseUrl)
   ]);
-  const { defaultLocale, locales: enabledLocales } = core.resolveSeoLocales(
-    config,
-    siteConfig
-  );
+  const { defaultLocale, locales: enabledLocales } = core.localesFromSiteConfig(siteConfig);
   const segments = Array.isArray(path) ? path : path ? path.split("/").filter(Boolean) : void 0;
   const fromPath = react.splitLocaleFromPath(segments, {
     defaultLocale,
@@ -489,7 +471,7 @@ function createCmssySitemap(config, options = {}) {
     }
     const notFoundPageId = siteConfig?.notFoundPageId ?? null;
     const baseUrl = await resolveSeoBaseUrl(config, options.baseUrl);
-    const { defaultLocale, locales } = core.resolveSeoLocales(config, siteConfig);
+    const { defaultLocale, locales } = core.localesFromSiteConfig(siteConfig);
     const excluded = new Set((options.excludeSlugs ?? []).map(core.normalizeSlug));
     const languagesFor = (slug) => locales.length > 1 ? {
       languages: {

package/dist/server.js

@@ -3,7 +3,7 @@ import { draftMode, headers, cookies } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
 import { createCmssyClient, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, resolveBlockData, CmssyServerPage, fetchSiteConfig, fetchPageById, fetchLayouts, resolveLayoutBlockData, CmssyServerLayout, normalizeSlug, fetchPageMeta, fetchPages } from '@cmssy/react';
 import { CmssyLocaleProvider } from '@cmssy/react/client';
-import { isDevelopment, resolveEditorOrigin, toCspOrigin, CMSSY_EDIT_HEADER, localeForPath, CMSSY_LOCALE_HEADER, resolveSiteLocales as resolveSiteLocales$1, resolveSeoLocales, localizedPath, normalizeSlug as normalizeSlug$1, assertAuthConfig, backendProduct, backendCheckout, backendMergeCart, backendSetShippingMethod, backendRemoveDiscount, backendApplyDiscount, backendClearCart, backendRemoveItem, backendUpdateItem, backendAddToCart, backendGetCart, backendMyOrder, backendMyOrders, cmssySecretsMatch, fetchProducts as fetchProducts$1, fetchProduct as fetchProduct$1, backendSignIn, toSessionPayload, backendRegister, backendSignOut, isAccessExpired, backendSignOutEverywhere, backendForgotPassword, backendResetPassword, backendVerifyEmail, CMSSY_SESSION_COOKIE, openSession, CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM, sealSession, sessionCookieOptions, backendRefresh } from '@cmssy/core';
+import { isDevelopment, resolveEditorOrigin, toCspOrigin, CMSSY_EDIT_HEADER, localeForPath, CMSSY_LOCALE_HEADER, resolveSiteLocales as resolveSiteLocales$1, localesFromSiteConfig, localizedPath, normalizeSlug as normalizeSlug$1, assertAuthConfig, backendProduct, backendCheckout, backendMergeCart, backendSetShippingMethod, backendRemoveDiscount, backendApplyDiscount, backendClearCart, backendRemoveItem, backendUpdateItem, backendAddToCart, backendGetCart, backendMyOrder, backendMyOrders, cmssySecretsMatch, fetchProducts as fetchProducts$1, fetchProduct as fetchProduct$1, backendSignIn, toSessionPayload, backendRegister, backendSignOut, isAccessExpired, backendSignOutEverywhere, backendForgotPassword, backendResetPassword, backendVerifyEmail, CMSSY_SESSION_COOKIE, openSession, CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM, sealSession, sessionCookieOptions, backendRefresh } from '@cmssy/core';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
 // src/server.ts
@@ -78,17 +78,12 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     const devAllowed = isDevelopment() && Boolean(config.devToken?.trim());
     let locale;
     let pagePath = path;
-    let defaultLocale;
-    let enabledLocales = config.enabledLocales;
+    const siteLocales = await resolveSiteLocales(clientConfig);
+    const { defaultLocale, locales: enabledLocales } = siteLocales;
     if (config.resolveLocale) {
-      defaultLocale = config.defaultLocale ?? (await resolveSiteLocales(clientConfig)).defaultLocale;
       locale = await config.resolveLocale();
     } else {
-      const siteLocales = await resolveSiteLocales(clientConfig);
-      defaultLocale = config.defaultLocale ?? siteLocales.defaultLocale;
-      const locales = config.enabledLocales ?? siteLocales.locales;
-      enabledLocales = locales;
-      const split = splitLocaleFromPath(path, { defaultLocale, locales });
+      const split = splitLocaleFromPath(path, siteLocales);
       locale = split.locale;
       pagePath = split.path;
     }
@@ -117,7 +112,7 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     const localeContext = {
       current: locale,
       default: defaultLocale,
-      enabled: enabledLocales && enabledLocales.length > 0 ? enabledLocales : Array.from(/* @__PURE__ */ new Set([defaultLocale, locale]))
+      enabled: enabledLocales
     };
     if (editorActive && Editor) {
       const bridgeOrigin = resolveBridgeOrigin(config.editorOrigin);
@@ -234,18 +229,8 @@ function createCmssyNotFound(config, blocks, options) {
       if (!notFoundPageId) return fallback;
       const page = await fetchPageById(clientConfig, notFoundPageId);
       if (!page || page.blocks.length === 0) return fallback;
-      let locale;
-      let defaultLocale;
-      let enabledLocales = config.enabledLocales;
-      if (config.resolveLocale) {
-        defaultLocale = config.defaultLocale ?? "en";
-        locale = await config.resolveLocale();
-      } else {
-        const siteLocales = await resolveSiteLocales(clientConfig);
-        defaultLocale = config.defaultLocale ?? siteLocales.defaultLocale;
-        enabledLocales = config.enabledLocales ?? siteLocales.locales;
-        locale = defaultLocale;
-      }
+      const { defaultLocale, locales: enabledLocales } = await resolveSiteLocales(clientConfig);
+      const locale = config.resolveLocale ? await config.resolveLocale() : defaultLocale;
       const resolvedForms = await resolveForms(
         clientConfig,
         page.blocks,
@@ -256,7 +241,7 @@ function createCmssyNotFound(config, blocks, options) {
       const localeContext = {
         current: locale,
         default: defaultLocale,
-        enabled: enabledLocales && enabledLocales.length > 0 ? enabledLocales : Array.from(/* @__PURE__ */ new Set([defaultLocale, locale]))
+        enabled: enabledLocales
       };
       return /* @__PURE__ */ jsx(CmssyLocaleProvider, { value: localeContext, children: /* @__PURE__ */ jsx(
         CmssyServerPage,
@@ -389,10 +374,7 @@ async function buildCmssyMetadata(config, path, options = {}) {
     fetchSiteConfig(clientConfig).catch(() => null),
     resolveSeoBaseUrl(config, options.baseUrl)
   ]);
-  const { defaultLocale, locales: enabledLocales } = resolveSeoLocales(
-    config,
-    siteConfig
-  );
+  const { defaultLocale, locales: enabledLocales } = localesFromSiteConfig(siteConfig);
   const segments = Array.isArray(path) ? path : path ? path.split("/").filter(Boolean) : void 0;
   const fromPath = splitLocaleFromPath(segments, {
     defaultLocale,
@@ -487,7 +469,7 @@ function createCmssySitemap(config, options = {}) {
     }
     const notFoundPageId = siteConfig?.notFoundPageId ?? null;
     const baseUrl = await resolveSeoBaseUrl(config, options.baseUrl);
-    const { defaultLocale, locales } = resolveSeoLocales(config, siteConfig);
+    const { defaultLocale, locales } = localesFromSiteConfig(siteConfig);
     const excluded = new Set((options.excludeSlugs ?? []).map(normalizeSlug$1));
     const languagesFor = (slug) => locales.length > 1 ? {
       languages: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "8.0.4",
+  "version": "9.0.0",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -70,12 +70,12 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "8.0.4"
+    "@cmssy/react": "9.0.0"
   },
   "dependencies": {
     "@cmssy/types": "0.28.0",
     "server-only": "^0.0.1",
-    "@cmssy/core": "8.0.4"
+    "@cmssy/core": "9.0.0"
   },
   "scripts": {
     "build": "tsup",