@payloadcms/next 3.0.0-beta.2 → 3.0.0-beta.20

package/dist/utilities/addLocalesToRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/addLocalesToRequest.ts"],"sourcesContent":["import type {\n  PayloadRequest,\n  PayloadRequestData,\n  PayloadRequestWithData,\n  SanitizedConfig,\n} from 'payload/types'\n\n/**\n * Mutates the Request to contain 'locale' and 'fallbackLocale' based on data or searchParams\n */\ntype Args = {\n  request: PayloadRequest & PayloadRequestData\n}\nexport function addLocalesToRequestFromData({ request }: Args): PayloadRequestWithData {\n  const {\n    data,\n    payload: { config },\n  } = request\n\n  if (data) {\n    let localeOnReq = request.locale\n    let fallbackLocaleOnReq = request.fallbackLocale\n\n    if (!localeOnReq && data?.locale && typeof data.locale === 'string') {\n      localeOnReq = data.locale\n    }\n\n    if (\n      !fallbackLocaleOnReq &&\n      data?.['fallback-locale'] &&\n      typeof data?.['fallback-locale'] === 'string'\n    ) {\n      fallbackLocaleOnReq = data['fallback-locale']\n    }\n\n    const { fallbackLocale, locale } = sanitizeLocales({\n      fallbackLocale: fallbackLocaleOnReq,\n      locale: localeOnReq,\n      localization: config.localization,\n    })\n\n    const mutableRequest = request\n    if (locale) mutableRequest.locale = locale\n    if (fallbackLocale) mutableRequest.fallbackLocale = fallbackLocale\n    return mutableRequest\n  }\n\n  return request\n}\n\ntype SanitizeLocalesArgs = {\n  fallbackLocale: string\n  locale: string\n  localization: SanitizedConfig['localization']\n}\ntype SanitizeLocalesReturn = {\n  fallbackLocale?: string\n  locale?: string\n}\nexport const sanitizeLocales = ({\n  fallbackLocale,\n  locale,\n  localization,\n}: SanitizeLocalesArgs): SanitizeLocalesReturn => {\n  if (fallbackLocale === 'none') {\n    fallbackLocale = 'null'\n  } else if (localization && !localization.localeCodes.includes(fallbackLocale)) {\n    fallbackLocale = localization.defaultLocale\n  }\n\n  if (locale === '*') {\n    locale = 'all'\n  } else if (localization && !localization.localeCodes.includes(locale)) {\n    locale = localization.defaultLocale\n  }\n\n  return {\n    fallbackLocale,\n    locale,\n  }\n}\n"],"names":["addLocalesToRequestFromData","request","data","payload","config","localeOnReq","locale","fallbackLocaleOnReq","fallbackLocale","sanitizeLocales","localization","mutableRequest","localeCodes","includes","defaultLocale"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAaA,OAAO,SAASA,4BAA4B,EAAEC,OAAO,EAAQ;IAC3D,MAAM,EACJC,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACpB,GAAGH;IAEJ,IAAIC,MAAM;QACR,IAAIG,cAAcJ,QAAQK,MAAM;QAChC,IAAIC,sBAAsBN,QAAQO,cAAc;QAEhD,IAAI,CAACH,eAAeH,MAAMI,UAAU,OAAOJ,KAAKI,MAAM,KAAK,UAAU;YACnED,cAAcH,KAAKI,MAAM;QAC3B;QAEA,IACE,CAACC,uBACDL,MAAM,CAAC,kBAAkB,IACzB,OAAOA,MAAM,CAAC,kBAAkB,KAAK,UACrC;YACAK,sBAAsBL,IAAI,CAAC,kBAAkB;QAC/C;QAEA,MAAM,EAAEM,cAAc,EAAEF,MAAM,EAAE,GAAGG,gBAAgB;YACjDD,gBAAgBD;YAChBD,QAAQD;YACRK,cAAcN,OAAOM,YAAY;QACnC;QAEA,MAAMC,iBAAiBV;QACvB,IAAIK,QAAQK,eAAeL,MAAM,GAAGA;QACpC,IAAIE,gBAAgBG,eAAeH,cAAc,GAAGA;QACpD,OAAOG;IACT;IAEA,OAAOV;AACT;AAWA,OAAO,MAAMQ,kBAAkB,CAAC,EAC9BD,cAAc,EACdF,MAAM,EACNI,YAAY,EACQ;IACpB,IAAIF,mBAAmB,QAAQ;QAC7BA,iBAAiB;IACnB,OAAO,IAAIE,gBAAgB,CAACA,aAAaE,WAAW,CAACC,QAAQ,CAACL,iBAAiB;QAC7EA,iBAAiBE,aAAaI,aAAa;IAC7C;IAEA,IAAIR,WAAW,KAAK;QAClBA,SAAS;IACX,OAAO,IAAII,gBAAgB,CAACA,aAAaE,WAAW,CAACC,QAAQ,CAACP,SAAS;QACrEA,SAASI,aAAaI,aAAa;IACrC;IAEA,OAAO;QACLN;QACAF;IACF;AACF,EAAC"}

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

@@ -1,4 +1,4 @@
-import type { PayloadRequest } from 'payload/types';
+import type { PayloadRequestWithData } from 'payload/types';
 import type { FieldSchemaMap } from './types.js';
-export declare const buildFieldSchemaMap: ({ i18n, payload: { config }, }: PayloadRequest) => FieldSchemaMap;
+export declare const buildFieldSchemaMap: ({ i18n, payload: { config }, }: PayloadRequestWithData) => FieldSchemaMap;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/buildFieldSchemaMap/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,eAAO,MAAM,mBAAmB,mCAG7B,cAAc,mBA4BhB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/buildFieldSchemaMap/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAE3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,eAAO,MAAM,mBAAmB,mCAG7B,sBAAsB,mBA4BxB,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utilities/buildFieldSchemaMap/index.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload/types'\n\nimport type { FieldSchemaMap } from './types.js'\n\nimport { traverseFields } from './traverseFields.js'\n\nexport const buildFieldSchemaMap = ({\n  i18n,\n  payload: { config },\n}: PayloadRequest): FieldSchemaMap => {\n  const result: FieldSchemaMap = new Map()\n\n  const validRelationships = config.collections.map((c) => c.slug) || []\n\n  config.collections.forEach((collection) => {\n    traverseFields({\n      config,\n      fields: collection.fields,\n      i18n,\n      schemaMap: result,\n      schemaPath: collection.slug,\n      validRelationships,\n    })\n  })\n\n  config.globals.forEach((global) => {\n    traverseFields({\n      config,\n      fields: global.fields,\n      i18n,\n      schemaMap: result,\n      schemaPath: global.slug,\n      validRelationships,\n    })\n  })\n\n  return result\n}\n"],"names":["traverseFields","buildFieldSchemaMap","i18n","payload","config","result","Map","validRelationships","collections","map","c","slug","forEach","collection","fields","schemaMap","schemaPath","globals","global"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,cAAc,QAAQ,sBAAqB;AAEpD,OAAO,MAAMC,sBAAsB,CAAC,EAClCC,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACJ;IACf,MAAMC,SAAyB,IAAIC;IAEnC,MAAMC,qBAAqBH,OAAOI,WAAW,CAACC,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,EAAE;IAEtEP,OAAOI,WAAW,CAACI,OAAO,CAAC,CAACC;QAC1Bb,eAAe;YACbI;YACAU,QAAQD,WAAWC,MAAM;YACzBZ;YACAa,WAAWV;YACXW,YAAYH,WAAWF,IAAI;YAC3BJ;QACF;IACF;IAEAH,OAAOa,OAAO,CAACL,OAAO,CAAC,CAACM;QACtBlB,eAAe;YACbI;YACAU,QAAQI,OAAOJ,MAAM;YACrBZ;YACAa,WAAWV;YACXW,YAAYE,OAAOP,IAAI;YACvBJ;QACF;IACF;IAEA,OAAOF;AACT,EAAC"}
+{"version":3,"sources":["../../../src/utilities/buildFieldSchemaMap/index.ts"],"sourcesContent":["import type { PayloadRequestWithData } from 'payload/types'\n\nimport type { FieldSchemaMap } from './types.js'\n\nimport { traverseFields } from './traverseFields.js'\n\nexport const buildFieldSchemaMap = ({\n  i18n,\n  payload: { config },\n}: PayloadRequestWithData): FieldSchemaMap => {\n  const result: FieldSchemaMap = new Map()\n\n  const validRelationships = config.collections.map((c) => c.slug) || []\n\n  config.collections.forEach((collection) => {\n    traverseFields({\n      config,\n      fields: collection.fields,\n      i18n,\n      schemaMap: result,\n      schemaPath: collection.slug,\n      validRelationships,\n    })\n  })\n\n  config.globals.forEach((global) => {\n    traverseFields({\n      config,\n      fields: global.fields,\n      i18n,\n      schemaMap: result,\n      schemaPath: global.slug,\n      validRelationships,\n    })\n  })\n\n  return result\n}\n"],"names":["traverseFields","buildFieldSchemaMap","i18n","payload","config","result","Map","validRelationships","collections","map","c","slug","forEach","collection","fields","schemaMap","schemaPath","globals","global"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,cAAc,QAAQ,sBAAqB;AAEpD,OAAO,MAAMC,sBAAsB,CAAC,EAClCC,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACI;IACvB,MAAMC,SAAyB,IAAIC;IAEnC,MAAMC,qBAAqBH,OAAOI,WAAW,CAACC,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,EAAE;IAEtEP,OAAOI,WAAW,CAACI,OAAO,CAAC,CAACC;QAC1Bb,eAAe;YACbI;YACAU,QAAQD,WAAWC,MAAM;YACzBZ;YACAa,WAAWV;YACXW,YAAYH,WAAWF,IAAI;YAC3BJ;QACF;IACF;IAEAH,OAAOa,OAAO,CAACL,OAAO,CAAC,CAACM;QACtBlB,eAAe;YACbI;YACAU,QAAQI,OAAOJ,MAAM;YACrBZ;YACAa,WAAWV;YACXW,YAAYE,OAAOP,IAAI;YACvBJ;QACF;IACF;IAEA,OAAOF;AACT,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"createPayloadRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/createPayloadRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,cAAc,EACd,eAAe,EAChB,MAAM,eAAe,CAAA;AActB,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QACP,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oBAAoB,gDAI9B,IAAI,KAAG,QAAQ,cAAc,CA8F/B,CAAA"}
+{"version":3,"file":"createPayloadRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/createPayloadRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkC,cAAc,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAapG,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QACP,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oBAAoB,gDAI9B,IAAI,KAAG,QAAQ,cAAc,CA+E/B,CAAA"}

package/dist/utilities/createPayloadRequest.js

@@ -4,39 +4,18 @@ import { parseCookies } from 'payload/auth';
 import { getDataLoader } from 'payload/utilities';
 import qs from 'qs';
 import { URL } from 'url';
-import { getDataAndFile } from './getDataAndFile.js';
+import { sanitizeLocales } from './addLocalesToRequest.js';
 import { getPayloadHMR } from './getPayloadHMR.js';
 import { getRequestLanguage } from './getRequestLanguage.js';
-import { getRequestLocales } from './getRequestLocales.js';
 export const createPayloadRequest = async ({ config: configPromise, params, request })=>{
     const cookies = parseCookies(request.headers);
     const payload = await getPayloadHMR({
         config: configPromise
     });
-    const { collections, config } = payload;
-    let collection = undefined;
-    if (params?.collection && collections?.[params.collection]) {
-        collection = collections[params.collection];
-    }
+    const { config } = payload;
     const urlProperties = new URL(request.url);
     const { pathname, searchParams } = urlProperties;
     const isGraphQL = !config.graphQL.disable && pathname === `${config.routes.api}${config.routes.graphQL}`;
-    const { data, file } = await getDataAndFile({
-        collection,
-        config,
-        request
-    });
-    let requestFallbackLocale;
-    let requestLocale;
-    if (config.localization) {
-        const locales = getRequestLocales({
-            data,
-            localization: config.localization,
-            searchParams
-        });
-        requestLocale = locales.locale;
-        requestFallbackLocale = locales.fallbackLocale;
-    }
     const language = getRequestLanguage({
         config,
         cookies,
@@ -47,16 +26,25 @@ export const createPayloadRequest = async ({ config: configPromise, params, requ
         context: 'api',
         language
     });
+    let locale;
+    let fallbackLocale;
+    if (config.localization) {
+        const locales = sanitizeLocales({
+            fallbackLocale: searchParams.get('fallback-locale'),
+            locale: searchParams.get('locale'),
+            localization: payload.config.localization
+        });
+        locale = locales.locale;
+        fallbackLocale = locales.fallbackLocale;
+    }
     const customRequest = {
         context: {},
-        data,
-        fallbackLocale: requestFallbackLocale,
-        file,
+        fallbackLocale,
         hash: urlProperties.hash,
         host: urlProperties.host,
         href: urlProperties.href,
         i18n,
-        locale: requestLocale,
+        locale,
         origin: urlProperties.origin,
         pathname: urlProperties.pathname,
         payload,
@@ -78,7 +66,6 @@ export const createPayloadRequest = async ({ config: configPromise, params, requ
         user: null
     };
     const req = Object.assign(request, customRequest);
-    if (data) req.json = ()=>Promise.resolve(data);
     req.payloadDataLoader = getDataLoader(req);
     req.user = await executeAuthStrategies({
         cookies,

package/dist/utilities/createPayloadRequest.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/createPayloadRequest.ts"],"sourcesContent":["import type {\n  Collection,\n  CustomPayloadRequest,\n  PayloadRequest,\n  SanitizedConfig,\n} from 'payload/types'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { executeAuthStrategies } from 'payload/auth'\nimport { parseCookies } from 'payload/auth'\nimport { getDataLoader } from 'payload/utilities'\nimport qs from 'qs'\nimport { URL } from 'url'\n\nimport { getDataAndFile } from './getDataAndFile.js'\nimport { getPayloadHMR } from './getPayloadHMR.js'\nimport { getRequestLanguage } from './getRequestLanguage.js'\nimport { getRequestLocales } from './getRequestLocales.js'\n\ntype Args = {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: {\n    collection: string\n  }\n  request: Request\n}\n\nexport const createPayloadRequest = async ({\n  config: configPromise,\n  params,\n  request,\n}: Args): Promise<PayloadRequest> => {\n  const cookies = parseCookies(request.headers)\n  const payload = await getPayloadHMR({ config: configPromise })\n\n  const { collections, config } = payload\n\n  let collection: Collection = undefined\n  if (params?.collection && collections?.[params.collection]) {\n    collection = collections[params.collection]\n  }\n\n  const urlProperties = new URL(request.url)\n  const { pathname, searchParams } = urlProperties\n\n  const isGraphQL =\n    !config.graphQL.disable && pathname === `${config.routes.api}${config.routes.graphQL}`\n\n  const { data, file } = await getDataAndFile({\n    collection,\n    config,\n    request,\n  })\n\n  let requestFallbackLocale\n  let requestLocale\n\n  if (config.localization) {\n    const locales = getRequestLocales({\n      data,\n      localization: config.localization,\n      searchParams,\n    })\n    requestLocale = locales.locale\n    requestFallbackLocale = locales.fallbackLocale\n  }\n\n  const language = getRequestLanguage({\n    config,\n    cookies,\n    headers: request.headers,\n  })\n\n  const i18n = await initI18n({\n    config: config.i18n,\n    context: 'api',\n    language,\n  })\n\n  const customRequest: CustomPayloadRequest = {\n    context: {},\n    data,\n    fallbackLocale: requestFallbackLocale,\n    file,\n    hash: urlProperties.hash,\n    host: urlProperties.host,\n    href: urlProperties.href,\n    i18n,\n    locale: requestLocale,\n    origin: urlProperties.origin,\n    pathname: urlProperties.pathname,\n    payload,\n    payloadAPI: isGraphQL ? 'GraphQL' : 'REST',\n    payloadDataLoader: undefined,\n    payloadUploadSizes: {},\n    port: urlProperties.port,\n    protocol: urlProperties.protocol,\n    query: urlProperties.search\n      ? qs.parse(urlProperties.search, {\n          arrayLimit: 1000,\n          depth: 10,\n          ignoreQueryPrefix: true,\n        })\n      : {},\n    routeParams: params || {},\n    search: urlProperties.search,\n    searchParams: urlProperties.searchParams,\n    t: i18n.t,\n    transactionID: undefined,\n    user: null,\n  }\n\n  const req: PayloadRequest = Object.assign(request, customRequest)\n\n  if (data) req.json = () => Promise.resolve(data)\n  req.payloadDataLoader = getDataLoader(req)\n\n  req.user = await executeAuthStrategies({\n    cookies,\n    headers: req.headers,\n    isGraphQL,\n    payload,\n  })\n\n  return req\n}\n"],"names":["initI18n","executeAuthStrategies","parseCookies","getDataLoader","qs","URL","getDataAndFile","getPayloadHMR","getRequestLanguage","getRequestLocales","createPayloadRequest","config","configPromise","params","request","cookies","headers","payload","collections","collection","undefined","urlProperties","url","pathname","searchParams","isGraphQL","graphQL","disable","routes","api","data","file","requestFallbackLocale","requestLocale","localization","locales","locale","fallbackLocale","language","i18n","context","customRequest","hash","host","href","origin","payloadAPI","payloadDataLoader","payloadUploadSizes","port","protocol","query","search","parse","arrayLimit","depth","ignoreQueryPrefix","routeParams","t","transactionID","user","req","Object","assign","json","Promise","resolve"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/utilities/createPayloadRequest.ts"],"sourcesContent":["import type { CustomPayloadRequestProperties, PayloadRequest, SanitizedConfig } from 'payload/types'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { executeAuthStrategies } from 'payload/auth'\nimport { parseCookies } from 'payload/auth'\nimport { getDataLoader } from 'payload/utilities'\nimport qs from 'qs'\nimport { URL } from 'url'\n\nimport { sanitizeLocales } from './addLocalesToRequest.js'\nimport { getPayloadHMR } from './getPayloadHMR.js'\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\ntype Args = {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: {\n    collection: string\n  }\n  request: Request\n}\n\nexport const createPayloadRequest = async ({\n  config: configPromise,\n  params,\n  request,\n}: Args): Promise<PayloadRequest> => {\n  const cookies = parseCookies(request.headers)\n  const payload = await getPayloadHMR({ config: configPromise })\n\n  const { config } = payload\n\n  const urlProperties = new URL(request.url)\n  const { pathname, searchParams } = urlProperties\n\n  const isGraphQL =\n    !config.graphQL.disable && pathname === `${config.routes.api}${config.routes.graphQL}`\n\n  const language = getRequestLanguage({\n    config,\n    cookies,\n    headers: request.headers,\n  })\n\n  const i18n = await initI18n({\n    config: config.i18n,\n    context: 'api',\n    language,\n  })\n\n  let locale\n  let fallbackLocale\n  if (config.localization) {\n    const locales = sanitizeLocales({\n      fallbackLocale: searchParams.get('fallback-locale'),\n      locale: searchParams.get('locale'),\n      localization: payload.config.localization,\n    })\n    locale = locales.locale\n    fallbackLocale = locales.fallbackLocale\n  }\n\n  const customRequest: CustomPayloadRequestProperties = {\n    context: {},\n    fallbackLocale,\n    hash: urlProperties.hash,\n    host: urlProperties.host,\n    href: urlProperties.href,\n    i18n,\n    locale,\n    origin: urlProperties.origin,\n    pathname: urlProperties.pathname,\n    payload,\n    payloadAPI: isGraphQL ? 'GraphQL' : 'REST',\n    payloadDataLoader: undefined,\n    payloadUploadSizes: {},\n    port: urlProperties.port,\n    protocol: urlProperties.protocol,\n    query: urlProperties.search\n      ? qs.parse(urlProperties.search, {\n          arrayLimit: 1000,\n          depth: 10,\n          ignoreQueryPrefix: true,\n        })\n      : {},\n    routeParams: params || {},\n    search: urlProperties.search,\n    searchParams: urlProperties.searchParams,\n    t: i18n.t,\n    transactionID: undefined,\n    user: null,\n  }\n\n  const req: PayloadRequest = Object.assign(request, customRequest)\n\n  req.payloadDataLoader = getDataLoader(req)\n\n  req.user = await executeAuthStrategies({\n    cookies,\n    headers: req.headers,\n    isGraphQL,\n    payload,\n  })\n\n  return req\n}\n"],"names":["initI18n","executeAuthStrategies","parseCookies","getDataLoader","qs","URL","sanitizeLocales","getPayloadHMR","getRequestLanguage","createPayloadRequest","config","configPromise","params","request","cookies","headers","payload","urlProperties","url","pathname","searchParams","isGraphQL","graphQL","disable","routes","api","language","i18n","context","locale","fallbackLocale","localization","locales","get","customRequest","hash","host","href","origin","payloadAPI","payloadDataLoader","undefined","payloadUploadSizes","port","protocol","query","search","parse","arrayLimit","depth","ignoreQueryPrefix","routeParams","t","transactionID","user","req","Object","assign"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,qBAAqB,QAAQ,eAAc;AACpD,SAASC,YAAY,QAAQ,eAAc;AAC3C,SAASC,aAAa,QAAQ,oBAAmB;AACjD,OAAOC,QAAQ,KAAI;AACnB,SAASC,GAAG,QAAQ,MAAK;AAEzB,SAASC,eAAe,QAAQ,2BAA0B;AAC1D,SAASC,aAAa,QAAQ,qBAAoB;AAClD,SAASC,kBAAkB,QAAQ,0BAAyB;AAU5D,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,QAAQC,aAAa,EACrBC,MAAM,EACNC,OAAO,EACF;IACL,MAAMC,UAAUZ,aAAaW,QAAQE,OAAO;IAC5C,MAAMC,UAAU,MAAMT,cAAc;QAAEG,QAAQC;IAAc;IAE5D,MAAM,EAAED,MAAM,EAAE,GAAGM;IAEnB,MAAMC,gBAAgB,IAAIZ,IAAIQ,QAAQK,GAAG;IACzC,MAAM,EAAEC,QAAQ,EAAEC,YAAY,EAAE,GAAGH;IAEnC,MAAMI,YACJ,CAACX,OAAOY,OAAO,CAACC,OAAO,IAAIJ,aAAa,CAAC,EAAET,OAAOc,MAAM,CAACC,GAAG,CAAC,EAAEf,OAAOc,MAAM,CAACF,OAAO,CAAC,CAAC;IAExF,MAAMI,WAAWlB,mBAAmB;QAClCE;QACAI;QACAC,SAASF,QAAQE,OAAO;IAC1B;IAEA,MAAMY,OAAO,MAAM3B,SAAS;QAC1BU,QAAQA,OAAOiB,IAAI;QACnBC,SAAS;QACTF;IACF;IAEA,IAAIG;IACJ,IAAIC;IACJ,IAAIpB,OAAOqB,YAAY,EAAE;QACvB,MAAMC,UAAU1B,gBAAgB;YAC9BwB,gBAAgBV,aAAaa,GAAG,CAAC;YACjCJ,QAAQT,aAAaa,GAAG,CAAC;YACzBF,cAAcf,QAAQN,MAAM,CAACqB,YAAY;QAC3C;QACAF,SAASG,QAAQH,MAAM;QACvBC,iBAAiBE,QAAQF,cAAc;IACzC;IAEA,MAAMI,gBAAgD;QACpDN,SAAS,CAAC;QACVE;QACAK,MAAMlB,cAAckB,IAAI;QACxBC,MAAMnB,cAAcmB,IAAI;QACxBC,MAAMpB,cAAcoB,IAAI;QACxBV;QACAE;QACAS,QAAQrB,cAAcqB,MAAM;QAC5BnB,UAAUF,cAAcE,QAAQ;QAChCH;QACAuB,YAAYlB,YAAY,YAAY;QACpCmB,mBAAmBC;QACnBC,oBAAoB,CAAC;QACrBC,MAAM1B,cAAc0B,IAAI;QACxBC,UAAU3B,cAAc2B,QAAQ;QAChCC,OAAO5B,cAAc6B,MAAM,GACvB1C,GAAG2C,KAAK,CAAC9B,cAAc6B,MAAM,EAAE;YAC7BE,YAAY;YACZC,OAAO;YACPC,mBAAmB;QACrB,KACA,CAAC;QACLC,aAAavC,UAAU,CAAC;QACxBkC,QAAQ7B,cAAc6B,MAAM;QAC5B1B,cAAcH,cAAcG,YAAY;QACxCgC,GAAGzB,KAAKyB,CAAC;QACTC,eAAeZ;QACfa,MAAM;IACR;IAEA,MAAMC,MAAsBC,OAAOC,MAAM,CAAC5C,SAASqB;IAEnDqB,IAAIf,iBAAiB,GAAGrC,cAAcoD;IAEtCA,IAAID,IAAI,GAAG,MAAMrD,sBAAsB;QACrCa;QACAC,SAASwC,IAAIxC,OAAO;QACpBM;QACAL;IACF;IAEA,OAAOuC;AACT,EAAC"}

package/dist/utilities/getDataAndFile.d.ts

@@ -1,11 +1,11 @@
-import type { Collection, CustomPayloadRequest, SanitizedConfig } from 'payload/types';
+import type { Collection, PayloadRequestWithData, SanitizedConfig } from 'payload/types';
 type GetDataAndFile = (args: {
     collection: Collection;
     config: SanitizedConfig;
     request: Request;
 }) => Promise<{
     data: Record<string, any>;
-    file: CustomPayloadRequest['file'];
+    file: PayloadRequestWithData['file'];
 }>;
 export declare const getDataAndFile: GetDataAndFile;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"getDataAndFile.d.ts","sourceRoot":"","sources":["../../src/utilities/getDataAndFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAItF,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE;IAC3B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;CACjB,KAAK,OAAO,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACzB,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAA;CACnC,CAAC,CAAA;AACF,eAAO,MAAM,cAAc,EAAE,cAmE5B,CAAA"}
+{"version":3,"file":"getDataAndFile.d.ts","sourceRoot":"","sources":["../../src/utilities/getDataAndFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAMxF,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE;IAC3B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;CACjB,KAAK,OAAO,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACzB,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;CACrC,CAAC,CAAA;AACF,eAAO,MAAM,cAAc,EAAE,cAwD5B,CAAA"}

package/dist/utilities/getDataAndFile.js

@@ -1,56 +1,40 @@
-import { nextFileUpload } from '../next-fileupload/index.js';
-export const getDataAndFile = async ({ collection, config, request })=>{
+import { fetchAPIFileUpload } from '../fetchAPI-multipart/index.js';
+export const getDataAndFile = async ({ collection, config, request: incomingRequest })=>{
     let data = undefined;
     let file = undefined;
     if ([
         'PATCH',
         'POST',
         'PUT'
-    ].includes(request.method.toUpperCase()) && request.body) {
+    ].includes(incomingRequest.method.toUpperCase()) && incomingRequest.body) {
+        const request = new Request(incomingRequest);
         const [contentType] = (request.headers.get('Content-Type') || '').split(';');
         if (contentType === 'application/json') {
-            data = await request.json();
-        } else if (contentType === 'multipart/form-data') {
-            // possible upload request
-            if (collection?.config?.upload) {
-                // load file in memory
-                if (!config.upload?.useTempFiles) {
-                    const formData = await request.formData();
-                    const formFile = formData.get('file');
-                    if (formFile instanceof Blob) {
-                        const bytes = await formFile.arrayBuffer();
-                        const buffer = Buffer.from(bytes);
-                        file = {
-                            name: formFile.name,
-                            data: buffer,
-                            mimetype: formFile.type,
-                            size: formFile.size
-                        };
-                    }
-                    const payloadData = formData.get('_payload');
-                    if (typeof payloadData === 'string') {
-                        data = JSON.parse(payloadData);
-                    }
-                } else {
-                    // store temp file on disk
-                    const { error, fields, files } = await nextFileUpload({
-                        options: config.upload,
-                        request
-                    });
-                    if (error) {
-                        throw new Error(error.message);
-                    }
-                    if (files?.file) file = files.file;
-                    if (fields?._payload && typeof fields._payload === 'string') {
-                        data = JSON.parse(fields._payload);
-                    }
+            const bodyByteSize = parseInt(request.headers.get('Content-Length') || '0', 10);
+            const upperByteLimit = typeof config.upload?.limits?.fieldSize === 'number' ? config.upload.limits.fields : undefined;
+            if (bodyByteSize <= upperByteLimit || upperByteLimit === undefined) {
+                try {
+                    data = await request.json();
+                } catch (error) {
+                    data = {};
                 }
             } else {
-                // non upload request
-                const formData = await request.formData();
-                const payloadData = formData.get('_payload');
-                if (typeof payloadData === 'string') {
-                    data = JSON.parse(payloadData);
+                throw new Error('Request body size exceeds the limit');
+            }
+        } else {
+            if (request.headers.has('Content-Length') && request.headers.get('Content-Length') !== '0') {
+                const { error, fields, files } = await fetchAPIFileUpload({
+                    options: config.upload,
+                    request
+                });
+                if (error) {
+                    throw new Error(error.message);
+                }
+                if (collection?.config?.upload && files?.file) {
+                    file = files.file;
+                }
+                if (fields?._payload && typeof fields._payload === 'string') {
+                    data = JSON.parse(fields._payload);
                 }
             }
         }

package/dist/utilities/getDataAndFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getDataAndFile.ts"],"sourcesContent":["import type { Collection, CustomPayloadRequest, SanitizedConfig } from 'payload/types'\n\nimport { nextFileUpload } from '../next-fileupload/index.js'\n\ntype GetDataAndFile = (args: {\n  collection: Collection\n  config: SanitizedConfig\n  request: Request\n}) => Promise<{\n  data: Record<string, any>\n  file: CustomPayloadRequest['file']\n}>\nexport const getDataAndFile: GetDataAndFile = async ({ collection, config, request }) => {\n  let data: Record<string, any> = undefined\n  let file: CustomPayloadRequest['file'] = undefined\n\n  if (['PATCH', 'POST', 'PUT'].includes(request.method.toUpperCase()) && request.body) {\n    const [contentType] = (request.headers.get('Content-Type') || '').split(';')\n\n    if (contentType === 'application/json') {\n      data = await request.json()\n    } else if (contentType === 'multipart/form-data') {\n      // possible upload request\n      if (collection?.config?.upload) {\n        // load file in memory\n        if (!config.upload?.useTempFiles) {\n          const formData = await request.formData()\n          const formFile = formData.get('file')\n\n          if (formFile instanceof Blob) {\n            const bytes = await formFile.arrayBuffer()\n            const buffer = Buffer.from(bytes)\n\n            file = {\n              name: formFile.name,\n              data: buffer,\n              mimetype: formFile.type,\n              size: formFile.size,\n            }\n          }\n\n          const payloadData = formData.get('_payload')\n\n          if (typeof payloadData === 'string') {\n            data = JSON.parse(payloadData)\n          }\n        } else {\n          // store temp file on disk\n          const { error, fields, files } = await nextFileUpload({\n            options: config.upload as any,\n            request,\n          })\n\n          if (error) {\n            throw new Error(error.message)\n          }\n\n          if (files?.file) file = files.file\n\n          if (fields?._payload && typeof fields._payload === 'string') {\n            data = JSON.parse(fields._payload)\n          }\n        }\n      } else {\n        // non upload request\n        const formData = await request.formData()\n        const payloadData = formData.get('_payload')\n\n        if (typeof payloadData === 'string') {\n          data = JSON.parse(payloadData)\n        }\n      }\n    }\n  }\n\n  return {\n    data,\n    file,\n  }\n}\n"],"names":["nextFileUpload","getDataAndFile","collection","config","request","data","undefined","file","includes","method","toUpperCase","body","contentType","headers","get","split","json","upload","useTempFiles","formData","formFile","Blob","bytes","arrayBuffer","buffer","Buffer","from","name","mimetype","type","size","payloadData","JSON","parse","error","fields","files","options","Error","message","_payload"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,cAAc,QAAQ,8BAA6B;AAU5D,OAAO,MAAMC,iBAAiC,OAAO,EAAEC,UAAU,EAAEC,MAAM,EAAEC,OAAO,EAAE;IAClF,IAAIC,OAA4BC;IAChC,IAAIC,OAAqCD;IAEzC,IAAI;QAAC;QAAS;QAAQ;KAAM,CAACE,QAAQ,CAACJ,QAAQK,MAAM,CAACC,WAAW,OAAON,QAAQO,IAAI,EAAE;QACnF,MAAM,CAACC,YAAY,GAAG,AAACR,CAAAA,QAAQS,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAC,EAAGC,KAAK,CAAC;QAExE,IAAIH,gBAAgB,oBAAoB;YACtCP,OAAO,MAAMD,QAAQY,IAAI;QAC3B,OAAO,IAAIJ,gBAAgB,uBAAuB;YAChD,0BAA0B;YAC1B,IAAIV,YAAYC,QAAQc,QAAQ;gBAC9B,sBAAsB;gBACtB,IAAI,CAACd,OAAOc,MAAM,EAAEC,cAAc;oBAChC,MAAMC,WAAW,MAAMf,QAAQe,QAAQ;oBACvC,MAAMC,WAAWD,SAASL,GAAG,CAAC;oBAE9B,IAAIM,oBAAoBC,MAAM;wBAC5B,MAAMC,QAAQ,MAAMF,SAASG,WAAW;wBACxC,MAAMC,SAASC,OAAOC,IAAI,CAACJ;wBAE3Bf,OAAO;4BACLoB,MAAMP,SAASO,IAAI;4BACnBtB,MAAMmB;4BACNI,UAAUR,SAASS,IAAI;4BACvBC,MAAMV,SAASU,IAAI;wBACrB;oBACF;oBAEA,MAAMC,cAAcZ,SAASL,GAAG,CAAC;oBAEjC,IAAI,OAAOiB,gBAAgB,UAAU;wBACnC1B,OAAO2B,KAAKC,KAAK,CAACF;oBACpB;gBACF,OAAO;oBACL,0BAA0B;oBAC1B,MAAM,EAAEG,KAAK,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAMpC,eAAe;wBACpDqC,SAASlC,OAAOc,MAAM;wBACtBb;oBACF;oBAEA,IAAI8B,OAAO;wBACT,MAAM,IAAII,MAAMJ,MAAMK,OAAO;oBAC/B;oBAEA,IAAIH,OAAO7B,MAAMA,OAAO6B,MAAM7B,IAAI;oBAElC,IAAI4B,QAAQK,YAAY,OAAOL,OAAOK,QAAQ,KAAK,UAAU;wBAC3DnC,OAAO2B,KAAKC,KAAK,CAACE,OAAOK,QAAQ;oBACnC;gBACF;YACF,OAAO;gBACL,qBAAqB;gBACrB,MAAMrB,WAAW,MAAMf,QAAQe,QAAQ;gBACvC,MAAMY,cAAcZ,SAASL,GAAG,CAAC;gBAEjC,IAAI,OAAOiB,gBAAgB,UAAU;oBACnC1B,OAAO2B,KAAKC,KAAK,CAACF;gBACpB;YACF;QACF;IACF;IAEA,OAAO;QACL1B;QACAE;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/getDataAndFile.ts"],"sourcesContent":["import type { Collection, PayloadRequestWithData, SanitizedConfig } from 'payload/types'\n\nimport type { FetchAPIFileUploadOptions } from '../fetchAPI-multipart/index.js'\n\nimport { fetchAPIFileUpload } from '../fetchAPI-multipart/index.js'\n\ntype GetDataAndFile = (args: {\n  collection: Collection\n  config: SanitizedConfig\n  request: Request\n}) => Promise<{\n  data: Record<string, any>\n  file: PayloadRequestWithData['file']\n}>\nexport const getDataAndFile: GetDataAndFile = async ({\n  collection,\n  config,\n  request: incomingRequest,\n}) => {\n  let data: Record<string, any> = undefined\n  let file: PayloadRequestWithData['file'] = undefined\n\n  if (\n    ['PATCH', 'POST', 'PUT'].includes(incomingRequest.method.toUpperCase()) &&\n    incomingRequest.body\n  ) {\n    const request = new Request(incomingRequest)\n    const [contentType] = (request.headers.get('Content-Type') || '').split(';')\n\n    if (contentType === 'application/json') {\n      const bodyByteSize = parseInt(request.headers.get('Content-Length') || '0', 10)\n      const upperByteLimit =\n        typeof config.upload?.limits?.fieldSize === 'number'\n          ? config.upload.limits.fields\n          : undefined\n      if (bodyByteSize <= upperByteLimit || upperByteLimit === undefined) {\n        try {\n          data = await request.json()\n        } catch (error) {\n          data = {}\n        }\n      } else {\n        throw new Error('Request body size exceeds the limit')\n      }\n    } else {\n      if (request.headers.has('Content-Length') && request.headers.get('Content-Length') !== '0') {\n        const { error, fields, files } = await fetchAPIFileUpload({\n          options: config.upload as FetchAPIFileUploadOptions,\n          request,\n        })\n\n        if (error) {\n          throw new Error(error.message)\n        }\n\n        if (collection?.config?.upload && files?.file) {\n          file = files.file\n        }\n\n        if (fields?._payload && typeof fields._payload === 'string') {\n          data = JSON.parse(fields._payload)\n        }\n      }\n    }\n  }\n\n  return {\n    data,\n    file,\n  }\n}\n"],"names":["fetchAPIFileUpload","getDataAndFile","collection","config","request","incomingRequest","data","undefined","file","includes","method","toUpperCase","body","Request","contentType","headers","get","split","bodyByteSize","parseInt","upperByteLimit","upload","limits","fieldSize","fields","json","error","Error","has","files","options","message","_payload","JSON","parse"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,kBAAkB,QAAQ,iCAAgC;AAUnE,OAAO,MAAMC,iBAAiC,OAAO,EACnDC,UAAU,EACVC,MAAM,EACNC,SAASC,eAAe,EACzB;IACC,IAAIC,OAA4BC;IAChC,IAAIC,OAAuCD;IAE3C,IACE;QAAC;QAAS;QAAQ;KAAM,CAACE,QAAQ,CAACJ,gBAAgBK,MAAM,CAACC,WAAW,OACpEN,gBAAgBO,IAAI,EACpB;QACA,MAAMR,UAAU,IAAIS,QAAQR;QAC5B,MAAM,CAACS,YAAY,GAAG,AAACV,CAAAA,QAAQW,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAC,EAAGC,KAAK,CAAC;QAExE,IAAIH,gBAAgB,oBAAoB;YACtC,MAAMI,eAAeC,SAASf,QAAQW,OAAO,CAACC,GAAG,CAAC,qBAAqB,KAAK;YAC5E,MAAMI,iBACJ,OAAOjB,OAAOkB,MAAM,EAAEC,QAAQC,cAAc,WACxCpB,OAAOkB,MAAM,CAACC,MAAM,CAACE,MAAM,GAC3BjB;YACN,IAAIW,gBAAgBE,kBAAkBA,mBAAmBb,WAAW;gBAClE,IAAI;oBACFD,OAAO,MAAMF,QAAQqB,IAAI;gBAC3B,EAAE,OAAOC,OAAO;oBACdpB,OAAO,CAAC;gBACV;YACF,OAAO;gBACL,MAAM,IAAIqB,MAAM;YAClB;QACF,OAAO;YACL,IAAIvB,QAAQW,OAAO,CAACa,GAAG,CAAC,qBAAqBxB,QAAQW,OAAO,CAACC,GAAG,CAAC,sBAAsB,KAAK;gBAC1F,MAAM,EAAEU,KAAK,EAAEF,MAAM,EAAEK,KAAK,EAAE,GAAG,MAAM7B,mBAAmB;oBACxD8B,SAAS3B,OAAOkB,MAAM;oBACtBjB;gBACF;gBAEA,IAAIsB,OAAO;oBACT,MAAM,IAAIC,MAAMD,MAAMK,OAAO;gBAC/B;gBAEA,IAAI7B,YAAYC,QAAQkB,UAAUQ,OAAOrB,MAAM;oBAC7CA,OAAOqB,MAAMrB,IAAI;gBACnB;gBAEA,IAAIgB,QAAQQ,YAAY,OAAOR,OAAOQ,QAAQ,KAAK,UAAU;oBAC3D1B,OAAO2B,KAAKC,KAAK,CAACV,OAAOQ,QAAQ;gBACnC;YACF;QACF;IACF;IAEA,OAAO;QACL1B;QACAE;IACF;AACF,EAAC"}

package/dist/utilities/getPayloadHMR.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"getPayloadHMR.d.ts","sourceRoot":"","sources":["../../src/utilities/getPayloadHMR.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,OAAO,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAgBjD,eAAO,MAAM,aAAa,YAAmB,WAAW,KAAG,QAAQ,OAAO,CA6EzE,CAAA"}
+{"version":3,"file":"getPayloadHMR.d.ts","sourceRoot":"","sources":["../../src/utilities/getPayloadHMR.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,OAAO,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAgBlE,eAAO,MAAM,MAAM,WAAkB,eAAe,uBAAqB,QAAQ,IAAI,CAuBpF,CAAA;AAED,eAAO,MAAM,aAAa,YAAmB,WAAW,KAAG,QAAQ,OAAO,CA4DzE,CAAA"}

package/dist/utilities/getPayloadHMR.js

@@ -9,6 +9,27 @@ if (!cached) {
         reload: false
     };
 }
+export const reload = async (config, payload)=>{
+    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
+    await payload.db.init();
+    await payload.db.connect({
+        hotReload: true
+    });
+};
 export const getPayloadHMR = async (options)=>{
     if (!options?.config) {
         throw new Error('Error: the payload config is required for getPayload to work.');
@@ -19,24 +40,7 @@ export const getPayloadHMR = async (options)=>{
         if (cached.reload === true) {
             let resolve;
             cached.reload = new Promise((res)=>resolve = res);
-            if (typeof cached.payload.db.destroy === 'function') {
-                await cached.payload.db.destroy();
-            }
-            cached.payload.config = config;
-            cached.payload.collections = config.collections.reduce((collections, collection)=>{
-                collections[collection.slug] = {
-                    config: collection
-                };
-                return collections;
-            }, {});
-            cached.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
-            await cached.payload.db.init();
-            await cached.payload.db.connect({
-                hotReload: true
-            });
+            await reload(config, cached.payload);
             resolve();
         }
         if (cached.reload instanceof Promise) {

package/dist/utilities/getPayloadHMR.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getPayloadHMR.ts"],"sourcesContent":["import type { GeneratedTypes, Payload } from 'payload'\nimport type { InitOptions } from 'payload/config'\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 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      if (typeof cached.payload.db.destroy === 'function') {\n        await cached.payload.db.destroy()\n      }\n\n      cached.payload.config = config\n\n      cached.payload.collections = config.collections.reduce((collections, collection) => {\n        collections[collection.slug] = { config: collection }\n        return collections\n      }, {})\n\n      cached.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      await cached.payload.db.init()\n      await cached.payload.db.connect({ hotReload: true })\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(`ws://localhost:${port}/_next/webpack-hmr`)\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","getPayloadHMR","options","config","Error","resolve","Promise","res","db","destroy","collections","reduce","collection","slug","globals","init","connect","hotReload","process","env","NODE_ENV","DISABLE_PAYLOAD_HMR","port","PORT","ws","onmessage","event","data","JSON","parse","action","_","e"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,WAAW,QAAQ,UAAS;AACrC,OAAOC,eAAe,KAAI;AAE1B,IAAIC,SAIAC,OAAOC,QAAQ;AAEnB,IAAI,CAACF,QAAQ;IACX,2CAA2C;IAC3CA,SAASC,OAAOC,QAAQ,GAAG;QAAEC,SAAS;QAAMC,SAAS;QAAMC,QAAQ;IAAM;AAC3E;AAEA,OAAO,MAAMC,gBAAgB,OAAOC;IAClC,IAAI,CAACA,SAASC,QAAQ;QACpB,MAAM,IAAIC,MAAM;IAClB;IAEA,IAAIT,OAAOG,OAAO,EAAE;QAClB,MAAMK,SAAS,MAAMD,QAAQC,MAAM,CAAC,8EAA8E;;QAElH,IAAIR,OAAOK,MAAM,KAAK,MAAM;YAC1B,IAAIK;YAEJV,OAAOK,MAAM,GAAG,IAAIM,QAAQ,CAACC,MAASF,UAAUE;YAEhD,IAAI,OAAOZ,OAAOG,OAAO,CAACU,EAAE,CAACC,OAAO,KAAK,YAAY;gBACnD,MAAMd,OAAOG,OAAO,CAACU,EAAE,CAACC,OAAO;YACjC;YAEAd,OAAOG,OAAO,CAACK,MAAM,GAAGA;YAExBR,OAAOG,OAAO,CAACY,WAAW,GAAGP,OAAOO,WAAW,CAACC,MAAM,CAAC,CAACD,aAAaE;gBACnEF,WAAW,CAACE,WAAWC,IAAI,CAAC,GAAG;oBAAEV,QAAQS;gBAAW;gBACpD,OAAOF;YACT,GAAG,CAAC;YAEJf,OAAOG,OAAO,CAACgB,OAAO,GAAG;gBACvBX,QAAQA,OAAOW,OAAO;YACxB;YAEA,qHAAqH;YAErH,MAAMnB,OAAOG,OAAO,CAACU,EAAE,CAACO,IAAI;YAC5B,MAAMpB,OAAOG,OAAO,CAACU,EAAE,CAACQ,OAAO,CAAC;gBAAEC,WAAW;YAAK;YAClDZ;QACF;QAEA,IAAIV,OAAOK,MAAM,YAAYM,SAAS;YACpC,MAAMX,OAAOK,MAAM;QACrB;QAEA,OAAOL,OAAOG,OAAO;IACvB;IAEA,IAAI,CAACH,OAAOI,OAAO,EAAE;QACnBJ,OAAOI,OAAO,GAAG,IAAIN,cAA8BsB,IAAI,CAACb;IAC1D;IAEA,IAAI;QACFP,OAAOG,OAAO,GAAG,MAAMH,OAAOI,OAAO;QAErC,IACEmB,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBACzBF,QAAQC,GAAG,CAACC,QAAQ,KAAK,UACzBF,QAAQC,GAAG,CAACE,mBAAmB,KAAK,QACpC;YACA,IAAI;gBACF,MAAMC,OAAOJ,QAAQC,GAAG,CAACI,IAAI,IAAI;gBACjC,MAAMC,KAAK,IAAI9B,UAAU,CAAC,eAAe,EAAE4B,KAAK,kBAAkB,CAAC;gBAEnEE,GAAGC,SAAS,GAAG,CAACC;oBACd,IAAI,OAAOA,MAAMC,IAAI,KAAK,UAAU;wBAClC,MAAMA,OAAOC,KAAKC,KAAK,CAACH,MAAMC,IAAI;wBAElC,IAAI,YAAYA,QAAQA,KAAKG,MAAM,KAAK,0BAA0B;4BAChEnC,OAAOK,MAAM,GAAG;wBAClB;oBACF;gBACF;YACF,EAAE,OAAO+B,GAAG;YACV,YAAY;YACd;QACF;IACF,EAAE,OAAOC,GAAG;QACVrC,OAAOI,OAAO,GAAG;QACjB,MAAMiC;IACR;IAEA,OAAOrC,OAAOG,OAAO;AACvB,EAAC"}
+{"version":3,"sources":["../../src/utilities/getPayloadHMR.ts"],"sourcesContent":["import type { GeneratedTypes, Payload } from 'payload'\nimport type { InitOptions, SanitizedConfig } from 'payload/config'\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  await payload.db.init()\n  await payload.db.connect({ hotReload: true })\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(`ws://localhost:${port}/_next/webpack-hmr`)\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","init","connect","hotReload","getPayloadHMR","options","Error","resolve","Promise","res","process","env","NODE_ENV","DISABLE_PAYLOAD_HMR","port","PORT","ws","onmessage","event","data","JSON","parse","action","_","e"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,WAAW,QAAQ,UAAS;AACrC,OAAOC,eAAe,KAAI;AAE1B,IAAIC,SAIAC,OAAOC,QAAQ;AAEnB,IAAI,CAACF,QAAQ;IACX,2CAA2C;IAC3CA,SAASC,OAAOC,QAAQ,GAAG;QAAEC,SAAS;QAAMC,SAAS;QAAMC,QAAQ;IAAM;AAC3E;AAEA,OAAO,MAAMA,SAAS,OAAOC,QAAyBH;IACpD,IAAI,OAAOA,QAAQI,EAAE,CAACC,OAAO,KAAK,YAAY;QAC5C,MAAML,QAAQI,EAAE,CAACC,OAAO;IAC1B;IAEAL,QAAQG,MAAM,GAAGA;IAEjBH,QAAQM,WAAW,GAAGH,OAAOG,WAAW,CAACC,MAAM,CAAC,CAACD,aAAaE;QAC5DF,WAAW,CAACE,WAAWC,IAAI,CAAC,GAAG;YAC7BN,QAAQK;YACRE,cAAcV,QAAQM,WAAW,CAACE,WAAWC,IAAI,CAAC,EAAEC;QACtD;QACA,OAAOJ;IACT,GAAG,CAAC;IAEJN,QAAQW,OAAO,GAAG;QAChBR,QAAQA,OAAOQ,OAAO;IACxB;IAEA,qHAAqH;IAErH,MAAMX,QAAQI,EAAE,CAACQ,IAAI;IACrB,MAAMZ,QAAQI,EAAE,CAACS,OAAO,CAAC;QAAEC,WAAW;IAAK;AAC7C,EAAC;AAED,OAAO,MAAMC,gBAAgB,OAAOC;IAClC,IAAI,CAACA,SAASb,QAAQ;QACpB,MAAM,IAAIc,MAAM;IAClB;IAEA,IAAIpB,OAAOG,OAAO,EAAE;QAClB,MAAMG,SAAS,MAAMa,QAAQb,MAAM,CAAC,8EAA8E;;QAElH,IAAIN,OAAOK,MAAM,KAAK,MAAM;YAC1B,IAAIgB;YAEJrB,OAAOK,MAAM,GAAG,IAAIiB,QAAQ,CAACC,MAASF,UAAUE;YAEhD,MAAMlB,OAAOC,QAAQN,OAAOG,OAAO;YAEnCkB;QACF;QAEA,IAAIrB,OAAOK,MAAM,YAAYiB,SAAS;YACpC,MAAMtB,OAAOK,MAAM;QACrB;QAEA,OAAOL,OAAOG,OAAO;IACvB;IAEA,IAAI,CAACH,OAAOI,OAAO,EAAE;QACnBJ,OAAOI,OAAO,GAAG,IAAIN,cAA8BiB,IAAI,CAACI;IAC1D;IAEA,IAAI;QACFnB,OAAOG,OAAO,GAAG,MAAMH,OAAOI,OAAO;QAErC,IACEoB,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBACzBF,QAAQC,GAAG,CAACC,QAAQ,KAAK,UACzBF,QAAQC,GAAG,CAACE,mBAAmB,KAAK,QACpC;YACA,IAAI;gBACF,MAAMC,OAAOJ,QAAQC,GAAG,CAACI,IAAI,IAAI;gBACjC,MAAMC,KAAK,IAAI/B,UAAU,CAAC,eAAe,EAAE6B,KAAK,kBAAkB,CAAC;gBAEnEE,GAAGC,SAAS,GAAG,CAACC;oBACd,IAAI,OAAOA,MAAMC,IAAI,KAAK,UAAU;wBAClC,MAAMA,OAAOC,KAAKC,KAAK,CAACH,MAAMC,IAAI;wBAElC,IAAI,YAAYA,QAAQA,KAAKG,MAAM,KAAK,0BAA0B;4BAChEpC,OAAOK,MAAM,GAAG;wBAClB;oBACF;gBACF;YACF,EAAE,OAAOgC,GAAG;YACV,YAAY;YACd;QACF;IACF,EAAE,OAAOC,GAAG;QACVtC,OAAOI,OAAO,GAAG;QACjB,MAAMkC;IACR;IAEA,OAAOtC,OAAOG,OAAO;AACvB,EAAC"}

package/dist/utilities/headersWithCors.d.ts

@@ -0,0 +1,8 @@
+import type { PayloadRequestWithData } from 'payload/types';
+type CorsArgs = {
+    headers: Headers;
+    req: Partial<PayloadRequestWithData>;
+};
+export declare const headersWithCors: ({ headers, req }: CorsArgs) => Headers;
+export {};
+//# sourceMappingURL=headersWithCors.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"headersWithCors.d.ts","sourceRoot":"","sources":["../../src/utilities/headersWithCors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAE3D,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"}

package/dist/utilities/headersWithCors.js

@@ -0,0 +1,17 @@
+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);
+        }
+    }
+    return headers;
+};
+
+//# sourceMappingURL=headersWithCors.js.map

package/dist/utilities/headersWithCors.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/headersWithCors.ts"],"sourcesContent":["import type { PayloadRequestWithData } from 'payload/types'\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"}

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

@@ -1 +1 @@
-{"version":3,"file":"initPage.d.ts","sourceRoot":"","sources":["../../src/utilities/initPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAGd,eAAe,EAGhB,MAAM,eAAe,CAAA;AAatB,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CAAA;CAC/D,CAAA;AAED,eAAO,MAAM,QAAQ,iFAKlB,IAAI,KAAG,QAAQ,cAAc,CA+F/B,CAAA"}
+{"version":3,"file":"initPage.d.ts","sourceRoot":"","sources":["../../src/utilities/initPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAGd,eAAe,EAGhB,MAAM,eAAe,CAAA;AAatB,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CAAA;CAC/D,CAAA;AAYD,eAAO,MAAM,QAAQ,iFAKlB,IAAI,KAAG,QAAQ,cAAc,CAyG/B,CAAA"}

package/dist/utilities/initPage.js

@@ -7,6 +7,15 @@ import { createLocalReq, isEntityHidden } from 'payload/utilities';
 import qs from 'qs';
 import { getPayloadHMR } from '../utilities/getPayloadHMR.js';
 import { getRequestLanguage } from './getRequestLanguage.js';
+const authRoutes = [
+    '/login',
+    '/logout',
+    '/create-first-user',
+    '/forgot',
+    '/reset',
+    '/verify',
+    '/logout-inactivity'
+];
 export const initPage = async ({ config: configPromise, redirectUnauthenticatedUser = false, route, searchParams })=>{
     const headers = getHeaders();
     const localeParam = searchParams?.locale;
@@ -58,16 +67,21 @@ export const initPage = async ({ config: configPromise, redirectUnauthenticatedU
                 user
             }) ? slug : null).filter(Boolean)
     };
-    const routeSegments = route.replace(payload.config.routes.admin, '').split('/').filter(Boolean);
+    const { routes: { admin: adminRoute } } = payload.config;
+    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;
-    if (redirectUnauthenticatedUser && !user && route !== '/login') {
+    const isAuthRoute = authRoutes.some((r)=>r === route.replace(adminRoute, ''));
+    if (redirectUnauthenticatedUser && !user && !isAuthRoute) {
         if (searchParams && 'redirect' in searchParams) delete searchParams.redirect;
         const stringifiedSearchParams = Object.keys(searchParams ?? {}).length ? `?${qs.stringify(searchParams)}` : '';
         redirect(`${routes.admin}/login?redirect=${route + stringifiedSearchParams}`);
     }
+    if (!permissions.canAccessAdmin && !isAuthRoute) {
+        notFound();
+    }
     let collectionConfig;
     let globalConfig;
     if (collectionSlug) {

package/dist/utilities/initPage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/initPage.ts"],"sourcesContent":["import type {\n  InitPageResult,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n  VisibleEntities,\n} from 'payload/types'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { findLocaleFromCode } from '@payloadcms/ui/utilities/findLocaleFromCode'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound, redirect } from 'next/navigation.js'\nimport { parseCookies } from 'payload/auth'\nimport { createLocalReq, isEntityHidden } from 'payload/utilities'\nimport qs from 'qs'\n\nimport { getPayloadHMR } from '../utilities/getPayloadHMR.js'\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\ntype Args = {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  redirectUnauthenticatedUser?: boolean\n  route: string\n  searchParams: { [key: string]: string | string[] | undefined }\n}\n\nexport const initPage = async ({\n  config: configPromise,\n  redirectUnauthenticatedUser = false,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = getHeaders()\n  const localeParam = searchParams?.locale as string\n  const payload = await getPayloadHMR({ config: configPromise })\n  const { collections, globals, localization, routes } = payload.config\n\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n  const defaultLocale =\n    localization && localization.defaultLocale ? localization.defaultLocale : 'en'\n  const localeCode = localeParam || defaultLocale\n  const locale = localization && findLocaleFromCode(localization, localeCode)\n  const cookies = parseCookies(headers)\n  const language = getRequestLanguage({ config: payload.config, cookies, headers })\n\n  const i18n = await initI18n({\n    config: payload.config.i18n,\n    context: 'client',\n    language,\n  })\n\n  const req = await createLocalReq(\n    {\n      fallbackLocale: null,\n      locale: locale.code,\n      req: {\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 { permissions, user } = await payload.auth({ headers, req })\n\n  req.user = user\n\n  const visibleEntities: VisibleEntities = {\n    collections: payload.config.collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: payload.config.globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  const routeSegments = route.replace(payload.config.routes.admin, '').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  if (redirectUnauthenticatedUser && !user && route !== '/login') {\n    if (searchParams && 'redirect' in searchParams) delete searchParams.redirect\n\n    const stringifiedSearchParams = Object.keys(searchParams ?? {}).length\n      ? `?${qs.stringify(searchParams)}`\n      : ''\n\n    redirect(`${routes.admin}/login?redirect=${route + stringifiedSearchParams}`)\n  }\n\n  let collectionConfig: SanitizedCollectionConfig\n  let globalConfig: SanitizedGlobalConfig\n\n  if (collectionSlug) {\n    collectionConfig = collections.find((collection) => collection.slug === collectionSlug)\n\n    if (!collectionConfig) {\n      notFound()\n    }\n  }\n\n  if (globalSlug) {\n    globalConfig = globals.find((global) => global.slug === globalSlug)\n\n    if (!globalConfig) {\n      notFound()\n    }\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    locale,\n    permissions,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"names":["initI18n","findLocaleFromCode","headers","getHeaders","notFound","redirect","parseCookies","createLocalReq","isEntityHidden","qs","getPayloadHMR","getRequestLanguage","initPage","config","configPromise","redirectUnauthenticatedUser","route","searchParams","localeParam","locale","payload","collections","globals","localization","routes","queryString","stringify","addQueryPrefix","defaultLocale","localeCode","cookies","language","i18n","context","req","fallbackLocale","code","query","parse","depth","ignoreQueryPrefix","url","serverURL","permissions","user","auth","visibleEntities","map","slug","admin","hidden","filter","Boolean","routeSegments","replace","split","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","stringifiedSearchParams","Object","keys","length","collectionConfig","globalConfig","find","collection","global","translations"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/utilities/initPage.ts"],"sourcesContent":["import type {\n  InitPageResult,\n  PayloadRequestWithData,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n  VisibleEntities,\n} from 'payload/types'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { findLocaleFromCode } from '@payloadcms/ui/utilities/findLocaleFromCode'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound, redirect } from 'next/navigation.js'\nimport { parseCookies } from 'payload/auth'\nimport { createLocalReq, isEntityHidden } from 'payload/utilities'\nimport qs from 'qs'\n\nimport { getPayloadHMR } from '../utilities/getPayloadHMR.js'\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\ntype Args = {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  redirectUnauthenticatedUser?: boolean\n  route: string\n  searchParams: { [key: string]: string | string[] | undefined }\n}\n\nconst authRoutes = [\n  '/login',\n  '/logout',\n  '/create-first-user',\n  '/forgot',\n  '/reset',\n  '/verify',\n  '/logout-inactivity',\n]\n\nexport const initPage = async ({\n  config: configPromise,\n  redirectUnauthenticatedUser = false,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = getHeaders()\n  const localeParam = searchParams?.locale as string\n  const payload = await getPayloadHMR({ config: configPromise })\n  const { collections, globals, localization, routes } = payload.config\n\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n  const defaultLocale =\n    localization && localization.defaultLocale ? localization.defaultLocale : 'en'\n  const localeCode = localeParam || defaultLocale\n  const locale = localization && findLocaleFromCode(localization, localeCode)\n  const cookies = parseCookies(headers)\n  const language = getRequestLanguage({ config: payload.config, cookies, headers })\n\n  const i18n = await initI18n({\n    config: payload.config.i18n,\n    context: 'client',\n    language,\n  })\n\n  const req = await createLocalReq(\n    {\n      fallbackLocale: null,\n      locale: locale.code,\n      req: {\n        i18n,\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n        url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n      } as PayloadRequestWithData,\n    },\n    payload,\n  )\n\n  const { permissions, user } = await payload.auth({ headers, req })\n\n  req.user = user\n\n  const visibleEntities: VisibleEntities = {\n    collections: payload.config.collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: payload.config.globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  const {\n    routes: { admin: adminRoute },\n  } = payload.config\n\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  const isAuthRoute = authRoutes.some((r) => r === route.replace(adminRoute, ''))\n\n  if (redirectUnauthenticatedUser && !user && !isAuthRoute) {\n    if (searchParams && 'redirect' in searchParams) delete searchParams.redirect\n\n    const stringifiedSearchParams = Object.keys(searchParams ?? {}).length\n      ? `?${qs.stringify(searchParams)}`\n      : ''\n\n    redirect(`${routes.admin}/login?redirect=${route + stringifiedSearchParams}`)\n  }\n\n  if (!permissions.canAccessAdmin && !isAuthRoute) {\n    notFound()\n  }\n\n  let collectionConfig: SanitizedCollectionConfig\n  let globalConfig: SanitizedGlobalConfig\n\n  if (collectionSlug) {\n    collectionConfig = collections.find((collection) => collection.slug === collectionSlug)\n\n    if (!collectionConfig) {\n      notFound()\n    }\n  }\n\n  if (globalSlug) {\n    globalConfig = globals.find((global) => global.slug === globalSlug)\n\n    if (!globalConfig) {\n      notFound()\n    }\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    locale,\n    permissions,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"names":["initI18n","findLocaleFromCode","headers","getHeaders","notFound","redirect","parseCookies","createLocalReq","isEntityHidden","qs","getPayloadHMR","getRequestLanguage","authRoutes","initPage","config","configPromise","redirectUnauthenticatedUser","route","searchParams","localeParam","locale","payload","collections","globals","localization","routes","queryString","stringify","addQueryPrefix","defaultLocale","localeCode","cookies","language","i18n","context","req","fallbackLocale","code","query","parse","depth","ignoreQueryPrefix","url","serverURL","permissions","user","auth","visibleEntities","map","slug","admin","hidden","filter","Boolean","adminRoute","routeSegments","replace","split","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","isAuthRoute","some","r","stringifiedSearchParams","Object","keys","length","canAccessAdmin","collectionConfig","globalConfig","find","collection","global","translations"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/views/API/index.client.js

@@ -16,7 +16,7 @@ import { useSearchParams } from 'next/navigation.js';
 import qs from 'qs';
 import * as React from 'react';
 import { toast } from 'react-toastify';
-import { SetStepNav } from '../Edit/Default/SetStepNav/index.js';
+import { SetDocumentStepNav } from '../Edit/Default/SetDocumentStepNav/index.js';
 import { RenderJSON } from './RenderJSON/index.js';
 const baseClass = 'query-inspector';
 export const APIViewClient = ()=>{
@@ -93,7 +93,7 @@ export const APIViewClient = ()=>{
             fullscreen && `${baseClass}--fullscreen`
         ].filter(Boolean).join(' '),
         right: false
-    }, /*#__PURE__*/ React.createElement(SetStepNav, {
+    }, /*#__PURE__*/ React.createElement(SetDocumentStepNav, {
         collectionSlug: collectionSlug,
         globalLabel: globalConfig?.label,
         globalSlug: globalSlug,