Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions packages/create-payload-app/src/lib/replacements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@ const vercelBlobStorageReplacement: StorageAdapterReplacement = {
packageName: '@payloadcms/storage-vercel-blob',
}

const r2StorageReplacement: StorageAdapterReplacement = {
// Replacement of `// storage-adapter-placeholder`
configReplacement: [
' r2Storage({',
' bucket: cloudflare.env.R2,',
' collections: { media: true },',
' }),',
],
importReplacement: "import { r2Storage } from '@payloadcms/storage-r2'",
packageName: '@payloadcms/storage-r2',
}

// Removes placeholders
const diskReplacement: StorageAdapterReplacement = {
configReplacement: [],
Expand All @@ -97,6 +109,7 @@ const diskReplacement: StorageAdapterReplacement = {

export const storageReplacements: Record<StorageAdapterType, StorageAdapterReplacement> = {
localDisk: diskReplacement,
r2Storage: r2StorageReplacement,
vercelBlobStorage: vercelBlobStorageReplacement,
}

Expand Down
2 changes: 1 addition & 1 deletion packages/create-payload-app/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ export type NextAppDetails = {

export type NextConfigType = 'cjs' | 'esm' | 'ts'

export type StorageAdapterType = 'localDisk' | 'vercelBlobStorage'
export type StorageAdapterType = 'localDisk' | 'r2Storage' | 'vercelBlobStorage'
19 changes: 18 additions & 1 deletion tools/scripts/src/generate-template-variations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type TemplateVariation = {
*
* @default 'default'
*/
targetDeployment?: 'default' | 'vercel'
targetDeployment?: 'cloudflare' | 'default' | 'vercel'
}

main().catch((error) => {
Expand Down Expand Up @@ -196,6 +196,23 @@ async function main() {
skipReadme: true,
workspace: true,
},
{
name: 'with-cloudflare-d1',
db: 'd1-sqlite',
dirname: 'with-cloudflare-d1',
generateLockfile: false,
sharp: false,
skipConfig: true, // Do not copy the payload.config.ts file from the base template
storage: 'r2Storage',
// The blank template is used as a base for create-payload-app functionality,
// so we do not configure the payload.config.ts file, which leaves the placeholder comments.
configureConfig: false,
base: 'none',
skipDockerCompose: true,
skipReadme: true,
workspace: false,
targetDeployment: 'cloudflare',
},
]

// If template is set, only generate that template
Expand Down