@payloadcms/tanstack-start 4.0.0-internal.e55ccef → 4.0.0-internal.ea6e8f8

package/dist/{routes/adminRoutes.d.ts → adapters/views/index.d.ts}

@@ -1,4 +1,3 @@
-import { type ReactNode } from 'react';
 /**
  * Loader supplied by the app — a TanStack Start `createServerFn` that delegates
  * to `loadAdminPage`. Typed loosely because the server-fn's call signature is
@@ -10,13 +9,6 @@ export type AdminLoad = (opts: {
         search: Record<string, string | string[]>;
     };
 }) => Promise<any>;
-declare function AdminPage(): import("react").JSX.Element;
-declare function AdminNotFound(props: {
-    data?: {
-        routeKey?: string;
-        rscPayload?: ReactNode;
-    };
-}): import("react").JSX.Element;
 /**
  * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's
  * server-built NotFound page (shipped via the `notFound()` error's
@@ -26,7 +18,7 @@ declare function AdminNotFound(props: {
 export declare function payloadAdminSplatRoute({ load }: {
     load: AdminLoad;
 }): {
-    component: typeof AdminPage;
+    component: import("@tanstack/react-router").AsyncRouteComponent<unknown>;
     head: ({ loaderData }: {
         loaderData?: any;
     }) => {
@@ -49,29 +41,29 @@ export declare function payloadAdminSplatRoute({ load }: {
             title: string;
         })[];
     };
+    notFoundComponent: import("@tanstack/react-router").AsyncRouteComponent<import("@tanstack/react-router").NotFoundRouteProps>;
     loader: {
         handler: ({ location, params }: {
             location: any;
             params: any;
         }) => Promise<any>;
-        staleReloadMode: string;
+        staleReloadMode: 'blocking';
     };
     loaderDeps: ({ search }: {
         search: Record<string, unknown>;
     }) => {
         searchKey: string;
     };
-    notFoundComponent: typeof AdminNotFound;
     validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
 };
 /**
- * Route options for the admin index route (`/_payload/admin/`). Same loader as the
- * splat route but throws a bare `notFound()` (no rscPayload) on miss.
+ * Route options for the admin index route (`/_payload/admin/`). Not-found
+ * results omit the RSC payload and fall back to `NotFoundClient`.
  */
 export declare function payloadAdminIndexRoute({ load }: {
     load: AdminLoad;
 }): {
-    component: typeof AdminPage;
+    component: import("@tanstack/react-router").AsyncRouteComponent<unknown>;
     head: ({ loaderData }: {
         loaderData?: any;
     }) => {
@@ -94,11 +86,13 @@ export declare function payloadAdminIndexRoute({ load }: {
             title: string;
         })[];
     };
+    notFoundComponent: import("@tanstack/react-router").AsyncRouteComponent<import("@tanstack/react-router").NotFoundRouteProps>;
     loader: {
-        handler: ({ location }: {
+        handler: ({ location, params }: {
             location: any;
+            params: any;
         }) => Promise<any>;
-        staleReloadMode: string;
+        staleReloadMode: 'blocking';
     };
     loaderDeps: ({ search }: {
         search: Record<string, unknown>;
@@ -107,5 +101,4 @@ export declare function payloadAdminIndexRoute({ load }: {
     };
     validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
 };
-export {};
-//# sourceMappingURL=adminRoutes.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist/adapters/views/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/views/index.tsx"],"names":[],"mappings":"AAMA;;;;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;AAkElB;;;;;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 → adapters/views/index.js}

@@ -1,9 +1,6 @@
 'use client';
-import { jsx as _jsx } from "react/jsx-runtime";
-import { NotFoundClient } from '@payloadcms/ui';
-import { notFound, redirect, useLoaderData } from '@tanstack/react-router';
-import { Fragment } from 'react';
-import { getAdminMeta } from '../utilities/meta.js';
+import { lazyRouteComponent, notFound, redirect } from '@tanstack/react-router';
+import { getAdminMeta } from '../metadata.js';
 const searchToRecord = (searchStr)=>Object.fromEntries(new URLSearchParams(searchStr));
 const runLoader = async (load, splat, searchStr)=>{
     const data = await load({
@@ -20,37 +17,16 @@ const runLoader = async (load, splat, searchStr)=>{
     }
     return data;
 };
-function AdminPage() {
-    // RSC Flight payload — render directly. Key by the loader-derived `routeKey`
-    // (not `location.pathname`, which updates before `useLoaderData` during a
-    // transition and would remount with the previous payload) so navigating to a
-    // different admin page remounts the view, mirroring Next route-segment
-    // semantics. Search params are excluded so search-only changes reconcile in place.
-    const data = useLoaderData({
-        strict: false
-    });
-    return /*#__PURE__*/ _jsx(Fragment, {
-        children: data?.rscPayload
-    }, data?.routeKey);
-}
-function AdminNotFound(props) {
-    const rscPayload = props?.data?.rscPayload;
-    if (!rscPayload) {
-        return /*#__PURE__*/ _jsx(NotFoundClient, {});
-    }
-    return /*#__PURE__*/ _jsx(Fragment, {
-        children: rscPayload
-    }, props?.data?.routeKey);
-}
-/**
- * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's
- * server-built NotFound page (shipped via the `notFound()` error's
- * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare
- * client view.
- */ export function payloadAdminSplatRoute({ load }) {
-    return {
+// The admin UI loads with the admin routes only, so front-end routes never download it. The
+// router preloads lazy route components before rendering, so admin pages don't flash.
+const AdminPage = lazyRouteComponent(()=>import('./lazy.js'), 'AdminPage');
+const AdminNotFound = lazyRouteComponent(()=>import('./lazy.js'), 'AdminNotFound');
+const adminRouteOptions = ({ forwardNotFoundPayload, load, resolveSplat })=>({
         component: AdminPage,
         head: ({ loaderData })=>getAdminMeta(loaderData?.metadata),
+        // Both admin routes must use the same boundary type so index ↔ splat
+        // navigation preserves the existing admin subtree.
+        notFoundComponent: AdminNotFound,
         // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a
         // sibling route option — router-core only reads it off a non-function loader)
         // makes stale-match revalidation await the fresh loader before committing,
@@ -58,15 +34,15 @@ function AdminNotFound(props) {
         // (e.g. a just-created doc missing) until the reload lands.
         loader: {
             handler: async ({ location, params })=>{
-                const data = await runLoader(load, params._splat ?? '', location.searchStr);
+                const data = await runLoader(load, resolveSplat(params), location.searchStr);
                 if (data?._notFound) {
                     // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects
-                    throw notFound({
+                    throw notFound(forwardNotFoundPayload ? {
                         data: {
                             routeKey: data.routeKey,
                             rscPayload: data.rscPayload
                         }
-                    });
+                    } : undefined);
                 }
                 return data;
             },
@@ -76,33 +52,29 @@ function AdminNotFound(props) {
         loaderDeps: ({ search })=>({
                 searchKey: JSON.stringify(search)
             }),
-        notFoundComponent: AdminNotFound,
         validateSearch: (search)=>search
-    };
+    });
+/**
+ * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's
+ * server-built NotFound page (shipped via the `notFound()` error's
+ * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare
+ * client view.
+ */ export function payloadAdminSplatRoute({ load }) {
+    return adminRouteOptions({
+        forwardNotFoundPayload: true,
+        load,
+        resolveSplat: (params)=>params._splat ?? ''
+    });
 }
 /**
- * Route options for the admin index route (`/_payload/admin/`). Same loader as the
- * splat route but throws a bare `notFound()` (no rscPayload) on miss.
+ * Route options for the admin index route (`/_payload/admin/`). Not-found
+ * results omit the RSC payload and fall back to `NotFoundClient`.
  */ export function payloadAdminIndexRoute({ load }) {
-    return {
-        component: AdminPage,
-        head: ({ loaderData })=>getAdminMeta(loaderData?.metadata),
-        loader: {
-            handler: async ({ location })=>{
-                const data = await runLoader(load, '', location.searchStr);
-                if (data?._notFound) {
-                    // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects
-                    throw notFound();
-                }
-                return data;
-            },
-            staleReloadMode: 'blocking'
-        },
-        loaderDeps: ({ search })=>({
-                searchKey: JSON.stringify(search)
-            }),
-        validateSearch: (search)=>search
-    };
+    return adminRouteOptions({
+        forwardNotFoundPayload: false,
+        load,
+        resolveSplat: ()=>''
+    });
 }
 
-//# sourceMappingURL=adminRoutes.js.map
+//# sourceMappingURL=index.js.map

package/dist/adapters/views/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/adapters/views/index.tsx"],"sourcesContent":["'use client'\n\nimport { lazyRouteComponent, notFound, redirect } from '@tanstack/react-router'\n\nimport { getAdminMeta } from '../metadata.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\n// The admin UI loads with the admin routes only, so front-end routes never download it. The\n// router preloads lazy route components before rendering, so admin pages don't flash.\nconst AdminPage = lazyRouteComponent(() => import('./lazy.js'), 'AdminPage')\nconst AdminNotFound = lazyRouteComponent(() => import('./lazy.js'), 'AdminNotFound')\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":["lazyRouteComponent","notFound","redirect","getAdminMeta","searchToRecord","searchStr","Object","fromEntries","URLSearchParams","runLoader","load","splat","data","_splat","search","_redirect","to","AdminPage","AdminNotFound","adminRouteOptions","forwardNotFoundPayload","resolveSplat","component","head","loaderData","metadata","notFoundComponent","loader","handler","location","params","_notFound","routeKey","rscPayload","undefined","staleReloadMode","loaderDeps","searchKey","JSON","stringify","validateSearch","payloadAdminSplatRoute","payloadAdminIndexRoute"],"mappings":"AAAA;AAEA,SAASA,kBAAkB,EAAEC,QAAQ,EAAEC,QAAQ,QAAQ,yBAAwB;AAE/E,SAASC,YAAY,QAAQ,iBAAgB;AAW7C,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,MAAMb,SAAS;YAAEc,IAAIJ,KAAKG,SAAS;QAAC;IACtC;IACA,OAAOH;AACT;AAEA,4FAA4F;AAC5F,sFAAsF;AACtF,MAAMK,YAAYjB,mBAAmB,IAAM,MAAM,CAAC,cAAc;AAChE,MAAMkB,gBAAgBlB,mBAAmB,IAAM,MAAM,CAAC,cAAc;AAEpE,MAAMmB,oBAAoB,CAAC,EACzBC,sBAAsB,EACtBV,IAAI,EACJW,YAAY,EAWb,GAAM,CAAA;QACLC,WAAWL;QACXM,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAKrB,aAAaqB,YAAYC;QACzE,qEAAqE;QACrE,mDAAmD;QACnDC,mBAAmBR;QACnB,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DS,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMlB,OAAO,MAAMH,UAAUC,MAAMW,aAAaS,SAASD,SAASxB,SAAS;gBAC3E,IAAIO,MAAMmB,WAAW;oBACnB,qHAAqH;oBACrH,MAAM9B,SACJmB,yBACI;wBAAER,MAAM;4BAAEoB,UAAUpB,KAAKoB,QAAQ;4BAAEC,YAAYrB,KAAKqB,UAAU;wBAAC;oBAAE,IACjEC;gBAER;gBACA,OAAOtB;YACT;YACAuB,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAEtB,MAAM,EAAuC,GAAM,CAAA;gBAChEuB,WAAWC,KAAKC,SAAS,CAACzB;YAC5B,CAAA;QACA0B,gBAAgB,CAAC1B,SAAoCA;IACvD,CAAA;AAEA;;;;;CAKC,GACD,OAAO,SAAS2B,uBAAuB,EAAE/B,IAAI,EAAuB;IAClE,OAAOS,kBAAkB;QACvBC,wBAAwB;QACxBV;QACAW,cAAc,CAACS,SAAWA,OAAOjB,MAAM,IAAI;IAC7C;AACF;AAEA;;;CAGC,GACD,OAAO,SAAS6B,uBAAuB,EAAEhC,IAAI,EAAuB;IAClE,OAAOS,kBAAkB;QACvBC,wBAAwB;QACxBV;QACAW,cAAc,IAAM;IACtB;AACF"}

package/dist/adapters/views/lazy.d.ts

@@ -0,0 +1,4 @@
+import type { NotFoundRouteProps } from '@tanstack/react-router';
+export declare function AdminPage(): import("react").JSX.Element;
+export declare function AdminNotFound({ data }: NotFoundRouteProps): import("react").JSX.Element;
+//# sourceMappingURL=lazy.d.ts.map

package/dist/adapters/views/lazy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/adapters/views/lazy.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAMhE,wBAAgB,SAAS,gCAuBxB;AAID,wBAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,kBAAkB,+BAOzD"}

package/dist/adapters/views/lazy.js

@@ -0,0 +1,43 @@
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { NotFoundClient, useRouteTransition } from '@payloadcms/ui';
+import { useLoaderData } from '@tanstack/react-router';
+import { Fragment, useDeferredValue, useEffect } from 'react';
+export function AdminPage() {
+    // Note: React key intentionally omitted here so the persistent template (nav, header) doesn't remount and flash on navigation.
+    // The per-route view key is attached server-side to the view subtree instead, via `renderRoot`'s `key` in `loadAdminPage`.
+    const data = useLoaderData({
+        strict: false
+    });
+    // Route state comes from an external store, so a new RSC payload that suspends
+    // on code-split client references can reveal the router's null fallback.
+    // Keep the current payload painted until the next one is renderable.
+    const rscPayload = useDeferredValue(data?.rscPayload);
+    const { holdRouteTransition } = useRouteTransition();
+    const isRscPayloadDeferred = rscPayload !== data?.rscPayload;
+    useEffect(()=>{
+        if (!isRscPayloadDeferred) {
+            return;
+        }
+        const releaseRouteTransition = holdRouteTransition();
+        return ()=>releaseRouteTransition();
+    }, [
+        holdRouteTransition,
+        isRscPayloadDeferred
+    ]);
+    return /*#__PURE__*/ _jsx(Fragment, {
+        children: rscPayload
+    });
+}
+export function AdminNotFound({ data }) {
+    // TanStack exposes not-found data as unknown; this route only receives the shape thrown below.
+    const { routeKey, rscPayload } = data ?? {};
+    if (!rscPayload) {
+        return /*#__PURE__*/ _jsx(NotFoundClient, {});
+    }
+    return /*#__PURE__*/ _jsx(Fragment, {
+        children: rscPayload
+    }, routeKey);
+}
+
+//# sourceMappingURL=lazy.js.map

package/dist/adapters/views/lazy.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/adapters/views/lazy.tsx"],"sourcesContent":["'use client'\n\nimport type { NotFoundRouteProps } from '@tanstack/react-router'\n\nimport { NotFoundClient, useRouteTransition } from '@payloadcms/ui'\nimport { useLoaderData } from '@tanstack/react-router'\nimport { Fragment, type ReactNode, useDeferredValue, useEffect } from 'react'\n\nexport function 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\nexport function 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"],"names":["NotFoundClient","useRouteTransition","useLoaderData","Fragment","useDeferredValue","useEffect","AdminPage","data","strict","rscPayload","holdRouteTransition","isRscPayloadDeferred","releaseRouteTransition","AdminNotFound","routeKey"],"mappings":"AAAA;;AAIA,SAASA,cAAc,EAAEC,kBAAkB,QAAQ,iBAAgB;AACnE,SAASC,aAAa,QAAQ,yBAAwB;AACtD,SAASC,QAAQ,EAAkBC,gBAAgB,EAAEC,SAAS,QAAQ,QAAO;AAE7E,OAAO,SAASC;IACd,+HAA+H;IAC/H,2HAA2H;IAC3H,MAAMC,OAAOL,cAAc;QAAEM,QAAQ;IAAM;IAE3C,+EAA+E;IAC/E,yEAAyE;IACzE,qEAAqE;IACrE,MAAMC,aAAaL,iBAAiBG,MAAME;IAC1C,MAAM,EAAEC,mBAAmB,EAAE,GAAGT;IAChC,MAAMU,uBAAuBF,eAAeF,MAAME;IAElDJ,UAAU;QACR,IAAI,CAACM,sBAAsB;YACzB;QACF;QAEA,MAAMC,yBAAyBF;QAE/B,OAAO,IAAME;IACf,GAAG;QAACF;QAAqBC;KAAqB;IAE9C,qBAAO,KAACR;kBAAUM;;AACpB;AAIA,OAAO,SAASI,cAAc,EAAEN,IAAI,EAAsB;IACxD,+FAA+F;IAC/F,MAAM,EAAEO,QAAQ,EAAEL,UAAU,EAAE,GAAIF,QAAQ,CAAC;IAC3C,IAAI,CAACE,YAAY;QACf,qBAAO,KAACT;IACV;IACA,qBAAO,KAACG;kBAAyBM;OAAXK;AACxB"}

package/dist/{utilities/loadAdminPage.d.ts → adapters/views/server.d.ts}

@@ -1,15 +1,17 @@
+import type { RenderableServerComponent } from '@tanstack/react-start/rsc';
 import type { ImportMap, SanitizedConfig } from 'payload';
-import type { AdminPageMetadata } from './meta.js';
+import type { AdminPageMetadata } from '../metadata.js';
 export type LoadAdminPageArgs = {
     config: SanitizedConfig;
     importMap: ImportMap;
     search?: Record<string, string | string[]>;
     splat?: string;
 };
+type RSCPayload = RenderableServerComponent<React.ReactElement>;
 export type LoadAdminPageResult = {
     _notFound: true;
     routeKey?: string;
-    rscPayload?: React.ReactNode;
+    rscPayload?: RSCPayload;
 } | {
     _redirect: string;
 } | {
@@ -26,15 +28,15 @@ export type LoadAdminPageResult = {
      * so search-only changes (e.g. list-view filtering) reconcile in place.
      */
     routeKey: string;
-    rscPayload: React.ReactNode;
+    rscPayload: RSCPayload;
 };
 /**
  * Renders an admin page for TanStack Start and returns a serializable loader
  * result. The framework adapter wraps this in a `createServerFn` that supplies
  * the app's `config` and generated `importMap`.
  *
- *   1. Initializes the Payload request via the shared `renderRoot` orchestrator
- *      from `@payloadcms/ui`, passing a TanStack-bound `initReq`. The injected
+ *   1. Gets the Payload admin context via the shared `renderRoot` orchestrator
+ *      from `@payloadcms/ui`, passing a TanStack-bound `initAdminContext`. The injected
  *      page-render `ServerAdapter` records navigation intent and throws the
  *      framework-agnostic error contract.
  *   2. Pipes the resulting React server tree through `renderServerComponent`
@@ -51,4 +53,5 @@ export type LoadAdminPageResult = {
  *   so it's read from the `nav` holder after `renderServerComponent` resolves.
  */
 export declare function loadAdminPage({ config, importMap, search, splat, }: LoadAdminPageArgs): Promise<LoadAdminPageResult>;
-//# sourceMappingURL=loadAdminPage.d.ts.map
+export {};
+//# sourceMappingURL=server.d.ts.map

package/dist/adapters/views/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/adapters/views/server.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAOvD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,UAAU,GAAG,yBAAyB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;AAE/D,MAAM,MAAM,mBAAmB,GAC3B;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,UAAU,CAAA;CAAE,GAC/D;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACrB;IACE,QAAQ,EAAE,iBAAiB,CAAA;IAC3B;;;;;;;;;;OAUG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAEL;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,aAAa,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,GACN,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA+IlD"}

package/dist/{utilities/loadAdminPage.js → adapters/views/server.js}

@@ -1,74 +1,16 @@
 import { getViewportContent } from '@payloadcms/ui/shared';
 import { renderServerComponent } from '@tanstack/react-start/rsc';
-import { getRequestI18n } from './getRequestI18n.server.js';
-import { initReq } from './initReq.server.js';
-import { createPageRenderServerAdapter } from './serverAdapter.server.js';
-const resolveTitle = (title)=>{
-    if (!title) {
-        return undefined;
-    }
-    if (typeof title === 'string') {
-        return title;
-    }
-    if ('absolute' in title) {
-        return title.absolute;
-    }
-    return title.default;
-};
-/**
- * Flattens the framework-agnostic `MetaConfig` (Next.js `Metadata` shape) into
- * the plain, serializable `AdminPageMetadata` the route loader ships to the
- * client. The full `MetaConfig` carries a `URL` `metadataBase`, functions and
- * other non-serializable values that seroval cannot cross the wire, so only the
- * fields `getAdminMeta` renders are extracted.
- */ const toAdminPageMetadata = (meta)=>{
-    const og = meta.openGraph;
-    const rawImages = og?.images;
-    const imagesArray = rawImages ? Array.isArray(rawImages) ? rawImages : [
-        rawImages
-    ] : [];
-    const images = imagesArray.map((image)=>typeof image === 'string' ? {
-            url: image
-        } : image?.url ? {
-            alt: image.alt,
-            height: image.height,
-            url: String(image.url),
-            width: image.width
-        } : undefined).filter(Boolean);
-    const rawIcons = meta.icons;
-    const iconList = Array.isArray(rawIcons) ? rawIcons : rawIcons && typeof rawIcons === 'object' && Array.isArray(rawIcons.icon) ? rawIcons.icon : [];
-    const icons = iconList.map((icon)=>typeof icon === 'string' ? {
-            rel: 'icon',
-            url: icon
-        } : icon?.url ? {
-            type: icon.type,
-            media: icon.media,
-            rel: icon.rel ?? 'icon',
-            sizes: icon.sizes,
-            url: String(icon.url)
-        } : undefined).filter(Boolean);
-    const keywords = meta.keywords;
-    return {
-        description: typeof meta.description === 'string' ? meta.description : undefined,
-        icons: icons?.length ? icons : undefined,
-        keywords: typeof keywords === 'string' ? keywords : Array.isArray(keywords) ? keywords.join(', ') : undefined,
-        openGraph: og ? {
-            description: typeof og.description === 'string' ? og.description : undefined,
-            images: images?.length ? images : undefined,
-            siteName: typeof og.siteName === 'string' ? og.siteName : undefined,
-            title: typeof og.title === 'string' ? og.title : undefined
-        } : undefined,
-        robots: typeof meta.robots === 'string' ? meta.robots : undefined,
-        title: resolveTitle(meta.title)
-    };
-};
+import { getRequestI18n } from '../../utilities/getRequestI18n.server.js';
+import { initAdminContext } from '../../utilities/initAdminContext.server.js';
+import { toAdminPageMetadata } from '../metadata.js';
+import { createPageRenderServerAdapter } from '../server.js';
 /**
  * Renders an admin page for TanStack Start and returns a serializable loader
  * result. The framework adapter wraps this in a `createServerFn` that supplies
  * the app's `config` and generated `importMap`.
  *
- *   1. Initializes the Payload request via the shared `renderRoot` orchestrator
- *      from `@payloadcms/ui`, passing a TanStack-bound `initReq`. The injected
+ *   1. Gets the Payload admin context via the shared `renderRoot` orchestrator
+ *      from `@payloadcms/ui`, passing a TanStack-bound `initAdminContext`. The injected
  *      page-render `ServerAdapter` records navigation intent and throws the
  *      framework-agnostic error contract.
  *   2. Pipes the resulting React server tree through `renderServerComponent`
@@ -101,29 +43,20 @@ const resolveTitle = (title)=>{
     const nav = {};
     const pageServerAdapter = createPageRenderServerAdapter(nav);
     let userAgent;
-    // `renderRoot` calls `initReq` itself with its own overrides (query
+    // `renderRoot` calls `initAdminContext` itself with its own overrides (query
     // re-nesting, `urlSuffix`, `fallbackLocale`). Forward them, injecting the
     // page-render `ServerAdapter` so `req.server.redirect()` / `.notFound()`
     // is recorded + thrown rather than escaping as raw TanStack nav.
-    const boundInitReq = async (args)=>{
-        const result = await initReq({
+    const boundInitAdminContext = async (args)=>{
+        const result = await initAdminContext({
             configPromise: args.configPromise,
             importMap: args.importMap,
             overrides: args.overrides,
             serverAdapter: pageServerAdapter
         });
-        userAgent = result.headers.get('user-agent') ?? undefined;
+        userAgent = result.req.headers.get('user-agent') ?? undefined;
         return result;
     };
-    const notFound = ()=>{
-        nav.type = 'notFound';
-        throw new Error('not-found');
-    };
-    const redirect = (url)=>{
-        nav.type = 'redirect';
-        nav.url = url;
-        throw new Error(`redirect:${url}`);
-    };
     // Build the 404 result the route loader re-throws as TanStack `notFound()`.
     //
     // Throwing `notFound()` is the only way to set the SSR document status to 404
@@ -142,11 +75,7 @@ const resolveTitle = (title)=>{
         const notFoundNode = await renderNotFoundPage({
             config: Promise.resolve(config),
             importMap,
-            initReq: (args)=>initReq({
-                    configPromise: args.configPromise,
-                    importMap: args.importMap,
-                    overrides: args.overrides
-                }),
+            initAdminContext,
             params: Promise.resolve({
                 segments: splatSegments
             }),
@@ -164,14 +93,15 @@ const resolveTitle = (title)=>{
             adminViews: defaultAdminViews,
             config: Promise.resolve(config),
             importMap,
-            initReq: boundInitReq,
-            notFound,
+            initAdminContext: boundInitAdminContext,
+            key: splat ?? '',
+            notFound: pageServerAdapter.notFound,
             // `segments` is intentionally `undefined` for the admin root (`/admin`),
             // matching Next's optional catch-all; `renderRoot` handles it at runtime.
             params: Promise.resolve({
                 segments
             }),
-            redirect,
+            redirect: pageServerAdapter.redirect,
             searchParams: Promise.resolve(searchParams)
         });
         const rscPayload = await renderServerComponent(node);
@@ -236,4 +166,4 @@ const resolveTitle = (title)=>{
     }
 }
 
-//# sourceMappingURL=loadAdminPage.js.map
+//# sourceMappingURL=server.js.map

package/dist/adapters/views/server.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/adapters/views/server.tsx"],"sourcesContent":["import type { RenderableServerComponent } from '@tanstack/react-start/rsc'\nimport type { ImportMap, SanitizedConfig } from 'payload'\n\nimport { getViewportContent } from '@payloadcms/ui/shared'\nimport { renderServerComponent } from '@tanstack/react-start/rsc'\n\nimport type { AdminPageMetadata } from '../metadata.js'\n\nimport { getRequestI18n } from '../../utilities/getRequestI18n.server.js'\nimport { initAdminContext } from '../../utilities/initAdminContext.server.js'\nimport { toAdminPageMetadata } from '../metadata.js'\nimport { createPageRenderServerAdapter } from '../server.js'\n\nexport type LoadAdminPageArgs = {\n  config: SanitizedConfig\n  importMap: ImportMap\n  search?: Record<string, string | string[]>\n  splat?: string\n}\n\ntype RSCPayload = RenderableServerComponent<React.ReactElement>\n\nexport type LoadAdminPageResult =\n  | { _notFound: true; routeKey?: string; rscPayload?: RSCPayload }\n  | { _redirect: string }\n  | {\n      metadata: AdminPageMetadata\n      /**\n       * Stable identity for this rendered route (the splat, i.e. the path\n       * after `/admin/`). The client keys the rendered subtree by this so the\n       * view remounts exactly when a new payload arrives. Keying by\n       * `location.pathname` instead races: the pathname updates before\n       * `useLoaderData()` during a transition, so the subtree would remount\n       * with the *previous* payload and then reconcile the fresh payload in\n       * place — leaving client providers (DocumentInfo, etc.) holding stale\n       * `useState` values from the prior document. Search params are excluded\n       * so search-only changes (e.g. list-view filtering) reconcile in place.\n       */\n      routeKey: string\n      rscPayload: RSCPayload\n    }\n\n/**\n * Renders an admin page for TanStack Start and returns a serializable loader\n * result. The framework adapter wraps this in a `createServerFn` that supplies\n * the app's `config` and generated `importMap`.\n *\n *   1. Gets the Payload admin context via the shared `renderRoot` orchestrator\n *      from `@payloadcms/ui`, passing a TanStack-bound `initAdminContext`. The injected\n *      page-render `ServerAdapter` records navigation intent and throws the\n *      framework-agnostic error contract.\n *   2. Pipes the resulting React server tree through `renderServerComponent`\n *      to produce a Flight payload the client consumes directly.\n *   3. Resolves page metadata via the same shared `generatePageMetadata`\n *      Next.js uses, returning plain serializable strings for `head()`.\n *\n * Navigation surfaces two ways and both become a `_notFound` / `_redirect`\n * sentinel the route loader re-throws as native TanStack nav:\n * - thrown during `renderRoot` orchestration (e.g. the login redirect) → caught\n *   by the try/catch below;\n * - thrown deep inside a streamed view component (e.g. `DocumentView` access\n *   denied, `LoginView` already-authenticated) → swallowed into the RSC stream,\n *   so it's read from the `nav` holder after `renderServerComponent` resolves.\n */\nexport async function loadAdminPage({\n  config,\n  importMap,\n  search,\n  splat,\n}: LoadAdminPageArgs): Promise<LoadAdminPageResult> {\n  const { renderRoot } = await import('@payloadcms/ui/views/Root')\n  const { defaultAdminViews } = await import('@payloadcms/ui/views/Root/adminViews')\n  const { generatePageMetadata } = await import('@payloadcms/ui/views/Root/generatePageMetadata')\n\n  const splatSegments = splat ? splat.split('/').filter(Boolean) : []\n  // Match Next's optional-catch-all behavior: the admin root (`/admin`) has no\n  // segments. Passing an empty array makes the shared `renderRoot` build\n  // `currentRoute` as `/admin/` (trailing slash), which no longer equals\n  // `adminRoute` and causes `handleAuthRedirect` to append `?redirect=/admin/`.\n  // Passing `undefined` yields `currentRoute = /admin`, so the unauthenticated\n  // redirect lands on a clean `/admin/login`.\n  const segments = splatSegments.length > 0 ? splatSegments : undefined\n  const searchParams = search ?? {}\n\n  // Records navigation requested via `req.server.*` (including throws swallowed\n  // by RSC streaming deep inside view components). Read after the render.\n  const nav: { type?: 'notFound' | 'redirect'; url?: string } = {}\n  const pageServerAdapter = createPageRenderServerAdapter(nav)\n  let userAgent: string | undefined\n\n  // `renderRoot` calls `initAdminContext` itself with its own overrides (query\n  // re-nesting, `urlSuffix`, `fallbackLocale`). Forward them, injecting the\n  // page-render `ServerAdapter` so `req.server.redirect()` / `.notFound()`\n  // is recorded + thrown rather than escaping as raw TanStack nav.\n  const boundInitAdminContext: Parameters<typeof renderRoot>[0]['initAdminContext'] = async (\n    args,\n  ) => {\n    const result = await initAdminContext({\n      configPromise: args.configPromise,\n      importMap: args.importMap,\n      overrides: args.overrides,\n      serverAdapter: pageServerAdapter,\n    })\n    userAgent = result.req.headers.get('user-agent') ?? undefined\n    return result\n  }\n\n  // Build the 404 result the route loader re-throws as TanStack `notFound()`.\n  //\n  // Throwing `notFound()` is the only way to set the SSR document status to 404\n  // (it's read from `router.stores.statusCode`, set by a not-found match — NOT\n  // from `setResponseStatus`, which only affects the RSC RPC response). But the\n  // matching `notFoundComponent` is a client component with no access to the\n  // Payload `req`, so it can't build the admin chrome on its own. To match Next\n  // (whose not-found route renders the full admin layout — nav sidebar, etc. —\n  // around the NotFound body, see `renderNotFoundPage`), we render that same\n  // shared `renderNotFoundPage` tree here, server-side, and ship its Flight\n  // payload through the `notFound()` error so the client renders it verbatim.\n  // For users without admin access `renderNotFoundPage` returns the bare\n  // `NotFoundClient`, preserving the access-denied behavior.\n  const renderNotFound = async (): Promise<LoadAdminPageResult> => {\n    const { renderNotFoundPage } = await import('@payloadcms/ui/views/NotFound/page')\n\n    const notFoundNode = await renderNotFoundPage({\n      config: Promise.resolve(config),\n      importMap,\n      initAdminContext,\n      params: Promise.resolve({ segments: splatSegments }),\n      searchParams: Promise.resolve(searchParams),\n    })\n\n    const rscPayload = await renderServerComponent(notFoundNode as React.ReactElement)\n\n    return { _notFound: true, routeKey: splat ?? '', rscPayload }\n  }\n\n  try {\n    const node = await renderRoot({\n      adminViews: defaultAdminViews,\n      config: Promise.resolve(config),\n      importMap,\n      initAdminContext: boundInitAdminContext,\n      key: splat ?? '',\n      notFound: pageServerAdapter.notFound,\n      // `segments` is intentionally `undefined` for the admin root (`/admin`),\n      // matching Next's optional catch-all; `renderRoot` handles it at runtime.\n      params: Promise.resolve({ segments }) as Parameters<typeof renderRoot>[0]['params'],\n      redirect: pageServerAdapter.redirect,\n      searchParams: Promise.resolve(searchParams),\n    })\n\n    const rscPayload = await renderServerComponent(node as React.ReactElement)\n\n    // The server-function (client-nav RPC) path returns the flight stream unread —\n    // unlike the router/SSR path, which awaits a decode that drives the render to\n    // completion. So streamed side effects (e.g. DocumentView's autosave-create\n    // `server.redirect()`) haven't run yet and `nav` is empty. Buffer the stream to\n    // completion to force the render (populating `nav`), then hand the client a fresh\n    // replayable stream from that buffer.\n    if (!nav.type) {\n      const wrapper = (\n        rscPayload as unknown as Record<\n          symbol,\n          { createReplayStream?: () => ReadableStream<Uint8Array> } | undefined\n        >\n      )[Symbol.for('tanstack.rsc.stream')]\n      if (typeof wrapper?.createReplayStream === 'function') {\n        const buffer = await new Response(wrapper.createReplayStream()).arrayBuffer()\n        wrapper.createReplayStream = () => new Response(buffer).body as ReadableStream<Uint8Array>\n      }\n    }\n\n    // Navigation thrown deep inside a streamed view component (e.g. access\n    // denied → notFound, already-authenticated → redirect) is swallowed into\n    // the RSC stream and never rejects the render. Honor it from the holder,\n    // discarding the (broken) payload from the aborted render.\n    if (nav.type === 'redirect' && nav.url) {\n      return { _redirect: nav.url }\n    }\n    if (nav.type === 'notFound') {\n      return await renderNotFound()\n    }\n\n    // Resolve metadata through the same shared generator Next.js uses. Only\n    // plain strings cross the wire (the full `MetaConfig` carries a `URL`\n    // `metadataBase` and icons that seroval cannot serialize).\n    const i18n = await getRequestI18n({ config })\n    const meta = await generatePageMetadata({\n      adminViews: defaultAdminViews as Parameters<typeof generatePageMetadata>[0]['adminViews'],\n      config,\n      i18n,\n      params: { segments },\n    })\n\n    return {\n      metadata: {\n        ...toAdminPageMetadata(meta),\n        viewport: getViewportContent(userAgent),\n      },\n      routeKey: splat ?? '',\n      rscPayload,\n    }\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err)\n    if (nav.type === 'notFound' || message === 'not-found') {\n      return await renderNotFound()\n    }\n    if (nav.type === 'redirect' || message.startsWith('redirect:')) {\n      return { _redirect: nav.url ?? message.slice('redirect:'.length) }\n    }\n    throw err\n  }\n}\n"],"names":["getViewportContent","renderServerComponent","getRequestI18n","initAdminContext","toAdminPageMetadata","createPageRenderServerAdapter","loadAdminPage","config","importMap","search","splat","renderRoot","defaultAdminViews","generatePageMetadata","splatSegments","split","filter","Boolean","segments","length","undefined","searchParams","nav","pageServerAdapter","userAgent","boundInitAdminContext","args","result","configPromise","overrides","serverAdapter","req","headers","get","renderNotFound","renderNotFoundPage","notFoundNode","Promise","resolve","params","rscPayload","_notFound","routeKey","node","adminViews","key","notFound","redirect","type","wrapper","Symbol","for","createReplayStream","buffer","Response","arrayBuffer","body","url","_redirect","i18n","meta","metadata","viewport","err","message","Error","String","startsWith","slice"],"mappings":"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"}

package/dist/auth/login.d.ts

@@ -1,17 +1,4 @@
-import type { AuthCollectionSlug, LoginResult, MaybePromise, SanitizedConfig } from 'payload';
-type LoginWithEmail = {
-    email: string;
-    username?: never;
-};
-type LoginWithUsername = {
-    email?: never;
-    username: string;
-};
-type LoginArgs = {
-    collection: AuthCollectionSlug;
-    config: MaybePromise<SanitizedConfig>;
-    password: string;
-} & (LoginWithEmail | LoginWithUsername);
-export declare function login<TSlug extends AuthCollectionSlug>({ collection, config, email, password, username, }: LoginArgs): Promise<LoginResult<TSlug>>;
-export {};
+import type { AuthCollectionSlug, LoginResult } from 'payload';
+import { type LoginArgsWithoutServerAdapter } from 'payload/auth';
+export declare function login<TSlug extends AuthCollectionSlug>(args: LoginArgsWithoutServerAdapter<TSlug>): Promise<LoginResult<TSlug>>;
 //# sourceMappingURL=login.d.ts.map

package/dist/auth/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAM7F,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,CAAA;CACjB,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,kBAAkB,CAAA;IAC9B,MAAM,EAAE,YAAY,CAAC,eAAe,CAAC,CAAA;IACrC,QAAQ,EAAE,MAAM,CAAA;CACjB,GAAG,CAAC,cAAc,GAAG,iBAAiB,CAAC,CAAA;AAExC,wBAAsB,KAAK,CAAC,KAAK,SAAS,kBAAkB,EAAE,EAC5D,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,EACR,QAAQ,GACT,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CA6CzC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAE9D,OAAO,EAAkB,KAAK,6BAA6B,EAAoB,MAAM,cAAc,CAAA;AAInG,wBAAsB,KAAK,CAAC,KAAK,SAAS,kBAAkB,EAC1D,IAAI,EAAE,6BAA6B,CAAC,KAAK,CAAC,GACzC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAE7B"}

package/dist/auth/login.js

@@ -1,50 +1,10 @@
-import { getPayload } from 'payload';
-import { setPayloadAuthCookie } from '../utilities/setPayloadAuthCookie.js';
-export async function login({ collection, config, email, password, username }) {
-    const payload = await getPayload({
-        config
+import { login as loginFn } from 'payload/auth';
+import { tanstackServerAdapter } from '../adapters/server.js';
+export async function login(args) {
+    return loginFn({
+        ...args,
+        serverAdapter: tanstackServerAdapter
     });
-    const authConfig = payload.collections[collection]?.config.auth;
-    if (!authConfig) {
-        throw new Error(`No auth config found for collection: ${collection}`);
-    }
-    const loginWithUsername = authConfig?.loginWithUsername ?? false;
-    if (loginWithUsername) {
-        if (loginWithUsername.allowEmailLogin) {
-            if (!email && !username) {
-                throw new Error('Email or username is required.');
-            }
-        } else {
-            if (!username) {
-                throw new Error('Username is required.');
-            }
-        }
-    } else {
-        if (!email) {
-            throw new Error('Email is required.');
-        }
-    }
-    const result = await payload.login({
-        collection,
-        data: loginWithUsername ? username ? {
-            password,
-            username
-        } : {
-            email,
-            password
-        } : {
-            email,
-            password
-        }
-    });
-    if (result.token) {
-        setPayloadAuthCookie({
-            authConfig,
-            cookiePrefix: payload.config.cookiePrefix,
-            token: result.token
-        });
-    }
-    return result;
 }
 
 //# sourceMappingURL=login.js.map

package/dist/auth/login.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/auth/login.ts"],"sourcesContent":["import type { AuthCollectionSlug, LoginResult, MaybePromise, SanitizedConfig } from 'payload'\n\nimport { getPayload } from 'payload'\n\nimport { setPayloadAuthCookie } from '../utilities/setPayloadAuthCookie.js'\n\ntype LoginWithEmail = {\n  email: string\n  username?: never\n}\n\ntype LoginWithUsername = {\n  email?: never\n  username: string\n}\n\ntype LoginArgs = {\n  collection: AuthCollectionSlug\n  config: MaybePromise<SanitizedConfig>\n  password: string\n} & (LoginWithEmail | LoginWithUsername)\n\nexport async function login<TSlug extends AuthCollectionSlug>({\n  collection,\n  config,\n  email,\n  password,\n  username,\n}: LoginArgs): Promise<LoginResult<TSlug>> {\n  const payload = await getPayload({ config })\n\n  const authConfig = payload.collections[collection]?.config.auth\n\n  if (!authConfig) {\n    throw new Error(`No auth config found for collection: ${collection}`)\n  }\n\n  const loginWithUsername = authConfig?.loginWithUsername ?? false\n\n  if (loginWithUsername) {\n    if (loginWithUsername.allowEmailLogin) {\n      if (!email && !username) {\n        throw new Error('Email or username is required.')\n      }\n    } else {\n      if (!username) {\n        throw new Error('Username is required.')\n      }\n    }\n  } else {\n    if (!email) {\n      throw new Error('Email is required.')\n    }\n  }\n\n  const result = await payload.login({\n    collection,\n    data: (loginWithUsername\n      ? username\n        ? { password, username }\n        : { email, password }\n      : { email, password }) as { email: string; password: string },\n  })\n\n  if (result.token) {\n    setPayloadAuthCookie({\n      authConfig,\n      cookiePrefix: payload.config.cookiePrefix,\n      token: result.token,\n    })\n  }\n\n  return result as LoginResult<TSlug>\n}\n"],"names":["getPayload","setPayloadAuthCookie","login","collection","config","email","password","username","payload","authConfig","collections","auth","Error","loginWithUsername","allowEmailLogin","result","data","token","cookiePrefix"],"mappings":"AAEA,SAASA,UAAU,QAAQ,UAAS;AAEpC,SAASC,oBAAoB,QAAQ,uCAAsC;AAkB3E,OAAO,eAAeC,MAAwC,EAC5DC,UAAU,EACVC,MAAM,EACNC,KAAK,EACLC,QAAQ,EACRC,QAAQ,EACE;IACV,MAAMC,UAAU,MAAMR,WAAW;QAAEI;IAAO;IAE1C,MAAMK,aAAaD,QAAQE,WAAW,CAACP,WAAW,EAAEC,OAAOO;IAE3D,IAAI,CAACF,YAAY;QACf,MAAM,IAAIG,MAAM,CAAC,qCAAqC,EAAET,YAAY;IACtE;IAEA,MAAMU,oBAAoBJ,YAAYI,qBAAqB;IAE3D,IAAIA,mBAAmB;QACrB,IAAIA,kBAAkBC,eAAe,EAAE;YACrC,IAAI,CAACT,SAAS,CAACE,UAAU;gBACvB,MAAM,IAAIK,MAAM;YAClB;QACF,OAAO;YACL,IAAI,CAACL,UAAU;gBACb,MAAM,IAAIK,MAAM;YAClB;QACF;IACF,OAAO;QACL,IAAI,CAACP,OAAO;YACV,MAAM,IAAIO,MAAM;QAClB;IACF;IAEA,MAAMG,SAAS,MAAMP,QAAQN,KAAK,CAAC;QACjCC;QACAa,MAAOH,oBACHN,WACE;YAAED;YAAUC;QAAS,IACrB;YAAEF;YAAOC;QAAS,IACpB;YAAED;YAAOC;QAAS;IACxB;IAEA,IAAIS,OAAOE,KAAK,EAAE;QAChBhB,qBAAqB;YACnBQ;YACAS,cAAcV,QAAQJ,MAAM,CAACc,YAAY;YACzCD,OAAOF,OAAOE,KAAK;QACrB;IACF;IAEA,OAAOF;AACT"}
+{"version":3,"sources":["../../src/auth/login.ts"],"sourcesContent":["import type { AuthCollectionSlug, LoginResult } from 'payload'\n\nimport { type LoginArgs, type LoginArgsWithoutServerAdapter, login as loginFn } from 'payload/auth'\n\nimport { tanstackServerAdapter } from '../adapters/server.js'\n\nexport async function login<TSlug extends AuthCollectionSlug>(\n  args: LoginArgsWithoutServerAdapter<TSlug>,\n): Promise<LoginResult<TSlug>> {\n  return loginFn({ ...args, serverAdapter: tanstackServerAdapter } as LoginArgs<TSlug>)\n}\n"],"names":["login","loginFn","tanstackServerAdapter","args","serverAdapter"],"mappings":"AAEA,SAA6DA,SAASC,OAAO,QAAQ,eAAc;AAEnG,SAASC,qBAAqB,QAAQ,wBAAuB;AAE7D,OAAO,eAAeF,MACpBG,IAA0C;IAE1C,OAAOF,QAAQ;QAAE,GAAGE,IAAI;QAAEC,eAAeF;IAAsB;AACjE"}