@payload-onpage/next 0.2.1 → 0.3.0

package/dist/client.d.ts

@@ -1,23 +1,23 @@
-import type { DataSource, Locator, MediaLibrary } from '@payload-onpage/core';
+import type { DataSource, Locator, MediaLibrary, OnPageMode } from '@payload-onpage/core';
 import type { FieldEditorDef, Messages } from '@payload-onpage/react';
 export interface OnPageMountProps {
-    mode: 'edit' | 'view';
+    mode: OnPageMode;
     /** Opened from a shared preview link (no editing). */
-    shared?: boolean;
+    shared?: boolean | undefined;
     /** Payload API route. Default "/api". */
-    apiRoute?: string;
+    apiRoute?: string | undefined;
     /** Plugin endpoint prefix. Default "/onpage". */
-    prefix?: string;
+    prefix?: `/${string}` | undefined;
     /** Payload admin route. Default "/admin". */
-    adminRoute?: string;
+    adminRoute?: string | undefined;
     /** Locale to edit. Default: <html lang>. */
-    locale?: string;
-    editors?: Record<string, FieldEditorDef | null>;
-    locator?: Locator;
-    media?: MediaLibrary;
-    dataSource?: DataSource;
+    locale?: string | undefined;
+    editors?: Record<string, FieldEditorDef | null> | undefined;
+    locator?: Locator | undefined;
+    media?: MediaLibrary | undefined;
+    dataSource?: DataSource | undefined;
     /** Override editor UI strings (see `defaultMessages` in @payload-onpage/react). */
-    messages?: Messages;
+    messages?: Messages | undefined;
 }
 export declare function OnPageMount(props: OnPageMountProps): import("react").JSX.Element;
 export { OnPageClient } from '@payload-onpage/react/client';

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAErE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,sDAAsD;IACtD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iDAAiD;IACjD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,CAAA;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,mFAAmF;IACnF,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB;AAKD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,+BAElD;AAED,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACzF,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAErE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,UAAU,CAAA;IAChB,sDAAsD;IACtD,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,iDAAiD;IACjD,MAAM,CAAC,EAAE,IAAI,MAAM,EAAE,GAAG,SAAS,CAAA;IACjC,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,GAAG,SAAS,CAAA;IAC3D,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7B,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAAA;IAChC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IACnC,mFAAmF;IACnF,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;CAChC;AAKD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,+BAElD;AAED,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA"}

package/dist/editor.d.ts

@@ -1,6 +1,4 @@
-/** The lazily loaded part of the Next adapter: the editor and the preview toolbar, wired to Next and Payload. */
-import React from 'react';
 import type { OnPageMountProps } from './client.tsx';
-export declare function NextEditor(props: OnPageMountProps): React.JSX.Element | null;
-export declare function NextPreview(props: OnPageMountProps): React.JSX.Element;
+export declare function NextEditor(props: OnPageMountProps): import("react").JSX.Element | null;
+export declare function NextPreview(props: OnPageMountProps): import("react").JSX.Element;
 //# sourceMappingURL=editor.d.ts.map

package/dist/editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../src/editor.tsx"],"names":[],"mappings":"AAEA,iHAAiH;AACjH,OAAO,KAAkB,MAAM,OAAO,CAAA;AAMtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AA+BpD,wBAAgB,UAAU,CAAC,KAAK,EAAE,gBAAgB,4BAwBjD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,qBAUlD"}
+{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../src/editor.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAoCpD,wBAAgB,UAAU,CAAC,KAAK,EAAE,gBAAgB,sCAwBjD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,+BAUlD"}

package/dist/editor.js

@@ -3,7 +3,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 /** The lazily loaded part of the Next adapter: the editor and the preview toolbar, wired to Next and Payload. */
 import { useMemo } from 'react';
 import { usePathname, useSearchParams } from 'next/navigation.js';
-import { DEFAULTS } from '@payload-onpage/core';
+import { DEFAULTS, ROUTES } from '@payload-onpage/core';
 import { payloadRest, payloadUploads } from '@payload-onpage/core/payload';
 import { OnPageEditor, PreviewToolbar, inPreviewFrame } from '@payload-onpage/react';
 import { lexicalEditors } from '@payload-onpage/lexical';
@@ -14,14 +14,18 @@ function useHere() {
     const qs = search?.toString();
     return `${pathname}${qs ? `?${qs}` : ''}`;
 }
+/** Routes resolved once, with the defaults applied. */
+const routesOf = (props) => {
+    const api = props.apiRoute ?? DEFAULTS.apiRoute;
+    const prefix = props.prefix ?? DEFAULTS.routePrefix;
+    return { api, prefix, base: `${api}${prefix}`, admin: props.adminRoute ?? DEFAULTS.adminRoute };
+};
 function useLinks(props) {
     const here = useHere();
-    const api = props.apiRoute ?? DEFAULTS.apiRoute;
-    const base = `${api}${props.prefix ?? DEFAULTS.routePrefix}`;
-    const admin = props.adminRoute ?? DEFAULTS.adminRoute;
+    const { base, admin } = routesOf(props);
     return useMemo(() => ({
-        exit: `${base}/exit?path=${encodeURIComponent(here)}`,
-        mode: (mode) => `${base}/mode?mode=${mode}&path=${encodeURIComponent(here)}`,
+        exit: `${base}${ROUTES.exit}?path=${encodeURIComponent(here)}`,
+        mode: (mode) => `${base}${ROUTES.mode}?mode=${mode}&path=${encodeURIComponent(here)}`,
         admin: (ref) => ref.kind === 'global'
             ? `${admin}/globals/${ref.slug}`
             : `${admin}/collections/${ref.slug}/${ref.id}`,
@@ -32,8 +36,8 @@ export function NextEditor(props) {
     const locale = props.locale ?? htmlLang();
     const links = useLinks(props);
     const renderer = useNextRefresh();
-    const api = props.apiRoute ?? DEFAULTS.apiRoute;
-    const dataSource = useMemo(() => props.dataSource ?? payloadRest({ apiBase: api, prefix: props.prefix }), [props.dataSource, api, props.prefix]);
+    const { api, prefix } = routesOf(props);
+    const dataSource = useMemo(() => props.dataSource ?? payloadRest({ apiBase: api, prefix }), [props.dataSource, api, prefix]);
     const media = useMemo(() => props.media ?? payloadUploads({ apiBase: api }), [props.media, api]);
     const editors = useMemo(() => ({ ...lexicalEditors, ...props.editors }), [props.editors]);
     if (inPreviewFrame())

package/dist/editor.js.map

@@ -1 +1 @@
-{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.tsx"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -7,9 +7,9 @@ export * from "./session.js";
  * renders nothing otherwise. Static-safe: it reads cookies only in draft mode.
  */
 export async function OnPage({ mount: Mount = OnPageMount, ...props }) {
-    const mode = await getOnPageMode();
+    const [mode, shared] = await Promise.all([getOnPageMode(), isSharedPreview()]);
     if (!mode)
         return null;
-    return _jsx(Mount, { ...props, mode: mode, shared: await isSharedPreview() });
+    return _jsx(Mount, { ...props, mode: mode, shared: shared });
 }
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AAcA,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAc,CAAA;AACjE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE7D,cAAc,cAAc,CAAA;AAgB5B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,WAAW,EAAE,GAAG,KAAK,EAAe;IAChF,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAA;IAClC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,OAAO,KAAC,KAAK,OAAK,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,EAAE,GAAI,CAAA;AAC1E,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AAcA,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAc,CAAA;AACjE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE7D,cAAc,cAAc,CAAA;AAgB5B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,WAAW,EAAE,GAAG,KAAK,EAAe;IAChF,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC,CAAA;IAC9E,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,OAAO,KAAC,KAAK,OAAK,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAI,CAAA;AACzD,CAAC"}

package/dist/proxy.d.ts

@@ -1,9 +1,9 @@
-import { NextResponse, type NextRequest } from 'next/server.js';
+import { type NextMiddleware, type NextRequest } from 'next/server.js';
 export interface OnPageProxyOptions {
     /** Same secret as the plugin (default: Payload's `secret`, i.e. PAYLOAD_SECRET). */
     secret: string | undefined;
 }
 /** Request headers for the rest of the pipeline, with draft mode injected for a valid grant. */
 export declare function withOnPage(request: NextRequest, opts: OnPageProxyOptions, headers?: Headers): Promise<Headers>;
-export declare function createOnPageProxy(opts: OnPageProxyOptions): (request: NextRequest) => Promise<NextResponse<unknown>>;
+export declare function createOnPageProxy(opts: OnPageProxyOptions): NextMiddleware;
 //# sourceMappingURL=proxy.d.ts.map

package/dist/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE/D,MAAM,WAAW,kBAAkB;IACjC,oFAAoF;IACpF,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B;AAeD,gGAAgG;AAChG,wBAAsB,UAAU,CAC9B,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,kBAAkB,EACxB,OAAO,GAAE,OAAsC,GAC9C,OAAO,CAAC,OAAO,CAAC,CAoBlB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,IAK5B,SAAS,WAAW,oCAGjD"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAgB,KAAK,cAAc,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEpF,MAAM,WAAW,kBAAkB;IACjC,oFAAoF;IACpF,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B;AAQD,gGAAgG;AAChG,wBAAsB,UAAU,CAC9B,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,kBAAkB,EACxB,OAAO,GAAE,OAAsC,GAC9C,OAAO,CAAC,OAAO,CAAC,CAalB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,cAAc,CAQ1E"}

package/dist/proxy.js

@@ -13,7 +13,7 @@
  *
  * Already have one? `NextResponse.next({ request: { headers: await withOnPage(request, { secret }) } })`
  */
-import { COOKIE, HEADER, SEAL_PURPOSE, samePath, unseal } from '@payload-onpage/core';
+import { COOKIE, HEADER, SEAL_PURPOSE, isLivePreviewGrant, samePath, unseal, } from '@payload-onpage/core';
 import { NextResponse } from 'next/server.js';
 const withoutCookies = (header, names) => (header ?? '')
     .split(';')
@@ -28,12 +28,8 @@ export async function withOnPage(request, opts, headers = new Headers(request.he
     if (!sealed || !opts.secret)
         return headers;
     const grant = await unseal(sealed, opts.secret, SEAL_PURPOSE.previewCookie);
-    if (!grant ||
-        typeof grant.draft !== 'string' ||
-        grant.exp * 1000 <= Date.now() ||
-        !samePath(path, grant.path)) {
+    if (!isLivePreviewGrant(grant) || !samePath(path, grant.path))
         return headers;
-    }
     const cookie = withoutCookies(headers.get('cookie'), [COOKIE.nextDraft, COOKIE.mode]);
     cookie.push(`${COOKIE.nextDraft}=${grant.draft}`, `${COOKIE.mode}=view`);
     headers.set('cookie', cookie.join('; '));

package/dist/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACrF,OAAO,EAAE,YAAY,EAAoB,MAAM,gBAAgB,CAAA;AAc/D,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAE,KAAe,EAAE,EAAE,CAChE,CAAC,MAAM,IAAI,EAAE,CAAC;KACX,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;KACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAElE,gGAAgG;AAChG,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAoB,EACpB,IAAwB,EACxB,UAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;IAE/C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAA;IACrC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC,iCAAiC;IAC/D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,CAAA;IACzD,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,OAAO,CAAA;IAC3C,MAAM,KAAK,GAAG,MAAM,MAAM,CAAe,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,CAAA;IACzF,IACE,CAAC,KAAK;QACN,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;QAC/B,KAAK,CAAC,GAAG,GAAG,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE;QAC9B,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,EAC3B,CAAC;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IACrF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,OAAO,CAAC,CAAA;IACxE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACxC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAwB;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM;QACd,OAAO,CAAC,IAAI,CACV,+FAA+F,CAChG,CAAA;IACH,OAAO,KAAK,UAAU,KAAK,CAAC,OAAoB;QAC9C,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IACrF,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,MAAM,EACN,MAAM,EACN,YAAY,EACZ,kBAAkB,EAClB,QAAQ,EACR,MAAM,GACP,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,YAAY,EAAyC,MAAM,gBAAgB,CAAA;AAOpF,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAE,KAAe,EAAE,EAAE,CAChE,CAAC,MAAM,IAAI,EAAE,CAAC;KACX,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;KACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAElE,gGAAgG;AAChG,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAoB,EACpB,IAAwB,EACxB,UAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;IAE/C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAA;IACrC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC,iCAAiC;IAC/D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,CAAA;IACzD,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,OAAO,CAAA;IAC3C,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,CAAA;IAC3E,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QAAE,OAAO,OAAO,CAAA;IAC7E,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IACrF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,OAAO,CAAC,CAAA;IACxE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACxC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAwB;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM;QACd,OAAO,CAAC,IAAI,CACV,+FAA+F,CAChG,CAAA;IACH,OAAO,KAAK,UAAU,KAAK,CAAC,OAAoB;QAC9C,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IACrF,CAAC,CAAA;AACH,CAAC"}

package/dist/session.d.ts

@@ -12,31 +12,33 @@
  * draft mode is on. Next exempts that read from prerender bailout, so pages
  * stay static for visitors.
  */
-import { type OnPageMode, type SessionAdapter } from '@payload-onpage/core';
+import { CONTEXT_KEY, type OnPageMode, type SessionAdapter } from '@payload-onpage/core';
 export interface NextSessionOptions {
     /** How long an editor's edit/preview mode lasts, in seconds. Default 12 hours. */
     maxAge?: number;
 }
 export declare function nextSession(opts?: NextSessionOptions): SessionAdapter;
 /** "edit", "view" or null for this request. Safe to call anywhere (returns null outside a request). */
-export declare function getOnPageMode(): Promise<OnPageMode | null>;
+export declare const getOnPageMode: () => Promise<OnPageMode | null>;
 /**
  * Should this request render drafts? `draftMode().isEnabled`, except that an
  * editor whose session ended (signed out) no longer sees drafts. Draft mode
  * turned on by something else (your own preview route) is respected.
  */
-export declare function isDraftEnabled(): Promise<boolean>;
+export declare const isDraftEnabled: () => Promise<boolean>;
 /** Is this request a preview-link view (set by the proxy)? */
-export declare function isSharedPreview(): Promise<boolean>;
+export declare const isSharedPreview: () => Promise<boolean>;
+/** What `onpageContext()` adds to a Payload read in edit mode. */
+export type OnPageReadContext = {
+    context?: {
+        [CONTEXT_KEY]: true;
+    };
+};
 /**
  * Spread into Payload reads that feed the page: in edit mode it turns on
  * auto-mapping markers, otherwise it is empty.
  *
  *   payload.find({ collection: 'pages', where, draft, ...(await onpageContext()) })
  */
-export declare function onpageContext(): Promise<{
-    context?: {
-        onpage: true;
-    };
-}>;
+export declare function onpageContext(): Promise<OnPageReadContext>;
 //# sourceMappingURL=session.d.ts.map

package/dist/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAA0B,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGnG,MAAM,WAAW,kBAAkB;IACjC,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAyBD,wBAAgB,WAAW,CAAC,IAAI,GAAE,kBAAuB,GAAG,cAAc,CAuCzE;AAED,uGAAuG;AACvG,wBAAsB,aAAa,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAQhE;AAED;;;;GAIG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CASvD;AAED,8DAA8D;AAC9D,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAOxD;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC,CAE7E"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EACL,WAAW,EAKX,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAA;AAG7B,MAAM,WAAW,kBAAkB;IACjC,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AA0CD,wBAAgB,WAAW,CAAC,IAAI,GAAE,kBAAuB,GAAG,cAAc,CA2BzE;AAED,uGAAuG;AACvG,eAAO,MAAM,aAAa,QAAO,OAAO,CAAC,UAAU,GAAG,IAAI,CAIhD,CAAA;AAEV;;;;GAIG;AACH,eAAO,MAAM,cAAc,QAAO,OAAO,CAAC,OAAO,CAKtC,CAAA;AAEX,8DAA8D;AAC9D,eAAO,MAAM,eAAe,QAAO,OAAO,CAAC,OAAO,CACwB,CAAA;AAE1E,kEAAkE;AAClE,MAAM,MAAM,iBAAiB,GAAG;IAAE,OAAO,CAAC,EAAE;QAAE,CAAC,WAAW,CAAC,EAAE,IAAI,CAAA;KAAE,CAAA;CAAE,CAAA;AAErE;;;;;GAKG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAEhE"}

package/dist/session.js

@@ -12,21 +12,35 @@
  * draft mode is on. Next exempts that read from prerender bailout, so pages
  * stay static for visitors.
  */
-import { COOKIE, HEADER, sha256 } from '@payload-onpage/core';
+import { CONTEXT_KEY, COOKIE, HEADER, isOnPageMode, sha256, } from '@payload-onpage/core';
 import { cookies, draftMode, headers } from 'next/headers.js';
+/** Our cookies: server-only, same-site, whole site. */
+const cookieBase = (secure) => ({ httpOnly: true, sameSite: 'lax', secure, path: '/' });
+/**
+ * Runs `read` only in draft mode, so visitors' requests never touch cookies and
+ * pages stay static. Outside a request (build, scripts) it returns `fallback`.
+ */
+async function inDraft(read, fallback) {
+    try {
+        return (await draftMode()).isEnabled ? await read() : fallback;
+    }
+    catch {
+        return fallback;
+    }
+}
 const HASH_LENGTH = 32;
 const fingerprint = async (token) => (await sha256(token)).slice(0, HASH_LENGTH);
 /** `edit` | `view`, or `<mode>:<authCookie>:<hash>` when bound to a session. */
 async function modeValue(mode, jar, bindTo) {
     const token = bindTo ? jar.get(bindTo)?.value : undefined;
-    return token && bindTo ? `${mode}:${bindTo}:${await fingerprint(token)}` : mode;
+    return token ? `${mode}:${bindTo}:${await fingerprint(token)}` : mode;
 }
 /** The mode a cookie value grants in this request, or null (unknown, or the bound session is gone). */
 async function readMode(raw, jar) {
     if (!raw)
         return null;
     const [mode, bound, hash] = raw.split(':');
-    if (mode !== 'edit' && mode !== 'view')
+    if (!isOnPageMode(mode))
         return null;
     if (bound) {
         const token = jar.get(bound)?.value;
@@ -42,13 +56,7 @@ export function nextSession(opts = {}) {
             ;
             (await draftMode()).enable();
             const jar = await cookies();
-            jar.set(COOKIE.mode, await modeValue(mode, jar, bindTo), {
-                httpOnly: true,
-                sameSite: 'lax',
-                secure,
-                path: '/',
-                maxAge,
-            });
+            jar.set(COOKIE.mode, await modeValue(mode, jar, bindTo), { ...cookieBase(secure), maxAge });
             jar.delete(COOKIE.preview);
         },
         async enableLink({ secure, path: _path, expiresAt, seal }) {
@@ -61,13 +69,7 @@ export function nextSession(opts = {}) {
             // Keep the draft secret server-side: the browser only gets the sealed grant.
             jar.delete(COOKIE.nextDraft);
             jar.delete(COOKIE.mode);
-            jar.set(COOKIE.preview, await seal(draft), {
-                httpOnly: true,
-                sameSite: 'lax',
-                secure,
-                path: '/',
-                expires: expiresAt,
-            });
+            jar.set(COOKIE.preview, await seal(draft), { ...cookieBase(secure), expires: expiresAt });
         },
         async disable() {
             ;
@@ -80,45 +82,22 @@ export function nextSession(opts = {}) {
     };
 }
 /** "edit", "view" or null for this request. Safe to call anywhere (returns null outside a request). */
-export async function getOnPageMode() {
-    try {
-        if (!(await draftMode()).isEnabled)
-            return null;
-        const jar = await cookies();
-        return await readMode(jar.get(COOKIE.mode)?.value, jar);
-    }
-    catch {
-        return null;
-    }
-}
+export const getOnPageMode = () => inDraft(async () => {
+    const jar = await cookies();
+    return readMode(jar.get(COOKIE.mode)?.value, jar);
+}, null);
 /**
  * Should this request render drafts? `draftMode().isEnabled`, except that an
  * editor whose session ended (signed out) no longer sees drafts. Draft mode
  * turned on by something else (your own preview route) is respected.
  */
-export async function isDraftEnabled() {
-    try {
-        if (!(await draftMode()).isEnabled)
-            return false;
-        const jar = await cookies();
-        const raw = jar.get(COOKIE.mode)?.value;
-        return raw === undefined || (await readMode(raw, jar)) !== null;
-    }
-    catch {
-        return false;
-    }
-}
+export const isDraftEnabled = () => inDraft(async () => {
+    const jar = await cookies();
+    const raw = jar.get(COOKIE.mode)?.value;
+    return raw === undefined || (await readMode(raw, jar)) !== null;
+}, false);
 /** Is this request a preview-link view (set by the proxy)? */
-export async function isSharedPreview() {
-    try {
-        if (!(await draftMode()).isEnabled)
-            return false;
-        return (await headers()).get(HEADER.shared) === '1';
-    }
-    catch {
-        return false;
-    }
-}
+export const isSharedPreview = () => inDraft(async () => (await headers()).get(HEADER.shared) === '1', false);
 /**
  * Spread into Payload reads that feed the page: in edit mode it turns on
  * auto-mapping markers, otherwise it is empty.
@@ -126,6 +105,6 @@ export async function isSharedPreview() {
  *   payload.find({ collection: 'pages', where, draft, ...(await onpageContext()) })
  */
 export async function onpageContext() {
-    return (await getOnPageMode()) === 'edit' ? { context: { onpage: true } } : {};
+    return (await getOnPageMode()) === 'edit' ? { context: { [CONTEXT_KEY]: true } } : {};
 }
 //# sourceMappingURL=session.js.map

package/dist/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payload-onpage/next",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "payload-onpage for Next.js App Router: draft-mode session adapter, <OnPage />, onpageContext() and refresh rendering.",
   "license": "MIT",
   "type": "module",
@@ -61,9 +61,9 @@
     "provenance": true
   },
   "dependencies": {
-    "@payload-onpage/core": "0.2.1",
-    "@payload-onpage/react": "0.2.1",
-    "@payload-onpage/lexical": "0.2.1"
+    "@payload-onpage/core": "0.3.0",
+    "@payload-onpage/react": "0.3.0",
+    "@payload-onpage/lexical": "0.3.0"
   },
   "peerDependencies": {
     "next": "^15.4.11 || ^16.3.8",

package/src/client.tsx

@@ -5,28 +5,28 @@
  * is loaded only when someone is editing or previewing.
  */
 import dynamic from 'next/dynamic.js'
-import type { DataSource, Locator, MediaLibrary } from '@payload-onpage/core'
+import type { DataSource, Locator, MediaLibrary, OnPageMode } from '@payload-onpage/core'
 import type { FieldEditorDef, Messages } from '@payload-onpage/react'
 
 export interface OnPageMountProps {
-  mode: 'edit' | 'view'
+  mode: OnPageMode
   /** Opened from a shared preview link (no editing). */
-  shared?: boolean
+  shared?: boolean | undefined
   /** Payload API route. Default "/api". */
-  apiRoute?: string
+  apiRoute?: string | undefined
   /** Plugin endpoint prefix. Default "/onpage". */
-  prefix?: string
+  prefix?: `/${string}` | undefined
   /** Payload admin route. Default "/admin". */
-  adminRoute?: string
+  adminRoute?: string | undefined
   /** Locale to edit. Default: <html lang>. */
-  locale?: string
+  locale?: string | undefined
   // Client-only options (pass them from your own 'use client' mount):
-  editors?: Record<string, FieldEditorDef | null>
-  locator?: Locator
-  media?: MediaLibrary
-  dataSource?: DataSource
+  editors?: Record<string, FieldEditorDef | null> | undefined
+  locator?: Locator | undefined
+  media?: MediaLibrary | undefined
+  dataSource?: DataSource | undefined
   /** Override editor UI strings (see `defaultMessages` in @payload-onpage/react). */
-  messages?: Messages
+  messages?: Messages | undefined
 }
 
 const Editor = dynamic(() => import('./editor.tsx').then((m) => m.NextEditor), { ssr: false })

package/src/editor.tsx

@@ -1,9 +1,9 @@
 'use client'
 
 /** The lazily loaded part of the Next adapter: the editor and the preview toolbar, wired to Next and Payload. */
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { usePathname, useSearchParams } from 'next/navigation.js'
-import { DEFAULTS, type DocRef } from '@payload-onpage/core'
+import { DEFAULTS, ROUTES, type DocRef } from '@payload-onpage/core'
 import { payloadRest, payloadUploads } from '@payload-onpage/core/payload'
 import { OnPageEditor, PreviewToolbar, inPreviewFrame, type Links } from '@payload-onpage/react'
 import { lexicalEditors } from '@payload-onpage/lexical'
@@ -17,15 +17,20 @@ function useHere(): string {
   return `${pathname}${qs ? `?${qs}` : ''}`
 }
 
+/** Routes resolved once, with the defaults applied. */
+const routesOf = (props: OnPageMountProps) => {
+  const api = props.apiRoute ?? DEFAULTS.apiRoute
+  const prefix = props.prefix ?? DEFAULTS.routePrefix
+  return { api, prefix, base: `${api}${prefix}`, admin: props.adminRoute ?? DEFAULTS.adminRoute }
+}
+
 function useLinks(props: OnPageMountProps): Links {
   const here = useHere()
-  const api = props.apiRoute ?? DEFAULTS.apiRoute
-  const base = `${api}${props.prefix ?? DEFAULTS.routePrefix}`
-  const admin = props.adminRoute ?? DEFAULTS.adminRoute
+  const { base, admin } = routesOf(props)
   return useMemo<Links>(
     () => ({
-      exit: `${base}/exit?path=${encodeURIComponent(here)}`,
-      mode: (mode) => `${base}/mode?mode=${mode}&path=${encodeURIComponent(here)}`,
+      exit: `${base}${ROUTES.exit}?path=${encodeURIComponent(here)}`,
+      mode: (mode) => `${base}${ROUTES.mode}?mode=${mode}&path=${encodeURIComponent(here)}`,
       admin: (ref: DocRef) =>
         ref.kind === 'global'
           ? `${admin}/globals/${ref.slug}`
@@ -42,10 +47,10 @@ export function NextEditor(props: OnPageMountProps) {
   const locale = props.locale ?? htmlLang()
   const links = useLinks(props)
   const renderer = useNextRefresh()
-  const api = props.apiRoute ?? DEFAULTS.apiRoute
+  const { api, prefix } = routesOf(props)
   const dataSource = useMemo(
-    () => props.dataSource ?? payloadRest({ apiBase: api, prefix: props.prefix }),
-    [props.dataSource, api, props.prefix],
+    () => props.dataSource ?? payloadRest({ apiBase: api, prefix }),
+    [props.dataSource, api, prefix],
   )
   const media = useMemo(() => props.media ?? payloadUploads({ apiBase: api }), [props.media, api])
   const editors = useMemo(() => ({ ...lexicalEditors, ...props.editors }), [props.editors])

package/src/index.tsx

@@ -36,7 +36,7 @@ export interface OnPageProps extends Omit<OnPageMountProps, ClientOnly> {
  * renders nothing otherwise. Static-safe: it reads cookies only in draft mode.
  */
 export async function OnPage({ mount: Mount = OnPageMount, ...props }: OnPageProps) {
-  const mode = await getOnPageMode()
+  const [mode, shared] = await Promise.all([getOnPageMode(), isSharedPreview()])
   if (!mode) return null
-  return <Mount {...props} mode={mode} shared={await isSharedPreview()} />
+  return <Mount {...props} mode={mode} shared={shared} />
 }

package/src/proxy.ts

@@ -13,21 +13,21 @@
  *
  * Already have one? `NextResponse.next({ request: { headers: await withOnPage(request, { secret }) } })`
  */
-import { COOKIE, HEADER, SEAL_PURPOSE, samePath, unseal } from '@payload-onpage/core'
-import { NextResponse, type NextRequest } from 'next/server.js'
+import {
+  COOKIE,
+  HEADER,
+  SEAL_PURPOSE,
+  isLivePreviewGrant,
+  samePath,
+  unseal,
+} from '@payload-onpage/core'
+import { NextResponse, type NextMiddleware, type NextRequest } from 'next/server.js'
 
 export interface OnPageProxyOptions {
   /** Same secret as the plugin (default: Payload's `secret`, i.e. PAYLOAD_SECRET). */
   secret: string | undefined
 }
 
-interface PreviewGrant {
-  path: string
-  ref: string
-  exp: number
-  draft: string
-}
-
 const withoutCookies = (header: string | null, names: string[]) =>
   (header ?? '')
     .split(';')
@@ -45,15 +45,8 @@ export async function withOnPage(
   headers.set(HEADER.path, path)
   const sealed = request.cookies.get(COOKIE.preview)?.value
   if (!sealed || !opts.secret) return headers
-  const grant = await unseal<PreviewGrant>(sealed, opts.secret, SEAL_PURPOSE.previewCookie)
-  if (
-    !grant ||
-    typeof grant.draft !== 'string' ||
-    grant.exp * 1000 <= Date.now() ||
-    !samePath(path, grant.path)
-  ) {
-    return headers
-  }
+  const grant = await unseal(sealed, opts.secret, SEAL_PURPOSE.previewCookie)
+  if (!isLivePreviewGrant(grant) || !samePath(path, grant.path)) return headers
   const cookie = withoutCookies(headers.get('cookie'), [COOKIE.nextDraft, COOKIE.mode])
   cookie.push(`${COOKIE.nextDraft}=${grant.draft}`, `${COOKIE.mode}=view`)
   headers.set('cookie', cookie.join('; '))
@@ -61,7 +54,7 @@ export async function withOnPage(
   return headers
 }
 
-export function createOnPageProxy(opts: OnPageProxyOptions) {
+export function createOnPageProxy(opts: OnPageProxyOptions): NextMiddleware {
   if (!opts.secret)
     console.warn(
       'payload-onpage: createOnPageProxy() has no secret; preview links will show published content.',

package/src/session.ts

@@ -12,7 +12,15 @@
  * draft mode is on. Next exempts that read from prerender bailout, so pages
  * stay static for visitors.
  */
-import { COOKIE, HEADER, sha256, type OnPageMode, type SessionAdapter } from '@payload-onpage/core'
+import {
+  CONTEXT_KEY,
+  COOKIE,
+  HEADER,
+  isOnPageMode,
+  sha256,
+  type OnPageMode,
+  type SessionAdapter,
+} from '@payload-onpage/core'
 import { cookies, draftMode, headers } from 'next/headers.js'
 
 export interface NextSessionOptions {
@@ -21,6 +29,23 @@ export interface NextSessionOptions {
 }
 
 type Jar = Awaited<ReturnType<typeof cookies>>
+type CookieOptions = NonNullable<Parameters<Jar['set']>[2]>
+
+/** Our cookies: server-only, same-site, whole site. */
+const cookieBase = (secure: boolean) =>
+  ({ httpOnly: true, sameSite: 'lax', secure, path: '/' }) satisfies CookieOptions
+
+/**
+ * Runs `read` only in draft mode, so visitors' requests never touch cookies and
+ * pages stay static. Outside a request (build, scripts) it returns `fallback`.
+ */
+async function inDraft<T>(read: () => Promise<T>, fallback: T): Promise<T> {
+  try {
+    return (await draftMode()).isEnabled ? await read() : fallback
+  } catch {
+    return fallback
+  }
+}
 
 const HASH_LENGTH = 32
 const fingerprint = async (token: string) => (await sha256(token)).slice(0, HASH_LENGTH)
@@ -28,14 +53,14 @@ const fingerprint = async (token: string) => (await sha256(token)).slice(0, HASH
 /** `edit` | `view`, or `<mode>:<authCookie>:<hash>` when bound to a session. */
 async function modeValue(mode: OnPageMode, jar: Jar, bindTo?: string): Promise<string> {
   const token = bindTo ? jar.get(bindTo)?.value : undefined
-  return token && bindTo ? `${mode}:${bindTo}:${await fingerprint(token)}` : mode
+  return token ? `${mode}:${bindTo}:${await fingerprint(token)}` : mode
 }
 
 /** The mode a cookie value grants in this request, or null (unknown, or the bound session is gone). */
 async function readMode(raw: string | undefined, jar: Jar): Promise<OnPageMode | null> {
   if (!raw) return null
   const [mode, bound, hash] = raw.split(':')
-  if (mode !== 'edit' && mode !== 'view') return null
+  if (!isOnPageMode(mode)) return null
   if (bound) {
     const token = jar.get(bound)?.value
     if (!token || (await fingerprint(token)) !== hash) return null
@@ -49,13 +74,7 @@ export function nextSession(opts: NextSessionOptions = {}): SessionAdapter {
     async enable(mode, { secure, bindTo }) {
       ;(await draftMode()).enable()
       const jar = await cookies()
-      jar.set(COOKIE.mode, await modeValue(mode, jar, bindTo), {
-        httpOnly: true,
-        sameSite: 'lax',
-        secure,
-        path: '/',
-        maxAge,
-      })
+      jar.set(COOKIE.mode, await modeValue(mode, jar, bindTo), { ...cookieBase(secure), maxAge })
       jar.delete(COOKIE.preview)
     },
     async enableLink({ secure, path: _path, expiresAt, seal }) {
@@ -66,13 +85,7 @@ export function nextSession(opts: NextSessionOptions = {}): SessionAdapter {
       // Keep the draft secret server-side: the browser only gets the sealed grant.
       jar.delete(COOKIE.nextDraft)
       jar.delete(COOKIE.mode)
-      jar.set(COOKIE.preview, await seal(draft), {
-        httpOnly: true,
-        sameSite: 'lax',
-        secure,
-        path: '/',
-        expires: expiresAt,
-      })
+      jar.set(COOKIE.preview, await seal(draft), { ...cookieBase(secure), expires: expiresAt })
     },
     async disable() {
       ;(await draftMode()).disable()
@@ -85,41 +98,30 @@ export function nextSession(opts: NextSessionOptions = {}): SessionAdapter {
 }
 
 /** "edit", "view" or null for this request. Safe to call anywhere (returns null outside a request). */
-export async function getOnPageMode(): Promise<OnPageMode | null> {
-  try {
-    if (!(await draftMode()).isEnabled) return null
+export const getOnPageMode = (): Promise<OnPageMode | null> =>
+  inDraft(async () => {
     const jar = await cookies()
-    return await readMode(jar.get(COOKIE.mode)?.value, jar)
-  } catch {
-    return null
-  }
-}
+    return readMode(jar.get(COOKIE.mode)?.value, jar)
+  }, null)
 
 /**
  * Should this request render drafts? `draftMode().isEnabled`, except that an
  * editor whose session ended (signed out) no longer sees drafts. Draft mode
  * turned on by something else (your own preview route) is respected.
  */
-export async function isDraftEnabled(): Promise<boolean> {
-  try {
-    if (!(await draftMode()).isEnabled) return false
+export const isDraftEnabled = (): Promise<boolean> =>
+  inDraft(async () => {
     const jar = await cookies()
     const raw = jar.get(COOKIE.mode)?.value
     return raw === undefined || (await readMode(raw, jar)) !== null
-  } catch {
-    return false
-  }
-}
+  }, false)
 
 /** Is this request a preview-link view (set by the proxy)? */
-export async function isSharedPreview(): Promise<boolean> {
-  try {
-    if (!(await draftMode()).isEnabled) return false
-    return (await headers()).get(HEADER.shared) === '1'
-  } catch {
-    return false
-  }
-}
+export const isSharedPreview = (): Promise<boolean> =>
+  inDraft(async () => (await headers()).get(HEADER.shared) === '1', false)
+
+/** What `onpageContext()` adds to a Payload read in edit mode. */
+export type OnPageReadContext = { context?: { [CONTEXT_KEY]: true } }
 
 /**
  * Spread into Payload reads that feed the page: in edit mode it turns on
@@ -127,6 +129,6 @@ export async function isSharedPreview(): Promise<boolean> {
  *
  *   payload.find({ collection: 'pages', where, draft, ...(await onpageContext()) })
  */
-export async function onpageContext(): Promise<{ context?: { onpage: true } }> {
-  return (await getOnPageMode()) === 'edit' ? { context: { onpage: true } } : {}
+export async function onpageContext(): Promise<OnPageReadContext> {
+  return (await getOnPageMode()) === 'edit' ? { context: { [CONTEXT_KEY]: true } } : {}
 }