@payloadcms/tanstack-start 4.0.0-internal.314c594 → 4.0.0-internal.31ba7ee

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;AA6DvE,eAAO,MAAM,qBAAqB,EAAE,sBAqHnC,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,6 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { RouterAdapterContext, useRouteTransition } from '@payloadcms/ui';
+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, useEffect, useMemo } from 'react';

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, 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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"}
+{"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":"AAAA;;AAKA,SAASA,oBAAoB,QAAQ,yCAAwC;AAC7E,SAASC,kBAAkB,QAAQ,2CAA0C;AAC7E,SACEC,QAAQC,YAAY,EACpBC,WAAW,EACXC,SAAS,EACTC,SAAS,EACTC,cAAc,QACT,yBAAwB;AAC/B,YAAYC,QAAQ,SAAQ;AAC5B,OAAOC,SAASC,WAAW,EAAEC,SAAS,EAAEC,OAAO,QAAQ,QAAO;AAE9D,MAAMC,4BAA4B,CAAC,EACjCC,IAAI,EACJC,QAAQ,EACRC,MAAM,EAKP;IACC,IAAIF,KAAKG,UAAU,CAAC,SAAS;QAC3B,MAAMC,MAAM,IAAIC,IAAIL;QACpB,OAAO,GAAGI,IAAIH,QAAQ,GAAGG,IAAIF,MAAM,GAAGE,IAAIE,IAAI,EAAE;IAClD;IAEA,IAAIN,KAAKG,UAAU,CAAC,MAAM;QACxB,OAAO,GAAGF,WAAWD,MAAM;IAC7B;IAEA,IAAIA,KAAKG,UAAU,CAAC,MAAM;QACxB,OAAO,GAAGF,WAAWC,SAASF,MAAM;IACtC;IAEA,OAAOA;AACT;AAEA,MAAMO,sBAAkD,CAAC,EACvDC,QAAQ,EACRC,IAAI,EACJC,QAAQ,EACRC,GAAG,EACHC,OAAO,EACPC,MAAM,EACN,GAAGC,MACJ;IACC,qBACE,KAACzB;QACC0B,SAASL,aAAa,QAAQ,QAAQ;QACtCC,KAAKA;QACLC,SAASA;QACTI,aAAaH;QACbI,IAAIR;QACH,GAAGK,IAAI;kBAEPN;;AAGP;AAEA,OAAO,MAAMU,wBAAgD,CAAC,EAAEV,QAAQ,EAAE;IACxE,MAAMW,SAAS3B;IACf,MAAM4B,WAAW9B;IACjB,MAAM+B,SAAS9B,UAAU;QAAE+B,QAAQ;IAAM;IACzC,MAAMC,kBAAkB9B,eAAe;QAAE+B,QAAQ,CAACC,QAAUA,MAAMC,SAAS;IAAC;IAC5E,MAAM,EAAEC,mBAAmB,EAAE,GAAGxC;IAEhCU,UAAU;QACR,IAAI,CAAC0B,iBAAiB;YACpB;QACF;QAEA,MAAMK,yBAAyBD;QAE/B,OAAO,IAAMC;IACf,GAAG;QAACD;QAAqBJ;KAAgB;IAEzC,MAAMM,gBAAgB/B,QAAQ;QAC5B,MAAMgC,UAA6C;YAAE,GAAGT,MAAM;QAAC;QAE/D,IAAI,YAAYA,UAAU,OAAOA,OAAOU,MAAM,KAAK,UAAU;YAC3DD,QAAQE,QAAQ,GAAGX,OAAOU,MAAM,CAACE,KAAK,CAAC,KAAKC,MAAM,CAACC;QACrD;QAEA,OAAOL;IACT,GAAG;QAACT;KAAO;IAEX,yEAAyE;IACzE,8EAA8E;IAC9E,8EAA8E;IAC9E,4DAA4D;IAC5D,4EAA4E;IAC5E,6EAA6E;IAC7E,4EAA4E;IAC5E,8DAA8D;IAC9D,MAAMe,eAAexC,YAAY,CAACI;QAChC,MAAMqC,eAAetC,0BAA0B;YAC7CC;YACAC,UAAUqC,OAAOlB,QAAQ,CAACnB,QAAQ;YAClCC,QAAQoC,OAAOlB,QAAQ,CAAClB,MAAM;QAChC;QAEA,MAAMqC,aAAaF,aAAaG,OAAO,CAAC;QAExC,IAAID,eAAe,CAAC,GAAG;YACrB,OAAO;gBAAEtB,IAAIoB;YAAa;QAC5B;QAEA,MAAMI,eAAe/C,GAAGgD,KAAK,CAACL,aAAaM,KAAK,CAACJ,aAAa,IAAI;YAChEK,OAAO;YACPC,mBAAmB;QACrB;QAEA,6EAA6E;QAC7E,OAAO;YAAE3C,QAAQ,IAAMuC;YAAcxB,IAAIoB,aAAaM,KAAK,CAAC,GAAGJ;QAAY;IAC7E,GAAG,EAAE;IAEL,MAAMO,OAAOlD,YAAY,IAAMuB,OAAO4B,OAAO,CAACD,IAAI,IAAI;QAAC3B;KAAO;IAE9D,MAAM6B,OAAOpD,YACX,CAACI,MAAciD;QACb,KAAK9B,OAAO+B,QAAQ,CAAC;YAAE,GAAGd,aAAapC,KAAK;YAAEgB,aAAaiC,SAASpC;QAAO;IAC7E,GACA;QAACM;QAAQiB;KAAa;IAGxB,MAAMe,UAAUvD,YAAY;QAC1B,KAAKuB,OAAOiC,UAAU;IACxB,GAAG;QAACjC;KAAO;IAEX,MAAMP,UAAUhB,YACd,CAACI,MAAciD;QACb,KAAK9B,OAAO+B,QAAQ,CAAC;YAAE,GAAGd,aAAapC,KAAK;YAAEY,SAAS;YAAMI,aAAaiC,SAASpC;QAAO;IAC5F,GACA;QAACM;QAAQiB;KAAa;IAGxB,oHAAoH;IACpH,mHAAmH;IACnH,2HAA2H;IAC3H,MAAMiB,eAAezD,YACnB,CAACQ;QACC,MAAM,EAAE2C,OAAO,EAAE,GAAG5B;QACpB4B,QAAQO,kBAAkB,GAAG;QAE7B,IAAI;YACFhB,OAAOS,OAAO,CAACM,YAAY,CAAC,MAAM,IAAIjD;QACxC,SAAU;YACR2C,QAAQO,kBAAkB,GAAG;QAC/B;IACF,GACA;QAACnC;KAAO;IAGV,MAAMoC,gBAAgBzD,QACpB,IAAO,CAAA;YAAEgD;YAAME;YAAMG;YAASvC;YAASyC;QAAa,CAAA,GACpD;QAACP;QAAME;QAAMG;QAASvC;QAASyC;KAAa;IAG9C,4EAA4E;IAC5E,6EAA6E;IAC7E,yEAAyE;IACzE,0EAA0E;IAC1E,MAAMG,eAAe1D,QAAQ,IAAM,IAAI2D,gBAAgBrC,SAASsC,SAAS,GAAG;QAACtC,SAASsC,SAAS;KAAC;IAEhG,MAAMC,QAAmC7D,QACvC,IAAO,CAAA;YACLV,MAAMmB;YACNc,QAAQQ;YACR5B,UAAUmB,SAASnB,QAAQ;YAC3BkB,QAAQoC;YACRC;QACF,CAAA,GACA;QAAC3B;QAAeT,SAASnB,QAAQ;QAAEsD;QAAeC;KAAa;IAGjE,qBAAO,KAACtE;QAAqByE,OAAOA;kBAAQnD;;AAC9C,EAAC"}

package/dist/exports/server.d.ts

@@ -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, type LoadAdminPageArgs, type LoadAdminPageResult, } from '../utilities/loadAdminPage.js';
 export { type AdminPageMetadata, getAdminMeta } from '../utilities/meta.js';
 export { serializeForRsc } from '../utilities/serializeForRsc.js';

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,KAAK,kBAAkB,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AACxF,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 { 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"}
+{"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

@@ -1,5 +1,6 @@
 import type { I18nClient } from '@payloadcms/translations';
 import type { Theme } from '@payloadcms/ui';
+import type { RequestThemeSource } from '@payloadcms/ui/utilities/getRequestTheme';
 import type { ClientConfig, ImportMap, LanguageOptions, SanitizedConfig, SanitizedPermissions, User } from 'payload';
 export type RootLayoutData = {
     clientConfig: ClientConfig;
@@ -19,6 +20,8 @@ export type RootLayoutData = {
      */
     providers?: React.ReactNode;
     theme: Theme;
+    /** The request input used to resolve `theme`. */
+    themeSource: RequestThemeSource;
     translations: I18nClient['translations'];
     user: null | User;
 };

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,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAA;AAClF,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,iDAAiD;IACjD,WAAW,EAAE,kBAAkB,CAAA;IAC/B,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,CA+F7C"}

package/dist/layouts/Root/getLayoutData.js

@@ -6,16 +6,16 @@ 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
     });
-    const theme = getRequestTheme({
+    const { theme, themeSource } = getRequestTheme({
         config,
         cookies,
         headers
@@ -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`
@@ -89,8 +89,9 @@ import { initReq } from '../../utilities/initReq.server.js';
         permissions,
         providers,
         theme,
+        themeSource,
         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 { RequestThemeSource } from '@payloadcms/ui/utilities/getRequestTheme'\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  /** The request input used to resolve `theme`. */\n  themeSource: RequestThemeSource\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, themeSource } = getRequestTheme({\n    config,\n    cookies,\n    headers,\n  })\n\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    themeSource,\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","themeSource","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":"AAaA,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;AA+B7E;;;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,MAAM,EAAES,KAAK,EAAEC,WAAW,EAAE,GAAGjB,gBAAgB;QAC7Cc;QACAN;QACAC;IACF;IAEA,MAAMS,aAAanB,gBAAgB;QAAEe;QAAQN;IAAQ;IAErD,MAAMW,kBAAmCC,OAAOC,OAAO,CACrDP,OAAOQ,IAAI,CAACC,kBAAkB,IAAI,CAAC,GACnCC,MAAM,CAAC,CAACC,KAAK,CAACC,UAAUC,eAAe;QACvC,IAAIP,OAAOQ,IAAI,CAACd,OAAOQ,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,MAAMxC,YAAYgB;IAEnC,MAAMyB,eAAevC,gBAAgB;QACnCgB;QACAQ,MAAMV,IAAIU,IAAI;QACdf;QACAQ,MAAMA,QAAQ;IAChB;IAEA,MAAMb,qBAAqB;QAAEmC;QAAcvB;QAAQF;IAAI;IAEvD,6EAA6E;IAC7E,sEAAsE;IACtE,0EAA0E;IAC1E,2EAA2E;IAC3E,2EAA2E;IAC3E,8EAA8E;IAC9E,MAAM0B,gBAAgBxB,OAAOyB,KAAK,EAAEC,YAAYC;IAChD,IAAIA,YAA6BC;IACjC,IAAIC,MAAMC,OAAO,CAACN,kBAAkBA,cAAcO,MAAM,GAAG,GAAG;QAC5D,MAAMC,cAA2B;YAC/BxB,MAAMV,IAAIU,IAAI;YACdyB,QAAQ,CAAC;YACTlC,SAASD,IAAIC,OAAO;YACpBF;YACAqC,cAAc,CAAC;YACfC,QAAQrC,IAAIqC,MAAM;YAClBlC,MAAMA,QAAQ2B;QAChB;QACA,6EAA6E;QAC7E,6EAA6E;QAC7E,8EAA8E;QAC9E,2EAA2E;QAC3E,8EAA8E;QAC9ED,YAAYH,cAAcY,WAAW,CACnC,CAACC,UAAUC,WACTvD,sBAAsB;gBACpBwD,aAAa;oBAAEF;gBAAS;gBACxBG,WAAWF;gBACX7C;gBACAuC;YACF,IACF3C,cAAcF;IAElB;IAEA,OAAO;QACLoC;QACAkB,YAAY3C,IAAIU,IAAI,CAACiC,UAAU;QAC/BC,cAAc1C,OAAOQ,IAAI,CAACmC,gBAAgB;QAC1CvC;QACAwC,WAAWtB,UAAUuB,QAAQ;QAC7BjD;QACAS;QACAyC,QAAQhD,IAAIgD,MAAM,IAAIlB;QACtB/B;QACA8B;QACAzB;QACAC;QACAe,cAAcpB,IAAIU,IAAI,CAACU,YAAY;QACnCjB,MAAMA,QAAQ;IAChB;AACF"}

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

@@ -6,10 +6,9 @@ export type PayloadAdminShellProps = {
  * 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`.
+ * (`getLayoutData`, exposed on the `/_payload` route loader). A blocking script
+ * resolves the server's default theme from the browser preference before first paint,
+ * while the server-provided language and text direction remain authoritative.
  */
 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;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"}
+{"version":3,"file":"withPayloadRoot.d.ts","sourceRoot":"","sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACnC,CAAA;AAED;;;;;;;GAOG;AACH,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"}

package/dist/layouts/Root/withPayloadRoot.js

@@ -1,5 +1,6 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { ResolveThemeOnClient } from '@payloadcms/ui/layouts/Root/ResolveThemeOnClient';
 import { getLanguageDir } from '@payloadcms/ui/utilities/getLanguageDir';
 import { HeadContent, Scripts, useRouterState } from '@tanstack/react-router';
 import React from 'react';
@@ -7,22 +8,25 @@ import React from 'react';
  * 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`.
+ * (`getLayoutData`, exposed on the `/_payload` route loader). A blocking script
+ * resolves the server's default theme from the browser preference before first paint,
+ * while the server-provided language and text direction remain authoritative.
  */ export function PayloadAdminShell({ children }) {
-    const htmlProps = useRouterState({
+    const { htmlProps, serverTheme, themeSource } = useRouterState({
         select: (state)=>{
             for (const match of state.matches){
                 const data = match.loaderData;
                 if (data?.theme && data?.languageCode) {
                     return {
-                        'data-theme': data.theme,
-                        dir: getLanguageDir({
-                            languageCode: data.languageCode
-                        }),
-                        lang: data.languageCode
+                        htmlProps: {
+                            'data-theme': data.theme,
+                            dir: getLanguageDir({
+                                languageCode: data.languageCode
+                            }),
+                            lang: data.languageCode
+                        },
+                        serverTheme: data.theme,
+                        themeSource: data.themeSource ?? 'default'
                     };
                 }
             }
@@ -30,7 +34,11 @@ import React from 'react';
             // 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'
+                htmlProps: {
+                    dir: 'ltr'
+                },
+                serverTheme: 'light',
+                themeSource: 'default'
             };
         }
     });
@@ -41,6 +49,9 @@ import React from 'react';
         children: [
             /*#__PURE__*/ _jsxs("head", {
                 children: [
+                    themeSource === 'default' && /*#__PURE__*/ _jsx(ResolveThemeOnClient, {
+                        serverTheme: serverTheme
+                    }),
                     /*#__PURE__*/ _jsx("style", {
                         children: `@layer payload-default, payload;`
                     }),

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 */\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"}
+{"version":3,"sources":["../../../src/layouts/Root/withPayloadRoot.tsx"],"sourcesContent":["'use client'\nimport type { Theme } from '@payloadcms/ui'\nimport type { RequestThemeSource } from '@payloadcms/ui/utilities/getRequestTheme'\n\nimport { ResolveThemeOnClient } from '@payloadcms/ui/layouts/Root/ResolveThemeOnClient'\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\ntype AdminShellState = {\n  htmlProps: AdminHTMLProps\n  serverTheme: Theme\n  themeSource: RequestThemeSource\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). A blocking script\n * resolves the server's default theme from the browser preference before first paint,\n * while the server-provided language and text direction remain authoritative.\n */\nexport function PayloadAdminShell({ children }: PayloadAdminShellProps) {\n  const { htmlProps, serverTheme, themeSource } = useRouterState({\n    select: (state): AdminShellState => {\n      for (const match of state.matches) {\n        const data = match.loaderData as\n          | {\n              languageCode?: string\n              theme?: Theme\n              themeSource?: RequestThemeSource\n            }\n          | undefined\n\n        if (data?.theme && data?.languageCode) {\n          return {\n            htmlProps: {\n              'data-theme': data.theme,\n              dir: getLanguageDir({ languageCode: data.languageCode }),\n              lang: data.languageCode,\n            },\n            serverTheme: data.theme,\n            themeSource: data.themeSource ?? 'default',\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 {\n        htmlProps: { dir: 'ltr' },\n        serverTheme: 'light',\n        themeSource: 'default',\n      }\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        {themeSource === 'default' && <ResolveThemeOnClient serverTheme={serverTheme} />}\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":["ResolveThemeOnClient","getLanguageDir","HeadContent","Scripts","useRouterState","React","PayloadAdminShell","children","htmlProps","serverTheme","themeSource","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;;AAIA,SAASA,oBAAoB,QAAQ,mDAAkD;AACvF,SAASC,cAAc,QAAQ,0CAAyC;AACxE,SAASC,WAAW,EAAEC,OAAO,EAAEC,cAAc,QAAQ,yBAAwB;AAC7E,OAAOC,WAAW,QAAO;AAkBzB;;;;;;;CAOC,GACD,OAAO,SAASC,kBAAkB,EAAEC,QAAQ,EAA0B;IACpE,MAAM,EAAEC,SAAS,EAAEC,WAAW,EAAEC,WAAW,EAAE,GAAGN,eAAe;QAC7DO,QAAQ,CAACC;YACP,KAAK,MAAMC,SAASD,MAAME,OAAO,CAAE;gBACjC,MAAMC,OAAOF,MAAMG,UAAU;gBAQ7B,IAAID,MAAME,SAASF,MAAMG,cAAc;oBACrC,OAAO;wBACLV,WAAW;4BACT,cAAcO,KAAKE,KAAK;4BACxBE,KAAKlB,eAAe;gCAAEiB,cAAcH,KAAKG,YAAY;4BAAC;4BACtDE,MAAML,KAAKG,YAAY;wBACzB;wBACAT,aAAaM,KAAKE,KAAK;wBACvBP,aAAaK,KAAKL,WAAW,IAAI;oBACnC;gBACF;YACF;YAEA,yEAAyE;YACzE,oEAAoE;YACpE,wEAAwE;YACxE,OAAO;gBACLF,WAAW;oBAAEW,KAAK;gBAAM;gBACxBV,aAAa;gBACbC,aAAa;YACf;QACF;IACF;IAEA,OACE,mHAAmH;kBACnH,MAACW;QAAM,GAAGb,SAAS;QAAEc,wBAAwB;;0BAC3C,MAACC;;oBACEb,gBAAgB,2BAAa,KAACV;wBAAqBS,aAAaA;;kCACjE,KAACe;kCAAO,CAAC,gCAAgC,CAAC;;kCAC1C,KAACtB;;;0BAEH,MAACuB;;oBACElB;kCACD,KAACJ;;;;;AAIT;AAWA;;;;;;;;;;;;CAYC,GACD,OAAO,SAASuB,gBACdC,SAA6D,EAC7DC,UAAkC,CAAC,CAAC;IAEpC,MAAM,EAAEC,aAAa,QAAQ,EAAE,GAAGD;IAElC,OAAO,SAASE,iBAAiB,EAAEvB,QAAQ,EAAiC;QAC1E,MAAMwB,eAAe3B,eAAe;YAClCO,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,KAACzB;0BAAmBC;;QAC7B;QAEA,qBAAO,KAACoB;sBAAWpB;;IACrB;AACF"}

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

@@ -1 +1 @@
-{"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"}
+{"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,6 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { NotFoundClient, useRouteTransition } 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, useDeferredValue, useEffect } from 'react';
 import { getAdminMeta } from '../utilities/meta.js';

package/dist/routes/adminRoutes.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"sources":["../../src/routes/adminRoutes.tsx"],"sourcesContent":["'use client'\n\nimport type { NotFoundRouteProps } from '@tanstack/react-router'\n\nimport { useRouteTransition } from '@payloadcms/ui/providers/RouteTransition'\nimport { NotFoundClient } from '@payloadcms/ui/views/NotFound/client'\nimport { notFound, redirect, useLoaderData } from '@tanstack/react-router'\nimport { Fragment, type ReactNode, useDeferredValue, useEffect } from 'react'\n\nimport { getAdminMeta } from '../utilities/meta.js'\n\n/**\n * Loader supplied by the app — a TanStack Start `createServerFn` that delegates\n * to `loadAdminPage`. Typed loosely because the server-fn's call signature is\n * generated by the Start compiler.\n */\nexport type AdminLoad = (opts: {\n  data: { _splat: string; search: Record<string, string | string[]> }\n}) => Promise<any>\n\nconst searchToRecord = (searchStr: string): Record<string, string | string[]> =>\n  Object.fromEntries(new URLSearchParams(searchStr)) as Record<string, string | string[]>\n\nconst runLoader = async (load: AdminLoad, splat: string, searchStr: string) => {\n  const data = await load({ data: { _splat: splat, search: searchToRecord(searchStr) } })\n  if (data?._redirect) {\n    // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing redirect objects\n    throw redirect({ to: data._redirect })\n  }\n  return data\n}\n\nfunction AdminPage() {\n  // Note: React key intentionally omitted here so the persistent template (nav, header) doesn't remount and flash on navigation.\n  // The per-route view key is attached server-side to the view subtree instead, via `renderRoot`'s `key` in `loadAdminPage`.\n  const data = useLoaderData({ strict: false })\n\n  // Route state comes from an external store, so a new RSC payload that suspends\n  // on code-split client references can reveal the router's null fallback.\n  // Keep the current payload painted until the next one is renderable.\n  const rscPayload = useDeferredValue(data?.rscPayload)\n  const { holdRouteTransition } = useRouteTransition()\n  const isRscPayloadDeferred = rscPayload !== data?.rscPayload\n\n  useEffect(() => {\n    if (!isRscPayloadDeferred) {\n      return\n    }\n\n    const releaseRouteTransition = holdRouteTransition()\n\n    return () => releaseRouteTransition()\n  }, [holdRouteTransition, isRscPayloadDeferred])\n\n  return <Fragment>{rscPayload}</Fragment>\n}\n\ntype AdminNotFoundData = { routeKey?: string; rscPayload?: ReactNode }\n\nfunction AdminNotFound({ data }: NotFoundRouteProps) {\n  // TanStack exposes not-found data as unknown; this route only receives the shape thrown below.\n  const { routeKey, rscPayload } = (data ?? {}) as AdminNotFoundData\n  if (!rscPayload) {\n    return <NotFoundClient />\n  }\n  return <Fragment key={routeKey}>{rscPayload}</Fragment>\n}\n\nconst adminRouteOptions = ({\n  forwardNotFoundPayload,\n  load,\n  resolveSplat,\n}: {\n  /**\n   * Ships the server-rendered NotFound tree through `notFound()`'s `data` so a\n   * `notFoundComponent` can render it with the full admin chrome. Routes without\n   * one throw bare.\n   */\n  forwardNotFoundPayload: boolean\n  load: AdminLoad\n  /** The route's splat, i.e. the path after `/admin/`. */\n  resolveSplat: (params: any) => string\n}) => ({\n  component: AdminPage,\n  head: ({ loaderData }: { loaderData?: any }) => getAdminMeta(loaderData?.metadata),\n  // Both admin routes must use the same boundary type so index ↔ splat\n  // navigation preserves the existing admin subtree.\n  notFoundComponent: AdminNotFound,\n  // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a\n  // sibling route option — router-core only reads it off a non-function loader)\n  // makes stale-match revalidation await the fresh loader before committing,\n  // instead of the default background SWR that flashes the pre-navigation list\n  // (e.g. a just-created doc missing) until the reload lands.\n  loader: {\n    handler: async ({ location, params }: { location: any; params: any }) => {\n      const data = await runLoader(load, resolveSplat(params), location.searchStr)\n      if (data?._notFound) {\n        // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects\n        throw notFound(\n          forwardNotFoundPayload\n            ? { data: { routeKey: data.routeKey, rscPayload: data.rscPayload } }\n            : undefined,\n        )\n      }\n      return data\n    },\n    staleReloadMode: 'blocking' as const,\n  },\n  // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.\n  loaderDeps: ({ search }: { search: Record<string, unknown> }) => ({\n    searchKey: JSON.stringify(search),\n  }),\n  validateSearch: (search: Record<string, unknown>) => search,\n})\n\n/**\n * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's\n * server-built NotFound page (shipped via the `notFound()` error's\n * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare\n * client view.\n */\nexport function payloadAdminSplatRoute({ load }: { load: AdminLoad }) {\n  return adminRouteOptions({\n    forwardNotFoundPayload: true,\n    load,\n    resolveSplat: (params) => params._splat ?? '',\n  })\n}\n\n/**\n * Route options for the admin index route (`/_payload/admin/`). Not-found\n * results omit the RSC payload and fall back to `NotFoundClient`.\n */\nexport function payloadAdminIndexRoute({ load }: { load: AdminLoad }) {\n  return adminRouteOptions({\n    forwardNotFoundPayload: false,\n    load,\n    resolveSplat: () => '',\n  })\n}\n"],"names":["useRouteTransition","NotFoundClient","notFound","redirect","useLoaderData","Fragment","useDeferredValue","useEffect","getAdminMeta","searchToRecord","searchStr","Object","fromEntries","URLSearchParams","runLoader","load","splat","data","_splat","search","_redirect","to","AdminPage","strict","rscPayload","holdRouteTransition","isRscPayloadDeferred","releaseRouteTransition","AdminNotFound","routeKey","adminRouteOptions","forwardNotFoundPayload","resolveSplat","component","head","loaderData","metadata","notFoundComponent","loader","handler","location","params","_notFound","undefined","staleReloadMode","loaderDeps","searchKey","JSON","stringify","validateSearch","payloadAdminSplatRoute","payloadAdminIndexRoute"],"mappings":"AAAA;;AAIA,SAASA,kBAAkB,QAAQ,2CAA0C;AAC7E,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,QAAQ,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,yBAAwB;AAC1E,SAASC,QAAQ,EAAkBC,gBAAgB,EAAEC,SAAS,QAAQ,QAAO;AAE7E,SAASC,YAAY,QAAQ,uBAAsB;AAWnD,MAAMC,iBAAiB,CAACC,YACtBC,OAAOC,WAAW,CAAC,IAAIC,gBAAgBH;AAEzC,MAAMI,YAAY,OAAOC,MAAiBC,OAAeN;IACvD,MAAMO,OAAO,MAAMF,KAAK;QAAEE,MAAM;YAAEC,QAAQF;YAAOG,QAAQV,eAAeC;QAAW;IAAE;IACrF,IAAIO,MAAMG,WAAW;QACnB,qHAAqH;QACrH,MAAMjB,SAAS;YAAEkB,IAAIJ,KAAKG,SAAS;QAAC;IACtC;IACA,OAAOH;AACT;AAEA,SAASK;IACP,+HAA+H;IAC/H,2HAA2H;IAC3H,MAAML,OAAOb,cAAc;QAAEmB,QAAQ;IAAM;IAE3C,+EAA+E;IAC/E,yEAAyE;IACzE,qEAAqE;IACrE,MAAMC,aAAalB,iBAAiBW,MAAMO;IAC1C,MAAM,EAAEC,mBAAmB,EAAE,GAAGzB;IAChC,MAAM0B,uBAAuBF,eAAeP,MAAMO;IAElDjB,UAAU;QACR,IAAI,CAACmB,sBAAsB;YACzB;QACF;QAEA,MAAMC,yBAAyBF;QAE/B,OAAO,IAAME;IACf,GAAG;QAACF;QAAqBC;KAAqB;IAE9C,qBAAO,KAACrB;kBAAUmB;;AACpB;AAIA,SAASI,cAAc,EAAEX,IAAI,EAAsB;IACjD,+FAA+F;IAC/F,MAAM,EAAEY,QAAQ,EAAEL,UAAU,EAAE,GAAIP,QAAQ,CAAC;IAC3C,IAAI,CAACO,YAAY;QACf,qBAAO,KAACvB;IACV;IACA,qBAAO,KAACI;kBAAyBmB;OAAXK;AACxB;AAEA,MAAMC,oBAAoB,CAAC,EACzBC,sBAAsB,EACtBhB,IAAI,EACJiB,YAAY,EAWb,GAAM,CAAA;QACLC,WAAWX;QACXY,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAK3B,aAAa2B,YAAYC;QACzE,qEAAqE;QACrE,mDAAmD;QACnDC,mBAAmBT;QACnB,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DU,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMxB,OAAO,MAAMH,UAAUC,MAAMiB,aAAaS,SAASD,SAAS9B,SAAS;gBAC3E,IAAIO,MAAMyB,WAAW;oBACnB,qHAAqH;oBACrH,MAAMxC,SACJ6B,yBACI;wBAAEd,MAAM;4BAAEY,UAAUZ,KAAKY,QAAQ;4BAAEL,YAAYP,KAAKO,UAAU;wBAAC;oBAAE,IACjEmB;gBAER;gBACA,OAAO1B;YACT;YACA2B,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAE1B,MAAM,EAAuC,GAAM,CAAA;gBAChE2B,WAAWC,KAAKC,SAAS,CAAC7B;YAC5B,CAAA;QACA8B,gBAAgB,CAAC9B,SAAoCA;IACvD,CAAA;AAEA;;;;;CAKC,GACD,OAAO,SAAS+B,uBAAuB,EAAEnC,IAAI,EAAuB;IAClE,OAAOe,kBAAkB;QACvBC,wBAAwB;QACxBhB;QACAiB,cAAc,CAACS,SAAWA,OAAOvB,MAAM,IAAI;IAC7C;AACF;AAEA;;;CAGC,GACD,OAAO,SAASiC,uBAAuB,EAAEpC,IAAI,EAAuB;IAClE,OAAOe,kBAAkB;QACvBC,wBAAwB;QACxBhB;QACAiB,cAAc,IAAM;IACtB;AACF"}

package/dist/routes/layoutRoute.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentProps } from 'react';
-import { RootProvider } from '@payloadcms/ui';
+import { RootProvider } from '@payloadcms/ui/providers/Root';
 import type { LoadLayoutDataResult } from '../utilities/loadLayoutData.js';
 /**
  * Loader supplied by the app — a TanStack Start `createServerFn` that delegates

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;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"}
+{"version":3,"file":"layoutRoute.d.ts","sourceRoot":"","sources":["../../src/routes/layoutRoute.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAI5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAI1E;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE5D;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,cAAc,GACf,EAAE;IACD,IAAI,EAAE,UAAU,CAAA;IAChB,cAAc,EAAE,cAAc,CAAC,OAAO,YAAY,CAAC,CAAC,gBAAgB,CAAC,CAAA;CACtE;IAsCG,SAAS;IACT,MAAM;QAAI,OAAO;QAAgB,eAAe,EAAE,UAAU;;EAE/D"}

package/dist/routes/layoutRoute.js

@@ -1,6 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { ProgressBar, RootProvider } from '@payloadcms/ui';
+import { RootProvider } from '@payloadcms/ui/providers/Root';
+import { ProgressBar } from '@payloadcms/ui/providers/RouteTransition/ProgressBar';
 import { Outlet, useLoaderData } from '@tanstack/react-router';
 import { TanStackRouterAdapter } from '../elements/RouterAdapter/index.js';
 /**

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

package/dist/utilities/devConfigReload.server.js

@@ -4,7 +4,7 @@ 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
+ * Imported for its side effect by `initAdminContext.server.ts`, the adapter's only
  * `getPayload` call site, so the strategy is registered before an instance can
  * be built. Registration is module-scoped on both ends: this runs inside the
  * app's server graph and so resolves the same copy of `payload` that
@@ -19,20 +19,45 @@ import { PAYLOAD_CONFIG_CHANGED_EVENT } from './devConfigReloadEvent.js';
  * production build.
  */ const hot = import.meta.hot;
 if (hot) {
+    registerDevReloadStrategy(createConfigChangedStrategy({
+        hot
+    }));
+}
+/**
+ * Builds a dev reload strategy that forwards the config-changed event to every
+ * connected instance.
+ *
+ * After a program reload, the first request to re-import this module replaces
+ * the old listener with a new one, but the cached Payload instance only connects
+ * to it on its next `getPayload` call - and a request such as a frontend page
+ * render may never make one. An event that lands in that gap has no one to
+ * notify, so it is held and replayed to the next connection instead of being
+ * dropped - which would otherwise leave the instance serving the old config
+ * indefinitely.
+ */ function createConfigChangedStrategy({ hot }) {
     const listeners = new Set();
+    let hasPendingReload = false;
     hot.on(PAYLOAD_CONFIG_CHANGED_EVENT, ()=>{
+        if (listeners.size === 0) {
+            hasPendingReload = true;
+            return;
+        }
         for (const onReload of listeners){
             onReload();
         }
     });
-    registerDevReloadStrategy({
+    return {
         connect: (onReload)=>{
             listeners.add(onReload);
+            if (hasPendingReload) {
+                hasPendingReload = false;
+                onReload();
+            }
             return ()=>{
                 listeners.delete(onReload);
             };
         }
-    });
+    };
 }
 
 //# sourceMappingURL=devConfigReload.server.js.map

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

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

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

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

package/dist/utilities/getRequestI18n.server.js

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

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

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