tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: generated template imports (#6832)

Browse Source 
Update templates with import breaking changes
This commit is contained in:
Elliot DeNolf
2024-06-18 11:28:19 -04:00
committed by GitHub
parent cedd916816
commit 040893ff22
22 changed files with 5300 additions and 9023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/create-payload-app/src/lib/configure-payload-config.ts
View File

@@ -114,7 +114,7 @@ export async function configurePayloadConfig(args: {
startMatch: '// storage-adapter-placeholder',
})
if (replacement?.importReplacement) {
if (replacement?.importReplacement !== undefined) {
configLines = replaceInConfigLines({
lines: configLines,
replacement: [replacement.importReplacement],

1
packages/create-payload-app/src/lib/replacements.ts
View File

@@ -63,6 +63,7 @@ const payloadCloudReplacement: StorageAdapterReplacement = {
// Removes placeholders
const diskReplacement: StorageAdapterReplacement = {
configReplacement: [],
importReplacement: '',
}
export const storageReplacements: Record<StorageAdapterType, StorageAdapterReplacement> = {

2
templates/_template/package.json
View File

@@ -32,7 +32,7 @@
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"dotenv": "^16.4.5",
"eslint": "^8",
"eslint-config-next": "^14.2.3",
"eslint-config-next": "15.0.0-rc.0",
"typescript": "^5.4.5"
},
"engines": {

2
templates/_template/src/collections/Media.ts
View File

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

2
templates/_template/src/collections/Users.ts
View File

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

2
templates/_template/src/payload.config.ts
View File

@@ -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'

3
templates/blank/package.json
View File

@@ -9,7 +9,6 @@
"dev": "cross-env NODE_OPTIONS=--no-deprecation next dev",
"devsafe": "rm -rf .next && cross-env NODE_OPTIONS=--no-deprecation next dev",
"generate:types": "payload generate:types",
"ii": "pnpm --ignore-workspace install",
"lint": "cross-env NODE_OPTIONS=--no-deprecation next lint",
"payload": "cross-env NODE_OPTIONS=--no-deprecation payload",
"start": "cross-env NODE_OPTIONS=--no-deprecation next start"
@@ -37,7 +36,7 @@
"typescript": "^5.4.5"
},
"engines": {
"node": "^18.20.2 || >=20.9.0"
"node": "^18.20.2 || >=20.6.0"
},
"pnpm": {
"overrides": {

7212
templates/blank/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

15
templates/blank/src/payload.config.ts
View File

@@ -1,13 +1,12 @@
// storage-adapter-import-placeholder
import { mongooseAdapter } from '@payloadcms/db-mongodb'
import { lexicalEditor } from '@payloadcms/richtext-lexical'
import path from 'path'
import { buildConfig } from 'payload'
import sharp from 'sharp'
import { fileURLToPath } from 'url'
import sharp from 'sharp'
import { Media } from './collections/Media'
import { Users } from './collections/Users'
import { Media } from './collections/Media'
const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)
@@ -17,14 +16,14 @@ export default buildConfig({
user: Users.slug,
},
collections: [Users, Media],
db: mongooseAdapter({
url: process.env.DATABASE_URI || '',
}),
editor: lexicalEditor(),
plugins: [],
secret: process.env.PAYLOAD_SECRET || '',
sharp,
typescript: {
outputFile: path.resolve(dirname, 'payload-types.ts'),
},
db: mongooseAdapter({
url: process.env.DATABASE_URI || '',
}),
sharp,
plugins: [],
})

7042
templates/website/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

4
templates/with-payload-cloud/package.json
View File

@@ -32,11 +32,11 @@
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"dotenv": "^16.4.5",
"eslint": "^8",
"eslint-config-next": "^14.2.3",
"eslint-config-next": "15.0.0-rc.0",
"typescript": "^5.4.5"
},
"engines": {
"node": "^18.20.2 || >=20.9.0"
"node": "^18.20.2 || >=20.6.0"
},
"pnpm": {
"overrides": {

2
templates/with-payload-cloud/src/collections/Media.ts
View File

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

2
templates/with-payload-cloud/src/collections/Users.ts
View File

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

2
templates/with-payload-cloud/src/payload.config.ts
View File

@@ -2,7 +2,7 @@ import { payloadCloudPlugin } from '@payloadcms/plugin-cloud'
import { mongooseAdapter } from '@payloadcms/db-mongodb'
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'

8
templates/with-vercel-mongodb/package.json
View File

@@ -18,13 +18,13 @@
"@payloadcms/next": "beta",
"@payloadcms/plugin-cloud": "beta",
"@payloadcms/richtext-lexical": "beta",
"@payloadcms/storage-vercel-blob": "beta",
"cross-env": "^7.0.3",
"graphql": "^16.8.1",
"next": "15.0.0-rc.0",
"payload": "beta",
"react": "^19.0.0-rc-f994737d14-20240522",
"react-dom": "^19.0.0-rc-f994737d14-20240522"
"react-dom": "^19.0.0-rc-f994737d14-20240522",
"@payloadcms/storage-vercel-blob": "beta"
},
"devDependencies": {
"@types/node": "^20.12.12",
@@ -32,11 +32,11 @@
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"dotenv": "^16.4.5",
"eslint": "^8",
"eslint-config-next": "^14.2.3",
"eslint-config-next": "15.0.0-rc.0",
"typescript": "^5.4.5"
},
"engines": {
"node": "^18.20.2 || >=20.9.0"
"node": "^18.20.2 || >=20.6.0"
},
"pnpm": {
"overrides": {

2
templates/with-vercel-mongodb/src/collections/Media.ts
View File

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

2
templates/with-vercel-mongodb/src/collections/Users.ts
View File

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

2
templates/with-vercel-mongodb/src/payload.config.ts
View File

@@ -2,7 +2,7 @@ import { vercelBlobStorage } from '@payloadcms/storage-vercel-blob'
import { mongooseAdapter } from '@payloadcms/db-mongodb'
import { lexicalEditor } from '@payloadcms/richtext-lexical'
import path from 'path'
import { buildConfig } from 'payload/config'
import { buildConfig } from 'payload'
import { fileURLToPath } from 'url'
import { Users } from './collections/Users'

10
templates/with-vercel-postgres/package.json
View File

@@ -14,17 +14,17 @@
"start": "cross-env NODE_OPTIONS=--no-deprecation next start"
},
"dependencies": {
"@payloadcms/db-postgres": "beta",
"@payloadcms/next": "beta",
"@payloadcms/plugin-cloud": "beta",
"@payloadcms/richtext-lexical": "beta",
"@payloadcms/storage-vercel-blob": "beta",
"cross-env": "^7.0.3",
"graphql": "^16.8.1",
"next": "15.0.0-rc.0",
"payload": "beta",
"react": "^19.0.0-rc-f994737d14-20240522",
"react-dom": "^19.0.0-rc-f994737d14-20240522"
"react-dom": "^19.0.0-rc-f994737d14-20240522",
"@payloadcms/db-postgres": "beta",
"@payloadcms/storage-vercel-blob": "beta"
},
"devDependencies": {
"@types/node": "^20.12.12",
@@ -32,11 +32,11 @@
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"dotenv": "^16.4.5",
"eslint": "^8",
"eslint-config-next": "^14.2.3",
"eslint-config-next": "15.0.0-rc.0",
"typescript": "^5.4.5"
},
"engines": {
"node": "^18.20.2 || >=20.9.0"
"node": "^18.20.2 || >=20.6.0"
},
"pnpm": {
"overrides": {

2
templates/with-vercel-postgres/src/collections/Media.ts
View File

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

2
templates/with-vercel-postgres/src/collections/Users.ts
View File

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

2
templates/with-vercel-postgres/src/payload.config.ts
View File

@@ -2,7 +2,7 @@ import { vercelBlobStorage } from '@payloadcms/storage-vercel-blob'
import { postgresAdapter } from '@payloadcms/db-postgres'
import { lexicalEditor } from '@payloadcms/richtext-lexical'
import path from 'path'
import { buildConfig } from 'payload/config'
import { buildConfig } from 'payload'
import { fileURLToPath } from 'url'
import { Users } from './collections/Users'