@payloadcms/next 3.0.0-canary.cee5702 → 3.0.0-canary.e14c80d

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,eAAe,CAAA;AAIxE,OAAO,KAAmB,MAAM,OAAO,CAAA;AAMvC,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,7 +1,7 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { HydrateClientUser } from '@payloadcms/ui/elements/HydrateClientUser';
-import { DefaultTemplate } from '@payloadcms/ui/templates/Default';
-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';
 import { NotFoundClient } from './index.client.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/types'\n\nimport { HydrateClientUser } from '@payloadcms/ui/elements/HydrateClientUser'\nimport { DefaultTemplate } from '@payloadcms/ui/templates/Default'\nimport React, { Fragment } from 'react'\n\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","DefaultTemplate","React","Fragment","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,4CAA2C;AAC7E,SAASC,eAAe,QAAQ,mCAAkC;AAClE,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,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,MAACZ;;0BACC,KAACH;gBAAkBsB,aAAaH,eAAeG,WAAW;gBAAEC,MAAMJ,eAAeK,GAAG,CAACD,IAAI;;0BACzF,KAACtB;gBACCS,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/types';
+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,eAAe,CAAA;AAIpD,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"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/meta.ts"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { SanitizedConfig } from 'payload/types'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateNotFoundMeta = async ({\n  config,\n  i18n,\n}: {\n  config: SanitizedConfig\n  i18n: I18n\n}): Promise<Metadata> =>\n  meta({\n    description: i18n.t('general:pageNotFound'),\n    keywords: `404 ${i18n.t('general:notFound')}`,\n    serverURL: config.serverURL,\n    title: i18n.t('general:notFound'),\n  })\n"],"names":["meta","generateNotFoundMeta","config","i18n","description","t","keywords","serverURL","title"],"rangeMappings":";;;;;;","mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,MAAM,EACNC,IAAI,EAIL,GACCH,KAAK;QACHI,aAAaD,KAAKE,CAAC,CAAC;QACpBC,UAAU,CAAC,IAAI,EAAEH,KAAKE,CAAC,CAAC,oBAAoB,CAAC;QAC7CE,WAAWL,OAAOK,SAAS;QAC3BC,OAAOL,KAAKE,CAAC,CAAC;IAChB,GAAE"}
+{"version":3,"sources":["../../../src/views/NotFound/meta.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { SanitizedConfig } from 'payload'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateNotFoundMeta = async ({\n  config,\n  i18n,\n}: {\n  config: SanitizedConfig\n  i18n: I18nClient\n}): Promise<Metadata> =>\n  meta({\n    description: i18n.t('general:pageNotFound'),\n    keywords: `404 ${i18n.t('general:notFound')}`,\n    serverURL: config.serverURL,\n    title: i18n.t('general:notFound'),\n  })\n"],"names":["meta","generateNotFoundMeta","config","i18n","description","t","keywords","serverURL","title"],"mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,MAAM,EACNC,IAAI,EAIL,GACCH,KAAK;QACHI,aAAaD,KAAKE,CAAC,CAAC;QACpBC,UAAU,CAAC,IAAI,EAAEH,KAAKE,CAAC,CAAC,oBAAoB,CAAC;QAC7CE,WAAWL,OAAOK,SAAS;QAC3BC,OAAOL,KAAKE,CAAC,CAAC;IAChB,GAAE"}

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

@@ -1,6 +1,6 @@
 import React from 'react';
 type Args = {
-    token: string;
+    readonly token: string;
 };
 export declare const ResetPasswordClient: React.FC<Args>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.client.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAeD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAsC9C,CAAA"}
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.client.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB,CAAA;AAeD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CA4D9C,CAAA"}

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

@@ -1,16 +1,10 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword';
-import { HiddenInput } from '@payloadcms/ui/fields/HiddenInput';
-import { Password } from '@payloadcms/ui/fields/Password';
-import { Form, useFormFields } from '@payloadcms/ui/forms/Form';
-import { FormSubmit } from '@payloadcms/ui/forms/Submit';
-import { useAuth } from '@payloadcms/ui/providers/Auth';
-import { useConfig } from '@payloadcms/ui/providers/Config';
-import { useTranslation } from '@payloadcms/ui/providers/Translation';
+import { ConfirmPasswordField, Form, FormSubmit, HiddenField, PasswordField, useAuth, useConfig, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
 import { useRouter } from 'next/navigation.js';
 import React from 'react';
-import { toast } from 'react-toastify';
+import { toast } from 'sonner';
 const initialState = {
     'confirm-password': {
         initialValue: '',
@@ -25,66 +19,54 @@ const initialState = {
 };
 export const ResetPasswordClient = ({ token })=>{
     const i18n = useTranslation();
-    const { admin: { user: userSlug }, routes: { admin, api }, serverURL } = useConfig();
+    const { config: { admin: { routes: { login: loginRoute }, user: userSlug }, routes: { admin: adminRoute, api: apiRoute }, serverURL } } = useConfig();
     const history = useRouter();
     const { fetchFullUser } = useAuth();
     const onSuccess = React.useCallback(async (data)=>{
         if (data.token) {
             await fetchFullUser();
-            history.push(`${admin}`);
+            history.push(adminRoute);
         } else {
-            history.push(`${admin}/login`);
-            toast.success(i18n.t('general:updatedSuccessfully'), {
-                autoClose: 3000
-            });
+            history.push(formatAdminURL({
+                adminRoute,
+                path: loginRoute
+            }));
+            toast.success(i18n.t('general:updatedSuccessfully'));
         }
     }, [
+        adminRoute,
         fetchFullUser,
         history,
-        admin,
-        i18n
+        i18n,
+        loginRoute
     ]);
     return /*#__PURE__*/ _jsxs(Form, {
-        action: `${serverURL}${api}/${userSlug}/reset-password`,
+        action: `${serverURL}${apiRoute}/${userSlug}/reset-password`,
         initialState: initialState,
         method: "POST",
         onSuccess: onSuccess,
         children: [
-            /*#__PURE__*/ _jsx(PasswordToConfirm, {}),
-            /*#__PURE__*/ _jsx(ConfirmPassword, {}),
-            /*#__PURE__*/ _jsx(HiddenInput, {
+            /*#__PURE__*/ _jsx(PasswordField, {
+                field: {
+                    name: 'password',
+                    label: i18n.t('authentication:newPassword'),
+                    required: true
+                }
+            }),
+            /*#__PURE__*/ _jsx(ConfirmPasswordField, {}),
+            /*#__PURE__*/ _jsx(HiddenField, {
+                field: {
+                    name: 'token'
+                },
                 forceUsePathFromProps: true,
-                name: "token",
                 value: token
             }),
             /*#__PURE__*/ _jsx(FormSubmit, {
+                size: "large",
                 children: i18n.t('authentication:resetPassword')
             })
         ]
     });
 };
-const PasswordToConfirm = ()=>{
-    const { t } = useTranslation();
-    const { value: confirmValue } = useFormFields(([fields])=>fields && fields?.['confirm-password'] || null);
-    const validate = React.useCallback((value)=>{
-        if (!value) {
-            return t('validation:required');
-        }
-        if (value === confirmValue) {
-            return true;
-        }
-        return t('fields:passwordsDoNotMatch');
-    }, [
-        confirmValue,
-        t
-    ]);
-    return /*#__PURE__*/ _jsx(Password, {
-        autoComplete: "off",
-        label: t('authentication:newPassword'),
-        name: "password",
-        required: true,
-        validate: validate
-    });
-};
 
 //# sourceMappingURL=index.client.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/ResetPassword/index.client.tsx"],"sourcesContent":["'use client'\nimport type { FormState } from 'payload/types'\n\nimport { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword'\nimport { HiddenInput } from '@payloadcms/ui/fields/HiddenInput'\nimport { Password } from '@payloadcms/ui/fields/Password'\nimport { Form, useFormFields } from '@payloadcms/ui/forms/Form'\nimport { FormSubmit } from '@payloadcms/ui/forms/Submit'\nimport { useAuth } from '@payloadcms/ui/providers/Auth'\nimport { useConfig } from '@payloadcms/ui/providers/Config'\nimport { useTranslation } from '@payloadcms/ui/providers/Translation'\nimport { useRouter } from 'next/navigation.js'\nimport React from 'react'\nimport { toast } from 'react-toastify'\n\ntype Args = {\n  token: string\n}\n\nconst initialState: FormState = {\n  'confirm-password': {\n    initialValue: '',\n    valid: false,\n    value: '',\n  },\n  password: {\n    initialValue: '',\n    valid: false,\n    value: '',\n  },\n}\n\nexport const ResetPasswordClient: React.FC<Args> = ({ token }) => {\n  const i18n = useTranslation()\n  const {\n    admin: { user: userSlug },\n    routes: { admin, api },\n    serverURL,\n  } = useConfig()\n\n  const history = useRouter()\n\n  const { fetchFullUser } = useAuth()\n\n  const onSuccess = React.useCallback(\n    async (data) => {\n      if (data.token) {\n        await fetchFullUser()\n        history.push(`${admin}`)\n      } else {\n        history.push(`${admin}/login`)\n        toast.success(i18n.t('general:updatedSuccessfully'), { autoClose: 3000 })\n      }\n    },\n    [fetchFullUser, history, admin, i18n],\n  )\n\n  return (\n    <Form\n      action={`${serverURL}${api}/${userSlug}/reset-password`}\n      initialState={initialState}\n      method=\"POST\"\n      onSuccess={onSuccess}\n    >\n      <PasswordToConfirm />\n      <ConfirmPassword />\n      <HiddenInput forceUsePathFromProps name=\"token\" value={token} />\n      <FormSubmit>{i18n.t('authentication:resetPassword')}</FormSubmit>\n    </Form>\n  )\n}\n\nconst PasswordToConfirm = () => {\n  const { t } = useTranslation()\n  const { value: confirmValue } = useFormFields(\n    ([fields]) => (fields && fields?.['confirm-password']) || null,\n  )\n\n  const validate = React.useCallback(\n    (value: string) => {\n      if (!value) {\n        return t('validation:required')\n      }\n\n      if (value === confirmValue) {\n        return true\n      }\n\n      return t('fields:passwordsDoNotMatch')\n    },\n    [confirmValue, t],\n  )\n\n  return (\n    <Password\n      autoComplete=\"off\"\n      label={t('authentication:newPassword')}\n      name=\"password\"\n      required\n      validate={validate}\n    />\n  )\n}\n"],"names":["ConfirmPassword","HiddenInput","Password","Form","useFormFields","FormSubmit","useAuth","useConfig","useTranslation","useRouter","React","toast","initialState","initialValue","valid","value","password","ResetPasswordClient","token","i18n","admin","user","userSlug","routes","api","serverURL","history","fetchFullUser","onSuccess","useCallback","data","push","success","t","autoClose","action","method","PasswordToConfirm","forceUsePathFromProps","name","confirmValue","fields","validate","autoComplete","label","required"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;;AAGA,SAASA,eAAe,QAAQ,wCAAuC;AACvE,SAASC,WAAW,QAAQ,oCAAmC;AAC/D,SAASC,QAAQ,QAAQ,iCAAgC;AACzD,SAASC,IAAI,EAAEC,aAAa,QAAQ,4BAA2B;AAC/D,SAASC,UAAU,QAAQ,8BAA6B;AACxD,SAASC,OAAO,QAAQ,gCAA+B;AACvD,SAASC,SAAS,QAAQ,kCAAiC;AAC3D,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,SAAS,QAAQ,qBAAoB;AAC9C,OAAOC,WAAW,QAAO;AACzB,SAASC,KAAK,QAAQ,iBAAgB;AAMtC,MAAMC,eAA0B;IAC9B,oBAAoB;QAClBC,cAAc;QACdC,OAAO;QACPC,OAAO;IACT;IACAC,UAAU;QACRH,cAAc;QACdC,OAAO;QACPC,OAAO;IACT;AACF;AAEA,OAAO,MAAME,sBAAsC,CAAC,EAAEC,KAAK,EAAE;IAC3D,MAAMC,OAAOX;IACb,MAAM,EACJY,OAAO,EAAEC,MAAMC,QAAQ,EAAE,EACzBC,QAAQ,EAAEH,KAAK,EAAEI,GAAG,EAAE,EACtBC,SAAS,EACV,GAAGlB;IAEJ,MAAMmB,UAAUjB;IAEhB,MAAM,EAAEkB,aAAa,EAAE,GAAGrB;IAE1B,MAAMsB,YAAYlB,MAAMmB,WAAW,CACjC,OAAOC;QACL,IAAIA,KAAKZ,KAAK,EAAE;YACd,MAAMS;YACND,QAAQK,IAAI,CAAC,CAAC,EAAEX,MAAM,CAAC;QACzB,OAAO;YACLM,QAAQK,IAAI,CAAC,CAAC,EAAEX,MAAM,MAAM,CAAC;YAC7BT,MAAMqB,OAAO,CAACb,KAAKc,CAAC,CAAC,gCAAgC;gBAAEC,WAAW;YAAK;QACzE;IACF,GACA;QAACP;QAAeD;QAASN;QAAOD;KAAK;IAGvC,qBACE,MAAChB;QACCgC,QAAQ,CAAC,EAAEV,UAAU,EAAED,IAAI,CAAC,EAAEF,SAAS,eAAe,CAAC;QACvDV,cAAcA;QACdwB,QAAO;QACPR,WAAWA;;0BAEX,KAACS;0BACD,KAACrC;0BACD,KAACC;gBAAYqC,qBAAqB;gBAACC,MAAK;gBAAQxB,OAAOG;;0BACvD,KAACb;0BAAYc,KAAKc,CAAC,CAAC;;;;AAG1B,EAAC;AAED,MAAMI,oBAAoB;IACxB,MAAM,EAAEJ,CAAC,EAAE,GAAGzB;IACd,MAAM,EAAEO,OAAOyB,YAAY,EAAE,GAAGpC,cAC9B,CAAC,CAACqC,OAAO,GAAK,AAACA,UAAUA,QAAQ,CAAC,mBAAmB,IAAK;IAG5D,MAAMC,WAAWhC,MAAMmB,WAAW,CAChC,CAACd;QACC,IAAI,CAACA,OAAO;YACV,OAAOkB,EAAE;QACX;QAEA,IAAIlB,UAAUyB,cAAc;YAC1B,OAAO;QACT;QAEA,OAAOP,EAAE;IACX,GACA;QAACO;QAAcP;KAAE;IAGnB,qBACE,KAAC/B;QACCyC,cAAa;QACbC,OAAOX,EAAE;QACTM,MAAK;QACLM,QAAQ;QACRH,UAAUA;;AAGhB"}
+{"version":3,"sources":["../../../src/views/ResetPassword/index.client.tsx"],"sourcesContent":["'use client'\nimport type { FormState } from 'payload'\n\nimport {\n  ConfirmPasswordField,\n  Form,\n  FormSubmit,\n  HiddenField,\n  PasswordField,\n  useAuth,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport { useRouter } from 'next/navigation.js'\nimport React from 'react'\nimport { toast } from 'sonner'\n\ntype Args = {\n  readonly token: string\n}\n\nconst initialState: FormState = {\n  'confirm-password': {\n    initialValue: '',\n    valid: false,\n    value: '',\n  },\n  password: {\n    initialValue: '',\n    valid: false,\n    value: '',\n  },\n}\n\nexport const ResetPasswordClient: React.FC<Args> = ({ token }) => {\n  const i18n = useTranslation()\n  const {\n    config: {\n      admin: {\n        routes: { login: loginRoute },\n        user: userSlug,\n      },\n      routes: { admin: adminRoute, api: apiRoute },\n      serverURL,\n    },\n  } = useConfig()\n\n  const history = useRouter()\n\n  const { fetchFullUser } = useAuth()\n\n  const onSuccess = React.useCallback(\n    async (data) => {\n      if (data.token) {\n        await fetchFullUser()\n        history.push(adminRoute)\n      } else {\n        history.push(\n          formatAdminURL({\n            adminRoute,\n            path: loginRoute,\n          }),\n        )\n        toast.success(i18n.t('general:updatedSuccessfully'))\n      }\n    },\n    [adminRoute, fetchFullUser, history, i18n, loginRoute],\n  )\n\n  return (\n    <Form\n      action={`${serverURL}${apiRoute}/${userSlug}/reset-password`}\n      initialState={initialState}\n      method=\"POST\"\n      onSuccess={onSuccess}\n    >\n      <PasswordField\n        field={{\n          name: 'password',\n          label: i18n.t('authentication:newPassword'),\n          required: true,\n        }}\n      />\n      <ConfirmPasswordField />\n      <HiddenField\n        field={{\n          name: 'token',\n        }}\n        forceUsePathFromProps\n        value={token}\n      />\n      <FormSubmit size=\"large\">{i18n.t('authentication:resetPassword')}</FormSubmit>\n    </Form>\n  )\n}\n"],"names":["ConfirmPasswordField","Form","FormSubmit","HiddenField","PasswordField","useAuth","useConfig","useTranslation","formatAdminURL","useRouter","React","toast","initialState","initialValue","valid","value","password","ResetPasswordClient","token","i18n","config","admin","routes","login","loginRoute","user","userSlug","adminRoute","api","apiRoute","serverURL","history","fetchFullUser","onSuccess","useCallback","data","push","path","success","t","action","method","field","name","label","required","forceUsePathFromProps","size"],"mappings":"AAAA;;AAGA,SACEA,oBAAoB,EACpBC,IAAI,EACJC,UAAU,EACVC,WAAW,EACXC,aAAa,EACbC,OAAO,EACPC,SAAS,EACTC,cAAc,QACT,iBAAgB;AACvB,SAASC,cAAc,QAAQ,wBAAuB;AACtD,SAASC,SAAS,QAAQ,qBAAoB;AAC9C,OAAOC,WAAW,QAAO;AACzB,SAASC,KAAK,QAAQ,SAAQ;AAM9B,MAAMC,eAA0B;IAC9B,oBAAoB;QAClBC,cAAc;QACdC,OAAO;QACPC,OAAO;IACT;IACAC,UAAU;QACRH,cAAc;QACdC,OAAO;QACPC,OAAO;IACT;AACF;AAEA,OAAO,MAAME,sBAAsC,CAAC,EAAEC,KAAK,EAAE;IAC3D,MAAMC,OAAOZ;IACb,MAAM,EACJa,QAAQ,EACNC,OAAO,EACLC,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC7BC,MAAMC,QAAQ,EACf,EACDJ,QAAQ,EAAED,OAAOM,UAAU,EAAEC,KAAKC,QAAQ,EAAE,EAC5CC,SAAS,EACV,EACF,GAAGxB;IAEJ,MAAMyB,UAAUtB;IAEhB,MAAM,EAAEuB,aAAa,EAAE,GAAG3B;IAE1B,MAAM4B,YAAYvB,MAAMwB,WAAW,CACjC,OAAOC;QACL,IAAIA,KAAKjB,KAAK,EAAE;YACd,MAAMc;YACND,QAAQK,IAAI,CAACT;QACf,OAAO;YACLI,QAAQK,IAAI,CACV5B,eAAe;gBACbmB;gBACAU,MAAMb;YACR;YAEFb,MAAM2B,OAAO,CAACnB,KAAKoB,CAAC,CAAC;QACvB;IACF,GACA;QAACZ;QAAYK;QAAeD;QAASZ;QAAMK;KAAW;IAGxD,qBACE,MAACvB;QACCuC,QAAQ,CAAC,EAAEV,UAAU,EAAED,SAAS,CAAC,EAAEH,SAAS,eAAe,CAAC;QAC5Dd,cAAcA;QACd6B,QAAO;QACPR,WAAWA;;0BAEX,KAAC7B;gBACCsC,OAAO;oBACLC,MAAM;oBACNC,OAAOzB,KAAKoB,CAAC,CAAC;oBACdM,UAAU;gBACZ;;0BAEF,KAAC7C;0BACD,KAACG;gBACCuC,OAAO;oBACLC,MAAM;gBACR;gBACAG,qBAAqB;gBACrB/B,OAAOG;;0BAET,KAAChB;gBAAW6C,MAAK;0BAAS5B,KAAKoB,CAAC,CAAC;;;;AAGvC,EAAC"}

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

@@ -1,4 +1,4 @@
-import type { AdminViewProps } from 'payload/types';
+import type { AdminViewProps } from 'payload';
 import React from 'react';
 import './index.scss';
 export declare const resetPasswordBaseClass = "reset-password";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAMnD,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,cAAc,CAAA;AAErB,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAItD,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAA;AAEzD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAmDlD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAK7C,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,cAAc,CAAA;AAErB,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAItD,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAA;AAEzD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA4DlD,CAAA"}

package/dist/views/ResetPassword/index.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button } from '@payloadcms/ui/elements/Button';
-import { Translation } from '@payloadcms/ui/elements/Translation';
-import { MinimalTemplate } from '@payloadcms/ui/templates/Minimal';
+import { Button, Translation } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
 import LinkImport from 'next/link.js';
 import React from 'react';
+import { MinimalTemplate } from '../../templates/Minimal/index.js';
 import { ResetPasswordClient } from './index.client.js';
 export const resetPasswordBaseClass = 'reset-password';
 const Link = LinkImport.default || LinkImport;
@@ -12,7 +12,7 @@ export const ResetPassword = ({ initPageResult, params })=>{
     const { req } = initPageResult;
     const { segments: [_, token] } = params;
     const { i18n, payload: { config }, user } = req;
-    const { admin: { routes: { account: accountRoute } }, routes: { admin } } = config;
+    const { admin: { routes: { account: accountRoute } }, routes: { admin: adminRoute } } = config;
     if (user) {
         return /*#__PURE__*/ _jsx(MinimalTemplate, {
             className: resetPasswordBaseClass,
@@ -26,7 +26,10 @@ export const ResetPassword = ({ initPageResult, params })=>{
                         children: /*#__PURE__*/ _jsx(Translation, {
                             elements: {
                                 '0': ({ children })=>/*#__PURE__*/ _jsx(Link, {
-                                        href: `${admin}${accountRoute}`,
+                                        href: formatAdminURL({
+                                            adminRoute,
+                                            path: accountRoute
+                                        }),
                                         children: children
                                     })
                             },
@@ -39,7 +42,7 @@ export const ResetPassword = ({ initPageResult, params })=>{
                         Link: Link,
                         buttonStyle: "secondary",
                         el: "link",
-                        to: admin,
+                        to: adminRoute,
                         children: i18n.t('general:backToDashboard')
                     })
                 ]

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/ResetPassword/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload/types'\n\nimport { Button } from '@payloadcms/ui/elements/Button'\nimport { Translation } from '@payloadcms/ui/elements/Translation'\nimport { MinimalTemplate } from '@payloadcms/ui/templates/Minimal'\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nimport { ResetPasswordClient } from './index.client.js'\nimport './index.scss'\n\nexport const resetPasswordBaseClass = 'reset-password'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport { generateResetPasswordMetadata } from './meta.js'\n\nexport const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params }) => {\n  const { req } = initPageResult\n\n  const {\n    segments: [_, token],\n  } = params\n\n  const {\n    i18n,\n    payload: { config },\n    user,\n  } = req\n\n  const {\n    admin: {\n      routes: { account: accountRoute },\n    },\n    routes: { admin },\n  } = config\n\n  if (user) {\n    return (\n      <MinimalTemplate className={resetPasswordBaseClass}>\n        <div className={`${resetPasswordBaseClass}__wrap`}>\n          <h1>{i18n.t('authentication:alreadyLoggedIn')}</h1>\n          <p>\n            <Translation\n              elements={{\n                '0': ({ children }) => <Link href={`${admin}${accountRoute}`}>{children}</Link>,\n              }}\n              i18nKey=\"authentication:loggedInChangePassword\"\n              t={i18n.t}\n            />\n          </p>\n          <br />\n          <Button Link={Link} buttonStyle=\"secondary\" el=\"link\" to={admin}>\n            {i18n.t('general:backToDashboard')}\n          </Button>\n        </div>\n      </MinimalTemplate>\n    )\n  }\n\n  return (\n    <MinimalTemplate className={resetPasswordBaseClass}>\n      <div className={`${resetPasswordBaseClass}__wrap`}>\n        <h1>{i18n.t('authentication:resetPassword')}</h1>\n        <ResetPasswordClient token={token} />\n      </div>\n    </MinimalTemplate>\n  )\n}\n"],"names":["Button","Translation","MinimalTemplate","LinkImport","React","ResetPasswordClient","resetPasswordBaseClass","Link","default","generateResetPasswordMetadata","ResetPassword","initPageResult","params","req","segments","_","token","i18n","payload","config","user","admin","routes","account","accountRoute","className","div","h1","t","p","elements","children","href","i18nKey","br","buttonStyle","el","to"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAEA,SAASA,MAAM,QAAQ,iCAAgC;AACvD,SAASC,WAAW,QAAQ,sCAAqC;AACjE,SAASC,eAAe,QAAQ,mCAAkC;AAClE,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,SAASC,mBAAmB,QAAQ,oBAAmB;AAGvD,OAAO,MAAMC,yBAAyB,iBAAgB;AAEtD,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,SAASM,6BAA6B,QAAQ,YAAW;AAEzD,OAAO,MAAMC,gBAA0C,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAE;IAChF,MAAM,EAAEC,GAAG,EAAE,GAAGF;IAEhB,MAAM,EACJG,UAAU,CAACC,GAAGC,MAAM,EACrB,GAAGJ;IAEJ,MAAM,EACJK,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBC,IAAI,EACL,GAAGP;IAEJ,MAAM,EACJQ,OAAO,EACLC,QAAQ,EAAEC,SAASC,YAAY,EAAE,EAClC,EACDF,QAAQ,EAAED,KAAK,EAAE,EAClB,GAAGF;IAEJ,IAAIC,MAAM;QACR,qBACE,KAAClB;YAAgBuB,WAAWnB;sBAC1B,cAAA,MAACoB;gBAAID,WAAW,CAAC,EAAEnB,uBAAuB,MAAM,CAAC;;kCAC/C,KAACqB;kCAAIV,KAAKW,CAAC,CAAC;;kCACZ,KAACC;kCACC,cAAA,KAAC5B;4BACC6B,UAAU;gCACR,KAAK,CAAC,EAAEC,QAAQ,EAAE,iBAAK,KAACxB;wCAAKyB,MAAM,CAAC,EAAEX,MAAM,EAAEG,aAAa,CAAC;kDAAGO;;4BACjE;4BACAE,SAAQ;4BACRL,GAAGX,KAAKW,CAAC;;;kCAGb,KAACM;kCACD,KAAClC;wBAAOO,MAAMA;wBAAM4B,aAAY;wBAAYC,IAAG;wBAAOC,IAAIhB;kCACvDJ,KAAKW,CAAC,CAAC;;;;;IAKlB;IAEA,qBACE,KAAC1B;QAAgBuB,WAAWnB;kBAC1B,cAAA,MAACoB;YAAID,WAAW,CAAC,EAAEnB,uBAAuB,MAAM,CAAC;;8BAC/C,KAACqB;8BAAIV,KAAKW,CAAC,CAAC;;8BACZ,KAACvB;oBAAoBW,OAAOA;;;;;AAIpC,EAAC"}
+{"version":3,"sources":["../../../src/views/ResetPassword/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { Button, Translation } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nimport { MinimalTemplate } from '../../templates/Minimal/index.js'\nimport { ResetPasswordClient } from './index.client.js'\nimport './index.scss'\n\nexport const resetPasswordBaseClass = 'reset-password'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport { generateResetPasswordMetadata } from './meta.js'\n\nexport const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params }) => {\n  const { req } = initPageResult\n\n  const {\n    segments: [_, token],\n  } = params\n\n  const {\n    i18n,\n    payload: { config },\n    user,\n  } = req\n\n  const {\n    admin: {\n      routes: { account: accountRoute },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (user) {\n    return (\n      <MinimalTemplate className={resetPasswordBaseClass}>\n        <div className={`${resetPasswordBaseClass}__wrap`}>\n          <h1>{i18n.t('authentication:alreadyLoggedIn')}</h1>\n          <p>\n            <Translation\n              elements={{\n                '0': ({ children }) => (\n                  <Link\n                    href={formatAdminURL({\n                      adminRoute,\n                      path: accountRoute,\n                    })}\n                  >\n                    {children}\n                  </Link>\n                ),\n              }}\n              i18nKey=\"authentication:loggedInChangePassword\"\n              t={i18n.t}\n            />\n          </p>\n          <br />\n          <Button Link={Link} buttonStyle=\"secondary\" el=\"link\" to={adminRoute}>\n            {i18n.t('general:backToDashboard')}\n          </Button>\n        </div>\n      </MinimalTemplate>\n    )\n  }\n\n  return (\n    <MinimalTemplate className={resetPasswordBaseClass}>\n      <div className={`${resetPasswordBaseClass}__wrap`}>\n        <h1>{i18n.t('authentication:resetPassword')}</h1>\n        <ResetPasswordClient token={token} />\n      </div>\n    </MinimalTemplate>\n  )\n}\n"],"names":["Button","Translation","formatAdminURL","LinkImport","React","MinimalTemplate","ResetPasswordClient","resetPasswordBaseClass","Link","default","generateResetPasswordMetadata","ResetPassword","initPageResult","params","req","segments","_","token","i18n","payload","config","user","admin","routes","account","accountRoute","adminRoute","className","div","h1","t","p","elements","children","href","path","i18nKey","br","buttonStyle","el","to"],"mappings":";AAEA,SAASA,MAAM,EAAEC,WAAW,QAAQ,iBAAgB;AACpD,SAASC,cAAc,QAAQ,wBAAuB;AACtD,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,mBAAmB,QAAQ,oBAAmB;AAGvD,OAAO,MAAMC,yBAAyB,iBAAgB;AAEtD,MAAMC,OAAQL,WAAWM,OAAO,IAAIN;AAEpC,SAASO,6BAA6B,QAAQ,YAAW;AAEzD,OAAO,MAAMC,gBAA0C,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAE;IAChF,MAAM,EAAEC,GAAG,EAAE,GAAGF;IAEhB,MAAM,EACJG,UAAU,CAACC,GAAGC,MAAM,EACrB,GAAGJ;IAEJ,MAAM,EACJK,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBC,IAAI,EACL,GAAGP;IAEJ,MAAM,EACJQ,OAAO,EACLC,QAAQ,EAAEC,SAASC,YAAY,EAAE,EAClC,EACDF,QAAQ,EAAED,OAAOI,UAAU,EAAE,EAC9B,GAAGN;IAEJ,IAAIC,MAAM;QACR,qBACE,KAAChB;YAAgBsB,WAAWpB;sBAC1B,cAAA,MAACqB;gBAAID,WAAW,CAAC,EAAEpB,uBAAuB,MAAM,CAAC;;kCAC/C,KAACsB;kCAAIX,KAAKY,CAAC,CAAC;;kCACZ,KAACC;kCACC,cAAA,KAAC9B;4BACC+B,UAAU;gCACR,KAAK,CAAC,EAAEC,QAAQ,EAAE,iBAChB,KAACzB;wCACC0B,MAAMhC,eAAe;4CACnBwB;4CACAS,MAAMV;wCACR;kDAECQ;;4BAGP;4BACAG,SAAQ;4BACRN,GAAGZ,KAAKY,CAAC;;;kCAGb,KAACO;kCACD,KAACrC;wBAAOQ,MAAMA;wBAAM8B,aAAY;wBAAYC,IAAG;wBAAOC,IAAId;kCACvDR,KAAKY,CAAC,CAAC;;;;;IAKlB;IAEA,qBACE,KAACzB;QAAgBsB,WAAWpB;kBAC1B,cAAA,MAACqB;YAAID,WAAW,CAAC,EAAEpB,uBAAuB,MAAM,CAAC;;8BAC/C,KAACsB;8BAAIX,KAAKY,CAAC,CAAC;;8BACZ,KAACxB;oBAAoBW,OAAOA;;;;;AAIpC,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/ResetPassword/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\n\nimport type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateResetPasswordMetadata: GenerateViewMetadata = async ({\n  config,\n  i18n: { t },\n}): Promise<Metadata> =>\n  meta({\n    description: t('authentication:resetPassword'),\n    keywords: t('authentication:resetPassword'),\n    serverURL: config.serverURL,\n    title: t('authentication:resetPassword'),\n    ...(config.admin.meta || {}),\n  })\n"],"names":["meta","generateResetPasswordMetadata","config","i18n","t","description","keywords","serverURL","title","admin"],"rangeMappings":";;;;;;;","mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,gCAAsD,OAAO,EACxEC,MAAM,EACNC,MAAM,EAAEC,CAAC,EAAE,EACZ,GACCJ,KAAK;QACHK,aAAaD,EAAE;QACfE,UAAUF,EAAE;QACZG,WAAWL,OAAOK,SAAS;QAC3BC,OAAOJ,EAAE;QACT,GAAIF,OAAOO,KAAK,CAACT,IAAI,IAAI,CAAC,CAAC;IAC7B,GAAE"}
+{"version":3,"sources":["../../../src/views/ResetPassword/meta.ts"],"sourcesContent":["import type { Metadata } from 'next'\n\nimport type { GenerateViewMetadata } from '../Root/index.js'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateResetPasswordMetadata: GenerateViewMetadata = async ({\n  config,\n  i18n: { t },\n}): Promise<Metadata> =>\n  meta({\n    description: t('authentication:resetPassword'),\n    keywords: t('authentication:resetPassword'),\n    serverURL: config.serverURL,\n    title: t('authentication:resetPassword'),\n    ...(config.admin.meta || {}),\n  })\n"],"names":["meta","generateResetPasswordMetadata","config","i18n","t","description","keywords","serverURL","title","admin"],"mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,gCAAsD,OAAO,EACxEC,MAAM,EACNC,MAAM,EAAEC,CAAC,EAAE,EACZ,GACCJ,KAAK;QACHK,aAAaD,EAAE;QACfE,UAAUF,EAAE;QACZG,WAAWL,OAAOK,SAAS;QAC3BC,OAAOJ,EAAE;QACT,GAAIF,OAAOO,KAAK,CAACT,IAAI,IAAI,CAAC,CAAC;IAC7B,GAAE"}

package/dist/views/Root/getCustomViewByRoute.d.ts

@@ -1,6 +1,7 @@
-import type { AdminViewComponent, SanitizedConfig } from 'payload/types';
+import type { SanitizedConfig } from 'payload';
+import type { ViewFromConfig } from './getViewFromConfig.js';
 export declare const getCustomViewByRoute: ({ config, currentRoute: currentRouteWithAdmin, }: {
     config: SanitizedConfig;
     currentRoute: string;
-}) => AdminViewComponent;
+}) => ViewFromConfig;
 //# sourceMappingURL=getCustomViewByRoute.d.ts.map

package/dist/views/Root/getCustomViewByRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCustomViewByRoute.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAIxE,eAAO,MAAM,oBAAoB,qDAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;CACrB,KAAG,kBA0BH,CAAA"}
+{"version":3,"file":"getCustomViewByRoute.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAI5D,eAAO,MAAM,oBAAoB,qDAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;CACrB,KAAG,cA8BH,CAAA"}

package/dist/views/Root/getCustomViewByRoute.js

@@ -3,17 +3,20 @@ export const getCustomViewByRoute = ({ config, currentRoute: currentRouteWithAdm
     const { admin: { components: { views } }, routes: { admin: adminRoute } } = config;
     const currentRoute = currentRouteWithAdmin.replace(adminRoute, '');
     const foundViewConfig = views && typeof views === 'object' && Object.entries(views).find(([, view])=>{
-        if (typeof view === 'object') {
-            return isPathMatchingRoute({
-                currentRoute,
-                exact: view.exact,
-                path: view.path,
-                sensitive: view.sensitive,
-                strict: view.strict
-            });
-        }
+        return isPathMatchingRoute({
+            currentRoute,
+            exact: view.exact,
+            path: view.path,
+            sensitive: view.sensitive,
+            strict: view.strict
+        });
     })?.[1];
-    return typeof foundViewConfig === 'object' ? foundViewConfig.Component : null;
+    if (!foundViewConfig) {
+        return null;
+    }
+    return {
+        payloadComponent: foundViewConfig.Component
+    };
 };
 
 //# sourceMappingURL=getCustomViewByRoute.js.map

package/dist/views/Root/getCustomViewByRoute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"sourcesContent":["import type { AdminViewComponent, SanitizedConfig } from 'payload/types'\n\nimport { isPathMatchingRoute } from './isPathMatchingRoute.js'\n\nexport const getCustomViewByRoute = ({\n  config,\n  currentRoute: currentRouteWithAdmin,\n}: {\n  config: SanitizedConfig\n  currentRoute: string\n}): AdminViewComponent => {\n  const {\n    admin: {\n      components: { views },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  const currentRoute = currentRouteWithAdmin.replace(adminRoute, '')\n\n  const foundViewConfig =\n    views &&\n    typeof views === 'object' &&\n    Object.entries(views).find(([, view]) => {\n      if (typeof view === 'object') {\n        return isPathMatchingRoute({\n          currentRoute,\n          exact: view.exact,\n          path: view.path,\n          sensitive: view.sensitive,\n          strict: view.strict,\n        })\n      }\n    })?.[1]\n\n  return typeof foundViewConfig === 'object' ? foundViewConfig.Component : null\n}\n"],"names":["isPathMatchingRoute","getCustomViewByRoute","config","currentRoute","currentRouteWithAdmin","admin","components","views","routes","adminRoute","replace","foundViewConfig","Object","entries","find","view","exact","path","sensitive","strict","Component"],"rangeMappings":";;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,mBAAmB,QAAQ,2BAA0B;AAE9D,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,MAAM,EACNC,cAAcC,qBAAqB,EAIpC;IACC,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,KAAK,EAAE,EACtB,EACDC,QAAQ,EAAEH,OAAOI,UAAU,EAAE,EAC9B,GAAGP;IAEJ,MAAMC,eAAeC,sBAAsBM,OAAO,CAACD,YAAY;IAE/D,MAAME,kBACJJ,SACA,OAAOA,UAAU,YACjBK,OAAOC,OAAO,CAACN,OAAOO,IAAI,CAAC,CAAC,GAAGC,KAAK;QAClC,IAAI,OAAOA,SAAS,UAAU;YAC5B,OAAOf,oBAAoB;gBACzBG;gBACAa,OAAOD,KAAKC,KAAK;gBACjBC,MAAMF,KAAKE,IAAI;gBACfC,WAAWH,KAAKG,SAAS;gBACzBC,QAAQJ,KAAKI,MAAM;YACrB;QACF;IACF,IAAI,CAAC,EAAE;IAET,OAAO,OAAOR,oBAAoB,WAAWA,gBAAgBS,SAAS,GAAG;AAC3E,EAAC"}
+{"version":3,"sources":["../../../src/views/Root/getCustomViewByRoute.tsx"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nimport type { ViewFromConfig } from './getViewFromConfig.js'\n\nimport { isPathMatchingRoute } from './isPathMatchingRoute.js'\n\nexport const getCustomViewByRoute = ({\n  config,\n  currentRoute: currentRouteWithAdmin,\n}: {\n  config: SanitizedConfig\n  currentRoute: string\n}): ViewFromConfig => {\n  const {\n    admin: {\n      components: { views },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  const currentRoute = currentRouteWithAdmin.replace(adminRoute, '')\n\n  const foundViewConfig =\n    views &&\n    typeof views === 'object' &&\n    Object.entries(views).find(([, view]) => {\n      return isPathMatchingRoute({\n        currentRoute,\n        exact: view.exact,\n        path: view.path,\n        sensitive: view.sensitive,\n        strict: view.strict,\n      })\n    })?.[1]\n\n  if (!foundViewConfig) {\n    return null\n  }\n\n  return {\n    payloadComponent: foundViewConfig.Component,\n  }\n}\n"],"names":["isPathMatchingRoute","getCustomViewByRoute","config","currentRoute","currentRouteWithAdmin","admin","components","views","routes","adminRoute","replace","foundViewConfig","Object","entries","find","view","exact","path","sensitive","strict","payloadComponent","Component"],"mappings":"AAIA,SAASA,mBAAmB,QAAQ,2BAA0B;AAE9D,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,MAAM,EACNC,cAAcC,qBAAqB,EAIpC;IACC,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,KAAK,EAAE,EACtB,EACDC,QAAQ,EAAEH,OAAOI,UAAU,EAAE,EAC9B,GAAGP;IAEJ,MAAMC,eAAeC,sBAAsBM,OAAO,CAACD,YAAY;IAE/D,MAAME,kBACJJ,SACA,OAAOA,UAAU,YACjBK,OAAOC,OAAO,CAACN,OAAOO,IAAI,CAAC,CAAC,GAAGC,KAAK;QAClC,OAAOf,oBAAoB;YACzBG;YACAa,OAAOD,KAAKC,KAAK;YACjBC,MAAMF,KAAKE,IAAI;YACfC,WAAWH,KAAKG,SAAS;YACzBC,QAAQJ,KAAKI,MAAM;QACrB;IACF,IAAI,CAAC,EAAE;IAET,IAAI,CAACR,iBAAiB;QACpB,OAAO;IACT;IAEA,OAAO;QACLS,kBAAkBT,gBAAgBU,SAAS;IAC7C;AACF,EAAC"}

package/dist/views/Root/getViewFromConfig.d.ts

@@ -1,18 +1,23 @@
-import type { SanitizedConfig } from 'payload/config';
-import type { AdminViewComponent } from 'payload/types';
+import type { AdminViewComponent, AdminViewProps, ImportMap, SanitizedConfig } from 'payload';
+import type React from 'react';
 import type { initPage } from '../../utilities/initPage/index.js';
-export declare const getViewFromConfig: ({ adminRoute, config, currentRoute, searchParams, segments, }: {
-    adminRoute;
+export type ViewFromConfig = {
+    Component?: React.FC<AdminViewProps>;
+    payloadComponent?: AdminViewComponent;
+};
+export declare const getViewFromConfig: ({ adminRoute, config, currentRoute, importMap, searchParams, segments, }: {
+    adminRoute: string;
     config: SanitizedConfig;
     currentRoute: string;
+    importMap: ImportMap;
     searchParams: {
         [key: string]: string | string[];
     };
     segments: string[];
 }) => {
-    DefaultView: AdminViewComponent;
+    DefaultView: ViewFromConfig;
     initPageOptions: Parameters<typeof initPage>[0];
     templateClassName: string;
-    templateType: 'default' | 'minimal';
+    templateType: "default" | "minimal";
 };
 //# sourceMappingURL=getViewFromConfig.d.ts.map

package/dist/views/Root/getViewFromConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getViewFromConfig.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getViewFromConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAsCjE,eAAO,MAAM,iBAAiB,kEAM3B;IACD,UAAU,CAAA;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;IACD,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,KAAG;IACF,WAAW,EAAE,kBAAkB,CAAA;IAC/B,eAAe,EAAE,WAAW,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAA;CAkIpC,CAAA"}
+{"version":3,"file":"getViewFromConfig.d.ts","sourceRoot":"","sources":["../../../src/views/Root/getViewFromConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAC7F,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AA4BjE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,CAAA;IACpC,gBAAgB,CAAC,EAAE,kBAAkB,CAAA;CACtC,CAAA;AAYD,eAAO,MAAM,iBAAiB,6EAO3B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;IACD,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,KAAG;IACF,WAAW,EAAE,cAAc,CAAA;IAC3B,eAAe,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAA;CAmJpC,CAAA"}

package/dist/views/Root/getViewFromConfig.js

@@ -1,3 +1,4 @@
+import { formatAdminURL } from '@payloadcms/ui/shared';
 import { Account } from '../Account/index.js';
 import { CreateFirstUserView } from '../CreateFirstUser/index.js';
 import { Dashboard } from '../Dashboard/index.js';
@@ -27,12 +28,13 @@ const oneSegmentViews = {
     logout: LogoutView,
     unauthorized: UnauthorizedView
 };
-export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchParams, segments })=>{
+export const getViewFromConfig = ({ adminRoute, config, currentRoute, importMap, searchParams, segments })=>{
     let ViewToRender = null;
     let templateClassName;
     let templateType;
     const initPageOptions = {
         config,
+        importMap,
         route: currentRoute,
         searchParams
     };
@@ -43,7 +45,9 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
         case 0:
             {
                 if (currentRoute === adminRoute) {
-                    ViewToRender = Dashboard;
+                    ViewToRender = {
+                        Component: Dashboard
+                    };
                     templateClassName = 'dashboard';
                     templateType = 'default';
                     initPageOptions.redirectUnauthenticatedUser = true;
@@ -60,7 +64,10 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
                         return isPathMatchingRoute({
                             currentRoute,
                             exact: true,
-                            path: `${adminRoute}${route}`
+                            path: formatAdminURL({
+                                adminRoute,
+                                path: route
+                            })
                         });
                     });
                     if (matchedRoute) {
@@ -75,7 +82,9 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
                     // --> /logout
                     // --> /logout-inactivity
                     // --> /unauthorized
-                    ViewToRender = oneSegmentViews[viewToRender];
+                    ViewToRender = {
+                        Component: oneSegmentViews[viewToRender]
+                    };
                     templateClassName = baseClasses[viewToRender];
                     templateType = 'minimal';
                     if (viewToRender === 'account') {
@@ -89,20 +98,26 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
             {
                 if (segmentOne === 'reset') {
                     // --> /reset/:token
-                    ViewToRender = ResetPassword;
+                    ViewToRender = {
+                        Component: ResetPassword
+                    };
                     templateClassName = baseClasses[segmentTwo];
                     templateType = 'minimal';
                 }
                 if (isCollection) {
                     // --> /collections/:collectionSlug
                     initPageOptions.redirectUnauthenticatedUser = true;
-                    ViewToRender = ListView;
+                    ViewToRender = {
+                        Component: ListView
+                    };
                     templateClassName = `${segmentTwo}-list`;
                     templateType = 'default';
                 } else if (isGlobal) {
                     // --> /globals/:globalSlug
                     initPageOptions.redirectUnauthenticatedUser = true;
-                    ViewToRender = DocumentView;
+                    ViewToRender = {
+                        Component: DocumentView
+                    };
                     templateClassName = 'global-edit';
                     templateType = 'default';
                 }
@@ -111,7 +126,9 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
         default:
             if (segmentTwo === 'verify') {
                 // --> /:collectionSlug/verify/:token
-                ViewToRender = Verify;
+                ViewToRender = {
+                    Component: Verify
+                };
                 templateClassName = 'verify';
                 templateType = 'minimal';
             } else if (isCollection) {
@@ -122,7 +139,9 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
                 // --> /collections/:collectionSlug/:id/versions/:versionId
                 // --> /collections/:collectionSlug/:id/api
                 initPageOptions.redirectUnauthenticatedUser = true;
-                ViewToRender = DocumentView;
+                ViewToRender = {
+                    Component: DocumentView
+                };
                 templateClassName = `collection-default-edit`;
                 templateType = 'default';
             } else if (isGlobal) {
@@ -132,7 +151,9 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
                 // --> /globals/:globalSlug/versions/:versionId
                 // --> /globals/:globalSlug/api
                 initPageOptions.redirectUnauthenticatedUser = true;
-                ViewToRender = DocumentView;
+                ViewToRender = {
+                    Component: DocumentView
+                };
                 templateClassName = `global-edit`;
                 templateType = 'default';
             }