Compare commits
10 Commits
v0.5.0-bet
...
v0.5.0-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b58915aff | ||
|
|
c1daeb3432 | ||
|
|
ff8acde322 | ||
|
|
1bade389e4 | ||
|
|
489de652a3 | ||
|
|
166b06e5d8 | ||
|
|
ed143c7a67 | ||
|
|
b29e2ae685 | ||
|
|
9bafc0fcbf | ||
|
|
b3db078a5f |
@@ -37,7 +37,7 @@
|
||||
"prompts": "^2.4.2",
|
||||
"terminal-link": "^2.1.1"
|
||||
},
|
||||
"version": "0.5.0-beta.6",
|
||||
"version": "0.5.0-beta.0",
|
||||
"devDependencies": {
|
||||
"@types/command-exists": "^1.2.0",
|
||||
"@types/degit": "^2.8.3",
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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({}),',
|
||||
},
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ const dbChoiceRecord: Record<DbType, DbChoice> = {
|
||||
},
|
||||
postgres: {
|
||||
value: 'postgres',
|
||||
title: 'PostgreSQL (beta)',
|
||||
title: 'PostgreSQL',
|
||||
dbConnectionPrefix: 'postgres://127.0.0.1:5432/',
|
||||
},
|
||||
}
|
||||
@@ -70,7 +70,7 @@ export async function selectDb(
|
||||
{
|
||||
type: 'text',
|
||||
name: 'value',
|
||||
message: `Enter ${dbChoice.title.split(' ')[0]} connection string`, // strip beta from title
|
||||
message: `Enter ${dbChoice.title} connection string`,
|
||||
initial: `${dbChoice.dbConnectionPrefix}${
|
||||
projectName === '.'
|
||||
? `payload-${getRandomDigitSuffix()}`
|
||||
|
||||
@@ -31,7 +31,6 @@ export class Main {
|
||||
'--dry-run': Boolean,
|
||||
'--beta': Boolean,
|
||||
|
||||
'-d': '--db',
|
||||
'-h': '--help',
|
||||
'-n': '--name',
|
||||
'-t': '--template',
|
||||
|
||||
@@ -55,4 +55,3 @@ export type DbDetails = {
|
||||
}
|
||||
|
||||
export type BundlerType = 'webpack' | 'vite'
|
||||
export type EditorType = 'lexical' | 'slate'
|
||||
|
||||
Reference in New Issue
Block a user