@payloadcms/next 3.0.0-canary.ac498e7 → 3.0.0-canary.af2bebe

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

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ConfirmPasswordField, Form, FormSubmit, HiddenField, PasswordField, useAuth, useConfig, useFormFields, useTranslation } from '@payloadcms/ui';
+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';
@@ -19,7 +19,7 @@ const initialState = {
 };
 export const ResetPasswordClient = ({ token })=>{
     const i18n = useTranslation();
-    const { admin: { routes: { login: loginRoute }, user: userSlug }, routes: { admin: adminRoute, api: apiRoute }, 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)=>{
@@ -34,10 +34,11 @@ export const ResetPasswordClient = ({ token })=>{
             toast.success(i18n.t('general:updatedSuccessfully'));
         }
     }, [
+        adminRoute,
         fetchFullUser,
         history,
-        adminRoute,
-        i18n
+        i18n,
+        loginRoute
     ]);
     return /*#__PURE__*/ _jsxs(Form, {
         action: `${serverURL}${apiRoute}/${userSlug}/reset-password`,
@@ -45,41 +46,27 @@ export const ResetPasswordClient = ({ token })=>{
         method: "POST",
         onSuccess: onSuccess,
         children: [
-            /*#__PURE__*/ _jsx(PasswordToConfirm, {}),
+            /*#__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(PasswordField, {
-        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'\n\nimport {\n  ConfirmPasswordField,\n  Form,\n  FormSubmit,\n  HiddenField,\n  PasswordField,\n  useAuth,\n  useConfig,\n  useFormFields,\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  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: {\n      routes: { login: loginRoute },\n      user: userSlug,\n    },\n    routes: { admin: adminRoute, api: apiRoute },\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(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    [fetchFullUser, history, adminRoute, i18n],\n  )\n\n  return (\n    <Form\n      action={`${serverURL}${apiRoute}/${userSlug}/reset-password`}\n      initialState={initialState}\n      method=\"POST\"\n      onSuccess={onSuccess}\n    >\n      <PasswordToConfirm />\n      <ConfirmPasswordField />\n      <HiddenField 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    <PasswordField\n      autoComplete=\"off\"\n      label={t('authentication:newPassword')}\n      name=\"password\"\n      required\n      validate={validate}\n    />\n  )\n}\n"],"names":["ConfirmPasswordField","Form","FormSubmit","HiddenField","PasswordField","useAuth","useConfig","useFormFields","useTranslation","formatAdminURL","useRouter","React","toast","initialState","initialValue","valid","value","password","ResetPasswordClient","token","i18n","admin","routes","login","loginRoute","user","userSlug","adminRoute","api","apiRoute","serverURL","history","fetchFullUser","onSuccess","useCallback","data","push","path","success","t","action","method","PasswordToConfirm","forceUsePathFromProps","name","confirmValue","fields","validate","autoComplete","label","required"],"mappings":"AAAA;;AAGA,SACEA,oBAAoB,EACpBC,IAAI,EACJC,UAAU,EACVC,WAAW,EACXC,aAAa,EACbC,OAAO,EACPC,SAAS,EACTC,aAAa,EACbC,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,OAAO,EACLC,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC7BC,MAAMC,QAAQ,EACf,EACDJ,QAAQ,EAAED,OAAOM,UAAU,EAAEC,KAAKC,QAAQ,EAAE,EAC5CC,SAAS,EACV,GAAGxB;IAEJ,MAAMyB,UAAUrB;IAEhB,MAAM,EAAEsB,aAAa,EAAE,GAAG3B;IAE1B,MAAM4B,YAAYtB,MAAMuB,WAAW,CACjC,OAAOC;QACL,IAAIA,KAAKhB,KAAK,EAAE;YACd,MAAMa;YACND,QAAQK,IAAI,CAACT;QACf,OAAO;YACLI,QAAQK,IAAI,CACV3B,eAAe;gBACbkB;gBACAU,MAAMb;YACR;YAEFZ,MAAM0B,OAAO,CAAClB,KAAKmB,CAAC,CAAC;QACvB;IACF,GACA;QAACP;QAAeD;QAASJ;QAAYP;KAAK;IAG5C,qBACE,MAACnB;QACCuC,QAAQ,CAAC,EAAEV,UAAU,EAAED,SAAS,CAAC,EAAEH,SAAS,eAAe,CAAC;QAC5Db,cAAcA;QACd4B,QAAO;QACPR,WAAWA;;0BAEX,KAACS;0BACD,KAAC1C;0BACD,KAACG;gBAAYwC,qBAAqB;gBAACC,MAAK;gBAAQ5B,OAAOG;;0BACvD,KAACjB;0BAAYkB,KAAKmB,CAAC,CAAC;;;;AAG1B,EAAC;AAED,MAAMG,oBAAoB;IACxB,MAAM,EAAEH,CAAC,EAAE,GAAG/B;IACd,MAAM,EAAEQ,OAAO6B,YAAY,EAAE,GAAGtC,cAC9B,CAAC,CAACuC,OAAO,GAAK,AAACA,UAAUA,QAAQ,CAAC,mBAAmB,IAAK;IAG5D,MAAMC,WAAWpC,MAAMuB,WAAW,CAChC,CAAClB;QACC,IAAI,CAACA,OAAO;YACV,OAAOuB,EAAE;QACX;QAEA,IAAIvB,UAAU6B,cAAc;YAC1B,OAAO;QACT;QAEA,OAAON,EAAE;IACX,GACA;QAACM;QAAcN;KAAE;IAGnB,qBACE,KAACnC;QACC4C,cAAa;QACbC,OAAOV,EAAE;QACTK,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/Root/generateCustomViewMetadata.d.ts

@@ -0,0 +1,11 @@
+import type { I18nClient } from '@payloadcms/translations';
+import type { Metadata } from 'next';
+import type { AdminViewConfig, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
+export declare const generateCustomViewMetadata: (args: {
+    collectionConfig?: SanitizedCollectionConfig;
+    config: SanitizedConfig;
+    globalConfig?: SanitizedGlobalConfig;
+    i18n: I18nClient;
+    viewConfig: AdminViewConfig;
+}) => Promise<Metadata>;
+//# sourceMappingURL=generateCustomViewMetadata.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generateCustomViewMetadata.d.ts","sourceRoot":"","sources":["../../../src/views/Root/generateCustomViewMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EACV,eAAe,EACf,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAIhB,eAAO,MAAM,0BAA0B,SAAgB;IACrD,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,IAAI,EAAE,UAAU,CAAA;IAChB,UAAU,EAAE,eAAe,CAAA;CAC5B,KAAG,OAAO,CAAC,QAAQ,CAwBnB,CAAA"}

package/dist/views/Root/generateCustomViewMetadata.js

@@ -0,0 +1,23 @@
+import { meta } from '../../utilities/meta.js';
+export const generateCustomViewMetadata = async (args)=>{
+    const { config, // i18n: { t },
+    viewConfig } = args;
+    if (!viewConfig) {
+        return null;
+    }
+    return meta({
+        description: `Payload`,
+        keywords: `Payload`,
+        serverURL: config.serverURL,
+        title: 'Payload',
+        ...config.admin.meta || {},
+        ...viewConfig.meta || {},
+        openGraph: {
+            title: 'Payload',
+            ...config.admin.meta?.openGraph || {},
+            ...viewConfig.meta?.openGraph || {}
+        }
+    });
+};
+
+//# sourceMappingURL=generateCustomViewMetadata.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/views/Root/generateCustomViewMetadata.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type {\n  AdminViewConfig,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateCustomViewMetadata = async (args: {\n  collectionConfig?: SanitizedCollectionConfig\n  config: SanitizedConfig\n  globalConfig?: SanitizedGlobalConfig\n  i18n: I18nClient\n  viewConfig: AdminViewConfig\n}): Promise<Metadata> => {\n  const {\n    config,\n    // i18n: { t },\n    viewConfig,\n  } = args\n\n  if (!viewConfig) {\n    return null\n  }\n\n  return meta({\n    description: `Payload`,\n    keywords: `Payload`,\n    serverURL: config.serverURL,\n    title: 'Payload',\n    ...(config.admin.meta || {}),\n    ...(viewConfig.meta || {}),\n    openGraph: {\n      title: 'Payload',\n      ...(config.admin.meta?.openGraph || {}),\n      ...(viewConfig.meta?.openGraph || {}),\n    },\n  })\n}\n"],"names":["meta","generateCustomViewMetadata","args","config","viewConfig","description","keywords","serverURL","title","admin","openGraph"],"mappings":"AASA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,6BAA6B,OAAOC;IAO/C,MAAM,EACJC,MAAM,EACN,eAAe;IACfC,UAAU,EACX,GAAGF;IAEJ,IAAI,CAACE,YAAY;QACf,OAAO;IACT;IAEA,OAAOJ,KAAK;QACVK,aAAa,CAAC,OAAO,CAAC;QACtBC,UAAU,CAAC,OAAO,CAAC;QACnBC,WAAWJ,OAAOI,SAAS;QAC3BC,OAAO;QACP,GAAIL,OAAOM,KAAK,CAACT,IAAI,IAAI,CAAC,CAAC;QAC3B,GAAII,WAAWJ,IAAI,IAAI,CAAC,CAAC;QACzBU,WAAW;YACTF,OAAO;YACP,GAAIL,OAAOM,KAAK,CAACT,IAAI,EAAEU,aAAa,CAAC,CAAC;YACtC,GAAIN,WAAWJ,IAAI,EAAEU,aAAa,CAAC,CAAC;QACtC;IACF;AACF,EAAC"}

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

@@ -1,6 +1,11 @@
-import type { AdminViewComponent, SanitizedConfig } from 'payload';
+import type { AdminViewConfig, SanitizedConfig } from 'payload';
+import type { ViewFromConfig } from './getViewFromConfig.js';
 export declare const getCustomViewByRoute: ({ config, currentRoute: currentRouteWithAdmin, }: {
     config: SanitizedConfig;
     currentRoute: string;
-}) => AdminViewComponent;
+}) => {
+    view: ViewFromConfig;
+    viewConfig: AdminViewConfig;
+    viewKey: string;
+};
 //# 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,SAAS,CAAA;AAIlE,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.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE/D,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;IACF,IAAI,EAAE,cAAc,CAAA;IACpB,UAAU,EAAE,eAAe,CAAA;IAC3B,OAAO,EAAE,MAAM,CAAA;CAiDhB,CAAA"}

package/dist/views/Root/getCustomViewByRoute.js

@@ -2,18 +2,36 @@ import { isPathMatchingRoute } from './isPathMatchingRoute.js';
 export const getCustomViewByRoute = ({ config, currentRoute: currentRouteWithAdmin })=>{
     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
-            });
+    let viewKey;
+    const foundViewConfig = views && typeof views === 'object' && Object.entries(views).find(([key, view])=>{
+        const isMatching = isPathMatchingRoute({
+            currentRoute,
+            exact: view.exact,
+            path: view.path,
+            sensitive: view.sensitive,
+            strict: view.strict
+        });
+        if (isMatching) {
+            viewKey = key;
         }
-    })?.[1];
-    return typeof foundViewConfig === 'object' ? foundViewConfig.Component : null;
+        return isMatching;
+    })?.[1] || undefined;
+    if (!foundViewConfig) {
+        return {
+            view: {
+                Component: null
+            },
+            viewConfig: null,
+            viewKey: null
+        };
+    }
+    return {
+        view: {
+            payloadComponent: foundViewConfig.Component
+        },
+        viewConfig: foundViewConfig,
+        viewKey
+    };
 };
 
 //# 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'\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"],"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.ts"],"sourcesContent":["import type { AdminViewConfig, 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}): {\n  view: ViewFromConfig\n  viewConfig: AdminViewConfig\n  viewKey: string\n} => {\n  const {\n    admin: {\n      components: { views },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  const currentRoute = currentRouteWithAdmin.replace(adminRoute, '')\n  let viewKey: string\n\n  const foundViewConfig =\n    (views &&\n      typeof views === 'object' &&\n      Object.entries(views).find(([key, view]) => {\n        const isMatching = isPathMatchingRoute({\n          currentRoute,\n          exact: view.exact,\n          path: view.path,\n          sensitive: view.sensitive,\n          strict: view.strict,\n        })\n\n        if (isMatching) {\n          viewKey = key\n        }\n\n        return isMatching\n      })?.[1]) ||\n    undefined\n\n  if (!foundViewConfig) {\n    return {\n      view: {\n        Component: null,\n      },\n      viewConfig: null,\n      viewKey: null,\n    }\n  }\n\n  return {\n    view: {\n      payloadComponent: foundViewConfig.Component,\n    },\n    viewConfig: foundViewConfig,\n    viewKey,\n  }\n}\n"],"names":["isPathMatchingRoute","getCustomViewByRoute","config","currentRoute","currentRouteWithAdmin","admin","components","views","routes","adminRoute","replace","viewKey","foundViewConfig","Object","entries","find","key","view","isMatching","exact","path","sensitive","strict","undefined","Component","viewConfig","payloadComponent"],"mappings":"AAIA,SAASA,mBAAmB,QAAQ,2BAA0B;AAE9D,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,MAAM,EACNC,cAAcC,qBAAqB,EAIpC;IAKC,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,KAAK,EAAE,EACtB,EACDC,QAAQ,EAAEH,OAAOI,UAAU,EAAE,EAC9B,GAAGP;IAEJ,MAAMC,eAAeC,sBAAsBM,OAAO,CAACD,YAAY;IAC/D,IAAIE;IAEJ,MAAMC,kBACJ,AAACL,SACC,OAAOA,UAAU,YACjBM,OAAOC,OAAO,CAACP,OAAOQ,IAAI,CAAC,CAAC,CAACC,KAAKC,KAAK;QACrC,MAAMC,aAAalB,oBAAoB;YACrCG;YACAgB,OAAOF,KAAKE,KAAK;YACjBC,MAAMH,KAAKG,IAAI;YACfC,WAAWJ,KAAKI,SAAS;YACzBC,QAAQL,KAAKK,MAAM;QACrB;QAEA,IAAIJ,YAAY;YACdP,UAAUK;QACZ;QAEA,OAAOE;IACT,IAAI,CAAC,EAAE,IACTK;IAEF,IAAI,CAACX,iBAAiB;QACpB,OAAO;YACLK,MAAM;gBACJO,WAAW;YACb;YACAC,YAAY;YACZd,SAAS;QACX;IACF;IAEA,OAAO;QACLM,MAAM;YACJS,kBAAkBd,gBAAgBY,SAAS;QAC7C;QACAC,YAAYb;QACZD;IACF;AACF,EAAC"}

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

@@ -1,15 +1,21 @@
-import type { AdminViewComponent, SanitizedConfig } from 'payload';
+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: any;
+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";

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,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAIlE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAsCjE,eAAO,MAAM,iBAAiB,kEAM3B;IACD,UAAU,MAAA;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,UAAU,CAAC,OAAO,QAAQ,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.ts"],"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;CA6JpC,CAAA"}

package/dist/views/Root/getViewFromConfig.js

@@ -28,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
     };
@@ -44,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;
@@ -55,7 +58,7 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
             {
                 // users can override the default routes via `admin.routes` config
                 // i.e.{ admin: { routes: { logout: '/sign-out', inactivity: '/idle' }}}
-                let viewToRender;
+                let viewKey;
                 if (config.admin.routes) {
                     const matchedRoute = Object.entries(config.admin.routes).find(([, route])=>{
                         return isPathMatchingRoute({
@@ -68,10 +71,10 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
                         });
                     });
                     if (matchedRoute) {
-                        viewToRender = matchedRoute[0];
+                        viewKey = matchedRoute[0];
                     }
                 }
-                if (oneSegmentViews[viewToRender]) {
+                if (oneSegmentViews[viewKey]) {
                     // --> /account
                     // --> /create-first-user
                     // --> /forgot
@@ -79,10 +82,12 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
                     // --> /logout
                     // --> /logout-inactivity
                     // --> /unauthorized
-                    ViewToRender = oneSegmentViews[viewToRender];
-                    templateClassName = baseClasses[viewToRender];
+                    ViewToRender = {
+                        Component: oneSegmentViews[viewKey]
+                    };
+                    templateClassName = baseClasses[viewKey];
                     templateType = 'minimal';
-                    if (viewToRender === 'account') {
+                    if (viewKey === 'account') {
                         initPageOptions.redirectUnauthenticatedUser = true;
                         templateType = 'default';
                     }
@@ -93,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';
                 }
@@ -115,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) {
@@ -126,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) {
@@ -136,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';
             }
@@ -146,7 +163,7 @@ export const getViewFromConfig = ({ adminRoute, config, currentRoute, searchPara
         ViewToRender = getCustomViewByRoute({
             config,
             currentRoute
-        });
+        })?.view;
     }
     return {
         DefaultView: ViewToRender,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Root/getViewFromConfig.tsx"],"sourcesContent":["import type { AdminViewComponent, SanitizedConfig } from 'payload'\n\nimport { formatAdminURL } from '@payloadcms/ui/shared'\n\nimport type { initPage } from '../../utilities/initPage/index.js'\n\nimport { Account } from '../Account/index.js'\nimport { CreateFirstUserView } from '../CreateFirstUser/index.js'\nimport { Dashboard } from '../Dashboard/index.js'\nimport { Document as DocumentView } from '../Document/index.js'\nimport { ForgotPasswordView, forgotPasswordBaseClass } from '../ForgotPassword/index.js'\nimport { ListView } from '../List/index.js'\nimport { LoginView, loginBaseClass } from '../Login/index.js'\nimport { LogoutInactivity, LogoutView } from '../Logout/index.js'\nimport { ResetPassword, resetPasswordBaseClass } from '../ResetPassword/index.js'\nimport { UnauthorizedView } from '../Unauthorized/index.js'\nimport { Verify, verifyBaseClass } from '../Verify/index.js'\nimport { getCustomViewByRoute } from './getCustomViewByRoute.js'\nimport { isPathMatchingRoute } from './isPathMatchingRoute.js'\n\nconst baseClasses = {\n  account: 'account',\n  forgot: forgotPasswordBaseClass,\n  login: loginBaseClass,\n  reset: resetPasswordBaseClass,\n  verify: verifyBaseClass,\n}\n\ntype OneSegmentViews = {\n  [K in Exclude<keyof SanitizedConfig['admin']['routes'], 'reset'>]: AdminViewComponent\n}\n\nconst oneSegmentViews: OneSegmentViews = {\n  account: Account,\n  createFirstUser: CreateFirstUserView,\n  forgot: ForgotPasswordView,\n  inactivity: LogoutInactivity,\n  login: LoginView,\n  logout: LogoutView,\n  unauthorized: UnauthorizedView,\n}\n\nexport const getViewFromConfig = ({\n  adminRoute,\n  config,\n  currentRoute,\n  searchParams,\n  segments,\n}: {\n  adminRoute\n  config: SanitizedConfig\n  currentRoute: string\n  searchParams: {\n    [key: string]: string | string[]\n  }\n  segments: string[]\n}): {\n  DefaultView: AdminViewComponent\n  initPageOptions: Parameters<typeof initPage>[0]\n  templateClassName: string\n  templateType: 'default' | 'minimal'\n} => {\n  let ViewToRender: AdminViewComponent = null\n  let templateClassName: string\n  let templateType: 'default' | 'minimal' | undefined\n\n  const initPageOptions: Parameters<typeof initPage>[0] = {\n    config,\n    route: currentRoute,\n    searchParams,\n  }\n\n  const [segmentOne, segmentTwo] = segments\n\n  const isGlobal = segmentOne === 'globals'\n  const isCollection = segmentOne === 'collections'\n\n  switch (segments.length) {\n    case 0: {\n      if (currentRoute === adminRoute) {\n        ViewToRender = Dashboard\n        templateClassName = 'dashboard'\n        templateType = 'default'\n        initPageOptions.redirectUnauthenticatedUser = true\n      }\n      break\n    }\n    case 1: {\n      // users can override the default routes via `admin.routes` config\n      // i.e.{ admin: { routes: { logout: '/sign-out', inactivity: '/idle' }}}\n      let viewToRender: keyof typeof oneSegmentViews\n\n      if (config.admin.routes) {\n        const matchedRoute = Object.entries(config.admin.routes).find(([, route]) => {\n          return isPathMatchingRoute({\n            currentRoute,\n            exact: true,\n            path: formatAdminURL({ adminRoute, path: route }),\n          })\n        })\n\n        if (matchedRoute) {\n          viewToRender = matchedRoute[0] as keyof typeof oneSegmentViews\n        }\n      }\n\n      if (oneSegmentViews[viewToRender]) {\n        // --> /account\n        // --> /create-first-user\n        // --> /forgot\n        // --> /login\n        // --> /logout\n        // --> /logout-inactivity\n        // --> /unauthorized\n\n        ViewToRender = oneSegmentViews[viewToRender]\n        templateClassName = baseClasses[viewToRender]\n        templateType = 'minimal'\n\n        if (viewToRender === 'account') {\n          initPageOptions.redirectUnauthenticatedUser = true\n          templateType = 'default'\n        }\n      }\n      break\n    }\n    case 2: {\n      if (segmentOne === 'reset') {\n        // --> /reset/:token\n        ViewToRender = ResetPassword\n        templateClassName = baseClasses[segmentTwo]\n        templateType = 'minimal'\n      }\n\n      if (isCollection) {\n        // --> /collections/:collectionSlug\n        initPageOptions.redirectUnauthenticatedUser = true\n        ViewToRender = ListView\n        templateClassName = `${segmentTwo}-list`\n        templateType = 'default'\n      } else if (isGlobal) {\n        // --> /globals/:globalSlug\n        initPageOptions.redirectUnauthenticatedUser = true\n        ViewToRender = DocumentView\n        templateClassName = 'global-edit'\n        templateType = 'default'\n      }\n      break\n    }\n    default:\n      if (segmentTwo === 'verify') {\n        // --> /:collectionSlug/verify/:token\n        ViewToRender = Verify\n        templateClassName = 'verify'\n        templateType = 'minimal'\n      } else if (isCollection) {\n        // Custom Views\n        // --> /collections/:collectionSlug/:id\n        // --> /collections/:collectionSlug/:id/preview\n        // --> /collections/:collectionSlug/:id/versions\n        // --> /collections/:collectionSlug/:id/versions/:versionId\n        // --> /collections/:collectionSlug/:id/api\n        initPageOptions.redirectUnauthenticatedUser = true\n        ViewToRender = DocumentView\n        templateClassName = `collection-default-edit`\n        templateType = 'default'\n      } else if (isGlobal) {\n        // Custom Views\n        // --> /globals/:globalSlug/versions\n        // --> /globals/:globalSlug/preview\n        // --> /globals/:globalSlug/versions/:versionId\n        // --> /globals/:globalSlug/api\n        initPageOptions.redirectUnauthenticatedUser = true\n        ViewToRender = DocumentView\n        templateClassName = `global-edit`\n        templateType = 'default'\n      }\n      break\n  }\n\n  if (!ViewToRender) {\n    ViewToRender = getCustomViewByRoute({ config, currentRoute })\n  }\n\n  return {\n    DefaultView: ViewToRender,\n    initPageOptions,\n    templateClassName,\n    templateType,\n  }\n}\n"],"names":["formatAdminURL","Account","CreateFirstUserView","Dashboard","Document","DocumentView","ForgotPasswordView","forgotPasswordBaseClass","ListView","LoginView","loginBaseClass","LogoutInactivity","LogoutView","ResetPassword","resetPasswordBaseClass","UnauthorizedView","Verify","verifyBaseClass","getCustomViewByRoute","isPathMatchingRoute","baseClasses","account","forgot","login","reset","verify","oneSegmentViews","createFirstUser","inactivity","logout","unauthorized","getViewFromConfig","adminRoute","config","currentRoute","searchParams","segments","ViewToRender","templateClassName","templateType","initPageOptions","route","segmentOne","segmentTwo","isGlobal","isCollection","length","redirectUnauthenticatedUser","viewToRender","admin","routes","matchedRoute","Object","entries","find","exact","path","DefaultView"],"mappings":"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"}
+{"version":3,"sources":["../../../src/views/Root/getViewFromConfig.ts"],"sourcesContent":["import type { AdminViewComponent, AdminViewProps, ImportMap, SanitizedConfig } from 'payload'\nimport type React from 'react'\n\nimport { formatAdminURL } from '@payloadcms/ui/shared'\n\nimport type { initPage } from '../../utilities/initPage/index.js'\n\nimport { Account } from '../Account/index.js'\nimport { CreateFirstUserView } from '../CreateFirstUser/index.js'\nimport { Dashboard } from '../Dashboard/index.js'\nimport { Document as DocumentView } from '../Document/index.js'\nimport { ForgotPasswordView, forgotPasswordBaseClass } from '../ForgotPassword/index.js'\nimport { ListView } from '../List/index.js'\nimport { LoginView, loginBaseClass } from '../Login/index.js'\nimport { LogoutInactivity, LogoutView } from '../Logout/index.js'\nimport { ResetPassword, resetPasswordBaseClass } from '../ResetPassword/index.js'\nimport { UnauthorizedView } from '../Unauthorized/index.js'\nimport { Verify, verifyBaseClass } from '../Verify/index.js'\nimport { getCustomViewByRoute } from './getCustomViewByRoute.js'\nimport { isPathMatchingRoute } from './isPathMatchingRoute.js'\n\nconst baseClasses = {\n  account: 'account',\n  forgot: forgotPasswordBaseClass,\n  login: loginBaseClass,\n  reset: resetPasswordBaseClass,\n  verify: verifyBaseClass,\n}\n\ntype OneSegmentViews = {\n  [K in Exclude<keyof SanitizedConfig['admin']['routes'], 'reset'>]: React.FC<AdminViewProps>\n}\n\nexport type ViewFromConfig = {\n  Component?: React.FC<AdminViewProps>\n  payloadComponent?: AdminViewComponent\n}\n\nconst oneSegmentViews: OneSegmentViews = {\n  account: Account,\n  createFirstUser: CreateFirstUserView,\n  forgot: ForgotPasswordView,\n  inactivity: LogoutInactivity,\n  login: LoginView,\n  logout: LogoutView,\n  unauthorized: UnauthorizedView,\n}\n\nexport const getViewFromConfig = ({\n  adminRoute,\n  config,\n  currentRoute,\n  importMap,\n  searchParams,\n  segments,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  currentRoute: string\n  importMap: ImportMap\n  searchParams: {\n    [key: string]: string | string[]\n  }\n  segments: string[]\n}): {\n  DefaultView: ViewFromConfig\n  initPageOptions: Parameters<typeof initPage>[0]\n  templateClassName: string\n  templateType: 'default' | 'minimal'\n} => {\n  let ViewToRender: ViewFromConfig = null\n  let templateClassName: string\n  let templateType: 'default' | 'minimal' | undefined\n\n  const initPageOptions: Parameters<typeof initPage>[0] = {\n    config,\n    importMap,\n    route: currentRoute,\n    searchParams,\n  }\n\n  const [segmentOne, segmentTwo] = segments\n\n  const isGlobal = segmentOne === 'globals'\n  const isCollection = segmentOne === 'collections'\n\n  switch (segments.length) {\n    case 0: {\n      if (currentRoute === adminRoute) {\n        ViewToRender = {\n          Component: Dashboard,\n        }\n        templateClassName = 'dashboard'\n        templateType = 'default'\n        initPageOptions.redirectUnauthenticatedUser = true\n      }\n      break\n    }\n    case 1: {\n      // users can override the default routes via `admin.routes` config\n      // i.e.{ admin: { routes: { logout: '/sign-out', inactivity: '/idle' }}}\n      let viewKey: keyof typeof oneSegmentViews\n\n      if (config.admin.routes) {\n        const matchedRoute = Object.entries(config.admin.routes).find(([, route]) => {\n          return isPathMatchingRoute({\n            currentRoute,\n            exact: true,\n            path: formatAdminURL({ adminRoute, path: route }),\n          })\n        })\n\n        if (matchedRoute) {\n          viewKey = matchedRoute[0] as keyof typeof oneSegmentViews\n        }\n      }\n\n      if (oneSegmentViews[viewKey]) {\n        // --> /account\n        // --> /create-first-user\n        // --> /forgot\n        // --> /login\n        // --> /logout\n        // --> /logout-inactivity\n        // --> /unauthorized\n\n        ViewToRender = {\n          Component: oneSegmentViews[viewKey],\n        }\n\n        templateClassName = baseClasses[viewKey]\n        templateType = 'minimal'\n\n        if (viewKey === 'account') {\n          initPageOptions.redirectUnauthenticatedUser = true\n          templateType = 'default'\n        }\n      }\n      break\n    }\n    case 2: {\n      if (segmentOne === 'reset') {\n        // --> /reset/:token\n        ViewToRender = {\n          Component: ResetPassword,\n        }\n        templateClassName = baseClasses[segmentTwo]\n        templateType = 'minimal'\n      }\n\n      if (isCollection) {\n        // --> /collections/:collectionSlug\n        initPageOptions.redirectUnauthenticatedUser = true\n\n        ViewToRender = {\n          Component: ListView,\n        }\n\n        templateClassName = `${segmentTwo}-list`\n        templateType = 'default'\n      } else if (isGlobal) {\n        // --> /globals/:globalSlug\n        initPageOptions.redirectUnauthenticatedUser = true\n\n        ViewToRender = {\n          Component: DocumentView,\n        }\n\n        templateClassName = 'global-edit'\n        templateType = 'default'\n      }\n      break\n    }\n    default:\n      if (segmentTwo === 'verify') {\n        // --> /:collectionSlug/verify/:token\n        ViewToRender = {\n          Component: Verify,\n        }\n\n        templateClassName = 'verify'\n        templateType = 'minimal'\n      } else if (isCollection) {\n        // Custom Views\n        // --> /collections/:collectionSlug/:id\n        // --> /collections/:collectionSlug/:id/preview\n        // --> /collections/:collectionSlug/:id/versions\n        // --> /collections/:collectionSlug/:id/versions/:versionId\n        // --> /collections/:collectionSlug/:id/api\n        initPageOptions.redirectUnauthenticatedUser = true\n\n        ViewToRender = {\n          Component: DocumentView,\n        }\n\n        templateClassName = `collection-default-edit`\n        templateType = 'default'\n      } else if (isGlobal) {\n        // Custom Views\n        // --> /globals/:globalSlug/versions\n        // --> /globals/:globalSlug/preview\n        // --> /globals/:globalSlug/versions/:versionId\n        // --> /globals/:globalSlug/api\n        initPageOptions.redirectUnauthenticatedUser = true\n\n        ViewToRender = {\n          Component: DocumentView,\n        }\n\n        templateClassName = `global-edit`\n        templateType = 'default'\n      }\n      break\n  }\n\n  if (!ViewToRender) {\n    ViewToRender = getCustomViewByRoute({ config, currentRoute })?.view\n  }\n\n  return {\n    DefaultView: ViewToRender,\n    initPageOptions,\n    templateClassName,\n    templateType,\n  }\n}\n"],"names":["formatAdminURL","Account","CreateFirstUserView","Dashboard","Document","DocumentView","ForgotPasswordView","forgotPasswordBaseClass","ListView","LoginView","loginBaseClass","LogoutInactivity","LogoutView","ResetPassword","resetPasswordBaseClass","UnauthorizedView","Verify","verifyBaseClass","getCustomViewByRoute","isPathMatchingRoute","baseClasses","account","forgot","login","reset","verify","oneSegmentViews","createFirstUser","inactivity","logout","unauthorized","getViewFromConfig","adminRoute","config","currentRoute","importMap","searchParams","segments","ViewToRender","templateClassName","templateType","initPageOptions","route","segmentOne","segmentTwo","isGlobal","isCollection","length","Component","redirectUnauthenticatedUser","viewKey","admin","routes","matchedRoute","Object","entries","find","exact","path","view","DefaultView"],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import type { I18nClient } from '@payloadcms/translations';
 import type { Metadata } from 'next';
-import type { SanitizedConfig } from 'payload';
+import type { ImportMap, SanitizedConfig } from 'payload';
 import React from 'react';
 export { generatePageMetadata } from './meta.js';
 export type GenerateViewMetadata = (args: {
@@ -11,12 +11,13 @@ export type GenerateViewMetadata = (args: {
         [key: string]: string | string[];
     };
 }) => Promise<Metadata>;
-export declare const RootPage: ({ config: configPromise, params, searchParams, }: {
-    config: Promise<SanitizedConfig>;
-    params: {
+export declare const RootPage: ({ config: configPromise, importMap, params, searchParams, }: {
+    readonly config: Promise<SanitizedConfig>;
+    readonly importMap: ImportMap;
+    readonly params: {
         segments: string[];
     };
-    searchParams: {
+    readonly searchParams: {
         [key: string]: string | string[];
     };
 }) => Promise<React.JSX.Element>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Root/index.tsx"],"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,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAEhD,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,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,QAAQ,qDAIlB;IACD,MAAM,EAAE,OAAO,CAAC,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,+BAoGA,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Root/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,SAAS,EAAmB,eAAe,EAAE,MAAM,SAAS,CAAA;AAI1E,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAEhD,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,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,QAAQ,gEAKlB;IACD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAC7B,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,EAAE,MAAM,EAAE,CAAA;KACnB,CAAA;IACD,QAAQ,CAAC,YAAY,EAAE;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;CACF,+BA6GA,CAAA"}

package/dist/views/Root/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { WithServerSideProps, formatAdminURL } from '@payloadcms/ui/shared';
+import { RenderComponent, formatAdminURL, getCreateMappedComponent } from '@payloadcms/ui/shared';
 import { notFound, redirect } from 'next/navigation.js';
 import React, { Fragment } from 'react';
 import { DefaultTemplate } from '../../templates/Default/index.js';
@@ -7,7 +7,7 @@ import { MinimalTemplate } from '../../templates/Minimal/index.js';
 import { initPage } from '../../utilities/initPage/index.js';
 import { getViewFromConfig } from './getViewFromConfig.js';
 export { generatePageMetadata } from './meta.js';
-export const RootPage = async ({ config: configPromise, params, searchParams })=>{
+export const RootPage = async ({ config: configPromise, importMap, params, searchParams })=>{
     const config = await configPromise;
     const { admin: { routes: { createFirstUser: _createFirstUserRoute }, user: userSlug }, routes: { admin: adminRoute } } = config;
     const currentRoute = formatAdminURL({
@@ -19,11 +19,12 @@ export const RootPage = async ({ config: configPromise, params, searchParams })=
         adminRoute,
         config,
         currentRoute,
+        importMap,
         searchParams,
         segments
     });
     let dbHasUser = false;
-    if (!DefaultView) {
+    if (!DefaultView?.Component && !DefaultView?.payloadComponent) {
         notFound();
     }
     const initPageResult = await initPage(initPageOptions);
@@ -48,14 +49,21 @@ export const RootPage = async ({ config: configPromise, params, searchParams })=
             redirect(adminRoute);
         }
     }
-    const RenderedView = /*#__PURE__*/ _jsx(WithServerSideProps, {
-        Component: DefaultView,
-        serverOnlyProps: {
+    const createMappedView = getCreateMappedComponent({
+        importMap,
+        serverProps: {
+            i18n: initPageResult?.req.i18n,
+            importMap,
             initPageResult,
             params,
+            payload: initPageResult?.req.payload,
             searchParams
         }
     });
+    const MappedView = createMappedView(DefaultView.payloadComponent, undefined, DefaultView.Component, 'createMappedView');
+    const RenderedView = /*#__PURE__*/ _jsx(RenderComponent, {
+        mappedComponent: MappedView
+    });
     return /*#__PURE__*/ _jsxs(Fragment, {
         children: [
             !templateType && /*#__PURE__*/ _jsx(Fragment, {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Root/index.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { SanitizedConfig } from 'payload'\n\nimport { WithServerSideProps, formatAdminURL } from '@payloadcms/ui/shared'\nimport { notFound, redirect } from 'next/navigation.js'\nimport React, { Fragment } from 'react'\n\nimport { DefaultTemplate } from '../../templates/Default/index.js'\nimport { MinimalTemplate } from '../../templates/Minimal/index.js'\nimport { initPage } from '../../utilities/initPage/index.js'\nimport { getViewFromConfig } from './getViewFromConfig.js'\n\nexport { generatePageMetadata } from './meta.js'\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18nClient\n  isEditing?: boolean\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const RootPage = 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\n  const {\n    admin: {\n      routes: { createFirstUser: _createFirstUserRoute },\n      user: userSlug,\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  const currentRoute = formatAdminURL({\n    adminRoute,\n    path: `${Array.isArray(params.segments) ? `/${params.segments.join('/')}` : ''}`,\n  })\n\n  const segments = Array.isArray(params.segments) ? params.segments : []\n\n  const { DefaultView, initPageOptions, templateClassName, templateType } = getViewFromConfig({\n    adminRoute,\n    config,\n    currentRoute,\n    searchParams,\n    segments,\n  })\n\n  let dbHasUser = false\n\n  if (!DefaultView) {\n    notFound()\n  }\n\n  const initPageResult = await initPage(initPageOptions)\n\n  if (initPageResult) {\n    dbHasUser = await initPageResult?.req.payload.db\n      .findOne({\n        collection: userSlug,\n        req: initPageResult?.req,\n      })\n      ?.then((doc) => !!doc)\n\n    const createFirstUserRoute = formatAdminURL({ adminRoute, path: _createFirstUserRoute })\n\n    const collectionConfig = config.collections.find(({ slug }) => slug === userSlug)\n    const disableLocalStrategy = collectionConfig?.auth?.disableLocalStrategy\n\n    if (disableLocalStrategy && currentRoute === createFirstUserRoute) {\n      redirect(adminRoute)\n    }\n\n    if (!dbHasUser && currentRoute !== createFirstUserRoute && !disableLocalStrategy) {\n      redirect(createFirstUserRoute)\n    }\n\n    if (dbHasUser && currentRoute === createFirstUserRoute) {\n      redirect(adminRoute)\n    }\n  }\n\n  const RenderedView = (\n    <WithServerSideProps\n      Component={DefaultView}\n      serverOnlyProps={\n        {\n          initPageResult,\n          params,\n          searchParams,\n        } as any\n      }\n    />\n  )\n\n  return (\n    <Fragment>\n      {!templateType && <Fragment>{RenderedView}</Fragment>}\n      {templateType === 'minimal' && (\n        <MinimalTemplate className={templateClassName}>{RenderedView}</MinimalTemplate>\n      )}\n      {templateType === 'default' && (\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={{\n            // The reason we are not passing in initPageResult.visibleEntities directly is due to a \"Cannot assign to read only property of object '#<Object>\" error introduced in React 19\n            // which this caused as soon as initPageResult.visibleEntities is passed in\n            collections: initPageResult.visibleEntities?.collections,\n            globals: initPageResult.visibleEntities?.globals,\n          }}\n        >\n          {RenderedView}\n        </DefaultTemplate>\n      )}\n    </Fragment>\n  )\n}\n"],"names":["WithServerSideProps","formatAdminURL","notFound","redirect","React","Fragment","DefaultTemplate","MinimalTemplate","initPage","getViewFromConfig","generatePageMetadata","RootPage","config","configPromise","params","searchParams","admin","routes","createFirstUser","_createFirstUserRoute","user","userSlug","adminRoute","currentRoute","path","Array","isArray","segments","join","DefaultView","initPageOptions","templateClassName","templateType","dbHasUser","initPageResult","req","payload","db","findOne","collection","then","doc","createFirstUserRoute","collectionConfig","collections","find","slug","disableLocalStrategy","auth","RenderedView","Component","serverOnlyProps","className","i18n","locale","permissions","visibleEntities","globals"],"mappings":";AAIA,SAASA,mBAAmB,EAAEC,cAAc,QAAQ,wBAAuB;AAC3E,SAASC,QAAQ,EAAEC,QAAQ,QAAQ,qBAAoB;AACvD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,QAAQ,QAAQ,oCAAmC;AAC5D,SAASC,iBAAiB,QAAQ,yBAAwB;AAE1D,SAASC,oBAAoB,QAAQ,YAAW;AAShD,OAAO,MAAMC,WAAW,OAAO,EAC7BC,QAAQC,aAAa,EACrBC,MAAM,EACNC,YAAY,EASb;IACC,MAAMH,SAAS,MAAMC;IAErB,MAAM,EACJG,OAAO,EACLC,QAAQ,EAAEC,iBAAiBC,qBAAqB,EAAE,EAClDC,MAAMC,QAAQ,EACf,EACDJ,QAAQ,EAAED,OAAOM,UAAU,EAAE,EAC9B,GAAGV;IAEJ,MAAMW,eAAetB,eAAe;QAClCqB;QACAE,MAAM,CAAC,EAAEC,MAAMC,OAAO,CAACZ,OAAOa,QAAQ,IAAI,CAAC,CAAC,EAAEb,OAAOa,QAAQ,CAACC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;IAClF;IAEA,MAAMD,WAAWF,MAAMC,OAAO,CAACZ,OAAOa,QAAQ,IAAIb,OAAOa,QAAQ,GAAG,EAAE;IAEtE,MAAM,EAAEE,WAAW,EAAEC,eAAe,EAAEC,iBAAiB,EAAEC,YAAY,EAAE,GAAGvB,kBAAkB;QAC1Fa;QACAV;QACAW;QACAR;QACAY;IACF;IAEA,IAAIM,YAAY;IAEhB,IAAI,CAACJ,aAAa;QAChB3B;IACF;IAEA,MAAMgC,iBAAiB,MAAM1B,SAASsB;IAEtC,IAAII,gBAAgB;QAClBD,YAAY,MAAMC,gBAAgBC,IAAIC,QAAQC,GAC3CC,QAAQ;YACPC,YAAYlB;YACZc,KAAKD,gBAAgBC;QACvB,IACEK,KAAK,CAACC,MAAQ,CAAC,CAACA;QAEpB,MAAMC,uBAAuBzC,eAAe;YAAEqB;YAAYE,MAAML;QAAsB;QAEtF,MAAMwB,mBAAmB/B,OAAOgC,WAAW,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASzB;QACxE,MAAM0B,uBAAuBJ,kBAAkBK,MAAMD;QAErD,IAAIA,wBAAwBxB,iBAAiBmB,sBAAsB;YACjEvC,SAASmB;QACX;QAEA,IAAI,CAACW,aAAaV,iBAAiBmB,wBAAwB,CAACK,sBAAsB;YAChF5C,SAASuC;QACX;QAEA,IAAIT,aAAaV,iBAAiBmB,sBAAsB;YACtDvC,SAASmB;QACX;IACF;IAEA,MAAM2B,6BACJ,KAACjD;QACCkD,WAAWrB;QACXsB,iBACE;YACEjB;YACApB;YACAC;QACF;;IAKN,qBACE,MAACV;;YACE,CAAC2B,8BAAgB,KAAC3B;0BAAU4C;;YAC5BjB,iBAAiB,2BAChB,KAACzB;gBAAgB6C,WAAWrB;0BAAoBkB;;YAEjDjB,iBAAiB,2BAChB,KAAC1B;gBACC+C,MAAMnB,gBAAgBC,IAAIkB;gBAC1BC,QAAQpB,gBAAgBoB;gBACxBxC,QAAQA;gBACRsB,SAASF,gBAAgBC,IAAIC;gBAC7BmB,aAAarB,gBAAgBqB;gBAC7BxC,cAAcA;gBACdK,MAAMc,gBAAgBC,IAAIf;gBAC1BoC,iBAAiB;oBACf,+KAA+K;oBAC/K,2EAA2E;oBAC3EZ,aAAaV,eAAesB,eAAe,EAAEZ;oBAC7Ca,SAASvB,eAAesB,eAAe,EAAEC;gBAC3C;0BAECR;;;;AAKX,EAAC"}
+{"version":3,"sources":["../../../src/views/Root/index.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { ImportMap, MappedComponent, SanitizedConfig } from 'payload'\n\nimport { RenderComponent, formatAdminURL, getCreateMappedComponent } from '@payloadcms/ui/shared'\nimport { notFound, redirect } from 'next/navigation.js'\nimport React, { Fragment } from 'react'\n\nimport { DefaultTemplate } from '../../templates/Default/index.js'\nimport { MinimalTemplate } from '../../templates/Minimal/index.js'\nimport { initPage } from '../../utilities/initPage/index.js'\nimport { getViewFromConfig } from './getViewFromConfig.js'\n\nexport { generatePageMetadata } from './meta.js'\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18nClient\n  isEditing?: boolean\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const RootPage = async ({\n  config: configPromise,\n  importMap,\n  params,\n  searchParams,\n}: {\n  readonly config: Promise<SanitizedConfig>\n  readonly importMap: ImportMap\n  readonly params: {\n    segments: string[]\n  }\n  readonly searchParams: {\n    [key: string]: string | string[]\n  }\n}) => {\n  const config = await configPromise\n\n  const {\n    admin: {\n      routes: { createFirstUser: _createFirstUserRoute },\n      user: userSlug,\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  const currentRoute = formatAdminURL({\n    adminRoute,\n    path: `${Array.isArray(params.segments) ? `/${params.segments.join('/')}` : ''}`,\n  })\n\n  const segments = Array.isArray(params.segments) ? params.segments : []\n\n  const { DefaultView, initPageOptions, templateClassName, templateType } = getViewFromConfig({\n    adminRoute,\n    config,\n    currentRoute,\n    importMap,\n    searchParams,\n    segments,\n  })\n\n  let dbHasUser = false\n\n  if (!DefaultView?.Component && !DefaultView?.payloadComponent) {\n    notFound()\n  }\n\n  const initPageResult = await initPage(initPageOptions)\n\n  if (initPageResult) {\n    dbHasUser = await initPageResult?.req.payload.db\n      .findOne({\n        collection: userSlug,\n        req: initPageResult?.req,\n      })\n      ?.then((doc) => !!doc)\n\n    const createFirstUserRoute = formatAdminURL({ adminRoute, path: _createFirstUserRoute })\n\n    const collectionConfig = config.collections.find(({ slug }) => slug === userSlug)\n    const disableLocalStrategy = collectionConfig?.auth?.disableLocalStrategy\n\n    if (disableLocalStrategy && currentRoute === createFirstUserRoute) {\n      redirect(adminRoute)\n    }\n\n    if (!dbHasUser && currentRoute !== createFirstUserRoute && !disableLocalStrategy) {\n      redirect(createFirstUserRoute)\n    }\n\n    if (dbHasUser && currentRoute === createFirstUserRoute) {\n      redirect(adminRoute)\n    }\n  }\n\n  const createMappedView = getCreateMappedComponent({\n    importMap,\n    serverProps: {\n      i18n: initPageResult?.req.i18n,\n      importMap,\n      initPageResult,\n      params,\n      payload: initPageResult?.req.payload,\n      searchParams,\n    },\n  })\n\n  const MappedView: MappedComponent = createMappedView(\n    DefaultView.payloadComponent,\n    undefined,\n    DefaultView.Component,\n    'createMappedView',\n  )\n\n  const RenderedView = <RenderComponent mappedComponent={MappedView} />\n\n  return (\n    <Fragment>\n      {!templateType && <Fragment>{RenderedView}</Fragment>}\n      {templateType === 'minimal' && (\n        <MinimalTemplate className={templateClassName}>{RenderedView}</MinimalTemplate>\n      )}\n      {templateType === 'default' && (\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={{\n            // The reason we are not passing in initPageResult.visibleEntities directly is due to a \"Cannot assign to read only property of object '#<Object>\" error introduced in React 19\n            // which this caused as soon as initPageResult.visibleEntities is passed in\n            collections: initPageResult.visibleEntities?.collections,\n            globals: initPageResult.visibleEntities?.globals,\n          }}\n        >\n          {RenderedView}\n        </DefaultTemplate>\n      )}\n    </Fragment>\n  )\n}\n"],"names":["RenderComponent","formatAdminURL","getCreateMappedComponent","notFound","redirect","React","Fragment","DefaultTemplate","MinimalTemplate","initPage","getViewFromConfig","generatePageMetadata","RootPage","config","configPromise","importMap","params","searchParams","admin","routes","createFirstUser","_createFirstUserRoute","user","userSlug","adminRoute","currentRoute","path","Array","isArray","segments","join","DefaultView","initPageOptions","templateClassName","templateType","dbHasUser","Component","payloadComponent","initPageResult","req","payload","db","findOne","collection","then","doc","createFirstUserRoute","collectionConfig","collections","find","slug","disableLocalStrategy","auth","createMappedView","serverProps","i18n","MappedView","undefined","RenderedView","mappedComponent","className","locale","permissions","visibleEntities","globals"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/Root/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAwB9C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAChC,MAAM,EAAE;QACN,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;IACD,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;CACF,CAAA;AAED,eAAO,MAAM,oBAAoB,sCAA6C,IAAI,sBAqGjF,CAAA"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/Root/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AA0B9C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAChC,MAAM,EAAE;QACN,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;IACD,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;CACF,CAAA;AAED,eAAO,MAAM,oBAAoB,sCAA6C,IAAI,sBAqHjF,CAAA"}