@payloadcms/tanstack-start 4.0.0-internal.7b031c8 → 4.0.0-internal.8709764

package/dist/layouts/Root/getLayoutData.js

@@ -1,6 +1,7 @@
 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';
@@ -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 { getRequestTheme } from '@payloadcms/ui/utilities/getRequestTheme'\nimport { Outlet } from '@tanstack/react-router'\nimport { applyLocaleFiltering } from 'payload/shared'\nimport { createElement } from 'react'\n\nimport type { RootLayoutData } from './index.js'\n\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","getRequestTheme","Outlet","applyLocaleFiltering","createElement","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,eAAe,QAAQ,2CAA0C;AAC1E,SAASC,MAAM,QAAQ,yBAAwB;AAC/C,SAASC,oBAAoB,QAAQ,iBAAgB;AACrD,SAASC,aAAa,QAAQ,QAAO;AAIrC,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,QAAQf,gBAAgB;QAAEc;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,MAAMjC,qBAAqB;QAAEgC;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,IACFzC,cAAcF;IAElB;IAEA,OAAO;QACLiC;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/routes/adminRoutes.d.ts

@@ -49,6 +49,7 @@ export declare function payloadAdminSplatRoute({ load }: {
             title: string;
         })[];
     };
+    notFoundComponent: typeof AdminNotFound;
     loader: {
         handler: ({ location, params }: {
             location: any;
@@ -61,12 +62,11 @@ export declare function payloadAdminSplatRoute({ load }: {
     }) => {
         searchKey: string;
     };
-    notFoundComponent: typeof AdminNotFound;
     validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
 };
 /**
- * Route options for the admin index route (`/_payload/admin/`). Same loader as the
- * splat route but throws a bare `notFound()` (no rscPayload) on miss.
+ * Route options for the admin index route (`/_payload/admin/`). Not-found
+ * results omit the RSC payload and fall back to `NotFoundClient`.
  */
 export declare function payloadAdminIndexRoute({ load }: {
     load: AdminLoad;
@@ -94,9 +94,11 @@ export declare function payloadAdminIndexRoute({ load }: {
             title: string;
         })[];
     };
+    notFoundComponent: typeof AdminNotFound;
     loader: {
-        handler: ({ location }: {
+        handler: ({ location, params }: {
             location: any;
+            params: any;
         }) => Promise<any>;
         staleReloadMode: string;
     };

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,EAA+B,MAAM,OAAO,CAAA;AAI7E;;;;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,gCAuBjB;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;AAiDD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;;2BArC3C;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;QAUzC,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;EAejD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;;2BAjD3C;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;QAUzC,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;EA2BjD"}

package/dist/routes/adminRoutes.js

@@ -1,8 +1,8 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { NotFoundClient } from '@payloadcms/ui';
+import { NotFoundClient, useRouteTransition } from '@payloadcms/ui';
 import { notFound, redirect, useLoaderData } from '@tanstack/react-router';
-import { Fragment } from 'react';
+import { Fragment, useDeferredValue, useEffect } 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,30 @@ 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
     });
+    // Route state comes from an external store, so a new RSC payload that suspends
+    // on code-split client references can reveal the router's null fallback.
+    // Keep the current payload painted until the next one is renderable.
+    const rscPayload = useDeferredValue(data?.rscPayload);
+    const { holdRouteTransition } = useRouteTransition();
+    const isRscPayloadDeferred = rscPayload !== data?.rscPayload;
+    useEffect(()=>{
+        if (!isRscPayloadDeferred) {
+            return;
+        }
+        const releaseRouteTransition = holdRouteTransition();
+        return ()=>releaseRouteTransition();
+    }, [
+        holdRouteTransition,
+        isRscPayloadDeferred
+    ]);
     return /*#__PURE__*/ _jsx(Fragment, {
-        children: data?.rscPayload
-    }, data?.routeKey);
+        children: rscPayload
+    });
 }
 function AdminNotFound(props) {
     const rscPayload = props?.data?.rscPayload;
@@ -42,15 +55,12 @@ 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),
+        // Both admin routes must use the same boundary type so index ↔ splat
+        // navigation preserves the existing admin subtree.
+        notFoundComponent: AdminNotFound,
         // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a
         // sibling route option — router-core only reads it off a non-function loader)
         // makes stale-match revalidation await the fresh loader before committing,
@@ -58,15 +68,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,33 +86,29 @@ 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 ?? ''
+    });
 }
 /**
- * Route options for the admin index route (`/_payload/admin/`). Same loader as the
- * splat route but throws a bare `notFound()` (no rscPayload) on miss.
+ * Route options for the admin index route (`/_payload/admin/`). Not-found
+ * results omit the RSC payload and fall back to `NotFoundClient`.
  */ 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
-    };
+    return adminRouteOptions({
+        forwardNotFoundPayload: false,
+        load,
+        resolveSplat: ()=>''
+    });
 }
 
 //# sourceMappingURL=adminRoutes.js.map

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, useRouteTransition } from '@payloadcms/ui'\nimport { notFound, redirect, useLoaderData } from '@tanstack/react-router'\nimport { Fragment, type ReactNode, useDeferredValue, useEffect } 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  // Route state comes from an external store, so a new RSC payload that suspends\n  // on code-split client references can reveal the router's null fallback.\n  // Keep the current payload painted until the next one is renderable.\n  const rscPayload = useDeferredValue(data?.rscPayload)\n  const { holdRouteTransition } = useRouteTransition()\n  const isRscPayloadDeferred = rscPayload !== data?.rscPayload\n\n  useEffect(() => {\n    if (!isRscPayloadDeferred) {\n      return\n    }\n\n    const releaseRouteTransition = holdRouteTransition()\n\n    return () => releaseRouteTransition()\n  }, [holdRouteTransition, isRscPayloadDeferred])\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  // Both admin routes must use the same boundary type so index ↔ splat\n  // navigation preserves the existing admin subtree.\n  notFoundComponent: AdminNotFound,\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 adminRouteOptions({\n    forwardNotFoundPayload: true,\n    load,\n    resolveSplat: (params) => params._splat ?? '',\n  })\n}\n\n/**\n * Route options for the admin index route (`/_payload/admin/`). Not-found\n * results omit the RSC payload and fall back to `NotFoundClient`.\n */\nexport function payloadAdminIndexRoute({ load }: { load: AdminLoad }) {\n  return adminRouteOptions({\n    forwardNotFoundPayload: false,\n    load,\n    resolveSplat: () => '',\n  })\n}\n"],"names":["NotFoundClient","useRouteTransition","notFound","redirect","useLoaderData","Fragment","useDeferredValue","useEffect","getAdminMeta","searchToRecord","searchStr","Object","fromEntries","URLSearchParams","runLoader","load","splat","data","_splat","search","_redirect","to","AdminPage","strict","rscPayload","holdRouteTransition","isRscPayloadDeferred","releaseRouteTransition","AdminNotFound","props","routeKey","adminRouteOptions","forwardNotFoundPayload","resolveSplat","component","head","loaderData","metadata","notFoundComponent","loader","handler","location","params","_notFound","undefined","staleReloadMode","loaderDeps","searchKey","JSON","stringify","validateSearch","payloadAdminSplatRoute","payloadAdminIndexRoute"],"mappings":"AAAA;;AAEA,SAASA,cAAc,EAAEC,kBAAkB,QAAQ,iBAAgB;AACnE,SAASC,QAAQ,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,yBAAwB;AAC1E,SAASC,QAAQ,EAAkBC,gBAAgB,EAAEC,SAAS,QAAQ,QAAO;AAE7E,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,MAAMjB,SAAS;YAAEkB,IAAIJ,KAAKG,SAAS;QAAC;IACtC;IACA,OAAOH;AACT;AAEA,SAASK;IACP,+HAA+H;IAC/H,2HAA2H;IAC3H,MAAML,OAAOb,cAAc;QAAEmB,QAAQ;IAAM;IAE3C,+EAA+E;IAC/E,yEAAyE;IACzE,qEAAqE;IACrE,MAAMC,aAAalB,iBAAiBW,MAAMO;IAC1C,MAAM,EAAEC,mBAAmB,EAAE,GAAGxB;IAChC,MAAMyB,uBAAuBF,eAAeP,MAAMO;IAElDjB,UAAU;QACR,IAAI,CAACmB,sBAAsB;YACzB;QACF;QAEA,MAAMC,yBAAyBF;QAE/B,OAAO,IAAME;IACf,GAAG;QAACF;QAAqBC;KAAqB;IAE9C,qBAAO,KAACrB;kBAAUmB;;AACpB;AAEA,SAASI,cAAcC,KAA+D;IACpF,MAAML,aAAaK,OAAOZ,MAAMO;IAChC,IAAI,CAACA,YAAY;QACf,qBAAO,KAACxB;IACV;IACA,qBAAO,KAACK;kBAAsCmB;OAAxBK,OAAOZ,MAAMa;AACrC;AAEA,MAAMC,oBAAoB,CAAC,EACzBC,sBAAsB,EACtBjB,IAAI,EACJkB,YAAY,EAWb,GAAM,CAAA;QACLC,WAAWZ;QACXa,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAK5B,aAAa4B,YAAYC;QACzE,qEAAqE;QACrE,mDAAmD;QACnDC,mBAAmBV;QACnB,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DW,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMzB,OAAO,MAAMH,UAAUC,MAAMkB,aAAaS,SAASD,SAAS/B,SAAS;gBAC3E,IAAIO,MAAM0B,WAAW;oBACnB,qHAAqH;oBACrH,MAAMzC,SACJ8B,yBACI;wBAAEf,MAAM;4BAAEa,UAAUb,KAAKa,QAAQ;4BAAEN,YAAYP,KAAKO,UAAU;wBAAC;oBAAE,IACjEoB;gBAER;gBACA,OAAO3B;YACT;YACA4B,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAE3B,MAAM,EAAuC,GAAM,CAAA;gBAChE4B,WAAWC,KAAKC,SAAS,CAAC9B;YAC5B,CAAA;QACA+B,gBAAgB,CAAC/B,SAAoCA;IACvD,CAAA;AAEA;;;;;CAKC,GACD,OAAO,SAASgC,uBAAuB,EAAEpC,IAAI,EAAuB;IAClE,OAAOgB,kBAAkB;QACvBC,wBAAwB;QACxBjB;QACAkB,cAAc,CAACS,SAAWA,OAAOxB,MAAM,IAAI;IAC7C;AACF;AAEA;;;CAGC,GACD,OAAO,SAASkC,uBAAuB,EAAErC,IAAI,EAAuB;IAClE,OAAOgB,kBAAkB;QACvBC,wBAAwB;QACxBjB;QACAkB,cAAc,IAAM;IACtB;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,

package/dist/routes/layoutRoute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/routes/layoutRoute.tsx"],"sourcesContent":["'use client'\n\nimport type { ComponentProps } from 'react'\n\nimport { ProgressBar, RootProvider } from '@payloadcms/ui'\nimport { Outlet, useLoaderData } from '@tanstack/react-router'\n\nimport { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js'\n\n/**\n * Loader supplied by the app — a TanStack Start `createServerFn` that delegates\n * to `loadLayoutData`. Typed loosely because the server-fn's call signature is\n * generated by the Start compiler.\n */\nexport type LayoutLoad = () => Promise<Record<string, unknown>>\n\n/**\n * Route options for the Payload admin layout (`/_payload`). Maps the layout\n * loader data onto `RootProvider` and renders the admin chrome (progress bar,\n * custom-provider tree or router `<Outlet />`, portal mount). The app supplies\n * `load` (the layout-data server fn) and `serverFunction` (the server-function\n * client wired into `RootProvider`); everything else is adapter-owned.\n */\nexport function payloadLayoutRoute({\n  load,\n  serverFunction,\n}: {\n  load: LayoutLoad\n  serverFunction: ComponentProps<typeof RootProvider>['serverFunction']\n}) {\n  function PayloadLayout() {\n    const data = useLoaderData({ strict: false })\n\n    return (\n      <>\n        <RootProvider\n          config={data.clientConfig}\n          dateFNSKey={data.dateFNSKey}\n          fallbackLang={data.fallbackLang}\n          highContrastMode={false}\n          isNavOpen={data.isNavOpen}\n          languageCode={data.languageCode}\n          languageOptions={data.languageOptions}\n          locale={data.locale}\n          permissions={data.user ? data.permissions : null}\n          RouterAdapter={TanStackRouterAdapter}\n          serverFunction={serverFunction}\n          theme={data.theme}\n          translations={data.translations}\n          user={data.user}\n        >\n          <ProgressBar />\n          {/* `data.providers` is the custom-provider tree (config.admin.components.providers)\n              already wrapping the router <Outlet />; falls back to a bare <Outlet /> when\n              no custom providers are configured. */}\n          {data.providers ?? <Outlet />}\n        </RootProvider>\n        <div id=\"portal\" />\n      </>\n    )\n  }\n\n  // `staleReloadMode` lives on the loader *object* — router-core only reads it\n  // off a non-function loader — so stale-match revalidation blocks on the fresh\n  // loader instead of flashing stale layout data via the default background SWR.\n  return {\n    component: PayloadLayout,\n    loader: { handler: () => load(), staleReloadMode: 'blocking' },\n  }\n}\n"],"names":["ProgressBar","RootProvider","Outlet","useLoaderData","TanStackRouterAdapter","payloadLayoutRoute","load","serverFunction","PayloadLayout","data","strict","config","clientConfig","dateFNSKey","fallbackLang","highContrastMode","isNavOpen","languageCode","languageOptions","locale","permissions","user","RouterAdapter","theme","translations","providers","div","id","component","loader","handler","staleReloadMode"],"mappings":"AAAA;;AAIA,SAASA,WAAW,EAAEC,YAAY,QAAQ,iBAAgB;AAC1D,SAASC,MAAM,EAAEC,aAAa,QAAQ,yBAAwB;AAE9D,SAASC,qBAAqB,QAAQ,qCAAoC;AAS1E;;;;;;CAMC,GACD,OAAO,SAASC,mBAAmB,EACjCC,IAAI,EACJC,cAAc,EAIf;IACC,SAASC;QACP,MAAMC,OAAON,cAAc;YAAEO,QAAQ;QAAM;QAE3C,qBACE;;8BACE,MAACT;oBACCU,QAAQF,KAAKG,YAAY;oBACzBC,YAAYJ,KAAKI,UAAU;oBAC3BC,cAAcL,KAAKK,YAAY;oBAC/BC,kBAAkB;oBAClBC,WAAWP,KAAKO,SAAS;oBACzBC,cAAcR,KAAKQ,YAAY;oBAC/BC,iBAAiBT,KAAKS,eAAe;oBACrCC,QAAQV,KAAKU,MAAM;oBACnBC,aAAaX,KAAKY,IAAI,GAAGZ,KAAKW,WAAW,GAAG;oBAC5CE,eAAelB;oBACfG,gBAAgBA;oBAChBgB,OAAOd,KAAKc,KAAK;oBACjBC,cAAcf,KAAKe,YAAY;oBAC/BH,MAAMZ,KAAKY,IAAI;;sCAEf,KAACrB;wBAIAS,KAAKgB,SAAS,kBAAI,KAACvB;;;8BAEtB,KAACwB;oBAAIC,IAAG;;;;IAGd;IAEA,6EAA6E;IAC7E,8EAA8E;IAC9E,+EAA+E;IAC/E,OAAO;QACLC,WAAWpB;QACXqB,QAAQ;YAAEC,SAAS,IAAMxB;YAAQyB,iBAAiB;QAAW;IAC/D;AACF"}
+{"version":3,"sources":["../../src/routes/layoutRoute.tsx"],"sourcesContent":["'use client'\n\nimport type { ComponentProps } from 'react'\n\nimport { ProgressBar, RootProvider } from '@payloadcms/ui'\nimport { Outlet, useLoaderData } from '@tanstack/react-router'\n\nimport { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js'\n\n/**\n * Loader supplied by the app — a TanStack Start `createServerFn` that delegates\n * to `loadLayoutData`. Typed loosely because the server-fn's call signature is\n * generated by the Start compiler.\n */\nexport type LayoutLoad = () => Promise<Record<string, unknown>>\n\n/**\n * Route options for the Payload admin layout (`/_payload`). Maps the layout\n * loader data onto `RootProvider` and renders the admin chrome (progress bar,\n * custom-provider tree or router `<Outlet />`, portal mount). The app supplies\n * `load` (the layout-data server fn) and `serverFunction` (the server-function\n * client wired into `RootProvider`); everything else is adapter-owned.\n */\nexport function payloadLayoutRoute({\n  load,\n  serverFunction,\n}: {\n  load: LayoutLoad\n  serverFunction: ComponentProps<typeof RootProvider>['serverFunction']\n}) {\n  function PayloadLayout() {\n    const data = useLoaderData({ strict: false })\n\n    return (\n      <>\n        <RootProvider\n          config={data.clientConfig}\n          dateFNSKey={data.dateFNSKey}\n          embed={data.isEmbedded}\n          fallbackLang={data.fallbackLang}\n          highContrastMode={false}\n          isNavOpen={data.isNavOpen}\n          languageCode={data.languageCode}\n          languageOptions={data.languageOptions}\n          locale={data.locale}\n          permissions={data.user ? data.permissions : null}\n          RouterAdapter={TanStackRouterAdapter}\n          serverFunction={serverFunction}\n          theme={data.theme}\n          translations={data.translations}\n          user={data.user}\n        >\n          <ProgressBar />\n          {/* `data.providers` is the custom-provider tree (config.admin.components.providers)\n              already wrapping the router <Outlet />; falls back to a bare <Outlet /> when\n              no custom providers are configured. */}\n          {data.providers ?? <Outlet />}\n        </RootProvider>\n        <div id=\"portal\" />\n      </>\n    )\n  }\n\n  // `staleReloadMode` lives on the loader *object* — router-core only reads it\n  // off a non-function loader — so stale-match revalidation blocks on the fresh\n  // loader instead of flashing stale layout data via the default background SWR.\n  return {\n    component: PayloadLayout,\n    loader: { handler: () => load(), staleReloadMode: 'blocking' },\n  }\n}\n"],"names":["ProgressBar","RootProvider","Outlet","useLoaderData","TanStackRouterAdapter","payloadLayoutRoute","load","serverFunction","PayloadLayout","data","strict","config","clientConfig","dateFNSKey","embed","isEmbedded","fallbackLang","highContrastMode","isNavOpen","languageCode","languageOptions","locale","permissions","user","RouterAdapter","theme","translations","providers","div","id","component","loader","handler","staleReloadMode"],"mappings":"AAAA;;AAIA,SAASA,WAAW,EAAEC,YAAY,QAAQ,iBAAgB;AAC1D,SAASC,MAAM,EAAEC,aAAa,QAAQ,yBAAwB;AAE9D,SAASC,qBAAqB,QAAQ,qCAAoC;AAS1E;;;;;;CAMC,GACD,OAAO,SAASC,mBAAmB,EACjCC,IAAI,EACJC,cAAc,EAIf;IACC,SAASC;QACP,MAAMC,OAAON,cAAc;YAAEO,QAAQ;QAAM;QAE3C,qBACE;;8BACE,MAACT;oBACCU,QAAQF,KAAKG,YAAY;oBACzBC,YAAYJ,KAAKI,UAAU;oBAC3BC,OAAOL,KAAKM,UAAU;oBACtBC,cAAcP,KAAKO,YAAY;oBAC/BC,kBAAkB;oBAClBC,WAAWT,KAAKS,SAAS;oBACzBC,cAAcV,KAAKU,YAAY;oBAC/BC,iBAAiBX,KAAKW,eAAe;oBACrCC,QAAQZ,KAAKY,MAAM;oBACnBC,aAAab,KAAKc,IAAI,GAAGd,KAAKa,WAAW,GAAG;oBAC5CE,eAAepB;oBACfG,gBAAgBA;oBAChBkB,OAAOhB,KAAKgB,KAAK;oBACjBC,cAAcjB,KAAKiB,YAAY;oBAC/BH,MAAMd,KAAKc,IAAI;;sCAEf,KAACvB;wBAIAS,KAAKkB,SAAS,kBAAI,KAACzB;;;8BAEtB,KAAC0B;oBAAIC,IAAG;;;;IAGd;IAEA,6EAA6E;IAC7E,8EAA8E;IAC9E,+EAA+E;IAC/E,OAAO;QACLC,WAAWtB;QACXuB,QAAQ;YAAEC,SAAS,IAAM1B;YAAQ2B,iBAAiB;QAAW;IAC/D;AACF"}

package/dist/utilities/getRequestLocale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRequestLocale.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestLocale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAOrD,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,wBAAsB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkCjG"}
+{"version":3,"file":"getRequestLocale.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestLocale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAKrD,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,wBAAsB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkCjG"}

package/dist/utilities/getRequestLocale.js

@@ -1,6 +1,5 @@
-import { upsertPreferences } from '@payloadcms/ui/rsc';
+import { getPreferences, upsertPreferences } from '@payloadcms/ui/rsc';
 import { findLocaleFromCode } from '@payloadcms/ui/shared';
-import { getPreferences } from './getPreferences.js';
 export async function getRequestLocale({ req }) {
     if (req.payload.config.localization) {
         const localeFromParams = req.query.locale;

package/dist/utilities/getRequestLocale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getRequestLocale.ts"],"sourcesContent":["import type { Locale, PayloadRequest } from 'payload'\n\nimport { upsertPreferences } from '@payloadcms/ui/rsc'\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\n\nimport { getPreferences } from './getPreferences.js'\n\ntype GetRequestLocaleArgs = {\n  req: PayloadRequest\n}\n\nexport async function getRequestLocale({ req }: GetRequestLocaleArgs): Promise<Locale | undefined> {\n  if (req.payload.config.localization) {\n    const localeFromParams = req.query.locale as string | undefined\n\n    if (req.user && localeFromParams) {\n      await upsertPreferences<Locale['code']>({ key: 'locale', req, value: localeFromParams })\n    }\n\n    const userLocale =\n      req.user &&\n      findLocaleFromCode(\n        req.payload.config.localization,\n        localeFromParams ||\n          (\n            await getPreferences<Locale['code']>(\n              'locale',\n              req.payload,\n              req.user.id,\n              req.user.collection,\n            )\n          )?.value,\n      )\n\n    return (\n      userLocale ??\n      findLocaleFromCode(\n        req.payload.config.localization,\n        req.payload.config.localization.defaultLocale || 'en',\n      ) ??\n      undefined\n    )\n  }\n\n  return undefined\n}\n"],"names":["upsertPreferences","findLocaleFromCode","getPreferences","getRequestLocale","req","payload","config","localization","localeFromParams","query","locale","user","key","value","userLocale","id","collection","defaultLocale","undefined"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,qBAAoB;AACtD,SAASC,kBAAkB,QAAQ,wBAAuB;AAE1D,SAASC,cAAc,QAAQ,sBAAqB;AAMpD,OAAO,eAAeC,iBAAiB,EAAEC,GAAG,EAAwB;IAClE,IAAIA,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAAE;QACnC,MAAMC,mBAAmBJ,IAAIK,KAAK,CAACC,MAAM;QAEzC,IAAIN,IAAIO,IAAI,IAAIH,kBAAkB;YAChC,MAAMR,kBAAkC;gBAAEY,KAAK;gBAAUR;gBAAKS,OAAOL;YAAiB;QACxF;QAEA,MAAMM,aACJV,IAAIO,IAAI,IACRV,mBACEG,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BC,oBAEI,CAAA,MAAMN,eACJ,UACAE,IAAIC,OAAO,EACXD,IAAIO,IAAI,CAACI,EAAE,EACXX,IAAIO,IAAI,CAACK,UAAU,CACrB,GACCH;QAGT,OACEC,cACAb,mBACEG,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BH,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,CAACU,aAAa,IAAI,SAEnDC;IAEJ;IAEA,OAAOA;AACT"}
+{"version":3,"sources":["../../src/utilities/getRequestLocale.ts"],"sourcesContent":["import type { Locale, PayloadRequest } from 'payload'\n\nimport { getPreferences, upsertPreferences } from '@payloadcms/ui/rsc'\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\n\ntype GetRequestLocaleArgs = {\n  req: PayloadRequest\n}\n\nexport async function getRequestLocale({ req }: GetRequestLocaleArgs): Promise<Locale | undefined> {\n  if (req.payload.config.localization) {\n    const localeFromParams = req.query.locale as string | undefined\n\n    if (req.user && localeFromParams) {\n      await upsertPreferences<Locale['code']>({ key: 'locale', req, value: localeFromParams })\n    }\n\n    const userLocale =\n      req.user &&\n      findLocaleFromCode(\n        req.payload.config.localization,\n        localeFromParams ||\n          (\n            await getPreferences<Locale['code']>(\n              'locale',\n              req.payload,\n              req.user.id,\n              req.user.collection,\n            )\n          )?.value,\n      )\n\n    return (\n      userLocale ??\n      findLocaleFromCode(\n        req.payload.config.localization,\n        req.payload.config.localization.defaultLocale || 'en',\n      ) ??\n      undefined\n    )\n  }\n\n  return undefined\n}\n"],"names":["getPreferences","upsertPreferences","findLocaleFromCode","getRequestLocale","req","payload","config","localization","localeFromParams","query","locale","user","key","value","userLocale","id","collection","defaultLocale","undefined"],"mappings":"AAEA,SAASA,cAAc,EAAEC,iBAAiB,QAAQ,qBAAoB;AACtE,SAASC,kBAAkB,QAAQ,wBAAuB;AAM1D,OAAO,eAAeC,iBAAiB,EAAEC,GAAG,EAAwB;IAClE,IAAIA,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAAE;QACnC,MAAMC,mBAAmBJ,IAAIK,KAAK,CAACC,MAAM;QAEzC,IAAIN,IAAIO,IAAI,IAAIH,kBAAkB;YAChC,MAAMP,kBAAkC;gBAAEW,KAAK;gBAAUR;gBAAKS,OAAOL;YAAiB;QACxF;QAEA,MAAMM,aACJV,IAAIO,IAAI,IACRT,mBACEE,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BC,oBAEI,CAAA,MAAMR,eACJ,UACAI,IAAIC,OAAO,EACXD,IAAIO,IAAI,CAACI,EAAE,EACXX,IAAIO,IAAI,CAACK,UAAU,CACrB,GACCH;QAGT,OACEC,cACAZ,mBACEE,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BH,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,CAACU,aAAa,IAAI,SAEnDC;IAEJ;IAEA,OAAOA;AACT"}

package/dist/utilities/handleServerFunctions.d.ts

@@ -1,20 +1,2 @@
-import type { ServerFunctionHandler } from 'payload';
-/**
- * Server function dispatcher for TanStack Start.
- *
- * Mirrors `packages/next/src/utilities/handleServerFunctions.ts` and uses the
- * exact same set of handlers — both adapters share `sharedServerFunctions`
- * plus the small set of RSC-only handlers re-exported by `@payloadcms/ui`.
- *
- * Pipes the result through `serializeForRsc`, which converts any React
- * elements left in the response (e.g. `state[path].customComponents.Field`
- * produced by `buildFormState`, the `List` / `Document` nodes returned by
- * `render-list` / `render-document`) into RSC "renderable handles" via
- * `renderServerComponent` from `@tanstack/react-start/rsc`. TanStack Start's
- * `$RSC` serialization adapter then ships those handles to the client as
- * Flight payloads — so this dispatcher must be invoked from a context that
- * uses TanStack's wire format (e.g. `createServerFn`), not raw
- * `JSON.stringify`.
- */
-export declare const handleServerFunctions: ServerFunctionHandler;
+export declare const handleServerFunctions: import("payload").ServerFunctionHandler;
 //# sourceMappingURL=handleServerFunctions.d.ts.map

package/dist/utilities/handleServerFunctions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6C,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAwB/F;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,qBAAqB,EAAE,qBAkCnC,CAAA"}
+{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,qBAAqB,yCAGhC,CAAA"}

package/dist/utilities/handleServerFunctions.js

@@ -1,60 +1,12 @@
-import { renderTabHandler } from '@payloadcms/ui/elements/Nav/SidebarTabs/renderTabServerFn';
-import { _internal_renderFieldHandler } from '@payloadcms/ui/rsc';
-import { sharedServerFunctions } from '@payloadcms/ui/utilities/serverFunctionRegistry';
-import { getDefaultLayoutHandler } from '@payloadcms/ui/views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn';
-import { renderWidgetHandler } from '@payloadcms/ui/views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn';
-import { renderDocumentSlotsHandler } from '@payloadcms/ui/views/Document/renderDocumentSlots';
-import { RenderRSCComponent } from '../rsc/renderPayloadRSC.js';
+import { createServerFunctionHandler } from '@payloadcms/ui/utilities/handleServerFunctions';
 import { initReq } from './initReq.server.js';
 import { serializeForRsc } from './serializeForRsc.js';
-import { switchLanguageHandler } from './serverFunctionHandlers.js';
-const baseServerFunctions = {
-    ...sharedServerFunctions,
-    'get-default-layout': getDefaultLayoutHandler,
-    'render-document-slots': renderDocumentSlotsHandler,
-    'render-field': _internal_renderFieldHandler,
-    'render-tab': renderTabHandler,
-    'render-widget': renderWidgetHandler,
-    'switch-language': switchLanguageHandler
-};
-/**
- * Server function dispatcher for TanStack Start.
- *
- * Mirrors `packages/next/src/utilities/handleServerFunctions.ts` and uses the
- * exact same set of handlers — both adapters share `sharedServerFunctions`
- * plus the small set of RSC-only handlers re-exported by `@payloadcms/ui`.
- *
- * Pipes the result through `serializeForRsc`, which converts any React
- * elements left in the response (e.g. `state[path].customComponents.Field`
- * produced by `buildFormState`, the `List` / `Document` nodes returned by
- * `render-list` / `render-document`) into RSC "renderable handles" via
- * `renderServerComponent` from `@tanstack/react-start/rsc`. TanStack Start's
- * `$RSC` serialization adapter then ships those handles to the client as
- * Flight payloads — so this dispatcher must be invoked from a context that
- * uses TanStack's wire format (e.g. `createServerFn`), not raw
- * `JSON.stringify`.
- */ export const handleServerFunctions = async (args)=>{
-    const { name: fnKey, args: fnArgs, config: configPromise, importMap, serverFunctions: extraServerFunctions } = args;
-    const { cookies, locale, permissions, req } = await initReq({
-        configPromise,
-        importMap
-    });
-    const augmentedArgs = {
-        ...fnArgs,
-        cookies,
-        importMap,
-        locale,
-        mode: 'rsc',
-        permissions,
-        renderComponent: RenderRSCComponent,
-        req
-    };
-    const fn = extraServerFunctions?.[fnKey] || baseServerFunctions[fnKey];
-    if (!fn) {
-        throw new Error(`Unknown Server Function: ${fnKey}`);
-    }
-    const result = await fn(augmentedArgs);
-    return await serializeForRsc(result);
-};
+export const handleServerFunctions = createServerFunctionHandler({
+    initReq: ({ configPromise, importMap })=>initReq({
+            configPromise,
+            importMap
+        }),
+    transformResult: serializeForRsc
+});
 
 //# sourceMappingURL=handleServerFunctions.js.map

package/dist/utilities/handleServerFunctions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { DefaultServerFunctionArgs, ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { renderTabHandler } from '@payloadcms/ui/elements/Nav/SidebarTabs/renderTabServerFn'\nimport { _internal_renderFieldHandler } from '@payloadcms/ui/rsc'\nimport { sharedServerFunctions } from '@payloadcms/ui/utilities/serverFunctionRegistry'\nimport { getDefaultLayoutHandler } from '@payloadcms/ui/views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn'\nimport { renderWidgetHandler } from '@payloadcms/ui/views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn'\nimport { renderDocumentSlotsHandler } from '@payloadcms/ui/views/Document/renderDocumentSlots'\n\nimport { RenderRSCComponent } from '../rsc/renderPayloadRSC.js'\nimport { initReq } from './initReq.server.js'\nimport { serializeForRsc } from './serializeForRsc.js'\nimport { switchLanguageHandler } from './serverFunctionHandlers.js'\n\nconst baseServerFunctions: Record<string, ServerFunction<any, any>> = {\n  ...sharedServerFunctions,\n  'get-default-layout': getDefaultLayoutHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-tab': renderTabHandler,\n  'render-widget': renderWidgetHandler,\n  'switch-language': switchLanguageHandler,\n}\n\n/**\n * Server function dispatcher for TanStack Start.\n *\n * Mirrors `packages/next/src/utilities/handleServerFunctions.ts` and uses the\n * exact same set of handlers — both adapters share `sharedServerFunctions`\n * plus the small set of RSC-only handlers re-exported by `@payloadcms/ui`.\n *\n * Pipes the result through `serializeForRsc`, which converts any React\n * elements left in the response (e.g. `state[path].customComponents.Field`\n * produced by `buildFormState`, the `List` / `Document` nodes returned by\n * `render-list` / `render-document`) into RSC \"renderable handles\" via\n * `renderServerComponent` from `@tanstack/react-start/rsc`. TanStack Start's\n * `$RSC` serialization adapter then ships those handles to the client as\n * Flight payloads — so this dispatcher must be invoked from a context that\n * uses TanStack's wire format (e.g. `createServerFn`), not raw\n * `JSON.stringify`.\n */\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const {\n    name: fnKey,\n    args: fnArgs,\n    config: configPromise,\n    importMap,\n    serverFunctions: extraServerFunctions,\n  } = args\n\n  const { cookies, locale, permissions, req } = await initReq({\n    configPromise,\n    importMap,\n  })\n\n  const augmentedArgs: DefaultServerFunctionArgs = {\n    ...fnArgs,\n    cookies,\n    importMap,\n    locale,\n    mode: 'rsc',\n    permissions,\n    renderComponent: RenderRSCComponent,\n    req,\n  }\n\n  const fn = extraServerFunctions?.[fnKey] || baseServerFunctions[fnKey]\n\n  if (!fn) {\n    throw new Error(`Unknown Server Function: ${fnKey}`)\n  }\n\n  const result = await fn(augmentedArgs)\n\n  return await serializeForRsc(result)\n}\n"],"names":["renderTabHandler","_internal_renderFieldHandler","sharedServerFunctions","getDefaultLayoutHandler","renderWidgetHandler","renderDocumentSlotsHandler","RenderRSCComponent","initReq","serializeForRsc","switchLanguageHandler","baseServerFunctions","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","serverFunctions","extraServerFunctions","cookies","locale","permissions","req","augmentedArgs","mode","renderComponent","fn","Error","result"],"mappings":"AAEA,SAASA,gBAAgB,QAAQ,4DAA2D;AAC5F,SAASC,4BAA4B,QAAQ,qBAAoB;AACjE,SAASC,qBAAqB,QAAQ,kDAAiD;AACvF,SAASC,uBAAuB,QAAQ,gGAA+F;AACvI,SAASC,mBAAmB,QAAQ,4FAA2F;AAC/H,SAASC,0BAA0B,QAAQ,oDAAmD;AAE9F,SAASC,kBAAkB,QAAQ,6BAA4B;AAC/D,SAASC,OAAO,QAAQ,sBAAqB;AAC7C,SAASC,eAAe,QAAQ,uBAAsB;AACtD,SAASC,qBAAqB,QAAQ,8BAA6B;AAEnE,MAAMC,sBAAgE;IACpE,GAAGR,qBAAqB;IACxB,sBAAsBC;IACtB,yBAAyBE;IACzB,gBAAgBJ;IAChB,cAAcD;IACd,iBAAiBI;IACjB,mBAAmBK;AACrB;AAEA;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,MAAME,wBAA+C,OAAOC;IACjE,MAAM,EACJC,MAAMC,KAAK,EACXF,MAAMG,MAAM,EACZC,QAAQC,aAAa,EACrBC,SAAS,EACTC,iBAAiBC,oBAAoB,EACtC,GAAGR;IAEJ,MAAM,EAAES,OAAO,EAAEC,MAAM,EAAEC,WAAW,EAAEC,GAAG,EAAE,GAAG,MAAMjB,QAAQ;QAC1DU;QACAC;IACF;IAEA,MAAMO,gBAA2C;QAC/C,GAAGV,MAAM;QACTM;QACAH;QACAI;QACAI,MAAM;QACNH;QACAI,iBAAiBrB;QACjBkB;IACF;IAEA,MAAMI,KAAKR,sBAAsB,CAACN,MAAM,IAAIJ,mBAAmB,CAACI,MAAM;IAEtE,IAAI,CAACc,IAAI;QACP,MAAM,IAAIC,MAAM,CAAC,yBAAyB,EAAEf,OAAO;IACrD;IAEA,MAAMgB,SAAS,MAAMF,GAAGH;IAExB,OAAO,MAAMjB,gBAAgBsB;AAC/B,EAAC"}
+{"version":3,"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import { createServerFunctionHandler } from '@payloadcms/ui/utilities/handleServerFunctions'\n\nimport { initReq } from './initReq.server.js'\nimport { serializeForRsc } from './serializeForRsc.js'\n\nexport const handleServerFunctions = createServerFunctionHandler({\n  initReq: ({ configPromise, importMap }) => initReq({ configPromise, importMap }),\n  transformResult: serializeForRsc,\n})\n"],"names":["createServerFunctionHandler","initReq","serializeForRsc","handleServerFunctions","configPromise","importMap","transformResult"],"mappings":"AAAA,SAASA,2BAA2B,QAAQ,iDAAgD;AAE5F,SAASC,OAAO,QAAQ,sBAAqB;AAC7C,SAASC,eAAe,QAAQ,uBAAsB;AAEtD,OAAO,MAAMC,wBAAwBH,4BAA4B;IAC/DC,SAAS,CAAC,EAAEG,aAAa,EAAEC,SAAS,EAAE,GAAKJ,QAAQ;YAAEG;YAAeC;QAAU;IAC9EC,iBAAiBJ;AACnB,GAAE"}

package/dist/utilities/loadAdminPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadAdminPage.d.ts","sourceRoot":"","sources":["../../src/utilities/loadAdminPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAc,eAAe,EAAE,MAAM,SAAS,CAAA;AAKrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAMlD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,GACpE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACrB;IACE,QAAQ,EAAE,iBAAiB,CAAA;IAC3B;;;;;;;;;;OAUG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAA;CAC5B,CAAA;AA0FL;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,aAAa,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,GACN,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA2JlD"}
+{"version":3,"file":"loadAdminPage.d.ts","sourceRoot":"","sources":["../../src/utilities/loadAdminPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAc,eAAe,EAAE,MAAM,SAAS,CAAA;AAKrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAMlD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,GACpE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACrB;IACE,QAAQ,EAAE,iBAAiB,CAAA;IAC3B;;;;;;;;;;OAUG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAA;CAC5B,CAAA;AA0FL;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,aAAa,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,GACN,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAkJlD"}

package/dist/utilities/loadAdminPage.js

@@ -115,15 +115,6 @@ const resolveTitle = (title)=>{
         userAgent = result.headers.get('user-agent') ?? undefined;
         return result;
     };
-    const notFound = ()=>{
-        nav.type = 'notFound';
-        throw new Error('not-found');
-    };
-    const redirect = (url)=>{
-        nav.type = 'redirect';
-        nav.url = url;
-        throw new Error(`redirect:${url}`);
-    };
     // Build the 404 result the route loader re-throws as TanStack `notFound()`.
     //
     // Throwing `notFound()` is the only way to set the SSR document status to 404
@@ -165,13 +156,14 @@ const resolveTitle = (title)=>{
             config: Promise.resolve(config),
             importMap,
             initReq: boundInitReq,
-            notFound,
+            key: splat ?? '',
+            notFound: pageServerAdapter.notFound,
             // `segments` is intentionally `undefined` for the admin root (`/admin`),
             // matching Next's optional catch-all; `renderRoot` handles it at runtime.
             params: Promise.resolve({
                 segments
             }),
-            redirect,
+            redirect: pageServerAdapter.redirect,
             searchParams: Promise.resolve(searchParams)
         });
         const rscPayload = await renderServerComponent(node);