@payloadcms/next 3.0.0-beta.9 → 3.0.0-beta.91

package/dist/utilities/addLocalesToRequest.js

@@ -0,0 +1,51 @@
+/**
+ * Mutates the Request to contain 'locale' and 'fallbackLocale' based on data or searchParams
+ */export function addLocalesToRequestFromData(req) {
+  const {
+    data,
+    payload: {
+      config
+    }
+  } = req;
+  if (data) {
+    let localeOnReq = req.locale;
+    let fallbackLocaleOnReq = req.fallbackLocale;
+    if (!localeOnReq && data?.locale && typeof data.locale === 'string') {
+      localeOnReq = data.locale;
+    }
+    if (!fallbackLocaleOnReq && data?.['fallback-locale'] && typeof data?.['fallback-locale'] === 'string') {
+      fallbackLocaleOnReq = data['fallback-locale'];
+    }
+    const {
+      fallbackLocale,
+      locale
+    } = sanitizeLocales({
+      fallbackLocale: fallbackLocaleOnReq,
+      locale: localeOnReq,
+      localization: config.localization
+    });
+    if (locale) req.locale = locale;
+    if (fallbackLocale) req.fallbackLocale = fallbackLocale;
+  }
+}
+export const sanitizeLocales = ({
+  fallbackLocale,
+  locale,
+  localization
+}) => {
+  if (['none', 'null'].includes(fallbackLocale)) {
+    fallbackLocale = 'null';
+  } else if (localization && !localization.localeCodes.includes(fallbackLocale)) {
+    fallbackLocale = localization.defaultLocale;
+  }
+  if (locale === '*') {
+    locale = 'all';
+  } else if (localization && !localization.localeCodes.includes(locale)) {
+    locale = localization.defaultLocale;
+  }
+  return {
+    fallbackLocale,
+    locale
+  };
+};
+//# sourceMappingURL=addLocalesToRequest.js.map

package/dist/utilities/addLocalesToRequest.js.map

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

package/dist/utilities/createPayloadRequest.d.ts

@@ -1,4 +1,4 @@
-import type { PayloadRequest, SanitizedConfig } from 'payload/types';
+import type { PayloadRequest, SanitizedConfig } from 'payload';
 type Args = {
     config: Promise<SanitizedConfig> | SanitizedConfig;
     params?: {

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,SAAS,CAAA;AAW9F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QACP,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oBAAoB,gDAI9B,IAAI,KAAG,OAAO,CAAC,cAAc,CA4F/B,CAAA"}

package/dist/utilities/createPayloadRequest.js

@@ -1,92 +1,95 @@
 import { initI18n } from '@payloadcms/translations';
-import { executeAuthStrategies } from 'payload/auth';
-import { parseCookies } from 'payload/auth';
-import { getDataLoader } from 'payload/utilities';
-import qs from 'qs';
+import { executeAuthStrategies, getDataLoader, parseCookies } from 'payload';
+import * as qs from 'qs-esm';
 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
+export const createPayloadRequest = async ({
+  config: configPromise,
+  params,
+  request
+}) => {
+  const cookies = parseCookies(request.headers);
+  const payload = await getPayloadHMR({
+    config: configPromise
+  });
+  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 language = getRequestLanguage({
+    config,
+    cookies,
+    headers: request.headers
+  });
+  const i18n = await initI18n({
+    config: config.i18n,
+    context: 'api',
+    language
+  });
+  let locale;
+  let fallbackLocale;
+  const overrideHttpMethod = request.headers.get('X-HTTP-Method-Override');
+  const queryToParse = overrideHttpMethod === 'GET' ? await request.text() : urlProperties.search;
+  const query = queryToParse ? qs.parse(queryToParse, {
+    arrayLimit: 1000,
+    depth: 10,
+    ignoreQueryPrefix: true
+  }) : {};
+  if (config.localization) {
+    const locales = sanitizeLocales({
+      fallbackLocale: searchParams.get('fallback-locale'),
+      locale: searchParams.get('locale'),
+      localization: payload.config.localization
     });
-    const { collections, config } = payload;
-    let collection = undefined;
-    if (params?.collection && collections?.[params.collection]) {
-        collection = collections[params.collection];
-    }
-    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,
-        headers: request.headers
-    });
-    const i18n = await initI18n({
-        config: config.i18n,
-        context: 'api',
-        language
-    });
-    const customRequest = {
-        context: {},
-        data,
-        fallbackLocale: requestFallbackLocale,
-        file,
-        hash: urlProperties.hash,
-        host: urlProperties.host,
-        href: urlProperties.href,
-        i18n,
-        locale: requestLocale,
-        origin: urlProperties.origin,
-        pathname: urlProperties.pathname,
-        payload,
-        payloadAPI: isGraphQL ? 'GraphQL' : 'REST',
-        payloadDataLoader: undefined,
-        payloadUploadSizes: {},
-        port: urlProperties.port,
-        protocol: urlProperties.protocol,
-        query: urlProperties.search ? qs.parse(urlProperties.search, {
-            arrayLimit: 1000,
-            depth: 10,
-            ignoreQueryPrefix: true
-        }) : {},
-        routeParams: params || {},
-        search: urlProperties.search,
-        searchParams: urlProperties.searchParams,
-        t: i18n.t,
-        transactionID: undefined,
-        user: null
-    };
-    const req = Object.assign(request, customRequest);
-    if (data) req.json = ()=>Promise.resolve(data);
-    req.payloadDataLoader = getDataLoader(req);
-    req.user = await executeAuthStrategies({
-        cookies,
-        headers: req.headers,
-        isGraphQL,
-        payload
-    });
-    return req;
+    locale = locales.locale;
+    fallbackLocale = locales.fallbackLocale;
+    // Override if query params are present, in order to respect HTTP method override
+    if (query.locale) locale = query.locale;
+    if (query?.['fallback-locale']) fallbackLocale = query['fallback-locale'];
+  }
+  const customRequest = {
+    context: {},
+    fallbackLocale,
+    hash: urlProperties.hash,
+    host: urlProperties.host,
+    href: urlProperties.href,
+    i18n,
+    locale,
+    origin: urlProperties.origin,
+    pathname: urlProperties.pathname,
+    payload,
+    payloadAPI: isGraphQL ? 'GraphQL' : 'REST',
+    payloadDataLoader: undefined,
+    payloadUploadSizes: {},
+    port: urlProperties.port,
+    protocol: urlProperties.protocol,
+    query,
+    routeParams: params || {},
+    search: urlProperties.search,
+    searchParams: urlProperties.searchParams,
+    t: i18n.t,
+    transactionID: undefined,
+    user: null
+  };
+  const req = Object.assign(request, customRequest);
+  req.payloadDataLoader = getDataLoader(req);
+  const {
+    responseHeaders,
+    user
+  } = await executeAuthStrategies({
+    headers: req.headers,
+    isGraphQL,
+    payload
+  });
+  req.user = user;
+  if (responseHeaders) req.responseHeaders = responseHeaders;
+  return req;
 };
-
 //# sourceMappingURL=createPayloadRequest.js.map

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

package/dist/utilities/getNextRequestI18n.d.ts

@@ -1,11 +1,11 @@
-import type { I18n } from '@payloadcms/translations';
-import type { SanitizedConfig } from 'payload/types';
+import type { ClientTranslationsObject, I18nClient } from '@payloadcms/translations';
+import type { SanitizedConfig } from 'payload';
 /**
- * In the context of NextJS, this function initializes the i18n object for the current request.
+ * In the context of Next.js, this function initializes the i18n object for the current request.
  *
  * It must be called on the server side, and within the lifecycle of a request since it relies on the request headers and cookies.
  */
-export declare const getNextRequestI18n: ({ config }: {
+export declare const getNextRequestI18n: <TAdditionalTranslations = {}, TAdditionalClientTranslationKeys extends string = never>({ config, }: {
     config: SanitizedConfig;
-}) => Promise<I18n>;
+}) => Promise<[TAdditionalClientTranslationKeys] extends [never] ? I18nClient : TAdditionalTranslations extends object ? I18nClient<TAdditionalTranslations, TAdditionalClientTranslationKeys> : I18nClient<ClientTranslationsObject, TAdditionalClientTranslationKeys>>;
 //# sourceMappingURL=getNextRequestI18n.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getNextRequestI18n.d.ts","sourceRoot":"","sources":["../../src/utilities/getNextRequestI18n.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAOpD;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,eAAsB;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,KAAG,QAAQ,IAAI,CAK3F,CAAA"}
+{"version":3,"file":"getNextRequestI18n.d.ts","sourceRoot":"","sources":["../../src/utilities/getNextRequestI18n.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EAIxB,UAAU,EACX,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,uBAAuB,OACvB,gCAAgC,SAAS,MAAM,uBAG9C;IACD,MAAM,EAAE,eAAe,CAAA;CACxB,KAAG,OAAO,CACT,CAAC,gCAAgC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC9C,UAAU,GACV,uBAAuB,SAAS,MAAM,GACpC,UAAU,CAAC,uBAAuB,EAAE,gCAAgC,CAAC,GACrE,UAAU,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAO7E,CAAA"}

package/dist/utilities/getNextRequestI18n.js

@@ -2,17 +2,21 @@ import { initI18n } from '@payloadcms/translations';
 import { cookies, headers } from 'next/headers.js';
 import { getRequestLanguage } from './getRequestLanguage.js';
 /**
- * In the context of NextJS, this function initializes the i18n object for the current request.
+ * In the context of Next.js, this function initializes the i18n object for the current request.
  *
  * It must be called on the server side, and within the lifecycle of a request since it relies on the request headers and cookies.
- */ export const getNextRequestI18n = async ({ config })=>initI18n({
-        config: config.i18n,
-        context: 'client',
-        language: getRequestLanguage({
-            config,
-            cookies: cookies(),
-            headers: headers()
-        })
-    });
-
+ */
+export const getNextRequestI18n = async ({
+  config
+}) => {
+  return await initI18n({
+    config: config.i18n,
+    context: 'client',
+    language: getRequestLanguage({
+      config,
+      cookies: cookies(),
+      headers: headers()
+    })
+  });
+};
 //# sourceMappingURL=getNextRequestI18n.js.map

package/dist/utilities/getNextRequestI18n.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getNextRequestI18n.ts"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { SanitizedConfig } from 'payload/types'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { cookies, headers } from 'next/headers.js'\n\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\n/**\n * In the context of NextJS, this function initializes the i18n object for the current request.\n *\n * It must be called on the server side, and within the lifecycle of a request since it relies on the request headers and cookies.\n */\nexport const getNextRequestI18n = async ({ config }: { config: SanitizedConfig }): Promise<I18n> =>\n  initI18n({\n    config: config.i18n,\n    context: 'client',\n    language: getRequestLanguage({ config, cookies: cookies(), headers: headers() }),\n  })\n"],"names":["initI18n","cookies","headers","getRequestLanguage","getNextRequestI18n","config","i18n","context","language"],"rangeMappings":";;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,OAAO,EAAEC,OAAO,QAAQ,kBAAiB;AAElD,SAASC,kBAAkB,QAAQ,0BAAyB;AAE5D;;;;CAIC,GACD,OAAO,MAAMC,qBAAqB,OAAO,EAAEC,MAAM,EAA+B,GAC9EL,SAAS;QACPK,QAAQA,OAAOC,IAAI;QACnBC,SAAS;QACTC,UAAUL,mBAAmB;YAAEE;YAAQJ,SAASA;YAAWC,SAASA;QAAU;IAChF,GAAE"}
+{"version":3,"file":"getNextRequestI18n.js","names":["initI18n","cookies","headers","getRequestLanguage","getNextRequestI18n","config","i18n","context","language"],"sources":["../../src/utilities/getNextRequestI18n.ts"],"sourcesContent":["import type {\n  ClientTranslationsObject,\n  DefaultTranslationKeys,\n  DefaultTranslationsObject,\n  I18n,\n  I18nClient,\n} from '@payloadcms/translations'\nimport type { SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { cookies, headers } from 'next/headers.js'\n\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\n/**\n * In the context of Next.js, this function initializes the i18n object for the current request.\n *\n * It must be called on the server side, and within the lifecycle of a request since it relies on the request headers and cookies.\n */\nexport const getNextRequestI18n = async <\n  TAdditionalTranslations = {},\n  TAdditionalClientTranslationKeys extends string = never,\n>({\n  config,\n}: {\n  config: SanitizedConfig\n}): Promise<\n  [TAdditionalClientTranslationKeys] extends [never]\n    ? I18nClient\n    : TAdditionalTranslations extends object\n      ? I18nClient<TAdditionalTranslations, TAdditionalClientTranslationKeys>\n      : I18nClient<ClientTranslationsObject, TAdditionalClientTranslationKeys>\n> => {\n  return (await initI18n({\n    config: config.i18n,\n    context: 'client',\n    language: getRequestLanguage({ config, cookies: cookies(), headers: headers() }),\n  })) as any\n}\n"],"mappings":"AASA,SAASA,QAAQ,QAAQ;AACzB,SAASC,OAAO,EAAEC,OAAO,QAAQ;AAEjC,SAASC,kBAAkB,QAAQ;AAEnC;;;;;AAKA,OAAO,MAAMC,kBAAA,GAAqB,MAAAA,CAGhC;EACAC;AAAM,CAGP;EAOC,OAAQ,MAAML,QAAA,CAAS;IACrBK,MAAA,EAAQA,MAAA,CAAOC,IAAI;IACnBC,OAAA,EAAS;IACTC,QAAA,EAAUL,kBAAA,CAAmB;MAAEE,MAAA;MAAQJ,OAAA,EAASA,OAAA;MAAWC,OAAA,EAASA,OAAA;IAAU;EAChF;AACF","ignoreList":[]}

package/dist/utilities/getPayloadHMR.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"getPayloadHMR.d.ts","sourceRoot":"","sources":["../../src/utilities/getPayloadHMR.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,OAAO,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAgBjD,eAAO,MAAM,aAAa,YAAmB,WAAW,KAAG,QAAQ,OAAO,CAgFzE,CAAA"}
+{"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"}

package/dist/utilities/getPayloadHMR.js

@@ -1,76 +1,105 @@
-import { BasePayload } from 'payload';
+import { BasePayload, generateImportMap } from 'payload';
 import WebSocket from 'ws';
 let cached = global._payload;
 if (!cached) {
-    // eslint-disable-next-line no-multi-assign
-    cached = global._payload = {
-        payload: null,
-        promise: null,
-        reload: false
-    };
+  cached = global._payload = {
+    payload: null,
+    promise: null,
+    reload: false,
+    ws: null
+  };
 }
-export const getPayloadHMR = async (options)=>{
-    if (!options?.config) {
-        throw new Error('Error: the payload config is required for getPayload to work.');
+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
+    });
+  }
+};
+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.payload) {
-        const config = await options.config // TODO: check if we can move this inside the cached.reload === true condition
-        ;
-        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,
-                    customIDType: cached.payload.collections[collection.slug]?.customIDType
-                };
-                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
-            });
-            resolve();
-        }
-        if (cached.reload instanceof Promise) {
-            await cached.reload;
-        }
-        return cached.payload;
+    if (cached.reload instanceof Promise) {
+      await cached.reload;
     }
-    if (!cached.promise) {
-        cached.promise = new BasePayload().init(options);
+    if (options?.importMap) {
+      cached.payload.importMap = options.importMap;
     }
-    try {
-        cached.payload = await cached.promise;
-        if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' && process.env.DISABLE_PAYLOAD_HMR !== 'true') {
-            try {
-                const port = process.env.PORT || '3000';
-                const ws = new WebSocket(`ws://localhost:${port}/_next/webpack-hmr`);
-                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
+    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 (e) {
-        cached.promise = null;
-        throw e;
+          }
+        };
+      } catch (_) {
+        // swallow e
+      }
     }
-    return cached.payload;
+  } catch (e) {
+    cached.promise = null;
+    throw e;
+  }
+  if (options?.importMap) {
+    cached.payload.importMap = options.importMap;
+  }
+  return cached.payload;
 };
-
 //# sourceMappingURL=getPayloadHMR.js.map

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] = {\n          config: collection,\n          customIDType: cached.payload.collections[collection.slug]?.customIDType,\n        }\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","customIDType","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;oBAC7BV,QAAQS;oBACRE,cAAcnB,OAAOG,OAAO,CAACY,WAAW,CAACE,WAAWC,IAAI,CAAC,EAAEC;gBAC7D;gBACA,OAAOJ;YACT,GAAG,CAAC;YAEJf,OAAOG,OAAO,CAACiB,OAAO,GAAG;gBACvBZ,QAAQA,OAAOY,OAAO;YACxB;YAEA,qHAAqH;YAErH,MAAMpB,OAAOG,OAAO,CAACU,EAAE,CAACQ,IAAI;YAC5B,MAAMrB,OAAOG,OAAO,CAACU,EAAE,CAACS,OAAO,CAAC;gBAAEC,WAAW;YAAK;YAClDb;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,cAA8BuB,IAAI,CAACd;IAC1D;IAEA,IAAI;QACFP,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"}
+{"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: Payload | null\n  promise: Promise<Payload> | null\n  reload: Promise<void> | boolean\n  ws: WebSocket | null\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":[]}