@payloadcms/tanstack-start 4.0.0-internal.e7d4ebc → 4.0.0-internal.ec73d44
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/handleServerFunctions.d.ts +3 -0
- package/dist/adapters/handleServerFunctions.d.ts.map +1 -0
- package/dist/adapters/handleServerFunctions.js +17 -0
- package/dist/adapters/handleServerFunctions.js.map +1 -0
- package/dist/adapters/layout/RootProviders/index.d.ts +9 -0
- package/dist/adapters/layout/RootProviders/index.d.ts.map +1 -0
- package/dist/adapters/layout/RootProviders/index.js +21 -0
- package/dist/adapters/layout/RootProviders/index.js.map +1 -0
- package/dist/{layouts/Root/withPayloadRoot.d.ts → adapters/layout/index.d.ts} +32 -4
- package/dist/adapters/layout/index.d.ts.map +1 -0
- package/dist/adapters/layout/index.js +107 -0
- package/dist/adapters/layout/index.js.map +1 -0
- package/dist/adapters/layout/lazy.d.ts +7 -0
- package/dist/adapters/layout/lazy.d.ts.map +1 -0
- package/dist/adapters/layout/lazy.js +17 -0
- package/dist/adapters/layout/lazy.js.map +1 -0
- package/dist/adapters/layout/outlet.d.ts +4 -0
- package/dist/adapters/layout/outlet.d.ts.map +1 -0
- package/dist/adapters/layout/outlet.js +9 -0
- package/dist/adapters/layout/outlet.js.map +1 -0
- package/dist/adapters/layout/server.d.ts +23 -0
- package/dist/adapters/layout/server.d.ts.map +1 -0
- package/dist/adapters/layout/server.js +65 -0
- package/dist/adapters/layout/server.js.map +1 -0
- package/dist/{utilities/meta.d.ts → adapters/metadata.d.ts} +10 -1
- package/dist/adapters/metadata.d.ts.map +1 -0
- package/dist/{utilities/meta.js → adapters/metadata.js} +60 -1
- package/dist/adapters/metadata.js.map +1 -0
- package/dist/{elements/RouterAdapter/index.d.ts → adapters/router.d.ts} +1 -1
- package/dist/adapters/router.d.ts.map +1 -0
- package/dist/{elements/RouterAdapter/index.js → adapters/router.js} +43 -17
- package/dist/adapters/router.js.map +1 -0
- package/dist/{utilities/serverAdapter.server.d.ts → adapters/server.d.ts} +1 -1
- package/dist/adapters/server.d.ts.map +1 -0
- package/dist/{utilities/serverAdapter.server.js → adapters/server.js} +3 -30
- package/dist/adapters/server.js.map +1 -0
- package/dist/{routes/adminRoutes.d.ts → adapters/views/index.d.ts} +15 -19
- package/dist/adapters/views/index.d.ts.map +1 -0
- package/dist/adapters/views/index.js +101 -0
- 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 +44 -0
- package/dist/adapters/views/lazy.js.map +1 -0
- package/dist/{utilities/loadAdminPage.d.ts → adapters/views/server.d.ts} +12 -6
- package/dist/adapters/views/server.d.ts.map +1 -0
- package/dist/{utilities/loadAdminPage.js → adapters/views/server.js} +27 -89
- package/dist/adapters/views/server.js.map +1 -0
- package/dist/auth/login.d.ts +3 -16
- package/dist/auth/login.d.ts.map +1 -1
- package/dist/auth/login.js +6 -46
- package/dist/auth/login.js.map +1 -1
- package/dist/auth/logout.d.ts +2 -5
- package/dist/auth/logout.d.ts.map +1 -1
- package/dist/auth/logout.js +6 -47
- package/dist/auth/logout.js.map +1 -1
- package/dist/auth/refresh.d.ts +2 -4
- package/dist/auth/refresh.d.ts.map +1 -1
- package/dist/auth/refresh.js +6 -49
- package/dist/auth/refresh.js.map +1 -1
- package/dist/exports/client/layout.d.ts +2 -0
- package/dist/exports/client/layout.d.ts.map +1 -0
- package/dist/exports/client/layout.js +4 -0
- package/dist/exports/client/layout.js.map +1 -0
- package/dist/exports/client.d.ts +3 -7
- package/dist/exports/client.d.ts.map +1 -1
- package/dist/exports/client.js +3 -7
- package/dist/exports/client.js.map +1 -1
- package/dist/exports/layouts.d.ts +2 -5
- package/dist/exports/layouts.d.ts.map +1 -1
- package/dist/exports/layouts.js +1 -3
- package/dist/exports/layouts.js.map +1 -1
- package/dist/exports/routes.d.ts +2 -0
- package/dist/exports/routes.d.ts.map +1 -0
- package/dist/exports/routes.js +3 -0
- package/dist/exports/routes.js.map +1 -0
- package/dist/exports/rsc.browser.d.ts +4 -1
- package/dist/exports/rsc.browser.d.ts.map +1 -1
- package/dist/exports/rsc.browser.js +4 -1
- package/dist/exports/rsc.browser.js.map +1 -1
- package/dist/exports/rsc.d.ts +0 -1
- package/dist/exports/rsc.d.ts.map +1 -1
- package/dist/exports/rsc.js +0 -1
- package/dist/exports/rsc.js.map +1 -1
- package/dist/exports/server.d.ts +6 -12
- package/dist/exports/server.d.ts.map +1 -1
- package/dist/exports/server.js +6 -12
- package/dist/exports/server.js.map +1 -1
- package/dist/{utilities/graphqlHandler.server.d.ts → routes/graphql/handler.server.d.ts} +1 -3
- package/dist/routes/graphql/handler.server.d.ts.map +1 -0
- package/dist/{utilities/graphqlHandler.server.js → routes/graphql/handler.server.js} +9 -6
- package/dist/routes/graphql/handler.server.js.map +1 -0
- package/dist/routes/rest/handler.server.d.ts +11 -0
- package/dist/routes/rest/handler.server.d.ts.map +1 -0
- package/dist/routes/rest/handler.server.js +14 -0
- package/dist/routes/rest/handler.server.js.map +1 -0
- package/dist/routes/{apiRoute.d.ts → rest/index.d.ts} +5 -4
- package/dist/routes/rest/index.d.ts.map +1 -0
- package/dist/routes/{apiRoute.js → rest/index.js} +6 -5
- package/dist/routes/rest/index.js.map +1 -0
- package/dist/rsc/CollectionCards.js +1 -1
- package/dist/rsc/CollectionCards.js.map +1 -1
- package/dist/utilities/devConfigReload.server.d.ts +2 -0
- package/dist/utilities/devConfigReload.server.d.ts.map +1 -0
- package/dist/utilities/devConfigReload.server.js +61 -0
- package/dist/utilities/devConfigReload.server.js.map +1 -0
- package/dist/utilities/devConfigReloadEvent.d.ts +9 -0
- package/dist/utilities/devConfigReloadEvent.d.ts.map +1 -0
- package/dist/utilities/devConfigReloadEvent.js +9 -0
- package/dist/utilities/devConfigReloadEvent.js.map +1 -0
- package/dist/utilities/getRequestI18n.server.d.ts +1 -1
- package/dist/utilities/getRequestI18n.server.js +1 -1
- package/dist/utilities/getRequestI18n.server.js.map +1 -1
- package/dist/utilities/initAdminContext.server.d.ts +9 -0
- package/dist/utilities/initAdminContext.server.d.ts.map +1 -0
- package/dist/utilities/initAdminContext.server.js +13 -0
- package/dist/utilities/initAdminContext.server.js.map +1 -0
- package/dist/utilities/serverFunctionClient.d.ts +2 -23
- package/dist/utilities/serverFunctionClient.d.ts.map +1 -1
- package/dist/utilities/serverFunctionClient.js +12 -101
- package/dist/utilities/serverFunctionClient.js.map +1 -1
- package/dist/withPayload/config/external.d.ts +19 -21
- package/dist/withPayload/config/external.d.ts.map +1 -1
- package/dist/withPayload/config/external.js +38 -32
- package/dist/withPayload/config/external.js.map +1 -1
- package/dist/withPayload/config/optimizeDeps.d.ts.map +1 -1
- package/dist/withPayload/config/optimizeDeps.js +44 -7
- package/dist/withPayload/config/optimizeDeps.js.map +1 -1
- package/dist/withPayload/devConfigReload.d.ts +14 -0
- package/dist/withPayload/devConfigReload.d.ts.map +1 -0
- package/dist/withPayload/devConfigReload.js +84 -0
- package/dist/withPayload/devConfigReload.js.map +1 -0
- package/dist/withPayload/importProtection.d.ts.map +1 -1
- package/dist/withPayload/importProtection.js +2 -2
- package/dist/withPayload/importProtection.js.map +1 -1
- package/dist/withPayload/index.d.ts +24 -11
- package/dist/withPayload/index.d.ts.map +1 -1
- package/dist/withPayload/index.js +50 -19
- package/dist/withPayload/index.js.map +1 -1
- package/dist/withPayload/workarounds/stripDistStyleImports.js +2 -2
- package/dist/withPayload/workarounds/stripDistStyleImports.js.map +1 -1
- package/package.json +35 -29
- package/dist/elements/DocumentHeaderClient/index.d.ts +0 -16
- package/dist/elements/DocumentHeaderClient/index.d.ts.map +0 -1
- package/dist/elements/DocumentHeaderClient/index.js +0 -116
- package/dist/elements/DocumentHeaderClient/index.js.map +0 -1
- package/dist/elements/RenderComponent/index.d.ts +0 -10
- package/dist/elements/RenderComponent/index.d.ts.map +0 -1
- package/dist/elements/RenderComponent/index.js +0 -12
- package/dist/elements/RenderComponent/index.js.map +0 -1
- package/dist/elements/RouterAdapter/index.d.ts.map +0 -1
- package/dist/elements/RouterAdapter/index.js.map +0 -1
- package/dist/layouts/Root/getLayoutData.d.ts +0 -12
- package/dist/layouts/Root/getLayoutData.d.ts.map +0 -1
- package/dist/layouts/Root/getLayoutData.js +0 -91
- package/dist/layouts/Root/getLayoutData.js.map +0 -1
- package/dist/layouts/Root/index.d.ts +0 -32
- package/dist/layouts/Root/index.d.ts.map +0 -1
- package/dist/layouts/Root/index.js +0 -53
- package/dist/layouts/Root/index.js.map +0 -1
- package/dist/layouts/Root/withPayloadRoot.d.ts.map +0 -1
- package/dist/layouts/Root/withPayloadRoot.js +0 -91
- package/dist/layouts/Root/withPayloadRoot.js.map +0 -1
- package/dist/node/cssLoader.d.mts +0 -25
- package/dist/node/cssLoader.d.mts.map +0 -1
- package/dist/node/cssLoader.js +0 -70
- package/dist/node/cssLoader.js.map +0 -1
- package/dist/node/cssLoader.mjs +0 -75
- package/dist/node/registerCssLoader.d.mts +0 -2
- package/dist/node/registerCssLoader.d.mts.map +0 -1
- package/dist/node/registerCssLoader.js +0 -10
- package/dist/node/registerCssLoader.js.map +0 -1
- package/dist/node/registerCssLoader.mjs +0 -10
- package/dist/routes/adminRoutes.d.ts.map +0 -1
- package/dist/routes/adminRoutes.js +0 -105
- package/dist/routes/adminRoutes.js.map +0 -1
- package/dist/routes/apiRoute.d.ts.map +0 -1
- package/dist/routes/apiRoute.js.map +0 -1
- package/dist/routes/layoutRoute.d.ts +0 -26
- package/dist/routes/layoutRoute.d.ts.map +0 -1
- package/dist/routes/layoutRoute.js +0 -57
- package/dist/routes/layoutRoute.js.map +0 -1
- package/dist/rsc/renderPayloadRSC.d.ts +0 -6
- package/dist/rsc/renderPayloadRSC.d.ts.map +0 -1
- package/dist/rsc/renderPayloadRSC.js +0 -6
- package/dist/rsc/renderPayloadRSC.js.map +0 -1
- package/dist/utilities/devReloadStrategy.d.ts +0 -10
- package/dist/utilities/devReloadStrategy.d.ts.map +0 -1
- package/dist/utilities/devReloadStrategy.js +0 -27
- package/dist/utilities/devReloadStrategy.js.map +0 -1
- package/dist/utilities/getExistingAuthToken.d.ts +0 -7
- package/dist/utilities/getExistingAuthToken.d.ts.map +0 -1
- package/dist/utilities/getExistingAuthToken.js +0 -18
- package/dist/utilities/getExistingAuthToken.js.map +0 -1
- package/dist/utilities/getPreferences.d.ts +0 -10
- package/dist/utilities/getPreferences.d.ts.map +0 -1
- package/dist/utilities/getPreferences.js +0 -33
- package/dist/utilities/getPreferences.js.map +0 -1
- package/dist/utilities/getRequestLocale.d.ts +0 -7
- package/dist/utilities/getRequestLocale.d.ts.map +0 -1
- package/dist/utilities/getRequestLocale.js +0 -20
- package/dist/utilities/getRequestLocale.js.map +0 -1
- package/dist/utilities/graphqlHandler.server.d.ts.map +0 -1
- package/dist/utilities/graphqlHandler.server.js.map +0 -1
- package/dist/utilities/handleAPIRoute.server.d.ts +0 -11
- package/dist/utilities/handleAPIRoute.server.d.ts.map +0 -1
- package/dist/utilities/handleAPIRoute.server.js +0 -17
- package/dist/utilities/handleAPIRoute.server.js.map +0 -1
- package/dist/utilities/handleServerFunctions.d.ts +0 -2
- package/dist/utilities/handleServerFunctions.d.ts.map +0 -1
- package/dist/utilities/handleServerFunctions.js +0 -12
- package/dist/utilities/handleServerFunctions.js.map +0 -1
- package/dist/utilities/importMap.server.d.ts +0 -8
- package/dist/utilities/importMap.server.d.ts.map +0 -1
- package/dist/utilities/importMap.server.js +0 -11
- package/dist/utilities/importMap.server.js.map +0 -1
- package/dist/utilities/initReq.server.d.ts +0 -19
- package/dist/utilities/initReq.server.d.ts.map +0 -1
- package/dist/utilities/initReq.server.js +0 -87
- package/dist/utilities/initReq.server.js.map +0 -1
- package/dist/utilities/loadAdminPage.d.ts.map +0 -1
- package/dist/utilities/loadAdminPage.js.map +0 -1
- package/dist/utilities/loadLayoutData.d.ts +0 -15
- package/dist/utilities/loadLayoutData.d.ts.map +0 -1
- package/dist/utilities/loadLayoutData.js +0 -23
- package/dist/utilities/loadLayoutData.js.map +0 -1
- package/dist/utilities/meta.d.ts.map +0 -1
- package/dist/utilities/meta.js.map +0 -1
- package/dist/utilities/serializeForRsc.d.ts +0 -26
- package/dist/utilities/serializeForRsc.d.ts.map +0 -1
- package/dist/utilities/serializeForRsc.js +0 -122
- package/dist/utilities/serializeForRsc.js.map +0 -1
- package/dist/utilities/serverAdapter.server.d.ts.map +0 -1
- package/dist/utilities/serverAdapter.server.js.map +0 -1
- package/dist/utilities/setPayloadAuthCookie.d.ts +0 -9
- package/dist/utilities/setPayloadAuthCookie.d.ts.map +0 -1
- package/dist/utilities/setPayloadAuthCookie.js +0 -31
- package/dist/utilities/setPayloadAuthCookie.js.map +0 -1
- package/dist/utilities/toSerializable.d.ts +0 -2
- package/dist/utilities/toSerializable.d.ts.map +0 -1
- package/dist/utilities/toSerializable.js +0 -111
- package/dist/utilities/toSerializable.js.map +0 -1
|
@@ -1,74 +1,17 @@
|
|
|
1
1
|
import { getViewportContent } from '@payloadcms/ui/shared';
|
|
2
2
|
import { renderServerComponent } from '@tanstack/react-start/rsc';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
return undefined;
|
|
9
|
-
}
|
|
10
|
-
if (typeof title === 'string') {
|
|
11
|
-
return title;
|
|
12
|
-
}
|
|
13
|
-
if ('absolute' in title) {
|
|
14
|
-
return title.absolute;
|
|
15
|
-
}
|
|
16
|
-
return title.default;
|
|
17
|
-
};
|
|
18
|
-
/**
|
|
19
|
-
* Flattens the framework-agnostic `MetaConfig` (Next.js `Metadata` shape) into
|
|
20
|
-
* the plain, serializable `AdminPageMetadata` the route loader ships to the
|
|
21
|
-
* client. The full `MetaConfig` carries a `URL` `metadataBase`, functions and
|
|
22
|
-
* other non-serializable values that seroval cannot cross the wire, so only the
|
|
23
|
-
* fields `getAdminMeta` renders are extracted.
|
|
24
|
-
*/ const toAdminPageMetadata = (meta)=>{
|
|
25
|
-
const og = meta.openGraph;
|
|
26
|
-
const rawImages = og?.images;
|
|
27
|
-
const imagesArray = rawImages ? Array.isArray(rawImages) ? rawImages : [
|
|
28
|
-
rawImages
|
|
29
|
-
] : [];
|
|
30
|
-
const images = imagesArray.map((image)=>typeof image === 'string' ? {
|
|
31
|
-
url: image
|
|
32
|
-
} : image?.url ? {
|
|
33
|
-
alt: image.alt,
|
|
34
|
-
height: image.height,
|
|
35
|
-
url: String(image.url),
|
|
36
|
-
width: image.width
|
|
37
|
-
} : undefined).filter(Boolean);
|
|
38
|
-
const rawIcons = meta.icons;
|
|
39
|
-
const iconList = Array.isArray(rawIcons) ? rawIcons : rawIcons && typeof rawIcons === 'object' && Array.isArray(rawIcons.icon) ? rawIcons.icon : [];
|
|
40
|
-
const icons = iconList.map((icon)=>typeof icon === 'string' ? {
|
|
41
|
-
rel: 'icon',
|
|
42
|
-
url: icon
|
|
43
|
-
} : icon?.url ? {
|
|
44
|
-
type: icon.type,
|
|
45
|
-
media: icon.media,
|
|
46
|
-
rel: icon.rel ?? 'icon',
|
|
47
|
-
sizes: icon.sizes,
|
|
48
|
-
url: String(icon.url)
|
|
49
|
-
} : undefined).filter(Boolean);
|
|
50
|
-
const keywords = meta.keywords;
|
|
51
|
-
return {
|
|
52
|
-
description: typeof meta.description === 'string' ? meta.description : undefined,
|
|
53
|
-
icons: icons?.length ? icons : undefined,
|
|
54
|
-
keywords: typeof keywords === 'string' ? keywords : Array.isArray(keywords) ? keywords.join(', ') : undefined,
|
|
55
|
-
openGraph: og ? {
|
|
56
|
-
description: typeof og.description === 'string' ? og.description : undefined,
|
|
57
|
-
images: images?.length ? images : undefined,
|
|
58
|
-
siteName: typeof og.siteName === 'string' ? og.siteName : undefined,
|
|
59
|
-
title: typeof og.title === 'string' ? og.title : undefined
|
|
60
|
-
} : undefined,
|
|
61
|
-
robots: typeof meta.robots === 'string' ? meta.robots : undefined,
|
|
62
|
-
title: resolveTitle(meta.title)
|
|
63
|
-
};
|
|
64
|
-
};
|
|
3
|
+
import { getRequest } from '@tanstack/react-start/server';
|
|
4
|
+
import { getRequestI18n } from '../../utilities/getRequestI18n.server.js';
|
|
5
|
+
import { initAdminContext } from '../../utilities/initAdminContext.server.js';
|
|
6
|
+
import { toAdminPageMetadata } from '../metadata.js';
|
|
7
|
+
import { createPageRenderServerAdapter } from '../server.js';
|
|
65
8
|
/**
|
|
66
9
|
* Renders an admin page for TanStack Start and returns a serializable loader
|
|
67
10
|
* result. The framework adapter wraps this in a `createServerFn` that supplies
|
|
68
11
|
* the app's `config` and generated `importMap`.
|
|
69
12
|
*
|
|
70
|
-
* 1.
|
|
71
|
-
* from `@payloadcms/ui`, passing a TanStack-bound `
|
|
13
|
+
* 1. Gets the Payload admin context via the shared `renderRoot` orchestrator
|
|
14
|
+
* from `@payloadcms/ui`, passing a TanStack-bound `initAdminContext`. The injected
|
|
72
15
|
* page-render `ServerAdapter` records navigation intent and throws the
|
|
73
16
|
* framework-agnostic error contract.
|
|
74
17
|
* 2. Pipes the resulting React server tree through `renderServerComponent`
|
|
@@ -101,29 +44,20 @@ const resolveTitle = (title)=>{
|
|
|
101
44
|
const nav = {};
|
|
102
45
|
const pageServerAdapter = createPageRenderServerAdapter(nav);
|
|
103
46
|
let userAgent;
|
|
104
|
-
// `renderRoot` calls `
|
|
47
|
+
// `renderRoot` calls `initAdminContext` itself with its own overrides (query
|
|
105
48
|
// re-nesting, `urlSuffix`, `fallbackLocale`). Forward them, injecting the
|
|
106
49
|
// page-render `ServerAdapter` so `req.server.redirect()` / `.notFound()`
|
|
107
50
|
// is recorded + thrown rather than escaping as raw TanStack nav.
|
|
108
|
-
const
|
|
109
|
-
const result = await
|
|
51
|
+
const boundInitAdminContext = async (args)=>{
|
|
52
|
+
const result = await initAdminContext({
|
|
110
53
|
configPromise: args.configPromise,
|
|
111
54
|
importMap: args.importMap,
|
|
112
55
|
overrides: args.overrides,
|
|
113
56
|
serverAdapter: pageServerAdapter
|
|
114
57
|
});
|
|
115
|
-
userAgent = result.headers.get('user-agent') ?? undefined;
|
|
58
|
+
userAgent = result.req.headers.get('user-agent') ?? undefined;
|
|
116
59
|
return result;
|
|
117
60
|
};
|
|
118
|
-
const notFound = ()=>{
|
|
119
|
-
nav.type = 'notFound';
|
|
120
|
-
throw new Error('not-found');
|
|
121
|
-
};
|
|
122
|
-
const redirect = (url)=>{
|
|
123
|
-
nav.type = 'redirect';
|
|
124
|
-
nav.url = url;
|
|
125
|
-
throw new Error(`redirect:${url}`);
|
|
126
|
-
};
|
|
127
61
|
// Build the 404 result the route loader re-throws as TanStack `notFound()`.
|
|
128
62
|
//
|
|
129
63
|
// Throwing `notFound()` is the only way to set the SSR document status to 404
|
|
@@ -142,17 +76,16 @@ const resolveTitle = (title)=>{
|
|
|
142
76
|
const notFoundNode = await renderNotFoundPage({
|
|
143
77
|
config: Promise.resolve(config),
|
|
144
78
|
importMap,
|
|
145
|
-
|
|
146
|
-
configPromise: args.configPromise,
|
|
147
|
-
importMap: args.importMap,
|
|
148
|
-
overrides: args.overrides
|
|
149
|
-
}),
|
|
79
|
+
initAdminContext,
|
|
150
80
|
params: Promise.resolve({
|
|
151
81
|
segments: splatSegments
|
|
152
82
|
}),
|
|
153
83
|
searchParams: Promise.resolve(searchParams)
|
|
154
84
|
});
|
|
155
|
-
const rscPayload = await renderServerComponent(
|
|
85
|
+
const rscPayload = await renderServerComponent({
|
|
86
|
+
page: notFoundNode,
|
|
87
|
+
routeKey: splat ?? ''
|
|
88
|
+
});
|
|
156
89
|
return {
|
|
157
90
|
_notFound: true,
|
|
158
91
|
routeKey: splat ?? '',
|
|
@@ -164,18 +97,21 @@ const resolveTitle = (title)=>{
|
|
|
164
97
|
adminViews: defaultAdminViews,
|
|
165
98
|
config: Promise.resolve(config),
|
|
166
99
|
importMap,
|
|
167
|
-
|
|
100
|
+
initAdminContext: boundInitAdminContext,
|
|
168
101
|
key: splat ?? '',
|
|
169
|
-
notFound,
|
|
102
|
+
notFound: pageServerAdapter.notFound,
|
|
170
103
|
// `segments` is intentionally `undefined` for the admin root (`/admin`),
|
|
171
104
|
// matching Next's optional catch-all; `renderRoot` handles it at runtime.
|
|
172
105
|
params: Promise.resolve({
|
|
173
106
|
segments
|
|
174
107
|
}),
|
|
175
|
-
redirect,
|
|
108
|
+
redirect: pageServerAdapter.redirect,
|
|
176
109
|
searchParams: Promise.resolve(searchParams)
|
|
177
110
|
});
|
|
178
|
-
const rscPayload = await renderServerComponent(
|
|
111
|
+
const rscPayload = await renderServerComponent({
|
|
112
|
+
page: node,
|
|
113
|
+
routeKey: splat ?? ''
|
|
114
|
+
});
|
|
179
115
|
// The server-function (client-nav RPC) path returns the flight stream unread —
|
|
180
116
|
// unlike the router/SSR path, which awaits a decode that drives the render to
|
|
181
117
|
// completion. So streamed side effects (e.g. DocumentView's autosave-create
|
|
@@ -185,7 +121,9 @@ const resolveTitle = (title)=>{
|
|
|
185
121
|
if (!nav.type) {
|
|
186
122
|
const wrapper = rscPayload[Symbol.for('tanstack.rsc.stream')];
|
|
187
123
|
if (typeof wrapper?.createReplayStream === 'function') {
|
|
188
|
-
const buffer = await new Response(wrapper.createReplayStream()
|
|
124
|
+
const buffer = await new Response(wrapper.createReplayStream().pipeThrough(new TransformStream(), {
|
|
125
|
+
signal: getRequest().signal
|
|
126
|
+
})).arrayBuffer();
|
|
189
127
|
wrapper.createReplayStream = ()=>new Response(buffer).body;
|
|
190
128
|
}
|
|
191
129
|
}
|
|
@@ -237,4 +175,4 @@ const resolveTitle = (title)=>{
|
|
|
237
175
|
}
|
|
238
176
|
}
|
|
239
177
|
|
|
240
|
-
//# sourceMappingURL=
|
|
178
|
+
//# sourceMappingURL=server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/adapters/views/server.tsx"],"sourcesContent":["import type { RenderableServerComponentBuilder } 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'\nimport { getRequest } from '@tanstack/react-start/server'\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 = RenderableServerComponentBuilder<{\n page: React.ReactElement\n routeKey: string\n}>\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({\n page: notFoundNode as React.ReactElement,\n routeKey: splat ?? '',\n })\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({\n page: node as React.ReactElement,\n routeKey: splat ?? '',\n })\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(\n wrapper.createReplayStream().pipeThrough(new TransformStream(), {\n signal: getRequest().signal,\n }),\n ).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","getRequest","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","page","routeKey","_notFound","node","adminViews","key","notFound","redirect","type","wrapper","Symbol","for","createReplayStream","buffer","Response","pipeThrough","TransformStream","signal","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
CHANGED
|
@@ -1,17 +1,4 @@
|
|
|
1
|
-
import type { AuthCollectionSlug, LoginResult
|
|
2
|
-
type
|
|
3
|
-
|
|
4
|
-
username?: never;
|
|
5
|
-
};
|
|
6
|
-
type LoginWithUsername = {
|
|
7
|
-
email?: never;
|
|
8
|
-
username: string;
|
|
9
|
-
};
|
|
10
|
-
type LoginArgs = {
|
|
11
|
-
collection: AuthCollectionSlug;
|
|
12
|
-
config: MaybePromise<SanitizedConfig>;
|
|
13
|
-
password: string;
|
|
14
|
-
} & (LoginWithEmail | LoginWithUsername);
|
|
15
|
-
export declare function login<TSlug extends AuthCollectionSlug>({ collection, config, email, password, username, }: LoginArgs): Promise<LoginResult<TSlug>>;
|
|
16
|
-
export {};
|
|
1
|
+
import type { AuthCollectionSlug, LoginResult } from 'payload';
|
|
2
|
+
import { type LoginArgsWithoutServerAdapter } from 'payload/auth';
|
|
3
|
+
export declare function login<TSlug extends AuthCollectionSlug>(args: LoginArgsWithoutServerAdapter<TSlug>): Promise<LoginResult<TSlug>>;
|
|
17
4
|
//# sourceMappingURL=login.d.ts.map
|
package/dist/auth/login.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,
|
|
1
|
+
{"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
CHANGED
|
@@ -1,50 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
export async function login(
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
import { login as loginFn } from 'payload/auth';
|
|
2
|
+
import { tanstackServerAdapter } from '../adapters/server.js';
|
|
3
|
+
export async function login(args) {
|
|
4
|
+
return loginFn({
|
|
5
|
+
...args,
|
|
6
|
+
serverAdapter: tanstackServerAdapter
|
|
6
7
|
});
|
|
7
|
-
const authConfig = payload.collections[collection]?.config.auth;
|
|
8
|
-
if (!authConfig) {
|
|
9
|
-
throw new Error(`No auth config found for collection: ${collection}`);
|
|
10
|
-
}
|
|
11
|
-
const loginWithUsername = authConfig?.loginWithUsername ?? false;
|
|
12
|
-
if (loginWithUsername) {
|
|
13
|
-
if (loginWithUsername.allowEmailLogin) {
|
|
14
|
-
if (!email && !username) {
|
|
15
|
-
throw new Error('Email or username is required.');
|
|
16
|
-
}
|
|
17
|
-
} else {
|
|
18
|
-
if (!username) {
|
|
19
|
-
throw new Error('Username is required.');
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
} else {
|
|
23
|
-
if (!email) {
|
|
24
|
-
throw new Error('Email is required.');
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
const result = await payload.login({
|
|
28
|
-
collection,
|
|
29
|
-
data: loginWithUsername ? username ? {
|
|
30
|
-
password,
|
|
31
|
-
username
|
|
32
|
-
} : {
|
|
33
|
-
email,
|
|
34
|
-
password
|
|
35
|
-
} : {
|
|
36
|
-
email,
|
|
37
|
-
password
|
|
38
|
-
}
|
|
39
|
-
});
|
|
40
|
-
if (result.token) {
|
|
41
|
-
setPayloadAuthCookie({
|
|
42
|
-
authConfig,
|
|
43
|
-
cookiePrefix: payload.config.cookiePrefix,
|
|
44
|
-
token: result.token
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
|
-
return result;
|
|
48
8
|
}
|
|
49
9
|
|
|
50
10
|
//# sourceMappingURL=login.js.map
|
package/dist/auth/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/auth/login.ts"],"sourcesContent":["import type { AuthCollectionSlug, LoginResult
|
|
1
|
+
{"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 })\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"}
|
package/dist/auth/logout.d.ts
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function logout(
|
|
3
|
-
allSessions?: boolean;
|
|
4
|
-
config: MaybePromise<SanitizedConfig>;
|
|
5
|
-
}): Promise<{
|
|
1
|
+
import type { LogoutArgs } from 'payload/auth';
|
|
2
|
+
export declare function logout(args: Omit<LogoutArgs, 'serverAdapter'>): Promise<{
|
|
6
3
|
message: string;
|
|
7
4
|
success: boolean;
|
|
8
5
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAM9C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,GACtC,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAEhD"}
|
package/dist/auth/logout.js
CHANGED
|
@@ -1,51 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { logout as logoutFn } from 'payload/auth';
|
|
2
|
+
import { tanstackServerAdapter } from '../adapters/server.js';
|
|
3
|
+
export async function logout(args) {
|
|
4
|
+
return logoutFn({
|
|
5
|
+
...args,
|
|
6
|
+
serverAdapter: tanstackServerAdapter
|
|
7
7
|
});
|
|
8
|
-
const request = getRequest();
|
|
9
|
-
const headers = new Headers(request.headers);
|
|
10
|
-
const authResult = await payload.auth({
|
|
11
|
-
headers
|
|
12
|
-
});
|
|
13
|
-
if (!authResult.user) {
|
|
14
|
-
return {
|
|
15
|
-
message: 'User already logged out',
|
|
16
|
-
success: true
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
|
-
const { user } = authResult;
|
|
20
|
-
const req = await createLocalReq({
|
|
21
|
-
user
|
|
22
|
-
}, payload);
|
|
23
|
-
const collection = payload.collections[user.collection];
|
|
24
|
-
if (!collection) {
|
|
25
|
-
return {
|
|
26
|
-
message: 'Collection not found',
|
|
27
|
-
success: false
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
const logoutResult = await logoutOperation({
|
|
31
|
-
allSessions,
|
|
32
|
-
collection,
|
|
33
|
-
req
|
|
34
|
-
});
|
|
35
|
-
if (!logoutResult) {
|
|
36
|
-
return {
|
|
37
|
-
message: 'Logout failed',
|
|
38
|
-
success: false
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
const existingCookie = getExistingAuthToken(payload.config.cookiePrefix);
|
|
42
|
-
if (existingCookie) {
|
|
43
|
-
setResponseHeader('Set-Cookie', `${encodeURIComponent(existingCookie.name)}=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly`);
|
|
44
|
-
}
|
|
45
|
-
return {
|
|
46
|
-
message: 'User logged out successfully',
|
|
47
|
-
success: true
|
|
48
|
-
};
|
|
49
8
|
}
|
|
50
9
|
|
|
51
10
|
//# sourceMappingURL=logout.js.map
|
package/dist/auth/logout.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/auth/logout.ts"],"sourcesContent":["import type {
|
|
1
|
+
{"version":3,"sources":["../../src/auth/logout.ts"],"sourcesContent":["import type { LogoutArgs } from 'payload/auth'\n\nimport { logout as logoutFn } from 'payload/auth'\n\nimport { tanstackServerAdapter } from '../adapters/server.js'\n\nexport async function logout(\n args: Omit<LogoutArgs, 'serverAdapter'>,\n): Promise<{ message: string; success: boolean }> {\n return logoutFn({ ...args, serverAdapter: tanstackServerAdapter })\n}\n"],"names":["logout","logoutFn","tanstackServerAdapter","args","serverAdapter"],"mappings":"AAEA,SAASA,UAAUC,QAAQ,QAAQ,eAAc;AAEjD,SAASC,qBAAqB,QAAQ,wBAAuB;AAE7D,OAAO,eAAeF,OACpBG,IAAuC;IAEvC,OAAOF,SAAS;QAAE,GAAGE,IAAI;QAAEC,eAAeF;IAAsB;AAClE"}
|
package/dist/auth/refresh.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function refresh(
|
|
3
|
-
config: MaybePromise<SanitizedConfig>;
|
|
4
|
-
}): Promise<{
|
|
1
|
+
import type { RefreshArgs } from 'payload/auth';
|
|
2
|
+
export declare function refresh(args: Omit<RefreshArgs, 'serverAdapter'>): Promise<{
|
|
5
3
|
message: string;
|
|
6
4
|
success: boolean;
|
|
7
5
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../src/auth/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../src/auth/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAM/C,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,GACvC,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAEhD"}
|
package/dist/auth/refresh.js
CHANGED
|
@@ -1,53 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
config
|
|
1
|
+
import { refresh as refreshFn } from 'payload/auth';
|
|
2
|
+
import { tanstackServerAdapter } from '../adapters/server.js';
|
|
3
|
+
export async function refresh(args) {
|
|
4
|
+
return refreshFn({
|
|
5
|
+
...args,
|
|
6
|
+
serverAdapter: tanstackServerAdapter
|
|
8
7
|
});
|
|
9
|
-
const request = getRequest();
|
|
10
|
-
const headers = new Headers(request.headers);
|
|
11
|
-
const result = await payload.auth({
|
|
12
|
-
headers
|
|
13
|
-
});
|
|
14
|
-
if (!result.user) {
|
|
15
|
-
throw new Error('Cannot refresh token: user not authenticated');
|
|
16
|
-
}
|
|
17
|
-
const existingCookie = getExistingAuthToken(payload.config.cookiePrefix);
|
|
18
|
-
if (!existingCookie) {
|
|
19
|
-
return {
|
|
20
|
-
message: 'No valid token found to refresh',
|
|
21
|
-
success: false
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
const collection = result.user.collection;
|
|
25
|
-
const collectionConfig = payload.collections[collection];
|
|
26
|
-
if (!collectionConfig?.config.auth) {
|
|
27
|
-
throw new Error(`No auth config found for collection: ${collection}`);
|
|
28
|
-
}
|
|
29
|
-
const req = await createLocalReq({
|
|
30
|
-
user: result.user
|
|
31
|
-
}, payload);
|
|
32
|
-
const refreshResult = await refreshOperation({
|
|
33
|
-
collection: collectionConfig,
|
|
34
|
-
req
|
|
35
|
-
});
|
|
36
|
-
if (!refreshResult) {
|
|
37
|
-
return {
|
|
38
|
-
message: 'Token refresh failed',
|
|
39
|
-
success: false
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
setPayloadAuthCookie({
|
|
43
|
-
authConfig: collectionConfig.config.auth,
|
|
44
|
-
cookiePrefix: payload.config.cookiePrefix,
|
|
45
|
-
token: refreshResult.refreshedToken
|
|
46
|
-
});
|
|
47
|
-
return {
|
|
48
|
-
message: 'Token refreshed successfully',
|
|
49
|
-
success: true
|
|
50
|
-
};
|
|
51
8
|
}
|
|
52
9
|
|
|
53
10
|
//# sourceMappingURL=refresh.js.map
|
package/dist/auth/refresh.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/auth/refresh.ts"],"sourcesContent":["import type {
|
|
1
|
+
{"version":3,"sources":["../../src/auth/refresh.ts"],"sourcesContent":["import type { RefreshArgs } from 'payload/auth'\n\nimport { refresh as refreshFn } from 'payload/auth'\n\nimport { tanstackServerAdapter } from '../adapters/server.js'\n\nexport async function refresh(\n args: Omit<RefreshArgs, 'serverAdapter'>,\n): Promise<{ message: string; success: boolean }> {\n return refreshFn({ ...args, serverAdapter: tanstackServerAdapter })\n}\n"],"names":["refresh","refreshFn","tanstackServerAdapter","args","serverAdapter"],"mappings":"AAEA,SAASA,WAAWC,SAAS,QAAQ,eAAc;AAEnD,SAASC,qBAAqB,QAAQ,wBAAuB;AAE7D,OAAO,eAAeF,QACpBG,IAAwC;IAExC,OAAOF,UAAU;QAAE,GAAGE,IAAI;QAAEC,eAAeF;IAAsB;AACnE"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/exports/client/layout.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/exports/client/layout.ts"],"sourcesContent":["'use client'\n\nexport { PayloadRootProviders } from '../../adapters/layout/RootProviders/index.js'\n"],"names":["PayloadRootProviders"],"mappings":"AAAA;AAEA,SAASA,oBAAoB,QAAQ,+CAA8C"}
|
package/dist/exports/client.d.ts
CHANGED
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
export {
|
|
2
|
-
export {
|
|
3
|
-
export {
|
|
4
|
-
export { type AdminLoad, payloadAdminIndexRoute, payloadAdminSplatRoute, } from '../routes/adminRoutes.js';
|
|
5
|
-
export { type LayoutLoad, payloadLayoutRoute } from '../routes/layoutRoute.js';
|
|
6
|
-
export { viteDevReloadStrategy } from '../utilities/devReloadStrategy.js';
|
|
7
|
-
export { createServerFunctionClient, stripUnserializable, } from '../utilities/serverFunctionClient.js';
|
|
1
|
+
export { type LayoutLoad, PayloadAdminShell, type PayloadAdminShellProps, payloadLayoutRoute, withPayloadRoot, type WithPayloadRootOptions, } from '../adapters/layout/index.js';
|
|
2
|
+
export { type AdminLoad, payloadAdminIndexRoute, payloadAdminSplatRoute, } from '../adapters/views/index.js';
|
|
3
|
+
export { createServerFunctionClient } from '../utilities/serverFunctionClient.js';
|
|
8
4
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,UAAU,EACf,iBAAiB,EACjB,KAAK,sBAAsB,EAC3B,kBAAkB,EAClB,eAAe,EACf,KAAK,sBAAsB,GAC5B,MAAM,6BAA6B,CAAA;AACpC,OAAO,EACL,KAAK,SAAS,EACd,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAA"}
|
package/dist/exports/client.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
export {
|
|
3
|
-
export {
|
|
4
|
-
export {
|
|
5
|
-
export { payloadAdminIndexRoute, payloadAdminSplatRoute } from '../routes/adminRoutes.js';
|
|
6
|
-
export { payloadLayoutRoute } from '../routes/layoutRoute.js';
|
|
7
|
-
export { viteDevReloadStrategy } from '../utilities/devReloadStrategy.js';
|
|
8
|
-
export { createServerFunctionClient, stripUnserializable } from '../utilities/serverFunctionClient.js';
|
|
2
|
+
export { PayloadAdminShell, payloadLayoutRoute, withPayloadRoot } from '../adapters/layout/index.js';
|
|
3
|
+
export { payloadAdminIndexRoute, payloadAdminSplatRoute } from '../adapters/views/index.js';
|
|
4
|
+
export { createServerFunctionClient } from '../utilities/serverFunctionClient.js';
|
|
9
5
|
|
|
10
6
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["'use client'\n\nexport {
|
|
1
|
+
{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["'use client'\n\nexport {\n type LayoutLoad,\n PayloadAdminShell,\n type PayloadAdminShellProps,\n payloadLayoutRoute,\n withPayloadRoot,\n type WithPayloadRootOptions,\n} from '../adapters/layout/index.js'\nexport {\n type AdminLoad,\n payloadAdminIndexRoute,\n payloadAdminSplatRoute,\n} from '../adapters/views/index.js'\nexport { createServerFunctionClient } from '../utilities/serverFunctionClient.js'\n"],"names":["PayloadAdminShell","payloadLayoutRoute","withPayloadRoot","payloadAdminIndexRoute","payloadAdminSplatRoute","createServerFunctionClient"],"mappings":"AAAA;AAEA,SAEEA,iBAAiB,EAEjBC,kBAAkB,EAClBC,eAAe,QAEV,8BAA6B;AACpC,SAEEC,sBAAsB,EACtBC,sBAAsB,QACjB,6BAA4B;AACnC,SAASC,0BAA0B,QAAQ,uCAAsC"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
export { getLayoutData } from '../
|
|
2
|
-
export type { GetLayoutDataArgs } from '../
|
|
3
|
-
export { RootLayout } from '../layouts/Root/index.js';
|
|
4
|
-
export type { RootLayoutData, RootLayoutProps } from '../layouts/Root/index.js';
|
|
5
|
-
export { loadLayoutData } from '../utilities/loadLayoutData.js';
|
|
1
|
+
export { getLayoutData, loadLayoutData } from '../adapters/layout/server.js';
|
|
2
|
+
export type { GetLayoutDataArgs, LoadLayoutDataResult, RootLayoutData, } from '../adapters/layout/server.js';
|
|
6
3
|
//# sourceMappingURL=layouts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layouts.d.ts","sourceRoot":"","sources":["../../src/exports/layouts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"layouts.d.ts","sourceRoot":"","sources":["../../src/exports/layouts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC5E,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,cAAc,GACf,MAAM,8BAA8B,CAAA"}
|
package/dist/exports/layouts.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
export { getLayoutData } from '../
|
|
2
|
-
export { RootLayout } from '../layouts/Root/index.js';
|
|
3
|
-
export { loadLayoutData } from '../utilities/loadLayoutData.js';
|
|
1
|
+
export { getLayoutData, loadLayoutData } from '../adapters/layout/server.js';
|
|
4
2
|
|
|
5
3
|
//# sourceMappingURL=layouts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/exports/layouts.ts"],"sourcesContent":["export { getLayoutData } from '../
|
|
1
|
+
{"version":3,"sources":["../../src/exports/layouts.ts"],"sourcesContent":["export { getLayoutData, loadLayoutData } from '../adapters/layout/server.js'\nexport type {\n GetLayoutDataArgs,\n LoadLayoutDataResult,\n RootLayoutData,\n} from '../adapters/layout/server.js'\n"],"names":["getLayoutData","loadLayoutData"],"mappings":"AAAA,SAASA,aAAa,EAAEC,cAAc,QAAQ,+BAA8B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/exports/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/exports/routes.ts"],"sourcesContent":["export { payloadApiHandlers } from '../routes/rest/index.js'\n"],"names":["payloadApiHandlers"],"mappings":"AAAA,SAASA,kBAAkB,QAAQ,0BAAyB"}
|