@payloadcms/next 3.0.0-beta.111 → 3.0.0-beta.112

package/dist/utilities/initPage/index.d.ts

@@ -1,4 +1,4 @@
 import type { InitPageResult } from 'payload';
 import type { Args } from './types.js';
-export declare const initPage: ({ config: configPromise, importMap, redirectUnauthenticatedUser, route, searchParams, }: Args) => Promise<InitPageResult>;
+export declare const initPage: ({ config: configPromise, importMap, route, searchParams, }: Args) => Promise<InitPageResult>;
 //# sourceMappingURL=index.d.ts.map

package/dist/utilities/initPage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA2C,MAAM,SAAS,CAAA;AAOtF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAOtC,eAAO,MAAM,QAAQ,4FAMlB,IAAI,KAAG,OAAO,CAAC,cAAc,CA0I/B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA2C,MAAM,SAAS,CAAA;AAQtF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQtC,eAAO,MAAM,QAAQ,+DAKlB,IAAI,KAAG,OAAO,CAAC,cAAc,CAmJ/B,CAAA"}

package/dist/utilities/initPage/index.js

@@ -1,15 +1,16 @@
 import { findLocaleFromCode } from '@payloadcms/ui/shared';
 import { headers as getHeaders } from 'next/headers.js';
+import { notFound } from 'next/navigation.js';
 import { createLocalReq, isEntityHidden, parseCookies } from 'payload';
 import * as qs from 'qs-esm';
 import { getPayloadHMR } from '../getPayloadHMR.js';
 import { initReq } from '../initReq.js';
-import { handleAdminPage } from './handleAdminPage.js';
+import { getRouteInfo } from './handleAdminPage.js';
 import { handleAuthRedirect } from './handleAuthRedirect.js';
+import { isPublicAdminRoute } from './shared.js';
 export const initPage = async ({
   config: configPromise,
   importMap,
-  redirectUnauthenticatedUser = false,
   route,
   searchParams
 }) => {
@@ -118,24 +119,33 @@ export const initPage = async ({
       user
     }) ? slug : null).filter(Boolean)
   };
-  if (redirectUnauthenticatedUser && !user) {
-    handleAuthRedirect({
+  let redirectTo = null;
+  if (!permissions.canAccessAdmin && !isPublicAdminRoute({
+    adminRoute,
+    config: payload.config,
+    route
+  })) {
+    redirectTo = handleAuthRedirect({
       config: payload.config,
-      redirectUnauthenticatedUser,
       route,
-      searchParams
+      searchParams,
+      user
     });
   }
   const {
     collectionConfig,
+    collectionSlug,
     docID,
-    globalConfig
-  } = handleAdminPage({
+    globalConfig,
+    globalSlug
+  } = getRouteInfo({
     adminRoute,
     config: payload.config,
-    permissions,
     route
   });
+  if (collectionSlug && !collectionConfig || globalSlug && !globalConfig) {
+    return notFound();
+  }
   return {
     collectionConfig,
     cookies,
@@ -144,6 +154,7 @@ export const initPage = async ({
     languageOptions,
     locale,
     permissions,
+    redirectTo,
     req,
     translations: i18n.translations,
     visibleEntities

package/dist/utilities/initPage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["findLocaleFromCode","headers","getHeaders","createLocalReq","isEntityHidden","parseCookies","qs","getPayloadHMR","initReq","handleAdminPage","handleAuthRedirect","initPage","config","configPromise","importMap","redirectUnauthenticatedUser","route","searchParams","payload","queryString","stringify","addQueryPrefix","collections","globals","localization","routes","admin","adminRoute","cookies","i18n","permissions","user","req","fallbackLocale","host","get","query","parse","depth","ignoreQueryPrefix","url","serverURL","languageOptions","Object","entries","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","localeParam","locale","defaultLocaleCode","defaultLocale","localeCode","find","collection","limit","where","and","equals","id","key","then","res","docs","error","code","visibleEntities","map","slug","hidden","filter","Boolean","collectionConfig","docID","globalConfig"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { InitPageResult, Locale, PayloadRequest, VisibleEntities } from 'payload'\n\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { createLocalReq, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { getPayloadHMR } from '../getPayloadHMR.js'\nimport { initReq } from '../initReq.js'\nimport { handleAdminPage } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  redirectUnauthenticatedUser = false,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = await getHeaders()\n  const payload = await getPayloadHMR({ config: configPromise, importMap })\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    collections,\n    globals,\n    localization,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const cookies = parseCookies(headers)\n\n  const { i18n, permissions, user } = await initReq(payload.config)\n\n  // Ideally, we should not need to recreate the req, because\n  // we can get it from the above initReq.\n\n  // We just need to -overwrite- the url and query of the req\n  // we get above. Clone the req? We'll look into that eventually.\n  const req = await createLocalReq(\n    {\n      fallbackLocale: null,\n      req: {\n        headers,\n        host: headers.get('host'),\n        i18n,\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n        url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n      } as PayloadRequest,\n    },\n    payload,\n  )\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  req.user = user\n\n  const localeParam = searchParams?.locale as string\n  let locale: Locale\n\n  if (localization) {\n    const defaultLocaleCode = localization.defaultLocale ? localization.defaultLocale : 'en'\n    let localeCode: string = localeParam\n\n    if (!localeCode) {\n      try {\n        localeCode = await payload\n          .find({\n            collection: 'payload-preferences',\n            depth: 0,\n            limit: 1,\n            user,\n            where: {\n              and: [\n                {\n                  'user.relationTo': {\n                    equals: payload.config.admin.user,\n                  },\n                },\n                {\n                  'user.value': {\n                    equals: user.id,\n                  },\n                },\n                {\n                  key: {\n                    equals: 'locale',\n                  },\n                },\n              ],\n            },\n          })\n          ?.then((res) => res.docs?.[0]?.value as string)\n      } catch (error) {} // eslint-disable-line no-empty\n    }\n\n    locale = findLocaleFromCode(localization, localeCode)\n\n    if (!locale) {\n      locale = findLocaleFromCode(localization, defaultLocaleCode)\n    }\n    req.locale = locale.code\n  }\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  if (redirectUnauthenticatedUser && !user) {\n    handleAuthRedirect({\n      config: payload.config,\n      redirectUnauthenticatedUser,\n      route,\n      searchParams,\n    })\n  }\n\n  const { collectionConfig, docID, globalConfig } = handleAdminPage({\n    adminRoute,\n    config: payload.config,\n    permissions,\n    route,\n  })\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["findLocaleFromCode","headers","getHeaders","notFound","createLocalReq","isEntityHidden","parseCookies","qs","getPayloadHMR","initReq","getRouteInfo","handleAuthRedirect","isPublicAdminRoute","initPage","config","configPromise","importMap","route","searchParams","payload","queryString","stringify","addQueryPrefix","collections","globals","localization","routes","admin","adminRoute","cookies","i18n","permissions","user","req","fallbackLocale","host","get","query","parse","depth","ignoreQueryPrefix","url","serverURL","languageOptions","Object","entries","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","localeParam","locale","defaultLocaleCode","defaultLocale","localeCode","find","collection","limit","where","and","equals","id","key","then","res","docs","error","code","visibleEntities","map","slug","hidden","filter","Boolean","redirectTo","canAccessAdmin","collectionConfig","collectionSlug","docID","globalConfig","globalSlug"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { InitPageResult, Locale, PayloadRequest, VisibleEntities } from 'payload'\n\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound } from 'next/navigation.js'\nimport { createLocalReq, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { getPayloadHMR } from '../getPayloadHMR.js'\nimport { initReq } from '../initReq.js'\nimport { getRouteInfo } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\nimport { isPublicAdminRoute } from './shared.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = await getHeaders()\n  const payload = await getPayloadHMR({ config: configPromise, importMap })\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    collections,\n    globals,\n    localization,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const cookies = parseCookies(headers)\n\n  const { i18n, permissions, user } = await initReq(payload.config)\n\n  // Ideally, we should not need to recreate the req, because\n  // we can get it from the above initReq.\n\n  // We just need to -overwrite- the url and query of the req\n  // we get above. Clone the req? We'll look into that eventually.\n  const req = await createLocalReq(\n    {\n      fallbackLocale: null,\n      req: {\n        headers,\n        host: headers.get('host'),\n        i18n,\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n        url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n      } as PayloadRequest,\n    },\n    payload,\n  )\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  req.user = user\n\n  const localeParam = searchParams?.locale as string\n  let locale: Locale\n\n  if (localization) {\n    const defaultLocaleCode = localization.defaultLocale ? localization.defaultLocale : 'en'\n    let localeCode: string = localeParam\n\n    if (!localeCode) {\n      try {\n        localeCode = await payload\n          .find({\n            collection: 'payload-preferences',\n            depth: 0,\n            limit: 1,\n            user,\n            where: {\n              and: [\n                {\n                  'user.relationTo': {\n                    equals: payload.config.admin.user,\n                  },\n                },\n                {\n                  'user.value': {\n                    equals: user.id,\n                  },\n                },\n                {\n                  key: {\n                    equals: 'locale',\n                  },\n                },\n              ],\n            },\n          })\n          ?.then((res) => res.docs?.[0]?.value as string)\n      } catch (error) {} // eslint-disable-line no-empty\n    }\n\n    locale = findLocaleFromCode(localization, localeCode)\n\n    if (!locale) {\n      locale = findLocaleFromCode(localization, defaultLocaleCode)\n    }\n    req.locale = locale.code\n  }\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  let redirectTo = null\n\n  if (\n    !permissions.canAccessAdmin &&\n    !isPublicAdminRoute({ adminRoute, config: payload.config, route })\n  ) {\n    redirectTo = handleAuthRedirect({\n      config: payload.config,\n      route,\n      searchParams,\n      user,\n    })\n  }\n\n  const { collectionConfig, collectionSlug, docID, globalConfig, globalSlug } = getRouteInfo({\n    adminRoute,\n    config: payload.config,\n    route,\n  })\n\n  if ((collectionSlug && !collectionConfig) || (globalSlug && !globalConfig)) {\n    return notFound()\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    redirectTo,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/initPage/shared.d.ts

@@ -1,10 +1,10 @@
 import type { SanitizedConfig } from 'payload';
-export declare const isAdminRoute: ({ adminRoute, config, route, }: {
+export declare const isAdminRoute: ({ adminRoute, route, }: {
     adminRoute: string;
     config: SanitizedConfig;
     route: string;
 }) => boolean;
-export declare const isAdminAuthRoute: ({ adminRoute, config, route, }: {
+export declare const isPublicAdminRoute: ({ adminRoute, config, route, }: {
     adminRoute: string;
     config: SanitizedConfig;
     route: string;

package/dist/utilities/initPage/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAa9C,eAAO,MAAM,YAAY,mCAItB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAEH,CAAA;AAED,eAAO,MAAM,gBAAgB,mCAI1B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAQH,CAAA;AAED,eAAO,MAAM,oBAAoB,2BAG9B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,MAEH,CAAA"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAiB9C,eAAO,MAAM,YAAY,2BAGtB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAEH,CAAA;AAED,eAAO,MAAM,kBAAkB,mCAI5B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAYH,CAAA;AAED,eAAO,MAAM,oBAAoB,2BAG9B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,MAEH,CAAA"}

package/dist/utilities/initPage/shared.js

@@ -1,25 +1,30 @@
-const authRouteKeys = ['createFirstUser', 'forgot', 'login', 'logout', 'forgot', 'inactivity', 'unauthorized', 'reset'];
+// Routes that require admin authentication
+const publicAdminRoutes = ['createFirstUser', 'forgot', 'login', 'logout', 'forgot', 'inactivity', 'unauthorized', 'reset'];
 export const isAdminRoute = ({
   adminRoute,
-  config,
   route
 }) => {
-  return route.startsWith(adminRoute) && !isAdminAuthRoute({
-    adminRoute,
-    config,
-    route
-  });
+  return route.startsWith(adminRoute);
 };
-export const isAdminAuthRoute = ({
+export const isPublicAdminRoute = ({
   adminRoute,
   config,
   route
 }) => {
-  const authRoutes = config.admin?.routes ? Object.entries(config.admin.routes).filter(([key]) => authRouteKeys.includes(key)).map(([_, value]) => value) : [];
-  return authRoutes.some(r => getRouteWithoutAdmin({
-    adminRoute,
-    route
-  }).startsWith(r));
+  return publicAdminRoutes.some(routeSegment => {
+    const segment = config.admin?.routes?.[routeSegment] || routeSegment;
+    const routeWithoutAdmin = getRouteWithoutAdmin({
+      adminRoute,
+      route
+    });
+    if (routeWithoutAdmin.startsWith(segment)) {
+      return true;
+    } else if (routeWithoutAdmin.includes('/verify/')) {
+      return true;
+    } else {
+      return false;
+    }
+  });
 };
 export const getRouteWithoutAdmin = ({
   adminRoute,

package/dist/utilities/initPage/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","names":["authRouteKeys","isAdminRoute","adminRoute","config","route","startsWith","isAdminAuthRoute","authRoutes","admin","routes","Object","entries","filter","key","includes","map","_","value","some","r","getRouteWithoutAdmin","replace"],"sources":["../../../src/utilities/initPage/shared.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nconst authRouteKeys: (keyof SanitizedConfig['admin']['routes'])[] = [\n  'createFirstUser',\n  'forgot',\n  'login',\n  'logout',\n  'forgot',\n  'inactivity',\n  'unauthorized',\n  'reset',\n]\n\nexport const isAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return route.startsWith(adminRoute) && !isAdminAuthRoute({ adminRoute, config, route })\n}\n\nexport const isAdminAuthRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  const authRoutes = config.admin?.routes\n    ? Object.entries(config.admin.routes)\n        .filter(([key]) => authRouteKeys.includes(key as keyof SanitizedConfig['admin']['routes']))\n        .map(([_, value]) => value)\n    : []\n\n  return authRoutes.some((r) => getRouteWithoutAdmin({ adminRoute, route }).startsWith(r))\n}\n\nexport const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"mappings":"AAEA,MAAMA,aAAA,GAA8D,CAClE,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,YAAA,GAAeA,CAAC;EAC3BC,UAAU;EACVC,MAAM;EACNC;AAAK,CAKN;EACC,OAAOA,KAAA,CAAMC,UAAU,CAACH,UAAA,KAAe,CAACI,gBAAA,CAAiB;IAAEJ,UAAA;IAAYC,MAAA;IAAQC;EAAM;AACvF;AAEA,OAAO,MAAME,gBAAA,GAAmBA,CAAC;EAC/BJ,UAAU;EACVC,MAAM;EACNC;AAAK,CAKN;EACC,MAAMG,UAAA,GAAaJ,MAAA,CAAOK,KAAK,EAAEC,MAAA,GAC7BC,MAAA,CAAOC,OAAO,CAACR,MAAA,CAAOK,KAAK,CAACC,MAAM,EAC/BG,MAAM,CAAC,CAAC,CAACC,GAAA,CAAI,KAAKb,aAAA,CAAcc,QAAQ,CAACD,GAAA,GACzCE,GAAG,CAAC,CAAC,CAACC,CAAA,EAAGC,KAAA,CAAM,KAAKA,KAAA,IACvB,EAAE;EAEN,OAAOV,UAAA,CAAWW,IAAI,CAAEC,CAAA,IAAMC,oBAAA,CAAqB;IAAElB,UAAA;IAAYE;EAAM,GAAGC,UAAU,CAACc,CAAA;AACvF;AAEA,OAAO,MAAMC,oBAAA,GAAuBA,CAAC;EACnClB,UAAU;EACVE;AAAK,CAIN;EACC,OAAOF,UAAA,IAAcA,UAAA,KAAe,MAAME,KAAA,CAAMiB,OAAO,CAACnB,UAAA,EAAY,MAAME,KAAA;AAC5E","ignoreList":[]}
+{"version":3,"file":"shared.js","names":["publicAdminRoutes","isAdminRoute","adminRoute","route","startsWith","isPublicAdminRoute","config","some","routeSegment","segment","admin","routes","routeWithoutAdmin","getRouteWithoutAdmin","includes","replace"],"sources":["../../../src/utilities/initPage/shared.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\n// Routes that require admin authentication\nconst publicAdminRoutes: (keyof Pick<\n  SanitizedConfig['admin']['routes'],\n  'createFirstUser' | 'forgot' | 'inactivity' | 'login' | 'logout' | 'reset' | 'unauthorized'\n>)[] = [\n  'createFirstUser',\n  'forgot',\n  'login',\n  'logout',\n  'forgot',\n  'inactivity',\n  'unauthorized',\n  'reset',\n]\n\nexport const isAdminRoute = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return route.startsWith(adminRoute)\n}\n\nexport const isPublicAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return publicAdminRoutes.some((routeSegment) => {\n    const segment = config.admin?.routes?.[routeSegment] || routeSegment\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n    if (routeWithoutAdmin.startsWith(segment)) {\n      return true\n    } else if (routeWithoutAdmin.includes('/verify/')) {\n      return true\n    } else {\n      return false\n    }\n  })\n}\n\nexport const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"mappings":"AAEA;AACA,MAAMA,iBAAA,GAGC,CACL,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,YAAA,GAAeA,CAAC;EAC3BC,UAAU;EACVC;AAAK,CAKN;EACC,OAAOA,KAAA,CAAMC,UAAU,CAACF,UAAA;AAC1B;AAEA,OAAO,MAAMG,kBAAA,GAAqBA,CAAC;EACjCH,UAAU;EACVI,MAAM;EACNH;AAAK,CAKN;EACC,OAAOH,iBAAA,CAAkBO,IAAI,CAAEC,YAAA;IAC7B,MAAMC,OAAA,GAAUH,MAAA,CAAOI,KAAK,EAAEC,MAAA,GAASH,YAAA,CAAa,IAAIA,YAAA;IACxD,MAAMI,iBAAA,GAAoBC,oBAAA,CAAqB;MAAEX,UAAA;MAAYC;IAAM;IACnE,IAAIS,iBAAA,CAAkBR,UAAU,CAACK,OAAA,GAAU;MACzC,OAAO;IACT,OAAO,IAAIG,iBAAA,CAAkBE,QAAQ,CAAC,aAAa;MACjD,OAAO;IACT,OAAO;MACL,OAAO;IACT;EACF;AACF;AAEA,OAAO,MAAMD,oBAAA,GAAuBA,CAAC;EACnCX,UAAU;EACVC;AAAK,CAIN;EACC,OAAOD,UAAA,IAAcA,UAAA,KAAe,MAAMC,KAAA,CAAMY,OAAO,CAACb,UAAA,EAAY,MAAMC,KAAA;AAC5E","ignoreList":[]}

package/dist/views/API/index.scss

@@ -1,123 +1,125 @@
 @import '../../scss/styles.scss';
 
-.query-inspector {
-  --string-color: #11b102;
-  --number-color: #62c3f3;
-  display: flex;
-  gap: calc(var(--base) * 2);
-  align-items: flex-start;
-
-  ul {
-    padding-left: calc(var(--base) * 1);
-  }
+@layer payload-default {
+  .query-inspector {
+    --string-color: #11b102;
+    --number-color: #62c3f3;
+    display: flex;
+    gap: calc(var(--base) * 2);
+    align-items: flex-start;
 
-  &--fullscreen {
-    padding-left: 0;
-    .query-inspector__configuration {
-      display: none;
+    ul {
+      padding-left: calc(var(--base) * 1);
     }
-  }
 
-  &__configuration {
-    margin-top: calc(var(--base) * 2);
-    width: 60%;
-    position: sticky;
-    top: var(--base);
-  }
+    &--fullscreen {
+      padding-left: 0;
+      .query-inspector__configuration {
+        display: none;
+      }
+    }
 
-  &__api-url {
-    margin-bottom: calc(var(--base) * 1.5);
+    &__configuration {
+      margin-top: calc(var(--base) * 2);
+      width: 60%;
+      position: sticky;
+      top: var(--base);
+    }
 
-    a {
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      text-decoration: none;
+    &__api-url {
+      margin-bottom: calc(var(--base) * 1.5);
 
-      &:hover,
-      &:focus-visible {
-        text-decoration: underline;
+      a {
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        text-decoration: none;
+
+        &:hover,
+        &:focus-visible {
+          text-decoration: underline;
+        }
       }
     }
-  }
 
-  &__form-fields {
-    display: flex;
-    flex-direction: column;
-    gap: var(--base);
-  }
-
-  &__label {
-    color: var(--theme-elevation-400);
-  }
+    &__form-fields {
+      display: flex;
+      flex-direction: column;
+      gap: var(--base);
+    }
 
-  &__filter-query-checkboxes {
-    display: flex;
-    gap: var(--base);
-  }
+    &__label {
+      color: var(--theme-elevation-400);
+    }
 
-  &__results-wrapper {
-    font-family: var(--font-mono);
-    width: 100%;
-    ul {
-      margin: 0;
+    &__filter-query-checkboxes {
+      display: flex;
+      gap: var(--base);
     }
-    li {
-      list-style: none;
+
+    &__results-wrapper {
+      font-family: var(--font-mono);
+      width: 100%;
+      ul {
+        margin: 0;
+      }
+      li {
+        list-style: none;
+      }
     }
-  }
 
-  &__toggle-fullscreen-button-container {
-    position: sticky;
-    top: 0;
-    z-index: 1;
+    &__toggle-fullscreen-button-container {
+      position: sticky;
+      top: 0;
+      z-index: 1;
 
-    @include mid-break {
-      display: none;
+      @include mid-break {
+        display: none;
+      }
     }
-  }
 
-  &__toggle-fullscreen-button {
-    position: absolute;
-    right: calc(var(--base) * 0.5);
-    top: calc(var(--base) * 0.5);
-    padding: calc(var(--base) * 0.25);
-    background-color: var(--theme-elevation-0);
-    cursor: pointer;
-    z-index: 1;
-    margin: 0;
-    border: 0;
-    border-radius: 3px;
-    color: var(--theme-elevation-300);
-    &:hover {
-      color: var(--theme-elevation-700);
+    &__toggle-fullscreen-button {
+      position: absolute;
+      right: calc(var(--base) * 0.5);
+      top: calc(var(--base) * 0.5);
+      padding: calc(var(--base) * 0.25);
+      background-color: var(--theme-elevation-0);
+      cursor: pointer;
+      z-index: 1;
+      margin: 0;
+      border: 0;
+      border-radius: 3px;
+      color: var(--theme-elevation-300);
+      &:hover {
+        color: var(--theme-elevation-700);
+      }
     }
-  }
 
-  &__results {
-    padding-top: calc(var(--base) * 0.5);
-    padding-left: calc(var(--base) * 0.5);
-    padding-bottom: calc(var(--base) * 0.5);
-    background-color: var(--theme-elevation-50);
-    overflow: auto;
-    min-height: 100vh;
-  }
-
-  @include mid-break {
-    flex-direction: column;
-    padding-left: 0;
+    &__results {
+      padding-top: calc(var(--base) * 0.5);
+      padding-left: calc(var(--base) * 0.5);
+      padding-bottom: calc(var(--base) * 0.5);
+      background-color: var(--theme-elevation-50);
+      overflow: auto;
+      min-height: 100vh;
+    }
 
-    .query-inspector__configuration {
-      position: relative;
-      width: 100%;
-      top: 0;
-      padding-inline-end: var(--gutter-h);
+    @include mid-break {
+      flex-direction: column;
+      padding-left: 0;
+
+      .query-inspector__configuration {
+        position: relative;
+        width: 100%;
+        top: 0;
+        padding-inline-end: var(--gutter-h);
+      }
     }
   }
-}
 
-html[data-theme='light'] {
-  .query-inspector {
-    --number-color: #2e9cd3;
+  html[data-theme='light'] {
+    .query-inspector {
+      --number-color: #2e9cd3;
+    }
   }
 }

package/dist/views/Account/Settings/index.scss

@@ -1,46 +1,48 @@
 @import '../../../scss/styles.scss';
 
-.payload-settings {
-  position: relative;
-  margin-bottom: calc(var(--base) * 2);
+@layer payload-default {
+  .payload-settings {
+    position: relative;
+    margin-bottom: calc(var(--base) * 2);
 
-  h3 {
-    margin: 0;
-  }
+    h3 {
+      margin: 0;
+    }
 
-  &::before,
-  &::after {
-    content: '';
-    display: block;
-    height: 1px;
-    background: var(--theme-elevation-100);
-    width: calc(100% + calc(var(--base) * 5));
-    left: calc(var(--gutter-h) * -1);
-    top: 0;
-    position: absolute;
-  }
+    &::before,
+    &::after {
+      content: '';
+      display: block;
+      height: 1px;
+      background: var(--theme-elevation-100);
+      width: calc(100% + calc(var(--base) * 5));
+      left: calc(var(--gutter-h) * -1);
+      top: 0;
+      position: absolute;
+    }
 
-  &::after {
-    display: none;
-    bottom: 0;
-    top: unset;
-  }
+    &::after {
+      display: none;
+      bottom: 0;
+      top: unset;
+    }
 
-  margin-top: calc(var(--base) * 3);
-  padding-top: calc(var(--base) * 3);
-  padding-bottom: calc(var(--base) * 3);
-  display: flex;
-  flex-direction: column;
-  gap: var(--base);
+    margin-top: calc(var(--base) * 3);
+    padding-top: calc(var(--base) * 3);
+    padding-bottom: calc(var(--base) * 3);
+    display: flex;
+    flex-direction: column;
+    gap: var(--base);
 
-  @include mid-break {
-    margin-bottom: var(--base);
-    padding-top: calc(var(--base) * 2);
-    margin-top: calc(var(--base) * 2);
-    padding-bottom: calc(var(--base) * 2);
+    @include mid-break {
+      margin-bottom: var(--base);
+      padding-top: calc(var(--base) * 2);
+      margin-top: calc(var(--base) * 2);
+      padding-bottom: calc(var(--base) * 2);
 
-    &::after {
-      display: block;
+      &::after {
+        display: block;
+      }
     }
   }
 }

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

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

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

@@ -67,7 +67,7 @@ export const CreateFirstUserClient = t0 => {
     let t5;
     if ($[14] !== setUser) {
       t5 = data => {
-        setUser(data.user);
+        setUser(data);
       };
       $[14] = setUser;
       $[15] = t5;

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

@@ -1 +1 @@
-{"version":3,"file":"index.client.js","names":["c","_c","ConfirmPasswordField","Form","FormSubmit","PasswordField","RenderFields","useAuth","useConfig","useTranslation","getFormState","React","RenderEmailAndUsernameFields","CreateFirstUserClient","t0","$","initialState","loginWithUsername","userSlug","config","t1","getEntityConfig","routes","t2","serverURL","admin","api","apiRoute","t","setUser","t3","collectionConfig","collectionSlug","t4","t5","formState","prevFormState","state","body","operation","schemaPath","onChange","data","user","handleFirstRegister","_jsxs","action","method","onSuccess","redirect","validationOperation","children","_jsx","className","readOnly","autoComplete","field","name","label","required","fields","forceRender","path","size"],"sources":["../../../src/views/CreateFirstUser/index.client.tsx"],"sourcesContent":["'use client'\nimport type {\n  ClientCollectionConfig,\n  ClientUser,\n  FormState,\n  LoginWithUsernameOptions,\n} from 'payload'\n\nimport {\n  ConfirmPasswordField,\n  Form,\n  type FormProps,\n  FormSubmit,\n  PasswordField,\n  RenderFields,\n  useAuth,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { getFormState } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nimport { RenderEmailAndUsernameFields } from '../../elements/EmailAndUsername/index.js'\n\nexport const CreateFirstUserClient: React.FC<{\n  initialState: FormState\n  loginWithUsername?: false | LoginWithUsernameOptions\n  userSlug: string\n}> = ({ initialState, loginWithUsername, userSlug }) => {\n  const {\n    config: {\n      routes: { admin, api: apiRoute },\n      serverURL,\n    },\n    getEntityConfig,\n  } = useConfig()\n\n  const { t } = useTranslation()\n  const { setUser } = useAuth()\n\n  const collectionConfig = getEntityConfig({ collectionSlug: userSlug }) as ClientCollectionConfig\n\n  const onChange: FormProps['onChange'][0] = React.useCallback(\n    async ({ formState: prevFormState }) => {\n      const { state } = await getFormState({\n        apiRoute,\n        body: {\n          collectionSlug: userSlug,\n          formState: prevFormState,\n          operation: 'create',\n          schemaPath: `_${userSlug}.auth`,\n        },\n        serverURL,\n      })\n      return state\n    },\n    [apiRoute, userSlug, serverURL],\n  )\n\n  const handleFirstRegister = (data: { user: ClientUser }) => {\n    setUser(data.user)\n  }\n\n  return (\n    <Form\n      action={`${serverURL}${apiRoute}/${userSlug}/first-register`}\n      initialState={initialState}\n      method=\"POST\"\n      onChange={[onChange]}\n      onSuccess={handleFirstRegister}\n      redirect={admin}\n      validationOperation=\"create\"\n    >\n      <RenderEmailAndUsernameFields\n        className=\"emailAndUsername\"\n        loginWithUsername={loginWithUsername}\n        operation=\"create\"\n        readOnly={false}\n      />\n      <PasswordField\n        autoComplete={'off'}\n        field={{\n          name: 'password',\n          label: t('authentication:newPassword'),\n          required: true,\n        }}\n      />\n      <ConfirmPasswordField />\n      <RenderFields\n        fields={collectionConfig.fields}\n        forceRender\n        operation=\"create\"\n        path=\"\"\n        readOnly={false}\n        schemaPath={userSlug}\n      />\n      <FormSubmit size=\"large\">{t('general:create')}</FormSubmit>\n    </Form>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.client.js","names":["c","_c","ConfirmPasswordField","Form","FormSubmit","PasswordField","RenderFields","useAuth","useConfig","useTranslation","getFormState","React","RenderEmailAndUsernameFields","CreateFirstUserClient","t0","$","initialState","loginWithUsername","userSlug","config","t1","getEntityConfig","routes","t2","serverURL","admin","api","apiRoute","t","setUser","t3","collectionConfig","collectionSlug","t4","t5","formState","prevFormState","state","body","operation","schemaPath","onChange","data","handleFirstRegister","_jsxs","action","method","onSuccess","redirect","validationOperation","children","_jsx","className","readOnly","autoComplete","field","name","label","required","fields","forceRender","path","size"],"sources":["../../../src/views/CreateFirstUser/index.client.tsx"],"sourcesContent":["'use client'\nimport type {\n  ClientCollectionConfig,\n  FormState,\n  LoginWithUsernameOptions,\n  MeOperationResult,\n} from 'payload'\n\nimport {\n  ConfirmPasswordField,\n  Form,\n  type FormProps,\n  FormSubmit,\n  PasswordField,\n  RenderFields,\n  useAuth,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { getFormState } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nimport { RenderEmailAndUsernameFields } from '../../elements/EmailAndUsername/index.js'\n\nexport const CreateFirstUserClient: React.FC<{\n  initialState: FormState\n  loginWithUsername?: false | LoginWithUsernameOptions\n  userSlug: string\n}> = ({ initialState, loginWithUsername, userSlug }) => {\n  const {\n    config: {\n      routes: { admin, api: apiRoute },\n      serverURL,\n    },\n    getEntityConfig,\n  } = useConfig()\n\n  const { t } = useTranslation()\n  const { setUser } = useAuth()\n\n  const collectionConfig = getEntityConfig({ collectionSlug: userSlug }) as ClientCollectionConfig\n\n  const onChange: FormProps['onChange'][0] = React.useCallback(\n    async ({ formState: prevFormState }) => {\n      const { state } = await getFormState({\n        apiRoute,\n        body: {\n          collectionSlug: userSlug,\n          formState: prevFormState,\n          operation: 'create',\n          schemaPath: `_${userSlug}.auth`,\n        },\n        serverURL,\n      })\n      return state\n    },\n    [apiRoute, userSlug, serverURL],\n  )\n\n  const handleFirstRegister = (data: MeOperationResult) => {\n    setUser(data)\n  }\n\n  return (\n    <Form\n      action={`${serverURL}${apiRoute}/${userSlug}/first-register`}\n      initialState={initialState}\n      method=\"POST\"\n      onChange={[onChange]}\n      onSuccess={handleFirstRegister}\n      redirect={admin}\n      validationOperation=\"create\"\n    >\n      <RenderEmailAndUsernameFields\n        className=\"emailAndUsername\"\n        loginWithUsername={loginWithUsername}\n        operation=\"create\"\n        readOnly={false}\n      />\n      <PasswordField\n        autoComplete={'off'}\n        field={{\n          name: 'password',\n          label: t('authentication:newPassword'),\n          required: true,\n        }}\n      />\n      <ConfirmPasswordField />\n      <RenderFields\n        fields={collectionConfig.fields}\n        forceRender\n        operation=\"create\"\n        path=\"\"\n        readOnly={false}\n        schemaPath={userSlug}\n      />\n      <FormSubmit size=\"large\">{t('general:create')}</FormSubmit>\n    </Form>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/CreateFirstUser/index.scss

@@ -1,19 +1,21 @@
 @import '../../scss/styles.scss';
 
-.create-first-user {
-  display: flex;
-  flex-direction: column;
-  gap: base(0.4);
+@layer payload-default {
+  .create-first-user {
+    display: flex;
+    flex-direction: column;
+    gap: base(0.4);
 
-  > form > .field-type {
-    margin-bottom: var(--base);
+    > form > .field-type {
+      margin-bottom: var(--base);
 
-    & .form-submit {
-      margin: 0;
+      & .form-submit {
+        margin: 0;
+      }
     }
   }
-}
 
-.emailAndUsername {
-  margin-bottom: var(--base);
+  .emailAndUsername {
+    margin-bottom: var(--base);
+  }
 }