@cmssy/next 9.10.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

@@ -20,22 +20,18 @@ Object.defineProperty(exports, "CMSSY_SECRET_QUERY_PARAM", {
   enumerable: true,
   get: function () { return core.CMSSY_SECRET_QUERY_PARAM; }
 });
-Object.defineProperty(exports, "CMSSY_SESSION_COOKIE", {
-  enumerable: true,
-  get: function () { return core.CMSSY_SESSION_COOKIE; }
-});
 Object.defineProperty(exports, "DEFAULT_CMSSY_EDITOR_ORIGINS", {
   enumerable: true,
   get: function () { return core.DEFAULT_CMSSY_EDITOR_ORIGINS; }
 });
-Object.defineProperty(exports, "assertAuthConfig", {
-  enumerable: true,
-  get: function () { return core.assertAuthConfig; }
-});
 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_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CMSSY_SESSION_COOKIE, CmssyAuthConfig, CmssyConfig, CmssyEnvConfig, CmssyPageData, CmssyPageMeta, CmssyPageSummary, DEFAULT_CMSSY_EDITOR_ORIGINS, assertAuthConfig, 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_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CMSSY_SESSION_COOKIE, CmssyAuthConfig, CmssyConfig, CmssyEnvConfig, CmssyPageData, CmssyPageMeta, CmssyPageSummary, DEFAULT_CMSSY_EDITOR_ORIGINS, assertAuthConfig, 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_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CMSSY_SESSION_COOKIE, DEFAULT_CMSSY_EDITOR_ORIGINS, assertAuthConfig, 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/middleware.cjs

@@ -1,8 +1,9 @@
 'use strict';
 
 var server = require('next/server');
-var react = require('@cmssy/react');
+var locale = require('@cmssy/core/internal/locale');
 var core = require('@cmssy/core');
+var internal = require('@cmssy/core/internal');
 
 // src/preset/proxy.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -12,7 +13,7 @@ async function cmssyEditRewrite(request, config, options = {}) {
   if (!searchParams.getAll(core.CMSSY_EDIT_QUERY_PARAM).includes("1")) return null;
   const provided = searchParams.get(core.CMSSY_SECRET_QUERY_PARAM);
   if (!provided || !config.draftSecret) return null;
-  if (!await core.cmssySecretsMatch(provided, config.draftSecret)) return null;
+  if (!await internal.cmssySecretsMatch(provided, config.draftSecret)) return null;
   const url = request.nextUrl.clone();
   url.pathname = `${CMSSY_EDIT_PATH_PREFIX}${pathname === "/" ? "" : pathname}`;
   warnIfEditRouteMissing(url);
@@ -49,9 +50,9 @@ function createCmssyProxy(config, options = {}) {
     const { pathname } = request.nextUrl;
     const requestHeaders = new Headers(request.headers);
     requestHeaders.delete(core.CMSSY_EDIT_HEADER);
-    requestHeaders.delete(core.CMSSY_LOCALE_HEADER);
-    const locale = await core.localeForPathname(config, pathname);
-    requestHeaders.set(core.CMSSY_LOCALE_HEADER, locale);
+    requestHeaders.delete(locale.CMSSY_LOCALE_HEADER);
+    const locale$1 = await locale.localeForPathname(config, pathname);
+    requestHeaders.set(locale.CMSSY_LOCALE_HEADER, locale$1);
     const editHeaders = new Headers(requestHeaders);
     editHeaders.set(core.CMSSY_EDIT_HEADER, "1");
     const editRewrite = await cmssyEditRewrite(request, config, {
@@ -61,11 +62,11 @@ function createCmssyProxy(config, options = {}) {
       core.applyCmssyCsp(editRewrite, { editorOrigin: config.editorOrigin });
       return editRewrite;
     }
-    if (options.stripLocalePrefix && pathname.startsWith(`/${locale}`)) {
-      const { defaultLocale } = await react.resolveSiteLocales(config);
-      if (locale !== defaultLocale) {
+    if (options.stripLocalePrefix && pathname.startsWith(`/${locale$1}`)) {
+      const { defaultLocale } = await locale.resolveSiteLocales(config);
+      if (locale$1 !== defaultLocale) {
         const url = request.nextUrl.clone();
-        url.pathname = pathname.slice(locale.length + 1) || "/";
+        url.pathname = pathname.slice(locale$1.length + 1) || "/";
         return server.NextResponse.rewrite(url, {
           request: { headers: requestHeaders }
         });
@@ -75,75 +76,6 @@ function createCmssyProxy(config, options = {}) {
   };
 }
 var cmssyProxyMatcher = ["/((?!_next/|api/|.*\\..*).*)"];
-async function resolveLocaleFromPathname(config, pathname) {
-  const segments = pathname.split("/").filter(Boolean);
-  const siteLocales = await react.resolveSiteLocales({
-    apiUrl: config.apiUrl,
-    org: config.org,
-    workspaceSlug: config.workspaceSlug
-  });
-  return react.splitLocaleFromPath(segments, siteLocales).locale;
-}
-function createCmssyLocaleMiddleware(config) {
-  return async function cmssyLocaleMiddleware(request) {
-    const locale = await resolveLocaleFromPathname(
-      config,
-      request.nextUrl.pathname
-    );
-    const headers = new Headers(request.headers);
-    headers.set(core.CMSSY_LOCALE_HEADER, locale);
-    return server.NextResponse.next({ request: { headers } });
-  };
-}
-function isPrefetch(request) {
-  return request.headers.get("next-router-prefetch") !== null || request.headers.get("purpose") === "prefetch" || (request.headers.get("sec-purpose") ?? "").includes("prefetch");
-}
-function createCmssyAuthMiddleware(config) {
-  const auth = core.assertAuthConfig(config);
-  return async function cmssyAuthMiddleware(request) {
-    const raw = request.cookies.get(core.CMSSY_SESSION_COOKIE)?.value;
-    if (!raw) return server.NextResponse.next();
-    const session = await core.openSession(
-      raw,
-      auth.sessionSecret,
-      config.workspaceSlug
-    );
-    if (!session) {
-      const response = server.NextResponse.next();
-      response.cookies.set(core.CMSSY_SESSION_COOKIE, "", {
-        ...core.sessionCookieOptions(),
-        maxAge: 0
-      });
-      return response;
-    }
-    if (!core.isAccessExpired(session)) return server.NextResponse.next();
-    if (isPrefetch(request)) return server.NextResponse.next();
-    let payload = null;
-    try {
-      const result = await core.backendRefresh(config, session.refreshToken);
-      payload = core.toSessionPayload(result);
-    } catch {
-      return server.NextResponse.next();
-    }
-    if (!payload) {
-      const cleared = server.NextResponse.next();
-      cleared.cookies.set(core.CMSSY_SESSION_COOKIE, "", {
-        ...core.sessionCookieOptions(),
-        maxAge: 0
-      });
-      return cleared;
-    }
-    const sealed = await core.sealSession(
-      payload,
-      auth.sessionSecret,
-      config.workspaceSlug
-    );
-    request.cookies.set(core.CMSSY_SESSION_COOKIE, sealed);
-    const refreshed = server.NextResponse.next({ request });
-    refreshed.cookies.set(core.CMSSY_SESSION_COOKIE, sealed, core.sessionCookieOptions());
-    return refreshed;
-  };
-}
 async function isCmssyEditRequest(request, config) {
   if (request.cookies.has("__prerender_bypass")) return true;
   return core.isVerifiedEditUrl(request.nextUrl, config);
@@ -153,28 +85,13 @@ Object.defineProperty(exports, "CMSSY_EDIT_HEADER", {
   enumerable: true,
   get: function () { return core.CMSSY_EDIT_HEADER; }
 });
-Object.defineProperty(exports, "CMSSY_LOCALE_HEADER", {
-  enumerable: true,
-  get: function () { return core.CMSSY_LOCALE_HEADER; }
-});
 Object.defineProperty(exports, "applyCmssyCsp", {
   enumerable: true,
   get: function () { return core.applyCmssyCsp; }
 });
-Object.defineProperty(exports, "cmssyCspHeaders", {
-  enumerable: true,
-  get: function () { return core.cmssyCspHeaders; }
-});
-Object.defineProperty(exports, "localeForPathname", {
-  enumerable: true,
-  get: function () { return core.localeForPathname; }
-});
 exports.CMSSY_EDIT_PATH_PREFIX = CMSSY_EDIT_PATH_PREFIX;
 exports.cmssyEditRewrite = cmssyEditRewrite;
 exports.cmssyProxyMatcher = cmssyProxyMatcher;
-exports.createCmssyAuthMiddleware = createCmssyAuthMiddleware;
 exports.createCmssyEditMiddleware = createCmssyEditMiddleware;
-exports.createCmssyLocaleMiddleware = createCmssyLocaleMiddleware;
 exports.createCmssyProxy = createCmssyProxy;
 exports.isCmssyEditRequest = isCmssyEditRequest;
-exports.resolveLocaleFromPathname = resolveLocaleFromPathname;

package/dist/middleware.d.cts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { CmssyConfig } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyCspOptions, applyCmssyCsp, cmssyCspHeaders, localeForPathname } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CmssyCspOptions, applyCmssyCsp } from '@cmssy/core';
 
 interface CmssyProxyOptions {
     /**
@@ -72,21 +72,6 @@ declare function createCmssyEditMiddleware(config: {
     draftSecret: string;
 }): (request: NextRequest) => Promise<NextResponse>;
 
-/**
- * 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>;
-/**
- * Middleware that derives the locale from the URL path prefix and forwards it as
- * the `x-cmssy-locale` request header, so server components that can't read the
- * path (root layout) resolve the right locale via `getCmssyLocale`.
- */
-declare function createCmssyLocaleMiddleware(config: CmssyConfig): (request: NextRequest) => Promise<NextResponse>;
-
-type CmssyAuthMiddleware = (request: NextRequest) => Promise<NextResponse>;
-declare function createCmssyAuthMiddleware(config: CmssyConfig): CmssyAuthMiddleware;
-
 interface EditRequestLike {
     cookies: {
         has: (name: string) => boolean;
@@ -102,4 +87,4 @@ declare function isCmssyEditRequest(request: EditRequestLike, config: {
     draftSecret: string;
 }): Promise<boolean>;
 
-export { CMSSY_EDIT_PATH_PREFIX, type CmssyAuthMiddleware, type CmssyProxyOptions, cmssyEditRewrite, cmssyProxyMatcher, createCmssyAuthMiddleware, createCmssyEditMiddleware, createCmssyLocaleMiddleware, createCmssyProxy, isCmssyEditRequest, resolveLocaleFromPathname };
+export { CMSSY_EDIT_PATH_PREFIX, type CmssyProxyOptions, cmssyEditRewrite, cmssyProxyMatcher, createCmssyEditMiddleware, createCmssyProxy, isCmssyEditRequest };

package/dist/middleware.d.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { CmssyConfig } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyCspOptions, applyCmssyCsp, cmssyCspHeaders, localeForPathname } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CmssyCspOptions, applyCmssyCsp } from '@cmssy/core';
 
 interface CmssyProxyOptions {
     /**
@@ -72,21 +72,6 @@ declare function createCmssyEditMiddleware(config: {
     draftSecret: string;
 }): (request: NextRequest) => Promise<NextResponse>;
 
-/**
- * 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>;
-/**
- * Middleware that derives the locale from the URL path prefix and forwards it as
- * the `x-cmssy-locale` request header, so server components that can't read the
- * path (root layout) resolve the right locale via `getCmssyLocale`.
- */
-declare function createCmssyLocaleMiddleware(config: CmssyConfig): (request: NextRequest) => Promise<NextResponse>;
-
-type CmssyAuthMiddleware = (request: NextRequest) => Promise<NextResponse>;
-declare function createCmssyAuthMiddleware(config: CmssyConfig): CmssyAuthMiddleware;
-
 interface EditRequestLike {
     cookies: {
         has: (name: string) => boolean;
@@ -102,4 +87,4 @@ declare function isCmssyEditRequest(request: EditRequestLike, config: {
     draftSecret: string;
 }): Promise<boolean>;
 
-export { CMSSY_EDIT_PATH_PREFIX, type CmssyAuthMiddleware, type CmssyProxyOptions, cmssyEditRewrite, cmssyProxyMatcher, createCmssyAuthMiddleware, createCmssyEditMiddleware, createCmssyLocaleMiddleware, createCmssyProxy, isCmssyEditRequest, resolveLocaleFromPathname };
+export { CMSSY_EDIT_PATH_PREFIX, type CmssyProxyOptions, cmssyEditRewrite, cmssyProxyMatcher, createCmssyEditMiddleware, createCmssyProxy, isCmssyEditRequest };

package/dist/middleware.js

@@ -1,7 +1,8 @@
 import { NextResponse } from 'next/server';
-import { resolveSiteLocales, splitLocaleFromPath } from '@cmssy/react';
-import { CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM, cmssySecretsMatch, CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, localeForPathname, applyCmssyCsp, assertAuthConfig, CMSSY_SESSION_COOKIE, openSession, sessionCookieOptions, isAccessExpired, backendRefresh, toSessionPayload, sealSession, isVerifiedEditUrl } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, applyCmssyCsp, cmssyCspHeaders, localeForPathname } from '@cmssy/core';
+import { CMSSY_LOCALE_HEADER, localeForPathname, resolveSiteLocales } from '@cmssy/core/internal/locale';
+import { CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM, CMSSY_EDIT_HEADER, applyCmssyCsp, isVerifiedEditUrl } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, applyCmssyCsp } from '@cmssy/core';
+import { cmssySecretsMatch } from '@cmssy/core/internal';
 
 // src/preset/proxy.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -74,78 +75,9 @@ function createCmssyProxy(config, options = {}) {
   };
 }
 var cmssyProxyMatcher = ["/((?!_next/|api/|.*\\..*).*)"];
-async function resolveLocaleFromPathname(config, pathname) {
-  const segments = pathname.split("/").filter(Boolean);
-  const siteLocales = await resolveSiteLocales({
-    apiUrl: config.apiUrl,
-    org: config.org,
-    workspaceSlug: config.workspaceSlug
-  });
-  return splitLocaleFromPath(segments, siteLocales).locale;
-}
-function createCmssyLocaleMiddleware(config) {
-  return async function cmssyLocaleMiddleware(request) {
-    const locale = await resolveLocaleFromPathname(
-      config,
-      request.nextUrl.pathname
-    );
-    const headers = new Headers(request.headers);
-    headers.set(CMSSY_LOCALE_HEADER, locale);
-    return NextResponse.next({ request: { headers } });
-  };
-}
-function isPrefetch(request) {
-  return request.headers.get("next-router-prefetch") !== null || request.headers.get("purpose") === "prefetch" || (request.headers.get("sec-purpose") ?? "").includes("prefetch");
-}
-function createCmssyAuthMiddleware(config) {
-  const auth = assertAuthConfig(config);
-  return async function cmssyAuthMiddleware(request) {
-    const raw = request.cookies.get(CMSSY_SESSION_COOKIE)?.value;
-    if (!raw) return NextResponse.next();
-    const session = await openSession(
-      raw,
-      auth.sessionSecret,
-      config.workspaceSlug
-    );
-    if (!session) {
-      const response = NextResponse.next();
-      response.cookies.set(CMSSY_SESSION_COOKIE, "", {
-        ...sessionCookieOptions(),
-        maxAge: 0
-      });
-      return response;
-    }
-    if (!isAccessExpired(session)) return NextResponse.next();
-    if (isPrefetch(request)) return NextResponse.next();
-    let payload = null;
-    try {
-      const result = await backendRefresh(config, session.refreshToken);
-      payload = toSessionPayload(result);
-    } catch {
-      return NextResponse.next();
-    }
-    if (!payload) {
-      const cleared = NextResponse.next();
-      cleared.cookies.set(CMSSY_SESSION_COOKIE, "", {
-        ...sessionCookieOptions(),
-        maxAge: 0
-      });
-      return cleared;
-    }
-    const sealed = await sealSession(
-      payload,
-      auth.sessionSecret,
-      config.workspaceSlug
-    );
-    request.cookies.set(CMSSY_SESSION_COOKIE, sealed);
-    const refreshed = NextResponse.next({ request });
-    refreshed.cookies.set(CMSSY_SESSION_COOKIE, sealed, sessionCookieOptions());
-    return refreshed;
-  };
-}
 async function isCmssyEditRequest(request, config) {
   if (request.cookies.has("__prerender_bypass")) return true;
   return isVerifiedEditUrl(request.nextUrl, config);
 }
 
-export { CMSSY_EDIT_PATH_PREFIX, cmssyEditRewrite, cmssyProxyMatcher, createCmssyAuthMiddleware, createCmssyEditMiddleware, createCmssyLocaleMiddleware, createCmssyProxy, isCmssyEditRequest, resolveLocaleFromPathname };
+export { CMSSY_EDIT_PATH_PREFIX, cmssyEditRewrite, cmssyProxyMatcher, createCmssyEditMiddleware, createCmssyProxy, isCmssyEditRequest };