@backmatter/next 0.0.36 → 0.0.37

package/dist/config.cjs

@@ -194,27 +194,27 @@ function renderCachedCmsClient() {
   return [
     "const raw = createBackmatter({ ...config, models, sync: false });",
     "",
-    "async function cachedGetDoc(locale: string, type: string, slug: string) {",
+    "async function cachedGetDoc(type: string, slug: string) {",
     '  "use cache";',
     '  cacheLife("hours");',
-    "  cacheTag(...contentCacheTags(locale, type, slug));",
-    "  return raw.getDoc(locale, type, slug);",
+    "  cacheTag(...contentCacheTags(type, slug));",
+    "  return raw.getDoc(type, slug);",
     "}",
     "",
-    "async function cachedListDocs(filter?: { type?: string; locale?: string }) {",
+    "async function cachedListDocs(filter?: { type?: string }) {",
     '  "use cache";',
     '  cacheLife("hours");',
     "  cacheTag(...listCacheTags(filter?.type));",
     "  return raw.listDocs(filter);",
     "}",
     "",
-    "async function getDoc(locale: string, type: string, slug: string) {",
+    "async function getDoc(type: string, slug: string) {",
     "  const preview = currentPreviewContent();",
-    "  if (preview) return preview.getDoc(locale, type, slug);",
-    "  return cachedGetDoc(locale, type, slug);",
+    "  if (preview) return preview.getDoc(type, slug);",
+    "  return cachedGetDoc(type, slug);",
     "}",
     "",
-    "async function listDocs(filter?: { type?: string; locale?: string }) {",
+    "async function listDocs(filter?: { type?: string }) {",
     "  const preview = currentPreviewContent();",
     "  if (preview) return preview.listDocs(filter);",
     "  return cachedListDocs(filter);",

package/dist/loader.cjs

@@ -187,27 +187,27 @@ function renderCachedCmsClient() {
   return [
     "const raw = createBackmatter({ ...config, models, sync: false });",
     "",
-    "async function cachedGetDoc(locale: string, type: string, slug: string) {",
+    "async function cachedGetDoc(type: string, slug: string) {",
     '  "use cache";',
     '  cacheLife("hours");',
-    "  cacheTag(...contentCacheTags(locale, type, slug));",
-    "  return raw.getDoc(locale, type, slug);",
+    "  cacheTag(...contentCacheTags(type, slug));",
+    "  return raw.getDoc(type, slug);",
     "}",
     "",
-    "async function cachedListDocs(filter?: { type?: string; locale?: string }) {",
+    "async function cachedListDocs(filter?: { type?: string }) {",
     '  "use cache";',
     '  cacheLife("hours");',
     "  cacheTag(...listCacheTags(filter?.type));",
     "  return raw.listDocs(filter);",
     "}",
     "",
-    "async function getDoc(locale: string, type: string, slug: string) {",
+    "async function getDoc(type: string, slug: string) {",
     "  const preview = currentPreviewContent();",
-    "  if (preview) return preview.getDoc(locale, type, slug);",
-    "  return cachedGetDoc(locale, type, slug);",
+    "  if (preview) return preview.getDoc(type, slug);",
+    "  return cachedGetDoc(type, slug);",
     "}",
     "",
-    "async function listDocs(filter?: { type?: string; locale?: string }) {",
+    "async function listDocs(filter?: { type?: string }) {",
     "  const preview = currentPreviewContent();",
     "  if (preview) return preview.listDocs(filter);",
     "  return cachedListDocs(filter);",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backmatter/next",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "description": "Experimental Next.js adapter for Backmatter. APIs will break. Not ready for production.",
   "type": "module",
   "publishConfig": {
@@ -47,7 +47,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@backmatter/core": "^0.0.27",
+    "@backmatter/core": "^0.0.28",
     "@mdx-js/mdx": "^3.1.1",
     "remark-gfm": "^4.0.1",
     "@backmatter/studio": "^0.0.13"

package/src/cached-doc.ts

@@ -7,22 +7,11 @@ export type CacheFns = {
   cacheTag: (...tags: string[]) => void;
 };
 
-export type GetDocFn = (
-  locale: string,
-  type: string,
-  slug: string,
-) => Promise<BackmatterDoc | null>;
+export type GetDocFn = (type: string, slug: string) => Promise<BackmatterDoc | null>;
 
-export type ListDocsFn = (filter?: {
-  type?: string;
-  locale?: string;
-}) => Promise<BackmatterDocSummary[]>;
+export type ListDocsFn = (filter?: { type?: string }) => Promise<BackmatterDocSummary[]>;
 
-export type PublishedRender = (
-  locale: string,
-  type: string,
-  slug: string,
-) => Promise<ReactNode>;
+export type PublishedRender = (type: string, slug: string) => Promise<ReactNode>;
 
 let registeredGetDoc: GetDocFn | null = null;
 let registeredListDocs: ListDocsFn | null = null;
@@ -61,7 +50,6 @@ async function loadCacheFns(): Promise<CacheFns> {
 }
 
 export async function getCachedDoc(
-  locale: string,
   type: string,
   slug: string,
   cache?: CacheFns,
@@ -69,17 +57,16 @@ export async function getCachedDoc(
   "use cache";
   const fns = cache ?? (await loadCacheFns());
   fns.cacheLife("hours");
-  fns.cacheTag(...contentCacheTags(locale, type, slug));
+  fns.cacheTag(...contentCacheTags(type, slug));
   const getDoc = registeredGetDoc;
   if (!getDoc) {
     throw new Error("[backmatter] getCachedDoc called before createBackmatter registered getDoc");
   }
-  return getDoc(locale, type, slug);
+  return getDoc(type, slug);
 }
 
 export async function getCachedDocs(
   type?: string,
-  locale?: string,
   cache?: CacheFns,
 ): Promise<BackmatterDocSummary[]> {
   "use cache";
@@ -90,7 +77,7 @@ export async function getCachedDocs(
   if (!listDocs) {
     throw new Error("[backmatter] getCachedDocs called before createBackmatter registered listDocs");
   }
-  return listDocs({ type, locale });
+  return listDocs({ type });
 }
 
 /**
@@ -98,7 +85,6 @@ export async function getCachedDocs(
  * The cache entry is what a static prerender and a normal link prefetch store.
  */
 export async function getCachedPublished(
-  locale: string,
   type: string,
   slug: string,
   cache?: CacheFns,
@@ -106,12 +92,12 @@ export async function getCachedPublished(
   "use cache";
   const fns = cache ?? (await loadCacheFns());
   fns.cacheLife("hours");
-  fns.cacheTag(...contentCacheTags(locale, type, slug));
+  fns.cacheTag(...contentCacheTags(type, slug));
   const render = registeredPublishedRender;
   if (!render) {
     throw new Error("[backmatter] getCachedPublished called before a published render was registered");
   }
-  return render(locale, type, slug);
+  return render(type, slug);
 }
 
 /** Unwrap Next `params` inside `"use cache"` so Cache Components can prerender. */

package/src/preview-content.ts

@@ -14,8 +14,8 @@ export type PreviewContentConfig = {
 };
 
 export type PreviewContent = {
-  getDoc(locale: string, type: string, slug: string): Promise<BackmatterDoc | null>;
-  listDocs(filter?: { type?: string; locale?: string }): Promise<BackmatterDocSummary[]>;
+  getDoc(type: string, slug: string): Promise<BackmatterDoc | null>;
+  listDocs(filter?: { type?: string }): Promise<BackmatterDocSummary[]>;
 };
 
 const current = new AsyncLocalStorage<PreviewContent>();
@@ -30,8 +30,8 @@ export function previewContentForCheckout(
     previewToken: config.previewToken,
   };
   return {
-    getDoc(locale, type, slug) {
-      return fetchPreviewDoc(options, { locale, type, slug, ...checkout });
+    getDoc(type, slug) {
+      return fetchPreviewDoc(options, { type, slug, ...checkout });
     },
     listDocs(filter) {
       return fetchPreviewDocs(options, { ...checkout, ...filter });

package/src/preview-live.tsx

@@ -15,10 +15,9 @@ export function PreviewUnavailable({ message }: { message?: string }) {
   );
 }
 
-function streamUrl(ref: { locale: string; type: string; slug: string }) {
+function streamUrl(ref: { type: string; slug: string }) {
   const params = new URLSearchParams({
     stream: "1",
-    locale: ref.locale,
     type: ref.type,
     slug: ref.slug,
   });
@@ -28,7 +27,7 @@ function streamUrl(ref: { locale: string; type: string; slug: string }) {
 }
 
 export function listenForPreviewChanges(
-  ref: { locale: string; type: string; slug: string },
+  ref: { type: string; slug: string },
   onChange: () => void,
   options?: { debounceMs?: number },
 ): () => void {
@@ -52,7 +51,7 @@ export function PreviewBody({
   components,
   children,
 }: {
-  doc: Pick<BackmatterDoc, "locale" | "type" | "slug" | "frontmatter" | "body">;
+  doc: Pick<BackmatterDoc, "type" | "slug" | "frontmatter" | "body">;
   components?: MdxComponents;
   /** RSC first paint. Replaced in place when SSE sends a new body. */
   children?: ReactNode;
@@ -76,19 +75,17 @@ export function PreviewBody({
       source.removeEventListener("change", onMessage as EventListener);
       source.close();
     };
-  }, [doc.locale, doc.type, doc.slug]);
+  }, [doc.type, doc.slug]);
 
   if (body === null) return children ?? <MdxBody source={doc.body} components={components} />;
   return <MdxBody source={body} components={components} />;
 }
 
 export function PreviewPageReloader({
-  locale,
   type,
   slug,
   refresh,
 }: {
-  locale: string;
   type: string;
   slug: string;
   /** Hosts omit this; the Next wrapper passes `router.refresh` in a transition. */
@@ -96,11 +93,11 @@ export function PreviewPageReloader({
 }) {
   useEffect(
     () =>
-      listenForPreviewChanges({ locale, type, slug }, () => {
+      listenForPreviewChanges({ type, slug }, () => {
         if (refresh) refresh();
         else window.location.reload();
       }),
-    [locale, type, slug, refresh],
+    [type, slug, refresh],
   );
   return null;
 }

package/src/preview-refresh.tsx

@@ -20,7 +20,7 @@ import { fanInPreviewTransports, sitePageTransport } from "./site-channel";
 import { PreviewPageReloader as PreviewStreamReloader, PreviewRemoved } from "./preview-live";
 
 /** Keeps the current page visible while preview content is refetched. */
-export function PreviewPageReloader(props: { locale: string; type: string; slug: string }) {
+export function PreviewPageReloader(props: { type: string; slug: string }) {
   const router = useRouter();
   const refresh = useCallback(() => {
     startTransition(() => {
@@ -30,8 +30,8 @@ export function PreviewPageReloader(props: { locale: string; type: string; slug:
   // HEAD and other documents in this checkout. This document's own saves
   // arrive on the doc stream below and must not refresh the page twice.
   useEffect(
-    () => subscribeTreeStream({ locale: props.locale, type: props.type, slug: props.slug }, refresh),
-    [props.locale, props.type, props.slug, refresh],
+    () => subscribeTreeStream({ type: props.type, slug: props.slug }, refresh),
+    [props.type, props.slug, refresh],
   );
   return <PreviewStreamReloader {...props} refresh={refresh} />;
 }
@@ -51,12 +51,11 @@ function referrerOrigin(): string {
 }
 
 function subscribeDocStream(
-  ref: { locale: string; type: string; slug: string },
+  ref: { type: string; slug: string },
   onEvent: (event: { raw?: string; body?: string; frontmatter?: Record<string, unknown> }) => void,
 ): () => void {
   const params = new URLSearchParams({
     stream: "1",
-    locale: ref.locale,
     type: ref.type,
     slug: ref.slug,
   });
@@ -90,7 +89,7 @@ function subscribeDocStream(
 
 /** Refresh when some other document in this checkout changes, or HEAD moves. */
 function subscribeTreeStream(
-  ref: { locale: string; type: string; slug: string },
+  ref: { type: string; slug: string },
   refresh: () => void,
 ): () => void {
   const params = new URLSearchParams({ stream: "tree" });
@@ -107,14 +106,9 @@ function subscribeTreeStream(
   };
   const onChange = (ev: MessageEvent) => {
     try {
-      const data = JSON.parse(String(ev.data)) as { ref?: { locale?: string; type?: string; slug?: string } };
+      const data = JSON.parse(String(ev.data)) as { ref?: { type?: string; slug?: string } };
       const changed = data.ref;
-      if (
-        changed &&
-        changed.locale === ref.locale &&
-        changed.type === ref.type &&
-        changed.slug === ref.slug
-      ) {
+      if (changed && changed.type === ref.type && changed.slug === ref.slug) {
         return;
       }
     } catch {
@@ -137,7 +131,6 @@ function subscribeTreeStream(
  * and swaps the body. First paint is `children`.
  */
 export function PreviewClient({
-  locale,
   type,
   slug,
   branch,
@@ -146,7 +139,6 @@ export function PreviewClient({
   renderPreview,
   children,
 }: {
-  locale: string;
   type: string;
   slug: string;
   branch?: string;
@@ -163,7 +155,6 @@ export function PreviewClient({
 
   useEffect(() => {
     const ref: PreviewChannelRef = {
-      locale,
       type,
       slug,
       ...(branch ? { branch } : {}),
@@ -266,7 +257,7 @@ export function PreviewClient({
       session.close();
       windowTransport?.close();
     };
-  }, [locale, type, slug, branch, tree, renderPreview, router, originsKey]);
+  }, [type, slug, branch, tree, renderPreview, router, originsKey]);
 
   if (removed) return <PreviewRemoved />;
   return (

package/src/preview-route.ts

@@ -277,13 +277,12 @@ export function createPreviewRoute(
       }
       const checkout = await checkoutFrom(req, secret, url);
       if (!checkout) return new Response("preview session missing", { status: 401 });
-      const locale = url.searchParams.get("locale") ?? cms.config.defaultLocale;
       const type = url.searchParams.get("type") ?? "";
       const slug = url.searchParams.get("slug") ?? "";
       if (!type || !slug) return new Response("missing type or slug", { status: 400 });
       const upstream = previewStreamUrl(
         { apiUrl: cms.config.apiUrl, workspaceId: cms.config.workspaceId, previewToken: secret },
-        { locale, type, slug, ...checkout },
+        { type, slug, ...checkout },
       );
       const res = await fetch(upstream);
       return new Response(res.body, {

package/src/render-preview.ts

@@ -17,7 +17,6 @@ import { requireSource, resolveSourceData } from "./source-data";
 export const RENDER_PREVIEW_PER_SECOND = 20;
 
 export type RenderPreviewRef = {
-  locale: string;
   type: string;
   slug: string;
   branch?: string;
@@ -165,7 +164,6 @@ export function createRenderPreview(
       const node = await runWithPreviewContent(content, () =>
         renderLayoutDoc(
           {
-            locale: ref.locale,
             type: ref.type,
             slug: ref.slug,
             source: "tree",

package/src/routes.ts

@@ -6,19 +6,17 @@
 import { Fragment, Suspense, createElement, type ReactNode } from "react";
 import { HeldPreview, HoldPreview } from "./preview-hold";
 import {
-  decodeDocLocale,
   DEFAULT_TEMPLATE_SLUG,
   isRoutable,
   isTemplateSlug,
   matchRoute,
   PREVIEW_CHECKOUT_QUERY,
   PREVIEW_COOKIE,
-  PREVIEW_LOCALE_QUERY,
   readPreviewCookie,
   routeSegments,
-  routeTemplate,
   type BackmatterDoc,
   type ModelDef,
+  type RouteMatch,
   type SourceDef,
 } from "@backmatter/core";
 import type { BackmatterClient } from "@backmatter/core/node/create-backmatter";
@@ -53,10 +51,6 @@ export type CatchAllOptions = {
    * third argument. A missing record is a 404.
    */
   sources?: Record<string, SourceDef>;
-  /** Overrides `cms.config.locales`. */
-  locales?: readonly string[];
-  /** Overrides `cms.config.defaultLocale`. */
-  defaultLocale?: string;
   /**
    * Wrap the rendered body (layout, title, metadata). Default: the body only.
    */
@@ -69,7 +63,6 @@ export type CatchAllOptions = {
    */
   renderPreview?: (
     ref: {
-      locale: string;
       type: string;
       slug: string;
       branch?: string;
@@ -89,7 +82,6 @@ export type CatchAllOptions = {
     checkout?: { branch?: string; tree?: string };
     error?: string;
     getDoc?: (ref: {
-      locale: string;
       type: string;
       slug: string;
       branch?: string;
@@ -138,19 +130,7 @@ export function previewReplacesPublished(
   return preview.enabled && preview.error !== "invalid_session";
 }
 
-type RouteHit = { locale: string; type: string; slug: string };
-
-async function previewLocaleQuery(
-  searchParams: Promise<CatchAllSearchParams> | CatchAllSearchParams | undefined,
-): Promise<string | undefined> {
-  if (!searchParams) return undefined;
-  const query = await searchParams;
-  const raw = query[PREVIEW_LOCALE_QUERY];
-  if (raw === undefined) return undefined;
-  const value = Array.isArray(raw) ? raw[0] : raw;
-  if (value === undefined) return undefined;
-  return decodeDocLocale(value);
-}
+type RouteHit = RouteMatch;
 
 async function checkoutQueryToken(
   searchParams: Promise<CatchAllSearchParams> | CatchAllSearchParams | undefined,
@@ -202,23 +182,18 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
 ): CatchAllRoute {
   const models = cms.models as readonly ModelDef[];
   const byType = new Map(models.map((m) => [m.type, m]));
-  const matchOptions = {
-    defaultLocale: options.defaultLocale ?? cms.config.defaultLocale,
-    locales: options.locales ?? cms.config.locales,
-  };
 
   const resolve: CatchAllRoute["resolve"] = (segments) => {
     const pathname = `/${(segments ?? []).join("/")}`;
-    return matchRoute(models, pathname, matchOptions);
+    return matchRoute(models, pathname);
   };
 
   const generateStaticParams: CatchAllRoute["generateStaticParams"] = async () => {
     const docs = await cms.listDocs();
     const params: CatchAllParams[] = [];
     const seen = new Set<string>();
-    // Keyed on the URL: a route without `{locale}` yields one page per slug.
-    const push = (model: ModelDef, locale: string, slug: string) => {
-      const segments = routeSegments(model, locale, slug);
+    const push = (model: ModelDef, slug: string) => {
+      const segments = routeSegments(model, slug);
       const key = segments.join("/");
       if (seen.has(key)) return;
       seen.add(key);
@@ -227,32 +202,22 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     for (const doc of docs) {
       const model = byType.get(doc.type);
       if (!model || !isRoutable(model)) continue;
-      // The template document has no page of its own.
       if (isTemplateSlug(model, doc.slug)) continue;
-      push(model, doc.locale, doc.slug);
+      push(model, doc.slug);
     }
-    // Catalog records that never got a CMS file still prerender through the template.
-    const locales = matchOptions.locales ?? [matchOptions.defaultLocale];
     for (const model of models) {
       if (!isRoutable(model)) continue;
       const list = options.sources?.[model.type]?.list;
       if (!list) continue;
-      for (const locale of locales) {
-        for (const slug of await list(locale)) push(model, locale, slug);
-      }
+      for (const slug of await list()) push(model, slug);
     }
     return params;
   };
 
   const failFor = options.notFound ?? nextNotFound;
 
-  type GetDocFn = (locale: string, type: string, slug: string) => Promise<BackmatterDoc | null>;
+  type GetDocFn = (type: string, slug: string) => Promise<BackmatterDoc | null>;
 
-  /**
-   * Document plus external record for a route hit, or null for a 404.
-   * External types: no record → null; no per-slug doc → the template doc.
-   * The template slug itself only renders when `allowTemplate` (preview).
-   */
   async function loadRouteDoc(
     hit: RouteHit,
     getDoc: GetDocFn,
@@ -265,13 +230,13 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     if (onTemplate && !allowTemplate) return null;
     const resolved = await resolveSourceData(source, model, hit);
     if (!resolved.ok) return null;
-    let doc = await getDoc(hit.locale, hit.type, hit.slug);
+    let doc = await getDoc(hit.type, hit.slug);
     if (!doc && model.external && !onTemplate) {
       const template = model.template ?? DEFAULT_TEMPLATE_SLUG;
-      doc = await getDoc(hit.locale, hit.type, template);
+      doc = await getDoc(hit.type, template);
       if (!doc) {
         console.warn(
-          `[backmatter] ${hit.type}/${hit.slug} has a record but no document; add content/${hit.locale}/${hit.type}/${template} to render every ${hit.type}`,
+          `[backmatter] ${hit.type}/${hit.slug} has a record but no document; add content/${hit.type}/${template} to render every ${hit.type}`,
         );
       }
     }
@@ -313,7 +278,6 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
       return createElement(
         PreviewClient,
         {
-          locale: doc.locale,
           type: doc.type,
           slug: doc.slug,
           branch: preview.branch,
@@ -324,13 +288,11 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
         inner,
       );
     }
-    // Hosts that have not generated `preview-action` keep the refresh fallback.
     const { PreviewPageReloader } = await import("./preview-refresh");
     return createElement(
       "div",
       null,
       createElement(PreviewPageReloader, {
-        locale: doc.locale,
         type: doc.type,
         slug: doc.slug,
       }),
@@ -357,7 +319,7 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
           ));
       const loaded = await loadRouteDoc(
         hit,
-        (locale, type, slug) => getDoc({ locale, type, slug, ...preview.checkout }),
+        (type, slug) => getDoc({ type, slug, ...preview.checkout }),
         true,
       );
       if (!loaded) return previewUnavailable("Document not found");
@@ -367,8 +329,8 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     }
   }
 
-  async function renderPublished(locale: string, type: string, slug: string): Promise<ReactNode> {
-    const loaded = await loadRouteDoc({ locale, type, slug }, cms.getDoc, false);
+  async function renderPublished(type: string, slug: string): Promise<ReactNode> {
+    const loaded = await loadRouteDoc({ type, slug }, cms.getDoc, false);
     if (!loaded) return null;
     return createElement(
       "div",
@@ -377,12 +339,10 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     );
   }
 
-  async function publishedBody(locale: string, type: string, slug: string): Promise<ReactNode> {
+  async function publishedBody(type: string, slug: string): Promise<ReactNode> {
     registerPublishedRender(renderPublished);
-    const body = await getCachedPublished(locale, type, slug);
+    const body = await getCachedPublished(type, slug);
     if (body != null) return body;
-    // A tree-only document has no published body. 404 only when preview is off,
-    // so the preview branch can still render it. The dynamic read is on the miss path.
     if (options.preview) {
       const state: PreviewState = options.preview.enabled
         ? {
@@ -405,29 +365,13 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     return failFor();
   }
 
-  /**
-   * Routes without `{locale}` always match as the default locale. The editor
-   * puts the file's locale on the preview URL so a conflicted or translated
-   * copy is the document that gets fetched.
-   */
-  async function previewHit(
-    hit: RouteHit,
-    searchParams: Promise<CatchAllSearchParams> | CatchAllSearchParams | undefined,
-  ): Promise<RouteHit> {
-    const model = byType.get(hit.type);
-    if (!model || routeTemplate(model).includes("{locale}")) return hit;
-    const locale = await previewLocaleQuery(searchParams);
-    if (locale === undefined) return hit;
-    return { ...hit, locale };
-  }
-
   const CmsRoute: CatchAllRoute["CmsRoute"] = async ({ params, searchParams }) => {
     const resolved = await cachedRouteParams(params);
     const hit = resolve(resolved[CATCH_ALL_PARAM]);
     if (!hit) return failFor();
     const preview = await resolvePreviewState(cms, options.preview, searchParams);
-    if (previewReplacesPublished(preview)) return loadPreviewDoc(await previewHit(hit, searchParams), preview);
-    return publishedBody(hit.locale, hit.type, hit.slug);
+    if (previewReplacesPublished(preview)) return loadPreviewDoc(hit, preview);
+    return publishedBody(hit.type, hit.slug);
   };
 
   const PublishedRoute = async ({
@@ -439,7 +383,7 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     const resolved = await params;
     const hit = resolve(resolved[CATCH_ALL_PARAM]);
     if (!hit) return failFor();
-    const body = await publishedBody(hit.locale, hit.type, hit.slug);
+    const body = await publishedBody(hit.type, hit.slug);
     if (body == null) return body;
     return createElement(Fragment, null, docBridge(hit), body);
   };
@@ -456,7 +400,6 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     if (!hit) return null;
     const preview = await resolvePreviewState(cms, options.preview, searchParams);
     if (!previewReplacesPublished(preview)) return null;
-    const docHit = await previewHit(hit, searchParams);
     return createElement(
       HoldPreview,
       null,
@@ -468,17 +411,16 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
             __html: "[data-backmatter-published]{display:none!important}",
           },
         }),
-        docBridge(docHit),
-        await loadPreviewDoc(docHit, preview),
+        docBridge(hit),
+        await loadPreviewDoc(hit, preview),
       ),
     );
   };
 
-  function docBridge(hit: { locale: string; type: string; slug: string }) {
+  function docBridge(hit: RouteHit) {
     if (!cms.config.workspaceId) return null;
     return createElement(SiteDocBridge, {
       doc: {
-        locale: hit.locale,
         type: hit.type,
         slug: hit.slug,
         workspaceId: cms.config.workspaceId,

package/src/site-doc-bridge.tsx

@@ -35,13 +35,12 @@ export function subscribeSiteDoc(listener: (doc: SiteDocRef) => void): () => voi
 export function SiteDocBridge({ doc }: { doc: SiteDocRef }) {
   useEffect(() => {
     publishSiteDoc(doc);
-  }, [doc.locale, doc.type, doc.slug, doc.workspaceId]);
+  }, [doc.type, doc.slug, doc.workspaceId]);
 
   return (
     <span
       hidden
       data-backmatter-doc=""
-      data-locale={doc.locale}
       data-type={doc.type}
       data-slug={doc.slug}
       data-workspace={doc.workspaceId}

package/src/site-doc.ts

@@ -1,6 +1,5 @@
 // packages/next/src/site-doc.ts
 export type SiteDocRef = {
-  locale: string;
   type: string;
   slug: string;
   workspaceId: string;
@@ -11,7 +10,6 @@ export function parseSiteDoc(content: string | null | undefined): SiteDocRef | n
   try {
     const value = JSON.parse(content) as Record<string, unknown>;
     if (
-      (value.locale !== undefined && typeof value.locale !== "string") ||
       typeof value.type !== "string" ||
       typeof value.slug !== "string" ||
       typeof value.workspaceId !== "string" ||
@@ -22,7 +20,6 @@ export function parseSiteDoc(content: string | null | undefined): SiteDocRef | n
       return null;
     }
     return {
-      locale: value.locale ?? "",
       type: value.type,
       slug: value.slug,
       workspaceId: value.workspaceId,
@@ -37,7 +34,6 @@ export function readSiteDoc(): SiteDocRef | null {
   const marked = document.querySelector("[data-backmatter-doc]");
   if (marked) {
     const doc = {
-      locale: marked.getAttribute("data-locale") ?? "",
       type: marked.getAttribute("data-type") ?? "",
       slug: marked.getAttribute("data-slug") ?? "",
       workspaceId: marked.getAttribute("data-workspace") ?? "",
@@ -50,12 +46,7 @@ export function readSiteDoc(): SiteDocRef | null {
 export function sameSiteDoc(a: SiteDocRef | null, b: SiteDocRef | null): boolean {
   if (a === b) return true;
   if (!a || !b) return false;
-  return (
-    a.locale === b.locale &&
-    a.type === b.type &&
-    a.slug === b.slug &&
-    a.workspaceId === b.workspaceId
-  );
+  return a.type === b.type && a.slug === b.slug && a.workspaceId === b.workspaceId;
 }
 
 export type SiteBlock = {

package/src/site-editor.tsx

@@ -45,7 +45,7 @@ function useSiteDoc(): SiteDocRef | null {
       subtree: true,
       childList: true,
       attributes: true,
-      attributeFilter: ["data-locale", "data-type", "data-slug", "data-workspace"],
+      attributeFilter: ["data-type", "data-slug", "data-workspace"],
     });
     return () => {
       stop();

package/src/source-data.ts

@@ -33,7 +33,7 @@ export async function resolveSourceData(
 ): Promise<SourceResult> {
   if (!source) return { ok: true, data: undefined };
   if (isTemplateSlug(model, ref.slug)) {
-    const sample = source.sample ? await source.sample(ref.locale) : null;
+    const sample = source.sample ? await source.sample() : null;
     return { ok: true, data: sample };
   }
   const record = await source.load(ref);