@payloadcms/tanstack-start 4.0.0-internal.a6582c6 → 4.0.0-internal.b6f3b9a
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/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/elements/RouterAdapter/index.d.ts.map +1 -1
- package/dist/elements/RouterAdapter/index.js +16 -3
- package/dist/elements/RouterAdapter/index.js.map +1 -1
- package/dist/routes/adminRoutes.d.ts +4 -3
- package/dist/routes/adminRoutes.d.ts.map +1 -1
- package/dist/routes/adminRoutes.js +28 -13
- package/dist/routes/adminRoutes.js.map +1 -1
- package/package.json +5 -5
- 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/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/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 '../utilities/serverAdapter.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 '../utilities/serverAdapter.server.js'\n\nexport async function login<TSlug extends AuthCollectionSlug>(\n args: LoginArgsWithoutServerAdapter<TSlug>,\n): Promise<LoginResult<TSlug>> {\n return loginFn({ ...args, serverAdapter: tanstackServerAdapter } as LoginArgs<TSlug>)\n}\n"],"names":["login","loginFn","tanstackServerAdapter","args","serverAdapter"],"mappings":"AAEA,SAA6DA,SAASC,OAAO,QAAQ,eAAc;AAEnG,SAASC,qBAAqB,QAAQ,uCAAsC;AAE5E,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 '../utilities/serverAdapter.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 '../utilities/serverAdapter.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,uCAAsC;AAE5E,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 '../utilities/serverAdapter.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 '../utilities/serverAdapter.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,uCAAsC;AAE5E,OAAO,eAAeF,QACpBG,IAAwC;IAExC,OAAOF,UAAU;QAAE,GAAGE,IAAI;QAAEC,eAAeF;IAAsB;AACnE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/RouterAdapter/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/RouterAdapter/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,SAAS,CAAA;AA6DvE,eAAO,MAAM,qBAAqB,EAAE,sBAmHnC,CAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
-
import { RouterAdapterContext } from '@payloadcms/ui';
|
|
4
|
-
import { Link as TanStackLink, useLocation, useParams, useRouter } from '@tanstack/react-router';
|
|
3
|
+
import { RouterAdapterContext, useRouteTransition } from '@payloadcms/ui';
|
|
4
|
+
import { Link as TanStackLink, useLocation, useParams, useRouter, useRouterState } from '@tanstack/react-router';
|
|
5
5
|
import * as qs from 'qs-esm';
|
|
6
|
-
import React, { useCallback, useMemo } from 'react';
|
|
6
|
+
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
7
7
|
const normalizeNavigationTarget = ({ path, pathname, search })=>{
|
|
8
8
|
if (path.startsWith('http')) {
|
|
9
9
|
const url = new URL(path);
|
|
@@ -34,6 +34,19 @@ export const TanStackRouterAdapter = ({ children })=>{
|
|
|
34
34
|
const params = useParams({
|
|
35
35
|
strict: false
|
|
36
36
|
});
|
|
37
|
+
const isRouterLoading = useRouterState({
|
|
38
|
+
select: (state)=>state.isLoading
|
|
39
|
+
});
|
|
40
|
+
const { beginRouteTransition } = useRouteTransition();
|
|
41
|
+
useEffect(()=>{
|
|
42
|
+
if (!isRouterLoading) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
return beginRouteTransition();
|
|
46
|
+
}, [
|
|
47
|
+
beginRouteTransition,
|
|
48
|
+
isRouterLoading
|
|
49
|
+
]);
|
|
37
50
|
const adaptedParams = useMemo(()=>{
|
|
38
51
|
const adapted = {
|
|
39
52
|
...params
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/elements/RouterAdapter/index.tsx"],"sourcesContent":["'use client'\n\nimport type { RouterAdapterContextValue } from '@payloadcms/ui'\nimport type { LinkAdapterProps, RouterAdapterComponent } from 'payload'\n\nimport { RouterAdapterContext } from '@payloadcms/ui'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../../src/elements/RouterAdapter/index.tsx"],"sourcesContent":["'use client'\n\nimport type { RouterAdapterContextValue } from '@payloadcms/ui'\nimport type { LinkAdapterProps, RouterAdapterComponent } from 'payload'\n\nimport { RouterAdapterContext, useRouteTransition } from '@payloadcms/ui'\nimport {\n Link as TanStackLink,\n useLocation,\n useParams,\n useRouter,\n useRouterState,\n} from '@tanstack/react-router'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useMemo } from 'react'\n\nconst normalizeNavigationTarget = ({\n path,\n pathname,\n search,\n}: {\n path: string\n pathname: string\n search: string\n}) => {\n if (path.startsWith('http')) {\n const url = new URL(path)\n return `${url.pathname}${url.search}${url.hash}`\n }\n\n if (path.startsWith('?')) {\n return `${pathname}${path}`\n }\n\n if (path.startsWith('#')) {\n return `${pathname}${search}${path}`\n }\n\n return path\n}\n\nconst TanStackLinkAdapter: React.FC<LinkAdapterProps> = ({\n children,\n href,\n prefetch,\n ref,\n replace,\n scroll,\n ...rest\n}) => {\n return (\n <TanStackLink\n preload={prefetch === false ? false : 'intent'}\n ref={ref}\n replace={replace}\n resetScroll={scroll}\n to={href}\n {...rest}\n >\n {children}\n </TanStackLink>\n )\n}\n\nexport const TanStackRouterAdapter: RouterAdapterComponent = ({ children }) => {\n const router = useRouter()\n const location = useLocation()\n const params = useParams({ strict: false })\n const isRouterLoading = useRouterState({ select: (state) => state.isLoading })\n const { beginRouteTransition } = useRouteTransition()\n\n useEffect(() => {\n if (!isRouterLoading) {\n return\n }\n\n return beginRouteTransition()\n }, [beginRouteTransition, isRouterLoading])\n\n const adaptedParams = useMemo(() => {\n const adapted: Record<string, string | string[]> = { ...params }\n\n if ('_splat' in params && typeof params._splat === 'string') {\n adapted.segments = params._splat.split('/').filter(Boolean)\n }\n\n return adapted\n }, [params])\n\n // Split a target into `to` (pathname) + a parsed `search` object, so the\n // router serializes the query via its `stringifySearch` (qs, bracket-encoded)\n // rather than embedding the raw string in `to`. Navigating with a string `to`\n // leaves the search *unencoded* in `window.location.search`\n // (e.g. `where[or][0]…`), which then never matches Payload's `qs.stringify`\n // output (`where%5Bor%5D…`) — breaking the list-view `syncPropsToURL` guard,\n // which compares the two and would otherwise clobber optimistic query state\n // (e.g. an in-progress filter condition) on every navigation.\n const toNavOptions = useCallback((path: string) => {\n const relativePath = normalizeNavigationTarget({\n path,\n pathname: window.location.pathname,\n search: window.location.search,\n })\n\n const queryIndex = relativePath.indexOf('?')\n\n if (queryIndex === -1) {\n return { to: relativePath }\n }\n\n const searchObject = qs.parse(relativePath.slice(queryIndex + 1), {\n depth: 10,\n ignoreQueryPrefix: true,\n })\n\n // Function form replaces the search entirely (no merge with current search).\n return { search: () => searchObject, to: relativePath.slice(0, queryIndex) }\n }, [])\n\n const back = useCallback(() => router.history.back(), [router])\n\n const push = useCallback(\n (path: string, options?: { scroll?: boolean }) => {\n void router.navigate({ ...toNavOptions(path), resetScroll: options?.scroll })\n },\n [router, toNavOptions],\n )\n\n const refresh = useCallback(() => {\n void router.invalidate()\n }, [router])\n\n const replace = useCallback(\n (path: string, options?: { scroll?: boolean }) => {\n void router.navigate({ ...toNavOptions(path), replace: true, resetScroll: options?.scroll })\n },\n [router, toNavOptions],\n )\n\n // Mirror Next.js' router behavior to allow syncing client state to the URL without triggering a second server load.\n // TanStack's browser history monkeypatches `window.history.replaceState` and notifies `router.load` on every call.\n // Use `_ignoreSubscribers` to suppresses that notification — the same flag TanStack uses internally when flushing history.\n const replaceState = useCallback(\n (url: string) => {\n const { history } = router\n history._ignoreSubscribers = true\n\n try {\n window.history.replaceState(null, '', url)\n } finally {\n history._ignoreSubscribers = false\n }\n },\n [router],\n )\n\n const adaptedRouter = useMemo(\n () => ({ back, push, refresh, replace, replaceState }),\n [back, push, refresh, replace, replaceState],\n )\n\n // `location.searchStr` is the serialized query string; `location.search` is\n // the parsed object (a nested structure once the router uses `qs` for search\n // serialization), which `URLSearchParams` cannot consume. Build from the\n // string so Payload's `parseSearchParams` re-parses the bracket notation.\n const searchParams = useMemo(() => new URLSearchParams(location.searchStr), [location.searchStr])\n\n const value: RouterAdapterContextValue = useMemo(\n () => ({\n Link: TanStackLinkAdapter,\n params: adaptedParams,\n pathname: location.pathname,\n router: adaptedRouter,\n searchParams,\n }),\n [adaptedParams, location.pathname, adaptedRouter, searchParams],\n )\n\n return <RouterAdapterContext value={value}>{children}</RouterAdapterContext>\n}\n"],"names":["RouterAdapterContext","useRouteTransition","Link","TanStackLink","useLocation","useParams","useRouter","useRouterState","qs","React","useCallback","useEffect","useMemo","normalizeNavigationTarget","path","pathname","search","startsWith","url","URL","hash","TanStackLinkAdapter","children","href","prefetch","ref","replace","scroll","rest","preload","resetScroll","to","TanStackRouterAdapter","router","location","params","strict","isRouterLoading","select","state","isLoading","beginRouteTransition","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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"}
|
|
@@ -49,6 +49,7 @@ export declare function payloadAdminSplatRoute({ load }: {
|
|
|
49
49
|
title: string;
|
|
50
50
|
})[];
|
|
51
51
|
};
|
|
52
|
+
notFoundComponent: typeof AdminNotFound;
|
|
52
53
|
loader: {
|
|
53
54
|
handler: ({ location, params }: {
|
|
54
55
|
location: any;
|
|
@@ -62,11 +63,10 @@ export declare function payloadAdminSplatRoute({ load }: {
|
|
|
62
63
|
searchKey: string;
|
|
63
64
|
};
|
|
64
65
|
validateSearch: (search: Record<string, unknown>) => Record<string, unknown>;
|
|
65
|
-
notFoundComponent: typeof AdminNotFound;
|
|
66
66
|
};
|
|
67
67
|
/**
|
|
68
|
-
* Route options for the admin index route (`/_payload/admin/`).
|
|
69
|
-
*
|
|
68
|
+
* Route options for the admin index route (`/_payload/admin/`). Not-found
|
|
69
|
+
* results omit the RSC payload and fall back to `NotFoundClient`.
|
|
70
70
|
*/
|
|
71
71
|
export declare function payloadAdminIndexRoute({ load }: {
|
|
72
72
|
load: AdminLoad;
|
|
@@ -94,6 +94,7 @@ export declare function payloadAdminIndexRoute({ load }: {
|
|
|
94
94
|
title: string;
|
|
95
95
|
})[];
|
|
96
96
|
};
|
|
97
|
+
notFoundComponent: typeof AdminNotFound;
|
|
97
98
|
loader: {
|
|
98
99
|
handler: ({ location, params }: {
|
|
99
100
|
location: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminRoutes.d.ts","sourceRoot":"","sources":["../../src/routes/adminRoutes.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAY,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"adminRoutes.d.ts","sourceRoot":"","sources":["../../src/routes/adminRoutes.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAY,KAAK,SAAS,EAA+B,MAAM,OAAO,CAAA;AAI7E;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE;IAC7B,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAAE,CAAA;CACpE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAclB,iBAAS,SAAS,gCAqBjB;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,SAAS,CAAA;KAAE,CAAA;CAAE,+BAMrF;AAiDD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;;2BArC3C;QAAE,UAAU,CAAC,EAAE,GAAG,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;QAUzC,OAAO,yBAA+B;YAAE,QAAQ,EAAE,GAAG,CAAC;YAAC,MAAM,EAAE,GAAG,CAAA;SAAE;QAYpE,eAAe;;6BAGQ;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;;6BAGQ;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE;QAC1D,SAAS;;6BAEc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EA2BjD"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
-
import { NotFoundClient } from '@payloadcms/ui';
|
|
3
|
+
import { NotFoundClient, useRouteTransition } from '@payloadcms/ui';
|
|
4
4
|
import { notFound, redirect, useLoaderData } from '@tanstack/react-router';
|
|
5
|
-
import { Fragment } from 'react';
|
|
5
|
+
import { Fragment, useDeferredValue, useEffect } from 'react';
|
|
6
6
|
import { getAdminMeta } from '../utilities/meta.js';
|
|
7
7
|
const searchToRecord = (searchStr)=>Object.fromEntries(new URLSearchParams(searchStr));
|
|
8
8
|
const runLoader = async (load, splat, searchStr)=>{
|
|
@@ -26,8 +26,23 @@ function AdminPage() {
|
|
|
26
26
|
const data = useLoaderData({
|
|
27
27
|
strict: false
|
|
28
28
|
});
|
|
29
|
+
// Route state comes from an external store, so a new RSC payload that suspends
|
|
30
|
+
// on code-split client references can reveal the router's null fallback.
|
|
31
|
+
// Keep the current payload painted until the next one is renderable.
|
|
32
|
+
const rscPayload = useDeferredValue(data?.rscPayload);
|
|
33
|
+
const { beginRouteTransition } = useRouteTransition();
|
|
34
|
+
const isRscPayloadDeferred = rscPayload !== data?.rscPayload;
|
|
35
|
+
useEffect(()=>{
|
|
36
|
+
if (!isRscPayloadDeferred) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
return beginRouteTransition();
|
|
40
|
+
}, [
|
|
41
|
+
beginRouteTransition,
|
|
42
|
+
isRscPayloadDeferred
|
|
43
|
+
]);
|
|
29
44
|
return /*#__PURE__*/ _jsx(Fragment, {
|
|
30
|
-
children:
|
|
45
|
+
children: rscPayload
|
|
31
46
|
});
|
|
32
47
|
}
|
|
33
48
|
function AdminNotFound(props) {
|
|
@@ -42,6 +57,9 @@ function AdminNotFound(props) {
|
|
|
42
57
|
const adminRouteOptions = ({ forwardNotFoundPayload, load, resolveSplat })=>({
|
|
43
58
|
component: AdminPage,
|
|
44
59
|
head: ({ loaderData })=>getAdminMeta(loaderData?.metadata),
|
|
60
|
+
// Both admin routes must use the same boundary type so index ↔ splat
|
|
61
|
+
// navigation preserves the existing admin subtree.
|
|
62
|
+
notFoundComponent: AdminNotFound,
|
|
45
63
|
// `staleReloadMode: 'blocking'` (a property of the loader *object*, not a
|
|
46
64
|
// sibling route option — router-core only reads it off a non-function loader)
|
|
47
65
|
// makes stale-match revalidation await the fresh loader before committing,
|
|
@@ -75,18 +93,15 @@ const adminRouteOptions = ({ forwardNotFoundPayload, load, resolveSplat })=>({
|
|
|
75
93
|
* `data.rscPayload`) for unknown/access-denied routes, falling back to the bare
|
|
76
94
|
* client view.
|
|
77
95
|
*/ export function payloadAdminSplatRoute({ load }) {
|
|
78
|
-
return {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}),
|
|
84
|
-
notFoundComponent: AdminNotFound
|
|
85
|
-
};
|
|
96
|
+
return adminRouteOptions({
|
|
97
|
+
forwardNotFoundPayload: true,
|
|
98
|
+
load,
|
|
99
|
+
resolveSplat: (params)=>params._splat ?? ''
|
|
100
|
+
});
|
|
86
101
|
}
|
|
87
102
|
/**
|
|
88
|
-
* Route options for the admin index route (`/_payload/admin/`).
|
|
89
|
-
*
|
|
103
|
+
* Route options for the admin index route (`/_payload/admin/`). Not-found
|
|
104
|
+
* results omit the RSC payload and fall back to `NotFoundClient`.
|
|
90
105
|
*/ export function payloadAdminIndexRoute({ load }) {
|
|
91
106
|
return adminRouteOptions({
|
|
92
107
|
forwardNotFoundPayload: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/routes/adminRoutes.tsx"],"sourcesContent":["'use client'\n\nimport { NotFoundClient } from '@payloadcms/ui'\nimport { notFound, redirect, useLoaderData } from '@tanstack/react-router'\nimport { Fragment, type ReactNode } from 'react'\n\nimport { getAdminMeta } from '../utilities/meta.js'\n\n/**\n * Loader supplied by the app — a TanStack Start `createServerFn` that delegates\n * to `loadAdminPage`. Typed loosely because the server-fn's call signature is\n * generated by the Start compiler.\n */\nexport type AdminLoad = (opts: {\n data: { _splat: string; search: Record<string, string | string[]> }\n}) => Promise<any>\n\nconst searchToRecord = (searchStr: string): Record<string, string | string[]> =>\n Object.fromEntries(new URLSearchParams(searchStr)) as Record<string, string | string[]>\n\nconst runLoader = async (load: AdminLoad, splat: string, searchStr: string) => {\n const data = await load({ data: { _splat: splat, search: searchToRecord(searchStr) } })\n if (data?._redirect) {\n // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing redirect objects\n throw redirect({ to: data._redirect })\n }\n return data\n}\n\nfunction AdminPage() {\n // Note: React key intentionally omitted here so the persistent template (nav, header) doesn't remount and flash on navigation.\n // The per-route view key is attached server-side to the view subtree instead, via `renderRoot`'s `key` in `loadAdminPage`.\n const data = useLoaderData({ strict: false })\n return <Fragment>{
|
|
1
|
+
{"version":3,"sources":["../../src/routes/adminRoutes.tsx"],"sourcesContent":["'use client'\n\nimport { NotFoundClient, useRouteTransition } from '@payloadcms/ui'\nimport { notFound, redirect, useLoaderData } from '@tanstack/react-router'\nimport { Fragment, type ReactNode, useDeferredValue, useEffect } from 'react'\n\nimport { getAdminMeta } from '../utilities/meta.js'\n\n/**\n * Loader supplied by the app — a TanStack Start `createServerFn` that delegates\n * to `loadAdminPage`. Typed loosely because the server-fn's call signature is\n * generated by the Start compiler.\n */\nexport type AdminLoad = (opts: {\n data: { _splat: string; search: Record<string, string | string[]> }\n}) => Promise<any>\n\nconst searchToRecord = (searchStr: string): Record<string, string | string[]> =>\n Object.fromEntries(new URLSearchParams(searchStr)) as Record<string, string | string[]>\n\nconst runLoader = async (load: AdminLoad, splat: string, searchStr: string) => {\n const data = await load({ data: { _splat: splat, search: searchToRecord(searchStr) } })\n if (data?._redirect) {\n // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing redirect objects\n throw redirect({ to: data._redirect })\n }\n return data\n}\n\nfunction AdminPage() {\n // Note: React key intentionally omitted here so the persistent template (nav, header) doesn't remount and flash on navigation.\n // The per-route view key is attached server-side to the view subtree instead, via `renderRoot`'s `key` in `loadAdminPage`.\n const data = useLoaderData({ strict: false })\n\n // Route state comes from an external store, so a new RSC payload that suspends\n // on code-split client references can reveal the router's null fallback.\n // Keep the current payload painted until the next one is renderable.\n const rscPayload = useDeferredValue(data?.rscPayload)\n const { beginRouteTransition } = useRouteTransition()\n const isRscPayloadDeferred = rscPayload !== data?.rscPayload\n\n useEffect(() => {\n if (!isRscPayloadDeferred) {\n return\n }\n\n return beginRouteTransition()\n }, [beginRouteTransition, isRscPayloadDeferred])\n\n return <Fragment>{rscPayload}</Fragment>\n}\n\nfunction AdminNotFound(props: { data?: { routeKey?: string; rscPayload?: ReactNode } }) {\n const rscPayload = props?.data?.rscPayload\n if (!rscPayload) {\n return <NotFoundClient />\n }\n return <Fragment key={props?.data?.routeKey}>{rscPayload}</Fragment>\n}\n\nconst adminRouteOptions = ({\n forwardNotFoundPayload,\n load,\n resolveSplat,\n}: {\n /**\n * Ships the server-rendered NotFound tree through `notFound()`'s `data` so a\n * `notFoundComponent` can render it with the full admin chrome. Routes without\n * one throw bare.\n */\n forwardNotFoundPayload: boolean\n load: AdminLoad\n /** The route's splat, i.e. the path after `/admin/`. */\n resolveSplat: (params: any) => string\n}) => ({\n component: AdminPage,\n head: ({ loaderData }: { loaderData?: any }) => getAdminMeta(loaderData?.metadata),\n // Both admin routes must use the same boundary type so index ↔ splat\n // navigation preserves the existing admin subtree.\n notFoundComponent: AdminNotFound,\n // `staleReloadMode: 'blocking'` (a property of the loader *object*, not a\n // sibling route option — router-core only reads it off a non-function loader)\n // makes stale-match revalidation await the fresh loader before committing,\n // instead of the default background SWR that flashes the pre-navigation list\n // (e.g. a just-created doc missing) until the reload lands.\n loader: {\n handler: async ({ location, params }: { location: any; params: any }) => {\n const data = await runLoader(load, resolveSplat(params), location.searchStr)\n if (data?._notFound) {\n // eslint-disable-next-line @typescript-eslint/only-throw-error -- TanStack Router requires throwing notFound objects\n throw notFound(\n forwardNotFoundPayload\n ? { data: { routeKey: data.routeKey, rscPayload: data.rscPayload } }\n : undefined,\n )\n }\n return data\n },\n staleReloadMode: 'blocking',\n },\n // Surface query params in `loaderDeps` so `?locale=es` re-runs the loader.\n loaderDeps: ({ search }: { search: Record<string, unknown> }) => ({\n searchKey: JSON.stringify(search),\n }),\n validateSearch: (search: Record<string, unknown>) => search,\n})\n\n/**\n * Route options for the admin splat route (`/_payload/admin/$`). Renders Payload's\n * server-built NotFound page (shipped via the `notFound()` error's\n * `data.rscPayload`) for unknown/access-denied routes, falling back to the bare\n * client view.\n */\nexport function payloadAdminSplatRoute({ load }: { load: AdminLoad }) {\n return adminRouteOptions({\n forwardNotFoundPayload: true,\n load,\n resolveSplat: (params) => params._splat ?? '',\n })\n}\n\n/**\n * Route options for the admin index route (`/_payload/admin/`). Not-found\n * results omit the RSC payload and fall back to `NotFoundClient`.\n */\nexport function payloadAdminIndexRoute({ load }: { load: AdminLoad }) {\n return adminRouteOptions({\n forwardNotFoundPayload: false,\n load,\n resolveSplat: () => '',\n })\n}\n"],"names":["NotFoundClient","useRouteTransition","notFound","redirect","useLoaderData","Fragment","useDeferredValue","useEffect","getAdminMeta","searchToRecord","searchStr","Object","fromEntries","URLSearchParams","runLoader","load","splat","data","_splat","search","_redirect","to","AdminPage","strict","rscPayload","beginRouteTransition","isRscPayloadDeferred","AdminNotFound","props","routeKey","adminRouteOptions","forwardNotFoundPayload","resolveSplat","component","head","loaderData","metadata","notFoundComponent","loader","handler","location","params","_notFound","undefined","staleReloadMode","loaderDeps","searchKey","JSON","stringify","validateSearch","payloadAdminSplatRoute","payloadAdminIndexRoute"],"mappings":"AAAA;;AAEA,SAASA,cAAc,EAAEC,kBAAkB,QAAQ,iBAAgB;AACnE,SAASC,QAAQ,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,yBAAwB;AAC1E,SAASC,QAAQ,EAAkBC,gBAAgB,EAAEC,SAAS,QAAQ,QAAO;AAE7E,SAASC,YAAY,QAAQ,uBAAsB;AAWnD,MAAMC,iBAAiB,CAACC,YACtBC,OAAOC,WAAW,CAAC,IAAIC,gBAAgBH;AAEzC,MAAMI,YAAY,OAAOC,MAAiBC,OAAeN;IACvD,MAAMO,OAAO,MAAMF,KAAK;QAAEE,MAAM;YAAEC,QAAQF;YAAOG,QAAQV,eAAeC;QAAW;IAAE;IACrF,IAAIO,MAAMG,WAAW;QACnB,qHAAqH;QACrH,MAAMjB,SAAS;YAAEkB,IAAIJ,KAAKG,SAAS;QAAC;IACtC;IACA,OAAOH;AACT;AAEA,SAASK;IACP,+HAA+H;IAC/H,2HAA2H;IAC3H,MAAML,OAAOb,cAAc;QAAEmB,QAAQ;IAAM;IAE3C,+EAA+E;IAC/E,yEAAyE;IACzE,qEAAqE;IACrE,MAAMC,aAAalB,iBAAiBW,MAAMO;IAC1C,MAAM,EAAEC,oBAAoB,EAAE,GAAGxB;IACjC,MAAMyB,uBAAuBF,eAAeP,MAAMO;IAElDjB,UAAU;QACR,IAAI,CAACmB,sBAAsB;YACzB;QACF;QAEA,OAAOD;IACT,GAAG;QAACA;QAAsBC;KAAqB;IAE/C,qBAAO,KAACrB;kBAAUmB;;AACpB;AAEA,SAASG,cAAcC,KAA+D;IACpF,MAAMJ,aAAaI,OAAOX,MAAMO;IAChC,IAAI,CAACA,YAAY;QACf,qBAAO,KAACxB;IACV;IACA,qBAAO,KAACK;kBAAsCmB;OAAxBI,OAAOX,MAAMY;AACrC;AAEA,MAAMC,oBAAoB,CAAC,EACzBC,sBAAsB,EACtBhB,IAAI,EACJiB,YAAY,EAWb,GAAM,CAAA;QACLC,WAAWX;QACXY,MAAM,CAAC,EAAEC,UAAU,EAAwB,GAAK3B,aAAa2B,YAAYC;QACzE,qEAAqE;QACrE,mDAAmD;QACnDC,mBAAmBV;QACnB,0EAA0E;QAC1E,8EAA8E;QAC9E,2EAA2E;QAC3E,6EAA6E;QAC7E,4DAA4D;QAC5DW,QAAQ;YACNC,SAAS,OAAO,EAAEC,QAAQ,EAAEC,MAAM,EAAkC;gBAClE,MAAMxB,OAAO,MAAMH,UAAUC,MAAMiB,aAAaS,SAASD,SAAS9B,SAAS;gBAC3E,IAAIO,MAAMyB,WAAW;oBACnB,qHAAqH;oBACrH,MAAMxC,SACJ6B,yBACI;wBAAEd,MAAM;4BAAEY,UAAUZ,KAAKY,QAAQ;4BAAEL,YAAYP,KAAKO,UAAU;wBAAC;oBAAE,IACjEmB;gBAER;gBACA,OAAO1B;YACT;YACA2B,iBAAiB;QACnB;QACA,2EAA2E;QAC3EC,YAAY,CAAC,EAAE1B,MAAM,EAAuC,GAAM,CAAA;gBAChE2B,WAAWC,KAAKC,SAAS,CAAC7B;YAC5B,CAAA;QACA8B,gBAAgB,CAAC9B,SAAoCA;IACvD,CAAA;AAEA;;;;;CAKC,GACD,OAAO,SAAS+B,uBAAuB,EAAEnC,IAAI,EAAuB;IAClE,OAAOe,kBAAkB;QACvBC,wBAAwB;QACxBhB;QACAiB,cAAc,CAACS,SAAWA,OAAOvB,MAAM,IAAI;IAC7C;AACF;AAEA;;;CAGC,GACD,OAAO,SAASiC,uBAAuB,EAAEpC,IAAI,EAAuB;IAClE,OAAOe,kBAAkB;QACvBC,wBAAwB;QACxBhB;QACAiB,cAAc,IAAM;IACtB;AACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/tanstack-start",
|
|
3
|
-
"version": "4.0.0-internal.
|
|
3
|
+
"version": "4.0.0-internal.b6f3b9a",
|
|
4
4
|
"description": "TanStack Start framework adapter for Payload",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -58,8 +58,8 @@
|
|
|
58
58
|
],
|
|
59
59
|
"dependencies": {
|
|
60
60
|
"qs-esm": "^7.0.2",
|
|
61
|
-
"@payloadcms/
|
|
62
|
-
"@payloadcms/
|
|
61
|
+
"@payloadcms/ui": "4.0.0-internal.b6f3b9a",
|
|
62
|
+
"@payloadcms/translations": "4.0.0-internal.b6f3b9a"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"@tanstack/react-router": "^1.120.0",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"react": "^19.0.0",
|
|
72
72
|
"react-dom": "^19.0.0",
|
|
73
73
|
"vite": ">=8.0.0",
|
|
74
|
-
"payload": "4.0.0-internal.
|
|
74
|
+
"payload": "4.0.0-internal.b6f3b9a"
|
|
75
75
|
},
|
|
76
76
|
"peerDependencies": {
|
|
77
77
|
"@tanstack/react-router": "^1.120.0",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"react": "^19.0.0",
|
|
82
82
|
"react-dom": "^19.0.0",
|
|
83
83
|
"vite": ">=8.0.0",
|
|
84
|
-
"payload": "4.0.0-internal.
|
|
84
|
+
"payload": "4.0.0-internal.b6f3b9a"
|
|
85
85
|
},
|
|
86
86
|
"peerDependenciesMeta": {
|
|
87
87
|
"@vitejs/plugin-react": {
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getExistingAuthToken.d.ts","sourceRoot":"","sources":["../../src/utilities/getExistingAuthToken.ts"],"names":[],"mappings":"AAGA,KAAK,MAAM,GAAG;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { getRequest } from '@tanstack/react-start/server';
|
|
2
|
-
import { parseCookies } from 'payload';
|
|
3
|
-
export function getExistingAuthToken(cookiePrefix) {
|
|
4
|
-
const request = getRequest();
|
|
5
|
-
const headers = new Headers(request.headers);
|
|
6
|
-
const cookies = parseCookies(headers);
|
|
7
|
-
for (const [name, value] of cookies.entries()){
|
|
8
|
-
if (name.startsWith(cookiePrefix)) {
|
|
9
|
-
return {
|
|
10
|
-
name,
|
|
11
|
-
value
|
|
12
|
-
};
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
return undefined;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
//# sourceMappingURL=getExistingAuthToken.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utilities/getExistingAuthToken.ts"],"sourcesContent":["import { getRequest } from '@tanstack/react-start/server'\nimport { parseCookies } from 'payload'\n\ntype Cookie = {\n name: string\n value: string\n}\n\nexport function getExistingAuthToken(cookiePrefix: string): Cookie | undefined {\n const request = getRequest()\n const headers = new Headers(request.headers)\n const cookies = parseCookies(headers)\n\n for (const [name, value] of cookies.entries()) {\n if (name.startsWith(cookiePrefix)) {\n return { name, value }\n }\n }\n\n return undefined\n}\n"],"names":["getRequest","parseCookies","getExistingAuthToken","cookiePrefix","request","headers","Headers","cookies","name","value","entries","startsWith","undefined"],"mappings":"AAAA,SAASA,UAAU,QAAQ,+BAA8B;AACzD,SAASC,YAAY,QAAQ,UAAS;AAOtC,OAAO,SAASC,qBAAqBC,YAAoB;IACvD,MAAMC,UAAUJ;IAChB,MAAMK,UAAU,IAAIC,QAAQF,QAAQC,OAAO;IAC3C,MAAME,UAAUN,aAAaI;IAE7B,KAAK,MAAM,CAACG,MAAMC,MAAM,IAAIF,QAAQG,OAAO,GAAI;QAC7C,IAAIF,KAAKG,UAAU,CAACR,eAAe;YACjC,OAAO;gBAAEK;gBAAMC;YAAM;QACvB;IACF;IAEA,OAAOG;AACT"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import type { Auth } from 'payload';
|
|
2
|
-
type SetPayloadAuthCookieArgs = {
|
|
3
|
-
authConfig: Auth;
|
|
4
|
-
cookiePrefix: string;
|
|
5
|
-
token: string;
|
|
6
|
-
};
|
|
7
|
-
export declare function setPayloadAuthCookie({ authConfig, cookiePrefix, token, }: SetPayloadAuthCookieArgs): void;
|
|
8
|
-
export {};
|
|
9
|
-
//# sourceMappingURL=setPayloadAuthCookie.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"setPayloadAuthCookie.d.ts","sourceRoot":"","sources":["../../src/utilities/setPayloadAuthCookie.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAKnC,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,IAAI,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,UAAU,EACV,YAAY,EACZ,KAAK,GACN,EAAE,wBAAwB,GAAG,IAAI,CAoCjC"}
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
import { setResponseHeader } from '@tanstack/react-start/server';
|
|
2
|
-
import { generatePayloadCookie } from 'payload';
|
|
3
|
-
export function setPayloadAuthCookie({ authConfig, cookiePrefix, token }) {
|
|
4
|
-
const cookieExpiration = authConfig.tokenExpiration ? new Date(Date.now() + authConfig.tokenExpiration) : undefined;
|
|
5
|
-
const payloadCookie = generatePayloadCookie({
|
|
6
|
-
collectionAuthConfig: authConfig,
|
|
7
|
-
cookiePrefix,
|
|
8
|
-
expires: cookieExpiration,
|
|
9
|
-
returnCookieAsObject: true,
|
|
10
|
-
token
|
|
11
|
-
});
|
|
12
|
-
if (payloadCookie.value) {
|
|
13
|
-
const sameSite = typeof authConfig.cookies.sameSite === 'string' ? authConfig.cookies.sameSite : 'Lax';
|
|
14
|
-
let cookie = `${encodeURIComponent(payloadCookie.name)}=${encodeURIComponent(payloadCookie.value)}`;
|
|
15
|
-
cookie += '; HttpOnly';
|
|
16
|
-
cookie += `; SameSite=${sameSite}`;
|
|
17
|
-
cookie += '; Path=/';
|
|
18
|
-
if (authConfig.cookies.secure) {
|
|
19
|
-
cookie += '; Secure';
|
|
20
|
-
}
|
|
21
|
-
if (authConfig.cookies.domain) {
|
|
22
|
-
cookie += `; Domain=${authConfig.cookies.domain}`;
|
|
23
|
-
}
|
|
24
|
-
if (payloadCookie.expires) {
|
|
25
|
-
cookie += `; Expires=${new Date(payloadCookie.expires).toUTCString()}`;
|
|
26
|
-
}
|
|
27
|
-
setResponseHeader('Set-Cookie', cookie);
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
//# sourceMappingURL=setPayloadAuthCookie.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utilities/setPayloadAuthCookie.ts"],"sourcesContent":["import type { Auth } from 'payload'\n\nimport { setResponseHeader } from '@tanstack/react-start/server'\nimport { generatePayloadCookie } from 'payload'\n\ntype SetPayloadAuthCookieArgs = {\n authConfig: Auth\n cookiePrefix: string\n token: string\n}\n\nexport function setPayloadAuthCookie({\n authConfig,\n cookiePrefix,\n token,\n}: SetPayloadAuthCookieArgs): void {\n const cookieExpiration = authConfig.tokenExpiration\n ? new Date(Date.now() + authConfig.tokenExpiration)\n : undefined\n\n const payloadCookie = generatePayloadCookie({\n collectionAuthConfig: authConfig,\n cookiePrefix,\n expires: cookieExpiration,\n returnCookieAsObject: true,\n token,\n })\n\n if (payloadCookie.value) {\n const sameSite =\n typeof authConfig.cookies.sameSite === 'string' ? authConfig.cookies.sameSite : 'Lax'\n\n let cookie = `${encodeURIComponent(payloadCookie.name)}=${encodeURIComponent(payloadCookie.value)}`\n cookie += '; HttpOnly'\n cookie += `; SameSite=${sameSite}`\n cookie += '; Path=/'\n\n if (authConfig.cookies.secure) {\n cookie += '; Secure'\n }\n\n if (authConfig.cookies.domain) {\n cookie += `; Domain=${authConfig.cookies.domain}`\n }\n\n if (payloadCookie.expires) {\n cookie += `; Expires=${new Date(payloadCookie.expires).toUTCString()}`\n }\n\n setResponseHeader('Set-Cookie', cookie)\n }\n}\n"],"names":["setResponseHeader","generatePayloadCookie","setPayloadAuthCookie","authConfig","cookiePrefix","token","cookieExpiration","tokenExpiration","Date","now","undefined","payloadCookie","collectionAuthConfig","expires","returnCookieAsObject","value","sameSite","cookies","cookie","encodeURIComponent","name","secure","domain","toUTCString"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,+BAA8B;AAChE,SAASC,qBAAqB,QAAQ,UAAS;AAQ/C,OAAO,SAASC,qBAAqB,EACnCC,UAAU,EACVC,YAAY,EACZC,KAAK,EACoB;IACzB,MAAMC,mBAAmBH,WAAWI,eAAe,GAC/C,IAAIC,KAAKA,KAAKC,GAAG,KAAKN,WAAWI,eAAe,IAChDG;IAEJ,MAAMC,gBAAgBV,sBAAsB;QAC1CW,sBAAsBT;QACtBC;QACAS,SAASP;QACTQ,sBAAsB;QACtBT;IACF;IAEA,IAAIM,cAAcI,KAAK,EAAE;QACvB,MAAMC,WACJ,OAAOb,WAAWc,OAAO,CAACD,QAAQ,KAAK,WAAWb,WAAWc,OAAO,CAACD,QAAQ,GAAG;QAElF,IAAIE,SAAS,GAAGC,mBAAmBR,cAAcS,IAAI,EAAE,CAAC,EAAED,mBAAmBR,cAAcI,KAAK,GAAG;QACnGG,UAAU;QACVA,UAAU,CAAC,WAAW,EAAEF,UAAU;QAClCE,UAAU;QAEV,IAAIf,WAAWc,OAAO,CAACI,MAAM,EAAE;YAC7BH,UAAU;QACZ;QAEA,IAAIf,WAAWc,OAAO,CAACK,MAAM,EAAE;YAC7BJ,UAAU,CAAC,SAAS,EAAEf,WAAWc,OAAO,CAACK,MAAM,EAAE;QACnD;QAEA,IAAIX,cAAcE,OAAO,EAAE;YACzBK,UAAU,CAAC,UAAU,EAAE,IAAIV,KAAKG,cAAcE,OAAO,EAAEU,WAAW,IAAI;QACxE;QAEAvB,kBAAkB,cAAckB;IAClC;AACF"}
|