@payloadcms/next 3.68.0-internal-debug.35482da → 3.68.0-internal.35482da

package/dist/utilities/getRequestLocale.js

@@ -1,19 +1,20 @@
 import { upsertPreferences } from '@payloadcms/ui/rsc';
 import { findLocaleFromCode } from '@payloadcms/ui/shared';
 import { getPreferences } from './getPreferences.js';
-export async function getRequestLocale({ req }) {
-    if (req.payload.config.localization) {
-        const localeFromParams = req.query.locale;
-        if (req.user && localeFromParams) {
-            await upsertPreferences({
-                key: 'locale',
-                req,
-                value: localeFromParams
-            });
-        }
-        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');
+export async function getRequestLocale({
+  req
+}) {
+  if (req.payload.config.localization) {
+    const localeFromParams = req.query.locale;
+    if (req.user && localeFromParams) {
+      await upsertPreferences({
+        key: 'locale',
+        req,
+        value: localeFromParams
+      });
     }
-    return undefined;
+    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;
 }
-
 //# sourceMappingURL=getRequestLocale.js.map

package/dist/utilities/getRequestLocale.js.map

@@ -1 +1 @@
-{"version":3,"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 (req.user && 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"],"names":["upsertPreferences","findLocaleFromCode","getPreferences","getRequestLocale","req","payload","config","localization","localeFromParams","query","locale","user","key","value","id","collection","defaultLocale","undefined"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,qBAAoB;AACtD,SAASC,kBAAkB,QAAQ,wBAAuB;AAE1D,SAASC,cAAc,QAAQ,sBAAqB;AAMpD,OAAO,eAAeC,iBAAiB,EAAEC,GAAG,EAAyB;IACnE,IAAIA,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAAE;QACnC,MAAMC,mBAAmBJ,IAAIK,KAAK,CAACC,MAAM;QAEzC,IAAIN,IAAIO,IAAI,IAAIH,kBAAkB;YAChC,MAAMR,kBAAkC;gBAAEY,KAAK;gBAAUR;gBAAKS,OAAOL;YAAiB;QACxF;QAEA,OACE,AAACJ,IAAIO,IAAI,IACPV,mBACEG,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BC,oBAEI,CAAA,MAAMN,eACJ,UACAE,IAAIC,OAAO,EACXD,IAAIO,IAAI,CAACG,EAAE,EACXV,IAAIO,IAAI,CAACI,UAAU,CACrB,GACCF,UAETZ,mBACEG,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BH,IAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,CAACS,aAAa,IAAI;IAGvD;IAEA,OAAOC;AACT"}
+{"version":3,"file":"getRequestLocale.js","names":["upsertPreferences","findLocaleFromCode","getPreferences","getRequestLocale","req","payload","config","localization","localeFromParams","query","locale","user","key","value","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 (req.user && 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,IAAIN,GAAA,CAAIO,IAAI,IAAIH,gBAAA,EAAkB;MAChC,MAAMR,iBAAA,CAAkC;QAAEY,GAAA,EAAK;QAAUR,GAAA;QAAKS,KAAA,EAAOL;MAAiB;IACxF;IAEA,OACEJ,GAAC,CAAIO,IAAI,IACPV,kBAAA,CACEG,GAAA,CAAIC,OAAO,CAACC,MAAM,CAACC,YAAY,EAC/BC,gBAAA,IAEI,OAAMN,cAAA,CACJ,UACAE,GAAA,CAAIC,OAAO,EACXD,GAAA,CAAIO,IAAI,CAACG,EAAE,EACXV,GAAA,CAAIO,IAAI,CAACI,UAAU,CACrB,GACCF,KAAA,KAETZ,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/getRequestTheme.js

@@ -1,22 +1,22 @@
 import { defaultTheme } from '@payloadcms/ui';
-const acceptedThemes = [
-    'dark',
-    'light'
-];
-export const getRequestTheme = ({ config, cookies, headers })=>{
-    if (config.admin.theme !== 'all' && acceptedThemes.includes(config.admin.theme)) {
-        return config.admin.theme;
-    }
-    const themeCookie = cookies.get(`${config.cookiePrefix || 'payload'}-theme`);
-    const themeFromCookie = typeof themeCookie === 'string' ? themeCookie : themeCookie?.value;
-    if (themeFromCookie && acceptedThemes.includes(themeFromCookie)) {
-        return themeFromCookie;
-    }
-    const themeFromHeader = headers.get('Sec-CH-Prefers-Color-Scheme');
-    if (themeFromHeader && acceptedThemes.includes(themeFromHeader)) {
-        return themeFromHeader;
-    }
-    return defaultTheme;
+const acceptedThemes = ['dark', 'light'];
+export const getRequestTheme = ({
+  config,
+  cookies,
+  headers
+}) => {
+  if (config.admin.theme !== 'all' && acceptedThemes.includes(config.admin.theme)) {
+    return config.admin.theme;
+  }
+  const themeCookie = cookies.get(`${config.cookiePrefix || 'payload'}-theme`);
+  const themeFromCookie = typeof themeCookie === 'string' ? themeCookie : themeCookie?.value;
+  if (themeFromCookie && acceptedThemes.includes(themeFromCookie)) {
+    return themeFromCookie;
+  }
+  const themeFromHeader = headers.get('Sec-CH-Prefers-Color-Scheme');
+  if (themeFromHeader && acceptedThemes.includes(themeFromHeader)) {
+    return themeFromHeader;
+  }
+  return defaultTheme;
 };
-
 //# sourceMappingURL=getRequestTheme.js.map

package/dist/utilities/getRequestTheme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getRequestTheme.ts"],"sourcesContent":["import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js'\nimport type { SanitizedConfig } from 'payload'\n\nimport { defaultTheme, type Theme } from '@payloadcms/ui'\n\ntype GetRequestLanguageArgs = {\n  config: SanitizedConfig\n  cookies: Map<string, string> | ReadonlyRequestCookies\n  headers: Request['headers']\n}\n\nconst acceptedThemes: Theme[] = ['dark', 'light']\n\nexport const getRequestTheme = ({ config, cookies, headers }: GetRequestLanguageArgs): Theme => {\n  if (config.admin.theme !== 'all' && acceptedThemes.includes(config.admin.theme)) {\n    return config.admin.theme\n  }\n\n  const themeCookie = cookies.get(`${config.cookiePrefix || 'payload'}-theme`)\n\n  const themeFromCookie: Theme = (\n    typeof themeCookie === 'string' ? themeCookie : themeCookie?.value\n  ) as Theme\n\n  if (themeFromCookie && acceptedThemes.includes(themeFromCookie)) {\n    return themeFromCookie\n  }\n\n  const themeFromHeader = headers.get('Sec-CH-Prefers-Color-Scheme') as Theme\n\n  if (themeFromHeader && acceptedThemes.includes(themeFromHeader)) {\n    return themeFromHeader\n  }\n\n  return defaultTheme\n}\n"],"names":["defaultTheme","acceptedThemes","getRequestTheme","config","cookies","headers","admin","theme","includes","themeCookie","get","cookiePrefix","themeFromCookie","value","themeFromHeader"],"mappings":"AAGA,SAASA,YAAY,QAAoB,iBAAgB;AAQzD,MAAMC,iBAA0B;IAAC;IAAQ;CAAQ;AAEjD,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAA0B;IAClF,IAAIF,OAAOG,KAAK,CAACC,KAAK,KAAK,SAASN,eAAeO,QAAQ,CAACL,OAAOG,KAAK,CAACC,KAAK,GAAG;QAC/E,OAAOJ,OAAOG,KAAK,CAACC,KAAK;IAC3B;IAEA,MAAME,cAAcL,QAAQM,GAAG,CAAC,GAAGP,OAAOQ,YAAY,IAAI,UAAU,MAAM,CAAC;IAE3E,MAAMC,kBACJ,OAAOH,gBAAgB,WAAWA,cAAcA,aAAaI;IAG/D,IAAID,mBAAmBX,eAAeO,QAAQ,CAACI,kBAAkB;QAC/D,OAAOA;IACT;IAEA,MAAME,kBAAkBT,QAAQK,GAAG,CAAC;IAEpC,IAAII,mBAAmBb,eAAeO,QAAQ,CAACM,kBAAkB;QAC/D,OAAOA;IACT;IAEA,OAAOd;AACT,EAAC"}
+{"version":3,"file":"getRequestTheme.js","names":["defaultTheme","acceptedThemes","getRequestTheme","config","cookies","headers","admin","theme","includes","themeCookie","get","cookiePrefix","themeFromCookie","value","themeFromHeader"],"sources":["../../src/utilities/getRequestTheme.ts"],"sourcesContent":["import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js'\nimport type { SanitizedConfig } from 'payload'\n\nimport { defaultTheme, type Theme } from '@payloadcms/ui'\n\ntype GetRequestLanguageArgs = {\n  config: SanitizedConfig\n  cookies: Map<string, string> | ReadonlyRequestCookies\n  headers: Request['headers']\n}\n\nconst acceptedThemes: Theme[] = ['dark', 'light']\n\nexport const getRequestTheme = ({ config, cookies, headers }: GetRequestLanguageArgs): Theme => {\n  if (config.admin.theme !== 'all' && acceptedThemes.includes(config.admin.theme)) {\n    return config.admin.theme\n  }\n\n  const themeCookie = cookies.get(`${config.cookiePrefix || 'payload'}-theme`)\n\n  const themeFromCookie: Theme = (\n    typeof themeCookie === 'string' ? themeCookie : themeCookie?.value\n  ) as Theme\n\n  if (themeFromCookie && acceptedThemes.includes(themeFromCookie)) {\n    return themeFromCookie\n  }\n\n  const themeFromHeader = headers.get('Sec-CH-Prefers-Color-Scheme') as Theme\n\n  if (themeFromHeader && acceptedThemes.includes(themeFromHeader)) {\n    return themeFromHeader\n  }\n\n  return defaultTheme\n}\n"],"mappings":"AAGA,SAASA,YAAY,QAAoB;AAQzC,MAAMC,cAAA,GAA0B,CAAC,QAAQ,QAAQ;AAEjD,OAAO,MAAMC,eAAA,GAAkBA,CAAC;EAAEC,MAAM;EAAEC,OAAO;EAAEC;AAAO,CAA0B;EAClF,IAAIF,MAAA,CAAOG,KAAK,CAACC,KAAK,KAAK,SAASN,cAAA,CAAeO,QAAQ,CAACL,MAAA,CAAOG,KAAK,CAACC,KAAK,GAAG;IAC/E,OAAOJ,MAAA,CAAOG,KAAK,CAACC,KAAK;EAC3B;EAEA,MAAME,WAAA,GAAcL,OAAA,CAAQM,GAAG,CAAC,GAAGP,MAAA,CAAOQ,YAAY,IAAI,iBAAiB;EAE3E,MAAMC,eAAA,GACJ,OAAOH,WAAA,KAAgB,WAAWA,WAAA,GAAcA,WAAA,EAAaI,KAAA;EAG/D,IAAID,eAAA,IAAmBX,cAAA,CAAeO,QAAQ,CAACI,eAAA,GAAkB;IAC/D,OAAOA,eAAA;EACT;EAEA,MAAME,eAAA,GAAkBT,OAAA,CAAQK,GAAG,CAAC;EAEpC,IAAII,eAAA,IAAmBb,cAAA,CAAeO,QAAQ,CAACM,eAAA,GAAkB;IAC/D,OAAOA,eAAA;EACT;EAEA,OAAOd,YAAA;AACT","ignoreList":[]}

package/dist/utilities/getRouteWithoutAdmin.js

@@ -1,5 +1,7 @@
-export const getRouteWithoutAdmin = ({ adminRoute, route })=>{
-    return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route;
+export const getRouteWithoutAdmin = ({
+  adminRoute,
+  route
+}) => {
+  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route;
 };
-
 //# sourceMappingURL=getRouteWithoutAdmin.js.map

package/dist/utilities/getRouteWithoutAdmin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getRouteWithoutAdmin.ts"],"sourcesContent":["export const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"names":["getRouteWithoutAdmin","adminRoute","route","replace"],"mappings":"AAAA,OAAO,MAAMA,uBAAuB,CAAC,EACnCC,UAAU,EACVC,KAAK,EAIN;IACC,OAAOD,cAAcA,eAAe,MAAMC,MAAMC,OAAO,CAACF,YAAY,MAAMC;AAC5E,EAAC"}
+{"version":3,"file":"getRouteWithoutAdmin.js","names":["getRouteWithoutAdmin","adminRoute","route","replace"],"sources":["../../src/utilities/getRouteWithoutAdmin.ts"],"sourcesContent":["export const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"mappings":"AAAA,OAAO,MAAMA,oBAAA,GAAuBA,CAAC;EACnCC,UAAU;EACVC;AAAK,CAIN;EACC,OAAOD,UAAA,IAAcA,UAAA,KAAe,MAAMC,KAAA,CAAMC,OAAO,CAACF,UAAA,EAAY,MAAMC,KAAA;AAC5E","ignoreList":[]}

package/dist/utilities/getVisibleEntities.js

@@ -1,15 +1,26 @@
 import { isEntityHidden } from 'payload';
-export function getVisibleEntities({ req }) {
-    return {
-        collections: req.payload.config.collections.map(({ slug, admin: { hidden } })=>!isEntityHidden({
-                hidden,
-                user: req.user
-            }) ? slug : null).filter(Boolean),
-        globals: req.payload.config.globals.map(({ slug, admin: { hidden } })=>!isEntityHidden({
-                hidden,
-                user: req.user
-            }) ? slug : null).filter(Boolean)
-    };
+export function getVisibleEntities({
+  req
+}) {
+  return {
+    collections: req.payload.config.collections.map(({
+      slug,
+      admin: {
+        hidden
+      }
+    }) => !isEntityHidden({
+      hidden,
+      user: req.user
+    }) ? slug : null).filter(Boolean),
+    globals: req.payload.config.globals.map(({
+      slug,
+      admin: {
+        hidden
+      }
+    }) => !isEntityHidden({
+      hidden,
+      user: req.user
+    }) ? slug : null).filter(Boolean)
+  };
 }
-
 //# sourceMappingURL=getVisibleEntities.js.map

package/dist/utilities/getVisibleEntities.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getVisibleEntities.ts"],"sourcesContent":["import type { PayloadRequest, VisibleEntities } from 'payload'\n\nimport { isEntityHidden } from 'payload'\n\nexport function getVisibleEntities({ req }: { req: PayloadRequest }): VisibleEntities {\n  return {\n    collections: req.payload.config.collections\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n    globals: req.payload.config.globals\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n  }\n}\n"],"names":["isEntityHidden","getVisibleEntities","req","collections","payload","config","map","slug","admin","hidden","user","filter","Boolean","globals"],"mappings":"AAEA,SAASA,cAAc,QAAQ,UAAS;AAExC,OAAO,SAASC,mBAAmB,EAAEC,GAAG,EAA2B;IACjE,OAAO;QACLC,aAAaD,IAAIE,OAAO,CAACC,MAAM,CAACF,WAAW,CACxCG,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAEC,MAAM,EAAE,EAAE,GAC/B,CAACT,eAAe;gBAAES;gBAAQC,MAAMR,IAAIQ,IAAI;YAAC,KAAKH,OAAO,MAEtDI,MAAM,CAACC;QACVC,SAASX,IAAIE,OAAO,CAACC,MAAM,CAACQ,OAAO,CAChCP,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAEC,MAAM,EAAE,EAAE,GAC/B,CAACT,eAAe;gBAAES;gBAAQC,MAAMR,IAAIQ,IAAI;YAAC,KAAKH,OAAO,MAEtDI,MAAM,CAACC;IACZ;AACF"}
+{"version":3,"file":"getVisibleEntities.js","names":["isEntityHidden","getVisibleEntities","req","collections","payload","config","map","slug","admin","hidden","user","filter","Boolean","globals"],"sources":["../../src/utilities/getVisibleEntities.ts"],"sourcesContent":["import type { PayloadRequest, VisibleEntities } from 'payload'\n\nimport { isEntityHidden } from 'payload'\n\nexport function getVisibleEntities({ req }: { req: PayloadRequest }): VisibleEntities {\n  return {\n    collections: req.payload.config.collections\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n    globals: req.payload.config.globals\n      .map(({ slug, admin: { hidden } }) =>\n        !isEntityHidden({ hidden, user: req.user }) ? slug : null,\n      )\n      .filter(Boolean),\n  }\n}\n"],"mappings":"AAEA,SAASA,cAAc,QAAQ;AAE/B,OAAO,SAASC,mBAAmB;EAAEC;AAAG,CAA2B;EACjE,OAAO;IACLC,WAAA,EAAaD,GAAA,CAAIE,OAAO,CAACC,MAAM,CAACF,WAAW,CACxCG,GAAG,CAAC,CAAC;MAAEC,IAAI;MAAEC,KAAA,EAAO;QAAEC;MAAM;IAAE,CAAE,KAC/B,CAACT,cAAA,CAAe;MAAES,MAAA;MAAQC,IAAA,EAAMR,GAAA,CAAIQ;IAAK,KAAKH,IAAA,GAAO,MAEtDI,MAAM,CAACC,OAAA;IACVC,OAAA,EAASX,GAAA,CAAIE,OAAO,CAACC,MAAM,CAACQ,OAAO,CAChCP,GAAG,CAAC,CAAC;MAAEC,IAAI;MAAEC,KAAA,EAAO;QAAEC;MAAM;IAAE,CAAE,KAC/B,CAACT,cAAA,CAAe;MAAES,MAAA;MAAQC,IAAA,EAAMR,GAAA,CAAIQ;IAAK,KAAKH,IAAA,GAAO,MAEtDI,MAAM,CAACC,OAAA;EACZ;AACF","ignoreList":[]}

package/dist/utilities/handleAuthRedirect.js

@@ -1,27 +1,41 @@
 import { formatAdminURL } from 'payload/shared';
 import * as qs from 'qs-esm';
-export const handleAuthRedirect = ({ config, route, searchParams, user })=>{
-    const { admin: { routes: { login: loginRouteFromConfig, unauthorized: unauthorizedRoute } }, routes: { admin: adminRoute } } = config;
-    if (searchParams && 'redirect' in searchParams) {
-        delete searchParams.redirect;
+export const handleAuthRedirect = ({
+  config,
+  route,
+  searchParams,
+  user
+}) => {
+  const {
+    admin: {
+      routes: {
+        login: loginRouteFromConfig,
+        unauthorized: unauthorizedRoute
+      }
+    },
+    routes: {
+      admin: adminRoute
     }
-    const redirectRoute = (route !== adminRoute ? route : '') + (Object.keys(searchParams ?? {}).length > 0 ? `${qs.stringify(searchParams, {
-        addQueryPrefix: true
-    })}` : '');
-    const redirectTo = formatAdminURL({
-        adminRoute,
-        path: user ? unauthorizedRoute : loginRouteFromConfig
-    });
-    const parsedLoginRouteSearchParams = qs.parse(redirectTo.split('?')[1] ?? '');
-    const searchParamsWithRedirect = `${qs.stringify({
-        ...parsedLoginRouteSearchParams,
-        ...redirectRoute ? {
-            redirect: redirectRoute
-        } : {}
-    }, {
-        addQueryPrefix: true
-    })}`;
-    return `${redirectTo.split('?', 1)[0]}${searchParamsWithRedirect}`;
+  } = config;
+  if (searchParams && 'redirect' in searchParams) {
+    delete searchParams.redirect;
+  }
+  const redirectRoute = (route !== adminRoute ? route : '') + (Object.keys(searchParams ?? {}).length > 0 ? `${qs.stringify(searchParams, {
+    addQueryPrefix: true
+  })}` : '');
+  const redirectTo = formatAdminURL({
+    adminRoute,
+    path: user ? unauthorizedRoute : loginRouteFromConfig
+  });
+  const parsedLoginRouteSearchParams = qs.parse(redirectTo.split('?')[1] ?? '');
+  const searchParamsWithRedirect = `${qs.stringify({
+    ...parsedLoginRouteSearchParams,
+    ...(redirectRoute ? {
+      redirect: redirectRoute
+    } : {})
+  }, {
+    addQueryPrefix: true
+  })}`;
+  return `${redirectTo.split('?', 1)[0]}${searchParamsWithRedirect}`;
 };
-
 //# sourceMappingURL=handleAuthRedirect.js.map

package/dist/utilities/handleAuthRedirect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/handleAuthRedirect.ts"],"sourcesContent":["import type { TypedUser } from 'payload'\n\nimport { formatAdminURL } from 'payload/shared'\nimport * as qs from 'qs-esm'\n\ntype Args = {\n  config\n  route: string\n  searchParams: { [key: string]: string | string[] }\n  user?: TypedUser\n}\n\nexport const handleAuthRedirect = ({ config, route, searchParams, user }: Args): string => {\n  const {\n    admin: {\n      routes: { login: loginRouteFromConfig, unauthorized: unauthorizedRoute },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (searchParams && 'redirect' in searchParams) {\n    delete searchParams.redirect\n  }\n\n  const redirectRoute =\n    (route !== adminRoute ? route : '') +\n    (Object.keys(searchParams ?? {}).length > 0\n      ? `${qs.stringify(searchParams, { addQueryPrefix: true })}`\n      : '')\n\n  const redirectTo = formatAdminURL({\n    adminRoute,\n    path: user ? unauthorizedRoute : loginRouteFromConfig,\n  })\n\n  const parsedLoginRouteSearchParams = qs.parse(redirectTo.split('?')[1] ?? '')\n\n  const searchParamsWithRedirect = `${qs.stringify(\n    {\n      ...parsedLoginRouteSearchParams,\n      ...(redirectRoute ? { redirect: redirectRoute } : {}),\n    },\n    { addQueryPrefix: true },\n  )}`\n\n  return `${redirectTo.split('?', 1)[0]}${searchParamsWithRedirect}`\n}\n"],"names":["formatAdminURL","qs","handleAuthRedirect","config","route","searchParams","user","admin","routes","login","loginRouteFromConfig","unauthorized","unauthorizedRoute","adminRoute","redirect","redirectRoute","Object","keys","length","stringify","addQueryPrefix","redirectTo","path","parsedLoginRouteSearchParams","parse","split","searchParamsWithRedirect"],"mappings":"AAEA,SAASA,cAAc,QAAQ,iBAAgB;AAC/C,YAAYC,QAAQ,SAAQ;AAS5B,OAAO,MAAMC,qBAAqB,CAAC,EAAEC,MAAM,EAAEC,KAAK,EAAEC,YAAY,EAAEC,IAAI,EAAQ;IAC5E,MAAM,EACJC,OAAO,EACLC,QAAQ,EAAEC,OAAOC,oBAAoB,EAAEC,cAAcC,iBAAiB,EAAE,EACzE,EACDJ,QAAQ,EAAED,OAAOM,UAAU,EAAE,EAC9B,GAAGV;IAEJ,IAAIE,gBAAgB,cAAcA,cAAc;QAC9C,OAAOA,aAAaS,QAAQ;IAC9B;IAEA,MAAMC,gBACJ,AAACX,CAAAA,UAAUS,aAAaT,QAAQ,EAAC,IAChCY,CAAAA,OAAOC,IAAI,CAACZ,gBAAgB,CAAC,GAAGa,MAAM,GAAG,IACtC,GAAGjB,GAAGkB,SAAS,CAACd,cAAc;QAAEe,gBAAgB;IAAK,IAAI,GACzD,EAAC;IAEP,MAAMC,aAAarB,eAAe;QAChCa;QACAS,MAAMhB,OAAOM,oBAAoBF;IACnC;IAEA,MAAMa,+BAA+BtB,GAAGuB,KAAK,CAACH,WAAWI,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI;IAE1E,MAAMC,2BAA2B,GAAGzB,GAAGkB,SAAS,CAC9C;QACE,GAAGI,4BAA4B;QAC/B,GAAIR,gBAAgB;YAAED,UAAUC;QAAc,IAAI,CAAC,CAAC;IACtD,GACA;QAAEK,gBAAgB;IAAK,IACtB;IAEH,OAAO,GAAGC,WAAWI,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,GAAGC,0BAA0B;AACpE,EAAC"}
+{"version":3,"file":"handleAuthRedirect.js","names":["formatAdminURL","qs","handleAuthRedirect","config","route","searchParams","user","admin","routes","login","loginRouteFromConfig","unauthorized","unauthorizedRoute","adminRoute","redirect","redirectRoute","Object","keys","length","stringify","addQueryPrefix","redirectTo","path","parsedLoginRouteSearchParams","parse","split","searchParamsWithRedirect"],"sources":["../../src/utilities/handleAuthRedirect.ts"],"sourcesContent":["import type { TypedUser } from 'payload'\n\nimport { formatAdminURL } from 'payload/shared'\nimport * as qs from 'qs-esm'\n\ntype Args = {\n  config\n  route: string\n  searchParams: { [key: string]: string | string[] }\n  user?: TypedUser\n}\n\nexport const handleAuthRedirect = ({ config, route, searchParams, user }: Args): string => {\n  const {\n    admin: {\n      routes: { login: loginRouteFromConfig, unauthorized: unauthorizedRoute },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (searchParams && 'redirect' in searchParams) {\n    delete searchParams.redirect\n  }\n\n  const redirectRoute =\n    (route !== adminRoute ? route : '') +\n    (Object.keys(searchParams ?? {}).length > 0\n      ? `${qs.stringify(searchParams, { addQueryPrefix: true })}`\n      : '')\n\n  const redirectTo = formatAdminURL({\n    adminRoute,\n    path: user ? unauthorizedRoute : loginRouteFromConfig,\n  })\n\n  const parsedLoginRouteSearchParams = qs.parse(redirectTo.split('?')[1] ?? '')\n\n  const searchParamsWithRedirect = `${qs.stringify(\n    {\n      ...parsedLoginRouteSearchParams,\n      ...(redirectRoute ? { redirect: redirectRoute } : {}),\n    },\n    { addQueryPrefix: true },\n  )}`\n\n  return `${redirectTo.split('?', 1)[0]}${searchParamsWithRedirect}`\n}\n"],"mappings":"AAEA,SAASA,cAAc,QAAQ;AAC/B,YAAYC,EAAA,MAAQ;AASpB,OAAO,MAAMC,kBAAA,GAAqBA,CAAC;EAAEC,MAAM;EAAEC,KAAK;EAAEC,YAAY;EAAEC;AAAI,CAAQ;EAC5E,MAAM;IACJC,KAAA,EAAO;MACLC,MAAA,EAAQ;QAAEC,KAAA,EAAOC,oBAAoB;QAAEC,YAAA,EAAcC;MAAiB;IAAE,CACzE;IACDJ,MAAA,EAAQ;MAAED,KAAA,EAAOM;IAAU;EAAE,CAC9B,GAAGV,MAAA;EAEJ,IAAIE,YAAA,IAAgB,cAAcA,YAAA,EAAc;IAC9C,OAAOA,YAAA,CAAaS,QAAQ;EAC9B;EAEA,MAAMC,aAAA,GACJ,CAACX,KAAA,KAAUS,UAAA,GAAaT,KAAA,GAAQ,EAAC,KAChCY,MAAA,CAAOC,IAAI,CAACZ,YAAA,IAAgB,CAAC,GAAGa,MAAM,GAAG,IACtC,GAAGjB,EAAA,CAAGkB,SAAS,CAACd,YAAA,EAAc;IAAEe,cAAA,EAAgB;EAAK,IAAI,GACzD,EAAC;EAEP,MAAMC,UAAA,GAAarB,cAAA,CAAe;IAChCa,UAAA;IACAS,IAAA,EAAMhB,IAAA,GAAOM,iBAAA,GAAoBF;EACnC;EAEA,MAAMa,4BAAA,GAA+BtB,EAAA,CAAGuB,KAAK,CAACH,UAAA,CAAWI,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI;EAE1E,MAAMC,wBAAA,GAA2B,GAAGzB,EAAA,CAAGkB,SAAS,CAC9C;IACE,GAAGI,4BAA4B;IAC/B,IAAIR,aAAA,GAAgB;MAAED,QAAA,EAAUC;IAAc,IAAI,CAAC,CAAC;EACtD,GACA;IAAEK,cAAA,EAAgB;EAAK,IACtB;EAEH,OAAO,GAAGC,UAAA,CAAWI,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,GAAGC,wBAAA,EAA0B;AACpE","ignoreList":[]}

package/dist/utilities/handleServerFunctions.js

@@ -9,38 +9,45 @@ import { renderListHandler } from '../views/List/handleServerFunction.js';
 import { initReq } from './initReq.js';
 import { slugifyHandler } from './slugify.js';
 const baseServerFunctions = {
-    'copy-data-from-locale': copyDataFromLocaleHandler,
-    'form-state': buildFormStateHandler,
-    'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,
-    'render-document': renderDocumentHandler,
-    'render-document-slots': renderDocumentSlotsHandler,
-    'render-field': _internal_renderFieldHandler,
-    'render-list': renderListHandler,
-    'schedule-publish': schedulePublishHandler,
-    slugify: slugifyHandler,
-    'table-state': buildTableStateHandler
+  'copy-data-from-locale': copyDataFromLocaleHandler,
+  'form-state': buildFormStateHandler,
+  'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,
+  'render-document': renderDocumentHandler,
+  'render-document-slots': renderDocumentSlotsHandler,
+  'render-field': _internal_renderFieldHandler,
+  'render-list': renderListHandler,
+  'schedule-publish': schedulePublishHandler,
+  slugify: slugifyHandler,
+  'table-state': buildTableStateHandler
 };
-export const handleServerFunctions = async (args)=>{
-    const { name: fnKey, args: fnArgs, config: configPromise, importMap, serverFunctions: extraServerFunctions } = args;
-    const { req } = await initReq({
-        configPromise,
-        importMap,
-        key: 'RootLayout'
-    });
-    const augmentedArgs = {
-        ...fnArgs,
-        importMap,
-        req
-    };
-    const serverFunctions = {
-        ...baseServerFunctions,
-        ...extraServerFunctions || {}
-    };
-    const fn = serverFunctions[fnKey];
-    if (!fn) {
-        throw new Error(`Unknown Server Function: ${fnKey}`);
-    }
-    return fn(augmentedArgs);
+export const handleServerFunctions = async args => {
+  const {
+    name: fnKey,
+    args: fnArgs,
+    config: configPromise,
+    importMap,
+    serverFunctions: extraServerFunctions
+  } = args;
+  const {
+    req
+  } = await initReq({
+    configPromise,
+    importMap,
+    key: 'RootLayout'
+  });
+  const augmentedArgs = {
+    ...fnArgs,
+    importMap,
+    req
+  };
+  const serverFunctions = {
+    ...baseServerFunctions,
+    ...(extraServerFunctions || {})
+  };
+  const fn = serverFunctions[fnKey];
+  if (!fn) {
+    throw new Error(`Unknown Server Function: ${fnKey}`);
+  }
+  return fn(augmentedArgs);
 };
-
 //# sourceMappingURL=handleServerFunctions.js.map

package/dist/utilities/handleServerFunctions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { _internal_renderFieldHandler, copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { getFolderResultsComponentAndDataHandler } from '@payloadcms/ui/utilities/getFolderResultsComponentAndData'\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'\nimport { slugifyHandler } from './slugify.js'\n\nconst baseServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'schedule-publish': schedulePublishHandler,\n  slugify: slugifyHandler,\n  'table-state': buildTableStateHandler,\n}\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const {\n    name: fnKey,\n    args: fnArgs,\n    config: configPromise,\n    importMap,\n    serverFunctions: extraServerFunctions,\n  } = 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    ...baseServerFunctions,\n    ...(extraServerFunctions || {}),\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"],"names":["_internal_renderFieldHandler","copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","getFolderResultsComponentAndDataHandler","schedulePublishHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","slugifyHandler","baseServerFunctions","slugify","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","serverFunctions","extraServerFunctions","req","key","augmentedArgs","fn","Error"],"mappings":"AAEA,SAASA,4BAA4B,EAAEC,yBAAyB,QAAQ,qBAAoB;AAC5F,SAASC,qBAAqB,QAAQ,0CAAyC;AAC/E,SAASC,sBAAsB,QAAQ,2CAA0C;AACjF,SAASC,uCAAuC,QAAQ,4DAA2D;AACnH,SAASC,sBAAsB,QAAQ,kDAAiD;AAExF,SAASC,qBAAqB,QAAQ,4CAA2C;AACjF,SAASC,0BAA0B,QAAQ,2CAA0C;AACrF,SAASC,iBAAiB,QAAQ,wCAAuC;AACzE,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,cAAc,QAAQ,eAAc;AAE7C,MAAMC,sBAAgE;IACpE,yBAAyBV;IACzB,cAAcC;IACd,yCAAyCE;IACzC,mBAAmBE;IACnB,yBAAyBC;IACzB,gBAAgBP;IAChB,eAAeQ;IACf,oBAAoBH;IACpBO,SAASF;IACT,eAAeP;AACjB;AAEA,OAAO,MAAMU,wBAA+C,OAAOC;IACjE,MAAM,EACJC,MAAMC,KAAK,EACXF,MAAMG,MAAM,EACZC,QAAQC,aAAa,EACrBC,SAAS,EACTC,iBAAiBC,oBAAoB,EACtC,GAAGR;IAEJ,MAAM,EAAES,GAAG,EAAE,GAAG,MAAMd,QAAQ;QAC5BU;QACAC;QACAI,KAAK;IACP;IAEA,MAAMC,gBAA+C;QACnD,GAAGR,MAAM;QACTG;QACAG;IACF;IAEA,MAAMF,kBAAkB;QACtB,GAAGV,mBAAmB;QACtB,GAAIW,wBAAwB,CAAC,CAAC;IAChC;IAEA,MAAMI,KAAKL,eAAe,CAACL,MAAM;IAEjC,IAAI,CAACU,IAAI;QACP,MAAM,IAAIC,MAAM,CAAC,yBAAyB,EAAEX,OAAO;IACrD;IAEA,OAAOU,GAAGD;AACZ,EAAC"}
+{"version":3,"file":"handleServerFunctions.js","names":["_internal_renderFieldHandler","copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","getFolderResultsComponentAndDataHandler","schedulePublishHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","slugifyHandler","baseServerFunctions","slugify","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","serverFunctions","extraServerFunctions","req","key","augmentedArgs","fn","Error"],"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { _internal_renderFieldHandler, copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { getFolderResultsComponentAndDataHandler } from '@payloadcms/ui/utilities/getFolderResultsComponentAndData'\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'\nimport { slugifyHandler } from './slugify.js'\n\nconst baseServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'schedule-publish': schedulePublishHandler,\n  slugify: slugifyHandler,\n  'table-state': buildTableStateHandler,\n}\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const {\n    name: fnKey,\n    args: fnArgs,\n    config: configPromise,\n    importMap,\n    serverFunctions: extraServerFunctions,\n  } = 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    ...baseServerFunctions,\n    ...(extraServerFunctions || {}),\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,4BAA4B,EAAEC,yBAAyB,QAAQ;AACxE,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,uCAAuC,QAAQ;AACxD,SAASC,sBAAsB,QAAQ;AAEvC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,OAAO,QAAQ;AACxB,SAASC,cAAc,QAAQ;AAE/B,MAAMC,mBAAA,GAAgE;EACpE,yBAAyBV,yBAAA;EACzB,cAAcC,qBAAA;EACd,yCAAyCE,uCAAA;EACzC,mBAAmBE,qBAAA;EACnB,yBAAyBC,0BAAA;EACzB,gBAAgBP,4BAAA;EAChB,eAAeQ,iBAAA;EACf,oBAAoBH,sBAAA;EACpBO,OAAA,EAASF,cAAA;EACT,eAAeP;AACjB;AAEA,OAAO,MAAMU,qBAAA,GAA+C,MAAOC,IAAA;EACjE,MAAM;IACJC,IAAA,EAAMC,KAAK;IACXF,IAAA,EAAMG,MAAM;IACZC,MAAA,EAAQC,aAAa;IACrBC,SAAS;IACTC,eAAA,EAAiBC;EAAoB,CACtC,GAAGR,IAAA;EAEJ,MAAM;IAAES;EAAG,CAAE,GAAG,MAAMd,OAAA,CAAQ;IAC5BU,aAAA;IACAC,SAAA;IACAI,GAAA,EAAK;EACP;EAEA,MAAMC,aAAA,GAA+C;IACnD,GAAGR,MAAM;IACTG,SAAA;IACAG;EACF;EAEA,MAAMF,eAAA,GAAkB;IACtB,GAAGV,mBAAmB;IACtB,IAAIW,oBAAA,IAAwB,CAAC,CAAC;EAChC;EAEA,MAAMI,EAAA,GAAKL,eAAe,CAACL,KAAA,CAAM;EAEjC,IAAI,CAACU,EAAA,EAAI;IACP,MAAM,IAAIC,KAAA,CAAM,4BAA4BX,KAAA,EAAO;EACrD;EAEA,OAAOU,EAAA,CAAGD,aAAA;AACZ","ignoreList":[]}

package/dist/utilities/initReq.js

@@ -9,84 +9,102 @@ const reqCache = selectiveCache('req');
 /**
  * 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
- */ export const initReq = async function({ canSetHeaders, configPromise, importMap, key, overrides }) {
-    const headers = await getHeaders();
-    const cookies = parseCookies(headers);
-    const partialResult = await partialReqCache.get(async ()=>{
-        const config = await configPromise;
-        const payload = await getPayload({
-            config,
-            cron: true,
-            importMap
-        });
-        const languageCode = getRequestLanguage({
-            config,
-            cookies,
-            headers
-        });
-        const i18n = await initI18n({
-            config: config.i18n,
-            context: 'client',
-            language: languageCode
-        });
-        const { responseHeaders, user } = await executeAuthStrategies({
-            canSetHeaders,
-            headers,
-            payload
-        });
-        return {
-            i18n,
-            languageCode,
-            payload,
-            responseHeaders,
-            user
-        };
-    }, 'global');
-    return reqCache.get(async ()=>{
-        const { i18n, languageCode, payload, responseHeaders, user } = partialResult;
-        const { req: reqOverrides, ...optionsOverrides } = overrides || {};
-        const req = await createLocalReq({
-            req: {
-                headers,
-                host: headers.get('host'),
-                i18n: i18n,
-                responseHeaders,
-                user,
-                ...reqOverrides || {}
-            },
-            ...optionsOverrides || {}
-        }, payload);
-        const locale = await getRequestLocale({
-            req
-        });
-        req.locale = locale?.code;
-        const permissions = await getAccessResults({
-            req
-        });
-        return {
-            cookies,
-            headers,
-            languageCode,
-            locale,
-            permissions,
-            req
-        };
-    }, key).then((result)=>{
-        // CRITICAL: Create a shallow copy of req before returning to prevent
-        // mutations from propagating to the cached req object.
-        // This ensures parallel operations using the same cache key don't affect each other.
-        return {
-            ...result,
-            req: {
-                ...result.req,
-                ...result.req?.context ? {
-                    context: {
-                        ...result.req.context
-                    }
-                } : {}
-            }
-        };
+ */
+export const initReq = async function ({
+  canSetHeaders,
+  configPromise,
+  importMap,
+  key,
+  overrides
+}) {
+  const headers = await getHeaders();
+  const cookies = parseCookies(headers);
+  const partialResult = await partialReqCache.get(async () => {
+    const config = await configPromise;
+    const payload = await getPayload({
+      config,
+      cron: true,
+      importMap
     });
+    const languageCode = getRequestLanguage({
+      config,
+      cookies,
+      headers
+    });
+    const i18n = await initI18n({
+      config: config.i18n,
+      context: 'client',
+      language: languageCode
+    });
+    const {
+      responseHeaders,
+      user
+    } = await executeAuthStrategies({
+      canSetHeaders,
+      headers,
+      payload
+    });
+    return {
+      i18n,
+      languageCode,
+      payload,
+      responseHeaders,
+      user
+    };
+  }, 'global');
+  return reqCache.get(async () => {
+    const {
+      i18n,
+      languageCode,
+      payload,
+      responseHeaders,
+      user
+    } = partialResult;
+    const {
+      req: reqOverrides,
+      ...optionsOverrides
+    } = overrides || {};
+    const req = await createLocalReq({
+      req: {
+        headers,
+        host: headers.get('host'),
+        i18n: i18n,
+        responseHeaders,
+        user,
+        ...(reqOverrides || {})
+      },
+      ...(optionsOverrides || {})
+    }, payload);
+    const locale = await getRequestLocale({
+      req
+    });
+    req.locale = locale?.code;
+    const permissions = await getAccessResults({
+      req
+    });
+    return {
+      cookies,
+      headers,
+      languageCode,
+      locale,
+      permissions,
+      req
+    };
+  }, key).then(result => {
+    // CRITICAL: Create a shallow copy of req before returning to prevent
+    // mutations from propagating to the cached req object.
+    // This ensures parallel operations using the same cache key don't affect each other.
+    return {
+      ...result,
+      req: {
+        ...result.req,
+        ...(result.req?.context ? {
+          context: {
+            ...result.req.context
+          }
+        } : {})
+      }
+    };
+  });
 };
-
 //# sourceMappingURL=initReq.js.map

package/dist/utilities/initReq.js.map

@@ -1 +1 @@
-{"version":3,"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  TypedUser,\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'\n\nimport { getRequestLocale } from './getRequestLocale.js'\nimport { selectiveCache } from './selectiveCache.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  i18n: I18nClient\n  languageCode: AcceptedLanguages\n  payload: Payload\n  responseHeaders: Headers\n  user: null | TypedUser\n}\n\n// Create cache instances for different parts of our application\nconst partialReqCache = selectiveCache<PartialResult>('partialReq')\nconst reqCache = selectiveCache<Result>('req')\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 */\nexport const initReq = async function ({\n  canSetHeaders,\n  configPromise,\n  importMap,\n  key,\n  overrides,\n}: {\n  canSetHeaders?: boolean\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n  key: string\n  overrides?: Parameters<typeof createLocalReq>[0]\n}): Promise<Result> {\n  const headers = await getHeaders()\n  const cookies = parseCookies(headers)\n\n  const partialResult = await partialReqCache.get(async () => {\n    const config = await configPromise\n    const payload = await getPayload({ config, cron: true, importMap })\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    const { responseHeaders, user } = await executeAuthStrategies({\n      canSetHeaders,\n      headers,\n      payload,\n    })\n\n    return {\n      i18n,\n      languageCode,\n      payload,\n      responseHeaders,\n      user,\n    }\n  }, 'global')\n\n  return reqCache\n    .get(async () => {\n      const { i18n, languageCode, payload, responseHeaders, user } = partialResult\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            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        cookies,\n        headers,\n        languageCode,\n        locale,\n        permissions,\n        req,\n      }\n    }, key)\n    .then((result) => {\n      // CRITICAL: Create a shallow copy of req before returning to prevent\n      // mutations from propagating to the cached req object.\n      // This ensures parallel operations using the same cache key don't affect each other.\n      return {\n        ...result,\n        req: {\n          ...result.req,\n          ...(result.req?.context\n            ? {\n                context: { ...result.req.context },\n              }\n            : {}),\n        },\n      }\n    })\n}\n"],"names":["initI18n","headers","getHeaders","createLocalReq","executeAuthStrategies","getAccessResults","getPayload","getRequestLanguage","parseCookies","getRequestLocale","selectiveCache","partialReqCache","reqCache","initReq","canSetHeaders","configPromise","importMap","key","overrides","cookies","partialResult","get","config","payload","cron","languageCode","i18n","context","language","responseHeaders","user","req","reqOverrides","optionsOverrides","host","locale","code","permissions","then","result"],"mappings":"AAWA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,WAAWC,UAAU,QAAQ,kBAAiB;AACvD,SACEC,cAAc,EACdC,qBAAqB,EACrBC,gBAAgB,EAChBC,UAAU,EACVC,kBAAkB,EAClBC,YAAY,QACP,UAAS;AAEhB,SAASC,gBAAgB,QAAQ,wBAAuB;AACxD,SAASC,cAAc,QAAQ,sBAAqB;AAmBpD,gEAAgE;AAChE,MAAMC,kBAAkBD,eAA8B;AACtD,MAAME,WAAWF,eAAuB;AAExC;;;CAGC,GACD,OAAO,MAAMG,UAAU,eAAgB,EACrCC,aAAa,EACbC,aAAa,EACbC,SAAS,EACTC,GAAG,EACHC,SAAS,EAOV;IACC,MAAMjB,UAAU,MAAMC;IACtB,MAAMiB,UAAUX,aAAaP;IAE7B,MAAMmB,gBAAgB,MAAMT,gBAAgBU,GAAG,CAAC;QAC9C,MAAMC,SAAS,MAAMP;QACrB,MAAMQ,UAAU,MAAMjB,WAAW;YAAEgB;YAAQE,MAAM;YAAMR;QAAU;QACjE,MAAMS,eAAelB,mBAAmB;YACtCe;YACAH;YACAlB;QACF;QAEA,MAAMyB,OAAmB,MAAM1B,SAAS;YACtCsB,QAAQA,OAAOI,IAAI;YACnBC,SAAS;YACTC,UAAUH;QACZ;QAEA,MAAM,EAAEI,eAAe,EAAEC,IAAI,EAAE,GAAG,MAAM1B,sBAAsB;YAC5DU;YACAb;YACAsB;QACF;QAEA,OAAO;YACLG;YACAD;YACAF;YACAM;YACAC;QACF;IACF,GAAG;IAEH,OAAOlB,SACJS,GAAG,CAAC;QACH,MAAM,EAAEK,IAAI,EAAED,YAAY,EAAEF,OAAO,EAAEM,eAAe,EAAEC,IAAI,EAAE,GAAGV;QAE/D,MAAM,EAAEW,KAAKC,YAAY,EAAE,GAAGC,kBAAkB,GAAGf,aAAa,CAAC;QAEjE,MAAMa,MAAM,MAAM5B,eAChB;YACE4B,KAAK;gBACH9B;gBACAiC,MAAMjC,QAAQoB,GAAG,CAAC;gBAClBK,MAAMA;gBACNG;gBACAC;gBACA,GAAIE,gBAAgB,CAAC,CAAC;YACxB;YACA,GAAIC,oBAAoB,CAAC,CAAC;QAC5B,GACAV;QAGF,MAAMY,SAAS,MAAM1B,iBAAiB;YACpCsB;QACF;QAEAA,IAAII,MAAM,GAAGA,QAAQC;QAErB,MAAMC,cAAc,MAAMhC,iBAAiB;YACzC0B;QACF;QAEA,OAAO;YACLZ;YACAlB;YACAwB;YACAU;YACAE;YACAN;QACF;IACF,GAAGd,KACFqB,IAAI,CAAC,CAACC;QACL,qEAAqE;QACrE,uDAAuD;QACvD,qFAAqF;QACrF,OAAO;YACL,GAAGA,MAAM;YACTR,KAAK;gBACH,GAAGQ,OAAOR,GAAG;gBACb,GAAIQ,OAAOR,GAAG,EAAEJ,UACZ;oBACEA,SAAS;wBAAE,GAAGY,OAAOR,GAAG,CAACJ,OAAO;oBAAC;gBACnC,IACA,CAAC,CAAC;YACR;QACF;IACF;AACJ,EAAC"}
+{"version":3,"file":"initReq.js","names":["initI18n","headers","getHeaders","createLocalReq","executeAuthStrategies","getAccessResults","getPayload","getRequestLanguage","parseCookies","getRequestLocale","selectiveCache","partialReqCache","reqCache","initReq","canSetHeaders","configPromise","importMap","key","overrides","cookies","partialResult","get","config","payload","cron","languageCode","i18n","context","language","responseHeaders","user","req","reqOverrides","optionsOverrides","host","locale","code","permissions","then","result"],"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  TypedUser,\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'\n\nimport { getRequestLocale } from './getRequestLocale.js'\nimport { selectiveCache } from './selectiveCache.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  i18n: I18nClient\n  languageCode: AcceptedLanguages\n  payload: Payload\n  responseHeaders: Headers\n  user: null | TypedUser\n}\n\n// Create cache instances for different parts of our application\nconst partialReqCache = selectiveCache<PartialResult>('partialReq')\nconst reqCache = selectiveCache<Result>('req')\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 */\nexport const initReq = async function ({\n  canSetHeaders,\n  configPromise,\n  importMap,\n  key,\n  overrides,\n}: {\n  canSetHeaders?: boolean\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n  key: string\n  overrides?: Parameters<typeof createLocalReq>[0]\n}): Promise<Result> {\n  const headers = await getHeaders()\n  const cookies = parseCookies(headers)\n\n  const partialResult = await partialReqCache.get(async () => {\n    const config = await configPromise\n    const payload = await getPayload({ config, cron: true, importMap })\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    const { responseHeaders, user } = await executeAuthStrategies({\n      canSetHeaders,\n      headers,\n      payload,\n    })\n\n    return {\n      i18n,\n      languageCode,\n      payload,\n      responseHeaders,\n      user,\n    }\n  }, 'global')\n\n  return reqCache\n    .get(async () => {\n      const { i18n, languageCode, payload, responseHeaders, user } = partialResult\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            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        cookies,\n        headers,\n        languageCode,\n        locale,\n        permissions,\n        req,\n      }\n    }, key)\n    .then((result) => {\n      // CRITICAL: Create a shallow copy of req before returning to prevent\n      // mutations from propagating to the cached req object.\n      // This ensures parallel operations using the same cache key don't affect each other.\n      return {\n        ...result,\n        req: {\n          ...result.req,\n          ...(result.req?.context\n            ? {\n                context: { ...result.req.context },\n              }\n            : {}),\n        },\n      }\n    })\n}\n"],"mappings":"AAWA,SAASA,QAAQ,QAAQ;AACzB,SAASC,OAAA,IAAWC,UAAU,QAAQ;AACtC,SACEC,cAAc,EACdC,qBAAqB,EACrBC,gBAAgB,EAChBC,UAAU,EACVC,kBAAkB,EAClBC,YAAY,QACP;AAEP,SAASC,gBAAgB,QAAQ;AACjC,SAASC,cAAc,QAAQ;AAmB/B;AACA,MAAMC,eAAA,GAAkBD,cAAA,CAA8B;AACtD,MAAME,QAAA,GAAWF,cAAA,CAAuB;AAExC;;;;AAIA,OAAO,MAAMG,OAAA,GAAU,eAAAA,CAAgB;EACrCC,aAAa;EACbC,aAAa;EACbC,SAAS;EACTC,GAAG;EACHC;AAAS,CAOV;EACC,MAAMjB,OAAA,GAAU,MAAMC,UAAA;EACtB,MAAMiB,OAAA,GAAUX,YAAA,CAAaP,OAAA;EAE7B,MAAMmB,aAAA,GAAgB,MAAMT,eAAA,CAAgBU,GAAG,CAAC;IAC9C,MAAMC,MAAA,GAAS,MAAMP,aAAA;IACrB,MAAMQ,OAAA,GAAU,MAAMjB,UAAA,CAAW;MAAEgB,MAAA;MAAQE,IAAA,EAAM;MAAMR;IAAU;IACjE,MAAMS,YAAA,GAAelB,kBAAA,CAAmB;MACtCe,MAAA;MACAH,OAAA;MACAlB;IACF;IAEA,MAAMyB,IAAA,GAAmB,MAAM1B,QAAA,CAAS;MACtCsB,MAAA,EAAQA,MAAA,CAAOI,IAAI;MACnBC,OAAA,EAAS;MACTC,QAAA,EAAUH;IACZ;IAEA,MAAM;MAAEI,eAAe;MAAEC;IAAI,CAAE,GAAG,MAAM1B,qBAAA,CAAsB;MAC5DU,aAAA;MACAb,OAAA;MACAsB;IACF;IAEA,OAAO;MACLG,IAAA;MACAD,YAAA;MACAF,OAAA;MACAM,eAAA;MACAC;IACF;EACF,GAAG;EAEH,OAAOlB,QAAA,CACJS,GAAG,CAAC;IACH,MAAM;MAAEK,IAAI;MAAED,YAAY;MAAEF,OAAO;MAAEM,eAAe;MAAEC;IAAI,CAAE,GAAGV,aAAA;IAE/D,MAAM;MAAEW,GAAA,EAAKC,YAAY;MAAE,GAAGC;IAAA,CAAkB,GAAGf,SAAA,IAAa,CAAC;IAEjE,MAAMa,GAAA,GAAM,MAAM5B,cAAA,CAChB;MACE4B,GAAA,EAAK;QACH9B,OAAA;QACAiC,IAAA,EAAMjC,OAAA,CAAQoB,GAAG,CAAC;QAClBK,IAAA,EAAMA,IAAA;QACNG,eAAA;QACAC,IAAA;QACA,IAAIE,YAAA,IAAgB,CAAC,CAAC;MACxB;MACA,IAAIC,gBAAA,IAAoB,CAAC,CAAC;IAC5B,GACAV,OAAA;IAGF,MAAMY,MAAA,GAAS,MAAM1B,gBAAA,CAAiB;MACpCsB;IACF;IAEAA,GAAA,CAAII,MAAM,GAAGA,MAAA,EAAQC,IAAA;IAErB,MAAMC,WAAA,GAAc,MAAMhC,gBAAA,CAAiB;MACzC0B;IACF;IAEA,OAAO;MACLZ,OAAA;MACAlB,OAAA;MACAwB,YAAA;MACAU,MAAA;MACAE,WAAA;MACAN;IACF;EACF,GAAGd,GAAA,EACFqB,IAAI,CAAEC,MAAA;IACL;IACA;IACA;IACA,OAAO;MACL,GAAGA,MAAM;MACTR,GAAA,EAAK;QACH,GAAGQ,MAAA,CAAOR,GAAG;QACb,IAAIQ,MAAA,CAAOR,GAAG,EAAEJ,OAAA,GACZ;UACEA,OAAA,EAAS;YAAE,GAAGY,MAAA,CAAOR,GAAG,CAACJ;UAAQ;QACnC,IACA,CAAC,CAAC;MACR;IACF;EACF;AACJ","ignoreList":[]}