@cmssy/next 4.0.1 → 4.1.0

package/dist/index.cjs

@@ -586,23 +586,25 @@ function createCmssySitemap(config, options = {}) {
     const baseUrl = await resolveSeoBaseUrl(config, options.baseUrl);
     const { defaultLocale, locales } = resolveSeoLocales(config, siteConfig);
     const excluded = new Set((options.excludeSlugs ?? []).map(normalizeSlug));
-    const entries = pages.map((page) => ({ ...page, slug: normalizeSlug(page.slug) })).filter((page) => page.id !== notFoundPageId && !excluded.has(page.slug)).map((page) => {
-      const lastModified = page.updatedAt ?? page.publishedAt ?? void 0;
-      const entry = {
-        url: `${baseUrl}${localizedPath(page.slug, defaultLocale, defaultLocale)}`,
-        ...lastModified ? { lastModified: new Date(lastModified) } : {}
-      };
-      if (locales.length > 1) {
-        entry.alternates = {
-          languages: Object.fromEntries(
-            locales.map((locale) => [
-              locale,
-              `${baseUrl}${localizedPath(page.slug, locale, defaultLocale)}`
-            ])
-          )
-        };
+    const languagesFor = (slug) => locales.length > 1 ? {
+      languages: {
+        ...Object.fromEntries(
+          locales.map((locale) => [
+            locale,
+            `${baseUrl}${localizedPath(slug, locale, defaultLocale)}`
+          ])
+        ),
+        "x-default": `${baseUrl}${localizedPath(slug, defaultLocale, defaultLocale)}`
       }
-      return entry;
+    } : void 0;
+    const entries = pages.map((page) => ({ ...page, slug: normalizeSlug(page.slug) })).filter((page) => page.id !== notFoundPageId && !excluded.has(page.slug)).flatMap((page) => {
+      const lastModified = page.updatedAt ?? page.publishedAt ?? void 0;
+      const alternates = languagesFor(page.slug);
+      return locales.map((locale) => ({
+        url: `${baseUrl}${localizedPath(page.slug, locale, defaultLocale)}`,
+        ...lastModified ? { lastModified: new Date(lastModified) } : {},
+        ...alternates ? { alternates } : {}
+      }));
     });
     return options.extra ? [...entries, ...options.extra] : entries;
   };
@@ -618,8 +620,7 @@ async function buildCmssyMetadata(config, path, options = {}) {
     org: config.org,
     workspaceSlug: config.workspaceSlug
   };
-  const [meta, siteConfig, baseUrl] = await Promise.all([
-    react.fetchPageMeta(clientConfig, path).catch(() => null),
+  const [siteConfig, baseUrl] = await Promise.all([
     react.fetchSiteConfig(clientConfig).catch(() => null),
     resolveSeoBaseUrl(config, options.baseUrl)
   ]);
@@ -627,20 +628,30 @@ async function buildCmssyMetadata(config, path, options = {}) {
     config,
     siteConfig
   );
-  const locale = await config.resolveLocale?.() ?? defaultLocale;
-  const slug = react.normalizeSlug(path);
+  const segments = Array.isArray(path) ? path : path ? path.split("/").filter(Boolean) : void 0;
+  const fromPath = react.splitLocaleFromPath(segments, {
+    defaultLocale,
+    locales: enabledLocales
+  });
+  const locale = options.locale ?? (fromPath.locale !== defaultLocale ? fromPath.locale : await config.resolveLocale?.() ?? defaultLocale);
+  const slug = react.normalizeSlug(fromPath.path);
+  const meta = await react.fetchPageMeta(clientConfig, slug).catch(() => null);
   const siteName = pick(siteConfig?.siteName, locale, defaultLocale) || siteConfig?.branding?.brandName || void 0;
   const title = pick(meta?.seoTitle, locale, defaultLocale) || pick(meta?.displayName, locale, defaultLocale) || siteName || "";
   const description = pick(meta?.seoDescription, locale, defaultLocale);
   const keywords = meta?.seoKeywords?.length ? meta.seoKeywords : void 0;
   const image = options.image ?? siteConfig?.branding?.ogImageUrl ?? void 0;
   const canonical = baseUrl ? `${baseUrl}${localizedPath(slug, locale, defaultLocale)}` : void 0;
-  const languages = baseUrl && enabledLocales.length > 1 ? Object.fromEntries(
-    enabledLocales.map((l) => [
-      l,
-      `${baseUrl}${localizedPath(slug, l, defaultLocale)}`
-    ])
-  ) : void 0;
+  const languages = baseUrl && enabledLocales.length > 1 ? {
+    ...Object.fromEntries(
+      enabledLocales.map((l) => [
+        l,
+        `${baseUrl}${localizedPath(slug, l, defaultLocale)}`
+      ])
+    ),
+    // What to serve a reader whose language none of these match.
+    "x-default": `${baseUrl}${localizedPath(slug, defaultLocale, defaultLocale)}`
+  } : void 0;
   return {
     ...baseUrl ? { metadataBase: new URL(baseUrl) } : {},
     ...title ? { title } : {},

package/dist/index.d.cts

@@ -206,6 +206,12 @@ interface BuildCmssyMetadataOptions extends SeoBaseUrlOption {
     ogType?: string;
     /** Twitter card. Defaults to "summary_large_image" when an image exists. */
     twitterCard?: "summary" | "summary_large_image";
+    /**
+     * The language to render metadata in. Only needed when the language does not
+     * live in the URL (a per-domain or cookie strategy); with a locale prefix the
+     * path already says it.
+     */
+    locale?: string;
 }
 /**
  * Builds complete Next.js `Metadata` for a cmssy page from its SEO fields and
@@ -213,10 +219,14 @@ interface BuildCmssyMetadataOptions extends SeoBaseUrlOption {
  * `hreflang` alternates, and Open Graph / Twitter cards (with the branding OG
  * image). Use in a route's `generateMetadata`:
  *
- *   export const generateMetadata = ({ params }) =>
+ *   export const generateMetadata = async ({ params }) =>
  *     buildCmssyMetadata(cmssy, (await params).path);
  *
- * `path` is the catch-all segments with the locale prefix already stripped.
+ * Pass the catch-all segments **as routed**, locale prefix and all: the prefix
+ * is what says which language this page is. Stripping it first (and leaving the
+ * language to `config.resolveLocale`) is how every localized page ends up with
+ * the default language's title - and a canonical pointing at the default
+ * language's URL, which tells Google the translation is a duplicate.
  */
 declare function buildCmssyMetadata(config: CmssyNextConfig, path?: string | string[], options?: BuildCmssyMetadataOptions): Promise<Metadata>;
 

package/dist/index.d.ts

@@ -206,6 +206,12 @@ interface BuildCmssyMetadataOptions extends SeoBaseUrlOption {
     ogType?: string;
     /** Twitter card. Defaults to "summary_large_image" when an image exists. */
     twitterCard?: "summary" | "summary_large_image";
+    /**
+     * The language to render metadata in. Only needed when the language does not
+     * live in the URL (a per-domain or cookie strategy); with a locale prefix the
+     * path already says it.
+     */
+    locale?: string;
 }
 /**
  * Builds complete Next.js `Metadata` for a cmssy page from its SEO fields and
@@ -213,10 +219,14 @@ interface BuildCmssyMetadataOptions extends SeoBaseUrlOption {
  * `hreflang` alternates, and Open Graph / Twitter cards (with the branding OG
  * image). Use in a route's `generateMetadata`:
  *
- *   export const generateMetadata = ({ params }) =>
+ *   export const generateMetadata = async ({ params }) =>
  *     buildCmssyMetadata(cmssy, (await params).path);
  *
- * `path` is the catch-all segments with the locale prefix already stripped.
+ * Pass the catch-all segments **as routed**, locale prefix and all: the prefix
+ * is what says which language this page is. Stripping it first (and leaving the
+ * language to `config.resolveLocale`) is how every localized page ends up with
+ * the default language's title - and a canonical pointing at the default
+ * language's URL, which tells Google the translation is a duplicate.
  */
 declare function buildCmssyMetadata(config: CmssyNextConfig, path?: string | string[], options?: BuildCmssyMetadataOptions): Promise<Metadata>;
 

package/dist/index.js

@@ -1,6 +1,6 @@
 import { headers, draftMode, cookies } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
-import { createCmssyClient, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, CmssyServerPage, fetchSiteConfig, fetchPageById, fetchPages, fetchPageMeta, normalizeSlug as normalizeSlug$1, resolveWorkspaceId, graphqlRequest, resolveApiUrl } from '@cmssy/react';
+import { createCmssyClient, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, CmssyServerPage, fetchSiteConfig, fetchPageById, fetchPages, normalizeSlug as normalizeSlug$1, fetchPageMeta, resolveWorkspaceId, graphqlRequest, resolveApiUrl } from '@cmssy/react';
 export { DEFAULT_CMSSY_API_URL, evaluateFieldConditionGroup, resolveApiUrl } from '@cmssy/react';
 import { CmssyLocaleProvider } from '@cmssy/react/client';
 import { EncryptJWT, jwtDecrypt } from 'jose';
@@ -585,23 +585,25 @@ function createCmssySitemap(config, options = {}) {
     const baseUrl = await resolveSeoBaseUrl(config, options.baseUrl);
     const { defaultLocale, locales } = resolveSeoLocales(config, siteConfig);
     const excluded = new Set((options.excludeSlugs ?? []).map(normalizeSlug));
-    const entries = pages.map((page) => ({ ...page, slug: normalizeSlug(page.slug) })).filter((page) => page.id !== notFoundPageId && !excluded.has(page.slug)).map((page) => {
-      const lastModified = page.updatedAt ?? page.publishedAt ?? void 0;
-      const entry = {
-        url: `${baseUrl}${localizedPath(page.slug, defaultLocale, defaultLocale)}`,
-        ...lastModified ? { lastModified: new Date(lastModified) } : {}
-      };
-      if (locales.length > 1) {
-        entry.alternates = {
-          languages: Object.fromEntries(
-            locales.map((locale) => [
-              locale,
-              `${baseUrl}${localizedPath(page.slug, locale, defaultLocale)}`
-            ])
-          )
-        };
+    const languagesFor = (slug) => locales.length > 1 ? {
+      languages: {
+        ...Object.fromEntries(
+          locales.map((locale) => [
+            locale,
+            `${baseUrl}${localizedPath(slug, locale, defaultLocale)}`
+          ])
+        ),
+        "x-default": `${baseUrl}${localizedPath(slug, defaultLocale, defaultLocale)}`
       }
-      return entry;
+    } : void 0;
+    const entries = pages.map((page) => ({ ...page, slug: normalizeSlug(page.slug) })).filter((page) => page.id !== notFoundPageId && !excluded.has(page.slug)).flatMap((page) => {
+      const lastModified = page.updatedAt ?? page.publishedAt ?? void 0;
+      const alternates = languagesFor(page.slug);
+      return locales.map((locale) => ({
+        url: `${baseUrl}${localizedPath(page.slug, locale, defaultLocale)}`,
+        ...lastModified ? { lastModified: new Date(lastModified) } : {},
+        ...alternates ? { alternates } : {}
+      }));
     });
     return options.extra ? [...entries, ...options.extra] : entries;
   };
@@ -617,8 +619,7 @@ async function buildCmssyMetadata(config, path, options = {}) {
     org: config.org,
     workspaceSlug: config.workspaceSlug
   };
-  const [meta, siteConfig, baseUrl] = await Promise.all([
-    fetchPageMeta(clientConfig, path).catch(() => null),
+  const [siteConfig, baseUrl] = await Promise.all([
     fetchSiteConfig(clientConfig).catch(() => null),
     resolveSeoBaseUrl(config, options.baseUrl)
   ]);
@@ -626,20 +627,30 @@ async function buildCmssyMetadata(config, path, options = {}) {
     config,
     siteConfig
   );
-  const locale = await config.resolveLocale?.() ?? defaultLocale;
-  const slug = normalizeSlug$1(path);
+  const segments = Array.isArray(path) ? path : path ? path.split("/").filter(Boolean) : void 0;
+  const fromPath = splitLocaleFromPath(segments, {
+    defaultLocale,
+    locales: enabledLocales
+  });
+  const locale = options.locale ?? (fromPath.locale !== defaultLocale ? fromPath.locale : await config.resolveLocale?.() ?? defaultLocale);
+  const slug = normalizeSlug$1(fromPath.path);
+  const meta = await fetchPageMeta(clientConfig, slug).catch(() => null);
   const siteName = pick(siteConfig?.siteName, locale, defaultLocale) || siteConfig?.branding?.brandName || void 0;
   const title = pick(meta?.seoTitle, locale, defaultLocale) || pick(meta?.displayName, locale, defaultLocale) || siteName || "";
   const description = pick(meta?.seoDescription, locale, defaultLocale);
   const keywords = meta?.seoKeywords?.length ? meta.seoKeywords : void 0;
   const image = options.image ?? siteConfig?.branding?.ogImageUrl ?? void 0;
   const canonical = baseUrl ? `${baseUrl}${localizedPath(slug, locale, defaultLocale)}` : void 0;
-  const languages = baseUrl && enabledLocales.length > 1 ? Object.fromEntries(
-    enabledLocales.map((l) => [
-      l,
-      `${baseUrl}${localizedPath(slug, l, defaultLocale)}`
-    ])
-  ) : void 0;
+  const languages = baseUrl && enabledLocales.length > 1 ? {
+    ...Object.fromEntries(
+      enabledLocales.map((l) => [
+        l,
+        `${baseUrl}${localizedPath(slug, l, defaultLocale)}`
+      ])
+    ),
+    // What to serve a reader whose language none of these match.
+    "x-default": `${baseUrl}${localizedPath(slug, defaultLocale, defaultLocale)}`
+  } : void 0;
   return {
     ...baseUrl ? { metadataBase: new URL(baseUrl) } : {},
     ...title ? { title } : {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -41,7 +41,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^4.0.1",
+    "@cmssy/react": "^4.1.0",
     "next": ">=15",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0"
@@ -55,7 +55,7 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "4.0.1"
+    "@cmssy/react": "4.1.0"
   },
   "dependencies": {
     "jose": "^6.2.3",