@payloadcms/tanstack-start 4.0.0-internal.078835b → 4.0.0-internal.164164a

package/dist/layouts/Root/getLayoutData.js

@@ -1,10 +1,11 @@
 import { getNavPrefs } from '@payloadcms/ui/elements/Nav/getNavPrefs';
 import { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent';
 import { getClientConfig } from '@payloadcms/ui/utilities/getClientConfig';
+import { getRequestEmbed } from '@payloadcms/ui/utilities/getRequestEmbed';
+import { getRequestTheme } from '@payloadcms/ui/utilities/getRequestTheme';
 import { Outlet } from '@tanstack/react-router';
 import { applyLocaleFiltering } from 'payload/shared';
 import { createElement } from 'react';
-import { getRequestTheme } from '../../utilities/getRequestTheme.js';
 import { initReq } from '../../utilities/initReq.server.js';
 /**
  * Fetches all data needed by the root admin layout.
@@ -19,6 +20,10 @@ import { initReq } from '../../utilities/initReq.server.js';
         cookies,
         headers
     });
+    const isEmbedded = getRequestEmbed({
+        config,
+        cookies
+    });
     const languageOptions = Object.entries(config.i18n.supportedLanguages || {}).reduce((acc, [language, languageConfig])=>{
         if (Object.keys(config.i18n.supportedLanguages).includes(language)) {
             acc.push({
@@ -76,6 +81,7 @@ import { initReq } from '../../utilities/initReq.server.js';
         clientConfig,
         dateFNSKey: req.i18n.dateFNSKey,
         fallbackLang: config.i18n.fallbackLanguage,
+        isEmbedded,
         isNavOpen: navPrefs?.open ?? true,
         languageCode,
         languageOptions,

package/dist/layouts/Root/getLayoutData.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layouts/Root/getLayoutData.ts"],"sourcesContent":["import type { AcceptedLanguages } from '@payloadcms/translations'\nimport type { ImportMap, LanguageOptions, SanitizedConfig, ServerProps } from 'payload'\n\nimport { getNavPrefs } from '@payloadcms/ui/elements/Nav/getNavPrefs'\nimport { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent'\nimport { getClientConfig } from '@payloadcms/ui/utilities/getClientConfig'\nimport { Outlet } from '@tanstack/react-router'\nimport { applyLocaleFiltering } from 'payload/shared'\nimport { createElement } from 'react'\n\nimport type { RootLayoutData } from './index.js'\n\nimport { getRequestTheme } from '../../utilities/getRequestTheme.js'\nimport { initReq } from '../../utilities/initReq.server.js'\n\nexport type GetLayoutDataArgs = {\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n}\n\n/**\n * Fetches all data needed by the root admin layout.\n * Call this in your TanStack Start root route loader.\n */\nexport async function getLayoutData({\n  configPromise,\n  importMap,\n}: GetLayoutDataArgs): Promise<RootLayoutData> {\n  const {\n    cookies,\n    headers,\n    languageCode,\n    permissions,\n    req,\n    req: {\n      payload: { config },\n    },\n  } = await initReq({ configPromise, importMap })\n\n  const theme = getRequestTheme({ config, cookies, headers })\n\n  const languageOptions: LanguageOptions = Object.entries(\n    config.i18n.supportedLanguages || {},\n  ).reduce((acc, [language, languageConfig]) => {\n    if (Object.keys(config.i18n.supportedLanguages).includes(language)) {\n      acc.push({\n        label: languageConfig.translations.general.thisLanguage,\n        value: language as AcceptedLanguages,\n      })\n    }\n    return acc\n  }, [] as LanguageOptions)\n\n  const navPrefs = await getNavPrefs(req)\n\n  const clientConfig = getClientConfig({\n    config,\n    i18n: req.i18n,\n    importMap,\n    user: req.user ?? true,\n  })\n\n  await applyLocaleFiltering({ clientConfig, config, req })\n\n  // Build the custom admin provider tree (`config.admin.components.providers`)\n  // nested around the router `<Outlet />`, mirroring the Next adapter's\n  // `NestProviders`. Returned as an unrendered element; the caller's server\n  // function renders it to an RSC payload (so server-component providers run\n  // server-side and client providers wrap the live Outlet). `undefined` when\n  // no custom providers are configured — the caller falls back to `<Outlet />`.\n  const providerPaths = config.admin?.components?.providers\n  let providers: React.ReactNode = undefined\n  if (Array.isArray(providerPaths) && providerPaths.length > 0) {\n    const serverProps: ServerProps = {\n      i18n: req.i18n,\n      params: {},\n      payload: req.payload,\n      permissions,\n      searchParams: {},\n      server: req.server!,\n      user: req.user ?? undefined,\n    }\n    // Mirror the Next adapter's `NestProviders`: render each configured provider\n    // via `RenderServerComponent` so the entry's own `clientProps`/`serverProps`\n    // (e.g. plugin-multi-tenant's `userHasAccessToAllTenants`) are merged in, and\n    // server components receive `serverProps` while client components get only\n    // `clientProps`. Nested around the router `<Outlet />` instead of `children`.\n    providers = providerPaths.reduceRight<React.ReactNode>(\n      (children, provider) =>\n        RenderServerComponent({\n          clientProps: { children },\n          Component: provider,\n          importMap,\n          serverProps,\n        }),\n      createElement(Outlet),\n    )\n  }\n\n  return {\n    clientConfig,\n    dateFNSKey: req.i18n.dateFNSKey,\n    fallbackLang: config.i18n.fallbackLanguage,\n    isNavOpen: navPrefs?.open ?? true,\n    languageCode,\n    languageOptions,\n    locale: req.locale ?? undefined,\n    permissions,\n    providers,\n    theme,\n    translations: req.i18n.translations,\n    user: req.user,\n  }\n}\n"],"names":["getNavPrefs","RenderServerComponent","getClientConfig","Outlet","applyLocaleFiltering","createElement","getRequestTheme","initReq","getLayoutData","configPromise","importMap","cookies","headers","languageCode","permissions","req","payload","config","theme","languageOptions","Object","entries","i18n","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","navPrefs","clientConfig","user","providerPaths","admin","components","providers","undefined","Array","isArray","length","serverProps","params","searchParams","server","reduceRight","children","provider","clientProps","Component","dateFNSKey","fallbackLang","fallbackLanguage","isNavOpen","open","locale"],"mappings":"AAGA,SAASA,WAAW,QAAQ,0CAAyC;AACrE,SAASC,qBAAqB,QAAQ,gDAA+C;AACrF,SAASC,eAAe,QAAQ,2CAA0C;AAC1E,SAASC,MAAM,QAAQ,yBAAwB;AAC/C,SAASC,oBAAoB,QAAQ,iBAAgB;AACrD,SAASC,aAAa,QAAQ,QAAO;AAIrC,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,OAAO,QAAQ,oCAAmC;AAO3D;;;CAGC,GACD,OAAO,eAAeC,cAAc,EAClCC,aAAa,EACbC,SAAS,EACS;IAClB,MAAM,EACJC,OAAO,EACPC,OAAO,EACPC,YAAY,EACZC,WAAW,EACXC,GAAG,EACHA,KAAK,EACHC,SAAS,EAAEC,MAAM,EAAE,EACpB,EACF,GAAG,MAAMV,QAAQ;QAAEE;QAAeC;IAAU;IAE7C,MAAMQ,QAAQZ,gBAAgB;QAAEW;QAAQN;QAASC;IAAQ;IAEzD,MAAMO,kBAAmCC,OAAOC,OAAO,CACrDJ,OAAOK,IAAI,CAACC,kBAAkB,IAAI,CAAC,GACnCC,MAAM,CAAC,CAACC,KAAK,CAACC,UAAUC,eAAe;QACvC,IAAIP,OAAOQ,IAAI,CAACX,OAAOK,IAAI,CAACC,kBAAkB,EAAEM,QAAQ,CAACH,WAAW;YAClED,IAAIK,IAAI,CAAC;gBACPC,OAAOJ,eAAeK,YAAY,CAACC,OAAO,CAACC,YAAY;gBACvDC,OAAOT;YACT;QACF;QACA,OAAOD;IACT,GAAG,EAAE;IAEL,MAAMW,WAAW,MAAMpC,YAAYe;IAEnC,MAAMsB,eAAenC,gBAAgB;QACnCe;QACAK,MAAMP,IAAIO,IAAI;QACdZ;QACA4B,MAAMvB,IAAIuB,IAAI,IAAI;IACpB;IAEA,MAAMlC,qBAAqB;QAAEiC;QAAcpB;QAAQF;IAAI;IAEvD,6EAA6E;IAC7E,sEAAsE;IACtE,0EAA0E;IAC1E,2EAA2E;IAC3E,2EAA2E;IAC3E,8EAA8E;IAC9E,MAAMwB,gBAAgBtB,OAAOuB,KAAK,EAAEC,YAAYC;IAChD,IAAIA,YAA6BC;IACjC,IAAIC,MAAMC,OAAO,CAACN,kBAAkBA,cAAcO,MAAM,GAAG,GAAG;QAC5D,MAAMC,cAA2B;YAC/BzB,MAAMP,IAAIO,IAAI;YACd0B,QAAQ,CAAC;YACThC,SAASD,IAAIC,OAAO;YACpBF;YACAmC,cAAc,CAAC;YACfC,QAAQnC,IAAImC,MAAM;YAClBZ,MAAMvB,IAAIuB,IAAI,IAAIK;QACpB;QACA,6EAA6E;QAC7E,6EAA6E;QAC7E,8EAA8E;QAC9E,2EAA2E;QAC3E,8EAA8E;QAC9ED,YAAYH,cAAcY,WAAW,CACnC,CAACC,UAAUC,WACTpD,sBAAsB;gBACpBqD,aAAa;oBAAEF;gBAAS;gBACxBG,WAAWF;gBACX3C;gBACAqC;YACF,IACF1C,cAAcF;IAElB;IAEA,OAAO;QACLkC;QACAmB,YAAYzC,IAAIO,IAAI,CAACkC,UAAU;QAC/BC,cAAcxC,OAAOK,IAAI,CAACoC,gBAAgB;QAC1CC,WAAWvB,UAAUwB,QAAQ;QAC7B/C;QACAM;QACA0C,QAAQ9C,IAAI8C,MAAM,IAAIlB;QACtB7B;QACA4B;QACAxB;QACAc,cAAcjB,IAAIO,IAAI,CAACU,YAAY;QACnCM,MAAMvB,IAAIuB,IAAI;IAChB;AACF"}
+{"version":3,"sources":["../../../src/layouts/Root/getLayoutData.ts"],"sourcesContent":["import type { AcceptedLanguages, I18nClient } from '@payloadcms/translations'\nimport type { Theme } from '@payloadcms/ui'\nimport type {\n  ClientConfig,\n  ImportMap,\n  LanguageOptions,\n  SanitizedConfig,\n  SanitizedPermissions,\n  ServerProps,\n  User,\n} from 'payload'\n\nimport { getNavPrefs } from '@payloadcms/ui/elements/Nav/getNavPrefs'\nimport { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent'\nimport { getClientConfig } from '@payloadcms/ui/utilities/getClientConfig'\nimport { getRequestEmbed } from '@payloadcms/ui/utilities/getRequestEmbed'\nimport { getRequestTheme } from '@payloadcms/ui/utilities/getRequestTheme'\nimport { Outlet } from '@tanstack/react-router'\nimport { applyLocaleFiltering } from 'payload/shared'\nimport { createElement } from 'react'\n\nimport { initReq } from '../../utilities/initReq.server.js'\n\nexport type RootLayoutData = {\n  clientConfig: ClientConfig\n  dateFNSKey: I18nClient['dateFNSKey']\n  fallbackLang: string\n  isEmbedded: boolean\n  isNavOpen: boolean\n  languageCode: string\n  languageOptions: LanguageOptions\n  locale?: string\n  permissions: SanitizedPermissions\n  /**\n   * Custom admin provider tree (`config.admin.components.providers`) nested\n   * around the router `<Outlet />`. Built unrendered by `getLayoutData`; the\n   * layout server function renders it to an RSC payload before it reaches the\n   * client. `undefined` when no custom providers are configured.\n   */\n  providers?: React.ReactNode\n  theme: Theme\n  translations: I18nClient['translations']\n  user: null | User\n}\n\nexport type GetLayoutDataArgs = {\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n}\n\n/**\n * Fetches all data needed by the root admin layout.\n * Call this in your TanStack Start root route loader.\n */\nexport async function getLayoutData({\n  configPromise,\n  importMap,\n}: GetLayoutDataArgs): Promise<RootLayoutData> {\n  const {\n    cookies,\n    headers,\n    languageCode,\n    permissions,\n    req,\n    req: {\n      payload: { config },\n    },\n  } = await initReq({ configPromise, importMap })\n\n  const theme = getRequestTheme({ config, cookies, headers })\n  const isEmbedded = getRequestEmbed({ config, cookies })\n\n  const languageOptions: LanguageOptions = Object.entries(\n    config.i18n.supportedLanguages || {},\n  ).reduce((acc, [language, languageConfig]) => {\n    if (Object.keys(config.i18n.supportedLanguages).includes(language)) {\n      acc.push({\n        label: languageConfig.translations.general.thisLanguage,\n        value: language as AcceptedLanguages,\n      })\n    }\n    return acc\n  }, [] as LanguageOptions)\n\n  const navPrefs = await getNavPrefs(req)\n\n  const clientConfig = getClientConfig({\n    config,\n    i18n: req.i18n,\n    importMap,\n    user: req.user ?? true,\n  })\n\n  await applyLocaleFiltering({ clientConfig, config, req })\n\n  // Build the custom admin provider tree (`config.admin.components.providers`)\n  // nested around the router `<Outlet />`, mirroring the Next adapter's\n  // `NestProviders`. Returned as an unrendered element; the caller's server\n  // function renders it to an RSC payload (so server-component providers run\n  // server-side and client providers wrap the live Outlet). `undefined` when\n  // no custom providers are configured — the caller falls back to `<Outlet />`.\n  const providerPaths = config.admin?.components?.providers\n  let providers: React.ReactNode = undefined\n  if (Array.isArray(providerPaths) && providerPaths.length > 0) {\n    const serverProps: ServerProps = {\n      i18n: req.i18n,\n      params: {},\n      payload: req.payload,\n      permissions,\n      searchParams: {},\n      server: req.server!,\n      user: req.user ?? undefined,\n    }\n    // Mirror the Next adapter's `NestProviders`: render each configured provider\n    // via `RenderServerComponent` so the entry's own `clientProps`/`serverProps`\n    // (e.g. plugin-multi-tenant's `userHasAccessToAllTenants`) are merged in, and\n    // server components receive `serverProps` while client components get only\n    // `clientProps`. Nested around the router `<Outlet />` instead of `children`.\n    providers = providerPaths.reduceRight<React.ReactNode>(\n      (children, provider) =>\n        RenderServerComponent({\n          clientProps: { children },\n          Component: provider,\n          importMap,\n          serverProps,\n        }),\n      createElement(Outlet),\n    )\n  }\n\n  return {\n    clientConfig,\n    dateFNSKey: req.i18n.dateFNSKey,\n    fallbackLang: config.i18n.fallbackLanguage,\n    isEmbedded,\n    isNavOpen: navPrefs?.open ?? true,\n    languageCode,\n    languageOptions,\n    locale: req.locale ?? undefined,\n    permissions,\n    providers,\n    theme,\n    translations: req.i18n.translations,\n    user: req.user,\n  }\n}\n"],"names":["getNavPrefs","RenderServerComponent","getClientConfig","getRequestEmbed","getRequestTheme","Outlet","applyLocaleFiltering","createElement","initReq","getLayoutData","configPromise","importMap","cookies","headers","languageCode","permissions","req","payload","config","theme","isEmbedded","languageOptions","Object","entries","i18n","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","navPrefs","clientConfig","user","providerPaths","admin","components","providers","undefined","Array","isArray","length","serverProps","params","searchParams","server","reduceRight","children","provider","clientProps","Component","dateFNSKey","fallbackLang","fallbackLanguage","isNavOpen","open","locale"],"mappings":"AAYA,SAASA,WAAW,QAAQ,0CAAyC;AACrE,SAASC,qBAAqB,QAAQ,gDAA+C;AACrF,SAASC,eAAe,QAAQ,2CAA0C;AAC1E,SAASC,eAAe,QAAQ,2CAA0C;AAC1E,SAASC,eAAe,QAAQ,2CAA0C;AAC1E,SAASC,MAAM,QAAQ,yBAAwB;AAC/C,SAASC,oBAAoB,QAAQ,iBAAgB;AACrD,SAASC,aAAa,QAAQ,QAAO;AAErC,SAASC,OAAO,QAAQ,oCAAmC;AA6B3D;;;CAGC,GACD,OAAO,eAAeC,cAAc,EAClCC,aAAa,EACbC,SAAS,EACS;IAClB,MAAM,EACJC,OAAO,EACPC,OAAO,EACPC,YAAY,EACZC,WAAW,EACXC,GAAG,EACHA,KAAK,EACHC,SAAS,EAAEC,MAAM,EAAE,EACpB,EACF,GAAG,MAAMV,QAAQ;QAAEE;QAAeC;IAAU;IAE7C,MAAMQ,QAAQf,gBAAgB;QAAEc;QAAQN;QAASC;IAAQ;IACzD,MAAMO,aAAajB,gBAAgB;QAAEe;QAAQN;IAAQ;IAErD,MAAMS,kBAAmCC,OAAOC,OAAO,CACrDL,OAAOM,IAAI,CAACC,kBAAkB,IAAI,CAAC,GACnCC,MAAM,CAAC,CAACC,KAAK,CAACC,UAAUC,eAAe;QACvC,IAAIP,OAAOQ,IAAI,CAACZ,OAAOM,IAAI,CAACC,kBAAkB,EAAEM,QAAQ,CAACH,WAAW;YAClED,IAAIK,IAAI,CAAC;gBACPC,OAAOJ,eAAeK,YAAY,CAACC,OAAO,CAACC,YAAY;gBACvDC,OAAOT;YACT;QACF;QACA,OAAOD;IACT,GAAG,EAAE;IAEL,MAAMW,WAAW,MAAMtC,YAAYgB;IAEnC,MAAMuB,eAAerC,gBAAgB;QACnCgB;QACAM,MAAMR,IAAIQ,IAAI;QACdb;QACA6B,MAAMxB,IAAIwB,IAAI,IAAI;IACpB;IAEA,MAAMlC,qBAAqB;QAAEiC;QAAcrB;QAAQF;IAAI;IAEvD,6EAA6E;IAC7E,sEAAsE;IACtE,0EAA0E;IAC1E,2EAA2E;IAC3E,2EAA2E;IAC3E,8EAA8E;IAC9E,MAAMyB,gBAAgBvB,OAAOwB,KAAK,EAAEC,YAAYC;IAChD,IAAIA,YAA6BC;IACjC,IAAIC,MAAMC,OAAO,CAACN,kBAAkBA,cAAcO,MAAM,GAAG,GAAG;QAC5D,MAAMC,cAA2B;YAC/BzB,MAAMR,IAAIQ,IAAI;YACd0B,QAAQ,CAAC;YACTjC,SAASD,IAAIC,OAAO;YACpBF;YACAoC,cAAc,CAAC;YACfC,QAAQpC,IAAIoC,MAAM;YAClBZ,MAAMxB,IAAIwB,IAAI,IAAIK;QACpB;QACA,6EAA6E;QAC7E,6EAA6E;QAC7E,8EAA8E;QAC9E,2EAA2E;QAC3E,8EAA8E;QAC9ED,YAAYH,cAAcY,WAAW,CACnC,CAACC,UAAUC,WACTtD,sBAAsB;gBACpBuD,aAAa;oBAAEF;gBAAS;gBACxBG,WAAWF;gBACX5C;gBACAsC;YACF,IACF1C,cAAcF;IAElB;IAEA,OAAO;QACLkC;QACAmB,YAAY1C,IAAIQ,IAAI,CAACkC,UAAU;QAC/BC,cAAczC,OAAOM,IAAI,CAACoC,gBAAgB;QAC1CxC;QACAyC,WAAWvB,UAAUwB,QAAQ;QAC7BhD;QACAO;QACA0C,QAAQ/C,IAAI+C,MAAM,IAAIlB;QACtB9B;QACA6B;QACAzB;QACAe,cAAclB,IAAIQ,IAAI,CAACU,YAAY;QACnCM,MAAMxB,IAAIwB,IAAI;IAChB;AACF"}

package/dist/layouts/Root/withPayloadRoot.d.ts

@@ -1,36 +1,17 @@
 import React from 'react';
-/**
- * Builds the blocking inline script that sets `data-theme`, `lang`, and `dir`
- * on `<html>` synchronously, before first paint, from Payload's theme and
- * language cookies. This is the no-flash equivalent of what `RootProvider`'s
- * `ThemeProvider` does in a post-hydration effect, hoisted into the SSR'd
- * document head so the admin panel never flashes light mode (or LTR for RTL
- * locales) on the first render. Mirrors `detectTheme` in
- * `@payloadcms/ui`'s `ThemeProvider`.
- */
-export declare function buildThemeInitScript(cookiePrefix?: string): string;
-/**
- * The no-flash theme bootstrap script for the default (`payload`) cookie
- * prefix. Inline this in a `<script dangerouslySetInnerHTML>` inside the
- * document `<head>` to set `data-theme`/`lang`/`dir` before first paint.
- */
-export declare const THEME_INIT_SCRIPT: string;
 export type PayloadAdminShellProps = {
     readonly children: React.ReactNode;
-    /**
-     * The `config.cookiePrefix` used to read the theme/language cookies in the
-     * no-flash bootstrap script. Defaults to `'payload'`.
-     */
-    readonly cookiePrefix?: string;
 };
 /**
  * The `<html>` document shell for Payload admin routes — the TanStack Start
- * equivalent of `@payloadcms/next`'s root layout `<html>`. Owns the no-flash
- * theme script, the `@layer` ordering style, `@payloadcms/ui` styles,
- * `<HeadContent />`, and `<Scripts />`. Render `RootProvider` (and the rest of
- * the admin tree) as `children`.
+ * equivalent of `@payloadcms/next`'s root layout `<html>`. Sets
+ * `data-theme`/`lang`/`dir` on `<html>` from the server-computed layout data
+ * (`getLayoutData`, exposed on the `/_payload` route loader), so the admin
+ * panel renders themed with the correct text direction on the first paint with no
+ * client bootstrap script — the same server-side path Next's `RootLayout`
+ * uses, sharing `getRequestTheme`/`getLanguageDir` from `@payloadcms/ui`.
  */
-export declare function PayloadAdminShell({ children, cookiePrefix }: PayloadAdminShellProps): React.JSX.Element;
+export declare function PayloadAdminShell({ children }: PayloadAdminShellProps): React.JSX.Element;
 export type WithPayloadRootOptions = {
     /**
      * Path prefix that mounts the Payload admin panel (`config.routes.admin`).
@@ -38,11 +19,6 @@ export type WithPayloadRootOptions = {
      * renders your own shell. Defaults to `'/admin'`.
      */
     adminRoute?: string;
-    /**
-     * The `config.cookiePrefix` used by the no-flash theme bootstrap script.
-     * Defaults to `'payload'`.
-     */
-    cookiePrefix?: string;
 };
 /**
  * Wraps your application's root document shell so Payload owns its own

package/dist/layouts/Root/withPayloadRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withPayloadRoot.d.ts","sourceRoot":"","sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,GAAE,MAAkB,GAAG,MAAM,CAG7E;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAA+B,CAAA;AAE/D,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAC/B,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,sBAAsB,qBAmBnF;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAAC,EAC7D,OAAO,GAAE,sBAA2B,kBAIW;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,uBAc7E"}
+{"version":3,"file":"withPayloadRoot.d.ts","sourceRoot":"","sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACnC,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,QAAQ,EAAE,EAAE,sBAAsB,qBAmCrE;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAAC,EAC7D,OAAO,GAAE,sBAA2B,kBAIW;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,uBAc7E"}

package/dist/layouts/Root/withPayloadRoot.js

@@ -1,46 +1,46 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { rtlLanguages } from '@payloadcms/translations';
+import { getLanguageDir } from '@payloadcms/ui/utilities/getLanguageDir';
 import { HeadContent, Scripts, useRouterState } from '@tanstack/react-router';
 import React from 'react';
-/**
- * Builds the blocking inline script that sets `data-theme`, `lang`, and `dir`
- * on `<html>` synchronously, before first paint, from Payload's theme and
- * language cookies. This is the no-flash equivalent of what `RootProvider`'s
- * `ThemeProvider` does in a post-hydration effect, hoisted into the SSR'd
- * document head so the admin panel never flashes light mode (or LTR for RTL
- * locales) on the first render. Mirrors `detectTheme` in
- * `@payloadcms/ui`'s `ThemeProvider`.
- */ export function buildThemeInitScript(cookiePrefix = 'payload') {
-    const rtl = JSON.stringify(rtlLanguages);
-    return `(function(){try{var d=document.documentElement;var c=document.cookie.split('; ');function r(n){var row=c.find(function(x){return x.indexOf(n+'=')===0});return row?row.split('=')[1]:null}var t=r('${cookiePrefix}-theme');if(t!=='light'&&t!=='dark'){t=window.matchMedia&&window.matchMedia('(prefers-color-scheme: dark)').matches?'dark':'light'}d.setAttribute('data-theme',t);var l=r('${cookiePrefix}-lng');if(l){d.setAttribute('lang',l);d.setAttribute('dir',${rtl}.indexOf(l)!==-1?'rtl':'ltr')}}catch(e){}})()`;
-}
-/**
- * The no-flash theme bootstrap script for the default (`payload`) cookie
- * prefix. Inline this in a `<script dangerouslySetInnerHTML>` inside the
- * document `<head>` to set `data-theme`/`lang`/`dir` before first paint.
- */ export const THEME_INIT_SCRIPT = buildThemeInitScript();
 /**
  * The `<html>` document shell for Payload admin routes — the TanStack Start
- * equivalent of `@payloadcms/next`'s root layout `<html>`. Owns the no-flash
- * theme script, the `@layer` ordering style, `@payloadcms/ui` styles,
- * `<HeadContent />`, and `<Scripts />`. Render `RootProvider` (and the rest of
- * the admin tree) as `children`.
- */ export function PayloadAdminShell({ children, cookiePrefix }) {
-    const themeInitScript = cookiePrefix ? buildThemeInitScript(cookiePrefix) : THEME_INIT_SCRIPT;
-    return(// `lang`/`dir` are set on `<html>` by `themeInitScript` before first paint
-    // from the `*-lng` cookie, so a static `lang` here would be incorrect.
-    // eslint-disable-next-line jsx-a11y/html-has-lang -- set dynamically by the inline bootstrap script
+ * equivalent of `@payloadcms/next`'s root layout `<html>`. Sets
+ * `data-theme`/`lang`/`dir` on `<html>` from the server-computed layout data
+ * (`getLayoutData`, exposed on the `/_payload` route loader), so the admin
+ * panel renders themed with the correct text direction on the first paint with no
+ * client bootstrap script — the same server-side path Next's `RootLayout`
+ * uses, sharing `getRequestTheme`/`getLanguageDir` from `@payloadcms/ui`.
+ */ export function PayloadAdminShell({ children }) {
+    const htmlProps = useRouterState({
+        select: (state)=>{
+            for (const match of state.matches){
+                const data = match.loaderData;
+                if (data?.theme && data?.languageCode) {
+                    return {
+                        'data-theme': data.theme,
+                        dir: getLanguageDir({
+                            languageCode: data.languageCode
+                        }),
+                        lang: data.languageCode
+                    };
+                }
+            }
+            // No layout data yet (fresh session before the loader resolves): default
+            // to `ltr` so the `[dir='ltr']`-scoped admin layout rules (e.g. the
+            // document sidebar divider) still match, matching Next's `ltr` default.
+            return {
+                dir: 'ltr'
+            };
+        }
+    });
+    return(// eslint-disable-next-line jsx-a11y/html-has-lang -- `lang` is set from server-computed layout data when available
     /*#__PURE__*/ _jsxs("html", {
+        ...htmlProps,
         suppressHydrationWarning: true,
         children: [
             /*#__PURE__*/ _jsxs("head", {
                 children: [
-                    /*#__PURE__*/ _jsx("script", {
-                        dangerouslySetInnerHTML: {
-                            __html: themeInitScript
-                        }
-                    }),
                     /*#__PURE__*/ _jsx("style", {
                         children: `@layer payload-default, payload;`
                     }),
@@ -69,7 +69,7 @@ import React from 'react';
  * })
  * ```
  */ export function withPayloadRoot(RootShell, options = {}) {
-    const { adminRoute = '/admin', cookiePrefix } = options;
+    const { adminRoute = '/admin' } = options;
     return function PayloadRootShell({ children }) {
         const isAdminRoute = useRouterState({
             select: (s)=>{
@@ -79,7 +79,6 @@ import React from 'react';
         });
         if (isAdminRoute) {
             return /*#__PURE__*/ _jsx(PayloadAdminShell, {
-                cookiePrefix: cookiePrefix,
                 children: children
             });
         }

package/dist/layouts/Root/withPayloadRoot.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"sourcesContent":["'use client'\nimport { rtlLanguages } from '@payloadcms/translations'\nimport { HeadContent, Scripts, useRouterState } from '@tanstack/react-router'\nimport React from 'react'\n\n/**\n * Builds the blocking inline script that sets `data-theme`, `lang`, and `dir`\n * on `<html>` synchronously, before first paint, from Payload's theme and\n * language cookies. This is the no-flash equivalent of what `RootProvider`'s\n * `ThemeProvider` does in a post-hydration effect, hoisted into the SSR'd\n * document head so the admin panel never flashes light mode (or LTR for RTL\n * locales) on the first render. Mirrors `detectTheme` in\n * `@payloadcms/ui`'s `ThemeProvider`.\n */\nexport function buildThemeInitScript(cookiePrefix: string = 'payload'): string {\n  const rtl = JSON.stringify(rtlLanguages)\n  return `(function(){try{var d=document.documentElement;var c=document.cookie.split('; ');function r(n){var row=c.find(function(x){return x.indexOf(n+'=')===0});return row?row.split('=')[1]:null}var t=r('${cookiePrefix}-theme');if(t!=='light'&&t!=='dark'){t=window.matchMedia&&window.matchMedia('(prefers-color-scheme: dark)').matches?'dark':'light'}d.setAttribute('data-theme',t);var l=r('${cookiePrefix}-lng');if(l){d.setAttribute('lang',l);d.setAttribute('dir',${rtl}.indexOf(l)!==-1?'rtl':'ltr')}}catch(e){}})()`\n}\n\n/**\n * The no-flash theme bootstrap script for the default (`payload`) cookie\n * prefix. Inline this in a `<script dangerouslySetInnerHTML>` inside the\n * document `<head>` to set `data-theme`/`lang`/`dir` before first paint.\n */\nexport const THEME_INIT_SCRIPT: string = buildThemeInitScript()\n\nexport type PayloadAdminShellProps = {\n  readonly children: React.ReactNode\n  /**\n   * The `config.cookiePrefix` used to read the theme/language cookies in the\n   * no-flash bootstrap script. Defaults to `'payload'`.\n   */\n  readonly cookiePrefix?: string\n}\n\n/**\n * The `<html>` document shell for Payload admin routes — the TanStack Start\n * equivalent of `@payloadcms/next`'s root layout `<html>`. Owns the no-flash\n * theme script, the `@layer` ordering style, `@payloadcms/ui` styles,\n * `<HeadContent />`, and `<Scripts />`. Render `RootProvider` (and the rest of\n * the admin tree) as `children`.\n */\nexport function PayloadAdminShell({ children, cookiePrefix }: PayloadAdminShellProps) {\n  const themeInitScript = cookiePrefix ? buildThemeInitScript(cookiePrefix) : THEME_INIT_SCRIPT\n\n  return (\n    // `lang`/`dir` are set on `<html>` by `themeInitScript` before first paint\n    // from the `*-lng` cookie, so a static `lang` here would be incorrect.\n    // eslint-disable-next-line jsx-a11y/html-has-lang -- set dynamically by the inline bootstrap script\n    <html suppressHydrationWarning>\n      <head>\n        <script dangerouslySetInnerHTML={{ __html: themeInitScript }} />\n        <style>{`@layer payload-default, payload;`}</style>\n        <HeadContent />\n      </head>\n      <body>\n        {children}\n        <Scripts />\n      </body>\n    </html>\n  )\n}\n\nexport type WithPayloadRootOptions = {\n  /**\n   * Path prefix that mounts the Payload admin panel (`config.routes.admin`).\n   * Routes under it render the Payload admin document shell; everything else\n   * renders your own shell. Defaults to `'/admin'`.\n   */\n  adminRoute?: string\n  /**\n   * The `config.cookiePrefix` used by the no-flash theme bootstrap script.\n   * Defaults to `'payload'`.\n   */\n  cookiePrefix?: string\n}\n\n/**\n * Wraps your application's root document shell so Payload owns its own\n * `<html>` chrome on admin routes while your shell renders everywhere else.\n *\n * Attach the result to the root route's `shellComponent`; it is the single\n * integration touch point — no root loader and no manual data threading:\n *\n * ```tsx\n * export const Route = createRootRoute({\n *   shellComponent: withPayloadRoot(MarketingRoot),\n * })\n * ```\n */\nexport function withPayloadRoot(\n  RootShell: React.ComponentType<{ children: React.ReactNode }>,\n  options: WithPayloadRootOptions = {},\n) {\n  const { adminRoute = '/admin', cookiePrefix } = options\n\n  return function PayloadRootShell({ children }: { children: React.ReactNode }) {\n    const isAdminRoute = useRouterState({\n      select: (s) => {\n        const { pathname } = s.location\n        return pathname === adminRoute || pathname.startsWith(`${adminRoute}/`)\n      },\n    })\n\n    if (isAdminRoute) {\n      return <PayloadAdminShell cookiePrefix={cookiePrefix}>{children}</PayloadAdminShell>\n    }\n\n    return <RootShell>{children}</RootShell>\n  }\n}\n"],"names":["rtlLanguages","HeadContent","Scripts","useRouterState","React","buildThemeInitScript","cookiePrefix","rtl","JSON","stringify","THEME_INIT_SCRIPT","PayloadAdminShell","children","themeInitScript","html","suppressHydrationWarning","head","script","dangerouslySetInnerHTML","__html","style","body","withPayloadRoot","RootShell","options","adminRoute","PayloadRootShell","isAdminRoute","select","s","pathname","location","startsWith"],"mappings":"AAAA;;AACA,SAASA,YAAY,QAAQ,2BAA0B;AACvD,SAASC,WAAW,EAAEC,OAAO,EAAEC,cAAc,QAAQ,yBAAwB;AAC7E,OAAOC,WAAW,QAAO;AAEzB;;;;;;;;CAQC,GACD,OAAO,SAASC,qBAAqBC,eAAuB,SAAS;IACnE,MAAMC,MAAMC,KAAKC,SAAS,CAACT;IAC3B,OAAO,CAAC,mMAAmM,EAAEM,aAAa,2KAA2K,EAAEA,aAAa,2DAA2D,EAAEC,IAAI,6CAA6C,CAAC;AACrgB;AAEA;;;;CAIC,GACD,OAAO,MAAMG,oBAA4BL,uBAAsB;AAW/D;;;;;;CAMC,GACD,OAAO,SAASM,kBAAkB,EAAEC,QAAQ,EAAEN,YAAY,EAA0B;IAClF,MAAMO,kBAAkBP,eAAeD,qBAAqBC,gBAAgBI;IAE5E,OACE,2EAA2E;IAC3E,uEAAuE;IACvE,oGAAoG;kBACpG,MAACI;QAAKC,wBAAwB;;0BAC5B,MAACC;;kCACC,KAACC;wBAAOC,yBAAyB;4BAAEC,QAAQN;wBAAgB;;kCAC3D,KAACO;kCAAO,CAAC,gCAAgC,CAAC;;kCAC1C,KAACnB;;;0BAEH,MAACoB;;oBACET;kCACD,KAACV;;;;;AAIT;AAgBA;;;;;;;;;;;;CAYC,GACD,OAAO,SAASoB,gBACdC,SAA6D,EAC7DC,UAAkC,CAAC,CAAC;IAEpC,MAAM,EAAEC,aAAa,QAAQ,EAAEnB,YAAY,EAAE,GAAGkB;IAEhD,OAAO,SAASE,iBAAiB,EAAEd,QAAQ,EAAiC;QAC1E,MAAMe,eAAexB,eAAe;YAClCyB,QAAQ,CAACC;gBACP,MAAM,EAAEC,QAAQ,EAAE,GAAGD,EAAEE,QAAQ;gBAC/B,OAAOD,aAAaL,cAAcK,SAASE,UAAU,CAAC,GAAGP,WAAW,CAAC,CAAC;YACxE;QACF;QAEA,IAAIE,cAAc;YAChB,qBAAO,KAAChB;gBAAkBL,cAAcA;0BAAeM;;QACzD;QAEA,qBAAO,KAACW;sBAAWX;;IACrB;AACF"}
+{"version":3,"sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"sourcesContent":["'use client'\nimport type { Theme } from '@payloadcms/ui'\n\nimport { getLanguageDir } from '@payloadcms/ui/utilities/getLanguageDir'\nimport { HeadContent, Scripts, useRouterState } from '@tanstack/react-router'\nimport React from 'react'\n\ntype AdminHTMLProps = {\n  'data-theme'?: Theme\n  dir: 'ltr' | 'rtl'\n  lang?: string\n}\n\nexport type PayloadAdminShellProps = {\n  readonly children: React.ReactNode\n}\n\n/**\n * The `<html>` document shell for Payload admin routes — the TanStack Start\n * equivalent of `@payloadcms/next`'s root layout `<html>`. Sets\n * `data-theme`/`lang`/`dir` on `<html>` from the server-computed layout data\n * (`getLayoutData`, exposed on the `/_payload` route loader), so the admin\n * panel renders themed with the correct text direction on the first paint with no\n * client bootstrap script — the same server-side path Next's `RootLayout`\n * uses, sharing `getRequestTheme`/`getLanguageDir` from `@payloadcms/ui`.\n */\nexport function PayloadAdminShell({ children }: PayloadAdminShellProps) {\n  const htmlProps = useRouterState({\n    select: (state): AdminHTMLProps => {\n      for (const match of state.matches) {\n        const data = match.loaderData as { languageCode?: string; theme?: Theme } | undefined\n\n        if (data?.theme && data?.languageCode) {\n          return {\n            'data-theme': data.theme,\n            dir: getLanguageDir({ languageCode: data.languageCode }),\n            lang: data.languageCode,\n          }\n        }\n      }\n\n      // No layout data yet (fresh session before the loader resolves): default\n      // to `ltr` so the `[dir='ltr']`-scoped admin layout rules (e.g. the\n      // document sidebar divider) still match, matching Next's `ltr` default.\n      return { dir: 'ltr' }\n    },\n  })\n\n  return (\n    // eslint-disable-next-line jsx-a11y/html-has-lang -- `lang` is set from server-computed layout data when available\n    <html {...htmlProps} suppressHydrationWarning>\n      <head>\n        <style>{`@layer payload-default, payload;`}</style>\n        <HeadContent />\n      </head>\n      <body>\n        {children}\n        <Scripts />\n      </body>\n    </html>\n  )\n}\n\nexport type WithPayloadRootOptions = {\n  /**\n   * Path prefix that mounts the Payload admin panel (`config.routes.admin`).\n   * Routes under it render the Payload admin document shell; everything else\n   * renders your own shell. Defaults to `'/admin'`.\n   */\n  adminRoute?: string\n}\n\n/**\n * Wraps your application's root document shell so Payload owns its own\n * `<html>` chrome on admin routes while your shell renders everywhere else.\n *\n * Attach the result to the root route's `shellComponent`; it is the single\n * integration touch point — no root loader and no manual data threading:\n *\n * ```tsx\n * export const Route = createRootRoute({\n *   shellComponent: withPayloadRoot(MarketingRoot),\n * })\n * ```\n */\nexport function withPayloadRoot(\n  RootShell: React.ComponentType<{ children: React.ReactNode }>,\n  options: WithPayloadRootOptions = {},\n) {\n  const { adminRoute = '/admin' } = options\n\n  return function PayloadRootShell({ children }: { children: React.ReactNode }) {\n    const isAdminRoute = useRouterState({\n      select: (s) => {\n        const { pathname } = s.location\n        return pathname === adminRoute || pathname.startsWith(`${adminRoute}/`)\n      },\n    })\n\n    if (isAdminRoute) {\n      return <PayloadAdminShell>{children}</PayloadAdminShell>\n    }\n\n    return <RootShell>{children}</RootShell>\n  }\n}\n"],"names":["getLanguageDir","HeadContent","Scripts","useRouterState","React","PayloadAdminShell","children","htmlProps","select","state","match","matches","data","loaderData","theme","languageCode","dir","lang","html","suppressHydrationWarning","head","style","body","withPayloadRoot","RootShell","options","adminRoute","PayloadRootShell","isAdminRoute","s","pathname","location","startsWith"],"mappings":"AAAA;;AAGA,SAASA,cAAc,QAAQ,0CAAyC;AACxE,SAASC,WAAW,EAAEC,OAAO,EAAEC,cAAc,QAAQ,yBAAwB;AAC7E,OAAOC,WAAW,QAAO;AAYzB;;;;;;;;CAQC,GACD,OAAO,SAASC,kBAAkB,EAAEC,QAAQ,EAA0B;IACpE,MAAMC,YAAYJ,eAAe;QAC/BK,QAAQ,CAACC;YACP,KAAK,MAAMC,SAASD,MAAME,OAAO,CAAE;gBACjC,MAAMC,OAAOF,MAAMG,UAAU;gBAE7B,IAAID,MAAME,SAASF,MAAMG,cAAc;oBACrC,OAAO;wBACL,cAAcH,KAAKE,KAAK;wBACxBE,KAAKhB,eAAe;4BAAEe,cAAcH,KAAKG,YAAY;wBAAC;wBACtDE,MAAML,KAAKG,YAAY;oBACzB;gBACF;YACF;YAEA,yEAAyE;YACzE,oEAAoE;YACpE,wEAAwE;YACxE,OAAO;gBAAEC,KAAK;YAAM;QACtB;IACF;IAEA,OACE,mHAAmH;kBACnH,MAACE;QAAM,GAAGX,SAAS;QAAEY,wBAAwB;;0BAC3C,MAACC;;kCACC,KAACC;kCAAO,CAAC,gCAAgC,CAAC;;kCAC1C,KAACpB;;;0BAEH,MAACqB;;oBACEhB;kCACD,KAACJ;;;;;AAIT;AAWA;;;;;;;;;;;;CAYC,GACD,OAAO,SAASqB,gBACdC,SAA6D,EAC7DC,UAAkC,CAAC,CAAC;IAEpC,MAAM,EAAEC,aAAa,QAAQ,EAAE,GAAGD;IAElC,OAAO,SAASE,iBAAiB,EAAErB,QAAQ,EAAiC;QAC1E,MAAMsB,eAAezB,eAAe;YAClCK,QAAQ,CAACqB;gBACP,MAAM,EAAEC,QAAQ,EAAE,GAAGD,EAAEE,QAAQ;gBAC/B,OAAOD,aAAaJ,cAAcI,SAASE,UAAU,CAAC,GAAGN,WAAW,CAAC,CAAC;YACxE;QACF;QAEA,IAAIE,cAAc;YAChB,qBAAO,KAACvB;0BAAmBC;;QAC7B;QAEA,qBAAO,KAACkB;sBAAWlB;;IACrB;AACF"}

package/dist/routes/adminRoutes.d.ts

@@ -61,12 +61,20 @@ export declare function payloadAdminSplatRoute({ load }: {
     }) => {
         searchKey: string;
     };
-    notFoundComponent: typeof AdminNotFound;
     validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
+    notFoundComponent: typeof AdminNotFound;
 };
 /**
  * Route options for the admin index route (`/_payload/admin/`). Same loader as the
- * splat route but throws a bare `notFound()` (no rscPayload) on miss.
+ * splat route but throws a bare `notFound()` (no rscPayload) on miss, so
+ * `AdminNotFound` falls through to the bare client view.
+ *
+ * `notFoundComponent` must be set here even though the payload is never forwarded:
+ * TanStack picks the boundary component from its presence (`routeNotFoundComponent ?
+ * CatchNotFound : SafeFragment`), so leaving it off gives this route a different
+ * component type than the splat route at the same position in the tree. Navigating
+ * between the two would then unmount the whole admin subtree and remount it —
+ * blanking the page for as long as the new view takes to render.
  */
 export declare function payloadAdminIndexRoute({ load }: {
     load: AdminLoad;
@@ -95,8 +103,9 @@ export declare function payloadAdminIndexRoute({ load }: {
         })[];
     };
     loader: {
-        handler: ({ location }: {
+        handler: ({ location, params }: {
             location: any;
+            params: any;
         }) => Promise<any>;
         staleReloadMode: string;
     };
@@ -106,6 +115,7 @@ export declare function payloadAdminIndexRoute({ load }: {
         searchKey: string;
     };
     validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
+    notFoundComponent: typeof AdminNotFound;
 };
 export {};
 //# sourceMappingURL=adminRoutes.d.ts.map

package/dist/routes/adminRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adminRoutes.d.ts","sourceRoot":"","sources":["../../src/routes/adminRoutes.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAIhD;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE;IAC7B,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAAE,CAAA;CACpE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAclB,iBAAS,SAAS,gCAQjB;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,SAAS,CAAA;KAAE,CAAA;CAAE,+BAMrF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;IAEhE,SAAS;IACT,IAAI,mBAAmB;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;IAM3C,MAAM;QACJ,OAAO,yBAA+B;YAAE,QAAQ,EAAE,GAAG,CAAC;YAAC,MAAM,EAAE,GAAG,CAAA;SAAE;QAQpE,eAAe;;IAGjB,UAAU,eAAe;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE;QAC1D,SAAS;;IAEX,iBAAiB;IACjB,cAAc,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EAEnD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;IAEhE,SAAS;IACT,IAAI,mBAAmB;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;IAC3C,MAAM;QACJ,OAAO,iBAAuB;YAAE,QAAQ,EAAE,GAAG,CAAA;SAAE;QAQ/C,eAAe;;IAEjB,UAAU,eAAe;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE;QAC1D,SAAS;;IAEX,cAAc,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EAEnD"}
+{"version":3,"file":"adminRoutes.d.ts","sourceRoot":"","sources":["../../src/routes/adminRoutes.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAY,KAAK,SAAS,EAAoB,MAAM,OAAO,CAAA;AAIlE;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE;IAC7B,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAAE,CAAA;CACpE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAclB,iBAAS,SAAS,gCAcjB;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,SAAS,CAAA;KAAE,CAAA;CAAE,+BAMrF;AA8CD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;;2BAlC3C;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;QAOzC,OAAO,yBAA+B;YAAE,QAAQ,EAAE,GAAG,CAAC;YAAC,MAAM,EAAE,GAAG,CAAA;SAAE;QAYpE,eAAe;;6BAGQ;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE;QAC1D,SAAS;;6BAEc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAkBjD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;;2BAzD3C;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;QAOzC,OAAO,yBAA+B;YAAE,QAAQ,EAAE,GAAG,CAAC;YAAC,MAAM,EAAE,GAAG,CAAA;SAAE;QAYpE,eAAe;;6BAGQ;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE;QAC1D,SAAS;;6BAEc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAyCjD"}

package/dist/routes/adminRoutes.js

@@ -2,7 +2,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { NotFoundClient } from '@payloadcms/ui';
 import { notFound, redirect, useLoaderData } from '@tanstack/react-router';
-import { Fragment } from 'react';
+import { Fragment, useDeferredValue } from 'react';
 import { getAdminMeta } from '../utilities/meta.js';
 const searchToRecord = (searchStr)=>Object.fromEntries(new URLSearchParams(searchStr));
 const runLoader = async (load, splat, searchStr)=>{
@@ -21,17 +21,21 @@ const runLoader = async (load, splat, searchStr)=>{
     return data;
 };
 function AdminPage() {
-    // RSC Flight payload — render directly. Key by the loader-derived `routeKey`
-    // (not `location.pathname`, which updates before `useLoaderData` during a
-    // transition and would remount with the previous payload) so navigating to a
-    // different admin page remounts the view, mirroring Next route-segment
-    // semantics. Search params are excluded so search-only changes reconcile in place.
+    // Note: React key intentionally omitted here so the persistent template (nav, header) doesn't remount and flash on navigation.
+    // The per-route view key is attached server-side to the view subtree instead, via `renderRoot`'s `key` in `loadAdminPage`.
     const data = useLoaderData({
         strict: false
     });
+    // The loader resolves as soon as the RSC wire data lands, but rendering the payload then
+    // suspends while its client references are imported — code-split chunks in a production build.
+    // Router state lives in an external store, so the transition TanStack wraps the commit in
+    // de-opts to a synchronous render and that suspension hits the nearest fallback, which is
+    // `null` unless a `pendingComponent` is configured — blanking the page. Deferring the payload
+    // keeps the previous view painted until the new one is renderable, then swaps.
+    const rscPayload = useDeferredValue(data?.rscPayload);
     return /*#__PURE__*/ _jsx(Fragment, {
-        children: data?.rscPayload
-    }, data?.routeKey);
+        children: rscPayload
+    });
 }
 function AdminNotFound(props) {
     const rscPayload = props?.data?.rscPayload;
@@ -42,13 +46,7 @@ function AdminNotFound(props) {
         children: rscPayload
     }, props?.data?.routeKey);
 }
-/**
- * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's
- * server-built NotFound page (shipped via the `notFound()` error's
- * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare
- * client view.
- */ export function payloadAdminSplatRoute({ load }) {
-    return {
+const adminRouteOptions = ({ forwardNotFoundPayload, load, resolveSplat })=>({
         component: AdminPage,
         head: ({ loaderData })=>getAdminMeta(loaderData?.metadata),
         // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a
@@ -58,15 +56,15 @@ function AdminNotFound(props) {
         // (e.g. a just-created doc missing) until the reload lands.
         loader: {
             handler: async ({ location, params })=>{
-                const data = await runLoader(load, params._splat ?? '', location.searchStr);
+                const data = await runLoader(load, resolveSplat(params), location.searchStr);
                 if (data?._notFound) {
                     // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects
-                    throw notFound({
+                    throw notFound(forwardNotFoundPayload ? {
                         data: {
                             routeKey: data.routeKey,
                             rscPayload: data.rscPayload
                         }
-                    });
+                    } : undefined);
                 }
                 return data;
             },
@@ -76,32 +74,42 @@ function AdminNotFound(props) {
         loaderDeps: ({ search })=>({
                 searchKey: JSON.stringify(search)
             }),
-        notFoundComponent: AdminNotFound,
         validateSearch: (search)=>search
+    });
+/**
+ * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's
+ * server-built NotFound page (shipped via the `notFound()` error's
+ * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare
+ * client view.
+ */ export function payloadAdminSplatRoute({ load }) {
+    return {
+        ...adminRouteOptions({
+            forwardNotFoundPayload: true,
+            load,
+            resolveSplat: (params)=>params._splat ?? ''
+        }),
+        notFoundComponent: AdminNotFound
     };
 }
 /**
  * Route options for the admin index route (`/_payload/admin/`). Same loader as the
- * splat route but throws a bare `notFound()` (no rscPayload) on miss.
+ * splat route but throws a bare `notFound()` (no rscPayload) on miss, so
+ * `AdminNotFound` falls through to the bare client view.
+ *
+ * `notFoundComponent` must be set here even though the payload is never forwarded:
+ * TanStack picks the boundary component from its presence (`routeNotFoundComponent ?
+ * CatchNotFound : SafeFragment`), so leaving it off gives this route a different
+ * component type than the splat route at the same position in the tree. Navigating
+ * between the two would then unmount the whole admin subtree and remount it —
+ * blanking the page for as long as the new view takes to render.
  */ export function payloadAdminIndexRoute({ load }) {
     return {
-        component: AdminPage,
-        head: ({ loaderData })=>getAdminMeta(loaderData?.metadata),
-        loader: {
-            handler: async ({ location })=>{
-                const data = await runLoader(load, '', location.searchStr);
-                if (data?._notFound) {
-                    // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects
-                    throw notFound();
-                }
-                return data;
-            },
-            staleReloadMode: 'blocking'
-        },
-        loaderDeps: ({ search })=>({
-                searchKey: JSON.stringify(search)
-            }),
-        validateSearch: (search)=>search
+        ...adminRouteOptions({
+            forwardNotFoundPayload: false,
+            load,
+            resolveSplat: ()=>''
+        }),
+        notFoundComponent: AdminNotFound
     };
 }
 

package/dist/routes/adminRoutes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/routes/adminRoutes.tsx"],"sourcesContent":["'use client'\n\nimport { NotFoundClient } from '@payloadcms/ui'\nimport { notFound, redirect, useLoaderData } from '@tanstack/react-router'\nimport { Fragment, type ReactNode } from 'react'\n\nimport { getAdminMeta } from '../utilities/meta.js'\n\n/**\n * Loader supplied by the app — a TanStack Start `createServerFn` that delegates\n * to `loadAdminPage`. Typed loosely because the server-fn's call signature is\n * generated by the Start compiler.\n */\nexport type AdminLoad = (opts: {\n  data: { _splat: string; search: Record<string, string | string[]> }\n}) => Promise<any>\n\nconst searchToRecord = (searchStr: string): Record<string, string | string[]> =>\n  Object.fromEntries(new URLSearchParams(searchStr)) as Record<string, string | string[]>\n\nconst runLoader = async (load: AdminLoad, splat: string, searchStr: string) => {\n  const data = await load({ data: { _splat: splat, search: searchToRecord(searchStr) } })\n  if (data?._redirect) {\n    // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing redirect objects\n    throw redirect({ to: data._redirect })\n  }\n  return data\n}\n\nfunction AdminPage() {\n  // RSC Flight payload — render directly. Key by the loader-derived `routeKey`\n  // (not `location.pathname`, which updates before `useLoaderData` during a\n  // transition and would remount with the previous payload) so navigating to a\n  // different admin page remounts the view, mirroring Next route-segment\n  // semantics. Search params are excluded so search-only changes reconcile in place.\n  const data = useLoaderData({ strict: false })\n  return <Fragment key={data?.routeKey}>{data?.rscPayload}</Fragment>\n}\n\nfunction AdminNotFound(props: { data?: { routeKey?: string; rscPayload?: ReactNode } }) {\n  const rscPayload = props?.data?.rscPayload\n  if (!rscPayload) {\n    return <NotFoundClient />\n  }\n  return <Fragment key={props?.data?.routeKey}>{rscPayload}</Fragment>\n}\n\n/**\n * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's\n * server-built NotFound page (shipped via the `notFound()` error's\n * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare\n * client view.\n */\nexport function payloadAdminSplatRoute({ load }: { load: AdminLoad }) {\n  return {\n    component: AdminPage,\n    head: ({ loaderData }: { loaderData?: any }) => getAdminMeta(loaderData?.metadata),\n    // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a\n    // sibling route option — router-core only reads it off a non-function loader)\n    // makes stale-match revalidation await the fresh loader before committing,\n    // instead of the default background SWR that flashes the pre-navigation list\n    // (e.g. a just-created doc missing) until the reload lands.\n    loader: {\n      handler: async ({ location, params }: { location: any; params: any }) => {\n        const data = await runLoader(load, params._splat ?? '', location.searchStr)\n        if (data?._notFound) {\n          // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects\n          throw notFound({ data: { routeKey: data.routeKey, rscPayload: data.rscPayload } })\n        }\n        return data\n      },\n      staleReloadMode: 'blocking',\n    },\n    // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.\n    loaderDeps: ({ search }: { search: Record<string, unknown> }) => ({\n      searchKey: JSON.stringify(search),\n    }),\n    notFoundComponent: AdminNotFound,\n    validateSearch: (search: Record<string, unknown>) => search,\n  }\n}\n\n/**\n * Route options for the admin index route (`/_payload/admin/`). Same loader as the\n * splat route but throws a bare `notFound()` (no rscPayload) on miss.\n */\nexport function payloadAdminIndexRoute({ load }: { load: AdminLoad }) {\n  return {\n    component: AdminPage,\n    head: ({ loaderData }: { loaderData?: any }) => getAdminMeta(loaderData?.metadata),\n    loader: {\n      handler: async ({ location }: { location: any }) => {\n        const data = await runLoader(load, '', location.searchStr)\n        if (data?._notFound) {\n          // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects\n          throw notFound()\n        }\n        return data\n      },\n      staleReloadMode: 'blocking',\n    },\n    loaderDeps: ({ search }: { search: Record<string, unknown> }) => ({\n      searchKey: JSON.stringify(search),\n    }),\n    validateSearch: (search: Record<string, unknown>) => search,\n  }\n}\n"],"names":["NotFoundClient","notFound","redirect","useLoaderData","Fragment","getAdminMeta","searchToRecord","searchStr","Object","fromEntries","URLSearchParams","runLoader","load","splat","data","_splat","search","_redirect","to","AdminPage","strict","rscPayload","routeKey","AdminNotFound","props","payloadAdminSplatRoute","component","head","loaderData","metadata","loader","handler","location","params","_notFound","staleReloadMode","loaderDeps","searchKey","JSON","stringify","notFoundComponent","validateSearch","payloadAdminIndexRoute"],"mappings":"AAAA;;AAEA,SAASA,cAAc,QAAQ,iBAAgB;AAC/C,SAASC,QAAQ,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,yBAAwB;AAC1E,SAASC,QAAQ,QAAwB,QAAO;AAEhD,SAASC,YAAY,QAAQ,uBAAsB;AAWnD,MAAMC,iBAAiB,CAACC,YACtBC,OAAOC,WAAW,CAAC,IAAIC,gBAAgBH;AAEzC,MAAMI,YAAY,OAAOC,MAAiBC,OAAeN;IACvD,MAAMO,OAAO,MAAMF,KAAK;QAAEE,MAAM;YAAEC,QAAQF;YAAOG,QAAQV,eAAeC;QAAW;IAAE;IACrF,IAAIO,MAAMG,WAAW;QACnB,qHAAqH;QACrH,MAAMf,SAAS;YAAEgB,IAAIJ,KAAKG,SAAS;QAAC;IACtC;IACA,OAAOH;AACT;AAEA,SAASK;IACP,6EAA6E;IAC7E,0EAA0E;IAC1E,6EAA6E;IAC7E,uEAAuE;IACvE,mFAAmF;IACnF,MAAML,OAAOX,cAAc;QAAEiB,QAAQ;IAAM;IAC3C,qBAAO,KAAChB;kBAA+BU,MAAMO;OAAvBP,MAAMQ;AAC9B;AAEA,SAASC,cAAcC,KAA+D;IACpF,MAAMH,aAAaG,OAAOV,MAAMO;IAChC,IAAI,CAACA,YAAY;QACf,qBAAO,KAACrB;IACV;IACA,qBAAO,KAACI;kBAAsCiB;OAAxBG,OAAOV,MAAMQ;AACrC;AAEA;;;;;CAKC,GACD,OAAO,SAASG,uBAAuB,EAAEb,IAAI,EAAuB;IAClE,OAAO;QACLc,WAAWP;QACXQ,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAKvB,aAAauB,YAAYC;QACzE,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DC,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMnB,OAAO,MAAMH,UAAUC,MAAMqB,OAAOlB,MAAM,IAAI,IAAIiB,SAASzB,SAAS;gBAC1E,IAAIO,MAAMoB,WAAW;oBACnB,qHAAqH;oBACrH,MAAMjC,SAAS;wBAAEa,MAAM;4BAAEQ,UAAUR,KAAKQ,QAAQ;4BAAED,YAAYP,KAAKO,UAAU;wBAAC;oBAAE;gBAClF;gBACA,OAAOP;YACT;YACAqB,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAEpB,MAAM,EAAuC,GAAM,CAAA;gBAChEqB,WAAWC,KAAKC,SAAS,CAACvB;YAC5B,CAAA;QACAwB,mBAAmBjB;QACnBkB,gBAAgB,CAACzB,SAAoCA;IACvD;AACF;AAEA;;;CAGC,GACD,OAAO,SAAS0B,uBAAuB,EAAE9B,IAAI,EAAuB;IAClE,OAAO;QACLc,WAAWP;QACXQ,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAKvB,aAAauB,YAAYC;QACzEC,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAqB;gBAC7C,MAAMlB,OAAO,MAAMH,UAAUC,MAAM,IAAIoB,SAASzB,SAAS;gBACzD,IAAIO,MAAMoB,WAAW;oBACnB,qHAAqH;oBACrH,MAAMjC;gBACR;gBACA,OAAOa;YACT;YACAqB,iBAAiB;QACnB;QACAC,YAAY,CAAC,EAAEpB,MAAM,EAAuC,GAAM,CAAA;gBAChEqB,WAAWC,KAAKC,SAAS,CAACvB;YAC5B,CAAA;QACAyB,gBAAgB,CAACzB,SAAoCA;IACvD;AACF"}
+{"version":3,"sources":["../../src/routes/adminRoutes.tsx"],"sourcesContent":["'use client'\n\nimport { NotFoundClient } from '@payloadcms/ui'\nimport { notFound, redirect, useLoaderData } from '@tanstack/react-router'\nimport { Fragment, type ReactNode, useDeferredValue } from 'react'\n\nimport { getAdminMeta } from '../utilities/meta.js'\n\n/**\n * Loader supplied by the app — a TanStack Start `createServerFn` that delegates\n * to `loadAdminPage`. Typed loosely because the server-fn's call signature is\n * generated by the Start compiler.\n */\nexport type AdminLoad = (opts: {\n  data: { _splat: string; search: Record<string, string | string[]> }\n}) => Promise<any>\n\nconst searchToRecord = (searchStr: string): Record<string, string | string[]> =>\n  Object.fromEntries(new URLSearchParams(searchStr)) as Record<string, string | string[]>\n\nconst runLoader = async (load: AdminLoad, splat: string, searchStr: string) => {\n  const data = await load({ data: { _splat: splat, search: searchToRecord(searchStr) } })\n  if (data?._redirect) {\n    // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing redirect objects\n    throw redirect({ to: data._redirect })\n  }\n  return data\n}\n\nfunction AdminPage() {\n  // Note: React key intentionally omitted here so the persistent template (nav, header) doesn't remount and flash on navigation.\n  // The per-route view key is attached server-side to the view subtree instead, via `renderRoot`'s `key` in `loadAdminPage`.\n  const data = useLoaderData({ strict: false })\n\n  // The loader resolves as soon as the RSC wire data lands, but rendering the payload then\n  // suspends while its client references are imported — code-split chunks in a production build.\n  // Router state lives in an external store, so the transition TanStack wraps the commit in\n  // de-opts to a synchronous render and that suspension hits the nearest fallback, which is\n  // `null` unless a `pendingComponent` is configured — blanking the page. Deferring the payload\n  // keeps the previous view painted until the new one is renderable, then swaps.\n  const rscPayload = useDeferredValue(data?.rscPayload)\n\n  return <Fragment>{rscPayload}</Fragment>\n}\n\nfunction AdminNotFound(props: { data?: { routeKey?: string; rscPayload?: ReactNode } }) {\n  const rscPayload = props?.data?.rscPayload\n  if (!rscPayload) {\n    return <NotFoundClient />\n  }\n  return <Fragment key={props?.data?.routeKey}>{rscPayload}</Fragment>\n}\n\nconst adminRouteOptions = ({\n  forwardNotFoundPayload,\n  load,\n  resolveSplat,\n}: {\n  /**\n   * Ships the server-rendered NotFound tree through `notFound()`'s `data` so a\n   * `notFoundComponent` can render it with the full admin chrome. Routes without\n   * one throw bare.\n   */\n  forwardNotFoundPayload: boolean\n  load: AdminLoad\n  /** The route's splat, i.e. the path after `/admin/`. */\n  resolveSplat: (params: any) => string\n}) => ({\n  component: AdminPage,\n  head: ({ loaderData }: { loaderData?: any }) => getAdminMeta(loaderData?.metadata),\n  // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a\n  // sibling route option — router-core only reads it off a non-function loader)\n  // makes stale-match revalidation await the fresh loader before committing,\n  // instead of the default background SWR that flashes the pre-navigation list\n  // (e.g. a just-created doc missing) until the reload lands.\n  loader: {\n    handler: async ({ location, params }: { location: any; params: any }) => {\n      const data = await runLoader(load, resolveSplat(params), location.searchStr)\n      if (data?._notFound) {\n        // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects\n        throw notFound(\n          forwardNotFoundPayload\n            ? { data: { routeKey: data.routeKey, rscPayload: data.rscPayload } }\n            : undefined,\n        )\n      }\n      return data\n    },\n    staleReloadMode: 'blocking',\n  },\n  // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.\n  loaderDeps: ({ search }: { search: Record<string, unknown> }) => ({\n    searchKey: JSON.stringify(search),\n  }),\n  validateSearch: (search: Record<string, unknown>) => search,\n})\n\n/**\n * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's\n * server-built NotFound page (shipped via the `notFound()` error's\n * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare\n * client view.\n */\nexport function payloadAdminSplatRoute({ load }: { load: AdminLoad }) {\n  return {\n    ...adminRouteOptions({\n      forwardNotFoundPayload: true,\n      load,\n      resolveSplat: (params) => params._splat ?? '',\n    }),\n    notFoundComponent: AdminNotFound,\n  }\n}\n\n/**\n * Route options for the admin index route (`/_payload/admin/`). Same loader as the\n * splat route but throws a bare `notFound()` (no rscPayload) on miss, so\n * `AdminNotFound` falls through to the bare client view.\n *\n * `notFoundComponent` must be set here even though the payload is never forwarded:\n * TanStack picks the boundary component from its presence (`routeNotFoundComponent ?\n * CatchNotFound : SafeFragment`), so leaving it off gives this route a different\n * component type than the splat route at the same position in the tree. Navigating\n * between the two would then unmount the whole admin subtree and remount it —\n * blanking the page for as long as the new view takes to render.\n */\nexport function payloadAdminIndexRoute({ load }: { load: AdminLoad }) {\n  return {\n    ...adminRouteOptions({\n      forwardNotFoundPayload: false,\n      load,\n      resolveSplat: () => '',\n    }),\n    notFoundComponent: AdminNotFound,\n  }\n}\n"],"names":["NotFoundClient","notFound","redirect","useLoaderData","Fragment","useDeferredValue","getAdminMeta","searchToRecord","searchStr","Object","fromEntries","URLSearchParams","runLoader","load","splat","data","_splat","search","_redirect","to","AdminPage","strict","rscPayload","AdminNotFound","props","routeKey","adminRouteOptions","forwardNotFoundPayload","resolveSplat","component","head","loaderData","metadata","loader","handler","location","params","_notFound","undefined","staleReloadMode","loaderDeps","searchKey","JSON","stringify","validateSearch","payloadAdminSplatRoute","notFoundComponent","payloadAdminIndexRoute"],"mappings":"AAAA;;AAEA,SAASA,cAAc,QAAQ,iBAAgB;AAC/C,SAASC,QAAQ,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,yBAAwB;AAC1E,SAASC,QAAQ,EAAkBC,gBAAgB,QAAQ,QAAO;AAElE,SAASC,YAAY,QAAQ,uBAAsB;AAWnD,MAAMC,iBAAiB,CAACC,YACtBC,OAAOC,WAAW,CAAC,IAAIC,gBAAgBH;AAEzC,MAAMI,YAAY,OAAOC,MAAiBC,OAAeN;IACvD,MAAMO,OAAO,MAAMF,KAAK;QAAEE,MAAM;YAAEC,QAAQF;YAAOG,QAAQV,eAAeC;QAAW;IAAE;IACrF,IAAIO,MAAMG,WAAW;QACnB,qHAAqH;QACrH,MAAMhB,SAAS;YAAEiB,IAAIJ,KAAKG,SAAS;QAAC;IACtC;IACA,OAAOH;AACT;AAEA,SAASK;IACP,+HAA+H;IAC/H,2HAA2H;IAC3H,MAAML,OAAOZ,cAAc;QAAEkB,QAAQ;IAAM;IAE3C,yFAAyF;IACzF,+FAA+F;IAC/F,0FAA0F;IAC1F,0FAA0F;IAC1F,8FAA8F;IAC9F,+EAA+E;IAC/E,MAAMC,aAAajB,iBAAiBU,MAAMO;IAE1C,qBAAO,KAAClB;kBAAUkB;;AACpB;AAEA,SAASC,cAAcC,KAA+D;IACpF,MAAMF,aAAaE,OAAOT,MAAMO;IAChC,IAAI,CAACA,YAAY;QACf,qBAAO,KAACtB;IACV;IACA,qBAAO,KAACI;kBAAsCkB;OAAxBE,OAAOT,MAAMU;AACrC;AAEA,MAAMC,oBAAoB,CAAC,EACzBC,sBAAsB,EACtBd,IAAI,EACJe,YAAY,EAWb,GAAM,CAAA;QACLC,WAAWT;QACXU,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAKzB,aAAayB,YAAYC;QACzE,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DC,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMrB,OAAO,MAAMH,UAAUC,MAAMe,aAAaQ,SAASD,SAAS3B,SAAS;gBAC3E,IAAIO,MAAMsB,WAAW;oBACnB,qHAAqH;oBACrH,MAAMpC,SACJ0B,yBACI;wBAAEZ,MAAM;4BAAEU,UAAUV,KAAKU,QAAQ;4BAAEH,YAAYP,KAAKO,UAAU;wBAAC;oBAAE,IACjEgB;gBAER;gBACA,OAAOvB;YACT;YACAwB,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAEvB,MAAM,EAAuC,GAAM,CAAA;gBAChEwB,WAAWC,KAAKC,SAAS,CAAC1B;YAC5B,CAAA;QACA2B,gBAAgB,CAAC3B,SAAoCA;IACvD,CAAA;AAEA;;;;;CAKC,GACD,OAAO,SAAS4B,uBAAuB,EAAEhC,IAAI,EAAuB;IAClE,OAAO;QACL,GAAGa,kBAAkB;YACnBC,wBAAwB;YACxBd;YACAe,cAAc,CAACQ,SAAWA,OAAOpB,MAAM,IAAI;QAC7C,EAAE;QACF8B,mBAAmBvB;IACrB;AACF;AAEA;;;;;;;;;;;CAWC,GACD,OAAO,SAASwB,uBAAuB,EAAElC,IAAI,EAAuB;IAClE,OAAO;QACL,GAAGa,kBAAkB;YACnBC,wBAAwB;YACxBd;YACAe,cAAc,IAAM;QACtB,EAAE;QACFkB,mBAAmBvB;IACrB;AACF"}

package/dist/routes/apiRoute.d.ts

@@ -7,10 +7,15 @@ type ApiRouteHandler = (ctx: {
  * (`/_payload/api/$`). The app supplies `getConfig` (an `@payload-config`
  * import) since the package cannot resolve the consumer's config.
  *
+ * Imported from `@payloadcms/tanstack-start/server` (not the root barrel) so
+ * the server-only `handleAPIRoute` graph never reaches the client bundle.
+ *
  * Spread the result into a literal `server.handlers` key so TanStack Start's
  * client compiler can statically see — and prune — the server-only route:
  *
  * ```ts
+ * import { payloadApiHandlers } from '@payloadcms/tanstack-start/server'
+ *
  * export const Route = createFileRoute('/_payload/api/$')({
  *   server: {
  *     handlers: payloadApiHandlers({ getConfig: async () => (await import('@payload-config')).default }),

package/dist/routes/apiRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiRoute.d.ts","sourceRoot":"","sources":["../../src/routes/apiRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,KAAK,eAAe,GAAG,CAAC,GAAG,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,SAAS,GACV,EAAE;IACD,SAAS,EAAE,MAAM,OAAO,CAAC,eAAe,CAAC,CAAA;CAC1C,GAAG,MAAM,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,EAAE,eAAe,CAAC,CAcnF"}
+{"version":3,"file":"apiRoute.d.ts","sourceRoot":"","sources":["../../src/routes/apiRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,KAAK,eAAe,GAAG,CAAC,GAAG,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,SAAS,GACV,EAAE;IACD,SAAS,EAAE,MAAM,OAAO,CAAC,eAAe,CAAC,CAAA;CAC1C,GAAG,MAAM,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,EAAE,eAAe,CAAC,CAcnF"}

package/dist/routes/apiRoute.js

@@ -3,10 +3,15 @@
  * (`/_payload/api/$`). The app supplies `getConfig` (an `@payload-config`
  * import) since the package cannot resolve the consumer's config.
  *
+ * Imported from `@payloadcms/tanstack-start/server` (not the root barrel) so
+ * the server-only `handleAPIRoute` graph never reaches the client bundle.
+ *
  * Spread the result into a literal `server.handlers` key so TanStack Start's
  * client compiler can statically see — and prune — the server-only route:
  *
  * ```ts
+ * import { payloadApiHandlers } from '@payloadcms/tanstack-start/server'
+ *
  * export const Route = createFileRoute('/_payload/api/$')({
  *   server: {
  *     handlers: payloadApiHandlers({ getConfig: async () => (await import('@payload-config')).default }),
@@ -19,7 +24,7 @@
  * key, leaking the config graph into the client bundle.
  */ export function payloadApiHandlers({ getConfig }) {
     const handler = async ({ request })=>{
-        const { handleAPIRoute } = await import('../utilities/handleAPIRoute.js');
+        const { handleAPIRoute } = await import('../utilities/handleAPIRoute.server.js');
         return handleAPIRoute({
             config: await getConfig(),
             request

package/dist/routes/apiRoute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/routes/apiRoute.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\ntype ApiRouteHandler = (ctx: { request: Request }) => Promise<Response>\n\n/**\n * Builds the method handlers for the Payload REST/GraphQL catch-all\n * (`/_payload/api/$`). The app supplies `getConfig` (an `@payload-config`\n * import) since the package cannot resolve the consumer's config.\n *\n * Spread the result into a literal `server.handlers` key so TanStack Start's\n * client compiler can statically see — and prune — the server-only route:\n *\n * ```ts\n * export const Route = createFileRoute('/_payload/api/$')({\n *   server: {\n *     handlers: payloadApiHandlers({ getConfig: async () => (await import('@payload-config')).default }),\n *   },\n * })\n * ```\n *\n * The compiler only strips a literal `server:` key from a route-options object\n * expression; wrapping the whole options object in a factory call hides the\n * key, leaking the config graph into the client bundle.\n */\nexport function payloadApiHandlers({\n  getConfig,\n}: {\n  getConfig: () => Promise<SanitizedConfig>\n}): Record<'DELETE' | 'GET' | 'OPTIONS' | 'PATCH' | 'POST' | 'PUT', ApiRouteHandler> {\n  const handler: ApiRouteHandler = async ({ request }) => {\n    const { handleAPIRoute } = await import('../utilities/handleAPIRoute.js')\n    return handleAPIRoute({ config: await getConfig(), request })\n  }\n\n  return {\n    DELETE: handler,\n    GET: handler,\n    OPTIONS: handler,\n    PATCH: handler,\n    POST: handler,\n    PUT: handler,\n  }\n}\n"],"names":["payloadApiHandlers","getConfig","handler","request","handleAPIRoute","config","DELETE","GET","OPTIONS","PATCH","POST","PUT"],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;CAmBC,GACD,OAAO,SAASA,mBAAmB,EACjCC,SAAS,EAGV;IACC,MAAMC,UAA2B,OAAO,EAAEC,OAAO,EAAE;QACjD,MAAM,EAAEC,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC;QACxC,OAAOA,eAAe;YAAEC,QAAQ,MAAMJ;YAAaE;QAAQ;IAC7D;IAEA,OAAO;QACLG,QAAQJ;QACRK,KAAKL;QACLM,SAASN;QACTO,OAAOP;QACPQ,MAAMR;QACNS,KAAKT;IACP;AACF"}
+{"version":3,"sources":["../../src/routes/apiRoute.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\ntype ApiRouteHandler = (ctx: { request: Request }) => Promise<Response>\n\n/**\n * Builds the method handlers for the Payload REST/GraphQL catch-all\n * (`/_payload/api/$`). The app supplies `getConfig` (an `@payload-config`\n * import) since the package cannot resolve the consumer's config.\n *\n * Imported from `@payloadcms/tanstack-start/server` (not the root barrel) so\n * the server-only `handleAPIRoute` graph never reaches the client bundle.\n *\n * Spread the result into a literal `server.handlers` key so TanStack Start's\n * client compiler can statically see — and prune — the server-only route:\n *\n * ```ts\n * import { payloadApiHandlers } from '@payloadcms/tanstack-start/server'\n *\n * export const Route = createFileRoute('/_payload/api/$')({\n *   server: {\n *     handlers: payloadApiHandlers({ getConfig: async () => (await import('@payload-config')).default }),\n *   },\n * })\n * ```\n *\n * The compiler only strips a literal `server:` key from a route-options object\n * expression; wrapping the whole options object in a factory call hides the\n * key, leaking the config graph into the client bundle.\n */\nexport function payloadApiHandlers({\n  getConfig,\n}: {\n  getConfig: () => Promise<SanitizedConfig>\n}): Record<'DELETE' | 'GET' | 'OPTIONS' | 'PATCH' | 'POST' | 'PUT', ApiRouteHandler> {\n  const handler: ApiRouteHandler = async ({ request }) => {\n    const { handleAPIRoute } = await import('../utilities/handleAPIRoute.server.js')\n    return handleAPIRoute({ config: await getConfig(), request })\n  }\n\n  return {\n    DELETE: handler,\n    GET: handler,\n    OPTIONS: handler,\n    PATCH: handler,\n    POST: handler,\n    PUT: handler,\n  }\n}\n"],"names":["payloadApiHandlers","getConfig","handler","request","handleAPIRoute","config","DELETE","GET","OPTIONS","PATCH","POST","PUT"],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;CAwBC,GACD,OAAO,SAASA,mBAAmB,EACjCC,SAAS,EAGV;IACC,MAAMC,UAA2B,OAAO,EAAEC,OAAO,EAAE;QACjD,MAAM,EAAEC,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC;QACxC,OAAOA,eAAe;YAAEC,QAAQ,MAAMJ;YAAaE;QAAQ;IAC7D;IAEA,OAAO;QACLG,QAAQJ;QACRK,KAAKL;QACLM,SAASN;QACTO,OAAOP;QACPQ,MAAMR;QACNS,KAAKT;IACP;AACF"}

package/dist/routes/layoutRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layoutRoute.d.ts","sourceRoot":"","sources":["../../src/routes/layoutRoute.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAK1D;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;AAE/D;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,cAAc,GACf,EAAE;IACD,IAAI,EAAE,UAAU,CAAA;IAChB,cAAc,EAAE,cAAc,CAAC,OAAO,YAAY,CAAC,CAAC,gBAAgB,CAAC,CAAA;CACtE;IAqCG,SAAS;IACT,MAAM;QAAI,OAAO;QAAgB,eAAe;;EAEnD"}
+{"version":3,"file":"layoutRoute.d.ts","sourceRoot":"","sources":["../../src/routes/layoutRoute.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAK1D;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;AAE/D;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,cAAc,GACf,EAAE;IACD,IAAI,EAAE,UAAU,CAAA;IAChB,cAAc,EAAE,cAAc,CAAC,OAAO,YAAY,CAAC,CAAC,gBAAgB,CAAC,CAAA;CACtE;IAsCG,SAAS;IACT,MAAM;QAAI,OAAO;QAAgB,eAAe;;EAEnD"}

package/dist/routes/layoutRoute.js

@@ -19,6 +19,7 @@ import { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js';
                 /*#__PURE__*/ _jsxs(RootProvider, {
                     config: data.clientConfig,
                     dateFNSKey: data.dateFNSKey,
+                    embed: data.isEmbedded,
                     fallbackLang: data.fallbackLang,
                     highContrastMode: false,
                     isNavOpen: data.isNavOpen,