@payloadcms/next 3.0.0-canary.51be7be → 3.0.0-canary.5624723

package/dist/utilities/addLocalesToRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"addLocalesToRequest.js","names":["addLocalesToRequestFromData","req","data","payload","config","localeOnReq","locale","fallbackLocaleOnReq","fallbackLocale","sanitizeLocales","localization","includes","localeCodes","defaultLocale"],"sources":["../../src/utilities/addLocalesToRequest.ts"],"sourcesContent":["import type { PayloadRequest, SanitizedConfig } from 'payload'\n\n/**\n * Mutates the Request to contain 'locale' and 'fallbackLocale' based on data or searchParams\n */\nexport function addLocalesToRequestFromData(req: PayloadRequest): void {\n  const {\n    data,\n    payload: { config },\n  } = req\n\n  if (data) {\n    let localeOnReq = req.locale\n    let fallbackLocaleOnReq = req.fallbackLocale\n\n    if (!localeOnReq && data?.locale && typeof data.locale === 'string') {\n      localeOnReq = data.locale\n    }\n\n    if (\n      !fallbackLocaleOnReq &&\n      data?.['fallback-locale'] &&\n      typeof data?.['fallback-locale'] === 'string'\n    ) {\n      fallbackLocaleOnReq = data['fallback-locale']\n    }\n\n    const { fallbackLocale, locale } = sanitizeLocales({\n      fallbackLocale: fallbackLocaleOnReq,\n      locale: localeOnReq,\n      localization: config.localization,\n    })\n\n    if (locale) {\n      req.locale = locale\n    }\n    if (fallbackLocale) {\n      req.fallbackLocale = fallbackLocale\n    }\n  }\n}\n\ntype SanitizeLocalesArgs = {\n  fallbackLocale: string\n  locale: string\n  localization: SanitizedConfig['localization']\n}\ntype SanitizeLocalesReturn = {\n  fallbackLocale?: string\n  locale?: string\n}\nexport const sanitizeLocales = ({\n  fallbackLocale,\n  locale,\n  localization,\n}: SanitizeLocalesArgs): SanitizeLocalesReturn => {\n  if (['none', 'null'].includes(fallbackLocale)) {\n    fallbackLocale = 'null'\n  } else if (localization && !localization.localeCodes.includes(fallbackLocale)) {\n    fallbackLocale = localization.defaultLocale\n  }\n\n  if (locale === '*') {\n    locale = 'all'\n  } else if (localization && !localization.localeCodes.includes(locale)) {\n    locale = localization.defaultLocale\n  }\n\n  return {\n    fallbackLocale,\n    locale,\n  }\n}\n"],"mappings":"AAEA;;GAGA,OAAO,SAASA,4BAA4BC,GAAmB;EAC7D,MAAM;IACJC,IAAI;IACJC,OAAA,EAAS;MAAEC;IAAM;EAAE,CACpB,GAAGH,GAAA;EAEJ,IAAIC,IAAA,EAAM;IACR,IAAIG,WAAA,GAAcJ,GAAA,CAAIK,MAAM;IAC5B,IAAIC,mBAAA,GAAsBN,GAAA,CAAIO,cAAc;IAE5C,IAAI,CAACH,WAAA,IAAeH,IAAA,EAAMI,MAAA,IAAU,OAAOJ,IAAA,CAAKI,MAAM,KAAK,UAAU;MACnED,WAAA,GAAcH,IAAA,CAAKI,MAAM;IAC3B;IAEA,IACE,CAACC,mBAAA,IACDL,IAAA,GAAO,kBAAkB,IACzB,OAAOA,IAAA,GAAO,kBAAkB,KAAK,UACrC;MACAK,mBAAA,GAAsBL,IAAI,CAAC,kBAAkB;IAC/C;IAEA,MAAM;MAAEM,cAAc;MAAEF;IAAM,CAAE,GAAGG,eAAA,CAAgB;MACjDD,cAAA,EAAgBD,mBAAA;MAChBD,MAAA,EAAQD,WAAA;MACRK,YAAA,EAAcN,MAAA,CAAOM;IACvB;IAEA,IAAIJ,MAAA,EAAQ;MACVL,GAAA,CAAIK,MAAM,GAAGA,MAAA;IACf;IACA,IAAIE,cAAA,EAAgB;MAClBP,GAAA,CAAIO,cAAc,GAAGA,cAAA;IACvB;EACF;AACF;AAWA,OAAO,MAAMC,eAAA,GAAkBA,CAAC;EAC9BD,cAAc;EACdF,MAAM;EACNI;AAAY,CACQ;EACpB,IAAI,CAAC,QAAQ,OAAO,CAACC,QAAQ,CAACH,cAAA,GAAiB;IAC7CA,cAAA,GAAiB;EACnB,OAAO,IAAIE,YAAA,IAAgB,CAACA,YAAA,CAAaE,WAAW,CAACD,QAAQ,CAACH,cAAA,GAAiB;IAC7EA,cAAA,GAAiBE,YAAA,CAAaG,aAAa;EAC7C;EAEA,IAAIP,MAAA,KAAW,KAAK;IAClBA,MAAA,GAAS;EACX,OAAO,IAAII,YAAA,IAAgB,CAACA,YAAA,CAAaE,WAAW,CAACD,QAAQ,CAACL,MAAA,GAAS;IACrEA,MAAA,GAASI,YAAA,CAAaG,aAAa;EACrC;EAEA,OAAO;IACLL,cAAA;IACAF;EACF;AACF","ignoreList":[]}
+{"version":3,"file":"addLocalesToRequest.js","names":["sanitizeFallbackLocale","addLocalesToRequestFromData","req","data","payload","config","localeOnReq","locale","fallbackLocaleOnReq","fallbackLocale","sanitizeLocales","localization","localeCodes","includes","fallback","defaultLocale"],"sources":["../../src/utilities/addLocalesToRequest.ts"],"sourcesContent":["import type { PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { sanitizeFallbackLocale } from 'payload'\n/**\n * Mutates the Request to contain 'locale' and 'fallbackLocale' based on data or searchParams\n */\nexport function addLocalesToRequestFromData(req: PayloadRequest): void {\n  const {\n    data,\n    payload: { config },\n  } = req\n\n  if (data) {\n    let localeOnReq = req.locale\n    let fallbackLocaleOnReq = req.fallbackLocale\n\n    if (!localeOnReq && data?.locale && typeof data.locale === 'string') {\n      localeOnReq = data.locale\n    }\n\n    if (!fallbackLocaleOnReq) {\n      if (data?.['fallback-locale'] && typeof data?.['fallback-locale'] === 'string') {\n        fallbackLocaleOnReq = data['fallback-locale']\n      }\n\n      if (data?.['fallbackLocale'] && typeof data?.['fallbackLocale'] === 'string') {\n        fallbackLocaleOnReq = data['fallbackLocale']\n      }\n    }\n\n    const { fallbackLocale, locale } = sanitizeLocales({\n      fallbackLocale: fallbackLocaleOnReq,\n      locale: localeOnReq,\n      localization: config.localization,\n    })\n\n    if (locale) {\n      req.locale = locale\n    }\n    if (fallbackLocale) {\n      req.fallbackLocale = fallbackLocale\n    }\n  }\n}\n\ntype SanitizeLocalesArgs = {\n  fallbackLocale: string\n  locale: string\n  localization: SanitizedConfig['localization']\n}\ntype SanitizeLocalesReturn = {\n  fallbackLocale?: string\n  locale?: string\n}\nexport const sanitizeLocales = ({\n  fallbackLocale,\n  locale,\n  localization,\n}: SanitizeLocalesArgs): SanitizeLocalesReturn => {\n  // Check if localization has fallback enabled or if a fallback locale is provided\n\n  if (localization) {\n    fallbackLocale = sanitizeFallbackLocale({\n      fallbackLocale,\n      locale,\n      localization,\n    })\n  }\n\n  if (locale === '*') {\n    locale = 'all'\n  } else if (localization && !localization.localeCodes.includes(locale) && localization.fallback) {\n    locale = localization.defaultLocale\n  }\n\n  return {\n    fallbackLocale,\n    locale,\n  }\n}\n"],"mappings":"AAEA,SAASA,sBAAsB,QAAQ;AACvC;;;AAGA,OAAO,SAASC,4BAA4BC,GAAmB;EAC7D,MAAM;IACJC,IAAI;IACJC,OAAA,EAAS;MAAEC;IAAM;EAAE,CACpB,GAAGH,GAAA;EAEJ,IAAIC,IAAA,EAAM;IACR,IAAIG,WAAA,GAAcJ,GAAA,CAAIK,MAAM;IAC5B,IAAIC,mBAAA,GAAsBN,GAAA,CAAIO,cAAc;IAE5C,IAAI,CAACH,WAAA,IAAeH,IAAA,EAAMI,MAAA,IAAU,OAAOJ,IAAA,CAAKI,MAAM,KAAK,UAAU;MACnED,WAAA,GAAcH,IAAA,CAAKI,MAAM;IAC3B;IAEA,IAAI,CAACC,mBAAA,EAAqB;MACxB,IAAIL,IAAA,GAAO,kBAAkB,IAAI,OAAOA,IAAA,GAAO,kBAAkB,KAAK,UAAU;QAC9EK,mBAAA,GAAsBL,IAAI,CAAC,kBAAkB;MAC/C;MAEA,IAAIA,IAAA,GAAO,iBAAiB,IAAI,OAAOA,IAAA,GAAO,iBAAiB,KAAK,UAAU;QAC5EK,mBAAA,GAAsBL,IAAI,CAAC,iBAAiB;MAC9C;IACF;IAEA,MAAM;MAAEM,cAAc;MAAEF;IAAM,CAAE,GAAGG,eAAA,CAAgB;MACjDD,cAAA,EAAgBD,mBAAA;MAChBD,MAAA,EAAQD,WAAA;MACRK,YAAA,EAAcN,MAAA,CAAOM;IACvB;IAEA,IAAIJ,MAAA,EAAQ;MACVL,GAAA,CAAIK,MAAM,GAAGA,MAAA;IACf;IACA,IAAIE,cAAA,EAAgB;MAClBP,GAAA,CAAIO,cAAc,GAAGA,cAAA;IACvB;EACF;AACF;AAWA,OAAO,MAAMC,eAAA,GAAkBA,CAAC;EAC9BD,cAAc;EACdF,MAAM;EACNI;AAAY,CACQ;EACpB;EAEA,IAAIA,YAAA,EAAc;IAChBF,cAAA,GAAiBT,sBAAA,CAAuB;MACtCS,cAAA;MACAF,MAAA;MACAI;IACF;EACF;EAEA,IAAIJ,MAAA,KAAW,KAAK;IAClBA,MAAA,GAAS;EACX,OAAO,IAAII,YAAA,IAAgB,CAACA,YAAA,CAAaC,WAAW,CAACC,QAAQ,CAACN,MAAA,KAAWI,YAAA,CAAaG,QAAQ,EAAE;IAC9FP,MAAA,GAASI,YAAA,CAAaI,aAAa;EACrC;EAEA,OAAO;IACLN,cAAA;IACAF;EACF;AACF","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"createPayloadRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/createPayloadRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkC,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAW9F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QACP,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oBAAoB,gDAI9B,IAAI,KAAG,OAAO,CAAC,cAAc,CAkG/B,CAAA"}
+{"version":3,"file":"createPayloadRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/createPayloadRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkC,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAgB9F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QACP,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oBAAoB,gDAI9B,IAAI,KAAG,OAAO,CAAC,cAAc,CAwG/B,CAAA"}

package/dist/utilities/createPayloadRequest.js

@@ -1,9 +1,8 @@
 import { initI18n } from '@payloadcms/translations';
-import { executeAuthStrategies, getDataLoader, parseCookies } from 'payload';
+import { executeAuthStrategies, getDataLoader, getPayload, parseCookies, sanitizeFallbackLocale } from 'payload';
 import * as qs from 'qs-esm';
 import { URL } from 'url';
 import { sanitizeLocales } from './addLocalesToRequest.js';
-import { getPayloadHMR } from './getPayloadHMR.js';
 import { getRequestLanguage } from './getRequestLanguage.js';
 export const createPayloadRequest = async ({
   config: configPromise,
@@ -11,12 +10,13 @@ export const createPayloadRequest = async ({
   request
 }) => {
   const cookies = parseCookies(request.headers);
-  const payload = await getPayloadHMR({
+  const payload = await getPayload({
     config: configPromise
   });
   const {
     config
   } = payload;
+  const localization = config.localization;
   const urlProperties = new URL(request.url);
   const {
     pathname,
@@ -33,8 +33,9 @@ export const createPayloadRequest = async ({
     context: 'api',
     language
   });
-  let locale;
-  let fallbackLocale;
+  const fallbackFromRequest = searchParams.get('fallback-locale') || searchParams.get('fallbackLocale');
+  let locale = searchParams.get('locale');
+  let fallbackLocale = fallbackFromRequest;
   const overrideHttpMethod = request.headers.get('X-HTTP-Method-Override');
   const queryToParse = overrideHttpMethod === 'GET' ? await request.text() : urlProperties.search;
   const query = queryToParse ? qs.parse(queryToParse, {
@@ -42,21 +43,22 @@ export const createPayloadRequest = async ({
     depth: 10,
     ignoreQueryPrefix: true
   }) : {};
-  if (config.localization) {
+  if (localization) {
+    fallbackLocale = sanitizeFallbackLocale({
+      fallbackLocale,
+      locale,
+      localization
+    });
     const locales = sanitizeLocales({
-      fallbackLocale: searchParams.get('fallback-locale'),
-      locale: searchParams.get('locale'),
-      localization: payload.config.localization
+      fallbackLocale,
+      locale,
+      localization
     });
     locale = locales.locale;
-    fallbackLocale = locales.fallbackLocale;
     // Override if query params are present, in order to respect HTTP method override
     if (query.locale) {
       locale = query.locale;
     }
-    if (query?.['fallback-locale']) {
-      fallbackLocale = query['fallback-locale'];
-    }
   }
   const customRequest = {
     context: {},

package/dist/utilities/createPayloadRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPayloadRequest.js","names":["initI18n","executeAuthStrategies","getDataLoader","parseCookies","qs","URL","sanitizeLocales","getPayloadHMR","getRequestLanguage","createPayloadRequest","config","configPromise","params","request","cookies","headers","payload","urlProperties","url","pathname","searchParams","isGraphQL","graphQL","disable","routes","api","language","i18n","context","locale","fallbackLocale","overrideHttpMethod","get","queryToParse","text","search","query","parse","arrayLimit","depth","ignoreQueryPrefix","localization","locales","customRequest","hash","host","href","origin","payloadAPI","payloadDataLoader","undefined","payloadUploadSizes","port","protocol","routeParams","t","transactionID","user","req","Object","assign","responseHeaders"],"sources":["../../src/utilities/createPayloadRequest.ts"],"sourcesContent":["import type { CustomPayloadRequestProperties, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { executeAuthStrategies, getDataLoader, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\nimport { URL } from 'url'\n\nimport { sanitizeLocales } from './addLocalesToRequest.js'\nimport { getPayloadHMR } from './getPayloadHMR.js'\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\ntype Args = {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: {\n    collection: string\n  }\n  request: Request\n}\n\nexport const createPayloadRequest = async ({\n  config: configPromise,\n  params,\n  request,\n}: Args): Promise<PayloadRequest> => {\n  const cookies = parseCookies(request.headers)\n  const payload = await getPayloadHMR({ config: configPromise })\n\n  const { config } = payload\n\n  const urlProperties = new URL(request.url)\n  const { pathname, searchParams } = urlProperties\n\n  const isGraphQL =\n    !config.graphQL.disable && pathname === `${config.routes.api}${config.routes.graphQL}`\n\n  const language = getRequestLanguage({\n    config,\n    cookies,\n    headers: request.headers,\n  })\n\n  const i18n = await initI18n({\n    config: config.i18n,\n    context: 'api',\n    language,\n  })\n\n  let locale\n  let fallbackLocale\n\n  const overrideHttpMethod = request.headers.get('X-HTTP-Method-Override')\n  const queryToParse = overrideHttpMethod === 'GET' ? await request.text() : urlProperties.search\n\n  const query = queryToParse\n    ? qs.parse(queryToParse, {\n        arrayLimit: 1000,\n        depth: 10,\n        ignoreQueryPrefix: true,\n      })\n    : {}\n\n  if (config.localization) {\n    const locales = sanitizeLocales({\n      fallbackLocale: searchParams.get('fallback-locale'),\n      locale: searchParams.get('locale'),\n      localization: payload.config.localization,\n    })\n    locale = locales.locale\n    fallbackLocale = locales.fallbackLocale\n\n    // Override if query params are present, in order to respect HTTP method override\n    if (query.locale) {\n      locale = query.locale\n    }\n    if (query?.['fallback-locale']) {\n      fallbackLocale = query['fallback-locale']\n    }\n  }\n\n  const customRequest: CustomPayloadRequestProperties = {\n    context: {},\n    fallbackLocale,\n    hash: urlProperties.hash,\n    host: urlProperties.host,\n    href: urlProperties.href,\n    i18n,\n    locale,\n    origin: urlProperties.origin,\n    pathname: urlProperties.pathname,\n    payload,\n    payloadAPI: isGraphQL ? 'GraphQL' : 'REST',\n    payloadDataLoader: undefined,\n    payloadUploadSizes: {},\n    port: urlProperties.port,\n    protocol: urlProperties.protocol,\n    query,\n    routeParams: params || {},\n    search: urlProperties.search,\n    searchParams: urlProperties.searchParams,\n    t: i18n.t,\n    transactionID: undefined,\n    user: null,\n  }\n\n  const req: PayloadRequest = Object.assign(request, customRequest)\n\n  req.payloadDataLoader = getDataLoader(req)\n\n  const { responseHeaders, user } = await executeAuthStrategies({\n    headers: req.headers,\n    isGraphQL,\n    payload,\n  })\n\n  req.user = user\n\n  if (responseHeaders) {\n    req.responseHeaders = responseHeaders\n  }\n\n  return req\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"createPayloadRequest.js","names":["initI18n","executeAuthStrategies","getDataLoader","getPayload","parseCookies","sanitizeFallbackLocale","qs","URL","sanitizeLocales","getRequestLanguage","createPayloadRequest","config","configPromise","params","request","cookies","headers","payload","localization","urlProperties","url","pathname","searchParams","isGraphQL","graphQL","disable","routes","api","language","i18n","context","fallbackFromRequest","get","locale","fallbackLocale","overrideHttpMethod","queryToParse","text","search","query","parse","arrayLimit","depth","ignoreQueryPrefix","locales","customRequest","hash","host","href","origin","payloadAPI","payloadDataLoader","undefined","payloadUploadSizes","port","protocol","routeParams","t","transactionID","user","req","Object","assign","responseHeaders"],"sources":["../../src/utilities/createPayloadRequest.ts"],"sourcesContent":["import type { CustomPayloadRequestProperties, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport {\n  executeAuthStrategies,\n  getDataLoader,\n  getPayload,\n  parseCookies,\n  sanitizeFallbackLocale,\n} from 'payload'\nimport * as qs from 'qs-esm'\nimport { URL } from 'url'\n\nimport { sanitizeLocales } from './addLocalesToRequest.js'\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\ntype Args = {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: {\n    collection: string\n  }\n  request: Request\n}\n\nexport const createPayloadRequest = async ({\n  config: configPromise,\n  params,\n  request,\n}: Args): Promise<PayloadRequest> => {\n  const cookies = parseCookies(request.headers)\n  const payload = await getPayload({ config: configPromise })\n\n  const { config } = payload\n  const localization = config.localization\n\n  const urlProperties = new URL(request.url)\n  const { pathname, searchParams } = urlProperties\n\n  const isGraphQL =\n    !config.graphQL.disable && pathname === `${config.routes.api}${config.routes.graphQL}`\n\n  const language = getRequestLanguage({\n    config,\n    cookies,\n    headers: request.headers,\n  })\n\n  const i18n = await initI18n({\n    config: config.i18n,\n    context: 'api',\n    language,\n  })\n\n  const fallbackFromRequest =\n    searchParams.get('fallback-locale') || searchParams.get('fallbackLocale')\n  let locale = searchParams.get('locale')\n  let fallbackLocale = fallbackFromRequest\n\n  const overrideHttpMethod = request.headers.get('X-HTTP-Method-Override')\n  const queryToParse = overrideHttpMethod === 'GET' ? await request.text() : urlProperties.search\n\n  const query = queryToParse\n    ? qs.parse(queryToParse, {\n        arrayLimit: 1000,\n        depth: 10,\n        ignoreQueryPrefix: true,\n      })\n    : {}\n\n  if (localization) {\n    fallbackLocale = sanitizeFallbackLocale({\n      fallbackLocale,\n      locale,\n      localization,\n    })\n\n    const locales = sanitizeLocales({\n      fallbackLocale,\n      locale,\n      localization,\n    })\n\n    locale = locales.locale\n\n    // Override if query params are present, in order to respect HTTP method override\n    if (query.locale) {\n      locale = query.locale as string\n    }\n  }\n\n  const customRequest: CustomPayloadRequestProperties = {\n    context: {},\n    fallbackLocale,\n    hash: urlProperties.hash,\n    host: urlProperties.host,\n    href: urlProperties.href,\n    i18n,\n    locale,\n    origin: urlProperties.origin,\n    pathname: urlProperties.pathname,\n    payload,\n    payloadAPI: isGraphQL ? 'GraphQL' : 'REST',\n    payloadDataLoader: undefined,\n    payloadUploadSizes: {},\n    port: urlProperties.port,\n    protocol: urlProperties.protocol,\n    query,\n    routeParams: params || {},\n    search: urlProperties.search,\n    searchParams: urlProperties.searchParams,\n    t: i18n.t,\n    transactionID: undefined,\n    user: null,\n  }\n\n  const req: PayloadRequest = Object.assign(request, customRequest)\n\n  req.payloadDataLoader = getDataLoader(req)\n\n  const { responseHeaders, user } = await executeAuthStrategies({\n    headers: req.headers,\n    isGraphQL,\n    payload,\n  })\n\n  req.user = user\n\n  if (responseHeaders) {\n    req.responseHeaders = responseHeaders\n  }\n\n  return req\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/getClientConfig.d.ts

@@ -0,0 +1,8 @@
+import type { I18nClient } from '@payloadcms/translations';
+import type { ClientConfig, ImportMap, SanitizedConfig } from 'payload';
+export declare const getClientConfig: (args: {
+    config: SanitizedConfig;
+    i18n: I18nClient;
+    importMap: ImportMap;
+}) => Promise<ClientConfig>;
+//# sourceMappingURL=getClientConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getClientConfig.d.ts","sourceRoot":"","sources":["../../src/utilities/getClientConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKvE,eAAO,MAAM,eAAe,SACb;IACX,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;CACrB,KAAG,OAAO,CAAC,YAAY,CAWzB,CAAA"}

package/dist/utilities/getClientConfig.js

@@ -0,0 +1,16 @@
+import { createClientConfig } from 'payload';
+import { cache } from 'react';
+export const getClientConfig = cache(async args => {
+  const {
+    config,
+    i18n,
+    importMap
+  } = args;
+  const clientConfig = createClientConfig({
+    config,
+    i18n,
+    importMap
+  });
+  return Promise.resolve(clientConfig);
+});
+//# sourceMappingURL=getClientConfig.js.map

package/dist/utilities/getClientConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getClientConfig.js","names":["createClientConfig","cache","getClientConfig","args","config","i18n","importMap","clientConfig","Promise","resolve"],"sources":["../../src/utilities/getClientConfig.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { ClientConfig, ImportMap, SanitizedConfig } from 'payload'\n\nimport { createClientConfig } from 'payload'\nimport { cache } from 'react'\n\nexport const getClientConfig = cache(\n  async (args: {\n    config: SanitizedConfig\n    i18n: I18nClient\n    importMap: ImportMap\n  }): Promise<ClientConfig> => {\n    const { config, i18n, importMap } = args\n\n    const clientConfig = createClientConfig({\n      config,\n      i18n,\n      importMap,\n    })\n\n    return Promise.resolve(clientConfig)\n  },\n)\n"],"mappings":"AAGA,SAASA,kBAAkB,QAAQ;AACnC,SAASC,KAAK,QAAQ;AAEtB,OAAO,MAAMC,eAAA,GAAkBD,KAAA,CAC7B,MAAOE,IAAA;EAKL,MAAM;IAAEC,MAAM;IAAEC,IAAI;IAAEC;EAAS,CAAE,GAAGH,IAAA;EAEpC,MAAMI,YAAA,GAAeP,kBAAA,CAAmB;IACtCI,MAAA;IACAC,IAAA;IACAC;EACF;EAEA,OAAOE,OAAA,CAAQC,OAAO,CAACF,YAAA;AACzB","ignoreList":[]}

package/dist/utilities/getPayloadHMR.d.ts

@@ -1,4 +1,3 @@
-import type { InitOptions, Payload, SanitizedConfig } from 'payload';
-export declare const reload: (config: SanitizedConfig, payload: Payload, skipImportMapGeneration?: boolean) => Promise<void>;
+import type { InitOptions, Payload } from 'payload';
 export declare const getPayloadHMR: (options: Pick<InitOptions, "config" | "importMap">) => Promise<Payload>;
 //# sourceMappingURL=getPayloadHMR.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getPayloadHMR.d.ts","sourceRoot":"","sources":["../../src/utilities/getPayloadHMR.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBpE,eAAO,MAAM,MAAM,WACT,eAAe,WACd,OAAO,4BACU,OAAO,KAChC,OAAO,CAAC,IAAI,CA0Cd,CAAA;AAED,eAAO,MAAM,aAAa,YACf,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,WAAW,CAAC,KACjD,OAAO,CAAC,OAAO,CAyEjB,CAAA"}
+{"version":3,"file":"getPayloadHMR.d.ts","sourceRoot":"","sources":["../../src/utilities/getPayloadHMR.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAInD,eAAO,MAAM,aAAa,YACf,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,WAAW,CAAC,KACjD,OAAO,CAAC,OAAO,CAQjB,CAAA"}

package/dist/utilities/getPayloadHMR.js

@@ -1,105 +1,7 @@
-import { BasePayload, generateImportMap } from 'payload';
-import WebSocket from 'ws';
-let cached = global._payload;
-if (!cached) {
-  cached = global._payload = {
-    payload: null,
-    promise: null,
-    reload: false,
-    ws: null
-  };
-}
-export const reload = async (config, payload, skipImportMapGeneration) => {
-  if (typeof payload.db.destroy === 'function') {
-    await payload.db.destroy();
-  }
-  payload.config = config;
-  payload.collections = config.collections.reduce((collections, collection) => {
-    collections[collection.slug] = {
-      config: collection,
-      customIDType: payload.collections[collection.slug]?.customIDType
-    };
-    return collections;
-  }, {});
-  payload.globals = {
-    config: config.globals
-  };
-  // TODO: support HMR for other props in the future (see payload/src/index init()) hat may change on Payload singleton
-  // Generate types
-  if (config.typescript.autoGenerate !== false) {
-    // We cannot run it directly here, as generate-types imports json-schema-to-typescript, which breaks on turbopack.
-    // see: https://github.com/vercel/next.js/issues/66723
-    void payload.bin({
-      args: ['generate:types'],
-      log: false
-    });
-  }
-  // Generate component map
-  if (skipImportMapGeneration !== true && config.admin?.importMap?.autoGenerate !== false) {
-    await generateImportMap(config, {
-      log: true
-    });
-  }
-  await payload.db.init();
-  if (payload.db.connect) {
-    await payload.db.connect({
-      hotReload: true
-    });
-  }
-};
+import { getPayload } from 'payload';
 export const getPayloadHMR = async options => {
-  if (!options?.config) {
-    throw new Error('Error: the payload config is required for getPayloadHMR to work.');
-  }
-  if (cached.payload) {
-    if (cached.reload === true) {
-      let resolve;
-      // getPayloadHMR is called multiple times, in parallel. However, we only want to run `await reload` once. By immediately setting cached.reload to a promise,
-      // we can ensure that all subsequent calls will wait for the first reload to finish. So if we set it here, the 2nd call of getPayloadHMR
-      // will reach `if (cached.reload instanceof Promise) {` which then waits for the first reload to finish.
-      cached.reload = new Promise(res => resolve = res);
-      const config = await options.config;
-      await reload(config, cached.payload);
-      resolve();
-    }
-    if (cached.reload instanceof Promise) {
-      await cached.reload;
-    }
-    if (options?.importMap) {
-      cached.payload.importMap = options.importMap;
-    }
-    return cached.payload;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  if (!cached.promise) {
-    // no need to await options.config here, as it's already awaited in the BasePayload.init
-    cached.promise = new BasePayload().init(options);
-  }
-  try {
-    cached.payload = await cached.promise;
-    if (!cached.ws && process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' && process.env.DISABLE_PAYLOAD_HMR !== 'true') {
-      try {
-        const port = process.env.PORT || '3000';
-        cached.ws = new WebSocket(`ws://localhost:${port}${process.env.NEXT_BASE_PATH ?? ''}/_next/webpack-hmr`);
-        cached.ws.onmessage = event => {
-          if (typeof event.data === 'string') {
-            const data = JSON.parse(event.data);
-            if ('action' in data && data.action === 'serverComponentChanges') {
-              cached.reload = true;
-            }
-          }
-        };
-      } catch (_) {
-        // swallow e
-      }
-    }
-  } catch (e) {
-    cached.promise = null;
-    throw e;
-  }
-  if (options?.importMap) {
-    cached.payload.importMap = options.importMap;
-  }
-  return cached.payload;
+  const result = await getPayload(options);
+  result.logger.error("Deprecation warning: getPayloadHMR is no longer preferred. You can now use `import { getPayload } from 'payload' in all contexts.");
+  return result;
 };
 //# sourceMappingURL=getPayloadHMR.js.map

package/dist/utilities/getPayloadHMR.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPayloadHMR.js","names":["BasePayload","generateImportMap","WebSocket","cached","global","_payload","payload","promise","reload","ws","config","skipImportMapGeneration","db","destroy","collections","reduce","collection","slug","customIDType","globals","typescript","autoGenerate","bin","args","log","admin","importMap","init","connect","hotReload","getPayloadHMR","options","Error","resolve","Promise","res","process","env","NODE_ENV","DISABLE_PAYLOAD_HMR","port","PORT","NEXT_BASE_PATH","onmessage","event","data","JSON","parse","action","_","e"],"sources":["../../src/utilities/getPayloadHMR.ts"],"sourcesContent":["import type { InitOptions, Payload, SanitizedConfig } from 'payload'\n\nimport { BasePayload, generateImportMap } from 'payload'\nimport WebSocket from 'ws'\n\nlet cached: {\n  payload: null | Payload\n  promise: null | Promise<Payload>\n  reload: boolean | Promise<void>\n  ws: null | WebSocket\n} = global._payload\n\nif (!cached) {\n  cached = global._payload = { payload: null, promise: null, reload: false, ws: null }\n}\n\nexport const reload = async (\n  config: SanitizedConfig,\n  payload: Payload,\n  skipImportMapGeneration?: boolean,\n): Promise<void> => {\n  if (typeof payload.db.destroy === 'function') {\n    await payload.db.destroy()\n  }\n\n  payload.config = config\n\n  payload.collections = config.collections.reduce((collections, collection) => {\n    collections[collection.slug] = {\n      config: collection,\n      customIDType: payload.collections[collection.slug]?.customIDType,\n    }\n    return collections\n  }, {})\n\n  payload.globals = {\n    config: config.globals,\n  }\n\n  // TODO: support HMR for other props in the future (see payload/src/index init()) hat may change on Payload singleton\n\n  // Generate types\n  if (config.typescript.autoGenerate !== false) {\n    // We cannot run it directly here, as generate-types imports json-schema-to-typescript, which breaks on turbopack.\n    // see: https://github.com/vercel/next.js/issues/66723\n    void payload.bin({\n      args: ['generate:types'],\n      log: false,\n    })\n  }\n\n  // Generate component map\n  if (skipImportMapGeneration !== true && config.admin?.importMap?.autoGenerate !== false) {\n    await generateImportMap(config, {\n      log: true,\n    })\n  }\n\n  await payload.db.init()\n  if (payload.db.connect) {\n    await payload.db.connect({ hotReload: true })\n  }\n}\n\nexport const getPayloadHMR = async (\n  options: Pick<InitOptions, 'config' | 'importMap'>,\n): Promise<Payload> => {\n  if (!options?.config) {\n    throw new Error('Error: the payload config is required for getPayloadHMR to work.')\n  }\n\n  if (cached.payload) {\n    if (cached.reload === true) {\n      let resolve: () => void\n\n      // getPayloadHMR is called multiple times, in parallel. However, we only want to run `await reload` once. By immediately setting cached.reload to a promise,\n      // we can ensure that all subsequent calls will wait for the first reload to finish. So if we set it here, the 2nd call of getPayloadHMR\n      // will reach `if (cached.reload instanceof Promise) {` which then waits for the first reload to finish.\n      cached.reload = new Promise((res) => (resolve = res))\n      const config = await options.config\n      await reload(config, cached.payload)\n\n      resolve()\n    }\n\n    if (cached.reload instanceof Promise) {\n      await cached.reload\n    }\n\n    if (options?.importMap) {\n      cached.payload.importMap = options.importMap\n    }\n    return cached.payload\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-misused-promises\n  if (!cached.promise) {\n    // no need to await options.config here, as it's already awaited in the BasePayload.init\n    cached.promise = new BasePayload().init(options)\n  }\n\n  try {\n    cached.payload = await cached.promise\n\n    if (\n      !cached.ws &&\n      process.env.NODE_ENV !== 'production' &&\n      process.env.NODE_ENV !== 'test' &&\n      process.env.DISABLE_PAYLOAD_HMR !== 'true'\n    ) {\n      try {\n        const port = process.env.PORT || '3000'\n        cached.ws = new WebSocket(\n          `ws://localhost:${port}${process.env.NEXT_BASE_PATH ?? ''}/_next/webpack-hmr`,\n        )\n\n        cached.ws.onmessage = (event) => {\n          if (typeof event.data === 'string') {\n            const data = JSON.parse(event.data)\n\n            if ('action' in data && data.action === 'serverComponentChanges') {\n              cached.reload = true\n            }\n          }\n        }\n      } catch (_) {\n        // swallow e\n      }\n    }\n  } catch (e) {\n    cached.promise = null\n    throw e\n  }\n\n  if (options?.importMap) {\n    cached.payload.importMap = options.importMap\n  }\n\n  return cached.payload\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"getPayloadHMR.js","names":["getPayload","getPayloadHMR","options","result","logger","error"],"sources":["../../src/utilities/getPayloadHMR.ts"],"sourcesContent":["import type { InitOptions, Payload } from 'payload'\n\nimport { getPayload } from 'payload'\n\nexport const getPayloadHMR = async (\n  options: Pick<InitOptions, 'config' | 'importMap'>,\n): Promise<Payload> => {\n  const result = await getPayload(options)\n\n  result.logger.error(\n    \"Deprecation warning: getPayloadHMR is no longer preferred. You can now use `import { getPayload } from 'payload' in all contexts.\",\n  )\n\n  return result\n}\n"],"mappings":"AAEA,SAASA,UAAU,QAAQ;AAE3B,OAAO,MAAMC,aAAA,GAAgB,MAC3BC,OAAA;EAEA,MAAMC,MAAA,GAAS,MAAMH,UAAA,CAAWE,OAAA;EAEhCC,MAAA,CAAOC,MAAM,CAACC,KAAK,CACjB;EAGF,OAAOF,MAAA;AACT","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"getRequestLocales.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestLocales.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,KAAK,qBAAqB,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,CAAA;IAC/D,YAAY,CAAC,EAAE,eAAe,CAAA;CAC/B,CAAA;AACD,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG;IAC9F,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;CACf,CA6BA"}
+{"version":3,"file":"getRequestLocales.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestLocales.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAItC,KAAK,qBAAqB,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,CAAA;IAC/D,YAAY,CAAC,EAAE,eAAe,CAAA;CAC/B,CAAA;AACD,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG;IAC9F,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;CACf,CAgCA"}

package/dist/utilities/getRequestLocales.js

@@ -1,10 +1,11 @@
+import { sanitizeFallbackLocale } from 'payload';
 export function getRequestLocales({
   data,
   localization,
   searchParams
 }) {
   let locale = searchParams.get('locale');
-  let fallbackLocale = searchParams.get('fallback-locale');
+  let fallbackLocale = searchParams.get('fallback-locale') || searchParams.get('fallbackLocale');
   if (data) {
     if (data?.locale) {
       locale = data.locale;
@@ -12,12 +13,15 @@ export function getRequestLocales({
     if (data?.['fallback-locale']) {
       fallbackLocale = data['fallback-locale'];
     }
+    if (data?.['fallbackLocale']) {
+      fallbackLocale = data['fallbackLocale'];
+    }
   }
-  if (fallbackLocale === 'none') {
-    fallbackLocale = 'null';
-  } else if (!localization.localeCodes.includes(fallbackLocale)) {
-    fallbackLocale = localization.defaultLocale;
-  }
+  fallbackLocale = sanitizeFallbackLocale({
+    fallbackLocale,
+    locale,
+    localization
+  });
   if (locale === '*') {
     locale = 'all';
   } else if (!localization.localeCodes.includes(locale)) {

package/dist/utilities/getRequestLocales.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRequestLocales.js","names":["getRequestLocales","data","localization","searchParams","locale","get","fallbackLocale","localeCodes","includes","defaultLocale"],"sources":["../../src/utilities/getRequestLocales.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\ntype GetRequestLocalesArgs = {\n  data?: Record<string, any>\n  localization: Exclude<Payload['config']['localization'], false>\n  searchParams?: URLSearchParams\n}\nexport function getRequestLocales({ data, localization, searchParams }: GetRequestLocalesArgs): {\n  fallbackLocale: string\n  locale: string\n} {\n  let locale = searchParams.get('locale')\n  let fallbackLocale = searchParams.get('fallback-locale')\n\n  if (data) {\n    if (data?.locale) {\n      locale = data.locale\n    }\n    if (data?.['fallback-locale']) {\n      fallbackLocale = data['fallback-locale']\n    }\n  }\n\n  if (fallbackLocale === 'none') {\n    fallbackLocale = 'null'\n  } else if (!localization.localeCodes.includes(fallbackLocale)) {\n    fallbackLocale = localization.defaultLocale\n  }\n\n  if (locale === '*') {\n    locale = 'all'\n  } else if (!localization.localeCodes.includes(locale)) {\n    locale = localization.defaultLocale\n  }\n\n  return {\n    fallbackLocale,\n    locale,\n  }\n}\n"],"mappings":"AAOA,OAAO,SAASA,kBAAkB;EAAEC,IAAI;EAAEC,YAAY;EAAEC;AAAY,CAAyB;EAI3F,IAAIC,MAAA,GAASD,YAAA,CAAaE,GAAG,CAAC;EAC9B,IAAIC,cAAA,GAAiBH,YAAA,CAAaE,GAAG,CAAC;EAEtC,IAAIJ,IAAA,EAAM;IACR,IAAIA,IAAA,EAAMG,MAAA,EAAQ;MAChBA,MAAA,GAASH,IAAA,CAAKG,MAAM;IACtB;IACA,IAAIH,IAAA,GAAO,kBAAkB,EAAE;MAC7BK,cAAA,GAAiBL,IAAI,CAAC,kBAAkB;IAC1C;EACF;EAEA,IAAIK,cAAA,KAAmB,QAAQ;IAC7BA,cAAA,GAAiB;EACnB,OAAO,IAAI,CAACJ,YAAA,CAAaK,WAAW,CAACC,QAAQ,CAACF,cAAA,GAAiB;IAC7DA,cAAA,GAAiBJ,YAAA,CAAaO,aAAa;EAC7C;EAEA,IAAIL,MAAA,KAAW,KAAK;IAClBA,MAAA,GAAS;EACX,OAAO,IAAI,CAACF,YAAA,CAAaK,WAAW,CAACC,QAAQ,CAACJ,MAAA,GAAS;IACrDA,MAAA,GAASF,YAAA,CAAaO,aAAa;EACrC;EAEA,OAAO;IACLH,cAAA;IACAF;EACF;AACF","ignoreList":[]}
+{"version":3,"file":"getRequestLocales.js","names":["sanitizeFallbackLocale","getRequestLocales","data","localization","searchParams","locale","get","fallbackLocale","localeCodes","includes","defaultLocale"],"sources":["../../src/utilities/getRequestLocales.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\nimport { sanitizeFallbackLocale } from 'payload'\n\ntype GetRequestLocalesArgs = {\n  data?: Record<string, any>\n  localization: Exclude<Payload['config']['localization'], false>\n  searchParams?: URLSearchParams\n}\nexport function getRequestLocales({ data, localization, searchParams }: GetRequestLocalesArgs): {\n  fallbackLocale: string\n  locale: string\n} {\n  let locale = searchParams.get('locale')\n  let fallbackLocale = searchParams.get('fallback-locale') || searchParams.get('fallbackLocale')\n\n  if (data) {\n    if (data?.locale) {\n      locale = data.locale\n    }\n    if (data?.['fallback-locale']) {\n      fallbackLocale = data['fallback-locale']\n    }\n    if (data?.['fallbackLocale']) {\n      fallbackLocale = data['fallbackLocale']\n    }\n  }\n\n  fallbackLocale = sanitizeFallbackLocale({\n    fallbackLocale,\n    locale,\n    localization,\n  })\n\n  if (locale === '*') {\n    locale = 'all'\n  } else if (!localization.localeCodes.includes(locale)) {\n    locale = localization.defaultLocale\n  }\n\n  return {\n    fallbackLocale,\n    locale,\n  }\n}\n"],"mappings":"AAEA,SAASA,sBAAsB,QAAQ;AAOvC,OAAO,SAASC,kBAAkB;EAAEC,IAAI;EAAEC,YAAY;EAAEC;AAAY,CAAyB;EAI3F,IAAIC,MAAA,GAASD,YAAA,CAAaE,GAAG,CAAC;EAC9B,IAAIC,cAAA,GAAiBH,YAAA,CAAaE,GAAG,CAAC,sBAAsBF,YAAA,CAAaE,GAAG,CAAC;EAE7E,IAAIJ,IAAA,EAAM;IACR,IAAIA,IAAA,EAAMG,MAAA,EAAQ;MAChBA,MAAA,GAASH,IAAA,CAAKG,MAAM;IACtB;IACA,IAAIH,IAAA,GAAO,kBAAkB,EAAE;MAC7BK,cAAA,GAAiBL,IAAI,CAAC,kBAAkB;IAC1C;IACA,IAAIA,IAAA,GAAO,iBAAiB,EAAE;MAC5BK,cAAA,GAAiBL,IAAI,CAAC,iBAAiB;IACzC;EACF;EAEAK,cAAA,GAAiBP,sBAAA,CAAuB;IACtCO,cAAA;IACAF,MAAA;IACAF;EACF;EAEA,IAAIE,MAAA,KAAW,KAAK;IAClBA,MAAA,GAAS;EACX,OAAO,IAAI,CAACF,YAAA,CAAaK,WAAW,CAACC,QAAQ,CAACJ,MAAA,GAAS;IACrDA,MAAA,GAASF,YAAA,CAAaO,aAAa;EACrC;EAEA,OAAO;IACLH,cAAA;IACAF;EACF;AACF","ignoreList":[]}

package/dist/utilities/handleServerFunctions.d.ts

@@ -0,0 +1,3 @@
+import type { ServerFunctionHandler } from 'payload';
+export declare const handleServerFunctions: ServerFunctionHandler;
+//# sourceMappingURL=handleServerFunctions.d.ts.map

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

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

package/dist/utilities/handleServerFunctions.js

@@ -0,0 +1,35 @@
+import { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState';
+import { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState';
+import { renderDocumentHandler } from '../views/Document/handleServerFunction.js';
+import { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js';
+import { renderListHandler } from '../views/List/handleServerFunction.js';
+import { initReq } from './initReq.js';
+export const handleServerFunctions = async args => {
+  const {
+    name: fnKey,
+    args: fnArgs,
+    config: configPromise,
+    importMap
+  } = args;
+  const {
+    req
+  } = await initReq(configPromise);
+  const augmentedArgs = {
+    ...fnArgs,
+    importMap,
+    req
+  };
+  const serverFunctions = {
+    'form-state': buildFormStateHandler,
+    'render-document': renderDocumentHandler,
+    'render-document-slots': renderDocumentSlotsHandler,
+    'render-list': renderListHandler,
+    'table-state': buildTableStateHandler
+  };
+  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

@@ -0,0 +1 @@
+{"version":3,"file":"handleServerFunctions.js","names":["buildFormStateHandler","buildTableStateHandler","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 { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\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    '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    '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,qBAAqB,QAAQ;AACtC,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,cAAchB,qBAAA;IACd,mBAAmBE,qBAAA;IACnB,yBAAyBC,0BAAA;IACzB,eAAeC,iBAAA;IACf,eAAeH;EACjB;EAEA,MAAMgB,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":[]}

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

@@ -3,6 +3,7 @@ type Args = {
     adminRoute: string;
     config: SanitizedConfig;
     defaultIDType: Payload['db']['defaultIDType'];
+    payload?: Payload;
     route: string;
 };
 type RouteInfo = {
@@ -12,6 +13,6 @@ type RouteInfo = {
     globalConfig?: SanitizedGlobalConfig;
     globalSlug?: string;
 };
-export declare function getRouteInfo({ adminRoute, config, defaultIDType, route }: Args): RouteInfo;
+export declare function getRouteInfo({ adminRoute, config, defaultIDType, payload, route, }: Args): RouteInfo;
 export {};
 //# sourceMappingURL=handleAdminPage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handleAdminPage.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAIhB,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAA;IAC7C,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,KAAK,SAAS,GAAG;IACf,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,IAAI,GAAG,SAAS,CAoC1F"}
+{"version":3,"file":"handleAdminPage.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAMhB,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAA;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,KAAK,SAAS,GAAG;IACf,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,YAAY,CAAC,EAC3B,UAAU,EACV,MAAM,EACN,aAAa,EACb,OAAO,EACP,KAAK,GACN,EAAE,IAAI,GAAG,SAAS,CA4ClB"}

package/dist/utilities/initPage/handleAdminPage.js

@@ -3,6 +3,7 @@ export function getRouteInfo({
   adminRoute,
   config,
   defaultIDType,
+  payload,
   route
 }) {
   if (isAdminRoute({
@@ -18,15 +19,22 @@ export function getRouteInfo({
     const [entityType, entitySlug, createOrID] = routeSegments;
     const collectionSlug = entityType === 'collections' ? entitySlug : undefined;
     const globalSlug = entityType === 'globals' ? entitySlug : undefined;
-    const docID = collectionSlug && createOrID !== 'create' ? defaultIDType === 'number' ? Number(createOrID) : createOrID : undefined;
     let collectionConfig;
     let globalConfig;
+    let idType = defaultIDType;
     if (collectionSlug) {
       collectionConfig = config.collections.find(collection => collection.slug === collectionSlug);
     }
     if (globalSlug) {
       globalConfig = config.globals.find(global => global.slug === globalSlug);
     }
+    // If the collection has an ID field, we need to determine the type of the ID field
+    if (collectionConfig && payload) {
+      if (payload.collections?.[collectionSlug]) {
+        idType = payload.collections?.[collectionSlug].customIDType;
+      }
+    }
+    const docID = collectionSlug && createOrID !== 'create' ? idType === 'number' ? Number(createOrID) : createOrID : undefined;
     return {
       collectionConfig,
       collectionSlug,

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

@@ -1 +1 @@
-{"version":3,"file":"handleAdminPage.js","names":["getRouteWithoutAdmin","isAdminRoute","getRouteInfo","adminRoute","config","defaultIDType","route","routeWithoutAdmin","routeSegments","split","filter","Boolean","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","Number","collectionConfig","globalConfig","collections","find","collection","slug","globals","global"],"sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"sourcesContent":["import type {\n  Payload,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { getRouteWithoutAdmin, isAdminRoute } from './shared.js'\n\ntype Args = {\n  adminRoute: string\n  config: SanitizedConfig\n  defaultIDType: Payload['db']['defaultIDType']\n  route: string\n}\n\ntype RouteInfo = {\n  collectionConfig?: SanitizedCollectionConfig\n  collectionSlug?: string\n  docID?: number | string\n  globalConfig?: SanitizedGlobalConfig\n  globalSlug?: string\n}\n\nexport function getRouteInfo({ adminRoute, config, defaultIDType, route }: Args): RouteInfo {\n  if (isAdminRoute({ adminRoute, config, route })) {\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n    const routeSegments = routeWithoutAdmin.split('/').filter(Boolean)\n    const [entityType, entitySlug, createOrID] = routeSegments\n    const collectionSlug = entityType === 'collections' ? entitySlug : undefined\n    const globalSlug = entityType === 'globals' ? entitySlug : undefined\n\n    const docID =\n      collectionSlug && createOrID !== 'create'\n        ? defaultIDType === 'number'\n          ? Number(createOrID)\n          : createOrID\n        : undefined\n\n    let collectionConfig: SanitizedCollectionConfig | undefined\n    let globalConfig: SanitizedGlobalConfig | undefined\n\n    if (collectionSlug) {\n      collectionConfig = config.collections.find((collection) => collection.slug === collectionSlug)\n    }\n\n    if (globalSlug) {\n      globalConfig = config.globals.find((global) => global.slug === globalSlug)\n    }\n\n    return {\n      collectionConfig,\n      collectionSlug,\n      docID,\n      globalConfig,\n      globalSlug,\n    }\n  }\n\n  return {}\n}\n"],"mappings":"AAOA,SAASA,oBAAoB,EAAEC,YAAY,QAAQ;AAiBnD,OAAO,SAASC,aAAa;EAAEC,UAAU;EAAEC,MAAM;EAAEC,aAAa;EAAEC;AAAK,CAAQ;EAC7E,IAAIL,YAAA,CAAa;IAAEE,UAAA;IAAYC,MAAA;IAAQE;EAAM,IAAI;IAC/C,MAAMC,iBAAA,GAAoBP,oBAAA,CAAqB;MAAEG,UAAA;MAAYG;IAAM;IACnE,MAAME,aAAA,GAAgBD,iBAAA,CAAkBE,KAAK,CAAC,KAAKC,MAAM,CAACC,OAAA;IAC1D,MAAM,CAACC,UAAA,EAAYC,UAAA,EAAYC,UAAA,CAAW,GAAGN,aAAA;IAC7C,MAAMO,cAAA,GAAiBH,UAAA,KAAe,gBAAgBC,UAAA,GAAaG,SAAA;IACnE,MAAMC,UAAA,GAAaL,UAAA,KAAe,YAAYC,UAAA,GAAaG,SAAA;IAE3D,MAAME,KAAA,GACJH,cAAA,IAAkBD,UAAA,KAAe,WAC7BT,aAAA,KAAkB,WAChBc,MAAA,CAAOL,UAAA,IACPA,UAAA,GACFE,SAAA;IAEN,IAAII,gBAAA;IACJ,IAAIC,YAAA;IAEJ,IAAIN,cAAA,EAAgB;MAClBK,gBAAA,GAAmBhB,MAAA,CAAOkB,WAAW,CAACC,IAAI,CAAEC,UAAA,IAAeA,UAAA,CAAWC,IAAI,KAAKV,cAAA;IACjF;IAEA,IAAIE,UAAA,EAAY;MACdI,YAAA,GAAejB,MAAA,CAAOsB,OAAO,CAACH,IAAI,CAAEI,MAAA,IAAWA,MAAA,CAAOF,IAAI,KAAKR,UAAA;IACjE;IAEA,OAAO;MACLG,gBAAA;MACAL,cAAA;MACAG,KAAA;MACAG,YAAA;MACAJ;IACF;EACF;EAEA,OAAO,CAAC;AACV","ignoreList":[]}
+{"version":3,"file":"handleAdminPage.js","names":["getRouteWithoutAdmin","isAdminRoute","getRouteInfo","adminRoute","config","defaultIDType","payload","route","routeWithoutAdmin","routeSegments","split","filter","Boolean","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","collectionConfig","globalConfig","idType","collections","find","collection","slug","globals","global","customIDType","docID","Number"],"sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"sourcesContent":["import type {\n  Payload,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { fieldAffectsData } from 'payload/shared'\n\nimport { getRouteWithoutAdmin, isAdminRoute } from './shared.js'\n\ntype Args = {\n  adminRoute: string\n  config: SanitizedConfig\n  defaultIDType: Payload['db']['defaultIDType']\n  payload?: Payload\n  route: string\n}\n\ntype RouteInfo = {\n  collectionConfig?: SanitizedCollectionConfig\n  collectionSlug?: string\n  docID?: number | string\n  globalConfig?: SanitizedGlobalConfig\n  globalSlug?: string\n}\n\nexport function getRouteInfo({\n  adminRoute,\n  config,\n  defaultIDType,\n  payload,\n  route,\n}: Args): RouteInfo {\n  if (isAdminRoute({ adminRoute, config, route })) {\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n    const routeSegments = routeWithoutAdmin.split('/').filter(Boolean)\n    const [entityType, entitySlug, createOrID] = routeSegments\n    const collectionSlug = entityType === 'collections' ? entitySlug : undefined\n    const globalSlug = entityType === 'globals' ? entitySlug : undefined\n\n    let collectionConfig: SanitizedCollectionConfig | undefined\n    let globalConfig: SanitizedGlobalConfig | undefined\n    let idType = defaultIDType\n\n    if (collectionSlug) {\n      collectionConfig = config.collections.find((collection) => collection.slug === collectionSlug)\n    }\n\n    if (globalSlug) {\n      globalConfig = config.globals.find((global) => global.slug === globalSlug)\n    }\n\n    // If the collection has an ID field, we need to determine the type of the ID field\n    if (collectionConfig && payload) {\n      if (payload.collections?.[collectionSlug]) {\n        idType = payload.collections?.[collectionSlug].customIDType\n      }\n    }\n\n    const docID =\n      collectionSlug && createOrID !== 'create'\n        ? idType === 'number'\n          ? Number(createOrID)\n          : createOrID\n        : undefined\n\n    return {\n      collectionConfig,\n      collectionSlug,\n      docID,\n      globalConfig,\n      globalSlug,\n    }\n  }\n\n  return {}\n}\n"],"mappings":"AASA,SAASA,oBAAoB,EAAEC,YAAY,QAAQ;AAkBnD,OAAO,SAASC,aAAa;EAC3BC,UAAU;EACVC,MAAM;EACNC,aAAa;EACbC,OAAO;EACPC;AAAK,CACA;EACL,IAAIN,YAAA,CAAa;IAAEE,UAAA;IAAYC,MAAA;IAAQG;EAAM,IAAI;IAC/C,MAAMC,iBAAA,GAAoBR,oBAAA,CAAqB;MAAEG,UAAA;MAAYI;IAAM;IACnE,MAAME,aAAA,GAAgBD,iBAAA,CAAkBE,KAAK,CAAC,KAAKC,MAAM,CAACC,OAAA;IAC1D,MAAM,CAACC,UAAA,EAAYC,UAAA,EAAYC,UAAA,CAAW,GAAGN,aAAA;IAC7C,MAAMO,cAAA,GAAiBH,UAAA,KAAe,gBAAgBC,UAAA,GAAaG,SAAA;IACnE,MAAMC,UAAA,GAAaL,UAAA,KAAe,YAAYC,UAAA,GAAaG,SAAA;IAE3D,IAAIE,gBAAA;IACJ,IAAIC,YAAA;IACJ,IAAIC,MAAA,GAAShB,aAAA;IAEb,IAAIW,cAAA,EAAgB;MAClBG,gBAAA,GAAmBf,MAAA,CAAOkB,WAAW,CAACC,IAAI,CAAEC,UAAA,IAAeA,UAAA,CAAWC,IAAI,KAAKT,cAAA;IACjF;IAEA,IAAIE,UAAA,EAAY;MACdE,YAAA,GAAehB,MAAA,CAAOsB,OAAO,CAACH,IAAI,CAAEI,MAAA,IAAWA,MAAA,CAAOF,IAAI,KAAKP,UAAA;IACjE;IAEA;IACA,IAAIC,gBAAA,IAAoBb,OAAA,EAAS;MAC/B,IAAIA,OAAA,CAAQgB,WAAW,GAAGN,cAAA,CAAe,EAAE;QACzCK,MAAA,GAASf,OAAA,CAAQgB,WAAW,GAAGN,cAAA,CAAe,CAACY,YAAA;MACjD;IACF;IAEA,MAAMC,KAAA,GACJb,cAAA,IAAkBD,UAAA,KAAe,WAC7BM,MAAA,KAAW,WACTS,MAAA,CAAOf,UAAA,IACPA,UAAA,GACFE,SAAA;IAEN,OAAO;MACLE,gBAAA;MACAH,cAAA;MACAa,KAAA;MACAT,YAAA;MACAF;IACF;EACF;EAEA,OAAO,CAAC;AACV","ignoreList":[]}

package/dist/utilities/initPage/handleAuthRedirect.js

@@ -20,9 +20,9 @@ export const handleAuthRedirect = ({
   if (searchParams && 'redirect' in searchParams) {
     delete searchParams.redirect;
   }
-  const redirectRoute = encodeURIComponent(route + Object.keys(searchParams ?? {}).length ? `${qs.stringify(searchParams, {
+  const redirectRoute = (route !== adminRoute ? route : '') + (Object.keys(searchParams ?? {}).length > 0 ? `${qs.stringify(searchParams, {
     addQueryPrefix: true
-  })}` : undefined);
+  })}` : '');
   const redirectTo = formatAdminURL({
     adminRoute,
     path: user ? unauthorizedRoute : loginRouteFromConfig

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

@@ -1 +1 @@
-{"version":3,"file":"handleAuthRedirect.js","names":["formatAdminURL","qs","handleAuthRedirect","config","route","searchParams","user","admin","routes","login","loginRouteFromConfig","unauthorized","unauthorizedRoute","adminRoute","redirect","redirectRoute","encodeURIComponent","Object","keys","length","stringify","addQueryPrefix","undefined","redirectTo","path","parsedLoginRouteSearchParams","parse","split","searchParamsWithRedirect"],"sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"sourcesContent":["import type { User } from 'payload'\n\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport * as qs from 'qs-esm'\n\ntype Args = {\n  config\n  route: string\n  searchParams: { [key: string]: string | string[] }\n  user?: User\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 = encodeURIComponent(\n    route + Object.keys(searchParams ?? {}).length\n      ? `${qs.stringify(searchParams, { addQueryPrefix: true })}`\n      : undefined,\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('?')[0]}${searchParamsWithRedirect}`\n}\n"],"mappings":"AAEA,SAASA,cAAc,QAAQ;AAC/B,YAAYC,EAAA,MAAQ;AAQpB,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,GAAgBC,kBAAA,CACpBZ,KAAA,GAAQa,MAAA,CAAOC,IAAI,CAACb,YAAA,IAAgB,CAAC,GAAGc,MAAM,GAC1C,GAAGlB,EAAA,CAAGmB,SAAS,CAACf,YAAA,EAAc;IAAEgB,cAAA,EAAgB;EAAK,IAAI,GACzDC,SAAA;EAGN,MAAMC,UAAA,GAAavB,cAAA,CAAe;IAChCa,UAAA;IACAW,IAAA,EAAMlB,IAAA,GAAOM,iBAAA,GAAoBF;EACnC;EAEA,MAAMe,4BAAA,GAA+BxB,EAAA,CAAGyB,KAAK,CAACH,UAAA,CAAWI,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI;EAE1E,MAAMC,wBAAA,GAA2B,GAAG3B,EAAA,CAAGmB,SAAS,CAC9C;IACE,GAAGK,4BAA4B;IAC/B,IAAIV,aAAA,GAAgB;MAAED,QAAA,EAAUC;IAAc,IAAI,CAAC,CAAC;EACtD,GACA;IAAEM,cAAA,EAAgB;EAAK,IACtB;EAEH,OAAO,GAAGE,UAAA,CAAWI,KAAK,CAAC,IAAI,CAAC,EAAE,GAAGC,wBAAA,EAA0B;AACjE","ignoreList":[]}
+{"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/initPage/handleAuthRedirect.ts"],"sourcesContent":["import type { User } from 'payload'\n\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport * as qs from 'qs-esm'\n\ntype Args = {\n  config\n  route: string\n  searchParams: { [key: string]: string | string[] }\n  user?: User\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('?')[0]}${searchParamsWithRedirect}`\n}\n"],"mappings":"AAEA,SAASA,cAAc,QAAQ;AAC/B,YAAYC,EAAA,MAAQ;AAQpB,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,IAAI,CAAC,EAAE,GAAGC,wBAAA,EAA0B;AACjE","ignoreList":[]}

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,EAA2C,MAAM,SAAS,CAAA;AAQtF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQtC,eAAO,MAAM,QAAQ,+DAKlB,IAAI,KAAG,OAAO,CAAC,cAAc,CAoJ/B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAA2B,MAAM,SAAS,CAAA;AAQtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQtC,eAAO,MAAM,QAAQ,+DAKlB,IAAI,KAAG,OAAO,CAAC,cAAc,CAsJ/B,CAAA"}

package/dist/utilities/initPage/index.js

@@ -1,12 +1,12 @@
 import { findLocaleFromCode } from '@payloadcms/ui/shared';
 import { headers as getHeaders } from 'next/headers.js';
 import { notFound } from 'next/navigation.js';
-import { createLocalReq, isEntityHidden, parseCookies } from 'payload';
+import { createLocalReq, getPayload, isEntityHidden, parseCookies } from 'payload';
 import * as qs from 'qs-esm';
-import { getPayloadHMR } from '../getPayloadHMR.js';
 import { initReq } from '../initReq.js';
 import { getRouteInfo } from './handleAdminPage.js';
 import { handleAuthRedirect } from './handleAuthRedirect.js';
+import { isCustomAdminView } from './isCustomAdminView.js';
 import { isPublicAdminRoute } from './shared.js';
 export const initPage = async ({
   config: configPromise,
@@ -15,7 +15,7 @@ export const initPage = async ({
   searchParams
 }) => {
   const headers = await getHeaders();
-  const payload = await getPayloadHMR({
+  const payload = await getPayload({
     config: configPromise,
     importMap
   });
@@ -41,11 +41,11 @@ export const initPage = async ({
   // We just need to -overwrite- the url and query of the req
   // we get above. Clone the req? We'll look into that eventually.
   const req = await createLocalReq({
-    fallbackLocale: null,
+    fallbackLocale: false,
     req: {
       headers,
       host: headers.get('host'),
-      i18n,
+      i18n: i18n,
       query: qs.parse(queryString, {
         depth: 10,
         ignoreQueryPrefix: true
@@ -124,6 +124,10 @@ export const initPage = async ({
     adminRoute,
     config: payload.config,
     route
+  }) && !isCustomAdminView({
+    adminRoute,
+    config: payload.config,
+    route
   })) {
     redirectTo = handleAuthRedirect({
       config: payload.config,
@@ -142,6 +146,7 @@ export const initPage = async ({
     adminRoute,
     config: payload.config,
     defaultIDType: payload.db.defaultIDType,
+    payload,
     route
   });
   if (collectionSlug && !collectionConfig || globalSlug && !globalConfig) {