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

package/dist/views/Login/LoginForm/index.js

@@ -4,85 +4,76 @@ import LinkImport from 'next/link.js';
 import React from 'react';
 const baseClass = 'login__form';
 const Link = LinkImport.default || LinkImport;
-import { EmailField, Form, FormSubmit, PasswordField, useConfig, useTranslation } from '@payloadcms/ui/client';
-import { email, password } from 'payload/shared';
-export const LoginForm = ({ searchParams })=>{
-    const config = useConfig();
-    const { admin: { autoLogin, routes: { forgot: forgotRoute }, user: userSlug }, routes: { admin, api } } = config;
+import { Form, FormSubmit, PasswordField, useConfig, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
+import { LoginField } from '../LoginField/index.js';
+export const LoginForm = ({ prefillEmail, prefillPassword, prefillUsername, searchParams })=>{
+    const { config } = useConfig();
+    const { admin: { routes: { forgot: forgotRoute }, user: userSlug }, routes: { admin: adminRoute, api: apiRoute } } = config;
+    const collectionConfig = config.collections?.find((collection)=>collection?.slug === userSlug);
+    const { auth: authOptions } = collectionConfig;
+    const loginWithUsername = authOptions.loginWithUsername;
+    const canLoginWithEmail = !authOptions.loginWithUsername || authOptions.loginWithUsername.allowEmailLogin;
+    const canLoginWithUsername = authOptions.loginWithUsername;
+    const [loginType] = React.useState(()=>{
+        if (canLoginWithEmail && canLoginWithUsername) return 'emailOrUsername';
+        if (canLoginWithUsername) return 'username';
+        return 'email';
+    });
     const { t } = useTranslation();
-    const prefillForm = autoLogin && autoLogin.prefillOnly;
     const initialState = {
-        email: {
-            initialValue: prefillForm ? autoLogin.email : undefined,
-            valid: true,
-            value: prefillForm ? autoLogin.email : undefined
-        },
         password: {
-            initialValue: prefillForm ? autoLogin.password : undefined,
+            initialValue: prefillPassword ?? undefined,
             valid: true,
-            value: prefillForm ? autoLogin.password : undefined
+            value: prefillPassword ?? undefined
         }
     };
+    if (loginWithUsername) {
+        initialState.username = {
+            initialValue: prefillUsername ?? undefined,
+            valid: true,
+            value: prefillUsername ?? undefined
+        };
+    } else {
+        initialState.email = {
+            initialValue: prefillEmail ?? undefined,
+            valid: true,
+            value: prefillEmail ?? undefined
+        };
+    }
     return /*#__PURE__*/ _jsxs(Form, {
-        action: `${api}/${userSlug}/login`,
+        action: `${apiRoute}/${userSlug}/login`,
         className: baseClass,
         disableSuccessStatus: true,
         initialState: initialState,
         method: "POST",
-        redirect: typeof searchParams?.redirect === 'string' ? searchParams.redirect : admin,
+        redirect: typeof searchParams?.redirect === 'string' ? searchParams.redirect : adminRoute,
         waitForAutocomplete: true,
         children: [
             /*#__PURE__*/ _jsxs("div", {
                 className: `${baseClass}__inputWrap`,
                 children: [
-                    /*#__PURE__*/ _jsx(EmailField, {
-                        autoComplete: "email",
-                        label: t('general:email'),
-                        name: "email",
-                        required: true,
-                        validate: (value)=>email(value, {
-                                name: 'email',
-                                type: 'email',
-                                data: {},
-                                preferences: {
-                                    fields: {}
-                                },
-                                req: {
-                                    t
-                                },
-                                required: true,
-                                siblingData: {}
-                            })
+                    /*#__PURE__*/ _jsx(LoginField, {
+                        type: loginType
                     }),
                     /*#__PURE__*/ _jsx(PasswordField, {
-                        autoComplete: "off",
-                        label: t('general:password'),
-                        name: "password",
-                        required: true,
-                        validate: (value)=>password(value, {
-                                name: 'password',
-                                type: 'text',
-                                data: {},
-                                preferences: {
-                                    fields: {}
-                                },
-                                req: {
-                                    payload: {
-                                        config
-                                    },
-                                    t
-                                },
-                                required: true,
-                                siblingData: {}
-                            })
+                        field: {
+                            name: 'password',
+                            label: t('general:password'),
+                            required: true
+                        }
                     })
                 ]
             }),
             /*#__PURE__*/ _jsx(Link, {
-                href: `${admin}${forgotRoute}`,
+                href: formatAdminURL({
+                    adminRoute,
+                    path: forgotRoute
+                }),
                 children: t('authentication:forgotPasswordQuestion')
             }),
             /*#__PURE__*/ _jsx(FormSubmit, {
+                size: "large",
                 children: t('authentication:login')
             })
         ]

package/dist/views/Login/LoginForm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Login/LoginForm/index.tsx"],"sourcesContent":["'use client'\n\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nconst baseClass = 'login__form'\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nimport type { FormState, PayloadRequestWithData } from 'payload'\n\nimport {\n  EmailField,\n  Form,\n  FormSubmit,\n  PasswordField,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui/client'\nimport { email, password } from 'payload/shared'\n\nimport './index.scss'\n\nexport const LoginForm: React.FC<{\n  searchParams: { [key: string]: string | string[] | undefined }\n}> = ({ searchParams }) => {\n  const config = useConfig()\n\n  const {\n    admin: {\n      autoLogin,\n      routes: { forgot: forgotRoute },\n      user: userSlug,\n    },\n    routes: { admin, api },\n  } = config\n\n  const { t } = useTranslation()\n\n  const prefillForm = autoLogin && autoLogin.prefillOnly\n\n  const initialState: FormState = {\n    email: {\n      initialValue: prefillForm ? autoLogin.email : undefined,\n      valid: true,\n      value: prefillForm ? autoLogin.email : undefined,\n    },\n    password: {\n      initialValue: prefillForm ? autoLogin.password : undefined,\n      valid: true,\n      value: prefillForm ? autoLogin.password : undefined,\n    },\n  }\n\n  return (\n    <Form\n      action={`${api}/${userSlug}/login`}\n      className={baseClass}\n      disableSuccessStatus\n      initialState={initialState}\n      method=\"POST\"\n      redirect={typeof searchParams?.redirect === 'string' ? searchParams.redirect : admin}\n      waitForAutocomplete\n    >\n      <div className={`${baseClass}__inputWrap`}>\n        <EmailField\n          autoComplete=\"email\"\n          label={t('general:email')}\n          name=\"email\"\n          required\n          validate={(value) =>\n            email(value, {\n              name: 'email',\n              type: 'email',\n              data: {},\n              preferences: { fields: {} },\n              req: { t } as PayloadRequestWithData,\n              required: true,\n              siblingData: {},\n            })\n          }\n        />\n        <PasswordField\n          autoComplete=\"off\"\n          label={t('general:password')}\n          name=\"password\"\n          required\n          validate={(value) =>\n            password(value, {\n              name: 'password',\n              type: 'text',\n              data: {},\n              preferences: { fields: {} },\n              req: {\n                payload: {\n                  config,\n                },\n                t,\n              } as PayloadRequestWithData,\n              required: true,\n              siblingData: {},\n            })\n          }\n        />\n      </div>\n      <Link href={`${admin}${forgotRoute}`}>{t('authentication:forgotPasswordQuestion')}</Link>\n      <FormSubmit>{t('authentication:login')}</FormSubmit>\n    </Form>\n  )\n}\n"],"names":["LinkImport","React","baseClass","Link","default","EmailField","Form","FormSubmit","PasswordField","useConfig","useTranslation","email","password","LoginForm","searchParams","config","admin","autoLogin","routes","forgot","forgotRoute","user","userSlug","api","t","prefillForm","prefillOnly","initialState","initialValue","undefined","valid","value","action","className","disableSuccessStatus","method","redirect","waitForAutocomplete","div","autoComplete","label","name","required","validate","type","data","preferences","fields","req","siblingData","payload","href"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;;AAEA,OAAOA,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,MAAMC,YAAY;AAClB,MAAMC,OAAQH,WAAWI,OAAO,IAAIJ;AAIpC,SACEK,UAAU,EACVC,IAAI,EACJC,UAAU,EACVC,aAAa,EACbC,SAAS,EACTC,cAAc,QACT,wBAAuB;AAC9B,SAASC,KAAK,EAAEC,QAAQ,QAAQ,iBAAgB;AAIhD,OAAO,MAAMC,YAER,CAAC,EAAEC,YAAY,EAAE;IACpB,MAAMC,SAASN;IAEf,MAAM,EACJO,OAAO,EACLC,SAAS,EACTC,QAAQ,EAAEC,QAAQC,WAAW,EAAE,EAC/BC,MAAMC,QAAQ,EACf,EACDJ,QAAQ,EAAEF,KAAK,EAAEO,GAAG,EAAE,EACvB,GAAGR;IAEJ,MAAM,EAAES,CAAC,EAAE,GAAGd;IAEd,MAAMe,cAAcR,aAAaA,UAAUS,WAAW;IAEtD,MAAMC,eAA0B;QAC9BhB,OAAO;YACLiB,cAAcH,cAAcR,UAAUN,KAAK,GAAGkB;YAC9CC,OAAO;YACPC,OAAON,cAAcR,UAAUN,KAAK,GAAGkB;QACzC;QACAjB,UAAU;YACRgB,cAAcH,cAAcR,UAAUL,QAAQ,GAAGiB;YACjDC,OAAO;YACPC,OAAON,cAAcR,UAAUL,QAAQ,GAAGiB;QAC5C;IACF;IAEA,qBACE,MAACvB;QACC0B,QAAQ,CAAC,EAAET,IAAI,CAAC,EAAED,SAAS,MAAM,CAAC;QAClCW,WAAW/B;QACXgC,oBAAoB;QACpBP,cAAcA;QACdQ,QAAO;QACPC,UAAU,OAAOtB,cAAcsB,aAAa,WAAWtB,aAAasB,QAAQ,GAAGpB;QAC/EqB,mBAAmB;;0BAEnB,MAACC;gBAAIL,WAAW,CAAC,EAAE/B,UAAU,WAAW,CAAC;;kCACvC,KAACG;wBACCkC,cAAa;wBACbC,OAAOhB,EAAE;wBACTiB,MAAK;wBACLC,QAAQ;wBACRC,UAAU,CAACZ,QACTpB,MAAMoB,OAAO;gCACXU,MAAM;gCACNG,MAAM;gCACNC,MAAM,CAAC;gCACPC,aAAa;oCAAEC,QAAQ,CAAC;gCAAE;gCAC1BC,KAAK;oCAAExB;gCAAE;gCACTkB,UAAU;gCACVO,aAAa,CAAC;4BAChB;;kCAGJ,KAACzC;wBACC+B,cAAa;wBACbC,OAAOhB,EAAE;wBACTiB,MAAK;wBACLC,QAAQ;wBACRC,UAAU,CAACZ,QACTnB,SAASmB,OAAO;gCACdU,MAAM;gCACNG,MAAM;gCACNC,MAAM,CAAC;gCACPC,aAAa;oCAAEC,QAAQ,CAAC;gCAAE;gCAC1BC,KAAK;oCACHE,SAAS;wCACPnC;oCACF;oCACAS;gCACF;gCACAkB,UAAU;gCACVO,aAAa,CAAC;4BAChB;;;;0BAIN,KAAC9C;gBAAKgD,MAAM,CAAC,EAAEnC,MAAM,EAAEI,YAAY,CAAC;0BAAGI,EAAE;;0BACzC,KAACjB;0BAAYiB,EAAE;;;;AAGrB,EAAC"}
+{"version":3,"sources":["../../../../src/views/Login/LoginForm/index.tsx"],"sourcesContent":["'use client'\n\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nconst baseClass = 'login__form'\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nimport type { FormState } from 'payload'\n\nimport { Form, FormSubmit, PasswordField, useConfig, useTranslation } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\n\nimport type { LoginFieldProps } from '../LoginField/index.js'\n\nimport { LoginField } from '../LoginField/index.js'\nimport './index.scss'\n\nexport const LoginForm: React.FC<{\n  prefillEmail?: string\n  prefillPassword?: string\n  prefillUsername?: string\n  searchParams: { [key: string]: string | string[] | undefined }\n}> = ({ prefillEmail, prefillPassword, prefillUsername, searchParams }) => {\n  const { config } = useConfig()\n\n  const {\n    admin: {\n      routes: { forgot: forgotRoute },\n      user: userSlug,\n    },\n    routes: { admin: adminRoute, api: apiRoute },\n  } = config\n\n  const collectionConfig = config.collections?.find((collection) => collection?.slug === userSlug)\n  const { auth: authOptions } = collectionConfig\n  const loginWithUsername = authOptions.loginWithUsername\n  const canLoginWithEmail =\n    !authOptions.loginWithUsername || authOptions.loginWithUsername.allowEmailLogin\n  const canLoginWithUsername = authOptions.loginWithUsername\n\n  const [loginType] = React.useState<LoginFieldProps['type']>(() => {\n    if (canLoginWithEmail && canLoginWithUsername) return 'emailOrUsername'\n    if (canLoginWithUsername) return 'username'\n    return 'email'\n  })\n\n  const { t } = useTranslation()\n\n  const initialState: FormState = {\n    password: {\n      initialValue: prefillPassword ?? undefined,\n      valid: true,\n      value: prefillPassword ?? undefined,\n    },\n  }\n\n  if (loginWithUsername) {\n    initialState.username = {\n      initialValue: prefillUsername ?? undefined,\n      valid: true,\n      value: prefillUsername ?? undefined,\n    }\n  } else {\n    initialState.email = {\n      initialValue: prefillEmail ?? undefined,\n      valid: true,\n      value: prefillEmail ?? undefined,\n    }\n  }\n\n  return (\n    <Form\n      action={`${apiRoute}/${userSlug}/login`}\n      className={baseClass}\n      disableSuccessStatus\n      initialState={initialState}\n      method=\"POST\"\n      redirect={typeof searchParams?.redirect === 'string' ? searchParams.redirect : adminRoute}\n      waitForAutocomplete\n    >\n      <div className={`${baseClass}__inputWrap`}>\n        <LoginField type={loginType} />\n        <PasswordField\n          field={{\n            name: 'password',\n            label: t('general:password'),\n            required: true,\n          }}\n        />\n      </div>\n      <Link\n        href={formatAdminURL({\n          adminRoute,\n          path: forgotRoute,\n        })}\n      >\n        {t('authentication:forgotPasswordQuestion')}\n      </Link>\n      <FormSubmit size=\"large\">{t('authentication:login')}</FormSubmit>\n    </Form>\n  )\n}\n"],"names":["LinkImport","React","baseClass","Link","default","Form","FormSubmit","PasswordField","useConfig","useTranslation","formatAdminURL","LoginField","LoginForm","prefillEmail","prefillPassword","prefillUsername","searchParams","config","admin","routes","forgot","forgotRoute","user","userSlug","adminRoute","api","apiRoute","collectionConfig","collections","find","collection","slug","auth","authOptions","loginWithUsername","canLoginWithEmail","allowEmailLogin","canLoginWithUsername","loginType","useState","t","initialState","password","initialValue","undefined","valid","value","username","email","action","className","disableSuccessStatus","method","redirect","waitForAutocomplete","div","type","field","name","label","required","href","path","size"],"mappings":"AAAA;;AAEA,OAAOA,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,MAAMC,YAAY;AAClB,MAAMC,OAAQH,WAAWI,OAAO,IAAIJ;AAIpC,SAASK,IAAI,EAAEC,UAAU,EAAEC,aAAa,EAAEC,SAAS,EAAEC,cAAc,QAAQ,iBAAgB;AAC3F,SAASC,cAAc,QAAQ,wBAAuB;AAItD,SAASC,UAAU,QAAQ,yBAAwB;AAGnD,OAAO,MAAMC,YAKR,CAAC,EAAEC,YAAY,EAAEC,eAAe,EAAEC,eAAe,EAAEC,YAAY,EAAE;IACpE,MAAM,EAAEC,MAAM,EAAE,GAAGT;IAEnB,MAAM,EACJU,OAAO,EACLC,QAAQ,EAAEC,QAAQC,WAAW,EAAE,EAC/BC,MAAMC,QAAQ,EACf,EACDJ,QAAQ,EAAED,OAAOM,UAAU,EAAEC,KAAKC,QAAQ,EAAE,EAC7C,GAAGT;IAEJ,MAAMU,mBAAmBV,OAAOW,WAAW,EAAEC,KAAK,CAACC,aAAeA,YAAYC,SAASR;IACvF,MAAM,EAAES,MAAMC,WAAW,EAAE,GAAGN;IAC9B,MAAMO,oBAAoBD,YAAYC,iBAAiB;IACvD,MAAMC,oBACJ,CAACF,YAAYC,iBAAiB,IAAID,YAAYC,iBAAiB,CAACE,eAAe;IACjF,MAAMC,uBAAuBJ,YAAYC,iBAAiB;IAE1D,MAAM,CAACI,UAAU,GAAGrC,MAAMsC,QAAQ,CAA0B;QAC1D,IAAIJ,qBAAqBE,sBAAsB,OAAO;QACtD,IAAIA,sBAAsB,OAAO;QACjC,OAAO;IACT;IAEA,MAAM,EAAEG,CAAC,EAAE,GAAG/B;IAEd,MAAMgC,eAA0B;QAC9BC,UAAU;YACRC,cAAc7B,mBAAmB8B;YACjCC,OAAO;YACPC,OAAOhC,mBAAmB8B;QAC5B;IACF;IAEA,IAAIV,mBAAmB;QACrBO,aAAaM,QAAQ,GAAG;YACtBJ,cAAc5B,mBAAmB6B;YACjCC,OAAO;YACPC,OAAO/B,mBAAmB6B;QAC5B;IACF,OAAO;QACLH,aAAaO,KAAK,GAAG;YACnBL,cAAc9B,gBAAgB+B;YAC9BC,OAAO;YACPC,OAAOjC,gBAAgB+B;QACzB;IACF;IAEA,qBACE,MAACvC;QACC4C,QAAQ,CAAC,EAAEvB,SAAS,CAAC,EAAEH,SAAS,MAAM,CAAC;QACvC2B,WAAWhD;QACXiD,oBAAoB;QACpBV,cAAcA;QACdW,QAAO;QACPC,UAAU,OAAOrC,cAAcqC,aAAa,WAAWrC,aAAaqC,QAAQ,GAAG7B;QAC/E8B,mBAAmB;;0BAEnB,MAACC;gBAAIL,WAAW,CAAC,EAAEhD,UAAU,WAAW,CAAC;;kCACvC,KAACS;wBAAW6C,MAAMlB;;kCAClB,KAAC/B;wBACCkD,OAAO;4BACLC,MAAM;4BACNC,OAAOnB,EAAE;4BACToB,UAAU;wBACZ;;;;0BAGJ,KAACzD;gBACC0D,MAAMnD,eAAe;oBACnBc;oBACAsC,MAAMzC;gBACR;0BAECmB,EAAE;;0BAEL,KAAClC;gBAAWyD,MAAK;0BAASvB,EAAE;;;;AAGlC,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Login/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,OAAO,cAAc,CAAA;AAErB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,eAAO,MAAM,cAAc,UAAU,CAAA;AAErC,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA4E9C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Login/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,OAAO,cAAc,CAAA;AAErB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,eAAO,MAAM,cAAc,UAAU,CAAA;AAErC,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAkF9C,CAAA"}

package/dist/views/Login/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { WithServerSideProps } from '@payloadcms/ui/shared';
+import { RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared';
 import { redirect } from 'next/navigation.js';
 import React, { Fragment } from 'react';
 import { Logo } from '../../elements/Logo/index.js';
@@ -10,34 +10,28 @@ export const LoginView = ({ initPageResult, params, searchParams })=>{
     const { locale, permissions, req } = initPageResult;
     const { i18n, payload: { config }, payload, user } = req;
     const { admin: { components: { afterLogin, beforeLogin } = {}, user: userSlug }, collections, routes: { admin } } = config;
-    const BeforeLogins = Array.isArray(beforeLogin) ? beforeLogin.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
-            Component: Component,
-            serverOnlyProps: {
-                i18n,
-                locale,
-                params,
-                payload,
-                permissions,
-                searchParams,
-                user
-            }
-        }, i)) : null;
-    const AfterLogins = Array.isArray(afterLogin) ? afterLogin.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
-            Component: Component,
-            serverOnlyProps: {
-                i18n,
-                locale,
-                params,
-                payload,
-                permissions,
-                searchParams,
-                user
-            }
-        }, i)) : null;
+    const createMappedComponent = getCreateMappedComponent({
+        importMap: payload.importMap,
+        serverProps: {
+            i18n,
+            locale,
+            params,
+            payload,
+            permissions,
+            searchParams,
+            user
+        }
+    });
+    const mappedBeforeLogins = createMappedComponent(beforeLogin, undefined, undefined, 'beforeLogin');
+    const mappedAfterLogins = createMappedComponent(afterLogin, undefined, undefined, 'afterLogin');
     if (user) {
         redirect(admin);
     }
     const collectionConfig = collections.find(({ slug })=>slug === userSlug);
+    const prefillAutoLogin = typeof config.admin?.autoLogin === 'object' && config.admin?.autoLogin.prefillOnly;
+    const prefillUsername = prefillAutoLogin && typeof config.admin?.autoLogin === 'object' ? config.admin?.autoLogin.username : undefined;
+    const prefillEmail = prefillAutoLogin && typeof config.admin?.autoLogin === 'object' ? config.admin?.autoLogin.email : undefined;
+    const prefillPassword = prefillAutoLogin && typeof config.admin?.autoLogin === 'object' ? config.admin?.autoLogin.password : undefined;
     return /*#__PURE__*/ _jsxs(Fragment, {
         children: [
             /*#__PURE__*/ _jsx("div", {
@@ -52,11 +46,18 @@ export const LoginView = ({ initPageResult, params, searchParams })=>{
                     user: user
                 })
             }),
-            Array.isArray(BeforeLogins) && BeforeLogins.map((Component)=>Component),
+            /*#__PURE__*/ _jsx(RenderComponent, {
+                mappedComponent: mappedBeforeLogins
+            }),
             !collectionConfig?.auth?.disableLocalStrategy && /*#__PURE__*/ _jsx(LoginForm, {
+                prefillEmail: prefillEmail,
+                prefillPassword: prefillPassword,
+                prefillUsername: prefillUsername,
                 searchParams: searchParams
             }),
-            Array.isArray(AfterLogins) && AfterLogins.map((Component)=>Component)
+            /*#__PURE__*/ _jsx(RenderComponent, {
+                mappedComponent: mappedAfterLogins
+            })
         ]
     });
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Login/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { WithServerSideProps } from '@payloadcms/ui/shared'\nimport { redirect } from 'next/navigation.js'\nimport React, { Fragment } from 'react'\n\nimport { Logo } from '../../elements/Logo/index.js'\nimport { LoginForm } from './LoginForm/index.js'\nimport './index.scss'\n\nexport { generateLoginMetadata } from './meta.js'\n\nexport const loginBaseClass = 'login'\n\nexport const LoginView: React.FC<AdminViewProps> = ({ initPageResult, params, searchParams }) => {\n  const { locale, permissions, req } = initPageResult\n\n  const {\n    i18n,\n    payload: { config },\n    payload,\n    user,\n  } = req\n\n  const {\n    admin: { components: { afterLogin, beforeLogin } = {}, user: userSlug },\n    collections,\n    routes: { admin },\n  } = config\n\n  const BeforeLogins = Array.isArray(beforeLogin)\n    ? beforeLogin.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 AfterLogins = Array.isArray(afterLogin)\n    ? afterLogin.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  if (user) {\n    redirect(admin)\n  }\n\n  const collectionConfig = collections.find(({ slug }) => slug === userSlug)\n\n  return (\n    <Fragment>\n      <div className={`${loginBaseClass}__brand`}>\n        <Logo\n          i18n={i18n}\n          locale={locale}\n          params={params}\n          payload={payload}\n          permissions={permissions}\n          searchParams={searchParams}\n          user={user}\n        />\n      </div>\n      {Array.isArray(BeforeLogins) && BeforeLogins.map((Component) => Component)}\n      {!collectionConfig?.auth?.disableLocalStrategy && <LoginForm searchParams={searchParams} />}\n      {Array.isArray(AfterLogins) && AfterLogins.map((Component) => Component)}\n    </Fragment>\n  )\n}\n"],"names":["WithServerSideProps","redirect","React","Fragment","Logo","LoginForm","generateLoginMetadata","loginBaseClass","LoginView","initPageResult","params","searchParams","locale","permissions","req","i18n","payload","config","user","admin","components","afterLogin","beforeLogin","userSlug","collections","routes","BeforeLogins","Array","isArray","map","Component","i","serverOnlyProps","AfterLogins","collectionConfig","find","slug","div","className","auth","disableLocalStrategy"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAEA,SAASA,mBAAmB,QAAQ,wBAAuB;AAC3D,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,IAAI,QAAQ,+BAA8B;AACnD,SAASC,SAAS,QAAQ,uBAAsB;AAGhD,SAASC,qBAAqB,QAAQ,YAAW;AAEjD,OAAO,MAAMC,iBAAiB,QAAO;AAErC,OAAO,MAAMC,YAAsC,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAEC,YAAY,EAAE;IAC1F,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,GAAG,EAAE,GAAGL;IAErC,MAAM,EACJM,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBD,OAAO,EACPE,IAAI,EACL,GAAGJ;IAEJ,MAAM,EACJK,OAAO,EAAEC,YAAY,EAAEC,UAAU,EAAEC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAEJ,MAAMK,QAAQ,EAAE,EACvEC,WAAW,EACXC,QAAQ,EAAEN,KAAK,EAAE,EAClB,GAAGF;IAEJ,MAAMS,eAAeC,MAAMC,OAAO,CAACN,eAC/BA,YAAYO,GAAG,CAAC,CAACC,WAAWC,kBAC1B,KAAC/B;YACC8B,WAAWA;YAEXE,iBAAiB;gBACfjB;gBACAH;gBACAF;gBACAM;gBACAH;gBACAF;gBACAO;YACF;WATKa,MAYT;IAEJ,MAAME,cAAcN,MAAMC,OAAO,CAACP,cAC9BA,WAAWQ,GAAG,CAAC,CAACC,WAAWC,kBACzB,KAAC/B;YACC8B,WAAWA;YAEXE,iBAAiB;gBACfjB;gBACAH;gBACAF;gBACAM;gBACAH;gBACAF;gBACAO;YACF;WATKa,MAYT;IAEJ,IAAIb,MAAM;QACRjB,SAASkB;IACX;IAEA,MAAMe,mBAAmBV,YAAYW,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASb;IAEjE,qBACE,MAACpB;;0BACC,KAACkC;gBAAIC,WAAW,CAAC,EAAE/B,eAAe,OAAO,CAAC;0BACxC,cAAA,KAACH;oBACCW,MAAMA;oBACNH,QAAQA;oBACRF,QAAQA;oBACRM,SAASA;oBACTH,aAAaA;oBACbF,cAAcA;oBACdO,MAAMA;;;YAGTS,MAAMC,OAAO,CAACF,iBAAiBA,aAAaG,GAAG,CAAC,CAACC,YAAcA;YAC/D,CAACI,kBAAkBK,MAAMC,sCAAwB,KAACnC;gBAAUM,cAAcA;;YAC1EgB,MAAMC,OAAO,CAACK,gBAAgBA,YAAYJ,GAAG,CAAC,CAACC,YAAcA;;;AAGpE,EAAC"}
+{"version":3,"sources":["../../../src/views/Login/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared'\nimport { redirect } from 'next/navigation.js'\nimport React, { Fragment } from 'react'\n\nimport { Logo } from '../../elements/Logo/index.js'\nimport { LoginForm } from './LoginForm/index.js'\nimport './index.scss'\n\nexport { generateLoginMetadata } from './meta.js'\n\nexport const loginBaseClass = 'login'\n\nexport const LoginView: React.FC<AdminViewProps> = ({ initPageResult, params, searchParams }) => {\n  const { locale, permissions, req } = initPageResult\n\n  const {\n    i18n,\n    payload: { config },\n    payload,\n    user,\n  } = req\n\n  const {\n    admin: { components: { afterLogin, beforeLogin } = {}, user: userSlug },\n    collections,\n    routes: { admin },\n  } = 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 mappedBeforeLogins = createMappedComponent(beforeLogin, undefined, undefined, 'beforeLogin')\n\n  const mappedAfterLogins = createMappedComponent(afterLogin, undefined, undefined, 'afterLogin')\n\n  if (user) {\n    redirect(admin)\n  }\n\n  const collectionConfig = collections.find(({ slug }) => slug === userSlug)\n\n  const prefillAutoLogin =\n    typeof config.admin?.autoLogin === 'object' && config.admin?.autoLogin.prefillOnly\n\n  const prefillUsername =\n    prefillAutoLogin && typeof config.admin?.autoLogin === 'object'\n      ? config.admin?.autoLogin.username\n      : undefined\n\n  const prefillEmail =\n    prefillAutoLogin && typeof config.admin?.autoLogin === 'object'\n      ? config.admin?.autoLogin.email\n      : undefined\n\n  const prefillPassword =\n    prefillAutoLogin && typeof config.admin?.autoLogin === 'object'\n      ? config.admin?.autoLogin.password\n      : undefined\n\n  return (\n    <Fragment>\n      <div className={`${loginBaseClass}__brand`}>\n        <Logo\n          i18n={i18n}\n          locale={locale}\n          params={params}\n          payload={payload}\n          permissions={permissions}\n          searchParams={searchParams}\n          user={user}\n        />\n      </div>\n      <RenderComponent mappedComponent={mappedBeforeLogins} />\n      {!collectionConfig?.auth?.disableLocalStrategy && (\n        <LoginForm\n          prefillEmail={prefillEmail}\n          prefillPassword={prefillPassword}\n          prefillUsername={prefillUsername}\n          searchParams={searchParams}\n        />\n      )}\n      <RenderComponent mappedComponent={mappedAfterLogins} />\n    </Fragment>\n  )\n}\n"],"names":["RenderComponent","getCreateMappedComponent","redirect","React","Fragment","Logo","LoginForm","generateLoginMetadata","loginBaseClass","LoginView","initPageResult","params","searchParams","locale","permissions","req","i18n","payload","config","user","admin","components","afterLogin","beforeLogin","userSlug","collections","routes","createMappedComponent","importMap","serverProps","mappedBeforeLogins","undefined","mappedAfterLogins","collectionConfig","find","slug","prefillAutoLogin","autoLogin","prefillOnly","prefillUsername","username","prefillEmail","email","prefillPassword","password","div","className","mappedComponent","auth","disableLocalStrategy"],"mappings":";AAEA,SAASA,eAAe,EAAEC,wBAAwB,QAAQ,wBAAuB;AACjF,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,IAAI,QAAQ,+BAA8B;AACnD,SAASC,SAAS,QAAQ,uBAAsB;AAGhD,SAASC,qBAAqB,QAAQ,YAAW;AAEjD,OAAO,MAAMC,iBAAiB,QAAO;AAErC,OAAO,MAAMC,YAAsC,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAEC,YAAY,EAAE;IAC1F,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,GAAG,EAAE,GAAGL;IAErC,MAAM,EACJM,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBD,OAAO,EACPE,IAAI,EACL,GAAGJ;IAEJ,MAAM,EACJK,OAAO,EAAEC,YAAY,EAAEC,UAAU,EAAEC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAEJ,MAAMK,QAAQ,EAAE,EACvEC,WAAW,EACXC,QAAQ,EAAEN,KAAK,EAAE,EAClB,GAAGF;IAEJ,MAAMS,wBAAwB1B,yBAAyB;QACrD2B,WAAWX,QAAQW,SAAS;QAC5BC,aAAa;YACXb;YACAH;YACAF;YACAM;YACAH;YACAF;YACAO;QACF;IACF;IAEA,MAAMW,qBAAqBH,sBAAsBJ,aAAaQ,WAAWA,WAAW;IAEpF,MAAMC,oBAAoBL,sBAAsBL,YAAYS,WAAWA,WAAW;IAElF,IAAIZ,MAAM;QACRjB,SAASkB;IACX;IAEA,MAAMa,mBAAmBR,YAAYS,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASX;IAEjE,MAAMY,mBACJ,OAAOlB,OAAOE,KAAK,EAAEiB,cAAc,YAAYnB,OAAOE,KAAK,EAAEiB,UAAUC;IAEzE,MAAMC,kBACJH,oBAAoB,OAAOlB,OAAOE,KAAK,EAAEiB,cAAc,WACnDnB,OAAOE,KAAK,EAAEiB,UAAUG,WACxBT;IAEN,MAAMU,eACJL,oBAAoB,OAAOlB,OAAOE,KAAK,EAAEiB,cAAc,WACnDnB,OAAOE,KAAK,EAAEiB,UAAUK,QACxBX;IAEN,MAAMY,kBACJP,oBAAoB,OAAOlB,OAAOE,KAAK,EAAEiB,cAAc,WACnDnB,OAAOE,KAAK,EAAEiB,UAAUO,WACxBb;IAEN,qBACE,MAAC3B;;0BACC,KAACyC;gBAAIC,WAAW,CAAC,EAAEtC,eAAe,OAAO,CAAC;0BACxC,cAAA,KAACH;oBACCW,MAAMA;oBACNH,QAAQA;oBACRF,QAAQA;oBACRM,SAASA;oBACTH,aAAaA;oBACbF,cAAcA;oBACdO,MAAMA;;;0BAGV,KAACnB;gBAAgB+C,iBAAiBjB;;YACjC,CAACG,kBAAkBe,MAAMC,sCACxB,KAAC3C;gBACCmC,cAAcA;gBACdE,iBAAiBA;gBACjBJ,iBAAiBA;gBACjB3B,cAAcA;;0BAGlB,KAACZ;gBAAgB+C,iBAAiBf;;;;AAGxC,EAAC"}

package/dist/views/Login/meta.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Login/meta.ts"],"sourcesContent":["import type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateLoginMetadata: GenerateViewMetadata = async ({ config, i18n: { t } }) =>\n  meta({\n    description: `${t('authentication:login')}`,\n    keywords: `${t('authentication:login')}`,\n    serverURL: config.serverURL,\n    title: t('authentication:login'),\n    ...(config.admin.meta || {}),\n  })\n"],"names":["meta","generateLoginMetadata","config","i18n","t","description","keywords","serverURL","title","admin"],"rangeMappings":";;;;;;;","mappings":"AAEA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,wBAA8C,OAAO,EAAEC,MAAM,EAAEC,MAAM,EAAEC,CAAC,EAAE,EAAE,GACvFJ,KAAK;QACHK,aAAa,CAAC,EAAED,EAAE,wBAAwB,CAAC;QAC3CE,UAAU,CAAC,EAAEF,EAAE,wBAAwB,CAAC;QACxCG,WAAWL,OAAOK,SAAS;QAC3BC,OAAOJ,EAAE;QACT,GAAIF,OAAOO,KAAK,CAACT,IAAI,IAAI,CAAC,CAAC;IAC7B,GAAE"}
+{"version":3,"sources":["../../../src/views/Login/meta.ts"],"sourcesContent":["import type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateLoginMetadata: GenerateViewMetadata = async ({ config, i18n: { t } }) =>\n  meta({\n    description: `${t('authentication:login')}`,\n    keywords: `${t('authentication:login')}`,\n    serverURL: config.serverURL,\n    title: t('authentication:login'),\n    ...(config.admin.meta || {}),\n  })\n"],"names":["meta","generateLoginMetadata","config","i18n","t","description","keywords","serverURL","title","admin"],"mappings":"AAEA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,wBAA8C,OAAO,EAAEC,MAAM,EAAEC,MAAM,EAAEC,CAAC,EAAE,EAAE,GACvFJ,KAAK;QACHK,aAAa,CAAC,EAAED,EAAE,wBAAwB,CAAC;QAC3CE,UAAU,CAAC,EAAEF,EAAE,wBAAwB,CAAC;QACxCG,WAAWL,OAAOK,SAAS;QAC3BC,OAAOJ,EAAE;QACT,GAAIF,OAAOO,KAAK,CAACT,IAAI,IAAI,CAAC,CAAC;IAC7B,GAAE"}

package/dist/views/Logout/LogoutClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LogoutClient.d.ts","sourceRoot":"","sources":["../../../src/views/Logout/LogoutClient.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA8B,MAAM,OAAO,CAAA;AAIlD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAkCA,CAAA"}
+{"version":3,"file":"LogoutClient.d.ts","sourceRoot":"","sources":["../../../src/views/Logout/LogoutClient.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA8B,MAAM,OAAO,CAAA;AAIlD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAsCA,CAAA"}

package/dist/views/Logout/LogoutClient.js

@@ -1,6 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, useAuth, useTranslation } from '@payloadcms/ui/client';
+import { Button, useAuth, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
 import LinkImport from 'next/link.js';
 import React, { Fragment, useEffect } from 'react';
 const Link = LinkImport.default || LinkImport;
@@ -12,7 +13,7 @@ export const LogoutClient = (props)=>{
     useEffect(()=>{
         if (!isLoggingOut) {
             setIsLoggingOut(true);
-            logOut();
+            void logOut();
         }
     }, [
         isLoggingOut,
@@ -31,7 +32,11 @@ export const LogoutClient = (props)=>{
                     Link: Link,
                     buttonStyle: "secondary",
                     el: "link",
-                    url: `${adminRoute}/login${redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''}`,
+                    size: "large",
+                    url: formatAdminURL({
+                        adminRoute,
+                        path: `/login${redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''}`
+                    }),
                     children: t('authentication:logBackIn')
                 })
             ]

package/dist/views/Logout/LogoutClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Logout/LogoutClient.tsx"],"sourcesContent":["'use client'\nimport { Button, useAuth, useTranslation } from '@payloadcms/ui/client'\nimport LinkImport from 'next/link.js'\nimport React, { Fragment, useEffect } from 'react'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const LogoutClient: React.FC<{\n  adminRoute: string\n  inactivity?: boolean\n  redirect: string\n}> = (props) => {\n  const { adminRoute, inactivity, redirect } = props\n\n  const [isLoggingOut, setIsLoggingOut] = React.useState<boolean | undefined>(undefined)\n  const { logOut } = useAuth()\n  const { t } = useTranslation()\n\n  useEffect(() => {\n    if (!isLoggingOut) {\n      setIsLoggingOut(true)\n      logOut()\n    }\n  }, [isLoggingOut, logOut])\n\n  if (isLoggingOut) {\n    return (\n      <Fragment>\n        {inactivity && <h2>{t('authentication:loggedOutInactivity')}</h2>}\n        {!inactivity && <h2>{t('authentication:loggedOutSuccessfully')}</h2>}\n        <Button\n          Link={Link}\n          buttonStyle=\"secondary\"\n          el=\"link\"\n          url={`${adminRoute}/login${\n            redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''\n          }`}\n        >\n          {t('authentication:logBackIn')}\n        </Button>\n      </Fragment>\n    )\n  }\n\n  return <Fragment>{t('authentication:loggingOut')}</Fragment>\n}\n"],"names":["Button","useAuth","useTranslation","LinkImport","React","Fragment","useEffect","Link","default","LogoutClient","props","adminRoute","inactivity","redirect","isLoggingOut","setIsLoggingOut","useState","undefined","logOut","t","h2","buttonStyle","el","url","length","encodeURIComponent"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,OAAO,EAAEC,cAAc,QAAQ,wBAAuB;AACvE,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,QAAO;AAElD,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,eAIR,CAACC;IACJ,MAAM,EAAEC,UAAU,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGH;IAE7C,MAAM,CAACI,cAAcC,gBAAgB,GAAGX,MAAMY,QAAQ,CAAsBC;IAC5E,MAAM,EAAEC,MAAM,EAAE,GAAGjB;IACnB,MAAM,EAAEkB,CAAC,EAAE,GAAGjB;IAEdI,UAAU;QACR,IAAI,CAACQ,cAAc;YACjBC,gBAAgB;YAChBG;QACF;IACF,GAAG;QAACJ;QAAcI;KAAO;IAEzB,IAAIJ,cAAc;QAChB,qBACE,MAACT;;gBACEO,4BAAc,KAACQ;8BAAID,EAAE;;gBACrB,CAACP,4BAAc,KAACQ;8BAAID,EAAE;;8BACvB,KAACnB;oBACCO,MAAMA;oBACNc,aAAY;oBACZC,IAAG;oBACHC,KAAK,CAAC,EAAEZ,WAAW,MAAM,EACvBE,YAAYA,SAASW,MAAM,GAAG,IAAI,CAAC,UAAU,EAAEC,mBAAmBZ,UAAU,CAAC,GAAG,GACjF,CAAC;8BAEDM,EAAE;;;;IAIX;IAEA,qBAAO,KAACd;kBAAUc,EAAE;;AACtB,EAAC"}
+{"version":3,"sources":["../../../src/views/Logout/LogoutClient.tsx"],"sourcesContent":["'use client'\nimport { Button, useAuth, useTranslation } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport LinkImport from 'next/link.js'\nimport React, { Fragment, useEffect } from 'react'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const LogoutClient: React.FC<{\n  adminRoute: string\n  inactivity?: boolean\n  redirect: string\n}> = (props) => {\n  const { adminRoute, inactivity, redirect } = props\n\n  const [isLoggingOut, setIsLoggingOut] = React.useState<boolean | undefined>(undefined)\n  const { logOut } = useAuth()\n  const { t } = useTranslation()\n\n  useEffect(() => {\n    if (!isLoggingOut) {\n      setIsLoggingOut(true)\n      void logOut()\n    }\n  }, [isLoggingOut, logOut])\n\n  if (isLoggingOut) {\n    return (\n      <Fragment>\n        {inactivity && <h2>{t('authentication:loggedOutInactivity')}</h2>}\n        {!inactivity && <h2>{t('authentication:loggedOutSuccessfully')}</h2>}\n        <Button\n          Link={Link}\n          buttonStyle=\"secondary\"\n          el=\"link\"\n          size=\"large\"\n          url={formatAdminURL({\n            adminRoute,\n            path: `/login${\n              redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''\n            }`,\n          })}\n        >\n          {t('authentication:logBackIn')}\n        </Button>\n      </Fragment>\n    )\n  }\n\n  return <Fragment>{t('authentication:loggingOut')}</Fragment>\n}\n"],"names":["Button","useAuth","useTranslation","formatAdminURL","LinkImport","React","Fragment","useEffect","Link","default","LogoutClient","props","adminRoute","inactivity","redirect","isLoggingOut","setIsLoggingOut","useState","undefined","logOut","t","h2","buttonStyle","el","size","url","path","length","encodeURIComponent"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,OAAO,EAAEC,cAAc,QAAQ,iBAAgB;AAChE,SAASC,cAAc,QAAQ,wBAAuB;AACtD,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,QAAO;AAElD,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,eAIR,CAACC;IACJ,MAAM,EAAEC,UAAU,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGH;IAE7C,MAAM,CAACI,cAAcC,gBAAgB,GAAGX,MAAMY,QAAQ,CAAsBC;IAC5E,MAAM,EAAEC,MAAM,EAAE,GAAGlB;IACnB,MAAM,EAAEmB,CAAC,EAAE,GAAGlB;IAEdK,UAAU;QACR,IAAI,CAACQ,cAAc;YACjBC,gBAAgB;YAChB,KAAKG;QACP;IACF,GAAG;QAACJ;QAAcI;KAAO;IAEzB,IAAIJ,cAAc;QAChB,qBACE,MAACT;;gBACEO,4BAAc,KAACQ;8BAAID,EAAE;;gBACrB,CAACP,4BAAc,KAACQ;8BAAID,EAAE;;8BACvB,KAACpB;oBACCQ,MAAMA;oBACNc,aAAY;oBACZC,IAAG;oBACHC,MAAK;oBACLC,KAAKtB,eAAe;wBAClBS;wBACAc,MAAM,CAAC,MAAM,EACXZ,YAAYA,SAASa,MAAM,GAAG,IAAI,CAAC,UAAU,EAAEC,mBAAmBd,UAAU,CAAC,GAAG,GACjF,CAAC;oBACJ;8BAECM,EAAE;;;;IAIX;IAEA,qBAAO,KAACd;kBAAUc,EAAE;;AACtB,EAAC"}

package/dist/views/Logout/index.d.ts

@@ -2,8 +2,8 @@ import type { AdminViewProps } from 'payload';
 import React from 'react';
 import './index.scss';
 export { generateLogoutMetadata } from './meta.js';
-export declare const LogoutView: React.FC<AdminViewProps & {
+export declare const LogoutView: React.FC<{
     inactivity?: boolean;
-}>;
+} & AdminViewProps>;
 export declare const LogoutInactivity: React.FC<AdminViewProps>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Logout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,cAAc,CAAA;AAIrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAC/B,cAAc,GAAG;IACf,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAqBF,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAErD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Logout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,cAAc,CAAA;AAIrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAC/B;IACE,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,GAAG,cAAc,CAqBnB,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAErD,CAAA"}

package/dist/views/Logout/index.js

@@ -4,11 +4,11 @@ import { LogoutClient } from './LogoutClient.js';
 const baseClass = 'logout';
 export { generateLogoutMetadata } from './meta.js';
 export const LogoutView = ({ inactivity, initPageResult, searchParams })=>{
-    const { req: { payload: { config: { routes: { admin } } } } } = initPageResult;
+    const { req: { payload: { config: { routes: { admin: adminRoute } } } } } = initPageResult;
     return /*#__PURE__*/ _jsx("div", {
         className: `${baseClass}__wrap`,
         children: /*#__PURE__*/ _jsx(LogoutClient, {
-            adminRoute: admin,
+            adminRoute: adminRoute,
             inactivity: inactivity,
             redirect: searchParams.redirect
         })

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Logout/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport React from 'react'\n\nimport { LogoutClient } from './LogoutClient.js'\nimport './index.scss'\n\nconst baseClass = 'logout'\n\nexport { generateLogoutMetadata } from './meta.js'\n\nexport const LogoutView: React.FC<\n  AdminViewProps & {\n    inactivity?: boolean\n  }\n> = ({ inactivity, initPageResult, searchParams }) => {\n  const {\n    req: {\n      payload: {\n        config: {\n          routes: { admin },\n        },\n      },\n    },\n  } = initPageResult\n\n  return (\n    <div className={`${baseClass}__wrap`}>\n      <LogoutClient\n        adminRoute={admin}\n        inactivity={inactivity}\n        redirect={searchParams.redirect as string}\n      />\n    </div>\n  )\n}\n\nexport const LogoutInactivity: React.FC<AdminViewProps> = (props) => {\n  return <LogoutView inactivity {...props} />\n}\n"],"names":["React","LogoutClient","baseClass","generateLogoutMetadata","LogoutView","inactivity","initPageResult","searchParams","req","payload","config","routes","admin","div","className","adminRoute","redirect","LogoutInactivity","props"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;","mappings":";AAEA,OAAOA,WAAW,QAAO;AAEzB,SAASC,YAAY,QAAQ,oBAAmB;AAGhD,MAAMC,YAAY;AAElB,SAASC,sBAAsB,QAAQ,YAAW;AAElD,OAAO,MAAMC,aAIT,CAAC,EAAEC,UAAU,EAAEC,cAAc,EAAEC,YAAY,EAAE;IAC/C,MAAM,EACJC,KAAK,EACHC,SAAS,EACPC,QAAQ,EACNC,QAAQ,EAAEC,KAAK,EAAE,EAClB,EACF,EACF,EACF,GAAGN;IAEJ,qBACE,KAACO;QAAIC,WAAW,CAAC,EAAEZ,UAAU,MAAM,CAAC;kBAClC,cAAA,KAACD;YACCc,YAAYH;YACZP,YAAYA;YACZW,UAAUT,aAAaS,QAAQ;;;AAIvC,EAAC;AAED,OAAO,MAAMC,mBAA6C,CAACC;IACzD,qBAAO,KAACd;QAAWC,UAAU;QAAE,GAAGa,KAAK;;AACzC,EAAC"}
+{"version":3,"sources":["../../../src/views/Logout/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport React from 'react'\n\nimport { LogoutClient } from './LogoutClient.js'\nimport './index.scss'\n\nconst baseClass = 'logout'\n\nexport { generateLogoutMetadata } from './meta.js'\n\nexport const LogoutView: React.FC<\n  {\n    inactivity?: boolean\n  } & AdminViewProps\n> = ({ inactivity, initPageResult, searchParams }) => {\n  const {\n    req: {\n      payload: {\n        config: {\n          routes: { admin: adminRoute },\n        },\n      },\n    },\n  } = initPageResult\n\n  return (\n    <div className={`${baseClass}__wrap`}>\n      <LogoutClient\n        adminRoute={adminRoute}\n        inactivity={inactivity}\n        redirect={searchParams.redirect as string}\n      />\n    </div>\n  )\n}\n\nexport const LogoutInactivity: React.FC<AdminViewProps> = (props) => {\n  return <LogoutView inactivity {...props} />\n}\n"],"names":["React","LogoutClient","baseClass","generateLogoutMetadata","LogoutView","inactivity","initPageResult","searchParams","req","payload","config","routes","admin","adminRoute","div","className","redirect","LogoutInactivity","props"],"mappings":";AAEA,OAAOA,WAAW,QAAO;AAEzB,SAASC,YAAY,QAAQ,oBAAmB;AAGhD,MAAMC,YAAY;AAElB,SAASC,sBAAsB,QAAQ,YAAW;AAElD,OAAO,MAAMC,aAIT,CAAC,EAAEC,UAAU,EAAEC,cAAc,EAAEC,YAAY,EAAE;IAC/C,MAAM,EACJC,KAAK,EACHC,SAAS,EACPC,QAAQ,EACNC,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC9B,EACF,EACF,EACF,GAAGP;IAEJ,qBACE,KAACQ;QAAIC,WAAW,CAAC,EAAEb,UAAU,MAAM,CAAC;kBAClC,cAAA,KAACD;YACCY,YAAYA;YACZR,YAAYA;YACZW,UAAUT,aAAaS,QAAQ;;;AAIvC,EAAC;AAED,OAAO,MAAMC,mBAA6C,CAACC;IACzD,qBAAO,KAACd;QAAWC,UAAU;QAAE,GAAGa,KAAK;;AACzC,EAAC"}

package/dist/views/Logout/meta.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Logout/meta.ts"],"sourcesContent":["import type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateLogoutMetadata: GenerateViewMetadata = async ({ config, i18n: { t } }) =>\n  meta({\n    description: `${t('authentication:logoutUser')}`,\n    keywords: `${t('authentication:logout')}`,\n    serverURL: config.serverURL,\n    title: t('authentication:logout'),\n  })\n"],"names":["meta","generateLogoutMetadata","config","i18n","t","description","keywords","serverURL","title"],"rangeMappings":";;;;;;","mappings":"AAEA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,yBAA+C,OAAO,EAAEC,MAAM,EAAEC,MAAM,EAAEC,CAAC,EAAE,EAAE,GACxFJ,KAAK;QACHK,aAAa,CAAC,EAAED,EAAE,6BAA6B,CAAC;QAChDE,UAAU,CAAC,EAAEF,EAAE,yBAAyB,CAAC;QACzCG,WAAWL,OAAOK,SAAS;QAC3BC,OAAOJ,EAAE;IACX,GAAE"}
+{"version":3,"sources":["../../../src/views/Logout/meta.ts"],"sourcesContent":["import type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateLogoutMetadata: GenerateViewMetadata = async ({ config, i18n: { t } }) =>\n  meta({\n    description: `${t('authentication:logoutUser')}`,\n    keywords: `${t('authentication:logout')}`,\n    serverURL: config.serverURL,\n    title: t('authentication:logout'),\n  })\n"],"names":["meta","generateLogoutMetadata","config","i18n","t","description","keywords","serverURL","title"],"mappings":"AAEA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,yBAA+C,OAAO,EAAEC,MAAM,EAAEC,MAAM,EAAEC,CAAC,EAAE,EAAE,GACxFJ,KAAK;QACHK,aAAa,CAAC,EAAED,EAAE,6BAA6B,CAAC;QAChDE,UAAU,CAAC,EAAEF,EAAE,yBAAyB,CAAC;QACzCG,WAAWL,OAAOK,SAAS;QAC3BC,OAAOJ,EAAE;IACX,GAAE"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.client.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAoB,MAAM,OAAO,CAAA;AAExC,OAAO,cAAc,CAAA;AAMrB,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC;IACpC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAiCA,CAAA"}
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.client.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAoB,MAAM,OAAO,CAAA;AAExC,OAAO,cAAc,CAAA;AAMrB,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC;IACpC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAyCA,CAAA"}

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

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui/client';
+import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui';
 import LinkImport from 'next/link.js';
 import React, { useEffect } from 'react';
 const baseClass = 'not-found';
@@ -9,7 +9,7 @@ export const NotFoundClient = (props)=>{
     const { marginTop = 'large' } = props;
     const { setStepNav } = useStepNav();
     const { t } = useTranslation();
-    const { routes: { admin } } = useConfig();
+    const { config: { routes: { admin: adminRoute } } } = useConfig();
     useEffect(()=>{
         setStepNav([
             {
@@ -38,7 +38,8 @@ export const NotFoundClient = (props)=>{
                     Link: Link,
                     className: `${baseClass}__button`,
                     el: "link",
-                    to: `${admin}`,
+                    size: "large",
+                    to: adminRoute,
                     children: t('general:backToDashboard')
                 })
             ]

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/index.client.tsx"],"sourcesContent":["'use client'\nimport { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui/client'\nimport LinkImport from 'next/link.js'\nimport React, { useEffect } from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'not-found'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const NotFoundClient: React.FC<{\n  marginTop?: 'large'\n}> = (props) => {\n  const { marginTop = 'large' } = props\n\n  const { setStepNav } = useStepNav()\n  const { t } = useTranslation()\n\n  const {\n    routes: { admin },\n  } = useConfig()\n\n  useEffect(() => {\n    setStepNav([\n      {\n        label: t('general:notFound'),\n      },\n    ])\n  }, [setStepNav, t])\n\n  return (\n    <div\n      className={[baseClass, marginTop && `${baseClass}--margin-top-${marginTop}`]\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <Gutter className={`${baseClass}__wrap`}>\n        <h1>{t('general:nothingFound')}</h1>\n        <p>{t('general:sorryNotFound')}</p>\n        <Button Link={Link} className={`${baseClass}__button`} el=\"link\" to={`${admin}`}>\n          {t('general:backToDashboard')}\n        </Button>\n      </Gutter>\n    </div>\n  )\n}\n"],"names":["Button","Gutter","useConfig","useStepNav","useTranslation","LinkImport","React","useEffect","baseClass","Link","default","NotFoundClient","props","marginTop","setStepNav","t","routes","admin","label","div","className","filter","Boolean","join","h1","p","el","to"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAEC,cAAc,QAAQ,wBAAuB;AAC7F,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,SAAS,QAAQ,QAAO;AAIxC,MAAMC,YAAY;AAElB,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,iBAER,CAACC;IACJ,MAAM,EAAEC,YAAY,OAAO,EAAE,GAAGD;IAEhC,MAAM,EAAEE,UAAU,EAAE,GAAGX;IACvB,MAAM,EAAEY,CAAC,EAAE,GAAGX;IAEd,MAAM,EACJY,QAAQ,EAAEC,KAAK,EAAE,EAClB,GAAGf;IAEJK,UAAU;QACRO,WAAW;YACT;gBACEI,OAAOH,EAAE;YACX;SACD;IACH,GAAG;QAACD;QAAYC;KAAE;IAElB,qBACE,KAACI;QACCC,WAAW;YAACZ;YAAWK,aAAa,CAAC,EAAEL,UAAU,aAAa,EAAEK,UAAU,CAAC;SAAC,CACzEQ,MAAM,CAACC,SACPC,IAAI,CAAC;kBAER,cAAA,MAACtB;YAAOmB,WAAW,CAAC,EAAEZ,UAAU,MAAM,CAAC;;8BACrC,KAACgB;8BAAIT,EAAE;;8BACP,KAACU;8BAAGV,EAAE;;8BACN,KAACf;oBAAOS,MAAMA;oBAAMW,WAAW,CAAC,EAAEZ,UAAU,QAAQ,CAAC;oBAAEkB,IAAG;oBAAOC,IAAI,CAAC,EAAEV,MAAM,CAAC;8BAC5EF,EAAE;;;;;AAKb,EAAC"}
+{"version":3,"sources":["../../../src/views/NotFound/index.client.tsx"],"sourcesContent":["'use client'\nimport { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui'\nimport LinkImport from 'next/link.js'\nimport React, { useEffect } from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'not-found'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const NotFoundClient: React.FC<{\n  marginTop?: 'large'\n}> = (props) => {\n  const { marginTop = 'large' } = props\n\n  const { setStepNav } = useStepNav()\n  const { t } = useTranslation()\n\n  const {\n    config: {\n      routes: { admin: adminRoute },\n    },\n  } = useConfig()\n\n  useEffect(() => {\n    setStepNav([\n      {\n        label: t('general:notFound'),\n      },\n    ])\n  }, [setStepNav, t])\n\n  return (\n    <div\n      className={[baseClass, marginTop && `${baseClass}--margin-top-${marginTop}`]\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <Gutter className={`${baseClass}__wrap`}>\n        <h1>{t('general:nothingFound')}</h1>\n        <p>{t('general:sorryNotFound')}</p>\n        <Button\n          Link={Link}\n          className={`${baseClass}__button`}\n          el=\"link\"\n          size=\"large\"\n          to={adminRoute}\n        >\n          {t('general:backToDashboard')}\n        </Button>\n      </Gutter>\n    </div>\n  )\n}\n"],"names":["Button","Gutter","useConfig","useStepNav","useTranslation","LinkImport","React","useEffect","baseClass","Link","default","NotFoundClient","props","marginTop","setStepNav","t","config","routes","admin","adminRoute","label","div","className","filter","Boolean","join","h1","p","el","size","to"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAEC,cAAc,QAAQ,iBAAgB;AACtF,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,SAAS,QAAQ,QAAO;AAIxC,MAAMC,YAAY;AAElB,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,iBAER,CAACC;IACJ,MAAM,EAAEC,YAAY,OAAO,EAAE,GAAGD;IAEhC,MAAM,EAAEE,UAAU,EAAE,GAAGX;IACvB,MAAM,EAAEY,CAAC,EAAE,GAAGX;IAEd,MAAM,EACJY,QAAQ,EACNC,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC9B,EACF,GAAGjB;IAEJK,UAAU;QACRO,WAAW;YACT;gBACEM,OAAOL,EAAE;YACX;SACD;IACH,GAAG;QAACD;QAAYC;KAAE;IAElB,qBACE,KAACM;QACCC,WAAW;YAACd;YAAWK,aAAa,CAAC,EAAEL,UAAU,aAAa,EAAEK,UAAU,CAAC;SAAC,CACzEU,MAAM,CAACC,SACPC,IAAI,CAAC;kBAER,cAAA,MAACxB;YAAOqB,WAAW,CAAC,EAAEd,UAAU,MAAM,CAAC;;8BACrC,KAACkB;8BAAIX,EAAE;;8BACP,KAACY;8BAAGZ,EAAE;;8BACN,KAACf;oBACCS,MAAMA;oBACNa,WAAW,CAAC,EAAEd,UAAU,QAAQ,CAAC;oBACjCoB,IAAG;oBACHC,MAAK;oBACLC,IAAIX;8BAEHJ,EAAE;;;;;AAKb,EAAC"}

package/dist/views/NotFound/index.d.ts

@@ -1,6 +1,6 @@
 import type { I18n } from '@payloadcms/translations';
 import type { Metadata } from 'next';
-import type { AdminViewComponent, SanitizedConfig } from 'payload';
+import type { AdminViewComponent, ImportMap, PayloadServerReactComponent, SanitizedConfig } from 'payload';
 import React from 'react';
 export declare const generatePageMetadata: ({ config: configPromise, }: {
     config: Promise<SanitizedConfig> | SanitizedConfig;
@@ -15,8 +15,9 @@ export type GenerateViewMetadata = (args: {
         [key: string]: string | string[];
     };
 }) => Promise<Metadata>;
-export declare const NotFoundPage: ({ config: configPromise, params, searchParams, }: {
+export declare const NotFoundPage: ({ config: configPromise, importMap, params, searchParams, }: {
     config: Promise<SanitizedConfig>;
+    importMap: ImportMap;
     params: {
         segments: string[];
     };
@@ -24,5 +25,5 @@ export declare const NotFoundPage: ({ config: configPromise, params, searchParam
         [key: string]: string | string[];
     };
 }) => Promise<React.JSX.Element>;
-export declare const NotFoundView: AdminViewComponent;
+export declare const NotFoundView: PayloadServerReactComponent<AdminViewComponent>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAGlE,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,eAAO,MAAM,oBAAoB,+BAE9B;IACD,MAAM,EAAE,QAAQ,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAE9C,KAAG,QAAQ,QAAQ,CAUnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvB,eAAO,MAAM,YAAY,qDAItB;IACD,MAAM,EAAE,QAAQ,eAAe,CAAC,CAAA;IAChC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,EAAE,CAAA;KACnB,CAAA;IACD,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;CACF,+BA4BA,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,kBAE1B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EACV,kBAAkB,EAClB,SAAS,EACT,2BAA2B,EAC3B,eAAe,EAChB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,eAAO,MAAM,oBAAoB,+BAE9B;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAG,OAAO,CAAC,QAAQ,CAUnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvB,eAAO,MAAM,YAAY,gEAKtB;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,EAAE,CAAA;KACnB,CAAA;IACD,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;CACF,+BA0BA,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,2BAA2B,CAAC,kBAAkB,CAExE,CAAA"}

package/dist/views/NotFound/index.js

@@ -1,6 +1,6 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { HydrateClientUser } from '@payloadcms/ui/client';
-import React, { Fragment } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { formatAdminURL } from '@payloadcms/ui/shared';
+import React from 'react';
 import { DefaultTemplate } from '../../templates/Default/index.js';
 import { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js';
 import { initPage } from '../../utilities/initPage/index.js';
@@ -14,33 +14,29 @@ export const generatePageMetadata = async ({ config: configPromise })=>{
         title: i18n.t('general:notFound')
     };
 };
-export const NotFoundPage = async ({ config: configPromise, params, searchParams })=>{
+export const NotFoundPage = async ({ config: configPromise, importMap, params, searchParams })=>{
     const config = await configPromise;
     const { routes: { admin: adminRoute } = {} } = config;
     const initPageResult = await initPage({
         config,
+        importMap,
         redirectUnauthenticatedUser: true,
-        route: `${adminRoute}/not-found`,
+        route: formatAdminURL({
+            adminRoute,
+            path: '/not-found'
+        }),
         searchParams
     });
-    return /*#__PURE__*/ _jsxs(Fragment, {
-        children: [
-            /*#__PURE__*/ _jsx(HydrateClientUser, {
-                permissions: initPageResult.permissions,
-                user: initPageResult.req.user
-            }),
-            /*#__PURE__*/ _jsx(DefaultTemplate, {
-                i18n: initPageResult.req.i18n,
-                locale: initPageResult.locale,
-                params: params,
-                payload: initPageResult.req.payload,
-                permissions: initPageResult.permissions,
-                searchParams: searchParams,
-                user: initPageResult.req.user,
-                visibleEntities: initPageResult.visibleEntities,
-                children: /*#__PURE__*/ _jsx(NotFoundClient, {})
-            })
-        ]
+    return /*#__PURE__*/ _jsx(DefaultTemplate, {
+        i18n: initPageResult.req.i18n,
+        locale: initPageResult.locale,
+        params: params,
+        payload: initPageResult.req.payload,
+        permissions: initPageResult.permissions,
+        searchParams: searchParams,
+        user: initPageResult.req.user,
+        visibleEntities: initPageResult.visibleEntities,
+        children: /*#__PURE__*/ _jsx(NotFoundClient, {})
     });
 };
 export const NotFoundView = ()=>{

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { AdminViewComponent, SanitizedConfig } from 'payload'\n\nimport { HydrateClientUser } from '@payloadcms/ui/client'\nimport React, { Fragment } from 'react'\n\nimport { DefaultTemplate } from '../../templates/Default/index.js'\nimport { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js'\nimport { initPage } from '../../utilities/initPage/index.js'\nimport { NotFoundClient } from './index.client.js'\n\nexport const generatePageMetadata = async ({\n  config: configPromise,\n}: {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: { [key: string]: string | string[] }\n  //eslint-disable-next-line @typescript-eslint/require-await\n}): Promise<Metadata> => {\n  const config = await configPromise\n\n  const i18n = await getNextRequestI18n({\n    config,\n  })\n\n  return {\n    title: i18n.t('general:notFound'),\n  }\n}\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18n\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const NotFoundPage = async ({\n  config: configPromise,\n  params,\n  searchParams,\n}: {\n  config: Promise<SanitizedConfig>\n  params: {\n    segments: string[]\n  }\n  searchParams: {\n    [key: string]: string | string[]\n  }\n}) => {\n  const config = await configPromise\n  const { routes: { admin: adminRoute } = {} } = config\n\n  const initPageResult = await initPage({\n    config,\n    redirectUnauthenticatedUser: true,\n    route: `${adminRoute}/not-found`,\n    searchParams,\n  })\n\n  return (\n    <Fragment>\n      <HydrateClientUser permissions={initPageResult.permissions} user={initPageResult.req.user} />\n      <DefaultTemplate\n        i18n={initPageResult.req.i18n}\n        locale={initPageResult.locale}\n        params={params}\n        payload={initPageResult.req.payload}\n        permissions={initPageResult.permissions}\n        searchParams={searchParams}\n        user={initPageResult.req.user}\n        visibleEntities={initPageResult.visibleEntities}\n      >\n        <NotFoundClient />\n      </DefaultTemplate>\n    </Fragment>\n  )\n}\n\nexport const NotFoundView: AdminViewComponent = () => {\n  return <NotFoundClient marginTop=\"large\" />\n}\n"],"names":["HydrateClientUser","React","Fragment","DefaultTemplate","getNextRequestI18n","initPage","NotFoundClient","generatePageMetadata","config","configPromise","i18n","title","t","NotFoundPage","params","searchParams","routes","admin","adminRoute","initPageResult","redirectUnauthenticatedUser","route","permissions","user","req","locale","payload","visibleEntities","NotFoundView","marginTop"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAIA,SAASA,iBAAiB,QAAQ,wBAAuB;AACzD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,kBAAkB,QAAQ,wCAAuC;AAC1E,SAASC,QAAQ,QAAQ,oCAAmC;AAC5D,SAASC,cAAc,QAAQ,oBAAmB;AAElD,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,QAAQC,aAAa,EAKtB;IACC,MAAMD,SAAS,MAAMC;IAErB,MAAMC,OAAO,MAAMN,mBAAmB;QACpCI;IACF;IAEA,OAAO;QACLG,OAAOD,KAAKE,CAAC,CAAC;IAChB;AACF,EAAC;AAQD,OAAO,MAAMC,eAAe,OAAO,EACjCL,QAAQC,aAAa,EACrBK,MAAM,EACNC,YAAY,EASb;IACC,MAAMP,SAAS,MAAMC;IACrB,MAAM,EAAEO,QAAQ,EAAEC,OAAOC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,GAAGV;IAE/C,MAAMW,iBAAiB,MAAMd,SAAS;QACpCG;QACAY,6BAA6B;QAC7BC,OAAO,CAAC,EAAEH,WAAW,UAAU,CAAC;QAChCH;IACF;IAEA,qBACE,MAACb;;0BACC,KAACF;gBAAkBsB,aAAaH,eAAeG,WAAW;gBAAEC,MAAMJ,eAAeK,GAAG,CAACD,IAAI;;0BACzF,KAACpB;gBACCO,MAAMS,eAAeK,GAAG,CAACd,IAAI;gBAC7Be,QAAQN,eAAeM,MAAM;gBAC7BX,QAAQA;gBACRY,SAASP,eAAeK,GAAG,CAACE,OAAO;gBACnCJ,aAAaH,eAAeG,WAAW;gBACvCP,cAAcA;gBACdQ,MAAMJ,eAAeK,GAAG,CAACD,IAAI;gBAC7BI,iBAAiBR,eAAeQ,eAAe;0BAE/C,cAAA,KAACrB;;;;AAIT,EAAC;AAED,OAAO,MAAMsB,eAAmC;IAC9C,qBAAO,KAACtB;QAAeuB,WAAU;;AACnC,EAAC"}
+{"version":3,"sources":["../../../src/views/NotFound/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type {\n  AdminViewComponent,\n  ImportMap,\n  PayloadServerReactComponent,\n  SanitizedConfig,\n} from 'payload'\n\nimport { HydrateAuthProvider } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport React, { Fragment } from 'react'\n\nimport { DefaultTemplate } from '../../templates/Default/index.js'\nimport { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js'\nimport { initPage } from '../../utilities/initPage/index.js'\nimport { NotFoundClient } from './index.client.js'\n\nexport const generatePageMetadata = async ({\n  config: configPromise,\n}: {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: { [key: string]: string | string[] }\n}): Promise<Metadata> => {\n  const config = await configPromise\n\n  const i18n = await getNextRequestI18n({\n    config,\n  })\n\n  return {\n    title: i18n.t('general:notFound'),\n  }\n}\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18n\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const NotFoundPage = async ({\n  config: configPromise,\n  importMap,\n  params,\n  searchParams,\n}: {\n  config: Promise<SanitizedConfig>\n  importMap: ImportMap\n  params: {\n    segments: string[]\n  }\n  searchParams: {\n    [key: string]: string | string[]\n  }\n}) => {\n  const config = await configPromise\n  const { routes: { admin: adminRoute } = {} } = config\n\n  const initPageResult = await initPage({\n    config,\n    importMap,\n    redirectUnauthenticatedUser: true,\n    route: formatAdminURL({ adminRoute, path: '/not-found' }),\n    searchParams,\n  })\n\n  return (\n    <DefaultTemplate\n      i18n={initPageResult.req.i18n}\n      locale={initPageResult.locale}\n      params={params}\n      payload={initPageResult.req.payload}\n      permissions={initPageResult.permissions}\n      searchParams={searchParams}\n      user={initPageResult.req.user}\n      visibleEntities={initPageResult.visibleEntities}\n    >\n      <NotFoundClient />\n    </DefaultTemplate>\n  )\n}\n\nexport const NotFoundView: PayloadServerReactComponent<AdminViewComponent> = () => {\n  return <NotFoundClient marginTop=\"large\" />\n}\n"],"names":["formatAdminURL","React","DefaultTemplate","getNextRequestI18n","initPage","NotFoundClient","generatePageMetadata","config","configPromise","i18n","title","t","NotFoundPage","importMap","params","searchParams","routes","admin","adminRoute","initPageResult","redirectUnauthenticatedUser","route","path","req","locale","payload","permissions","user","visibleEntities","NotFoundView","marginTop"],"mappings":";AAUA,SAASA,cAAc,QAAQ,wBAAuB;AACtD,OAAOC,WAAyB,QAAO;AAEvC,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,kBAAkB,QAAQ,wCAAuC;AAC1E,SAASC,QAAQ,QAAQ,oCAAmC;AAC5D,SAASC,cAAc,QAAQ,oBAAmB;AAElD,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,QAAQC,aAAa,EAItB;IACC,MAAMD,SAAS,MAAMC;IAErB,MAAMC,OAAO,MAAMN,mBAAmB;QACpCI;IACF;IAEA,OAAO;QACLG,OAAOD,KAAKE,CAAC,CAAC;IAChB;AACF,EAAC;AAQD,OAAO,MAAMC,eAAe,OAAO,EACjCL,QAAQC,aAAa,EACrBK,SAAS,EACTC,MAAM,EACNC,YAAY,EAUb;IACC,MAAMR,SAAS,MAAMC;IACrB,MAAM,EAAEQ,QAAQ,EAAEC,OAAOC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,GAAGX;IAE/C,MAAMY,iBAAiB,MAAMf,SAAS;QACpCG;QACAM;QACAO,6BAA6B;QAC7BC,OAAOrB,eAAe;YAAEkB;YAAYI,MAAM;QAAa;QACvDP;IACF;IAEA,qBACE,KAACb;QACCO,MAAMU,eAAeI,GAAG,CAACd,IAAI;QAC7Be,QAAQL,eAAeK,MAAM;QAC7BV,QAAQA;QACRW,SAASN,eAAeI,GAAG,CAACE,OAAO;QACnCC,aAAaP,eAAeO,WAAW;QACvCX,cAAcA;QACdY,MAAMR,eAAeI,GAAG,CAACI,IAAI;QAC7BC,iBAAiBT,eAAeS,eAAe;kBAE/C,cAAA,KAACvB;;AAGP,EAAC;AAED,OAAO,MAAMwB,eAAgE;IAC3E,qBAAO,KAACxB;QAAeyB,WAAU;;AACnC,EAAC"}

package/dist/views/NotFound/meta.d.ts

@@ -1,8 +1,8 @@
-import type { I18n } from '@payloadcms/translations';
+import type { I18nClient } from '@payloadcms/translations';
 import type { Metadata } from 'next';
 import type { SanitizedConfig } from 'payload';
 export declare const generateNotFoundMeta: ({ config, i18n, }: {
     config: SanitizedConfig;
-    i18n: I18n;
+    i18n: I18nClient;
 }) => Promise<Metadata>;
 //# sourceMappingURL=meta.d.ts.map

package/dist/views/NotFound/meta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,oBAAoB,sBAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;CACX,KAAG,QAAQ,QAAQ,CAMhB,CAAA"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,oBAAoB,sBAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;CACjB,KAAG,OAAO,CAAC,QAAQ,CAMhB,CAAA"}