payload 3.0.0-beta.1 → 3.0.0-beta.100

package/dist/config/build.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-use-before-define */ /* eslint-disable no-nested-ternary */ import { sanitizeConfig } from './sanitize.js';
+import { sanitizeConfig } from './sanitize.js';
 /**
  * @description Builds and validates Payload configuration
  * @param config Payload Config
@@ -9,10 +9,9 @@
             const configAfterPlugin = await acc;
             return plugin(configAfterPlugin);
         }, Promise.resolve(config));
-        const sanitizedConfig = sanitizeConfig(configAfterPlugins);
-        return sanitizedConfig;
+        return await sanitizeConfig(configAfterPlugins);
     }
-    return sanitizeConfig(config);
+    return await sanitizeConfig(config);
 }
 
 //# sourceMappingURL=build.js.map

package/dist/config/build.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/build.ts"],"sourcesContent":["/* eslint-disable no-use-before-define */\n/* eslint-disable no-nested-ternary */\nimport type { Config, SanitizedConfig } from './types.js'\n\nimport { sanitizeConfig } from './sanitize.js'\n\n/**\n * @description Builds and validates Payload configuration\n * @param config Payload Config\n * @returns Built and sanitized Payload Config\n */\nexport async function buildConfig(config: Config): Promise<SanitizedConfig> {\n  if (Array.isArray(config.plugins)) {\n    const configAfterPlugins = await config.plugins.reduce(async (acc, plugin) => {\n      const configAfterPlugin = await acc\n      return plugin(configAfterPlugin)\n    }, Promise.resolve(config))\n\n    const sanitizedConfig = sanitizeConfig(configAfterPlugins)\n\n    return sanitizedConfig\n  }\n\n  return sanitizeConfig(config)\n}\n"],"names":["sanitizeConfig","buildConfig","config","Array","isArray","plugins","configAfterPlugins","reduce","acc","plugin","configAfterPlugin","Promise","resolve","sanitizedConfig"],"rangeMappings":";;;;;;;;;;;;;;;","mappings":"AAAA,uCAAuC,GACvC,oCAAoC,GAGpC,SAASA,cAAc,QAAQ,gBAAe;AAE9C;;;;CAIC,GACD,OAAO,eAAeC,YAAYC,MAAc;IAC9C,IAAIC,MAAMC,OAAO,CAACF,OAAOG,OAAO,GAAG;QACjC,MAAMC,qBAAqB,MAAMJ,OAAOG,OAAO,CAACE,MAAM,CAAC,OAAOC,KAAKC;YACjE,MAAMC,oBAAoB,MAAMF;YAChC,OAAOC,OAAOC;QAChB,GAAGC,QAAQC,OAAO,CAACV;QAEnB,MAAMW,kBAAkBb,eAAeM;QAEvC,OAAOO;IACT;IAEA,OAAOb,eAAeE;AACxB"}
+{"version":3,"sources":["../../src/config/build.ts"],"sourcesContent":["import type { Config, SanitizedConfig } from './types.js'\n\nimport { sanitizeConfig } from './sanitize.js'\n\n/**\n * @description Builds and validates Payload configuration\n * @param config Payload Config\n * @returns Built and sanitized Payload Config\n */\nexport async function buildConfig(config: Config): Promise<SanitizedConfig> {\n  if (Array.isArray(config.plugins)) {\n    const configAfterPlugins = await config.plugins.reduce(async (acc, plugin) => {\n      const configAfterPlugin = await acc\n      return plugin(configAfterPlugin)\n    }, Promise.resolve(config))\n\n    return await sanitizeConfig(configAfterPlugins)\n  }\n\n  return await sanitizeConfig(config)\n}\n"],"names":["sanitizeConfig","buildConfig","config","Array","isArray","plugins","configAfterPlugins","reduce","acc","plugin","configAfterPlugin","Promise","resolve"],"mappings":"AAEA,SAASA,cAAc,QAAQ,gBAAe;AAE9C;;;;CAIC,GACD,OAAO,eAAeC,YAAYC,MAAc;IAC9C,IAAIC,MAAMC,OAAO,CAACF,OAAOG,OAAO,GAAG;QACjC,MAAMC,qBAAqB,MAAMJ,OAAOG,OAAO,CAACE,MAAM,CAAC,OAAOC,KAAKC;YACjE,MAAMC,oBAAoB,MAAMF;YAChC,OAAOC,OAAOC;QAChB,GAAGC,QAAQC,OAAO,CAACV;QAEnB,OAAO,MAAMF,eAAeM;IAC9B;IAEA,OAAO,MAAMN,eAAeE;AAC9B"}

package/dist/config/client.d.ts

@@ -1,18 +1,26 @@
-import type { TFunction } from '@payloadcms/translations';
+import type { MappedComponent } from '../admin/types.js';
 import type { ClientCollectionConfig } from '../collections/config/client.js';
 import type { ClientGlobalConfig } from '../globals/config/client.js';
 import type { LivePreviewConfig, SanitizedConfig, ServerOnlyLivePreviewProperties } from './types.js';
-export type ServerOnlyRootProperties = keyof Pick<SanitizedConfig, 'bin' | 'cors' | 'csrf' | 'db' | 'editor' | 'email' | 'endpoints' | 'hooks' | 'onInit' | 'plugins' | 'secret' | 'sharp' | 'typescript'>;
+export type ServerOnlyRootProperties = keyof Pick<SanitizedConfig, 'bin' | 'cors' | 'csrf' | 'custom' | 'db' | 'editor' | 'email' | 'endpoints' | 'graphQL' | 'hooks' | 'onInit' | 'plugins' | 'secret' | 'sharp' | 'typescript'>;
 export type ServerOnlyRootAdminProperties = keyof Pick<SanitizedConfig['admin'], 'components'>;
-export type ClientConfig = Omit<SanitizedConfig, 'admin' | 'collections' | 'globals' | ServerOnlyRootProperties> & {
-    admin: Omit<SanitizedConfig['admin'], ServerOnlyRootAdminProperties & 'livePreview'> & {
+export type ClientConfig = {
+    admin: {
+        components: {
+            actions?: MappedComponent[];
+            Avatar: MappedComponent;
+            graphics: {
+                Icon: MappedComponent;
+                Logo: MappedComponent;
+            };
+            LogoutButton?: MappedComponent;
+        };
+        dependencies?: Record<string, MappedComponent>;
         livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>;
-    };
+    } & Omit<SanitizedConfig['admin'], 'components' | 'dependencies' | 'livePreview'>;
     collections: ClientCollectionConfig[];
+    custom?: Record<string, any>;
     globals: ClientGlobalConfig[];
-};
-export declare const createClientConfig: ({ config, t, }: {
-    config: SanitizedConfig;
-    t: TFunction;
-}) => Promise<ClientConfig>;
+} & Omit<SanitizedConfig, 'admin' | 'collections' | 'globals' | ServerOnlyRootProperties>;
+export declare const serverOnlyConfigProperties: readonly Partial<ServerOnlyRootProperties>[];
 //# sourceMappingURL=client.d.ts.map

package/dist/config/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAA;AAE7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAErE,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EACf,+BAA+B,EAChC,MAAM,YAAY,CAAA;AAKnB,MAAM,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAC/C,eAAe,EACb,KAAK,GACL,MAAM,GACN,MAAM,GACN,IAAI,GACJ,QAAQ,GACR,OAAO,GACP,WAAW,GACX,OAAO,GACP,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,OAAO,GACP,YAAY,CACf,CAAA;AAED,MAAM,MAAM,6BAA6B,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAA;AAE9F,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,eAAe,EACf,OAAO,GAAG,aAAa,GAAG,SAAS,GAAG,wBAAwB,CAC/D,GAAG;IACF,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,6BAA6B,GAAG,aAAa,CAAC,GAAG;QACrF,WAAW,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,+BAA+B,CAAC,CAAA;KACvE,CAAA;IACD,WAAW,EAAE,sBAAsB,EAAE,CAAA;IACrC,OAAO,EAAE,kBAAkB,EAAE,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,kBAAkB,mBAG5B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,CAAC,EAAE,SAAS,CAAA;CACb,KAAG,QAAQ,YAAY,CA8DvB,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AACrE,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EACf,+BAA+B,EAChC,MAAM,YAAY,CAAA;AAEnB,MAAM,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAC/C,eAAe,EACb,KAAK,GACL,MAAM,GACN,MAAM,GACN,QAAQ,GACR,IAAI,GACJ,QAAQ,GACR,OAAO,GACP,WAAW,GACX,SAAS,GACT,OAAO,GACP,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,OAAO,GACP,YAAY,CACf,CAAA;AAED,MAAM,MAAM,6BAA6B,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAA;AAE9F,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE;QACL,UAAU,EAAE;YACV,OAAO,CAAC,EAAE,eAAe,EAAE,CAAA;YAC3B,MAAM,EAAE,eAAe,CAAA;YACvB,QAAQ,EAAE;gBACR,IAAI,EAAE,eAAe,CAAA;gBACrB,IAAI,EAAE,eAAe,CAAA;aACtB,CAAA;YACD,YAAY,CAAC,EAAE,eAAe,CAAA;SAC/B,CAAA;QACD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;QAC9C,WAAW,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,+BAA+B,CAAC,CAAA;KACvE,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,cAAc,GAAG,aAAa,CAAC,CAAA;IACjF,WAAW,EAAE,sBAAsB,EAAE,CAAA;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,OAAO,EAAE,kBAAkB,EAAE,CAAA;CAC9B,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,GAAG,wBAAwB,CAAC,CAAA;AAEzF,eAAO,MAAM,0BAA0B,EAAE,SAAS,OAAO,CAAC,wBAAwB,CAAC,EAiBlF,CAAA"}

package/dist/config/client.js

@@ -1,65 +1,19 @@
-import { createClientCollectionConfigs } from '../collections/config/client.js';
-import { createClientGlobalConfigs } from '../globals/config/client.js';
-export const createClientConfig = async ({ config, t })=>{
-    const clientConfig = {
-        ...config
-    };
-    const serverOnlyConfigProperties = [
-        'endpoints',
-        'db',
-        'editor',
-        'plugins',
-        'sharp',
-        'onInit',
-        'secret',
-        'hooks',
-        'bin',
-        'typescript',
-        'cors',
-        'csrf',
-        'email'
-    ];
-    serverOnlyConfigProperties.forEach((key)=>{
-        if (key in clientConfig) {
-            delete clientConfig[key];
-        }
-    });
-    if ('localization' in clientConfig && clientConfig.localization) {
-        clientConfig.localization = {
-            ...clientConfig.localization
-        };
-        clientConfig.localization.locales.forEach((locale)=>{
-            delete locale.toString;
-        });
-    }
-    if ('admin' in clientConfig) {
-        clientConfig.admin = {
-            ...clientConfig.admin
-        };
-        const serverOnlyAdminProperties = [
-            'components'
-        ];
-        serverOnlyAdminProperties.forEach((key)=>{
-            if (key in clientConfig.admin) {
-                delete clientConfig.admin[key];
-            }
-        });
-        if ('livePreview' in clientConfig.admin) {
-            clientConfig.admin.livePreview = {
-                ...clientConfig.admin.livePreview
-            };
-            delete clientConfig.admin.livePreview.url;
-        }
-    }
-    clientConfig.collections = createClientCollectionConfigs({
-        collections: clientConfig.collections,
-        t
-    });
-    clientConfig.globals = createClientGlobalConfigs({
-        globals: clientConfig.globals,
-        t
-    });
-    return clientConfig;
-};
+export const serverOnlyConfigProperties = [
+    'endpoints',
+    'db',
+    'editor',
+    'plugins',
+    'sharp',
+    'onInit',
+    'secret',
+    'hooks',
+    'bin',
+    'typescript',
+    'cors',
+    'csrf',
+    'email',
+    'custom',
+    'graphQL'
+];
 
 //# sourceMappingURL=client.js.map

package/dist/config/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/client.ts"],"sourcesContent":["import type { TFunction } from '@payloadcms/translations'\n\nimport type { ClientCollectionConfig } from '../collections/config/client.js'\nimport type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { ClientGlobalConfig } from '../globals/config/client.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type {\n  LivePreviewConfig,\n  SanitizedConfig,\n  ServerOnlyLivePreviewProperties,\n} from './types.js'\n\nimport { createClientCollectionConfigs } from '../collections/config/client.js'\nimport { createClientGlobalConfigs } from '../globals/config/client.js'\n\nexport type ServerOnlyRootProperties = keyof Pick<\n  SanitizedConfig,\n  | 'bin'\n  | 'cors'\n  | 'csrf'\n  | 'db'\n  | 'editor'\n  | 'email'\n  | 'endpoints'\n  | 'hooks'\n  | 'onInit'\n  | 'plugins'\n  | 'secret'\n  | 'sharp'\n  | 'typescript'\n>\n\nexport type ServerOnlyRootAdminProperties = keyof Pick<SanitizedConfig['admin'], 'components'>\n\nexport type ClientConfig = Omit<\n  SanitizedConfig,\n  'admin' | 'collections' | 'globals' | ServerOnlyRootProperties\n> & {\n  admin: Omit<SanitizedConfig['admin'], ServerOnlyRootAdminProperties & 'livePreview'> & {\n    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>\n  }\n  collections: ClientCollectionConfig[]\n  globals: ClientGlobalConfig[]\n}\n\nexport const createClientConfig = async ({\n  config,\n  t,\n}: {\n  config: SanitizedConfig\n  t: TFunction\n}): Promise<ClientConfig> => {\n  const clientConfig: ClientConfig = { ...config }\n\n  const serverOnlyConfigProperties: Partial<ServerOnlyRootProperties>[] = [\n    'endpoints',\n    'db',\n    'editor',\n    'plugins',\n    'sharp',\n    'onInit',\n    'secret',\n    'hooks',\n    'bin',\n    'typescript',\n    'cors',\n    'csrf',\n    'email',\n    // `admin`, `onInit`, `localization`, `collections`, and `globals` are all handled separately\n  ]\n\n  serverOnlyConfigProperties.forEach((key) => {\n    if (key in clientConfig) {\n      delete clientConfig[key]\n    }\n  })\n\n  if ('localization' in clientConfig && clientConfig.localization) {\n    clientConfig.localization = { ...clientConfig.localization }\n\n    clientConfig.localization.locales.forEach((locale) => {\n      delete locale.toString\n    })\n  }\n\n  if ('admin' in clientConfig) {\n    clientConfig.admin = { ...clientConfig.admin }\n\n    const serverOnlyAdminProperties: Partial<ServerOnlyRootAdminProperties>[] = ['components']\n\n    serverOnlyAdminProperties.forEach((key) => {\n      if (key in clientConfig.admin) {\n        delete clientConfig.admin[key]\n      }\n    })\n\n    if ('livePreview' in clientConfig.admin) {\n      clientConfig.admin.livePreview = { ...clientConfig.admin.livePreview }\n      delete clientConfig.admin.livePreview.url\n    }\n  }\n\n  clientConfig.collections = createClientCollectionConfigs({\n    collections: clientConfig.collections as SanitizedCollectionConfig[],\n    t,\n  })\n\n  clientConfig.globals = createClientGlobalConfigs({\n    globals: clientConfig.globals as SanitizedGlobalConfig[],\n    t,\n  })\n\n  return clientConfig\n}\n"],"names":["createClientCollectionConfigs","createClientGlobalConfigs","createClientConfig","config","t","clientConfig","serverOnlyConfigProperties","forEach","key","localization","locales","locale","toString","admin","serverOnlyAdminProperties","livePreview","url","collections","globals"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAYA,SAASA,6BAA6B,QAAQ,kCAAiC;AAC/E,SAASC,yBAAyB,QAAQ,8BAA6B;AAgCvE,OAAO,MAAMC,qBAAqB,OAAO,EACvCC,MAAM,EACNC,CAAC,EAIF;IACC,MAAMC,eAA6B;QAAE,GAAGF,MAAM;IAAC;IAE/C,MAAMG,6BAAkE;QACtE;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;KAED;IAEDA,2BAA2BC,OAAO,CAAC,CAACC;QAClC,IAAIA,OAAOH,cAAc;YACvB,OAAOA,YAAY,CAACG,IAAI;QAC1B;IACF;IAEA,IAAI,kBAAkBH,gBAAgBA,aAAaI,YAAY,EAAE;QAC/DJ,aAAaI,YAAY,GAAG;YAAE,GAAGJ,aAAaI,YAAY;QAAC;QAE3DJ,aAAaI,YAAY,CAACC,OAAO,CAACH,OAAO,CAAC,CAACI;YACzC,OAAOA,OAAOC,QAAQ;QACxB;IACF;IAEA,IAAI,WAAWP,cAAc;QAC3BA,aAAaQ,KAAK,GAAG;YAAE,GAAGR,aAAaQ,KAAK;QAAC;QAE7C,MAAMC,4BAAsE;YAAC;SAAa;QAE1FA,0BAA0BP,OAAO,CAAC,CAACC;YACjC,IAAIA,OAAOH,aAAaQ,KAAK,EAAE;gBAC7B,OAAOR,aAAaQ,KAAK,CAACL,IAAI;YAChC;QACF;QAEA,IAAI,iBAAiBH,aAAaQ,KAAK,EAAE;YACvCR,aAAaQ,KAAK,CAACE,WAAW,GAAG;gBAAE,GAAGV,aAAaQ,KAAK,CAACE,WAAW;YAAC;YACrE,OAAOV,aAAaQ,KAAK,CAACE,WAAW,CAACC,GAAG;QAC3C;IACF;IAEAX,aAAaY,WAAW,GAAGjB,8BAA8B;QACvDiB,aAAaZ,aAAaY,WAAW;QACrCb;IACF;IAEAC,aAAaa,OAAO,GAAGjB,0BAA0B;QAC/CiB,SAASb,aAAaa,OAAO;QAC7Bd;IACF;IAEA,OAAOC;AACT,EAAC"}
+{"version":3,"sources":["../../src/config/client.ts"],"sourcesContent":["import type { MappedComponent } from '../admin/types.js'\nimport type { ClientCollectionConfig } from '../collections/config/client.js'\nimport type { ClientGlobalConfig } from '../globals/config/client.js'\nimport type {\n  LivePreviewConfig,\n  SanitizedConfig,\n  ServerOnlyLivePreviewProperties,\n} from './types.js'\n\nexport type ServerOnlyRootProperties = keyof Pick<\n  SanitizedConfig,\n  | 'bin'\n  | 'cors'\n  | 'csrf'\n  | 'custom'\n  | 'db'\n  | 'editor'\n  | 'email'\n  | 'endpoints'\n  | 'graphQL'\n  | 'hooks'\n  | 'onInit'\n  | 'plugins'\n  | 'secret'\n  | 'sharp'\n  | 'typescript'\n>\n\nexport type ServerOnlyRootAdminProperties = keyof Pick<SanitizedConfig['admin'], 'components'>\n\nexport type ClientConfig = {\n  admin: {\n    components: {\n      actions?: MappedComponent[]\n      Avatar: MappedComponent\n      graphics: {\n        Icon: MappedComponent\n        Logo: MappedComponent\n      }\n      LogoutButton?: MappedComponent\n    }\n    dependencies?: Record<string, MappedComponent>\n    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>\n  } & Omit<SanitizedConfig['admin'], 'components' | 'dependencies' | 'livePreview'>\n  collections: ClientCollectionConfig[]\n  custom?: Record<string, any>\n  globals: ClientGlobalConfig[]\n} & Omit<SanitizedConfig, 'admin' | 'collections' | 'globals' | ServerOnlyRootProperties>\n\nexport const serverOnlyConfigProperties: readonly Partial<ServerOnlyRootProperties>[] = [\n  'endpoints',\n  'db',\n  'editor',\n  'plugins',\n  'sharp',\n  'onInit',\n  'secret',\n  'hooks',\n  'bin',\n  'typescript',\n  'cors',\n  'csrf',\n  'email',\n  'custom',\n  'graphQL',\n  // `admin`, `onInit`, `localization`, `collections`, and `globals` are all handled separately\n]\n"],"names":["serverOnlyConfigProperties"],"mappings":"AAiDA,OAAO,MAAMA,6BAA2E;IACtF;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CAED,CAAA"}

package/dist/config/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAExC,eAAO,MAAM,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,QAAQ,GAAG,QAAQ,CAyC7D,CAAA"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAExC,eAAO,MAAM,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,QAAQ,GAAG,QAAQ,CA0D7D,CAAA"}

package/dist/config/defaults.js

@@ -1,13 +1,27 @@
 export const defaults = {
     admin: {
-        avatar: 'default',
+        avatar: 'gravatar',
         components: {},
+        custom: {},
         dateFormat: 'MMMM do yyyy, h:mm a',
+        dependencies: {},
         disable: false,
-        inactivityRoute: '/logout-inactivity',
-        logoutRoute: '/logout',
+        importMap: {
+            baseDir: `${typeof process?.cwd === 'function' ? process.cwd() : ''}`
+        },
         meta: {
+            defaultOGImageType: 'dynamic',
             titleSuffix: '- Payload'
+        },
+        routes: {
+            account: '/account',
+            createFirstUser: '/create-first-user',
+            forgot: '/forgot',
+            inactivity: '/logout-inactivity',
+            login: '/login',
+            logout: '/logout',
+            reset: '/reset',
+            unauthorized: '/unauthorized'
         }
     },
     bin: [],
@@ -22,9 +36,11 @@ export const defaults = {
     globals: [],
     graphQL: {
         disablePlaygroundInProduction: true,
-        maxComplexity: 1000
+        maxComplexity: 1000,
+        schemaOutputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`
     },
     hooks: {},
+    i18n: {},
     localization: false,
     maxDepth: 10,
     routes: {
@@ -36,6 +52,7 @@ export const defaults = {
     serverURL: '',
     telemetry: true,
     typescript: {
+        autoGenerate: true,
         outputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`
     },
     upload: {}

package/dist/config/defaults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/defaults.ts"],"sourcesContent":["import type { Config } from './types.js'\n\nexport const defaults: Omit<Config, 'db' | 'editor' | 'secret'> = {\n  admin: {\n    avatar: 'default',\n    components: {},\n    dateFormat: 'MMMM do yyyy, h:mm a',\n    disable: false,\n    inactivityRoute: '/logout-inactivity',\n    logoutRoute: '/logout',\n    meta: {\n      titleSuffix: '- Payload',\n    },\n  },\n  bin: [],\n  collections: [],\n  cookiePrefix: 'payload',\n  cors: [],\n  csrf: [],\n  custom: {},\n  defaultDepth: 2,\n  defaultMaxTextLength: 40000,\n  endpoints: [],\n  globals: [],\n  graphQL: {\n    disablePlaygroundInProduction: true,\n    maxComplexity: 1000,\n  },\n  hooks: {},\n  localization: false,\n  maxDepth: 10,\n  routes: {\n    admin: '/admin',\n    api: '/api',\n    graphQL: '/graphql',\n    graphQLPlayground: '/graphql-playground',\n  },\n  serverURL: '',\n  telemetry: true,\n  typescript: {\n    outputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`,\n  },\n  upload: {},\n}\n"],"names":["defaults","admin","avatar","components","dateFormat","disable","inactivityRoute","logoutRoute","meta","titleSuffix","bin","collections","cookiePrefix","cors","csrf","custom","defaultDepth","defaultMaxTextLength","endpoints","globals","graphQL","disablePlaygroundInProduction","maxComplexity","hooks","localization","maxDepth","routes","api","graphQLPlayground","serverURL","telemetry","typescript","outputFile","process","cwd","upload"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAO,MAAMA,WAAqD;IAChEC,OAAO;QACLC,QAAQ;QACRC,YAAY,CAAC;QACbC,YAAY;QACZC,SAAS;QACTC,iBAAiB;QACjBC,aAAa;QACbC,MAAM;YACJC,aAAa;QACf;IACF;IACAC,KAAK,EAAE;IACPC,aAAa,EAAE;IACfC,cAAc;IACdC,MAAM,EAAE;IACRC,MAAM,EAAE;IACRC,QAAQ,CAAC;IACTC,cAAc;IACdC,sBAAsB;IACtBC,WAAW,EAAE;IACbC,SAAS,EAAE;IACXC,SAAS;QACPC,+BAA+B;QAC/BC,eAAe;IACjB;IACAC,OAAO,CAAC;IACRC,cAAc;IACdC,UAAU;IACVC,QAAQ;QACNzB,OAAO;QACP0B,KAAK;QACLP,SAAS;QACTQ,mBAAmB;IACrB;IACAC,WAAW;IACXC,WAAW;IACXC,YAAY;QACVC,YAAY,CAAC,EAAE,OAAOC,SAASC,QAAQ,aAAaD,QAAQC,GAAG,KAAK,GAAG,iBAAiB,CAAC;IAC3F;IACAC,QAAQ,CAAC;AACX,EAAC"}
+{"version":3,"sources":["../../src/config/defaults.ts"],"sourcesContent":["import type { Config } from './types.js'\n\nexport const defaults: Omit<Config, 'db' | 'editor' | 'secret'> = {\n  admin: {\n    avatar: 'gravatar',\n    components: {},\n    custom: {},\n    dateFormat: 'MMMM do yyyy, h:mm a',\n    dependencies: {},\n    disable: false,\n    importMap: {\n      baseDir: `${typeof process?.cwd === 'function' ? process.cwd() : ''}`,\n    },\n    meta: {\n      defaultOGImageType: 'dynamic',\n      titleSuffix: '- Payload',\n    },\n    routes: {\n      account: '/account',\n      createFirstUser: '/create-first-user',\n      forgot: '/forgot',\n      inactivity: '/logout-inactivity',\n      login: '/login',\n      logout: '/logout',\n      reset: '/reset',\n      unauthorized: '/unauthorized',\n    },\n  },\n  bin: [],\n  collections: [],\n  cookiePrefix: 'payload',\n  cors: [],\n  csrf: [],\n  custom: {},\n  defaultDepth: 2,\n  defaultMaxTextLength: 40000,\n  endpoints: [],\n  globals: [],\n  graphQL: {\n    disablePlaygroundInProduction: true,\n    maxComplexity: 1000,\n    schemaOutputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`,\n  },\n  hooks: {},\n  i18n: {},\n  localization: false,\n  maxDepth: 10,\n  routes: {\n    admin: '/admin',\n    api: '/api',\n    graphQL: '/graphql',\n    graphQLPlayground: '/graphql-playground',\n  },\n  serverURL: '',\n  telemetry: true,\n  typescript: {\n    autoGenerate: true,\n    outputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`,\n  },\n  upload: {},\n}\n"],"names":["defaults","admin","avatar","components","custom","dateFormat","dependencies","disable","importMap","baseDir","process","cwd","meta","defaultOGImageType","titleSuffix","routes","account","createFirstUser","forgot","inactivity","login","logout","reset","unauthorized","bin","collections","cookiePrefix","cors","csrf","defaultDepth","defaultMaxTextLength","endpoints","globals","graphQL","disablePlaygroundInProduction","maxComplexity","schemaOutputFile","hooks","i18n","localization","maxDepth","api","graphQLPlayground","serverURL","telemetry","typescript","autoGenerate","outputFile","upload"],"mappings":"AAEA,OAAO,MAAMA,WAAqD;IAChEC,OAAO;QACLC,QAAQ;QACRC,YAAY,CAAC;QACbC,QAAQ,CAAC;QACTC,YAAY;QACZC,cAAc,CAAC;QACfC,SAAS;QACTC,WAAW;YACTC,SAAS,CAAC,EAAE,OAAOC,SAASC,QAAQ,aAAaD,QAAQC,GAAG,KAAK,GAAG,CAAC;QACvE;QACAC,MAAM;YACJC,oBAAoB;YACpBC,aAAa;QACf;QACAC,QAAQ;YACNC,SAAS;YACTC,iBAAiB;YACjBC,QAAQ;YACRC,YAAY;YACZC,OAAO;YACPC,QAAQ;YACRC,OAAO;YACPC,cAAc;QAChB;IACF;IACAC,KAAK,EAAE;IACPC,aAAa,EAAE;IACfC,cAAc;IACdC,MAAM,EAAE;IACRC,MAAM,EAAE;IACRxB,QAAQ,CAAC;IACTyB,cAAc;IACdC,sBAAsB;IACtBC,WAAW,EAAE;IACbC,SAAS,EAAE;IACXC,SAAS;QACPC,+BAA+B;QAC/BC,eAAe;QACfC,kBAAkB,CAAC,EAAE,OAAO1B,SAASC,QAAQ,aAAaD,QAAQC,GAAG,KAAK,GAAG,eAAe,CAAC;IAC/F;IACA0B,OAAO,CAAC;IACRC,MAAM,CAAC;IACPC,cAAc;IACdC,UAAU;IACVzB,QAAQ;QACNd,OAAO;QACPwC,KAAK;QACLR,SAAS;QACTS,mBAAmB;IACrB;IACAC,WAAW;IACXC,WAAW;IACXC,YAAY;QACVC,cAAc;QACdC,YAAY,CAAC,EAAE,OAAOrC,SAASC,QAAQ,aAAaD,QAAQC,GAAG,KAAK,GAAG,iBAAiB,CAAC;IAC3F;IACAqC,QAAQ,CAAC;AACX,EAAC"}

package/dist/config/find.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../src/config/find.ts"],"names":[],"mappings":"AAmCA;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAO,MA8D7B,CAAA"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../src/config/find.ts"],"names":[],"mappings":"AA4CA;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAO,MA6E7B,CAAA"}

package/dist/config/find.js

@@ -1,34 +1,34 @@
-import findUp from 'find-up';
-import fs from 'fs';
+import { findUpSync, pathExistsSync } from 'find-up';
+import { getTsconfig } from 'get-tsconfig';
 import path from 'path';
 /**
  * Returns the source and output paths from the nearest tsconfig.json file.
  * If no tsconfig.json file is found, returns the current working directory.
  * @returns An object containing the source and output paths.
  */ const getTSConfigPaths = ()=>{
-    const tsConfigPath = findUp.sync('tsconfig.json');
-    if (!tsConfigPath) {
-        return {
-            outPath: process.cwd(),
-            srcPath: process.cwd()
-        };
-    }
+    const tsConfigResult = getTsconfig();
+    const tsConfig = tsConfigResult.config;
+    const tsConfigDir = path.dirname(tsConfigResult.path);
     try {
-        // Read the file as a string and remove trailing commas
-        const rawTsConfig = fs.readFileSync(tsConfigPath, 'utf-8').replace(/,\s*\]/g, ']').replace(/,\s*\}/g, '}');
-        const tsConfig = JSON.parse(rawTsConfig);
-        const srcPath = tsConfig.compilerOptions?.rootDir || process.cwd();
-        const outPath = tsConfig.compilerOptions?.outDir || process.cwd();
+        const rootConfigDir = path.resolve(tsConfigDir, tsConfig.compilerOptions.baseUrl || '');
+        const srcPath = tsConfig.compilerOptions?.rootDir || path.resolve(process.cwd(), 'src');
+        const outPath = tsConfig.compilerOptions?.outDir || path.resolve(process.cwd(), 'dist');
+        let configPath = tsConfig.compilerOptions?.paths?.['@payload-config']?.[0];
+        if (configPath) {
+            configPath = path.resolve(rootConfigDir, configPath);
+        }
         return {
+            configPath,
             outPath,
-            srcPath
+            rootPath: rootConfigDir,
+            srcPath,
+            tsConfigPath: tsConfigResult.path
         };
     } catch (error) {
         console.error(`Error parsing tsconfig.json: ${error}`) // Do not throw the error, as we can still continue with the other config path finding methods
         ;
         return {
-            outPath: process.cwd(),
-            srcPath: process.cwd()
+            rootPath: process.cwd()
         };
     }
 };
@@ -45,23 +45,33 @@ import path from 'path';
         }
         return path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH);
     }
-    const { outPath, srcPath } = getTSConfigPaths();
+    const { configPath, outPath, rootPath, srcPath } = getTSConfigPaths();
+    // if configPath is absolute file, not folder, return it
+    if (path.extname(configPath) === '.js' || path.extname(configPath) === '.ts') {
+        return configPath;
+    }
     const searchPaths = process.env.NODE_ENV === 'production' ? [
+        configPath,
         outPath,
-        srcPath
+        srcPath,
+        rootPath
     ] : [
-        srcPath
+        configPath,
+        srcPath,
+        rootPath
     ];
-    // eslint-disable-next-line no-restricted-syntax
     for (const searchPath of searchPaths){
-        const configPath = findUp.sync((dir)=>{
+        if (!searchPath) {
+            continue;
+        }
+        const configPath = findUpSync((dir)=>{
             const tsPath = path.join(dir, 'payload.config.ts');
-            const hasTS = findUp.sync.exists(tsPath);
+            const hasTS = pathExistsSync(tsPath);
             if (hasTS) {
                 return tsPath;
             }
             const jsPath = path.join(dir, 'payload.config.js');
-            const hasJS = findUp.sync.exists(jsPath);
+            const hasJS = pathExistsSync(jsPath);
             if (hasJS) {
                 return jsPath;
             }
@@ -76,21 +86,25 @@ import path from 'path';
     // If no config file is found in the directories defined by tsconfig.json,
     // try searching in the 'src' and 'dist' directory as a last resort, as they are most commonly used
     if (process.env.NODE_ENV === 'production') {
-        const distConfigPath = findUp.sync([
+        const distConfigPath = findUpSync([
             'payload.config.js',
             'payload.config.ts'
         ], {
             cwd: path.resolve(process.cwd(), 'dist')
         });
-        if (distConfigPath) return distConfigPath;
+        if (distConfigPath) {
+            return distConfigPath;
+        }
     } else {
-        const srcConfigPath = findUp.sync([
+        const srcConfigPath = findUpSync([
             'payload.config.js',
             'payload.config.ts'
         ], {
             cwd: path.resolve(process.cwd(), 'src')
         });
-        if (srcConfigPath) return srcConfigPath;
+        if (srcConfigPath) {
+            return srcConfigPath;
+        }
     }
     throw new Error('Error: cannot find Payload config. Please create a configuration file located at the root of your current working directory called "payload.config.js" or "payload.config.ts".');
 };

package/dist/config/find.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/find.ts"],"sourcesContent":["import findUp from 'find-up'\nimport fs from 'fs'\nimport path from 'path'\n\n/**\n * Returns the source and output paths from the nearest tsconfig.json file.\n * If no tsconfig.json file is found, returns the current working directory.\n * @returns An object containing the source and output paths.\n */\nconst getTSConfigPaths = (): { outPath: string; srcPath: string } => {\n  const tsConfigPath = findUp.sync('tsconfig.json')\n\n  if (!tsConfigPath) {\n    return { outPath: process.cwd(), srcPath: process.cwd() }\n  }\n\n  try {\n    // Read the file as a string and remove trailing commas\n    const rawTsConfig = fs\n      .readFileSync(tsConfigPath, 'utf-8')\n      .replace(/,\\s*\\]/g, ']')\n      .replace(/,\\s*\\}/g, '}')\n\n    const tsConfig = JSON.parse(rawTsConfig)\n\n    const srcPath = tsConfig.compilerOptions?.rootDir || process.cwd()\n    const outPath = tsConfig.compilerOptions?.outDir || process.cwd()\n\n    return { outPath, srcPath }\n  } catch (error) {\n    console.error(`Error parsing tsconfig.json: ${error}`) // Do not throw the error, as we can still continue with the other config path finding methods\n    return { outPath: process.cwd(), srcPath: process.cwd() }\n  }\n}\n\n/**\n * Searches for a Payload configuration file.\n * @returns The absolute path to the Payload configuration file.\n * @throws An error if no configuration file is found.\n */\nexport const findConfig = (): string => {\n  // If the developer has specified a config path,\n  // format it if relative and use it directly if absolute\n  if (process.env.PAYLOAD_CONFIG_PATH) {\n    if (path.isAbsolute(process.env.PAYLOAD_CONFIG_PATH)) {\n      return process.env.PAYLOAD_CONFIG_PATH\n    }\n\n    return path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH)\n  }\n\n  const { outPath, srcPath } = getTSConfigPaths()\n\n  const searchPaths = process.env.NODE_ENV === 'production' ? [outPath, srcPath] : [srcPath]\n\n  // eslint-disable-next-line no-restricted-syntax\n  for (const searchPath of searchPaths) {\n    const configPath = findUp.sync(\n      (dir) => {\n        const tsPath = path.join(dir, 'payload.config.ts')\n        const hasTS = findUp.sync.exists(tsPath)\n\n        if (hasTS) {\n          return tsPath\n        }\n\n        const jsPath = path.join(dir, 'payload.config.js')\n        const hasJS = findUp.sync.exists(jsPath)\n\n        if (hasJS) {\n          return jsPath\n        }\n\n        return undefined\n      },\n      { cwd: searchPath },\n    )\n\n    if (configPath) {\n      return configPath\n    }\n  }\n\n  // If no config file is found in the directories defined by tsconfig.json,\n  // try searching in the 'src' and 'dist' directory as a last resort, as they are most commonly used\n  if (process.env.NODE_ENV === 'production') {\n    const distConfigPath = findUp.sync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'dist'),\n    })\n\n    if (distConfigPath) return distConfigPath\n  } else {\n    const srcConfigPath = findUp.sync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'src'),\n    })\n\n    if (srcConfigPath) return srcConfigPath\n  }\n\n  throw new Error(\n    'Error: cannot find Payload config. Please create a configuration file located at the root of your current working directory called \"payload.config.js\" or \"payload.config.ts\".',\n  )\n}\n"],"names":["findUp","fs","path","getTSConfigPaths","tsConfigPath","sync","outPath","process","cwd","srcPath","rawTsConfig","readFileSync","replace","tsConfig","JSON","parse","compilerOptions","rootDir","outDir","error","console","findConfig","env","PAYLOAD_CONFIG_PATH","isAbsolute","resolve","searchPaths","NODE_ENV","searchPath","configPath","dir","tsPath","join","hasTS","exists","jsPath","hasJS","undefined","distConfigPath","srcConfigPath","Error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,YAAY,UAAS;AAC5B,OAAOC,QAAQ,KAAI;AACnB,OAAOC,UAAU,OAAM;AAEvB;;;;CAIC,GACD,MAAMC,mBAAmB;IACvB,MAAMC,eAAeJ,OAAOK,IAAI,CAAC;IAEjC,IAAI,CAACD,cAAc;QACjB,OAAO;YAAEE,SAASC,QAAQC,GAAG;YAAIC,SAASF,QAAQC,GAAG;QAAG;IAC1D;IAEA,IAAI;QACF,uDAAuD;QACvD,MAAME,cAAcT,GACjBU,YAAY,CAACP,cAAc,SAC3BQ,OAAO,CAAC,WAAW,KACnBA,OAAO,CAAC,WAAW;QAEtB,MAAMC,WAAWC,KAAKC,KAAK,CAACL;QAE5B,MAAMD,UAAUI,SAASG,eAAe,EAAEC,WAAWV,QAAQC,GAAG;QAChE,MAAMF,UAAUO,SAASG,eAAe,EAAEE,UAAUX,QAAQC,GAAG;QAE/D,OAAO;YAAEF;YAASG;QAAQ;IAC5B,EAAE,OAAOU,OAAO;QACdC,QAAQD,KAAK,CAAC,CAAC,6BAA6B,EAAEA,MAAM,CAAC,EAAE,8FAA8F;;QACrJ,OAAO;YAAEb,SAASC,QAAQC,GAAG;YAAIC,SAASF,QAAQC,GAAG;QAAG;IAC1D;AACF;AAEA;;;;CAIC,GACD,OAAO,MAAMa,aAAa;IACxB,gDAAgD;IAChD,wDAAwD;IACxD,IAAId,QAAQe,GAAG,CAACC,mBAAmB,EAAE;QACnC,IAAIrB,KAAKsB,UAAU,CAACjB,QAAQe,GAAG,CAACC,mBAAmB,GAAG;YACpD,OAAOhB,QAAQe,GAAG,CAACC,mBAAmB;QACxC;QAEA,OAAOrB,KAAKuB,OAAO,CAAClB,QAAQC,GAAG,IAAID,QAAQe,GAAG,CAACC,mBAAmB;IACpE;IAEA,MAAM,EAAEjB,OAAO,EAAEG,OAAO,EAAE,GAAGN;IAE7B,MAAMuB,cAAcnB,QAAQe,GAAG,CAACK,QAAQ,KAAK,eAAe;QAACrB;QAASG;KAAQ,GAAG;QAACA;KAAQ;IAE1F,gDAAgD;IAChD,KAAK,MAAMmB,cAAcF,YAAa;QACpC,MAAMG,aAAa7B,OAAOK,IAAI,CAC5B,CAACyB;YACC,MAAMC,SAAS7B,KAAK8B,IAAI,CAACF,KAAK;YAC9B,MAAMG,QAAQjC,OAAOK,IAAI,CAAC6B,MAAM,CAACH;YAEjC,IAAIE,OAAO;gBACT,OAAOF;YACT;YAEA,MAAMI,SAASjC,KAAK8B,IAAI,CAACF,KAAK;YAC9B,MAAMM,QAAQpC,OAAOK,IAAI,CAAC6B,MAAM,CAACC;YAEjC,IAAIC,OAAO;gBACT,OAAOD;YACT;YAEA,OAAOE;QACT,GACA;YAAE7B,KAAKoB;QAAW;QAGpB,IAAIC,YAAY;YACd,OAAOA;QACT;IACF;IAEA,0EAA0E;IAC1E,mGAAmG;IACnG,IAAItB,QAAQe,GAAG,CAACK,QAAQ,KAAK,cAAc;QACzC,MAAMW,iBAAiBtC,OAAOK,IAAI,CAAC;YAAC;YAAqB;SAAoB,EAAE;YAC7EG,KAAKN,KAAKuB,OAAO,CAAClB,QAAQC,GAAG,IAAI;QACnC;QAEA,IAAI8B,gBAAgB,OAAOA;IAC7B,OAAO;QACL,MAAMC,gBAAgBvC,OAAOK,IAAI,CAAC;YAAC;YAAqB;SAAoB,EAAE;YAC5EG,KAAKN,KAAKuB,OAAO,CAAClB,QAAQC,GAAG,IAAI;QACnC;QAEA,IAAI+B,eAAe,OAAOA;IAC5B;IAEA,MAAM,IAAIC,MACR;AAEJ,EAAC"}
+{"version":3,"sources":["../../src/config/find.ts"],"sourcesContent":["import { findUpSync, pathExistsSync } from 'find-up'\nimport { getTsconfig } from 'get-tsconfig'\nimport path from 'path'\n\n/**\n * Returns the source and output paths from the nearest tsconfig.json file.\n * If no tsconfig.json file is found, returns the current working directory.\n * @returns An object containing the source and output paths.\n */\nconst getTSConfigPaths = (): {\n  configPath?: string\n  outPath?: string\n  rootPath?: string\n  srcPath?: string\n  tsConfigPath?: string\n} => {\n  const tsConfigResult = getTsconfig()\n  const tsConfig = tsConfigResult.config\n  const tsConfigDir = path.dirname(tsConfigResult.path)\n\n  try {\n    const rootConfigDir = path.resolve(tsConfigDir, tsConfig.compilerOptions.baseUrl || '')\n    const srcPath = tsConfig.compilerOptions?.rootDir || path.resolve(process.cwd(), 'src')\n    const outPath = tsConfig.compilerOptions?.outDir || path.resolve(process.cwd(), 'dist')\n    let configPath = tsConfig.compilerOptions?.paths?.['@payload-config']?.[0]\n\n    if (configPath) {\n      configPath = path.resolve(rootConfigDir, configPath)\n    }\n    return {\n      configPath,\n      outPath,\n      rootPath: rootConfigDir,\n      srcPath,\n      tsConfigPath: tsConfigResult.path,\n    }\n  } catch (error) {\n    console.error(`Error parsing tsconfig.json: ${error}`) // Do not throw the error, as we can still continue with the other config path finding methods\n    return {\n      rootPath: process.cwd(),\n    }\n  }\n}\n\n/**\n * Searches for a Payload configuration file.\n * @returns The absolute path to the Payload configuration file.\n * @throws An error if no configuration file is found.\n */\nexport const findConfig = (): string => {\n  // If the developer has specified a config path,\n  // format it if relative and use it directly if absolute\n  if (process.env.PAYLOAD_CONFIG_PATH) {\n    if (path.isAbsolute(process.env.PAYLOAD_CONFIG_PATH)) {\n      return process.env.PAYLOAD_CONFIG_PATH\n    }\n\n    return path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH)\n  }\n\n  const { configPath, outPath, rootPath, srcPath } = getTSConfigPaths()\n\n  // if configPath is absolute file, not folder, return it\n  if (path.extname(configPath) === '.js' || path.extname(configPath) === '.ts') {\n    return configPath\n  }\n\n  const searchPaths =\n    process.env.NODE_ENV === 'production'\n      ? [configPath, outPath, srcPath, rootPath]\n      : [configPath, srcPath, rootPath]\n\n  for (const searchPath of searchPaths) {\n    if (!searchPath) {\n      continue\n    }\n\n    const configPath = findUpSync(\n      (dir) => {\n        const tsPath = path.join(dir, 'payload.config.ts')\n        const hasTS = pathExistsSync(tsPath)\n\n        if (hasTS) {\n          return tsPath\n        }\n\n        const jsPath = path.join(dir, 'payload.config.js')\n        const hasJS = pathExistsSync(jsPath)\n\n        if (hasJS) {\n          return jsPath\n        }\n\n        return undefined\n      },\n      { cwd: searchPath },\n    )\n\n    if (configPath) {\n      return configPath\n    }\n  }\n\n  // If no config file is found in the directories defined by tsconfig.json,\n  // try searching in the 'src' and 'dist' directory as a last resort, as they are most commonly used\n  if (process.env.NODE_ENV === 'production') {\n    const distConfigPath = findUpSync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'dist'),\n    })\n\n    if (distConfigPath) {\n      return distConfigPath\n    }\n  } else {\n    const srcConfigPath = findUpSync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'src'),\n    })\n\n    if (srcConfigPath) {\n      return srcConfigPath\n    }\n  }\n\n  throw new Error(\n    'Error: cannot find Payload config. Please create a configuration file located at the root of your current working directory called \"payload.config.js\" or \"payload.config.ts\".',\n  )\n}\n"],"names":["findUpSync","pathExistsSync","getTsconfig","path","getTSConfigPaths","tsConfigResult","tsConfig","config","tsConfigDir","dirname","rootConfigDir","resolve","compilerOptions","baseUrl","srcPath","rootDir","process","cwd","outPath","outDir","configPath","paths","rootPath","tsConfigPath","error","console","findConfig","env","PAYLOAD_CONFIG_PATH","isAbsolute","extname","searchPaths","NODE_ENV","searchPath","dir","tsPath","join","hasTS","jsPath","hasJS","undefined","distConfigPath","srcConfigPath","Error"],"mappings":"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"}

package/dist/config/sanitize.d.ts

@@ -1,3 +1,3 @@
 import type { Config, SanitizedConfig } from './types.js';
-export declare const sanitizeConfig: (incomingConfig: Config) => SanitizedConfig;
+export declare const sanitizeConfig: (incomingConfig: Config) => Promise<SanitizedConfig>;
 //# sourceMappingURL=sanitize.d.ts.map

package/dist/config/sanitize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/config/sanitize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,MAAM,EAGN,eAAe,EAChB,MAAM,YAAY,CAAA;AAmCnB,eAAO,MAAM,cAAc,mBAAoB,MAAM,KAAG,eAsEvD,CAAA"}
+{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/config/sanitize.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,MAAM,EAGN,eAAe,EAChB,MAAM,YAAY,CAAA;AAqCnB,eAAO,MAAM,cAAc,mBAA0B,MAAM,KAAG,OAAO,CAAC,eAAe,CAgKpF,CAAA"}

package/dist/config/sanitize.js

@@ -1,13 +1,12 @@
 import { en } from '@payloadcms/translations/languages/en';
-import merge from 'deepmerge';
+import { deepMergeSimple } from '@payloadcms/translations/utilities';
 import { defaultUserCollection } from '../auth/defaultUser.js';
-import sanitizeCollection from '../collections/config/sanitize.js';
+import { sanitizeCollection } from '../collections/config/sanitize.js';
 import { migrationsCollection } from '../database/migrations/migrationsCollection.js';
 import { InvalidConfiguration } from '../errors/index.js';
-import sanitizeGlobals from '../globals/config/sanitize.js';
+import { sanitizeGlobals } from '../globals/config/sanitize.js';
 import getPreferencesCollection from '../preferences/preferencesCollection.js';
 import checkDuplicateCollections from '../utilities/checkDuplicateCollections.js';
-import { isPlainObject } from '../utilities/isPlainObject.js';
 import { defaults } from './defaults.js';
 const sanitizeAdminConfig = (configToSanitize)=>{
     const sanitizedConfig = {
@@ -23,18 +22,50 @@ const sanitizeAdminConfig = (configToSanitize)=>{
             sanitizedConfig.collections.push(defaultUserCollection);
         }
     }
-    if (!sanitizedConfig.collections.find(({ slug })=>slug === sanitizedConfig.admin.user)) {
+    const userCollection = sanitizedConfig.collections.find(({ slug })=>slug === sanitizedConfig.admin.user);
+    if (!userCollection || !userCollection.auth) {
         throw new InvalidConfiguration(`${sanitizedConfig.admin.user} is not a valid admin user collection`);
     }
     return sanitizedConfig;
 };
-export const sanitizeConfig = (incomingConfig)=>{
-    const configWithDefaults = merge(defaults, incomingConfig, {
-        isMergeableObject: isPlainObject
-    });
+export const sanitizeConfig = async (incomingConfig)=>{
+    const configWithDefaults = {
+        ...defaults,
+        ...incomingConfig,
+        admin: {
+            ...defaults.admin,
+            ...incomingConfig?.admin,
+            meta: {
+                ...defaults.admin.meta,
+                ...incomingConfig?.admin?.meta
+            },
+            routes: {
+                ...defaults.admin.routes,
+                ...incomingConfig?.admin?.routes
+            }
+        },
+        graphQL: {
+            ...defaults.graphQL,
+            ...incomingConfig?.graphQL
+        },
+        routes: {
+            ...defaults.routes,
+            ...incomingConfig?.routes
+        },
+        typescript: {
+            ...defaults.typescript,
+            ...incomingConfig?.typescript
+        }
+    };
     if (!configWithDefaults?.serverURL) {
         configWithDefaults.serverURL = '';
     }
+    if (process.env.NEXT_BASE_PATH) {
+        if (!incomingConfig?.routes?.api) {
+            // check for incomingConfig, as configWithDefaults will always have a default value for routes.api
+            configWithDefaults.routes.api = process.env.NEXT_BASE_PATH + '/api';
+        }
+    }
     const config = sanitizeAdminConfig(configWithDefaults);
     if (config.localization && config.localization.locales?.length > 0) {
         // clone localization config so to not break everything
@@ -62,24 +93,62 @@ export const sanitizeConfig = (incomingConfig)=>{
                 }));
         }
     }
-    config.i18n = {
+    const i18nConfig = {
         fallbackLanguage: 'en',
         supportedLanguages: {
             en
         },
-        translations: {},
-        ...incomingConfig?.i18n ?? {}
+        translations: {}
     };
-    configWithDefaults.collections.push(getPreferencesCollection(configWithDefaults));
+    if (incomingConfig?.i18n) {
+        i18nConfig.supportedLanguages = incomingConfig.i18n?.supportedLanguages || i18nConfig.supportedLanguages;
+        const supportedLangKeys = Object.keys(i18nConfig.supportedLanguages);
+        const fallbackLang = incomingConfig.i18n?.fallbackLanguage || i18nConfig.fallbackLanguage;
+        i18nConfig.fallbackLanguage = supportedLangKeys.includes(fallbackLang) ? fallbackLang : supportedLangKeys[0];
+        i18nConfig.translations = incomingConfig.i18n?.translations || i18nConfig.translations;
+    }
+    config.i18n = i18nConfig;
+    configWithDefaults.collections.push(getPreferencesCollection(config));
     configWithDefaults.collections.push(migrationsCollection);
-    config.collections = config.collections.map((collection)=>sanitizeCollection(configWithDefaults, collection));
+    const richTextSanitizationPromises = [];
+    for(let i = 0; i < config.collections.length; i++){
+        config.collections[i] = await sanitizeCollection(config, config.collections[i], richTextSanitizationPromises);
+    }
     checkDuplicateCollections(config.collections);
     if (config.globals.length > 0) {
-        config.globals = sanitizeGlobals(config);
+        config.globals = await sanitizeGlobals(config, richTextSanitizationPromises);
     }
     if (config.serverURL !== '') {
         config.csrf.push(config.serverURL);
     }
+    // Get deduped list of upload adapters
+    if (!config.upload) {
+        config.upload = {
+            adapters: []
+        };
+    }
+    config.upload.adapters = Array.from(new Set(config.collections.map((c)=>c.upload?.adapter).filter(Boolean)));
+    // Pass through the email config as is so adapters don't break
+    if (incomingConfig.email) {
+        config.email = incomingConfig.email;
+    }
+    /*
+    Execute richText sanitization
+   */ if (typeof incomingConfig.editor === 'function') {
+        config.editor = await incomingConfig.editor({
+            config: config,
+            isRoot: true,
+            parentIsLocalized: false
+        });
+        if (config.editor.i18n && Object.keys(config.editor.i18n).length >= 0) {
+            config.i18n.translations = deepMergeSimple(config.i18n.translations, config.editor.i18n);
+        }
+    }
+    const promises = [];
+    for (const sanitizeFunction of richTextSanitizationPromises){
+        promises.push(sanitizeFunction(config));
+    }
+    await Promise.all(promises);
     return config;
 };