payload 3.0.0-beta.13 → 3.0.0-beta.130

package/dist/config/find.js

@@ -1,34 +1,34 @@
-import findUp from 'find-up';
-import fs from 'fs';
+import { getTsconfig } from 'get-tsconfig';
 import path from 'path';
+import { findUpSync } from '../utilities/findUp.js';
+/**
+ * List of all filenames to detect as a Payload configuration file.
+ */ export const payloadConfigFileNames = [
+    'payload.config.js',
+    'payload.config.ts'
+];
 /**
  * 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 {
-            rootPath: 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 rootPath = 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');
-        const tsConfigDir = path.dirname(tsConfigPath);
         let configPath = tsConfig.compilerOptions?.paths?.['@payload-config']?.[0];
         if (configPath) {
-            configPath = path.resolve(tsConfigDir, configPath);
+            configPath = path.resolve(rootConfigDir, configPath);
         }
         return {
             configPath,
             outPath,
-            rootPath,
-            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
@@ -52,6 +52,10 @@ import path from 'path';
         return path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH);
     }
     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,
@@ -62,23 +66,13 @@ import path from 'path';
         srcPath,
         rootPath
     ];
-    // eslint-disable-next-line no-restricted-syntax
     for (const searchPath of searchPaths){
-        if (!searchPath) continue;
-        const configPath = findUp.sync((dir)=>{
-            const tsPath = path.join(dir, 'payload.config.ts');
-            const hasTS = findUp.sync.exists(tsPath);
-            if (hasTS) {
-                return tsPath;
-            }
-            const jsPath = path.join(dir, 'payload.config.js');
-            const hasJS = findUp.sync.exists(jsPath);
-            if (hasJS) {
-                return jsPath;
-            }
-            return undefined;
-        }, {
-            cwd: searchPath
+        if (!searchPath) {
+            continue;
+        }
+        const configPath = findUpSync({
+            dir: searchPath,
+            fileNames: payloadConfigFileNames
         });
         if (configPath) {
             return configPath;
@@ -87,21 +81,23 @@ 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([
-            'payload.config.js',
-            'payload.config.ts'
-        ], {
-            cwd: path.resolve(process.cwd(), 'dist')
+        const distConfigPath = findUpSync({
+            dir: path.resolve(process.cwd(), 'dist'),
+            fileNames: [
+                'payload.config.js'
+            ]
         });
-        if (distConfigPath) return distConfigPath;
+        if (distConfigPath) {
+            return distConfigPath;
+        }
     } else {
-        const srcConfigPath = findUp.sync([
-            'payload.config.js',
-            'payload.config.ts'
-        ], {
-            cwd: path.resolve(process.cwd(), 'src')
+        const srcConfigPath = findUpSync({
+            dir: path.resolve(process.cwd(), 'src'),
+            fileNames: payloadConfigFileNames
         });
-        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 = (): {\n  configPath?: string\n  outPath?: string\n  rootPath?: string\n  srcPath?: string\n} => {\n  const tsConfigPath = findUp.sync('tsconfig.json')\n\n  if (!tsConfigPath) {\n    return {\n      rootPath: process.cwd(),\n    }\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 rootPath = process.cwd()\n    const srcPath = tsConfig.compilerOptions?.rootDir || path.resolve(process.cwd(), 'src')\n    const outPath = tsConfig.compilerOptions?.outDir || path.resolve(process.cwd(), 'dist')\n    const tsConfigDir = path.dirname(tsConfigPath)\n    let configPath = tsConfig.compilerOptions?.paths?.['@payload-config']?.[0]\n    if (configPath) {\n      configPath = path.resolve(tsConfigDir, configPath)\n    }\n    return {\n      configPath,\n      outPath,\n      rootPath,\n      srcPath,\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  const searchPaths =\n    process.env.NODE_ENV === 'production'\n      ? [configPath, outPath, srcPath, rootPath]\n      : [configPath, srcPath, rootPath]\n\n  // eslint-disable-next-line no-restricted-syntax\n  for (const searchPath of searchPaths) {\n    if (!searchPath) continue\n\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","rootPath","process","cwd","rawTsConfig","readFileSync","replace","tsConfig","JSON","parse","srcPath","compilerOptions","rootDir","resolve","outPath","outDir","tsConfigDir","dirname","configPath","paths","error","console","findConfig","env","PAYLOAD_CONFIG_PATH","isAbsolute","searchPaths","NODE_ENV","searchPath","dir","tsPath","join","hasTS","exists","jsPath","hasJS","undefined","distConfigPath","srcConfigPath","Error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/config/find.ts"],"sourcesContent":["import { getTsconfig } from 'get-tsconfig'\nimport path from 'path'\n\nimport { findUpSync } from '../utilities/findUp.js'\n\n/**\n * List of all filenames to detect as a Payload configuration file.\n */\nexport const payloadConfigFileNames = ['payload.config.js', 'payload.config.ts']\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: searchPath,\n      fileNames: payloadConfigFileNames,\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({\n      dir: path.resolve(process.cwd(), 'dist'),\n      fileNames: ['payload.config.js'],\n    })\n\n    if (distConfigPath) {\n      return distConfigPath\n    }\n  } else {\n    const srcConfigPath = findUpSync({\n      dir: path.resolve(process.cwd(), 'src'),\n      fileNames: payloadConfigFileNames,\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":["getTsconfig","path","findUpSync","payloadConfigFileNames","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","fileNames","distConfigPath","srcConfigPath","Error"],"mappings":"AAAA,SAASA,WAAW,QAAQ,eAAc;AAC1C,OAAOC,UAAU,OAAM;AAEvB,SAASC,UAAU,QAAQ,yBAAwB;AAEnD;;CAEC,GACD,OAAO,MAAMC,yBAAyB;IAAC;IAAqB;CAAoB,CAAA;AAEhF;;;;CAIC,GACD,MAAMC,mBAAmB;IAOvB,MAAMC,iBAAiBL;IACvB,MAAMM,WAAWD,eAAeE,MAAM;IACtC,MAAMC,cAAcP,KAAKQ,OAAO,CAACJ,eAAeJ,IAAI;IAEpD,IAAI;QACF,MAAMS,gBAAgBT,KAAKU,OAAO,CAACH,aAAaF,SAASM,eAAe,CAACC,OAAO,IAAI;QACpF,MAAMC,UAAUR,SAASM,eAAe,EAAEG,WAAWd,KAAKU,OAAO,CAACK,QAAQC,GAAG,IAAI;QACjF,MAAMC,UAAUZ,SAASM,eAAe,EAAEO,UAAUlB,KAAKU,OAAO,CAACK,QAAQC,GAAG,IAAI;QAChF,IAAIG,aAAad,SAASM,eAAe,EAAES,OAAO,CAAC,kBAAkB,EAAE,CAAC,EAAE;QAE1E,IAAID,YAAY;YACdA,aAAanB,KAAKU,OAAO,CAACD,eAAeU;QAC3C;QACA,OAAO;YACLA;YACAF;YACAI,UAAUZ;YACVI;YACAS,cAAclB,eAAeJ,IAAI;QACnC;IACF,EAAE,OAAOuB,OAAO;QACdC,QAAQD,KAAK,CAAC,CAAC,6BAA6B,EAAEA,MAAM,CAAC,EAAE,8FAA8F;;QACrJ,OAAO;YACLF,UAAUN,QAAQC,GAAG;QACvB;IACF;AACF;AAEA;;;;CAIC,GACD,OAAO,MAAMS,aAAa;IACxB,gDAAgD;IAChD,wDAAwD;IACxD,IAAIV,QAAQW,GAAG,CAACC,mBAAmB,EAAE;QACnC,IAAI3B,KAAK4B,UAAU,CAACb,QAAQW,GAAG,CAACC,mBAAmB,GAAG;YACpD,OAAOZ,QAAQW,GAAG,CAACC,mBAAmB;QACxC;QAEA,OAAO3B,KAAKU,OAAO,CAACK,QAAQC,GAAG,IAAID,QAAQW,GAAG,CAACC,mBAAmB;IACpE;IAEA,MAAM,EAAER,UAAU,EAAEF,OAAO,EAAEI,QAAQ,EAAER,OAAO,EAAE,GAAGV;IAEnD,wDAAwD;IACxD,IAAIH,KAAK6B,OAAO,CAACV,gBAAgB,SAASnB,KAAK6B,OAAO,CAACV,gBAAgB,OAAO;QAC5E,OAAOA;IACT;IAEA,MAAMW,cACJf,QAAQW,GAAG,CAACK,QAAQ,KAAK,eACrB;QAACZ;QAAYF;QAASJ;QAASQ;KAAS,GACxC;QAACF;QAAYN;QAASQ;KAAS;IAErC,KAAK,MAAMW,cAAcF,YAAa;QACpC,IAAI,CAACE,YAAY;YACf;QACF;QAEA,MAAMb,aAAalB,WAAW;YAC5BgC,KAAKD;YACLE,WAAWhC;QACb;QAEA,IAAIiB,YAAY;YACd,OAAOA;QACT;IACF;IAEA,0EAA0E;IAC1E,mGAAmG;IACnG,IAAIJ,QAAQW,GAAG,CAACK,QAAQ,KAAK,cAAc;QACzC,MAAMI,iBAAiBlC,WAAW;YAChCgC,KAAKjC,KAAKU,OAAO,CAACK,QAAQC,GAAG,IAAI;YACjCkB,WAAW;gBAAC;aAAoB;QAClC;QAEA,IAAIC,gBAAgB;YAClB,OAAOA;QACT;IACF,OAAO;QACL,MAAMC,gBAAgBnC,WAAW;YAC/BgC,KAAKjC,KAAKU,OAAO,CAACK,QAAQC,GAAG,IAAI;YACjCkB,WAAWhC;QACb;QAEA,IAAIkC,eAAe;YACjB,OAAOA;QACT;IACF;IAEA,MAAM,IAAIC,MACR;AAEJ,EAAC"}

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;AAiDnB,eAAO,MAAM,cAAc,mBAA0B,MAAM,KAAG,OAAO,CAAC,eAAe,CA2LpF,CAAA"}

package/dist/config/sanitize.js

@@ -1,18 +1,28 @@
 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 { getLockedDocumentsCollection } from '../lockedDocuments/lockedDocumentsCollection.js';
 import getPreferencesCollection from '../preferences/preferencesCollection.js';
+import { getDefaultJobsCollection } from '../queues/config/jobsCollection.js';
 import checkDuplicateCollections from '../utilities/checkDuplicateCollections.js';
-import { isPlainObject } from '../utilities/isPlainObject.js';
 import { defaults } from './defaults.js';
 const sanitizeAdminConfig = (configToSanitize)=>{
     const sanitizedConfig = {
         ...configToSanitize
     };
+    // default logging level will be 'error' if not provided
+    sanitizedConfig.loggingLevels = {
+        Forbidden: 'info',
+        Locked: 'info',
+        MissingFile: 'info',
+        NotFound: 'info',
+        ValidationError: 'info',
+        ...sanitizedConfig.loggingLevels || {}
+    };
     // add default user collection if none provided
     if (!sanitizedConfig?.admin?.user) {
         const firstCollectionWithAuth = sanitizedConfig.collections.find(({ auth })=>Boolean(auth));
@@ -23,18 +33,60 @@ 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
+        },
+        jobs: {
+            ...defaults.jobs,
+            ...incomingConfig?.jobs,
+            access: {
+                ...defaults.jobs.access,
+                ...incomingConfig?.jobs?.access
+            },
+            tasks: incomingConfig?.jobs?.tasks || [],
+            workflows: incomingConfig?.jobs?.workflows || []
+        },
+        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
@@ -61,25 +113,76 @@ export const sanitizeConfig = (incomingConfig)=>{
                     toString: ()=>locale.code
                 }));
         }
+        // Default fallback to true if not provided
+        config.localization.fallback = config.localization?.fallback ?? true;
     }
-    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;
+    // Need to add default jobs collection before locked documents collections
+    if (Array.isArray(configWithDefaults.jobs?.tasks) && configWithDefaults.jobs.tasks.length > 0) {
+        let defaultJobsCollection = getDefaultJobsCollection(config);
+        if (typeof configWithDefaults.jobs.jobsCollectionOverrides === 'function') {
+            defaultJobsCollection = configWithDefaults.jobs.jobsCollectionOverrides({
+                defaultJobsCollection
+            });
+        }
+        configWithDefaults.collections.push(defaultJobsCollection);
+    }
+    configWithDefaults.collections.push(getLockedDocumentsCollection(config));
+    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;
 };
 

package/dist/config/sanitize.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/sanitize.ts"],"sourcesContent":["import { en } from '@payloadcms/translations/languages/en'\nimport merge from 'deepmerge'\n\nimport type {\n  Config,\n  LocalizationConfigWithLabels,\n  LocalizationConfigWithNoLabels,\n  SanitizedConfig,\n} from './types.js'\n\nimport { defaultUserCollection } from '../auth/defaultUser.js'\nimport sanitizeCollection from '../collections/config/sanitize.js'\nimport { migrationsCollection } from '../database/migrations/migrationsCollection.js'\nimport { InvalidConfiguration } from '../errors/index.js'\nimport sanitizeGlobals from '../globals/config/sanitize.js'\nimport getPreferencesCollection from '../preferences/preferencesCollection.js'\nimport checkDuplicateCollections from '../utilities/checkDuplicateCollections.js'\nimport { isPlainObject } from '../utilities/isPlainObject.js'\nimport { defaults } from './defaults.js'\n\nconst sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig> => {\n  const sanitizedConfig = { ...configToSanitize }\n\n  // add default user collection if none provided\n  if (!sanitizedConfig?.admin?.user) {\n    const firstCollectionWithAuth = sanitizedConfig.collections.find(({ auth }) => Boolean(auth))\n    if (firstCollectionWithAuth) {\n      sanitizedConfig.admin.user = firstCollectionWithAuth.slug\n    } else {\n      sanitizedConfig.admin.user = defaultUserCollection.slug\n      sanitizedConfig.collections.push(defaultUserCollection)\n    }\n  }\n\n  if (!sanitizedConfig.collections.find(({ slug }) => slug === sanitizedConfig.admin.user)) {\n    throw new InvalidConfiguration(\n      `${sanitizedConfig.admin.user} is not a valid admin user collection`,\n    )\n  }\n\n  return sanitizedConfig as Partial<SanitizedConfig>\n}\n\nexport const sanitizeConfig = (incomingConfig: Config): SanitizedConfig => {\n  const configWithDefaults: Config = merge(defaults, incomingConfig, {\n    isMergeableObject: isPlainObject,\n  }) as Config\n\n  if (!configWithDefaults?.serverURL) {\n    configWithDefaults.serverURL = ''\n  }\n\n  const config: Partial<SanitizedConfig> = sanitizeAdminConfig(configWithDefaults)\n\n  if (config.localization && config.localization.locales?.length > 0) {\n    // clone localization config so to not break everything\n    const firstLocale = config.localization.locales[0]\n    if (typeof firstLocale === 'string') {\n      config.localization.localeCodes = [\n        ...(config.localization as unknown as LocalizationConfigWithNoLabels).locales,\n      ]\n\n      // is string[], so convert to Locale[]\n      config.localization.locales = (\n        config.localization as unknown as LocalizationConfigWithNoLabels\n      ).locales.map((locale) => ({\n        code: locale,\n        label: locale,\n        rtl: false,\n        toString: () => locale,\n      }))\n    } else {\n      // is Locale[], so convert to string[] for localeCodes\n      config.localization.localeCodes = config.localization.locales.reduce((locales, locale) => {\n        locales.push(locale.code)\n        return locales\n      }, [] as string[])\n\n      config.localization.locales = (\n        config.localization as LocalizationConfigWithLabels\n      ).locales.map((locale) => ({\n        ...locale,\n        toString: () => locale.code,\n      }))\n    }\n  }\n\n  config.i18n = {\n    fallbackLanguage: 'en',\n    supportedLanguages: {\n      en,\n    },\n    translations: {},\n    ...(incomingConfig?.i18n ?? {}),\n  }\n\n  configWithDefaults.collections.push(getPreferencesCollection(configWithDefaults))\n  configWithDefaults.collections.push(migrationsCollection)\n\n  config.collections = config.collections.map((collection) =>\n    sanitizeCollection(configWithDefaults, collection),\n  )\n  checkDuplicateCollections(config.collections)\n\n  if (config.globals.length > 0) {\n    config.globals = sanitizeGlobals(config as SanitizedConfig)\n  }\n\n  if (config.serverURL !== '') {\n    config.csrf.push(config.serverURL)\n  }\n\n  return config as SanitizedConfig\n}\n"],"names":["en","merge","defaultUserCollection","sanitizeCollection","migrationsCollection","InvalidConfiguration","sanitizeGlobals","getPreferencesCollection","checkDuplicateCollections","isPlainObject","defaults","sanitizeAdminConfig","configToSanitize","sanitizedConfig","admin","user","firstCollectionWithAuth","collections","find","auth","Boolean","slug","push","sanitizeConfig","incomingConfig","configWithDefaults","isMergeableObject","serverURL","config","localization","locales","length","firstLocale","localeCodes","map","locale","code","label","rtl","toString","reduce","i18n","fallbackLanguage","supportedLanguages","translations","collection","globals","csrf"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/config/sanitize.ts"],"sourcesContent":["import type { AcceptedLanguages } from '@payloadcms/translations'\n\nimport { en } from '@payloadcms/translations/languages/en'\nimport { deepMergeSimple } from '@payloadcms/translations/utilities'\n\nimport type {\n  Config,\n  LocalizationConfigWithLabels,\n  LocalizationConfigWithNoLabels,\n  SanitizedConfig,\n} from './types.js'\n\nimport { defaultUserCollection } from '../auth/defaultUser.js'\nimport { sanitizeCollection } from '../collections/config/sanitize.js'\nimport { migrationsCollection } from '../database/migrations/migrationsCollection.js'\nimport { InvalidConfiguration } from '../errors/index.js'\nimport { sanitizeGlobals } from '../globals/config/sanitize.js'\nimport { getLockedDocumentsCollection } from '../lockedDocuments/lockedDocumentsCollection.js'\nimport getPreferencesCollection from '../preferences/preferencesCollection.js'\nimport { getDefaultJobsCollection } from '../queues/config/jobsCollection.js'\nimport checkDuplicateCollections from '../utilities/checkDuplicateCollections.js'\nimport { defaults } from './defaults.js'\n\nconst sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig> => {\n  const sanitizedConfig = { ...configToSanitize }\n\n  // default logging level will be 'error' if not provided\n  sanitizedConfig.loggingLevels = {\n    Forbidden: 'info',\n    Locked: 'info',\n    MissingFile: 'info',\n    NotFound: 'info',\n    ValidationError: 'info',\n    ...(sanitizedConfig.loggingLevels || {}),\n  }\n\n  // add default user collection if none provided\n  if (!sanitizedConfig?.admin?.user) {\n    const firstCollectionWithAuth = sanitizedConfig.collections.find(({ auth }) => Boolean(auth))\n    if (firstCollectionWithAuth) {\n      sanitizedConfig.admin.user = firstCollectionWithAuth.slug\n    } else {\n      sanitizedConfig.admin.user = defaultUserCollection.slug\n      sanitizedConfig.collections.push(defaultUserCollection)\n    }\n  }\n\n  const userCollection = sanitizedConfig.collections.find(\n    ({ slug }) => slug === sanitizedConfig.admin.user,\n  )\n  if (!userCollection || !userCollection.auth) {\n    throw new InvalidConfiguration(\n      `${sanitizedConfig.admin.user} is not a valid admin user collection`,\n    )\n  }\n\n  return sanitizedConfig as unknown as Partial<SanitizedConfig>\n}\n\nexport const sanitizeConfig = async (incomingConfig: Config): Promise<SanitizedConfig> => {\n  const configWithDefaults = {\n    ...defaults,\n    ...incomingConfig,\n    admin: {\n      ...defaults.admin,\n      ...incomingConfig?.admin,\n      meta: {\n        ...defaults.admin.meta,\n        ...incomingConfig?.admin?.meta,\n      },\n      routes: {\n        ...defaults.admin.routes,\n        ...incomingConfig?.admin?.routes,\n      },\n    },\n    graphQL: {\n      ...defaults.graphQL,\n      ...incomingConfig?.graphQL,\n    },\n    jobs: {\n      ...defaults.jobs,\n      ...incomingConfig?.jobs,\n      access: {\n        ...defaults.jobs.access,\n        ...incomingConfig?.jobs?.access,\n      },\n      tasks: incomingConfig?.jobs?.tasks || [],\n      workflows: incomingConfig?.jobs?.workflows || [],\n    },\n    routes: {\n      ...defaults.routes,\n      ...incomingConfig?.routes,\n    },\n    typescript: {\n      ...defaults.typescript,\n      ...incomingConfig?.typescript,\n    },\n  }\n\n  if (!configWithDefaults?.serverURL) {\n    configWithDefaults.serverURL = ''\n  }\n\n  if (process.env.NEXT_BASE_PATH) {\n    if (!incomingConfig?.routes?.api) {\n      // check for incomingConfig, as configWithDefaults will always have a default value for routes.api\n      configWithDefaults.routes.api = process.env.NEXT_BASE_PATH + '/api'\n    }\n  }\n\n  const config: Partial<SanitizedConfig> = sanitizeAdminConfig(configWithDefaults)\n\n  if (config.localization && config.localization.locales?.length > 0) {\n    // clone localization config so to not break everything\n    const firstLocale = config.localization.locales[0]\n    if (typeof firstLocale === 'string') {\n      config.localization.localeCodes = [\n        ...(config.localization as unknown as LocalizationConfigWithNoLabels).locales,\n      ]\n\n      // is string[], so convert to Locale[]\n      config.localization.locales = (\n        config.localization as unknown as LocalizationConfigWithNoLabels\n      ).locales.map((locale) => ({\n        code: locale,\n        label: locale,\n        rtl: false,\n        toString: () => locale,\n      }))\n    } else {\n      // is Locale[], so convert to string[] for localeCodes\n      config.localization.localeCodes = config.localization.locales.reduce((locales, locale) => {\n        locales.push(locale.code)\n        return locales\n      }, [] as string[])\n\n      config.localization.locales = (\n        config.localization as LocalizationConfigWithLabels\n      ).locales.map((locale) => ({\n        ...locale,\n        toString: () => locale.code,\n      }))\n    }\n\n    // Default fallback to true if not provided\n    config.localization.fallback = config.localization?.fallback ?? true\n  }\n\n  const i18nConfig: SanitizedConfig['i18n'] = {\n    fallbackLanguage: 'en',\n    supportedLanguages: {\n      en,\n    },\n    translations: {},\n  }\n\n  if (incomingConfig?.i18n) {\n    i18nConfig.supportedLanguages =\n      incomingConfig.i18n?.supportedLanguages || i18nConfig.supportedLanguages\n\n    const supportedLangKeys = <AcceptedLanguages[]>Object.keys(i18nConfig.supportedLanguages)\n    const fallbackLang = incomingConfig.i18n?.fallbackLanguage || i18nConfig.fallbackLanguage\n\n    i18nConfig.fallbackLanguage = supportedLangKeys.includes(fallbackLang)\n      ? fallbackLang\n      : supportedLangKeys[0]\n    i18nConfig.translations =\n      (incomingConfig.i18n?.translations as SanitizedConfig['i18n']['translations']) ||\n      i18nConfig.translations\n  }\n\n  config.i18n = i18nConfig\n\n  // Need to add default jobs collection before locked documents collections\n  if (Array.isArray(configWithDefaults.jobs?.tasks) && configWithDefaults.jobs.tasks.length > 0) {\n    let defaultJobsCollection = getDefaultJobsCollection(config as unknown as Config)\n\n    if (typeof configWithDefaults.jobs.jobsCollectionOverrides === 'function') {\n      defaultJobsCollection = configWithDefaults.jobs.jobsCollectionOverrides({\n        defaultJobsCollection,\n      })\n    }\n\n    configWithDefaults.collections.push(defaultJobsCollection)\n  }\n\n  configWithDefaults.collections.push(getLockedDocumentsCollection(config as unknown as Config))\n  configWithDefaults.collections.push(getPreferencesCollection(config as unknown as Config))\n  configWithDefaults.collections.push(migrationsCollection)\n\n  const richTextSanitizationPromises: Array<(config: SanitizedConfig) => Promise<void>> = []\n  for (let i = 0; i < config.collections.length; i++) {\n    config.collections[i] = await sanitizeCollection(\n      config as unknown as Config,\n      config.collections[i],\n      richTextSanitizationPromises,\n    )\n  }\n\n  checkDuplicateCollections(config.collections)\n\n  if (config.globals.length > 0) {\n    config.globals = await sanitizeGlobals(\n      config as unknown as Config,\n      richTextSanitizationPromises,\n    )\n  }\n\n  if (config.serverURL !== '') {\n    config.csrf.push(config.serverURL)\n  }\n\n  // Get deduped list of upload adapters\n  if (!config.upload) {\n    config.upload = { adapters: [] }\n  }\n  config.upload.adapters = Array.from(\n    new Set(config.collections.map((c) => c.upload?.adapter).filter(Boolean)),\n  )\n\n  // Pass through the email config as is so adapters don't break\n  if (incomingConfig.email) {\n    config.email = incomingConfig.email\n  }\n\n  /*\n    Execute richText sanitization\n   */\n  if (typeof incomingConfig.editor === 'function') {\n    config.editor = await incomingConfig.editor({\n      config: config as SanitizedConfig,\n      isRoot: true,\n      parentIsLocalized: false,\n    })\n    if (config.editor.i18n && Object.keys(config.editor.i18n).length >= 0) {\n      config.i18n.translations = deepMergeSimple(config.i18n.translations, config.editor.i18n)\n    }\n  }\n\n  const promises: Promise<void>[] = []\n  for (const sanitizeFunction of richTextSanitizationPromises) {\n    promises.push(sanitizeFunction(config as SanitizedConfig))\n  }\n  await Promise.all(promises)\n\n  return config as SanitizedConfig\n}\n"],"names":["en","deepMergeSimple","defaultUserCollection","sanitizeCollection","migrationsCollection","InvalidConfiguration","sanitizeGlobals","getLockedDocumentsCollection","getPreferencesCollection","getDefaultJobsCollection","checkDuplicateCollections","defaults","sanitizeAdminConfig","configToSanitize","sanitizedConfig","loggingLevels","Forbidden","Locked","MissingFile","NotFound","ValidationError","admin","user","firstCollectionWithAuth","collections","find","auth","Boolean","slug","push","userCollection","sanitizeConfig","incomingConfig","configWithDefaults","meta","routes","graphQL","jobs","access","tasks","workflows","typescript","serverURL","process","env","NEXT_BASE_PATH","api","config","localization","locales","length","firstLocale","localeCodes","map","locale","code","label","rtl","toString","reduce","fallback","i18nConfig","fallbackLanguage","supportedLanguages","translations","i18n","supportedLangKeys","Object","keys","fallbackLang","includes","Array","isArray","defaultJobsCollection","jobsCollectionOverrides","richTextSanitizationPromises","i","globals","csrf","upload","adapters","from","Set","c","adapter","filter","email","editor","isRoot","parentIsLocalized","promises","sanitizeFunction","Promise","all"],"mappings":"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"}