create-payload-app 3.0.0-canary.ce278e4 → 3.0.0-canary.ee0375f

package/dist/lib/configure-payload-config.js

@@ -82,7 +82,7 @@ import { dbReplacements, storageReplacements } from './replacements.js';
                 replacement: replacement.configReplacement,
                 startMatch: '// storage-adapter-placeholder'
             });
-            if (replacement?.importReplacement) {
+            if (replacement?.importReplacement !== undefined) {
                 configLines = replaceInConfigLines({
                     lines: configLines,
                     replacement: [

package/dist/lib/configure-payload-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/configure-payload-config.ts"],"sourcesContent":["import fse from 'fs-extra'\nimport globby from 'globby'\nimport path from 'path'\n\nimport type { DbType, StorageAdapterType } from '../types.js'\n\nimport { warning } from '../utils/log.js'\nimport { dbReplacements, storageReplacements } from './replacements.js'\n\n/** Update payload config with necessary imports and adapters */\nexport async function configurePayloadConfig(args: {\n  dbType?: DbType\n  envNames?: {\n    dbUri: string\n  }\n  packageJsonName?: string\n  projectDirOrConfigPath: { payloadConfigPath: string } | { projectDir: string }\n  sharp?: boolean\n  storageAdapter?: StorageAdapterType\n}): Promise<void> {\n  if (!args.dbType) {\n    return\n  }\n\n  // Update package.json\n  const packageJsonPath =\n    'projectDir' in args.projectDirOrConfigPath &&\n    path.resolve(args.projectDirOrConfigPath.projectDir, 'package.json')\n\n  if (packageJsonPath && fse.existsSync(packageJsonPath)) {\n    try {\n      const packageObj = await fse.readJson(packageJsonPath)\n\n      const dbPackage = dbReplacements[args.dbType]\n\n      // Delete all other db adapters\n      Object.values(dbReplacements).forEach((p) => {\n        if (p.packageName !== dbPackage.packageName) {\n          delete packageObj.dependencies[p.packageName]\n        }\n      })\n\n      // Set version of db adapter to match payload version\n      packageObj.dependencies[dbPackage.packageName] = packageObj.dependencies['payload']\n\n      if (args.storageAdapter) {\n        const storagePackage = storageReplacements[args.storageAdapter]\n\n        if (storagePackage?.packageName) {\n          // Set version of storage adapter to match payload version\n          packageObj.dependencies[storagePackage.packageName] = packageObj.dependencies['payload']\n        }\n      }\n\n      // Sharp provided by default, only remove if explicitly set to false\n      if (args.sharp === false) {\n        delete packageObj.dependencies['sharp']\n      }\n\n      if (args.packageJsonName) {\n        packageObj.name = args.packageJsonName\n      }\n\n      await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })\n    } catch (err: unknown) {\n      warning(`Unable to configure Payload in package.json`)\n      warning(err instanceof Error ? err.message : '')\n    }\n  }\n\n  try {\n    let payloadConfigPath: string | undefined\n    if (!('payloadConfigPath' in args.projectDirOrConfigPath)) {\n      payloadConfigPath = (\n        await globby('**/payload.config.ts', {\n          absolute: true,\n          cwd: args.projectDirOrConfigPath.projectDir,\n        })\n      )?.[0]\n    } else {\n      payloadConfigPath = args.projectDirOrConfigPath.payloadConfigPath\n    }\n\n    if (!payloadConfigPath) {\n      warning('Unable to update payload.config.ts with plugins. Could not find payload.config.ts.')\n      return\n    }\n\n    const configContent = fse.readFileSync(payloadConfigPath, 'utf-8')\n    let configLines = configContent.split('\\n')\n\n    // DB Replacement\n    const dbReplacement = dbReplacements[args.dbType]\n\n    configLines = replaceInConfigLines({\n      endMatch: `// database-adapter-config-end`,\n      lines: configLines,\n      replacement: dbReplacement.configReplacement(args.envNames?.dbUri),\n      startMatch: `// database-adapter-config-start`,\n    })\n\n    configLines = replaceInConfigLines({\n      lines: configLines,\n      replacement: [dbReplacement.importReplacement],\n      startMatch: '// database-adapter-import',\n    })\n\n    // Storage Adapter Replacement\n    if (args.storageAdapter) {\n      const replacement = storageReplacements[args.storageAdapter]\n      configLines = replaceInConfigLines({\n        lines: configLines,\n        replacement: replacement.configReplacement,\n        startMatch: '// storage-adapter-placeholder',\n      })\n\n      if (replacement?.importReplacement) {\n        configLines = replaceInConfigLines({\n          lines: configLines,\n          replacement: [replacement.importReplacement],\n          startMatch: '// storage-adapter-import-placeholder',\n        })\n      }\n    }\n\n    // Sharp Replacement (provided by default, only remove if explicitly set to false)\n    if (args.sharp === false) {\n      configLines = replaceInConfigLines({\n        lines: configLines,\n        replacement: [],\n        startMatch: 'sharp,',\n      })\n      configLines = replaceInConfigLines({\n        lines: configLines,\n        replacement: [],\n        startMatch: \"import sharp from 'sharp'\",\n      })\n    }\n\n    fse.writeFileSync(payloadConfigPath, configLines.join('\\n'))\n  } catch (err: unknown) {\n    warning(\n      `Unable to update payload.config.ts with plugins: ${err instanceof Error ? err.message : ''}`,\n    )\n  }\n}\n\nfunction replaceInConfigLines({\n  endMatch,\n  lines,\n  replacement,\n  startMatch,\n}: {\n  /** Optional endMatch to replace multiple lines */\n  endMatch?: string\n  lines: string[]\n  replacement: string[]\n  startMatch: string\n}) {\n  if (!replacement) {\n    return lines\n  }\n\n  const startIndex = lines.findIndex((l) => l.includes(startMatch))\n  const endIndex = endMatch ? lines.findIndex((l) => l.includes(endMatch)) : startIndex\n\n  if (startIndex === -1 || endIndex === -1) {\n    return lines\n  }\n\n  lines.splice(startIndex, endIndex - startIndex + 1, ...replacement)\n  return lines\n}\n"],"names":["fse","globby","path","warning","dbReplacements","storageReplacements","configurePayloadConfig","args","dbType","packageJsonPath","projectDirOrConfigPath","resolve","projectDir","existsSync","packageObj","readJson","dbPackage","Object","values","forEach","p","packageName","dependencies","storageAdapter","storagePackage","sharp","packageJsonName","name","writeJson","spaces","err","Error","message","payloadConfigPath","absolute","cwd","configContent","readFileSync","configLines","split","dbReplacement","replaceInConfigLines","endMatch","lines","replacement","configReplacement","envNames","dbUri","startMatch","importReplacement","writeFileSync","join","startIndex","findIndex","l","includes","endIndex","splice"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/lib/configure-payload-config.ts"],"sourcesContent":["import fse from 'fs-extra'\nimport globby from 'globby'\nimport path from 'path'\n\nimport type { DbType, StorageAdapterType } from '../types.js'\n\nimport { warning } from '../utils/log.js'\nimport { dbReplacements, storageReplacements } from './replacements.js'\n\n/** Update payload config with necessary imports and adapters */\nexport async function configurePayloadConfig(args: {\n  dbType?: DbType\n  envNames?: {\n    dbUri: string\n  }\n  packageJsonName?: string\n  projectDirOrConfigPath: { payloadConfigPath: string } | { projectDir: string }\n  sharp?: boolean\n  storageAdapter?: StorageAdapterType\n}): Promise<void> {\n  if (!args.dbType) {\n    return\n  }\n\n  // Update package.json\n  const packageJsonPath =\n    'projectDir' in args.projectDirOrConfigPath &&\n    path.resolve(args.projectDirOrConfigPath.projectDir, 'package.json')\n\n  if (packageJsonPath && fse.existsSync(packageJsonPath)) {\n    try {\n      const packageObj = await fse.readJson(packageJsonPath)\n\n      const dbPackage = dbReplacements[args.dbType]\n\n      // Delete all other db adapters\n      Object.values(dbReplacements).forEach((p) => {\n        if (p.packageName !== dbPackage.packageName) {\n          delete packageObj.dependencies[p.packageName]\n        }\n      })\n\n      // Set version of db adapter to match payload version\n      packageObj.dependencies[dbPackage.packageName] = packageObj.dependencies['payload']\n\n      if (args.storageAdapter) {\n        const storagePackage = storageReplacements[args.storageAdapter]\n\n        if (storagePackage?.packageName) {\n          // Set version of storage adapter to match payload version\n          packageObj.dependencies[storagePackage.packageName] = packageObj.dependencies['payload']\n        }\n      }\n\n      // Sharp provided by default, only remove if explicitly set to false\n      if (args.sharp === false) {\n        delete packageObj.dependencies['sharp']\n      }\n\n      if (args.packageJsonName) {\n        packageObj.name = args.packageJsonName\n      }\n\n      await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })\n    } catch (err: unknown) {\n      warning(`Unable to configure Payload in package.json`)\n      warning(err instanceof Error ? err.message : '')\n    }\n  }\n\n  try {\n    let payloadConfigPath: string | undefined\n    if (!('payloadConfigPath' in args.projectDirOrConfigPath)) {\n      payloadConfigPath = (\n        await globby('**/payload.config.ts', {\n          absolute: true,\n          cwd: args.projectDirOrConfigPath.projectDir,\n        })\n      )?.[0]\n    } else {\n      payloadConfigPath = args.projectDirOrConfigPath.payloadConfigPath\n    }\n\n    if (!payloadConfigPath) {\n      warning('Unable to update payload.config.ts with plugins. Could not find payload.config.ts.')\n      return\n    }\n\n    const configContent = fse.readFileSync(payloadConfigPath, 'utf-8')\n    let configLines = configContent.split('\\n')\n\n    // DB Replacement\n    const dbReplacement = dbReplacements[args.dbType]\n\n    configLines = replaceInConfigLines({\n      endMatch: `// database-adapter-config-end`,\n      lines: configLines,\n      replacement: dbReplacement.configReplacement(args.envNames?.dbUri),\n      startMatch: `// database-adapter-config-start`,\n    })\n\n    configLines = replaceInConfigLines({\n      lines: configLines,\n      replacement: [dbReplacement.importReplacement],\n      startMatch: '// database-adapter-import',\n    })\n\n    // Storage Adapter Replacement\n    if (args.storageAdapter) {\n      const replacement = storageReplacements[args.storageAdapter]\n      configLines = replaceInConfigLines({\n        lines: configLines,\n        replacement: replacement.configReplacement,\n        startMatch: '// storage-adapter-placeholder',\n      })\n\n      if (replacement?.importReplacement !== undefined) {\n        configLines = replaceInConfigLines({\n          lines: configLines,\n          replacement: [replacement.importReplacement],\n          startMatch: '// storage-adapter-import-placeholder',\n        })\n      }\n    }\n\n    // Sharp Replacement (provided by default, only remove if explicitly set to false)\n    if (args.sharp === false) {\n      configLines = replaceInConfigLines({\n        lines: configLines,\n        replacement: [],\n        startMatch: 'sharp,',\n      })\n      configLines = replaceInConfigLines({\n        lines: configLines,\n        replacement: [],\n        startMatch: \"import sharp from 'sharp'\",\n      })\n    }\n\n    fse.writeFileSync(payloadConfigPath, configLines.join('\\n'))\n  } catch (err: unknown) {\n    warning(\n      `Unable to update payload.config.ts with plugins: ${err instanceof Error ? err.message : ''}`,\n    )\n  }\n}\n\nfunction replaceInConfigLines({\n  endMatch,\n  lines,\n  replacement,\n  startMatch,\n}: {\n  /** Optional endMatch to replace multiple lines */\n  endMatch?: string\n  lines: string[]\n  replacement: string[]\n  startMatch: string\n}) {\n  if (!replacement) {\n    return lines\n  }\n\n  const startIndex = lines.findIndex((l) => l.includes(startMatch))\n  const endIndex = endMatch ? lines.findIndex((l) => l.includes(endMatch)) : startIndex\n\n  if (startIndex === -1 || endIndex === -1) {\n    return lines\n  }\n\n  lines.splice(startIndex, endIndex - startIndex + 1, ...replacement)\n  return lines\n}\n"],"names":["fse","globby","path","warning","dbReplacements","storageReplacements","configurePayloadConfig","args","dbType","packageJsonPath","projectDirOrConfigPath","resolve","projectDir","existsSync","packageObj","readJson","dbPackage","Object","values","forEach","p","packageName","dependencies","storageAdapter","storagePackage","sharp","packageJsonName","name","writeJson","spaces","err","Error","message","payloadConfigPath","absolute","cwd","configContent","readFileSync","configLines","split","dbReplacement","replaceInConfigLines","endMatch","lines","replacement","configReplacement","envNames","dbUri","startMatch","importReplacement","undefined","writeFileSync","join","startIndex","findIndex","l","includes","endIndex","splice"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/lib/replacements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replacements.d.ts","sourceRoot":"","sources":["../../src/lib/replacements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE7D,KAAK,oBAAoB,GAAG;IAC1B,iBAAiB,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;IACjD,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAyBD,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAG/D,CAAA;AAED,KAAK,yBAAyB,GAAG;IAC/B,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AA2BD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,kBAAkB,EAAE,yBAAyB,CAIrF,CAAA;AAED;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,iBAAiB,EAAE;QACjB,KAAK,EAAE,MAAM,CAAA;QACb,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAUhE,CAAA"}
+{"version":3,"file":"replacements.d.ts","sourceRoot":"","sources":["../../src/lib/replacements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE7D,KAAK,oBAAoB,GAAG;IAC1B,iBAAiB,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;IACjD,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAyBD,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAG/D,CAAA;AAED,KAAK,yBAAyB,GAAG;IAC/B,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AA4BD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,kBAAkB,EAAE,yBAAyB,CAIrF,CAAA;AAED;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,iBAAiB,EAAE;QACjB,KAAK,EAAE,MAAM,CAAA;QACb,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAUhE,CAAA"}

package/dist/lib/replacements.js

@@ -45,7 +45,8 @@ const payloadCloudReplacement = {
 };
 // Removes placeholders
 const diskReplacement = {
-    configReplacement: []
+    configReplacement: [],
+    importReplacement: ''
 };
 export const storageReplacements = {
     localDisk: diskReplacement,

package/dist/lib/replacements.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/replacements.ts"],"sourcesContent":["import type { DbType, StorageAdapterType } from '../types.js'\n\ntype DbAdapterReplacement = {\n  configReplacement: (envName?: string) => string[]\n  importReplacement: string\n  packageName: string\n}\n\nconst mongodbReplacement: DbAdapterReplacement = {\n  // Replacement between `// database-adapter-config-start` and `// database-adapter-config-end`\n  configReplacement: (envName = 'DATABASE_URI') => [\n    '  db: mongooseAdapter({',\n    `    url: process.env.${envName} || '',`,\n    '  }),',\n  ],\n  importReplacement: \"import { mongooseAdapter } from '@payloadcms/db-mongodb'\",\n  packageName: '@payloadcms/db-mongodb',\n}\n\nconst postgresReplacement: DbAdapterReplacement = {\n  configReplacement: (envName = 'DATABASE_URI') => [\n    '  db: postgresAdapter({',\n    '    pool: {',\n    `      connectionString: process.env.${envName} || '',`,\n    '    },',\n    '  }),',\n  ],\n  importReplacement: \"import { postgresAdapter } from '@payloadcms/db-postgres'\",\n  packageName: '@payloadcms/db-postgres',\n}\n\nexport const dbReplacements: Record<DbType, DbAdapterReplacement> = {\n  mongodb: mongodbReplacement,\n  postgres: postgresReplacement,\n}\n\ntype StorageAdapterReplacement = {\n  configReplacement: string[]\n  importReplacement?: string\n  packageName?: string\n}\n\nconst vercelBlobStorageReplacement: StorageAdapterReplacement = {\n  // Replacement of `// storage-adapter-placeholder`\n  configReplacement: [\n    '    vercelBlobStorage({',\n    '      collections: {',\n    '        [Media.slug]: true,',\n    '      },',\n    \"      token: process.env.BLOB_READ_WRITE_TOKEN || '',\",\n    '    }),',\n  ],\n  importReplacement: \"import { vercelBlobStorage } from '@payloadcms/storage-vercel-blob'\",\n  packageName: '@payloadcms/storage-vercel-blob',\n}\n\nconst payloadCloudReplacement: StorageAdapterReplacement = {\n  configReplacement: ['    payloadCloudPlugin(),'],\n  importReplacement: \"import { payloadCloudPlugin } from '@payloadcms/plugin-cloud'\",\n  packageName: '@payloadcms/plugin-cloud',\n}\n\n// Removes placeholders\nconst diskReplacement: StorageAdapterReplacement = {\n  configReplacement: [],\n}\n\nexport const storageReplacements: Record<StorageAdapterType, StorageAdapterReplacement> = {\n  localDisk: diskReplacement,\n  payloadCloud: payloadCloudReplacement,\n  vercelBlobStorage: vercelBlobStorageReplacement,\n}\n\n/**\n * Generic config replacement\n */\ntype ConfigReplacement = {\n  configReplacement: {\n    match: string\n    replacement: string\n  }\n  importReplacement: string\n  packageName: string\n}\n\nexport const configReplacements: Record<string, ConfigReplacement> = {\n  sharp: {\n    // Replacement of `sharp, // Now optional`\n    configReplacement: {\n      match: 'sharp,',\n      replacement: '  // sharp,',\n    },\n    importReplacement: \"import sharp from 'sharp'\",\n    packageName: 'sharp',\n  },\n}\n"],"names":["mongodbReplacement","configReplacement","envName","importReplacement","packageName","postgresReplacement","dbReplacements","mongodb","postgres","vercelBlobStorageReplacement","payloadCloudReplacement","diskReplacement","storageReplacements","localDisk","payloadCloud","vercelBlobStorage","configReplacements","sharp","match","replacement"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAQA,MAAMA,qBAA2C;IAC/C,8FAA8F;IAC9FC,mBAAmB,CAACC,UAAU,cAAc,GAAK;YAC/C;YACA,CAAC,qBAAqB,EAAEA,QAAQ,OAAO,CAAC;YACxC;SACD;IACDC,mBAAmB;IACnBC,aAAa;AACf;AAEA,MAAMC,sBAA4C;IAChDJ,mBAAmB,CAACC,UAAU,cAAc,GAAK;YAC/C;YACA;YACA,CAAC,oCAAoC,EAAEA,QAAQ,OAAO,CAAC;YACvD;YACA;SACD;IACDC,mBAAmB;IACnBC,aAAa;AACf;AAEA,OAAO,MAAME,iBAAuD;IAClEC,SAASP;IACTQ,UAAUH;AACZ,EAAC;AAQD,MAAMI,+BAA0D;IAC9D,kDAAkD;IAClDR,mBAAmB;QACjB;QACA;QACA;QACA;QACA;QACA;KACD;IACDE,mBAAmB;IACnBC,aAAa;AACf;AAEA,MAAMM,0BAAqD;IACzDT,mBAAmB;QAAC;KAA4B;IAChDE,mBAAmB;IACnBC,aAAa;AACf;AAEA,uBAAuB;AACvB,MAAMO,kBAA6C;IACjDV,mBAAmB,EAAE;AACvB;AAEA,OAAO,MAAMW,sBAA6E;IACxFC,WAAWF;IACXG,cAAcJ;IACdK,mBAAmBN;AACrB,EAAC;AAcD,OAAO,MAAMO,qBAAwD;IACnEC,OAAO;QACL,0CAA0C;QAC1ChB,mBAAmB;YACjBiB,OAAO;YACPC,aAAa;QACf;QACAhB,mBAAmB;QACnBC,aAAa;IACf;AACF,EAAC"}
+{"version":3,"sources":["../../src/lib/replacements.ts"],"sourcesContent":["import type { DbType, StorageAdapterType } from '../types.js'\n\ntype DbAdapterReplacement = {\n  configReplacement: (envName?: string) => string[]\n  importReplacement: string\n  packageName: string\n}\n\nconst mongodbReplacement: DbAdapterReplacement = {\n  // Replacement between `// database-adapter-config-start` and `// database-adapter-config-end`\n  configReplacement: (envName = 'DATABASE_URI') => [\n    '  db: mongooseAdapter({',\n    `    url: process.env.${envName} || '',`,\n    '  }),',\n  ],\n  importReplacement: \"import { mongooseAdapter } from '@payloadcms/db-mongodb'\",\n  packageName: '@payloadcms/db-mongodb',\n}\n\nconst postgresReplacement: DbAdapterReplacement = {\n  configReplacement: (envName = 'DATABASE_URI') => [\n    '  db: postgresAdapter({',\n    '    pool: {',\n    `      connectionString: process.env.${envName} || '',`,\n    '    },',\n    '  }),',\n  ],\n  importReplacement: \"import { postgresAdapter } from '@payloadcms/db-postgres'\",\n  packageName: '@payloadcms/db-postgres',\n}\n\nexport const dbReplacements: Record<DbType, DbAdapterReplacement> = {\n  mongodb: mongodbReplacement,\n  postgres: postgresReplacement,\n}\n\ntype StorageAdapterReplacement = {\n  configReplacement: string[]\n  importReplacement?: string\n  packageName?: string\n}\n\nconst vercelBlobStorageReplacement: StorageAdapterReplacement = {\n  // Replacement of `// storage-adapter-placeholder`\n  configReplacement: [\n    '    vercelBlobStorage({',\n    '      collections: {',\n    '        [Media.slug]: true,',\n    '      },',\n    \"      token: process.env.BLOB_READ_WRITE_TOKEN || '',\",\n    '    }),',\n  ],\n  importReplacement: \"import { vercelBlobStorage } from '@payloadcms/storage-vercel-blob'\",\n  packageName: '@payloadcms/storage-vercel-blob',\n}\n\nconst payloadCloudReplacement: StorageAdapterReplacement = {\n  configReplacement: ['    payloadCloudPlugin(),'],\n  importReplacement: \"import { payloadCloudPlugin } from '@payloadcms/plugin-cloud'\",\n  packageName: '@payloadcms/plugin-cloud',\n}\n\n// Removes placeholders\nconst diskReplacement: StorageAdapterReplacement = {\n  configReplacement: [],\n  importReplacement: '',\n}\n\nexport const storageReplacements: Record<StorageAdapterType, StorageAdapterReplacement> = {\n  localDisk: diskReplacement,\n  payloadCloud: payloadCloudReplacement,\n  vercelBlobStorage: vercelBlobStorageReplacement,\n}\n\n/**\n * Generic config replacement\n */\ntype ConfigReplacement = {\n  configReplacement: {\n    match: string\n    replacement: string\n  }\n  importReplacement: string\n  packageName: string\n}\n\nexport const configReplacements: Record<string, ConfigReplacement> = {\n  sharp: {\n    // Replacement of `sharp, // Now optional`\n    configReplacement: {\n      match: 'sharp,',\n      replacement: '  // sharp,',\n    },\n    importReplacement: \"import sharp from 'sharp'\",\n    packageName: 'sharp',\n  },\n}\n"],"names":["mongodbReplacement","configReplacement","envName","importReplacement","packageName","postgresReplacement","dbReplacements","mongodb","postgres","vercelBlobStorageReplacement","payloadCloudReplacement","diskReplacement","storageReplacements","localDisk","payloadCloud","vercelBlobStorage","configReplacements","sharp","match","replacement"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAQA,MAAMA,qBAA2C;IAC/C,8FAA8F;IAC9FC,mBAAmB,CAACC,UAAU,cAAc,GAAK;YAC/C;YACA,CAAC,qBAAqB,EAAEA,QAAQ,OAAO,CAAC;YACxC;SACD;IACDC,mBAAmB;IACnBC,aAAa;AACf;AAEA,MAAMC,sBAA4C;IAChDJ,mBAAmB,CAACC,UAAU,cAAc,GAAK;YAC/C;YACA;YACA,CAAC,oCAAoC,EAAEA,QAAQ,OAAO,CAAC;YACvD;YACA;SACD;IACDC,mBAAmB;IACnBC,aAAa;AACf;AAEA,OAAO,MAAME,iBAAuD;IAClEC,SAASP;IACTQ,UAAUH;AACZ,EAAC;AAQD,MAAMI,+BAA0D;IAC9D,kDAAkD;IAClDR,mBAAmB;QACjB;QACA;QACA;QACA;QACA;QACA;KACD;IACDE,mBAAmB;IACnBC,aAAa;AACf;AAEA,MAAMM,0BAAqD;IACzDT,mBAAmB;QAAC;KAA4B;IAChDE,mBAAmB;IACnBC,aAAa;AACf;AAEA,uBAAuB;AACvB,MAAMO,kBAA6C;IACjDV,mBAAmB,EAAE;IACrBE,mBAAmB;AACrB;AAEA,OAAO,MAAMS,sBAA6E;IACxFC,WAAWF;IACXG,cAAcJ;IACdK,mBAAmBN;AACrB,EAAC;AAcD,OAAO,MAAMO,qBAAwD;IACnEC,OAAO;QACL,0CAA0C;QAC1ChB,mBAAmB;YACjBiB,OAAO;YACPC,aAAa;QACf;QACAhB,mBAAmB;QACnBC,aAAa;IACf;AACF,EAAC"}

package/dist/template/src/collections/Media.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from 'payload/types'
+import type { CollectionConfig } from 'payload'
 
 export const Media: CollectionConfig = {
   slug: 'media',

package/dist/template/src/collections/Users.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from 'payload/types'
+import type { CollectionConfig } from 'payload'
 
 export const Users: CollectionConfig = {
   slug: 'users',

package/dist/template/src/payload.config.ts

@@ -2,7 +2,7 @@
 import { mongooseAdapter } from '@payloadcms/db-mongodb' // database-adapter-import
 import { lexicalEditor } from '@payloadcms/richtext-lexical'
 import path from 'path'
-import { buildConfig } from 'payload/config'
+import { buildConfig } from 'payload'
 import { fileURLToPath } from 'url'
 import sharp from 'sharp'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-canary.ce278e4",
+  "version": "3.0.0-canary.ee0375f",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",