chore(release): v3.0.0-beta.10 [skip ci]

BREAKING: Changes the classnames of the converted HTML

.github/workflows/main.yml

@@ -2,9 +2,13 @@ name: build
 
 on:
   pull_request:
-    types: [ opened, reopened, synchronize ]
+    types: [opened, reopened, synchronize]
   push:
-    branches: ['main', 'alpha']
+    branches: ['main', 'beta']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   changes:
@@ -35,7 +39,7 @@ jobs:
           echo "needs_build: ${{ steps.filter.outputs.needs_build }}"
           echo "templates: ${{ steps.filter.outputs.templates }}"
 
-  core-build:
+  build:
     needs: changes
     if: ${{ needs.changes.outputs.needs_build == 'true' }}
     runs-on: ubuntu-latest
@@ -61,34 +65,31 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        timeout-minutes: 720
         with:
           path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          key: pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-            ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            pnpm-store-
+            pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
 
       - run: pnpm install
-      - run: pnpm run build:core
+      - run: pnpm run build:all
 
       - name: Cache build
         uses: actions/cache@v4
+        timeout-minutes: 10
         with:
           path: ./*
           key: ${{ github.sha }}-${{ github.run_number }}
 
-  plugins-build:
-    needs: changes
-    if: ${{ needs.changes.outputs.needs_build == 'true' }}
+  tests-unit:
     runs-on: ubuntu-latest
+    needs: build
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 25
-
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
@@ -100,32 +101,27 @@ jobs:
           version: 8
           run_install: false
 
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
+      - name: Restore build
+        uses: actions/cache@v4
+        timeout-minutes: 10
         with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-            ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          path: ./*
+          key: ${{ github.sha }}-${{ github.run_number }}
 
-      - run: pnpm install
-      - run: pnpm run build:plugins
+      - name: Unit Tests
+        run: pnpm test:unit
+        env:
+          NODE_OPTIONS: --max-old-space-size=8096
 
-  tests:
+  tests-int:
     runs-on: ubuntu-latest
-    needs: core-build
+    needs: build
     strategy:
       fail-fast: false
       matrix:
         database:
-         - mongodb
-        #  - postgres
+          - mongodb
+          - postgres
         #  - postgres-custom-schema
         #  - postgres-uuid
         #  - supabase
@@ -152,6 +148,7 @@ jobs:
 
       - name: Restore build
         uses: actions/cache@v4
+        timeout-minutes: 10
         with:
           path: ./*
           key: ${{ github.sha }}-${{ github.run_number }}
@@ -162,7 +159,7 @@ jobs:
       - name: Start PostgreSQL
         uses: CasperWA/postgresql-action@v1.2
         with:
-          postgresql version: '14'  # See https://hub.docker.com/_/postgres for available versions
+          postgresql version: '14' # See https://hub.docker.com/_/postgres for available versions
           postgresql db: ${{ env.POSTGRES_DB }}
           postgresql user: ${{ env.POSTGRES_USER }}
           postgresql password: ${{ env.POSTGRES_PASSWORD }}
@@ -202,7 +199,7 @@ jobs:
         if: matrix.database == 'supabase'
 
       - name: Integration Tests
-        run: pnpm test:int --testPathIgnorePatterns=test/fields # Ignore fields tests until reworked
+        run: pnpm test:int
         env:
           NODE_OPTIONS: --max-old-space-size=8096
           PAYLOAD_DATABASE: ${{ matrix.database }}
@@ -210,7 +207,7 @@ jobs:
 
   tests-e2e:
     runs-on: ubuntu-latest
-    needs: core-build
+    needs: build
     strategy:
       fail-fast: false
       matrix:
@@ -218,18 +215,23 @@ jobs:
         suite:
           - _community
           - access-control
-          # - admin
+          - admin
           - auth
-          # - field-error-states
-          # - fields-relationship
-          # - fields
-          # - live-preview
-          # - localization
-          # - plugin-nested-docs
-          # - plugin-seo
-          # - refresh-permissions
-          # - uploads
-          # - versions
+          - email
+          - field-error-states
+          - fields-relationship
+          - fields
+          - fields__collections__Blocks
+          - fields__collections__Array
+          - fields__collections__Relationship
+          - fields__collections__Lexical
+          - live-preview
+          - localization
+          - plugin-form-builder
+          - plugin-nested-docs
+          - plugin-seo
+          - versions
+          - uploads
 
     steps:
       - name: Use Node.js 18
@@ -245,32 +247,28 @@ jobs:
 
       - name: Restore build
         uses: actions/cache@v4
+        timeout-minutes: 10
         with:
           path: ./*
           key: ${{ github.sha }}-${{ github.run_number }}
 
       - name: Install Playwright
-        run: pnpm exec playwright install
+        run: pnpm exec playwright install --with-deps
 
       - name: E2E Tests
-        uses: nick-fields/retry@v3
-        with:
-          retry_on: error
-          max_attempts: 2
-          timeout_minutes: 15
-          command: pnpm test:e2e ${{ matrix.suite }}
+        run: pnpm test:e2e ${{ matrix.suite }}
 
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results
+          name: test-results-${{ matrix.suite }}
           path: test/test-results/
           retention-days: 1
 
   tests-type-generation:
     if: false # This should be replaced with gen on a real Payload project
     runs-on: ubuntu-latest
-    needs: core-build
+    needs: build
 
     steps:
       - name: Use Node.js 18
@@ -286,6 +284,7 @@ jobs:
 
       - name: Restore build
         uses: actions/cache@v4
+        timeout-minutes: 10
         with:
           path: ./*
           key: ${{ github.sha }}-${{ github.run_number }}
@@ -296,47 +295,6 @@ jobs:
       - name: Generate GraphQL schema file
         run: pnpm dev:generate-graphql-schema graphql-schema-gen
 
-  plugins:
-    runs-on: ubuntu-latest
-    needs: core-build
-    strategy:
-      fail-fast: false
-      matrix:
-        pkg:
-          - create-payload-app
-          - plugin-cloud
-          - plugin-cloud-storage
-          - plugin-form-builder
-          - plugin-nested-docs
-          - plugin-search
-          - plugin-sentry
-          - plugin-seo
-
-    steps:
-      - name: Use Node.js 18
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 8
-          run_install: false
-
-      - name: Restore build
-        uses: actions/cache@v4
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
-
-      - name: Build ${{ matrix.pkg }}
-        run: pnpm turbo run build --filter=${{ matrix.pkg }}
-
-      - name: Test ${{ matrix.pkg }}
-        run: pnpm --filter ${{ matrix.pkg }} run test
-        if: matrix.pkg != 'create-payload-app' # degit doesn't work within GitHub Actions
-
   templates:
     needs: changes
     if: false # Disable until templates are updated for 3.0
@@ -344,7 +302,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        template: [ blank, website, ecommerce ]
+        template: [blank, website, ecommerce]
 
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -3,6 +3,7 @@ package-lock.json
 dist
 /.idea/*
 !/.idea/runConfigurations
+!/.idea/payload.iml
 
 test-results
 .devcontainer
@@ -15,6 +16,7 @@ test-results
 
 # Ignore test directory media folder/files
 /media
+test/media
 /versions
 
 # Created by https://www.toptal.com/developers/gitignore/api/node,macos,windows,webstorm,sublimetext,visualstudiocode
@@ -288,4 +290,4 @@ $RECYCLE.BIN/
 # End of https://www.toptal.com/developers/gitignore/api/node,macos,windows,webstorm,sublimetext,visualstudiocode
 
 /build
-.swc
+.swc

.idea/payload.iml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/payload/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/payload/components" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/payload/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/.swc" />
+      <excludeFolder url="file://$MODULE_DIR$/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/examples" />
+      <excludeFolder url="file://$MODULE_DIR$/media" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/create-payload-app/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/create-payload-app/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/db-mongodb/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/db-mongodb/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/db-postgres/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/db-postgres/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/graphql/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/graphql/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/live-preview-react/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/live-preview-react/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/live-preview/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/live-preview/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/next/.swc" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/next/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/payload/fields" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-cloud-storage/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-cloud-storage/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-cloud/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-cloud/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-form-builder/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-nested-docs/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-nested-docs/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-redirects/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-redirects/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-search/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-search/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-sentry/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-seo/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-seo/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/plugin-stripe/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/richtext-lexical/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/richtext-lexical/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/templates" />
+      <excludeFolder url="file://$MODULE_DIR$/test/.swc" />
+      <excludeFolder url="file://$MODULE_DIR$/versions" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.node-version

@@ -1 +1 @@
-v18.19.1
+v18.20.2

.nvmrc

@@ -1 +1 @@
-v18.19.1
+v18.20.2

.prettierignore

@@ -9,4 +9,6 @@
 **/node_modules
 **/temp
 **/docs/**
-./tsconfig.json
+tsconfig.json
+packages/payload/*.js
+packages/payload/*.d.ts

.vscode/launch.json

@@ -10,19 +10,37 @@
       "cwd": "${workspaceFolder}"
     },
     {
-      "command": "pnpm run dev _community -- --no-turbo",
+      "command": "node --no-deprecation test/dev.js _community",
       "cwd": "${workspaceFolder}",
       "name": "Run Dev Community",
       "request": "launch",
       "type": "node-terminal"
     },
     {
-      "command": "pnpm run dev live-preview -- --no-turbo",
+      "command": "node --no-deprecation test/dev.js live-preview",
       "cwd": "${workspaceFolder}",
       "name": "Run Dev Live Preview",
       "request": "launch",
       "type": "node-terminal"
     },
+    {
+      "command": "node --no-deprecation test/loader/init.js",
+      "cwd": "${workspaceFolder}",
+      "name": "Run Loader",
+      "request": "launch",
+      "type": "node-terminal",
+      "env": {
+        "LOADER_TEST_FILE_PATH": "./dependency-test.js"
+        // "LOADER_TEST_FILE_PATH": "../fields/config.ts"
+      }
+    },
+    {
+      "command": "node --no-deprecation test/dev.js admin",
+      "cwd": "${workspaceFolder}",
+      "name": "Run Dev Admin",
+      "request": "launch",
+      "type": "node-terminal"
+    },
     {
       "command": "pnpm run dev plugin-cloud-storage",
       "cwd": "${workspaceFolder}",
@@ -34,18 +52,21 @@
       }
     },
     {
-      "command": "pnpm run dev fields",
+      "command": "node --no-deprecation test/dev.js fields",
       "cwd": "${workspaceFolder}",
       "name": "Run Dev Fields",
       "request": "launch",
       "type": "node-terminal"
     },
     {
-      "command": "pnpm run dev:postgres versions",
+      "command": "node --no-deprecation test/dev.js versions",
       "cwd": "${workspaceFolder}",
       "name": "Run Dev Postgres",
       "request": "launch",
-      "type": "node-terminal"
+      "type": "node-terminal",
+      "env": {
+        "PAYLOAD_DATABASE": "postgres"
+      }
     },
     {
       "command": "pnpm run dev versions",

app/(payload)/admin/[[...segments]]/not-found.tsx

@@ -1,7 +1,9 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+import type { Metadata } from 'next'
+
 import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { NotFoundView } from '@payloadcms/next/views/NotFound/index.js'
+import { NotFoundPage, generatePageMetadata } from '@payloadcms/next/views'
 
 type Args = {
   params: {
@@ -12,6 +14,9 @@ type Args = {
   }
 }
 
-const NotFound = ({ params, searchParams }: Args) => NotFoundView({ config, params, searchParams })
+export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
+  generatePageMetadata({ config, params, searchParams })
+
+const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
 
 export default NotFound

app/(payload)/admin/[[...segments]]/page.tsx

@@ -3,7 +3,7 @@ import type { Metadata } from 'next'
 
 import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { RootPage, generatePageMetadata } from '@payloadcms/next/views/Root/index.js'
+import { RootPage, generatePageMetadata } from '@payloadcms/next/views'
 
 type Args = {
   params: {

app/(payload)/api/[...slug]/route.ts

@@ -1,7 +1,7 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
 import config from '@payload-config'
-import { REST_DELETE, REST_GET, REST_PATCH, REST_POST } from '@payloadcms/next/routes/index.js'
+import { REST_DELETE, REST_GET, REST_PATCH, REST_POST } from '@payloadcms/next/routes'
 
 export const GET = REST_GET(config)
 export const POST = REST_POST(config)

app/(payload)/api/graphql-playground/route.ts

@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
 import config from '@payload-config'
-import { GRAPHQL_PLAYGROUND_GET } from '@payloadcms/next/routes/index.js'
+import { GRAPHQL_PLAYGROUND_GET } from '@payloadcms/next/routes'
 
 export const GET = GRAPHQL_PLAYGROUND_GET(config)

app/(payload)/api/graphql/route.ts

@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes/index.js'
+import { GRAPHQL_POST } from '@payloadcms/next/routes'
 
 export const POST = GRAPHQL_POST(config)

app/(payload)/custom.scss

@@ -0,0 +1,8 @@
+#custom-css {
+  font-family: monospace;
+  background-image: url('/placeholder.png');
+}
+
+#custom-css::after {
+  content: 'custom-css';
+}

app/(payload)/layout.tsx

@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 import configPromise from '@payload-config'
-import { RootLayout } from '@payloadcms/next/layouts/Root/index.js'
+import { RootLayout } from '@payloadcms/next/layouts'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
 

app/live-preview/_api/fetchDoc.ts

@@ -1,35 +0,0 @@
-import QueryString from 'qs'
-
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export const fetchDoc = async <T>(args: {
-  collection: string
-  depth?: number
-  id?: string
-  slug?: string
-}): Promise<T> => {
-  const { id, slug, collection, depth = 2 } = args || {}
-
-  const queryString = QueryString.stringify(
-    {
-      ...(slug ? { 'where[slug][equals]': slug } : {}),
-      ...(depth ? { depth } : {}),
-    },
-    { addQueryPrefix: true },
-  )
-
-  const doc: T = await fetch(`${PAYLOAD_SERVER_URL}/api/${collection}${queryString}`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    ?.then((res) => res.json())
-    ?.then((res) => {
-      if (res.errors) throw new Error(res?.errors?.[0]?.message ?? 'Error fetching doc')
-      return res?.docs?.[0]
-    })
-
-  return doc
-}

app/live-preview/_api/fetchDocs.ts

@@ -1,19 +0,0 @@
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export const fetchDocs = async <T>(collection: string): Promise<T[]> => {
-  const docs: T[] = await fetch(`${PAYLOAD_SERVER_URL}/api/${collection}?depth=0&limit=100`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    ?.then((res) => res.json())
-    ?.then((res) => {
-      if (res.errors) throw new Error(res?.errors?.[0]?.message ?? 'Error fetching docs')
-
-      return res?.docs
-    })
-
-  return docs
-}

app/live-preview/_api/fetchFooter.ts

@@ -1,25 +0,0 @@
-import type { Footer } from '../../../test/live-preview/payload-types.js'
-
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export async function fetchFooter(): Promise<Footer> {
-  if (!PAYLOAD_SERVER_URL) throw new Error('PAYLOAD_SERVER_URL not found')
-
-  const footer = await fetch(`${PAYLOAD_SERVER_URL}/api/globals/footer`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    .then((res) => {
-      if (!res.ok) throw new Error('Error fetching doc')
-      return res.json()
-    })
-    ?.then((res) => {
-      if (res?.errors) throw new Error(res?.errors[0]?.message || 'Error fetching footer')
-      return res
-    })
-
-  return footer
-}

app/live-preview/_api/fetchHeader.ts

@@ -1,25 +0,0 @@
-import type { Header } from '../../../test/live-preview/payload-types.js'
-
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export async function fetchHeader(): Promise<Header> {
-  if (!PAYLOAD_SERVER_URL) throw new Error('PAYLOAD_SERVER_URL not found')
-
-  const header = await fetch(`${PAYLOAD_SERVER_URL}/api/globals/header`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    ?.then((res) => {
-      if (!res.ok) throw new Error('Error fetching doc')
-      return res.json()
-    })
-    ?.then((res) => {
-      if (res?.errors) throw new Error(res?.errors[0]?.message || 'Error fetching header')
-      return res
-    })
-
-  return header
-}

docs/admin/hooks.mdx

@@ -639,12 +639,12 @@ export const CustomArrayManager = () => {
 
 The `useCollapsible` hook allows you to control parent collapsibles:
 
-| Property                | Description                                                                                                  |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------ | --- |
-| **`collapsed`**         | State of the collapsible. `true` if open, `false` if collapsed                                               |
-| **`isVisible`**         | If nested, determine if the nearest collapsible is visible. `true` if no parent is closed, `false` otherwise |
-| **`toggle`**            | Toggles the state of the nearest collapsible                                                                 |
-| **`withinCollapsible`** | Determine when you are within another collaspible                                                            |     |
+| Property                  | Description                                                                                                  |
+| ------------------------- | ------------------------------------------------------------------------------------------------------------ | --- |
+| **`isCollapsed`**         | State of the collapsible. `true` if open, `false` if collapsed                                               |
+| **`isVisible`**           | If nested, determine if the nearest collapsible is visible. `true` if no parent is closed, `false` otherwise |
+| **`toggle`**              | Toggles the state of the nearest collapsible                                                                 |
+| **`isWithinCollapsible`** | Determine when you are within another collaspible                                                            |     |
 
 **Example:**
 
@@ -654,10 +654,11 @@ import React from 'react'
 import { useCollapsible } from 'payload/components/utilities'
 
 const CustomComponent: React.FC = () => {
-  const { collapsed, toggle } = useCollapsible()
+  const { isCollapsed, toggle } = useCollapsible()
+
   return (
     <div>
-      <p className="field-type">I am {collapsed ? 'closed' : 'open'}</p>
+      <p className="field-type">I am {isCollapsed ? 'closed' : 'open'}</p>
       <button onClick={toggle} type="button">
         Toggle
       </button>

docs/configuration/collections.mdx

@@ -13,23 +13,25 @@ It's often best practice to write your Collections in separate files and then im
 
 ## Options
 
-| Option            | Description                                                                                                                                                                                                              |
-| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **`slug`** \*     | Unique, URL-friendly string that will act as an identifier for this Collection.                                                                                                                                          |
-| **`fields`** \*   | Array of field types that will determine the structure and functionality of the data stored within this Collection. [Click here](/docs/fields/overview) for a full list of field types as well as how to configure them. |
-| **`labels`**      | Singular and plural labels for use in identifying this Collection throughout Payload. Auto-generated from slug if not defined.                                                                                           |
-| **`admin`**       | Admin-specific configuration. See below for [more detail](#admin-options).                                                                                                                                               |
-| **`hooks`**       | Entry points to "tie in" to Collection actions at specific points. [More](/docs/hooks/overview#collection-hooks)                                                                                                         |
-| **`access`**      | Provide access control functions to define exactly who should be able to do what with Documents in this Collection. [More](/docs/access-control/overview/#collections)                                                   |
-| **`auth`**        | Specify options if you would like this Collection to feature authentication. For more, consult the [Authentication](/docs/authentication/config) documentation.                                                          |
-| **`upload`**      | Specify options if you would like this Collection to support file uploads. For more, consult the [Uploads](/docs/upload/overview) documentation.                                                                         |
-| **`timestamps`**  | Set to false to disable documents' automatically generated `createdAt` and `updatedAt` timestamps.                                                                                                                       |
-| **`versions`**    | Set to true to enable default options, or configure with object properties. [More](/docs/versions/overview#collection-config)                                                                                            |
-| **`endpoints`**   | Add custom routes to the REST API. Set to `false` to disable routes. [More](/docs/rest-api/overview#custom-endpoints)                                                                                                    |
-| **`graphQL`**     | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. Set to `false` to disable GraphQL.                                                            |
-| **`typescript`**  | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined.                                                                                                      |
-| **`defaultSort`** | Pass a top-level field to sort by default in the collection List view. Prefix the name of the field with a minus symbol ("-") to sort in descending order.                                                               |
-| **`custom`**      | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                                |
+| Option                 | Description                                                                                                                                                                                                              |
+|------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **`slug`** \*          | Unique, URL-friendly string that will act as an identifier for this Collection.                                                                                                                                          |
+| **`fields`** \*        | Array of field types that will determine the structure and functionality of the data stored within this Collection. [Click here](/docs/fields/overview) for a full list of field types as well as how to configure them. |
+| **`labels`**           | Singular and plural labels for use in identifying this Collection throughout Payload. Auto-generated from slug if not defined.                                                                                           |
+| **`admin`**            | Admin-specific configuration. See below for [more detail](#admin-options).                                                                                                                                               |
+| **`hooks`**            | Entry points to "tie in" to Collection actions at specific points. [More](/docs/hooks/overview#collection-hooks)                                                                                                         |
+| **`access`**           | Provide access control functions to define exactly who should be able to do what with Documents in this Collection. [More](/docs/access-control/overview/#collections)                                                   |
+| **`auth`**             | Specify options if you would like this Collection to feature authentication. For more, consult the [Authentication](/docs/authentication/config) documentation.                                                          |
+| **`upload`**           | Specify options if you would like this Collection to support file uploads. For more, consult the [Uploads](/docs/upload/overview) documentation.                                                                         |
+| **`timestamps`**       | Set to false to disable documents' automatically generated `createdAt` and `updatedAt` timestamps.                                                                                                                       |
+| **`versions`**         | Set to true to enable default options, or configure with object properties. [More](/docs/versions/overview#collection-config)                                                                                            |
+| **`endpoints`**        | Add custom routes to the REST API. Set to `false` to disable routes. [More](/docs/rest-api/overview#custom-endpoints)                                                                                                    |
+| **`graphQL`**          | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. Set to `false` to disable GraphQL.                                                            |
+| **`typescript`**       | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined.                                                                                                      |
+| **`disableDuplicate`** | When true, do not show the "Duplicate" button while editing documents within this collection and prevent `duplicate` from all APIs.                                                                                      |
+| **`defaultSort`**      | Pass a top-level field to sort by default in the collection List view. Prefix the name of the field with a minus symbol ("-") to sort in descending order.                                                               |
+| **`dbName`**      | Custom table or collection name depending on the database adapter. Auto-generated from slug if not defined.
+| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                                |
 
 _\* An asterisk denotes that a property is required._
 
@@ -75,7 +77,6 @@ property on a collection's config.
 | `useAsTitle`                 | Specify a top-level field to use for a document title throughout the Admin panel. If no field is defined, the ID of the document is used as the title.                                                |
 | `description`                | Text or React component to display below the Collection label in the List view to give editors more information.                                                                                      |
 | `defaultColumns`             | Array of field names that correspond to which columns to show by default in this collection's List view.                                                                                              |
-| `disableDuplicate `          | Disables the "Duplicate" button while editing documents within this collection.                                                                                                                       |
 | `hideAPIURL`                 | Hides the "API URL" meta field while editing documents within this collection.                                                                                                                        |
 | `enableRichTextLink`         | The [Rich Text](/docs/fields/rich-text) field features a `Link` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default.         |
 | `enableRichTextRelationship` | The [Rich Text](/docs/fields/rich-text) field features a `Relationship` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default. |

docs/configuration/globals.mdx

@@ -26,6 +26,7 @@ As with Collection configs, it's often best practice to write your Globals in se
 | **`graphQL.name`** | Text used in schema generation. Auto-generated from slug if not defined.                                                                                                                                             |
 | **`typescript`**   | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined.                                                                                                  |
 | **`custom`**       | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                            |
+| **`dbName`**       | Custom table or collection name for this global depending on the database adapter. Auto-generated from slug if not defined.
 
 _\* An asterisk denotes that a property is required._
 

docs/database/postgres.mdx

@@ -38,12 +38,18 @@ export default buildConfig({
 
 ### Options
 
-| Option         | Description                                                                                                                                                                      |
-| -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `pool`         | [Pool connection options](https://orm.drizzle.team/docs/quick-postgresql/node-postgres) that will be passed to Drizzle and `node-postgres`.                                      |
-| `push`         | Disable Drizzle's [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push) in development mode. By default, `push` is enabled for development mode only. |
-| `migrationDir` | Customize the directory that migrations are stored.                                                                                                                              |
+| Option                | Description                                                                                                                                                                                           |
+|-----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `pool` \*             | [Pool connection options](https://orm.drizzle.team/docs/quick-postgresql/node-postgres) that will be passed to Drizzle and `node-postgres`.                                                           |
+| `push`                | Disable Drizzle's [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push) in development mode. By default, `push` is enabled for development mode only.                      |
+| `migrationDir`        | Customize the directory that migrations are stored.                                                                                                                                                   |
+| `logger`              | The instance of the logger to be passed to drizzle. By default Payload's will be used.                                                                                                                |
 | `schemaName`   | A string for the postgres schema to use, defaults to 'public'.                                                                                                                   |
+| `localesSuffix`       | A string appended to the end of table names for storing localized fields. Default is '_locales'.                                                                                                      |
+| `relationshipsSuffix` | A string appended to the end of table names for storing relationships. Default is '_rels'.                                                                                                            |
+| `versionsSuffix`      | A string appended to the end of table names for storing versions. Defaults to '_v'.                                                                                                                   |
+
+
 
 ### Access to Drizzle
 

docs/fields/array.mdx

@@ -45,6 +45,7 @@ keywords: array, fields, config, configuration, documentation, Content Managemen
 | **`admin`**         | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                                                                                                                          |
 | **`custom`**        | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                                                                                          |
 | **`interfaceName`** | Create a top level, reusable [Typescript interface](/docs/typescript/generating-types#custom-field-interfaces) & [GraphQL type](/docs/graphql/graphql-schema#custom-field-schemas).                                                                                                |
+| **`dbName`**        | Custom table name for the field when using SQL database adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                                                                                                                                    |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/blocks.mdx

@@ -80,6 +80,7 @@ Blocks are defined as separate configs of their own.
 | **`imageAltText`**         | Customize this block's image thumbnail alt text.                                                                                                                                    |
 | **`interfaceName`**        | Create a top level, reusable [Typescript interface](/docs/typescript/generating-types#custom-field-interfaces) & [GraphQL type](/docs/graphql/graphql-schema#custom-field-schemas). |
 | **`graphQL.singularName`** | Text to use for the GraphQL schema name. Auto-generated from slug if not defined. NOTE: this is set for deprecation, prefer `interfaceName`.                                        |
+| **`dbName`**               | Custom table name for this block type when using SQL database adapter ([Postgres](/docs/database/postgres)). Auto-generated from slug if not defined.
 | **`custom`**               | Extension point for adding custom data (e.g. for plugins)                                                                                                                           |
 
 #### Auto-generated data per block

docs/fields/number.mdx

@@ -20,27 +20,27 @@ keywords: number, fields, config, configuration, documentation, Content Manageme
 
 ### Config
 
-| Option             | Description                                                                                                                                                                 |
-| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`name`** \*      | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                      |
-| **`label`**        | Text used as a field label in the Admin panel or an object with keys for each language.                                                                                     |
-| **`min`**          | Minimum value accepted. Used in the default `validation` function.                                                                                                          |
-| **`max`**          | Maximum value accepted. Used in the default `validation` function.                                                                                                          |
-| **`hasMany`**      | Makes this field an ordered array of numbers instead of just a single number.                                                                                               |
-| **`minRows`**      | Minimum number of numbers in the numbers array, if `hasMany` is set to true.                                                                                                |
-| **`maxRows`**      | Maximum number of numbers in the numbers array, if `hasMany` is set to true.                                                                                                |
-| **`unique`**       | Enforce that each entry in the Collection has a unique value for this field.                                                                                                |
-| **`index`**        | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
-| **`validate`**     | Provide a custom validation function that will be executed on both the Admin panel and the backend. [More](/docs/fields/overview#validation)                                |
-| **`saveToJWT`**    | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/config), include its data in the user JWT.                               |
-| **`hooks`**        | Provide field-based hooks to control logic for this field. [More](/docs/fields/overview#field-level-hooks)                                                                  |
-| **`access`**       | Provide field-based access control to denote what users can see and do with this field's data. [More](/docs/fields/overview#field-level-access-control)                     |
-| **`hidden`**       | Restrict this field's visibility from all APIs entirely. Will still be saved to the database, but will not appear in any API or the Admin panel.                            |
-| **`defaultValue`** | Provide data to be used for this field's default value. [More](/docs/fields/overview#default-values)                                                                        |
-| **`localized`**    | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                             |
-| **`required`**     | Require this field to have a value.                                                                                                                                         |
-| **`admin`**        | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                   |
-| **`custom`**       | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
+| Option             | Description                                                                                                                                                                          |
+|--------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **`name`** \*      | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                               |
+| **`label`**        | Text used as a field label in the Admin panel or an object with keys for each language.                                                                                              |
+| **`min`**          | Minimum value accepted. Used in the default `validation` function.                                                                                                                   |
+| **`max`**          | Maximum value accepted. Used in the default `validation` function.                                                                                                                   |
+| **`hasMany`**      | Makes this field an ordered array of numbers instead of just a single number.                                                                                                        |
+| **`minRows`**      | Minimum number of numbers in the numbers array, if `hasMany` is set to true.                                                                                                         |
+| **`maxRows`**      | Maximum number of numbers in the numbers array, if `hasMany` is set to true.                                                                                                         |
+| **`unique`**       | Enforce that each entry in the Collection has a unique value for this field.                                                                                                         |
+| **`index`**        | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often.          |
+| **`validate`**     | Provide a custom validation function that will be executed on both the Admin panel and the backend. [More](/docs/fields/overview#validation)                                         |
+| **`saveToJWT`**    | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/config), include its data in the user JWT.                                        |
+| **`hooks`**        | Provide field-based hooks to control logic for this field. [More](/docs/fields/overview#field-level-hooks)                                                                           |
+| **`access`**       | Provide field-based access control to denote what users can see and do with this field's data. [More](/docs/fields/overview#field-level-access-control)                              |
+| **`hidden`**       | Restrict this field's visibility from all APIs entirely. Will still be saved to the database, but will not appear in any API or the Admin panel.                                     |
+| **`defaultValue`** | Provide data to be used for this field's default value. [More](/docs/fields/overview#default-values)                                                                                 |
+| **`localized`**    | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                                      |
+| **`required`**     | Require this field to have a value.                                                                                                                                                  |
+| **`admin`**        | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                            |
+| **`custom`**       | Extension point for adding custom data (e.g. for plugins)                                                                                                                            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/radio.mdx

@@ -36,6 +36,7 @@ keywords: radio, fields, config, configuration, documentation, Content Managemen
 | **`required`**     | Require this field to have a value.                                                                                                                                         |
 | **`admin`**        | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                   |
 | **`custom`**       | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
+| **`enumName`**     | Custom enum name for this field when using SQL database adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/select.mdx

@@ -38,6 +38,8 @@ keywords: select, multi-select, fields, config, configuration, documentation, Co
 | **`required`**     | Require this field to have a value.                                                                                                                                         |
 | **`admin`**        | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details.                                                    |
 | **`custom`**       | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
+| **`enumName`**     | Custom enum name for this field when using SQL database adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                               |
+| **`dbName`**       | Custom table name (if `hasMany` set to `true`) for this field when using SQL database adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined. |
 
 _\* An asterisk denotes that a property is required._
 

docs/hooks/fields.mdx

@@ -221,9 +221,13 @@ user-friendly.
 
 ### beforeDuplicate
 
-The `beforeDuplicate` field hook is only called when duplicating a document. It may be used when documents having the
-exact same properties may cause issue. This gives you a way to avoid duplicate names on `unique`, `required` fields or
-to unset values by returning `null`. This is called immediately after `defaultValue` and before validation occurs.
+The `beforeDuplicate` field hook is called on each locale (when using localization), when duplicating a document. It may be used when documents having the
+exact same properties may cause issue. This gives you a way to avoid duplicate names on `unique`, `required` fields or when external systems expect non-repeating values on documents.
+
+This hook gets called after `beforeChange` hooks are called and before the document is saved to the database.
+
+By Default, unique and required text fields Payload will append "- Copy" to the original document value. The default is not added if your field has its own, you must return non-unique values from your beforeDuplicate hook to avoid errors or enable the `disableDuplicate` option on the collection.
+Here is an example of a number field with a hook that increments the number to avoid unique constraint errors when duplicating a document:
 
 ```ts
 import { Field } from 'payload/types'

docs/rich-text/lexical.mdx

@@ -138,7 +138,7 @@ import { CallToAction } from '../blocks/CallToAction'
 Here's an overview of all the included features:
 
 | Feature Name                   | Included by default | Description                                                                                                                                                                            |
-| ------------------------------ | ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|--------------------------------|---------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **`BoldTextFeature`**          | Yes                 | Handles the bold text format                                                                                                                                                           |
 | **`ItalicTextFeature`**        | Yes                 | Handles the italic text format                                                                                                                                                         |
 | **`UnderlineTextFeature`**     | Yes                 | Handles the underline text format                                                                                                                                                      |
@@ -157,7 +157,8 @@ Here's an overview of all the included features:
 | **`RelationshipFeature`**      | Yes                 | Allows you to create block-level (not inline) relationships to other documents                                                                                                         |
 | **`BlockQuoteFeature`**        | Yes                 | Allows you to create block-level quotes                                                                                                                                                |
 | **`UploadFeature`**            | Yes                 | Allows you to create block-level upload nodes - this supports all kinds of uploads, not just images                                                                                    |
-| **`BlocksFeature`**            | No                  | Allows you to use Payload's [Blocks Field](/docs/fields/blocks) directly inside your editor. In the feature props, you can specify the allowed blocks - just like in the Blocks field. |
+| **`HorizontalRuleFeature`**    | Yes                 | Horizontal rules / separators. Basically displays an <hr> element                                                                                                                      |
+| **`BlocksFeature`**            | No                  | Allows you to use Payload's [Blocks Field](/docs/fields/blocks) directly inside your editor. In the feature props, you can specify the allowed blocks - just like in the Blocks field.                 |
 | **`TreeViewFeature`**          | No                  | Adds a debug box under the editor, which allows you to see the current editor state live, the dom, as well as time travel. Very useful for debugging                                   |
 
 ## Creating your own, custom Feature
@@ -173,7 +174,7 @@ Next, take a look at the [features we've already built](https://github.com/paylo
 Lexical saves data in JSON, but can also generate its HTML representation via two main methods:
 
 1. **Outputting HTML from the Collection:** Create a new field in your collection to convert saved JSON content to HTML. Payload generates and outputs the HTML for use in your frontend.
-2. **Generating HTML on the Frontend:** Convert JSON to HTML on-demand, either in your frontend or elsewhere.
+2. **Generating HTML on any server** Convert JSON to HTML on-demand on the server.
 
 The editor comes with built-in HTML serializers, simplifying the process of converting JSON to HTML.
 
@@ -207,7 +208,7 @@ const Pages: CollectionConfig = {
 
 The `lexicalHTML()` function creates a new field that automatically converts the referenced lexical richText field into HTML through an afterRead hook.
 
-#### Generating HTML in the Frontend:
+#### Generating HTML anywhere on the server:
 
 If you wish to convert JSON to HTML ad-hoc, use this code snippet:
 
@@ -234,6 +235,19 @@ This method employs `convertLexicalToHTML` from `@payloadcms/richtext-lexical`,
 
 Because every `Feature` is able to provide html converters, and because the `htmlFeature` can modify those or provide their own, we need to consolidate them with the default html Converters using the `consolidateHTMLConverters` function.
 
+#### CSS
+
+Payload's lexical HTML converter does not generate CSS for you, but it does add classes to the generated HTML. You can use these classes to style the HTML in your frontend.
+
+Here is some "base" CSS you can use to ensure that nested lists render correctly:
+
+```css
+/* Base CSS for Lexical HTML */
+.nestedListItem, .list-check {
+  list-style-type: none;
+}
+```
+
 #### Creating your own HTML Converter
 
 HTML Converters are typed as `HTMLConverter`, which contains the node type it should handle, and a function that accepts the serialized node from the lexical editor, and outputs the HTML string. Here's the HTML Converter of the Upload node as an example:

docs/rich-text/slate.mdx

@@ -167,7 +167,9 @@ Specifying custom `Type`s let you extend your custom elements by adding addition
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload/types'
+import type { CollectionConfig } from 'payload/types'
+
+import { slateEditor } from '@payloadcms/richtext-slate'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',
@@ -181,57 +183,59 @@ export const ExampleCollection: CollectionConfig = {
         },
       ],
       required: true,
-      admin: {
-        elements: [
-          'h2',
-          'h3',
-          'h4',
-          'link',
-          'blockquote',
-          {
-            name: 'cta',
-            Button: CustomCallToActionButton,
-            Element: CustomCallToActionElement,
-            plugins: [
-              // any plugins that are required by this element go here
-            ],
-          },
-        ],
-        leaves: [
-          'bold',
-          'italic',
-          {
-            name: 'highlight',
-            Button: CustomHighlightButton,
-            Leaf: CustomHighlightLeaf,
-            plugins: [
-              // any plugins that are required by this leaf go here
-            ],
-          },
-        ],
-        link: {
-          // Inject your own fields into the Link element
-          fields: [
+      editor: slateEditor({
+        admin: {
+          elements: [
+            'h2',
+            'h3',
+            'h4',
+            'link',
+            'blockquote',
             {
-              name: 'rel',
-              label: 'Rel Attribute',
-              type: 'select',
-              hasMany: true,
-              options: ['noopener', 'noreferrer', 'nofollow'],
-            },
-          ],
-        },
-        upload: {
-          collections: {
-            media: {
-              fields: [
-                // any fields that you would like to save
-                // on an upload element in the `media` collection
+              name: 'cta',
+              Button: CustomCallToActionButton,
+              Element: CustomCallToActionElement,
+              plugins: [
+                // any plugins that are required by this element go here
               ],
             },
+          ],
+          leaves: [
+            'bold',
+            'italic',
+            {
+              name: 'highlight',
+              Button: CustomHighlightButton,
+              Leaf: CustomHighlightLeaf,
+              plugins: [
+                // any plugins that are required by this leaf go here
+              ],
+            },
+          ],
+          link: {
+            // Inject your own fields into the Link element
+            fields: [
+              {
+                name: 'rel',
+                label: 'Rel Attribute',
+                type: 'select',
+                hasMany: true,
+                options: ['noopener', 'noreferrer', 'nofollow'],
+              },
+            ],
+          },
+          upload: {
+            collections: {
+              media: {
+                fields: [
+                  // any fields that you would like to save
+                  // on an upload element in the `media` collection
+                ],
+              },
+            },
           },
         },
-      },
+      }),
     },
   ],
 }

emptyModule.js

@@ -1 +0,0 @@
-export default {}

examples/email/package.json

@@ -32,4 +32,4 @@
     "ts-node": "^9.1.1",
     "typescript": "^4.8.4"
   }
-}
+}

examples/email/tsconfig.json

@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "strict": false,
     "esModuleInterop": true,
@@ -16,22 +12,12 @@
     "sourceMap": true,
     "resolveJsonModule": true,
     "paths": {
-      "payload/generated-types": [
-        "./src/payload-types.ts"
-      ],
-      "node_modules/*": [
-        "./node_modules/*"
-      ]
-    },
+      "payload/generated-types": ["./src/payload-types.ts"],
+      "node_modules/*": ["./node_modules/*"]
+    }
   },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist",
-    "build",
-  ],
+  "include": ["src"],
+  "exclude": ["node_modules", "dist", "build"],
   "ts-node": {
     "transpileOnly": true
   }

examples/testing/tsconfig.json

@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "outDir": "./dist",
     "skipLibCheck": true,
     "strict": false,
@@ -18,10 +14,8 @@
     "jsx": "preserve",
     "sourceMap": true
   },
-  "include": [
-    "src"
-  ],
+  "include": ["src"],
   "ts-node": {
     "transpileOnly": true
   }
-}
+}

examples/virtual-fields/package.json

@@ -26,4 +26,4 @@
     "ts-node": "^9.1.1",
     "typescript": "^4.8.4"
   }
-}
+}

examples/virtual-fields/tsconfig.json

@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "strict": false,
     "esModuleInterop": true,
@@ -14,14 +10,8 @@
     "rootDir": "./src",
     "jsx": "react"
   },
-  "include": [
-    "src",
-  ],
-  "exclude": [
-    "node_modules",
-    "dist",
-    "build",
-  ],
+  "include": ["src"],
+  "exclude": ["node_modules", "dist", "build"],
   "ts-node": {
     "transpileOnly": true
   }

examples/whitelabel/package.json

@@ -26,4 +26,4 @@
     "ts-node": "^9.1.1",
     "typescript": "^4.8.4"
   }
-}
+}

examples/whitelabel/tsconfig.json

@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "strict": false,
     "esModuleInterop": true,
@@ -14,14 +10,8 @@
     "rootDir": "./src",
     "jsx": "react"
   },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist",
-    "build",
-  ],
+  "include": ["src"],
+  "exclude": ["node_modules", "dist", "build"],
   "ts-node": {
     "transpileOnly": true
   }

jest.config.js

@@ -1,5 +1,5 @@
 /** @type {import('jest').Config} */
-const customJestConfig = {
+const baseJestConfig = {
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
   setupFilesAfterEnv: ['<rootDir>/test/jest.setup.ts'],
   moduleNameMapper: {
@@ -8,9 +8,8 @@ const customJestConfig = {
       '<rootDir>/test/helpers/mocks/fileMock.js',
     '^(\\.{1,2}/.*)\\.js$': '$1',
   },
-  reporters: ['default', ['github-actions', { silent: false }], 'summary'],
   testEnvironment: 'node',
-  testMatch: ['<rootDir>/packages/payload/src/**/*.spec.ts', '<rootDir>/test/**/*int.spec.ts'],
+  testMatch: ['<rootDir>/packages/*/src/**/*.spec.ts'],
   testTimeout: 90000,
   transform: {
     '^.+\\.(t|j)sx?$': ['@swc/jest'],
@@ -18,4 +17,8 @@ const customJestConfig = {
   verbose: true,
 }
 
-export default customJestConfig
+if (process.env.CI) {
+  baseJestConfig.reporters = [['github-actions', { silent: false }], 'summary']
+}
+
+export default baseJestConfig

next.config.mjs

@@ -10,6 +10,12 @@ const withBundleAnalyzer = bundleAnalyzer({
 export default withBundleAnalyzer(
   withPayload({
     reactStrictMode: false,
+    eslint: {
+      ignoreDuringBuilds: true,
+    },
+    typescript: {
+      ignoreBuildErrors: true,
+    },
     async redirects() {
       return [
         {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-alpha.49",
+  "version": "3.0.0-beta.10",
   "private": true,
   "type": "module",
   "workspaces:": [
@@ -46,10 +46,10 @@
     "devsafe": "rimraf .next && pnpm dev",
     "dev:generate-graphql-schema": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateGraphQLSchema.ts",
     "dev:generate-types": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateTypes.ts",
-    "dev:postgres": "pnpm --filter payload run dev:postgres",
+    "dev:postgres": "cross-env NODE_OPTIONS=--no-deprecation PAYLOAD_DATABASE=postgres node ./test/dev.js",
     "docker:restart": "pnpm docker:stop --remove-orphans && pnpm docker:start",
-    "docker:start": "docker-compose -f packages/plugin-cloud-storage/docker-compose.yml up -d",
-    "docker:stop": "docker-compose -f packages/plugin-cloud-storage/docker-compose.yml down",
+    "docker:start": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml up -d",
+    "docker:stop": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml down",
     "fix": "eslint \"packages/**/*.ts\" --fix",
     "generate:types": "PAYLOAD_CONFIG_PATH=./test/_community/config.ts node --no-deprecation ./packages/payload/bin.js generate:types",
     "lint": "eslint \"packages/**/*.ts\"",
@@ -57,7 +57,6 @@
     "prepare": "husky install",
     "pretest": "pnpm build",
     "reinstall": "pnpm clean:all && pnpm install",
-    "script:list-packages": "tsx ./scripts/list-packages.ts",
     "script:pack": "tsx scripts/pack-all-to-dest.ts",
     "release:alpha": "tsx ./scripts/release.ts --bump prerelease --tag alpha",
     "release:beta": "tsx ./scripts/release.ts --bump prerelease --tag beta",
@@ -66,8 +65,9 @@
     "test:e2e": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 tsx ./test/runE2E.ts",
     "test:e2e:debug": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PWDEBUG=1 DISABLE_LOGGING=true playwright test",
     "test:e2e:headed": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true playwright test --headed",
-    "test:int:postgres": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
-    "test:int": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
+    "test:int:postgres": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:unit": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=jest.config.js --runInBand",
     "translateNewKeys": "pnpm --filter payload run translateNewKeys"
   },
   "devDependencies": {
@@ -76,7 +76,7 @@
     "@octokit/core": "^5.1.0",
     "@payloadcms/eslint-config": "workspace:*",
     "@payloadcms/live-preview-react": "workspace:*",
-    "@playwright/test": "^1.42.1",
+    "@playwright/test": "1.43.0",
     "@swc/cli": "^0.1.62",
     "@swc/jest": "0.2.36",
     "@testing-library/jest-dom": "6.4.2",
@@ -88,13 +88,13 @@
     "@types/conventional-changelog-writer": "^4.0.10",
     "@types/fs-extra": "^11.0.2",
     "@types/jest": "29.5.12",
-    "@types/minimist": "1.2.2",
-    "@types/node": "20.11.28",
+    "@types/minimist": "1.2.5",
+    "@types/node": "20.12.5",
     "@types/prompts": "^2.4.5",
-    "@types/qs": "6.9.7",
-    "@types/react": "18.2.15",
+    "@types/qs": "6.9.14",
+    "@types/react": "18.2.74",
     "@types/semver": "^7.5.3",
-    "@types/shelljs": "0.8.12",
+    "@types/shelljs": "0.8.15",
     "add-stream": "^1.0.0",
     "chalk": "^4.1.2",
     "comment-json": "^4.2.3",
@@ -109,8 +109,8 @@
     "dotenv": "8.6.0",
     "drizzle-kit": "0.20.14-1f2c838",
     "drizzle-orm": "0.29.4",
-    "eslint-plugin-payload": "workspace:*",
     "escape-html": "^1.0.3",
+    "eslint-plugin-payload": "workspace:*",
     "execa": "5.1.1",
     "form-data": "3.0.1",
     "fs-extra": "10.1.0",
@@ -127,14 +127,15 @@
     "lint-staged": "^14.0.1",
     "minimist": "1.2.8",
     "mongodb-memory-server": "^9.0",
-    "next": "14.2.0-canary.22",
+    "next": "^14.2.0-canary.23",
     "node-mocks-http": "^1.14.1",
     "nodemon": "3.0.3",
     "open": "^10.1.0",
+    "p-limit": "^5.0.0",
     "pino": "8.15.0",
     "pino-pretty": "10.2.0",
-    "playwright": "^1.42.1",
-    "playwright-core": "^1.42.1",
+    "playwright": "1.43.0",
+    "playwright-core": "1.43.0",
     "prettier": "^3.0.3",
     "prompts": "2.4.2",
     "qs": "6.11.2",
@@ -145,7 +146,7 @@
     "semver": "^7.5.4",
     "sharp": "0.32.6",
     "shelljs": "0.8.5",
-    "simple-git": "^3.20.0",
+    "simple-git": "^3.24.0",
     "slash": "3.0.0",
     "slate": "0.91.4",
     "swc-plugin-transform-remove-imports": "^1.12.1",
@@ -153,20 +154,20 @@
     "tempy": "^1.0.1",
     "ts-node": "10.9.1",
     "tsx": "^4.7.1",
-    "turbo": "^1.12.5",
-    "typescript": "5.4.2",
+    "turbo": "^1.13.2",
+    "typescript": "5.4.4",
     "uuid": "^9.0.1",
     "yocto-queue": "^1.0.0"
   },
   "peerDependencies": {
-    "react": "18.2.0",
-    "react-router-dom": "5.3.4"
+    "react": "18.2.0"
   },
   "engines": {
-    "node": ">=18.17.0",
+    "node": ">=18.20.2",
     "pnpm": ">=8"
   },
   "lint-staged": {
+    "*.{md,mdx,yml,json}": "prettier --write",
     "*.{js,jsx,ts,tsx}": [
       "prettier --write",
       "eslint --cache --fix"
@@ -194,8 +195,7 @@
       "domexception": "4"
     },
     "patchedDependencies": {
-      "playwright@1.42.1": "patches/playwright@1.42.1.patch"
+      "playwright@1.43.0": "patches/playwright@1.43.0.patch"
     }
-  },
-  "packageManager": "pnpm@8.15.4+sha256.cea6d0bdf2de3a0549582da3983c70c92ffc577ff4410cbf190817ddc35137c2"
+  }
 }

packages/create-payload-app/.swcrc

@@ -10,6 +10,6 @@
     }
   },
   "module": {
-    "type": "commonjs"
+    "type": "es6"
   }
 }

packages/create-payload-app/bin/cli.js

@@ -1,2 +1,4 @@
 #!/usr/bin/env node
-require('../dist/index.js')
+
+import { main } from '../dist/index.js'
+main()

packages/create-payload-app/jest.config.js

@@ -1,11 +1,32 @@
-import baseConfig from '../../jest.config.js'
+// import baseConfig from '../../jest.config.js'
 
-/** @type {import('@jest/types').Config} */
+// /** @type {import('@jest/types').Config} */
+// const customJestConfig = {
+//   ...baseConfig,
+//   setupFilesAfterEnv: null,
+//   testMatch: ['**/src/**/?(*.)+(spec|test|it-test).[tj]s?(x)'],
+//   testTimeout: 20000,
+// }
+
+// export default customJestConfig
+
+/** @type {import('jest').Config} */
 const customJestConfig = {
-  ...baseConfig,
-  setupFilesAfterEnv: null,
-  testMatch: ['**/src/**/?(*.)+(spec|test|it-test).[tj]s?(x)'],
-  testTimeout: 20000,
+  extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  // setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
+  moduleNameMapper: {
+    '\\.(css|scss)$': '<rootDir>/helpers/mocks/emptyModule.js',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+      '<rootDir>/test/helpers/mocks/fileMock.js',
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+  testEnvironment: 'node',
+  testMatch: ['<rootDir>/**/*spec.ts'],
+  testTimeout: 90000,
+  transform: {
+    '^.+\\.(t|j)sx?$': ['@swc/jest'],
+  },
+  verbose: true,
 }
 
 export default customJestConfig

packages/create-payload-app/package.json

@@ -1,18 +1,25 @@
 {
   "name": "create-payload-app",
-  "version": "1.0.0",
+  "version": "3.0.0-beta.10",
   "license": "MIT",
   "type": "module",
+  "homepage": "https://payloadcms.com",
   "bin": {
     "create-payload-app": "bin/cli.js"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/payloadcms/payload.git",
+    "directory": "packages/create-payload-app"
+  },
   "scripts": {
-    "build": "pnpm copyfiles && pnpm build:swc",
-    "copyfiles": "copyfiles -u 2 \"../../app/(payload)/**\" \"dist\"",
+    "build": "pnpm pack-template-files && pnpm typecheck && pnpm build:swc",
+    "typecheck": "tsc",
+    "pack-template-files": "tsx src/scripts/pack-template-files.ts",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "test": "jest",
-    "prepublishOnly": "pnpm test && pnpm clean && pnpm build"
+    "prepublishOnly": "pnpm clean && pnpm build"
   },
   "files": [
     "package.json",
@@ -20,6 +27,7 @@
     "bin"
   ],
   "dependencies": {
+    "@clack/prompts": "^0.7.0",
     "@sindresorhus/slugify": "^1.1.0",
     "arg": "^5.0.0",
     "chalk": "^4.1.0",
@@ -27,21 +35,26 @@
     "comment-json": "^4.2.3",
     "degit": "^2.8.4",
     "detect-package-manager": "^3.0.1",
+    "esprima-next": "^6.0.3",
     "execa": "^5.0.0",
-    "figures": "^3.2.0",
+    "figures": "^6.1.0",
     "fs-extra": "^9.0.1",
     "globby": "11.1.0",
-    "handlebars": "^4.7.7",
-    "ora": "^5.1.0",
-    "prompts": "^2.4.2",
     "terminal-link": "^2.1.1"
   },
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
     "@types/degit": "^2.8.3",
+    "@types/esprima": "^4.0.6",
     "@types/fs-extra": "^9.0.12",
     "@types/jest": "^27.0.3",
-    "@types/node": "^16.6.2",
-    "@types/prompts": "^2.4.1"
+    "@types/node": "20.12.5"
+  },
+  "exports": {
+    "./commands": {
+      "import": "./src/lib/init-next.ts",
+      "require": "./src/lib/init-next.ts",
+      "types": "./src/lib/init-next.ts"
+    }
   }
 }

packages/create-payload-app/src/index.ts

@@ -1,8 +1,12 @@
 import { Main } from './main.js'
 import { error } from './utils/log.js'
 
-async function main(): Promise<void> {
-  await new Main().init()
+export async function main(): Promise<void> {
+  try {
+    await new Main().init()
+  } catch (e) {
+    if (e instanceof Error) {
+      error(e.message)
+    }
+  }
 }
-
-main().catch((e) => error(`An error has occurred: ${e instanceof Error ? e.message : e}`))

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

@@ -1,72 +1,42 @@
 import fse from 'fs-extra'
-import path from 'path'
+import globby from 'globby'
 
 import type { DbDetails } from '../types.js'
 
 import { warning } from '../utils/log.js'
-import { bundlerPackages, dbPackages, editorPackages } from './packages.js'
+import { dbReplacements } from './packages.js'
 
 /** Update payload config with necessary imports and adapters */
 export async function configurePayloadConfig(args: {
   dbDetails: DbDetails | undefined
-  projectDir: string
+  projectDirOrConfigPath: { payloadConfigPath: string } | { projectDir: string }
 }): Promise<void> {
   if (!args.dbDetails) {
     return
   }
 
-  // Update package.json
-  const packageJsonPath = path.resolve(args.projectDir, 'package.json')
   try {
-    const packageObj = await fse.readJson(packageJsonPath)
-
-    packageObj.dependencies['payload'] = '^2.0.0'
-
-    const dbPackage = dbPackages[args.dbDetails.type]
-    const bundlerPackage = bundlerPackages['webpack']
-    const editorPackage = editorPackages['slate']
-
-    // Delete all other db adapters
-    Object.values(dbPackages).forEach((p) => {
-      if (p.packageName !== dbPackage.packageName) {
-        delete packageObj.dependencies[p.packageName]
-      }
-    })
-
-    packageObj.dependencies[dbPackage.packageName] = dbPackage.version
-    packageObj.dependencies[bundlerPackage.packageName] = bundlerPackage.version
-    packageObj.dependencies[editorPackage.packageName] = editorPackage.version
-
-    await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })
-  } catch (err: unknown) {
-    warning('Unable to update name in package.json')
-  }
-
-  try {
-    const possiblePaths = [
-      path.resolve(args.projectDir, 'src/payload.config.ts'),
-      path.resolve(args.projectDir, 'src/payload/payload.config.ts'),
-    ]
-
     let payloadConfigPath: string | undefined
-
-    possiblePaths.forEach((p) => {
-      if (fse.pathExistsSync(p) && !payloadConfigPath) {
-        payloadConfigPath = p
-      }
-    })
+    if (!('payloadConfigPath' in args.projectDirOrConfigPath)) {
+      payloadConfigPath = (
+        await globby('**/payload.config.ts', {
+          absolute: true,
+          cwd: args.projectDirOrConfigPath.projectDir,
+        })
+      )?.[0]
+    } else {
+      payloadConfigPath = args.projectDirOrConfigPath.payloadConfigPath
+    }
 
     if (!payloadConfigPath) {
-      warning('Unable to update payload.config.ts with plugins')
+      warning('Unable to update payload.config.ts with plugins. Could not find payload.config.ts.')
       return
     }
 
     const configContent = fse.readFileSync(payloadConfigPath, 'utf-8')
     const configLines = configContent.split('\n')
 
-    const dbReplacement = dbPackages[args.dbDetails.type]
-    const bundlerReplacement = bundlerPackages['webpack']
-    const editorReplacement = editorPackages['slate']
+    const dbReplacement = dbReplacements[args.dbDetails.type]
 
     let dbConfigStartLineIndex: number | undefined
     let dbConfigEndLineIndex: number | undefined
@@ -75,21 +45,6 @@ export async function configurePayloadConfig(args: {
       if (l.includes('// database-adapter-import')) {
         configLines[i] = dbReplacement.importReplacement
       }
-      if (l.includes('// bundler-import')) {
-        configLines[i] = bundlerReplacement.importReplacement
-      }
-
-      if (l.includes('// bundler-config')) {
-        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
@@ -112,6 +67,8 @@ export async function configurePayloadConfig(args: {
 
     fse.writeFileSync(payloadConfigPath, configLines.join('\n'))
   } catch (err: unknown) {
-    warning('Unable to update payload.config.ts with plugins')
+    warning(
+      `Unable to update payload.config.ts with plugins: ${err instanceof Error ? err.message : ''}`,
+    )
   }
 }

packages/create-payload-app/src/lib/create-project.spec.ts

@@ -1,12 +1,16 @@
 import fse from 'fs-extra'
 import path from 'path'
-import type { BundlerType, CliArgs, DbType, ProjectTemplate } from '../types.js'
+import type { CliArgs, DbType, ProjectTemplate } from '../types.js'
 import { createProject } from './create-project.js'
-import { bundlerPackages, dbPackages, editorPackages } from './packages.js'
-import exp from 'constants'
+import { fileURLToPath } from 'node:url'
+import { dbReplacements } from './packages.js'
 import { getValidTemplates } from './templates.js'
+import globby from 'globby'
 
-const projectDir = path.resolve(__dirname, './tmp')
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
+const projectDir = path.resolve(dirname, './tmp')
 describe('createProject', () => {
   beforeAll(() => {
     console.log = jest.fn()
@@ -28,33 +32,11 @@ describe('createProject', () => {
     const args = {
       _: ['project-name'],
       '--db': 'mongodb',
+      '--local-template': 'blank',
       '--no-deps': true,
     } as CliArgs
     const packageManager = 'yarn'
 
-    it('creates starter project', async () => {
-      const projectName = 'starter-project'
-      const template: ProjectTemplate = {
-        name: 'blank',
-        type: 'starter',
-        url: 'https://github.com/payloadcms/payload/templates/blank',
-        description: 'Blank Template',
-      }
-      await createProject({
-        cliArgs: args,
-        projectName,
-        projectDir,
-        template,
-        packageManager,
-      })
-
-      const packageJsonPath = path.resolve(projectDir, 'package.json')
-      const packageJson = fse.readJsonSync(packageJsonPath)
-
-      // Check package name and description
-      expect(packageJson.name).toEqual(projectName)
-    })
-
     it('creates plugin template', async () => {
       const projectName = 'plugin'
       const template: ProjectTemplate = {
@@ -78,26 +60,34 @@ describe('createProject', () => {
       expect(packageJson.name).toEqual(projectName)
     })
 
-    describe('db adapters and bundlers', () => {
+    describe('creates project from template', () => {
       const templates = getValidTemplates()
 
       it.each([
-        ['blank', 'mongodb', 'webpack'],
-        ['blank', 'postgres', 'webpack'],
-        ['website', 'mongodb', 'webpack'],
-        ['website', 'postgres', 'webpack'],
-        ['ecommerce', 'mongodb', 'webpack'],
-        ['ecommerce', 'postgres', 'webpack'],
-      ])('update config and deps: %s, %s, %s', async (templateName, db, bundler) => {
+        ['blank-3.0', 'mongodb'],
+        ['blank-3.0', 'postgres'],
+
+        // TODO: Re-enable these once 3.0 is stable and templates updated
+        // ['website', 'mongodb'],
+        // ['website', 'postgres'],
+        // ['ecommerce', 'mongodb'],
+        // ['ecommerce', 'postgres'],
+      ])('update config and deps: %s, %s', async (templateName, db) => {
         const projectName = 'starter-project'
 
         const template = templates.find((t) => t.name === templateName)
 
+        const cliArgs = {
+          ...args,
+          '--db': db,
+          '--local-template': templateName,
+        } as CliArgs
+
         await createProject({
-          cliArgs: args,
+          cliArgs,
           projectName,
           projectDir,
-          template,
+          template: template as ProjectTemplate,
           packageManager,
           dbDetails: {
             dbUri: `${db}://localhost:27017/create-project-test`,
@@ -105,35 +95,27 @@ describe('createProject', () => {
           },
         })
 
-        const dbReplacement = dbPackages[db as DbType]
-        const bundlerReplacement = bundlerPackages[bundler as BundlerType]
-        const editorReplacement = editorPackages['slate']
+        const dbReplacement = dbReplacements[db as DbType]
 
         const packageJsonPath = path.resolve(projectDir, 'package.json')
         const packageJson = fse.readJsonSync(packageJsonPath)
 
-        // Check deps
-        expect(packageJson.dependencies['payload']).toEqual('^2.0.0')
-        expect(packageJson.dependencies[dbReplacement.packageName]).toEqual(dbReplacement.version)
-
         // Should only have one db adapter
         expect(
           Object.keys(packageJson.dependencies).filter((n) => n.startsWith('@payloadcms/db-')),
         ).toHaveLength(1)
 
-        expect(packageJson.dependencies[bundlerReplacement.packageName]).toEqual(
-          bundlerReplacement.version,
-        )
-        expect(packageJson.dependencies[editorReplacement.packageName]).toEqual(
-          editorReplacement.version,
-        )
+        const payloadConfigPath = (
+          await globby('**/payload.config.ts', {
+            absolute: true,
+            cwd: projectDir,
+          })
+        )?.[0]
 
-        let payloadConfigPath = path.resolve(projectDir, 'src/payload.config.ts')
-
-        // Website and ecommerce templates have payload.config.ts in src/payload
-        if (!fse.existsSync(payloadConfigPath)) {
-          payloadConfigPath = path.resolve(projectDir, 'src/payload/payload.config.ts')
+        if (!payloadConfigPath) {
+          throw new Error(`Could not find payload.config.ts inside ${projectDir}`)
         }
+
         const content = fse.readFileSync(payloadConfigPath, 'utf-8')
 
         // Check payload.config.ts
@@ -143,18 +125,7 @@ describe('createProject', () => {
         expect(content).not.toContain('// database-adapter-config-start')
         expect(content).not.toContain('// database-adapter-config-end')
         expect(content).toContain(dbReplacement.configReplacement.join('\n'))
-
-        expect(content).not.toContain('// bundler-config-import')
-        expect(content).toContain(bundlerReplacement.importReplacement)
-
-        expect(content).not.toContain('// bundler-config')
-        expect(content).toContain(bundlerReplacement.configReplacement)
       })
     })
   })
-
-  describe('Templates', () => {
-    it.todo('Verify that all templates are valid')
-    // Loop through all templates.ts that should have replacement comments, and verify that they are present
-  })
 })

packages/create-payload-app/src/lib/create-project.ts

@@ -1,15 +1,19 @@
+import * as p from '@clack/prompts'
 import chalk from 'chalk'
 import degit from 'degit'
 import execa from 'execa'
 import fse from 'fs-extra'
-import ora from 'ora'
+import { fileURLToPath } from 'node:url'
 import path from 'path'
 
 import type { CliArgs, DbDetails, PackageManager, ProjectTemplate } from '../types.js'
 
-import { error, success, warning } from '../utils/log.js'
+import { debug, error, warning } from '../utils/log.js'
 import { configurePayloadConfig } from './configure-payload-config.js'
 
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
 async function createOrFindProjectDir(projectDir: string): Promise<void> {
   const pathExists = await fse.pathExists(projectDir)
   if (!pathExists) {
@@ -40,7 +44,7 @@ async function installDeps(args: {
     })
     return true
   } catch (err: unknown) {
-    console.log({ err })
+    error(`Error installing dependencies${err instanceof Error ? `: ${err.message}` : ''}.`)
     return false
   }
 }
@@ -55,19 +59,37 @@ export async function createProject(args: {
 }): Promise<void> {
   const { cliArgs, dbDetails, packageManager, projectDir, projectName, template } = args
 
+  if (cliArgs['--dry-run']) {
+    debug(`Dry run: Creating project in ${chalk.green(projectDir)}`)
+    return
+  }
+
   await createOrFindProjectDir(projectDir)
 
-  console.log(`\n  Creating project in ${chalk.green(path.resolve(projectDir))}\n`)
-
-  if ('url' in template) {
-    const emitter = degit(template.url)
+  if (cliArgs['--local-template']) {
+    // Copy template from local path. For development purposes.
+    const localTemplate = path.resolve(
+      dirname,
+      '../../../../templates/',
+      cliArgs['--local-template'],
+    )
+    await fse.copy(localTemplate, projectDir)
+  } else if ('url' in template) {
+    let templateUrl = template.url
+    if (cliArgs['--template-branch']) {
+      templateUrl = `${template.url}#${cliArgs['--template-branch']}`
+      debug(`Using template url: ${templateUrl}`)
+    }
+    const emitter = degit(templateUrl)
     await emitter.clone(projectDir)
   }
 
-  const spinner = ora('Checking latest Payload version...').start()
+  const spinner = p.spinner()
+  spinner.start('Checking latest Payload version...')
 
   await updatePackageJSON({ projectDir, projectName })
-  await configurePayloadConfig({ dbDetails, projectDir })
+  spinner.message('Configuring Payload...')
+  await configurePayloadConfig({ dbDetails, projectDirOrConfigPath: { projectDir } })
 
   // Remove yarn.lock file. This is only desired in Payload Cloud.
   const lockPath = path.resolve(projectDir, 'yarn.lock')
@@ -75,14 +97,16 @@ export async function createProject(args: {
     await fse.remove(lockPath)
   }
 
-  spinner.text = 'Installing dependencies...'
-  const result = await installDeps({ cliArgs, packageManager, projectDir })
-  spinner.stop()
-  spinner.clear()
-  if (result) {
-    success('Dependencies installed')
+  if (!cliArgs['--no-deps']) {
+    spinner.message('Installing dependencies...')
+    const result = await installDeps({ cliArgs, packageManager, projectDir })
+    if (result) {
+      spinner.stop('Successfully installed Payload and dependencies')
+    } else {
+      spinner.stop('Error installing dependencies', 1)
+    }
   } else {
-    error('Error installing dependencies')
+    spinner.stop('Dependency installation skipped')
   }
 }
 
@@ -97,6 +121,6 @@ export async function updatePackageJSON(args: {
     packageObj.name = projectName
     await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })
   } catch (err: unknown) {
-    warning('Unable to update name in package.json')
+    warning(`Unable to update name in package.json. ${err instanceof Error ? err.message : ''}`)
   }
 }

packages/create-payload-app/src/lib/init-next.ts

@@ -1,14 +1,14 @@
 import type { CompilerOptions } from 'typescript'
 
-import chalk from 'chalk'
+import * as p from '@clack/prompts'
 import { parse, stringify } from 'comment-json'
-import { detect } from 'detect-package-manager'
 import execa from 'execa'
 import fs from 'fs'
 import fse from 'fs-extra'
 import globby from 'globby'
 import path from 'path'
 import { promisify } from 'util'
+
 const readFile = promisify(fs.readFile)
 const writeFile = promisify(fs.writeFile)
 
@@ -17,59 +17,107 @@ const dirname = path.dirname(filename)
 
 import { fileURLToPath } from 'node:url'
 
-import type { CliArgs } from '../types.js'
+import type { CliArgs, DbType, PackageManager } from '../types.js'
 
 import { copyRecursiveSync } from '../utils/copy-recursive-sync.js'
-import { error, info, debug as origDebug, success, warning } from '../utils/log.js'
+import { debug as origDebug, warning } from '../utils/log.js'
+import { moveMessage } from '../utils/messages.js'
+import { wrapNextConfig } from './wrap-next-config.js'
 
 type InitNextArgs = Pick<CliArgs, '--debug'> & {
-  projectDir?: string
+  dbType: DbType
+  nextAppDetails?: NextAppDetails
+  packageManager: PackageManager
+  projectDir: string
   useDistFiles?: boolean
 }
-type InitNextResult = { reason?: string; success: boolean; userAppDir?: string }
+
+type NextConfigType = 'cjs' | 'esm'
+
+type InitNextResult =
+  | {
+      isSrcDir: boolean
+      nextAppDir: string
+      payloadConfigPath: string
+      success: true
+    }
+  | { isSrcDir: boolean; nextAppDir?: string; reason: string; success: false }
 
 export async function initNext(args: InitNextArgs): Promise<InitNextResult> {
-  args.projectDir = args.projectDir || process.cwd()
-  const { projectDir } = args
-  const templateResult = await applyPayloadTemplateFiles(args)
-  if (!templateResult.success) return templateResult
+  const { dbType: dbType, packageManager, projectDir } = args
 
-  const { success: installSuccess } = await installDeps(projectDir)
-  if (!installSuccess) {
-    return { ...templateResult, reason: 'Failed to install dependencies', success: false }
+  const nextAppDetails = args.nextAppDetails || (await getNextAppDetails(projectDir))
+
+  if (!nextAppDetails.nextAppDir) {
+    warning(`Could not find app directory in ${projectDir}, creating...`)
+    const createdAppDir = path.resolve(projectDir, nextAppDetails.isSrcDir ? 'src/app' : 'app')
+    fse.mkdirSync(createdAppDir, { recursive: true })
+    nextAppDetails.nextAppDir = createdAppDir
   }
 
-  // Create or find payload.config.ts
-  const createConfigResult = findOrCreatePayloadConfig(projectDir)
-  if (!createConfigResult.success) {
-    return { ...templateResult, ...createConfigResult }
+  const { hasTopLevelLayout, isSrcDir, nextAppDir, nextConfigType } = nextAppDetails
+
+  if (!nextConfigType) {
+    return {
+      isSrcDir,
+      nextAppDir,
+      reason: `Could not determine Next Config type in ${projectDir}. Possibly try renaming next.config.js to next.config.cjs or next.config.mjs.`,
+      success: false,
+    }
+  }
+
+  if (hasTopLevelLayout) {
+    // Output directions for user to move all files from app to top-level directory named `(app)`
+    p.log.warn(moveMessage({ nextAppDir, projectDir }))
+    return {
+      isSrcDir,
+      nextAppDir,
+      reason: 'Found existing layout.tsx in app directory',
+      success: false,
+    }
+  }
+
+  const installSpinner = p.spinner()
+  installSpinner.start('Installing Payload and dependencies...')
+
+  const configurationResult = installAndConfigurePayload({
+    ...args,
+    nextAppDetails,
+    nextConfigType,
+    useDistFiles: true, // Requires running 'pnpm pack-template-files' in cpa
+  })
+
+  if (configurationResult.success === false) {
+    installSpinner.stop(configurationResult.reason, 1)
+    return { ...configurationResult, isSrcDir, success: false }
+  }
+
+  const { success: installSuccess } = await installDeps(projectDir, packageManager, dbType)
+  if (!installSuccess) {
+    installSpinner.stop('Failed to install dependencies', 1)
+    return {
+      ...configurationResult,
+      isSrcDir,
+      reason: 'Failed to install dependencies',
+      success: false,
+    }
   }
 
   // Add `@payload-config` to tsconfig.json `paths`
-  await addPayloadConfigToTsConfig(projectDir)
-
-  // Output directions for user to update next.config.js
-  const withPayloadMessage = `
-
-  ${chalk.bold(`Wrap your existing next.config.js with the withPayload function. Here is an example:`)}
-
-  import withPayload from '@payloadcms/next/withPayload'
-
-  const nextConfig = {
-    // Your Next.js config here
-  }
-
-  export default withPayload(nextConfig)
-
-`
-
-  console.log(withPayloadMessage)
-
-  return templateResult
+  await addPayloadConfigToTsConfig(projectDir, isSrcDir)
+  installSpinner.stop('Successfully installed Payload and dependencies')
+  return { ...configurationResult, isSrcDir, nextAppDir, success: true }
 }
 
-async function addPayloadConfigToTsConfig(projectDir: string) {
+async function addPayloadConfigToTsConfig(projectDir: string, isSrcDir: boolean) {
   const tsConfigPath = path.resolve(projectDir, 'tsconfig.json')
+
+  // Check if tsconfig.json exists
+  if (!fs.existsSync(tsConfigPath)) {
+    warning(`Could not find tsconfig.json to add @payload-config path.`)
+    return
+  }
+
   const userTsConfigContent = await readFile(tsConfigPath, {
     encoding: 'utf8',
   })
@@ -80,51 +128,59 @@ async function addPayloadConfigToTsConfig(projectDir: string) {
     userTsConfig.compilerOptions = {}
   }
 
-  if (!userTsConfig.compilerOptions.paths?.['@payload-config']) {
+  if (
+    !userTsConfig.compilerOptions?.paths?.['@payload-config'] &&
+    userTsConfig.compilerOptions?.paths
+  ) {
     userTsConfig.compilerOptions.paths = {
       ...(userTsConfig.compilerOptions.paths || {}),
-      '@payload-config': ['./payload.config.ts'],
+      '@payload-config': [`./${isSrcDir ? 'src/' : ''}payload.config.ts`],
     }
     await writeFile(tsConfigPath, stringify(userTsConfig, null, 2), { encoding: 'utf8' })
   }
 }
 
-async function applyPayloadTemplateFiles(args: InitNextArgs): Promise<InitNextResult> {
-  const { '--debug': debug, projectDir, useDistFiles } = args
+function installAndConfigurePayload(
+  args: InitNextArgs & {
+    nextAppDetails: NextAppDetails
+    nextConfigType: NextConfigType
+    useDistFiles?: boolean
+  },
+):
+  | { payloadConfigPath: string; success: true }
+  | { payloadConfigPath?: string; reason: string; success: false } {
+  const {
+    '--debug': debug,
+    nextAppDetails: { isSrcDir, nextAppDir, nextConfigPath } = {},
+    nextConfigType,
+    projectDir,
+    useDistFiles,
+  } = args
 
-  info('Initializing Payload app in Next.js project', 1)
+  if (!nextAppDir || !nextConfigPath) {
+    return {
+      reason: 'Could not find app directory or next.config.js',
+      success: false,
+    }
+  }
 
   const logDebug = (message: string) => {
     if (debug) origDebug(message)
   }
 
   if (!fs.existsSync(projectDir)) {
-    return { reason: `Could not find specified project directory at ${projectDir}`, success: false }
-  }
-
-  // Next.js configs can be next.config.js, next.config.mjs, etc.
-  const foundConfig = (await globby('next.config.*js', { cwd: projectDir }))?.[0]
-
-  if (!foundConfig) {
-    throw new Error(`No next.config.js found at ${projectDir}`)
-  }
-
-  const nextConfigPath = path.resolve(projectDir, foundConfig)
-  if (!fs.existsSync(nextConfigPath)) {
     return {
-      reason: `No next.config.js found at ${nextConfigPath}. Ensure you are in a Next.js project directory.`,
+      reason: `Could not find specified project directory at ${projectDir}`,
       success: false,
     }
-  } else {
-    if (debug) logDebug(`Found Next config at ${nextConfigPath}`)
   }
 
   const templateFilesPath =
     dirname.endsWith('dist') || useDistFiles
-      ? path.resolve(dirname, '../..', 'dist/app')
-      : path.resolve(dirname, '../../../../app')
+      ? path.resolve(dirname, '../..', 'dist/template')
+      : path.resolve(dirname, '../../../../templates/blank-3.0')
 
-  if (debug) logDebug(`Using template files from: ${templateFilesPath}`)
+  logDebug(`Using template files from: ${templateFilesPath}`)
 
   if (!fs.existsSync(templateFilesPath)) {
     return {
@@ -132,40 +188,41 @@ async function applyPayloadTemplateFiles(args: InitNextArgs): Promise<InitNextRe
       success: false,
     }
   } else {
-    if (debug) logDebug('Found template source files')
+    logDebug('Found template source files')
   }
 
-  // src/app or app
-  const userAppDirGlob = await globby(['**/app'], {
-    cwd: projectDir,
-    onlyDirectories: true,
-  })
-  const userAppDir = path.resolve(projectDir, userAppDirGlob?.[0])
-  if (!fs.existsSync(userAppDir)) {
-    return { reason: `Could not find user app directory inside ${projectDir}`, success: false }
-  } else {
-    logDebug(`Found user app directory: ${userAppDir}`)
-  }
+  logDebug(`Copying template files from ${templateFilesPath} to ${nextAppDir}`)
 
-  logDebug(`Copying template files from ${templateFilesPath} to ${userAppDir}`)
-  copyRecursiveSync(templateFilesPath, userAppDir, debug)
-  success('Successfully initialized.')
-  return { success: true, userAppDir }
+  const templateSrcDir = path.resolve(templateFilesPath, isSrcDir ? '' : 'src')
+
+  logDebug(`templateSrcDir: ${templateSrcDir}`)
+  logDebug(`nextAppDir: ${nextAppDir}`)
+  logDebug(`projectDir: ${projectDir}`)
+  logDebug(`nextConfigPath: ${nextConfigPath}`)
+  logDebug(`payloadConfigPath: ${path.resolve(projectDir, 'payload.config.ts')}`)
+
+  logDebug(
+    `isSrcDir: ${isSrcDir}. source: ${templateSrcDir}. dest: ${path.dirname(nextConfigPath)}`,
+  )
+
+  // This is a little clunky and needs to account for isSrcDir
+  copyRecursiveSync(templateSrcDir, path.dirname(nextConfigPath), debug)
+
+  // Wrap next.config.js with withPayload
+  wrapNextConfig({ nextConfigPath, nextConfigType })
+
+  return {
+    payloadConfigPath: path.resolve(nextAppDir, '../payload.config.ts'),
+    success: true,
+  }
 }
 
-async function installDeps(projectDir: string) {
-  const packageManager = await detect({ cwd: projectDir })
-  if (!packageManager) {
-    throw new Error('Could not detect package manager')
-  }
+async function installDeps(projectDir: string, packageManager: PackageManager, dbType: DbType) {
+  const packagesToInstall = ['payload', '@payloadcms/next', '@payloadcms/richtext-lexical'].map(
+    (pkg) => `${pkg}@beta`,
+  )
 
-  info(`Installing dependencies with ${packageManager}`, 1)
-  const packagesToInstall = [
-    'payload',
-    '@payloadcms/db-mongodb',
-    '@payloadcms/next',
-    '@payloadcms/richtext-slate',
-  ].map((pkg) => `${pkg}@alpha`)
+  packagesToInstall.push(`@payloadcms/db-${dbType}@beta`)
 
   let exitCode = 0
   switch (packageManager) {
@@ -189,43 +246,69 @@ async function installDeps(projectDir: string) {
     }
   }
 
-  if (exitCode !== 0) {
-    error(`Failed to install dependencies with ${packageManager}`)
-  } else {
-    success(`Successfully installed dependencies`)
-  }
   return { success: exitCode === 0 }
 }
-function findOrCreatePayloadConfig(projectDir: string) {
-  const configPath = path.resolve(projectDir, 'payload.config.ts')
-  if (fs.existsSync(configPath)) {
-    return { message: 'Found existing payload.config.ts', success: true }
-  } else {
-    // Create default config
-    // TODO: Pull this from templates
-    const defaultConfig = `import path from "path";
 
-import { mongooseAdapter } from "@payloadcms/db-mongodb"; // database-adapter-import
-import { slateEditor } from "@payloadcms/richtext-slate"; // editor-import
-import { buildConfig } from "payload/config";
-
-export default buildConfig({
-  editor: slateEditor({}), // editor-config
-  collections: [],
-  secret: "asdfasdf",
-  typescript: {
-    outputFile: path.resolve(__dirname, "payload-types.ts"),
-  },
-  graphQL: {
-    schemaOutputFile: path.resolve(__dirname, "generated-schema.graphql"),
-  },
-  db: mongooseAdapter({
-    url: "mongodb://localhost:27017/next-payload-3",
-  }),
-});
-`
-
-    fse.writeFileSync(configPath, defaultConfig)
-    return { message: 'Created default payload.config.ts', success: true }
-  }
+type NextAppDetails = {
+  hasTopLevelLayout: boolean
+  isSrcDir: boolean
+  nextAppDir?: string
+  nextConfigPath?: string
+  nextConfigType?: NextConfigType
+}
+
+export async function getNextAppDetails(projectDir: string): Promise<NextAppDetails> {
+  const isSrcDir = fs.existsSync(path.resolve(projectDir, 'src'))
+
+  const nextConfigPath: string | undefined = (
+    await globby('next.config.*js', { absolute: true, cwd: projectDir })
+  )?.[0]
+  if (!nextConfigPath || nextConfigPath.length === 0) {
+    return {
+      hasTopLevelLayout: false,
+      isSrcDir,
+      nextConfigPath: undefined,
+    }
+  }
+
+  let nextAppDir: string | undefined = (
+    await globby(['**/app'], {
+      absolute: true,
+      cwd: projectDir,
+      ignore: ['**/node_modules/**'],
+      onlyDirectories: true,
+    })
+  )?.[0]
+
+  if (!nextAppDir || nextAppDir.length === 0) {
+    nextAppDir = undefined
+  }
+
+  const configType = await getProjectType(projectDir, nextConfigPath)
+
+  const hasTopLevelLayout = nextAppDir
+    ? fs.existsSync(path.resolve(nextAppDir, 'layout.tsx'))
+    : false
+
+  return { hasTopLevelLayout, isSrcDir, nextAppDir, nextConfigPath, nextConfigType: configType }
+}
+
+async function getProjectType(projectDir: string, nextConfigPath: string): Promise<'cjs' | 'esm'> {
+  if (nextConfigPath.endsWith('.mjs')) {
+    return 'esm'
+  }
+  if (nextConfigPath.endsWith('.cjs')) {
+    return 'cjs'
+  }
+
+  const packageObj = await fse.readJson(path.resolve(projectDir, 'package.json'))
+  const packageJsonType = packageObj.type
+  if (packageJsonType === 'module') {
+    return 'esm'
+  }
+  if (packageJsonType === 'commonjs') {
+    return 'cjs'
+  }
+
+  return 'cjs'
 }

packages/create-payload-app/src/lib/packages.ts

@@ -1,83 +1,35 @@
-import type { BundlerType, DbType, EditorType } from '../types.js'
+import type { DbType } from '../types.js'
 
 type DbAdapterReplacement = {
   configReplacement: string[]
   importReplacement: string
   packageName: string
-  version: string
-}
-
-type BundlerReplacement = {
-  configReplacement: string
-  importReplacement: string
-  packageName: string
-  version: string
-}
-
-type EditorReplacement = {
-  configReplacement: string
-  importReplacement: string
-  packageName: string
-  version: string
 }
 
 const mongodbReplacement: DbAdapterReplacement = {
   importReplacement: "import { mongooseAdapter } from '@payloadcms/db-mongodb'",
   packageName: '@payloadcms/db-mongodb',
   // Replacement between `// database-adapter-config-start` and `// database-adapter-config-end`
-  configReplacement: ['  db: mongooseAdapter({', '    url: process.env.DATABASE_URI,', '  }),'],
-  version: '^1.0.0',
+  configReplacement: [
+    '  db: mongooseAdapter({',
+    "    url: process.env.DATABASE_URI || '',",
+    '  }),',
+  ],
 }
 
 const postgresReplacement: DbAdapterReplacement = {
   configReplacement: [
     '  db: postgresAdapter({',
     '    pool: {',
-    '      connectionString: process.env.DATABASE_URI,',
+    "      connectionString: process.env.DATABASE_URI || '',",
     '    },',
     '  }),',
   ],
   importReplacement: "import { postgresAdapter } from '@payloadcms/db-postgres'",
   packageName: '@payloadcms/db-postgres',
-  version: '^0.x', // up to, not including 1.0.0
 }
 
-export const dbPackages: Record<DbType, DbAdapterReplacement> = {
+export const dbReplacements: Record<DbType, DbAdapterReplacement> = {
   mongodb: mongodbReplacement,
   postgres: postgresReplacement,
 }
-
-const webpackReplacement: BundlerReplacement = {
-  importReplacement: "import { webpackBundler } from '@payloadcms/bundler-webpack'",
-  packageName: '@payloadcms/bundler-webpack',
-  // Replacement of line containing `// bundler-config`
-  configReplacement: '    bundler: webpackBundler(),',
-  version: '^1.0.0',
-}
-
-const viteReplacement: BundlerReplacement = {
-  configReplacement: '  bundler: viteBundler(),',
-  importReplacement: "import { viteBundler } from '@payloadcms/bundler-vite'",
-  packageName: '@payloadcms/bundler-vite',
-  version: '^0.x', // up to, not including 1.0.0
-}
-
-export const bundlerPackages: Record<BundlerType, BundlerReplacement> = {
-  vite: viteReplacement,
-  webpack: webpackReplacement,
-}
-
-export const editorPackages: Record<EditorType, EditorReplacement> = {
-  lexical: {
-    configReplacement: '  editor: lexicalEditor({}),',
-    importReplacement: "import { lexicalEditor } from '@payloadcms/richtext-lexical'",
-    packageName: '@payloadcms/richtext-lexical',
-    version: '^0.x', // up to, not including 1.0.0
-  },
-  slate: {
-    configReplacement: '  editor: slateEditor({}),',
-    importReplacement: "import { slateEditor } from '@payloadcms/richtext-slate'",
-    packageName: '@payloadcms/richtext-slate',
-    version: '^1.0.0',
-  },
-}

packages/create-payload-app/src/lib/parse-project-name.ts

@@ -1,24 +1,20 @@
-import prompts from 'prompts'
+import * as p from '@clack/prompts'
+import slugify from '@sindresorhus/slugify'
 
 import type { CliArgs } from '../types.js'
 
 export async function parseProjectName(args: CliArgs): Promise<string> {
-  if (args['--name']) return args['--name']
-  if (args._[0]) return args._[0]
+  if (args['--name']) return slugify(args['--name'])
+  if (args._[0]) return slugify(args._[0])
 
-  const response = await prompts(
-    {
-      name: 'value',
-      type: 'text',
-      message: 'Project name?',
-      validate: (value: string) => !!value.length,
+  const projectName = await p.text({
+    message: 'Project name?',
+    validate: (value) => {
+      if (!value) return 'Please enter a project name.'
     },
-    {
-      onCancel: () => {
-        process.exit(0)
-      },
-    },
-  )
-
-  return response.value
+  })
+  if (p.isCancel(projectName)) {
+    process.exit(0)
+  }
+  return slugify(projectName)
 }

packages/create-payload-app/src/lib/parse-template.ts

@@ -1,11 +1,11 @@
-import prompts from 'prompts'
+import * as p from '@clack/prompts'
 
 import type { CliArgs, ProjectTemplate } from '../types.js'
 
 export async function parseTemplate(
   args: CliArgs,
   validTemplates: ProjectTemplate[],
-): Promise<ProjectTemplate> {
+): Promise<ProjectTemplate | undefined> {
   if (args['--template']) {
     const templateName = args['--template']
     const template = validTemplates.find((t) => t.name === templateName)
@@ -13,29 +13,20 @@ export async function parseTemplate(
     return template
   }
 
-  const response = await prompts(
-    {
-      name: 'value',
-      type: 'select',
-      choices: validTemplates.map((p) => {
-        return {
-          description: p.description,
-          title: p.name,
-          value: p.name,
-        }
-      }),
-      message: 'Choose project template',
-      validate: (value: string) => !!value.length,
-    },
-    {
-      onCancel: () => {
-        process.exit(0)
-      },
-    },
-  )
+  const response = await p.select<{ label: string; value: string }[], string>({
+    message: 'Choose project template',
+    options: validTemplates.map((p) => {
+      return {
+        label: p.name,
+        value: p.name,
+      }
+    }),
+  })
+  if (p.isCancel(response)) {
+    process.exit(0)
+  }
 
-  const template = validTemplates.find((t) => t.name === response.value)
-  if (!template) throw new Error('Template is undefined')
+  const template = validTemplates.find((t) => t.name === response)
 
   return template
 }

packages/create-payload-app/src/lib/select-db.ts

@@ -1,5 +1,5 @@
+import * as p from '@clack/prompts'
 import slugify from '@sindresorhus/slugify'
-import prompts from 'prompts'
 
 import type { CliArgs, DbDetails, DbType } from '../types.js'
 
@@ -23,7 +23,7 @@ const dbChoiceRecord: Record<DbType, DbChoice> = {
 }
 
 export async function selectDb(args: CliArgs, projectName: string): Promise<DbDetails> {
-  let dbType: DbType | undefined = undefined
+  let dbType: DbType | symbol | undefined = undefined
   if (args['--db']) {
     if (!Object.values(dbChoiceRecord).some((dbChoice) => dbChoice.value === args['--db'])) {
       throw new Error(
@@ -34,50 +34,39 @@ export async function selectDb(args: CliArgs, projectName: string): Promise<DbDe
     }
     dbType = args['--db'] as DbType
   } else {
-    const dbTypeRes = await prompts(
-      {
-        name: 'value',
-        type: 'select',
-        choices: Object.values(dbChoiceRecord).map((dbChoice) => {
-          return {
-            title: dbChoice.title,
-            value: dbChoice.value,
-          }
-        }),
-        message: 'Select a database',
-        validate: (value: string) => !!value.length,
-      },
-      {
-        onCancel: () => {
-          process.exit(0)
-        },
-      },
-    )
-    dbType = dbTypeRes.value
+    dbType = await p.select<{ label: string; value: DbType }[], DbType>({
+      initialValue: 'mongodb',
+      message: `Select a database`,
+      options: [
+        { label: 'MongoDB', value: 'mongodb' },
+        { label: 'Postgres', value: 'postgres' },
+      ],
+    })
+    if (p.isCancel(dbType)) process.exit(0)
   }
 
   const dbChoice = dbChoiceRecord[dbType]
 
-  const dbUriRes = await prompts(
-    {
-      name: 'value',
-      type: 'text',
-      initial: `${dbChoice.dbConnectionPrefix}${
-        projectName === '.' ? `payload-${getRandomDigitSuffix()}` : slugify(projectName)
-      }`,
+  let dbUri: string | symbol | undefined = undefined
+  const initialDbUri = `${dbChoice.dbConnectionPrefix}${
+    projectName === '.' ? `payload-${getRandomDigitSuffix()}` : slugify(projectName)
+  }`
+
+  if (args['--db-accept-recommended']) {
+    dbUri = initialDbUri
+  } else if (args['--db-connection-string']) {
+    dbUri = args['--db-connection-string']
+  } else {
+    dbUri = await p.text({
+      initialValue: initialDbUri,
       message: `Enter ${dbChoice.title.split(' ')[0]} connection string`, // strip beta from title
-      validate: (value: string) => !!value.length,
-    },
-    {
-      onCancel: () => {
-        process.exit(0)
-      },
-    },
-  )
+    })
+    if (p.isCancel(dbUri)) process.exit(0)
+  }
 
   return {
     type: dbChoice.value,
-    dbUri: dbUriRes.value,
+    dbUri,
   }
 }
 

packages/create-payload-app/src/lib/templates.ts

@@ -15,40 +15,49 @@ export function validateTemplate(templateName: string): boolean {
 export function getValidTemplates(): ProjectTemplate[] {
   return [
     {
-      name: 'blank',
+      name: 'blank-3.0',
       type: 'starter',
-      description: 'Blank Template',
-      url: 'https://github.com/payloadcms/payload/templates/blank',
-    },
-    {
-      name: 'website',
-      type: 'starter',
-      description: 'Website Template',
-      url: 'https://github.com/payloadcms/payload/templates/website',
-    },
-    {
-      name: 'ecommerce',
-      type: 'starter',
-      description: 'E-commerce Template',
-      url: 'https://github.com/payloadcms/payload/templates/ecommerce',
-    },
-    {
-      name: 'plugin',
-      type: 'plugin',
-      description: 'Template for creating a Payload plugin',
-      url: 'https://github.com/payloadcms/payload-plugin-template',
-    },
-    {
-      name: 'payload-demo',
-      type: 'starter',
-      description: 'Payload demo site at https://demo.payloadcms.com',
-      url: 'https://github.com/payloadcms/public-demo',
-    },
-    {
-      name: 'payload-website',
-      type: 'starter',
-      description: 'Payload website CMS at https://payloadcms.com',
-      url: 'https://github.com/payloadcms/website-cms',
+      description: 'Blank 3.0 Template',
+      url: 'https://github.com/payloadcms/payload/templates/blank-3.0#beta',
     },
+
+    // Remove these until they have been updated for 3.0
+
+    // {
+    //   name: 'blank',
+    //   type: 'starter',
+    //   description: 'Blank Template',
+    //   url: 'https://github.com/payloadcms/payload/templates/blank',
+    // },
+    // {
+    //   name: 'website',
+    //   type: 'starter',
+    //   description: 'Website Template',
+    //   url: 'https://github.com/payloadcms/payload/templates/website',
+    // },
+    // {
+    //   name: 'ecommerce',
+    //   type: 'starter',
+    //   description: 'E-commerce Template',
+    //   url: 'https://github.com/payloadcms/payload/templates/ecommerce',
+    // },
+    // {
+    //   name: 'plugin',
+    //   type: 'plugin',
+    //   description: 'Template for creating a Payload plugin',
+    //   url: 'https://github.com/payloadcms/payload-plugin-template',
+    // },
+    // {
+    //   name: 'payload-demo',
+    //   type: 'starter',
+    //   description: 'Payload demo site at https://demo.payloadcms.com',
+    //   url: 'https://github.com/payloadcms/public-demo',
+    // },
+    // {
+    //   name: 'payload-website',
+    //   type: 'starter',
+    //   description: 'Payload website CMS at https://payloadcms.com',
+    //   url: 'https://github.com/payloadcms/website-cms',
+    // },
   ]
 }

packages/create-payload-app/src/lib/wrap-next-config.spec.ts

@@ -0,0 +1,159 @@
+import { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js'
+import * as p from '@clack/prompts'
+
+const esmConfigs = {
+  defaultNextConfig: `/** @type {import('next').NextConfig} */
+const nextConfig = {};
+export default nextConfig;
+`,
+  nextConfigWithFunc: `const nextConfig = {};
+export default someFunc(nextConfig);
+`,
+  nextConfigWithFuncMultiline: `const nextConfig = {};;
+export default someFunc(
+  nextConfig
+);
+`,
+  nextConfigExportNamedDefault: `const nextConfig = {};
+const wrapped = someFunc(asdf);
+export { wrapped as default };
+`,
+  nextConfigWithSpread: `const nextConfig = {
+  ...someConfig,
+};
+export default nextConfig;
+`,
+}
+
+const cjsConfigs = {
+  defaultNextConfig: `
+  /** @type {import('next').NextConfig} */
+const nextConfig = {};
+module.exports = nextConfig;
+`,
+  anonConfig: `module.exports = {};`,
+  nextConfigWithFunc: `const nextConfig = {};
+module.exports = someFunc(nextConfig);
+`,
+  nextConfigWithFuncMultiline: `const nextConfig = {};
+module.exports = someFunc(
+  nextConfig
+);
+`,
+  nextConfigExportNamedDefault: `const nextConfig = {};
+const wrapped = someFunc(asdf);
+module.exports = wrapped;
+`,
+  nextConfigWithSpread: `const nextConfig = { ...someConfig };
+module.exports = nextConfig;
+`,
+}
+
+describe('parseAndInsertWithPayload', () => {
+  describe('esm', () => {
+    const configType = 'esm'
+    const importStatement = withPayloadStatement[configType]
+    it('should parse the default next config', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        esmConfigs.defaultNextConfig,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(importStatement)
+      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')
+    })
+    it('should parse the config with a function', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        esmConfigs.nextConfigWithFunc,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))')
+    })
+
+    it('should parse the config with a function on a new line', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        esmConfigs.nextConfigWithFuncMultiline,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(importStatement)
+      expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n  nextConfig\n\)\)/)
+    })
+
+    it('should parse the config with a spread', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        esmConfigs.nextConfigWithSpread,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(importStatement)
+      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')
+    })
+
+    // Unsupported: export { wrapped as default }
+    it('should give warning with a named export as default', () => {
+      const warnLogSpy = jest.spyOn(p.log, 'warn').mockImplementation(() => {})
+
+      const { modifiedConfigContent, success } = parseAndModifyConfigContent(
+        esmConfigs.nextConfigExportNamedDefault,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(importStatement)
+      expect(success).toBe(false)
+
+      expect(warnLogSpy).toHaveBeenCalledWith(
+        expect.stringContaining('Could not automatically wrap'),
+      )
+    })
+  })
+
+  describe('cjs', () => {
+    const configType = 'cjs'
+    const requireStatement = withPayloadStatement[configType]
+    it('should parse the default next config', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        cjsConfigs.defaultNextConfig,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(requireStatement)
+      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')
+    })
+    it('should parse anonymous default config', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        cjsConfigs.anonConfig,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(requireStatement)
+      expect(modifiedConfigContent).toContain('withPayload({})')
+    })
+    it('should parse the config with a function', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        cjsConfigs.nextConfigWithFunc,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))')
+    })
+    it('should parse the config with a function on a new line', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        cjsConfigs.nextConfigWithFuncMultiline,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(requireStatement)
+      expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n  nextConfig\n\)\)/)
+    })
+    it('should parse the config with a named export as default', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        cjsConfigs.nextConfigExportNamedDefault,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(requireStatement)
+      expect(modifiedConfigContent).toContain('withPayload(wrapped)')
+    })
+
+    it('should parse the config with a spread', () => {
+      const { modifiedConfigContent } = parseAndModifyConfigContent(
+        cjsConfigs.nextConfigWithSpread,
+        configType,
+      )
+      expect(modifiedConfigContent).toContain(requireStatement)
+      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')
+    })
+  })
+})

packages/create-payload-app/src/lib/wrap-next-config.ts

@@ -0,0 +1,208 @@
+import type { Program } from 'esprima-next'
+
+import chalk from 'chalk'
+import { Syntax, parseModule } from 'esprima-next'
+import fs from 'fs'
+
+import { warning } from '../utils/log.js'
+import { log } from '../utils/log.js'
+
+export const withPayloadStatement = {
+  cjs: `const { withPayload } = require('@payloadcms/next/withPayload')\n`,
+  esm: `import { withPayload } from '@payloadcms/next/withPayload'\n`,
+}
+
+type NextConfigType = 'cjs' | 'esm'
+
+export const wrapNextConfig = (args: {
+  nextConfigPath: string
+  nextConfigType: NextConfigType
+}) => {
+  const { nextConfigPath, nextConfigType: configType } = args
+  const configContent = fs.readFileSync(nextConfigPath, 'utf8')
+  const { modifiedConfigContent: newConfig, success } = parseAndModifyConfigContent(
+    configContent,
+    configType,
+  )
+
+  if (!success) {
+    return
+  }
+
+  fs.writeFileSync(nextConfigPath, newConfig)
+}
+
+/**
+ * Parses config content with AST and wraps it with withPayload function
+ */
+export function parseAndModifyConfigContent(
+  content: string,
+  configType: NextConfigType,
+): { modifiedConfigContent: string; success: boolean } {
+  content = withPayloadStatement[configType] + content
+
+  let ast: Program | undefined
+  try {
+    ast = parseModule(content, { loc: true })
+  } catch (error: unknown) {
+    if (error instanceof Error) {
+      warning(`Unable to parse Next config. Error: ${error.message} `)
+      warnUserWrapNotSuccessful(configType)
+    }
+    return {
+      modifiedConfigContent: content,
+      success: false,
+    }
+  }
+
+  if (configType === 'esm') {
+    const exportDefaultDeclaration = ast.body.find(
+      (p) => p.type === Syntax.ExportDefaultDeclaration,
+    ) as Directive | undefined
+
+    const exportNamedDeclaration = ast.body.find(
+      (p) => p.type === Syntax.ExportNamedDeclaration,
+    ) as ExportNamedDeclaration | undefined
+
+    if (!exportDefaultDeclaration && !exportNamedDeclaration) {
+      throw new Error('Could not find ExportDefaultDeclaration in next.config.js')
+    }
+
+    if (exportDefaultDeclaration && exportDefaultDeclaration.declaration?.loc) {
+      const modifiedConfigContent = insertBeforeAndAfter(
+        content,
+        exportDefaultDeclaration.declaration.loc,
+      )
+      return { modifiedConfigContent, success: true }
+    } else if (exportNamedDeclaration) {
+      const exportSpecifier = exportNamedDeclaration.specifiers.find(
+        (s) =>
+          s.type === 'ExportSpecifier' &&
+          s.exported?.name === 'default' &&
+          s.local?.type === 'Identifier' &&
+          s.local?.name,
+      )
+
+      if (exportSpecifier) {
+        warning('Could not automatically wrap next.config.js with withPayload.')
+        warning('Automatic wrapping of named exports as default not supported yet.')
+
+        warnUserWrapNotSuccessful(configType)
+        return {
+          modifiedConfigContent: content,
+          success: false,
+        }
+      }
+    }
+
+    warning('Could not automatically wrap Next config with withPayload.')
+    warnUserWrapNotSuccessful(configType)
+    return {
+      modifiedConfigContent: content,
+      success: false,
+    }
+  } else if (configType === 'cjs') {
+    // Find `module.exports = X`
+    const moduleExports = ast.body.find(
+      (p) =>
+        p.type === Syntax.ExpressionStatement &&
+        p.expression?.type === Syntax.AssignmentExpression &&
+        p.expression.left?.type === Syntax.MemberExpression &&
+        p.expression.left.object?.type === Syntax.Identifier &&
+        p.expression.left.object.name === 'module' &&
+        p.expression.left.property?.type === Syntax.Identifier &&
+        p.expression.left.property.name === 'exports',
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) as any
+
+    if (moduleExports && moduleExports.expression.right?.loc) {
+      const modifiedConfigContent = insertBeforeAndAfter(
+        content,
+        moduleExports.expression.right.loc,
+      )
+      return { modifiedConfigContent, success: true }
+    }
+
+    return {
+      modifiedConfigContent: content,
+      success: false,
+    }
+  }
+
+  warning('Could not automatically wrap Next config with withPayload.')
+  warnUserWrapNotSuccessful(configType)
+  return {
+    modifiedConfigContent: content,
+    success: false,
+  }
+}
+
+function warnUserWrapNotSuccessful(configType: NextConfigType) {
+  // Output directions for user to update next.config.js
+  const withPayloadMessage = `
+
+  ${chalk.bold(`Please manually wrap your existing next.config.js with the withPayload function. Here is an example:`)}
+
+  ${withPayloadStatement[configType]}
+
+  const nextConfig = {
+    // Your Next.js config here
+  }
+
+  ${configType === 'esm' ? 'export default withPayload(nextConfig)' : 'module.exports = withPayload(nextConfig)'}
+
+`
+
+  log(withPayloadMessage)
+}
+
+type Directive = {
+  declaration?: {
+    loc: Loc
+  }
+}
+
+type ExportNamedDeclaration = {
+  declaration: null
+  loc: Loc
+  specifiers: {
+    exported: {
+      loc: Loc
+      name: string
+      type: string
+    }
+    loc: Loc
+    local: {
+      loc: Loc
+      name: string
+      type: string
+    }
+    type: string
+  }[]
+  type: string
+}
+
+type Loc = {
+  end: { column: number; line: number }
+  start: { column: number; line: number }
+}
+
+function insertBeforeAndAfter(content: string, loc: Loc) {
+  const { end, start } = loc
+  const lines = content.split('\n')
+
+  const insert = (line: string, column: number, text: string) => {
+    return line.slice(0, column) + text + line.slice(column)
+  }
+
+  // insert ) after end
+  lines[end.line - 1] = insert(lines[end.line - 1], end.column, ')')
+  // insert withPayload before start
+  if (start.line === end.line) {
+    lines[end.line - 1] = insert(lines[end.line - 1], start.column, 'withPayload(')
+  } else {
+    lines[start.line - 1] = insert(lines[start.line - 1], start.column, 'withPayload(')
+  }
+
+  return lines.join('\n')
+}

packages/create-payload-app/src/lib/write-env-file.ts

@@ -1,50 +1,64 @@
 import fs from 'fs-extra'
 import path from 'path'
 
-import type { ProjectTemplate } from '../types.js'
+import type { CliArgs, ProjectTemplate } from '../types.js'
 
-import { error, success } from '../utils/log.js'
+import { debug, error } from '../utils/log.js'
 
 /** Parse and swap .env.example values and write .env */
 export async function writeEnvFile(args: {
+  cliArgs: CliArgs
   databaseUri: string
   payloadSecret: string
   projectDir: string
-  template: ProjectTemplate
+  template?: ProjectTemplate
 }): Promise<void> {
-  const { databaseUri, payloadSecret, projectDir, template } = args
+  const { cliArgs, databaseUri, payloadSecret, projectDir, template } = args
+
+  if (cliArgs['--dry-run']) {
+    debug(`DRY RUN: .env file created`)
+    return
+  }
+
+  const envOutputPath = path.join(projectDir, '.env')
+
   try {
-    if (template.type === 'starter' && fs.existsSync(path.join(projectDir, '.env.example'))) {
-      // Parse .env file into key/value pairs
-      const envFile = await fs.readFile(path.join(projectDir, '.env.example'), 'utf8')
-      const envWithValues: string[] = envFile
-        .split('\n')
-        .filter((e) => e)
-        .map((line) => {
-          if (line.startsWith('#') || !line.includes('=')) return line
+    if (fs.existsSync(envOutputPath)) {
+      if (template?.type === 'starter') {
+        // Parse .env file into key/value pairs
+        const envFile = await fs.readFile(path.join(projectDir, '.env.example'), 'utf8')
+        const envWithValues: string[] = envFile
+          .split('\n')
+          .filter((e) => e)
+          .map((line) => {
+            if (line.startsWith('#') || !line.includes('=')) return line
 
-          const split = line.split('=')
-          const key = split[0]
-          let value = split[1]
+            const split = line.split('=')
+            const key = split[0]
+            let value = split[1]
 
-          if (key === 'MONGODB_URI' || key === 'MONGO_URL' || key === 'DATABASE_URI') {
-            value = databaseUri
-          }
-          if (key === 'PAYLOAD_SECRET' || key === 'PAYLOAD_SECRET_KEY') {
-            value = payloadSecret
-          }
+            if (key === 'MONGODB_URI' || key === 'MONGO_URL' || key === 'DATABASE_URI') {
+              value = databaseUri
+            }
+            if (key === 'PAYLOAD_SECRET' || key === 'PAYLOAD_SECRET_KEY') {
+              value = payloadSecret
+            }
 
-          return `${key}=${value}`
-        })
+            return `${key}=${value}`
+          })
 
-      // Write new .env file
-      await fs.writeFile(path.join(projectDir, '.env'), envWithValues.join('\n'))
+        // Write new .env file
+        await fs.writeFile(envOutputPath, envWithValues.join('\n'))
+      } else {
+        const existingEnv = await fs.readFile(envOutputPath, 'utf8')
+        const newEnv =
+          existingEnv + `\nDATABASE_URI=${databaseUri}\nPAYLOAD_SECRET=${payloadSecret}\n`
+        await fs.writeFile(envOutputPath, newEnv)
+      }
     } else {
-      const content = `MONGODB_URI=${databaseUri}\nPAYLOAD_SECRET=${payloadSecret}`
+      const content = `DATABASE_URI=${databaseUri}\nPAYLOAD_SECRET=${payloadSecret}`
       await fs.outputFile(`${projectDir}/.env`, content)
     }
-
-    success('.env file created')
   } catch (err: unknown) {
     error('Unable to write .env file')
     if (err instanceof Error) {

packages/create-payload-app/src/main.ts

@@ -1,19 +1,31 @@
+import * as p from '@clack/prompts'
 import slugify from '@sindresorhus/slugify'
 import arg from 'arg'
-import commandExists from 'command-exists'
+import chalk from 'chalk'
+// @ts-expect-error no types
+import { detect } from 'detect-package-manager'
+import figures from 'figures'
+import path from 'path'
 
 import type { CliArgs, PackageManager } from './types.js'
 
+import { configurePayloadConfig } from './lib/configure-payload-config.js'
 import { createProject } from './lib/create-project.js'
 import { generateSecret } from './lib/generate-secret.js'
-import { initNext } from './lib/init-next.js'
+import { getNextAppDetails, initNext } from './lib/init-next.js'
 import { parseProjectName } from './lib/parse-project-name.js'
 import { parseTemplate } from './lib/parse-template.js'
 import { selectDb } from './lib/select-db.js'
 import { getValidTemplates, validateTemplate } from './lib/templates.js'
 import { writeEnvFile } from './lib/write-env-file.js'
-import { error, success } from './utils/log.js'
-import { helpMessage, successMessage, welcomeMessage } from './utils/messages.js'
+import { error, info } from './utils/log.js'
+import {
+  feedbackOutro,
+  helpMessage,
+  moveMessage,
+  successMessage,
+  successfulNextInit,
+} from './utils/messages.js'
 
 export class Main {
   args: CliArgs
@@ -23,13 +35,17 @@ export class Main {
     this.args = arg(
       {
         '--db': String,
+        '--db-accept-recommended': Boolean,
+        '--db-connection-string': String,
         '--help': Boolean,
+        '--local-template': String,
         '--name': String,
         '--secret': String,
         '--template': String,
+        '--template-branch': String,
 
         // Next.js
-        '--init-next': Boolean,
+        '--init-next': Boolean, // TODO: Is this needed if we detect if inside Next.js project?
 
         // Package manager
         '--no-deps': Boolean,
@@ -55,41 +71,107 @@ export class Main {
   async init(): Promise<void> {
     try {
       if (this.args['--help']) {
-        console.log(helpMessage())
+        helpMessage()
         process.exit(0)
       }
 
-      if (this.args['--init-next']) {
-        const result = await initNext(this.args)
-        if (!result.success) {
-          error(result.reason || 'Failed to initialize Payload app in Next.js project')
-        } else {
-          success('Payload app successfully initialized in Next.js project')
+      // eslint-disable-next-line no-console
+      console.log('\n')
+      p.intro(chalk.bgCyan(chalk.black(' create-payload-app ')))
+      p.note("Welcome to Payload. Let's create a project!")
+
+      // Detect if inside Next.js project
+      const nextAppDetails = await getNextAppDetails(process.cwd())
+      const { hasTopLevelLayout, nextAppDir, nextConfigPath } = nextAppDetails
+
+      if (nextConfigPath) {
+        this.args['--name'] = slugify(path.basename(path.dirname(nextConfigPath)))
+      }
+
+      const projectName = await parseProjectName(this.args)
+      const projectDir = nextConfigPath
+        ? path.dirname(nextConfigPath)
+        : path.resolve(process.cwd(), slugify(projectName))
+
+      const packageManager = await getPackageManager(this.args, projectDir)
+
+      if (nextConfigPath) {
+        p.log.step(
+          chalk.bold(`${chalk.bgBlack(` ${figures.triangleUp} Next.js `)} project detected!`),
+        )
+
+        const proceed = await p.confirm({
+          initialValue: true,
+          message: chalk.bold(`Install ${chalk.green('Payload')} in this project?`),
+        })
+        if (p.isCancel(proceed) || !proceed) {
+          p.outro(feedbackOutro())
+          process.exit(0)
         }
-        process.exit(result.success ? 0 : 1)
+
+        // Check for top-level layout.tsx
+        if (nextAppDir && hasTopLevelLayout) {
+          p.log.warn(moveMessage({ nextAppDir, projectDir }))
+          p.outro(feedbackOutro())
+          process.exit(0)
+        }
+
+        const dbDetails = await selectDb(this.args, projectName)
+
+        const result = await initNext({
+          ...this.args,
+          dbType: dbDetails.type,
+          nextAppDetails,
+          packageManager,
+          projectDir,
+        })
+
+        if (result.success === false) {
+          p.outro(feedbackOutro())
+          process.exit(1)
+        }
+
+        await configurePayloadConfig({
+          dbDetails,
+          projectDirOrConfigPath: {
+            payloadConfigPath: result.payloadConfigPath,
+          },
+        })
+
+        await writeEnvFile({
+          cliArgs: this.args,
+          databaseUri: dbDetails.dbUri,
+          payloadSecret: generateSecret(),
+          projectDir,
+        })
+
+        info('Payload project successfully initialized!')
+        p.note(successfulNextInit(), chalk.bgGreen(chalk.black(' Documentation ')))
+        p.outro(feedbackOutro())
+        return
       }
 
       const templateArg = this.args['--template']
       if (templateArg) {
         const valid = validateTemplate(templateArg)
         if (!valid) {
-          console.log(helpMessage())
+          helpMessage()
           process.exit(1)
         }
       }
 
-      console.log(welcomeMessage)
-      const projectName = await parseProjectName(this.args)
       const validTemplates = getValidTemplates()
       const template = await parseTemplate(this.args, validTemplates)
+      if (!template) {
+        p.log.error('Invalid template given')
+        p.outro(feedbackOutro())
+        process.exit(1)
+      }
 
-      const projectDir = projectName === '.' ? process.cwd() : `./${slugify(projectName)}`
-      const packageManager = await getPackageManager(this.args)
-
-      if (template.type !== 'plugin') {
-        const dbDetails = await selectDb(this.args, projectName)
-        const payloadSecret = generateSecret()
-        if (!this.args['--dry-run']) {
+      switch (template.type) {
+        case 'starter': {
+          const dbDetails = await selectDb(this.args, projectName)
+          const payloadSecret = generateSecret()
           await createProject({
             cliArgs: this.args,
             dbDetails,
@@ -99,14 +181,15 @@ export class Main {
             template,
           })
           await writeEnvFile({
+            cliArgs: this.args,
             databaseUri: dbDetails.dbUri,
             payloadSecret,
             projectDir,
             template,
           })
+          break
         }
-      } else {
-        if (!this.args['--dry-run']) {
+        case 'plugin': {
           await createProject({
             cliArgs: this.args,
             packageManager,
@@ -114,18 +197,20 @@ export class Main {
             projectName,
             template,
           })
+          break
         }
       }
 
-      success('Payload project successfully created')
-      console.log(successMessage(projectDir, packageManager))
-    } catch (error: unknown) {
-      console.log(error)
+      info('Payload project successfully created!')
+      p.note(successMessage(projectDir, packageManager), chalk.bgGreen(chalk.black(' Next Steps ')))
+      p.outro(feedbackOutro())
+    } catch (err: unknown) {
+      error(err instanceof Error ? err.message : 'An error occurred')
     }
   }
 }
 
-async function getPackageManager(args: CliArgs): Promise<PackageManager> {
+async function getPackageManager(args: CliArgs, projectDir: string): Promise<PackageManager> {
   let packageManager: PackageManager = 'npm'
 
   if (args['--use-npm']) {
@@ -135,15 +220,8 @@ async function getPackageManager(args: CliArgs): Promise<PackageManager> {
   } else if (args['--use-pnpm']) {
     packageManager = 'pnpm'
   } else {
-    try {
-      if (await commandExists('yarn')) {
-        packageManager = 'yarn'
-      } else if (await commandExists('pnpm')) {
-        packageManager = 'pnpm'
-      }
-    } catch (error: unknown) {
-      packageManager = 'npm'
-    }
+    const detected = await detect({ cwd: projectDir })
+    packageManager = detected || 'npm'
   }
   return packageManager
 }

packages/create-payload-app/src/scripts/pack-template-files.ts

@@ -0,0 +1,35 @@
+import fs from 'fs'
+import fsp from 'fs/promises'
+import { fileURLToPath } from 'node:url'
+import path from 'path'
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+main()
+
+/**
+ * Copy the necessary template files from `templates/blank-3.0` to `dist/template`
+ *
+ * Eventually, this should be replaced with using tar.x to stream from the git repo
+ */
+
+async function main() {
+  const root = path.resolve(dirname, '../../../../')
+  const outputPath = path.resolve(dirname, '../../dist/template')
+  const sourceTemplatePath = path.resolve(root, 'templates/blank-3.0')
+
+  if (!fs.existsSync(sourceTemplatePath)) {
+    throw new Error(`Source path does not exist: ${sourceTemplatePath}`)
+  }
+
+  if (!fs.existsSync(outputPath)) {
+    fs.mkdirSync(outputPath, { recursive: true })
+  }
+
+  // Copy the src directory from `templates/blank-3.0` to `dist`
+  const srcPath = path.resolve(sourceTemplatePath, 'src')
+  const distSrcPath = path.resolve(outputPath, 'src')
+  // Copy entire file structure from src to dist
+  await fsp.cp(srcPath, distSrcPath, { recursive: true })
+}

packages/create-payload-app/src/types.ts

@@ -3,14 +3,18 @@ import type arg from 'arg'
 export interface Args extends arg.Spec {
   '--beta': BooleanConstructor
   '--db': StringConstructor
+  '--db-accept-recommended': BooleanConstructor
+  '--db-connection-string': StringConstructor
   '--debug': BooleanConstructor
   '--dry-run': BooleanConstructor
   '--help': BooleanConstructor
   '--init-next': BooleanConstructor
+  '--local-template': StringConstructor
   '--name': StringConstructor
   '--no-deps': BooleanConstructor
   '--secret': StringConstructor
   '--template': StringConstructor
+  '--template-branch': StringConstructor
   '--use-npm': BooleanConstructor
   '--use-pnpm': BooleanConstructor
   '--use-yarn': BooleanConstructor
@@ -50,7 +54,7 @@ interface Template {
   type: ProjectTemplate['type']
 }
 
-export type PackageManager = 'npm' | 'pnpm' | 'yarn'
+export type PackageManager = 'bun' | 'npm' | 'pnpm' | 'yarn'
 
 export type DbType = 'mongodb' | 'postgres'
 
@@ -59,5 +63,4 @@ export type DbDetails = {
   type: DbType
 }
 
-export type BundlerType = 'vite' | 'webpack'
 export type EditorType = 'lexical' | 'slate'

packages/create-payload-app/src/utils/copy-recursive-sync.ts

@@ -7,7 +7,7 @@ import path from 'path'
 export function copyRecursiveSync(src: string, dest: string, debug?: boolean) {
   const exists = fs.existsSync(src)
   const stats = exists && fs.statSync(src)
-  const isDirectory = exists && stats.isDirectory()
+  const isDirectory = exists && stats !== false && stats.isDirectory()
   if (isDirectory) {
     fs.mkdirSync(dest, { recursive: true })
     fs.readdirSync(src).forEach((childItemName) => {

packages/create-payload-app/src/utils/log.ts

@@ -1,26 +1,23 @@
+/* eslint-disable no-console */
+import * as p from '@clack/prompts'
 import chalk from 'chalk'
-import figures from 'figures'
-
-export const success = (message: string): void => {
-  console.log(`${chalk.green(figures.tick)} ${chalk.bold(message)}`)
-}
 
 export const warning = (message: string): void => {
-  console.log(chalk.yellow('? ') + chalk.bold(message))
+  p.log.warn(chalk.yellow('? ') + chalk.bold(message))
 }
 
-export const info = (message: string, paddingTop?: number): void => {
-  console.log(
-    `${'\n'.repeat(paddingTop || 0)}${chalk.green(figures.pointerSmall)} ${chalk.bold(message)}`,
-  )
+export const info = (message: string): void => {
+  p.log.step(chalk.bold(message))
 }
 
 export const error = (message: string): void => {
-  console.log(`${chalk.red(figures.cross)} ${chalk.bold(message)}`)
+  p.log.error(chalk.bold(message))
 }
 
 export const debug = (message: string): void => {
-  console.log(
-    `${chalk.gray(figures.pointerSmall)} ${chalk.bgGray('[DEBUG]')} ${chalk.gray(message)}`,
-  )
+  p.log.step(`${chalk.bgGray('[DEBUG]')} ${chalk.gray(message)}`)
+}
+
+export const log = (message: string): void => {
+  p.log.message(message)
 }

packages/create-payload-app/src/utils/messages.ts

@@ -1,13 +1,14 @@
+/* eslint-disable no-console */
 import chalk from 'chalk'
-import figures from 'figures'
 import path from 'path'
 import terminalLink from 'terminal-link'
 
-import type { ProjectTemplate } from '../types'
+import type { ProjectTemplate } from '../types.js'
+import type { PackageManager } from '../types.js'
 
-import { getValidTemplates } from '../lib/templates'
+import { getValidTemplates } from '../lib/templates.js'
 
-const header = (message: string): string => `${chalk.yellow(figures.star)} ${chalk.bold(message)}`
+const header = (message: string): string => chalk.bold(message)
 
 export const welcomeMessage = chalk`
   {green Welcome to Payload. Let's create a project! }
@@ -15,14 +16,20 @@ export const welcomeMessage = chalk`
 
 const spacer = ' '.repeat(8)
 
-export function helpMessage(): string {
+export function helpMessage(): void {
   const validTemplates = getValidTemplates()
-  return chalk`
+  console.log(chalk`
   {bold USAGE}
 
+      {dim Inside of an existing Next.js project}
+
+      {dim $} {bold npx create-payload-app}
+
+      {dim Create a new project from scratch}
+
       {dim $} {bold npx create-payload-app}
       {dim $} {bold npx create-payload-app} my-project
-      {dim $} {bold npx create-payload-app} -n my-project -t blog
+      {dim $} {bold npx create-payload-app} -n my-project -t template-name
 
   {bold OPTIONS}
 
@@ -36,7 +43,7 @@ export function helpMessage(): string {
       --use-pnpm                    Use pnpm to install dependencies
       --no-deps                     Do not install any dependencies
       -h                            Show help
-`
+`)
 }
 
 function formatTemplates(templates: ProjectTemplate[]) {
@@ -45,29 +52,61 @@ function formatTemplates(templates: ProjectTemplate[]) {
     .join(`\n${spacer}`)}`
 }
 
-export function successMessage(projectDir: string, packageManager: string): string {
+export function successMessage(projectDir: string, packageManager: PackageManager): string {
+  const relativePath = path.relative(process.cwd(), projectDir)
   return `
-  ${header('Launch Application:')}
+${header('Launch Application:')}
 
-    - cd ${projectDir}
-    - ${
-      packageManager === 'yarn' ? 'yarn' : 'npm run'
-    } dev or follow directions in ${createTerminalLink(
-      'README.md',
-      `file://${path.resolve(projectDir, 'README.md')}`,
-    )}
+  - cd ./${relativePath}
+  - ${
+    packageManager === 'npm' ? 'npm run' : packageManager
+  } dev or follow directions in ${createTerminalLink(
+    'README.md',
+    `file://${path.resolve(projectDir, 'README.md')}`,
+  )}
 
-  ${header('Documentation:')}
+${header('Documentation:')}
 
-    - ${createTerminalLink(
-      'Getting Started',
-      'https://payloadcms.com/docs/getting-started/what-is-payload',
-    )}
-    - ${createTerminalLink('Configuration', 'https://payloadcms.com/docs/configuration/overview')}
+  - ${createTerminalLink(
+    'Getting Started',
+    'https://payloadcms.com/docs/getting-started/what-is-payload',
+  )}
+  - ${createTerminalLink('Configuration', 'https://payloadcms.com/docs/configuration/overview')}
 
 `
 }
 
+export function successfulNextInit(): string {
+  return `- ${createTerminalLink(
+    'Getting Started',
+    'https://payloadcms.com/docs/getting-started/what-is-payload',
+  )}
+- ${createTerminalLink('Configuration', 'https://payloadcms.com/docs/configuration/overview')}
+`
+}
+
+export function moveMessage(args: { nextAppDir: string; projectDir: string }): string {
+  const relativeAppDir = path.relative(process.cwd(), args.nextAppDir)
+  return `
+${header('Next Steps:')}
+
+Payload does not support a top-level layout.tsx file in the app directory.
+
+${chalk.bold('To continue:')}
+
+- Create a new directory in ./${relativeAppDir} such as ./${relativeAppDir}/${chalk.bold('(app)')}
+- Move all files from ./${relativeAppDir} into that directory
+
+It is recommended to do this from your IDE if your app has existing file references.
+
+Once moved, rerun the create-payload-app command again.
+`
+}
+
+export function feedbackOutro(): string {
+  return `${chalk.bgCyan(chalk.black(' Have feedback? '))} Visit us on ${createTerminalLink('GitHub', 'https://github.com/payloadcms/payload')}.`
+}
+
 // Create terminalLink with fallback for unsupported terminals
 function createTerminalLink(text: string, url: string) {
   return terminalLink(text, url, {

packages/create-payload-app/tsconfig.json

@@ -5,19 +5,9 @@
     "noEmit": false /* Do not emit outputs. */,
     "emitDeclarationOnly": true,
     "outDir": "./dist" /* Specify an output folder for all emitted files. */,
-    "rootDir": "./src" /* Specify the root folder within your source files. */
+    "rootDir": "./src" /* Specify the root folder within your source files. */,
+    "strict": true,
   },
-  "exclude": [
-    "dist",
-    "build",
-    "tests",
-    "test",
-    "node_modules",
-    ".eslintrc.js",
-    "src/**/*.spec.js",
-    "src/**/*.spec.jsx",
-    "src/**/*.spec.ts",
-    "src/**/*.spec.tsx"
-  ],
-  "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"]
+  "exclude": ["dist", "build", "tests", "test", "node_modules", ".eslintrc.js"],
+  "include": ["src/**/*.ts", "src/**/*.spec.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"]
 }

packages/db-mongodb/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-alpha.49",
-  "description": "The officially supported MongoDB database adapter for Payload - Update 2",
-  "repository": "https://github.com/payloadcms/payload",
+  "version": "3.0.0-beta.10",
+  "description": "The officially supported MongoDB database adapter for Payload",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/payloadcms/payload.git",
+    "directory": "packages/db-mongodb"
+  },
   "license": "MIT",
   "homepage": "https://payloadcms.com",
   "type": "module",
@@ -15,7 +19,7 @@
   "types": "./src/types.ts",
   "scripts": {
     "build": "pnpm build:swc && pnpm build:types",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc-build",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "prepublishOnly": "pnpm clean && pnpm turbo build"
@@ -26,7 +30,6 @@
     "get-port": "5.1.1",
     "http-status": "1.6.2",
     "mongoose": "6.12.3",
-    "mongoose-aggregate-paginate-v2": "1.0.6",
     "mongoose-paginate-v2": "1.7.22",
     "prompts": "2.4.2",
     "uuid": "9.0.0"

packages/db-mongodb/src/createMigration.ts

@@ -45,7 +45,9 @@ export const createMigration: CreateMigration = async function createMigration({
 
     // Check if predefined migration exists
     if (fs.existsSync(cleanPath)) {
-      let migration = await eval(`${require ? 'require' : 'import'}(${cleanPath})`)
+      let migration = await eval(
+        `${typeof require === 'function' ? 'require' : 'import'}(${cleanPath})`,
+      )
       if ('default' in migration) migration = migration.default
       const { down, up } = migration
 

packages/db-mongodb/src/init.ts

@@ -5,11 +5,7 @@ import type { SanitizedCollectionConfig } from 'payload/types'
 
 import mongoose from 'mongoose'
 import paginate from 'mongoose-paginate-v2'
-import {
-  buildVersionCollectionFields,
-  buildVersionGlobalFields,
-  getVersionsModelName,
-} from 'payload/versions'
+import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions'
 
 import type { MongooseAdapter } from './index.js'
 import type { CollectionModel } from './types.js'
@@ -18,13 +14,14 @@ import buildCollectionSchema from './models/buildCollectionSchema.js'
 import { buildGlobalModel } from './models/buildGlobalModel.js'
 import buildSchema from './models/buildSchema.js'
 import getBuildQueryPlugin from './queries/buildQuery.js'
+import { getDBName } from './utilities/getDBName.js'
 
 export const init: Init = function init(this: MongooseAdapter) {
   this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {
     const schema = buildCollectionSchema(collection, this.payload.config)
 
     if (collection.versions) {
-      const versionModelName = getVersionsModelName(collection)
+      const versionModelName = getDBName({ config: collection, versions: true })
 
       const versionCollectionFields = buildVersionCollectionFields(collection)
 
@@ -54,17 +51,11 @@ export const init: Init = function init(this: MongooseAdapter) {
     }
 
     const model = mongoose.model(
-      collection.slug,
+      getDBName({ config: collection }),
       schema,
       this.autoPluralization === true ? undefined : collection.slug,
     ) as CollectionModel
     this.collections[collection.slug] = model
-
-    // TS expect error only needed until we launch 2.0.0
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    this.payload.collections[collection.slug] = {
-      config: collection,
-    }
   })
 
   const model = buildGlobalModel(this.payload.config)
@@ -72,7 +63,7 @@ export const init: Init = function init(this: MongooseAdapter) {
 
   this.payload.config.globals.forEach((global) => {
     if (global.versions) {
-      const versionModelName = getVersionsModelName(global)
+      const versionModelName = getDBName({ config: global, versions: true })
 
       const versionGlobalFields = buildVersionGlobalFields(global)
 

packages/db-mongodb/src/models/buildSchema.ts

@@ -363,7 +363,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
       }
       if (field.localized && config.localization) {
         config.localization.locales.forEach((locale) => {
-          schema.index({ [`${field.name}.${locale}`]: '2dsphere' }, indexOptions)
+          schema.index({ [`${field.name}.${locale.code}`]: '2dsphere' }, indexOptions)
         })
       } else {
         schema.index({ [field.name]: '2dsphere' }, indexOptions)

packages/db-mongodb/src/queries/buildSearchParams.ts

@@ -59,17 +59,12 @@ export async function buildSearchParam({
   let hasCustomID = false
 
   if (sanitizedPath === '_id') {
-    const customIDfield = payload.collections[collectionSlug]?.config.fields.find(
-      (field) => fieldAffectsData(field) && field.name === 'id',
-    )
+    const customIDFieldType = payload.collections[collectionSlug]?.customIDType
 
     let idFieldType: 'number' | 'text' = 'text'
 
-    if (customIDfield) {
-      if (customIDfield?.type === 'text' || customIDfield?.type === 'number') {
-        idFieldType = customIDfield.type
-      }
-
+    if (customIDFieldType) {
+      idFieldType = customIDFieldType
       hasCustomID = true
     }
 
@@ -213,18 +208,11 @@ export async function buildSearchParam({
           } else {
             ;(Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]).forEach(
               (relationTo) => {
-                const isRelatedToCustomNumberID = payload.collections[
-                  relationTo
-                ]?.config?.fields.find((relatedField) => {
-                  return (
-                    fieldAffectsData(relatedField) &&
-                    relatedField.name === 'id' &&
-                    relatedField.type === 'number'
-                  )
-                })
+                const isRelatedToCustomNumberID =
+                  payload.collections[relationTo]?.customIDType === 'number'
 
                 if (isRelatedToCustomNumberID) {
-                  if (isRelatedToCustomNumberID.type === 'number') hasNumberIDRelation = true
+                  hasNumberIDRelation = true
                 }
               },
             )

packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts

@@ -1,18 +1,20 @@
-import { sanitizeConfig } from 'payload/config'
+import { SanitizedConfig, sanitizeConfig } from 'payload/config'
 import { Config } from 'payload/config'
 import { getLocalizedSortProperty } from './getLocalizedSortProperty.js'
 
-const config = {
+const config = sanitizeConfig({
   localization: {
     locales: ['en', 'es'],
+    defaultLocale: 'en',
+    fallback: true,
   },
-} as Config
+} as Config) as SanitizedConfig
 
 describe('get localized sort property', () => {
   it('passes through a non-localized sort property', () => {
     const result = getLocalizedSortProperty({
       segments: ['title'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           name: 'title',
@@ -28,7 +30,7 @@ describe('get localized sort property', () => {
   it('properly localizes an un-localized sort property', () => {
     const result = getLocalizedSortProperty({
       segments: ['title'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           name: 'title',
@@ -45,7 +47,7 @@ describe('get localized sort property', () => {
   it('keeps specifically asked-for localized sort properties', () => {
     const result = getLocalizedSortProperty({
       segments: ['title', 'es'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           name: 'title',
@@ -62,7 +64,7 @@ describe('get localized sort property', () => {
   it('properly localizes nested sort properties', () => {
     const result = getLocalizedSortProperty({
       segments: ['group', 'title'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           name: 'group',
@@ -85,7 +87,7 @@ describe('get localized sort property', () => {
   it('keeps requested locale with nested sort properties', () => {
     const result = getLocalizedSortProperty({
       segments: ['group', 'title', 'es'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           name: 'group',
@@ -108,7 +110,7 @@ describe('get localized sort property', () => {
   it('properly localizes field within row', () => {
     const result = getLocalizedSortProperty({
       segments: ['title'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           type: 'row',
@@ -130,7 +132,7 @@ describe('get localized sort property', () => {
   it('properly localizes field within named tab', () => {
     const result = getLocalizedSortProperty({
       segments: ['tab', 'title'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           type: 'tabs',
@@ -157,7 +159,7 @@ describe('get localized sort property', () => {
   it('properly localizes field within unnamed tab', () => {
     const result = getLocalizedSortProperty({
       segments: ['title'],
-      config: sanitizeConfig(config),
+      config,
       fields: [
         {
           type: 'tabs',

packages/db-mongodb/src/queries/sanitizeQueryValue.ts

@@ -62,7 +62,7 @@ export const sanitizeQueryValue = ({
     formattedValue = Number(val)
   }
 
-  if (field.type === 'date' && typeof val === 'string') {
+  if (field.type === 'date' && typeof val === 'string' && operator !== 'exists') {
     formattedValue = new Date(val)
     if (Number.isNaN(Date.parse(formattedValue))) {
       return undefined

packages/db-mongodb/src/updateOne.ts

@@ -26,6 +26,7 @@ export const updateOne: UpdateOne = async function updateOne(
   })
 
   let result
+
   try {
     result = await Model.findOneAndUpdate(query, data, options)
   } catch (error) {

packages/db-mongodb/src/utilities/getDBName.ts

@@ -0,0 +1,41 @@
+import type { DBIdentifierName } from 'payload/database'
+
+type Args = {
+  config: {
+    dbName?: DBIdentifierName
+    enumName?: DBIdentifierName
+    name?: string
+    slug?: string
+  }
+  locales?: boolean
+  target?: 'dbName' | 'enumName'
+  versions?: boolean
+}
+
+/**
+ * Used to name database enums and collections
+ * Returns the collection or enum name for a given entity
+ */
+export const getDBName = ({
+  config: { name, slug },
+  config,
+  target = 'dbName',
+  versions = false,
+}: Args): string => {
+  let result: string
+  let custom = config[target]
+
+  if (!custom && target === 'enumName') {
+    custom = config['dbName']
+  }
+
+  if (custom) {
+    result = typeof custom === 'function' ? custom({}) : custom
+  } else {
+    result = name ?? slug
+  }
+
+  if (versions) result = `_${result}_versions`
+
+  return result
+}

packages/db-postgres/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-alpha.49",
+  "version": "3.0.0-beta.10",
   "description": "The officially supported Postgres database adapter for Payload",
-  "repository": "https://github.com/payloadcms/payload",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/payloadcms/payload.git",
+    "directory": "packages/db-postgres"
+  },
   "license": "MIT",
   "homepage": "https://payloadcms.com",
   "type": "module",

packages/db-postgres/src/create.ts

@@ -1,9 +1,8 @@
 import type { Create } from 'payload/database'
 
-import toSnakeCase from 'to-snake-case'
-
 import type { PostgresAdapter } from './types.js'
 
+import { getTableName } from './schema/getTableName.js'
 import { upsertRow } from './upsertRow/index.js'
 
 export const create: Create = async function create(
@@ -20,7 +19,10 @@ export const create: Create = async function create(
     fields: collection.fields,
     operation: 'create',
     req,
-    tableName: toSnakeCase(collectionSlug),
+    tableName: getTableName({
+      adapter: this,
+      config: collection,
+    }),
   })
 
   return result

packages/db-postgres/src/createGlobal.ts

@@ -1,10 +1,9 @@
 import type { CreateGlobalArgs } from 'payload/database'
 import type { PayloadRequest, TypeWithID } from 'payload/types'
 
-import toSnakeCase from 'to-snake-case'
-
 import type { PostgresAdapter } from './types.js'
 
+import { getTableName } from './schema/getTableName.js'
 import { upsertRow } from './upsertRow/index.js'
 
 export async function createGlobal<T extends TypeWithID>(
@@ -21,7 +20,10 @@ export async function createGlobal<T extends TypeWithID>(
     fields: globalConfig.fields,
     operation: 'create',
     req,
-    tableName: toSnakeCase(slug),
+    tableName: getTableName({
+      adapter: this,
+      config: globalConfig,
+    }),
   })
 
   return result

packages/db-postgres/src/createGlobalVersion.ts

@@ -4,10 +4,10 @@ import type { PayloadRequest, TypeWithID } from 'payload/types'
 import { sql } from 'drizzle-orm'
 import { type CreateGlobalVersionArgs } from 'payload/database'
 import { buildVersionGlobalFields } from 'payload/versions'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
 
+import { getTableName } from './schema/getTableName.js'
 import { upsertRow } from './upsertRow/index.js'
 
 export async function createGlobalVersion<T extends TypeWithID>(
@@ -16,8 +16,11 @@ export async function createGlobalVersion<T extends TypeWithID>(
 ) {
   const db = this.sessions[req.transactionID]?.db || this.drizzle
   const global = this.payload.globals.config.find(({ slug }) => slug === globalSlug)
-  const globalTableName = toSnakeCase(globalSlug)
-  const tableName = `_${globalTableName}_v`
+  const tableName = getTableName({
+    adapter: this,
+    config: global,
+    versions: true,
+  })
 
   const result = await upsertRow<TypeWithVersion<T>>({
     adapter: this,

packages/db-postgres/src/createMigration.ts

@@ -3,15 +3,17 @@ import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload'
 import type { CreateMigration } from 'payload/database'
 
 import fs from 'fs'
+import { createRequire } from 'module'
 import prompts from 'prompts'
 
 import type { PostgresAdapter } from './types.js'
 
+const require = createRequire(import.meta.url)
+
 const migrationTemplate = (
   upSQL?: string,
   downSQL?: string,
-) => `import { MigrateUpArgs, MigrateDownArgs } from '@payloadcms/db-postgres'
-import { sql } from 'drizzle-orm'
+) => `import { MigrateUpArgs, MigrateDownArgs, sql } from '@payloadcms/db-postgres'
 
 export async function up({ payload }: MigrateUpArgs): Promise<void> {
 ${
@@ -60,9 +62,7 @@ export const createMigration: CreateMigration = async function createMigration(
     fs.mkdirSync(dir)
   }
 
-  const { generateDrizzleJson, generateMigration } = require
-    ? require('drizzle-kit/payload')
-    : await import('drizzle-kit/payload')
+  const { generateDrizzleJson, generateMigration } = require('drizzle-kit/payload')
 
   const [yyymmdd, hhmmss] = new Date().toISOString().split('T')
   const formattedDate = yyymmdd.replace(/\D/g, '')

packages/db-postgres/src/createVersion.ts

@@ -3,10 +3,10 @@ import type { PayloadRequest, TypeWithID } from 'payload/types'
 
 import { sql } from 'drizzle-orm'
 import { buildVersionCollectionFields } from 'payload/versions'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
 
+import { getTableName } from './schema/getTableName.js'
 import { upsertRow } from './upsertRow/index.js'
 
 export async function createVersion<T extends TypeWithID>(
@@ -21,8 +21,11 @@ export async function createVersion<T extends TypeWithID>(
 ) {
   const db = this.sessions[req.transactionID]?.db || this.drizzle
   const collection = this.payload.collections[collectionSlug].config
-  const collectionTableName = toSnakeCase(collectionSlug)
-  const tableName = `_${collectionTableName}_v`
+  const tableName = getTableName({
+    adapter: this,
+    config: collection,
+    versions: true,
+  })
 
   const result = await upsertRow<TypeWithVersion<T>>({
     adapter: this,
@@ -40,7 +43,15 @@ export async function createVersion<T extends TypeWithID>(
   })
 
   const table = this.tables[tableName]
-  const relationshipsTable = this.tables[`${tableName}_rels`]
+  const relationshipsTable =
+    this.tables[
+      getTableName({
+        adapter: this,
+        config: collection,
+        relationships: true,
+        versions: true,
+      })
+    ]
 
   if (collection.versions.drafts) {
     await db.execute(sql`

packages/db-postgres/src/deleteMany.ts

@@ -2,11 +2,11 @@ import type { DeleteMany } from 'payload/database'
 import type { PayloadRequest } from 'payload/types'
 
 import { inArray } from 'drizzle-orm'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const deleteMany: DeleteMany = async function deleteMany(
   this: PostgresAdapter,
@@ -14,7 +14,7 @@ export const deleteMany: DeleteMany = async function deleteMany(
 ) {
   const db = this.sessions[req.transactionID]?.db || this.drizzle
   const collectionConfig = this.payload.collections[collection].config
-  const tableName = toSnakeCase(collection)
+  const tableName = getTableName({ adapter: this, config: collectionConfig })
 
   const result = await findMany({
     adapter: this,

packages/db-postgres/src/deleteOne.ts

@@ -1,47 +1,71 @@
 import type { DeleteOne } from 'payload/database'
 import type { PayloadRequest } from 'payload/types'
 
-import toSnakeCase from 'to-snake-case'
+import { eq } from 'drizzle-orm'
 
 import type { PostgresAdapter } from './types.js'
 
 import { buildFindManyArgs } from './find/buildFindManyArgs.js'
 import buildQuery from './queries/buildQuery.js'
+import { selectDistinct } from './queries/selectDistinct.js'
+import { getTableName } from './schema/getTableName.js'
 import { transform } from './transform/read/index.js'
 
 export const deleteOne: DeleteOne = async function deleteOne(
   this: PostgresAdapter,
-  { collection, req = {} as PayloadRequest, where: incomingWhere },
+  { collection: collectionSlug, req = {} as PayloadRequest, where: whereArg },
 ) {
   const db = this.sessions[req.transactionID]?.db || this.drizzle
-  const collectionConfig = this.payload.collections[collection].config
-  const tableName = toSnakeCase(collection)
-
-  const { where } = await buildQuery({
+  const collection = this.payload.collections[collectionSlug].config
+  const tableName = getTableName({
     adapter: this,
-    fields: collectionConfig.fields,
+    config: collection,
+  })
+  let docToDelete: Record<string, unknown>
+
+  const { joinAliases, joins, selectFields, where } = await buildQuery({
+    adapter: this,
+    fields: collection.fields,
+    locale: req.locale,
     tableName,
-    where: incomingWhere,
+    where: whereArg,
   })
 
-  const findManyArgs = buildFindManyArgs({
+  const selectDistinctResult = await selectDistinct({
     adapter: this,
-    depth: 0,
-    fields: collectionConfig.fields,
+    chainedMethods: [{ args: [1], method: 'limit' }],
+    db,
+    joinAliases,
+    joins,
+    selectFields,
     tableName,
+    where,
   })
 
-  findManyArgs.where = where
+  if (selectDistinctResult?.[0]?.id) {
+    docToDelete = await db.query[tableName].findFirst({
+      where: eq(this.tables[tableName].id, selectDistinctResult[0].id),
+    })
+  } else {
+    const findManyArgs = buildFindManyArgs({
+      adapter: this,
+      depth: 0,
+      fields: collection.fields,
+      tableName,
+    })
 
-  const docToDelete = await db.query[tableName].findFirst(findManyArgs)
+    findManyArgs.where = where
+
+    docToDelete = await db.query[tableName].findFirst(findManyArgs)
+  }
 
   const result = transform({
     config: this.payload.config,
     data: docToDelete,
-    fields: collectionConfig.fields,
+    fields: collection.fields,
   })
 
-  await db.delete(this.tables[tableName]).where(where)
+  await db.delete(this.tables[tableName]).where(eq(this.tables[tableName].id, docToDelete.id))
 
   return result
 }

packages/db-postgres/src/deleteVersions.ts

@@ -3,11 +3,11 @@ import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'
 
 import { inArray } from 'drizzle-orm'
 import { buildVersionCollectionFields } from 'payload/versions'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const deleteVersions: DeleteVersions = async function deleteVersion(
   this: PostgresAdapter,
@@ -16,7 +16,11 @@ export const deleteVersions: DeleteVersions = async function deleteVersion(
   const db = this.sessions[req.transactionID]?.db || this.drizzle
   const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config
 
-  const tableName = `_${toSnakeCase(collection)}_v`
+  const tableName = getTableName({
+    adapter: this,
+    config: collectionConfig,
+    versions: true,
+  })
   const fields = buildVersionCollectionFields(collectionConfig)
 
   const { docs } = await findMany({

packages/db-postgres/src/find.ts

@@ -1,38 +1,41 @@
 import type { Find } from 'payload/database'
 import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'
 
-import toSnakeCase from 'to-snake-case'
-
 import type { PostgresAdapter } from './types.js'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const find: Find = async function find(
   this: PostgresAdapter,
   {
     collection,
-    limit: limitArg,
+    limit,
     locale,
     page = 1,
     pagination,
     req = {} as PayloadRequest,
     sort: sortArg,
-    where: whereArg,
+    where,
   },
 ) {
   const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config
   const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort
+  const tableName = getTableName({
+    adapter: this,
+    config: collectionConfig,
+  })
 
   return findMany({
     adapter: this,
     fields: collectionConfig.fields,
-    limit: limitArg,
+    limit,
     locale,
     page,
     pagination,
     req,
     sort,
-    tableName: toSnakeCase(collection),
-    where: whereArg,
+    tableName,
+    where,
   })
 }

packages/db-postgres/src/find/chainMethods.ts

@@ -1,3 +1,5 @@
+import type { QueryPromise } from 'drizzle-orm'
+
 export type ChainedMethods = {
   args: unknown[]
   method: string
@@ -8,7 +10,7 @@ export type ChainedMethods = {
  * @param methods
  * @param query
  */
-const chainMethods = ({ methods, query }): Promise<unknown> => {
+const chainMethods = <T>({ methods, query }): QueryPromise<T> => {
   return methods.reduce((query, { args, method }) => {
     return query[method](...args)
   }, query)

packages/db-postgres/src/find/findMany.ts

@@ -7,6 +7,7 @@ import type { PostgresAdapter } from '../types.js'
 import type { ChainedMethods } from './chainMethods.js'
 
 import buildQuery from '../queries/buildQuery.js'
+import { selectDistinct } from '../queries/selectDistinct.js'
 import { transform } from '../transform/read/index.js'
 import { buildFindManyArgs } from './buildFindManyArgs.js'
 import { chainMethods } from './chainMethods.js'
@@ -39,7 +40,6 @@ export const findMany = async function find({
   let hasPrevPage: boolean
   let hasNextPage: boolean
   let pagingCounter: number
-  let selectDistinctResult
 
   const { joinAliases, joins, orderBy, selectFields, where } = await buildQuery({
     adapter,
@@ -69,36 +69,21 @@ export const findMany = async function find({
     tableName,
   })
 
-  // only fetch IDs when a sort or where query is used that needs to be done on join tables, otherwise these can be done directly on the table in findMany
-  if (Object.keys(joins).length > 0 || joinAliases.length > 0) {
-    if (where) {
-      selectDistinctMethods.push({ args: [where], method: 'where' })
-    }
+  selectDistinctMethods.push({ args: [skip || (page - 1) * limit], method: 'offset' })
+  selectDistinctMethods.push({ args: [limit === 0 ? undefined : limit], method: 'limit' })
 
-    joinAliases.forEach(({ condition, table }) => {
-      selectDistinctMethods.push({
-        args: [table, condition],
-        method: 'leftJoin',
-      })
-    })
-
-    Object.entries(joins).forEach(([joinTable, condition]) => {
-      if (joinTable) {
-        selectDistinctMethods.push({
-          args: [adapter.tables[joinTable], condition],
-          method: 'leftJoin',
-        })
-      }
-    })
-
-    selectDistinctMethods.push({ args: [skip || (page - 1) * limit], method: 'offset' })
-    selectDistinctMethods.push({ args: [limit === 0 ? undefined : limit], method: 'limit' })
-
-    selectDistinctResult = await chainMethods({
-      methods: selectDistinctMethods,
-      query: db.selectDistinct(selectFields).from(table),
-    })
+  const selectDistinctResult = await selectDistinct({
+    adapter,
+    chainedMethods: selectDistinctMethods,
+    db,
+    joinAliases,
+    joins,
+    selectFields,
+    tableName,
+    where,
+  })
 
+  if (selectDistinctResult) {
     if (selectDistinctResult.length === 0) {
       return {
         docs: [],
@@ -112,13 +97,14 @@ export const findMany = async function find({
         totalDocs: 0,
         totalPages: 0,
       }
+    } else {
+      // set the id in an object for sorting later
+      selectDistinctResult.forEach(({ id }, i) => {
+        orderedIDMap[id] = i
+      })
+      orderedIDs = Object.keys(orderedIDMap)
+      findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)
     }
-    // set the id in an object for sorting later
-    selectDistinctResult.forEach(({ id }, i) => {
-      orderedIDMap[id as number | string] = i
-    })
-    orderedIDs = Object.keys(orderedIDMap)
-    findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)
   } else {
     findManyArgs.limit = limitArg === 0 ? undefined : limitArg
 
@@ -134,7 +120,7 @@ export const findMany = async function find({
 
   const findPromise = db.query[tableName].findMany(findManyArgs)
 
-  if (pagination !== false && (orderedIDs ? orderedIDs?.length >= limit : true)) {
+  if (pagination !== false && (orderedIDs ? orderedIDs?.length <= limit : true)) {
     const selectCountMethods: ChainedMethods = []
 
     joinAliases.forEach(({ condition, table }) => {

packages/db-postgres/src/find/traverseFields.ts

@@ -2,11 +2,12 @@
 import type { Field } from 'payload/types'
 
 import { fieldAffectsData, tabHasName } from 'payload/types'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from '../types.js'
 import type { Result } from './buildFindManyArgs.js'
 
+import { getTableName } from '../schema/getTableName.js'
+
 type TraverseFieldArgs = {
   _locales: Record<string, unknown>
   adapter: PostgresAdapter
@@ -78,9 +79,22 @@ export const traverseFields = ({
             with: {},
           }
 
-          const arrayTableName = `${currentTableName}_${path}${toSnakeCase(field.name)}`
+          const arrayTableName = getTableName({
+            adapter,
+            config: field,
+            parentTableName: currentTableName,
+            prefix: `${currentTableName}_${path}`,
+          })
 
-          if (adapter.tables[`${arrayTableName}_locales`]) withArray.with._locales = _locales
+          const arrayTableNameWithLocales = getTableName({
+            adapter,
+            config: field,
+            locales: true,
+            parentTableName: currentTableName,
+            prefix: `${currentTableName}_${path}`,
+          })
+
+          if (adapter.tables[arrayTableNameWithLocales]) withArray.with._locales = _locales
           currentArgs.with[`${path}${field.name}`] = withArray
 
           traverseFields({
@@ -128,9 +142,16 @@ export const traverseFields = ({
                 with: {},
               }
 
-              const tableName = `${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`
+              const tableName = getTableName({
+                adapter,
+                config: block,
+                parentTableName: topLevelTableName,
+                prefix: `${topLevelTableName}_blocks_`,
+              })
 
-              if (adapter.tables[`${tableName}_locales`]) withBlock.with._locales = _locales
+              if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {
+                withBlock.with._locales = _locales
+              }
               topLevelArgs.with[blockKey] = withBlock
 
               traverseFields({

packages/db-postgres/src/findGlobal.ts

@@ -1,17 +1,19 @@
 import type { FindGlobal } from 'payload/database'
 
-import toSnakeCase from 'to-snake-case'
-
 import type { PostgresAdapter } from './types.js'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const findGlobal: FindGlobal = async function findGlobal(
   this: PostgresAdapter,
   { slug, locale, req, where },
 ) {
   const globalConfig = this.payload.globals.config.find((config) => config.slug === slug)
-  const tableName = toSnakeCase(slug)
+  const tableName = getTableName({
+    adapter: this,
+    config: globalConfig,
+  })
 
   const {
     docs: [doc],

packages/db-postgres/src/findGlobalVersions.ts

@@ -2,11 +2,11 @@ import type { FindGlobalVersions } from 'payload/database'
 import type { PayloadRequest, SanitizedGlobalConfig } from 'payload/types'
 
 import { buildVersionGlobalFields } from 'payload/versions'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(
   this: PostgresAdapter,
@@ -27,7 +27,11 @@ export const findGlobalVersions: FindGlobalVersions = async function findGlobalV
   )
   const sort = typeof sortArg === 'string' ? sortArg : '-createdAt'
 
-  const tableName = `_${toSnakeCase(global)}_v`
+  const tableName = getTableName({
+    adapter: this,
+    config: globalConfig,
+    versions: true,
+  })
   const fields = buildVersionGlobalFields(globalConfig)
 
   return findMany({

packages/db-postgres/src/findOne.ts

@@ -1,17 +1,20 @@
 import type { FindOneArgs } from 'payload/database'
 import type { PayloadRequest, SanitizedCollectionConfig, TypeWithID } from 'payload/types'
 
-import toSnakeCase from 'to-snake-case'
-
 import type { PostgresAdapter } from './types.js'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export async function findOne<T extends TypeWithID>(
   this: PostgresAdapter,
-  { collection, locale, req = {} as PayloadRequest, where: incomingWhere }: FindOneArgs,
+  { collection, locale, req = {} as PayloadRequest, where }: FindOneArgs,
 ): Promise<T> {
   const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config
+  const tableName = getTableName({
+    adapter: this,
+    config: collectionConfig,
+  })
 
   const { docs } = await findMany({
     adapter: this,
@@ -22,8 +25,8 @@ export async function findOne<T extends TypeWithID>(
     pagination: false,
     req,
     sort: undefined,
-    tableName: toSnakeCase(collection),
-    where: incomingWhere,
+    tableName,
+    where,
   })
 
   return docs?.[0] || null

packages/db-postgres/src/findVersions.ts

@@ -2,11 +2,11 @@ import type { FindVersions } from 'payload/database'
 import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'
 
 import { buildVersionCollectionFields } from 'payload/versions'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const findVersions: FindVersions = async function findVersions(
   this: PostgresAdapter,
@@ -25,7 +25,11 @@ export const findVersions: FindVersions = async function findVersions(
   const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config
   const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort
 
-  const tableName = `_${toSnakeCase(collection)}_v`
+  const tableName = getTableName({
+    adapter: this,
+    config: collectionConfig,
+    versions: true,
+  })
   const fields = buildVersionCollectionFields(collectionConfig)
 
   return findMany({

packages/db-postgres/src/index.ts

@@ -40,6 +40,8 @@ import { updateVersion } from './updateVersion.js'
 
 export type { MigrateDownArgs, MigrateUpArgs } from './types.js'
 
+export { sql } from 'drizzle-orm'
+
 export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter> {
   function adapter({ payload }: { payload: Payload }) {
     const migrationDir = findMigrationDir(args.migrationDir)
@@ -49,20 +51,24 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
       name: 'postgres',
 
       // Postgres-specific
+      blockTableNames: {},
       drizzle: undefined,
       enums: {},
       fieldConstraints: {},
       idType,
+      localesSuffix: args.localesSuffix || '_locales',
       logger: args.logger,
       pgSchema: undefined,
       pool: undefined,
       poolOptions: args.pool,
       push: args.push,
       relations: {},
+      relationshipsSuffix: args.relationshipsSuffix || '_rels',
       schema: {},
       schemaName: args.schemaName,
       sessions: {},
       tables: {},
+      versionsSuffix: args.versionsSuffix || '_v',
 
       // DatabaseAdapter
       beginTransaction,

packages/db-postgres/src/init.ts

@@ -4,11 +4,11 @@ import type { SanitizedCollectionConfig } from 'payload/types'
 
 import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core'
 import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions'
-import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
 
 import { buildTable } from './schema/build.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const init: Init = function init(this: PostgresAdapter) {
   if (this.schemaName) {
@@ -25,7 +25,10 @@ export const init: Init = function init(this: PostgresAdapter) {
   }
 
   this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {
-    const tableName = toSnakeCase(collection.slug)
+    const tableName = getTableName({
+      adapter: this,
+      config: collection,
+    })
 
     buildTable({
       adapter: this,
@@ -37,10 +40,15 @@ export const init: Init = function init(this: PostgresAdapter) {
       fields: collection.fields,
       tableName,
       timestamps: collection.timestamps,
+      versions: false,
     })
 
     if (collection.versions) {
-      const versionsTableName = `_${tableName}_v`
+      const versionsTableName = getTableName({
+        adapter: this,
+        config: collection,
+        versions: true,
+      })
       const versionFields = buildVersionCollectionFields(collection)
 
       buildTable({
@@ -53,12 +61,13 @@ export const init: Init = function init(this: PostgresAdapter) {
         fields: versionFields,
         tableName: versionsTableName,
         timestamps: true,
+        versions: true,
       })
     }
   })
 
   this.payload.config.globals.forEach((global) => {
-    const tableName = toSnakeCase(global.slug)
+    const tableName = getTableName({ adapter: this, config: global })
 
     buildTable({
       adapter: this,
@@ -70,10 +79,11 @@ export const init: Init = function init(this: PostgresAdapter) {
       fields: global.fields,
       tableName,
       timestamps: false,
+      versions: false,
     })
 
     if (global.versions) {
-      const versionsTableName = `_${tableName}_v`
+      const versionsTableName = getTableName({ adapter: this, config: global, versions: true })
       const versionFields = buildVersionGlobalFields(global)
 
       buildTable({
@@ -86,6 +96,7 @@ export const init: Init = function init(this: PostgresAdapter) {
         fields: versionFields,
         tableName: versionsTableName,
         timestamps: true,
+        versions: true,
       })
     }
   })

packages/db-postgres/src/migrate.ts

@@ -3,6 +3,7 @@ import type { Payload } from 'payload'
 import type { Migration } from 'payload/database'
 import type { PayloadRequest } from 'payload/types'
 
+import { createRequire } from 'module'
 import {
   commitTransaction,
   initTransaction,
@@ -17,6 +18,8 @@ import { createMigrationTable } from './utilities/createMigrationTable.js'
 import { migrationTableExists } from './utilities/migrationTableExists.js'
 import { parseError } from './utilities/parseError.js'
 
+const require = createRequire(import.meta.url)
+
 export async function migrate(this: PostgresAdapter): Promise<void> {
   const { payload } = this
   const migrationFiles = await readMigrationFiles({ payload })
@@ -82,16 +85,14 @@ export async function migrate(this: PostgresAdapter): Promise<void> {
 }
 
 async function runMigrationFile(payload: Payload, migration: Migration, batch: number) {
-  const { generateDrizzleJson } = require
-    ? require('drizzle-kit/payload')
-    : await import('drizzle-kit/payload')
+  const { generateDrizzleJson } = require('drizzle-kit/payload')
 
   const start = Date.now()
   const req = { payload } as PayloadRequest
 
   payload.logger.info({ msg: `Migrating: ${migration.name}` })
 
-  const pgAdapter = payload.db as PostgresAdapter
+  const pgAdapter = payload.db
   const drizzleJSON = generateDrizzleJson(pgAdapter.schema)
 
   try {

packages/db-postgres/src/queries/getTableColumnFromPath.ts

@@ -14,6 +14,8 @@ import { v4 as uuid } from 'uuid'
 import type { GenericColumn, GenericTable, PostgresAdapter } from '../types.js'
 import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.js'
 
+import { getTableName } from '../schema/getTableName.js'
+
 type Constraint = {
   columnName: string
   table: GenericTable | PgTableWithColumns<any>
@@ -183,7 +185,13 @@ export const getTableColumnFromPath = ({
 
       case 'group': {
         if (locale && field.localized && adapter.payload.config.localization) {
-          newTableName = `${tableName}_locales`
+          newTableName = getTableName({
+            adapter,
+            config: field,
+            locales: true,
+            parentTableName: tableName,
+            prefix: `${tableName}_`,
+          })
 
           joins[tableName] = eq(
             adapter.tables[tableName].id,
@@ -218,7 +226,12 @@ export const getTableColumnFromPath = ({
       }
 
       case 'array': {
-        newTableName = `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`
+        newTableName = getTableName({
+          adapter,
+          config: field,
+          parentTableName: `${tableName}_${tableNameSuffix}`,
+          prefix: `${tableName}_${tableNameSuffix}`,
+        })
         constraintPath = `${constraintPath}${field.name}.%.`
         if (locale && field.localized && adapter.payload.config.localization) {
           joins[newTableName] = and(
@@ -265,7 +278,12 @@ export const getTableColumnFromPath = ({
           const blockTypes = Array.isArray(value) ? value : [value]
           blockTypes.forEach((blockType) => {
             const block = field.blocks.find((block) => block.slug === blockType)
-            newTableName = `${tableName}_blocks_${toSnakeCase(block.slug)}`
+            newTableName = getTableName({
+              adapter,
+              config: block,
+              parentTableName: tableName,
+              prefix: `${tableName}_blocks_`,
+            })
             joins[newTableName] = eq(
               adapter.tables[tableName].id,
               adapter.tables[newTableName]._parentID,
@@ -285,7 +303,12 @@ export const getTableColumnFromPath = ({
         }
 
         const hasBlockField = field.blocks.some((block) => {
-          newTableName = `${tableName}_blocks_${toSnakeCase(block.slug)}`
+          newTableName = getTableName({
+            adapter,
+            config: block,
+            parentTableName: tableName,
+            prefix: `${tableName}_blocks_`,
+          })
           constraintPath = `${constraintPath}${field.name}.%.`
           let result
           const blockConstraints = []
@@ -351,7 +374,7 @@ export const getTableColumnFromPath = ({
       case 'relationship':
       case 'upload': {
         let relationshipFields
-        const relationTableName = `${rootTableName}_rels`
+        const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`
         const newCollectionPath = pathSegments.slice(1).join('.')
         const aliasRelationshipTableName = uuid()
         const aliasRelationshipTable = alias(
@@ -360,22 +383,45 @@ export const getTableColumnFromPath = ({
         )
 
         // Join in the relationships table
-        joinAliases.push({
-          condition: and(
-            eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),
-            like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),
-          ),
-          table: aliasRelationshipTable,
-        })
+        if (locale && field.localized && adapter.payload.config.localization) {
+          joinAliases.push({
+            condition: and(
+              eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),
+              eq(aliasRelationshipTable.locale, locale),
+              like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),
+            ),
+            table: aliasRelationshipTable,
+          })
+          if (locale !== 'all') {
+            constraints.push({
+              columnName: 'locale',
+              table: aliasRelationshipTable,
+              value: locale,
+            })
+          }
+        } else {
+          // Join in the relationships table
+          joinAliases.push({
+            condition: and(
+              eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),
+              like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),
+            ),
+            table: aliasRelationshipTable,
+          })
+        }
 
         selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path
 
         let newAliasTable
 
         if (typeof field.relationTo === 'string') {
-          newTableName = `${toSnakeCase(field.relationTo)}`
+          const relationshipConfig = adapter.payload.collections[field.relationTo].config
+          newTableName = getTableName({
+            adapter,
+            config: relationshipConfig,
+          })
           // parent to relationship join table
-          relationshipFields = adapter.payload.collections[field.relationTo].config.fields
+          relationshipFields = relationshipConfig.fields
 
           newAliasTable = alias(adapter.tables[newTableName], toSnakeCase(uuid()))
 
@@ -394,7 +440,11 @@ export const getTableColumnFromPath = ({
           }
         } else if (newCollectionPath === 'value') {
           const tableColumnsNames = field.relationTo.map(
-            (relationTo) => `"${aliasRelationshipTableName}"."${toSnakeCase(relationTo)}_id"`,
+            (relationTo) =>
+              `"${aliasRelationshipTableName}"."${getTableName({
+                adapter,
+                config: adapter.payload.collections[relationTo].config,
+              })}_id"`,
           )
           return {
             constraints,
@@ -441,7 +491,7 @@ export const getTableColumnFromPath = ({
           if (field.localized && adapter.payload.config.localization) {
             // If localized, we go to localized table and set aliasTable to undefined
             // so it is not picked up below to be used as targetTable
-            newTableName = `${tableName}_locales`
+            newTableName = `${tableName}${adapter.localesSuffix}`
 
             const parentTable = aliasTable || adapter.tables[tableName]
 

packages/db-postgres/src/queries/sanitizeQueryValue.ts

@@ -66,7 +66,7 @@ export const sanitizeQueryValue = ({
     formattedValue = Number(val)
   }
 
-  if (field.type === 'date') {
+  if (field.type === 'date' && operator !== 'exists') {
     if (typeof val === 'string') {
       formattedValue = new Date(val)
       if (Number.isNaN(Date.parse(formattedValue))) {
@@ -85,6 +85,10 @@ export const sanitizeQueryValue = ({
     }
   }
 
+  if ('hasMany' in field && field.hasMany && operator === 'contains') {
+    operator = 'equals'
+  }
+
   if (operator === 'near' || operator === 'within' || operator === 'intersects') {
     throw new APIError(
       `Querying with '${operator}' is not supported with the postgres database adapter.`,

packages/db-postgres/src/queries/selectDistinct.ts

@@ -0,0 +1,60 @@
+import type { QueryPromise, SQL } from 'drizzle-orm'
+
+import type { ChainedMethods } from '../find/chainMethods.js'
+import type { DrizzleDB, PostgresAdapter } from '../types.js'
+import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.js'
+
+import { chainMethods } from '../find/chainMethods.js'
+import { type GenericColumn } from '../types.js'
+
+type Args = {
+  adapter: PostgresAdapter
+  chainedMethods?: ChainedMethods
+  db: DrizzleDB
+  joinAliases: BuildQueryJoinAliases
+  joins: BuildQueryJoins
+  selectFields: Record<string, GenericColumn>
+  tableName: string
+  where: SQL
+}
+
+/**
+ * Selects distinct records from a table only if there are joins that need to be used, otherwise return null
+ */
+export const selectDistinct = ({
+  adapter,
+  chainedMethods = [],
+  db,
+  joinAliases,
+  joins,
+  selectFields,
+  tableName,
+  where,
+}: Args): QueryPromise<Record<string, GenericColumn> & { id: number | string }[]> => {
+  if (Object.keys(joins).length > 0 || joinAliases.length > 0) {
+    if (where) {
+      chainedMethods.push({ args: [where], method: 'where' })
+    }
+
+    joinAliases.forEach(({ condition, table }) => {
+      chainedMethods.push({
+        args: [table, condition],
+        method: 'leftJoin',
+      })
+    })
+
+    Object.entries(joins).forEach(([joinTable, condition]) => {
+      if (joinTable) {
+        chainedMethods.push({
+          args: [adapter.tables[joinTable], condition],
+          method: 'leftJoin',
+        })
+      }
+    })
+
+    return chainMethods({
+      methods: chainedMethods,
+      query: db.selectDistinct(selectFields).from(adapter.tables[tableName]),
+    })
+  }
+}

packages/db-postgres/src/queryDrafts.ts

@@ -2,9 +2,9 @@ import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'
 
 import { type QueryDrafts, combineQueries } from 'payload/database'
 import { buildVersionCollectionFields } from 'payload/versions'
-import toSnakeCase from 'to-snake-case'
 
 import { findMany } from './find/findMany.js'
+import { getTableName } from './schema/getTableName.js'
 
 export const queryDrafts: QueryDrafts = async function queryDrafts({
   collection,
@@ -17,7 +17,11 @@ export const queryDrafts: QueryDrafts = async function queryDrafts({
   where,
 }) {
   const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config
-  const tableName = `_${toSnakeCase(collection)}_v`
+  const tableName = getTableName({
+    adapter: this,
+    config: collectionConfig,
+    versions: true,
+  })
   const fields = buildVersionCollectionFields(collectionConfig)
 
   const combinedWhere = combineQueries({ latest: { equals: true } }, where)

packages/db-postgres/src/schema/build.ts

@@ -11,10 +11,10 @@ import type { Field } from 'payload/types'
 import { relations } from 'drizzle-orm'
 import { index, integer, numeric, serial, timestamp, unique, varchar } from 'drizzle-orm/pg-core'
 import { fieldAffectsData } from 'payload/types'
-import toSnakeCase from 'to-snake-case'
 
 import type { GenericColumns, GenericTable, IDType, PostgresAdapter } from '../types.js'
 
+import { getTableName } from './getTableName.js'
 import { parentIDColumnMap } from './parentIDColumnMap.js'
 import { setColumnID } from './setColumnID.js'
 import { traverseFields } from './traverseFields.js'
@@ -35,6 +35,7 @@ type Args = {
   rootTableName?: string
   tableName: string
   timestamps?: boolean
+  versions: boolean
 }
 
 type Result = {
@@ -59,6 +60,7 @@ export const buildTable = ({
   rootTableName: incomingRootTableName,
   tableName,
   timestamps,
+  versions,
 }: Args): Result => {
   const rootTableName = incomingRootTableName || tableName
   const columns: Record<string, PgColumnBuilder> = baseColumns
@@ -113,6 +115,7 @@ export const buildTable = ({
     rootRelationsToBuild: rootRelationsToBuild || relationsToBuild,
     rootTableIDColType: rootTableIDColType || idColType,
     rootTableName,
+    versions,
   }))
 
   if (timestamps) {
@@ -147,7 +150,7 @@ export const buildTable = ({
   adapter.tables[tableName] = table
 
   if (hasLocalizedField) {
-    const localeTableName = `${tableName}_locales`
+    const localeTableName = `${tableName}${adapter.localesSuffix}`
     localesColumns.id = serial('id').primaryKey()
     localesColumns._locale = adapter.enums.enum__locales('_locale').notNull()
     localesColumns._parentID = parentIDColumnMap[idColType]('_parent_id')
@@ -288,20 +291,26 @@ export const buildTable = ({
       }
 
       relationships.forEach((relationTo) => {
-        const formattedRelationTo = toSnakeCase(relationTo)
+        const relationshipConfig = adapter.payload.collections[relationTo].config
+        const formattedRelationTo = getTableName({
+          adapter,
+          config: relationshipConfig,
+          throwValidationError: true,
+        })
         let colType = adapter.idType === 'uuid' ? 'uuid' : 'integer'
-        const relatedCollectionCustomID = adapter.payload.collections[
-          relationTo
-        ].config.fields.find((field) => fieldAffectsData(field) && field.name === 'id')
-        if (relatedCollectionCustomID?.type === 'number') colType = 'numeric'
-        if (relatedCollectionCustomID?.type === 'text') colType = 'varchar'
+
+        const relatedCollectionCustomIDType =
+          adapter.payload.collections[relationshipConfig.slug]?.customIDType
+
+        if (relatedCollectionCustomIDType === 'number') colType = 'numeric'
+        if (relatedCollectionCustomIDType === 'text') colType = 'varchar'
 
         relationshipColumns[`${relationTo}ID`] = parentIDColumnMap[colType](
           `${formattedRelationTo}_id`,
         ).references(() => adapter.tables[formattedRelationTo].id, { onDelete: 'cascade' })
       })
 
-      const relationshipsTableName = `${tableName}_rels`
+      const relationshipsTableName = `${tableName}${adapter.relationshipsSuffix}`
 
       relationshipsTable = adapter.pgSchema.table(
         relationshipsTableName,
@@ -333,7 +342,11 @@ export const buildTable = ({
         }
 
         relationships.forEach((relationTo) => {
-          const relatedTableName = toSnakeCase(relationTo)
+          const relatedTableName = getTableName({
+            adapter,
+            config: adapter.payload.collections[relationTo].config,
+            throwValidationError: true,
+          })
           const idColumnName = `${relationTo}ID`
           result[idColumnName] = one(adapter.tables[relatedTableName], {
             fields: [relationshipsTable[idColumnName]],