@payloadcms/next 3.0.0-canary.ce278e4 → 3.0.0-canary.cf66341

package/dist/templates/Default/Wrapper/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/templates/Default/Wrapper/index.tsx"],"sourcesContent":["'use client'\nimport { useNav } from '@payloadcms/ui/client'\nimport React from 'react'\n\nimport './index.scss'\n\nexport const Wrapper: React.FC<{\n  baseClass?: string\n  children?: React.ReactNode\n  className?: string\n}> = (props) => {\n  const { baseClass, children, className } = props\n  const { navOpen } = useNav()\n\n  return (\n    <div\n      className={[baseClass, className, navOpen && `${baseClass}--nav-open`]\n        .filter(Boolean)\n        .join(' ')}\n    >\n      {children}\n    </div>\n  )\n}\n"],"names":["useNav","React","Wrapper","props","baseClass","children","className","navOpen","div","filter","Boolean","join"],"rangeMappings":";;;;;;;;;;;;;;;","mappings":"AAAA;;AACA,SAASA,MAAM,QAAQ,wBAAuB;AAC9C,OAAOC,WAAW,QAAO;AAIzB,OAAO,MAAMC,UAIR,CAACC;IACJ,MAAM,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,SAAS,EAAE,GAAGH;IAC3C,MAAM,EAAEI,OAAO,EAAE,GAAGP;IAEpB,qBACE,KAACQ;QACCF,WAAW;YAACF;YAAWE;YAAWC,WAAW,CAAC,EAAEH,UAAU,UAAU,CAAC;SAAC,CACnEK,MAAM,CAACC,SACPC,IAAI,CAAC;kBAEPN;;AAGP,EAAC"}
+{"version":3,"sources":["../../../../src/templates/Default/Wrapper/index.tsx"],"sourcesContent":["'use client'\nimport { useNav } from '@payloadcms/ui'\nimport React from 'react'\n\nimport './index.scss'\n\nexport const Wrapper: React.FC<{\n  baseClass?: string\n  children?: React.ReactNode\n  className?: string\n}> = (props) => {\n  const { baseClass, children, className } = props\n  const { hydrated, navOpen, shouldAnimate } = useNav()\n\n  return (\n    <div\n      className={[\n        baseClass,\n        className,\n        navOpen && `${baseClass}--nav-open`,\n        shouldAnimate && `${baseClass}--nav-animate`,\n        hydrated && `${baseClass}--nav-hydrated`,\n      ]\n        .filter(Boolean)\n        .join(' ')}\n    >\n      {children}\n    </div>\n  )\n}\n"],"names":["useNav","React","Wrapper","props","baseClass","children","className","hydrated","navOpen","shouldAnimate","div","filter","Boolean","join"],"mappings":"AAAA;;AACA,SAASA,MAAM,QAAQ,iBAAgB;AACvC,OAAOC,WAAW,QAAO;AAIzB,OAAO,MAAMC,UAIR,CAACC;IACJ,MAAM,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,SAAS,EAAE,GAAGH;IAC3C,MAAM,EAAEI,QAAQ,EAAEC,OAAO,EAAEC,aAAa,EAAE,GAAGT;IAE7C,qBACE,KAACU;QACCJ,WAAW;YACTF;YACAE;YACAE,WAAW,CAAC,EAAEJ,UAAU,UAAU,CAAC;YACnCK,iBAAiB,CAAC,EAAEL,UAAU,aAAa,CAAC;YAC5CG,YAAY,CAAC,EAAEH,UAAU,cAAc,CAAC;SACzC,CACEO,MAAM,CAACC,SACPC,IAAI,CAAC;kBAEPR;;AAGP,EAAC"}

package/dist/templates/Default/Wrapper/index.scss

@@ -4,17 +4,17 @@
   min-height: 100vh;
   display: grid;
   position: relative;
-  grid-template-columns: 0 auto;
-  transition: grid-template-columns var(--nav-trans-time) linear;
   isolation: isolate;
 
   @media (prefers-reduced-motion) {
     transition: none;
   }
 
+  &--nav-animate {
+    transition: grid-template-columns var(--nav-trans-time) linear;
+  }
+
   &--nav-open {
-    width: 100%;
-    grid-template-columns: var(--nav-width) auto;
 
     .template-default {
       &__nav-overlay {
@@ -23,3 +23,35 @@
     }
   }
 }
+
+@media (min-width: 1441px) {
+  .template-default {
+    grid-template-columns: 0 auto;
+
+    &--nav-open {
+      grid-template-columns: var(--nav-width) auto;
+    }
+  }
+}
+
+@media (max-width: 1440px) {
+  .template-default--nav-hydrated.template-default--nav-open {
+    grid-template-columns: var(--nav-width) auto;
+  }
+
+  .template-default {
+    grid-template-columns: 1fr auto;
+
+    .nav {
+      display: none;
+    }
+
+    &--nav-hydrated {
+      grid-template-columns: 0 auto;
+
+      .nav {
+        display: unset;
+      }
+    }
+  }
+}

package/dist/templates/Default/index.d.ts

@@ -1,10 +1,10 @@
 import type { ServerProps, VisibleEntities } from 'payload';
 import React from 'react';
 import './index.scss';
-export type DefaultTemplateProps = ServerProps & {
+export type DefaultTemplateProps = {
     children?: React.ReactNode;
     className?: string;
     visibleEntities: VisibleEntities;
-};
+} & ServerProps;
 export declare const DefaultTemplate: React.FC<DefaultTemplateProps>;
 //# sourceMappingURL=index.d.ts.map

package/dist/templates/Default/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/Default/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI3D,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,cAAc,CAAA;AAIrB,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG;IAC/C,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,eAAe,CAAA;CACjC,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA6D1D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/Default/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI5E,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,cAAc,CAAA;AAIrB,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,eAAe,CAAA;CACjC,GAAG,WAAW,CAAA;AAEf,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA2D1D,CAAA"}

package/dist/templates/Default/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { AppHeader, EntityVisibilityProvider, NavToggler } from '@payloadcms/ui/client';
-import { RenderCustomComponent } from '@payloadcms/ui/shared';
+import { AppHeader, EntityVisibilityProvider, NavToggler } from '@payloadcms/ui';
+import { RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared';
 import React from 'react';
 import { DefaultNav } from '../../elements/Nav/index.js';
 import { NavHamburger } from './NavHamburger/index.js';
@@ -10,15 +10,19 @@ export const DefaultTemplate = ({ children, className, i18n, locale, params, pay
     const { admin: { components: { Nav: CustomNav } = {
         Nav: undefined
     } } = {} } = payload.config || {};
-    const navProps = {
-        i18n,
-        locale,
-        params,
-        payload,
-        permissions,
-        searchParams,
-        user
-    };
+    const createMappedComponent = getCreateMappedComponent({
+        importMap: payload.importMap,
+        serverProps: {
+            i18n,
+            locale,
+            params,
+            payload,
+            permissions,
+            searchParams,
+            user
+        }
+    });
+    const MappedDefaultNav = createMappedComponent(CustomNav, undefined, DefaultNav, 'CustomNav');
     return /*#__PURE__*/ _jsx(EntityVisibilityProvider, {
         visibleEntities: visibleEntities,
         children: /*#__PURE__*/ _jsxs("div", {
@@ -35,19 +39,8 @@ export const DefaultTemplate = ({ children, className, i18n, locale, params, pay
                     baseClass: baseClass,
                     className: className,
                     children: [
-                        /*#__PURE__*/ _jsx(RenderCustomComponent, {
-                            CustomComponent: CustomNav,
-                            DefaultComponent: DefaultNav,
-                            componentProps: navProps,
-                            serverOnlyProps: {
-                                i18n,
-                                locale,
-                                params,
-                                payload,
-                                permissions,
-                                searchParams,
-                                user
-                            }
+                        /*#__PURE__*/ _jsx(RenderComponent, {
+                            mappedComponent: MappedDefaultNav
                         }),
                         /*#__PURE__*/ _jsxs("div", {
                             className: `${baseClass}__wrap`,

package/dist/templates/Default/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/templates/Default/index.tsx"],"sourcesContent":["import type { ServerProps, VisibleEntities } from 'payload'\n\nimport { AppHeader, EntityVisibilityProvider, NavToggler } from '@payloadcms/ui/client'\nimport { RenderCustomComponent } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nimport { DefaultNav, type NavProps } from '../../elements/Nav/index.js'\nimport { NavHamburger } from './NavHamburger/index.js'\nimport { Wrapper } from './Wrapper/index.js'\nimport './index.scss'\n\nconst baseClass = 'template-default'\n\nexport type DefaultTemplateProps = ServerProps & {\n  children?: React.ReactNode\n  className?: string\n  visibleEntities: VisibleEntities\n}\n\nexport const DefaultTemplate: React.FC<DefaultTemplateProps> = ({\n  children,\n  className,\n  i18n,\n  locale,\n  params,\n  payload,\n  permissions,\n  searchParams,\n  user,\n  visibleEntities,\n}) => {\n  const {\n    admin: {\n      components: { Nav: CustomNav } = {\n        Nav: undefined,\n      },\n    } = {},\n  } = payload.config || {}\n\n  const navProps: NavProps = {\n    i18n,\n    locale,\n    params,\n    payload,\n    permissions,\n    searchParams,\n    user,\n  }\n\n  return (\n    <EntityVisibilityProvider visibleEntities={visibleEntities}>\n      <div>\n        <div className={`${baseClass}__nav-toggler-wrapper`} id=\"nav-toggler\">\n          <NavToggler className={`${baseClass}__nav-toggler`}>\n            <NavHamburger />\n          </NavToggler>\n        </div>\n        <Wrapper baseClass={baseClass} className={className}>\n          <RenderCustomComponent\n            CustomComponent={CustomNav}\n            DefaultComponent={DefaultNav}\n            componentProps={navProps}\n            serverOnlyProps={{\n              i18n,\n              locale,\n              params,\n              payload,\n              permissions,\n              searchParams,\n              user,\n            }}\n          />\n          <div className={`${baseClass}__wrap`}>\n            <AppHeader />\n            {children}\n          </div>\n        </Wrapper>\n      </div>\n    </EntityVisibilityProvider>\n  )\n}\n"],"names":["AppHeader","EntityVisibilityProvider","NavToggler","RenderCustomComponent","React","DefaultNav","NavHamburger","Wrapper","baseClass","DefaultTemplate","children","className","i18n","locale","params","payload","permissions","searchParams","user","visibleEntities","admin","components","Nav","CustomNav","undefined","config","navProps","div","id","CustomComponent","DefaultComponent","componentProps","serverOnlyProps"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAEA,SAASA,SAAS,EAAEC,wBAAwB,EAAEC,UAAU,QAAQ,wBAAuB;AACvF,SAASC,qBAAqB,QAAQ,wBAAuB;AAC7D,OAAOC,WAAW,QAAO;AAEzB,SAASC,UAAU,QAAuB,8BAA6B;AACvE,SAASC,YAAY,QAAQ,0BAAyB;AACtD,SAASC,OAAO,QAAQ,qBAAoB;AAG5C,MAAMC,YAAY;AAQlB,OAAO,MAAMC,kBAAkD,CAAC,EAC9DC,QAAQ,EACRC,SAAS,EACTC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,OAAO,EACPC,WAAW,EACXC,YAAY,EACZC,IAAI,EACJC,eAAe,EAChB;IACC,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,KAAKC,SAAS,EAAE,GAAG;QAC/BD,KAAKE;IACP,CAAC,EACF,GAAG,CAAC,CAAC,EACP,GAAGT,QAAQU,MAAM,IAAI,CAAC;IAEvB,MAAMC,WAAqB;QACzBd;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;IACF;IAEA,qBACE,KAACjB;QAAyBkB,iBAAiBA;kBACzC,cAAA,MAACQ;;8BACC,KAACA;oBAAIhB,WAAW,CAAC,EAAEH,UAAU,qBAAqB,CAAC;oBAAEoB,IAAG;8BACtD,cAAA,KAAC1B;wBAAWS,WAAW,CAAC,EAAEH,UAAU,aAAa,CAAC;kCAChD,cAAA,KAACF;;;8BAGL,MAACC;oBAAQC,WAAWA;oBAAWG,WAAWA;;sCACxC,KAACR;4BACC0B,iBAAiBN;4BACjBO,kBAAkBzB;4BAClB0B,gBAAgBL;4BAChBM,iBAAiB;gCACfpB;gCACAC;gCACAC;gCACAC;gCACAC;gCACAC;gCACAC;4BACF;;sCAEF,MAACS;4BAAIhB,WAAW,CAAC,EAAEH,UAAU,MAAM,CAAC;;8CAClC,KAACR;gCACAU;;;;;;;;AAMb,EAAC"}
+{"version":3,"sources":["../../../src/templates/Default/index.tsx"],"sourcesContent":["import type { MappedComponent, ServerProps, VisibleEntities } from 'payload'\n\nimport { AppHeader, EntityVisibilityProvider, NavToggler } from '@payloadcms/ui'\nimport { RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nimport { DefaultNav } from '../../elements/Nav/index.js'\nimport { NavHamburger } from './NavHamburger/index.js'\nimport { Wrapper } from './Wrapper/index.js'\nimport './index.scss'\n\nconst baseClass = 'template-default'\n\nexport type DefaultTemplateProps = {\n  children?: React.ReactNode\n  className?: string\n  visibleEntities: VisibleEntities\n} & ServerProps\n\nexport const DefaultTemplate: React.FC<DefaultTemplateProps> = ({\n  children,\n  className,\n  i18n,\n  locale,\n  params,\n  payload,\n  permissions,\n  searchParams,\n  user,\n  visibleEntities,\n}) => {\n  const {\n    admin: {\n      components: { Nav: CustomNav } = {\n        Nav: undefined,\n      },\n    } = {},\n  } = payload.config || {}\n\n  const createMappedComponent = getCreateMappedComponent({\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  const MappedDefaultNav: MappedComponent = createMappedComponent(\n    CustomNav,\n    undefined,\n    DefaultNav,\n    'CustomNav',\n  )\n\n  return (\n    <EntityVisibilityProvider visibleEntities={visibleEntities}>\n      <div>\n        <div className={`${baseClass}__nav-toggler-wrapper`} id=\"nav-toggler\">\n          <NavToggler className={`${baseClass}__nav-toggler`}>\n            <NavHamburger />\n          </NavToggler>\n        </div>\n        <Wrapper baseClass={baseClass} className={className}>\n          <RenderComponent mappedComponent={MappedDefaultNav} />\n\n          <div className={`${baseClass}__wrap`}>\n            <AppHeader />\n            {children}\n          </div>\n        </Wrapper>\n      </div>\n    </EntityVisibilityProvider>\n  )\n}\n"],"names":["AppHeader","EntityVisibilityProvider","NavToggler","RenderComponent","getCreateMappedComponent","React","DefaultNav","NavHamburger","Wrapper","baseClass","DefaultTemplate","children","className","i18n","locale","params","payload","permissions","searchParams","user","visibleEntities","admin","components","Nav","CustomNav","undefined","config","createMappedComponent","importMap","serverProps","MappedDefaultNav","div","id","mappedComponent"],"mappings":";AAEA,SAASA,SAAS,EAAEC,wBAAwB,EAAEC,UAAU,QAAQ,iBAAgB;AAChF,SAASC,eAAe,EAAEC,wBAAwB,QAAQ,wBAAuB;AACjF,OAAOC,WAAW,QAAO;AAEzB,SAASC,UAAU,QAAQ,8BAA6B;AACxD,SAASC,YAAY,QAAQ,0BAAyB;AACtD,SAASC,OAAO,QAAQ,qBAAoB;AAG5C,MAAMC,YAAY;AAQlB,OAAO,MAAMC,kBAAkD,CAAC,EAC9DC,QAAQ,EACRC,SAAS,EACTC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,OAAO,EACPC,WAAW,EACXC,YAAY,EACZC,IAAI,EACJC,eAAe,EAChB;IACC,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,KAAKC,SAAS,EAAE,GAAG;QAC/BD,KAAKE;IACP,CAAC,EACF,GAAG,CAAC,CAAC,EACP,GAAGT,QAAQU,MAAM,IAAI,CAAC;IAEvB,MAAMC,wBAAwBvB,yBAAyB;QACrDwB,WAAWZ,QAAQY,SAAS;QAC5BC,aAAa;YACXhB;YACAC;YACAC;YACAC;YACAC;YACAC;YACAC;QACF;IACF;IAEA,MAAMW,mBAAoCH,sBACxCH,WACAC,WACAnB,YACA;IAGF,qBACE,KAACL;QAAyBmB,iBAAiBA;kBACzC,cAAA,MAACW;;8BACC,KAACA;oBAAInB,WAAW,CAAC,EAAEH,UAAU,qBAAqB,CAAC;oBAAEuB,IAAG;8BACtD,cAAA,KAAC9B;wBAAWU,WAAW,CAAC,EAAEH,UAAU,aAAa,CAAC;kCAChD,cAAA,KAACF;;;8BAGL,MAACC;oBAAQC,WAAWA;oBAAWG,WAAWA;;sCACxC,KAACT;4BAAgB8B,iBAAiBH;;sCAElC,MAACC;4BAAInB,WAAW,CAAC,EAAEH,UAAU,MAAM,CAAC;;8CAClC,KAACT;gCACAW;;;;;;;;AAMb,EAAC"}

package/dist/templates/Minimal/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/templates/Minimal/index.tsx"],"sourcesContent":["import React from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'template-minimal'\n\nexport type MinimalTemplateProps = {\n  children?: React.ReactNode\n  className?: string\n  style?: React.CSSProperties\n  width?: 'normal' | 'wide'\n}\n\nexport const MinimalTemplate: React.FC<MinimalTemplateProps> = (props) => {\n  const { children, className, style = {}, width = 'normal' } = props\n\n  const classes = [className, baseClass, `${baseClass}--width-${width}`].filter(Boolean).join(' ')\n\n  return (\n    <section className={classes} style={style}>\n      <div className={`${baseClass}__wrap`}>{children}</div>\n    </section>\n  )\n}\n"],"names":["React","baseClass","MinimalTemplate","props","children","className","style","width","classes","filter","Boolean","join","section","div"],"rangeMappings":";;;;;;;;;;;;;;;;;;","mappings":";AAAA,OAAOA,WAAW,QAAO;AAIzB,MAAMC,YAAY;AASlB,OAAO,MAAMC,kBAAkD,CAACC;IAC9D,MAAM,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,QAAQ,CAAC,CAAC,EAAEC,QAAQ,QAAQ,EAAE,GAAGJ;IAE9D,MAAMK,UAAU;QAACH;QAAWJ;QAAW,CAAC,EAAEA,UAAU,QAAQ,EAAEM,MAAM,CAAC;KAAC,CAACE,MAAM,CAACC,SAASC,IAAI,CAAC;IAE5F,qBACE,KAACC;QAAQP,WAAWG;QAASF,OAAOA;kBAClC,cAAA,KAACO;YAAIR,WAAW,CAAC,EAAEJ,UAAU,MAAM,CAAC;sBAAGG;;;AAG7C,EAAC"}
+{"version":3,"sources":["../../../src/templates/Minimal/index.tsx"],"sourcesContent":["import React from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'template-minimal'\n\nexport type MinimalTemplateProps = {\n  children?: React.ReactNode\n  className?: string\n  style?: React.CSSProperties\n  width?: 'normal' | 'wide'\n}\n\nexport const MinimalTemplate: React.FC<MinimalTemplateProps> = (props) => {\n  const { children, className, style = {}, width = 'normal' } = props\n\n  const classes = [className, baseClass, `${baseClass}--width-${width}`].filter(Boolean).join(' ')\n\n  return (\n    <section className={classes} style={style}>\n      <div className={`${baseClass}__wrap`}>{children}</div>\n    </section>\n  )\n}\n"],"names":["React","baseClass","MinimalTemplate","props","children","className","style","width","classes","filter","Boolean","join","section","div"],"mappings":";AAAA,OAAOA,WAAW,QAAO;AAIzB,MAAMC,YAAY;AASlB,OAAO,MAAMC,kBAAkD,CAACC;IAC9D,MAAM,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,QAAQ,CAAC,CAAC,EAAEC,QAAQ,QAAQ,EAAE,GAAGJ;IAE9D,MAAMK,UAAU;QAACH;QAAWJ;QAAW,CAAC,EAAEA,UAAU,QAAQ,EAAEM,MAAM,CAAC;KAAC,CAACE,MAAM,CAACC,SAASC,IAAI,CAAC;IAE5F,qBACE,KAACC;QAAQP,WAAWG;QAASF,OAAOA;kBAClC,cAAA,KAACO;YAAIR,WAAW,CAAC,EAAEJ,UAAU,MAAM,CAAC;sBAAGG;;;AAG7C,EAAC"}

package/dist/utilities/addDataAndFileToRequest.d.ts

@@ -1,10 +1,7 @@
-import type { PayloadRequest, PayloadRequestData } from 'payload';
-type ReturnType = PayloadRequest & PayloadRequestData;
-type AddDataAndFileToRequest = (args: {
-    request: PayloadRequest;
-}) => Promise<ReturnType>;
+import type { PayloadRequest } from 'payload';
+type AddDataAndFileToRequest = (req: PayloadRequest) => Promise<void>;
 /**
- * Mutates the Request to contain 'data' and 'file' if present
+ * Mutates the Request, appending 'data' and 'file' if found
  */
 export declare const addDataAndFileToRequest: AddDataAndFileToRequest;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"addDataAndFileToRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/addDataAndFileToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAQjE,KAAK,UAAU,GAAG,cAAc,GAAG,kBAAkB,CAAA;AACrD,KAAK,uBAAuB,GAAG,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,cAAc,CAAA;CAAE,KAAK,OAAO,CAAC,UAAU,CAAC,CAAA;AAEzF;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,uBA+CrC,CAAA"}
+{"version":3,"file":"addDataAndFileToRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/addDataAndFileToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAQ7C,KAAK,uBAAuB,GAAG,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAErE;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,uBAoCrC,CAAA"}

package/dist/utilities/addDataAndFileToRequest.js

@@ -1,45 +1,42 @@
 import { APIError } from 'payload';
 import { fetchAPIFileUpload } from '../fetchAPI-multipart/index.js';
 /**
- * Mutates the Request to contain 'data' and 'file' if present
- */ export const addDataAndFileToRequest = async ({ request: incomingRequest })=>{
-    const config = incomingRequest.payload.config;
-    if (incomingRequest.method && [
+ * Mutates the Request, appending 'data' and 'file' if found
+ */ export const addDataAndFileToRequest = async (req)=>{
+    const { body, headers, method, payload } = req;
+    if (method && [
         'PATCH',
         'POST',
         'PUT'
-    ].includes(incomingRequest.method.toUpperCase()) && incomingRequest.body) {
-        const [contentType] = (incomingRequest.headers.get('Content-Type') || '').split(';');
-        const mutableRequest = incomingRequest;
-        const bodyByteSize = parseInt(incomingRequest.headers.get('Content-Length') || '0', 10);
+    ].includes(method.toUpperCase()) && body) {
+        const [contentType] = (headers.get('Content-Type') || '').split(';');
+        const bodyByteSize = parseInt(req.headers.get('Content-Length') || '0', 10);
         if (contentType === 'application/json') {
             let data = {};
             try {
-                data = await mutableRequest.json();
+                data = await req.json();
             } catch (error) {
-                mutableRequest.payload.logger.error(error);
+                req.payload.logger.error(error);
             } finally{
-                mutableRequest.data = data;
-                mutableRequest.json = ()=>Promise.resolve(data);
+                req.data = data;
+                req.json = ()=>Promise.resolve(data);
             }
         } else if (bodyByteSize && contentType.includes('multipart/')) {
             const { error, fields, files } = await fetchAPIFileUpload({
-                options: config.upload,
-                request: mutableRequest
+                options: payload.config.upload,
+                request: req
             });
             if (error) {
                 throw new APIError(error.message);
             }
             if (files?.file) {
-                mutableRequest.file = files.file;
+                req.file = files.file;
             }
             if (fields?._payload && typeof fields._payload === 'string') {
-                mutableRequest.data = JSON.parse(fields._payload);
+                req.data = JSON.parse(fields._payload);
             }
         }
-        return mutableRequest;
     }
-    return incomingRequest;
 };
 
 //# sourceMappingURL=addDataAndFileToRequest.js.map

package/dist/utilities/addDataAndFileToRequest.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/addDataAndFileToRequest.ts"],"sourcesContent":["import type { PayloadRequest, PayloadRequestData } from 'payload'\n\nimport { APIError } from 'payload'\n\nimport type { FetchAPIFileUploadOptions } from '../fetchAPI-multipart/index.js'\n\nimport { fetchAPIFileUpload } from '../fetchAPI-multipart/index.js'\n\ntype ReturnType = PayloadRequest & PayloadRequestData\ntype AddDataAndFileToRequest = (args: { request: PayloadRequest }) => Promise<ReturnType>\n\n/**\n * Mutates the Request to contain 'data' and 'file' if present\n */\nexport const addDataAndFileToRequest: AddDataAndFileToRequest = async ({\n  request: incomingRequest,\n}) => {\n  const config = incomingRequest.payload.config\n\n  if (\n    incomingRequest.method &&\n    ['PATCH', 'POST', 'PUT'].includes(incomingRequest.method.toUpperCase()) &&\n    incomingRequest.body\n  ) {\n    const [contentType] = (incomingRequest.headers.get('Content-Type') || '').split(';')\n    const mutableRequest = incomingRequest as ReturnType\n    const bodyByteSize = parseInt(incomingRequest.headers.get('Content-Length') || '0', 10)\n\n    if (contentType === 'application/json') {\n      let data = {}\n      try {\n        data = await mutableRequest.json()\n      } catch (error) {\n        mutableRequest.payload.logger.error(error)\n      } finally {\n        mutableRequest.data = data\n        mutableRequest.json = () => Promise.resolve(data)\n      }\n    } else if (bodyByteSize && contentType.includes('multipart/')) {\n      const { error, fields, files } = await fetchAPIFileUpload({\n        options: config.upload as FetchAPIFileUploadOptions,\n        request: mutableRequest as Request,\n      })\n\n      if (error) {\n        throw new APIError(error.message)\n      }\n\n      if (files?.file) {\n        mutableRequest.file = files.file\n      }\n\n      if (fields?._payload && typeof fields._payload === 'string') {\n        mutableRequest.data = JSON.parse(fields._payload)\n      }\n    }\n\n    return mutableRequest\n  }\n\n  return incomingRequest\n}\n"],"names":["APIError","fetchAPIFileUpload","addDataAndFileToRequest","request","incomingRequest","config","payload","method","includes","toUpperCase","body","contentType","headers","get","split","mutableRequest","bodyByteSize","parseInt","data","json","error","logger","Promise","resolve","fields","files","options","upload","message","file","_payload","JSON","parse"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,QAAQ,QAAQ,UAAS;AAIlC,SAASC,kBAAkB,QAAQ,iCAAgC;AAKnE;;CAEC,GACD,OAAO,MAAMC,0BAAmD,OAAO,EACrEC,SAASC,eAAe,EACzB;IACC,MAAMC,SAASD,gBAAgBE,OAAO,CAACD,MAAM;IAE7C,IACED,gBAAgBG,MAAM,IACtB;QAAC;QAAS;QAAQ;KAAM,CAACC,QAAQ,CAACJ,gBAAgBG,MAAM,CAACE,WAAW,OACpEL,gBAAgBM,IAAI,EACpB;QACA,MAAM,CAACC,YAAY,GAAG,AAACP,CAAAA,gBAAgBQ,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAC,EAAGC,KAAK,CAAC;QAChF,MAAMC,iBAAiBX;QACvB,MAAMY,eAAeC,SAASb,gBAAgBQ,OAAO,CAACC,GAAG,CAAC,qBAAqB,KAAK;QAEpF,IAAIF,gBAAgB,oBAAoB;YACtC,IAAIO,OAAO,CAAC;YACZ,IAAI;gBACFA,OAAO,MAAMH,eAAeI,IAAI;YAClC,EAAE,OAAOC,OAAO;gBACdL,eAAeT,OAAO,CAACe,MAAM,CAACD,KAAK,CAACA;YACtC,SAAU;gBACRL,eAAeG,IAAI,GAAGA;gBACtBH,eAAeI,IAAI,GAAG,IAAMG,QAAQC,OAAO,CAACL;YAC9C;QACF,OAAO,IAAIF,gBAAgBL,YAAYH,QAAQ,CAAC,eAAe;YAC7D,MAAM,EAAEY,KAAK,EAAEI,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAMxB,mBAAmB;gBACxDyB,SAASrB,OAAOsB,MAAM;gBACtBxB,SAASY;YACX;YAEA,IAAIK,OAAO;gBACT,MAAM,IAAIpB,SAASoB,MAAMQ,OAAO;YAClC;YAEA,IAAIH,OAAOI,MAAM;gBACfd,eAAec,IAAI,GAAGJ,MAAMI,IAAI;YAClC;YAEA,IAAIL,QAAQM,YAAY,OAAON,OAAOM,QAAQ,KAAK,UAAU;gBAC3Df,eAAeG,IAAI,GAAGa,KAAKC,KAAK,CAACR,OAAOM,QAAQ;YAClD;QACF;QAEA,OAAOf;IACT;IAEA,OAAOX;AACT,EAAC"}
+{"version":3,"sources":["../../src/utilities/addDataAndFileToRequest.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { APIError } from 'payload'\n\nimport type { FetchAPIFileUploadOptions } from '../fetchAPI-multipart/index.js'\n\nimport { fetchAPIFileUpload } from '../fetchAPI-multipart/index.js'\n\ntype AddDataAndFileToRequest = (req: PayloadRequest) => Promise<void>\n\n/**\n * Mutates the Request, appending 'data' and 'file' if found\n */\nexport const addDataAndFileToRequest: AddDataAndFileToRequest = async (req) => {\n  const { body, headers, method, payload } = req\n\n  if (method && ['PATCH', 'POST', 'PUT'].includes(method.toUpperCase()) && body) {\n    const [contentType] = (headers.get('Content-Type') || '').split(';')\n    const bodyByteSize = parseInt(req.headers.get('Content-Length') || '0', 10)\n\n    if (contentType === 'application/json') {\n      let data = {}\n      try {\n        data = await req.json()\n      } catch (error) {\n        req.payload.logger.error(error)\n      } finally {\n        req.data = data\n        req.json = () => Promise.resolve(data)\n      }\n    } else if (bodyByteSize && contentType.includes('multipart/')) {\n      const { error, fields, files } = await fetchAPIFileUpload({\n        options: payload.config.upload as FetchAPIFileUploadOptions,\n        request: req as Request,\n      })\n\n      if (error) {\n        throw new APIError(error.message)\n      }\n\n      if (files?.file) {\n        req.file = files.file\n      }\n\n      if (fields?._payload && typeof fields._payload === 'string') {\n        req.data = JSON.parse(fields._payload)\n      }\n    }\n  }\n}\n"],"names":["APIError","fetchAPIFileUpload","addDataAndFileToRequest","req","body","headers","method","payload","includes","toUpperCase","contentType","get","split","bodyByteSize","parseInt","data","json","error","logger","Promise","resolve","fields","files","options","config","upload","request","message","file","_payload","JSON","parse"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,UAAS;AAIlC,SAASC,kBAAkB,QAAQ,iCAAgC;AAInE;;CAEC,GACD,OAAO,MAAMC,0BAAmD,OAAOC;IACrE,MAAM,EAAEC,IAAI,EAAEC,OAAO,EAAEC,MAAM,EAAEC,OAAO,EAAE,GAAGJ;IAE3C,IAAIG,UAAU;QAAC;QAAS;QAAQ;KAAM,CAACE,QAAQ,CAACF,OAAOG,WAAW,OAAOL,MAAM;QAC7E,MAAM,CAACM,YAAY,GAAG,AAACL,CAAAA,QAAQM,GAAG,CAAC,mBAAmB,EAAC,EAAGC,KAAK,CAAC;QAChE,MAAMC,eAAeC,SAASX,IAAIE,OAAO,CAACM,GAAG,CAAC,qBAAqB,KAAK;QAExE,IAAID,gBAAgB,oBAAoB;YACtC,IAAIK,OAAO,CAAC;YACZ,IAAI;gBACFA,OAAO,MAAMZ,IAAIa,IAAI;YACvB,EAAE,OAAOC,OAAO;gBACdd,IAAII,OAAO,CAACW,MAAM,CAACD,KAAK,CAACA;YAC3B,SAAU;gBACRd,IAAIY,IAAI,GAAGA;gBACXZ,IAAIa,IAAI,GAAG,IAAMG,QAAQC,OAAO,CAACL;YACnC;QACF,OAAO,IAAIF,gBAAgBH,YAAYF,QAAQ,CAAC,eAAe;YAC7D,MAAM,EAAES,KAAK,EAAEI,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAMrB,mBAAmB;gBACxDsB,SAAShB,QAAQiB,MAAM,CAACC,MAAM;gBAC9BC,SAASvB;YACX;YAEA,IAAIc,OAAO;gBACT,MAAM,IAAIjB,SAASiB,MAAMU,OAAO;YAClC;YAEA,IAAIL,OAAOM,MAAM;gBACfzB,IAAIyB,IAAI,GAAGN,MAAMM,IAAI;YACvB;YAEA,IAAIP,QAAQQ,YAAY,OAAOR,OAAOQ,QAAQ,KAAK,UAAU;gBAC3D1B,IAAIY,IAAI,GAAGe,KAAKC,KAAK,CAACV,OAAOQ,QAAQ;YACvC;QACF;IACF;AACF,EAAC"}

package/dist/utilities/addLocalesToRequest.d.ts

@@ -1,11 +1,8 @@
-import type { PayloadRequest, PayloadRequestData, PayloadRequestWithData, SanitizedConfig } from 'payload';
+import type { PayloadRequest, SanitizedConfig } from 'payload';
 /**
  * Mutates the Request to contain 'locale' and 'fallbackLocale' based on data or searchParams
  */
-type Args = {
-    request: PayloadRequest & PayloadRequestData;
-};
-export declare function addLocalesToRequestFromData({ request }: Args): PayloadRequestWithData;
+export declare function addLocalesToRequestFromData(req: PayloadRequest): void;
 type SanitizeLocalesArgs = {
     fallbackLocale: string;
     locale: string;

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

@@ -1 +1 @@
-{"version":3,"file":"addLocalesToRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/addLocalesToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EAChB,MAAM,SAAS,CAAA;AAEhB;;GAEG;AACH,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,GAAG,kBAAkB,CAAA;CAC7C,CAAA;AACD,wBAAgB,2BAA2B,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,GAAG,sBAAsB,CAmCrF;AAED,KAAK,mBAAmB,GAAG;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,eAAe,CAAC,cAAc,CAAC,CAAA;CAC9C,CAAA;AACD,KAAK,qBAAqB,GAAG;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AACD,eAAO,MAAM,eAAe,8CAIzB,mBAAmB,KAAG,qBAiBxB,CAAA"}
+{"version":3,"file":"addLocalesToRequest.d.ts","sourceRoot":"","sources":["../../src/utilities/addLocalesToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9D;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CA+BrE;AAED,KAAK,mBAAmB,GAAG;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,eAAe,CAAC,cAAc,CAAC,CAAA;CAC9C,CAAA;AACD,KAAK,qBAAqB,GAAG;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AACD,eAAO,MAAM,eAAe,8CAIzB,mBAAmB,KAAG,qBAiBxB,CAAA"}

package/dist/utilities/addLocalesToRequest.js

@@ -1,8 +1,10 @@
-export function addLocalesToRequestFromData({ request }) {
-    const { data, payload: { config } } = request;
+/**
+ * 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 = request.locale;
-        let fallbackLocaleOnReq = request.fallbackLocale;
+        let localeOnReq = req.locale;
+        let fallbackLocaleOnReq = req.fallbackLocale;
         if (!localeOnReq && data?.locale && typeof data.locale === 'string') {
             localeOnReq = data.locale;
         }
@@ -14,12 +16,9 @@ export function addLocalesToRequestFromData({ request }) {
             locale: localeOnReq,
             localization: config.localization
         });
-        const mutableRequest = request;
-        if (locale) mutableRequest.locale = locale;
-        if (fallbackLocale) mutableRequest.fallbackLocale = fallbackLocale;
-        return mutableRequest;
+        if (locale) req.locale = locale;
+        if (fallbackLocale) req.fallbackLocale = fallbackLocale;
     }
-    return request;
 }
 export const sanitizeLocales = ({ fallbackLocale, locale, localization })=>{
     if ([

package/dist/utilities/addLocalesToRequest.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/addLocalesToRequest.ts"],"sourcesContent":["import type {\n  PayloadRequest,\n  PayloadRequestData,\n  PayloadRequestWithData,\n  SanitizedConfig,\n} from 'payload'\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 (['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"],"names":["addLocalesToRequestFromData","request","data","payload","config","localeOnReq","locale","fallbackLocaleOnReq","fallbackLocale","sanitizeLocales","localization","mutableRequest","includes","localeCodes","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,IAAI;QAAC;QAAQ;KAAO,CAACE,QAAQ,CAACJ,iBAAiB;QAC7CA,iBAAiB;IACnB,OAAO,IAAIE,gBAAgB,CAACA,aAAaG,WAAW,CAACD,QAAQ,CAACJ,iBAAiB;QAC7EA,iBAAiBE,aAAaI,aAAa;IAC7C;IAEA,IAAIR,WAAW,KAAK;QAClBA,SAAS;IACX,OAAO,IAAII,gBAAgB,CAACA,aAAaG,WAAW,CAACD,QAAQ,CAACN,SAAS;QACrEA,SAASI,aAAaI,aAAa;IACrC;IAEA,OAAO;QACLN;QACAF;IACF;AACF,EAAC"}
+{"version":3,"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"],"names":["addLocalesToRequestFromData","req","data","payload","config","localeOnReq","locale","fallbackLocaleOnReq","fallbackLocale","sanitizeLocales","localization","includes","localeCodes","defaultLocale"],"mappings":"AAEA;;CAEC,GACD,OAAO,SAASA,4BAA4BC,GAAmB;IAC7D,MAAM,EACJC,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACpB,GAAGH;IAEJ,IAAIC,MAAM;QACR,IAAIG,cAAcJ,IAAIK,MAAM;QAC5B,IAAIC,sBAAsBN,IAAIO,cAAc;QAE5C,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,IAAIJ,QAAQL,IAAIK,MAAM,GAAGA;QACzB,IAAIE,gBAAgBP,IAAIO,cAAc,GAAGA;IAC3C;AACF;AAWA,OAAO,MAAMC,kBAAkB,CAAC,EAC9BD,cAAc,EACdF,MAAM,EACNI,YAAY,EACQ;IACpB,IAAI;QAAC;QAAQ;KAAO,CAACC,QAAQ,CAACH,iBAAiB;QAC7CA,iBAAiB;IACnB,OAAO,IAAIE,gBAAgB,CAACA,aAAaE,WAAW,CAACD,QAAQ,CAACH,iBAAiB;QAC7EA,iBAAiBE,aAAaG,aAAa;IAC7C;IAEA,IAAIP,WAAW,KAAK;QAClBA,SAAS;IACX,OAAO,IAAII,gBAAgB,CAACA,aAAaE,WAAW,CAACD,QAAQ,CAACL,SAAS;QACrEA,SAASI,aAAaG,aAAa;IACrC;IAEA,OAAO;QACLL;QACAF;IACF;AACF,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,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,QAAQ,cAAc,CAoF/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,6 +1,6 @@
 import { initI18n } from '@payloadcms/translations';
 import { executeAuthStrategies, getDataLoader, parseCookies } from 'payload';
-import qs from 'qs';
+import * as qs from 'qs-esm';
 import { URL } from 'url';
 import { sanitizeLocales } from './addLocalesToRequest.js';
 import { getPayloadHMR } from './getPayloadHMR.js';
@@ -26,6 +26,13 @@ export const createPayloadRequest = async ({ config: configPromise, params, requ
     });
     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'),
@@ -34,14 +41,10 @@ export const createPayloadRequest = async ({ config: configPromise, params, requ
         });
         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 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
-    }) : {};
     const customRequest = {
         context: {},
         fallbackLocale,
@@ -68,12 +71,13 @@ export const createPayloadRequest = async ({ config: configPromise, params, requ
     };
     const req = Object.assign(request, customRequest);
     req.payloadDataLoader = getDataLoader(req);
-    req.user = await executeAuthStrategies({
-        cookies,
+    const { responseHeaders, user } = await executeAuthStrategies({
         headers: req.headers,
         isGraphQL,
         payload
     });
+    req.user = user;
+    if (responseHeaders) req.responseHeaders = responseHeaders;
     return req;
 };
 

package/dist/utilities/createPayloadRequest.js.map

@@ -1 +1 @@
-{"version":3,"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 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 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  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  req.user = await executeAuthStrategies({\n    cookies,\n    headers: req.headers,\n    isGraphQL,\n    payload,\n  })\n\n  return req\n}\n"],"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","localization","locales","get","overrideHttpMethod","queryToParse","text","search","query","parse","arrayLimit","depth","ignoreQueryPrefix","customRequest","hash","host","href","origin","payloadAPI","payloadDataLoader","undefined","payloadUploadSizes","port","protocol","routeParams","t","transactionID","user","req","Object","assign"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,qBAAqB,EAAEC,aAAa,EAAEC,YAAY,QAAQ,UAAS;AAC5E,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,UAAUX,aAAaU,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,qBAAqBrB,QAAQE,OAAO,CAACkB,GAAG,CAAC;IAC/C,MAAME,eAAeD,uBAAuB,QAAQ,MAAMrB,QAAQuB,IAAI,KAAKnB,cAAcoB,MAAM;IAE/F,MAAMC,QAAQH,eACV/B,GAAGmC,KAAK,CAACJ,cAAc;QACrBK,YAAY;QACZC,OAAO;QACPC,mBAAmB;IACrB,KACA,CAAC;IAEL,MAAMC,gBAAgD;QACpDf,SAAS,CAAC;QACVE;QACAc,MAAM3B,cAAc2B,IAAI;QACxBC,MAAM5B,cAAc4B,IAAI;QACxBC,MAAM7B,cAAc6B,IAAI;QACxBnB;QACAE;QACAkB,QAAQ9B,cAAc8B,MAAM;QAC5B5B,UAAUF,cAAcE,QAAQ;QAChCH;QACAgC,YAAY3B,YAAY,YAAY;QACpC4B,mBAAmBC;QACnBC,oBAAoB,CAAC;QACrBC,MAAMnC,cAAcmC,IAAI;QACxBC,UAAUpC,cAAcoC,QAAQ;QAChCf;QACAgB,aAAa1C,UAAU,CAAC;QACxByB,QAAQpB,cAAcoB,MAAM;QAC5BjB,cAAcH,cAAcG,YAAY;QACxCmC,GAAG5B,KAAK4B,CAAC;QACTC,eAAeN;QACfO,MAAM;IACR;IAEA,MAAMC,MAAsBC,OAAOC,MAAM,CAAC/C,SAAS8B;IAEnDe,IAAIT,iBAAiB,GAAG/C,cAAcwD;IAEtCA,IAAID,IAAI,GAAG,MAAMxD,sBAAsB;QACrCa;QACAC,SAAS2C,IAAI3C,OAAO;QACpBM;QACAL;IACF;IAEA,OAAO0C;AACT,EAAC"}
+{"version":3,"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"],"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"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,qBAAqB,EAAEC,aAAa,EAAEC,YAAY,QAAQ,UAAS;AAC5E,YAAYC,QAAQ,SAAQ;AAC5B,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,UAAUX,aAAaU,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;IAEJ,MAAMC,qBAAqBlB,QAAQE,OAAO,CAACiB,GAAG,CAAC;IAC/C,MAAMC,eAAeF,uBAAuB,QAAQ,MAAMlB,QAAQqB,IAAI,KAAKjB,cAAckB,MAAM;IAE/F,MAAMC,QAAQH,eACV7B,GAAGiC,KAAK,CAACJ,cAAc;QACrBK,YAAY;QACZC,OAAO;QACPC,mBAAmB;IACrB,KACA,CAAC;IAEL,IAAI9B,OAAO+B,YAAY,EAAE;QACvB,MAAMC,UAAUpC,gBAAgB;YAC9BwB,gBAAgBV,aAAaY,GAAG,CAAC;YACjCH,QAAQT,aAAaY,GAAG,CAAC;YACzBS,cAAczB,QAAQN,MAAM,CAAC+B,YAAY;QAC3C;QACAZ,SAASa,QAAQb,MAAM;QACvBC,iBAAiBY,QAAQZ,cAAc;QAEvC,iFAAiF;QACjF,IAAIM,MAAMP,MAAM,EAAEA,SAASO,MAAMP,MAAM;QACvC,IAAIO,OAAO,CAAC,kBAAkB,EAAEN,iBAAiBM,KAAK,CAAC,kBAAkB;IAC3E;IAEA,MAAMO,gBAAgD;QACpDf,SAAS,CAAC;QACVE;QACAc,MAAM3B,cAAc2B,IAAI;QACxBC,MAAM5B,cAAc4B,IAAI;QACxBC,MAAM7B,cAAc6B,IAAI;QACxBnB;QACAE;QACAkB,QAAQ9B,cAAc8B,MAAM;QAC5B5B,UAAUF,cAAcE,QAAQ;QAChCH;QACAgC,YAAY3B,YAAY,YAAY;QACpC4B,mBAAmBC;QACnBC,oBAAoB,CAAC;QACrBC,MAAMnC,cAAcmC,IAAI;QACxBC,UAAUpC,cAAcoC,QAAQ;QAChCjB;QACAkB,aAAa1C,UAAU,CAAC;QACxBuB,QAAQlB,cAAckB,MAAM;QAC5Bf,cAAcH,cAAcG,YAAY;QACxCmC,GAAG5B,KAAK4B,CAAC;QACTC,eAAeN;QACfO,MAAM;IACR;IAEA,MAAMC,MAAsBC,OAAOC,MAAM,CAAC/C,SAAS8B;IAEnDe,IAAIT,iBAAiB,GAAG/C,cAAcwD;IAEtC,MAAM,EAAEG,eAAe,EAAEJ,IAAI,EAAE,GAAG,MAAMxD,sBAAsB;QAC5Dc,SAAS2C,IAAI3C,OAAO;QACpBM;QACAL;IACF;IAEA0C,IAAID,IAAI,GAAGA;IAEX,IAAII,iBAAiBH,IAAIG,eAAe,GAAGA;IAE3C,OAAOH;AACT,EAAC"}

package/dist/utilities/getNextRequestI18n.d.ts

@@ -1,11 +1,11 @@
-import type { I18n } from '@payloadcms/translations';
+import type { ClientTranslationsObject, I18nClient } from '@payloadcms/translations';
 import type { SanitizedConfig } from 'payload';
 /**
  * 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,SAAS,CAAA;AAO9C;;;;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

@@ -5,7 +5,8 @@ import { getRequestLanguage } from './getRequestLanguage.js';
  * 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({
+ */ export const getNextRequestI18n = async ({ config })=>{
+    return await initI18n({
         config: config.i18n,
         context: 'client',
         language: getRequestLanguage({
@@ -14,5 +15,6 @@ import { getRequestLanguage } from './getRequestLanguage.js';
             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'\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 ({ 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,"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"],"names":["initI18n","cookies","headers","getRequestLanguage","getNextRequestI18n","config","i18n","context","language"],"mappings":"AASA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,OAAO,EAAEC,OAAO,QAAQ,kBAAiB;AAElD,SAASC,kBAAkB,QAAQ,0BAAyB;AAE5D;;;;CAIC,GACD,OAAO,MAAMC,qBAAqB,OAGhC,EACAC,MAAM,EAGP;IAOC,OAAQ,MAAML,SAAS;QACrBK,QAAQA,OAAOC,IAAI;QACnBC,SAAS;QACTC,UAAUL,mBAAmB;YAAEE;YAAQJ,SAASA;YAAWC,SAASA;QAAU;IAChF;AACF,EAAC"}

package/dist/utilities/getPayloadHMR.d.ts

@@ -1,4 +1,4 @@
 import type { InitOptions, Payload, SanitizedConfig } from 'payload';
-export declare const reload: (config: SanitizedConfig, payload: Payload) => Promise<void>;
+export declare const reload: (config: SanitizedConfig, payload: Payload, skipImportMapGeneration?: boolean) => 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,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBpF,eAAO,MAAM,MAAM,WAAkB,eAAe,uBAAqB,QAAQ,IAAI,CAmCpF,CAAA;AAED,eAAO,MAAM,aAAa,YAAmB,WAAW,KAAG,QAAQ,OAAO,CA8DzE,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,YAAmB,WAAW,KAAG,OAAO,CAAC,OAAO,CAyEzE,CAAA"}

package/dist/utilities/getPayloadHMR.js

@@ -1,15 +1,15 @@
-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
+        reload: false,
+        ws: null
     };
 }
-export const reload = async (config, payload)=>{
+export const reload = async (config, payload, skipImportMapGeneration)=>{
     if (typeof payload.db.destroy === 'function') {
         await payload.db.destroy();
     }
@@ -36,6 +36,12 @@ export const reload = async (config, payload)=>{
             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({
@@ -45,32 +51,39 @@ export const reload = async (config, payload)=>{
 };
 export const getPayloadHMR = async (options)=>{
     if (!options?.config) {
-        throw new Error('Error: the payload config is required for getPayload to work.');
+        throw new Error('Error: the payload config is required for getPayloadHMR to work.');
     }
     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;
+            // getPayloadHMR is called multiple times, in parallel. However, we only want to run `await reload` once. By immediately setting cached.reload to a promise,
+            // we can ensure that all subsequent calls will wait for the first reload to finish. So if we set it here, the 2nd call of getPayloadHMR
+            // will reach `if (cached.reload instanceof Promise) {` which then waits for the first reload to finish.
             cached.reload = new Promise((res)=>resolve = res);
+            const config = await options.config;
             await reload(config, cached.payload);
             resolve();
         }
         if (cached.reload instanceof Promise) {
             await cached.reload;
         }
+        if (options?.importMap) {
+            cached.payload.importMap = options.importMap;
+        }
         return cached.payload;
     }
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     if (!cached.promise) {
+        // no need to await options.config here, as it's already awaited in the BasePayload.init
         cached.promise = new BasePayload().init(options);
     }
     try {
         cached.payload = await cached.promise;
-        if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' && process.env.DISABLE_PAYLOAD_HMR !== 'true') {
+        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';
-                const ws = new WebSocket(`ws://localhost:${port}${process.env.NEXT_BASE_PATH ?? ''}/_next/webpack-hmr`);
-                ws.onmessage = (event)=>{
+                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') {
@@ -86,6 +99,9 @@ export const getPayloadHMR = async (options)=>{
         cached.promise = null;
         throw e;
     }
+    if (options?.importMap) {
+        cached.payload.importMap = options.importMap;
+    }
     return cached.payload;
 };