@payloadcms/next 3.24.0 → 3.25.0-canary.6d6bbd2

package/dist/utilities/getPreferences.d.ts

@@ -1,3 +1,6 @@
-import type { Payload, User } from 'payload';
-export declare const getPreferences: <T>(key: string, payload: Payload, user: User) => Promise<T>;
+import type { DefaultDocumentIDType, Payload } from 'payload';
+export declare const getPreferences: <T>(key: string, payload: Payload, userID: DefaultDocumentIDType, userSlug: string) => Promise<{
+    id: DefaultDocumentIDType;
+    value: T;
+}>;
 //# sourceMappingURL=getPreferences.d.ts.map

package/dist/utilities/getPreferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPreferences.d.ts","sourceRoot":"","sources":["../../src/utilities/getPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAI5C,eAAO,MAAM,cAAc,GAClB,CAAC,OAAO,MAAM,WAAW,OAAO,QAAQ,IAAI,KAAG,OAAO,CAAC,CAAC,CAmChE,CAAA"}
+{"version":3,"file":"getPreferences.d.ts","sourceRoot":"","sources":["../../src/utilities/getPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAI7D,eAAO,MAAM,cAAc,GAClB,CAAC,OACD,MAAM,WACF,OAAO,UACR,qBAAqB,YACnB,MAAM,KACf,OAAO,CAAC;IAAE,EAAE,EAAE,qBAAqB,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CA+BnD,CAAA"}

package/dist/utilities/getPreferences.js

@@ -1,29 +1,26 @@
 import { cache } from 'react';
-export const getPreferences = cache(async (key, payload, user) => {
-  let result = null;
-  try {
-    result = await payload.find({
-      collection: 'payload-preferences',
-      depth: 0,
-      limit: 1,
-      user,
-      where: {
-        and: [{
-          'user.relationTo': {
-            equals: payload.config.admin.user
-          }
-        }, {
-          'user.value': {
-            equals: user.id
-          }
-        }, {
-          key: {
-            equals: key
-          }
-        }]
-      }
-    })?.then(res => res.docs?.[0]?.value);
-  } catch (_err) {} // eslint-disable-line no-empty
+export const getPreferences = cache(async (key, payload, userID, userSlug) => {
+  const result = await payload.find({
+    collection: 'payload-preferences',
+    depth: 0,
+    limit: 1,
+    pagination: false,
+    where: {
+      and: [{
+        key: {
+          equals: key
+        }
+      }, {
+        'user.relationTo': {
+          equals: userSlug
+        }
+      }, {
+        'user.value': {
+          equals: userID
+        }
+      }]
+    }
+  }).then(res => res.docs?.[0]);
   return result;
 });
 //# sourceMappingURL=getPreferences.js.map

package/dist/utilities/getPreferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPreferences.js","names":["cache","getPreferences","key","payload","user","result","find","collection","depth","limit","where","and","equals","config","admin","id","then","res","docs","value","_err"],"sources":["../../src/utilities/getPreferences.ts"],"sourcesContent":["import type { Payload, User } from 'payload'\n\nimport { cache } from 'react'\n\nexport const getPreferences = cache(\n  async <T>(key: string, payload: Payload, user: User): Promise<T> => {\n    let result: T = null\n\n    try {\n      result = await payload\n        .find({\n          collection: 'payload-preferences',\n          depth: 0,\n          limit: 1,\n          user,\n          where: {\n            and: [\n              {\n                'user.relationTo': {\n                  equals: payload.config.admin.user,\n                },\n              },\n              {\n                'user.value': {\n                  equals: user.id,\n                },\n              },\n              {\n                key: {\n                  equals: key,\n                },\n              },\n            ],\n          },\n        })\n        ?.then((res) => res.docs?.[0]?.value as T)\n    } catch (_err) {} // eslint-disable-line no-empty\n\n    return result\n  },\n)\n"],"mappings":"AAEA,SAASA,KAAK,QAAQ;AAEtB,OAAO,MAAMC,cAAA,GAAiBD,KAAA,CAC5B,OAAUE,GAAA,EAAaC,OAAA,EAAkBC,IAAA;EACvC,IAAIC,MAAA,GAAY;EAEhB,IAAI;IACFA,MAAA,GAAS,MAAMF,OAAA,CACZG,IAAI,CAAC;MACJC,UAAA,EAAY;MACZC,KAAA,EAAO;MACPC,KAAA,EAAO;MACPL,IAAA;MACAM,KAAA,EAAO;QACLC,GAAA,EAAK,CACH;UACE,mBAAmB;YACjBC,MAAA,EAAQT,OAAA,CAAQU,MAAM,CAACC,KAAK,CAACV;UAC/B;QACF,GACA;UACE,cAAc;YACZQ,MAAA,EAAQR,IAAA,CAAKW;UACf;QACF,GACA;UACEb,GAAA,EAAK;YACHU,MAAA,EAAQV;UACV;QACF;MAEJ;IACF,IACEc,IAAA,CAAMC,GAAA,IAAQA,GAAA,CAAIC,IAAI,GAAG,EAAE,EAAEC,KAAA;EACnC,EAAE,OAAOC,IAAA,EAAM,CAAC,EAAE;EAElB,OAAOf,MAAA;AACT","ignoreList":[]}
+{"version":3,"file":"getPreferences.js","names":["cache","getPreferences","key","payload","userID","userSlug","result","find","collection","depth","limit","pagination","where","and","equals","then","res","docs"],"sources":["../../src/utilities/getPreferences.ts"],"sourcesContent":["import type { DefaultDocumentIDType, Payload } from 'payload'\n\nimport { cache } from 'react'\n\nexport const getPreferences = cache(\n  async <T>(\n    key: string,\n    payload: Payload,\n    userID: DefaultDocumentIDType,\n    userSlug: string,\n  ): Promise<{ id: DefaultDocumentIDType; value: T }> => {\n    const result = (await payload\n      .find({\n        collection: 'payload-preferences',\n        depth: 0,\n        limit: 1,\n        pagination: false,\n        where: {\n          and: [\n            {\n              key: {\n                equals: key,\n              },\n            },\n            {\n              'user.relationTo': {\n                equals: userSlug,\n              },\n            },\n            {\n              'user.value': {\n                equals: userID,\n              },\n            },\n          ],\n        },\n      })\n      .then((res) => res.docs?.[0])) as { id: DefaultDocumentIDType; value: T }\n\n    return result\n  },\n)\n"],"mappings":"AAEA,SAASA,KAAK,QAAQ;AAEtB,OAAO,MAAMC,cAAA,GAAiBD,KAAA,CAC5B,OACEE,GAAA,EACAC,OAAA,EACAC,MAAA,EACAC,QAAA;EAEA,MAAMC,MAAA,GAAU,MAAMH,OAAA,CACnBI,IAAI,CAAC;IACJC,UAAA,EAAY;IACZC,KAAA,EAAO;IACPC,KAAA,EAAO;IACPC,UAAA,EAAY;IACZC,KAAA,EAAO;MACLC,GAAA,EAAK,CACH;QACEX,GAAA,EAAK;UACHY,MAAA,EAAQZ;QACV;MACF,GACA;QACE,mBAAmB;UACjBY,MAAA,EAAQT;QACV;MACF,GACA;QACE,cAAc;UACZS,MAAA,EAAQV;QACV;MACF;IAEJ;EACF,GACCW,IAAI,CAAEC,GAAA,IAAQA,GAAA,CAAIC,IAAI,GAAG,EAAE;EAE9B,OAAOX,MAAA;AACT","ignoreList":[]}

package/dist/utilities/getRequestLocale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRequestLocale.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestLocale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAOrD,KAAK,qBAAqB,GAAG;IAC3B,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,wBAAsB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqBtF"}
+{"version":3,"file":"getRequestLocale.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestLocale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAOrD,KAAK,qBAAqB,GAAG;IAC3B,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,wBAAsB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CA8BtF"}

package/dist/utilities/getRequestLocale.js

@@ -13,7 +13,7 @@ export async function getRequestLocale({
         value: localeFromParams
       });
     }
-    return findLocaleFromCode(req.payload.config.localization, localeFromParams || (await getPreferences('locale', req.payload, req.user))) || findLocaleFromCode(req.payload.config.localization, req.payload.config.localization.defaultLocale || 'en');
+    return req.user && findLocaleFromCode(req.payload.config.localization, localeFromParams || (await getPreferences('locale', req.payload, req.user.id, req.user.collection))?.value) || findLocaleFromCode(req.payload.config.localization, req.payload.config.localization.defaultLocale || 'en');
   }
   return undefined;
 }

package/dist/utilities/getRequestLocale.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRequestLocale.js","names":["upsertPreferences","findLocaleFromCode","getPreferences","getRequestLocale","req","payload","config","localization","localeFromParams","query","locale","key","value","user","defaultLocale","undefined"],"sources":["../../src/utilities/getRequestLocale.ts"],"sourcesContent":["import type { Locale, PayloadRequest } from 'payload'\n\nimport { upsertPreferences } from '@payloadcms/ui/rsc'\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\n\nimport { getPreferences } from './getPreferences.js'\n\ntype GetRequestLocalesArgs = {\n  req: PayloadRequest\n}\n\nexport async function getRequestLocale({ req }: GetRequestLocalesArgs): Promise<Locale> {\n  if (req.payload.config.localization) {\n    const localeFromParams = req.query.locale as string | undefined\n\n    if (localeFromParams) {\n      await upsertPreferences<Locale['code']>({ key: 'locale', req, value: localeFromParams })\n    }\n\n    return (\n      findLocaleFromCode(\n        req.payload.config.localization,\n        localeFromParams || (await getPreferences<Locale['code']>('locale', req.payload, req.user)),\n      ) ||\n      findLocaleFromCode(\n        req.payload.config.localization,\n        req.payload.config.localization.defaultLocale || 'en',\n      )\n    )\n  }\n\n  return undefined\n}\n"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ;AAClC,SAASC,kBAAkB,QAAQ;AAEnC,SAASC,cAAc,QAAQ;AAM/B,OAAO,eAAeC,iBAAiB;EAAEC;AAAG,CAAyB;EACnE,IAAIA,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAAE;IACnC,MAAMC,gBAAA,GAAmBJ,GAAA,CAAIK,KAAK,CAACC,MAAM;IAEzC,IAAIF,gBAAA,EAAkB;MACpB,MAAMR,iBAAA,CAAkC;QAAEW,GAAA,EAAK;QAAUP,GAAA;QAAKQ,KAAA,EAAOJ;MAAiB;IACxF;IAEA,OACEP,kBAAA,CACEG,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BC,gBAAA,KAAqB,MAAMN,cAAA,CAA+B,UAAUE,GAAA,CAAIC,OAAO,EAAED,GAAA,CAAIS,IAAI,OAE3FZ,kBAAA,CACEG,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BH,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,CAACO,aAAa,IAAI;EAGvD;EAEA,OAAOC,SAAA;AACT","ignoreList":[]}
+{"version":3,"file":"getRequestLocale.js","names":["upsertPreferences","findLocaleFromCode","getPreferences","getRequestLocale","req","payload","config","localization","localeFromParams","query","locale","key","value","user","id","collection","defaultLocale","undefined"],"sources":["../../src/utilities/getRequestLocale.ts"],"sourcesContent":["import type { Locale, PayloadRequest } from 'payload'\n\nimport { upsertPreferences } from '@payloadcms/ui/rsc'\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\n\nimport { getPreferences } from './getPreferences.js'\n\ntype GetRequestLocalesArgs = {\n  req: PayloadRequest\n}\n\nexport async function getRequestLocale({ req }: GetRequestLocalesArgs): Promise<Locale> {\n  if (req.payload.config.localization) {\n    const localeFromParams = req.query.locale as string | undefined\n\n    if (localeFromParams) {\n      await upsertPreferences<Locale['code']>({ key: 'locale', req, value: localeFromParams })\n    }\n\n    return (\n      (req.user &&\n        findLocaleFromCode(\n          req.payload.config.localization,\n          localeFromParams ||\n            (\n              await getPreferences<Locale['code']>(\n                'locale',\n                req.payload,\n                req.user.id,\n                req.user.collection,\n              )\n            )?.value,\n        )) ||\n      findLocaleFromCode(\n        req.payload.config.localization,\n        req.payload.config.localization.defaultLocale || 'en',\n      )\n    )\n  }\n\n  return undefined\n}\n"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ;AAClC,SAASC,kBAAkB,QAAQ;AAEnC,SAASC,cAAc,QAAQ;AAM/B,OAAO,eAAeC,iBAAiB;EAAEC;AAAG,CAAyB;EACnE,IAAIA,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAAE;IACnC,MAAMC,gBAAA,GAAmBJ,GAAA,CAAIK,KAAK,CAACC,MAAM;IAEzC,IAAIF,gBAAA,EAAkB;MACpB,MAAMR,iBAAA,CAAkC;QAAEW,GAAA,EAAK;QAAUP,GAAA;QAAKQ,KAAA,EAAOJ;MAAiB;IACxF;IAEA,OACEJ,GAAC,CAAIS,IAAI,IACPZ,kBAAA,CACEG,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BC,gBAAA,IAEI,OAAMN,cAAA,CACJ,UACAE,GAAA,CAAIC,OAAO,EACXD,GAAA,CAAIS,IAAI,CAACC,EAAE,EACXV,GAAA,CAAIS,IAAI,CAACE,UAAU,CACrB,GACCH,KAAA,KAETX,kBAAA,CACEG,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BH,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,CAACS,aAAa,IAAI;EAGvD;EAEA,OAAOC,SAAA;AACT","ignoreList":[]}

package/dist/utilities/handleServerFunctions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAYpE,eAAO,MAAM,qBAAqB,EAAE,qBA4BnC,CAAA"}
+{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAYpE,eAAO,MAAM,qBAAqB,EAAE,qBAgCnC,CAAA"}

package/dist/utilities/handleServerFunctions.js

@@ -15,7 +15,11 @@ export const handleServerFunctions = async args => {
   } = args;
   const {
     req
-  } = await initReq(configPromise);
+  } = await initReq({
+    configPromise,
+    importMap,
+    key: 'RootLayout'
+  });
   const augmentedArgs = {
     ...fnArgs,
     importMap,

package/dist/utilities/handleServerFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerFunctions.js","names":["copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","schedulePublishHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","req","augmentedArgs","serverFunctions","fn","Error"],"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { schedulePublishHandler } from '@payloadcms/ui/utilities/schedulePublishHandler'\n\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { initReq } from './initReq.js'\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const { name: fnKey, args: fnArgs, config: configPromise, importMap } = args\n\n  const { req } = await initReq(configPromise)\n\n  const augmentedArgs: Parameters<ServerFunction>[0] = {\n    ...fnArgs,\n    importMap,\n    req,\n  }\n\n  const serverFunctions = {\n    'copy-data-from-locale': copyDataFromLocaleHandler as any as ServerFunction,\n    'form-state': buildFormStateHandler as any as ServerFunction,\n    'render-document': renderDocumentHandler as any as ServerFunction,\n    'render-document-slots': renderDocumentSlotsHandler as any as ServerFunction,\n    'render-list': renderListHandler as any as ServerFunction,\n    'schedule-publish': schedulePublishHandler as any as ServerFunction,\n    'table-state': buildTableStateHandler as any as ServerFunction,\n  }\n\n  const fn = serverFunctions[fnKey]\n\n  if (!fn) {\n    throw new Error(`Unknown Server Function: ${fnKey}`)\n  }\n\n  return fn(augmentedArgs)\n}\n"],"mappings":"AAEA,SAASA,yBAAyB,QAAQ;AAC1C,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,sBAAsB,QAAQ;AAEvC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,OAAO,QAAQ;AAExB,OAAO,MAAMC,qBAAA,GAA+C,MAAOC,IAAA;EACjE,MAAM;IAAEC,IAAA,EAAMC,KAAK;IAAEF,IAAA,EAAMG,MAAM;IAAEC,MAAA,EAAQC,aAAa;IAAEC;EAAS,CAAE,GAAGN,IAAA;EAExE,MAAM;IAAEO;EAAG,CAAE,GAAG,MAAMT,OAAA,CAAQO,aAAA;EAE9B,MAAMG,aAAA,GAA+C;IACnD,GAAGL,MAAM;IACTG,SAAA;IACAC;EACF;EAEA,MAAME,eAAA,GAAkB;IACtB,yBAAyBlB,yBAAA;IACzB,cAAcC,qBAAA;IACd,mBAAmBG,qBAAA;IACnB,yBAAyBC,0BAAA;IACzB,eAAeC,iBAAA;IACf,oBAAoBH,sBAAA;IACpB,eAAeD;EACjB;EAEA,MAAMiB,EAAA,GAAKD,eAAe,CAACP,KAAA,CAAM;EAEjC,IAAI,CAACQ,EAAA,EAAI;IACP,MAAM,IAAIC,KAAA,CAAM,4BAA4BT,KAAA,EAAO;EACrD;EAEA,OAAOQ,EAAA,CAAGF,aAAA;AACZ","ignoreList":[]}
+{"version":3,"file":"handleServerFunctions.js","names":["copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","schedulePublishHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","req","key","augmentedArgs","serverFunctions","fn","Error"],"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { schedulePublishHandler } from '@payloadcms/ui/utilities/schedulePublishHandler'\n\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { initReq } from './initReq.js'\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const { name: fnKey, args: fnArgs, config: configPromise, importMap } = args\n\n  const { req } = await initReq({\n    configPromise,\n    importMap,\n    key: 'RootLayout',\n  })\n\n  const augmentedArgs: Parameters<ServerFunction>[0] = {\n    ...fnArgs,\n    importMap,\n    req,\n  }\n\n  const serverFunctions = {\n    'copy-data-from-locale': copyDataFromLocaleHandler as any as ServerFunction,\n    'form-state': buildFormStateHandler as any as ServerFunction,\n    'render-document': renderDocumentHandler as any as ServerFunction,\n    'render-document-slots': renderDocumentSlotsHandler as any as ServerFunction,\n    'render-list': renderListHandler as any as ServerFunction,\n    'schedule-publish': schedulePublishHandler as any as ServerFunction,\n    'table-state': buildTableStateHandler as any as ServerFunction,\n  }\n\n  const fn = serverFunctions[fnKey]\n\n  if (!fn) {\n    throw new Error(`Unknown Server Function: ${fnKey}`)\n  }\n\n  return fn(augmentedArgs)\n}\n"],"mappings":"AAEA,SAASA,yBAAyB,QAAQ;AAC1C,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,sBAAsB,QAAQ;AAEvC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,OAAO,QAAQ;AAExB,OAAO,MAAMC,qBAAA,GAA+C,MAAOC,IAAA;EACjE,MAAM;IAAEC,IAAA,EAAMC,KAAK;IAAEF,IAAA,EAAMG,MAAM;IAAEC,MAAA,EAAQC,aAAa;IAAEC;EAAS,CAAE,GAAGN,IAAA;EAExE,MAAM;IAAEO;EAAG,CAAE,GAAG,MAAMT,OAAA,CAAQ;IAC5BO,aAAA;IACAC,SAAA;IACAE,GAAA,EAAK;EACP;EAEA,MAAMC,aAAA,GAA+C;IACnD,GAAGN,MAAM;IACTG,SAAA;IACAC;EACF;EAEA,MAAMG,eAAA,GAAkB;IACtB,yBAAyBnB,yBAAA;IACzB,cAAcC,qBAAA;IACd,mBAAmBG,qBAAA;IACnB,yBAAyBC,0BAAA;IACzB,eAAeC,iBAAA;IACf,oBAAoBH,sBAAA;IACpB,eAAeD;EACjB;EAEA,MAAMkB,EAAA,GAAKD,eAAe,CAACR,KAAA,CAAM;EAEjC,IAAI,CAACS,EAAA,EAAI;IACP,MAAM,IAAIC,KAAA,CAAM,4BAA4BV,KAAA,EAAO;EACrD;EAEA,OAAOS,EAAA,CAAGF,aAAA;AACZ","ignoreList":[]}

package/dist/utilities/initPage/index.d.ts

@@ -1,4 +1,4 @@
 import type { InitPageResult } from 'payload';
 import type { Args } from './types.js';
-export declare const initPage: ({ config: configPromise, importMap, route, searchParams, }: Args) => Promise<InitPageResult>;
+export declare const initPage: ({ config: configPromise, importMap, route, searchParams, useLayoutReq, }: Args) => Promise<InitPageResult>;
 //# sourceMappingURL=index.d.ts.map

package/dist/utilities/initPage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAmB,MAAM,SAAS,CAAA;AAO9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQtC,eAAO,MAAM,QAAQ,+DAKlB,IAAI,KAAG,OAAO,CAAC,cAAc,CA4F/B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAmB,MAAM,SAAS,CAAA;AAO9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQtC,eAAO,MAAM,QAAQ,6EAMlB,IAAI,KAAG,OAAO,CAAC,cAAc,CAkG/B,CAAA"}

package/dist/utilities/initPage/index.js

@@ -1,6 +1,5 @@
-import { headers as getHeaders } from 'next/headers.js';
 import { notFound } from 'next/navigation.js';
-import { getPayload, isEntityHidden, parseCookies } from 'payload';
+import { isEntityHidden } from 'payload';
 import * as qs from 'qs-esm';
 import { initReq } from '../initReq.js';
 import { getRouteInfo } from './handleAdminPage.js';
@@ -11,16 +10,35 @@ export const initPage = async ({
   config: configPromise,
   importMap,
   route,
-  searchParams
+  searchParams,
+  useLayoutReq
 }) => {
-  const headers = await getHeaders();
-  const payload = await getPayload({
-    config: configPromise,
-    importMap
-  });
   const queryString = `${qs.stringify(searchParams ?? {}, {
     addQueryPrefix: true
   })}`;
+  const {
+    cookies,
+    locale,
+    permissions,
+    req,
+    req: {
+      payload
+    }
+  } = await initReq({
+    configPromise,
+    importMap,
+    key: useLayoutReq ? 'RootLayout' : 'initPage',
+    overrides: {
+      fallbackLocale: false,
+      req: {
+        query: qs.parse(queryString, {
+          depth: 10,
+          ignoreQueryPrefix: true
+        })
+      }
+    },
+    urlSuffix: `${route}${searchParams ? queryString : ''}`
+  });
   const {
     collections,
     globals,
@@ -28,22 +46,6 @@ export const initPage = async ({
       admin: adminRoute
     }
   } = payload.config;
-  const cookies = parseCookies(headers);
-  const {
-    locale,
-    permissions,
-    req
-  } = await initReq(payload.config, {
-    fallbackLocale: false,
-    req: {
-      headers,
-      query: qs.parse(queryString, {
-        depth: 10,
-        ignoreQueryPrefix: true
-      }),
-      url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`
-    }
-  });
   const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce((acc, [language, languageConfig]) => {
     if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {
       acc.push({

package/dist/utilities/initPage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["headers","getHeaders","notFound","getPayload","isEntityHidden","parseCookies","qs","initReq","getRouteInfo","handleAuthRedirect","isCustomAdminView","isPublicAdminRoute","initPage","config","configPromise","importMap","route","searchParams","payload","queryString","stringify","addQueryPrefix","collections","globals","routes","admin","adminRoute","cookies","locale","permissions","req","fallbackLocale","query","parse","depth","ignoreQueryPrefix","url","serverURL","languageOptions","Object","entries","i18n","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","visibleEntities","map","slug","hidden","user","filter","Boolean","redirectTo","canAccessAdmin","collectionConfig","collectionSlug","docID","globalConfig","globalSlug","defaultIDType","db"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { InitPageResult, VisibleEntities } from 'payload'\n\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound } from 'next/navigation.js'\nimport { getPayload, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { initReq } from '../initReq.js'\nimport { getRouteInfo } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\nimport { isCustomAdminView } from './isCustomAdminView.js'\nimport { isPublicAdminRoute } from './shared.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = await getHeaders()\n  const payload = await getPayload({ config: configPromise, importMap })\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    collections,\n    globals,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const cookies = parseCookies(headers)\n\n  const { locale, permissions, req } = await initReq(payload.config, {\n    fallbackLocale: false,\n    req: {\n      headers,\n      query: qs.parse(queryString, {\n        depth: 10,\n        ignoreQueryPrefix: true,\n      }),\n      url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n    },\n  })\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n  }\n\n  let redirectTo = null\n\n  if (\n    !permissions.canAccessAdmin &&\n    !isPublicAdminRoute({ adminRoute, config: payload.config, route }) &&\n    !isCustomAdminView({ adminRoute, config: payload.config, route })\n  ) {\n    redirectTo = handleAuthRedirect({\n      config: payload.config,\n      route,\n      searchParams,\n      user: req.user,\n    })\n  }\n\n  const { collectionConfig, collectionSlug, docID, globalConfig, globalSlug } = getRouteInfo({\n    adminRoute,\n    config: payload.config,\n    defaultIDType: payload.db.defaultIDType,\n    payload,\n    route,\n  })\n\n  if ((collectionSlug && !collectionConfig) || (globalSlug && !globalConfig)) {\n    return notFound()\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    redirectTo,\n    req,\n    translations: req.i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["notFound","isEntityHidden","qs","initReq","getRouteInfo","handleAuthRedirect","isCustomAdminView","isPublicAdminRoute","initPage","config","configPromise","importMap","route","searchParams","useLayoutReq","queryString","stringify","addQueryPrefix","cookies","locale","permissions","req","payload","key","overrides","fallbackLocale","query","parse","depth","ignoreQueryPrefix","urlSuffix","collections","globals","routes","admin","adminRoute","languageOptions","Object","entries","i18n","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","visibleEntities","map","slug","hidden","user","filter","Boolean","redirectTo","canAccessAdmin","collectionConfig","collectionSlug","docID","globalConfig","globalSlug","defaultIDType","db"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { InitPageResult, VisibleEntities } from 'payload'\n\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound } from 'next/navigation.js'\nimport { getPayload, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { initReq } from '../initReq.js'\nimport { getRouteInfo } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\nimport { isCustomAdminView } from './isCustomAdminView.js'\nimport { isPublicAdminRoute } from './shared.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  route,\n  searchParams,\n  useLayoutReq,\n}: Args): Promise<InitPageResult> => {\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    cookies,\n    locale,\n    permissions,\n    req,\n    req: { payload },\n  } = await initReq({\n    configPromise,\n    importMap,\n    key: useLayoutReq ? 'RootLayout' : 'initPage',\n    overrides: {\n      fallbackLocale: false,\n      req: {\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n      },\n    },\n    urlSuffix: `${route}${searchParams ? queryString : ''}`,\n  })\n\n  const {\n    collections,\n    globals,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n  }\n\n  let redirectTo = null\n\n  if (\n    !permissions.canAccessAdmin &&\n    !isPublicAdminRoute({ adminRoute, config: payload.config, route }) &&\n    !isCustomAdminView({ adminRoute, config: payload.config, route })\n  ) {\n    redirectTo = handleAuthRedirect({\n      config: payload.config,\n      route,\n      searchParams,\n      user: req.user,\n    })\n  }\n\n  const { collectionConfig, collectionSlug, docID, globalConfig, globalSlug } = getRouteInfo({\n    adminRoute,\n    config: payload.config,\n    defaultIDType: payload.db.defaultIDType,\n    payload,\n    route,\n  })\n\n  if ((collectionSlug && !collectionConfig) || (globalSlug && !globalConfig)) {\n    return notFound()\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    redirectTo,\n    req,\n    translations: req.i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"AAGA,SAASA,QAAQ,QAAQ;AACzB,SAAqBC,cAAc,QAAsB;AACzD,YAAYC,EAAA,MAAQ;AAIpB,SAASC,OAAO,QAAQ;AACxB,SAASC,YAAY,QAAQ;AAC7B,SAASC,kBAAkB,QAAQ;AACnC,SAASC,iBAAiB,QAAQ;AAClC,SAASC,kBAAkB,QAAQ;AAEnC,OAAO,MAAMC,QAAA,GAAW,MAAAA,CAAO;EAC7BC,MAAA,EAAQC,aAAa;EACrBC,SAAS;EACTC,KAAK;EACLC,YAAY;EACZC;AAAY,CACP;EACL,MAAMC,WAAA,GAAc,GAAGb,EAAA,CAAGc,SAAS,CAACH,YAAA,IAAgB,CAAC,GAAG;IAAEI,cAAA,EAAgB;EAAK,IAAI;EAEnF,MAAM;IACJC,OAAO;IACPC,MAAM;IACNC,WAAW;IACXC,GAAG;IACHA,GAAA,EAAK;MAAEC;IAAO;EAAE,CACjB,GAAG,MAAMnB,OAAA,CAAQ;IAChBO,aAAA;IACAC,SAAA;IACAY,GAAA,EAAKT,YAAA,GAAe,eAAe;IACnCU,SAAA,EAAW;MACTC,cAAA,EAAgB;MAChBJ,GAAA,EAAK;QACHK,KAAA,EAAOxB,EAAA,CAAGyB,KAAK,CAACZ,WAAA,EAAa;UAC3Ba,KAAA,EAAO;UACPC,iBAAA,EAAmB;QACrB;MACF;IACF;IACAC,SAAA,EAAW,GAAGlB,KAAA,GAAQC,YAAA,GAAeE,WAAA,GAAc;EACrD;EAEA,MAAM;IACJgB,WAAW;IACXC,OAAO;IACPC,MAAA,EAAQ;MAAEC,KAAA,EAAOC;IAAU;EAAE,CAC9B,GAAGb,OAAA,CAAQb,MAAM;EAElB,MAAM2B,eAAA,GAAkBC,MAAA,CAAOC,OAAO,CAAChB,OAAA,CAAQb,MAAM,CAAC8B,IAAI,CAACC,kBAAkB,IAAI,CAAC,GAAGC,MAAM,CACzF,CAACC,GAAA,EAAK,CAACC,QAAA,EAAUC,cAAA,CAAe;IAC9B,IAAIP,MAAA,CAAOQ,IAAI,CAACvB,OAAA,CAAQb,MAAM,CAAC8B,IAAI,CAACC,kBAAkB,EAAEM,QAAQ,CAACH,QAAA,GAAW;MAC1ED,GAAA,CAAIK,IAAI,CAAC;QACPC,KAAA,EAAOJ,cAAA,CAAeK,YAAY,CAACC,OAAO,CAACC,YAAY;QACvDC,KAAA,EAAOT;MACT;IACF;IAEA,OAAOD,GAAA;EACT,GACA,EAAE;EAGJ,MAAMW,eAAA,GAAmC;IACvCtB,WAAA,EAAaA,WAAA,CACVuB,GAAG,CAAC,CAAC;MAAEC,IAAI;MAAErB,KAAA,EAAO;QAAEsB;MAAM;IAAE,CAAE,KAC/B,CAACvD,cAAA,CAAe;MAAEuD,MAAA;MAAQC,IAAA,EAAMpC,GAAA,CAAIoC;IAAK,KAAKF,IAAA,GAAO,MAEtDG,MAAM,CAACC,OAAA;IACV3B,OAAA,EAASA,OAAA,CACNsB,GAAG,CAAC,CAAC;MAAEC,IAAI;MAAErB,KAAA,EAAO;QAAEsB;MAAM;IAAE,CAAE,KAC/B,CAACvD,cAAA,CAAe;MAAEuD,MAAA;MAAQC,IAAA,EAAMpC,GAAA,CAAIoC;IAAK,KAAKF,IAAA,GAAO,MAEtDG,MAAM,CAACC,OAAA;EACZ;EAEA,IAAIC,UAAA,GAAa;EAEjB,IACE,CAACxC,WAAA,CAAYyC,cAAc,IAC3B,CAACtD,kBAAA,CAAmB;IAAE4B,UAAA;IAAY1B,MAAA,EAAQa,OAAA,CAAQb,MAAM;IAAEG;EAAM,MAChE,CAACN,iBAAA,CAAkB;IAAE6B,UAAA;IAAY1B,MAAA,EAAQa,OAAA,CAAQb,MAAM;IAAEG;EAAM,IAC/D;IACAgD,UAAA,GAAavD,kBAAA,CAAmB;MAC9BI,MAAA,EAAQa,OAAA,CAAQb,MAAM;MACtBG,KAAA;MACAC,YAAA;MACA4C,IAAA,EAAMpC,GAAA,CAAIoC;IACZ;EACF;EAEA,MAAM;IAAEK,gBAAgB;IAAEC,cAAc;IAAEC,KAAK;IAAEC,YAAY;IAAEC;EAAU,CAAE,GAAG9D,YAAA,CAAa;IACzF+B,UAAA;IACA1B,MAAA,EAAQa,OAAA,CAAQb,MAAM;IACtB0D,aAAA,EAAe7C,OAAA,CAAQ8C,EAAE,CAACD,aAAa;IACvC7C,OAAA;IACAV;EACF;EAEA,IAAImD,cAAC,IAAkB,CAACD,gBAAA,IAAsBI,UAAA,IAAc,CAACD,YAAA,EAAe;IAC1E,OAAOjE,QAAA;EACT;EAEA,OAAO;IACL8D,gBAAA;IACA5C,OAAA;IACA8C,KAAA;IACAC,YAAA;IACA7B,eAAA;IACAjB,MAAA;IACAC,WAAA;IACAwC,UAAA;IACAvC,GAAA;IACA4B,YAAA,EAAc5B,GAAA,CAAIkB,IAAI,CAACU,YAAY;IACnCI;EACF;AACF","ignoreList":[]}

package/dist/utilities/initPage/types.d.ts

@@ -21,5 +21,16 @@ export type Args = {
     searchParams: {
         [key: string]: string | string[] | undefined;
     };
+    /**
+     * If `useLayoutReq` is `true`, this page will use the cached `req` created by the root layout
+     * instead of creating a new one.
+     *
+     * This is improves performance for pages that are able to share the same `req` as the root layout,
+     * as permissions do not need to be re-calculated.
+     *
+     * If the page has unique query and url params that need to be part of the `req` object, or if you
+     * need permissions calculation to respect those you should not use this property.
+     */
+    useLayoutReq?: boolean;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/utilities/initPage/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAEzD,MAAM,MAAM,IAAI,GAAG;IACjB;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,SAAS,EAAE,SAAS,CAAA;IACpB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC9C;;OAEG;IACH,KAAK,EAAE,MAAM,CAAA;IACb;;OAEG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CAAA;CAC/D,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAEzD,MAAM,MAAM,IAAI,GAAG;IACjB;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,SAAS,EAAE,SAAS,CAAA;IACpB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC9C;;OAEG;IACH,KAAK,EAAE,MAAM,CAAA;IACb;;OAEG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CAAA;IAC9D;;;;;;;;;OASG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA"}

package/dist/utilities/initPage/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/utilities/initPage/types.ts"],"sourcesContent":["import type { ImportMap, SanitizedConfig } from 'payload'\n\nexport type Args = {\n  /**\n   * Your sanitized Payload config.\n   * If unresolved, this function will await the promise.\n   */\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n  /**\n   * If true, redirects unauthenticated users to the admin login page.\n   * If a string is provided, the user will be redirected to that specific URL.\n   */\n  redirectUnauthenticatedUser?: boolean | string\n  /**\n   * The current route, i.e. `/admin/collections/posts`.\n   */\n  route: string\n  /**\n   * The search parameters of the current route provided to all pages in Next.js.\n   */\n  searchParams: { [key: string]: string | string[] | undefined }\n}\n"],"mappings":"AAEA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/utilities/initPage/types.ts"],"sourcesContent":["import type { ImportMap, SanitizedConfig } from 'payload'\n\nexport type Args = {\n  /**\n   * Your sanitized Payload config.\n   * If unresolved, this function will await the promise.\n   */\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n  /**\n   * If true, redirects unauthenticated users to the admin login page.\n   * If a string is provided, the user will be redirected to that specific URL.\n   */\n  redirectUnauthenticatedUser?: boolean | string\n  /**\n   * The current route, i.e. `/admin/collections/posts`.\n   */\n  route: string\n  /**\n   * The search parameters of the current route provided to all pages in Next.js.\n   */\n  searchParams: { [key: string]: string | string[] | undefined }\n  /**\n   * If `useLayoutReq` is `true`, this page will use the cached `req` created by the root layout\n   * instead of creating a new one.\n   *\n   * This is improves performance for pages that are able to share the same `req` as the root layout,\n   * as permissions do not need to be re-calculated.\n   *\n   * If the page has unique query and url params that need to be part of the `req` object, or if you\n   * need permissions calculation to respect those you should not use this property.\n   */\n  useLayoutReq?: boolean\n}\n"],"mappings":"AAEA","ignoreList":[]}

package/dist/utilities/initReq.d.ts

@@ -1,10 +1,26 @@
-import type { Locale, PayloadRequest, SanitizedConfig, SanitizedPermissions } from 'payload';
+import type { AcceptedLanguages } from '@payloadcms/translations';
+import type { ImportMap, Locale, PayloadRequest, SanitizedConfig, SanitizedPermissions } from 'payload';
+import { headers as getHeaders } from 'next/headers.js';
 import { createLocalReq } from 'payload';
 type Result = {
+    cookies: Map<string, string>;
+    headers: Awaited<ReturnType<typeof getHeaders>>;
+    languageCode: AcceptedLanguages;
     locale?: Locale;
     permissions: SanitizedPermissions;
     req: PayloadRequest;
 };
-export declare const initReq: (configPromise: Promise<SanitizedConfig> | SanitizedConfig, overrides?: Parameters<typeof createLocalReq>[0]) => Promise<Result>;
+/**
+ * Initializes a full request object, including the `req` object and access control.
+ * As access control and getting the request locale is dependent on the current URL and
+ * query parameters, this function cannot be cached as often as the partial request object.
+ */
+export declare const initReq: ({ configPromise, importMap, key, overrides, urlSuffix, }: {
+    configPromise: Promise<SanitizedConfig> | SanitizedConfig;
+    importMap: ImportMap;
+    key: string;
+    overrides?: Parameters<typeof createLocalReq>[0];
+    urlSuffix?: string;
+}) => Promise<Result>;
 export {};
 //# sourceMappingURL=initReq.d.ts.map

package/dist/utilities/initReq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initReq.d.ts","sourceRoot":"","sources":["../../src/utilities/initReq.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAI5F,OAAO,EACL,cAAc,EAMf,MAAM,SAAS,CAAA;AAKhB,KAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,oBAAoB,CAAA;IACjC,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,OAAO,kBACH,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,cAC7C,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,KAC/C,OAAO,CAAC,MAAM,CA6Df,CAAA"}
+{"version":3,"file":"initReq.d.ts","sourceRoot":"","sources":["../../src/utilities/initReq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAoB,MAAM,0BAA0B,CAAA;AACnF,OAAO,KAAK,EACV,SAAS,EACT,MAAM,EAEN,cAAc,EACd,eAAe,EACf,oBAAoB,EAErB,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EACL,cAAc,EAMf,MAAM,SAAS,CAAA;AAKhB,KAAK,MAAM,GAAG;IACZ,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAA;IAC/C,YAAY,EAAE,iBAAiB,CAAA;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,oBAAoB,CAAA;IACjC,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AA6GD;;;;GAIG;AACH,eAAO,MAAM,OAAO,6DAMjB;IACD,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IACzD,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;IAChD,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,KAAG,OAAO,CAAC,MAAM,CA6DjB,CAAA"}

package/dist/utilities/initReq.js

@@ -3,61 +3,147 @@ import { headers as getHeaders } from 'next/headers.js';
 import { createLocalReq, executeAuthStrategies, getAccessResults, getPayload, getRequestLanguage, parseCookies } from 'payload';
 import { cache } from 'react';
 import { getRequestLocale } from './getRequestLocale.js';
-export const initReq = cache(async function (configPromise, overrides) {
-  const config = await configPromise;
-  const payload = await getPayload({
-    config
-  });
-  const headers = await getHeaders();
-  const cookies = parseCookies(headers);
-  const languageCode = getRequestLanguage({
-    config,
-    cookies,
-    headers
-  });
-  const i18n = await initI18n({
-    config: config.i18n,
-    context: 'client',
-    language: languageCode
-  });
-  /**
-  * Cannot simply call `payload.auth` here, as we need the user to get the locale, and we need the locale to get the access results
-  * I.e. the `payload.auth` function would call `getAccessResults` without a fully-formed `req` object
-  */
+/**
+ * Stable object to cache the partial request object across all pages
+ */
+const getPartialInitReqContainer = cache(function () {
+  return {
+    reqResult: false
+  };
+});
+/**
+ * Stable object to cache the request object across all pages with the same key
+ */
+const getInitReqContainer = cache(function (
+/**
+* The key is solely used to control caching behavior
+*/
+key) {
+  return {
+    reqResult: false
+  };
+});
+/**
+ * Initializes a partial request object. This does not construct the `req` object and does
+ * not run access control.
+ *
+ * The output of this function can be cached across all pages, which is why it is
+ * separated from `initReq`.
+ */
+const initPartialReq = async function ({
+  configPromise,
+  importMap
+}) {
+  const partialReqContainer = getPartialInitReqContainer();
+  if (partialReqContainer?.reqResult && 'then' in partialReqContainer.reqResult && typeof partialReqContainer?.reqResult?.then === 'function') {
+    return await partialReqContainer.reqResult;
+  }
+  partialReqContainer.reqResult = (async () => {
+    const config = await configPromise;
+    const payload = await getPayload({
+      config,
+      importMap
+    });
+    const headers = await getHeaders();
+    const cookies = parseCookies(headers);
+    const languageCode = getRequestLanguage({
+      config,
+      cookies,
+      headers
+    });
+    const i18n = await initI18n({
+      config: config.i18n,
+      context: 'client',
+      language: languageCode
+    });
+    /**
+    * Cannot simply call `payload.auth` here, as we need the user to get the locale, and we need the locale to get the access results
+    * I.e. the `payload.auth` function would call `getAccessResults` without a fully-formed `req` object
+    */
+    const {
+      responseHeaders,
+      user
+    } = await executeAuthStrategies({
+      headers,
+      payload
+    });
+    const result = {
+      cookies,
+      headers,
+      i18n,
+      languageCode,
+      payload,
+      responseHeaders,
+      user
+    };
+    return result;
+  })();
+  partialReqContainer.reqResult = await partialReqContainer.reqResult;
+  return partialReqContainer.reqResult;
+};
+/**
+ * Initializes a full request object, including the `req` object and access control.
+ * As access control and getting the request locale is dependent on the current URL and
+ * query parameters, this function cannot be cached as often as the partial request object.
+ */
+export const initReq = async function ({
+  configPromise,
+  importMap,
+  key,
+  overrides,
+  urlSuffix
+}) {
   const {
+    cookies,
+    headers,
+    i18n,
+    languageCode,
+    payload,
     responseHeaders,
     user
-  } = await executeAuthStrategies({
-    headers,
-    payload
+  } = await initPartialReq({
+    configPromise,
+    importMap
   });
-  const {
-    req: reqOverrides,
-    ...optionsOverrides
-  } = overrides || {};
-  const req = await createLocalReq({
-    req: {
+  const reqContainer = getInitReqContainer(key);
+  if (reqContainer?.reqResult && 'then' in reqContainer.reqResult && typeof reqContainer?.reqResult?.then === 'function') {
+    return await reqContainer.reqResult;
+  }
+  reqContainer.reqResult = (async () => {
+    const {
+      req: reqOverrides,
+      ...optionsOverrides
+    } = overrides || {};
+    const req = await createLocalReq({
+      req: {
+        headers,
+        host: headers.get('host'),
+        i18n: i18n,
+        responseHeaders,
+        url: `${payload.config.serverURL}${urlSuffix || ''}`,
+        user,
+        ...(reqOverrides || {})
+      },
+      ...(optionsOverrides || {})
+    }, payload);
+    const locale = await getRequestLocale({
+      req
+    });
+    req.locale = locale?.code;
+    const permissions = await getAccessResults({
+      req
+    });
+    const result = {
+      cookies,
       headers,
-      host: headers.get('host'),
-      i18n: i18n,
-      responseHeaders,
-      url: `${payload.config.serverURL}`,
-      user,
-      ...(reqOverrides || {})
-    },
-    ...(optionsOverrides || {})
-  }, payload);
-  const locale = await getRequestLocale({
-    req
-  });
-  req.locale = locale?.code;
-  const permissions = await getAccessResults({
-    req
-  });
-  return {
-    locale,
-    permissions,
-    req
-  };
-});
+      languageCode,
+      locale,
+      permissions,
+      req
+    };
+    return result;
+  })();
+  reqContainer.reqResult = await reqContainer.reqResult;
+  return reqContainer.reqResult;
+};
 //# sourceMappingURL=initReq.js.map

package/dist/utilities/initReq.js.map

@@ -1 +1 @@
-{"version":3,"file":"initReq.js","names":["initI18n","headers","getHeaders","createLocalReq","executeAuthStrategies","getAccessResults","getPayload","getRequestLanguage","parseCookies","cache","getRequestLocale","initReq","configPromise","overrides","config","payload","cookies","languageCode","i18n","context","language","responseHeaders","user","req","reqOverrides","optionsOverrides","host","get","url","serverURL","locale","code","permissions"],"sources":["../../src/utilities/initReq.ts"],"sourcesContent":["import type { I18n, I18nClient } from '@payloadcms/translations'\nimport type { Locale, PayloadRequest, SanitizedConfig, SanitizedPermissions } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { headers as getHeaders } from 'next/headers.js'\nimport {\n  createLocalReq,\n  executeAuthStrategies,\n  getAccessResults,\n  getPayload,\n  getRequestLanguage,\n  parseCookies,\n} from 'payload'\nimport { cache } from 'react'\n\nimport { getRequestLocale } from './getRequestLocale.js'\n\ntype Result = {\n  locale?: Locale\n  permissions: SanitizedPermissions\n  req: PayloadRequest\n}\n\nexport const initReq = cache(async function (\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig,\n  overrides?: Parameters<typeof createLocalReq>[0],\n): Promise<Result> {\n  const config = await configPromise\n  const payload = await getPayload({ config })\n\n  const headers = await getHeaders()\n  const cookies = parseCookies(headers)\n\n  const languageCode = getRequestLanguage({\n    config,\n    cookies,\n    headers,\n  })\n\n  const i18n: I18nClient = await initI18n({\n    config: config.i18n,\n    context: 'client',\n    language: languageCode,\n  })\n\n  /**\n   * Cannot simply call `payload.auth` here, as we need the user to get the locale, and we need the locale to get the access results\n   * I.e. the `payload.auth` function would call `getAccessResults` without a fully-formed `req` object\n   */\n  const { responseHeaders, user } = await executeAuthStrategies({\n    headers,\n    payload,\n  })\n\n  const { req: reqOverrides, ...optionsOverrides } = overrides || {}\n\n  const req = await createLocalReq(\n    {\n      req: {\n        headers,\n        host: headers.get('host'),\n        i18n: i18n as I18n,\n        responseHeaders,\n        url: `${payload.config.serverURL}`,\n        user,\n        ...(reqOverrides || {}),\n      },\n      ...(optionsOverrides || {}),\n    },\n    payload,\n  )\n\n  const locale = await getRequestLocale({\n    req,\n  })\n\n  req.locale = locale?.code\n\n  const permissions = await getAccessResults({\n    req,\n  })\n\n  return {\n    locale,\n    permissions,\n    req,\n  }\n})\n"],"mappings":"AAGA,SAASA,QAAQ,QAAQ;AACzB,SAASC,OAAA,IAAWC,UAAU,QAAQ;AACtC,SACEC,cAAc,EACdC,qBAAqB,EACrBC,gBAAgB,EAChBC,UAAU,EACVC,kBAAkB,EAClBC,YAAY,QACP;AACP,SAASC,KAAK,QAAQ;AAEtB,SAASC,gBAAgB,QAAQ;AAQjC,OAAO,MAAMC,OAAA,GAAUF,KAAA,CAAM,gBAC3BG,aAAyD,EACzDC,SAAgD;EAEhD,MAAMC,MAAA,GAAS,MAAMF,aAAA;EACrB,MAAMG,OAAA,GAAU,MAAMT,UAAA,CAAW;IAAEQ;EAAO;EAE1C,MAAMb,OAAA,GAAU,MAAMC,UAAA;EACtB,MAAMc,OAAA,GAAUR,YAAA,CAAaP,OAAA;EAE7B,MAAMgB,YAAA,GAAeV,kBAAA,CAAmB;IACtCO,MAAA;IACAE,OAAA;IACAf;EACF;EAEA,MAAMiB,IAAA,GAAmB,MAAMlB,QAAA,CAAS;IACtCc,MAAA,EAAQA,MAAA,CAAOI,IAAI;IACnBC,OAAA,EAAS;IACTC,QAAA,EAAUH;EACZ;EAEA;;;;EAIA,MAAM;IAAEI,eAAe;IAAEC;EAAI,CAAE,GAAG,MAAMlB,qBAAA,CAAsB;IAC5DH,OAAA;IACAc;EACF;EAEA,MAAM;IAAEQ,GAAA,EAAKC,YAAY;IAAE,GAAGC;EAAA,CAAkB,GAAGZ,SAAA,IAAa,CAAC;EAEjE,MAAMU,GAAA,GAAM,MAAMpB,cAAA,CAChB;IACEoB,GAAA,EAAK;MACHtB,OAAA;MACAyB,IAAA,EAAMzB,OAAA,CAAQ0B,GAAG,CAAC;MAClBT,IAAA,EAAMA,IAAA;MACNG,eAAA;MACAO,GAAA,EAAK,GAAGb,OAAA,CAAQD,MAAM,CAACe,SAAS,EAAE;MAClCP,IAAA;MACA,IAAIE,YAAA,IAAgB,CAAC,CAAC;IACxB;IACA,IAAIC,gBAAA,IAAoB,CAAC,CAAC;EAC5B,GACAV,OAAA;EAGF,MAAMe,MAAA,GAAS,MAAMpB,gBAAA,CAAiB;IACpCa;EACF;EAEAA,GAAA,CAAIO,MAAM,GAAGA,MAAA,EAAQC,IAAA;EAErB,MAAMC,WAAA,GAAc,MAAM3B,gBAAA,CAAiB;IACzCkB;EACF;EAEA,OAAO;IACLO,MAAA;IACAE,WAAA;IACAT;EACF;AACF","ignoreList":[]}
+{"version":3,"file":"initReq.js","names":["initI18n","headers","getHeaders","createLocalReq","executeAuthStrategies","getAccessResults","getPayload","getRequestLanguage","parseCookies","cache","getRequestLocale","getPartialInitReqContainer","reqResult","getInitReqContainer","key","initPartialReq","configPromise","importMap","partialReqContainer","then","config","payload","cookies","languageCode","i18n","context","language","responseHeaders","user","result","initReq","overrides","urlSuffix","reqContainer","req","reqOverrides","optionsOverrides","host","get","url","serverURL","locale","code","permissions"],"sources":["../../src/utilities/initReq.ts"],"sourcesContent":["import type { AcceptedLanguages, I18n, I18nClient } from '@payloadcms/translations'\nimport type {\n  ImportMap,\n  Locale,\n  Payload,\n  PayloadRequest,\n  SanitizedConfig,\n  SanitizedPermissions,\n  User,\n} from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { headers as getHeaders } from 'next/headers.js'\nimport {\n  createLocalReq,\n  executeAuthStrategies,\n  getAccessResults,\n  getPayload,\n  getRequestLanguage,\n  parseCookies,\n} from 'payload'\nimport { cache } from 'react'\n\nimport { getRequestLocale } from './getRequestLocale.js'\n\ntype Result = {\n  cookies: Map<string, string>\n  headers: Awaited<ReturnType<typeof getHeaders>>\n  languageCode: AcceptedLanguages\n  locale?: Locale\n  permissions: SanitizedPermissions\n  req: PayloadRequest\n}\n\ntype PartialResult = {\n  cookies: Map<string, string>\n  headers: Awaited<ReturnType<typeof getHeaders>>\n  i18n: I18nClient\n  languageCode: AcceptedLanguages\n  payload: Payload\n  responseHeaders: Headers\n  user: null | User\n}\n\n/**\n * Stable object to cache the partial request object across all pages\n */\nconst getPartialInitReqContainer = cache(function (): {\n  reqResult: false | PartialResult | Promise<PartialResult>\n} {\n  return {\n    reqResult: false,\n  }\n})\n\n/**\n * Stable object to cache the request object across all pages with the same key\n */\nconst getInitReqContainer = cache(function (\n  /**\n   * The key is solely used to control caching behavior\n   */\n  key: string,\n): {\n  reqResult: false | Promise<Result> | Result\n} {\n  return {\n    reqResult: false,\n  }\n})\n\n/**\n * Initializes a partial request object. This does not construct the `req` object and does\n * not run access control.\n *\n * The output of this function can be cached across all pages, which is why it is\n * separated from `initReq`.\n */\nconst initPartialReq = async function ({\n  configPromise,\n  importMap,\n}: {\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n}): Promise<PartialResult> {\n  const partialReqContainer = getPartialInitReqContainer()\n\n  if (\n    partialReqContainer?.reqResult &&\n    'then' in partialReqContainer.reqResult &&\n    typeof partialReqContainer?.reqResult?.then === 'function'\n  ) {\n    return await partialReqContainer.reqResult\n  }\n\n  partialReqContainer.reqResult = (async () => {\n    const config = await configPromise\n    const payload = await getPayload({ config, importMap })\n\n    const headers = await getHeaders()\n    const cookies = parseCookies(headers)\n\n    const languageCode = getRequestLanguage({\n      config,\n      cookies,\n      headers,\n    })\n\n    const i18n: I18nClient = await initI18n({\n      config: config.i18n,\n      context: 'client',\n      language: languageCode,\n    })\n\n    /**\n     * Cannot simply call `payload.auth` here, as we need the user to get the locale, and we need the locale to get the access results\n     * I.e. the `payload.auth` function would call `getAccessResults` without a fully-formed `req` object\n     */\n    const { responseHeaders, user } = await executeAuthStrategies({\n      headers,\n      payload,\n    })\n\n    const result: PartialResult = {\n      cookies,\n      headers,\n      i18n,\n      languageCode,\n      payload,\n      responseHeaders,\n      user,\n    }\n\n    return result\n  })()\n\n  partialReqContainer.reqResult = await partialReqContainer.reqResult\n\n  return partialReqContainer.reqResult\n}\n\n/**\n * Initializes a full request object, including the `req` object and access control.\n * As access control and getting the request locale is dependent on the current URL and\n * query parameters, this function cannot be cached as often as the partial request object.\n */\nexport const initReq = async function ({\n  configPromise,\n  importMap,\n  key,\n  overrides,\n  urlSuffix,\n}: {\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n  key: string\n  overrides?: Parameters<typeof createLocalReq>[0]\n  urlSuffix?: string\n}): Promise<Result> {\n  const { cookies, headers, i18n, languageCode, payload, responseHeaders, user } =\n    await initPartialReq({\n      configPromise,\n      importMap,\n    })\n\n  const reqContainer = getInitReqContainer(key)\n\n  if (\n    reqContainer?.reqResult &&\n    'then' in reqContainer.reqResult &&\n    typeof reqContainer?.reqResult?.then === 'function'\n  ) {\n    return await reqContainer.reqResult\n  }\n\n  reqContainer.reqResult = (async () => {\n    const { req: reqOverrides, ...optionsOverrides } = overrides || {}\n\n    const req = await createLocalReq(\n      {\n        req: {\n          headers,\n          host: headers.get('host'),\n          i18n: i18n as I18n,\n          responseHeaders,\n          url: `${payload.config.serverURL}${urlSuffix || ''}`,\n          user,\n          ...(reqOverrides || {}),\n        },\n        ...(optionsOverrides || {}),\n      },\n      payload,\n    )\n\n    const locale = await getRequestLocale({\n      req,\n    })\n\n    req.locale = locale?.code\n\n    const permissions = await getAccessResults({\n      req,\n    })\n\n    const result: Result = {\n      cookies,\n      headers,\n      languageCode,\n      locale,\n      permissions,\n      req,\n    }\n\n    return result\n  })()\n\n  reqContainer.reqResult = await reqContainer.reqResult\n\n  return reqContainer.reqResult\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAG/E,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,eAAO,MAAM,oBAAoB,+BAE9B;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAG,OAAO,CAAC,QAAQ,CAUnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvB,eAAO,MAAM,YAAY,oGAKtB;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,OAAO,CAAC;QACd,QAAQ,EAAE,MAAM,EAAE,CAAA;KACnB,CAAC,CAAA;IACF,YAAY,EAAE,OAAO,CAAC;QACpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAC,CAAA;CACH,+BAiCA,CAAA;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,oBAAoB,qBAEvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAG/E,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,eAAO,MAAM,oBAAoB,+BAE9B;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAG,OAAO,CAAC,QAAQ,CAUnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvB,eAAO,MAAM,YAAY,oGAKtB;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,OAAO,CAAC;QACd,QAAQ,EAAE,MAAM,EAAE,CAAA;KACnB,CAAC,CAAA;IACF,YAAY,EAAE,OAAO,CAAC;QACpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAC,CAAA;CACH,+BAkCA,CAAA;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,oBAAoB,qBAEvD"}

package/dist/views/NotFound/index.js

@@ -37,7 +37,8 @@ export const NotFoundPage = async ({
       adminRoute,
       path: '/not-found'
     }),
-    searchParams
+    searchParams,
+    useLayoutReq: true
   });
   const params = await paramsPromise;
   if (!initPageResult.req.user || !initPageResult.permissions.canAccessAdmin) {