@payloadcms/tanstack-start 4.0.0-internal.2fddfc0 → 4.0.0-internal.31ba7ee

package/dist/routes/adminRoutes.js

@@ -1,8 +1,9 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { NotFoundClient } from '@payloadcms/ui';
+import { useRouteTransition } from '@payloadcms/ui/providers/RouteTransition';
+import { NotFoundClient } from '@payloadcms/ui/views/NotFound/client';
 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,77 +22,95 @@ 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;
+function AdminNotFound({ data }) {
+    // TanStack exposes not-found data as unknown; this route only receives the shape thrown below.
+    const { routeKey, rscPayload } = data ?? {};
     if (!rscPayload) {
         return /*#__PURE__*/ _jsx(NotFoundClient, {});
     }
     return /*#__PURE__*/ _jsx(Fragment, {
         children: rscPayload
-    }, props?.data?.routeKey);
+    }, 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),
-        // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.
-        loader: async ({ location, params })=>{
-            const data = await runLoader(load, params._splat ?? '', location.searchStr);
-            if (data?._notFound) {
-                // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects
-                throw notFound({
-                    data: {
-                        routeKey: data.routeKey,
-                        rscPayload: data.rscPayload
-                    }
-                });
-            }
-            return data;
+        // 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,
+        // instead of the default background SWR that flashes the pre-navigation list
+        // (e.g. a just-created doc missing) until the reload lands.
+        loader: {
+            handler: async ({ location, params })=>{
+                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(forwardNotFoundPayload ? {
+                        data: {
+                            routeKey: data.routeKey,
+                            rscPayload: data.rscPayload
+                        }
+                    } : undefined);
+                }
+                return data;
+            },
+            staleReloadMode: 'blocking'
         },
+        // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.
         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: 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;
-        },
-        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    // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.\n    loader: 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    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: 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    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","location","params","_notFound","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,2EAA2E;QAC3EC,QAAQ,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;YACjE,MAAMlB,OAAO,MAAMH,UAAUC,MAAMoB,OAAOjB,MAAM,IAAI,IAAIgB,SAASxB,SAAS;YAC1E,IAAIO,MAAMmB,WAAW;gBACnB,qHAAqH;gBACrH,MAAMhC,SAAS;oBAAEa,MAAM;wBAAEQ,UAAUR,KAAKQ,QAAQ;wBAAED,YAAYP,KAAKO,UAAU;oBAAC;gBAAE;YAClF;YACA,OAAOP;QACT;QACAoB,YAAY,CAAC,EAAElB,MAAM,EAAuC,GAAM,CAAA;gBAChEmB,WAAWC,KAAKC,SAAS,CAACrB;YAC5B,CAAA;QACAsB,mBAAmBf;QACnBgB,gBAAgB,CAACvB,SAAoCA;IACvD;AACF;AAEA;;;CAGC,GACD,OAAO,SAASwB,uBAAuB,EAAE5B,IAAI,EAAuB;IAClE,OAAO;QACLc,WAAWP;QACXQ,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAKvB,aAAauB,YAAYC;QACzEC,QAAQ,OAAO,EAAEC,QAAQ,EAAqB;YAC5C,MAAMjB,OAAO,MAAMH,UAAUC,MAAM,IAAImB,SAASxB,SAAS;YACzD,IAAIO,MAAMmB,WAAW;gBACnB,qHAAqH;gBACrH,MAAMhC;YACR;YACA,OAAOa;QACT;QACAoB,YAAY,CAAC,EAAElB,MAAM,EAAuC,GAAM,CAAA;gBAChEmB,WAAWC,KAAKC,SAAS,CAACrB;YAC5B,CAAA;QACAuB,gBAAgB,CAACvB,SAAoCA;IACvD;AACF"}
+{"version":3,"sources":["../../src/routes/adminRoutes.tsx"],"sourcesContent":["'use client'\n\nimport type { NotFoundRouteProps } from '@tanstack/react-router'\n\nimport { useRouteTransition } from '@payloadcms/ui/providers/RouteTransition'\nimport { NotFoundClient } from '@payloadcms/ui/views/NotFound/client'\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\ntype AdminNotFoundData = { routeKey?: string; rscPayload?: ReactNode }\n\nfunction AdminNotFound({ data }: NotFoundRouteProps) {\n  // TanStack exposes not-found data as unknown; this route only receives the shape thrown below.\n  const { routeKey, rscPayload } = (data ?? {}) as AdminNotFoundData\n  if (!rscPayload) {\n    return <NotFoundClient />\n  }\n  return <Fragment key={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' as const,\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":["useRouteTransition","NotFoundClient","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","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;;AAIA,SAASA,kBAAkB,QAAQ,2CAA0C;AAC7E,SAASC,cAAc,QAAQ,uCAAsC;AACrE,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,GAAGzB;IAChC,MAAM0B,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;AAIA,SAASI,cAAc,EAAEX,IAAI,EAAsB;IACjD,+FAA+F;IAC/F,MAAM,EAAEY,QAAQ,EAAEL,UAAU,EAAE,GAAIP,QAAQ,CAAC;IAC3C,IAAI,CAACO,YAAY;QACf,qBAAO,KAACvB;IACV;IACA,qBAAO,KAACI;kBAAyBmB;OAAXK;AACxB;AAEA,MAAMC,oBAAoB,CAAC,EACzBC,sBAAsB,EACtBhB,IAAI,EACJiB,YAAY,EAWb,GAAM,CAAA;QACLC,WAAWX;QACXY,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAK3B,aAAa2B,YAAYC;QACzE,qEAAqE;QACrE,mDAAmD;QACnDC,mBAAmBT;QACnB,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DU,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMxB,OAAO,MAAMH,UAAUC,MAAMiB,aAAaS,SAASD,SAAS9B,SAAS;gBAC3E,IAAIO,MAAMyB,WAAW;oBACnB,qHAAqH;oBACrH,MAAMxC,SACJ6B,yBACI;wBAAEd,MAAM;4BAAEY,UAAUZ,KAAKY,QAAQ;4BAAEL,YAAYP,KAAKO,UAAU;wBAAC;oBAAE,IACjEmB;gBAER;gBACA,OAAO1B;YACT;YACA2B,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAE1B,MAAM,EAAuC,GAAM,CAAA;gBAChE2B,WAAWC,KAAKC,SAAS,CAAC7B;YAC5B,CAAA;QACA8B,gBAAgB,CAAC9B,SAAoCA;IACvD,CAAA;AAEA;;;;;CAKC,GACD,OAAO,SAAS+B,uBAAuB,EAAEnC,IAAI,EAAuB;IAClE,OAAOe,kBAAkB;QACvBC,wBAAwB;QACxBhB;QACAiB,cAAc,CAACS,SAAWA,OAAOvB,MAAM,IAAI;IAC7C;AACF;AAEA;;;CAGC,GACD,OAAO,SAASiC,uBAAuB,EAAEpC,IAAI,EAAuB;IAClE,OAAOe,kBAAkB;QACvBC,wBAAwB;QACxBhB;QACAiB,cAAc,IAAM;IACtB;AACF"}

package/dist/routes/apiRoute.d.ts

@@ -1,33 +1,34 @@
 import type { SanitizedConfig } from 'payload';
+type ApiRouteHandler = (ctx: {
+    request: Request;
+}) => Promise<Response>;
 /**
- * Route options for the Payload REST/GraphQL catch-all (`/_payload/api/$`). The
- * app supplies `getConfig` (an `@payload-config` import) since the package cannot
- * resolve the consumer's config.
+ * Builds the method handlers for the Payload REST/GraphQL catch-all
+ * (`/_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 }),
+ *   },
+ * })
+ * ```
+ *
+ * The compiler only strips a literal `server:` key from a route-options object
+ * expression; wrapping the whole options object in a factory call hides the
+ * key, leaking the config graph into the client bundle.
  */
-export declare function payloadApiRoute({ getConfig }: {
+export declare function payloadApiHandlers({ getConfig, }: {
     getConfig: () => Promise<SanitizedConfig>;
-}): {
-    server: {
-        handlers: {
-            DELETE: ({ request }: {
-                request: Request;
-            }) => Promise<Response>;
-            GET: ({ request }: {
-                request: Request;
-            }) => Promise<Response>;
-            OPTIONS: ({ request }: {
-                request: Request;
-            }) => Promise<Response>;
-            PATCH: ({ request }: {
-                request: Request;
-            }) => Promise<Response>;
-            POST: ({ request }: {
-                request: Request;
-            }) => Promise<Response>;
-            PUT: ({ request }: {
-                request: Request;
-            }) => Promise<Response>;
-        };
-    };
-};
+}): Record<'DELETE' | 'GET' | 'OPTIONS' | 'PATCH' | 'POST' | 'PUT', ApiRouteHandler>;
+export {};
 //# sourceMappingURL=apiRoute.d.ts.map

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;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,OAAO,CAAC,eAAe,CAAC,CAAA;CAAE;;;kCACtD;gBAAE,OAAO,EAAE,OAAO,CAAA;aAAE;+BAApB;gBAAE,OAAO,EAAE,OAAO,CAAA;aAAE;mCAApB;gBAAE,OAAO,EAAE,OAAO,CAAA;aAAE;iCAApB;gBAAE,OAAO,EAAE,OAAO,CAAA;aAAE;gCAApB;gBAAE,OAAO,EAAE,OAAO,CAAA;aAAE;+BAApB;gBAAE,OAAO,EAAE,OAAO,CAAA;aAAE;;;EAiBzD"}
+{"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

@@ -1,26 +1,42 @@
 /**
- * Route options for the Payload REST/GraphQL catch-all (`/_payload/api/$`). The
- * app supplies `getConfig` (an `@payload-config` import) since the package cannot
- * resolve the consumer's config.
- */ export function payloadApiRoute({ getConfig }) {
+ * Builds the method handlers for the Payload REST/GraphQL catch-all
+ * (`/_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 }),
+ *   },
+ * })
+ * ```
+ *
+ * The compiler only strips a literal `server:` key from a route-options object
+ * expression; wrapping the whole options object in a factory call hides the
+ * 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
         });
     };
     return {
-        server: {
-            handlers: {
-                DELETE: handler,
-                GET: handler,
-                OPTIONS: handler,
-                PATCH: handler,
-                POST: handler,
-                PUT: handler
-            }
-        }
+        DELETE: handler,
+        GET: handler,
+        OPTIONS: handler,
+        PATCH: handler,
+        POST: handler,
+        PUT: handler
     };
 }
 

package/dist/routes/apiRoute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/routes/apiRoute.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\n/**\n * Route options for the Payload REST/GraphQL catch-all (`/_payload/api/$`). The\n * app supplies `getConfig` (an `@payload-config` import) since the package cannot\n * resolve the consumer's config.\n */\nexport function payloadApiRoute({ getConfig }: { getConfig: () => Promise<SanitizedConfig> }) {\n  const handler = async ({ request }: { request: Request }) => {\n    const { handleAPIRoute } = await import('../utilities/handleAPIRoute.js')\n    return handleAPIRoute({ config: await getConfig(), request })\n  }\n\n  return {\n    server: {\n      handlers: {\n        DELETE: handler,\n        GET: handler,\n        OPTIONS: handler,\n        PATCH: handler,\n        POST: handler,\n        PUT: handler,\n      },\n    },\n  }\n}\n"],"names":["payloadApiRoute","getConfig","handler","request","handleAPIRoute","config","server","handlers","DELETE","GET","OPTIONS","PATCH","POST","PUT"],"mappings":"AAEA;;;;CAIC,GACD,OAAO,SAASA,gBAAgB,EAAEC,SAAS,EAAiD;IAC1F,MAAMC,UAAU,OAAO,EAAEC,OAAO,EAAwB;QACtD,MAAM,EAAEC,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC;QACxC,OAAOA,eAAe;YAAEC,QAAQ,MAAMJ;YAAaE;QAAQ;IAC7D;IAEA,OAAO;QACLG,QAAQ;YACNC,UAAU;gBACRC,QAAQN;gBACRO,KAAKP;gBACLQ,SAASR;gBACTS,OAAOT;gBACPU,MAAMV;gBACNW,KAAKX;YACP;QACF;IACF;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

@@ -1,11 +1,12 @@
 import type { ComponentProps } from 'react';
-import { RootProvider } from '@payloadcms/ui';
+import { RootProvider } from '@payloadcms/ui/providers/Root';
+import type { LoadLayoutDataResult } from '../utilities/loadLayoutData.js';
 /**
  * Loader supplied by the app — a TanStack Start `createServerFn` that delegates
  * to `loadLayoutData`. Typed loosely because the server-fn's call signature is
  * generated by the Start compiler.
  */
-export type LayoutLoad = () => Promise<Record<string, unknown>>;
+export type LayoutLoad = () => Promise<LoadLayoutDataResult>;
 /**
  * Route options for the Payload admin layout (`/_payload`). Maps the layout
  * loader data onto `RootProvider` and renders the admin chrome (progress bar,
@@ -18,6 +19,9 @@ export declare function payloadLayoutRoute({ load, serverFunction, }: {
     serverFunction: ComponentProps<typeof RootProvider>['serverFunction'];
 }): {
     component: () => import("react").JSX.Element;
-    loader: () => Promise<Record<string, unknown>>;
+    loader: {
+        handler: () => Promise<import("../utilities/toSerializable.js").SerializableRecord>;
+        staleReloadMode: 'blocking';
+    };
 };
 //# sourceMappingURL=layoutRoute.d.ts.map

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;;;EAkCA"}
+{"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,+BAA+B,CAAA;AAI5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAI1E;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE5D;;;;;;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,EAAE,UAAU;;EAE/D"}

package/dist/routes/layoutRoute.js

@@ -1,6 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { ProgressBar, RootProvider } from '@payloadcms/ui';
+import { RootProvider } from '@payloadcms/ui/providers/Root';
+import { ProgressBar } from '@payloadcms/ui/providers/RouteTransition/ProgressBar';
 import { Outlet, useLoaderData } from '@tanstack/react-router';
 import { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js';
 /**
@@ -19,6 +20,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,
@@ -42,9 +44,15 @@ import { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js';
             ]
         });
     }
+    // `staleReloadMode` lives on the loader *object* — router-core only reads it
+    // off a non-function loader — so stale-match revalidation blocks on the fresh
+    // loader instead of flashing stale layout data via the default background SWR.
     return {
         component: PayloadLayout,
-        loader: ()=>load()
+        loader: {
+            handler: ()=>load(),
+            staleReloadMode: 'blocking'
+        }
     };
 }
 

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  return { component: PayloadLayout, loader: () => load() }\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"],"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,OAAO;QAAEC,WAAWpB;QAAeqB,QAAQ,IAAMvB;IAAO;AAC1D"}
+{"version":3,"sources":["../../src/routes/layoutRoute.tsx"],"sourcesContent":["'use client'\n\nimport type { ComponentProps } from 'react'\n\nimport { RootProvider } from '@payloadcms/ui/providers/Root'\nimport { ProgressBar } from '@payloadcms/ui/providers/RouteTransition/ProgressBar'\nimport { Outlet, useLoaderData } from '@tanstack/react-router'\n\nimport type { LoadLayoutDataResult } from '../utilities/loadLayoutData.js'\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<LoadLayoutDataResult>\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' as const },\n  }\n}\n"],"names":["RootProvider","ProgressBar","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,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,WAAW,QAAQ,uDAAsD;AAClF,SAASC,MAAM,EAAEC,aAAa,QAAQ,yBAAwB;AAI9D,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,MAACV;oBACCW,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,KAACtB;wBAIAQ,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;QAAoB;IACxE;AACF"}

package/dist/utilities/devConfigReload.server.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=devConfigReload.server.d.ts.map

package/dist/utilities/devConfigReload.server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"devConfigReload.server.d.ts","sourceRoot":"","sources":["../../src/utilities/devConfigReload.server.ts"],"names":[],"mappings":""}

package/dist/utilities/devConfigReload.server.js

@@ -0,0 +1,63 @@
+import { registerDevReloadStrategy } from 'payload';
+import { PAYLOAD_CONFIG_CHANGED_EVENT } from './devConfigReloadEvent.js';
+/**
+ * Subscribes the Payload instance to the config-changed event that the
+ * `payload:dev-config-reload` Vite plugin broadcasts.
+ *
+ * Imported for its side effect by `initAdminContext.server.ts`, the adapter's only
+ * `getPayload` call site, so the strategy is registered before an instance can
+ * be built. Registration is module-scoped on both ends: this runs inside the
+ * app's server graph and so resolves the same copy of `payload` that
+ * `getPayload` is called on, and each Vite environment (`ssr`, `rsc`) registers
+ * its own listener against its own copy.
+ *
+ * Vite re-evaluates this module on a program reload, which drops the listeners
+ * the previous instance had collected. `getPayload` reconnects on its next call
+ * because the registered strategy is a new object - see `connectDevReload`.
+ *
+ * `import.meta.hot` is only defined during dev serve, so this is inert in a
+ * production build.
+ */ const hot = import.meta.hot;
+if (hot) {
+    registerDevReloadStrategy(createConfigChangedStrategy({
+        hot
+    }));
+}
+/**
+ * Builds a dev reload strategy that forwards the config-changed event to every
+ * connected instance.
+ *
+ * After a program reload, the first request to re-import this module replaces
+ * the old listener with a new one, but the cached Payload instance only connects
+ * to it on its next `getPayload` call - and a request such as a frontend page
+ * render may never make one. An event that lands in that gap has no one to
+ * notify, so it is held and replayed to the next connection instead of being
+ * dropped - which would otherwise leave the instance serving the old config
+ * indefinitely.
+ */ function createConfigChangedStrategy({ hot }) {
+    const listeners = new Set();
+    let hasPendingReload = false;
+    hot.on(PAYLOAD_CONFIG_CHANGED_EVENT, ()=>{
+        if (listeners.size === 0) {
+            hasPendingReload = true;
+            return;
+        }
+        for (const onReload of listeners){
+            onReload();
+        }
+    });
+    return {
+        connect: (onReload)=>{
+            listeners.add(onReload);
+            if (hasPendingReload) {
+                hasPendingReload = false;
+                onReload();
+            }
+            return ()=>{
+                listeners.delete(onReload);
+            };
+        }
+    };
+}
+
+//# sourceMappingURL=devConfigReload.server.js.map

package/dist/utilities/devConfigReload.server.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/devConfigReload.server.ts"],"sourcesContent":["import { registerDevReloadStrategy } from 'payload'\n\nimport { PAYLOAD_CONFIG_CHANGED_EVENT } from './devConfigReloadEvent.js'\n\n/**\n * Subscribes the Payload instance to the config-changed event that the\n * `payload:dev-config-reload` Vite plugin broadcasts.\n *\n * Imported for its side effect by `initAdminContext.server.ts`, the adapter's only\n * `getPayload` call site, so the strategy is registered before an instance can\n * be built. Registration is module-scoped on both ends: this runs inside the\n * app's server graph and so resolves the same copy of `payload` that\n * `getPayload` is called on, and each Vite environment (`ssr`, `rsc`) registers\n * its own listener against its own copy.\n *\n * Vite re-evaluates this module on a program reload, which drops the listeners\n * the previous instance had collected. `getPayload` reconnects on its next call\n * because the registered strategy is a new object - see `connectDevReload`.\n *\n * `import.meta.hot` is only defined during dev serve, so this is inert in a\n * production build.\n */\nconst hot = (import.meta as unknown as { hot?: ViteHotContext }).hot\n\nif (hot) {\n  registerDevReloadStrategy(createConfigChangedStrategy({ hot }))\n}\n\n/**\n * Builds a dev reload strategy that forwards the config-changed event to every\n * connected instance.\n *\n * After a program reload, the first request to re-import this module replaces\n * the old listener with a new one, but the cached Payload instance only connects\n * to it on its next `getPayload` call - and a request such as a frontend page\n * render may never make one. An event that lands in that gap has no one to\n * notify, so it is held and replayed to the next connection instead of being\n * dropped - which would otherwise leave the instance serving the old config\n * indefinitely.\n */\nfunction createConfigChangedStrategy({ hot }: { hot: ViteHotContext }): {\n  connect: (onReload: () => void) => () => void\n} {\n  const listeners = new Set<() => void>()\n  let hasPendingReload = false\n\n  hot.on(PAYLOAD_CONFIG_CHANGED_EVENT, () => {\n    if (listeners.size === 0) {\n      hasPendingReload = true\n      return\n    }\n\n    for (const onReload of listeners) {\n      onReload()\n    }\n  })\n\n  return {\n    connect: (onReload) => {\n      listeners.add(onReload)\n\n      if (hasPendingReload) {\n        hasPendingReload = false\n        onReload()\n      }\n\n      return () => {\n        listeners.delete(onReload)\n      }\n    },\n  }\n}\n\ntype ViteHotContext = {\n  on: (event: string, cb: () => void) => void\n}\n"],"names":["registerDevReloadStrategy","PAYLOAD_CONFIG_CHANGED_EVENT","hot","createConfigChangedStrategy","listeners","Set","hasPendingReload","on","size","onReload","connect","add","delete"],"mappings":"AAAA,SAASA,yBAAyB,QAAQ,UAAS;AAEnD,SAASC,4BAA4B,QAAQ,4BAA2B;AAExE;;;;;;;;;;;;;;;;;CAiBC,GACD,MAAMC,MAAM,AAAC,YAAoDA,GAAG;AAEpE,IAAIA,KAAK;IACPF,0BAA0BG,4BAA4B;QAAED;IAAI;AAC9D;AAEA;;;;;;;;;;;CAWC,GACD,SAASC,4BAA4B,EAAED,GAAG,EAA2B;IAGnE,MAAME,YAAY,IAAIC;IACtB,IAAIC,mBAAmB;IAEvBJ,IAAIK,EAAE,CAACN,8BAA8B;QACnC,IAAIG,UAAUI,IAAI,KAAK,GAAG;YACxBF,mBAAmB;YACnB;QACF;QAEA,KAAK,MAAMG,YAAYL,UAAW;YAChCK;QACF;IACF;IAEA,OAAO;QACLC,SAAS,CAACD;YACRL,UAAUO,GAAG,CAACF;YAEd,IAAIH,kBAAkB;gBACpBA,mBAAmB;gBACnBG;YACF;YAEA,OAAO;gBACLL,UAAUQ,MAAM,CAACH;YACnB;QACF;IACF;AACF"}

package/dist/utilities/devConfigReloadEvent.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Custom Vite HMR event the `payload:dev-config-reload` plugin broadcasts when
+ * the Payload config (or anything it imports) changes on disk.
+ *
+ * Kept in its own module so the Vite plugin can name the event without pulling
+ * in the server runtime — and therefore the whole CMS — when `vite.config.ts` loads.
+ */
+export declare const PAYLOAD_CONFIG_CHANGED_EVENT = "payload:config-changed";
+//# sourceMappingURL=devConfigReloadEvent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"devConfigReloadEvent.d.ts","sourceRoot":"","sources":["../../src/utilities/devConfigReloadEvent.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,2BAA2B,CAAA"}

package/dist/utilities/devConfigReloadEvent.js

@@ -0,0 +1,9 @@
+/**
+ * Custom Vite HMR event the `payload:dev-config-reload` plugin broadcasts when
+ * the Payload config (or anything it imports) changes on disk.
+ *
+ * Kept in its own module so the Vite plugin can name the event without pulling
+ * in the server runtime — and therefore the whole CMS — when `vite.config.ts` loads.
+ */ export const PAYLOAD_CONFIG_CHANGED_EVENT = 'payload:config-changed';
+
+//# sourceMappingURL=devConfigReloadEvent.js.map

package/dist/utilities/devConfigReloadEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/devConfigReloadEvent.ts"],"sourcesContent":["/**\n * Custom Vite HMR event the `payload:dev-config-reload` plugin broadcasts when\n * the Payload config (or anything it imports) changes on disk.\n *\n * Kept in its own module so the Vite plugin can name the event without pulling\n * in the server runtime — and therefore the whole CMS — when `vite.config.ts` loads.\n */\nexport const PAYLOAD_CONFIG_CHANGED_EVENT = 'payload:config-changed'\n"],"names":["PAYLOAD_CONFIG_CHANGED_EVENT"],"mappings":"AAAA;;;;;;CAMC,GACD,OAAO,MAAMA,+BAA+B,yBAAwB"}

package/dist/utilities/getRequestI18n.server.d.ts

@@ -2,7 +2,7 @@ import type { I18nClient } from '@payloadcms/translations';
 import type { SanitizedConfig } from 'payload';
 /**
  * Resolves the client `I18n` for the current TanStack Start request without a
- * full `initReq` (no `getPayload`/auth/access). Mirrors the Next.js adapter's
+ * full `initAdminContext` (no `getPayload`/auth/access). Mirrors the Next.js adapter's
  * `getNextRequestI18n` and feeds the shared `generatePageMetadata`, which only
  * needs `config` + `i18n` to translate admin-page titles.
  */

package/dist/utilities/getRequestI18n.server.js

@@ -3,7 +3,7 @@ import { getRequest } from '@tanstack/react-start/server';
 import { getRequestLanguage, parseCookies } from 'payload';
 /**
  * Resolves the client `I18n` for the current TanStack Start request without a
- * full `initReq` (no `getPayload`/auth/access). Mirrors the Next.js adapter's
+ * full `initAdminContext` (no `getPayload`/auth/access). Mirrors the Next.js adapter's
  * `getNextRequestI18n` and feeds the shared `generatePageMetadata`, which only
  * needs `config` + `i18n` to translate admin-page titles.
  */ export async function getRequestI18n({ config }) {

package/dist/utilities/getRequestI18n.server.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getRequestI18n.server.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { getRequest } from '@tanstack/react-start/server'\nimport { getRequestLanguage, parseCookies } from 'payload'\n\n/**\n * Resolves the client `I18n` for the current TanStack Start request without a\n * full `initReq` (no `getPayload`/auth/access). Mirrors the Next.js adapter's\n * `getNextRequestI18n` and feeds the shared `generatePageMetadata`, which only\n * needs `config` + `i18n` to translate admin-page titles.\n */\nexport async function getRequestI18n({ config }: { config: SanitizedConfig }): Promise<I18nClient> {\n  const webRequest = getRequest()\n  const headers = new Headers(webRequest.headers)\n  const cookies = parseCookies(headers)\n\n  const languageCode = getRequestLanguage({ config, cookies, headers })\n\n  return initI18n({\n    config: config.i18n,\n    context: 'client',\n    language: languageCode,\n  })\n}\n"],"names":["initI18n","getRequest","getRequestLanguage","parseCookies","getRequestI18n","config","webRequest","headers","Headers","cookies","languageCode","i18n","context","language"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,UAAU,QAAQ,+BAA8B;AACzD,SAASC,kBAAkB,EAAEC,YAAY,QAAQ,UAAS;AAE1D;;;;;CAKC,GACD,OAAO,eAAeC,eAAe,EAAEC,MAAM,EAA+B;IAC1E,MAAMC,aAAaL;IACnB,MAAMM,UAAU,IAAIC,QAAQF,WAAWC,OAAO;IAC9C,MAAME,UAAUN,aAAaI;IAE7B,MAAMG,eAAeR,mBAAmB;QAAEG;QAAQI;QAASF;IAAQ;IAEnE,OAAOP,SAAS;QACdK,QAAQA,OAAOM,IAAI;QACnBC,SAAS;QACTC,UAAUH;IACZ;AACF"}
+{"version":3,"sources":["../../src/utilities/getRequestI18n.server.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { getRequest } from '@tanstack/react-start/server'\nimport { getRequestLanguage, parseCookies } from 'payload'\n\n/**\n * Resolves the client `I18n` for the current TanStack Start request without a\n * full `initAdminContext` (no `getPayload`/auth/access). Mirrors the Next.js adapter's\n * `getNextRequestI18n` and feeds the shared `generatePageMetadata`, which only\n * needs `config` + `i18n` to translate admin-page titles.\n */\nexport async function getRequestI18n({ config }: { config: SanitizedConfig }): Promise<I18nClient> {\n  const webRequest = getRequest()\n  const headers = new Headers(webRequest.headers)\n  const cookies = parseCookies(headers)\n\n  const languageCode = getRequestLanguage({ config, cookies, headers })\n\n  return initI18n({\n    config: config.i18n,\n    context: 'client',\n    language: languageCode,\n  })\n}\n"],"names":["initI18n","getRequest","getRequestLanguage","parseCookies","getRequestI18n","config","webRequest","headers","Headers","cookies","languageCode","i18n","context","language"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,UAAU,QAAQ,+BAA8B;AACzD,SAASC,kBAAkB,EAAEC,YAAY,QAAQ,UAAS;AAE1D;;;;;CAKC,GACD,OAAO,eAAeC,eAAe,EAAEC,MAAM,EAA+B;IAC1E,MAAMC,aAAaL;IACnB,MAAMM,UAAU,IAAIC,QAAQF,WAAWC,OAAO;IAC9C,MAAME,UAAUN,aAAaI;IAE7B,MAAMG,eAAeR,mBAAmB;QAAEG;QAAQI;QAASF;IAAQ;IAEnE,OAAOP,SAAS;QACdK,QAAQA,OAAOM,IAAI;QACnBC,SAAS;QACTC,UAAUH;IACZ;AACF"}

package/dist/utilities/graphqlHandler.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlHandler.server.d.ts","sourceRoot":"","sources":["../../src/utilities/graphqlHandler.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,eAAe,EAAE,MAAM,SAAS,CAAA;AAyFvE;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAU,sBAGjC;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,OAAO,EAAE,OAAO,CAAA;CACjB,KAAG,OAAO,CAAC,QAAQ,CA2DnB,CAAA"}
+{"version":3,"file":"graphqlHandler.server.d.ts","sourceRoot":"","sources":["../../src/utilities/graphqlHandler.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,eAAe,EAAE,MAAM,SAAS,CAAA;AAyFvE;;;;;GAKG;AACH,eAAO,MAAM,aAAa,yBAGvB;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,OAAO,EAAE,OAAO,CAAA;CACjB,KAAG,OAAO,CAAC,QAAQ,CA2DnB,CAAA"}

package/dist/utilities/graphqlHandler.server.js

@@ -1,4 +1,4 @@
-import { addDataAndFileToRequest, addLocalesToRequestFromData, createPayloadRequest, headersWithCors, logError, mergeHeaders } from 'payload';
+import { addDataAndFileToRequest, addLocalesToRequestFromData, createPayloadRequestFromWebRequest, headersWithCors, logError, mergeHeaders } from 'payload';
 const handleError = async ({ err, payload, req })=>{
     const status = err.originalError?.status || 500;
     let errorMessage = err.message;
@@ -72,7 +72,7 @@ const getGraphql = async (config)=>{
  * Requires `@payloadcms/graphql` and `graphql-http` to be installed in the consuming app.
  */ export const handleGraphQL = async ({ config, request })=>{
     const originalRequest = request.clone();
-    const req = await createPayloadRequest({
+    const req = await createPayloadRequestFromWebRequest({
         canSetHeaders: true,
         config,
         request