@payloadcms/tanstack-start 4.0.0-internal.8001944 → 4.0.0-internal.8089ef7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/{layout.d.ts → layout/index.d.ts} +10 -10
- package/dist/adapters/layout/index.d.ts.map +1 -0
- package/dist/adapters/{layout.js → layout/index.js} +11 -17
- package/dist/adapters/layout/index.js.map +1 -0
- package/dist/adapters/layout/lazy.d.ts +11 -0
- package/dist/adapters/layout/lazy.d.ts.map +1 -0
- package/dist/adapters/layout/lazy.js +23 -0
- package/dist/adapters/layout/lazy.js.map +1 -0
- package/dist/adapters/{layout.server.d.ts → layout/server.d.ts} +2 -2
- package/dist/adapters/layout/server.d.ts.map +1 -0
- package/dist/adapters/{layout.server.js → layout/server.js} +9 -7
- package/dist/adapters/layout/server.js.map +1 -0
- package/dist/adapters/router.d.ts.map +1 -1
- package/dist/adapters/router.js +1 -2
- package/dist/adapters/router.js.map +1 -1
- package/dist/adapters/server.js +2 -2
- package/dist/adapters/server.js.map +1 -1
- package/dist/adapters/{views.d.ts → views/index.d.ts} +5 -9
- package/dist/adapters/views/index.d.ts.map +1 -0
- package/dist/adapters/{views.js → views/index.js} +7 -43
- package/dist/adapters/views/index.js.map +1 -0
- package/dist/adapters/views/lazy.d.ts +4 -0
- package/dist/adapters/views/lazy.d.ts.map +1 -0
- package/dist/adapters/views/lazy.js +43 -0
- package/dist/adapters/views/lazy.js.map +1 -0
- package/dist/adapters/{views.server.d.ts → views/server.d.ts} +2 -2
- package/dist/adapters/views/server.d.ts.map +1 -0
- package/dist/adapters/{views.server.js → views/server.js} +6 -6
- package/dist/adapters/views/server.js.map +1 -0
- package/dist/exports/client.d.ts +2 -3
- package/dist/exports/client.d.ts.map +1 -1
- package/dist/exports/client.js +2 -3
- package/dist/exports/client.js.map +1 -1
- package/dist/exports/layouts.d.ts +2 -2
- package/dist/exports/layouts.js +1 -1
- package/dist/exports/layouts.js.map +1 -1
- package/dist/exports/server.d.ts +1 -1
- package/dist/exports/server.js +1 -1
- package/dist/exports/server.js.map +1 -1
- package/dist/routes/graphql/handler.server.d.ts +0 -2
- package/dist/routes/graphql/handler.server.d.ts.map +1 -1
- package/dist/routes/graphql/handler.server.js +6 -3
- package/dist/routes/graphql/handler.server.js.map +1 -1
- package/dist/rsc/CollectionCards.js +1 -1
- package/dist/rsc/CollectionCards.js.map +1 -1
- package/dist/withPayload/index.d.ts +2 -10
- package/dist/withPayload/index.d.ts.map +1 -1
- package/dist/withPayload/index.js +4 -12
- package/dist/withPayload/index.js.map +1 -1
- package/package.json +10 -7
- package/dist/adapters/layout.d.ts.map +0 -1
- package/dist/adapters/layout.js.map +0 -1
- package/dist/adapters/layout.server.d.ts.map +0 -1
- package/dist/adapters/layout.server.js.map +0 -1
- package/dist/adapters/views.d.ts.map +0 -1
- package/dist/adapters/views.js.map +0 -1
- package/dist/adapters/views.server.d.ts.map +0 -1
- package/dist/adapters/views.server.js.map +0 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import { RootProviders } from '@payloadcms/ui/layouts/RootProviders';
|
|
1
|
+
import type { ServerFunctionClient } from 'payload';
|
|
3
2
|
import React from 'react';
|
|
4
|
-
import type { LoadLayoutDataResult } from './
|
|
3
|
+
import type { LoadLayoutDataResult } from './server.js';
|
|
5
4
|
export type PayloadAdminShellProps = {
|
|
6
5
|
readonly children: React.ReactNode;
|
|
7
6
|
};
|
|
@@ -47,20 +46,21 @@ export declare function withPayloadRoot(RootShell: React.ComponentType<{
|
|
|
47
46
|
*/
|
|
48
47
|
export type LayoutLoad = () => Promise<LoadLayoutDataResult>;
|
|
49
48
|
/**
|
|
50
|
-
* Route options for the Payload admin layout (`/_payload`).
|
|
51
|
-
* loader data onto `RootProviders` and renders the admin chrome (progress bar,
|
|
52
|
-
* custom-provider tree or router `<Outlet />`, portal mount). The app supplies
|
|
49
|
+
* Route options for the Payload admin layout (`/_payload`). The app supplies
|
|
53
50
|
* `load` (the layout-data server fn) and `serverFunction` (the server-function
|
|
54
51
|
* client wired into `RootProviders`); everything else is adapter-owned.
|
|
55
52
|
*/
|
|
56
53
|
export declare function payloadLayoutRoute({ load, serverFunction, }: {
|
|
57
54
|
load: LayoutLoad;
|
|
58
|
-
serverFunction:
|
|
55
|
+
serverFunction: ServerFunctionClient;
|
|
59
56
|
}): {
|
|
60
|
-
component:
|
|
57
|
+
component: {
|
|
58
|
+
(): React.JSX.Element;
|
|
59
|
+
preload: (() => Promise<void> | undefined) | undefined;
|
|
60
|
+
};
|
|
61
61
|
loader: {
|
|
62
|
-
handler: () => Promise<import("
|
|
62
|
+
handler: () => Promise<import("../../utilities/toSerializable.js").SerializableRecord>;
|
|
63
63
|
staleReloadMode: 'blocking';
|
|
64
64
|
};
|
|
65
65
|
};
|
|
66
|
-
//# sourceMappingURL=
|
|
66
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/layout/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAInD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAEvD,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,qBA+BrE;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;AAED;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAM5D;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,cAAc,GACf,EAAE;IACD,IAAI,EAAE,UAAU,CAAA;IAChB,cAAc,EAAE,oBAAoB,CAAA;CACrC;IAUG,SAAS;;;;IACT,MAAM;QAAI,OAAO;QAAgB,eAAe,EAAE,UAAU;;EAE/D"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
3
|
import { DocumentRoot } from '@payloadcms/ui/layouts/DocumentRoot';
|
|
4
|
-
import {
|
|
5
|
-
import { HeadContent, Outlet, Scripts, useLoaderData, useRouterState } from '@tanstack/react-router';
|
|
4
|
+
import { HeadContent, lazyRouteComponent, Scripts, useRouterState } from '@tanstack/react-router';
|
|
6
5
|
import React from 'react';
|
|
7
|
-
import { TanStackRouterAdapter } from './router.js';
|
|
8
6
|
/**
|
|
9
7
|
* The `<html>` document shell for Payload admin routes — the TanStack Start
|
|
10
8
|
* equivalent of `@payloadcms/next`'s root layout `<html>`. Sets
|
|
@@ -78,29 +76,25 @@ import { TanStackRouterAdapter } from './router.js';
|
|
|
78
76
|
});
|
|
79
77
|
};
|
|
80
78
|
}
|
|
79
|
+
// The admin UI loads with the admin routes only, so front-end routes never download it. The
|
|
80
|
+
// router preloads lazy route components before rendering, so admin pages don't flash.
|
|
81
|
+
const PayloadLayout = lazyRouteComponent(()=>import('./lazy.js'), 'PayloadLayout');
|
|
81
82
|
/**
|
|
82
|
-
* Route options for the Payload admin layout (`/_payload`).
|
|
83
|
-
* loader data onto `RootProviders` and renders the admin chrome (progress bar,
|
|
84
|
-
* custom-provider tree or router `<Outlet />`, portal mount). The app supplies
|
|
83
|
+
* Route options for the Payload admin layout (`/_payload`). The app supplies
|
|
85
84
|
* `load` (the layout-data server fn) and `serverFunction` (the server-function
|
|
86
85
|
* client wired into `RootProviders`); everything else is adapter-owned.
|
|
87
86
|
*/ export function payloadLayoutRoute({ load, serverFunction }) {
|
|
88
|
-
function
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
});
|
|
92
|
-
return /*#__PURE__*/ _jsx(RootProviders, {
|
|
93
|
-
data: data,
|
|
94
|
-
RouterAdapter: TanStackRouterAdapter,
|
|
95
|
-
serverFunction: serverFunction,
|
|
96
|
-
children: data.providers ?? /*#__PURE__*/ _jsx(Outlet, {})
|
|
87
|
+
function PayloadLayoutRoute() {
|
|
88
|
+
return /*#__PURE__*/ _jsx(PayloadLayout, {
|
|
89
|
+
serverFunction: serverFunction
|
|
97
90
|
});
|
|
98
91
|
}
|
|
92
|
+
PayloadLayoutRoute.preload = PayloadLayout.preload;
|
|
99
93
|
// `staleReloadMode` lives on the loader *object* — router-core only reads it
|
|
100
94
|
// off a non-function loader — so stale-match revalidation blocks on the fresh
|
|
101
95
|
// loader instead of flashing stale layout data via the default background SWR.
|
|
102
96
|
return {
|
|
103
|
-
component:
|
|
97
|
+
component: PayloadLayoutRoute,
|
|
104
98
|
loader: {
|
|
105
99
|
handler: ()=>load(),
|
|
106
100
|
staleReloadMode: 'blocking'
|
|
@@ -108,4 +102,4 @@ import { TanStackRouterAdapter } from './router.js';
|
|
|
108
102
|
};
|
|
109
103
|
}
|
|
110
104
|
|
|
111
|
-
//# sourceMappingURL=
|
|
105
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/adapters/layout/index.tsx"],"sourcesContent":["'use client'\nimport type { DocumentRootProps } from '@payloadcms/ui/layouts/DocumentRoot'\nimport type { RootLayoutData } from '@payloadcms/ui/layouts/Root/getRootLayoutData'\nimport type { ServerFunctionClient } from 'payload'\n\nimport { DocumentRoot } from '@payloadcms/ui/layouts/DocumentRoot'\nimport { HeadContent, lazyRouteComponent, Scripts, useRouterState } from '@tanstack/react-router'\nimport React from 'react'\n\nimport type { LoadLayoutDataResult } from './server.js'\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 shares document rendering and request preferences with Next's `RootLayout`.\n * A blocking script resolves the default theme from the browser preference before first paint.\n */\nexport function PayloadAdminShell({ children }: PayloadAdminShellProps) {\n const documentProps = useRouterState({\n select: (state): Partial<DocumentRootProps> => {\n for (const match of state.matches) {\n const data = match.loaderData as Partial<RootLayoutData> | undefined\n\n if (data?.theme && data?.languageCode) {\n return {\n dir: data.dir,\n highContrastMode: data.highContrastMode,\n languageCode: data.languageCode,\n suppressHydrationWarning: data.suppressHydrationWarning,\n theme: 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 { dir: 'ltr', suppressHydrationWarning: true, themeSource: 'default' }\n },\n })\n\n return (\n <DocumentRoot {...documentProps} head={<HeadContent />}>\n {children}\n <Scripts />\n </DocumentRoot>\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\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// 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 PayloadLayout = lazyRouteComponent(() => import('./lazy.js'), 'PayloadLayout')\n\n/**\n * Route options for the Payload admin layout (`/_payload`). The app supplies\n * `load` (the layout-data server fn) and `serverFunction` (the server-function\n * client wired into `RootProviders`); everything else is adapter-owned.\n */\nexport function payloadLayoutRoute({\n load,\n serverFunction,\n}: {\n load: LayoutLoad\n serverFunction: ServerFunctionClient\n}) {\n function PayloadLayoutRoute() {\n return <PayloadLayout serverFunction={serverFunction} />\n }\n PayloadLayoutRoute.preload = PayloadLayout.preload\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: PayloadLayoutRoute,\n loader: { handler: () => load(), staleReloadMode: 'blocking' as const },\n }\n}\n"],"names":["DocumentRoot","HeadContent","lazyRouteComponent","Scripts","useRouterState","React","PayloadAdminShell","children","documentProps","select","state","match","matches","data","loaderData","theme","languageCode","dir","highContrastMode","suppressHydrationWarning","themeSource","head","withPayloadRoot","RootShell","options","adminRoute","PayloadRootShell","isAdminRoute","s","pathname","location","startsWith","PayloadLayout","payloadLayoutRoute","load","serverFunction","PayloadLayoutRoute","preload","component","loader","handler","staleReloadMode"],"mappings":"AAAA;;AAKA,SAASA,YAAY,QAAQ,sCAAqC;AAClE,SAASC,WAAW,EAAEC,kBAAkB,EAAEC,OAAO,EAAEC,cAAc,QAAQ,yBAAwB;AACjG,OAAOC,WAAW,QAAO;AAQzB;;;;;;;CAOC,GACD,OAAO,SAASC,kBAAkB,EAAEC,QAAQ,EAA0B;IACpE,MAAMC,gBAAgBJ,eAAe;QACnCK,QAAQ,CAACC;YACP,KAAK,MAAMC,SAASD,MAAME,OAAO,CAAE;gBACjC,MAAMC,OAAOF,MAAMG,UAAU;gBAE7B,IAAID,MAAME,SAASF,MAAMG,cAAc;oBACrC,OAAO;wBACLC,KAAKJ,KAAKI,GAAG;wBACbC,kBAAkBL,KAAKK,gBAAgB;wBACvCF,cAAcH,KAAKG,YAAY;wBAC/BG,0BAA0BN,KAAKM,wBAAwB;wBACvDJ,OAAOF,KAAKE,KAAK;wBACjBK,aAAaP,KAAKO,WAAW,IAAI;oBACnC;gBACF;YACF;YAEA,yEAAyE;YACzE,oEAAoE;YACpE,wEAAwE;YACxE,OAAO;gBAAEH,KAAK;gBAAOE,0BAA0B;gBAAMC,aAAa;YAAU;QAC9E;IACF;IAEA,qBACE,MAACpB;QAAc,GAAGQ,aAAa;QAAEa,oBAAM,KAACpB;;YACrCM;0BACD,KAACJ;;;AAGP;AAWA;;;;;;;;;;;;CAYC,GACD,OAAO,SAASmB,gBACdC,SAA6D,EAC7DC,UAAkC,CAAC,CAAC;IAEpC,MAAM,EAAEC,aAAa,QAAQ,EAAE,GAAGD;IAElC,OAAO,SAASE,iBAAiB,EAAEnB,QAAQ,EAAiC;QAC1E,MAAMoB,eAAevB,eAAe;YAClCK,QAAQ,CAACmB;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,KAACrB;0BAAmBC;;QAC7B;QAEA,qBAAO,KAACgB;sBAAWhB;;IACrB;AACF;AASA,4FAA4F;AAC5F,sFAAsF;AACtF,MAAMyB,gBAAgB9B,mBAAmB,IAAM,MAAM,CAAC,cAAc;AAEpE;;;;CAIC,GACD,OAAO,SAAS+B,mBAAmB,EACjCC,IAAI,EACJC,cAAc,EAIf;IACC,SAASC;QACP,qBAAO,KAACJ;YAAcG,gBAAgBA;;IACxC;IACAC,mBAAmBC,OAAO,GAAGL,cAAcK,OAAO;IAElD,6EAA6E;IAC7E,8EAA8E;IAC9E,+EAA+E;IAC/E,OAAO;QACLC,WAAWF;QACXG,QAAQ;YAAEC,SAAS,IAAMN;YAAQO,iBAAiB;QAAoB;IACxE;AACF"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { ServerFunctionClient } from 'payload';
|
|
2
|
+
import React from 'react';
|
|
3
|
+
/**
|
|
4
|
+
* The admin layout route's component. Maps the layout loader data onto `RootProviders` and
|
|
5
|
+
* renders the admin chrome (progress bar, custom-provider tree or router `<Outlet />`, portal
|
|
6
|
+
* mount). `payloadLayoutRoute` loads it lazily, so front-end routes never download the admin UI.
|
|
7
|
+
*/
|
|
8
|
+
export declare function PayloadLayout({ serverFunction }: {
|
|
9
|
+
serverFunction: ServerFunctionClient;
|
|
10
|
+
}): React.JSX.Element;
|
|
11
|
+
//# sourceMappingURL=lazy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/adapters/layout/lazy.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAInD,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAAE,cAAc,EAAE,EAAE;IAAE,cAAc,EAAE,oBAAoB,CAAA;CAAE,qBAYzF"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
+
import { RootProviders } from '@payloadcms/ui';
|
|
4
|
+
import { Outlet, useLoaderData } from '@tanstack/react-router';
|
|
5
|
+
import React from 'react';
|
|
6
|
+
import { TanStackRouterAdapter } from '../router.js';
|
|
7
|
+
/**
|
|
8
|
+
* The admin layout route's component. Maps the layout loader data onto `RootProviders` and
|
|
9
|
+
* renders the admin chrome (progress bar, custom-provider tree or router `<Outlet />`, portal
|
|
10
|
+
* mount). `payloadLayoutRoute` loads it lazily, so front-end routes never download the admin UI.
|
|
11
|
+
*/ export function PayloadLayout({ serverFunction }) {
|
|
12
|
+
const data = useLoaderData({
|
|
13
|
+
strict: false
|
|
14
|
+
});
|
|
15
|
+
return /*#__PURE__*/ _jsx(RootProviders, {
|
|
16
|
+
data: data,
|
|
17
|
+
RouterAdapter: TanStackRouterAdapter,
|
|
18
|
+
serverFunction: serverFunction,
|
|
19
|
+
children: data.providers ?? /*#__PURE__*/ _jsx(Outlet, {})
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
//# sourceMappingURL=lazy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/adapters/layout/lazy.tsx"],"sourcesContent":["'use client'\nimport type { ServerFunctionClient } from 'payload'\n\nimport { RootProviders } from '@payloadcms/ui'\nimport { Outlet, useLoaderData } from '@tanstack/react-router'\nimport React from 'react'\n\nimport { TanStackRouterAdapter } from '../router.js'\n\n/**\n * The admin layout route's component. Maps the layout loader data onto `RootProviders` and\n * renders the admin chrome (progress bar, custom-provider tree or router `<Outlet />`, portal\n * mount). `payloadLayoutRoute` loads it lazily, so front-end routes never download the admin UI.\n */\nexport function PayloadLayout({ serverFunction }: { serverFunction: ServerFunctionClient }) {\n const data = useLoaderData({ strict: false })\n\n return (\n <RootProviders\n data={data}\n RouterAdapter={TanStackRouterAdapter}\n serverFunction={serverFunction}\n >\n {data.providers ?? <Outlet />}\n </RootProviders>\n )\n}\n"],"names":["RootProviders","Outlet","useLoaderData","React","TanStackRouterAdapter","PayloadLayout","serverFunction","data","strict","RouterAdapter","providers"],"mappings":"AAAA;;AAGA,SAASA,aAAa,QAAQ,iBAAgB;AAC9C,SAASC,MAAM,EAAEC,aAAa,QAAQ,yBAAwB;AAC9D,OAAOC,WAAW,QAAO;AAEzB,SAASC,qBAAqB,QAAQ,eAAc;AAEpD;;;;CAIC,GACD,OAAO,SAASC,cAAc,EAAEC,cAAc,EAA4C;IACxF,MAAMC,OAAOL,cAAc;QAAEM,QAAQ;IAAM;IAE3C,qBACE,KAACR;QACCO,MAAMA;QACNE,eAAeL;QACfE,gBAAgBA;kBAEfC,KAAKG,SAAS,kBAAI,KAACT;;AAG1B"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { RootLayoutData as UIRootLayoutData } from '@payloadcms/ui/layouts/Root/getRootLayoutData';
|
|
2
2
|
import type { ImportMap, SanitizedConfig } from 'payload';
|
|
3
3
|
import type { ReactNode } from 'react';
|
|
4
|
-
import type { SerializableRecord } from '
|
|
4
|
+
import type { SerializableRecord } from '../../utilities/toSerializable.js';
|
|
5
5
|
export type LoadLayoutDataResult = SerializableRecord;
|
|
6
6
|
export type RootLayoutData = {
|
|
7
7
|
/** Custom admin providers wrapping the Outlet, rendered to an RSC payload before serialization. */
|
|
@@ -26,4 +26,4 @@ export declare function loadLayoutData({ config, importMap, }: {
|
|
|
26
26
|
config: SanitizedConfig;
|
|
27
27
|
importMap: ImportMap;
|
|
28
28
|
}): Promise<LoadLayoutDataResult>;
|
|
29
|
-
//# sourceMappingURL=
|
|
29
|
+
//# sourceMappingURL=server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/adapters/layout/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,IAAI,gBAAgB,EAAE,MAAM,+CAA+C,CAAA;AACvG,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAQtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAK3E,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,CAAA;AAErD,MAAM,MAAM,cAAc,GAAG;IAC3B,mGAAmG;IACnG,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB,GAAG,gBAAgB,CAAA;AAEpB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IACzD,SAAS,EAAE,SAAS,CAAA;CACrB,CAAA;AAED,0EAA0E;AAC1E,wBAAsB,aAAa,CAAC,EAClC,aAAa,EACb,SAAS,GACV,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAqC7C;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAAC,EACnC,MAAM,EACN,SAAS,GACV,EAAE;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,SAAS,CAAA;CACrB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAMhC"}
|
|
@@ -3,18 +3,20 @@ import { getRootLayoutData } from '@payloadcms/ui/layouts/Root/getRootLayoutData
|
|
|
3
3
|
import { Outlet } from '@tanstack/react-router';
|
|
4
4
|
import { renderServerComponent } from '@tanstack/react-start/rsc';
|
|
5
5
|
import { createElement } from 'react';
|
|
6
|
-
import { initAdminContext } from '
|
|
7
|
-
import { toSerializable } from '
|
|
6
|
+
import { initAdminContext } from '../../utilities/initAdminContext.server.js';
|
|
7
|
+
import { toSerializable } from '../../utilities/toSerializable.js';
|
|
8
8
|
/** Fetches the admin layout data for the TanStack layout route loader. */ export async function getLayoutData({ configPromise, importMap }) {
|
|
9
9
|
const context = await initAdminContext({
|
|
10
10
|
configPromise,
|
|
11
11
|
importMap
|
|
12
12
|
});
|
|
13
|
-
const { permissions, req, user } = context;
|
|
13
|
+
const { cookies, permissions, req, user } = context;
|
|
14
14
|
const data = await getRootLayoutData({
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
cookies,
|
|
16
|
+
importMap,
|
|
17
|
+
permissions,
|
|
18
|
+
req,
|
|
19
|
+
user
|
|
18
20
|
});
|
|
19
21
|
const providerPaths = req.payload.config.admin?.components?.providers;
|
|
20
22
|
let providers;
|
|
@@ -58,4 +60,4 @@ import { toSerializable } from '../utilities/toSerializable.js';
|
|
|
58
60
|
});
|
|
59
61
|
}
|
|
60
62
|
|
|
61
|
-
//# sourceMappingURL=
|
|
63
|
+
//# sourceMappingURL=server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/adapters/layout/server.ts"],"sourcesContent":["import type { RootLayoutData as UIRootLayoutData } from '@payloadcms/ui/layouts/Root/getRootLayoutData'\nimport type { ImportMap, SanitizedConfig, ServerProps } from 'payload'\nimport type { ReactNode } from 'react'\n\nimport { NestProviders } from '@payloadcms/ui/layouts/NestProviders'\nimport { getRootLayoutData } from '@payloadcms/ui/layouts/Root/getRootLayoutData'\nimport { Outlet } from '@tanstack/react-router'\nimport { renderServerComponent } from '@tanstack/react-start/rsc'\nimport { createElement } from 'react'\n\nimport type { SerializableRecord } from '../../utilities/toSerializable.js'\n\nimport { initAdminContext } from '../../utilities/initAdminContext.server.js'\nimport { toSerializable } from '../../utilities/toSerializable.js'\n\nexport type LoadLayoutDataResult = SerializableRecord\n\nexport type RootLayoutData = {\n /** Custom admin providers wrapping the Outlet, rendered to an RSC payload before serialization. */\n providers?: ReactNode\n} & UIRootLayoutData\n\nexport type GetLayoutDataArgs = {\n configPromise: Promise<SanitizedConfig> | SanitizedConfig\n importMap: ImportMap\n}\n\n/** Fetches the admin layout data for the TanStack layout route loader. */\nexport async function getLayoutData({\n configPromise,\n importMap,\n}: GetLayoutDataArgs): Promise<RootLayoutData> {\n const context = await initAdminContext({ configPromise, importMap })\n\n const { cookies, permissions, req, user } = context\n\n const data = await getRootLayoutData({\n cookies,\n importMap,\n permissions,\n req,\n user,\n })\n\n const providerPaths = req.payload.config.admin?.components?.providers\n\n let providers: ReactNode\n\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\n providers = createElement(NestProviders, {\n children: createElement(Outlet),\n importMap,\n providers: providerPaths,\n serverProps,\n })\n }\n\n return { ...data, providers }\n}\n\n/**\n * Resolves the admin layout data for TanStack Start and returns a serializable\n * payload for the `/_payload` route loader. The framework adapter wraps this in\n * a `createServerFn` that supplies the app's `config` and generated `importMap`.\n *\n * `toSerializable` strips React elements, so the custom-providers element tree\n * (`config.admin.components.providers`) is rendered to an RSC payload separately\n * and re-attached.\n */\nexport async function loadLayoutData({\n config,\n importMap,\n}: {\n config: SanitizedConfig\n importMap: ImportMap\n}): Promise<LoadLayoutDataResult> {\n const { providers, ...data } = await getLayoutData({ configPromise: config, importMap })\n\n return toSerializable(data, {\n providers: providers ? await renderServerComponent(providers as any) : undefined,\n })\n}\n"],"names":["NestProviders","getRootLayoutData","Outlet","renderServerComponent","createElement","initAdminContext","toSerializable","getLayoutData","configPromise","importMap","context","cookies","permissions","req","user","data","providerPaths","payload","config","admin","components","providers","Array","isArray","length","serverProps","i18n","params","searchParams","server","undefined","children","loadLayoutData"],"mappings":"AAIA,SAASA,aAAa,QAAQ,uCAAsC;AACpE,SAASC,iBAAiB,QAAQ,gDAA+C;AACjF,SAASC,MAAM,QAAQ,yBAAwB;AAC/C,SAASC,qBAAqB,QAAQ,4BAA2B;AACjE,SAASC,aAAa,QAAQ,QAAO;AAIrC,SAASC,gBAAgB,QAAQ,6CAA4C;AAC7E,SAASC,cAAc,QAAQ,oCAAmC;AAclE,wEAAwE,GACxE,OAAO,eAAeC,cAAc,EAClCC,aAAa,EACbC,SAAS,EACS;IAClB,MAAMC,UAAU,MAAML,iBAAiB;QAAEG;QAAeC;IAAU;IAElE,MAAM,EAAEE,OAAO,EAAEC,WAAW,EAAEC,GAAG,EAAEC,IAAI,EAAE,GAAGJ;IAE5C,MAAMK,OAAO,MAAMd,kBAAkB;QACnCU;QACAF;QACAG;QACAC;QACAC;IACF;IAEA,MAAME,gBAAgBH,IAAII,OAAO,CAACC,MAAM,CAACC,KAAK,EAAEC,YAAYC;IAE5D,IAAIA;IAEJ,IAAIC,MAAMC,OAAO,CAACP,kBAAkBA,cAAcQ,MAAM,GAAG,GAAG;QAC5D,MAAMC,cAA2B;YAC/BC,MAAMb,IAAIa,IAAI;YACdC,QAAQ,CAAC;YACTV,SAASJ,IAAII,OAAO;YACpBL;YACAgB,cAAc,CAAC;YACfC,QAAQhB,IAAIgB,MAAM;YAClBf,MAAMA,QAAQgB;QAChB;QAEAT,YAAYjB,cAAcJ,eAAe;YACvC+B,UAAU3B,cAAcF;YACxBO;YACAY,WAAWL;YACXS;QACF;IACF;IAEA,OAAO;QAAE,GAAGV,IAAI;QAAEM;IAAU;AAC9B;AAEA;;;;;;;;CAQC,GACD,OAAO,eAAeW,eAAe,EACnCd,MAAM,EACNT,SAAS,EAIV;IACC,MAAM,EAAEY,SAAS,EAAE,GAAGN,MAAM,GAAG,MAAMR,cAAc;QAAEC,eAAeU;QAAQT;IAAU;IAEtF,OAAOH,eAAeS,MAAM;QAC1BM,WAAWA,YAAY,MAAMlB,sBAAsBkB,aAAoBS;IACzE;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/adapters/router.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/adapters/router.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,SAAS,CAAA;AA0EvE,eAAO,MAAM,qBAAqB,EAAE,sBAqHnC,CAAA"}
|
package/dist/adapters/router.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
-
import { RouterAdapterContext } from '@payloadcms/ui
|
|
4
|
-
import { useRouteTransition } from '@payloadcms/ui/providers/RouteTransition';
|
|
3
|
+
import { RouterAdapterContext, useRouteTransition } from '@payloadcms/ui';
|
|
5
4
|
import { createLink, useLocation, useParams, useRouter, useRouterState } from '@tanstack/react-router';
|
|
6
5
|
import * as qs from 'qs-esm';
|
|
7
6
|
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/adapters/router.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 createLink,\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\ntype LinkProps = {\n ariaCurrent?: React.AriaAttributes['aria-current']\n} & React.ComponentPropsWithRef<'a'>\n\nconst TanStackLink = createLink(function Link({ ariaCurrent, children, ...props }: LinkProps) {\n return (\n <a {...props} aria-current={ariaCurrent ?? props['aria-current']}>\n {children}\n </a>\n )\n})\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 ariaCurrent={rest['aria-current']}\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","createLink","useLocation","useParams","useRouter","useRouterState","qs","React","useCallback","useEffect","useMemo","TanStackLink","Link","ariaCurrent","children","props","a","aria-current","normalizeNavigationTarget","path","pathname","search","startsWith","url","URL","hash","TanStackLinkAdapter","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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"}
|
|
1
|
+
{"version":3,"sources":["../../src/adapters/router.tsx"],"sourcesContent":["'use client'\n\nimport type { RouterAdapterContextValue } from '@payloadcms/ui/providers/RouterAdapter'\nimport type { LinkAdapterProps, RouterAdapterComponent } from 'payload'\n\nimport { RouterAdapterContext, useRouteTransition } from '@payloadcms/ui'\nimport {\n createLink,\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\ntype LinkProps = {\n ariaCurrent?: React.AriaAttributes['aria-current']\n} & React.ComponentPropsWithRef<'a'>\n\nconst TanStackLink = createLink(function Link({ ariaCurrent, children, ...props }: LinkProps) {\n return (\n <a {...props} aria-current={ariaCurrent ?? props['aria-current']}>\n {children}\n </a>\n )\n})\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 ariaCurrent={rest['aria-current']}\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","createLink","useLocation","useParams","useRouter","useRouterState","qs","React","useCallback","useEffect","useMemo","TanStackLink","Link","ariaCurrent","children","props","a","aria-current","normalizeNavigationTarget","path","pathname","search","startsWith","url","URL","hash","TanStackLinkAdapter","href","prefetch","ref","replace","scroll","rest","preload","resetScroll","to","TanStackRouterAdapter","router","location","params","strict","isRouterLoading","select","state","isLoading","holdRouteTransition","releaseRouteTransition","adaptedParams","adapted","_splat","segments","split","filter","Boolean","toNavOptions","relativePath","window","queryIndex","indexOf","searchObject","parse","slice","depth","ignoreQueryPrefix","back","history","push","options","navigate","refresh","invalidate","replaceState","_ignoreSubscribers","adaptedRouter","searchParams","URLSearchParams","searchStr","value"],"mappings":"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"}
|
package/dist/adapters/server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { notFound, redirect } from '@tanstack/react-router';
|
|
2
|
-
import { getRequest,
|
|
2
|
+
import { getRequest, getResponseHeaders } from '@tanstack/react-start/server';
|
|
3
3
|
import { parseCookies } from 'payload';
|
|
4
4
|
function buildCookieStore(headers) {
|
|
5
5
|
const cookies = parseCookies(headers);
|
|
@@ -88,7 +88,7 @@ function serializeCookie(name, value, options) {
|
|
|
88
88
|
throw new Error('Unauthorized');
|
|
89
89
|
},
|
|
90
90
|
setCookie: (name, value, options)=>{
|
|
91
|
-
|
|
91
|
+
getResponseHeaders().append('Set-Cookie', serializeCookie(name, value, options));
|
|
92
92
|
}
|
|
93
93
|
};
|
|
94
94
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/adapters/server.ts"],"sourcesContent":["import type { CookieOptions, CookieStore, ServerAdapter } from 'payload'\n\nimport { notFound, redirect } from '@tanstack/react-router'\nimport { getRequest,
|
|
1
|
+
{"version":3,"sources":["../../src/adapters/server.ts"],"sourcesContent":["import type { CookieOptions, CookieStore, ServerAdapter } from 'payload'\n\nimport { notFound, redirect } from '@tanstack/react-router'\nimport { getRequest, getResponseHeaders } from '@tanstack/react-start/server'\nimport { parseCookies } from 'payload'\n\nfunction buildCookieStore(headers: Headers): CookieStore {\n const cookies = parseCookies(headers)\n\n return {\n get: (name: string) => {\n const value = cookies.get(name)\n return value !== undefined ? { name, value } : undefined\n },\n getAll: () => {\n return Array.from(cookies.entries()).map(([name, value]) => ({ name, value }))\n },\n }\n}\n\nfunction serializeCookie(name: string, value: string, options?: CookieOptions): string {\n let cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}`\n\n if (options?.path) {\n cookie += `; Path=${options.path}`\n }\n\n if (options?.domain) {\n cookie += `; Domain=${options.domain}`\n }\n\n if (options?.maxAge !== undefined) {\n cookie += `; Max-Age=${options.maxAge}`\n }\n\n if (options?.expires) {\n cookie += `; Expires=${options.expires.toUTCString()}`\n }\n\n if (options?.httpOnly) {\n cookie += '; HttpOnly'\n }\n\n if (options?.secure) {\n cookie += '; Secure'\n }\n\n if (options?.sameSite) {\n cookie += `; SameSite=${options.sameSite.charAt(0).toUpperCase() + options.sameSite.slice(1)}`\n }\n\n return cookie\n}\n\n/**\n * Server-side adapter for TanStack Start.\n * Uses `@tanstack/react-start/server` utilities for request/response handling.\n */\nexport const tanstackServerAdapter: ServerAdapter = {\n getCookies: () => {\n const request = getRequest()\n const headers = new Headers(request.headers)\n return buildCookieStore(headers)\n },\n\n getHeaders: () => {\n const request = getRequest()\n return new Headers(request.headers)\n },\n\n notFound: () => {\n // TanStack Router requires throwing the notFound() result directly\n // eslint-disable-next-line @typescript-eslint/only-throw-error\n throw notFound()\n },\n\n redirect: (path: string) => {\n // TanStack Router requires throwing the redirect() result directly\n // eslint-disable-next-line @typescript-eslint/only-throw-error\n throw redirect({ to: path })\n },\n\n permanentRedirect: (path: string) => {\n // TanStack Router does not have a separate permanent redirect primitive;\n // fall back to a regular redirect so existing behavior is preserved.\n // eslint-disable-next-line @typescript-eslint/only-throw-error\n throw redirect({ to: path })\n },\n\n forbidden: () => {\n // TanStack Router does not have a dedicated forbidden() helper; surface\n // a generic error so the request boundary still terminates the request.\n throw new Error('Forbidden')\n },\n\n unauthorized: () => {\n // TanStack Router does not have a dedicated unauthorized() helper; surface\n // a generic error so the request boundary still terminates the request.\n throw new Error('Unauthorized')\n },\n\n setCookie: (name: string, value: string, options?: CookieOptions) => {\n getResponseHeaders().append('Set-Cookie', serializeCookie(name, value, options))\n },\n}\n\n/**\n * Navigation requested during an admin page render, recorded by\n * `createPageRenderServerAdapter`. The admin-page server function reads this\n * after `renderServerComponent` resolves.\n */\nexport type PageNavIntent = {\n type?: 'notFound' | 'redirect'\n url?: string\n}\n\n/**\n * Builds the `ServerAdapter` for the admin page render (`renderRoot`). Like\n * `tanstackServerAdapter` for cookies/headers, but navigation **records the\n * intent on `nav` and throws** the framework-agnostic string error-contract\n * (`Error('not-found')` / `Error('redirect:<url>')`) instead of TanStack's\n * native `notFound`/`redirect`.\n *\n * `renderRoot` navigates via `req.server.*` in two places:\n * - during orchestration (e.g. the unauthenticated login redirect) — the throw\n * propagates out of `renderRoot` and is caught by the loader's try/catch;\n * - deep inside streamed view components (e.g. `DocumentView` access checks,\n * `LoginView` already-authenticated) — here the throw happens during\n * `renderServerComponent` and is swallowed into the RSC stream, so it never\n * rejects the render promise.\n *\n * Recording the intent on `nav` lets the loader honor the second case by\n * inspecting `nav` after the render resolves, then re-throwing native TanStack\n * nav at the loader boundary.\n */\nexport const createPageRenderServerAdapter = (nav: PageNavIntent): ServerAdapter => ({\n ...tanstackServerAdapter,\n notFound: () => {\n nav.type = 'notFound'\n throw new Error('not-found')\n },\n permanentRedirect: (path: string) => {\n nav.type = 'redirect'\n nav.url = path\n throw new Error(`redirect:${path}`)\n },\n redirect: (path: string) => {\n nav.type = 'redirect'\n nav.url = path\n throw new Error(`redirect:${path}`)\n },\n})\n"],"names":["notFound","redirect","getRequest","getResponseHeaders","parseCookies","buildCookieStore","headers","cookies","get","name","value","undefined","getAll","Array","from","entries","map","serializeCookie","options","cookie","encodeURIComponent","path","domain","maxAge","expires","toUTCString","httpOnly","secure","sameSite","charAt","toUpperCase","slice","tanstackServerAdapter","getCookies","request","Headers","getHeaders","to","permanentRedirect","forbidden","Error","unauthorized","setCookie","append","createPageRenderServerAdapter","nav","type","url"],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { NotFoundRouteProps } from '@tanstack/react-router';
|
|
2
1
|
/**
|
|
3
2
|
* Loader supplied by the app — a TanStack Start `createServerFn` that delegates
|
|
4
3
|
* to `loadAdminPage`. Typed loosely because the server-fn's call signature is
|
|
@@ -10,8 +9,6 @@ export type AdminLoad = (opts: {
|
|
|
10
9
|
search: Record<string, string | string[]>;
|
|
11
10
|
};
|
|
12
11
|
}) => Promise<any>;
|
|
13
|
-
declare function AdminPage(): import("react").JSX.Element;
|
|
14
|
-
declare function AdminNotFound({ data }: NotFoundRouteProps): import("react").JSX.Element;
|
|
15
12
|
/**
|
|
16
13
|
* Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's
|
|
17
14
|
* server-built NotFound page (shipped via the `notFound()` error's
|
|
@@ -21,7 +18,7 @@ declare function AdminNotFound({ data }: NotFoundRouteProps): import("react").JS
|
|
|
21
18
|
export declare function payloadAdminSplatRoute({ load }: {
|
|
22
19
|
load: AdminLoad;
|
|
23
20
|
}): {
|
|
24
|
-
component:
|
|
21
|
+
component: import("@tanstack/react-router").AsyncRouteComponent<unknown>;
|
|
25
22
|
head: ({ loaderData }: {
|
|
26
23
|
loaderData?: any;
|
|
27
24
|
}) => {
|
|
@@ -44,7 +41,7 @@ export declare function payloadAdminSplatRoute({ load }: {
|
|
|
44
41
|
title: string;
|
|
45
42
|
})[];
|
|
46
43
|
};
|
|
47
|
-
notFoundComponent:
|
|
44
|
+
notFoundComponent: import("@tanstack/react-router").AsyncRouteComponent<import("@tanstack/react-router").NotFoundRouteProps>;
|
|
48
45
|
loader: {
|
|
49
46
|
handler: ({ location, params }: {
|
|
50
47
|
location: any;
|
|
@@ -66,7 +63,7 @@ export declare function payloadAdminSplatRoute({ load }: {
|
|
|
66
63
|
export declare function payloadAdminIndexRoute({ load }: {
|
|
67
64
|
load: AdminLoad;
|
|
68
65
|
}): {
|
|
69
|
-
component:
|
|
66
|
+
component: import("@tanstack/react-router").AsyncRouteComponent<unknown>;
|
|
70
67
|
head: ({ loaderData }: {
|
|
71
68
|
loaderData?: any;
|
|
72
69
|
}) => {
|
|
@@ -89,7 +86,7 @@ export declare function payloadAdminIndexRoute({ load }: {
|
|
|
89
86
|
title: string;
|
|
90
87
|
})[];
|
|
91
88
|
};
|
|
92
|
-
notFoundComponent:
|
|
89
|
+
notFoundComponent: import("@tanstack/react-router").AsyncRouteComponent<import("@tanstack/react-router").NotFoundRouteProps>;
|
|
93
90
|
loader: {
|
|
94
91
|
handler: ({ location, params }: {
|
|
95
92
|
location: any;
|
|
@@ -104,5 +101,4 @@ export declare function payloadAdminIndexRoute({ load }: {
|
|
|
104
101
|
};
|
|
105
102
|
validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
|
|
106
103
|
};
|
|
107
|
-
|
|
108
|
-
//# sourceMappingURL=views.d.ts.map
|
|
104
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { NotFoundClient } from '@payloadcms/ui/views/NotFound/client';
|
|
5
|
-
import { notFound, redirect, useLoaderData } from '@tanstack/react-router';
|
|
6
|
-
import { Fragment, useDeferredValue, useEffect } from 'react';
|
|
7
|
-
import { getAdminMeta } from './metadata.js';
|
|
2
|
+
import { lazyRouteComponent, notFound, redirect } from '@tanstack/react-router';
|
|
3
|
+
import { getAdminMeta } from '../metadata.js';
|
|
8
4
|
const searchToRecord = (searchStr)=>Object.fromEntries(new URLSearchParams(searchStr));
|
|
9
5
|
const runLoader = async (load, splat, searchStr)=>{
|
|
10
6
|
const data = await load({
|
|
@@ -21,42 +17,10 @@ const runLoader = async (load, splat, searchStr)=>{
|
|
|
21
17
|
}
|
|
22
18
|
return data;
|
|
23
19
|
};
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
strict: false
|
|
29
|
-
});
|
|
30
|
-
// Route state comes from an external store, so a new RSC payload that suspends
|
|
31
|
-
// on code-split client references can reveal the router's null fallback.
|
|
32
|
-
// Keep the current payload painted until the next one is renderable.
|
|
33
|
-
const rscPayload = useDeferredValue(data?.rscPayload);
|
|
34
|
-
const { holdRouteTransition } = useRouteTransition();
|
|
35
|
-
const isRscPayloadDeferred = rscPayload !== data?.rscPayload;
|
|
36
|
-
useEffect(()=>{
|
|
37
|
-
if (!isRscPayloadDeferred) {
|
|
38
|
-
return;
|
|
39
|
-
}
|
|
40
|
-
const releaseRouteTransition = holdRouteTransition();
|
|
41
|
-
return ()=>releaseRouteTransition();
|
|
42
|
-
}, [
|
|
43
|
-
holdRouteTransition,
|
|
44
|
-
isRscPayloadDeferred
|
|
45
|
-
]);
|
|
46
|
-
return /*#__PURE__*/ _jsx(Fragment, {
|
|
47
|
-
children: rscPayload
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
function AdminNotFound({ data }) {
|
|
51
|
-
// TanStack exposes not-found data as unknown; this route only receives the shape thrown below.
|
|
52
|
-
const { routeKey, rscPayload } = data ?? {};
|
|
53
|
-
if (!rscPayload) {
|
|
54
|
-
return /*#__PURE__*/ _jsx(NotFoundClient, {});
|
|
55
|
-
}
|
|
56
|
-
return /*#__PURE__*/ _jsx(Fragment, {
|
|
57
|
-
children: rscPayload
|
|
58
|
-
}, routeKey);
|
|
59
|
-
}
|
|
20
|
+
// The admin UI loads with the admin routes only, so front-end routes never download it. The
|
|
21
|
+
// router preloads lazy route components before rendering, so admin pages don't flash.
|
|
22
|
+
const AdminPage = lazyRouteComponent(()=>import('./lazy.js'), 'AdminPage');
|
|
23
|
+
const AdminNotFound = lazyRouteComponent(()=>import('./lazy.js'), 'AdminNotFound');
|
|
60
24
|
const adminRouteOptions = ({ forwardNotFoundPayload, load, resolveSplat })=>({
|
|
61
25
|
component: AdminPage,
|
|
62
26
|
head: ({ loaderData })=>getAdminMeta(loaderData?.metadata),
|
|
@@ -113,4 +77,4 @@ const adminRouteOptions = ({ forwardNotFoundPayload, load, resolveSplat })=>({
|
|
|
113
77
|
});
|
|
114
78
|
}
|
|
115
79
|
|
|
116
|
-
//# sourceMappingURL=
|
|
80
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
+
import { NotFoundClient, useRouteTransition } from '@payloadcms/ui';
|
|
4
|
+
import { useLoaderData } from '@tanstack/react-router';
|
|
5
|
+
import { Fragment, useDeferredValue, useEffect } from 'react';
|
|
6
|
+
export function AdminPage() {
|
|
7
|
+
// Note: React key intentionally omitted here so the persistent template (nav, header) doesn't remount and flash on navigation.
|
|
8
|
+
// The per-route view key is attached server-side to the view subtree instead, via `renderRoot`'s `key` in `loadAdminPage`.
|
|
9
|
+
const data = useLoaderData({
|
|
10
|
+
strict: false
|
|
11
|
+
});
|
|
12
|
+
// Route state comes from an external store, so a new RSC payload that suspends
|
|
13
|
+
// on code-split client references can reveal the router's null fallback.
|
|
14
|
+
// Keep the current payload painted until the next one is renderable.
|
|
15
|
+
const rscPayload = useDeferredValue(data?.rscPayload);
|
|
16
|
+
const { holdRouteTransition } = useRouteTransition();
|
|
17
|
+
const isRscPayloadDeferred = rscPayload !== data?.rscPayload;
|
|
18
|
+
useEffect(()=>{
|
|
19
|
+
if (!isRscPayloadDeferred) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const releaseRouteTransition = holdRouteTransition();
|
|
23
|
+
return ()=>releaseRouteTransition();
|
|
24
|
+
}, [
|
|
25
|
+
holdRouteTransition,
|
|
26
|
+
isRscPayloadDeferred
|
|
27
|
+
]);
|
|
28
|
+
return /*#__PURE__*/ _jsx(Fragment, {
|
|
29
|
+
children: rscPayload
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
export function AdminNotFound({ data }) {
|
|
33
|
+
// TanStack exposes not-found data as unknown; this route only receives the shape thrown below.
|
|
34
|
+
const { routeKey, rscPayload } = data ?? {};
|
|
35
|
+
if (!rscPayload) {
|
|
36
|
+
return /*#__PURE__*/ _jsx(NotFoundClient, {});
|
|
37
|
+
}
|
|
38
|
+
return /*#__PURE__*/ _jsx(Fragment, {
|
|
39
|
+
children: rscPayload
|
|
40
|
+
}, routeKey);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
//# sourceMappingURL=lazy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { RenderableServerComponent } from '@tanstack/react-start/rsc';
|
|
2
2
|
import type { ImportMap, SanitizedConfig } from 'payload';
|
|
3
|
-
import type { AdminPageMetadata } from '
|
|
3
|
+
import type { AdminPageMetadata } from '../metadata.js';
|
|
4
4
|
export type LoadAdminPageArgs = {
|
|
5
5
|
config: SanitizedConfig;
|
|
6
6
|
importMap: ImportMap;
|
|
@@ -54,4 +54,4 @@ export type LoadAdminPageResult = {
|
|
|
54
54
|
*/
|
|
55
55
|
export declare function loadAdminPage({ config, importMap, search, splat, }: LoadAdminPageArgs): Promise<LoadAdminPageResult>;
|
|
56
56
|
export {};
|
|
57
|
-
//# sourceMappingURL=
|
|
57
|
+
//# sourceMappingURL=server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|