@payloadcms/tanstack-start 4.0.0-internal.c3ac604 → 4.0.0-internal.cc18726

package/dist/elements/RouterAdapter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/RouterAdapter/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,SAAS,CAAA;AAuDvE,eAAO,MAAM,qBAAqB,EAAE,sBAyGnC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/RouterAdapter/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,SAAS,CAAA;AA6DvE,eAAO,MAAM,qBAAqB,EAAE,sBAqHnC,CAAA"}

package/dist/elements/RouterAdapter/index.js

@@ -1,9 +1,9 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { RouterAdapterContext } from '@payloadcms/ui';
-import { Link as TanStackLink, useLocation, useParams, useRouter } from '@tanstack/react-router';
+import { RouterAdapterContext, useRouteTransition } from '@payloadcms/ui';
+import { Link as TanStackLink, useLocation, useParams, useRouter, useRouterState } from '@tanstack/react-router';
 import * as qs from 'qs-esm';
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 const normalizeNavigationTarget = ({ path, pathname, search })=>{
     if (path.startsWith('http')) {
         const url = new URL(path);
@@ -34,6 +34,20 @@ export const TanStackRouterAdapter = ({ children })=>{
     const params = useParams({
         strict: false
     });
+    const isRouterLoading = useRouterState({
+        select: (state)=>state.isLoading
+    });
+    const { holdRouteTransition } = useRouteTransition();
+    useEffect(()=>{
+        if (!isRouterLoading) {
+            return;
+        }
+        const releaseRouteTransition = holdRouteTransition();
+        return ()=>releaseRouteTransition();
+    }, [
+        holdRouteTransition,
+        isRouterLoading
+    ]);
     const adaptedParams = useMemo(()=>{
         const adapted = {
             ...params

package/dist/elements/RouterAdapter/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/RouterAdapter/index.tsx"],"sourcesContent":["'use client'\n\nimport type { RouterAdapterContextValue } from '@payloadcms/ui'\nimport type { LinkAdapterProps, RouterAdapterComponent } from 'payload'\n\nimport { RouterAdapterContext } from '@payloadcms/ui'\nimport { Link as TanStackLink, useLocation, useParams, useRouter } from '@tanstack/react-router'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useMemo } from 'react'\n\nconst normalizeNavigationTarget = ({\n  path,\n  pathname,\n  search,\n}: {\n  path: string\n  pathname: string\n  search: string\n}) => {\n  if (path.startsWith('http')) {\n    const url = new URL(path)\n    return `${url.pathname}${url.search}${url.hash}`\n  }\n\n  if (path.startsWith('?')) {\n    return `${pathname}${path}`\n  }\n\n  if (path.startsWith('#')) {\n    return `${pathname}${search}${path}`\n  }\n\n  return path\n}\n\nconst TanStackLinkAdapter: React.FC<LinkAdapterProps> = ({\n  children,\n  href,\n  prefetch,\n  ref,\n  replace,\n  scroll,\n  ...rest\n}) => {\n  return (\n    <TanStackLink\n      preload={prefetch === false ? false : 'intent'}\n      ref={ref}\n      replace={replace}\n      resetScroll={scroll}\n      to={href}\n      {...rest}\n    >\n      {children}\n    </TanStackLink>\n  )\n}\n\nexport const TanStackRouterAdapter: RouterAdapterComponent = ({ children }) => {\n  const router = useRouter()\n  const location = useLocation()\n  const params = useParams({ strict: false })\n\n  const adaptedParams = useMemo(() => {\n    const adapted: Record<string, string | string[]> = { ...params }\n\n    if ('_splat' in params && typeof params._splat === 'string') {\n      adapted.segments = params._splat.split('/').filter(Boolean)\n    }\n\n    return adapted\n  }, [params])\n\n  // Split a target into `to` (pathname) + a parsed `search` object, so the\n  // router serializes the query via its `stringifySearch` (qs, bracket-encoded)\n  // rather than embedding the raw string in `to`. Navigating with a string `to`\n  // leaves the search *unencoded* in `window.location.search`\n  // (e.g. `where[or][0]…`), which then never matches Payload's `qs.stringify`\n  // output (`where%5Bor%5D…`) — breaking the list-view `syncPropsToURL` guard,\n  // which compares the two and would otherwise clobber optimistic query state\n  // (e.g. an in-progress filter condition) on every navigation.\n  const toNavOptions = useCallback((path: string) => {\n    const relativePath = normalizeNavigationTarget({\n      path,\n      pathname: window.location.pathname,\n      search: window.location.search,\n    })\n\n    const queryIndex = relativePath.indexOf('?')\n\n    if (queryIndex === -1) {\n      return { to: relativePath }\n    }\n\n    const searchObject = qs.parse(relativePath.slice(queryIndex + 1), {\n      depth: 10,\n      ignoreQueryPrefix: true,\n    })\n\n    // Function form replaces the search entirely (no merge with current search).\n    return { search: () => searchObject, to: relativePath.slice(0, queryIndex) }\n  }, [])\n\n  const back = useCallback(() => router.history.back(), [router])\n\n  const push = useCallback(\n    (path: string, options?: { scroll?: boolean }) => {\n      void router.navigate({ ...toNavOptions(path), resetScroll: options?.scroll })\n    },\n    [router, toNavOptions],\n  )\n\n  const refresh = useCallback(() => {\n    void router.invalidate()\n  }, [router])\n\n  const replace = useCallback(\n    (path: string, options?: { scroll?: boolean }) => {\n      void router.navigate({ ...toNavOptions(path), replace: true, resetScroll: options?.scroll })\n    },\n    [router, toNavOptions],\n  )\n\n  // Mirror Next.js' router behavior to allow syncing client state to the URL without triggering a second server load.\n  // TanStack's browser history monkeypatches `window.history.replaceState` and notifies `router.load` on every call.\n  // Use `_ignoreSubscribers` to suppresses that notification — the same flag TanStack uses internally when flushing history.\n  const replaceState = useCallback(\n    (url: string) => {\n      const { history } = router\n      history._ignoreSubscribers = true\n\n      try {\n        window.history.replaceState(null, '', url)\n      } finally {\n        history._ignoreSubscribers = false\n      }\n    },\n    [router],\n  )\n\n  const adaptedRouter = useMemo(\n    () => ({ back, push, refresh, replace, replaceState }),\n    [back, push, refresh, replace, replaceState],\n  )\n\n  // `location.searchStr` is the serialized query string; `location.search` is\n  // the parsed object (a nested structure once the router uses `qs` for search\n  // serialization), which `URLSearchParams` cannot consume. Build from the\n  // string so Payload's `parseSearchParams` re-parses the bracket notation.\n  const searchParams = useMemo(() => new URLSearchParams(location.searchStr), [location.searchStr])\n\n  const value: RouterAdapterContextValue = useMemo(\n    () => ({\n      Link: TanStackLinkAdapter,\n      params: adaptedParams,\n      pathname: location.pathname,\n      router: adaptedRouter,\n      searchParams,\n    }),\n    [adaptedParams, location.pathname, adaptedRouter, searchParams],\n  )\n\n  return <RouterAdapterContext value={value}>{children}</RouterAdapterContext>\n}\n"],"names":["RouterAdapterContext","Link","TanStackLink","useLocation","useParams","useRouter","qs","React","useCallback","useMemo","normalizeNavigationTarget","path","pathname","search","startsWith","url","URL","hash","TanStackLinkAdapter","children","href","prefetch","ref","replace","scroll","rest","preload","resetScroll","to","TanStackRouterAdapter","router","location","params","strict","adaptedParams","adapted","_splat","segments","split","filter","Boolean","toNavOptions","relativePath","window","queryIndex","indexOf","searchObject","parse","slice","depth","ignoreQueryPrefix","back","history","push","options","navigate","refresh","invalidate","replaceState","_ignoreSubscribers","adaptedRouter","searchParams","URLSearchParams","searchStr","value"],"mappings":"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"}
+{"version":3,"sources":["../../../src/elements/RouterAdapter/index.tsx"],"sourcesContent":["'use client'\n\nimport type { RouterAdapterContextValue } from '@payloadcms/ui'\nimport type { LinkAdapterProps, RouterAdapterComponent } from 'payload'\n\nimport { RouterAdapterContext, useRouteTransition } from '@payloadcms/ui'\nimport {\n  Link as TanStackLink,\n  useLocation,\n  useParams,\n  useRouter,\n  useRouterState,\n} from '@tanstack/react-router'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useMemo } from 'react'\n\nconst normalizeNavigationTarget = ({\n  path,\n  pathname,\n  search,\n}: {\n  path: string\n  pathname: string\n  search: string\n}) => {\n  if (path.startsWith('http')) {\n    const url = new URL(path)\n    return `${url.pathname}${url.search}${url.hash}`\n  }\n\n  if (path.startsWith('?')) {\n    return `${pathname}${path}`\n  }\n\n  if (path.startsWith('#')) {\n    return `${pathname}${search}${path}`\n  }\n\n  return path\n}\n\nconst TanStackLinkAdapter: React.FC<LinkAdapterProps> = ({\n  children,\n  href,\n  prefetch,\n  ref,\n  replace,\n  scroll,\n  ...rest\n}) => {\n  return (\n    <TanStackLink\n      preload={prefetch === false ? false : 'intent'}\n      ref={ref}\n      replace={replace}\n      resetScroll={scroll}\n      to={href}\n      {...rest}\n    >\n      {children}\n    </TanStackLink>\n  )\n}\n\nexport const TanStackRouterAdapter: RouterAdapterComponent = ({ children }) => {\n  const router = useRouter()\n  const location = useLocation()\n  const params = useParams({ strict: false })\n  const isRouterLoading = useRouterState({ select: (state) => state.isLoading })\n  const { holdRouteTransition } = useRouteTransition()\n\n  useEffect(() => {\n    if (!isRouterLoading) {\n      return\n    }\n\n    const releaseRouteTransition = holdRouteTransition()\n\n    return () => releaseRouteTransition()\n  }, [holdRouteTransition, isRouterLoading])\n\n  const adaptedParams = useMemo(() => {\n    const adapted: Record<string, string | string[]> = { ...params }\n\n    if ('_splat' in params && typeof params._splat === 'string') {\n      adapted.segments = params._splat.split('/').filter(Boolean)\n    }\n\n    return adapted\n  }, [params])\n\n  // Split a target into `to` (pathname) + a parsed `search` object, so the\n  // router serializes the query via its `stringifySearch` (qs, bracket-encoded)\n  // rather than embedding the raw string in `to`. Navigating with a string `to`\n  // leaves the search *unencoded* in `window.location.search`\n  // (e.g. `where[or][0]…`), which then never matches Payload's `qs.stringify`\n  // output (`where%5Bor%5D…`) — breaking the list-view `syncPropsToURL` guard,\n  // which compares the two and would otherwise clobber optimistic query state\n  // (e.g. an in-progress filter condition) on every navigation.\n  const toNavOptions = useCallback((path: string) => {\n    const relativePath = normalizeNavigationTarget({\n      path,\n      pathname: window.location.pathname,\n      search: window.location.search,\n    })\n\n    const queryIndex = relativePath.indexOf('?')\n\n    if (queryIndex === -1) {\n      return { to: relativePath }\n    }\n\n    const searchObject = qs.parse(relativePath.slice(queryIndex + 1), {\n      depth: 10,\n      ignoreQueryPrefix: true,\n    })\n\n    // Function form replaces the search entirely (no merge with current search).\n    return { search: () => searchObject, to: relativePath.slice(0, queryIndex) }\n  }, [])\n\n  const back = useCallback(() => router.history.back(), [router])\n\n  const push = useCallback(\n    (path: string, options?: { scroll?: boolean }) => {\n      void router.navigate({ ...toNavOptions(path), resetScroll: options?.scroll })\n    },\n    [router, toNavOptions],\n  )\n\n  const refresh = useCallback(() => {\n    void router.invalidate()\n  }, [router])\n\n  const replace = useCallback(\n    (path: string, options?: { scroll?: boolean }) => {\n      void router.navigate({ ...toNavOptions(path), replace: true, resetScroll: options?.scroll })\n    },\n    [router, toNavOptions],\n  )\n\n  // Mirror Next.js' router behavior to allow syncing client state to the URL without triggering a second server load.\n  // TanStack's browser history monkeypatches `window.history.replaceState` and notifies `router.load` on every call.\n  // Use `_ignoreSubscribers` to suppresses that notification — the same flag TanStack uses internally when flushing history.\n  const replaceState = useCallback(\n    (url: string) => {\n      const { history } = router\n      history._ignoreSubscribers = true\n\n      try {\n        window.history.replaceState(null, '', url)\n      } finally {\n        history._ignoreSubscribers = false\n      }\n    },\n    [router],\n  )\n\n  const adaptedRouter = useMemo(\n    () => ({ back, push, refresh, replace, replaceState }),\n    [back, push, refresh, replace, replaceState],\n  )\n\n  // `location.searchStr` is the serialized query string; `location.search` is\n  // the parsed object (a nested structure once the router uses `qs` for search\n  // serialization), which `URLSearchParams` cannot consume. Build from the\n  // string so Payload's `parseSearchParams` re-parses the bracket notation.\n  const searchParams = useMemo(() => new URLSearchParams(location.searchStr), [location.searchStr])\n\n  const value: RouterAdapterContextValue = useMemo(\n    () => ({\n      Link: TanStackLinkAdapter,\n      params: adaptedParams,\n      pathname: location.pathname,\n      router: adaptedRouter,\n      searchParams,\n    }),\n    [adaptedParams, location.pathname, adaptedRouter, searchParams],\n  )\n\n  return <RouterAdapterContext value={value}>{children}</RouterAdapterContext>\n}\n"],"names":["RouterAdapterContext","useRouteTransition","Link","TanStackLink","useLocation","useParams","useRouter","useRouterState","qs","React","useCallback","useEffect","useMemo","normalizeNavigationTarget","path","pathname","search","startsWith","url","URL","hash","TanStackLinkAdapter","children","href","prefetch","ref","replace","scroll","rest","preload","resetScroll","to","TanStackRouterAdapter","router","location","params","strict","isRouterLoading","select","state","isLoading","holdRouteTransition","releaseRouteTransition","adaptedParams","adapted","_splat","segments","split","filter","Boolean","toNavOptions","relativePath","window","queryIndex","indexOf","searchObject","parse","slice","depth","ignoreQueryPrefix","back","history","push","options","navigate","refresh","invalidate","replaceState","_ignoreSubscribers","adaptedRouter","searchParams","URLSearchParams","searchStr","value"],"mappings":"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"}

package/dist/exports/client.d.ts

@@ -2,6 +2,5 @@ export { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js';
 export { PayloadAdminShell, type PayloadAdminShellProps, withPayloadRoot, type WithPayloadRootOptions, } from '../layouts/Root/withPayloadRoot.js';
 export { type AdminLoad, payloadAdminIndexRoute, payloadAdminSplatRoute, } from '../routes/adminRoutes.js';
 export { type LayoutLoad, payloadLayoutRoute } from '../routes/layoutRoute.js';
-export { viteDevReloadStrategy } from '../utilities/devReloadStrategy.js';
 export { createServerFunctionClient, stripUnserializable, } from '../utilities/serverFunctionClient.js';
 //# sourceMappingURL=client.d.ts.map

package/dist/exports/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EACL,iBAAiB,EACjB,KAAK,sBAAsB,EAC3B,eAAe,EACf,KAAK,sBAAsB,GAC5B,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACL,KAAK,SAAS,EACd,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,KAAK,UAAU,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AACzE,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,sCAAsC,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EACL,iBAAiB,EACjB,KAAK,sBAAsB,EAC3B,eAAe,EACf,KAAK,sBAAsB,GAC5B,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACL,KAAK,SAAS,EACd,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,KAAK,UAAU,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC9E,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,sCAAsC,CAAA"}

package/dist/exports/client.js

@@ -3,7 +3,6 @@ export { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js';
 export { PayloadAdminShell, withPayloadRoot } from '../layouts/Root/withPayloadRoot.js';
 export { payloadAdminIndexRoute, payloadAdminSplatRoute } from '../routes/adminRoutes.js';
 export { payloadLayoutRoute } from '../routes/layoutRoute.js';
-export { viteDevReloadStrategy } from '../utilities/devReloadStrategy.js';
 export { createServerFunctionClient, stripUnserializable } from '../utilities/serverFunctionClient.js';
 
 //# sourceMappingURL=client.js.map

package/dist/exports/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["'use client'\n\nexport { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js'\nexport {\n  PayloadAdminShell,\n  type PayloadAdminShellProps,\n  withPayloadRoot,\n  type WithPayloadRootOptions,\n} from '../layouts/Root/withPayloadRoot.js'\nexport {\n  type AdminLoad,\n  payloadAdminIndexRoute,\n  payloadAdminSplatRoute,\n} from '../routes/adminRoutes.js'\nexport { type LayoutLoad, payloadLayoutRoute } from '../routes/layoutRoute.js'\nexport { viteDevReloadStrategy } from '../utilities/devReloadStrategy.js'\nexport {\n  createServerFunctionClient,\n  stripUnserializable,\n} from '../utilities/serverFunctionClient.js'\n"],"names":["TanStackRouterAdapter","PayloadAdminShell","withPayloadRoot","payloadAdminIndexRoute","payloadAdminSplatRoute","payloadLayoutRoute","viteDevReloadStrategy","createServerFunctionClient","stripUnserializable"],"mappings":"AAAA;AAEA,SAASA,qBAAqB,QAAQ,qCAAoC;AAC1E,SACEC,iBAAiB,EAEjBC,eAAe,QAEV,qCAAoC;AAC3C,SAEEC,sBAAsB,EACtBC,sBAAsB,QACjB,2BAA0B;AACjC,SAA0BC,kBAAkB,QAAQ,2BAA0B;AAC9E,SAASC,qBAAqB,QAAQ,oCAAmC;AACzE,SACEC,0BAA0B,EAC1BC,mBAAmB,QACd,uCAAsC"}
+{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["'use client'\n\nexport { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js'\nexport {\n  PayloadAdminShell,\n  type PayloadAdminShellProps,\n  withPayloadRoot,\n  type WithPayloadRootOptions,\n} from '../layouts/Root/withPayloadRoot.js'\nexport {\n  type AdminLoad,\n  payloadAdminIndexRoute,\n  payloadAdminSplatRoute,\n} from '../routes/adminRoutes.js'\nexport { type LayoutLoad, payloadLayoutRoute } from '../routes/layoutRoute.js'\nexport {\n  createServerFunctionClient,\n  stripUnserializable,\n} from '../utilities/serverFunctionClient.js'\n"],"names":["TanStackRouterAdapter","PayloadAdminShell","withPayloadRoot","payloadAdminIndexRoute","payloadAdminSplatRoute","payloadLayoutRoute","createServerFunctionClient","stripUnserializable"],"mappings":"AAAA;AAEA,SAASA,qBAAqB,QAAQ,qCAAoC;AAC1E,SACEC,iBAAiB,EAEjBC,eAAe,QAEV,qCAAoC;AAC3C,SAEEC,sBAAsB,EACtBC,sBAAsB,QACjB,2BAA0B;AACjC,SAA0BC,kBAAkB,QAAQ,2BAA0B;AAC9E,SACEC,0BAA0B,EAC1BC,mBAAmB,QACd,uCAAsC"}

package/dist/exports/layouts.d.ts

@@ -1,4 +1,4 @@
 export { getLayoutData } from '../layouts/Root/getLayoutData.js';
 export type { GetLayoutDataArgs, RootLayoutData } from '../layouts/Root/getLayoutData.js';
-export { loadLayoutData } from '../utilities/loadLayoutData.js';
+export { loadLayoutData, type LoadLayoutDataResult } from '../utilities/loadLayoutData.js';
 //# sourceMappingURL=layouts.d.ts.map

package/dist/exports/layouts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layouts.d.ts","sourceRoot":"","sources":["../../src/exports/layouts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAChE,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA"}
+{"version":3,"file":"layouts.d.ts","sourceRoot":"","sources":["../../src/exports/layouts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAChE,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,gCAAgC,CAAA"}

package/dist/exports/layouts.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/layouts.ts"],"sourcesContent":["export { getLayoutData } from '../layouts/Root/getLayoutData.js'\nexport type { GetLayoutDataArgs, RootLayoutData } from '../layouts/Root/getLayoutData.js'\nexport { loadLayoutData } from '../utilities/loadLayoutData.js'\n"],"names":["getLayoutData","loadLayoutData"],"mappings":"AAAA,SAASA,aAAa,QAAQ,mCAAkC;AAEhE,SAASC,cAAc,QAAQ,iCAAgC"}
+{"version":3,"sources":["../../src/exports/layouts.ts"],"sourcesContent":["export { getLayoutData } from '../layouts/Root/getLayoutData.js'\nexport type { GetLayoutDataArgs, RootLayoutData } from '../layouts/Root/getLayoutData.js'\nexport { loadLayoutData, type LoadLayoutDataResult } from '../utilities/loadLayoutData.js'\n"],"names":["getLayoutData","loadLayoutData"],"mappings":"AAAA,SAASA,aAAa,QAAQ,mCAAkC;AAEhE,SAASC,cAAc,QAAmC,iCAAgC"}

package/dist/exports/server.d.ts

@@ -12,6 +12,6 @@ export { loadAdminPage, type LoadAdminPageArgs, type LoadAdminPageResult, } from
 export { type AdminPageMetadata, getAdminMeta } from '../utilities/meta.js';
 export { serializeForRsc } from '../utilities/serializeForRsc.js';
 export { createPageRenderServerAdapter, type PageNavIntent, tanstackServerAdapter, } from '../utilities/serverAdapter.server.js';
-export { toSerializable } from '../utilities/toSerializable.js';
+export { type SerializableRecord, toSerializable } from '../utilities/toSerializable.js';
 export { getRequestTheme } from '@payloadcms/ui/utilities/getRequestTheme';
 //# sourceMappingURL=server.d.ts.map

package/dist/exports/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/exports/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAA;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AACxD,OAAO,EACL,aAAa,EACb,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,GACzB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,KAAK,iBAAiB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EACL,6BAA6B,EAC7B,KAAK,aAAa,EAClB,qBAAqB,GACtB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/exports/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAA;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AACxD,OAAO,EACL,aAAa,EACb,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,GACzB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,KAAK,iBAAiB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EACL,6BAA6B,EAC7B,KAAK,aAAa,EAClB,qBAAqB,GACtB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,kBAAkB,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA"}

package/dist/exports/server.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/server.ts"],"sourcesContent":["export { login } from '../auth/login.js'\nexport { logout } from '../auth/logout.js'\nexport { refresh } from '../auth/refresh.js'\nexport { payloadApiHandlers } from '../routes/apiRoute.js'\nexport { getRequestI18n } from '../utilities/getRequestI18n.server.js'\nexport { getRequestLocale } from '../utilities/getRequestLocale.js'\nexport { handleGraphQL } from '../utilities/graphqlHandler.server.js'\nexport { handleAPIRoute } from '../utilities/handleAPIRoute.server.js'\nexport { handleServerFunctions } from '../utilities/handleServerFunctions.js'\nexport { initReq } from '../utilities/initReq.server.js'\nexport {\n  loadAdminPage,\n  type LoadAdminPageArgs,\n  type LoadAdminPageResult,\n} from '../utilities/loadAdminPage.js'\nexport { type AdminPageMetadata, getAdminMeta } from '../utilities/meta.js'\nexport { serializeForRsc } from '../utilities/serializeForRsc.js'\nexport {\n  createPageRenderServerAdapter,\n  type PageNavIntent,\n  tanstackServerAdapter,\n} from '../utilities/serverAdapter.server.js'\nexport { toSerializable } from '../utilities/toSerializable.js'\nexport { getRequestTheme } from '@payloadcms/ui/utilities/getRequestTheme'\n"],"names":["login","logout","refresh","payloadApiHandlers","getRequestI18n","getRequestLocale","handleGraphQL","handleAPIRoute","handleServerFunctions","initReq","loadAdminPage","getAdminMeta","serializeForRsc","createPageRenderServerAdapter","tanstackServerAdapter","toSerializable","getRequestTheme"],"mappings":"AAAA,SAASA,KAAK,QAAQ,mBAAkB;AACxC,SAASC,MAAM,QAAQ,oBAAmB;AAC1C,SAASC,OAAO,QAAQ,qBAAoB;AAC5C,SAASC,kBAAkB,QAAQ,wBAAuB;AAC1D,SAASC,cAAc,QAAQ,wCAAuC;AACtE,SAASC,gBAAgB,QAAQ,mCAAkC;AACnE,SAASC,aAAa,QAAQ,wCAAuC;AACrE,SAASC,cAAc,QAAQ,wCAAuC;AACtE,SAASC,qBAAqB,QAAQ,wCAAuC;AAC7E,SAASC,OAAO,QAAQ,iCAAgC;AACxD,SACEC,aAAa,QAGR,gCAA+B;AACtC,SAAiCC,YAAY,QAAQ,uBAAsB;AAC3E,SAASC,eAAe,QAAQ,kCAAiC;AACjE,SACEC,6BAA6B,EAE7BC,qBAAqB,QAChB,uCAAsC;AAC7C,SAASC,cAAc,QAAQ,iCAAgC;AAC/D,SAASC,eAAe,QAAQ,2CAA0C"}
+{"version":3,"sources":["../../src/exports/server.ts"],"sourcesContent":["export { login } from '../auth/login.js'\nexport { logout } from '../auth/logout.js'\nexport { refresh } from '../auth/refresh.js'\nexport { payloadApiHandlers } from '../routes/apiRoute.js'\nexport { getRequestI18n } from '../utilities/getRequestI18n.server.js'\nexport { getRequestLocale } from '../utilities/getRequestLocale.js'\nexport { handleGraphQL } from '../utilities/graphqlHandler.server.js'\nexport { handleAPIRoute } from '../utilities/handleAPIRoute.server.js'\nexport { handleServerFunctions } from '../utilities/handleServerFunctions.js'\nexport { initReq } from '../utilities/initReq.server.js'\nexport {\n  loadAdminPage,\n  type LoadAdminPageArgs,\n  type LoadAdminPageResult,\n} from '../utilities/loadAdminPage.js'\nexport { type AdminPageMetadata, getAdminMeta } from '../utilities/meta.js'\nexport { serializeForRsc } from '../utilities/serializeForRsc.js'\nexport {\n  createPageRenderServerAdapter,\n  type PageNavIntent,\n  tanstackServerAdapter,\n} from '../utilities/serverAdapter.server.js'\nexport { type SerializableRecord, toSerializable } from '../utilities/toSerializable.js'\nexport { getRequestTheme } from '@payloadcms/ui/utilities/getRequestTheme'\n"],"names":["login","logout","refresh","payloadApiHandlers","getRequestI18n","getRequestLocale","handleGraphQL","handleAPIRoute","handleServerFunctions","initReq","loadAdminPage","getAdminMeta","serializeForRsc","createPageRenderServerAdapter","tanstackServerAdapter","toSerializable","getRequestTheme"],"mappings":"AAAA,SAASA,KAAK,QAAQ,mBAAkB;AACxC,SAASC,MAAM,QAAQ,oBAAmB;AAC1C,SAASC,OAAO,QAAQ,qBAAoB;AAC5C,SAASC,kBAAkB,QAAQ,wBAAuB;AAC1D,SAASC,cAAc,QAAQ,wCAAuC;AACtE,SAASC,gBAAgB,QAAQ,mCAAkC;AACnE,SAASC,aAAa,QAAQ,wCAAuC;AACrE,SAASC,cAAc,QAAQ,wCAAuC;AACtE,SAASC,qBAAqB,QAAQ,wCAAuC;AAC7E,SAASC,OAAO,QAAQ,iCAAgC;AACxD,SACEC,aAAa,QAGR,gCAA+B;AACtC,SAAiCC,YAAY,QAAQ,uBAAsB;AAC3E,SAASC,eAAe,QAAQ,kCAAiC;AACjE,SACEC,6BAA6B,EAE7BC,qBAAqB,QAChB,uCAAsC;AAC7C,SAAkCC,cAAc,QAAQ,iCAAgC;AACxF,SAASC,eAAe,QAAQ,2CAA0C"}

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

@@ -2,6 +2,15 @@ import React from 'react';
 export type PayloadAdminShellProps = {
     readonly children: React.ReactNode;
 };
+/**
+ * The `<html>` document shell for Payload admin routes — the TanStack Start
+ * equivalent of `@payloadcms/next`'s root layout `<html>`. Sets
+ * `data-theme`/`lang`/`dir` on `<html>` from the server-computed layout data
+ * (`getLayoutData`, exposed on the `/_payload` route loader), so the admin
+ * panel renders themed with the correct text direction on the first paint with no
+ * client bootstrap script — the same server-side path Next's `RootLayout`
+ * uses, sharing `getRequestTheme`/`getLanguageDir` from `@payloadcms/ui`.
+ */
 export declare function PayloadAdminShell({ children }: PayloadAdminShellProps): React.JSX.Element;
 export type WithPayloadRootOptions = {
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"withPayloadRoot.d.ts","sourceRoot":"","sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACnC,CAAA;AAaD,wBAAgB,iBAAiB,CAAC,EAAE,QAAQ,EAAE,EAAE,sBAAsB,qBAkDrE;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAAC,EAC7D,OAAO,GAAE,sBAA2B,kBAIW;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,uBAc7E"}
+{"version":3,"file":"withPayloadRoot.d.ts","sourceRoot":"","sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACnC,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,QAAQ,EAAE,EAAE,sBAAsB,qBAmCrE;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAAC,EAC7D,OAAO,GAAE,sBAA2B,kBAIW;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,uBAc7E"}

package/dist/layouts/Root/withPayloadRoot.js

@@ -11,44 +11,29 @@ import React from 'react';
  * panel renders themed with the correct text direction on the first paint with no
  * client bootstrap script — the same server-side path Next's `RootLayout`
  * uses, sharing `getRequestTheme`/`getLanguageDir` from `@payloadcms/ui`.
- */ const NO_LAYOUT_DATA = '|';
-export function PayloadAdminShell({ children }) {
-    // `select` has to return a primitive. `useRouterState` compares its result by reference, so
-    // returning an object literal yields a fresh value on every router state change, re-rendering
-    // `<html>` each time. On a production build that desynchronises `<html>` from the
-    // server-rendered markup during hydration, which React reports as error #418 and recovers from
-    // by discarding and regenerating the tree.
-    const encoded = useRouterState({
+ */ export function PayloadAdminShell({ children }) {
+    const htmlProps = useRouterState({
         select: (state)=>{
             for (const match of state.matches){
                 const data = match.loaderData;
                 if (data?.theme && data?.languageCode) {
-                    return `${data.theme}|${data.languageCode}`;
+                    return {
+                        'data-theme': data.theme,
+                        dir: getLanguageDir({
+                            languageCode: data.languageCode
+                        }),
+                        lang: data.languageCode
+                    };
                 }
             }
-            return NO_LAYOUT_DATA;
-        }
-    });
-    const htmlProps = React.useMemo(()=>{
-        const [theme, languageCode] = encoded.split('|');
-        // No layout data yet (fresh session before the loader resolves): default
-        // to `ltr` so the `[dir='ltr']`-scoped admin layout rules (e.g. the
-        // document sidebar divider) still match, matching Next's `ltr` default.
-        if (!theme || !languageCode) {
+            // No layout data yet (fresh session before the loader resolves): default
+            // to `ltr` so the `[dir='ltr']`-scoped admin layout rules (e.g. the
+            // document sidebar divider) still match, matching Next's `ltr` default.
             return {
                 dir: 'ltr'
             };
         }
-        return {
-            'data-theme': theme,
-            dir: getLanguageDir({
-                languageCode
-            }),
-            lang: languageCode
-        };
-    }, [
-        encoded
-    ]);
+    });
     return(// eslint-disable-next-line jsx-a11y/html-has-lang -- `lang` is set from server-computed layout data when available
     /*#__PURE__*/ _jsxs("html", {
         ...htmlProps,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"sourcesContent":["'use client'\nimport type { Theme } from '@payloadcms/ui'\n\nimport { getLanguageDir } from '@payloadcms/ui/utilities/getLanguageDir'\nimport { HeadContent, Scripts, useRouterState } from '@tanstack/react-router'\nimport React from 'react'\n\ntype AdminHTMLProps = {\n  'data-theme'?: Theme\n  dir: 'ltr' | 'rtl'\n  lang?: string\n}\n\nexport type PayloadAdminShellProps = {\n  readonly children: React.ReactNode\n}\n\n/**\n * The `<html>` document shell for Payload admin routes — the TanStack Start\n * equivalent of `@payloadcms/next`'s root layout `<html>`. Sets\n * `data-theme`/`lang`/`dir` on `<html>` from the server-computed layout data\n * (`getLayoutData`, exposed on the `/_payload` route loader), so the admin\n * panel renders themed with the correct text direction on the first paint with no\n * client bootstrap script — the same server-side path Next's `RootLayout`\n * uses, sharing `getRequestTheme`/`getLanguageDir` from `@payloadcms/ui`.\n */\nconst NO_LAYOUT_DATA = '|'\n\nexport function PayloadAdminShell({ children }: PayloadAdminShellProps) {\n  // `select` has to return a primitive. `useRouterState` compares its result by reference, so\n  // returning an object literal yields a fresh value on every router state change, re-rendering\n  // `<html>` each time. On a production build that desynchronises `<html>` from the\n  // server-rendered markup during hydration, which React reports as error #418 and recovers from\n  // by discarding and regenerating the tree.\n  const encoded = useRouterState({\n    select: (state): string => {\n      for (const match of state.matches) {\n        const data = match.loaderData as { languageCode?: string; theme?: Theme } | undefined\n\n        if (data?.theme && data?.languageCode) {\n          return `${data.theme}|${data.languageCode}`\n        }\n      }\n\n      return NO_LAYOUT_DATA\n    },\n  })\n\n  const htmlProps = React.useMemo((): AdminHTMLProps => {\n    const [theme, languageCode] = encoded.split('|')\n\n    // No layout data yet (fresh session before the loader resolves): default\n    // to `ltr` so the `[dir='ltr']`-scoped admin layout rules (e.g. the\n    // document sidebar divider) still match, matching Next's `ltr` default.\n    if (!theme || !languageCode) {\n      return { dir: 'ltr' }\n    }\n\n    return {\n      'data-theme': theme as Theme,\n      dir: getLanguageDir({ languageCode }),\n      lang: languageCode,\n    }\n  }, [encoded])\n\n  return (\n    // eslint-disable-next-line jsx-a11y/html-has-lang -- `lang` is set from server-computed layout data when available\n    <html {...htmlProps} suppressHydrationWarning>\n      <head>\n        <style>{`@layer payload-default, payload;`}</style>\n        <HeadContent />\n      </head>\n      <body>\n        {children}\n        <Scripts />\n      </body>\n    </html>\n  )\n}\n\nexport type WithPayloadRootOptions = {\n  /**\n   * Path prefix that mounts the Payload admin panel (`config.routes.admin`).\n   * Routes under it render the Payload admin document shell; everything else\n   * renders your own shell. Defaults to `'/admin'`.\n   */\n  adminRoute?: string\n}\n\n/**\n * Wraps your application's root document shell so Payload owns its own\n * `<html>` chrome on admin routes while your shell renders everywhere else.\n *\n * Attach the result to the root route's `shellComponent`; it is the single\n * integration touch point — no root loader and no manual data threading:\n *\n * ```tsx\n * export const Route = createRootRoute({\n *   shellComponent: withPayloadRoot(MarketingRoot),\n * })\n * ```\n */\nexport function withPayloadRoot(\n  RootShell: React.ComponentType<{ children: React.ReactNode }>,\n  options: WithPayloadRootOptions = {},\n) {\n  const { adminRoute = '/admin' } = options\n\n  return function PayloadRootShell({ children }: { children: React.ReactNode }) {\n    const isAdminRoute = useRouterState({\n      select: (s) => {\n        const { pathname } = s.location\n        return pathname === adminRoute || pathname.startsWith(`${adminRoute}/`)\n      },\n    })\n\n    if (isAdminRoute) {\n      return <PayloadAdminShell>{children}</PayloadAdminShell>\n    }\n\n    return <RootShell>{children}</RootShell>\n  }\n}\n"],"names":["getLanguageDir","HeadContent","Scripts","useRouterState","React","NO_LAYOUT_DATA","PayloadAdminShell","children","encoded","select","state","match","matches","data","loaderData","theme","languageCode","htmlProps","useMemo","split","dir","lang","html","suppressHydrationWarning","head","style","body","withPayloadRoot","RootShell","options","adminRoute","PayloadRootShell","isAdminRoute","s","pathname","location","startsWith"],"mappings":"AAAA;;AAGA,SAASA,cAAc,QAAQ,0CAAyC;AACxE,SAASC,WAAW,EAAEC,OAAO,EAAEC,cAAc,QAAQ,yBAAwB;AAC7E,OAAOC,WAAW,QAAO;AAYzB;;;;;;;;CAQC,GACD,MAAMC,iBAAiB;AAEvB,OAAO,SAASC,kBAAkB,EAAEC,QAAQ,EAA0B;IACpE,4FAA4F;IAC5F,8FAA8F;IAC9F,kFAAkF;IAClF,+FAA+F;IAC/F,2CAA2C;IAC3C,MAAMC,UAAUL,eAAe;QAC7BM,QAAQ,CAACC;YACP,KAAK,MAAMC,SAASD,MAAME,OAAO,CAAE;gBACjC,MAAMC,OAAOF,MAAMG,UAAU;gBAE7B,IAAID,MAAME,SAASF,MAAMG,cAAc;oBACrC,OAAO,GAAGH,KAAKE,KAAK,CAAC,CAAC,EAAEF,KAAKG,YAAY,EAAE;gBAC7C;YACF;YAEA,OAAOX;QACT;IACF;IAEA,MAAMY,YAAYb,MAAMc,OAAO,CAAC;QAC9B,MAAM,CAACH,OAAOC,aAAa,GAAGR,QAAQW,KAAK,CAAC;QAE5C,yEAAyE;QACzE,oEAAoE;QACpE,wEAAwE;QACxE,IAAI,CAACJ,SAAS,CAACC,cAAc;YAC3B,OAAO;gBAAEI,KAAK;YAAM;QACtB;QAEA,OAAO;YACL,cAAcL;YACdK,KAAKpB,eAAe;gBAAEgB;YAAa;YACnCK,MAAML;QACR;IACF,GAAG;QAACR;KAAQ;IAEZ,OACE,mHAAmH;kBACnH,MAACc;QAAM,GAAGL,SAAS;QAAEM,wBAAwB;;0BAC3C,MAACC;;kCACC,KAACC;kCAAO,CAAC,gCAAgC,CAAC;;kCAC1C,KAACxB;;;0BAEH,MAACyB;;oBACEnB;kCACD,KAACL;;;;;AAIT;AAWA;;;;;;;;;;;;CAYC,GACD,OAAO,SAASyB,gBACdC,SAA6D,EAC7DC,UAAkC,CAAC,CAAC;IAEpC,MAAM,EAAEC,aAAa,QAAQ,EAAE,GAAGD;IAElC,OAAO,SAASE,iBAAiB,EAAExB,QAAQ,EAAiC;QAC1E,MAAMyB,eAAe7B,eAAe;YAClCM,QAAQ,CAACwB;gBACP,MAAM,EAAEC,QAAQ,EAAE,GAAGD,EAAEE,QAAQ;gBAC/B,OAAOD,aAAaJ,cAAcI,SAASE,UAAU,CAAC,GAAGN,WAAW,CAAC,CAAC;YACxE;QACF;QAEA,IAAIE,cAAc;YAChB,qBAAO,KAAC1B;0BAAmBC;;QAC7B;QAEA,qBAAO,KAACqB;sBAAWrB;;IACrB;AACF"}
+{"version":3,"sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"sourcesContent":["'use client'\nimport type { Theme } from '@payloadcms/ui'\n\nimport { getLanguageDir } from '@payloadcms/ui/utilities/getLanguageDir'\nimport { HeadContent, Scripts, useRouterState } from '@tanstack/react-router'\nimport React from 'react'\n\ntype AdminHTMLProps = {\n  'data-theme'?: Theme\n  dir: 'ltr' | 'rtl'\n  lang?: string\n}\n\nexport type PayloadAdminShellProps = {\n  readonly children: React.ReactNode\n}\n\n/**\n * The `<html>` document shell for Payload admin routes — the TanStack Start\n * equivalent of `@payloadcms/next`'s root layout `<html>`. Sets\n * `data-theme`/`lang`/`dir` on `<html>` from the server-computed layout data\n * (`getLayoutData`, exposed on the `/_payload` route loader), so the admin\n * panel renders themed with the correct text direction on the first paint with no\n * client bootstrap script — the same server-side path Next's `RootLayout`\n * uses, sharing `getRequestTheme`/`getLanguageDir` from `@payloadcms/ui`.\n */\nexport function PayloadAdminShell({ children }: PayloadAdminShellProps) {\n  const htmlProps = useRouterState({\n    select: (state): AdminHTMLProps => {\n      for (const match of state.matches) {\n        const data = match.loaderData as { languageCode?: string; theme?: Theme } | undefined\n\n        if (data?.theme && data?.languageCode) {\n          return {\n            'data-theme': data.theme,\n            dir: getLanguageDir({ languageCode: data.languageCode }),\n            lang: data.languageCode,\n          }\n        }\n      }\n\n      // No layout data yet (fresh session before the loader resolves): default\n      // to `ltr` so the `[dir='ltr']`-scoped admin layout rules (e.g. the\n      // document sidebar divider) still match, matching Next's `ltr` default.\n      return { dir: 'ltr' }\n    },\n  })\n\n  return (\n    // eslint-disable-next-line jsx-a11y/html-has-lang -- `lang` is set from server-computed layout data when available\n    <html {...htmlProps} suppressHydrationWarning>\n      <head>\n        <style>{`@layer payload-default, payload;`}</style>\n        <HeadContent />\n      </head>\n      <body>\n        {children}\n        <Scripts />\n      </body>\n    </html>\n  )\n}\n\nexport type WithPayloadRootOptions = {\n  /**\n   * Path prefix that mounts the Payload admin panel (`config.routes.admin`).\n   * Routes under it render the Payload admin document shell; everything else\n   * renders your own shell. Defaults to `'/admin'`.\n   */\n  adminRoute?: string\n}\n\n/**\n * Wraps your application's root document shell so Payload owns its own\n * `<html>` chrome on admin routes while your shell renders everywhere else.\n *\n * Attach the result to the root route's `shellComponent`; it is the single\n * integration touch point — no root loader and no manual data threading:\n *\n * ```tsx\n * export const Route = createRootRoute({\n *   shellComponent: withPayloadRoot(MarketingRoot),\n * })\n * ```\n */\nexport function withPayloadRoot(\n  RootShell: React.ComponentType<{ children: React.ReactNode }>,\n  options: WithPayloadRootOptions = {},\n) {\n  const { adminRoute = '/admin' } = options\n\n  return function PayloadRootShell({ children }: { children: React.ReactNode }) {\n    const isAdminRoute = useRouterState({\n      select: (s) => {\n        const { pathname } = s.location\n        return pathname === adminRoute || pathname.startsWith(`${adminRoute}/`)\n      },\n    })\n\n    if (isAdminRoute) {\n      return <PayloadAdminShell>{children}</PayloadAdminShell>\n    }\n\n    return <RootShell>{children}</RootShell>\n  }\n}\n"],"names":["getLanguageDir","HeadContent","Scripts","useRouterState","React","PayloadAdminShell","children","htmlProps","select","state","match","matches","data","loaderData","theme","languageCode","dir","lang","html","suppressHydrationWarning","head","style","body","withPayloadRoot","RootShell","options","adminRoute","PayloadRootShell","isAdminRoute","s","pathname","location","startsWith"],"mappings":"AAAA;;AAGA,SAASA,cAAc,QAAQ,0CAAyC;AACxE,SAASC,WAAW,EAAEC,OAAO,EAAEC,cAAc,QAAQ,yBAAwB;AAC7E,OAAOC,WAAW,QAAO;AAYzB;;;;;;;;CAQC,GACD,OAAO,SAASC,kBAAkB,EAAEC,QAAQ,EAA0B;IACpE,MAAMC,YAAYJ,eAAe;QAC/BK,QAAQ,CAACC;YACP,KAAK,MAAMC,SAASD,MAAME,OAAO,CAAE;gBACjC,MAAMC,OAAOF,MAAMG,UAAU;gBAE7B,IAAID,MAAME,SAASF,MAAMG,cAAc;oBACrC,OAAO;wBACL,cAAcH,KAAKE,KAAK;wBACxBE,KAAKhB,eAAe;4BAAEe,cAAcH,KAAKG,YAAY;wBAAC;wBACtDE,MAAML,KAAKG,YAAY;oBACzB;gBACF;YACF;YAEA,yEAAyE;YACzE,oEAAoE;YACpE,wEAAwE;YACxE,OAAO;gBAAEC,KAAK;YAAM;QACtB;IACF;IAEA,OACE,mHAAmH;kBACnH,MAACE;QAAM,GAAGX,SAAS;QAAEY,wBAAwB;;0BAC3C,MAACC;;kCACC,KAACC;kCAAO,CAAC,gCAAgC,CAAC;;kCAC1C,KAACpB;;;0BAEH,MAACqB;;oBACEhB;kCACD,KAACJ;;;;;AAIT;AAWA;;;;;;;;;;;;CAYC,GACD,OAAO,SAASqB,gBACdC,SAA6D,EAC7DC,UAAkC,CAAC,CAAC;IAEpC,MAAM,EAAEC,aAAa,QAAQ,EAAE,GAAGD;IAElC,OAAO,SAASE,iBAAiB,EAAErB,QAAQ,EAAiC;QAC1E,MAAMsB,eAAezB,eAAe;YAClCK,QAAQ,CAACqB;gBACP,MAAM,EAAEC,QAAQ,EAAE,GAAGD,EAAEE,QAAQ;gBAC/B,OAAOD,aAAaJ,cAAcI,SAASE,UAAU,CAAC,GAAGN,WAAW,CAAC,CAAC;YACxE;QACF;QAEA,IAAIE,cAAc;YAChB,qBAAO,KAACvB;0BAAmBC;;QAC7B;QAEA,qBAAO,KAACkB;sBAAWlB;;IACrB;AACF"}

package/dist/routes/adminRoutes.d.ts

@@ -1,4 +1,4 @@
-import { type ReactNode } from 'react';
+import type { NotFoundRouteProps } from '@tanstack/react-router';
 /**
  * Loader supplied by the app — a TanStack Start `createServerFn` that delegates
  * to `loadAdminPage`. Typed loosely because the server-fn's call signature is
@@ -11,12 +11,7 @@ export type AdminLoad = (opts: {
     };
 }) => Promise<any>;
 declare function AdminPage(): import("react").JSX.Element;
-declare function AdminNotFound(props: {
-    data?: {
-        routeKey?: string;
-        rscPayload?: ReactNode;
-    };
-}): import("react").JSX.Element;
+declare function AdminNotFound({ data }: NotFoundRouteProps): import("react").JSX.Element;
 /**
  * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's
  * server-built NotFound page (shipped via the `notFound()` error's
@@ -49,12 +44,13 @@ export declare function payloadAdminSplatRoute({ load }: {
             title: string;
         })[];
     };
+    notFoundComponent: typeof AdminNotFound;
     loader: {
         handler: ({ location, params }: {
             location: any;
             params: any;
         }) => Promise<any>;
-        staleReloadMode: string;
+        staleReloadMode: 'blocking';
     };
     loaderDeps: ({ search }: {
         search: Record<string, unknown>;
@@ -62,11 +58,10 @@ export declare function payloadAdminSplatRoute({ load }: {
         searchKey: string;
     };
     validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
-    notFoundComponent: typeof AdminNotFound;
 };
 /**
- * Route options for the admin index route (`/_payload/admin/`). Same loader as the
- * splat route but throws a bare `notFound()` (no rscPayload) on miss.
+ * 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,12 +89,13 @@ export declare function payloadAdminIndexRoute({ load }: {
             title: string;
         })[];
     };
+    notFoundComponent: typeof AdminNotFound;
     loader: {
         handler: ({ location, params }: {
             location: any;
             params: any;
         }) => Promise<any>;
-        staleReloadMode: string;
+        staleReloadMode: 'blocking';
     };
     loaderDeps: ({ search }: {
         search: Record<string, unknown>;

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,gCAKjB;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,SAAS,CAAA;KAAE,CAAA;CAAE,+BAMrF;AA8CD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;;2BAlC3C;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;QAOzC,OAAO,yBAA+B;YAAE,QAAQ,EAAE,GAAG,CAAC;YAAC,MAAM,EAAE,GAAG,CAAA;SAAE;QAYpE,eAAe;;6BAGQ;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE;QAC1D,SAAS;;6BAEc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAkBjD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;;2BAjD3C;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;QAOzC,OAAO,yBAA+B;YAAE,QAAQ,EAAE,GAAG,CAAC;YAAC,MAAM,EAAE,GAAG,CAAA;SAAE;QAYpE,eAAe;;6BAGQ;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE;QAC1D,SAAS;;6BAEc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EA8BjD"}
+{"version":3,"file":"adminRoutes.d.ts","sourceRoot":"","sources":["../../src/routes/adminRoutes.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAQhE;;;;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;AAID,iBAAS,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,kBAAkB,+BAOlD;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,EAAE,UAAU;;6BAGJ;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,EAAE,UAAU;;6BAGJ;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)=>{
@@ -26,22 +26,42 @@ function AdminPage() {
     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
+        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);
 }
 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,
@@ -75,18 +95,15 @@ const adminRouteOptions = ({ forwardNotFoundPayload, load, resolveSplat })=>({
  * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare
  * client view.
  */ export function payloadAdminSplatRoute({ load }) {
-    return {
-        ...adminRouteOptions({
-            forwardNotFoundPayload: true,
-            load,
-            resolveSplat: (params)=>params._splat ?? ''
-        }),
-        notFoundComponent: AdminNotFound
-    };
+    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 adminRouteOptions({
         forwardNotFoundPayload: false,

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  // 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  return <Fragment>{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\nconst adminRouteOptions = ({\n  forwardNotFoundPayload,\n  load,\n  resolveSplat,\n}: {\n  /**\n   * Ships the server-rendered NotFound tree through `notFound()`'s `data` so a\n   * `notFoundComponent` can render it with the full admin chrome. Routes without\n   * one throw bare.\n   */\n  forwardNotFoundPayload: boolean\n  load: AdminLoad\n  /** The route's splat, i.e. the path after `/admin/`. */\n  resolveSplat: (params: any) => string\n}) => ({\n  component: AdminPage,\n  head: ({ loaderData }: { loaderData?: any }) => getAdminMeta(loaderData?.metadata),\n  // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a\n  // sibling route option — router-core only reads it off a non-function loader)\n  // makes stale-match revalidation await the fresh loader before committing,\n  // instead of the default background SWR that flashes the pre-navigation list\n  // (e.g. a just-created doc missing) until the reload lands.\n  loader: {\n    handler: async ({ location, params }: { location: any; params: any }) => {\n      const data = await runLoader(load, resolveSplat(params), location.searchStr)\n      if (data?._notFound) {\n        // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects\n        throw notFound(\n          forwardNotFoundPayload\n            ? { data: { routeKey: data.routeKey, rscPayload: data.rscPayload } }\n            : undefined,\n        )\n      }\n      return data\n    },\n    staleReloadMode: 'blocking',\n  },\n  // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.\n  loaderDeps: ({ search }: { search: Record<string, unknown> }) => ({\n    searchKey: JSON.stringify(search),\n  }),\n  validateSearch: (search: Record<string, unknown>) => search,\n})\n\n/**\n * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's\n * server-built NotFound page (shipped via the `notFound()` error's\n * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare\n * client view.\n */\nexport function payloadAdminSplatRoute({ load }: { load: AdminLoad }) {\n  return {\n    ...adminRouteOptions({\n      forwardNotFoundPayload: true,\n      load,\n      resolveSplat: (params) => params._splat ?? '',\n    }),\n    notFoundComponent: AdminNotFound,\n  }\n}\n\n/**\n * Route options for the admin index route (`/_payload/admin/`). Same loader as the\n * splat route but throws a bare `notFound()` (no rscPayload) on miss.\n */\nexport function payloadAdminIndexRoute({ load }: { load: AdminLoad }) {\n  return adminRouteOptions({\n    forwardNotFoundPayload: false,\n    load,\n    resolveSplat: () => '',\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","AdminNotFound","props","routeKey","adminRouteOptions","forwardNotFoundPayload","resolveSplat","component","head","loaderData","metadata","loader","handler","location","params","_notFound","undefined","staleReloadMode","loaderDeps","searchKey","JSON","stringify","validateSearch","payloadAdminSplatRoute","notFoundComponent","payloadAdminIndexRoute"],"mappings":"AAAA;;AAEA,SAASA,cAAc,QAAQ,iBAAgB;AAC/C,SAASC,QAAQ,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,yBAAwB;AAC1E,SAASC,QAAQ,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,+HAA+H;IAC/H,2HAA2H;IAC3H,MAAML,OAAOX,cAAc;QAAEiB,QAAQ;IAAM;IAC3C,qBAAO,KAAChB;kBAAUU,MAAMO;;AAC1B;AAEA,SAASC,cAAcC,KAA+D;IACpF,MAAMF,aAAaE,OAAOT,MAAMO;IAChC,IAAI,CAACA,YAAY;QACf,qBAAO,KAACrB;IACV;IACA,qBAAO,KAACI;kBAAsCiB;OAAxBE,OAAOT,MAAMU;AACrC;AAEA,MAAMC,oBAAoB,CAAC,EACzBC,sBAAsB,EACtBd,IAAI,EACJe,YAAY,EAWb,GAAM,CAAA;QACLC,WAAWT;QACXU,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAKzB,aAAayB,YAAYC;QACzE,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DC,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMrB,OAAO,MAAMH,UAAUC,MAAMe,aAAaQ,SAASD,SAAS3B,SAAS;gBAC3E,IAAIO,MAAMsB,WAAW;oBACnB,qHAAqH;oBACrH,MAAMnC,SACJyB,yBACI;wBAAEZ,MAAM;4BAAEU,UAAUV,KAAKU,QAAQ;4BAAEH,YAAYP,KAAKO,UAAU;wBAAC;oBAAE,IACjEgB;gBAER;gBACA,OAAOvB;YACT;YACAwB,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAEvB,MAAM,EAAuC,GAAM,CAAA;gBAChEwB,WAAWC,KAAKC,SAAS,CAAC1B;YAC5B,CAAA;QACA2B,gBAAgB,CAAC3B,SAAoCA;IACvD,CAAA;AAEA;;;;;CAKC,GACD,OAAO,SAAS4B,uBAAuB,EAAEhC,IAAI,EAAuB;IAClE,OAAO;QACL,GAAGa,kBAAkB;YACnBC,wBAAwB;YACxBd;YACAe,cAAc,CAACQ,SAAWA,OAAOpB,MAAM,IAAI;QAC7C,EAAE;QACF8B,mBAAmBvB;IACrB;AACF;AAEA;;;CAGC,GACD,OAAO,SAASwB,uBAAuB,EAAElC,IAAI,EAAuB;IAClE,OAAOa,kBAAkB;QACvBC,wBAAwB;QACxBd;QACAe,cAAc,IAAM;IACtB;AACF"}
+{"version":3,"sources":["../../src/routes/adminRoutes.tsx"],"sourcesContent":["'use client'\n\nimport type { NotFoundRouteProps } from '@tanstack/react-router'\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\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":["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","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,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;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,KAACxB;IACV;IACA,qBAAO,KAACK;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/layoutRoute.d.ts

@@ -1,11 +1,12 @@
 import type { ComponentProps } from 'react';
 import { RootProvider } from '@payloadcms/ui';
+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,
@@ -19,8 +20,8 @@ export declare function payloadLayoutRoute({ load, serverFunction, }: {
 }): {
     component: () => import("react").JSX.Element;
     loader: {
-        handler: () => Promise<Record<string, unknown>>;
-        staleReloadMode: string;
+        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;IAsCG,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;AAG1D,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.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          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"}
+{"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 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":["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;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,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;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,38 @@
+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 `initReq.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) {
+    const listeners = new Set();
+    hot.on(PAYLOAD_CONFIG_CHANGED_EVENT, ()=>{
+        for (const onReload of listeners){
+            onReload();
+        }
+    });
+    registerDevReloadStrategy({
+        connect: (onReload)=>{
+            listeners.add(onReload);
+            return ()=>{
+                listeners.delete(onReload);
+            };
+        }
+    });
+}
+
+//# sourceMappingURL=devConfigReload.server.js.map