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

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;AA8DvE,eAAO,MAAM,qBAAqB,EAAE,sBAqHnC,CAAA"}

package/dist/elements/RouterAdapter/index.js

@@ -1,9 +1,10 @@
 '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 } from '@payloadcms/ui/providers/RouterAdapter';
+import { useRouteTransition } from '@payloadcms/ui/providers/RouteTransition';
+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 +35,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/providers/RouterAdapter'\nimport type { LinkAdapterProps, RouterAdapterComponent } from 'payload'\n\nimport { RouterAdapterContext } from '@payloadcms/ui/providers/RouterAdapter'\nimport { useRouteTransition } from '@payloadcms/ui/providers/RouteTransition'\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

@@ -3,15 +3,13 @@ export { logout } from '../auth/logout.js';
 export { refresh } from '../auth/refresh.js';
 export { payloadApiHandlers } from '../routes/apiRoute.js';
 export { getRequestI18n } from '../utilities/getRequestI18n.server.js';
-export { getRequestLocale } from '../utilities/getRequestLocale.js';
 export { handleGraphQL } from '../utilities/graphqlHandler.server.js';
 export { handleAPIRoute } from '../utilities/handleAPIRoute.server.js';
 export { handleServerFunctions } from '../utilities/handleServerFunctions.js';
-export { initReq } from '../utilities/initReq.server.js';
 export { loadAdminPage, type LoadAdminPageArgs, type LoadAdminPageResult, } from '../utilities/loadAdminPage.js';
 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,aAAa,EAAE,MAAM,uCAAuC,CAAA;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,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

@@ -3,11 +3,9 @@ export { logout } from '../auth/logout.js';
 export { refresh } from '../auth/refresh.js';
 export { payloadApiHandlers } from '../routes/apiRoute.js';
 export { getRequestI18n } from '../utilities/getRequestI18n.server.js';
-export { getRequestLocale } from '../utilities/getRequestLocale.js';
 export { handleGraphQL } from '../utilities/graphqlHandler.server.js';
 export { handleAPIRoute } from '../utilities/handleAPIRoute.server.js';
 export { handleServerFunctions } from '../utilities/handleServerFunctions.js';
-export { initReq } from '../utilities/initReq.server.js';
 export { loadAdminPage } from '../utilities/loadAdminPage.js';
 export { getAdminMeta } from '../utilities/meta.js';
 export { serializeForRsc } from '../utilities/serializeForRsc.js';

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 { handleGraphQL } from '../utilities/graphqlHandler.server.js'\nexport { handleAPIRoute } from '../utilities/handleAPIRoute.server.js'\nexport { handleServerFunctions } from '../utilities/handleServerFunctions.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","handleGraphQL","handleAPIRoute","handleServerFunctions","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,aAAa,QAAQ,wCAAuC;AACrE,SAASC,cAAc,QAAQ,wCAAuC;AACtE,SAASC,qBAAqB,QAAQ,wCAAuC;AAC7E,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/getLayoutData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLayoutData.d.ts","sourceRoot":"","sources":["../../../src/layouts/Root/getLayoutData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,eAAe,EACf,eAAe,EACf,oBAAoB,EAEpB,IAAI,EACL,MAAM,SAAS,CAAA;AAahB,MAAM,MAAM,cAAc,GAAG;IAC3B,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,OAAO,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,oBAAoB,CAAA;IACjC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,EAAE,KAAK,CAAA;IACZ,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,CAAA;IACxC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IACzD,SAAS,EAAE,SAAS,CAAA;CACrB,CAAA;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,EAClC,aAAa,EACb,SAAS,GACV,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAwF7C"}
+{"version":3,"file":"getLayoutData.d.ts","sourceRoot":"","sources":["../../../src/layouts/Root/getLayoutData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,eAAe,EACf,eAAe,EACf,oBAAoB,EAEpB,IAAI,EACL,MAAM,SAAS,CAAA;AAahB,MAAM,MAAM,cAAc,GAAG;IAC3B,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,OAAO,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,oBAAoB,CAAA;IACjC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,EAAE,KAAK,CAAA;IACZ,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,CAAA;IACxC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IACzD,SAAS,EAAE,SAAS,CAAA;CACrB,CAAA;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,EAClC,aAAa,EACb,SAAS,GACV,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAyF7C"}

package/dist/layouts/Root/getLayoutData.js

@@ -6,12 +6,12 @@ import { getRequestTheme } from '@payloadcms/ui/utilities/getRequestTheme';
 import { Outlet } from '@tanstack/react-router';
 import { applyLocaleFiltering } from 'payload/shared';
 import { createElement } from 'react';
-import { initReq } from '../../utilities/initReq.server.js';
+import { initAdminContext } from '../../utilities/initAdminContext.server.js';
 /**
  * Fetches all data needed by the root admin layout.
  * Call this in your TanStack Start root route loader.
  */ export async function getLayoutData({ configPromise, importMap }) {
-    const { cookies, headers, languageCode, permissions, req, req: { payload: { config } } } = await initReq({
+    const { cookies, headers, languageCode, permissions, req, req: { payload: { config } }, user } = await initAdminContext({
         configPromise,
         importMap
     });
@@ -38,7 +38,7 @@ import { initReq } from '../../utilities/initReq.server.js';
         config,
         i18n: req.i18n,
         importMap,
-        user: req.user ?? true
+        user: user ?? true
     });
     await applyLocaleFiltering({
         clientConfig,
@@ -61,7 +61,7 @@ import { initReq } from '../../utilities/initReq.server.js';
             permissions,
             searchParams: {},
             server: req.server,
-            user: req.user ?? undefined
+            user: user ?? undefined
         };
         // Mirror the Next adapter's `NestProviders`: render each configured provider
         // via `RenderServerComponent` so the entry's own `clientProps`/`serverProps`
@@ -90,7 +90,7 @@ import { initReq } from '../../utilities/initReq.server.js';
         providers,
         theme,
         translations: req.i18n.translations,
-        user: req.user
+        user: user ?? null
     };
 }
 

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

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

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;AAShE;;;;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,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)=>{
@@ -26,22 +27,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 +96,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,