@cmssy/next 10.0.0 → 10.1.0

package/README.md

@@ -61,18 +61,19 @@ Helpers to frame the page inside the cmssy editor only in edit mode.
 
 The active locale lives in the URL path prefix (`/en/about`; the default locale
 stays bare). `createCmssyPage` resolves it and exposes it via `CmssyLocaleProvider`.
-For the locale to survive navigation, internal links must carry the prefix - use
-`CmssyLink` instead of `next/link` / `<a>`:
+For the locale to survive navigation, internal links must carry the prefix -
+prefix hrefs yourself with `localizeHref` and pass the result to `next/link`:
 
 ```tsx
 // any block component
-import { CmssyLink } from "@cmssy/next/client";
+import Link from "next/link";
+import { localizeHref } from "@cmssy/next";
 
-<CmssyLink href="/about">About</CmssyLink>; // → /en/about while EN is active
+<Link href={localizeHref("/about", locale)}>About</Link>; // → /en/about while EN is active
 ```
 
 Add middleware so the root layout (which can't read the path) resolves the right
-locale via `getCmssyLocale`. On Next.js 16 the file is `proxy.ts` (the renamed
+locale from the path prefix. On Next.js 16 the file is `proxy.ts` (the renamed
 middleware convention); on Next.js 15 use `middleware.ts` with the same body.
 
 ```ts
@@ -87,16 +88,14 @@ export const config = { matcher: ["/((?!_next/|api/|.*\\..*).*)"] };
 On Next.js 15, name the file `middleware.ts` and rename the export to
 `middleware` (`export const middleware = createCmssyLocaleMiddleware(cmssy)`).
 
-Language switcher and raw markup helpers live in `@cmssy/react`:
-`buildLocaleSwitchHref(target, pathname, locale)`, `localizeHref(href, locale)`,
-`localizeHtmlLinks(html, locale)`.
+`localizeHref(href, locale)` and the `CMSSY_LOCALE_HEADER` constant are
+re-exported from `@cmssy/next` (and `@cmssy/core`).
 
 ## Exports
 
 `createCmssyPage`, `createDraftRoute`, `cmssyCspHeaders` / `applyCmssyCsp`,
 `isCmssyEditRequest` / `isCmssyEditMode`, `createCmssyLocaleMiddleware` /
-`resolveLocaleFromPathname`, the `CmssyConfig` type, and from
-`@cmssy/next/client`: `CmssyLink`, `CmssyLocaleProvider`, `useCmssyLocale`.
+`resolveLocaleFromPathname`, and the `CmssyConfig` type.
 
 ## License
 

package/dist/index.cjs

@@ -12,6 +12,10 @@ Object.defineProperty(exports, "CMSSY_EDIT_QUERY_PARAM", {
   enumerable: true,
   get: function () { return core.CMSSY_EDIT_QUERY_PARAM; }
 });
+Object.defineProperty(exports, "CMSSY_LOCALE_HEADER", {
+  enumerable: true,
+  get: function () { return core.CMSSY_LOCALE_HEADER; }
+});
 Object.defineProperty(exports, "CMSSY_SECRET_QUERY_PARAM", {
   enumerable: true,
   get: function () { return core.CMSSY_SECRET_QUERY_PARAM; }
@@ -24,6 +28,10 @@ Object.defineProperty(exports, "defineCmssyConfig", {
   enumerable: true,
   get: function () { return core.defineCmssyConfig; }
 });
+Object.defineProperty(exports, "localizeHref", {
+  enumerable: true,
+  get: function () { return core.localizeHref; }
+});
 Object.defineProperty(exports, "resolveEditorOrigin", {
   enumerable: true,
   get: function () { return core.resolveEditorOrigin; }

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyPageData, CmssyPageMeta, CmssyPageSummary, DEFAULT_CMSSY_EDITOR_ORIGINS, defineCmssyConfig, resolveEditorOrigin } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyPageData, CmssyPageMeta, CmssyPageSummary, DEFAULT_CMSSY_EDITOR_ORIGINS, defineCmssyConfig, localizeHref, resolveEditorOrigin } from '@cmssy/core';
 export { C as CmssyEditorProps, a as CreateCmssyPageOptions } from './index-C4vUxDkk.cjs';
 import 'react/jsx-runtime';
 import 'react';

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyPageData, CmssyPageMeta, CmssyPageSummary, DEFAULT_CMSSY_EDITOR_ORIGINS, defineCmssyConfig, resolveEditorOrigin } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyPageData, CmssyPageMeta, CmssyPageSummary, DEFAULT_CMSSY_EDITOR_ORIGINS, defineCmssyConfig, localizeHref, resolveEditorOrigin } from '@cmssy/core';
 export { C as CmssyEditorProps, a as CreateCmssyPageOptions } from './index-C4vUxDkk.js';
 import 'react/jsx-runtime';
 import 'react';

package/dist/index.js

@@ -1 +1 @@
-export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM, DEFAULT_CMSSY_EDITOR_ORIGINS, defineCmssyConfig, resolveEditorOrigin } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, DEFAULT_CMSSY_EDITOR_ORIGINS, defineCmssyConfig, localizeHref, resolveEditorOrigin } from '@cmssy/core';

package/dist/server.cjs

@@ -5,6 +5,7 @@ var headers = require('next/headers');
 var navigation = require('next/navigation');
 var react = require('@cmssy/react');
 var internal$1 = require('@cmssy/react/internal');
+var internalServer = require('@cmssy/react/internal-server');
 var internal = require('@cmssy/core/internal');
 var core = require('@cmssy/core');
 var jsxRuntime = require('react/jsx-runtime');
@@ -101,7 +102,7 @@ function buildCmssyPageRenderer(config, blocks, options, editRoute) {
     };
     if (editorActive && Editor) {
       const bridgeOrigin = resolveBridgeOrigin(config.editorOrigin);
-      const editorData = await react.resolveEditorBlockData({
+      const editorData = await internalServer.resolveEditorBlockData({
         page,
         blocks,
         locale,
@@ -240,17 +241,6 @@ function createDraftRoute(config) {
     navigation.redirect(location);
   };
 }
-async function getCmssyLocale(config, options) {
-  if (options?.path !== void 0) {
-    return internal.localeForPath(config, options.path);
-  }
-  const { headers: headers3 } = await import('next/headers');
-  const headerList = await headers3();
-  const fromHeader = headerList.get(internal.CMSSY_LOCALE_HEADER);
-  if (fromHeader) return fromHeader;
-  const { defaultLocale } = await internal.resolveSiteLocales(config);
-  return defaultLocale;
-}
 async function isCmssyEditMode() {
   const h = await headers.headers();
   return h.get(core.CMSSY_EDIT_HEADER) === "1";
@@ -259,5 +249,4 @@ async function isCmssyEditMode() {
 exports.createCmssyEditPage = createCmssyEditPage;
 exports.createCmssyPage = createCmssyPage;
 exports.createDraftRoute = createDraftRoute;
-exports.getCmssyLocale = getCmssyLocale;
 exports.isCmssyEditMode = isCmssyEditMode;

package/dist/server.d.cts

@@ -1,5 +1,5 @@
 export { C as CmssyEditorProps, a as CreateCmssyPageOptions, c as createCmssyEditPage, b as createCmssyPage } from './index-C4vUxDkk.cjs';
-import { CmssyConfig, CmssyClientConfig } from '@cmssy/core';
+import { CmssyConfig } from '@cmssy/core';
 import 'react/jsx-runtime';
 import 'react';
 import '@cmssy/react';
@@ -10,16 +10,6 @@ type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
 };
 declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Request) => Promise<Response>;
 
-/**
- * Resolve the active locale. Pass `options.path` (route params) wherever
- * possible - that path is static-safe. The no-argument form falls back to the
- * `x-cmssy-locale` request header, which reads `headers()` and forces the
- * calling route into dynamic rendering.
- */
-declare function getCmssyLocale(config: CmssyClientConfig, options?: {
-    path?: string | string[];
-}): Promise<string>;
-
 declare function isCmssyEditMode(): Promise<boolean>;
 
-export { type CmssyDraftRouteConfig, createDraftRoute, getCmssyLocale, isCmssyEditMode };
+export { type CmssyDraftRouteConfig, createDraftRoute, isCmssyEditMode };

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 export { C as CmssyEditorProps, a as CreateCmssyPageOptions, c as createCmssyEditPage, b as createCmssyPage } from './index-C4vUxDkk.js';
-import { CmssyConfig, CmssyClientConfig } from '@cmssy/core';
+import { CmssyConfig } from '@cmssy/core';
 import 'react/jsx-runtime';
 import 'react';
 import '@cmssy/react';
@@ -10,16 +10,6 @@ type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
 };
 declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Request) => Promise<Response>;
 
-/**
- * Resolve the active locale. Pass `options.path` (route params) wherever
- * possible - that path is static-safe. The no-argument form falls back to the
- * `x-cmssy-locale` request header, which reads `headers()` and forces the
- * calling route into dynamic rendering.
- */
-declare function getCmssyLocale(config: CmssyClientConfig, options?: {
-    path?: string | string[];
-}): Promise<string>;
-
 declare function isCmssyEditMode(): Promise<boolean>;
 
-export { type CmssyDraftRouteConfig, createDraftRoute, getCmssyLocale, isCmssyEditMode };
+export { type CmssyDraftRouteConfig, createDraftRoute, isCmssyEditMode };

package/dist/server.js

@@ -1,9 +1,10 @@
 import 'server-only';
 import { draftMode, headers } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
-import { createCmssyClient, resolveEditorBlockData, CmssyServerPage } from '@cmssy/react';
+import { createCmssyClient, CmssyServerPage } from '@cmssy/react';
 import { CmssyLocaleProvider } from '@cmssy/react/internal';
-import { isDevelopment, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, toCspOrigin, cmssySecretsMatch, localeForPath, CMSSY_LOCALE_HEADER } from '@cmssy/core/internal';
+import { 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 { jsx } from 'react/jsx-runtime';
 
@@ -238,20 +239,9 @@ function createDraftRoute(config) {
     redirect(location);
   };
 }
-async function getCmssyLocale(config, options) {
-  if (options?.path !== void 0) {
-    return localeForPath(config, options.path);
-  }
-  const { headers: headers3 } = await import('next/headers');
-  const headerList = await headers3();
-  const fromHeader = headerList.get(CMSSY_LOCALE_HEADER);
-  if (fromHeader) return fromHeader;
-  const { defaultLocale } = await resolveSiteLocales(config);
-  return defaultLocale;
-}
 async function isCmssyEditMode() {
   const h = await headers();
   return h.get(CMSSY_EDIT_HEADER) === "1";
 }
 
-export { createCmssyEditPage, createCmssyPage, createDraftRoute, getCmssyLocale, isCmssyEditMode };
+export { createCmssyEditPage, createCmssyPage, createDraftRoute, isCmssyEditMode };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -38,11 +38,6 @@
       "import": "./dist/middleware.js",
       "require": "./dist/middleware.cjs"
     },
-    "./client": {
-      "types": "./dist/client.d.ts",
-      "import": "./dist/client.js",
-      "require": "./dist/client.cjs"
-    },
     "./testing": {
       "types": "./dist/testing.d.ts",
       "import": "./dist/testing.js",
@@ -70,12 +65,12 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "10.0.0"
+    "@cmssy/react": "10.1.0"
   },
   "dependencies": {
     "@cmssy/types": "0.29.0",
     "server-only": "^0.0.1",
-    "@cmssy/core": "10.0.0"
+    "@cmssy/core": "10.1.0"
   },
   "scripts": {
     "build": "tsup",

package/dist/client.cjs

@@ -1,21 +0,0 @@
-"use client";
-'use strict';
-
-var Link = require('next/link');
-var internal$1 = require('@cmssy/core/internal');
-var internal = require('@cmssy/react/internal');
-var jsxRuntime = require('react/jsx-runtime');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var Link__default = /*#__PURE__*/_interopDefault(Link);
-
-// src/cmssy-link.tsx
-function CmssyLink({ href, locale, ...rest }) {
-  const fromContext = internal.useCmssyLocale();
-  const active = locale ?? fromContext;
-  const resolved = active ? internal$1.localizeHref(href, active) : href;
-  return /* @__PURE__ */ jsxRuntime.jsx(Link__default.default, { href: resolved, ...rest });
-}
-
-exports.CmssyLink = CmssyLink;

package/dist/client.d.cts

@@ -1,18 +0,0 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
-import Link from 'next/link';
-import { ComponentProps } from 'react';
-import { CmssyLocaleContext } from '@cmssy/react';
-
-interface CmssyLinkProps extends Omit<ComponentProps<typeof Link>, "href" | "locale"> {
-    href: string;
-    /** Override the active locale (defaults to the nearest CmssyLocaleProvider). */
-    locale?: CmssyLocaleContext;
-}
-/**
- * `next/link` that prefixes internal hrefs with the active locale, so navigation
- * preserves the language. Reads the locale from the nearest
- * `CmssyLocaleProvider`; falls back to the raw href when none is mounted.
- */
-declare function CmssyLink({ href, locale, ...rest }: CmssyLinkProps): react_jsx_runtime.JSX.Element;
-
-export { CmssyLink, type CmssyLinkProps };

package/dist/client.d.ts

@@ -1,18 +0,0 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
-import Link from 'next/link';
-import { ComponentProps } from 'react';
-import { CmssyLocaleContext } from '@cmssy/react';
-
-interface CmssyLinkProps extends Omit<ComponentProps<typeof Link>, "href" | "locale"> {
-    href: string;
-    /** Override the active locale (defaults to the nearest CmssyLocaleProvider). */
-    locale?: CmssyLocaleContext;
-}
-/**
- * `next/link` that prefixes internal hrefs with the active locale, so navigation
- * preserves the language. Reads the locale from the nearest
- * `CmssyLocaleProvider`; falls back to the raw href when none is mounted.
- */
-declare function CmssyLink({ href, locale, ...rest }: CmssyLinkProps): react_jsx_runtime.JSX.Element;
-
-export { CmssyLink, type CmssyLinkProps };

package/dist/client.js

@@ -1,15 +0,0 @@
-"use client";
-import Link from 'next/link';
-import { localizeHref } from '@cmssy/core/internal';
-import { useCmssyLocale } from '@cmssy/react/internal';
-import { jsx } from 'react/jsx-runtime';
-
-// src/cmssy-link.tsx
-function CmssyLink({ href, locale, ...rest }) {
-  const fromContext = useCmssyLocale();
-  const active = locale ?? fromContext;
-  const resolved = active ? localizeHref(href, active) : href;
-  return /* @__PURE__ */ jsx(Link, { href: resolved, ...rest });
-}
-
-export { CmssyLink };