@payloadcms/next 3.0.0-canary.a78fca3 → 3.0.0-canary.ab70b75

package/dist/utilities/getPayloadHMR.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getPayloadHMR.ts"],"sourcesContent":["import type { GeneratedTypes, InitOptions, Payload, SanitizedConfig } from 'payload'\n\nimport { BasePayload } from 'payload'\nimport WebSocket from 'ws'\n\nlet cached: {\n  payload: Payload | null\n  promise: Promise<Payload> | null\n  reload: Promise<boolean> | boolean\n} = global._payload\n\nif (!cached) {\n  // eslint-disable-next-line no-multi-assign\n  cached = global._payload = { payload: null, promise: null, reload: false }\n}\n\nexport const reload = async (config: SanitizedConfig, payload: Payload): 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  await payload.db.init()\n  if (payload.db.connect) {\n    await payload.db.connect({ hotReload: true })\n  }\n}\n\nexport const getPayloadHMR = async (options: InitOptions): Promise<Payload> => {\n  if (!options?.config) {\n    throw new Error('Error: the payload config is required for getPayload to work.')\n  }\n\n  if (cached.payload) {\n    const config = await options.config // TODO: check if we can move this inside the cached.reload === true condition\n\n    if (cached.reload === true) {\n      let resolve\n\n      cached.reload = new Promise((res) => (resolve = res))\n\n      await reload(config, cached.payload)\n\n      resolve()\n    }\n\n    if (cached.reload instanceof Promise) {\n      await cached.reload\n    }\n\n    return cached.payload\n  }\n\n  if (!cached.promise) {\n    cached.promise = new BasePayload<GeneratedTypes>().init(options)\n  }\n\n  try {\n    cached.payload = await cached.promise\n\n    if (\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        const ws = new WebSocket(\n          `ws://localhost:${port}${process.env.NEXT_BASE_PATH ?? ''}/_next/webpack-hmr`,\n        )\n\n        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  return cached.payload\n}\n"],"names":["BasePayload","WebSocket","cached","global","_payload","payload","promise","reload","config","db","destroy","collections","reduce","collection","slug","customIDType","globals","typescript","autoGenerate","bin","args","log","init","connect","hotReload","getPayloadHMR","options","Error","resolve","Promise","res","process","env","NODE_ENV","DISABLE_PAYLOAD_HMR","port","PORT","ws","NEXT_BASE_PATH","onmessage","event","data","JSON","parse","action","_","e"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"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":[]}

package/dist/utilities/getRequestLanguage.js

@@ -1,16 +1,19 @@
 import { extractHeaderLanguage } from '@payloadcms/translations';
-export const getRequestLanguage = ({ config, cookies, headers })=>{
-    const supportedLanguageKeys = Object.keys(config.i18n.supportedLanguages);
-    const langCookie = cookies.get(`${config.cookiePrefix || 'payload'}-lng`);
-    const languageFromCookie = typeof langCookie === 'string' ? langCookie : langCookie?.value;
-    if (languageFromCookie && supportedLanguageKeys.includes(languageFromCookie)) {
-        return languageFromCookie;
-    }
-    const languageFromHeader = headers.get('Accept-Language') ? extractHeaderLanguage(headers.get('Accept-Language')) : undefined;
-    if (languageFromHeader && supportedLanguageKeys.includes(languageFromHeader)) {
-        return languageFromHeader;
-    }
-    return config.i18n.fallbackLanguage;
+export const getRequestLanguage = ({
+  config,
+  cookies,
+  headers
+}) => {
+  const supportedLanguageKeys = Object.keys(config.i18n.supportedLanguages);
+  const langCookie = cookies.get(`${config.cookiePrefix || 'payload'}-lng`);
+  const languageFromCookie = typeof langCookie === 'string' ? langCookie : langCookie?.value;
+  if (languageFromCookie && supportedLanguageKeys.includes(languageFromCookie)) {
+    return languageFromCookie;
+  }
+  const languageFromHeader = headers.get('Accept-Language') ? extractHeaderLanguage(headers.get('Accept-Language')) : undefined;
+  if (languageFromHeader && supportedLanguageKeys.includes(languageFromHeader)) {
+    return languageFromHeader;
+  }
+  return config.i18n.fallbackLanguage;
 };
-
 //# sourceMappingURL=getRequestLanguage.js.map

package/dist/utilities/getRequestLanguage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getRequestLanguage.ts"],"sourcesContent":["import type { AcceptedLanguages } from '@payloadcms/translations'\nimport type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js'\nimport type { SanitizedConfig } from 'payload'\n\nimport { extractHeaderLanguage } from '@payloadcms/translations'\n\ntype GetRequestLanguageArgs = {\n  config: SanitizedConfig\n  cookies: Map<string, string> | ReadonlyRequestCookies\n  defaultLanguage?: AcceptedLanguages\n  headers: Request['headers']\n}\n\nexport const getRequestLanguage = ({\n  config,\n  cookies,\n  headers,\n}: GetRequestLanguageArgs): AcceptedLanguages => {\n  const supportedLanguageKeys = <AcceptedLanguages[]>Object.keys(config.i18n.supportedLanguages)\n  const langCookie = cookies.get(`${config.cookiePrefix || 'payload'}-lng`)\n\n  const languageFromCookie: AcceptedLanguages = (\n    typeof langCookie === 'string' ? langCookie : langCookie?.value\n  ) as AcceptedLanguages\n\n  if (languageFromCookie && supportedLanguageKeys.includes(languageFromCookie)) {\n    return languageFromCookie\n  }\n\n  const languageFromHeader = headers.get('Accept-Language')\n    ? extractHeaderLanguage(headers.get('Accept-Language'))\n    : undefined\n\n  if (languageFromHeader && supportedLanguageKeys.includes(languageFromHeader)) {\n    return languageFromHeader\n  }\n\n  return config.i18n.fallbackLanguage\n}\n"],"names":["extractHeaderLanguage","getRequestLanguage","config","cookies","headers","supportedLanguageKeys","Object","keys","i18n","supportedLanguages","langCookie","get","cookiePrefix","languageFromCookie","value","includes","languageFromHeader","undefined","fallbackLanguage"],"rangeMappings":";;;;;;;;;;;;;","mappings":"AAIA,SAASA,qBAAqB,QAAQ,2BAA0B;AAShE,OAAO,MAAMC,qBAAqB,CAAC,EACjCC,MAAM,EACNC,OAAO,EACPC,OAAO,EACgB;IACvB,MAAMC,wBAA6CC,OAAOC,IAAI,CAACL,OAAOM,IAAI,CAACC,kBAAkB;IAC7F,MAAMC,aAAaP,QAAQQ,GAAG,CAAC,CAAC,EAAET,OAAOU,YAAY,IAAI,UAAU,IAAI,CAAC;IAExE,MAAMC,qBACJ,OAAOH,eAAe,WAAWA,aAAaA,YAAYI;IAG5D,IAAID,sBAAsBR,sBAAsBU,QAAQ,CAACF,qBAAqB;QAC5E,OAAOA;IACT;IAEA,MAAMG,qBAAqBZ,QAAQO,GAAG,CAAC,qBACnCX,sBAAsBI,QAAQO,GAAG,CAAC,sBAClCM;IAEJ,IAAID,sBAAsBX,sBAAsBU,QAAQ,CAACC,qBAAqB;QAC5E,OAAOA;IACT;IAEA,OAAOd,OAAOM,IAAI,CAACU,gBAAgB;AACrC,EAAC"}
+{"version":3,"file":"getRequestLanguage.js","names":["extractHeaderLanguage","getRequestLanguage","config","cookies","headers","supportedLanguageKeys","Object","keys","i18n","supportedLanguages","langCookie","get","cookiePrefix","languageFromCookie","value","includes","languageFromHeader","undefined","fallbackLanguage"],"sources":["../../src/utilities/getRequestLanguage.ts"],"sourcesContent":["import type { AcceptedLanguages } from '@payloadcms/translations'\nimport type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js'\nimport type { SanitizedConfig } from 'payload'\n\nimport { extractHeaderLanguage } from '@payloadcms/translations'\n\ntype GetRequestLanguageArgs = {\n  config: SanitizedConfig\n  cookies: Map<string, string> | ReadonlyRequestCookies\n  defaultLanguage?: AcceptedLanguages\n  headers: Request['headers']\n}\n\nexport const getRequestLanguage = ({\n  config,\n  cookies,\n  headers,\n}: GetRequestLanguageArgs): AcceptedLanguages => {\n  const supportedLanguageKeys = <AcceptedLanguages[]>Object.keys(config.i18n.supportedLanguages)\n  const langCookie = cookies.get(`${config.cookiePrefix || 'payload'}-lng`)\n\n  const languageFromCookie: AcceptedLanguages = (\n    typeof langCookie === 'string' ? langCookie : langCookie?.value\n  ) as AcceptedLanguages\n\n  if (languageFromCookie && supportedLanguageKeys.includes(languageFromCookie)) {\n    return languageFromCookie\n  }\n\n  const languageFromHeader = headers.get('Accept-Language')\n    ? extractHeaderLanguage(headers.get('Accept-Language'))\n    : undefined\n\n  if (languageFromHeader && supportedLanguageKeys.includes(languageFromHeader)) {\n    return languageFromHeader\n  }\n\n  return config.i18n.fallbackLanguage\n}\n"],"mappings":"AAIA,SAASA,qBAAqB,QAAQ;AAStC,OAAO,MAAMC,kBAAA,GAAqBA,CAAC;EACjCC,MAAM;EACNC,OAAO;EACPC;AAAO,CACgB;EACvB,MAAMC,qBAAA,GAA6CC,MAAA,CAAOC,IAAI,CAACL,MAAA,CAAOM,IAAI,CAACC,kBAAkB;EAC7F,MAAMC,UAAA,GAAaP,OAAA,CAAQQ,GAAG,CAAC,GAAGT,MAAA,CAAOU,YAAY,IAAI,eAAe;EAExE,MAAMC,kBAAA,GACJ,OAAOH,UAAA,KAAe,WAAWA,UAAA,GAAaA,UAAA,EAAYI,KAAA;EAG5D,IAAID,kBAAA,IAAsBR,qBAAA,CAAsBU,QAAQ,CAACF,kBAAA,GAAqB;IAC5E,OAAOA,kBAAA;EACT;EAEA,MAAMG,kBAAA,GAAqBZ,OAAA,CAAQO,GAAG,CAAC,qBACnCX,qBAAA,CAAsBI,OAAA,CAAQO,GAAG,CAAC,sBAClCM,SAAA;EAEJ,IAAID,kBAAA,IAAsBX,qBAAA,CAAsBU,QAAQ,CAACC,kBAAA,GAAqB;IAC5E,OAAOA,kBAAA;EACT;EAEA,OAAOd,MAAA,CAAOM,IAAI,CAACU,gBAAgB;AACrC","ignoreList":[]}

package/dist/utilities/getRequestLocales.js

@@ -1,28 +1,31 @@
-export function getRequestLocales({ data, localization, searchParams }) {
-    let locale = searchParams.get('locale');
-    let fallbackLocale = searchParams.get('fallback-locale');
-    if (data) {
-        if (data?.locale) {
-            locale = data.locale;
-        }
-        if (data?.['fallback-locale']) {
-            fallbackLocale = data['fallback-locale'];
-        }
+export function getRequestLocales({
+  data,
+  localization,
+  searchParams
+}) {
+  let locale = searchParams.get('locale');
+  let fallbackLocale = searchParams.get('fallback-locale');
+  if (data) {
+    if (data?.locale) {
+      locale = data.locale;
     }
-    if (fallbackLocale === 'none') {
-        fallbackLocale = 'null';
-    } else if (!localization.localeCodes.includes(fallbackLocale)) {
-        fallbackLocale = localization.defaultLocale;
+    if (data?.['fallback-locale']) {
+      fallbackLocale = data['fallback-locale'];
     }
-    if (locale === '*') {
-        locale = 'all';
-    } else if (!localization.localeCodes.includes(locale)) {
-        locale = localization.defaultLocale;
-    }
-    return {
-        fallbackLocale,
-        locale
-    };
+  }
+  if (fallbackLocale === 'none') {
+    fallbackLocale = 'null';
+  } else if (!localization.localeCodes.includes(fallbackLocale)) {
+    fallbackLocale = localization.defaultLocale;
+  }
+  if (locale === '*') {
+    locale = 'all';
+  } else if (!localization.localeCodes.includes(locale)) {
+    locale = localization.defaultLocale;
+  }
+  return {
+    fallbackLocale,
+    locale
+  };
 }
-
 //# sourceMappingURL=getRequestLocales.js.map

package/dist/utilities/getRequestLocales.js.map

@@ -1 +1 @@
-{"version":3,"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"],"names":["getRequestLocales","data","localization","searchParams","locale","get","fallbackLocale","localeCodes","includes","defaultLocale"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAOA,OAAO,SAASA,kBAAkB,EAAEC,IAAI,EAAEC,YAAY,EAAEC,YAAY,EAAyB;IAI3F,IAAIC,SAASD,aAAaE,GAAG,CAAC;IAC9B,IAAIC,iBAAiBH,aAAaE,GAAG,CAAC;IAEtC,IAAIJ,MAAM;QACR,IAAIA,MAAMG,QAAQ;YAChBA,SAASH,KAAKG,MAAM;QACtB;QACA,IAAIH,MAAM,CAAC,kBAAkB,EAAE;YAC7BK,iBAAiBL,IAAI,CAAC,kBAAkB;QAC1C;IACF;IAEA,IAAIK,mBAAmB,QAAQ;QAC7BA,iBAAiB;IACnB,OAAO,IAAI,CAACJ,aAAaK,WAAW,CAACC,QAAQ,CAACF,iBAAiB;QAC7DA,iBAAiBJ,aAAaO,aAAa;IAC7C;IAEA,IAAIL,WAAW,KAAK;QAClBA,SAAS;IACX,OAAO,IAAI,CAACF,aAAaK,WAAW,CAACC,QAAQ,CAACJ,SAAS;QACrDA,SAASF,aAAaO,aAAa;IACrC;IAEA,OAAO;QACLH;QACAF;IACF;AACF"}
+{"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":[]}

package/dist/utilities/getRequestTheme.d.ts

@@ -1,6 +1,6 @@
 import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js';
 import type { SanitizedConfig } from 'payload';
-import { type Theme } from '@payloadcms/ui/client';
+import { type Theme } from '@payloadcms/ui';
 type GetRequestLanguageArgs = {
     config: SanitizedConfig;
     cookies: Map<string, string> | ReadonlyRequestCookies;

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

@@ -1 +1 @@
-{"version":3,"file":"getRequestTheme.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestTheme.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iEAAiE,CAAA;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAA;AAEhE,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,sBAAsB,CAAA;IACrD,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;CAC5B,CAAA;AAID,eAAO,MAAM,eAAe,iCAAkC,sBAAsB,KAAG,KAkBtF,CAAA"}
+{"version":3,"file":"getRequestTheme.d.ts","sourceRoot":"","sources":["../../src/utilities/getRequestTheme.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iEAAiE,CAAA;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,EAAgB,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAEzD,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,sBAAsB,CAAA;IACrD,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;CAC5B,CAAA;AAID,eAAO,MAAM,eAAe,iCAAkC,sBAAsB,KAAG,KAsBtF,CAAA"}

package/dist/utilities/getRequestTheme.js

@@ -1,19 +1,22 @@
-import { defaultTheme } from '@payloadcms/ui/client';
-const acceptedThemes = [
-    'dark',
-    'light'
-];
-export const getRequestTheme = ({ config, cookies, headers })=>{
-    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;
+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;
 };
-
 //# 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 { type Theme, defaultTheme } from '@payloadcms/ui/client'\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  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","themeCookie","get","cookiePrefix","themeFromCookie","value","includes","themeFromHeader"],"rangeMappings":";;;;;;;;;;;;;;;;","mappings":"AAGA,SAAqBA,YAAY,QAAQ,wBAAuB;AAQhE,MAAMC,iBAA0B;IAAC;IAAQ;CAAQ;AAEjD,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAA0B;IAClF,MAAMC,cAAcF,QAAQG,GAAG,CAAC,CAAC,EAAEJ,OAAOK,YAAY,IAAI,UAAU,MAAM,CAAC;IAE3E,MAAMC,kBACJ,OAAOH,gBAAgB,WAAWA,cAAcA,aAAaI;IAG/D,IAAID,mBAAmBR,eAAeU,QAAQ,CAACF,kBAAkB;QAC/D,OAAOA;IACT;IAEA,MAAMG,kBAAkBP,QAAQE,GAAG,CAAC;IAEpC,IAAIK,mBAAmBX,eAAeU,QAAQ,CAACC,kBAAkB;QAC/D,OAAOA;IACT;IAEA,OAAOZ;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/headersWithCors.d.ts

@@ -1,7 +1,7 @@
-import type { PayloadRequestWithData } from 'payload';
+import type { PayloadRequest } from 'payload';
 type CorsArgs = {
     headers: Headers;
-    req: Partial<PayloadRequestWithData>;
+    req: Partial<PayloadRequest>;
 };
 export declare const headersWithCors: ({ headers, req }: CorsArgs) => Headers;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"headersWithCors.d.ts","sourceRoot":"","sources":["../../src/utilities/headersWithCors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAA;AAErD,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAA;CACrC,CAAA;AACD,eAAO,MAAM,eAAe,qBAAsB,QAAQ,KAAG,OAoB5D,CAAA"}
+{"version":3,"file":"headersWithCors.d.ts","sourceRoot":"","sources":["../../src/utilities/headersWithCors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC7B,CAAA;AACD,eAAO,MAAM,eAAe,qBAAsB,QAAQ,KAAG,OAyC5D,CAAA"}

package/dist/utilities/headersWithCors.js

@@ -1,17 +1,24 @@
-export const headersWithCors = ({ headers, req })=>{
-    const cors = req?.payload.config.cors;
-    const requestOrigin = req?.headers.get('Origin');
-    if (cors) {
-        headers.set('Access-Control-Allow-Methods', 'PUT, PATCH, POST, GET, DELETE, OPTIONS');
-        headers.set('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization, Content-Encoding, x-apollo-tracing');
-        if (cors === '*') {
-            headers.set('Access-Control-Allow-Origin', '*');
-        } else if (Array.isArray(cors) && cors.indexOf(requestOrigin) > -1) {
-            headers.set('Access-Control-Allow-Credentials', 'true');
-            headers.set('Access-Control-Allow-Origin', requestOrigin);
-        }
+export const headersWithCors = ({
+  headers,
+  req
+}) => {
+  const cors = req?.payload.config.cors;
+  const requestOrigin = req?.headers.get('Origin');
+  if (cors) {
+    const defaultAllowedHeaders = ['Origin', 'X-Requested-With', 'Content-Type', 'Accept', 'Authorization', 'Content-Encoding', 'x-apollo-tracing'];
+    headers.set('Access-Control-Allow-Methods', 'PUT, PATCH, POST, GET, DELETE, OPTIONS');
+    if (typeof cors === 'object' && 'headers' in cors) {
+      headers.set('Access-Control-Allow-Headers', [...defaultAllowedHeaders, ...cors.headers].filter(Boolean).join(', '));
+    } else {
+      headers.set('Access-Control-Allow-Headers', defaultAllowedHeaders.join(', '));
     }
-    return headers;
+    if (cors === '*' || typeof cors === 'object' && 'origins' in cors && cors.origins === '*') {
+      headers.set('Access-Control-Allow-Origin', '*');
+    } else if (Array.isArray(cors) && cors.indexOf(requestOrigin) > -1 || !Array.isArray(cors) && typeof cors === 'object' && 'origins' in cors && cors.origins.indexOf(requestOrigin) > -1) {
+      headers.set('Access-Control-Allow-Credentials', 'true');
+      headers.set('Access-Control-Allow-Origin', requestOrigin);
+    }
+  }
+  return headers;
 };
-
 //# sourceMappingURL=headersWithCors.js.map

package/dist/utilities/headersWithCors.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/headersWithCors.ts"],"sourcesContent":["import type { PayloadRequestWithData } from 'payload'\n\ntype CorsArgs = {\n  headers: Headers\n  req: Partial<PayloadRequestWithData>\n}\nexport const headersWithCors = ({ headers, req }: CorsArgs): Headers => {\n  const cors = req?.payload.config.cors\n  const requestOrigin = req?.headers.get('Origin')\n\n  if (cors) {\n    headers.set('Access-Control-Allow-Methods', 'PUT, PATCH, POST, GET, DELETE, OPTIONS')\n    headers.set(\n      'Access-Control-Allow-Headers',\n      'Origin, X-Requested-With, Content-Type, Accept, Authorization, Content-Encoding, x-apollo-tracing',\n    )\n\n    if (cors === '*') {\n      headers.set('Access-Control-Allow-Origin', '*')\n    } else if (Array.isArray(cors) && cors.indexOf(requestOrigin) > -1) {\n      headers.set('Access-Control-Allow-Credentials', 'true')\n      headers.set('Access-Control-Allow-Origin', requestOrigin)\n    }\n  }\n\n  return headers\n}\n"],"names":["headersWithCors","headers","req","cors","payload","config","requestOrigin","get","set","Array","isArray","indexOf"],"rangeMappings":";;;;;;;;;;;;;;","mappings":"AAMA,OAAO,MAAMA,kBAAkB,CAAC,EAAEC,OAAO,EAAEC,GAAG,EAAY;IACxD,MAAMC,OAAOD,KAAKE,QAAQC,OAAOF;IACjC,MAAMG,gBAAgBJ,KAAKD,QAAQM,IAAI;IAEvC,IAAIJ,MAAM;QACRF,QAAQO,GAAG,CAAC,gCAAgC;QAC5CP,QAAQO,GAAG,CACT,gCACA;QAGF,IAAIL,SAAS,KAAK;YAChBF,QAAQO,GAAG,CAAC,+BAA+B;QAC7C,OAAO,IAAIC,MAAMC,OAAO,CAACP,SAASA,KAAKQ,OAAO,CAACL,iBAAiB,CAAC,GAAG;YAClEL,QAAQO,GAAG,CAAC,oCAAoC;YAChDP,QAAQO,GAAG,CAAC,+BAA+BF;QAC7C;IACF;IAEA,OAAOL;AACT,EAAC"}
+{"version":3,"file":"headersWithCors.js","names":["headersWithCors","headers","req","cors","payload","config","requestOrigin","get","defaultAllowedHeaders","set","filter","Boolean","join","origins","Array","isArray","indexOf"],"sources":["../../src/utilities/headersWithCors.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\ntype CorsArgs = {\n  headers: Headers\n  req: Partial<PayloadRequest>\n}\nexport const headersWithCors = ({ headers, req }: CorsArgs): Headers => {\n  const cors = req?.payload.config.cors\n  const requestOrigin = req?.headers.get('Origin')\n\n  if (cors) {\n    const defaultAllowedHeaders = [\n      'Origin',\n      'X-Requested-With',\n      'Content-Type',\n      'Accept',\n      'Authorization',\n      'Content-Encoding',\n      'x-apollo-tracing',\n    ]\n\n    headers.set('Access-Control-Allow-Methods', 'PUT, PATCH, POST, GET, DELETE, OPTIONS')\n\n    if (typeof cors === 'object' && 'headers' in cors) {\n      headers.set(\n        'Access-Control-Allow-Headers',\n        [...defaultAllowedHeaders, ...cors.headers].filter(Boolean).join(', '),\n      )\n    } else {\n      headers.set('Access-Control-Allow-Headers', defaultAllowedHeaders.join(', '))\n    }\n\n    if (cors === '*' || (typeof cors === 'object' && 'origins' in cors && cors.origins === '*')) {\n      headers.set('Access-Control-Allow-Origin', '*')\n    } else if (\n      (Array.isArray(cors) && cors.indexOf(requestOrigin) > -1) ||\n      (!Array.isArray(cors) &&\n        typeof cors === 'object' &&\n        'origins' in cors &&\n        cors.origins.indexOf(requestOrigin) > -1)\n    ) {\n      headers.set('Access-Control-Allow-Credentials', 'true')\n      headers.set('Access-Control-Allow-Origin', requestOrigin)\n    }\n  }\n\n  return headers\n}\n"],"mappings":"AAMA,OAAO,MAAMA,eAAA,GAAkBA,CAAC;EAAEC,OAAO;EAAEC;AAAG,CAAY;EACxD,MAAMC,IAAA,GAAOD,GAAA,EAAKE,OAAA,CAAQC,MAAA,CAAOF,IAAA;EACjC,MAAMG,aAAA,GAAgBJ,GAAA,EAAKD,OAAA,CAAQM,GAAA,CAAI;EAEvC,IAAIJ,IAAA,EAAM;IACR,MAAMK,qBAAA,GAAwB,CAC5B,UACA,oBACA,gBACA,UACA,iBACA,oBACA,mBACD;IAEDP,OAAA,CAAQQ,GAAG,CAAC,gCAAgC;IAE5C,IAAI,OAAON,IAAA,KAAS,YAAY,aAAaA,IAAA,EAAM;MACjDF,OAAA,CAAQQ,GAAG,CACT,gCACA,C,GAAID,qBAAA,E,GAA0BL,IAAA,CAAKF,OAAO,CAAC,CAACS,MAAM,CAACC,OAAA,EAASC,IAAI,CAAC;IAErE,OAAO;MACLX,OAAA,CAAQQ,GAAG,CAAC,gCAAgCD,qBAAA,CAAsBI,IAAI,CAAC;IACzE;IAEA,IAAIT,IAAA,KAAS,OAAQ,OAAOA,IAAA,KAAS,YAAY,aAAaA,IAAA,IAAQA,IAAA,CAAKU,OAAO,KAAK,KAAM;MAC3FZ,OAAA,CAAQQ,GAAG,CAAC,+BAA+B;IAC7C,OAAO,IACLK,KAAC,CAAMC,OAAO,CAACZ,IAAA,KAASA,IAAA,CAAKa,OAAO,CAACV,aAAA,IAAiB,CAAC,KACtD,CAACQ,KAAA,CAAMC,OAAO,CAACZ,IAAA,KACd,OAAOA,IAAA,KAAS,YAChB,aAAaA,IAAA,IACbA,IAAA,CAAKU,OAAO,CAACG,OAAO,CAACV,aAAA,IAAiB,CAAC,GACzC;MACAL,OAAA,CAAQQ,GAAG,CAAC,oCAAoC;MAChDR,OAAA,CAAQQ,GAAG,CAAC,+BAA+BH,aAAA;IAC7C;EACF;EAEA,OAAOL,OAAA;AACT","ignoreList":[]}

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

@@ -1,12 +1,17 @@
-import type { Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
-export declare const handleAdminPage: ({ adminRoute, config, permissions, route, }: {
+import type { Payload, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
+type Args = {
     adminRoute: string;
     config: SanitizedConfig;
-    permissions: Permissions;
+    defaultIDType: Payload['db']['defaultIDType'];
     route: string;
-}) => {
-    collectionConfig: SanitizedCollectionConfig;
-    docID: string;
-    globalConfig: SanitizedGlobalConfig;
 };
+type RouteInfo = {
+    collectionConfig?: SanitizedCollectionConfig;
+    collectionSlug?: string;
+    docID?: number | string;
+    globalConfig?: SanitizedGlobalConfig;
+    globalSlug?: string;
+};
+export declare function getRouteInfo({ adminRoute, config, defaultIDType, 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,WAAW,EACX,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAMhB,eAAO,MAAM,eAAe,gDAKzB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,WAAW,EAAE,WAAW,CAAA;IACxB,KAAK,EAAE,MAAM,CAAA;CACd;;;;CAqCA,CAAA"}
+{"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"}

package/dist/utilities/initPage/handleAdminPage.js

@@ -1,35 +1,40 @@
-import { notFound } from 'next/navigation.js';
-import { isAdminAuthRoute, isAdminRoute } from './shared.js';
-export const handleAdminPage = ({ adminRoute, config, permissions, route })=>{
-    if (isAdminRoute(route, adminRoute)) {
-        const routeSegments = route.replace(adminRoute, '').split('/').filter(Boolean);
-        const [entityType, entitySlug, createOrID] = routeSegments;
-        const collectionSlug = entityType === 'collections' ? entitySlug : undefined;
-        const globalSlug = entityType === 'globals' ? entitySlug : undefined;
-        const docID = collectionSlug && createOrID !== 'create' ? createOrID : undefined;
-        let collectionConfig;
-        let globalConfig;
-        if (collectionSlug) {
-            collectionConfig = config.collections.find((collection)=>collection.slug === collectionSlug);
-            if (!collectionConfig) {
-                notFound();
-            }
-        }
-        if (globalSlug) {
-            globalConfig = config.globals.find((global)=>global.slug === globalSlug);
-            if (!globalConfig) {
-                notFound();
-            }
-        }
-        if (!permissions.canAccessAdmin && !isAdminAuthRoute(config, route, adminRoute)) {
-            notFound();
-        }
-        return {
-            collectionConfig,
-            docID,
-            globalConfig
-        };
+import { getRouteWithoutAdmin, isAdminRoute } from './shared.js';
+export function getRouteInfo({
+  adminRoute,
+  config,
+  defaultIDType,
+  route
+}) {
+  if (isAdminRoute({
+    adminRoute,
+    config,
+    route
+  })) {
+    const routeWithoutAdmin = getRouteWithoutAdmin({
+      adminRoute,
+      route
+    });
+    const routeSegments = routeWithoutAdmin.split('/').filter(Boolean);
+    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;
+    if (collectionSlug) {
+      collectionConfig = config.collections.find(collection => collection.slug === collectionSlug);
     }
-};
-
+    if (globalSlug) {
+      globalConfig = config.globals.find(global => global.slug === globalSlug);
+    }
+    return {
+      collectionConfig,
+      collectionSlug,
+      docID,
+      globalConfig,
+      globalSlug
+    };
+  }
+  return {};
+}
 //# sourceMappingURL=handleAdminPage.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"sourcesContent":["import type {\n  Permissions,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { notFound } from 'next/navigation.js'\n\nimport { isAdminAuthRoute, isAdminRoute } from './shared.js'\n\nexport const handleAdminPage = ({\n  adminRoute,\n  config,\n  permissions,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  permissions: Permissions\n  route: string\n}) => {\n  if (isAdminRoute(route, adminRoute)) {\n    const routeSegments = route.replace(adminRoute, '').split('/').filter(Boolean)\n    const [entityType, entitySlug, createOrID] = routeSegments\n    const collectionSlug = entityType === 'collections' ? entitySlug : undefined\n    const globalSlug = entityType === 'globals' ? entitySlug : undefined\n    const docID = collectionSlug && createOrID !== 'create' ? createOrID : 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      if (!collectionConfig) {\n        notFound()\n      }\n    }\n\n    if (globalSlug) {\n      globalConfig = config.globals.find((global) => global.slug === globalSlug)\n\n      if (!globalConfig) {\n        notFound()\n      }\n    }\n\n    if (!permissions.canAccessAdmin && !isAdminAuthRoute(config, route, adminRoute)) {\n      notFound()\n    }\n\n    return {\n      collectionConfig,\n      docID,\n      globalConfig,\n    }\n  }\n}\n"],"names":["notFound","isAdminAuthRoute","isAdminRoute","handleAdminPage","adminRoute","config","permissions","route","routeSegments","replace","split","filter","Boolean","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","collectionConfig","globalConfig","collections","find","collection","slug","globals","global","canAccessAdmin"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAOA,SAASA,QAAQ,QAAQ,qBAAoB;AAE7C,SAASC,gBAAgB,EAAEC,YAAY,QAAQ,cAAa;AAE5D,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,UAAU,EACVC,MAAM,EACNC,WAAW,EACXC,KAAK,EAMN;IACC,IAAIL,aAAaK,OAAOH,aAAa;QACnC,MAAMI,gBAAgBD,MAAME,OAAO,CAACL,YAAY,IAAIM,KAAK,CAAC,KAAKC,MAAM,CAACC;QACtE,MAAM,CAACC,YAAYC,YAAYC,WAAW,GAAGP;QAC7C,MAAMQ,iBAAiBH,eAAe,gBAAgBC,aAAaG;QACnE,MAAMC,aAAaL,eAAe,YAAYC,aAAaG;QAC3D,MAAME,QAAQH,kBAAkBD,eAAe,WAAWA,aAAaE;QAEvE,IAAIG;QACJ,IAAIC;QAEJ,IAAIL,gBAAgB;YAClBI,mBAAmBf,OAAOiB,WAAW,CAACC,IAAI,CAAC,CAACC,aAAeA,WAAWC,IAAI,KAAKT;YAE/E,IAAI,CAACI,kBAAkB;gBACrBpB;YACF;QACF;QAEA,IAAIkB,YAAY;YACdG,eAAehB,OAAOqB,OAAO,CAACH,IAAI,CAAC,CAACI,SAAWA,OAAOF,IAAI,KAAKP;YAE/D,IAAI,CAACG,cAAc;gBACjBrB;YACF;QACF;QAEA,IAAI,CAACM,YAAYsB,cAAc,IAAI,CAAC3B,iBAAiBI,QAAQE,OAAOH,aAAa;YAC/EJ;QACF;QAEA,OAAO;YACLoB;YACAD;YACAE;QACF;IACF;AACF,EAAC"}
+{"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":[]}

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

@@ -1,9 +1,12 @@
-export declare const handleAuthRedirect: ({ config, redirectUnauthenticatedUser, route, searchParams, }: {
-    config;
-    redirectUnauthenticatedUser: boolean | string;
+import type { User } from 'payload';
+type Args = {
+    config: any;
     route: string;
     searchParams: {
         [key: string]: string | string[];
     };
-}) => void;
+    user?: User;
+};
+export declare const handleAuthRedirect: ({ config, route, searchParams, user }: Args) => string;
+export {};
 //# sourceMappingURL=handleAuthRedirect.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handleAuthRedirect.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,kBAAkB,kEAK5B;IACD,MAAM,CAAA;IACN,2BAA2B,EAAE,OAAO,GAAG,MAAM,CAAA;IAC7C,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CACnD,SAsCA,CAAA"}
+{"version":3,"file":"handleAuthRedirect.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAKnC,KAAK,IAAI,GAAG;IACV,MAAM,MAAA;IACN,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;IAClD,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ,CAAA;AACD,eAAO,MAAM,kBAAkB,0CAA2C,IAAI,KAAG,MAkChF,CAAA"}

package/dist/utilities/initPage/handleAuthRedirect.js

@@ -1,27 +1,41 @@
-import { redirect } from 'next/navigation.js';
-import QueryString from 'qs';
-import { isAdminAuthRoute, isAdminRoute } from './shared.js';
-export const handleAuthRedirect = ({ config, redirectUnauthenticatedUser, route, searchParams })=>{
-    const { admin: { routes: { login: loginRouteFromConfig } }, routes: { admin: adminRoute } } = config;
-    if (!isAdminAuthRoute(config, route, adminRoute)) {
-        if (searchParams && 'redirect' in searchParams) delete searchParams.redirect;
-        const redirectRoute = encodeURIComponent(route + Object.keys(searchParams ?? {}).length ? `${QueryString.stringify(searchParams, {
-            addQueryPrefix: true
-        })}` : undefined);
-        const adminLoginRoute = `${adminRoute}${loginRouteFromConfig}`;
-        const customLoginRoute = typeof redirectUnauthenticatedUser === 'string' ? redirectUnauthenticatedUser : undefined;
-        const loginRoute = isAdminRoute(route, adminRoute) ? adminLoginRoute : customLoginRoute || loginRouteFromConfig;
-        const parsedLoginRouteSearchParams = QueryString.parse(loginRoute.split('?')[1] ?? '');
-        const searchParamsWithRedirect = `${QueryString.stringify({
-            ...parsedLoginRouteSearchParams,
-            ...redirectRoute ? {
-                redirect: redirectRoute
-            } : {}
-        }, {
-            addQueryPrefix: true
-        })}`;
-        redirect(`${loginRoute.split('?')[0]}${searchParamsWithRedirect}`);
+import { formatAdminURL } from '@payloadcms/ui/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;
+  }
+  const redirectRoute = encodeURIComponent(route + Object.keys(searchParams ?? {}).length ? `${qs.stringify(searchParams, {
+    addQueryPrefix: true
+  })}` : undefined);
+  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('?')[0]}${searchParamsWithRedirect}`;
 };
-
 //# sourceMappingURL=handleAuthRedirect.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"sourcesContent":["import { redirect } from 'next/navigation.js'\nimport QueryString from 'qs'\n\nimport { isAdminAuthRoute, isAdminRoute } from './shared.js'\n\nexport const handleAuthRedirect = ({\n  config,\n  redirectUnauthenticatedUser,\n  route,\n  searchParams,\n}: {\n  config\n  redirectUnauthenticatedUser: boolean | string\n  route: string\n  searchParams: { [key: string]: string | string[] }\n}) => {\n  const {\n    admin: {\n      routes: { login: loginRouteFromConfig },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (!isAdminAuthRoute(config, route, adminRoute)) {\n    if (searchParams && 'redirect' in searchParams) delete searchParams.redirect\n\n    const redirectRoute = encodeURIComponent(\n      route + Object.keys(searchParams ?? {}).length\n        ? `${QueryString.stringify(searchParams, { addQueryPrefix: true })}`\n        : undefined,\n    )\n\n    const adminLoginRoute = `${adminRoute}${loginRouteFromConfig}`\n\n    const customLoginRoute =\n      typeof redirectUnauthenticatedUser === 'string' ? redirectUnauthenticatedUser : undefined\n\n    const loginRoute = isAdminRoute(route, adminRoute)\n      ? adminLoginRoute\n      : customLoginRoute || loginRouteFromConfig\n\n    const parsedLoginRouteSearchParams = QueryString.parse(loginRoute.split('?')[1] ?? '')\n\n    const searchParamsWithRedirect = `${QueryString.stringify(\n      {\n        ...parsedLoginRouteSearchParams,\n        ...(redirectRoute ? { redirect: redirectRoute } : {}),\n      },\n      { addQueryPrefix: true },\n    )}`\n\n    redirect(`${loginRoute.split('?')[0]}${searchParamsWithRedirect}`)\n  }\n}\n"],"names":["redirect","QueryString","isAdminAuthRoute","isAdminRoute","handleAuthRedirect","config","redirectUnauthenticatedUser","route","searchParams","admin","routes","login","loginRouteFromConfig","adminRoute","redirectRoute","encodeURIComponent","Object","keys","length","stringify","addQueryPrefix","undefined","adminLoginRoute","customLoginRoute","loginRoute","parsedLoginRouteSearchParams","parse","split","searchParamsWithRedirect"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAASA,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,iBAAiB,KAAI;AAE5B,SAASC,gBAAgB,EAAEC,YAAY,QAAQ,cAAa;AAE5D,OAAO,MAAMC,qBAAqB,CAAC,EACjCC,MAAM,EACNC,2BAA2B,EAC3BC,KAAK,EACLC,YAAY,EAMb;IACC,MAAM,EACJC,OAAO,EACLC,QAAQ,EAAEC,OAAOC,oBAAoB,EAAE,EACxC,EACDF,QAAQ,EAAED,OAAOI,UAAU,EAAE,EAC9B,GAAGR;IAEJ,IAAI,CAACH,iBAAiBG,QAAQE,OAAOM,aAAa;QAChD,IAAIL,gBAAgB,cAAcA,cAAc,OAAOA,aAAaR,QAAQ;QAE5E,MAAMc,gBAAgBC,mBACpBR,QAAQS,OAAOC,IAAI,CAACT,gBAAgB,CAAC,GAAGU,MAAM,GAC1C,CAAC,EAAEjB,YAAYkB,SAAS,CAACX,cAAc;YAAEY,gBAAgB;QAAK,GAAG,CAAC,GAClEC;QAGN,MAAMC,kBAAkB,CAAC,EAAET,WAAW,EAAED,qBAAqB,CAAC;QAE9D,MAAMW,mBACJ,OAAOjB,gCAAgC,WAAWA,8BAA8Be;QAElF,MAAMG,aAAarB,aAAaI,OAAOM,cACnCS,kBACAC,oBAAoBX;QAExB,MAAMa,+BAA+BxB,YAAYyB,KAAK,CAACF,WAAWG,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI;QAEnF,MAAMC,2BAA2B,CAAC,EAAE3B,YAAYkB,SAAS,CACvD;YACE,GAAGM,4BAA4B;YAC/B,GAAIX,gBAAgB;gBAAEd,UAAUc;YAAc,IAAI,CAAC,CAAC;QACtD,GACA;YAAEM,gBAAgB;QAAK,GACvB,CAAC;QAEHpB,SAAS,CAAC,EAAEwB,WAAWG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAEC,yBAAyB,CAAC;IACnE;AACF,EAAC"}
+{"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":[]}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAmD,MAAM,SAAS,CAAA;AAQ9F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAOtC,eAAO,MAAM,QAAQ,iFAKlB,IAAI,KAAG,QAAQ,cAAc,CAyI/B,CAAA"}
+{"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"}