@payloadcms/next 3.0.0-canary.926cbeb → 3.0.0-canary.95fcd13

package/dist/utilities/mergeHeaders.js

@@ -1,37 +1,11 @@
-const headersToJoin = [
-    'set-cookie',
-    'warning',
-    'www-authenticate',
-    'proxy-authenticate',
-    'vary'
-];
-export function mergeHeaders(sourceHeaders, destinationHeaders) {
-    // Create a map to store combined headers
-    const combinedHeaders = new Headers();
-    // Add existing destination headers to the combined map
-    destinationHeaders.forEach((value, key)=>{
-        combinedHeaders.set(key, value);
-    });
-    // Add source headers to the combined map, joining specific headers
+export const mergeHeaders = (sourceHeaders, destinationHeaders)=>{
+    // Create a new Headers object
+    const combinedHeaders = new Headers(destinationHeaders);
+    // Append sourceHeaders to combinedHeaders
     sourceHeaders.forEach((value, key)=>{
-        const lowerKey = key.toLowerCase();
-        if (headersToJoin.includes(lowerKey)) {
-            if (combinedHeaders.has(key)) {
-                combinedHeaders.set(key, `${combinedHeaders.get(key)}, ${value}`);
-            } else {
-                combinedHeaders.set(key, value);
-            }
-        } else {
-            combinedHeaders.set(key, value);
-        }
-    });
-    // Clear the destination headers and set the combined headers
-    destinationHeaders.forEach((_, key)=>{
-        destinationHeaders.delete(key);
-    });
-    combinedHeaders.forEach((value, key)=>{
-        destinationHeaders.append(key, value);
+        combinedHeaders.append(key, value);
     });
-}
+    return combinedHeaders;
+};
 
 //# sourceMappingURL=mergeHeaders.js.map

package/dist/utilities/mergeHeaders.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/mergeHeaders.ts"],"sourcesContent":["const headersToJoin = ['set-cookie', 'warning', 'www-authenticate', 'proxy-authenticate', 'vary']\n\nexport function mergeHeaders(sourceHeaders: Headers, destinationHeaders: Headers): void {\n  // Create a map to store combined headers\n  const combinedHeaders = new Headers()\n\n  // Add existing destination headers to the combined map\n  destinationHeaders.forEach((value, key) => {\n    combinedHeaders.set(key, value)\n  })\n\n  // Add source headers to the combined map, joining specific headers\n  sourceHeaders.forEach((value, key) => {\n    const lowerKey = key.toLowerCase()\n    if (headersToJoin.includes(lowerKey)) {\n      if (combinedHeaders.has(key)) {\n        combinedHeaders.set(key, `${combinedHeaders.get(key)}, ${value}`)\n      } else {\n        combinedHeaders.set(key, value)\n      }\n    } else {\n      combinedHeaders.set(key, value)\n    }\n  })\n\n  // Clear the destination headers and set the combined headers\n  destinationHeaders.forEach((_, key) => {\n    destinationHeaders.delete(key)\n  })\n  combinedHeaders.forEach((value, key) => {\n    destinationHeaders.append(key, value)\n  })\n}\n"],"names":["headersToJoin","mergeHeaders","sourceHeaders","destinationHeaders","combinedHeaders","Headers","forEach","value","key","set","lowerKey","toLowerCase","includes","has","get","_","delete","append"],"mappings":"AAAA,MAAMA,gBAAgB;IAAC;IAAc;IAAW;IAAoB;IAAsB;CAAO;AAEjG,OAAO,SAASC,aAAaC,aAAsB,EAAEC,kBAA2B;IAC9E,yCAAyC;IACzC,MAAMC,kBAAkB,IAAIC;IAE5B,uDAAuD;IACvDF,mBAAmBG,OAAO,CAAC,CAACC,OAAOC;QACjCJ,gBAAgBK,GAAG,CAACD,KAAKD;IAC3B;IAEA,mEAAmE;IACnEL,cAAcI,OAAO,CAAC,CAACC,OAAOC;QAC5B,MAAME,WAAWF,IAAIG,WAAW;QAChC,IAAIX,cAAcY,QAAQ,CAACF,WAAW;YACpC,IAAIN,gBAAgBS,GAAG,CAACL,MAAM;gBAC5BJ,gBAAgBK,GAAG,CAACD,KAAK,CAAC,EAAEJ,gBAAgBU,GAAG,CAACN,KAAK,EAAE,EAAED,MAAM,CAAC;YAClE,OAAO;gBACLH,gBAAgBK,GAAG,CAACD,KAAKD;YAC3B;QACF,OAAO;YACLH,gBAAgBK,GAAG,CAACD,KAAKD;QAC3B;IACF;IAEA,6DAA6D;IAC7DJ,mBAAmBG,OAAO,CAAC,CAACS,GAAGP;QAC7BL,mBAAmBa,MAAM,CAACR;IAC5B;IACAJ,gBAAgBE,OAAO,CAAC,CAACC,OAAOC;QAC9BL,mBAAmBc,MAAM,CAACT,KAAKD;IACjC;AACF"}
+{"version":3,"sources":["../../src/utilities/mergeHeaders.ts"],"sourcesContent":["export const mergeHeaders = (sourceHeaders: Headers, destinationHeaders: Headers): Headers => {\n  // Create a new Headers object\n  const combinedHeaders = new Headers(destinationHeaders)\n\n  // Append sourceHeaders to combinedHeaders\n  sourceHeaders.forEach((value, key) => {\n    combinedHeaders.append(key, value)\n  })\n\n  return combinedHeaders\n}\n"],"names":["mergeHeaders","sourceHeaders","destinationHeaders","combinedHeaders","Headers","forEach","value","key","append"],"mappings":"AAAA,OAAO,MAAMA,eAAe,CAACC,eAAwBC;IACnD,8BAA8B;IAC9B,MAAMC,kBAAkB,IAAIC,QAAQF;IAEpC,0CAA0C;IAC1CD,cAAcI,OAAO,CAAC,CAACC,OAAOC;QAC5BJ,gBAAgBK,MAAM,CAACD,KAAKD;IAC9B;IAEA,OAAOH;AACT,EAAC"}

package/dist/utilities/meta.d.ts

@@ -1,5 +1,5 @@
 import type { MetaConfig } from 'payload';
-export declare const meta: (args: MetaConfig & {
+export declare const meta: (args: {
     serverURL: string;
-}) => Promise<any>;
+} & MetaConfig) => Promise<any>;
 //# sourceMappingURL=meta.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../src/utilities/meta.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAYzC,eAAO,MAAM,IAAI,SAAgB,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,KAAG,OAAO,CAAC,GAAG,CAwFhF,CAAA"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../src/utilities/meta.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAYzC,eAAO,MAAM,IAAI,SAAgB;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,UAAU,KAAG,OAAO,CAAC,GAAG,CAwFhF,CAAA"}

package/dist/utilities/meta.js

@@ -1,5 +1,5 @@
 import { payloadFaviconDark, payloadFaviconLight, staticOGImage } from '@payloadcms/ui/assets';
-import qs from 'qs';
+import * as qs from 'qs-esm';
 const defaultOpenGraph = {
     description: 'Payload is a headless CMS and application framework built with TypeScript, Node.js, and React.',
     siteName: 'Payload App',

package/dist/utilities/meta.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\nimport type { Icon } from 'next/dist/lib/metadata/types/metadata-types.js'\nimport type { MetaConfig } from 'payload'\n\nimport { payloadFaviconDark, payloadFaviconLight, staticOGImage } from '@payloadcms/ui/assets'\nimport qs from 'qs'\n\nconst defaultOpenGraph = {\n  description:\n    'Payload is a headless CMS and application framework built with TypeScript, Node.js, and React.',\n  siteName: 'Payload App',\n  title: 'Payload App',\n}\n\nexport const meta = async (args: MetaConfig & { serverURL: string }): Promise<any> => {\n  const {\n    defaultOGImageType,\n    description,\n    icons: customIcons,\n    keywords,\n    openGraph: openGraphFromProps,\n    serverURL,\n    title,\n    titleSuffix,\n  } = args\n\n  const payloadIcons: Icon[] = [\n    {\n      type: 'image/png',\n      rel: 'icon',\n      sizes: '32x32',\n      url: typeof payloadFaviconDark === 'object' ? payloadFaviconDark?.src : payloadFaviconDark,\n    },\n    {\n      type: 'image/png',\n      media: '(prefers-color-scheme: dark)',\n      rel: 'icon',\n      sizes: '32x32',\n      url: typeof payloadFaviconLight === 'object' ? payloadFaviconLight?.src : payloadFaviconLight,\n    },\n  ]\n\n  let icons = customIcons ?? payloadIcons // TODO: fix this type assertion\n\n  if (customIcons && typeof customIcons === 'object' && Array.isArray(customIcons)) {\n    icons = payloadIcons.concat(customIcons) // TODO: fix this type assertion\n  }\n\n  const metaTitle = `${title} ${titleSuffix}`\n\n  const ogTitle = `${typeof openGraphFromProps?.title === 'string' ? openGraphFromProps.title : title} ${titleSuffix}`\n\n  const mergedOpenGraph: Metadata['openGraph'] = {\n    ...(defaultOpenGraph || {}),\n    ...(defaultOGImageType === 'dynamic'\n      ? {\n          images: [\n            {\n              alt: ogTitle,\n              height: 630,\n              url: `/api/og${qs.stringify(\n                {\n                  description: openGraphFromProps?.description || defaultOpenGraph.description,\n                  title: ogTitle,\n                },\n                {\n                  addQueryPrefix: true,\n                },\n              )}`,\n              width: 1200,\n            },\n          ],\n        }\n      : {}),\n    ...(defaultOGImageType === 'static'\n      ? {\n          images: [\n            {\n              alt: ogTitle,\n              height: 480,\n              url: typeof staticOGImage === 'object' ? staticOGImage?.src : staticOGImage,\n              width: 640,\n            },\n          ],\n        }\n      : {}),\n    title: ogTitle,\n    ...(openGraphFromProps || {}),\n  }\n\n  return Promise.resolve({\n    description,\n    icons,\n    keywords,\n    metadataBase: new URL(\n      serverURL ||\n        process.env.PAYLOAD_PUBLIC_SERVER_URL ||\n        `http://localhost:${process.env.PORT || 3000}`,\n    ),\n    openGraph: mergedOpenGraph,\n    title: metaTitle,\n  })\n}\n"],"names":["payloadFaviconDark","payloadFaviconLight","staticOGImage","qs","defaultOpenGraph","description","siteName","title","meta","args","defaultOGImageType","icons","customIcons","keywords","openGraph","openGraphFromProps","serverURL","titleSuffix","payloadIcons","type","rel","sizes","url","src","media","Array","isArray","concat","metaTitle","ogTitle","mergedOpenGraph","images","alt","height","stringify","addQueryPrefix","width","Promise","resolve","metadataBase","URL","process","env","PAYLOAD_PUBLIC_SERVER_URL","PORT"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,mBAAmB,EAAEC,aAAa,QAAQ,wBAAuB;AAC9F,OAAOC,QAAQ,KAAI;AAEnB,MAAMC,mBAAmB;IACvBC,aACE;IACFC,UAAU;IACVC,OAAO;AACT;AAEA,OAAO,MAAMC,OAAO,OAAOC;IACzB,MAAM,EACJC,kBAAkB,EAClBL,WAAW,EACXM,OAAOC,WAAW,EAClBC,QAAQ,EACRC,WAAWC,kBAAkB,EAC7BC,SAAS,EACTT,KAAK,EACLU,WAAW,EACZ,GAAGR;IAEJ,MAAMS,eAAuB;QAC3B;YACEC,MAAM;YACNC,KAAK;YACLC,OAAO;YACPC,KAAK,OAAOtB,uBAAuB,WAAWA,oBAAoBuB,MAAMvB;QAC1E;QACA;YACEmB,MAAM;YACNK,OAAO;YACPJ,KAAK;YACLC,OAAO;YACPC,KAAK,OAAOrB,wBAAwB,WAAWA,qBAAqBsB,MAAMtB;QAC5E;KACD;IAED,IAAIU,QAAQC,eAAeM,aAAa,gCAAgC;;IAExE,IAAIN,eAAe,OAAOA,gBAAgB,YAAYa,MAAMC,OAAO,CAACd,cAAc;QAChFD,QAAQO,aAAaS,MAAM,CAACf,aAAa,gCAAgC;;IAC3E;IAEA,MAAMgB,YAAY,CAAC,EAAErB,MAAM,CAAC,EAAEU,YAAY,CAAC;IAE3C,MAAMY,UAAU,CAAC,EAAE,OAAOd,oBAAoBR,UAAU,WAAWQ,mBAAmBR,KAAK,GAAGA,MAAM,CAAC,EAAEU,YAAY,CAAC;IAEpH,MAAMa,kBAAyC;QAC7C,GAAI1B,oBAAoB,CAAC,CAAC;QAC1B,GAAIM,uBAAuB,YACvB;YACEqB,QAAQ;gBACN;oBACEC,KAAKH;oBACLI,QAAQ;oBACRX,KAAK,CAAC,OAAO,EAAEnB,GAAG+B,SAAS,CACzB;wBACE7B,aAAaU,oBAAoBV,eAAeD,iBAAiBC,WAAW;wBAC5EE,OAAOsB;oBACT,GACA;wBACEM,gBAAgB;oBAClB,GACA,CAAC;oBACHC,OAAO;gBACT;aACD;QACH,IACA,CAAC,CAAC;QACN,GAAI1B,uBAAuB,WACvB;YACEqB,QAAQ;gBACN;oBACEC,KAAKH;oBACLI,QAAQ;oBACRX,KAAK,OAAOpB,kBAAkB,WAAWA,eAAeqB,MAAMrB;oBAC9DkC,OAAO;gBACT;aACD;QACH,IACA,CAAC,CAAC;QACN7B,OAAOsB;QACP,GAAId,sBAAsB,CAAC,CAAC;IAC9B;IAEA,OAAOsB,QAAQC,OAAO,CAAC;QACrBjC;QACAM;QACAE;QACA0B,cAAc,IAAIC,IAChBxB,aACEyB,QAAQC,GAAG,CAACC,yBAAyB,IACrC,CAAC,iBAAiB,EAAEF,QAAQC,GAAG,CAACE,IAAI,IAAI,KAAK,CAAC;QAElD9B,WAAWgB;QACXvB,OAAOqB;IACT;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\nimport type { Icon } from 'next/dist/lib/metadata/types/metadata-types.js'\nimport type { MetaConfig } from 'payload'\n\nimport { payloadFaviconDark, payloadFaviconLight, staticOGImage } from '@payloadcms/ui/assets'\nimport * as qs from 'qs-esm'\n\nconst defaultOpenGraph = {\n  description:\n    'Payload is a headless CMS and application framework built with TypeScript, Node.js, and React.',\n  siteName: 'Payload App',\n  title: 'Payload App',\n}\n\nexport const meta = async (args: { serverURL: string } & MetaConfig): Promise<any> => {\n  const {\n    defaultOGImageType,\n    description,\n    icons: customIcons,\n    keywords,\n    openGraph: openGraphFromProps,\n    serverURL,\n    title,\n    titleSuffix,\n  } = args\n\n  const payloadIcons: Icon[] = [\n    {\n      type: 'image/png',\n      rel: 'icon',\n      sizes: '32x32',\n      url: typeof payloadFaviconDark === 'object' ? payloadFaviconDark?.src : payloadFaviconDark,\n    },\n    {\n      type: 'image/png',\n      media: '(prefers-color-scheme: dark)',\n      rel: 'icon',\n      sizes: '32x32',\n      url: typeof payloadFaviconLight === 'object' ? payloadFaviconLight?.src : payloadFaviconLight,\n    },\n  ]\n\n  let icons = customIcons ?? payloadIcons // TODO: fix this type assertion\n\n  if (customIcons && typeof customIcons === 'object' && Array.isArray(customIcons)) {\n    icons = payloadIcons.concat(customIcons) // TODO: fix this type assertion\n  }\n\n  const metaTitle = `${title} ${titleSuffix}`\n\n  const ogTitle = `${typeof openGraphFromProps?.title === 'string' ? openGraphFromProps.title : title} ${titleSuffix}`\n\n  const mergedOpenGraph: Metadata['openGraph'] = {\n    ...(defaultOpenGraph || {}),\n    ...(defaultOGImageType === 'dynamic'\n      ? {\n          images: [\n            {\n              alt: ogTitle,\n              height: 630,\n              url: `/api/og${qs.stringify(\n                {\n                  description: openGraphFromProps?.description || defaultOpenGraph.description,\n                  title: ogTitle,\n                },\n                {\n                  addQueryPrefix: true,\n                },\n              )}`,\n              width: 1200,\n            },\n          ],\n        }\n      : {}),\n    ...(defaultOGImageType === 'static'\n      ? {\n          images: [\n            {\n              alt: ogTitle,\n              height: 480,\n              url: typeof staticOGImage === 'object' ? staticOGImage?.src : staticOGImage,\n              width: 640,\n            },\n          ],\n        }\n      : {}),\n    title: ogTitle,\n    ...(openGraphFromProps || {}),\n  }\n\n  return Promise.resolve({\n    description,\n    icons,\n    keywords,\n    metadataBase: new URL(\n      serverURL ||\n        process.env.PAYLOAD_PUBLIC_SERVER_URL ||\n        `http://localhost:${process.env.PORT || 3000}`,\n    ),\n    openGraph: mergedOpenGraph,\n    title: metaTitle,\n  })\n}\n"],"names":["payloadFaviconDark","payloadFaviconLight","staticOGImage","qs","defaultOpenGraph","description","siteName","title","meta","args","defaultOGImageType","icons","customIcons","keywords","openGraph","openGraphFromProps","serverURL","titleSuffix","payloadIcons","type","rel","sizes","url","src","media","Array","isArray","concat","metaTitle","ogTitle","mergedOpenGraph","images","alt","height","stringify","addQueryPrefix","width","Promise","resolve","metadataBase","URL","process","env","PAYLOAD_PUBLIC_SERVER_URL","PORT"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,mBAAmB,EAAEC,aAAa,QAAQ,wBAAuB;AAC9F,YAAYC,QAAQ,SAAQ;AAE5B,MAAMC,mBAAmB;IACvBC,aACE;IACFC,UAAU;IACVC,OAAO;AACT;AAEA,OAAO,MAAMC,OAAO,OAAOC;IACzB,MAAM,EACJC,kBAAkB,EAClBL,WAAW,EACXM,OAAOC,WAAW,EAClBC,QAAQ,EACRC,WAAWC,kBAAkB,EAC7BC,SAAS,EACTT,KAAK,EACLU,WAAW,EACZ,GAAGR;IAEJ,MAAMS,eAAuB;QAC3B;YACEC,MAAM;YACNC,KAAK;YACLC,OAAO;YACPC,KAAK,OAAOtB,uBAAuB,WAAWA,oBAAoBuB,MAAMvB;QAC1E;QACA;YACEmB,MAAM;YACNK,OAAO;YACPJ,KAAK;YACLC,OAAO;YACPC,KAAK,OAAOrB,wBAAwB,WAAWA,qBAAqBsB,MAAMtB;QAC5E;KACD;IAED,IAAIU,QAAQC,eAAeM,aAAa,gCAAgC;;IAExE,IAAIN,eAAe,OAAOA,gBAAgB,YAAYa,MAAMC,OAAO,CAACd,cAAc;QAChFD,QAAQO,aAAaS,MAAM,CAACf,aAAa,gCAAgC;;IAC3E;IAEA,MAAMgB,YAAY,CAAC,EAAErB,MAAM,CAAC,EAAEU,YAAY,CAAC;IAE3C,MAAMY,UAAU,CAAC,EAAE,OAAOd,oBAAoBR,UAAU,WAAWQ,mBAAmBR,KAAK,GAAGA,MAAM,CAAC,EAAEU,YAAY,CAAC;IAEpH,MAAMa,kBAAyC;QAC7C,GAAI1B,oBAAoB,CAAC,CAAC;QAC1B,GAAIM,uBAAuB,YACvB;YACEqB,QAAQ;gBACN;oBACEC,KAAKH;oBACLI,QAAQ;oBACRX,KAAK,CAAC,OAAO,EAAEnB,GAAG+B,SAAS,CACzB;wBACE7B,aAAaU,oBAAoBV,eAAeD,iBAAiBC,WAAW;wBAC5EE,OAAOsB;oBACT,GACA;wBACEM,gBAAgB;oBAClB,GACA,CAAC;oBACHC,OAAO;gBACT;aACD;QACH,IACA,CAAC,CAAC;QACN,GAAI1B,uBAAuB,WACvB;YACEqB,QAAQ;gBACN;oBACEC,KAAKH;oBACLI,QAAQ;oBACRX,KAAK,OAAOpB,kBAAkB,WAAWA,eAAeqB,MAAMrB;oBAC9DkC,OAAO;gBACT;aACD;QACH,IACA,CAAC,CAAC;QACN7B,OAAOsB;QACP,GAAId,sBAAsB,CAAC,CAAC;IAC9B;IAEA,OAAOsB,QAAQC,OAAO,CAAC;QACrBjC;QACAM;QACAE;QACA0B,cAAc,IAAIC,IAChBxB,aACEyB,QAAQC,GAAG,CAACC,yBAAyB,IACrC,CAAC,iBAAiB,EAAEF,QAAQC,GAAG,CAACE,IAAI,IAAI,KAAK,CAAC;QAElD9B,WAAWgB;QACXvB,OAAOqB;IACT;AACF,EAAC"}

package/dist/views/Account/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Account/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA2B,MAAM,SAAS,CAAA;AAKtE,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAA;AAEnD,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAqG5C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Account/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA2B,MAAM,SAAS,CAAA;AAKtE,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAA;AAEnD,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA2F5C,CAAA"}

package/dist/views/Account/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { DocumentInfoProvider, FormQueryParamsProvider, HydrateClientUser } from '@payloadcms/ui';
+import { DocumentInfoProvider, HydrateClientUser } from '@payloadcms/ui';
 import { RenderCustomComponent } from '@payloadcms/ui/shared';
 import { notFound } from 'next/navigation.js';
 import React from 'react';
@@ -37,7 +37,6 @@ export const Account = async ({ initPageResult, params, searchParams })=>{
                 i18n: i18n,
                 languageOptions: languageOptions
             }),
-            action: `${serverURL}${api}/${userSlug}${user?.id ? `/${user.id}` : ''}`,
             apiURL: `${serverURL}${api}/${userSlug}${user?.id ? `/${user.id}` : ''}`,
             collectionSlug: userSlug,
             docPermissions: docPermissions,
@@ -59,27 +58,19 @@ export const Account = async ({ initPageResult, params, searchParams })=>{
                     permissions: permissions,
                     user: user
                 }),
-                /*#__PURE__*/ _jsx(FormQueryParamsProvider, {
-                    initialParams: {
-                        depth: 0,
-                        'fallback-locale': 'null',
-                        locale: locale?.code,
-                        uploadEdits: undefined
-                    },
-                    children: /*#__PURE__*/ _jsx(RenderCustomComponent, {
-                        CustomComponent: typeof CustomAccountComponent === 'function' ? CustomAccountComponent : undefined,
-                        DefaultComponent: EditView,
-                        componentProps: viewComponentProps,
-                        serverOnlyProps: {
-                            i18n,
-                            locale,
-                            params,
-                            payload,
-                            permissions,
-                            searchParams,
-                            user
-                        }
-                    })
+                /*#__PURE__*/ _jsx(RenderCustomComponent, {
+                    CustomComponent: typeof CustomAccountComponent === 'function' ? CustomAccountComponent : undefined,
+                    DefaultComponent: EditView,
+                    componentProps: viewComponentProps,
+                    serverOnlyProps: {
+                        i18n,
+                        locale,
+                        params,
+                        payload,
+                        permissions,
+                        searchParams,
+                        user
+                    }
                 })
             ]
         });

package/dist/views/Account/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Account/index.tsx"],"sourcesContent":["import type { AdminViewProps, ServerSideEditViewProps } from 'payload'\n\nimport { DocumentInfoProvider, FormQueryParamsProvider, HydrateClientUser } from '@payloadcms/ui'\nimport { RenderCustomComponent } from '@payloadcms/ui/shared'\nimport { notFound } from 'next/navigation.js'\nimport React from 'react'\n\nimport { DocumentHeader } from '../../elements/DocumentHeader/index.js'\nimport { getDocumentData } from '../Document/getDocumentData.js'\nimport { getDocumentPermissions } from '../Document/getDocumentPermissions.js'\nimport { EditView } from '../Edit/index.js'\nimport { Settings } from './Settings/index.js'\n\nexport { generateAccountMetadata } from './meta.js'\n\nexport const Account: React.FC<AdminViewProps> = async ({\n  initPageResult,\n  params,\n  searchParams,\n}) => {\n  const {\n    languageOptions,\n    locale,\n    permissions,\n    req,\n    req: {\n      i18n,\n      payload,\n      payload: { config },\n      user,\n    },\n  } = initPageResult\n\n  const {\n    admin: { components: { views: { Account: CustomAccountComponent } = {} } = {}, user: userSlug },\n    routes: { api },\n    serverURL,\n  } = config\n\n  const collectionConfig = config.collections.find((collection) => collection.slug === userSlug)\n\n  if (collectionConfig && user?.id) {\n    const { docPermissions, hasPublishPermission, hasSavePermission } =\n      await getDocumentPermissions({\n        id: user.id,\n        collectionConfig,\n        data: user,\n        req,\n      })\n\n    const { data, formState } = await getDocumentData({\n      id: user.id,\n      collectionConfig,\n      locale,\n      req,\n    })\n\n    const viewComponentProps: ServerSideEditViewProps = {\n      initPageResult,\n      params,\n      routeSegments: [],\n      searchParams,\n    }\n\n    return (\n      <DocumentInfoProvider\n        AfterFields={<Settings i18n={i18n} languageOptions={languageOptions} />}\n        action={`${serverURL}${api}/${userSlug}${user?.id ? `/${user.id}` : ''}`}\n        apiURL={`${serverURL}${api}/${userSlug}${user?.id ? `/${user.id}` : ''}`}\n        collectionSlug={userSlug}\n        docPermissions={docPermissions}\n        hasPublishPermission={hasPublishPermission}\n        hasSavePermission={hasSavePermission}\n        id={user?.id.toString()}\n        initialData={data}\n        initialState={formState}\n        isEditing\n      >\n        <DocumentHeader\n          collectionConfig={collectionConfig}\n          config={payload.config}\n          hideTabs\n          i18n={i18n}\n          permissions={permissions}\n        />\n        <HydrateClientUser permissions={permissions} user={user} />\n        <FormQueryParamsProvider\n          initialParams={{\n            depth: 0,\n            'fallback-locale': 'null',\n            locale: locale?.code,\n            uploadEdits: undefined,\n          }}\n        >\n          <RenderCustomComponent\n            CustomComponent={\n              typeof CustomAccountComponent === 'function' ? CustomAccountComponent : undefined\n            }\n            DefaultComponent={EditView}\n            componentProps={viewComponentProps}\n            serverOnlyProps={{\n              i18n,\n              locale,\n              params,\n              payload,\n              permissions,\n              searchParams,\n              user,\n            }}\n          />\n        </FormQueryParamsProvider>\n      </DocumentInfoProvider>\n    )\n  }\n\n  return notFound()\n}\n"],"names":["DocumentInfoProvider","FormQueryParamsProvider","HydrateClientUser","RenderCustomComponent","notFound","React","DocumentHeader","getDocumentData","getDocumentPermissions","EditView","Settings","generateAccountMetadata","Account","initPageResult","params","searchParams","languageOptions","locale","permissions","req","i18n","payload","config","user","admin","components","views","CustomAccountComponent","userSlug","routes","api","serverURL","collectionConfig","collections","find","collection","slug","id","docPermissions","hasPublishPermission","hasSavePermission","data","formState","viewComponentProps","routeSegments","AfterFields","action","apiURL","collectionSlug","toString","initialData","initialState","isEditing","hideTabs","initialParams","depth","code","uploadEdits","undefined","CustomComponent","DefaultComponent","componentProps","serverOnlyProps"],"mappings":";AAEA,SAASA,oBAAoB,EAAEC,uBAAuB,EAAEC,iBAAiB,QAAQ,iBAAgB;AACjG,SAASC,qBAAqB,QAAQ,wBAAuB;AAC7D,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,WAAW,QAAO;AAEzB,SAASC,cAAc,QAAQ,yCAAwC;AACvE,SAASC,eAAe,QAAQ,iCAAgC;AAChE,SAASC,sBAAsB,QAAQ,wCAAuC;AAC9E,SAASC,QAAQ,QAAQ,mBAAkB;AAC3C,SAASC,QAAQ,QAAQ,sBAAqB;AAE9C,SAASC,uBAAuB,QAAQ,YAAW;AAEnD,OAAO,MAAMC,UAAoC,OAAO,EACtDC,cAAc,EACdC,MAAM,EACNC,YAAY,EACb;IACC,MAAM,EACJC,eAAe,EACfC,MAAM,EACNC,WAAW,EACXC,GAAG,EACHA,KAAK,EACHC,IAAI,EACJC,OAAO,EACPA,SAAS,EAAEC,MAAM,EAAE,EACnBC,IAAI,EACL,EACF,GAAGV;IAEJ,MAAM,EACJW,OAAO,EAAEC,YAAY,EAAEC,OAAO,EAAEd,SAASe,sBAAsB,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAEJ,MAAMK,QAAQ,EAAE,EAC/FC,QAAQ,EAAEC,GAAG,EAAE,EACfC,SAAS,EACV,GAAGT;IAEJ,MAAMU,mBAAmBV,OAAOW,WAAW,CAACC,IAAI,CAAC,CAACC,aAAeA,WAAWC,IAAI,KAAKR;IAErF,IAAII,oBAAoBT,MAAMc,IAAI;QAChC,MAAM,EAAEC,cAAc,EAAEC,oBAAoB,EAAEC,iBAAiB,EAAE,GAC/D,MAAMhC,uBAAuB;YAC3B6B,IAAId,KAAKc,EAAE;YACXL;YACAS,MAAMlB;YACNJ;QACF;QAEF,MAAM,EAAEsB,IAAI,EAAEC,SAAS,EAAE,GAAG,MAAMnC,gBAAgB;YAChD8B,IAAId,KAAKc,EAAE;YACXL;YACAf;YACAE;QACF;QAEA,MAAMwB,qBAA8C;YAClD9B;YACAC;YACA8B,eAAe,EAAE;YACjB7B;QACF;QAEA,qBACE,MAACf;YACC6C,2BAAa,KAACnC;gBAASU,MAAMA;gBAAMJ,iBAAiBA;;YACpD8B,QAAQ,CAAC,EAAEf,UAAU,EAAED,IAAI,CAAC,EAAEF,SAAS,EAAEL,MAAMc,KAAK,CAAC,CAAC,EAAEd,KAAKc,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;YACxEU,QAAQ,CAAC,EAAEhB,UAAU,EAAED,IAAI,CAAC,EAAEF,SAAS,EAAEL,MAAMc,KAAK,CAAC,CAAC,EAAEd,KAAKc,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;YACxEW,gBAAgBpB;YAChBU,gBAAgBA;YAChBC,sBAAsBA;YACtBC,mBAAmBA;YACnBH,IAAId,MAAMc,GAAGY;YACbC,aAAaT;YACbU,cAAcT;YACdU,SAAS;;8BAET,KAAC9C;oBACC0B,kBAAkBA;oBAClBV,QAAQD,QAAQC,MAAM;oBACtB+B,QAAQ;oBACRjC,MAAMA;oBACNF,aAAaA;;8BAEf,KAAChB;oBAAkBgB,aAAaA;oBAAaK,MAAMA;;8BACnD,KAACtB;oBACCqD,eAAe;wBACbC,OAAO;wBACP,mBAAmB;wBACnBtC,QAAQA,QAAQuC;wBAChBC,aAAaC;oBACf;8BAEA,cAAA,KAACvD;wBACCwD,iBACE,OAAOhC,2BAA2B,aAAaA,yBAAyB+B;wBAE1EE,kBAAkBnD;wBAClBoD,gBAAgBlB;wBAChBmB,iBAAiB;4BACf1C;4BACAH;4BACAH;4BACAO;4BACAH;4BACAH;4BACAQ;wBACF;;;;;IAKV;IAEA,OAAOnB;AACT,EAAC"}
+{"version":3,"sources":["../../../src/views/Account/index.tsx"],"sourcesContent":["import type { AdminViewProps, ServerSideEditViewProps } from 'payload'\n\nimport { DocumentInfoProvider, HydrateClientUser } from '@payloadcms/ui'\nimport { RenderCustomComponent } from '@payloadcms/ui/shared'\nimport { notFound } from 'next/navigation.js'\nimport React from 'react'\n\nimport { DocumentHeader } from '../../elements/DocumentHeader/index.js'\nimport { getDocumentData } from '../Document/getDocumentData.js'\nimport { getDocumentPermissions } from '../Document/getDocumentPermissions.js'\nimport { EditView } from '../Edit/index.js'\nimport { Settings } from './Settings/index.js'\n\nexport { generateAccountMetadata } from './meta.js'\n\nexport const Account: React.FC<AdminViewProps> = async ({\n  initPageResult,\n  params,\n  searchParams,\n}) => {\n  const {\n    languageOptions,\n    locale,\n    permissions,\n    req,\n    req: {\n      i18n,\n      payload,\n      payload: { config },\n      user,\n    },\n  } = initPageResult\n\n  const {\n    admin: { components: { views: { Account: CustomAccountComponent } = {} } = {}, user: userSlug },\n    routes: { api },\n    serverURL,\n  } = config\n\n  const collectionConfig = config.collections.find((collection) => collection.slug === userSlug)\n\n  if (collectionConfig && user?.id) {\n    const { docPermissions, hasPublishPermission, hasSavePermission } =\n      await getDocumentPermissions({\n        id: user.id,\n        collectionConfig,\n        data: user,\n        req,\n      })\n\n    const { data, formState } = await getDocumentData({\n      id: user.id,\n      collectionConfig,\n      locale,\n      req,\n    })\n\n    const viewComponentProps: ServerSideEditViewProps = {\n      initPageResult,\n      params,\n      routeSegments: [],\n      searchParams,\n    }\n\n    return (\n      <DocumentInfoProvider\n        AfterFields={<Settings i18n={i18n} languageOptions={languageOptions} />}\n        apiURL={`${serverURL}${api}/${userSlug}${user?.id ? `/${user.id}` : ''}`}\n        collectionSlug={userSlug}\n        docPermissions={docPermissions}\n        hasPublishPermission={hasPublishPermission}\n        hasSavePermission={hasSavePermission}\n        id={user?.id.toString()}\n        initialData={data}\n        initialState={formState}\n        isEditing\n      >\n        <DocumentHeader\n          collectionConfig={collectionConfig}\n          config={payload.config}\n          hideTabs\n          i18n={i18n}\n          permissions={permissions}\n        />\n        <HydrateClientUser permissions={permissions} user={user} />\n        <RenderCustomComponent\n          CustomComponent={\n            typeof CustomAccountComponent === 'function' ? CustomAccountComponent : undefined\n          }\n          DefaultComponent={EditView}\n          componentProps={viewComponentProps}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      </DocumentInfoProvider>\n    )\n  }\n\n  return notFound()\n}\n"],"names":["DocumentInfoProvider","HydrateClientUser","RenderCustomComponent","notFound","React","DocumentHeader","getDocumentData","getDocumentPermissions","EditView","Settings","generateAccountMetadata","Account","initPageResult","params","searchParams","languageOptions","locale","permissions","req","i18n","payload","config","user","admin","components","views","CustomAccountComponent","userSlug","routes","api","serverURL","collectionConfig","collections","find","collection","slug","id","docPermissions","hasPublishPermission","hasSavePermission","data","formState","viewComponentProps","routeSegments","AfterFields","apiURL","collectionSlug","toString","initialData","initialState","isEditing","hideTabs","CustomComponent","undefined","DefaultComponent","componentProps","serverOnlyProps"],"mappings":";AAEA,SAASA,oBAAoB,EAAEC,iBAAiB,QAAQ,iBAAgB;AACxE,SAASC,qBAAqB,QAAQ,wBAAuB;AAC7D,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,WAAW,QAAO;AAEzB,SAASC,cAAc,QAAQ,yCAAwC;AACvE,SAASC,eAAe,QAAQ,iCAAgC;AAChE,SAASC,sBAAsB,QAAQ,wCAAuC;AAC9E,SAASC,QAAQ,QAAQ,mBAAkB;AAC3C,SAASC,QAAQ,QAAQ,sBAAqB;AAE9C,SAASC,uBAAuB,QAAQ,YAAW;AAEnD,OAAO,MAAMC,UAAoC,OAAO,EACtDC,cAAc,EACdC,MAAM,EACNC,YAAY,EACb;IACC,MAAM,EACJC,eAAe,EACfC,MAAM,EACNC,WAAW,EACXC,GAAG,EACHA,KAAK,EACHC,IAAI,EACJC,OAAO,EACPA,SAAS,EAAEC,MAAM,EAAE,EACnBC,IAAI,EACL,EACF,GAAGV;IAEJ,MAAM,EACJW,OAAO,EAAEC,YAAY,EAAEC,OAAO,EAAEd,SAASe,sBAAsB,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAEJ,MAAMK,QAAQ,EAAE,EAC/FC,QAAQ,EAAEC,GAAG,EAAE,EACfC,SAAS,EACV,GAAGT;IAEJ,MAAMU,mBAAmBV,OAAOW,WAAW,CAACC,IAAI,CAAC,CAACC,aAAeA,WAAWC,IAAI,KAAKR;IAErF,IAAII,oBAAoBT,MAAMc,IAAI;QAChC,MAAM,EAAEC,cAAc,EAAEC,oBAAoB,EAAEC,iBAAiB,EAAE,GAC/D,MAAMhC,uBAAuB;YAC3B6B,IAAId,KAAKc,EAAE;YACXL;YACAS,MAAMlB;YACNJ;QACF;QAEF,MAAM,EAAEsB,IAAI,EAAEC,SAAS,EAAE,GAAG,MAAMnC,gBAAgB;YAChD8B,IAAId,KAAKc,EAAE;YACXL;YACAf;YACAE;QACF;QAEA,MAAMwB,qBAA8C;YAClD9B;YACAC;YACA8B,eAAe,EAAE;YACjB7B;QACF;QAEA,qBACE,MAACd;YACC4C,2BAAa,KAACnC;gBAASU,MAAMA;gBAAMJ,iBAAiBA;;YACpD8B,QAAQ,CAAC,EAAEf,UAAU,EAAED,IAAI,CAAC,EAAEF,SAAS,EAAEL,MAAMc,KAAK,CAAC,CAAC,EAAEd,KAAKc,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;YACxEU,gBAAgBnB;YAChBU,gBAAgBA;YAChBC,sBAAsBA;YACtBC,mBAAmBA;YACnBH,IAAId,MAAMc,GAAGW;YACbC,aAAaR;YACbS,cAAcR;YACdS,SAAS;;8BAET,KAAC7C;oBACC0B,kBAAkBA;oBAClBV,QAAQD,QAAQC,MAAM;oBACtB8B,QAAQ;oBACRhC,MAAMA;oBACNF,aAAaA;;8BAEf,KAAChB;oBAAkBgB,aAAaA;oBAAaK,MAAMA;;8BACnD,KAACpB;oBACCkD,iBACE,OAAO1B,2BAA2B,aAAaA,yBAAyB2B;oBAE1EC,kBAAkB9C;oBAClB+C,gBAAgBb;oBAChBc,iBAAiB;wBACfrC;wBACAH;wBACAH;wBACAO;wBACAH;wBACAH;wBACAQ;oBACF;;;;IAIR;IAEA,OAAOnB;AACT,EAAC"}

package/dist/views/CreateFirstUser/index.client.d.ts

@@ -1,7 +1,8 @@
-import type { FormState } from 'payload';
+import type { FormState, LoginWithUsernameOptions } from 'payload';
 import React from 'react';
 export declare const CreateFirstUserClient: React.FC<{
     initialState: FormState;
+    loginWithUsername?: LoginWithUsernameOptions | false;
     userSlug: string;
 }>;
 //# sourceMappingURL=index.client.d.ts.map

package/dist/views/CreateFirstUser/index.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/CreateFirstUser/index.client.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAexC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,SAAS,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAuDA,CAAA"}
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/CreateFirstUser/index.client.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAclE,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,SAAS,CAAA;IACvB,iBAAiB,CAAC,EAAE,wBAAwB,GAAG,KAAK,CAAA;IACpD,QAAQ,EAAE,MAAM,CAAA;CACjB,CAuDA,CAAA"}

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

@@ -1,27 +1,26 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ConfirmPasswordField, EmailField, Form, FormSubmit, PasswordField, RenderFields, useComponentMap, useConfig, useTranslation } from '@payloadcms/ui';
+import { ConfirmPasswordField, Form, FormSubmit, PasswordField, RenderFields, useComponentMap, useConfig, useTranslation } from '@payloadcms/ui';
 import { getFormState } from '@payloadcms/ui/shared';
 import React from 'react';
-export const CreateFirstUserClient = ({ initialState, userSlug })=>{
+import { EmailAndUsernameFields } from '../../elements/EmailAndUsername/index.js';
+export const CreateFirstUserClient = ({ initialState, loginWithUsername, userSlug })=>{
     const { getFieldMap } = useComponentMap();
     const { routes: { admin, api: apiRoute }, serverURL } = useConfig();
     const { t } = useTranslation();
     const fieldMap = getFieldMap({
         collectionSlug: userSlug
     });
-    const onChange = React.useCallback(async ({ formState: prevFormState })=>{
-        return getFormState({
+    const onChange = React.useCallback(async ({ formState: prevFormState })=>getFormState({
             apiRoute,
             body: {
                 collectionSlug: userSlug,
                 formState: prevFormState,
                 operation: 'create',
-                schemaPath: userSlug
+                schemaPath: `_${userSlug}.auth`
             },
             serverURL
-        });
-    }, [
+        }), [
         apiRoute,
         userSlug,
         serverURL
@@ -36,27 +35,26 @@ export const CreateFirstUserClient = ({ initialState, userSlug })=>{
         redirect: admin,
         validationOperation: "create",
         children: [
-            /*#__PURE__*/ _jsx(EmailField, {
-                autoComplete: "email",
-                label: t('general:email'),
-                name: "email",
-                required: true
+            /*#__PURE__*/ _jsx(EmailAndUsernameFields, {
+                loginWithUsername: loginWithUsername
             }),
             /*#__PURE__*/ _jsx(PasswordField, {
-                autoComplete: "off",
                 label: t('authentication:newPassword'),
                 name: "password",
+                path: "password",
                 required: true
             }),
             /*#__PURE__*/ _jsx(ConfirmPasswordField, {}),
             /*#__PURE__*/ _jsx(RenderFields, {
                 fieldMap: fieldMap,
+                forceRender: true,
                 operation: "create",
                 path: "",
                 readOnly: false,
                 schemaPath: userSlug
             }),
             /*#__PURE__*/ _jsx(FormSubmit, {
+                size: "large",
                 children: t('general:create')
             })
         ]

package/dist/views/CreateFirstUser/index.client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/CreateFirstUser/index.client.tsx"],"sourcesContent":["'use client'\nimport type { FormState } from 'payload'\n\nimport {\n  ConfirmPasswordField,\n  EmailField,\n  Form,\n  type FormProps,\n  FormSubmit,\n  PasswordField,\n  RenderFields,\n  useComponentMap,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { getFormState } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nexport const CreateFirstUserClient: React.FC<{\n  initialState: FormState\n  userSlug: string\n}> = ({ initialState, userSlug }) => {\n  const { getFieldMap } = useComponentMap()\n\n  const {\n    routes: { admin, api: apiRoute },\n    serverURL,\n  } = useConfig()\n\n  const { t } = useTranslation()\n\n  const fieldMap = getFieldMap({ collectionSlug: userSlug })\n\n  const onChange: FormProps['onChange'][0] = React.useCallback(\n    async ({ formState: prevFormState }) => {\n      return getFormState({\n        apiRoute,\n        body: {\n          collectionSlug: userSlug,\n          formState: prevFormState,\n          operation: 'create',\n          schemaPath: userSlug,\n        },\n        serverURL,\n      })\n    },\n    [apiRoute, userSlug, serverURL],\n  )\n\n  return (\n    <Form\n      action={`${serverURL}${apiRoute}/${userSlug}/first-register`}\n      initialState={initialState}\n      method=\"POST\"\n      onChange={[onChange]}\n      redirect={admin}\n      validationOperation=\"create\"\n    >\n      <EmailField autoComplete=\"email\" label={t('general:email')} name=\"email\" required />\n      <PasswordField\n        autoComplete=\"off\"\n        label={t('authentication:newPassword')}\n        name=\"password\"\n        required\n      />\n      <ConfirmPasswordField />\n      <RenderFields\n        fieldMap={fieldMap}\n        operation=\"create\"\n        path=\"\"\n        readOnly={false}\n        schemaPath={userSlug}\n      />\n      <FormSubmit>{t('general:create')}</FormSubmit>\n    </Form>\n  )\n}\n"],"names":["ConfirmPasswordField","EmailField","Form","FormSubmit","PasswordField","RenderFields","useComponentMap","useConfig","useTranslation","getFormState","React","CreateFirstUserClient","initialState","userSlug","getFieldMap","routes","admin","api","apiRoute","serverURL","t","fieldMap","collectionSlug","onChange","useCallback","formState","prevFormState","body","operation","schemaPath","action","method","redirect","validationOperation","autoComplete","label","name","required","path","readOnly"],"mappings":"AAAA;;AAGA,SACEA,oBAAoB,EACpBC,UAAU,EACVC,IAAI,EAEJC,UAAU,EACVC,aAAa,EACbC,YAAY,EACZC,eAAe,EACfC,SAAS,EACTC,cAAc,QACT,iBAAgB;AACvB,SAASC,YAAY,QAAQ,wBAAuB;AACpD,OAAOC,WAAW,QAAO;AAEzB,OAAO,MAAMC,wBAGR,CAAC,EAAEC,YAAY,EAAEC,QAAQ,EAAE;IAC9B,MAAM,EAAEC,WAAW,EAAE,GAAGR;IAExB,MAAM,EACJS,QAAQ,EAAEC,KAAK,EAAEC,KAAKC,QAAQ,EAAE,EAChCC,SAAS,EACV,GAAGZ;IAEJ,MAAM,EAAEa,CAAC,EAAE,GAAGZ;IAEd,MAAMa,WAAWP,YAAY;QAAEQ,gBAAgBT;IAAS;IAExD,MAAMU,WAAqCb,MAAMc,WAAW,CAC1D,OAAO,EAAEC,WAAWC,aAAa,EAAE;QACjC,OAAOjB,aAAa;YAClBS;YACAS,MAAM;gBACJL,gBAAgBT;gBAChBY,WAAWC;gBACXE,WAAW;gBACXC,YAAYhB;YACd;YACAM;QACF;IACF,GACA;QAACD;QAAUL;QAAUM;KAAU;IAGjC,qBACE,MAACjB;QACC4B,QAAQ,CAAC,EAAEX,UAAU,EAAED,SAAS,CAAC,EAAEL,SAAS,eAAe,CAAC;QAC5DD,cAAcA;QACdmB,QAAO;QACPR,UAAU;YAACA;SAAS;QACpBS,UAAUhB;QACViB,qBAAoB;;0BAEpB,KAAChC;gBAAWiC,cAAa;gBAAQC,OAAOf,EAAE;gBAAkBgB,MAAK;gBAAQC,QAAQ;;0BACjF,KAACjC;gBACC8B,cAAa;gBACbC,OAAOf,EAAE;gBACTgB,MAAK;gBACLC,QAAQ;;0BAEV,KAACrC;0BACD,KAACK;gBACCgB,UAAUA;gBACVO,WAAU;gBACVU,MAAK;gBACLC,UAAU;gBACVV,YAAYhB;;0BAEd,KAACV;0BAAYiB,EAAE;;;;AAGrB,EAAC"}
+{"version":3,"sources":["../../../src/views/CreateFirstUser/index.client.tsx"],"sourcesContent":["'use client'\nimport type { FormState, LoginWithUsernameOptions } from 'payload'\n\nimport {\n  ConfirmPasswordField,\n  Form,\n  type FormProps,\n  FormSubmit,\n  PasswordField,\n  RenderFields,\n  useComponentMap,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { getFormState } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nimport { EmailAndUsernameFields } from '../../elements/EmailAndUsername/index.js'\n\nexport const CreateFirstUserClient: React.FC<{\n  initialState: FormState\n  loginWithUsername?: LoginWithUsernameOptions | false\n  userSlug: string\n}> = ({ initialState, loginWithUsername, userSlug }) => {\n  const { getFieldMap } = useComponentMap()\n\n  const {\n    routes: { admin, api: apiRoute },\n    serverURL,\n  } = useConfig()\n\n  const { t } = useTranslation()\n\n  const fieldMap = getFieldMap({ collectionSlug: userSlug })\n\n  const onChange: FormProps['onChange'][0] = React.useCallback(\n    async ({ formState: prevFormState }) =>\n      getFormState({\n        apiRoute,\n        body: {\n          collectionSlug: userSlug,\n          formState: prevFormState,\n          operation: 'create',\n          schemaPath: `_${userSlug}.auth`,\n        },\n        serverURL,\n      }),\n    [apiRoute, userSlug, serverURL],\n  )\n\n  return (\n    <Form\n      action={`${serverURL}${apiRoute}/${userSlug}/first-register`}\n      initialState={initialState}\n      method=\"POST\"\n      onChange={[onChange]}\n      redirect={admin}\n      validationOperation=\"create\"\n    >\n      <EmailAndUsernameFields loginWithUsername={loginWithUsername} />\n      <PasswordField\n        label={t('authentication:newPassword')}\n        name=\"password\"\n        path=\"password\"\n        required\n      />\n      <ConfirmPasswordField />\n      <RenderFields\n        fieldMap={fieldMap}\n        forceRender\n        operation=\"create\"\n        path=\"\"\n        readOnly={false}\n        schemaPath={userSlug}\n      />\n      <FormSubmit size=\"large\">{t('general:create')}</FormSubmit>\n    </Form>\n  )\n}\n"],"names":["ConfirmPasswordField","Form","FormSubmit","PasswordField","RenderFields","useComponentMap","useConfig","useTranslation","getFormState","React","EmailAndUsernameFields","CreateFirstUserClient","initialState","loginWithUsername","userSlug","getFieldMap","routes","admin","api","apiRoute","serverURL","t","fieldMap","collectionSlug","onChange","useCallback","formState","prevFormState","body","operation","schemaPath","action","method","redirect","validationOperation","label","name","path","required","forceRender","readOnly","size"],"mappings":"AAAA;;AAGA,SACEA,oBAAoB,EACpBC,IAAI,EAEJC,UAAU,EACVC,aAAa,EACbC,YAAY,EACZC,eAAe,EACfC,SAAS,EACTC,cAAc,QACT,iBAAgB;AACvB,SAASC,YAAY,QAAQ,wBAAuB;AACpD,OAAOC,WAAW,QAAO;AAEzB,SAASC,sBAAsB,QAAQ,2CAA0C;AAEjF,OAAO,MAAMC,wBAIR,CAAC,EAAEC,YAAY,EAAEC,iBAAiB,EAAEC,QAAQ,EAAE;IACjD,MAAM,EAAEC,WAAW,EAAE,GAAGV;IAExB,MAAM,EACJW,QAAQ,EAAEC,KAAK,EAAEC,KAAKC,QAAQ,EAAE,EAChCC,SAAS,EACV,GAAGd;IAEJ,MAAM,EAAEe,CAAC,EAAE,GAAGd;IAEd,MAAMe,WAAWP,YAAY;QAAEQ,gBAAgBT;IAAS;IAExD,MAAMU,WAAqCf,MAAMgB,WAAW,CAC1D,OAAO,EAAEC,WAAWC,aAAa,EAAE,GACjCnB,aAAa;YACXW;YACAS,MAAM;gBACJL,gBAAgBT;gBAChBY,WAAWC;gBACXE,WAAW;gBACXC,YAAY,CAAC,CAAC,EAAEhB,SAAS,KAAK,CAAC;YACjC;YACAM;QACF,IACF;QAACD;QAAUL;QAAUM;KAAU;IAGjC,qBACE,MAACnB;QACC8B,QAAQ,CAAC,EAAEX,UAAU,EAAED,SAAS,CAAC,EAAEL,SAAS,eAAe,CAAC;QAC5DF,cAAcA;QACdoB,QAAO;QACPR,UAAU;YAACA;SAAS;QACpBS,UAAUhB;QACViB,qBAAoB;;0BAEpB,KAACxB;gBAAuBG,mBAAmBA;;0BAC3C,KAACV;gBACCgC,OAAOd,EAAE;gBACTe,MAAK;gBACLC,MAAK;gBACLC,QAAQ;;0BAEV,KAACtC;0BACD,KAACI;gBACCkB,UAAUA;gBACViB,WAAW;gBACXV,WAAU;gBACVQ,MAAK;gBACLG,UAAU;gBACVV,YAAYhB;;0BAEd,KAACZ;gBAAWuC,MAAK;0BAASpB,EAAE;;;;AAGlC,EAAC"}

package/dist/views/CreateFirstUser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/CreateFirstUser/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AAGpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,cAAc,CAAA;AAErB,OAAO,EAAE,+BAA+B,EAAE,MAAM,WAAW,CAAA;AAE3D,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA+CxD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/CreateFirstUser/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,cAAc,CAAA;AAErB,OAAO,EAAE,+BAA+B,EAAE,MAAM,WAAW,CAAA;AAE3D,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAoCxD,CAAA"}

package/dist/views/CreateFirstUser/index.js

@@ -1,37 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { buildStateFromSchema } from '@payloadcms/ui/forms/buildStateFromSchema';
 import React from 'react';
+import { getDocumentData } from '../Document/getDocumentData.js';
 import { CreateFirstUserClient } from './index.client.js';
 export { generateCreateFirstUserMetadata } from './meta.js';
 export const CreateFirstUserView = async ({ initPageResult })=>{
-    const { req, req: { payload: { config: { admin: { user: userSlug } } } } } = initPageResult;
-    const fields = [
-        {
-            name: 'email',
-            type: 'email',
-            label: req.t('general:emailAddress'),
-            required: true
-        },
-        {
-            name: 'password',
-            type: 'text',
-            label: req.t('general:password'),
-            required: true
-        },
-        {
-            name: 'confirm-password',
-            type: 'text',
-            label: req.t('authentication:confirmPassword'),
-            required: true
-        }
-    ];
-    const formState = await buildStateFromSchema({
-        fieldSchema: fields,
-        operation: 'create',
-        preferences: {
-            fields: {}
-        },
-        req
+    const { locale, req, req: { payload: { config: { admin: { user: userSlug } }, config } } } = initPageResult;
+    const collectionConfig = config.collections?.find((collection)=>collection?.slug === userSlug);
+    const { auth: authOptions } = collectionConfig;
+    const loginWithUsername = authOptions.loginWithUsername;
+    const { formState } = await getDocumentData({
+        collectionConfig,
+        locale,
+        req,
+        schemaPath: `_${collectionConfig.slug}.auth`
     });
     return /*#__PURE__*/ _jsxs("div", {
         className: "create-first-user",
@@ -44,6 +25,7 @@ export const CreateFirstUserView = async ({ initPageResult })=>{
             }),
             /*#__PURE__*/ _jsx(CreateFirstUserClient, {
                 initialState: formState,
+                loginWithUsername: loginWithUsername,
                 userSlug: userSlug
             })
         ]

package/dist/views/CreateFirstUser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/CreateFirstUser/index.tsx"],"sourcesContent":["import type { AdminViewProps, Field } from 'payload'\n\nimport { buildStateFromSchema } from '@payloadcms/ui/forms/buildStateFromSchema'\nimport React from 'react'\n\nimport { CreateFirstUserClient } from './index.client.js'\nimport './index.scss'\n\nexport { generateCreateFirstUserMetadata } from './meta.js'\n\nexport const CreateFirstUserView: React.FC<AdminViewProps> = async ({ initPageResult }) => {\n  const {\n    req,\n    req: {\n      payload: {\n        config: {\n          admin: { user: userSlug },\n        },\n      },\n    },\n  } = initPageResult\n\n  const fields: Field[] = [\n    {\n      name: 'email',\n      type: 'email',\n      label: req.t('general:emailAddress'),\n      required: true,\n    },\n    {\n      name: 'password',\n      type: 'text',\n      label: req.t('general:password'),\n      required: true,\n    },\n    {\n      name: 'confirm-password',\n      type: 'text',\n      label: req.t('authentication:confirmPassword'),\n      required: true,\n    },\n  ]\n\n  const formState = await buildStateFromSchema({\n    fieldSchema: fields,\n    operation: 'create',\n    preferences: { fields: {} },\n    req,\n  })\n\n  return (\n    <div className=\"create-first-user\">\n      <h1>{req.t('general:welcome')}</h1>\n      <p>{req.t('authentication:beginCreateFirstUser')}</p>\n      <CreateFirstUserClient initialState={formState} userSlug={userSlug} />\n    </div>\n  )\n}\n"],"names":["buildStateFromSchema","React","CreateFirstUserClient","generateCreateFirstUserMetadata","CreateFirstUserView","initPageResult","req","payload","config","admin","user","userSlug","fields","name","type","label","t","required","formState","fieldSchema","operation","preferences","div","className","h1","p","initialState"],"mappings":";AAEA,SAASA,oBAAoB,QAAQ,4CAA2C;AAChF,OAAOC,WAAW,QAAO;AAEzB,SAASC,qBAAqB,QAAQ,oBAAmB;AAGzD,SAASC,+BAA+B,QAAQ,YAAW;AAE3D,OAAO,MAAMC,sBAAgD,OAAO,EAAEC,cAAc,EAAE;IACpF,MAAM,EACJC,GAAG,EACHA,KAAK,EACHC,SAAS,EACPC,QAAQ,EACNC,OAAO,EAAEC,MAAMC,QAAQ,EAAE,EAC1B,EACF,EACF,EACF,GAAGN;IAEJ,MAAMO,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNC,OAAOT,IAAIU,CAAC,CAAC;YACbC,UAAU;QACZ;QACA;YACEJ,MAAM;YACNC,MAAM;YACNC,OAAOT,IAAIU,CAAC,CAAC;YACbC,UAAU;QACZ;QACA;YACEJ,MAAM;YACNC,MAAM;YACNC,OAAOT,IAAIU,CAAC,CAAC;YACbC,UAAU;QACZ;KACD;IAED,MAAMC,YAAY,MAAMlB,qBAAqB;QAC3CmB,aAAaP;QACbQ,WAAW;QACXC,aAAa;YAAET,QAAQ,CAAC;QAAE;QAC1BN;IACF;IAEA,qBACE,MAACgB;QAAIC,WAAU;;0BACb,KAACC;0BAAIlB,IAAIU,CAAC,CAAC;;0BACX,KAACS;0BAAGnB,IAAIU,CAAC,CAAC;;0BACV,KAACd;gBAAsBwB,cAAcR;gBAAWP,UAAUA;;;;AAGhE,EAAC"}
+{"version":3,"sources":["../../../src/views/CreateFirstUser/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport React from 'react'\n\nimport type { LoginFieldProps } from '../Login/LoginField/index.js'\n\nimport { getDocumentData } from '../Document/getDocumentData.js'\nimport { CreateFirstUserClient } from './index.client.js'\nimport './index.scss'\n\nexport { generateCreateFirstUserMetadata } from './meta.js'\n\nexport const CreateFirstUserView: React.FC<AdminViewProps> = async ({ initPageResult }) => {\n  const {\n    locale,\n    req,\n    req: {\n      payload: {\n        config: {\n          admin: { user: userSlug },\n        },\n        config,\n      },\n    },\n  } = initPageResult\n\n  const collectionConfig = config.collections?.find((collection) => collection?.slug === userSlug)\n  const { auth: authOptions } = collectionConfig\n  const loginWithUsername = authOptions.loginWithUsername\n\n  const { formState } = await getDocumentData({\n    collectionConfig,\n    locale,\n    req,\n    schemaPath: `_${collectionConfig.slug}.auth`,\n  })\n\n  return (\n    <div className=\"create-first-user\">\n      <h1>{req.t('general:welcome')}</h1>\n      <p>{req.t('authentication:beginCreateFirstUser')}</p>\n      <CreateFirstUserClient\n        initialState={formState}\n        loginWithUsername={loginWithUsername}\n        userSlug={userSlug}\n      />\n    </div>\n  )\n}\n"],"names":["React","getDocumentData","CreateFirstUserClient","generateCreateFirstUserMetadata","CreateFirstUserView","initPageResult","locale","req","payload","config","admin","user","userSlug","collectionConfig","collections","find","collection","slug","auth","authOptions","loginWithUsername","formState","schemaPath","div","className","h1","t","p","initialState"],"mappings":";AAEA,OAAOA,WAAW,QAAO;AAIzB,SAASC,eAAe,QAAQ,iCAAgC;AAChE,SAASC,qBAAqB,QAAQ,oBAAmB;AAGzD,SAASC,+BAA+B,QAAQ,YAAW;AAE3D,OAAO,MAAMC,sBAAgD,OAAO,EAAEC,cAAc,EAAE;IACpF,MAAM,EACJC,MAAM,EACNC,GAAG,EACHA,KAAK,EACHC,SAAS,EACPC,QAAQ,EACNC,OAAO,EAAEC,MAAMC,QAAQ,EAAE,EAC1B,EACDH,MAAM,EACP,EACF,EACF,GAAGJ;IAEJ,MAAMQ,mBAAmBJ,OAAOK,WAAW,EAAEC,KAAK,CAACC,aAAeA,YAAYC,SAASL;IACvF,MAAM,EAAEM,MAAMC,WAAW,EAAE,GAAGN;IAC9B,MAAMO,oBAAoBD,YAAYC,iBAAiB;IAEvD,MAAM,EAAEC,SAAS,EAAE,GAAG,MAAMpB,gBAAgB;QAC1CY;QACAP;QACAC;QACAe,YAAY,CAAC,CAAC,EAAET,iBAAiBI,IAAI,CAAC,KAAK,CAAC;IAC9C;IAEA,qBACE,MAACM;QAAIC,WAAU;;0BACb,KAACC;0BAAIlB,IAAImB,CAAC,CAAC;;0BACX,KAACC;0BAAGpB,IAAImB,CAAC,CAAC;;0BACV,KAACxB;gBACC0B,cAAcP;gBACdD,mBAAmBA;gBACnBR,UAAUA;;;;AAIlB,EAAC"}

package/dist/views/Dashboard/Default/index.d.ts

@@ -2,11 +2,11 @@ import type { groupNavItems } from '@payloadcms/ui/shared';
 import type { Permissions, ServerProps, VisibleEntities } from 'payload';
 import React from 'react';
 import './index.scss';
-export type DashboardProps = ServerProps & {
+export type DashboardProps = {
     Link: React.ComponentType<any>;
     navGroups?: ReturnType<typeof groupNavItems>;
     permissions: Permissions;
     visibleEntities: VisibleEntities;
-};
+} & ServerProps;
 export declare const DefaultDashboard: React.FC<DashboardProps>;
 //# sourceMappingURL=index.d.ts.map

package/dist/views/Dashboard/Default/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Dashboard/Default/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKxE,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,cAAc,CAAA;AAIrB,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IACzC,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IAC9B,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAA;IAC5C,WAAW,EAAE,WAAW,CAAA;IACxB,eAAe,EAAE,eAAe,CAAA;CACjC,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAyIrD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Dashboard/Default/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKxE,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,cAAc,CAAA;AAIrB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IAC9B,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAA;IAC5C,WAAW,EAAE,WAAW,CAAA;IACxB,eAAe,EAAE,eAAe,CAAA;CACjC,GAAG,WAAW,CAAA;AAEf,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAqJrD,CAAA"}

package/dist/views/Dashboard/Default/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
 import { Button, Card, Gutter, SetStepNav, SetViewActions } from '@payloadcms/ui';
-import { EntityType, WithServerSideProps } from '@payloadcms/ui/shared';
+import { EntityType, WithServerSideProps, formatAdminURL } from '@payloadcms/ui/shared';
 import React, { Fragment } from 'react';
 const baseClass = 'dashboard';
 export const DefaultDashboard = (props)=>{
@@ -71,8 +71,14 @@ export const DefaultDashboard = (props)=>{
                                                     buttonAriaLabel = t('general:showAllLabel', {
                                                         label: title
                                                     });
-                                                    href = `${adminRoute}/collections/${entity.slug}`;
-                                                    createHREF = `${adminRoute}/collections/${entity.slug}/create`;
+                                                    href = formatAdminURL({
+                                                        adminRoute,
+                                                        path: `/collections/${entity.slug}`
+                                                    });
+                                                    createHREF = formatAdminURL({
+                                                        adminRoute,
+                                                        path: `/collections/${entity.slug}/create`
+                                                    });
                                                     hasCreatePermission = permissions?.collections?.[entity.slug]?.create?.permission;
                                                 }
                                                 if (type === EntityType.global) {
@@ -80,7 +86,10 @@ export const DefaultDashboard = (props)=>{
                                                     buttonAriaLabel = t('general:editLabel', {
                                                         label: getTranslation(entity.label, i18n)
                                                     });
-                                                    href = `${adminRoute}/globals/${entity.slug}`;
+                                                    href = formatAdminURL({
+                                                        adminRoute,
+                                                        path: `/globals/${entity.slug}`
+                                                    });
                                                 }
                                                 return /*#__PURE__*/ _jsx("li", {
                                                     children: /*#__PURE__*/ _jsx(Card, {

package/dist/views/Dashboard/Default/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Dashboard/Default/index.tsx"],"sourcesContent":["import type { groupNavItems } from '@payloadcms/ui/shared'\nimport type { Permissions, ServerProps, VisibleEntities } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { Button, Card, Gutter, SetStepNav, SetViewActions } from '@payloadcms/ui'\nimport { EntityType, WithServerSideProps } from '@payloadcms/ui/shared'\nimport React, { Fragment } from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'dashboard'\n\nexport type DashboardProps = ServerProps & {\n  Link: React.ComponentType<any>\n  navGroups?: ReturnType<typeof groupNavItems>\n  permissions: Permissions\n  visibleEntities: VisibleEntities\n}\n\nexport const DefaultDashboard: React.FC<DashboardProps> = (props) => {\n  const {\n    Link,\n    i18n,\n    i18n: { t },\n    locale,\n    navGroups,\n    params,\n    payload: {\n      config: {\n        admin: {\n          components: { afterDashboard, beforeDashboard },\n        },\n        routes: { admin: adminRoute },\n      },\n    },\n    payload,\n    permissions,\n    searchParams,\n    user,\n  } = props\n\n  const BeforeDashboards = Array.isArray(beforeDashboard)\n    ? beforeDashboard.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  const AfterDashboards = Array.isArray(afterDashboard)\n    ? afterDashboard.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  return (\n    <div className={baseClass}>\n      <SetStepNav nav={[]} />\n      <SetViewActions actions={[]} />\n      <Gutter className={`${baseClass}__wrap`}>\n        {Array.isArray(BeforeDashboards) && BeforeDashboards.map((Component) => Component)}\n        <Fragment>\n          <SetViewActions actions={[]} />\n          {!navGroups || navGroups?.length === 0 ? (\n            <p>no nav groups....</p>\n          ) : (\n            navGroups.map(({ entities, label }, groupIndex) => {\n              return (\n                <div className={`${baseClass}__group`} key={groupIndex}>\n                  <h2 className={`${baseClass}__label`}>{label}</h2>\n                  <ul className={`${baseClass}__card-list`}>\n                    {entities.map(({ type, entity }, entityIndex) => {\n                      let title: string\n                      let buttonAriaLabel: string\n                      let createHREF: string\n                      let href: string\n                      let hasCreatePermission: boolean\n\n                      if (type === EntityType.collection) {\n                        title = getTranslation(entity.labels.plural, i18n)\n                        buttonAriaLabel = t('general:showAllLabel', { label: title })\n                        href = `${adminRoute}/collections/${entity.slug}`\n                        createHREF = `${adminRoute}/collections/${entity.slug}/create`\n                        hasCreatePermission =\n                          permissions?.collections?.[entity.slug]?.create?.permission\n                      }\n\n                      if (type === EntityType.global) {\n                        title = getTranslation(entity.label, i18n)\n                        buttonAriaLabel = t('general:editLabel', {\n                          label: getTranslation(entity.label, i18n),\n                        })\n                        href = `${adminRoute}/globals/${entity.slug}`\n                      }\n\n                      return (\n                        <li key={entityIndex}>\n                          <Card\n                            Link={Link}\n                            actions={\n                              hasCreatePermission && type === EntityType.collection ? (\n                                <Button\n                                  Link={Link}\n                                  aria-label={t('general:createNewLabel', {\n                                    label: getTranslation(entity.labels.singular, i18n),\n                                  })}\n                                  buttonStyle=\"icon-label\"\n                                  el=\"link\"\n                                  icon=\"plus\"\n                                  iconStyle=\"with-border\"\n                                  round\n                                  to={createHREF}\n                                />\n                              ) : undefined\n                            }\n                            buttonAriaLabel={buttonAriaLabel}\n                            href={href}\n                            id={`card-${entity.slug}`}\n                            title={title}\n                            titleAs=\"h3\"\n                          />\n                        </li>\n                      )\n                    })}\n                  </ul>\n                </div>\n              )\n            })\n          )}\n        </Fragment>\n        {Array.isArray(AfterDashboards) && AfterDashboards.map((Component) => Component)}\n      </Gutter>\n    </div>\n  )\n}\n"],"names":["getTranslation","Button","Card","Gutter","SetStepNav","SetViewActions","EntityType","WithServerSideProps","React","Fragment","baseClass","DefaultDashboard","props","Link","i18n","t","locale","navGroups","params","payload","config","admin","components","afterDashboard","beforeDashboard","routes","adminRoute","permissions","searchParams","user","BeforeDashboards","Array","isArray","map","Component","i","serverOnlyProps","AfterDashboards","div","className","nav","actions","length","p","entities","label","groupIndex","h2","ul","type","entity","entityIndex","title","buttonAriaLabel","createHREF","href","hasCreatePermission","collection","labels","plural","slug","collections","create","permission","global","li","aria-label","singular","buttonStyle","el","icon","iconStyle","round","to","undefined","id","titleAs"],"mappings":";AAGA,SAASA,cAAc,QAAQ,2BAA0B;AACzD,SAASC,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,UAAU,EAAEC,cAAc,QAAQ,iBAAgB;AACjF,SAASC,UAAU,EAAEC,mBAAmB,QAAQ,wBAAuB;AACvE,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAIvC,MAAMC,YAAY;AASlB,OAAO,MAAMC,mBAA6C,CAACC;IACzD,MAAM,EACJC,IAAI,EACJC,IAAI,EACJA,MAAM,EAAEC,CAAC,EAAE,EACXC,MAAM,EACNC,SAAS,EACTC,MAAM,EACNC,SAAS,EACPC,QAAQ,EACNC,OAAO,EACLC,YAAY,EAAEC,cAAc,EAAEC,eAAe,EAAE,EAChD,EACDC,QAAQ,EAAEJ,OAAOK,UAAU,EAAE,EAC9B,EACF,EACDP,OAAO,EACPQ,WAAW,EACXC,YAAY,EACZC,IAAI,EACL,GAAGjB;IAEJ,MAAMkB,mBAAmBC,MAAMC,OAAO,CAACR,mBACnCA,gBAAgBS,GAAG,CAAC,CAACC,WAAWC,kBAC9B,KAAC5B;YACC2B,WAAWA;YAEXE,iBAAiB;gBACftB;gBACAE;gBACAE;gBACAC;gBACAQ;gBACAC;gBACAC;YACF;WATKM,MAYT;IAEJ,MAAME,kBAAkBN,MAAMC,OAAO,CAACT,kBAClCA,eAAeU,GAAG,CAAC,CAACC,WAAWC,kBAC7B,KAAC5B;YACC2B,WAAWA;YAEXE,iBAAiB;gBACftB;gBACAE;gBACAE;gBACAC;gBACAQ;gBACAC;gBACAC;YACF;WATKM,MAYT;IAEJ,qBACE,MAACG;QAAIC,WAAW7B;;0BACd,KAACN;gBAAWoC,KAAK,EAAE;;0BACnB,KAACnC;gBAAeoC,SAAS,EAAE;;0BAC3B,MAACtC;gBAAOoC,WAAW,CAAC,EAAE7B,UAAU,MAAM,CAAC;;oBACpCqB,MAAMC,OAAO,CAACF,qBAAqBA,iBAAiBG,GAAG,CAAC,CAACC,YAAcA;kCACxE,MAACzB;;0CACC,KAACJ;gCAAeoC,SAAS,EAAE;;4BAC1B,CAACxB,aAAaA,WAAWyB,WAAW,kBACnC,KAACC;0CAAE;iCAEH1B,UAAUgB,GAAG,CAAC,CAAC,EAAEW,QAAQ,EAAEC,KAAK,EAAE,EAAEC;gCAClC,qBACE,MAACR;oCAAIC,WAAW,CAAC,EAAE7B,UAAU,OAAO,CAAC;;sDACnC,KAACqC;4CAAGR,WAAW,CAAC,EAAE7B,UAAU,OAAO,CAAC;sDAAGmC;;sDACvC,KAACG;4CAAGT,WAAW,CAAC,EAAE7B,UAAU,WAAW,CAAC;sDACrCkC,SAASX,GAAG,CAAC,CAAC,EAAEgB,IAAI,EAAEC,MAAM,EAAE,EAAEC;gDAC/B,IAAIC;gDACJ,IAAIC;gDACJ,IAAIC;gDACJ,IAAIC;gDACJ,IAAIC;gDAEJ,IAAIP,SAAS3C,WAAWmD,UAAU,EAAE;oDAClCL,QAAQpD,eAAekD,OAAOQ,MAAM,CAACC,MAAM,EAAE7C;oDAC7CuC,kBAAkBtC,EAAE,wBAAwB;wDAAE8B,OAAOO;oDAAM;oDAC3DG,OAAO,CAAC,EAAE7B,WAAW,aAAa,EAAEwB,OAAOU,IAAI,CAAC,CAAC;oDACjDN,aAAa,CAAC,EAAE5B,WAAW,aAAa,EAAEwB,OAAOU,IAAI,CAAC,OAAO,CAAC;oDAC9DJ,sBACE7B,aAAakC,aAAa,CAACX,OAAOU,IAAI,CAAC,EAAEE,QAAQC;gDACrD;gDAEA,IAAId,SAAS3C,WAAW0D,MAAM,EAAE;oDAC9BZ,QAAQpD,eAAekD,OAAOL,KAAK,EAAE/B;oDACrCuC,kBAAkBtC,EAAE,qBAAqB;wDACvC8B,OAAO7C,eAAekD,OAAOL,KAAK,EAAE/B;oDACtC;oDACAyC,OAAO,CAAC,EAAE7B,WAAW,SAAS,EAAEwB,OAAOU,IAAI,CAAC,CAAC;gDAC/C;gDAEA,qBACE,KAACK;8DACC,cAAA,KAAC/D;wDACCW,MAAMA;wDACN4B,SACEe,uBAAuBP,SAAS3C,WAAWmD,UAAU,iBACnD,KAACxD;4DACCY,MAAMA;4DACNqD,cAAYnD,EAAE,0BAA0B;gEACtC8B,OAAO7C,eAAekD,OAAOQ,MAAM,CAACS,QAAQ,EAAErD;4DAChD;4DACAsD,aAAY;4DACZC,IAAG;4DACHC,MAAK;4DACLC,WAAU;4DACVC,KAAK;4DACLC,IAAInB;6DAEJoB;wDAENrB,iBAAiBA;wDACjBE,MAAMA;wDACNoB,IAAI,CAAC,KAAK,EAAEzB,OAAOU,IAAI,CAAC,CAAC;wDACzBR,OAAOA;wDACPwB,SAAQ;;mDAvBHzB;4CA2Bb;;;mCAvDwCL;4BA2DhD;;;oBAGHf,MAAMC,OAAO,CAACK,oBAAoBA,gBAAgBJ,GAAG,CAAC,CAACC,YAAcA;;;;;AAI9E,EAAC"}
+{"version":3,"sources":["../../../../src/views/Dashboard/Default/index.tsx"],"sourcesContent":["import type { groupNavItems } from '@payloadcms/ui/shared'\nimport type { Permissions, ServerProps, VisibleEntities } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { Button, Card, Gutter, SetStepNav, SetViewActions } from '@payloadcms/ui'\nimport { EntityType, WithServerSideProps, formatAdminURL } from '@payloadcms/ui/shared'\nimport React, { Fragment } from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'dashboard'\n\nexport type DashboardProps = {\n  Link: React.ComponentType<any>\n  navGroups?: ReturnType<typeof groupNavItems>\n  permissions: Permissions\n  visibleEntities: VisibleEntities\n} & ServerProps\n\nexport const DefaultDashboard: React.FC<DashboardProps> = (props) => {\n  const {\n    Link,\n    i18n,\n    i18n: { t },\n    locale,\n    navGroups,\n    params,\n    payload: {\n      config: {\n        admin: {\n          components: { afterDashboard, beforeDashboard },\n        },\n        routes: { admin: adminRoute },\n      },\n    },\n    payload,\n    permissions,\n    searchParams,\n    user,\n  } = props\n\n  const BeforeDashboards = Array.isArray(beforeDashboard)\n    ? beforeDashboard.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  const AfterDashboards = Array.isArray(afterDashboard)\n    ? afterDashboard.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  return (\n    <div className={baseClass}>\n      <SetStepNav nav={[]} />\n      <SetViewActions actions={[]} />\n      <Gutter className={`${baseClass}__wrap`}>\n        {Array.isArray(BeforeDashboards) && BeforeDashboards.map((Component) => Component)}\n        <Fragment>\n          <SetViewActions actions={[]} />\n          {!navGroups || navGroups?.length === 0 ? (\n            <p>no nav groups....</p>\n          ) : (\n            navGroups.map(({ entities, label }, groupIndex) => {\n              return (\n                <div className={`${baseClass}__group`} key={groupIndex}>\n                  <h2 className={`${baseClass}__label`}>{label}</h2>\n                  <ul className={`${baseClass}__card-list`}>\n                    {entities.map(({ type, entity }, entityIndex) => {\n                      let title: string\n                      let buttonAriaLabel: string\n                      let createHREF: string\n                      let href: string\n                      let hasCreatePermission: boolean\n\n                      if (type === EntityType.collection) {\n                        title = getTranslation(entity.labels.plural, i18n)\n\n                        buttonAriaLabel = t('general:showAllLabel', { label: title })\n\n                        href = formatAdminURL({ adminRoute, path: `/collections/${entity.slug}` })\n\n                        createHREF = formatAdminURL({\n                          adminRoute,\n                          path: `/collections/${entity.slug}/create`,\n                        })\n\n                        hasCreatePermission =\n                          permissions?.collections?.[entity.slug]?.create?.permission\n                      }\n\n                      if (type === EntityType.global) {\n                        title = getTranslation(entity.label, i18n)\n\n                        buttonAriaLabel = t('general:editLabel', {\n                          label: getTranslation(entity.label, i18n),\n                        })\n\n                        href = formatAdminURL({\n                          adminRoute,\n                          path: `/globals/${entity.slug}`,\n                        })\n                      }\n\n                      return (\n                        <li key={entityIndex}>\n                          <Card\n                            Link={Link}\n                            actions={\n                              hasCreatePermission && type === EntityType.collection ? (\n                                <Button\n                                  Link={Link}\n                                  aria-label={t('general:createNewLabel', {\n                                    label: getTranslation(entity.labels.singular, i18n),\n                                  })}\n                                  buttonStyle=\"icon-label\"\n                                  el=\"link\"\n                                  icon=\"plus\"\n                                  iconStyle=\"with-border\"\n                                  round\n                                  to={createHREF}\n                                />\n                              ) : undefined\n                            }\n                            buttonAriaLabel={buttonAriaLabel}\n                            href={href}\n                            id={`card-${entity.slug}`}\n                            title={title}\n                            titleAs=\"h3\"\n                          />\n                        </li>\n                      )\n                    })}\n                  </ul>\n                </div>\n              )\n            })\n          )}\n        </Fragment>\n        {Array.isArray(AfterDashboards) && AfterDashboards.map((Component) => Component)}\n      </Gutter>\n    </div>\n  )\n}\n"],"names":["getTranslation","Button","Card","Gutter","SetStepNav","SetViewActions","EntityType","WithServerSideProps","formatAdminURL","React","Fragment","baseClass","DefaultDashboard","props","Link","i18n","t","locale","navGroups","params","payload","config","admin","components","afterDashboard","beforeDashboard","routes","adminRoute","permissions","searchParams","user","BeforeDashboards","Array","isArray","map","Component","i","serverOnlyProps","AfterDashboards","div","className","nav","actions","length","p","entities","label","groupIndex","h2","ul","type","entity","entityIndex","title","buttonAriaLabel","createHREF","href","hasCreatePermission","collection","labels","plural","path","slug","collections","create","permission","global","li","aria-label","singular","buttonStyle","el","icon","iconStyle","round","to","undefined","id","titleAs"],"mappings":"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"}

package/dist/views/Dashboard/Default/index.scss

@@ -26,13 +26,9 @@
     padding: 0;
     margin: 0;
     list-style: none;
-    display: flex;
     gap: var(--gap);
-    flex-wrap: wrap;
-
-    li {
-      width: calc(100% / var(--cols) - var(--gap) / var(--cols) * (var(--cols) - 1));
-    }
+    display: grid;
+    grid-template-columns: repeat(var(--cols), 1fr);
 
     .card {
       height: 100%;
@@ -49,10 +45,18 @@
   }
 
   @include small-break {
-    --cols: 1;
+    --cols: 2;
 
     &__wrap {
       gap: var(--base);
     }
+
+    &__card-list {
+      gap: base(0.4);
+    }
+  }
+
+  @include extra-small-break {
+    --cols: 1;
   }
 }

package/dist/views/Document/getDocumentData.d.ts

@@ -5,5 +5,6 @@ export declare const getDocumentData: (args: {
     id?: number | string;
     locale: Locale;
     req: PayloadRequest;
+    schemaPath?: string;
 }) => Promise<Data>;
 //# sourceMappingURL=getDocumentData.d.ts.map

package/dist/views/Document/getDocumentData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDocumentData.d.ts","sourceRoot":"","sources":["../../../src/views/Document/getDocumentData.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,MAAM,EACN,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAKhB,eAAO,MAAM,eAAe,SAAgB;IAC1C,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CA4Bf,CAAA"}
+{"version":3,"file":"getDocumentData.d.ts","sourceRoot":"","sources":["../../../src/views/Document/getDocumentData.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,MAAM,EACN,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAKhB,eAAO,MAAM,eAAe,SAAgB;IAC1C,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CA8Bf,CAAA"}

package/dist/views/Document/getDocumentData.js

@@ -1,7 +1,8 @@
-import { reduceFieldsToValues } from '@payloadcms/ui/shared';
 import { buildFormState } from '@payloadcms/ui/utilities/buildFormState';
+import { reduceFieldsToValues } from 'payload/shared';
 export const getDocumentData = async (args)=>{
-    const { id, collectionConfig, globalConfig, locale, req } = args;
+    const { id, collectionConfig, globalConfig, locale, req, schemaPath: schemaPathFromProps } = args;
+    const schemaPath = schemaPathFromProps || collectionConfig?.slug || globalConfig?.slug;
     try {
         const formState = await buildFormState({
             req: {
@@ -12,7 +13,7 @@ export const getDocumentData = async (args)=>{
                     globalSlug: globalConfig?.slug,
                     locale: locale?.code,
                     operation: collectionConfig && id || globalConfig ? 'update' : 'create',
-                    schemaPath: collectionConfig?.slug || globalConfig?.slug
+                    schemaPath
                 }
             }
         });

package/dist/views/Document/getDocumentData.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Document/getDocumentData.tsx"],"sourcesContent":["import type {\n  Data,\n  Locale,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { reduceFieldsToValues } from '@payloadcms/ui/shared'\nimport { buildFormState } from '@payloadcms/ui/utilities/buildFormState'\n\nexport const getDocumentData = async (args: {\n  collectionConfig?: SanitizedCollectionConfig\n  globalConfig?: SanitizedGlobalConfig\n  id?: number | string\n  locale: Locale\n  req: PayloadRequest\n}): Promise<Data> => {\n  const { id, collectionConfig, globalConfig, locale, req } = args\n\n  try {\n    const formState = await buildFormState({\n      req: {\n        ...req,\n        data: {\n          id,\n          collectionSlug: collectionConfig?.slug,\n          globalSlug: globalConfig?.slug,\n          locale: locale?.code,\n          operation: (collectionConfig && id) || globalConfig ? 'update' : 'create',\n          schemaPath: collectionConfig?.slug || globalConfig?.slug,\n        },\n      },\n    })\n\n    const data = reduceFieldsToValues(formState, true)\n\n    return {\n      data,\n      formState,\n    }\n  } catch (error) {\n    console.error('Error getting document data', error) // eslint-disable-line no-console\n    return {}\n  }\n}\n"],"names":["reduceFieldsToValues","buildFormState","getDocumentData","args","id","collectionConfig","globalConfig","locale","req","formState","data","collectionSlug","slug","globalSlug","code","operation","schemaPath","error","console"],"mappings":"AAQA,SAASA,oBAAoB,QAAQ,wBAAuB;AAC5D,SAASC,cAAc,QAAQ,0CAAyC;AAExE,OAAO,MAAMC,kBAAkB,OAAOC;IAOpC,MAAM,EAAEC,EAAE,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,MAAM,EAAEC,GAAG,EAAE,GAAGL;IAE5D,IAAI;QACF,MAAMM,YAAY,MAAMR,eAAe;YACrCO,KAAK;gBACH,GAAGA,GAAG;gBACNE,MAAM;oBACJN;oBACAO,gBAAgBN,kBAAkBO;oBAClCC,YAAYP,cAAcM;oBAC1BL,QAAQA,QAAQO;oBAChBC,WAAW,AAACV,oBAAoBD,MAAOE,eAAe,WAAW;oBACjEU,YAAYX,kBAAkBO,QAAQN,cAAcM;gBACtD;YACF;QACF;QAEA,MAAMF,OAAOV,qBAAqBS,WAAW;QAE7C,OAAO;YACLC;YACAD;QACF;IACF,EAAE,OAAOQ,OAAO;QACdC,QAAQD,KAAK,CAAC,+BAA+BA,OAAO,iCAAiC;;QACrF,OAAO,CAAC;IACV;AACF,EAAC"}
+{"version":3,"sources":["../../../src/views/Document/getDocumentData.tsx"],"sourcesContent":["import type {\n  Data,\n  Locale,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { buildFormState } from '@payloadcms/ui/utilities/buildFormState'\nimport { reduceFieldsToValues } from 'payload/shared'\n\nexport const getDocumentData = async (args: {\n  collectionConfig?: SanitizedCollectionConfig\n  globalConfig?: SanitizedGlobalConfig\n  id?: number | string\n  locale: Locale\n  req: PayloadRequest\n  schemaPath?: string\n}): Promise<Data> => {\n  const { id, collectionConfig, globalConfig, locale, req, schemaPath: schemaPathFromProps } = args\n\n  const schemaPath = schemaPathFromProps || collectionConfig?.slug || globalConfig?.slug\n\n  try {\n    const formState = await buildFormState({\n      req: {\n        ...req,\n        data: {\n          id,\n          collectionSlug: collectionConfig?.slug,\n          globalSlug: globalConfig?.slug,\n          locale: locale?.code,\n          operation: (collectionConfig && id) || globalConfig ? 'update' : 'create',\n          schemaPath,\n        },\n      },\n    })\n\n    const data = reduceFieldsToValues(formState, true)\n\n    return {\n      data,\n      formState,\n    }\n  } catch (error) {\n    console.error('Error getting document data', error) // eslint-disable-line no-console\n    return {}\n  }\n}\n"],"names":["buildFormState","reduceFieldsToValues","getDocumentData","args","id","collectionConfig","globalConfig","locale","req","schemaPath","schemaPathFromProps","slug","formState","data","collectionSlug","globalSlug","code","operation","error","console"],"mappings":"AAQA,SAASA,cAAc,QAAQ,0CAAyC;AACxE,SAASC,oBAAoB,QAAQ,iBAAgB;AAErD,OAAO,MAAMC,kBAAkB,OAAOC;IAQpC,MAAM,EAAEC,EAAE,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,MAAM,EAAEC,GAAG,EAAEC,YAAYC,mBAAmB,EAAE,GAAGP;IAE7F,MAAMM,aAAaC,uBAAuBL,kBAAkBM,QAAQL,cAAcK;IAElF,IAAI;QACF,MAAMC,YAAY,MAAMZ,eAAe;YACrCQ,KAAK;gBACH,GAAGA,GAAG;gBACNK,MAAM;oBACJT;oBACAU,gBAAgBT,kBAAkBM;oBAClCI,YAAYT,cAAcK;oBAC1BJ,QAAQA,QAAQS;oBAChBC,WAAW,AAACZ,oBAAoBD,MAAOE,eAAe,WAAW;oBACjEG;gBACF;YACF;QACF;QAEA,MAAMI,OAAOZ,qBAAqBW,WAAW;QAE7C,OAAO;YACLC;YACAD;QACF;IACF,EAAE,OAAOM,OAAO;QACdC,QAAQD,KAAK,CAAC,+BAA+BA,OAAO,iCAAiC;;QACrF,OAAO,CAAC;IACV;AACF,EAAC"}