Compare commits

..

10 Commits

Author SHA1 Message Date
Elliot DeNolf
9b58915aff 0.5.0-beta.0 2023-09-29 12:02:05 -04:00
Elliot DeNolf
c1daeb3432 feat: bump template branch to 2.0 2023-09-29 12:02:01 -04:00
Elliot DeNolf
ff8acde322 chore: check DATABASE_URI key 2023-09-19 15:53:06 -04:00
Elliot DeNolf
1bade389e4 test: reorganize tests 2023-09-19 15:42:04 -04:00
Elliot DeNolf
489de652a3 chore(templates): update branch on starter urls temporarily 2023-09-19 15:38:31 -04:00
Elliot DeNolf
166b06e5d8 chore: replace DATABASE_URI env value 2023-09-19 15:11:27 -04:00
Elliot DeNolf
ed143c7a67 test: add debug for cli 2023-09-19 14:58:24 -04:00
Elliot DeNolf
b29e2ae685 test: dependency and config replacement tests 2023-09-19 14:58:10 -04:00
Elliot DeNolf
9bafc0fcbf feat: update templates with bundler and db adapter 2023-09-19 14:23:47 -04:00
Elliot DeNolf
b3db078a5f feat: implement db selection 2023-09-18 12:13:50 -04:00
6 changed files with 903 additions and 1218 deletions

View File

@@ -37,7 +37,7 @@
"prompts": "^2.4.2",
"terminal-link": "^2.1.1"
},
"version": "0.5.0-beta.5",
"version": "0.5.0-beta.0",
"devDependencies": {
"@types/command-exists": "^1.2.0",
"@types/degit": "^2.8.3",

View File

@@ -3,7 +3,7 @@ import path from 'path'
import type { DbDetails } from '../types'
import { warning } from '../utils/log'
import { bundlerPackages, dbPackages, editorPackages } from './packages'
import { bundlerPackages, dbPackages } from './packages'
/** Update payload config with necessary imports and adapters */
export async function configurePayloadConfig(args: {
@@ -19,16 +19,11 @@ export async function configurePayloadConfig(args: {
try {
const packageObj = await fse.readJson(packageJsonPath)
// TODO: Likely revert this once we go to latest
packageObj.dependencies['payload'] = 'beta'
const dbPackage = dbPackages[args.dbDetails.type]
const bundlerPackage = bundlerPackages['webpack']
const editorPackage = editorPackages['lexical']
packageObj.dependencies[dbPackage.packageName] = 'beta'
packageObj.dependencies[bundlerPackage.packageName] = 'beta'
packageObj.dependencies[editorPackage.packageName] = 'beta'
packageObj.dependencies[dbPackage.packageName] = 'latest'
packageObj.dependencies[bundlerPackage.packageName] = 'latest'
await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })
} catch (err: unknown) {
@@ -59,7 +54,6 @@ export async function configurePayloadConfig(args: {
const dbReplacement = dbPackages[args.dbDetails.type]
const bundlerReplacement = bundlerPackages['webpack']
const editorReplacement = editorPackages['lexical']
let dbConfigStartLineIndex: number | undefined
let dbConfigEndLineIndex: number | undefined
@@ -76,14 +70,6 @@ export async function configurePayloadConfig(args: {
configLines[i] = bundlerReplacement.configReplacement
}
if (l.includes('// editor-import')) {
configLines[i] = editorReplacement.importReplacement
}
if (l.includes('// editor-config')) {
configLines[i] = editorReplacement.configReplacement
}
if (l.includes('// database-adapter-config-start')) {
dbConfigStartLineIndex = i
}

View File

@@ -1,4 +1,4 @@
import type { BundlerType, DbType, EditorType } from '../types'
import type { BundlerType, DbType } from '../types'
type DbAdapterReplacement = {
packageName: string
@@ -12,12 +12,6 @@ type BundlerReplacement = {
configReplacement: string
}
type EditorReplacement = {
packageName: string
importReplacement: string
configReplacement: string
}
const mongodbReplacement: DbAdapterReplacement = {
packageName: '@payloadcms/db-mongodb',
importReplacement: "import { mongooseAdapter } from '@payloadcms/db-mongodb'",
@@ -29,12 +23,12 @@ const mongodbReplacement: DbAdapterReplacement = {
],
}
const postgresReplacement: DbAdapterReplacement = {
packageName: '@payloadcms/db-postgres',
importReplacement: "import { postgresAdapter } from '@payloadcms/db-postgres'",
const postgresqlReplacement: DbAdapterReplacement = {
packageName: '@payloadcms/db-postgresql',
importReplacement: "import { postgresqlAdapter } from '@payloadcms/db-postgresql'",
configReplacement: [
' db: postgresAdapter({',
' pool: {',
' db: postgresqlAdapter({',
' client: {',
' connectionString: process.env.DATABASE_URI,',
' },',
' }),',
@@ -43,7 +37,7 @@ const postgresReplacement: DbAdapterReplacement = {
export const dbPackages: Record<DbType, DbAdapterReplacement> = {
mongodb: mongodbReplacement,
postgres: postgresReplacement,
postgres: postgresqlReplacement,
}
const webpackReplacement: BundlerReplacement = {
@@ -63,17 +57,3 @@ export const bundlerPackages: Record<BundlerType, BundlerReplacement> = {
webpack: webpackReplacement,
vite: viteReplacement,
}
export const editorPackages: Record<EditorType, EditorReplacement> = {
slate: {
packageName: '@payloadcms/richtext-slate',
importReplacement: "import { slateEditor } from '@payloadcms/richtext-slate'",
configReplacement: ' editor: slateEditor({}),',
},
lexical: {
packageName: '@payloadcms/richtext-lexical',
importReplacement:
"import { lexicalEditor } from '@payloadcms/richtext-lexical'",
configReplacement: ' editor: lexicalEditor({}),',
},
}

View File

@@ -16,7 +16,7 @@ const dbChoiceRecord: Record<DbType, DbChoice> = {
},
postgres: {
value: 'postgres',
title: 'PostgreSQL (beta)',
title: 'PostgreSQL',
dbConnectionPrefix: 'postgres://127.0.0.1:5432/',
},
}

View File

@@ -55,4 +55,3 @@ export type DbDetails = {
}
export type BundlerType = 'webpack' | 'vite'
export type EditorType = 'lexical' | 'slate'

2062
yarn.lock

File diff suppressed because it is too large Load Diff