@payloadcms/next 3.0.0-canary.291e44c → 3.0.0-canary.2d0dd26

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

@@ -1,16 +1,18 @@
-import type { SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
+import type { Payload, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
 type Args = {
     adminRoute: string;
     config: SanitizedConfig;
+    defaultIDType: Payload['db']['defaultIDType'];
+    payload?: Payload;
     route: string;
 };
 type RouteInfo = {
     collectionConfig?: SanitizedCollectionConfig;
     collectionSlug?: string;
-    docID?: string;
+    docID?: number | string;
     globalConfig?: SanitizedGlobalConfig;
     globalSlug?: string;
 };
-export declare function getRouteInfo({ adminRoute, config, 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,EAAE,yBAAyB,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAIhG,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AACD,KAAK,SAAS,GAAG;IACf,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,GAAG,SAAS,CA8B3E"}
+{"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

@@ -2,6 +2,8 @@ import { getRouteWithoutAdmin, isAdminRoute } from './shared.js';
 export function getRouteInfo({
   adminRoute,
   config,
+  defaultIDType,
+  payload,
   route
 }) {
   if (isAdminRoute({
@@ -17,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' ? 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","route","routeWithoutAdmin","routeSegments","split","filter","Boolean","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","collectionConfig","globalConfig","collections","find","collection","slug","globals","global"],"sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload'\n\nimport { getRouteWithoutAdmin, isAdminRoute } from './shared.js'\n\ntype Args = {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}\ntype RouteInfo = {\n  collectionConfig?: SanitizedCollectionConfig\n  collectionSlug?: string\n  docID?: string\n  globalConfig?: SanitizedGlobalConfig\n  globalSlug?: string\n}\n\nexport function getRouteInfo({ adminRoute, config, 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    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\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":"AAEA,SAASA,oBAAoB,EAAEC,YAAY,QAAQ;AAenD,OAAO,SAASC,aAAa;EAAEC,UAAU;EAAEC,MAAM;EAAEC;AAAK,CAAQ;EAC9D,IAAIJ,YAAA,CAAa;IAAEE,UAAA;IAAYC,MAAA;IAAQC;EAAM,IAAI;IAC/C,MAAMC,iBAAA,GAAoBN,oBAAA,CAAqB;MAAEG,UAAA;MAAYE;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;IAC3D,MAAME,KAAA,GAAQH,cAAA,IAAkBD,UAAA,KAAe,WAAWA,UAAA,GAAaE,SAAA;IAEvE,IAAIG,gBAAA;IACJ,IAAIC,YAAA;IAEJ,IAAIL,cAAA,EAAgB;MAClBI,gBAAA,GAAmBd,MAAA,CAAOgB,WAAW,CAACC,IAAI,CAAEC,UAAA,IAAeA,UAAA,CAAWC,IAAI,KAAKT,cAAA;IACjF;IAEA,IAAIE,UAAA,EAAY;MACdG,YAAA,GAAef,MAAA,CAAOoB,OAAO,CAACH,IAAI,CAAEI,MAAA,IAAWA,MAAA,CAAOF,IAAI,KAAKP,UAAA;IACjE;IAEA,OAAO;MACLE,gBAAA;MACAJ,cAAA;MACAG,KAAA;MACAE,YAAA;MACAH;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,CAmJ/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,
@@ -141,6 +145,8 @@ export const initPage = async ({
   } = getRouteInfo({
     adminRoute,
     config: payload.config,
+    defaultIDType: payload.db.defaultIDType,
+    payload,
     route
   });
   if (collectionSlug && !collectionConfig || globalSlug && !globalConfig) {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["findLocaleFromCode","headers","getHeaders","notFound","createLocalReq","isEntityHidden","parseCookies","qs","getPayloadHMR","initReq","getRouteInfo","handleAuthRedirect","isPublicAdminRoute","initPage","config","configPromise","importMap","route","searchParams","payload","queryString","stringify","addQueryPrefix","collections","globals","localization","routes","admin","adminRoute","cookies","i18n","permissions","user","req","fallbackLocale","host","get","query","parse","depth","ignoreQueryPrefix","url","serverURL","languageOptions","Object","entries","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","localeParam","locale","defaultLocaleCode","defaultLocale","localeCode","find","collection","limit","where","and","equals","id","key","then","res","docs","error","code","visibleEntities","map","slug","hidden","filter","Boolean","redirectTo","canAccessAdmin","collectionConfig","collectionSlug","docID","globalConfig","globalSlug"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { InitPageResult, Locale, PayloadRequest, VisibleEntities } from 'payload'\n\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound } from 'next/navigation.js'\nimport { createLocalReq, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { getPayloadHMR } from '../getPayloadHMR.js'\nimport { initReq } from '../initReq.js'\nimport { getRouteInfo } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\nimport { isPublicAdminRoute } from './shared.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = await getHeaders()\n  const payload = await getPayloadHMR({ config: configPromise, importMap })\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    collections,\n    globals,\n    localization,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const cookies = parseCookies(headers)\n\n  const { i18n, permissions, user } = await initReq(payload.config)\n\n  // Ideally, we should not need to recreate the req, because\n  // we can get it from the above initReq.\n\n  // We just need to -overwrite- the url and query of the req\n  // we get above. Clone the req? We'll look into that eventually.\n  const req = await createLocalReq(\n    {\n      fallbackLocale: null,\n      req: {\n        headers,\n        host: headers.get('host'),\n        i18n,\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n        url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n      } as PayloadRequest,\n    },\n    payload,\n  )\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  req.user = user\n\n  const localeParam = searchParams?.locale as string\n  let locale: Locale\n\n  if (localization) {\n    const defaultLocaleCode = localization.defaultLocale ? localization.defaultLocale : 'en'\n    let localeCode: string = localeParam\n\n    if (!localeCode) {\n      try {\n        localeCode = await payload\n          .find({\n            collection: 'payload-preferences',\n            depth: 0,\n            limit: 1,\n            user,\n            where: {\n              and: [\n                {\n                  'user.relationTo': {\n                    equals: payload.config.admin.user,\n                  },\n                },\n                {\n                  'user.value': {\n                    equals: user.id,\n                  },\n                },\n                {\n                  key: {\n                    equals: 'locale',\n                  },\n                },\n              ],\n            },\n          })\n          ?.then((res) => res.docs?.[0]?.value as string)\n      } catch (error) {} // eslint-disable-line no-empty\n    }\n\n    locale = findLocaleFromCode(localization, localeCode)\n\n    if (!locale) {\n      locale = findLocaleFromCode(localization, defaultLocaleCode)\n    }\n    req.locale = locale.code\n  }\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  let redirectTo = null\n\n  if (\n    !permissions.canAccessAdmin &&\n    !isPublicAdminRoute({ adminRoute, config: payload.config, route })\n  ) {\n    redirectTo = handleAuthRedirect({\n      config: payload.config,\n      route,\n      searchParams,\n      user,\n    })\n  }\n\n  const { collectionConfig, collectionSlug, docID, globalConfig, globalSlug } = getRouteInfo({\n    adminRoute,\n    config: payload.config,\n    route,\n  })\n\n  if ((collectionSlug && !collectionConfig) || (globalSlug && !globalConfig)) {\n    return notFound()\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    redirectTo,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["findLocaleFromCode","headers","getHeaders","notFound","createLocalReq","getPayload","isEntityHidden","parseCookies","qs","initReq","getRouteInfo","handleAuthRedirect","isCustomAdminView","isPublicAdminRoute","initPage","config","configPromise","importMap","route","searchParams","payload","queryString","stringify","addQueryPrefix","collections","globals","localization","routes","admin","adminRoute","cookies","i18n","permissions","user","req","fallbackLocale","host","get","query","parse","depth","ignoreQueryPrefix","url","serverURL","languageOptions","Object","entries","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","localeParam","locale","defaultLocaleCode","defaultLocale","localeCode","find","collection","limit","where","and","equals","id","key","then","res","docs","error","code","visibleEntities","map","slug","hidden","filter","Boolean","redirectTo","canAccessAdmin","collectionConfig","collectionSlug","docID","globalConfig","globalSlug","defaultIDType","db"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { InitPageResult, Locale, VisibleEntities } from 'payload'\n\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound } from 'next/navigation.js'\nimport { createLocalReq, getPayload, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { initReq } from '../initReq.js'\nimport { getRouteInfo } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\nimport { isCustomAdminView } from './isCustomAdminView.js'\nimport { isPublicAdminRoute } from './shared.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = await getHeaders()\n  const payload = await getPayload({ config: configPromise, importMap })\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    collections,\n    globals,\n    localization,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const cookies = parseCookies(headers)\n\n  const { i18n, permissions, user } = await initReq(payload.config)\n\n  // Ideally, we should not need to recreate the req, because\n  // we can get it from the above initReq.\n\n  // We just need to -overwrite- the url and query of the req\n  // we get above. Clone the req? We'll look into that eventually.\n  const req = await createLocalReq(\n    {\n      fallbackLocale: false,\n      req: {\n        headers,\n        host: headers.get('host'),\n        i18n: i18n as I18n,\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n        url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n      },\n    },\n    payload,\n  )\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  req.user = user\n\n  const localeParam = searchParams?.locale as string\n  let locale: Locale\n\n  if (localization) {\n    const defaultLocaleCode = localization.defaultLocale ? localization.defaultLocale : 'en'\n    let localeCode: string = localeParam\n\n    if (!localeCode) {\n      try {\n        localeCode = await payload\n          .find({\n            collection: 'payload-preferences',\n            depth: 0,\n            limit: 1,\n            user,\n            where: {\n              and: [\n                {\n                  'user.relationTo': {\n                    equals: payload.config.admin.user,\n                  },\n                },\n                {\n                  'user.value': {\n                    equals: user.id,\n                  },\n                },\n                {\n                  key: {\n                    equals: 'locale',\n                  },\n                },\n              ],\n            },\n          })\n          ?.then((res) => res.docs?.[0]?.value as string)\n      } catch (error) {} // eslint-disable-line no-empty\n    }\n\n    locale = findLocaleFromCode(localization, localeCode)\n\n    if (!locale) {\n      locale = findLocaleFromCode(localization, defaultLocaleCode)\n    }\n    req.locale = locale.code\n  }\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  let redirectTo = null\n\n  if (\n    !permissions.canAccessAdmin &&\n    !isPublicAdminRoute({ adminRoute, config: payload.config, route }) &&\n    !isCustomAdminView({ adminRoute, config: payload.config, route })\n  ) {\n    redirectTo = handleAuthRedirect({\n      config: payload.config,\n      route,\n      searchParams,\n      user,\n    })\n  }\n\n  const { collectionConfig, collectionSlug, docID, globalConfig, globalSlug } = getRouteInfo({\n    adminRoute,\n    config: payload.config,\n    defaultIDType: payload.db.defaultIDType,\n    payload,\n    route,\n  })\n\n  if ((collectionSlug && !collectionConfig) || (globalSlug && !globalConfig)) {\n    return notFound()\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    redirectTo,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,10 @@
+import type { SanitizedConfig } from 'payload';
+/**
+ * Returns an array of views marked with 'public: true' in the config
+ */
+export declare const isCustomAdminView: ({ adminRoute, config, route, }: {
+    adminRoute: string;
+    config: SanitizedConfig;
+    route: string;
+}) => boolean;
+//# sourceMappingURL=isCustomAdminView.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isCustomAdminView.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/isCustomAdminView.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmC,eAAe,EAAE,MAAM,SAAS,CAAA;AAI/E;;GAEG;AACH,eAAO,MAAM,iBAAiB,mCAI3B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAmBH,CAAA"}

package/dist/utilities/initPage/isCustomAdminView.js

@@ -0,0 +1,31 @@
+import { getRouteWithoutAdmin } from './shared.js';
+/**
+ * Returns an array of views marked with 'public: true' in the config
+ */
+export const isCustomAdminView = ({
+  adminRoute,
+  config,
+  route
+}) => {
+  if (config.admin?.components?.views) {
+    const isPublicAdminRoute = Object.entries(config.admin.components.views).some(([_, view]) => {
+      const routeWithoutAdmin = getRouteWithoutAdmin({
+        adminRoute,
+        route
+      });
+      if (view.exact) {
+        if (routeWithoutAdmin === view.path) {
+          return true;
+        }
+      } else {
+        if (routeWithoutAdmin.startsWith(view.path)) {
+          return true;
+        }
+      }
+      return false;
+    });
+    return isPublicAdminRoute;
+  }
+  return false;
+};
+//# sourceMappingURL=isCustomAdminView.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isCustomAdminView.js","names":["getRouteWithoutAdmin","isCustomAdminView","adminRoute","config","route","admin","components","views","isPublicAdminRoute","Object","entries","some","_","view","routeWithoutAdmin","exact","path","startsWith"],"sources":["../../../src/utilities/initPage/isCustomAdminView.ts"],"sourcesContent":["import type { AdminViewConfig, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { getRouteWithoutAdmin } from './shared.js'\n\n/**\n * Returns an array of views marked with 'public: true' in the config\n */\nexport const isCustomAdminView = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  if (config.admin?.components?.views) {\n    const isPublicAdminRoute = Object.entries(config.admin.components.views).some(([_, view]) => {\n      const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n\n      if (view.exact) {\n        if (routeWithoutAdmin === view.path) {\n          return true\n        }\n      } else {\n        if (routeWithoutAdmin.startsWith(view.path)) {\n          return true\n        }\n      }\n      return false\n    })\n    return isPublicAdminRoute\n  }\n  return false\n}\n"],"mappings":"AAEA,SAASA,oBAAoB,QAAQ;AAErC;;;AAGA,OAAO,MAAMC,iBAAA,GAAoBA,CAAC;EAChCC,UAAU;EACVC,MAAM;EACNC;AAAK,CAKN;EACC,IAAID,MAAA,CAAOE,KAAK,EAAEC,UAAA,EAAYC,KAAA,EAAO;IACnC,MAAMC,kBAAA,GAAqBC,MAAA,CAAOC,OAAO,CAACP,MAAA,CAAOE,KAAK,CAACC,UAAU,CAACC,KAAK,EAAEI,IAAI,CAAC,CAAC,CAACC,CAAA,EAAGC,IAAA,CAAK;MACtF,MAAMC,iBAAA,GAAoBd,oBAAA,CAAqB;QAAEE,UAAA;QAAYE;MAAM;MAEnE,IAAIS,IAAA,CAAKE,KAAK,EAAE;QACd,IAAID,iBAAA,KAAsBD,IAAA,CAAKG,IAAI,EAAE;UACnC,OAAO;QACT;MACF,OAAO;QACL,IAAIF,iBAAA,CAAkBG,UAAU,CAACJ,IAAA,CAAKG,IAAI,GAAG;UAC3C,OAAO;QACT;MACF;MACA,OAAO;IACT;IACA,OAAOR,kBAAA;EACT;EACA,OAAO;AACT","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAiB9C,eAAO,MAAM,YAAY,2BAGtB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAEH,CAAA;AAED,eAAO,MAAM,kBAAkB,mCAI5B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAYH,CAAA;AAED,eAAO,MAAM,oBAAoB,2BAG9B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,MAEH,CAAA"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAiB9C,eAAO,MAAM,YAAY,2BAGtB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAEH,CAAA;AAED,eAAO,MAAM,kBAAkB,mCAI5B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAeH,CAAA;AAED,eAAO,MAAM,oBAAoB,2BAG9B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,MAEH,CAAA"}

package/dist/utilities/initPage/shared.js

@@ -11,7 +11,7 @@ export const isPublicAdminRoute = ({
   config,
   route
 }) => {
-  return publicAdminRoutes.some(routeSegment => {
+  const isPublicAdminRoute = publicAdminRoutes.some(routeSegment => {
     const segment = config.admin?.routes?.[routeSegment] || routeSegment;
     const routeWithoutAdmin = getRouteWithoutAdmin({
       adminRoute,
@@ -25,6 +25,7 @@ export const isPublicAdminRoute = ({
       return false;
     }
   });
+  return isPublicAdminRoute;
 };
 export const getRouteWithoutAdmin = ({
   adminRoute,

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

@@ -1 +1 @@
-{"version":3,"file":"shared.js","names":["publicAdminRoutes","isAdminRoute","adminRoute","route","startsWith","isPublicAdminRoute","config","some","routeSegment","segment","admin","routes","routeWithoutAdmin","getRouteWithoutAdmin","includes","replace"],"sources":["../../../src/utilities/initPage/shared.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\n// Routes that require admin authentication\nconst publicAdminRoutes: (keyof Pick<\n  SanitizedConfig['admin']['routes'],\n  'createFirstUser' | 'forgot' | 'inactivity' | 'login' | 'logout' | 'reset' | 'unauthorized'\n>)[] = [\n  'createFirstUser',\n  'forgot',\n  'login',\n  'logout',\n  'forgot',\n  'inactivity',\n  'unauthorized',\n  'reset',\n]\n\nexport const isAdminRoute = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return route.startsWith(adminRoute)\n}\n\nexport const isPublicAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return publicAdminRoutes.some((routeSegment) => {\n    const segment = config.admin?.routes?.[routeSegment] || routeSegment\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n    if (routeWithoutAdmin.startsWith(segment)) {\n      return true\n    } else if (routeWithoutAdmin.includes('/verify/')) {\n      return true\n    } else {\n      return false\n    }\n  })\n}\n\nexport const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"mappings":"AAEA;AACA,MAAMA,iBAAA,GAGC,CACL,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,YAAA,GAAeA,CAAC;EAC3BC,UAAU;EACVC;AAAK,CAKN;EACC,OAAOA,KAAA,CAAMC,UAAU,CAACF,UAAA;AAC1B;AAEA,OAAO,MAAMG,kBAAA,GAAqBA,CAAC;EACjCH,UAAU;EACVI,MAAM;EACNH;AAAK,CAKN;EACC,OAAOH,iBAAA,CAAkBO,IAAI,CAAEC,YAAA;IAC7B,MAAMC,OAAA,GAAUH,MAAA,CAAOI,KAAK,EAAEC,MAAA,GAASH,YAAA,CAAa,IAAIA,YAAA;IACxD,MAAMI,iBAAA,GAAoBC,oBAAA,CAAqB;MAAEX,UAAA;MAAYC;IAAM;IACnE,IAAIS,iBAAA,CAAkBR,UAAU,CAACK,OAAA,GAAU;MACzC,OAAO;IACT,OAAO,IAAIG,iBAAA,CAAkBE,QAAQ,CAAC,aAAa;MACjD,OAAO;IACT,OAAO;MACL,OAAO;IACT;EACF;AACF;AAEA,OAAO,MAAMD,oBAAA,GAAuBA,CAAC;EACnCX,UAAU;EACVC;AAAK,CAIN;EACC,OAAOD,UAAA,IAAcA,UAAA,KAAe,MAAMC,KAAA,CAAMY,OAAO,CAACb,UAAA,EAAY,MAAMC,KAAA;AAC5E","ignoreList":[]}
+{"version":3,"file":"shared.js","names":["publicAdminRoutes","isAdminRoute","adminRoute","route","startsWith","isPublicAdminRoute","config","some","routeSegment","segment","admin","routes","routeWithoutAdmin","getRouteWithoutAdmin","includes","replace"],"sources":["../../../src/utilities/initPage/shared.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\n// Routes that require admin authentication\nconst publicAdminRoutes: (keyof Pick<\n  SanitizedConfig['admin']['routes'],\n  'createFirstUser' | 'forgot' | 'inactivity' | 'login' | 'logout' | 'reset' | 'unauthorized'\n>)[] = [\n  'createFirstUser',\n  'forgot',\n  'login',\n  'logout',\n  'forgot',\n  'inactivity',\n  'unauthorized',\n  'reset',\n]\n\nexport const isAdminRoute = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return route.startsWith(adminRoute)\n}\n\nexport const isPublicAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  const isPublicAdminRoute = publicAdminRoutes.some((routeSegment) => {\n    const segment = config.admin?.routes?.[routeSegment] || routeSegment\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n\n    if (routeWithoutAdmin.startsWith(segment)) {\n      return true\n    } else if (routeWithoutAdmin.includes('/verify/')) {\n      return true\n    } else {\n      return false\n    }\n  })\n\n  return isPublicAdminRoute\n}\n\nexport const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"mappings":"AAEA;AACA,MAAMA,iBAAA,GAGC,CACL,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,YAAA,GAAeA,CAAC;EAC3BC,UAAU;EACVC;AAAK,CAKN;EACC,OAAOA,KAAA,CAAMC,UAAU,CAACF,UAAA;AAC1B;AAEA,OAAO,MAAMG,kBAAA,GAAqBA,CAAC;EACjCH,UAAU;EACVI,MAAM;EACNH;AAAK,CAKN;EACC,MAAME,kBAAA,GAAqBL,iBAAA,CAAkBO,IAAI,CAAEC,YAAA;IACjD,MAAMC,OAAA,GAAUH,MAAA,CAAOI,KAAK,EAAEC,MAAA,GAASH,YAAA,CAAa,IAAIA,YAAA;IACxD,MAAMI,iBAAA,GAAoBC,oBAAA,CAAqB;MAAEX,UAAA;MAAYC;IAAM;IAEnE,IAAIS,iBAAA,CAAkBR,UAAU,CAACK,OAAA,GAAU;MACzC,OAAO;IACT,OAAO,IAAIG,iBAAA,CAAkBE,QAAQ,CAAC,aAAa;MACjD,OAAO;IACT,OAAO;MACL,OAAO;IACT;EACF;EAEA,OAAOT,kBAAA;AACT;AAEA,OAAO,MAAMQ,oBAAA,GAAuBA,CAAC;EACnCX,UAAU;EACVC;AAAK,CAIN;EACC,OAAOD,UAAA,IAAcA,UAAA,KAAe,MAAMC,KAAA,CAAMY,OAAO,CAACb,UAAA,EAAY,MAAMC,KAAA;AAC5E","ignoreList":[]}

package/dist/utilities/initReq.d.ts

@@ -1,11 +1,11 @@
 import type { I18nClient } from '@payloadcms/translations';
-import type { PayloadRequest, Permissions, SanitizedConfig, User } from 'payload';
+import type { PayloadRequest, SanitizedConfig, SanitizedPermissions, User } from 'payload';
 type Result = {
     i18n: I18nClient;
-    permissions: Permissions;
+    permissions: SanitizedPermissions;
     req: PayloadRequest;
     user: User;
 };
-export declare const initReq: (config: SanitizedConfig) => Promise<Result>;
+export declare const initReq: (configPromise: Promise<SanitizedConfig> | SanitizedConfig) => Promise<Result>;
 export {};
 //# sourceMappingURL=initReq.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"initReq.d.ts","sourceRoot":"","sources":["../../src/utilities/initReq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAUjF,KAAK,MAAM,GAAG;IACZ,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,EAAE,WAAW,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,eAAO,MAAM,OAAO,WAAiC,eAAe,KAAG,OAAO,CAAC,MAAM,CAuCnF,CAAA"}
+{"version":3,"file":"initReq.d.ts","sourceRoot":"","sources":["../../src/utilities/initReq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAS1F,KAAK,MAAM,GAAG;IACZ,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,EAAE,oBAAoB,CAAA;IACjC,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,eAAO,MAAM,OAAO,kBACH,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,KACxD,OAAO,CAAC,MAAM,CAuCf,CAAA"}