chore: cleanup

## Description

`singular` labels were not being used for array rows - this PR updates
the array field to properly retrieve the correct label

- [x] I have read and understand the
[CONTRIBUTING.md](https://github.com/payloadcms/payload/blob/main/CONTRIBUTING.md)
document in this repository.

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## Checklist:

- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] Existing test suite passes locally with my changes

.git-blame-ignore-revs

@@ -22,3 +22,9 @@ fb7d1be2f3325d076b7c967b1730afcef37922c2
 
 # 3.0 prettier & lint everywhere again
 83fd4c66222d7846eeb5cc332dfa99bf1e830831
+
+# Upgrade to typescript-eslint v8, then prettier & lint everywhere
+86fdad0bb8ab27810599c8a32f3d8cba1341e1df
+
+# Prettier and lint remaining db packages
+7fd736ea5b2e9fc4ef936e9dc9e5e3d722f6d8bf

.github/CODEOWNERS

@@ -1,24 +1,23 @@
 # Order matters. The last matching pattern takes precedence.
+# Approvals are not required currently but may be enabled in the future.
 
 ### Package Exports ###
-/**/exports/ @denolfe @jmikrut
+/**/exports/ @denolfe @jmikrut @DanRibbens
 
 ### Packages ###
-/packages/richtext-*/ @AlessioGr
-/packages/plugin-cloud*/ @denolfe
-/packages/email-*/ @denolfe
-/packages/storage-*/ @denolfe
-/packages/create-payload-app/ @denolfe
-/packages/eslint-*/ @denolfe
+/packages/plugin-cloud*/src/ @denolfe
+/packages/email-*/src/ @denolfe
+/packages/storage-*/src/ @denolfe
+/packages/create-payload-app/src/ @denolfe
+/packages/eslint-*/ @denolfe @AlessioGr
 
 ### Templates ###
-/templates/ @jacobsfletch @denolfe
+/templates/_data/ @denolfe
+/templates/_template/ @denolfe
 
 ### Build Files ###
-/**/package.json @denolfe
 /tsconfig.json @denolfe
 /**/tsconfig*.json @denolfe
-
 /jest.config.js @denolfe
 /**/jest.config.js @denolfe
 
@@ -26,5 +25,5 @@
 /package.json @denolfe
 /scripts/ @denolfe
 /.husky/ @denolfe
-/.vscode/ @denolfe
+/.vscode/ @denolfe @AlessioGr
 /.github/ @denolfe

.github/actions/setup/action.yml

@@ -9,7 +9,7 @@ inputs:
   pnpm-version:
     description: 'The pnpm version to use'
     required: true
-    default: 8.15.7
+    default: 9.7.0
 
 runs:
   using: composite
@@ -25,7 +25,7 @@ runs:
         node-version: ${{ inputs.node-version }}
 
     - name: Install pnpm
-      uses: pnpm/action-setup@v3
+      uses: pnpm/action-setup@v4
       with:
         version: ${{ inputs.pnpm-version }}
         run_install: false

.github/workflows/main.yml

@@ -17,8 +17,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  NODE_VERSION: 18.20.2
-  PNPM_VERSION: 8.15.7
+  NODE_VERSION: 22.6.0
+  PNPM_VERSION: 9.7.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 
@@ -74,7 +74,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -120,7 +120,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -167,7 +167,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -196,6 +196,7 @@ jobs:
           - postgres-custom-schema
           - postgres-uuid
           - supabase
+          - sqlite
     env:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -206,6 +207,9 @@ jobs:
       AWS_REGION: us-east-1
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
         run: sudo ethtool -K eth0 tx off rx off
@@ -216,17 +220,12 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
 
-      - name: Restore build
-        uses: actions/cache@v4
-        timeout-minutes: 10
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
+      - run: pnpm install
 
       - name: Start LocalStack
         run: pnpm docker:start
@@ -292,6 +291,7 @@ jobs:
           - access-control
           - admin__e2e__1
           - admin__e2e__2
+          - admin-root
           - auth
           - field-error-states
           - fields-relationship
@@ -330,7 +330,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -369,7 +369,7 @@ jobs:
         run: pnpm exec playwright install-deps chromium
 
       - name: E2E Tests
-        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e ${{ matrix.suite }}
+        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e:prod:ci ${{ matrix.suite }}
         env:
           PLAYWRIGHT_JSON_OUTPUT_NAME: results_${{ matrix.suite }}.json
           NEXT_TELEMETRY_DISABLED: 1
@@ -390,6 +390,7 @@ jobs:
       #     job-summary: true
 
   app-build-with-packed:
+    if: false # Disable until package resolution in tgzs can be figured out
     runs-on: ubuntu-latest
     needs: build
 
@@ -404,7 +405,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -417,15 +418,15 @@ jobs:
           key: ${{ github.sha }}-${{ github.run_number }}
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.10.0
+        uses: supercharge/mongodb-github-action@1.11.0
         with:
           mongodb-version: 6.0
 
       - name: Pack and build app
         run: |
           set -ex
-          pnpm run script:pack --dest templates/blank-3.0
-          cd templates/blank-3.0
+          pnpm run script:pack --dest templates/blank
+          cd templates/blank
           cp .env.example .env
           ls -la
           pnpm add ./*.tgz --ignore-workspace
@@ -448,7 +449,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -489,7 +490,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.10.0
+        uses: supercharge/mongodb-github-action@1.11.0
         with:
           mongodb-version: 6.0
 
@@ -517,7 +518,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -546,3 +547,16 @@ jobs:
     steps:
       - if: ${{ always() && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')) }}
         run: exit 1
+
+  publish-canary:
+    name: Publish Canary
+    runs-on: ubuntu-latest
+    needs:
+      - all-green
+
+    steps:
+      # debug github.ref output
+      - run: |
+          echo github.ref: ${{ github.ref }}
+          echo isBeta: ${{ github.ref == 'refs/heads/beta' }}
+          echo isMain: ${{ github.ref == 'refs/heads/main' }}

.github/workflows/pr-title.yml

@@ -38,6 +38,8 @@ jobs:
             db-\*
             db-mongodb
             db-postgres
+            db-sqlite
+            drizzle
             email-nodemailer
             eslint
             graphql
@@ -101,3 +103,19 @@ jobs:
         with:
           header: pr-title-lint-error
           delete: true
+
+  label-pr-on-open:
+    name: label-pr-on-open
+    runs-on: ubuntu-latest
+    if: github.event.action == 'opened'
+    steps:
+      - name: Tag with main branch with v2
+        if: github.event.pull_request.base.ref == 'main'
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: v2
+      - name: Tag with beta branch with v3
+        if: github.event.pull_request.base.ref == 'beta'
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: v3

.github/workflows/release-canary.yml

@@ -6,8 +6,8 @@ on:
       - beta
 
 env:
-  NODE_VERSION: 18.20.2
-  PNPM_VERSION: 8.15.7
+  NODE_VERSION: 22.6.0
+  PNPM_VERSION: 9.7.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 

.gitignore

@@ -5,6 +5,7 @@ dist
 !/.idea/runConfigurations
 !/.idea/payload.iml
 
+test/packed
 test-results
 .devcontainer
 .localstack
@@ -22,6 +23,10 @@ meta_shared.json
 # Ignore test directory media folder/files
 /media
 test/media
+*payloadtests.db
+*payloadtests.db-journal
+*payloadtests.db-shm
+*payloadtests.db-wal
 /versions
 
 # Created by https://www.toptal.com/developers/gitignore/api/node,macos,windows,webstorm,sublimetext,visualstudiocode
@@ -149,6 +154,7 @@ out
 # Nuxt.js build / generate output
 .nuxt
 dist
+dist_optimized
 
 # Gatsby files
 .cache/
@@ -296,3 +302,11 @@ $RECYCLE.BIN/
 
 /build
 .swc
+app/(payload)/admin/importMap.js
+test/live-preview/app/(payload)/admin/importMap.js
+/test/live-preview/app/(payload)/admin/importMap.js
+test/admin-root/app/(payload)/admin/importMap.js
+/test/admin-root/app/(payload)/admin/importMap.js
+test/app/(payload)/admin/importMap.js
+/test/app/(payload)/admin/importMap.js
+test/pnpm-lock.yaml

.idea/payload.iml

@@ -26,6 +26,7 @@
       <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/next/dist" />
       <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" />
@@ -75,8 +76,12 @@
       <excludeFolder url="file://$MODULE_DIR$/packages/ui/.swc" />
       <excludeFolder url="file://$MODULE_DIR$/packages/ui/.turbo" />
       <excludeFolder url="file://$MODULE_DIR$/packages/ui/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/drizzle/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/drizzle/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/db-sqlite/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/db-sqlite/dist" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

.idea/runConfigurations/Run_Dev_Fields.xml

@@ -1,8 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Dev Fields" type="NodeJSConfigurationType" application-parameters="--no-deprecation fields" path-to-js-file="test/dev.js" working-dir="$PROJECT_DIR$">
-    <envs>
-      <env name="NODE_OPTIONS" value="--no-deprecation" />
-    </envs>
+  <configuration default="false" name="Run Dev Fields" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="dev" />
+    </scripts>
+    <arguments value="fields" />
+    <node-interpreter value="project" />
+    <envs />
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Run_Dev__community.xml

@@ -1,8 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Dev _community" type="NodeJSConfigurationType" application-parameters="--no-deprecation _community" path-to-js-file="test/dev.js" working-dir="$PROJECT_DIR$">
-    <envs>
-      <env name="NODE_OPTIONS" value="--no-deprecation" />
-    </envs>
+  <configuration default="false" name="Run Dev _community" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="dev" />
+    </scripts>
+    <arguments value="_community" />
+    <node-interpreter value="project" />
+    <envs />
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Run_Dev_admin.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Dev admin" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="dev" />
+    </scripts>
+    <arguments value="admin" />
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.idea/runConfigurations/_template__of_JavaScriptTestRunnerJest.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="true" type="JavaScriptTestRunnerJest">
     <node-interpreter value="project" />
-    <node-options value="--experimental-vm-modules --no-deprecation" />
+    <node-options value="--no-deprecation" />
     <envs />
     <scope-kind value="ALL" />
     <method v="2" />

.node-version

@@ -1 +1 @@
-v18.20.2
+v22.6.0

.npmrc

@@ -1,2 +1,3 @@
 symlink=true
-node-linker=isolated # due to a typescript bug, isolated mode requires @types/express-serve-static-core, terser and monaco-editor to be installed https://github.com/microsoft/TypeScript/issues/47663#issuecomment-1519138189 along with two other changes in the code which I've marked with (tsbugisolatedmode) in the code
+node-linker=isolated
+hoist-workspace-packages=false # the default in pnpm v9 is true, but that can break our runtime dependency checks

.nvmrc

@@ -1 +1 @@
-v18.20.2
+v22.6.0

.tool-versions

@@ -0,0 +1,2 @@
+pnpm 9.7.1
+nodejs 22.6.0

.vscode/launch.json

@@ -56,6 +56,20 @@
       "request": "launch",
       "type": "node-terminal"
     },
+    {
+      "command": "node --no-deprecation test/dev.js fields-relationship",
+      "cwd": "${workspaceFolder}",
+      "name": "Run Dev Fields-Relationship",
+      "request": "launch",
+      "type": "node-terminal"
+    },
+    {
+      "command": "node --no-deprecation test/dev.js login-with-username",
+      "cwd": "${workspaceFolder}",
+      "name": "Run Dev Login-With-Username",
+      "request": "launch",
+      "type": "node-terminal"
+    },
     {
       "command": "pnpm run dev plugin-cloud-storage",
       "cwd": "${workspaceFolder}",

.vscode/settings.json

@@ -31,8 +31,15 @@
     "editor.formatOnSave": true
   },
   "editor.formatOnSaveMode": "file",
-  // All ESLint rules to 'warn' to differentate from TypeScript's 'error' level
-  "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }],
+  "eslint.rules.customizations": [
+    // Defaultt all ESLint errors to 'warn' to differentate from TypeScript's 'error' level
+    { "rule": "*", "severity": "warn" },
+
+    // Silence some warnings that will get auto-fixed
+    { "rule": "perfectionist/*", "severity": "off", "fixable": true },
+    { "rule": "curly", "severity": "off", "fixable": true },
+    { "rule": "object-shorthand", "severity": "off", "fixable": true }
+  ],
   "typescript.tsdk": "node_modules/typescript/lib",
   // Load .git-blame-ignore-revs file
   "gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".git-blame-ignore-revs"],
@@ -42,8 +49,8 @@
     }
   },
   "files.insertFinalNewline": true,
-  "jestrunner.jestCommand": "pnpm exec cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" node 'node_modules/jest/bin/jest.js'",
+  "jestrunner.jestCommand": "pnpm exec cross-env NODE_OPTIONS=\"--no-deprecation\" node 'node_modules/jest/bin/jest.js'",
   "jestrunner.debugOptions": {
-    "runtimeArgs": ["--experimental-vm-modules", "--no-deprecation"]
+    "runtimeArgs": ["--no-deprecation"]
   }
 }

README.md

@@ -1,6 +1,7 @@
 <a href="https://payloadcms.com"><img width="100%" src="https://github.com/payloadcms/payload/blob/main/packages/payload/src/admin/assets/images/github-banner-alt.jpg?raw=true" alt="Payload headless CMS Admin panel built with React" /></a>
 <br />
 <br />
+
 <p align="left">
   <a href="https://github.com/payloadcms/payload/actions"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/payloadcms/payload/main.yml?style=flat-square"></a>
   &nbsp;

app/(app)/layout.tsx

@@ -0,0 +1,14 @@
+import React from 'react'
+
+export const metadata = {
+  description: 'Generated by Next.js',
+  title: 'Next.js',
+}
+
+export default function RootLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}

app/(app)/test/page.tsx

@@ -0,0 +1,11 @@
+import configPromise from '@payload-config'
+import { getPayloadHMR } from '@payloadcms/next/utilities'
+
+export const Page = async ({ params, searchParams }) => {
+  const payload = await getPayloadHMR({
+    config: configPromise,
+  })
+  return <div>test ${payload?.config?.collections?.length}</div>
+}
+
+export default Page

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

@@ -5,6 +5,8 @@ import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import { NotFoundPage, generatePageMetadata } from '@payloadcms/next/views'
 
+import { importMap } from '../importMap.js'
+
 type Args = {
   params: {
     segments: string[]
@@ -17,6 +19,7 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
+const NotFound = ({ params, searchParams }: Args) =>
+  NotFoundPage({ config, importMap, params, searchParams })
 
 export default NotFound

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

@@ -5,6 +5,8 @@ import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import { RootPage, generatePageMetadata } from '@payloadcms/next/views'
 
+import { importMap } from '../importMap.js'
+
 type Args = {
   params: {
     segments: string[]
@@ -17,6 +19,7 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const Page = ({ params, searchParams }: Args) => RootPage({ config, params, searchParams })
+const Page = ({ params, searchParams }: Args) =>
+  RootPage({ config, importMap, params, searchParams })
 
 export default Page

app/(payload)/layout.tsx

@@ -1,6 +1,9 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 import configPromise from '@payload-config'
 import { RootLayout } from '@payloadcms/next/layouts'
+
+import { importMap } from './admin/importMap.js'
+
 // import '@payloadcms/ui/styles.css' // Uncomment this line if `@payloadcms/ui` in `tsconfig.json` points to `/ui/dist` instead of `/ui/src`
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
@@ -11,6 +14,10 @@ type Args = {
   children: React.ReactNode
 }
 
-const Layout = ({ children }: Args) => <RootLayout config={configPromise}>{children}</RootLayout>
+const Layout = ({ children }: Args) => (
+  <RootLayout config={configPromise} importMap={importMap}>
+    {children}
+  </RootLayout>
+)
 
 export default Layout

docs/admin/collections.mdx

@@ -31,12 +31,12 @@ The following options are available:
 | **`hidden`**                     | Set to true or a function, called with the current user, returning true to exclude this Collection from navigation and admin routing.                                                                 |
 | **`hooks`**                      | Admin-specific hooks for this Collection. [More details](../hooks/collections).                                                                                                                                        |
 | **`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.                                                                                      |
+| **`description`**                | Text to display below the Collection label in the List View to give editors more information. Alternatively, you can use the `admin.components.Description` to render a React component. [More details](#components). |
 | **`defaultColumns`**             | Array of field names that correspond to which columns to show by default in this Collection's List View.                                                                                              |
 | **`hideAPIURL`**                 | Hides the "API URL" meta field while editing documents within this Collection.                                                                                                                        |
 | **`enableRichTextLink`**         | The [Rich Text](../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](../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. |
-| **`meta`**                       | Metadata overrides to apply to the Admin Panel. Included properties are `description` and `openGraph`.                                                                           |
+| **`meta`**                       | Page metadata overrides to apply to this Collection within the Admin Panel. [More details](./metadata).                                                                           |
 | **`preview`**                    | Function to generate preview URLs within the Admin Panel that can point to your app. [More details](#preview).                                                                                                |
 | **`livePreview`**                | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).                                                                              |
 | **`components`**                 | Swap in your own React components to be used within this Collection. [More details](#components).                                                                                       |
@@ -51,7 +51,6 @@ To override Collection Components, use the `admin.components` property in your [
 
 ```ts
 import type { SanitizedCollectionConfig } from 'payload'
-import { CustomSaveButton } from './CustomSaveButton'
 
 export const MyCollection: SanitizedCollectionConfig = {
   // ...
@@ -70,7 +69,8 @@ The following options are available:
 | **`beforeList`**           | An array of components to inject _before_ the built-in List View                                                          |
 | **`beforeListTable`**      | An array of components to inject _before_ the built-in List View's table                                                  |
 | **`afterList`**            | An array of components to inject _after_ the built-in List View                                                           |
-| **`afterListTable`**       | An array of components to inject _after_ the built-in List View's table                                                   |
+| **`afterListTable`**       | An array of components to inject _after_ the built-in List View's table
+| **`Description`**          | A component to render below the Collection label in the List View. An alternative to the `admin.description` property. |
 | **`edit.SaveButton`**      | Replace the default Save Button with a Custom Component. [Drafts](../versions/drafts) must be disabled.                                     |
 | **`edit.SaveDraftButton`** | Replace the default Save Draft Button with a Custom Component. [Drafts](../versions/drafts) must be enabled and autosave must be disabled. |
 | **`edit.PublishButton`**   | Replace the default Publish Button with a Custom Component. [Drafts](../versions/drafts) must be enabled.                                  |

docs/admin/components.mdx

@@ -24,6 +24,220 @@ There are four main types of Custom Components in Payload:
 
 To swap in your own Custom Component, consult the list of available components. Determine the scope that corresponds to what you are trying to accomplish, then [author your React component(s)](#building-custom-components) accordingly.
 
+
+## Defining Custom Components in the Payload Config
+
+In the Payload Config, you can define custom React Components to enhance the admin interface. However, these components should not be imported directly into the server-only Payload Config to avoid including client-side code. Instead, you specify the path to the component. Here’s how you can do it:
+
+
+src/components/Logout.tsx
+```tsx
+'use client'
+import React from 'react'
+
+export const MyComponent = () => {
+  return (
+    <button>Click me!</button>
+  )
+}
+```
+
+payload.config.ts:
+```ts
+import { buildConfig } from 'payload'
+
+const config = buildConfig({
+  // ...
+  admin: { // highlight-line
+    components: {
+      logout: {
+        Button: '/src/components/Logout#MyComponent'
+      }
+    }
+  },
+})
+```
+
+In the path `/src/components/Logout#MyComponent`, `/src/components/Logout` is the file path, and `MyComponent` is the named export. If the component is the default export, the export name can be omitted. Path and export name are separated by a `#`.
+
+### Configuring the Base Directory
+
+Component paths, by default, are relative to your working directory - this is usually where your Next.js config lies. To simplify component paths, you have the option to configure the *base directory* using the `admin.baseDir.baseDir` property:
+
+```ts
+import { buildConfig } from 'payload'
+import { fileURLToPath } from 'node:url'
+import path from 'path'
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
+const config = buildConfig({
+  // ...
+  admin: { // highlight-line
+     importMap: {
+      baseDir: path.resolve(dirname, 'src'),
+    },
+    components: {
+      logout: {
+        Button: '/components/Logout#MyComponent'
+      }
+    }
+  },
+})
+```
+
+In this example, we set the base directory to the `src` directory - thus we can omit the `/src/` part of our component path string.
+
+### Passing Props
+
+Each React Component in the Payload Config is typed as `PayloadComponent`. This usually is a string, but can also be an object containing the following properties:
+
+| Property      | Description                                                                                                                   |
+|---------------|-------------------------------------------------------------------------------------------------------------------------------|
+| `clientProps` | Props to be passed to the React Component if it's a Client Component                                                          |
+| `exportName`  | Instead of declaring named exports using `#` in the component path, you can also omit them from `path` and pass them in here. |
+| `path`        | Path to the React Component. Named exports can be appended to the end of the path, separated by a `#`                         |
+| `serverProps` | Props to be passed to the React Component if it's a Server Component                                                          |
+
+To pass in props from the config, you can use the `clientProps` and/or `serverProps` properties. This alleviates the need to use an HOC (Higher-Order-Component) to declare a React Component with props passed in.
+
+Here is an example:
+
+src/components/Logout.tsx
+```tsx
+'use client'
+import React from 'react'
+
+export const MyComponent = ({ text }: { text: string }) => {
+  return (
+    <button>Click me! {text}</button>
+  )
+}
+```
+
+payload.config.ts:
+```ts
+import { buildConfig } from 'payload'
+
+const config = buildConfig({
+  // ...
+  admin: { // highlight-line
+    components: {
+      logout: {
+        Button: {
+          path: '/src/components/Logout',
+          clientProps: {
+            text: 'Some Text.'
+          },
+          exportName: 'MyComponent'
+        }
+      }
+    }
+  },
+})
+```
+
+### Import Maps
+
+It's essential to understand how `PayloadComponent` paths function behind the scenes. Directly importing React Components into your Payload Config using import statements can introduce client-only modules like CSS into your server-only config. This could error when attempting to load the Payload Config in server-only environments and unnecessarily increase the size of the Payload Config, which should remain streamlined and efficient for server use.
+
+Instead, we utilize component paths to reference React Components. This method enhances the Payload Config with actual React Component imports on the client side, without affecting server-side usage. A script is deployed to scan the Payload Config, collecting all component paths and creating an `importMap.js`. This file, located in app/(payload)/admin/importMap.js, must be statically imported by your Next.js root page and layout. The script imports all the React Components from the specified paths into a Map, associating them with their respective paths (the ones you defined).
+
+When constructing the `ClientConfig`, Payload uses the component paths as keys to fetch the corresponding React Component imports from the Import Map. It then substitutes the `PayloadComponent` with a `MappedComponent`. A `MappedComponent` includes the React Component and additional metadata, such as whether it's a server or a client component and which props it should receive. These components are then rendered through the `<RenderComponent />` component within the Payload Admin Panel.
+
+Import maps are regenerated whenever you modify any element related to component paths. This regeneration occurs at startup and whenever Hot Module Replacement (HMR) runs. If the import maps fail to regenerate during HMR, you can restart your application and execute the `payload generate:importmap` command to manually create a new import map. If you encounter any errors running this command, see the [Troubleshooting](/docs/beta/local-api/outside-nextjs#troubleshooting) section.
+
+### Component paths in external packages
+
+Component paths are resolved relative to your project's base directory, which is either your current working directory or the directory specified in `config.admin.baseDir`. When using custom components from external packages, you can't use relative paths. Instead, use an import path that's accessible as if you were writing an import statement in your project's base directory.
+
+For example, to export a field with a custom component from an external package named `my-external-package`:
+
+```ts
+import type { Field } from 'payload'
+export const MyCustomField: Field = {
+  type: 'text',
+  name: 'MyField',
+  admin: {
+    components: {
+      Field: 'my-external-package/client#MyFieldComponent'
+    }
+  }
+}
+```
+
+Despite `MyFieldComponent` living in `src/components/MyFieldComponent.tsx` in `my-external-package`, this will not be accessible from the consuming project. Instead, we recommend exporting all custom components from one file in the external package. For example, you can define a `src/client.ts file in `my-external-package`:
+
+```ts
+'use client'
+export { MyFieldComponent } from './components/MyFieldComponent'
+```
+
+Then, update the package.json of `my-external-package:
+
+```json
+{
+...
+  "exports": {
+    "./client": {
+        "import": "./dist/client.js",
+        "types": "./dist/client.d.ts",
+        "default": "./dist/client.js"
+    }
+  }
+}
+```
+
+This setup allows you to specify the component path as `my-external-package/client#MyFieldComponent` as seen above. The import map will generate:
+
+```ts
+import { MyFieldComponent } from 'my-external-package/client'
+```
+
+which is a valid way to access MyFieldComponent that can be resolved by the consuming project.
+
+### Custom Components from unknown locations
+
+By default, any component paths from known locations are added to the import map. However, if you need to add any components from unknown locations to the import map, you can do so by adding them to the `admin.dependencies` array in your Payload Config. This is mostly only relevant for plugin authors and not for regular Payload users.
+
+Example:
+
+```ts
+export default {
+  // ...
+  admin: {
+    // ...
+    dependencies: {
+      myTestComponent: { // myTestComponent is the key - can be anything
+        path: '/components/TestComponent.js#TestComponent',
+        type: 'component',
+        clientProps: {
+          test: 'hello',
+        },
+      },
+    },
+  }
+}
+```
+
+This way, `TestComponent` is added to the import map, no matter if it's referenced in a known location or not. On the client, you can then use the component like this:
+
+```tsx
+'use client'
+
+import { RenderComponent, useConfig } from '@payloadcms/ui'
+import React from 'react'
+
+export const CustomView = () => {
+  const { config } = useConfig()
+  return (
+    <div>
+      <RenderComponent mappedComponent={config.admin.dependencies?.myTestComponent} />
+    </div>
+  )
+}
+```
+
 ## Root Components
 
 Root Components are those that effect the [Admin Panel](./overview) generally, such as the logo or the main nav.
@@ -33,8 +247,6 @@ To override Root Components, use the `admin.components` property in your [Payloa
 ```ts
 import { buildConfig } from 'payload'
 
-import { MyCustomLogo } from './MyCustomLogo'
-
 export default buildConfig({
   // ...
   admin: {
@@ -81,13 +293,11 @@ To add a Custom Provider, use the `admin.components.providers` property in your
 ```ts
 import { buildConfig } from 'payload'
 
-import { MyProvider } from './MyProvider'
-
 export default buildConfig({
   // ...
   admin: {
     components: {
-      providers: [MyProvider], // highlight-line
+      providers: ['/path/to/MyProvider'], // highlight-line
     },
   },
 })
@@ -207,7 +417,7 @@ import React from 'react'
 import { useConfig } from '@payloadcms/ui'
 
 export const MyClientComponent: React.FC = () => {
-  const { serverURL } = useConfig() // highlight-line
+  const { config: { serverURL } } = useConfig() // highlight-line
 
   return (
     <Link href={serverURL}>
@@ -221,6 +431,22 @@ export const MyClientComponent: React.FC = () => {
   See [Using Hooks](#using-hooks) for more details.
 </Banner>
 
+All [Field Components](./fields) automatically receive their respective Field Config through a common [`field`](./fields#the-field-prop) prop:
+
+```tsx
+'use client'
+import React from 'react'
+import type { TextFieldClientComponent } from 'payload'
+
+export const MyClientFieldComponent: TextFieldClientComponent = ({ field: { name } }) => {
+  return (
+    <p>
+      {`This field's name is ${name}`}
+    </p>
+  )
+}
+```
+
 ### Using Hooks
 
 To make it easier to [build your Custom Components](#building-custom-components), you can use [Payload's built-in React Hooks](./hooks) in any Client Component. For example, you might want to interact with one of Payload's many React Contexts:

docs/admin/fields.mdx

@@ -117,7 +117,7 @@ export const CollectionConfig: CollectionConfig = {
       // ...
       admin: {
         components: {
-          Field: MyFieldComponent, // highlight-line
+          Field: '/path/to/MyFieldComponent', // highlight-line
         },
       },
     }
@@ -135,32 +135,13 @@ All Field Components receive the following props:
 
 | Property         | Description                                                                                                                                                                                                                      |
 | ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`AfterInput`** | The rendered result of the `admin.components.afterInput` property. [More details](#afterinput-and-beforeinput).                                                                                                      |
-| **`BeforeInput`** | The rendered result of the `admin.components.beforeInput` property. [More details](#afterinput-and-beforeinput).                                                                                                      |
-| **`CustomDescription`** | The rendered result of the `admin.components.Description` property. [More details](#the-description-component).                                                                                                      |
-| **`CustomError`** | The rendered result of the `admin.components.Error` property. [More details](#the-error-component).                                                                                                      |
-| **`CustomLabel`** | The rendered result of the `admin.components.Label` property. [More details](#the-label-component).
-| **`path`**       | The static path of the field at render time. [More details](./hooks#usefieldprops). |
-| **`disabled`**   | The `admin.disabled` property defined in the [Field Config](../fields/overview). |
-| **`required`**   | The `admin.required` property defined in the [Field Config](../fields/overview). |
-| **`className`**  | The `admin.className` property defined in the [Field Config](../fields/overview). |
-| **`style`**      | The `admin.style` property defined in the [Field Config](../fields/overview).                                                                                                                                                      |
-| **`custom`**     | The `admin.custom` property defined in the [Field Config](../fields/overview).
-| **`placeholder`** | The `admin.placeholder` property defined in the [Field Config](../fields/overview). |
-| **`descriptionProps`** | An object that contains the props for the `FieldDescription` component.                                                                                                                                                                   |
-| **`labelProps`** | An object that contains the props needed for the `FieldLabel` component.                                                                                                                                                                         |
-| **`errorProps`** | An object that contains the props for the `FieldError` component.                                                                                                                                                                         |
-| **`docPreferences`** | An object that contains the preferences for the document.                                                                                                                                                                         |
-| **`label`**      | The label value provided in the field, it can be used with i18n.                                                                                                                                                                   |
+| **`docPreferences`** | An object that contains the [Preferences](./preferences) for the document.
+| **`field`** | In Server Components, this is the original Field Config. In Client Components, this is the sanitized Client Field Config. [More details](#the-field-prop). |
+| **`clientField`** | Server components receive the Client Field Config through this prop. [More details](#the-field-prop). |
 | **`locale`**     | The locale of the field. [More details](../configuration/localization).                                                                                                                                                                   |
-| **`localized`**  | A boolean value that represents if the field is localized or not. [More details](../fields/localized).                                                                                                                                                                   |
 | **`readOnly`**   | A boolean value that represents if the field is read-only or not.                                                                                                                                                                  |
-| **`rtl`**        | A boolean value that represents if the field should be rendered right-to-left or not. [More details](../configuration/i18n).                                                                                           |
 | **`user`**       | The currently authenticated user. [More details](../authentication/overview). |
 | **`validate`**   | A function that can be used to validate the field.                                                                                                                                                                                 |
-| **`hasMany`**    | If a [`relationship`](../fields/relationship) field, the `hasMany` property defined in the [Field Config](../fields/overview). |
-| **`maxLength`**  | If a [`text`](../fields/text) field, the `maxLength` property defined in the [Field Config](../fields/overview). |
-| **`minLength`**  | If a [`text`](../fields/text) field, the `minLength` property defined in the [Field Config](../fields/overview). |
 
 <Banner type="success">
   <strong>Reminder:</strong>
@@ -193,6 +174,82 @@ export const CustomTextField: React.FC = () => {
   For a complete list of all available React hooks, see the [Payload React Hooks](./hooks) documentation. For additional help, see [Building Custom Components](./components#building-custom-components).
 </Banner>
 
+#### TypeScript
+
+When building Custom Field Components, you can import the component type to ensure type safety. There is an explicit type for the Field Component, one for every [Field Type](../fields/overview) and for every client/server environment. The convention is to prepend the field type onto the target type, i.e. `TextFieldClientComponent`:
+
+```tsx
+import type {
+  TextFieldClientComponent,
+  TextFieldServerComponent,
+  TextFieldClientProps,
+  TextFieldServerProps,
+  // ...and so on for each Field Type
+} from 'payload'
+```
+
+### The `field` Prop
+
+All Field Components are passed their own Field Config through a common `field` prop. Within Server Components, this is the original Field Config as written within your Payload Config. Within Client Components, however, this is a "Client Config", which is a sanitized, client-friendly version of the Field Config. This is because the original Field Config is [non-serializable](https://react.dev/reference/rsc/use-client#serializable-types), meaning it cannot be passed into Client Components without first being transformed.
+
+The Client Field Config is an exact copy of the original Field Config, minus all non-serializable properties, plus all evaluated functions such as field labels, [Custom Components](../components), etc.
+
+Server Component:
+
+```tsx
+import React from 'react'
+import type { TextFieldServerComponent } from 'payload'
+import { TextField } from '@payloadcms/ui'
+
+export const MyServerField: TextFieldServerComponent = ({ clientField }) => {
+  return <TextField field={clientField} />
+}
+```
+
+<Banner type="info">
+  <strong>Tip:</strong>
+  Server Components can still access the original Field Config through the `field` prop.
+</Banner>
+
+Client Component:
+
+```tsx
+'use client'
+import React from 'react'
+import type { TextFieldClientComponent } from 'payload'
+
+export const MyTextField: TextFieldClientComponent = ({ field }) => {
+  return <TextField field={field} />
+}
+```
+
+The following additional properties are also provided to the `field` prop:
+
+| Property         | Description                                                                                                                                                                                                                      |
+| ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`_isPresentational`** | A boolean indicating that the field is purely visual and does not directly affect data or change data shape, i.e. the [UI Field](../fields/ui). |
+| **`_path`** | A string representing the direct, dynamic path to the field at runtime, i.e. `myGroup.myArray[0].myField`. |
+| **`_schemaPath`** | A string representing the direct, static path to the [Field Config](../fields/overview), i.e. `myGroup.myArray.myField` |
+
+<Banner type="info">
+  <strong>Note:</strong>
+  These properties are underscored to denote that they are not part of the original Field Config, and instead are attached during client sanitization to make fields easier to work with on the front-end.
+</Banner>
+
+#### TypeScript
+
+When building Custom Field Components, you can import the client field props to ensure type safety in your component. There is an explicit type for the Field Component, one for every [Field Type](../fields/overview) and server/client environment. The convention is to prepend the field type onto the target type, i.e. `TextFieldClientComponent`:
+
+```tsx
+import type {
+  TextFieldClientComponent,
+  TextFieldServerComponent,
+  TextFieldClientProps,
+  TextFieldServerProps,
+  // ...and so on for each Field Type
+} from 'payload'
+```
+
 ### The Cell Component
 
 The Cell Component is rendered in the table of the List View. It represents the value of the field when displayed in a table cell.
@@ -207,7 +264,7 @@ export const myField: Field = {
   type: 'text',
   admin: {
     components: {
-      Cell: MyCustomCell, // highlight-line
+      Cell: '/path/to/MyCustomCellComponent', // highlight-line
     },
   },
 }
@@ -219,20 +276,10 @@ All Cell Components receive the following props:
 
 | Property         | Description                                                       |
 | ---------------- | ----------------------------------------------------------------- |
-| **`name`** | The name of the field. |
-| **`className`**  | The `admin.className` property defined in the [Field Config](../fields/overview). |
-| **`fieldType`** | The `type` property defined in the [Field Config](../fields/overview). |
-| **`schemaPath`** | The path to the field in the schema. Similar to `path`, but without dynamic indices. |
-| **`isFieldAffectingData`** | A boolean value that represents if the field is affecting the data or not. |
-| **`label`** | The label value provided in the field, it can be used with i18n. |
-| **`labels`** | An object that contains the labels for the field. |
+| **`field`** | In Server Components, this is the original Field Config. In Client Components, this is the sanitized Client Field Config. [More details](#the-field-prop). |
+| **`clientField`** | Server components receive the Client Field Config through this prop. [More details](#the-field-prop). |
 | **`link`** | A boolean representing whether this cell should be wrapped in a link. |
 | **`onClick`** | A function that is called when the cell is clicked. |
-| **`dateDisplayFormat`** | If a [`date`](../fields/date) field, the `admin.dateDisplayFormat` property defined in the [Field Config](../fields/overview). |
-| **`options`** | If a [`select`](../fields/select) field, this is an array of options defined in the [Field Config](../fields/overview). [More details](../fields/select). |
-| **`relationTo`** | If a [`relationship`](../fields/relationship). or [`upload`](../fields/upload) field, this is the collection(s) the field is related to. |
-| **`richTextComponentMap`** | If a [`richText`](../fields/rich-text) field, this is an object that maps the rich text components. [More details](../fields/rich-text). |
-| **`blocks`** | If a [`blocks`](../fields/blocks) field, this is an array of labels and slugs representing the blocks defined in the [Field Config](../fields/overview). [More details](../fields/blocks). |
 
 <Banner type="info">
   <strong>Tip:</strong>
@@ -258,7 +305,7 @@ export const myField: Field = {
   type: 'text',
   admin: {
     components: {
-      Label: MyCustomLabel, // highlight-line
+      Label: '/path/to/MyCustomLabelComponent', // highlight-line
     },
   },
 }
@@ -266,19 +313,30 @@ export const myField: Field = {
 
 _For details on how to build Custom Components, see [Building Custom Components](./components#building-custom-components)._
 
-All Label Components receive the following props:
+Custom Label Components receive all [Field Component](#the-field-component) props, plus the following props:
 
 | Property       | Description                                                      |
 | -------------- | ---------------------------------------------------------------- |
-| **`label`**    | Label value provided in field, it can be used with i18n.         |
-| **`required`** | The `admin.required` property defined in the [Field Config](../fields/overview). |
-| **`schemaPath`** | The path to the field in the schema. Similar to `path`, but without dynamic indices. |
+| **`field`** | In Server Components, this is the original Field Config. In Client Components, this is the sanitized Client Field Config. [More details](#the-field-prop). |
+| **`clientField`** | Server components receive the Client Field Config through this prop. [More details](#the-field-prop). |
 
 <Banner type="success">
   <strong>Reminder:</strong>
   All [Custom Server Components](./components) receive the `payload` and `i18n` properties by default. See [Building Custom Components](./components#building-custom-components) for more details.
 </Banner>
 
+#### TypeScript
+
+When building Custom Label Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Label Component, one for every [Field Type](../fields/overview) and server/client environment. The convention is to append `LabelServerComponent` or `LabelClientComponent` to the type of field, i.e. `TextFieldLabelClientComponent`.
+
+```tsx
+import type {
+  TextFieldLabelServerComponent,
+  TextFieldLabelClientComponent,
+  // ...and so on for each Field Type
+} from 'payload'
+```
+
 ### The Error Component
 
 The Error Component is rendered when a field fails validation. It is typically displayed beneath the field input in a visually-compelling style.
@@ -293,7 +351,7 @@ export const myField: Field = {
   type: 'text',
   admin: {
     components: {
-      Error: MyCustomError, // highlight-line
+      Error: '/path/to/MyCustomErrorComponent', // highlight-line
     },
   },
 }
@@ -301,17 +359,30 @@ export const myField: Field = {
 
 _For details on how to build Custom Components, see [Building Custom Components](./components#building-custom-components)._
 
-All Error Components receive the following props:
+Custom Error Components receive all [Field Component](#the-field-component) props, plus the following props:
 
 | Property        | Description                                                   |
 | --------------- | ------------------------------------------------------------- |
-| **`path`***       | The static path of the field at render time. [More details](./hooks#usefieldprops). |
+| **`field`** | In Server Components, this is the original Field Config. In Client Components, this is the sanitized Client Field Config. [More details](#the-field-prop). |
+| **`clientField`** | Server components receive the Client Field Config through this prop. [More details](#the-field-prop). |
 
 <Banner type="success">
   <strong>Reminder:</strong>
   All [Custom Server Components](./components) receive the `payload` and `i18n` properties by default. See [Building Custom Components](./components#building-custom-components) for more details.
 </Banner>
 
+#### TypeScript
+
+When building Custom Error Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Error Component, one for every [Field Type](../fields/overview) and server/client environment. The convention is to append `ErrorServerComponent` or `ErrorClientComponent` to the type of field, i.e. `TextFieldErrorClientComponent`.
+
+```tsx
+import type {
+  TextFieldErrorServerComponent,
+  TextFieldErrorClientComponent,
+  // And so on for each Field Type
+} from 'payload'
+```
+
 ### The Description Property
 
 Field Descriptions are used to provide additional information to the editor about a field, such as special instructions. Their placement varies from field to field, but typically are displayed with subtle style differences beneath the field inputs.
@@ -385,7 +456,6 @@ To easily add a Description Component to a field, use the `admin.components.Desc
 
 ```ts
 import type { SanitizedCollectionConfig } from 'payload'
-import { MyCustomDescription } from './MyCustomDescription'
 
 export const MyCollectionConfig: SanitizedCollectionConfig = {
   // ...
@@ -396,7 +466,7 @@ export const MyCollectionConfig: SanitizedCollectionConfig = {
       type: 'text',
       admin: {
         components: {
-          Description: MyCustomDescription, // highlight-line
+          Description: '/path/to/MyCustomDescriptionComponent', // highlight-line
         }
       }
     }
@@ -406,17 +476,30 @@ export const MyCollectionConfig: SanitizedCollectionConfig = {
 
 _For details on how to build a Custom Description, see [Building Custom Components](./components#building-custom-components)._
 
-All Description Components receive the following props:
+Custom Description Components receive all [Field Component](#the-field-component) props, plus the following props:
 
 | Property       | Description                                                      |
 | -------------- | ---------------------------------------------------------------- |
-| **`description`**    | The `description` property defined in the [Field Config](../fields/overview).         |
+| **`field`** | In Server Components, this is the original Field Config. In Client Components, this is the sanitized Client Field Config. [More details](#the-field-prop). |
+| **`clientField`** | Server components receive the Client Field Config through this prop. [More details](#the-field-prop). |
 
 <Banner type="success">
   <strong>Reminder:</strong>
   All [Custom Server Components](./components) receive the `payload` and `i18n` properties by default. See [Building Custom Components](./components#building-custom-components) for more details.
 </Banner>
 
+#### TypeScript
+
+When building Custom Description Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Description Component, one for every [Field Type](../fields/overview) and server/client environment. The convention is to append `DescriptionServerComponent` or `DescriptionClientComponent` to the type of field, i.e. `TextFieldDescriptionClientComponent`.
+
+```tsx
+import type {
+  TextFieldDescriptionServerComponent,
+  TextFieldDescriptionClientComponent,
+  // And so on for each Field Type
+} from 'payload'
+```
+
 ### afterInput and beforeInput
 
 With these properties you can add multiple components _before_ and _after_ the input element, as their name suggests. This is useful when you need to render additional elements alongside the field without replacing the entire field component.
@@ -436,8 +519,8 @@ export const MyCollectionConfig: SanitizedCollectionConfig = {
       admin: {
         components: {
           // highlight-start
-          beforeInput: [MyCustomComponent],
-          afterInput: [MyOtherCustomComponent],
+          beforeInput: ['/path/to/MyCustomComponent'],
+          afterInput: ['/path/to/MyOtherCustomComponent'],
           // highlight-end
         }
       }

docs/admin/globals.mdx

@@ -33,7 +33,7 @@ The following options are available:
 | **`preview`**     | Function to generate a preview URL within the Admin Panel for this Global that can point to your app. [More details](#preview).           |
 | **`livePreview`** | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).          |
 | **`hideAPIURL`**  | Hides the "API URL" meta field while editing documents within this collection.                                                    |
-| **`meta`**        | Metadata overrides to apply to the Admin Panel. Included properties are `description` and `openGraph`.       |
+| **`meta`**        | Page metadata overrides to apply to this Global within the Admin Panel. [More details](./metadata).                                                                           |
 
 ### Components
 
@@ -43,7 +43,6 @@ To override Global Components, use the `admin.components` property in your [Glob
 
 ```ts
 import type { SanitizedGlobalConfig } from 'payload'
-import { CustomSaveButton } from './CustomSaveButton'
 
 export const MyGlobal: SanitizedGlobalConfig = {
   // ...

docs/admin/hooks.mdx

@@ -52,7 +52,7 @@ The `useField` hook accepts the following arguments:
 The `useField` hook returns the following object:
 
 ```ts
-type FieldResult<T> = {
+type FieldType<T> = {
   errorMessage?: string
   errorPaths?: string[]
   filterOptions?: FilterOptionsResult
@@ -65,7 +65,7 @@ type FieldResult<T> = {
   readOnly?: boolean
   rows?: Row[]
   schemaPath: string
-  setValue: (val: unknown, disableModifyingForm?: boolean) => voi
+  setValue: (val: unknown, disableModifyingForm?: boolean) => void
   showError: boolean
   valid?: boolean
   value: T
@@ -74,9 +74,9 @@ type FieldResult<T> = {
 
 ## useFieldProps
 
-All [Custom Field Components](./fields#the-field-component) are rendered on the server, and as such, only have access to static props at render time. But, some fields can be dynamic, such as when nested in an [`array`](../fields/array) or [`blocks`](../fields/block) field. For example, items can be added, re-ordered, or deleted on-the-fly.
+[Custom Field Components](./fields#the-field-component) can be rendered on the server. When using a server component as a custom field component, you can access dynamic props from within any client component rendered by your custom server component. This is done using the `useFieldProps` hook. This is important because some fields can be dynamic, such as when nested in an [`array`](../fields/array) or [`blocks`](../fields/block) field. For example, items can be added, re-ordered, or deleted on-the-fly.
 
-For this reason, dynamic props like `path` are managed in their own React context, which can be accessed using the `useFieldProps` hook:
+You can use the `useFieldProps` hooks to access dynamic props like `path`:
 
 ```tsx
 'use client'
@@ -463,7 +463,7 @@ export const CustomArrayManager = () => {
       name: "customArrayManager",
       admin: {
         components: {
-          Field: CustomArrayManager,
+          Field: '/path/to/CustomArrayManagerField',
         },
       },
     },
@@ -560,7 +560,7 @@ export const CustomArrayManager = () => {
       name: "customArrayManager",
       admin: {
         components: {
-          Field: CustomArrayManager,
+          Field: '/path/to/CustomArrayManagerField',
         },
       },
     },
@@ -670,7 +670,7 @@ export const CustomArrayManager = () => {
       name: "customArrayManager",
       admin: {
         components: {
-          Field: CustomArrayManager,
+          Field: '/path/to/CustomArrayManagerField',
         },
       },
     },
@@ -818,7 +818,7 @@ import { useConfig } from '@payloadcms/ui'
 
 const MyComponent: React.FC = () => {
   // highlight-start
-  const config = useConfig()
+  const { config } = useConfig()
   // highlight-end
 
   return <span>{config.serverURL}</span>

docs/admin/metadata.mdx

@@ -0,0 +1,216 @@
+---
+title: Page Metadata
+label: Metadata
+order: 70
+desc: Customize the metadata of your pages within the Admin Panel
+keywords: admin, components, custom, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
+---
+
+Every page within the Admin Panel automatically receives dynamic, auto-generated metadata derived from live document data, the user's current locale, and more, without any additional configuration. This includes the page title, description, og:image and everything in between. Metadata is fully configurable at the root level and cascades down to individual collections, documents, and custom views, allowing for the ability to control metadata on any page with high precision.
+
+Within the Admin Panel, metadata can be customized at the following levels:
+
+- [Root Metadata](#root-metadata)
+- [Collection Metadata](#collection-metadata)
+- [Global Metadata](#global-metadata)
+- [View Metadata](#view-metadata)
+
+All of these types of metadata share a similar structure, with a few key differences on the Root level. To customize metadata, consult the list of available scopes. Determine the scope that corresponds to what you are trying to accomplish, then author your metadata within the Payload Config accordingly.
+
+## Root Metadata
+
+Root Metadata is the metadata that is applied to all pages within the Admin Panel. This is where you can control things like the suffix appended onto each page's title, the favicon displayed in the browser's tab, and the Open Graph data that is used when sharing the Admin Panel on social media.
+
+To customize Root Metadata, use the `admin.meta` key in your Payload Config:
+
+```ts
+{
+  // ...
+  admin: {
+    // highlight-start
+    meta: {
+    // highlight-end
+      title: 'My Admin Panel',
+      description: 'The best admin panel in the world',
+      icons: [
+        {
+          rel: 'icon',
+          type: 'image/png',
+          href: '/favicon.png',
+        },
+      ],
+    },
+  },
+}
+```
+
+The following options are available for Root Metadata:
+
+| Key | Type | Description |
+| --- | --- | --- |
+| **`title`** | `string` | The title of the Admin Panel. |
+| **`description`** | `string` | The description of the Admin Panel. |
+| **`defaultOGImageType`** | `dynamic` (default), `static`, or `off` | The type of default OG image to use. If set to `dynamic`, Payload will use Next.js image generation to create an image with the title of the page. If set to `static`, Payload will use the `defaultOGImage` URL. If set to `off`, Payload will not generate an OG image. |
+| **`icons`** | `IconConfig[]` | An array of icon objects. [More details](#icons) |
+| **`keywords`** | `string` | A comma-separated list of keywords to include in the metadata of the Admin Panel. |
+| **`openGraph`** | `OpenGraphConfig` | An object containing Open Graph metadata. [More details](#open-graph) |
+| **`titleSuffix`** | `string` | A suffix to append to the end of the title of every page. Defaults to "- Payload". |
+
+<Banner type="success">
+  <strong>Reminder:</strong>
+  These are the _root-level_ options for the Admin Panel. You can also customize [Collection Metadata](./collections), [Global Metadata](./globals), and [Document Metadata](./documents) in their respective configs.
+</Banner>
+
+### Icons
+
+The Icons Config corresponds to the `<link>` tags that are used to specify icons for the Admin Panel. The `icons` key is an array of objects, each of which represents an individual icon. Icons are differentiated from one another by their `rel` attribute, which specifies the relationship between the document and the icon.
+
+The most common icon type is the favicon, which is displayed in the browser tab. This is specified by the `rel` attribute `icon`. Other common icon types include `apple-touch-icon`, which is used by Apple devices when the Admin Panel is saved to the home screen, and `mask-icon`, which is used by Safari to mask the Admin Panel icon.
+
+To customize icons, use the `icons` key within the `admin.meta` object in your Payload Config:
+
+```ts
+{
+  // ...
+  admin: {
+    meta: {
+      // highlight-start
+      icons: [
+      // highlight-end
+        {
+          rel: 'icon',
+          type: 'image/png',
+          href: '/favicon.png',
+        },
+        {
+          rel: 'apple-touch-icon',
+          type: 'image/png',
+          href: '/apple-touch-icon.png',
+        },
+      ],
+    },
+  },
+}
+```
+
+The following options are available for Icons:
+
+| Key | Type | Description |
+| --- | --- | --- |
+| **`rel`** | `string` | The HTML `rel` attribute of the icon. |
+| **`type`** | `string` | The MIME type of the icon. |
+| **`color`** | `string` | The color of the icon. |
+| **`fetchPriority`** | `string` | The [fetch priority](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/fetchPriority) of the icon. |
+| **`media`** | `string` | The [media query](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_media_queries/Using_media_queries) of the icon. |
+| **`sizes`** | `string` | The [sizes](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/sizes) of the icon. |
+| **`url`** | `string` | The URL pointing the resource of the icon. |
+
+### Open Graph
+
+Open Graph metadata is a set of tags that are used to control how URLs are displayed when shared on social media platforms. Open Graph metadata is automatically generated by Payload, but can be customized at the Root level.
+
+To customize Open Graph metadata, use the `openGraph` key within the `admin.meta` object in your Payload Config:
+
+```ts
+{
+  // ...
+  admin: {
+    meta: {
+      // highlight-start
+      openGraph: {
+      // highlight-end
+        description: 'The best admin panel in the world',
+        images: [
+          {
+            url: 'https://example.com/image.jpg',
+            width: 800,
+            height: 600,
+          },
+        ],
+        siteName: 'Payload',
+        title: 'My Admin Panel',
+      },
+    },
+  },
+}
+```
+
+The following options are available for Open Graph Metadata:
+
+| Key | Type | Description |
+| --- | --- | --- |
+| **`description`** | `string` | The description of the Admin Panel. |
+| **`images`** | `OGImageConfig | OGImageConfig[]` | An array of image objects. |
+| **`siteName`** | `string` | The name of the site. |
+| **`title`** | `string` | The title of the Admin Panel. |
+
+## Collection Metadata
+
+Collection Metadata is the metadata that is applied to all pages within any given Collection within the Admin Panel. This metadata is used to customize the title and description of all views within any given Collection, unless overridden by the view itself.
+
+To customize Collection Metadata, use the `admin.meta` key within your Collection Config:
+
+```ts
+import { CollectionConfig } from 'payload'
+
+export const MyCollection: CollectionConfig = {
+  // ...
+  admin: {
+    // highlight-start
+    meta: {
+    // highlight-end
+      title: 'My Collection',
+      description: 'The best collection in the world',
+    },
+  },
+}
+```
+
+The Collection Meta config has the same options as the [Root Metadata](#root-metadata) config.
+
+## Global Metadata
+
+Global Metadata is the metadata that is applied to all pages within any given Global within the Admin Panel. This metadata is used to customize the title and description of all views within any given Global, unless overridden by the view itself.
+
+To customize Global Metadata, use the `admin.meta` key within your Global Config:
+
+```ts
+import { GlobalConfig } from 'payload'
+
+export const MyGlobal: GlobalConfig = {
+  // ...
+  admin: {
+    // highlight-start
+    meta: {
+    // highlight-end
+      title: 'My Global',
+      description: 'The best
+    },
+  },
+}
+```
+
+The Global Meta config has the same options as the [Root Metadata](#root-metadata) config.
+
+## View Metadata
+
+View Metadata is the metadata that is applied to specific [Views](./views) within the Admin Panel. This metadata is used to customize the title and description of a specific view, overriding any metadata set at the [Root](#root-metadata), [Collection](#collection-metadata), or [Global](#global-metadata) level.
+
+To customize View Metadata, use the `meta` key within your View Config:
+
+```ts
+{
+  // ...
+  admin: {
+    views: {
+      dashboard: {
+        // highlight-start
+        meta: {
+        // highlight-end
+          title: 'My Dashboard',
+          description: 'The best dashboard in the world',
+        }
+      },
+    },
+  },
+}

docs/admin/overview.mdx

@@ -86,19 +86,19 @@ const config = buildConfig({
 
 The following options are available:
 
-| Option            | Description                                                                                                                                                                                                                                                                 |
-| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `autoLogin`       | Used to automate admin log-in for dev and demonstration convenience. [More details](../authentication/overview).                                                                                                                                                                      |
-| `avatar`          | Set account profile picture. Options: `gravatar`, `default` or a custom React component.                                                                                                                                                                                    |
-| `buildPath`       | Specify an absolute path for where to store the built Admin bundle used in production. Defaults to `path.resolve(process.cwd(), 'build')`.                                                                                                                                  |
-| `components`      | Component overrides that affect the entirety of the Admin Panel. [More details](./components).                                                                                                                                                                                      |
-| `custom`          | Any custom properties you wish to pass to the Admin Panel.                                                                                                                                                                                                                  |
-| `dateFormat`      | The date format that will be used for all dates within the Admin Panel. Any valid [date-fns](https://date-fns.org/) format pattern can be used.                                                                                                                             |
-| `disable`         | If set to `true`, the entire Admin Panel will be disabled.                                                                                                                                                                                                                  |
-| `livePreview`     | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).                                                                                                                                                       |
-| `meta`            | Base metadata to use for the Admin Panel. Included properties are `titleSuffix`, `icons`, and `openGraph`. Can be overridden on a per Collection or per Global basis.                                                                                                       |
-| `routes`          | Replace built-in Admin Panel routes with your own custom routes. [More details](#customizing-routes).                                                                                                                                                                               |
-| `user`            | The `slug` of the Collection that you want to allow to login to the Admin Panel. [More details](#the-admin-user-collection).                                                                                                                                                        |
+| Option        | Description                                                                                                                                                           |
+|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **`avatar`**      | Set account profile picture. Options: `gravatar`, `default` or a custom React component.                                                                              |
+| **`autoLogin`**   | Used to automate log-in for dev and demonstration convenience. [More details](../authentication/overview).                                                            |
+| **`buildPath`**   | Specify an absolute path for where to store the built Admin bundle used in production. Defaults to `path.resolve(process.cwd(), 'build')`.                            |
+| **`components`**  | Component overrides that affect the entirety of the Admin Panel. [More details](./components).                                                                        |
+| **`custom`**      | Any custom properties you wish to pass to the Admin Panel.                                                                                                            |
+| **`dateFormat`**  | The date format that will be used for all dates within the Admin Panel. Any valid [date-fns](https://date-fns.org/) format pattern can be used.                       |
+| **`disable`**     | If set to `true`, the entire Admin Panel will be disabled.                                                                                                            |
+| **`livePreview`** | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).                                         |
+| **`meta`**        | Base metadata to use for the Admin Panel. [More details](./metadata). |
+| **`routes`**      | Replace built-in Admin Panel routes with your own custom routes. [More details](#customizing-routes).                                                                 |
+| **`user`**        | The `slug` of the Collection that you want to allow to login to the Admin Panel. [More details](#the-admin-user-collection).                                          |
 
 <Banner type="success">
   <strong>Reminder:</strong>
@@ -167,21 +167,34 @@ const config = buildConfig({
 
 The following options are available:
 
-| Option             | Default route           | Description                           |
-| ------------------ | ----------------------- | ------------------------------------- |
-| `admin`            | `/admin`                | The Admin Panel itself.               |
-| `api`              | `/api`                  | The [REST API](../rest-api/overview) base path.               |
-| `graphQL`          | `/graphql`              | The [GraphQL API](../graphql/overview) base path.            |
-| `graphQLPlayground`| `/graphql-playground`   | The GraphQL Playground.               |
-
-<Banner type="warning">
-  <strong>Warning:</strong>
-  Changing Root-level Routes _after_ your project was generated will also require you to manually update the corresponding directories in your project. For example, changing `routes.admin` will require you to rename the `(payload)/admin` directory in your project to match the new route. [More details](#project-structure).
-</Banner>
+| Option              | Default route         | Description                                       |
+|---------------------|-----------------------|---------------------------------------------------|
+| `admin`             | `/admin`              | The Admin Panel itself.                           |
+| `api`               | `/api`                | The [REST API](../rest-api/overview) base path.   |
+| `graphQL`           | `/graphql`            | The [GraphQL API](../graphql/overview) base path. |
+| `graphQLPlayground` | `/graphql-playground` | The GraphQL Playground.                           |
 
 <Banner type="success">
   <strong>Tip:</strong>
-   You can easily add _new_ routes to the Admin Panel through the `endpoints` property of the Payload Config. See [Custom Endpoints](../rest-api/overview#custom-endpoints) for more information.
+   You can easily add _new_ routes to the Admin Panel through [Custom Endpoints](../rest-api/overview#custom-endpoints) and [Custom Views](./views).
+</Banner>
+
+#### Customizing Root-level Routes
+
+You can change the Root-level Routes as needed, such as to mount the Admin Panel at the root of your application.
+
+Changing Root-level Routes also requires a change to [Project Structure](#project-structure) to match the new route. For example, if you set `routes.admin` to `/`, you would need to completely remove the `admin` directory from the project structure:
+
+```plaintext
+app/
+├─ (payload)/
+├── [[...segments]]/
+├──── ...
+```
+
+<Banner type="warning">
+  <strong>Note:</strong>
+  If you set Root-level Routes _before_ auto-generating the Admin Panel, your [Project Structure](#project-structure) will already be set up correctly.
 </Banner>
 
 ### Admin-level Routes

docs/admin/views.mdx

@@ -31,31 +31,70 @@ const config = buildConfig({
   admin: {
     components: {
       views: {
-        Dashboard: MyCustomDashboardView, // highlight-line
+        customView: {
+          Component: '/path/to/MyCustomView#MyCustomView', // highlight-line
+          path: '/my-custom-view',
+        }
       },
     },
   },
 })
 ```
 
-_For details on how to build Custom Views, see [Building Custom Views](#building-custom-views)._
+Your Custom Root Views can optionally use one of the templates that Payload provides. The most common of these is the Default Template which provides the basic layout and navigation. Here is an example of what that might look like:
+
+```tsx
+import type { AdminViewProps } from 'payload'
+
+import { DefaultTemplate } from '@payloadcms/next/templates'
+import { Gutter } from '@payloadcms/ui'
+import React from 'react'
+
+export const MyCustomView: React.FC<AdminViewProps> = ({
+  initPageResult,
+  params,
+  searchParams,
+}) => {
+  return (
+    <DefaultTemplate
+      i18n={initPageResult.req.i18n}
+      locale={initPageResult.locale}
+      params={params}
+      payload={initPageResult.req.payload}
+      permissions={initPageResult.permissions}
+      searchParams={searchParams}
+      user={initPageResult.req.user || undefined}
+      visibleEntities={initPageResult.visibleEntities}
+    >
+      <Gutter>
+        <h1>Custom Default Root View</h1>
+        <br />
+        <p>This view uses the Default Template.</p>
+      </Gutter>
+    </DefaultTemplate>
+  )
+}
+```
+
+_For details on how to build Custom Views, including all available props, see [Building Custom Views](#building-custom-views)._
 
 The following options are available:
 
 | Property        | Description                                                                   |
 | --------------- | ----------------------------------------------------------------------------- |
-| **`Account`**   | The Account view is used to show the currently logged in user's Account page. |
-| **`Dashboard`** | The main landing page of the [Admin Panel](./overview).                                     |
+| **`account`**   | The Account view is used to show the currently logged in user's Account page. |
+| **`dashboard`** | The main landing page of the [Admin Panel](./overview).                                     |
 
 For more granular control, pass a configuration object instead. Payload exposes the following properties for each view:
 
 | Property           | Description                                                                                                                                                                                |
 | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **`Component`** \* | Pass in the component that should be rendered when a user navigates to this route.                                                                                                         |
+| **`Component`** \* | Pass in the component path that should be rendered when a user navigates to this route.                                                                                                         |
 | **`path`** \*      | Any valid URL path or array of paths that [`path-to-regexp`](https://www.npmjs.com/package/path-to-regex) understands.                                                                     |
 | **`exact`**        | Boolean. When true, will only match if the path matches the `usePathname()` exactly.                                                                                                     |
 | **`strict`**       | When true, a path that has a trailing slash will only match a `location.pathname` with a trailing slash. This has no effect when there are additional URL segments in the pathname. |
-| **`sensitive`**    | When true, will match if the path is case sensitive.                                                                                                                                       |
+| **`sensitive`**    | When true, will match if the path is case sensitive.
+| **`meta`**         | Page metadata overrides to apply to this view within the Admin Panel. [More details](./metadata).                                                                           |
 
 _\* An asterisk denotes that a property is required._
 
@@ -72,9 +111,9 @@ const config = buildConfig({
     components: {
       views: {
         // highlight-start
-        MyCustomView: {
+        myCustomView: {
         // highlight-end
-          Component: MyCustomView,
+          Component: '/path/to/MyCustomView#MyCustomViewComponent',
           path: '/my-custom-view',
         },
       },
@@ -108,26 +147,41 @@ export const MyCollectionConfig: SanitizedCollectionConfig = {
   admin: {
     components: {
       views: {
-        Edit: MyCustomEditView, // highlight-line
+        edit: {
+          root: {
+            Component: '/path/to/MyCustomEditView', // highlight-line
+          }
+          // other options include:
+          // default
+          // versions
+          // version
+          // api
+          // livePreview
+          // [key: string]
+          // See "Document Views" for more details
+        },
+        list: {
+          Component: '/path/to/MyCustomListView',
+        }
       },
     },
   },
 }
 ```
 
-_For details on how to build Custom Views, see [Building Custom Views](#building-custom-views)._
+_For details on how to build Custom Views, including all available props, see [Building Custom Views](#building-custom-views)._
 
 <Banner type="warning">
   <strong>Note:</strong>
-  The `Edit` property will replace the _entire_ Edit View, including the title, tabs, etc., _as well as all nested [Document Views](#document-views)_, such as the API, Live Preview, and Version views. To replace only the Edit View precisely, use the `Edit.Default` key instead.
+  The `root` property will replace the _entire_ Edit View, including the title, tabs, etc., _as well as all nested [Document Views](#document-views)_, such as the API, Live Preview, and Version views. To replace only the Edit View precisely, use the `edit.default` key instead.
 </Banner>
 
 The following options are available:
 
 | Property   | Description                                                                                                       |
 | ---------- | ----------------------------------------------------------------------------------------------------------------- |
-| **`Edit`** | The Edit View is used to edit a single document for any given Collection. [More details](#document-views).     |
-| **`List`** | The List View is used to show a list of documents for any given Collection.                                         |
+| **`edit`** | The Edit View is used to edit a single document for any given Collection. [More details](#document-views).     |
+| **`list`** | The List View is used to show a list of documents for any given Collection.                                         |
 
 <Banner type="success">
   <strong>Note:</strong>
@@ -148,25 +202,36 @@ export const MyGlobalConfig: SanitizedGlobalConfig = {
   admin: {
     components: {
       views: {
-        Edit: MyCustomEditView, // highlight-line
+        edit: {
+          root: {
+            Component: '/path/to/MyCustomEditView', // highlight-line
+          }
+          // other options include:
+          // default
+          // versions
+          // version
+          // api
+          // livePreview
+          // [key: string]
+        },
       },
     },
   },
-})
+}
 ```
 
-_For details on how to build Custom Views, see [Building Custom Views](#building-custom-views)._
+_For details on how to build Custom Views, including all available props, see [Building Custom Views](#building-custom-views)._
 
 <Banner type="warning">
   <strong>Note:</strong>
-  The `Edit` property will replace the _entire_ Edit View, including the title, tabs, etc., _as well as all nested [Document Views](#document-views)_, such as the API, Live Preview, and Version views. To replace only the Edit View precisely, use the `Edit.Default` key instead.
+  The `root` property will replace the _entire_ Edit View, including the title, tabs, etc., _as well as all nested [Document Views](#document-views)_, such as the API, Live Preview, and Version views. To replace only the Edit View precisely, use the `edit.default` key instead.
 </Banner>
 
 The following options are available:
 
 | Property   | Description                                                         |
 | ---------- | ------------------------------------------------------------------- |
-| **`Edit`** | The Edit View is used to edit a single document for any given Global. [More details](#document-views). |
+| **`edit`** | The Edit View is used to edit a single document for any given Global. [More details](#document-views). |
 
 <Banner type="success">
   <strong>Note:</strong>
@@ -187,37 +252,38 @@ export const MyCollectionOrGlobalConfig: SanitizedCollectionConfig = {
   admin: {
     components: {
       views: {
-        Edit: {
-          API: {
-            Component: MyCustomAPIView, // highlight-line
+        edit: {
+          api: {
+            Component: '/path/to/MyCustomAPIViewComponent', // highlight-line
           },
         },
       },
     },
   },
-})
+}
 ```
 
-_For details on how to build Custom Views, see [Building Custom Views](#building-custom-views)._
+_For details on how to build Custom Views, including all available props, see [Building Custom Views](#building-custom-views)._
 
 <Banner type="warning">
  <strong>Note:</strong>
- If you need to replace the _entire_ Edit View, including _all_ nested Document Views, use the `Edit` key itself. See [Custom Collection Views](#collection-views) or [Custom Global Views](#global-views) for more information.
+ If you need to replace the _entire_ Edit View, including _all_ nested Document Views, use the `root` key. See [Custom Collection Views](#collection-views) or [Custom Global Views](#global-views) for more information.
 </Banner>
 
 The following options are available:
 
 | Property          | Description                                                                                                                 |
 | ----------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| **`Default`**     | The Default view is the primary view in which your document is edited.                                                      |
-| **`Versions`**    | The Versions view is used to view the version history of a single document. [More details](../versions).                    |
-| **`Version`**     | The Version view is used to view a single version of a single document for a given collection. [More details](../versions). |
-| **`API`**         | The API view is used to display the REST API JSON response for a given document.                                            |
-| **`LivePreview`** | The LivePreview view is used to display the Live Preview interface. [More details](../live-preview).                        |
+| **`root`**        | The Root View overrides all other nested views and routes. No document controls or tabs are rendered when this key is set.  |
+| **`default`**     | The Default View is the primary view in which your document is edited. It is rendered within the "Edit" tab.     |
+| **`versions`**    | The Versions View is used to navigate the version history of a single document. It is rendered within the "Versions" tab. [More details](../versions).                    |
+| **`version`**     | The Version View is used to edit a single version of a document. It is rendered within the "Version" tab. [More details](../versions). |
+| **`api`**         | The API View is used to display the REST API JSON response for a given document. It is rendered within the "API" tab.                                            |
+| **`livePreview`** | The LivePreview view is used to display the Live Preview interface. It is rendered within the "Live Preview" tab. [More details](../live-preview).                        |
 
 ### Document Tabs
 
-Each Document View can be given a new tab in the Edit View, if desired. Tabs are highly configurable, from as simple as changing the label to swapping out the entire component, they can be modified in any way. To add or customize tabs in the Edit View, use the `Component.Tab` key:
+Each Document View can be given a new tab in the Edit View, if desired. Tabs are highly configurable, from as simple as changing the label to swapping out the entire component, they can be modified in any way. To add or customize tabs in the Edit View, use the `tab` key:
 
 ```ts
 import type { SanitizedCollectionConfig } from 'payload'
@@ -227,17 +293,19 @@ export const MyCollection: SanitizedCollectionConfig = {
   admin: {
     components: {
       views: {
-        Edit: {
-          MyCustomTab: {
-            Component: MyCustomTab,
+        edit: {
+          myCustomTab: {
+            Component: '/path/to/MyCustomTab',
             path: '/my-custom-tab',
-            Tab: MyCustomTab // highlight-line
+            tab: {
+              Component: '/path/to/MyCustomTabComponent' // highlight-line
+            }
           },
-          AnotherCustomView: {
-            Component: AnotherCustomView,
+          anotherCustomTab: {
+            Component: '/path/to/AnotherCustomView',
             path: '/another-custom-view',
             // highlight-start
-            Tab: {
+            tab: {
               label: 'Another Custom View',
               href: '/another-custom-view',
             }
@@ -261,14 +329,15 @@ Custom Views are just [Custom Components](./components) rendered at the page-lev
 
 ```ts
 import type { SanitizedCollectionConfig } from 'payload'
-import { MyCustomView } from './MyCustomView'
 
 export const MyCollectionConfig: SanitizedCollectionConfig = {
   // ...
   admin: {
     components: {
       views: {
-        Edit: MyCustomView, // highlight-line
+        edit: {
+          Component: '/path/to/MyCustomView' // highlight-line
+        }
       },
     },
   },
@@ -279,13 +348,11 @@ Your Custom Views will be provided with the following props:
 
 | Prop                      | Description                                                                                                                            |
 | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
-| **`user`**                    | The currently logged in user.                                                                                                          |
-| **`locale`**                  | The current [Locale](../configuration/localization) of the [Admin Panel](./overview).                                                  |
-| **`navGroups`**               | The grouped navigation items according to `admin.group` in your [Collection Config](../collections/overview) or [Global Config](../globals/overview). |
-| **`params`**                  | An object containing the [Dynamic Route Parameters](https://nextjs.org/docs/app/building-your-application/routing/dynamic-routes).     |
-| **`permissions`**             | The permissions of the currently logged in user.                                                                                       |
-| **`searchParams`**            | An object containing the [Search Parameters](https://developer.mozilla.org/docs/Learn/Common_questions/What_is_a_URL#parameters).      |
-| **`visibleEntities`**         | The current user's visible entities according to your [Access Control](../access-control/overview).                                    |
+| **`initPageResult`**      | An object containing `req`, `payload`, `permissions`, etc.                                                                  |
+| **`clientConfig`**        | The Client Config object. [More details](../components#accessing-the-payload-config).                                                             |
+| **`importMap`**           | The import map object.                                                        |
+| **`params`**              | An object containing the [Dynamic Route Parameters](https://nextjs.org/docs/app/building-your-application/routing/dynamic-routes).     |
+| **`searchParams`**        | An object containing the [Search Parameters](https://developer.mozilla.org/docs/Learn/Common_questions/What_is_a_URL#parameters).      |
 
 <Banner type="success">
   <strong>Reminder:</strong>

docs/authentication/overview.mdx

@@ -85,6 +85,7 @@ The following options are available:
 | **`lockTime`**             | Set the time (in milliseconds) that a user should be locked out if they fail authentication more times than `maxLoginAttempts` allows for.                                                                                          |
 | **`loginWithUsername`**    | Ability to allow users to login with username/password. [More](/docs/authentication/overview#login-with-username)                                                                                                                     |
 | **`maxLoginAttempts`**     | Only allow a user to attempt logging in X amount of times. Automatically locks out a user from authenticating if this limit is passed. Set to `0` to disable.                                                                       |
+| **`removeTokenFromResponses`** | Set to true if you want to remove the token from the returned authentication API responses such as login or refresh.                                                                                                                                                            |
 | **`strategies`**           | Advanced - an array of custom authentification strategies to extend this collection's authentication with. [More details](./custom-strategies).                                                                         |
 | **`tokenExpiration`**      | How long (in seconds) to keep the user logged in. JWTs and HTTP-only cookies will both expire at the same time.                                                                                                                     |
 | **`useAPIKey`**            | Payload Authentication provides for API keys to be set on each user within an Authentication-enabled Collection. [More details](./api-keys).                                                                       |
@@ -127,30 +128,27 @@ If set to `true`, users can log in with either their username or email address.
 
 If set to `true`, an email address is required when creating a new user. If set to `false`, email is not required upon creation.
 
-## Admin Auto-Login
+## Auto-Login
 
-For testing and demo purposes you may want to skip forcing the admin user to login in order to access the [Admin Panel](../admin/overview). Typically, all users should be required to login to access the Admin Panel, however, you can speed up local development time by enabling auto-login.
+For testing and demo purposes you may want to skip forcing the user to login in order to access your application. Typically, all users should be required to login, however, you can speed up local development time by enabling auto-login.
 
 To enable auto-login, set the `autoLogin` property in the [Admin Config](../configuration/admin):
 
 ```ts
-import { buildConfig } from 'payload/config'
+import { buildConfig } from 'payload'
 
 export default buildConfig({
   // ...
-  admin: {
-    // ...
-    // highlight-start
-    autoLogin:
-      process.env.NEXT_PUBLIC_ENABLE_AUTOLOGIN === 'true'
-        ? {
-            email: 'test@example.com',
-            password: 'test',
-            prefillOnly: true,
-          }
-        : false,
-    // highlight-end
-  },
+  // highlight-start
+  autoLogin:
+    process.env.NEXT_PUBLIC_ENABLE_AUTOLOGIN === 'true'
+      ? {
+          email: 'test@example.com',
+          password: 'test',
+          prefillOnly: true,
+        }
+      : false,
+  // highlight-end
 })
 ```
 
@@ -162,9 +160,10 @@ export default buildConfig({
 The following options are available:
 
 | Option            | Description                                                                                                     |
-| ----------------- | --------------------------------------------------------------------------------------------------------------- |
+|-------------------|-----------------------------------------------------------------------------------------------------------------|
+| **`username`**    | The username of the user to login as                                                                            |
 | **`email`**       | The email address of the user to login as                                                                       |
-| **`password`**    | The password of the user to login as                                                                            |
+| **`password`**    | The password of the user to login as. This is only needed if `prefillOnly` is set to true                       |
 | **`prefillOnly`** | If set to true, the login credentials will be prefilled but the user will still need to click the login button. |
 
 ## Operations

docs/configuration/collections.mdx

@@ -102,5 +102,5 @@ You can import types from Payload to help make writing your Collection configs e
 The `CollectionConfig` type represents a raw Collection Config in its full form, where only the bare minimum properties are marked as required. The `SanitizedCollectionConfig` type represents a Collection Config after it has been fully sanitized. Generally, this is only used internally by Payload.
 
 ```ts
-import { CollectionConfig, SanitizedCollectionConfig } from 'payload'
+import type { CollectionConfig, SanitizedCollectionConfig } from 'payload'
 ```

docs/configuration/globals.mdx

@@ -106,5 +106,5 @@ You can import types from Payload to help make writing your Global configs easie
 The `GlobalConfig` type represents a raw Global Config in its full form, where only the bare minimum properties are marked as required. The `SanitizedGlobalConfig` type represents a Global Config after it has been fully sanitized. Generally, this is only used internally by Payload.
 
 ```ts
-import { GlobalConfig, SanitizedGlobalConfig } from 'payload'
+import type { GlobalConfig, SanitizedGlobalConfig } from 'payload'
 ```

docs/configuration/overview.mdx

@@ -36,7 +36,6 @@ Here is one of the simplest possible Payload configs:
 ```ts
 import { buildConfig } from 'payload'
 import { mongooseAdapter } from '@payloadcms/db-mongodb'
-// import { postgresAdapter } from '@payloadcms/db-postgres'
 
 export default buildConfig({
   secret: process.env.PAYLOAD_SECRET,
@@ -64,38 +63,40 @@ export default buildConfig({
 
 The following options are available:
 
-| Option                 | Description                                                                                                                                                                        |
-| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`admin`**                | The configuration options for the Admin Panel, including Custom Components, Live Preview, etc. [More details](../admin/overview#admin-options). |
-| **`bin`**                  | Register custom bin scripts for Payload to execute. |
-| **`editor`**               | The Rich Text Editor which will be used by `richText` fields. [More details](../rich-text/overview). |
-| **`db`** \*                | The Database Adapter which will be used by Payload. [More details](../database/overview). |
-| **`serverURL`**            | A string used to define the absolute URL of your app. This includes the protocol, for example `https://example.com`. No paths allowed, only protocol, domain and (optionally) port. |
-| **`collections`**          | An array of Collections for Payload to manage. [More details](./collections). |
-| **`globals`**              | An array of Globals for Payload to manage. [More details](./globals). |
+| Option                     | Description                                                                                                                                                                                    |
+|----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **`admin`**                | The configuration options for the Admin Panel, including Custom Components, Live Preview, etc. [More details](../admin/overview#admin-options).                                                |
+| **`bin`**                  | Register custom bin scripts for Payload to execute.                                                                                                                                            |
+| **`editor`**               | The Rich Text Editor which will be used by `richText` fields. [More details](../rich-text/overview).                                                                                           |
+| **`db`** \*                | The Database Adapter which will be used by Payload. [More details](../database/overview).                                                                                                      |
+| **`serverURL`**            | A string used to define the absolute URL of your app. This includes the protocol, for example `https://example.com`. No paths allowed, only protocol, domain and (optionally) port.            |
+| **`collections`**          | An array of Collections for Payload to manage. [More details](./collections).                                                                                                                  |
+| **`compatibility`**        | Compatibility flags for earlier versions of Payload. [More details](#compatibility-flags).                                                                                                     |
+| **`globals`**              | An array of Globals for Payload to manage. [More details](./globals).                                                                                                                          |
 | **`cors`**                 | Cross-origin resource sharing (CORS) is a mechanism that accept incoming requests from given domains. You can also customize the `Access-Control-Allow-Headers` header. [More details](#cors). |
-| **`localization`**         | Opt-in to translate your content into multiple locales. [More details](./localization). |
-| **`graphQL`**              | Manage GraphQL-specific functionality, including custom queries and mutations, query complexity limits, etc. [More details](../graphql/overview#graphql-options). |
-| **`cookiePrefix`**         | A string that will be prefixed to all cookies that Payload sets. |
-| **`csrf`**                 | A whitelist array of URLs to allow Payload to accept cookies from. [More details](../authentication/overview#csrf-protection). |
-| **`defaultDepth`**         | If a user does not specify `depth` while requesting a resource, this depth will be used. [More details](../queries/depth). |
-| **`defaultMaxTextLength`** | The maximum allowed string length to be permitted application-wide. Helps to prevent malicious public document creation. |
-| **`maxDepth`**             | The maximum allowed depth to be permitted application-wide. This setting helps prevent against malicious queries. Defaults to `10`. [More details](../queries/depth). |
-| **`indexSortableFields`**  | Automatically index all sortable top-level fields in the database to improve sort performance and add database compatibility for Azure Cosmos and similar. |
-| **`upload`**               | Base Payload upload configuration. [More details](../upload/overview#payload-wide-upload-options). |
-| **`routes`**               | Control the routing structure that Payload binds itself to. [More details](../admin/overview#root-level-routes). |
-| **`email`**                | Configure the Email Adapter for Payload to use. [More details](../email/overview). |
-| **`debug`**                | Enable to expose more detailed error information. |
-| **`telemetry`**            | Disable Payload telemetry by passing `false`. [More details](#telemetry). |
-| **`rateLimit`**            | Control IP-based rate limiting for all Payload resources. Used to prevent DDoS attacks, etc. [More details](../production/preventing-abuse#rate-limiting-requests). |
-| **`hooks`**                | An array of Root Hooks. [More details](../hooks/overview). |
-| **`plugins`**              | An array of Plugins. [More details](../plugins/overview). |
-| **`endpoints`**            | An array of Custom Endpoints added to the Payload router. [More details](../rest-api/overview#custom-endpoints). |
-| **`custom`**               | Extension point for adding custom data (e.g. for plugins). |
-| **`i18n`**                 | Internationalization configuration. Pass all i18n languages you'd like the admin UI to support. Defaults to English-only. [More details](./i18n). |
-| **`secret`** \*            | A secure, unguessable string that Payload will use for any encryption workflows - for example, password salt / hashing. |
-| **`sharp`**                | If you would like Payload to offer cropping, focal point selection, and automatic media resizing, install and pass the Sharp module to the config here. |
-| **`typescript`**           | Configure TypeScript settings here. [More details](#typescript). |
+| **`localization`**         | Opt-in to translate your content into multiple locales. [More details](./localization).                                                                                                        |
+| **`logger`**               | Logger options, logger options with a destination stream, or an instantiated logger instance. [More details](https://getpino.io/#/docs/api?id=options).                                        |
+| **`graphQL`**              | Manage GraphQL-specific functionality, including custom queries and mutations, query complexity limits, etc. [More details](../graphql/overview#graphql-options).                              |
+| **`cookiePrefix`**         | A string that will be prefixed to all cookies that Payload sets.                                                                                                                               |
+| **`csrf`**                 | A whitelist array of URLs to allow Payload to accept cookies from. [More details](../authentication/overview#csrf-protection).                                                                 |
+| **`defaultDepth`**         | If a user does not specify `depth` while requesting a resource, this depth will be used. [More details](../queries/depth).                                                                     |
+| **`defaultMaxTextLength`** | The maximum allowed string length to be permitted application-wide. Helps to prevent malicious public document creation.                                                                       |
+| **`maxDepth`**             | The maximum allowed depth to be permitted application-wide. This setting helps prevent against malicious queries. Defaults to `10`. [More details](../queries/depth).                          |
+| **`indexSortableFields`**  | Automatically index all sortable top-level fields in the database to improve sort performance and add database compatibility for Azure Cosmos and similar.                                     |
+| **`upload`**               | Base Payload upload configuration. [More details](../upload/overview#payload-wide-upload-options).                                                                                             |
+| **`routes`**               | Control the routing structure that Payload binds itself to. [More details](../admin/overview#root-level-routes).                                                                               |
+| **`email`**                | Configure the Email Adapter for Payload to use. [More details](../email/overview).                                                                                                             |
+| **`debug`**                | Enable to expose more detailed error information.                                                                                                                                              |
+| **`telemetry`**            | Disable Payload telemetry by passing `false`. [More details](#telemetry).                                                                                                                      |
+| **`rateLimit`**            | Control IP-based rate limiting for all Payload resources. Used to prevent DDoS attacks, etc. [More details](../production/preventing-abuse#rate-limiting-requests).                            |
+| **`hooks`**                | An array of Root Hooks. [More details](../hooks/overview).                                                                                                                                     |
+| **`plugins`**              | An array of Plugins. [More details](../plugins/overview).                                                                                                                                      |
+| **`endpoints`**            | An array of Custom Endpoints added to the Payload router. [More details](../rest-api/overview#custom-endpoints).                                                                               |
+| **`custom`**               | Extension point for adding custom data (e.g. for plugins).                                                                                                                                     |
+| **`i18n`**                 | Internationalization configuration. Pass all i18n languages you'd like the admin UI to support. Defaults to English-only. [More details](./i18n).                                              |
+| **`secret`** \*            | A secure, unguessable string that Payload will use for any encryption workflows - for example, password salt / hashing.                                                                        |
+| **`sharp`**                | If you would like Payload to offer cropping, focal point selection, and automatic media resizing, install and pass the Sharp module to the config here.                                        |
+| **`typescript`**           | Configure TypeScript settings here. [More details](#typescript).                                                                                                                               |
 
 _\* An asterisk denotes that a property is required._
 
@@ -246,5 +247,21 @@ You can import types from Payload to help make writing your config easier and ty
 The `Config` type represents a raw Payload Config in its full form. Only the bare minimum properties are marked as required. The `SanitizedConfig` type represents a Payload Config after it has been fully sanitized. Generally, this is only used internally by Payload.
 
 ```ts
-import { Config, SanitizedConfig } from 'payload'
+import type { Config, SanitizedConfig } from 'payload'
 ```
+
+## Server vs. Client
+
+The Payload Config only lives on the server and is not allowed to contain any client-side code. That way, you can load up the Payload Config in any server environment or standalone script, without having to use Bundlers or Node.js loaders to handle importing client-only modules (e.g. scss files or React Components) without any errors.
+
+Behind the curtains, the Next.js-based Admin Panel generates a ClientConfig, which strips away any server-only code and enriches the config with React Components.
+
+## Compatibility flags
+
+The Payload Config can accept compatibility flags for running the newest versions but with older databases. You should only use these flags if you need to, and should confirm that you need to prior to enabling these flags.
+
+`allowLocalizedWithinLocalized`
+
+Payload localization works on a field-by-field basis. As you can nest fields within other fields, you could potentially nest a localized field within a localized field—but this would be redundant and unnecessary. There would be no reason to define a localized field within a localized parent field, given that the entire data structure from the parent field onward would be localized.
+
+By default, Payload will remove the `localized: true` property from sub-fields if a parent field is localized. Set this compatibility flag to `true` only if you have an existing Payload MongoDB database from pre-3.0, and you have nested localized fields that you would like to maintain without migrating.

docs/database/migrations.mdx

@@ -211,3 +211,32 @@ In the example above, we've specified a `ci` script which we can use as our "bui
 This will require that your build pipeline can connect to your database, and it will simply run the `payload migrate` command prior to starting the build process. By calling `payload migrate`, Payload will automatically execute any migrations in your `/migrations` folder that have not yet been executed against your production database, in the order that they were created.
 
 If it fails, the deployment will be rejected. But now, with your build script set up to run your migrations, you will be all set! Next time you deploy, your CI will execute the required migrations for you, and your database will be caught up with the shape that your Payload Config requires.
+
+## Running migrations in production
+
+In certain cases, you might want to run migrations at runtime when the server starts. Running them during build time may be impossible due to not having access to your database connection while building or similar reasoning.
+
+If you're using a long-running server or container where your Node server starts up one time and then stays initialized, you might prefer to run migrations on server startup instead of within your CI.
+
+In order to run migrations at runtime, on initialization, you can pass your migrations to your database adapter under the `prodMigrations` key as follows:
+
+```ts
+// Import your migrations from the `index.ts` file
+// that Payload generates for you
+import { migrations } from './migrations'
+import { buildConfig } from 'payload'
+
+export default buildConfig({
+  // your config here
+  db: postgresAdapter({
+    //  your adapter config here
+    prodMigrations: migrations
+  })
+})
+```
+
+Passing your migrations as shown above will tell Payload, in production only, to execute any migrations that need to be run prior to completing the initialization of Payload. This is ideal for long-running services where Payload will only be initialized at startup.
+
+<Banner type="warning">
+  Warning - if Payload is instructed to run migrations in production, this may slow down serverless cold starts on platforms such as Vercel. Generally, this option should only be used for long-running servers / containers.
+</Banner>

docs/database/mongodb.mdx

@@ -37,6 +37,7 @@ export default buildConfig({
 | `disableIndexHints`  | Set to true to disable hinting to MongoDB to use 'id' as index. This is currently done when counting documents for pagination, as it increases the speed of the count function used in that query. Disabling this optimization might fix some problems with AWS DocumentDB. Defaults to false |
 | `migrationDir`       | Customize the directory that migrations are stored. |
 | `transactionOptions` | An object with configuration properties used in [transactions](https://www.mongodb.com/docs/manual/core/transactions/) or `false` which will disable the use of transactions. |
+| `collation`          | Enable language-specific string comparison with customizable options. Available on MongoDB 3.4+. Defaults locale to "en". Example: `{ strength: 3 }`. For a full list of collation options and their definitions, see the [MongoDB documentation](https://www.mongodb.com/docs/manual/reference/collation/). |
 
 ## Access to Mongoose models
 

docs/database/overview.mdx

@@ -12,7 +12,7 @@ Currently, Payload officially supports the following Database Adapters:
 
 - [MongoDB](/docs/database/mongodb) with [Mongoose](https://mongoosejs.com/)
 - [Postgres](/docs/database/postgres) with [Drizzle](https://drizzle.team/)
-- Coming soon: SQLite and MySQL using Drizzle.
+- [SQLite](/docs/database/sqlite) with [Drizzle](https://drizzle.team/)
 
 To configure a Database Adapter, use the `db` property in your [Payload Config](../configuration/overview):
 
@@ -59,7 +59,7 @@ You should prefer MongoDB if:
 
 Many projects might call for more rigid database architecture where the shape of your data is strongly enforced at the database level. For example, if you know the shape of your data and it's relatively "flat", and you don't anticipate it to change often, your workload might suit relational databases like Postgres very well.
 
-You should prefer a relational DB like Postgres if:
+You should prefer a relational DB like Postgres or SQLite if:
 
 - You are comfortable with [Migrations](./migrations)
 - You require enforced data consistency at the database level

docs/database/postgres.mdx

@@ -8,18 +8,20 @@ keywords: Postgres, documentation, typescript, Content Management System, cms, h
 
 To use Payload with Postgres, install the package `@payloadcms/db-postgres`. It leverages Drizzle ORM and `node-postgres` to interact with a Postgres database that you provide.
 
+Alternatively, the `@payloadcms/db-vercel-postgres` package is also available and is optimized for use with Vercel.
+
 It automatically manages changes to your database for you in development mode, and exposes a full suite of migration controls for you to leverage in order to keep other database environments in sync with your schema. DDL transformations are automatically generated.
 
 To configure Payload to use Postgres, pass the `postgresAdapter` to your Payload Config as follows:
 
+### Usage
+
+`@payloadcms/db-postgres`:
+
 ```ts
 import { postgresAdapter } from '@payloadcms/db-postgres'
 
 export default buildConfig({
-  // Your config goes here
-  collections: [
-    // Collections go here
-  ],
   // Configure the Postgres adapter here
   db: postgresAdapter({
     // Postgres-specific arguments go here.
@@ -31,20 +33,36 @@ export default buildConfig({
 })
 ```
 
+`@payloadcms/db-vercel-postgres`:
+
+```ts
+import { vercelPostgresAdapter } from '@payloadcms/db-vercel-postgres'
+
+export default buildConfig({
+  // Automatically uses proces.env.POSTGRES_URL if no options are provided.
+  db: vercelPostgresAdapter(),
+  // Optionally, can accept the same options as the @vercel/postgres package.
+  db: vercelPostgresAdapter({
+    pool: {
+      connectionString: process.env.DATABASE_URL
+    },
+  }),
+})
+```
+
 ## 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.                                                                                                                                                   |
-| `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'.                                                                                                                   |
-
-
+| Option                      | Description                                                                                                                                                                      |
+| --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `pool` \*                   | [Pool connection options](https://orm.drizzle.team/docs/quick-postgresql/node-postgres) that will be passed to Drizzle and `node-postgres` or to `@vercel/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.                                                                                                                              |
+| `schemaName` (experimental) | A string for the postgres schema to use, defaults to 'public'.                                                                                                                   |
+| `idType`                    | A string of 'serial', or 'uuid' that is used for the data type given to id columns.                                                                                              |
+| `transactionOptions`        | A PgTransactionConfig object for transactions, or set to `false` to disable using transactions. [More details](https://orm.drizzle.team/docs/transactions)                       |
+| `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/database/sqlite.mdx

@@ -0,0 +1,81 @@
+---
+title: SQLite
+label: SQLite
+order: 60
+desc: Payload supports SQLite through an officially supported Drizzle Database Adapter.
+keywords: SQLite, documentation, typescript, Content Management System, cms, headless, javascript, node, react, nextjs
+---
+
+To use Payload with SQLite, install the package `@payloadcms/db-sqlite`. It leverages Drizzle ORM and `libSQL` to interact with a SQLite database that you provide.
+
+It automatically manages changes to your database for you in development mode, and exposes a full suite of migration controls for you to leverage in order to keep other database environments in sync with your schema. DDL transformations are automatically generated.
+
+To configure Payload to use SQLite, pass the `sqliteAdapter` to your Payload Config as follows:
+
+```ts
+import { sqliteAdapter } from '@payloadcms/db-sqlite'
+
+export default buildConfig({
+  // Your config goes here
+  collections: [
+    // Collections go here
+  ],
+  // Configure the SQLite adapter here
+  db: sqliteAdapter({
+    // SQLite-specific arguments go here.
+    // `client.url` is required.
+    client: {
+      url: process.env.DATABASE_URL,
+      authToken: process.env.DATABASE_AUTH_TOKEN,
+    }
+  }),
+})
+```
+
+## Options
+
+| Option                | Description                                                                                                                                                                      |
+|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `client` \*           | [Client connection options](https://orm.drizzle.team/docs/get-started-sqlite#turso) that will be passed to `createClient` from `@libsql/client`.                                 |
+| `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.                                                                                           |
+| `transactionOptions`  | A SQLiteTransactionConfig object for transactions, or set to `false` to disable using transactions. [More details](https://orm.drizzle.team/docs/transactions)                   |
+| `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
+
+After Payload is initialized, this adapter will expose the full power of Drizzle to you for use if you need it.
+
+You can access Drizzle as follows:
+
+```text
+payload.db.drizzle
+```
+
+## Tables and relations
+
+In addition to exposing Drizzle directly, all of the tables and Drizzle relations are exposed for you via the `payload.db` property as well.
+
+- Tables - `payload.db.tables`
+- Relations - `payload.db.relations`
+
+## Prototyping in development mode
+
+Drizzle exposes two ways to work locally in development mode.
+
+The first is [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push), which automatically pushes changes you make to your Payload Config (and therefore, Drizzle schema) to your database so you don't have to manually migrate every time you change your Payload Config. This only works in development mode, and should not be mixed with manually running [`migrate`](/docs/database/migrations) commands.
+
+You will be warned if any changes that you make will entail data loss while in development mode. Push is enabled by default, but you can opt out if you'd like.
+
+Alternatively, you can disable `push` and rely solely on migrations to keep your local database in sync with your Payload Config.
+
+## Migration workflows
+
+In SQLite, migrations are a fundamental aspect of working with Payload and you should become familiar with how they work.
+
+For more information about migrations, [click here](/docs/beta/database/migrations#when-to-run-migrations).

docs/database/transactions.mdx

@@ -68,3 +68,7 @@ The following functions can be used for managing transactions:
 `payload.db.beginTransaction` - Starts a new session and returns a transaction ID for use in other Payload Local API calls.
 `payload.db.commitTransaction` - Takes the identifier for the transaction, finalizes any changes.
 `payload.db.rollbackTransaction` - Takes the identifier for the transaction, discards any changes.
+
+## Disabling Transactions
+
+If you wish to disable transactions entirely, you can do so by passing `false` as the `transactionOptions` in your database adapter configuration. All the official Payload database adapters support this option.

docs/examples/overview.mdx

@@ -11,6 +11,7 @@ Payload provides a vast array of examples to help you get started with your proj
 Examples are changing every day, so be sure to check back often to see what new examples have been added. If you have a specific example you would like to see, please feel free to start a new [Discussion](https://github.com/payloadcms/payload/discussions) or open a new [PR](https://github.com/payloadcms/payload/pulls) to add it yourself.
 
 - [Auth](https://github.com/payloadcms/payload/tree/main/examples/auth)
+- [Custom Components](https://github.com/payloadcms/payload/tree/main/examples/custom-components)
 - [Custom Server](https://github.com/payloadcms/payload/tree/main/examples/custom-server)
 - [Draft Preview](https://github.com/payloadcms/payload/tree/main/examples/draft-preview)
 - [Email](https://github.com/payloadcms/payload/tree/main/examples/email)

docs/fields/array.mdx

@@ -2,14 +2,17 @@
 title: Array Field
 label: Array
 order: 20
-desc: Array fields are intended for sets of repeating fields, that you define. Learn how to use array fields, see examples and options.
+desc: Array Fields are intended for sets of repeating fields, that you define. Learn how to use Array Fields, see examples and options.
 keywords: array, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Array field type is used when you need to have a set of "repeating" fields. It stores an array
-  of objects containing the fields that you define. Its uses can be simple or highly complex.
-</Banner>
+The Array Field is used when you need to have a set of "repeating" [Fields](./overview). It stores an array of objects containing fields that you define. These fields can be of any type, including other arrays to achieve infinitely nested structures.
+
+Arrays are useful for many different types of content from simple to complex, such as:
+
+- A "slider" with an image ([upload field](/docs/fields/upload)) and a caption ([text field](/docs/fields/text))
+- Navigational structures where editors can specify nav items containing pages ([relationship field](/docs/fields/relationship)), an "open in new tab" [checkbox field](/docs/fields/checkbox)
+- Event agenda "timeslots" where you need to specify start & end time ([date field](/docs/fields/date)), label ([text field](/docs/fields/text)), and Learn More page [relationship](/docs/fields/relationship)
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/array.png"
@@ -18,13 +21,23 @@ keywords: array, fields, config, configuration, documentation, Content Managemen
   caption="Admin Panel screenshot of an Array field with two Rows"
 />
 
-**Example uses:**
+To create an Array Field, set the `type` to `array` in your [Field Config](./overview):
 
-- A "slider" with an image ([upload field](/docs/fields/upload)) and a caption ([text field](/docs/fields/text))
-- Navigational structures where editors can specify nav items containing pages ([relationship field](/docs/fields/relationship)), an "open in new tab" [checkbox field](/docs/fields/checkbox)
-- Event agenda "timeslots" where you need to specify start & end time ([date field](/docs/fields/date)), label ([text field](/docs/fields/text)), and Learn More page [relationship](/docs/fields/relationship)
+```ts
+import type { Field } from 'payload/types'
 
-## Config
+export const MyArrayField: Field = {
+  // ...
+  // highlight-start
+  type: 'array',
+  fields: [
+    // ...
+  ],
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                                                                                                                        |
 | ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -42,7 +55,7 @@ keywords: array, fields, config, configuration, documentation, Content Managemen
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this Array will be kept, so there is no need to specify each nested field as `localized`. |
 | **`required`**         | Require this field to have a value.                                                                                                                                                                                                                                                |
 | **`labels`**           | Customize the row labels appearing in the Admin dashboard.                                                                                                                                                                                                                         |
-| **`admin`**            | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                                                                                                                          |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                          |
 | **`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.                                                                                                                                    |
@@ -50,9 +63,22 @@ keywords: array, fields, config, configuration, documentation, Content Managemen
 
 _\* An asterisk denotes that a property is required._
 
-## Admin Config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), you can adjust the following properties:
+The customize the appearance and behavior of the Array Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyArrayField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The Array Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
 | Option                    | Description                                                                                                          |
 | ------------------------- | -------------------------------------------------------------------------------------------------------------------- |
@@ -62,7 +88,7 @@ In addition to the default [field admin config](/docs/fields/overview#admin-conf
 
 ## Example
 
-`collections/ExampleCollection.ts`
+In this example, we have an Array Field called `slider` that contains a set of fields for a simple image slider. Each row in the array has a `title`, `image`, and `caption`. We also customize the row label to display the title if it exists, or a default label if it doesn't.
 
 ```ts
 import { CollectionConfig } from 'payload'

docs/fields/blocks.mdx

@@ -2,16 +2,17 @@
 title: Blocks Field
 label: Blocks
 order: 30
-desc: The Blocks field type is a great layout build and can be used to construct any flexible content model. Learn how to use Block fields, see examples and options.
+desc: The Blocks Field is a great layout build and can be used to construct any flexible content model. Learn how to use Block Fields, see examples and options.
 keywords: blocks, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Blocks field type is <strong>incredibly powerful</strong> and can be used as a{' '}
-  <em>layout builder</em> as well as to define any other flexible content model you can think of. It
-  stores an array of objects, where each object must match the shape of one of your provided block
-  configs.
-</Banner>
+The Blocks Field is <strong>incredibly powerful</strong>, storing an array of objects based on the fields that your define, where each item in the array is a "block" with its own unique schema.
+
+Blocks are a great way to create a flexible content model that can be used to build a wide variety of content types, including:
+
+- A layout builder tool that grants editors to design highly customizable page or post layouts. Blocks could include configs such as `Quote`, `CallToAction`, `Slider`, `Content`, `Gallery`, or others.
+- A form builder tool where available block configs might be `Text`, `Select`, or `Checkbox`.
+- Virtual event agenda "timeslots" where a timeslot could either be a `Break`, a `Presentation`, or a `BreakoutSession`.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/blocks.png"
@@ -20,13 +21,23 @@ keywords: blocks, fields, config, configuration, documentation, Content Manageme
   caption="Admin Panel screenshot of add Blocks drawer view"
 />
 
-**Example uses:**
+To add a Blocks Field, set the `type` to `blocks` in your [Field Config](./overview):
 
-- A layout builder tool that grants editors to design highly customizable page or post layouts. Blocks could include configs such as `Quote`, `CallToAction`, `Slider`, `Content`, `Gallery`, or others.
-- A form builder tool where available block configs might be `Text`, `Select`, or `Checkbox`.
-- Virtual event agenda "timeslots" where a timeslot could either be a `Break`, a `Presentation`, or a `BreakoutSession`.
+```ts
+import type { Field } from 'payload/types'
 
-## Field config
+export const MyBlocksField: Field = {
+  // ...
+  // highlight-start
+  type: 'blocks',
+  blocks: [
+    // ...
+  ],
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                                                                                                                        |
 | ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -44,22 +55,35 @@ keywords: blocks, fields, config, configuration, documentation, Content Manageme
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this field will be kept, so there is no need to specify each nested field as `localized`. |
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                                                                                                                       |
 | **`labels`**           | Customize the block row labels appearing in the Admin dashboard.                                                                                                                                                                                                                   |
-| **`admin`**            | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                                                                                                                          |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                          |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                                                                                          |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                                                                                                        |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin Config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), you can adjust the following properties:
+The customize the appearance and behavior of the Blocks Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyBlocksField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The Blocks Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
 | Option              | Description                        |
 | ------------------- | ---------------------------------- |
 | **`initCollapsed`**    | Set the initial collapsed state |
 | **`isSortable`**       | Disable order sorting by setting this value to `false` |
 
-## Block configs
+## Block Configs
 
 Blocks are defined as separate configs of their own.
 

docs/fields/checkbox.mdx

@@ -6,7 +6,7 @@ desc: Checkbox field types allow the developer to save a boolean value in the da
 keywords: checkbox, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>The Checkbox field type saves a boolean in the database.</Banner>
+The Checkbox Field saves a boolean in the database.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/checkbox.png"
@@ -15,7 +15,18 @@ keywords: checkbox, fields, config, configuration, documentation, Content Manage
   caption="Admin Panel screenshot of Checkbox field with Text field below"
 />
 
-## Config
+To add a Checkbox Field, set the `type` to `checkbox` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyCheckboxField: Field = {
+  // ...
+  type: 'checkbox', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -30,7 +41,7 @@ keywords: checkbox, fields, config, configuration, documentation, Content Manage
 | **`defaultValue`**     | Provide data to be used for this field's default value, will default to false if field is also `required`. [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 the [default field admin config](/docs/fields/overview#admin-config) for more details.                                                    |
+| **`admin`**            | Admin-specific configuration. [More details](../admin/fields#admin-options).                                                    |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
@@ -38,7 +49,7 @@ _\* An asterisk denotes that a property is required._
 
 ## Example
 
-`collections/ExampleCollection.ts`
+Here is an example of a Checkbox Field in a Collection:
 
 ```ts
 import { CollectionConfig } from 'payload'

docs/fields/code.mdx

@@ -7,21 +7,27 @@ desc: The Code field type will store any string in the Database. Learn how to us
 keywords: code, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Code field type saves a string in the database, but provides the Admin Panel with a code
-  editor styled interface.
-</Banner>
+The Code Field saves a string in the database, but provides the [Admin Panel](../admin/overview) with a code editor styled interface.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/code.png"
   srcDark="https://payloadcms.com/images/docs/fields/code-dark.png"
   alt="Shows a Code field in the Payload Admin Panel"
-  caption="Admin Panel screenshot of a Code field"
+  caption="This field is using the `monaco-react` editor syntax highlighting."
 />
 
-This field uses the `monaco-react` editor syntax highlighting.
+To add a Code Field, set the `type` to `code` in your [Field Config](./overview):
 
-## Config
+```ts
+import type { Field } from 'payload/types'
+
+export const MyBlocksField: Field = {
+  // ...
+  type: 'code', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -39,15 +45,28 @@ This field uses the `monaco-react` editor syntax highlighting.
 | **`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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. See below for [more detail](#admin-options).                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin Config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), you can adjust the following properties:
+The customize the appearance and behavior of the Code Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyCodeField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The Code Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
 | Option              | Description                                                                                                                                                                     |
 | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/collapsible.mdx

@@ -6,10 +6,7 @@ desc: With the Collapsible field, you can place fields within a collapsible layo
 keywords: row, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Collapsible field is presentational-only and only affects the Admin Panel. By using it, you
-  can place fields within a nice layout component that can be collapsed / expanded.
-</Banner>
+The Collapsible Field is presentational-only and only affects the Admin Panel. By using it, you can place fields within a nice layout component that can be collapsed / expanded.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/collapsible.png"
@@ -18,20 +15,49 @@ keywords: row, fields, config, configuration, documentation, Content Management
   caption="Admin Panel screenshot of a Collapsible field"
 />
 
-## Config
+To add a Collapsible Field, set the `type` to `collapsible` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyCollapsibleField: Field = {
+  // ...
+  // highlight-start
+  type: 'collapsible',
+  fields: [
+    // ...
+  ],
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option          | Description                                                                                                                                                                  |
 | --------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **`label`** \*  | A label to render within the header of the collapsible component. This can be a string, function or react component. Function/components receive `({ data, path })` as args. |
 | **`fields`** \* | Array of field types to nest within this Collapsible.                                                                                                                        |
-| **`admin`**     | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                    |
+| **`admin`**     | Admin-specific configuration. [More details](#admin-options).                                                                                                    |
 | **`custom`**    | Extension point for adding custom data (e.g. for plugins)                                                                                                                    |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin Config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), you can adjust the following properties:
+The customize the appearance and behavior of the Collapsible Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyCollapsibleField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The Collapsible Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
 | Option              | Description                     |
 | ------------------- | ------------------------------- |

docs/fields/date.mdx

@@ -6,21 +6,27 @@ desc: The Date field type stores a Date in the database. Learn how to use and cu
 keywords: date, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Date field type saves a Date in the database and provides the Admin Panel with a customizable
-  time picker interface.
-</Banner>
+The Date Field saves a Date in the database and provides the [Admin Panel](../admin/overview) with a customizable time picker interface.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/date.png"
   srcDark="https://payloadcms.com/images/docs/fields/date-dark.png"
   alt="Shows a Date field in the Payload Admin Panel"
-  caption="Admin Panel screenshot of a Date field"
+  caption="This field is using the `react-datepicker` component for UI."
 />
 
-This field uses [`react-datepicker`](https://www.npmjs.com/package/react-datepicker) for the Admin Panel component.
+To add a Date Field, set the `type` to `date` in your [Field Config](./overview):
 
-## Config
+```ts
+import type { Field } from 'payload/types'
+
+export const MyDateField: Field = {
+  // ...
+  type: 'date', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -35,15 +41,28 @@ This field uses [`react-datepicker`](https://www.npmjs.com/package/react-datepic
 | **`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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin Config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), you can customize the following fields that will adjust how the component displays in the Admin Panel via the `date` property.
+The customize the appearance and behavior of the Date Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyDateField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The Date Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
 | Property                       | Description                                                                                                                            |
 | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/email.mdx

@@ -6,7 +6,7 @@ desc: The Email field enforces that the value provided is a valid email address.
 keywords: email, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>The Email field enforces that the value provided is a valid email address.</Banner>
+The Email Field enforces that the value provided is a valid email address.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/email.png"
@@ -15,7 +15,18 @@ keywords: email, fields, config, configuration, documentation, Content Managemen
   caption="Admin Panel screenshot of an Email field"
 />
 
-## Config
+To create an Email Field, set the `type` to `email` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyEmailField: Field = {
+  // ...
+  type: 'email', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -31,23 +42,33 @@ keywords: email, fields, config, configuration, documentation, Content Managemen
 | **`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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), this field type allows for the following `admin` properties:
+The customize the appearance and behavior of the Email Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`placeholder`**
+```ts
+import type { Field } from 'payload/types'
 
-Set this property to define a placeholder string for the field.
+export const MyEmailField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
 
-**`autoComplete`**
+The Email Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
-Set this property to a string that will be used for browser autocomplete.
+| Property                       | Description                                                                                                                            |
+| ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- |
+| **`placeholder`**              | Set this property to define a placeholder string for the field.                                                                         |
+| **`autoComplete`**             | Set this property to a string that will be used for browser autocomplete.                                                               |
 
 ## Example
 

docs/fields/group.mdx

@@ -6,10 +6,7 @@ desc: The Group field allows other fields to be nested under a common property.
 keywords: group, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Group field allows fields to be nested under a common property name. It also groups fields
-  together visually in the Admin Panel.
-</Banner>
+The Group Field allows [Fields](./overview) to be nested under a common property name. It also groups fields together visually in the [Admin Panel](../admin/overview).
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/group.png"
@@ -18,7 +15,23 @@ keywords: group, fields, config, configuration, documentation, Content Managemen
   caption="Admin Panel screenshot of a Group field"
 />
 
-## Config
+To add a Group Field, set the `type` to `group` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyGroupField: Field = {
+  // ...
+  // highlight-start
+  type: 'group',
+  fields: [
+    // ...
+  ],
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                                                                                                                        |
 | ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -32,20 +45,33 @@ keywords: group, fields, config, configuration, documentation, Content Managemen
 | **`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 an object of 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. If enabled, a separate, localized set of all data within this Group will be kept, so there is no need to specify each nested field as `localized`. |
-| **`admin`**            | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                                                                                                                          |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                          |
 | **`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).                                                                                                |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                                                                                                        |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), the Group allows for the following admin property:
+The customize the appearance and behavior of the Group Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`hideGutter`**
+```ts
+import type { Field } from 'payload/types'
 
-Set this property to `true` to hide this field's gutter within the Admin Panel. The field gutter is rendered as a vertical line and padding, but often if this field is nested within a Group, Block, or Array, you may want to hide the gutter.
+export const MyGroupField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The Group Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
+
+| Option              | Description                                                                                                                                                                                                                   |
+| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`hideGutter`**    | Set this property to `true` to hide this field's gutter within the Admin Panel. The field gutter is rendered as a vertical line and padding, but often if this field is nested within a Group, Block, or Array, you may want to hide the gutter. |
 
 ## Example
 

docs/fields/json.mdx

@@ -7,21 +7,27 @@ desc: The JSON field type will store any string in the Database. Learn how to us
 keywords: json, jsonSchema, schema, validation, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The JSON field type saves actual JSON in the database, which differs from the Code field that
-  saves the value as a string in the database.
-</Banner>
+The JSON Field saves actual JSON in the database, which differs from the Code field that saves the value as a string in the database.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/json.png"
   srcDark="https://payloadcms.com/images/docs/fields/json-dark.png"
   alt="Shows a JSON field in the Payload Admin Panel"
-  caption="Admin Panel screenshot of a JSON field"
+  caption="This field is using the `monaco-react` editor syntax highlighting."
 />
 
-This field uses the `monaco-react` editor syntax highlighting.
+To add a JSON Field, set the `type` to `json` in your [Field Config](./overview):
 
-## Config
+```ts
+import type { Field } from 'payload/types'
+
+export const MyJSONField: Field = {
+  // ...
+  type: 'json', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -38,15 +44,28 @@ This field uses the `monaco-react` editor syntax highlighting.
 | **`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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin Config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), you can adjust the following properties:
+The customize the appearance and behavior of the JSON Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyJSONField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The JSON Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
 | Option              | Description                                                                                                                                                   |
 | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/number.mdx

@@ -6,10 +6,7 @@ desc: Number fields store and validate numeric data. Learn how to use and format
 keywords: number, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Number field stores and validates numeric entry and supports additional numerical validation
-  and formatting features.
-</Banner>
+The Number Field stores and validates numeric entry and supports additional numerical validation and formatting features.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/number.png"
@@ -18,7 +15,18 @@ keywords: number, fields, config, configuration, documentation, Content Manageme
   caption="Admin Panel screenshot of a Number field"
 />
 
-## Config
+To add a Number Field, set the `type` to `number` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyNumberField: Field = {
+  // ...
+  type: 'number', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -39,27 +47,34 @@ keywords: number, fields, config, configuration, documentation, Content Manageme
 | **`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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), this field type allows for the following `admin` properties:
+The customize the appearance and behavior of the Number Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`step`**
+```ts
+import type { Field } from 'payload/types'
 
-Set a value for the number field to increment / decrement using browser controls.
+export const MyNumberField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
 
-**`placeholder`**
+The Number Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
-Set this property to define a placeholder string for the field.
-
-**`autoComplete`**
-
-Set this property to a string that will be used for browser autocomplete.
+| Property                       | Description                                                                                                                            |
+| ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- |
+| **`step`**                     | Set a value for the number field to increment / decrement using browser controls.                                                      |
+| **`placeholder`**              | Set this property to define a placeholder string for the field.                                                                       |
+| **`autoComplete`**             | Set this property to a string that will be used for browser autocomplete.                                                             |
 
 ## Example
 

docs/fields/overview.mdx

@@ -205,7 +205,9 @@ export const MyField: Field = {
 }
 ```
 
-Default values can be defined as a static string or a function that returns a string. Functions are called with the following arguments:
+Default values can be defined as a static value or a function that returns a value. When a `defaultValue` is defined statically, Payload's DB adapters will apply it to the database schema or models.
+
+Functions can be written to make use of the following argument properties:
 
 - `user` - the authenticated user object
 - `locale` - the currently selected locale string
@@ -294,7 +296,7 @@ When using custom validation functions, Payload will use yours in place of the d
 To reuse default field validations, call them from within your custom validation function:
 
 ```ts
-import { text } from 'payload/fields/validations'
+import { text } from 'payload/shared'
 
 const field: Field = {
   name: 'notBad',
@@ -375,6 +377,8 @@ export const MyCollection: CollectionConfig = {
 <Banner type="warning">
   <strong>Reminder:</strong>
   The Custom ID Fields can only be of type [`Number`](./number) or [`Text`](./text).
+
+  Custom ID fields with type `text` must not contain `/` or `.` characters.
 </Banner>
 
 ## TypeScript

docs/fields/point.mdx

@@ -3,18 +3,10 @@ title: Point Field
 label: Point
 order: 110
 desc: The Point field type stores coordinates in the database. Learn how to use Point field for geolocation and geometry.
-
 keywords: point, geolocation, geospatial, geojson, 2dsphere, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Point field type saves a pair of coordinates in the database and assigns an index for location
-  related queries.
-</Banner>
-
-<Banner type="warning">
-  <strong>Note:</strong> The Point field type is currently only supported in MongoDB.
-</Banner>
+The Point Field saves a pair of coordinates in the database and assigns an index for location related queries. The data structure in the database matches the GeoJSON structure to represent point. The Payload APIs simplifies the object data to only the [longitude, latitude] location.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/point.png"
@@ -23,7 +15,21 @@ keywords: point, geolocation, geospatial, geojson, 2dsphere, config, configurati
   caption="Admin Panel screenshot of a Point field"
 />
 
-The data structure in the database matches the GeoJSON structure to represent point. The Payload APIs simplifies the object data to only the [longitude, latitude] location.
+To add a Point Field, set the `type` to `point` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyPointField: Field = {
+  // ...
+  type: 'point', // highlight-line
+}
+```
+
+<Banner type="warning">
+  <strong>Important:</strong>
+  The Point Field is currently only supported in MongoDB.
+</Banner>
 
 ## Config
 
@@ -41,16 +47,12 @@ The data structure in the database matches the GeoJSON structure to represent po
 | **`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).                                                                                                                 |
+| **`admin`**            | Admin-specific configuration. [More details](../admin/fields#admin-options).                                                                                                                    |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                 |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                               |
 
 _\* An asterisk denotes that a property is required._
 
-<Banner type="warning">
-  <strong>Note:</strong> The Point field type is currently only supported in MongoDB.
-</Banner>
-
 ## Example
 
 `collections/ExampleCollection.ts`

docs/fields/radio.mdx

@@ -6,10 +6,7 @@ desc: The Radio field type allows for the selection of one value from a predefin
 keywords: radio, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Radio Group field type allows for the selection of one value from a predefined set of possible
-  values and presents a radio group-style set of inputs to the Admin Panel.
-</Banner>
+The Radio Field allows for the selection of one value from a predefined set of possible values and presents a radio group-style set of inputs to the [Admin Panel](../admin/overview).
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/radio.png"
@@ -18,7 +15,23 @@ keywords: radio, fields, config, configuration, documentation, Content Managemen
   caption="Admin Panel screenshot of a Radio field"
 />
 
-## Config
+To add a Radio Field, set the `type` to `radio` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyRadioField: Field = {
+  // ...
+  // highlight-start
+  type: 'radio',
+  options: [
+    // ...
+  ]
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -34,7 +47,7 @@ keywords: radio, fields, config, configuration, documentation, Content Managemen
 | **`defaultValue`**     | Provide data to be used for this field's default value. The default value must exist within provided values in `options`. [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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
 | **`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.                             |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
@@ -50,13 +63,26 @@ _\* An asterisk denotes that a property is required._
   being used as a GraphQL enum.
 </Banner>
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), the Radio Group field type allows for the specification of the following `admin` properties:
+The customize the appearance and behavior of the Radio Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`layout`**
+```ts
+import type { Field } from 'payload/types'
 
-The `layout` property allows for the radio group to be styled as a horizonally or vertically distributed list. The default value is `horizontal`.
+export const MyRadioField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
+
+The Radio Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
+
+| Property                       | Description                                                                                                                            |
+| ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- |
+| **`layout`**                   | Allows for the radio group to be styled as a horizonally or vertically distributed list. The default value is `horizontal`.          |
 
 ## Example
 

docs/fields/relationship.mdx

@@ -6,10 +6,7 @@ desc: The Relationship field provides the ability to relate documents together.
 keywords: relationship, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Relationship field is one of the most powerful fields Payload features. It provides for the
-  ability to easily relate documents together.
-</Banner>
+The Relationship Field is one of the most powerful fields Payload features. It provides for the ability to easily relate documents together.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/relationship.png"
@@ -18,13 +15,27 @@ keywords: relationship, fields, config, configuration, documentation, Content Ma
   caption="Admin Panel screenshot of a Relationship field"
 />
 
-**Example uses:**
+The Relationship field is used in a variety of ways, including:
 
 - To add `Product` documents to an `Order` document
 - To allow for an `Order` to feature a `placedBy` relationship to either an `Organization` or `User` collection
 - To assign `Category` documents to `Post` documents
 
-## Config
+To add a Relationship Field, set the `type` to `relationship` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyRelationshipField: Field = {
+  // ...
+  // highlight-start
+  type: 'relationship',
+  relationTo: 'products',
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                     |
 | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -46,7 +57,7 @@ keywords: relationship, fields, config, configuration, documentation, Content Ma
 | **`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 the [default field admin config](/docs/fields/overview#admin-config) for more details.                                                        |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                        |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                       |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                     |
 
@@ -54,30 +65,33 @@ _\* An asterisk denotes that a property is required._
 
 <Banner type="success">
   <strong>Tip:</strong>
-  <br />
-  The [Depth](../queries/depth) parameter can be used to automatically populate
-  related documents that are returned by the API.
+  The [Depth](../queries/depth) parameter can be used to automatically populate related documents that are returned by the API.
 </Banner>
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), the Relationship field type also
-allows for the following admin-specific properties:
+The customize the appearance and behavior of the Relationship Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`isSortable`**
+```ts
+import type { Field } from 'payload/types'
 
-Set to `true` if you'd like this field to be sortable within the Admin UI using drag and drop (only works when `hasMany`
-is set to `true`).
+export const MyRelationshipField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
 
-**`allowCreate`**
+The Relationship Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
-Set to `false` if you'd like to disable the ability to create new documents from within the relationship field (hides
-the "Add new" button in the admin UI).
+| Property                       | Description                                                                                                                              |
+| ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| **`isSortable`**               | Set to `true` if you'd like this field to be sortable within the Admin UI using drag and drop (only works when `hasMany` is set to `true`). |
+| **`allowCreate`**              | Set to `false` if you'd like to disable the ability to create new documents from within the relationship field.                             |
+| **`sortOptions`**              | Define a default sorting order for the options within a Relationship field's dropdown. [More](#sortOptions)                                |
 
-**`sortOptions`**
-
-The `sortOptions` property allows you to define a default sorting order for the options within a Relationship field's
-dropdown. This can be particularly useful for ensuring that the most relevant options are presented first to the user.
+### Sort Options
 
 You can specify `sortOptions` in two ways:
 
@@ -179,7 +193,7 @@ You can learn more about writing queries [here](/docs/queries/overview).
   When a relationship field has both <strong>filterOptions</strong> and a custom{' '}
   <strong>validate</strong> function, the api will not validate <strong>filterOptions</strong>{' '}
   unless you call the default relationship field validation function imported from{' '}
-  <strong>payload/fields/validations</strong> in your validate function.
+  <strong>payload/shared</strong> in your validate function.
 </Banner>
 
 ## How the data is saved

docs/fields/rich-text.mdx

@@ -6,10 +6,7 @@ desc: The Rich Text field allows dynamic content to be written through the Admin
 keywords: rich text, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Rich Text field is a powerful way to allow editors to write dynamic content. The content is
-  saved as JSON in the database and can be converted into any format, including HTML, that you need.
-</Banner>
+The Rich Text Field is a powerful way to allow editors to write dynamic content. The content is saved as JSON in the database and can be converted into any format, including HTML, that you need.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/richtext.png"
@@ -23,7 +20,7 @@ Payload's rich text field is built on an "adapter pattern" which lets you specif
 Right now, Payload is officially supporting two rich text editors:
 
 1. [SlateJS](/docs/rich-text/slate) - stable, backwards-compatible with 1.0
-2. [Lexical](/docs/rich-text/lexical) - beta, where things will be moving
+2. [Lexical](/docs/lexical/overview) - beta, where things will be moving
 
 <Banner type="success">
   <strong>
@@ -39,7 +36,7 @@ Right now, Payload is officially supporting two rich text editors:
   will allow you to apply your learnings elsewhere as well.
 </Banner>
 
-## Config
+## Config Options
 
 | Option                 | Description                                                                                                                                             |
 | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -53,29 +50,36 @@ Right now, Payload is officially supporting two rich text editors:
 | **`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).                                                                               |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                               |
 | **`editor`**           | Override the rich text editor specified in your base configuration for this field.                                                                      |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                               |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                             |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), the Rich Text editor allows for the following admin properties:
+The customize the appearance and behavior of the Rich Text Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`placeholder`**
+```ts
+import type { Field } from 'payload/types'
 
-Set this property to define a placeholder string in the text input.
+export const MyRichTextField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
 
-**`hideGutter`**
+The Rich Text Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
-Set this property to `true` to hide this field's gutter within the Admin Panel. The field gutter is rendered as a vertical line and padding, but often if this field is nested within a Group, Block, or Array, you may want to hide the gutter.
+| Property                       | Description                                                                                                                            |
+| ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- |
+| **`placeholder`**              | Set this property to define a placeholder string for the field.                                                                         |
+| **`hideGutter`**               | Set this property to `true` to hide this field's gutter within the Admin Panel.                                                         |
+| **`rtl`**                      | Override the default text direction of the Admin Panel for this field. Set to `true` to force right-to-left text direction.            |
 
-**`rtl`**
+## Editor-specific Options
 
-Override the default text direction of the Admin Panel for this field. Set to `true` to force right-to-left text direction.
-
-## Editor-specific options
-
-For a ton more editor-specific options, including how to build custom rich text elements directly into your editor, take a look at either the [Slate docs](/docs/rich-text/slate) or the [Lexical docs](/docs/rich-text/lexical) depending on which editor you're using.
+For a ton more editor-specific options, including how to build custom rich text elements directly into your editor, take a look at either the [Slate docs](/docs/rich-text/slate) or the [Lexical docs](/docs/lexical/overview) depending on which editor you're using.

docs/fields/row.mdx

@@ -6,10 +6,7 @@ desc: With the Row field you can arrange fields next to each other in the Admin
 keywords: row, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Row field is presentational-only and only affects the Admin Panel. By using it, you can
-  arrange fields next to each other horizontally.
-</Banner>
+The Row Field is presentational-only and only affects the [Admin Panel](../admin/overview). By using it, you can arrange [Fields](./overview) next to each other horizontally.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/row.png"
@@ -18,12 +15,28 @@ keywords: row, fields, config, configuration, documentation, Content Management
   caption="Admin Panel screenshot of a Row field"
 />
 
-## Config
+To add a Row Field, set the `type` to `row` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyRowField: Field = {
+  // ...
+  // highlight-start
+  type: 'row',
+  fields: [
+    // ...
+  ]
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option          | Description                                                                                                                                                                |
 | --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **`fields`** \* | Array of field types to nest within this Row.                                                                                                                              |
-| **`admin`**     | Admin-specific configuration excluding `description`, `readOnly`, and `hidden`. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`admin`**     | Admin-specific configuration excluding `description`, `readOnly`, and `hidden`. [More details](../admin/fields#admin-options). |
 | **`custom`**    | Extension point for adding custom data (e.g. for plugins)                                                                                                                  |
 
 _\* An asterisk denotes that a property is required._

docs/fields/select.mdx

@@ -6,10 +6,7 @@ desc: The Select field provides a dropdown-style interface for choosing options
 keywords: select, multi-select, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Select field provides a dropdown-style interface for choosing options from a predefined list
-  as an enumeration.
-</Banner>
+The Select Field provides a dropdown-style interface for choosing options from a predefined list as an enumeration.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/select.png"
@@ -18,7 +15,23 @@ keywords: select, multi-select, fields, config, configuration, documentation, Co
   caption="Admin Panel screenshot of a Select field"
 />
 
-## Config
+To add a Select Field, set the `type` to `select` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MySelectField: Field = {
+  // ...
+  // highlight-start
+  type: 'select',
+  options: [
+    // ...
+  ]
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                   |
 | ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -36,7 +49,7 @@ keywords: select, multi-select, fields, config, configuration, documentation, Co
 | **`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 the [default field admin config](/docs/fields/overview#admin-config) for more details.                                                      |
+| **`admin`**            | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-options) 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. |
@@ -46,24 +59,33 @@ _\* An asterisk denotes that a property is required._
 
 <Banner type="warning">
   <strong>Important:</strong>
-  <br />
   Option values should be strings that do not contain hyphens or special characters due to GraphQL
   enumeration naming constraints. Underscores are allowed. If you determine you need your option
   values to be non-strings or contain special characters, they will be formatted accordingly before
   being used as a GraphQL enum.
 </Banner>
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), the Select field type also allows for the following admin-specific properties:
+The customize the appearance and behavior of the Select Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`isClearable`**
+```ts
+import type { Field } from 'payload/types'
 
-Set to `true` if you'd like this field to be clearable within the Admin UI.
+export const MySelectField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
 
-**`isSortable`**
+The Select Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
-Set to `true` if you'd like this field to be sortable within the Admin UI using drag and drop. (Only works when `hasMany` is set to `true`)
+| Property                       | Description                                                                                                                              |
+| ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| **`isClearable`**              | Set to `true` if you'd like this field to be clearable within the Admin UI.                                                              |
+| **`isSortable`**               | Set to `true` if you'd like this field to be sortable within the Admin UI using drag and drop. (Only works when `hasMany` is set to `true`) |
 
 ## Example
 

docs/fields/tabs.mdx

@@ -6,11 +6,7 @@ desc: The Tabs field is a great way to organize complex editing experiences into
 keywords: tabs, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Tabs field is presentational-only and only affects the Admin Panel (unless a tab is named). By
-  using it, you can place fields within a nice layout component that separates certain sub-fields by
-  a tabbed interface.
-</Banner>
+The Tabs Field is presentational-only and only affects the [Admin Panel](../admin/overview) (unless a tab is named). By using it, you can place fields within a nice layout component that separates certain sub-fields by a tabbed interface.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/tabs.png"
@@ -19,12 +15,28 @@ keywords: tabs, fields, config, configuration, documentation, Content Management
   caption="Tabs field type used to separate Hero fields from Page Layout"
 />
 
-## Config
+To add a Tabs Field, set the `type` to `tabs` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyTabsField: Field = {
+  // ...
+  // highlight-start
+  type: 'tabs',
+  tabs: [
+    // ...
+  ]
+  // highlight-end
+}
+```
+
+## Config Options
 
 | Option        | Description                                                                                                              |
 | ------------- | ------------------------------------------------------------------------------------------------------------------------ |
 | **`tabs`** \* | Array of tabs to render within this Tabs field.                                                                          |
-| **`admin`**   | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
+| **`admin`**   | Admin-specific configuration. [More details](../admin/fields#admin-options). |
 | **`custom`**  | Extension point for adding custom data (e.g. for plugins)                                                                |
 
 ### Tab-specific Config

docs/fields/text.mdx

@@ -6,10 +6,7 @@ desc: Text field types simply save a string to the database and provide the Admi
 keywords: text, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Text field type is one of the most commonly used fields. It saves a string to the database and
-  provides the Admin Panel with a simple text input.
-</Banner>
+The Text Field is one of the most commonly used fields. It saves a string to the database and provides the [Admin Panel](../admin/overview) with a simple text input.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/text.png"
@@ -18,7 +15,18 @@ keywords: text, fields, config, configuration, documentation, Content Management
   caption="Admin Panel screenshot of a Text field and read-only Text field"
 />
 
-## Config
+To add a Text Field, set the `type` to `text` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyTextField: Field = {
+  // ...
+  type: 'text', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -36,7 +44,7 @@ keywords: text, fields, config, configuration, documentation, Content Management
 | **`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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`hasMany`**          | Makes this field an ordered array of text instead of just a single text.                                                                                                    |
 | **`minRows`**          | Minimum number of texts in the array, if `hasMany` is set to true.                                                                                                          |
@@ -45,21 +53,28 @@ keywords: text, fields, config, configuration, documentation, Content Management
 
 _\* An asterisk denotes that a property is required._
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), the Text field type allows for the following `admin` properties:
+The customize the appearance and behavior of the Text Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`placeholder`**
+```ts
+import type { Field } from 'payload/types'
 
-Set this property to define a placeholder string in the text input.
+export const MyTextField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
 
-**`autoComplete`**
+The Text Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
-Set this property to a string that will be used for browser autocomplete.
-
-**`rtl`**
-
-Override the default text direction of the Admin Panel for this field. Set to `true` to force right-to-left text direction.
+| Option         | Description                                                                                                      |
+| -------------- | ---------------------------------------------------------------------------------------------------------------- |
+| **`placeholder`** | Set this property to define a placeholder string in the text input.                                              |
+| **`autoComplete`** | Set this property to a string that will be used for browser autocomplete.                                        |
+| **`rtl`**        | Override the default text direction of the Admin Panel for this field. Set to `true` to force right-to-left text direction. |
 
 ## Example
 

docs/fields/textarea.mdx

@@ -6,10 +6,7 @@ desc: Textarea field types save a string to the database, similar to the Text fi
 keywords: textarea, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Textarea field is almost identical to the Text field but it features a slightly larger input
-  that is better suited to edit longer text.
-</Banner>
+The Textarea Field is nearly identical to the [Text Field](./text) but it features a slightly larger input that is better suited to edit longer text.
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/textarea.png"
@@ -18,7 +15,18 @@ keywords: textarea, fields, config, configuration, documentation, Content Manage
   caption="Admin Panel screenshot of a Textarea field and read-only Textarea field"
 />
 
-## Config
+To add a Textarea Field, set the `type` to `textarea` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyTextareaField: Field = {
+  // ...
+  type: 'textarea', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -36,27 +44,34 @@ keywords: textarea, fields, config, configuration, documentation, Content Manage
 | **`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).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
 _\* An asterisk denotes that a property is required._
 
-## Admin config
+## Admin Options
 
-In addition to the default [field admin config](/docs/fields/overview#admin-config), the Textarea field type allows for the following `admin` properties:
+The customize the appearance and behavior of the Textarea Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
-**`placeholder`**
+```ts
+import type { Field } from 'payload/types'
 
-Set this property to define a placeholder string in the textarea.
+export const MyTextareaField: Field = {
+  // ...
+  admin: { // highlight-line
+    // ...
+  },
+}
+```
 
-**`autoComplete`**
+The Textarea Field inherits all of the default options from the base [Field Admin Config](../admin/fields#admin-options), plus the following additional options:
 
-Set this property to a string that will be used for browser autocomplete.
-
-**`rtl`**
-
-Override the default text direction of the Admin Panel for this field. Set to `true` to force right-to-left text direction.
+| Option         | Description                                                                                                      |
+| -------------- | ---------------------------------------------------------------------------------------------------------------- |
+| **`placeholder`** | Set this property to define a placeholder string in the textarea.                                               |
+| **`autoComplete`** | Set this property to a string that will be used for browser autocomplete.                                      |
+| **`rtl`** | Override the default text direction of the Admin Panel for this field. Set to `true` to force right-to-left text direction. |
 
 ## Example
 

docs/fields/ui.mdx

@@ -6,31 +6,34 @@ desc: UI fields are purely presentational and allow developers to customize the
 keywords: custom field, react component, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The UI (user interface) field gives you a ton of power to add your own React components directly
-  into the Admin Panel, nested directly within your other fields. It has absolutely no effect on the
-  data of your documents. It is presentational-only.
-</Banner>
+The UI (user interface) Field gives you a ton of power to add your own React components directly into the [Admin Panel](../admin/overview), nested directly within your other fields. It has absolutely no effect on the data of your documents. It is presentational-only. Think of it as a way for you to "plug in" your own React components directly within your other fields, so you can provide your editors with new controls exactly where you want them to go.
 
-This field is helpful if you need to build in custom functionality via React components within the Admin Panel. Think of it as a way for you to "plug in" your own React components directly within your other fields, so you can provide your editors with new controls exactly where you want them to go.
-
-With this field, you can also inject custom `Cell` components that appear as additional columns within collections' List views.
-
-**Example uses:**
+With the UI Field, you can:
 
 - Add a custom message or block of text within the body of an Edit View to describe the purpose of surrounding fields
 - Add a "Refund" button to an Order's Edit View sidebar, which might make a fetch call to a custom `refund` endpoint
 - Add a "view page" button into a Pages List View to give editors a shortcut to view a page on the frontend of the site
 - Build a "clear cache" button or similar mechanism to manually clear caches of specific documents
 
-## Config
+To add a UI Field, set the `type` to `ui` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyUIField: Field = {
+  // ...
+  type: 'ui', // highlight-line
+}
+```
+
+## Config Options
 
 | Option                          | Description                                                                                                            |
 | ------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
 | **`name`** \*                   | A unique identifier for this field.                                                                                    |
 | **`label`**                     | Human-readable label for this UI field.                                                                                |
-| **`admin.components.Field`** \* | React component to be rendered for this field within the Edit View. [More](/docs/admin/components/#field-component)    |
-| **`admin.components.Cell`**     | React component to be rendered as a Cell within collection List views. [More](/docs/admin/components/#field-component) |
+| **`admin.components.Field`** \* | React component to be rendered for this field within the Edit View. [More](../admin/components/#field-component)    |
+| **`admin.components.Cell`**     | React component to be rendered as a Cell within collection List views. [More](../admin/components/#field-component) |
 | **`admin.disableListColumn`**   | Set `disableListColumn` to `true` to prevent the UI field from appearing in the list view column selector.             |
 | **`custom`**                    | Extension point for adding custom data (e.g. for plugins)                                                              |
 
@@ -51,8 +54,8 @@ export const ExampleCollection: CollectionConfig = {
       type: 'ui', // required
       admin: {
         components: {
-          Field: MyCustomUIField,
-          Cell: MyCustomUICell,
+          Field: '/path/to/MyCustomUIField',
+          Cell: '/path/to/MyCustomUICell',
         },
       },
     },

docs/fields/upload.mdx

@@ -6,18 +6,13 @@ desc: Upload fields will allow a file to be uploaded, only from a collection sup
 keywords: upload, images media, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
 
-<Banner>
-  The Upload field allows for the selection of a Document from a collection supporting Uploads, and
-  formats the selection as a thumbnail in the Admin Panel.
-</Banner>
+The Upload Field allows for the selection of a Document from a Collection supporting [Uploads](../upload/overview), and formats the selection as a thumbnail in the Admin Panel.
 
-<Banner type="warning">
-  <strong>Important:</strong>
-  <br />
-  To use this field, you need to have a Collection configured to allow Uploads. For more
-  information, [click here](/docs/upload/overview) to read about how to enable Uploads on a
-  collection by collection basis.
-</Banner>
+Upload fields are useful for a variety of use cases, such as:
+
+- To provide a `Page` with a featured image
+- To allow for a `Product` to deliver a downloadable asset like PDF or MP3
+- To give a layout building block the ability to feature a background image
 
 <LightDarkImage
   srcLight="https://payloadcms.com/images/docs/fields/upload.png"
@@ -26,13 +21,26 @@ keywords: upload, images media, fields, config, configuration, documentation, Co
   caption="Admin Panel screenshot of an Upload field"
 />
 
-**Example uses:**
+To create an Upload Field, set the `type` to `upload` in your [Field Config](./overview):
 
-- To provide a `Page` with a featured image
-- To allow for a `Product` to deliver a downloadable asset like PDF or MP3
-- To give a layout building block the ability to feature a background image
+```ts
+import type { Field } from 'payload/types'
 
-## Config
+export const MyUploadField: Field = {
+  // ...
+  // highlight-start
+  type: 'upload',
+  relationTo: 'media',
+  // highlight-end
+}
+```
+
+<Banner type="warning">
+  <strong>Important:</strong>
+  To use the Upload Field, you must have a [Collection](../configuration/collections) configured to allow [Uploads](../upload/overview).
+</Banner>
+
+## Config Options
 
 | Option                 | Description                                                                                                                                                                 |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -49,9 +57,10 @@ keywords: upload, images media, fields, config, configuration, documentation, Co
 | **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
 | **`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)                                                                        |
+| **`displayPreview`**   | Enable displaying preview of the uploaded file. Overrides related Collection's `displayPreview` option. [More](/docs/upload/overview#collection-upload-options).            |
 | **`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 the [default field admin config](/docs/fields/overview#admin-config) for more details.                                                    |
+| **`admin`**            | Admin-specific configuration. [Admin Options](../admin/fields#admin-options).                                                    |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
 
@@ -115,5 +124,5 @@ You can learn more about writing queries [here](/docs/queries/overview).
   When an upload field has both <strong>filterOptions</strong> and a custom{' '}
   <strong>validate</strong> function, the api will not validate <strong>filterOptions</strong>{' '}
   unless you call the default upload field validation function imported from{' '}
-  <strong>payload/fields/validations</strong> in your validate function.
+  <strong>payload/shared</strong> in your validate function.
 </Banner>

docs/getting-started/concepts.mdx

@@ -162,7 +162,7 @@ All of Payload's GraphQL functionality is abstracted into a separate package. Pa
 
 This is the UI library that Payload's Admin Panel uses. All components are exported from this package and can be re-used as you build extensions to the Payload admin UI, or want to use Payload components in your own React apps. Some exports are server components and some are client components.
 
-`@payloadcms/db-postgres`, `@payloadcms/db-mongodb`
+`@payloadcms/db-postgres`, `@payloadcms/db-vercel-postgres`, `@payloadcms/db-mongodb`
 
 You can choose which Database Adapter you'd like to use for your project, and no matter which you choose, the entire data layer for Payload is contained within these packages. You can only use one at a time for any given project.
 

docs/getting-started/installation.mdx

@@ -69,7 +69,7 @@ To install a Database Adapter, you can run **one** of the following commands:
 
 #### 2. Copy Payload files into your Next.js app folder
 
-Payload installs directly in your Next.js `/app` folder, and you'll need to place some files into that folder for Payload to run. You can copy these files from the [Blank Template](https://github.com/payloadcms/payload/tree/beta/templates/blank-3.0/src/app/(payload)) on GitHub. Once you have the required Payload files in place in your `/app` folder, you should have something like this:
+Payload installs directly in your Next.js `/app` folder, and you'll need to place some files into that folder for Payload to run. You can copy these files from the [Blank Template](https://github.com/payloadcms/payload/tree/beta/templates/blank/src/app/(payload)) on GitHub. Once you have the required Payload files in place in your `/app` folder, you should have something like this:
 
 ```plaintext
 app/
@@ -79,6 +79,8 @@ app/
 ├── // Your app files
 ```
 
+_For an exact reference of the `(payload)` directory, see [Project Structure](../admin/overview#project-structure)._
+
 <Banner type="warning">
   You may need to copy all of your existing frontend files, including your existing root layout, into its own newly created [Route Group](https://nextjs.org/docs/app/building-your-application/routing/route-groups), i.e. `(my-app)`.
 </Banner>

docs/getting-started/what-is-payload.mdx

@@ -28,7 +28,7 @@ No matter what you're building, Payload will give you backend superpowers. It ca
 
 ### Open source - deploy anywhere, including Vercel
 
-It's fully open source with an MIT license and you can self-host anywhere that you can run a Node app. You can also deploy serverless to hosts like Vercel, right inside your existing Next.js app folder.
+It's fully open source with an MIT license and you can self-host anywhere that you can run a Node.js app. You can also deploy serverless to hosts like Vercel, right inside your existing Next.js application.
 
 ### Code-first and version controlled
 

docs/lexical/migration.mdx

@@ -18,9 +18,10 @@ IMPORTANT: This will overwrite all slate data. We recommend doing the following
 1. Take a backup of your entire database. If anything goes wrong and you do not have a backup, you are on your own and will not receive any support.
 2. Make every richText field a lexical editor. This script will only convert lexical richText fields with old Slate data
 3. Add the SlateToLexicalFeature (as seen below) first, and test it out by loading up the Admin Panel, to see if the migrator works as expected. You might have to build some custom converters for some fields first in order to convert custom Slate nodes. The SlateToLexicalFeature is where the converters are stored. Only fields with this feature added will be migrated.
+4. If this works as expected, add the `disableHooks: true` prop everywhere you're initializing `SlateToLexicalFeature`. Example: `SlateToLexicalFeature({ disableHooks: true })`. Once you did that, you're ready to run the migration script.
 
 ```ts
-import { migrateSlateToLexical } from '@payloadcms/richtext-lexical'
+import { migrateSlateToLexical } from '@payloadcms/richtext-lexical/migrate'
 
 await migrateSlateToLexical({ payload })
 ```
@@ -34,7 +35,8 @@ Simply add the `SlateToLexicalFeature` to your editor:
 ```ts
 import type { CollectionConfig } from 'payload'
 
-import { SlateToLexicalFeature, lexicalEditor } from '@payloadcms/richtext-lexical'
+import { SlateToLexicalFeature } from '@payloadcms/richtext-lexical/migrate'
+import { lexicalEditor } from '@payloadcms/richtext-lexical'
 
 const Pages: CollectionConfig = {
   slug: 'pages',
@@ -64,8 +66,8 @@ The easy way to solve this: Edit the richText field and save the document! This
 If you have custom Slate nodes, create a custom converter for them. Here's the Upload converter as an example:
 
 ```ts
-import type { SerializedUploadNode } from '../uploadNode.'
-import type { SlateNodeConverter } from '@payloadcms/richtext-lexical'
+import type { SerializedUploadNode } from '../uploadNode'
+import type { SlateNodeConverter } from '@payloadcms/richtext-lexical/migrate'
 
 export const SlateUploadConverter: SlateNodeConverter = {
   converter({ slateNode }) {
@@ -95,9 +97,9 @@ When using the `SlateToLexicalFeature`, you can add your custom converters to th
 ```ts
 import type { CollectionConfig } from 'payload'
 
+import {  lexicalEditor } from '@payloadcms/richtext-lexical'
 import {
   SlateToLexicalFeature,
-  lexicalEditor,
   defaultSlateConverters,
 } from '@payloadcms/richtext-lexical'
 

docs/local-api/outside-nextjs.mdx

@@ -2,11 +2,11 @@
 title: Using Payload outside Next.js
 label: Outside Next.js
 order: 20
-desc: Payload can be used outside of Next.js within standalone scripts or in other frameworks like Remix, Sveltekit, Nuxt, and similar.
+desc: Payload can be used outside of Next.js within standalone scripts or in other frameworks like Remix, SvelteKit, Nuxt, and similar.
 keywords: local api, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, express
 ---
 
-Payload can be used completely outside of Next.js which is helpful in cases like running scripts, using Payload in a separate backend service, or using Payload's Local API to fetch your data directly from your database in other frontend frameworks like Sveltekit, Remix, Nuxt, and similar.
+Payload can be used completely outside of Next.js which is helpful in cases like running scripts, using Payload in a separate backend service, or using Payload's Local API to fetch your data directly from your database in other frontend frameworks like SvelteKit, Remix, Nuxt, and similar.
 
 <Banner>
   <strong>Note:</strong>
@@ -16,38 +16,16 @@ Payload can be used completely outside of Next.js which is helpful in cases like
 
 ## Importing the Payload Config outside of Next.js
 
-Your Payload Config likely has imports which need to be handled properly, such as CSS imports and similar. If you were to try and import your config without any Node support for SCSS / CSS files, you'll see errors that arise accordingly.
+Payload provides a convenient way to run standalone scripts, which can be useful for tasks like seeding your database or performing one-off operations.
 
-This is especially relevant if you are importing your Payload Config outside of a bundler context, such as in standalone Node scripts.
-
-For these cases, you can use Payload's `importConfig` function to handle importing your config safely. It will handle everything you need to be able to load and use your Payload Config, without any client-side files present.
-
-Here's an example of a seed script that creates a few documents for local development / testing purposes, using Payload's `importConfig` function to safely import Payload, and the `getPayload` function to retrieve an initialized copy of Payload.
+In standalone scripts, can simply import the Payload Config and use it right away. If you need an initialized copy of Payload, you can then use the `getPayload` function. This can be useful for tasks like seeding your database or performing other one-off operations.
 
 ```ts
 // We are importing `getPayload` because we don't need HMR
 // for a standalone script. For usage of Payload inside Next.js,
 // you should always use `import { getPayloadHMR } from '@payloadcms/next/utilities'` instead.
 import { getPayload } from 'payload'
-
-// This is a helper function that will make sure we can safely load the Payload Config
-// and all of its client-side files, such as CSS, SCSS, etc.
-import { importConfig } from 'payload/node'
-
-import path from 'path'
-import { fileURLToPath } from 'node:url'
-import dotenv from 'dotenv'
-
-// In ESM, you can create the "dirname" variable
-// like this. We'll use this with `dotenv` to load our `.env` file, if necessary.
-const filename = fileURLToPath(import.meta.url)
-const dirname = path.dirname(filename)
-
-// If you don't need to load your .env file,
-// then you can skip this part!
-dotenv.config({
-  path: path.resolve(dirname, '../.env'),
-})
+import config from '@payload-config'
 
 const seed = async () => {
   // Get a local copy of Payload by passing your config
@@ -71,6 +49,39 @@ const seed = async () => {
 }
 
 // Call the function here to run your seed script
-seed()
-
+await seed()
 ```
+
+You can then execute the script using `payload run`. Example: if you placed this standalone script in `src/seed.ts`, you would execute it like this:
+
+```sh
+payload run src/seed.ts
+```
+
+The `payload run` command does two things for you:
+
+1. It loads the environment variables the same way Next.js loads them, eliminating the need for additional dependencies like `dotenv`. The usage of `dotenv` is not recommended, as Next.js loads environment variables differently. By using `payload run`, you ensure consistent environment variable handling across your Payload and Next.js setup.
+2. It initializes tsx, allowing direct execution of TypeScript files manually installing tools like tsx or ts-node.
+
+### Troubleshooting
+
+If you encounter import-related errors, you have 2 options:
+
+#### Option 1: enable swc mode by appending `--use-swc` to the `payload` command:
+
+Example:
+```sh
+payload run src/seed.ts --use-swc
+```
+
+Note: Install @swc-node/register in your project first. While swc mode is faster than the default tsx mode, it might break for some imports.
+
+#### Option 2: use an alternative runtime like bun
+
+While we do not guarantee support for alternative runtimes, you are free to use them and disable payloads own transpilation by appending the `--disable-transpilation` flag to the `payload` command:
+
+```sh
+bunx --bun payload run src/seed.ts --disable-transpile
+```
+
+You will need to have bun installed on your system for this to work.

docs/local-api/overview.mdx

@@ -62,19 +62,16 @@ If you are accessing Payload via function arguments or `req.payload`, HMR is aut
 
 **Option 2 - outside of Next.js**
 
-If you are using Payload outside of Next.js, for example in standalone scripts or in other frameworks, you can import Payload with no HMR functionality.
+If you are using Payload outside of Next.js, for example in standalone scripts or in other frameworks, you can import Payload with no HMR functionality. Instead of using `getPayloadHMR`, you can use `getPayload`.
 
 ```ts
 import { getPayload } from 'payload'
-import { importConfig } from 'payload/node'
+import config from '@payload-config'
 
-const config = await importConfig('./payload.config.ts')
 const payload = await getPayload({ config })
 ```
 
-Both options function in exactly the same way outside of one having HMR support and the other not. However, when you import your Payload Config, you need to make sure that you can import it safely.
-
-For more information about using Payload outside of Next.js, [click here](/docs/beta/local-api/outside-nextjs).
+Both options function in exactly the same way outside of one having HMR support and the other not. For more information about using Payload outside of Next.js, [click here](/docs/beta/local-api/outside-nextjs).
 
 ## Local options available
 

docs/migration-guide/overview.mdx

@@ -159,7 +159,6 @@ import {
   useAllFormFields,
   useAuth,
   useClientFunctions,
-  useComponentMap,
   useConfig,
   useDebounce,
   useDebouncedCallback,
@@ -212,7 +211,6 @@ import {
   ActionsProvider,
   AuthProvider,
   ClientFunctionProvider,
-  ComponentMapProvider,
   ConfigProvider,
   DocumentEventsProvider,
   DocumentInfoProvider,
@@ -299,14 +297,10 @@ import {
   fieldBaseClass,
 
   // TS Types
-  ActionMap,
-  CollectionComponentMap,
   ColumnPreferences,
-  ConfigComponentMapBase,
   DocumentInfoContext,
   DocumentInfoProps,
   FieldType,
-  FieldComponentProps,
   FormProps,
   RowLabelProps,
   SelectFieldProps,
@@ -323,7 +317,6 @@ import {
   AppHeader,
   BlocksDrawer,
   Column,
-  ComponentMap,
   DefaultBlockImage,
   DeleteMany,
   DocumentControls,
@@ -335,11 +328,9 @@ import {
   FieldMap,
   File,
   Form,
-  FormFieldBase,
   FormLoadingOverlayToggle,
   FormSubmit,
   GenerateConfirmation,
-  GlobalComponentMap,
   HydrateClientUser,
   ListControls,
   ListSelection,
@@ -350,7 +341,8 @@ import {
   PublishMany,
   ReactSelect,
   ReactSelectOption,
-  ReducedBlock,
+  ClientField,
+  ClientBlock,
   RenderFields,
   SectionTitle,
   Select,
@@ -475,10 +467,10 @@ export const ServerRenderedDescription = () => <ClientRenderedDescription />
 // file: components/ClientRenderedDescription.tsx
 'use client'
 import React from 'react'
-import type { DescriptionComponent } from 'payload'
+import type { TextFieldDescriptionClientComponent } from 'payload'
 import { useFieldProps, useFormFields } from '@payloadcms/ui'
 
-export const ClientRenderedDescription: DescriptionComponent = () ={
+export const ClientRenderedDescription: TextFieldDescriptionClientComponent = () ={
   const { path } = useFieldProps()
   const { value } = useFormFields(([fields]) => fields[path])
   const customDescription = `Component description: ${path} - ${value}`
@@ -667,8 +659,8 @@ export const ClientArrayRowLabel = () => {
   admin: {
     components: {
       views: {
-        Edit: {
-          Tab: {
+        edit: {
+          tab: {
             pillLabel: '',
           },
         },
@@ -683,9 +675,11 @@ export const ClientArrayRowLabel = () => {
   admin: {
     components: {
       views: {
-        Edit: {
-          Tab: {
-            Pill: MyPill,
+        edit: {
+          tab: {
+            pill: {
+              Component: './path/to/CustomPill.js',
+            },
           },
         },
       },
@@ -717,7 +711,7 @@ import type { FormState } from 'payload'
 
 This is because the configs themselves are not serializable and so they cannot be thread through to the client, i.e. the `DocumentInfoContext`. Instead, various properties of the config are passed instead, like `collectionSlug` and `globalSlug`.  You can use these to access a client-side config, if needed, through the `useConfig` hook (see next bullet).
 
-17. The `useConfig` hook now returns a `ClientConfig` and not a `SanizitedConfig`.
+17. The `useConfig` hook now returns a `ClientConfig` and not a `SanitizedConfig`.
 
 This is because the config itself is not serializable and so it is not able to be thread through to the client, i.e. the `ConfigContext`.
 

docs/plugins/build-your-own.mdx

@@ -1,7 +1,7 @@
 ---
 title: Building Your Own Plugin
 label: Build Your Own
-order: 50
+order: 20
 desc: Starting to build your own plugin? Find everything you need and learn best practices with the Payload plugin template.
 keywords: plugins, template, config, configuration, extensions, custom, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
 ---
@@ -159,36 +159,60 @@ export const seed = async (payload: Payload): Promise<void> => {
 
 ```
 
-## Overview of the src folder
+## Building a Plugin
 
 Now that we have our environment setup and dev project ready to go - it&apos;s time to build the plugin!
 
-**index.ts**
-
-First up, the `src/index.ts` file - this is where the plugin should be imported from. It is best practice not to build the plugin directly in this file, instead we use this to export the plugin and types from their respective files.
-
-**Plugin.ts**
-
-To reiterate, the essence of a [Payload Plugin](./overview) is simply to extend the [Payload Config](../configuration/overview) - and that is exactly what we are doing in this file.
 
 ```
+import type { Config } from 'payload'
+
 export const samplePlugin =
   (pluginOptions: PluginTypes) =>
   (incomingConfig: Config): Config => {
+    // create copy of incoming config
     let config = { ...incomingConfig }
 
-   // do something cool with the config here
+    /**
+    * This is where you could modify the
+    * config based on the plugin options
+    */
 
+    // If you wanted to add a new collection:
+    config.collections = [
+      ...(config.collections || []),
+      newCollection,
+    ]
+
+    // If you wanted to add a new global:
+    config.globals = [
+      ...(config.globals || []),
+      newGlobal,
+    ]
+
+    /**
+    * If you wanted to add a new field to a collection:
+    *
+    * 1. Loop over collections
+    * 2. Find the collection you want to add the field to
+    * 3. Add the field to the collection
+    */
+
+    // If you wanted to add to the onInit:
+    config.onInit = async payload => {
+      if (incomingConfig.onInit) await incomingConfig.onInit(payload)
+      // Add additional onInit code here
+    }
+
+    // Finally, return the modified config
     return config
  }
 ```
 
-1. First, you need to receive the existing Payload Config along with any plugin options.
-2. Then set the variable `config` to be equal to a copy of the existing config.
-3. From here, you can extend the config however you like!
-4. Finally, return the config and you&apos;re all set.
+To reiterate, the essence of a [Payload Plugin](./overview) is simply to extend the [Payload Config](../configuration/overview) - and that is exactly what we are doing in this file.
 
-## Spread Syntax
+
+### Spread syntax
 
 [Spread syntax](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax) (or the spread operator) is a feature in JavaScript that uses the dot notation **(...)** to spread elements from arrays, strings, or objects into various contexts.
 
@@ -206,7 +230,7 @@ config.collections = [
 
 First, you need to spread the `config.collections` to ensure that we don&apos;t lose the existing collections. Then you can add any additional collections, just as you would in a regular Payload Config.
 
-This same logic is applied to other properties like admin, globals, hooks:
+This same logic is applied to other array and object like properties such as admin, globals and hooks:
 
 ```
 config.globals = [
@@ -220,7 +244,10 @@ config.hooks = {
 }
 ```
 
-Some properties will be slightly different to extend, for instance the `onInit` property:
+### Extending functions
+Function properties cannot use spread syntax. The way to extend them is to execute the existing function if it exists and then run your additional functionality. 
+
+Here is an example extending the `onInit` property:
 
 ```
 config.onInit = async payload => {
@@ -231,10 +258,6 @@ config.onInit = async payload => {
 }
 ```
 
-If you wish to add to the `onInit`, you must include the async/await. We don&apos;t use spread syntax in this case, instead you must await the existing `onInit` before running additional functionality.
-
-In the template, we have stubbed out a basic `onInitExtension` file that you can use, if not needed feel free to delete it.
-
 ## Types
 
 If your plugin has options, you should define and provide types for these options in a separate file which gets exported from the main `index.ts`.

docs/plugins/form-builder.mdx

@@ -1,7 +1,7 @@
 ---
 title: Form Builder Plugin
 label: Form Builder
-order: 20
+order: 40
 desc: Easily build and manage forms from the Admin Panel. Send dynamic, personalized emails and even accept and process payments.
 keywords: plugins, plugin, form, forms, form builder
 ---
@@ -109,7 +109,7 @@ The `beforeEmail` property is a [beforeChange](<[beforeChange](https://payloadcm
 // payload.config.ts
 formBuilder({
   // ...
-  beforeEmail: (emailsToSend) => {
+  beforeEmail: (emailsToSend, beforeChangeParams) => {
     // modify the emails in any way before they are sent
     return emails.map((email) => ({
       ...email,
@@ -119,6 +119,23 @@ formBuilder({
 })
 ```
 
+For full types with `beforeChangeParams`, you can import the types from the plugin:
+
+```ts
+import type { BeforeEmail } from '@payloadcms/plugin-form-builder'
+// Your generated FormSubmission type
+import type {FormSubmission} from '@payload-types'
+
+// Pass it through and 'data' or 'originalDoc' will now be typed
+const beforeEmail: BeforeEmail<FormSubmission> = (emailsToSend, beforeChangeParams) => {
+  // modify the emails in any way before they are sent
+  return emails.map((email) => ({
+    ...email,
+    html: email.html, // transform the html in any way you'd like (maybe wrap it in an html template?)
+  }))
+}
+```
+
 ### `formOverrides`
 
 Override anything on the `forms` collection by sending a [Payload Collection Config](https://payloadcms.com/docs/configuration/collections) to the `formOverrides` property.

docs/plugins/nested-docs.mdx

@@ -1,7 +1,7 @@
 ---
 title: Nested Docs Plugin
 label: Nested Docs
-order: 20
+order: 40
 desc: Nested documents in a parent, child, and sibling relationship.
 keywords: plugins, nested, documents, parent, child, sibling, relationship
 ---

docs/plugins/redirects.mdx

@@ -1,7 +1,7 @@
 ---
 title: Redirects Plugin
 label: Redirects
-order: 20
+order: 40
 desc: Automatically create redirects for your Payload application
 keywords: plugins, redirects, redirect, plugin, payload, cms, seo, indexing, search, search engine
 ---
@@ -66,6 +66,8 @@ export default config
 | ------------- | ---------- | ----------------------------------------------------------------------------------------------- |
 | `collections` | `string[]` | An array of collection slugs to populate in the `to` field of each redirect.                    |
 | `overrides`   | `object`   | A partial collection config that allows you to override anything on the `redirects` collection. |
+| `redirectTypes`   | `string[]`   | Provide an array of redirects if you want to provide options for the type of redirects to be supported. |
+| `redirectTypeFieldOverride`   | `Field`   | A partial Field config that allows you to override the Redirect Type field if enabled above. |
 
 Note that the fields in overrides take a function that receives the default fields and returns an array of fields. This allows you to add fields to the collection.
 
@@ -83,6 +85,10 @@ redirectsPlugin({
       ]
     },
   },
+  redirectTypes: ['301', '302'],
+  redirectTypeFieldOverride: {
+    label: 'Redirect Type (Overridden)',
+  },
 })
 ```
 

docs/plugins/search.mdx

@@ -1,7 +1,7 @@
 ---
 title: Search Plugin
 label: Search
-order: 20
+order: 40
 desc: Generates records of your documents that are extremely fast to search on.
 keywords: plugins, search, search plugin, search engine, search index, search results, search bar, search box, search field, search form, search input
 ---

docs/plugins/sentry.mdx

@@ -1,7 +1,7 @@
 ---
 title: Sentry Plugin
 label: Sentry
-order: 20
+order: 40
 desc: Integrate Sentry error tracking into your Payload application
 keywords: plugins, sentry, error, tracking, monitoring, logging, bug, reporting, performance
 ---

docs/plugins/seo.mdx

@@ -1,7 +1,7 @@
 ---
 title: SEO Plugin
 label: SEO
-order: 20
+order: 30
 desc: Manage SEO metadata from your Payload admin
 keywords: plugins, seo, meta, search, engine, ranking, google
 ---
@@ -119,7 +119,7 @@ A function that allows you to return any meta title, including from document's c
 {
   // ...
   seoPlugin({
-    generateTitle: ({ ...docInfo, doc, locale }) => `Website.com — ${doc?.title}`,
+    generateTitle: ({ ...docInfo, doc, locale, req }) => `Website.com — ${doc?.title}`,
   })
 }
 ```
@@ -133,7 +133,7 @@ A function that allows you to return any meta description, including from docume
 {
   // ...
   seoPlugin({
-    generateDescription: ({ ...docInfo, doc, locale }) => doc?.excerpt,
+    generateDescription: ({ ...docInfo, doc, locale, req }) => doc?.excerpt,
   })
 }
 ```
@@ -147,7 +147,7 @@ A function that allows you to return any meta image, including from document's c
 {
   // ...
   seoPlugin({
-    generateImage: ({ ...docInfo, doc, locale }) => doc?.featuredImage,
+    generateImage: ({ ...docInfo, doc, locale, req }) => doc?.featuredImage,
   })
 }
 ```
@@ -161,7 +161,7 @@ A function called by the search preview component to display the actual URL of y
 {
   // ...
   seoPlugin({
-    generateURL: ({ ...docInfo, doc, locale }) =>
+    generateURL: ({ ...docInfo, doc, locale, req }) =>
       `https://yoursite.com/${collection?.slug}/${doc?.slug}`,
   })
 }

docs/plugins/stripe.mdx

@@ -1,7 +1,7 @@
 ---
 title: Stripe Plugin
 label: Stripe
-order: 20
+order: 40
 desc: Easily accept payments with Stripe
 keywords: plugins, stripe, payments, ecommerce
 ---

docs/upload/overview.mdx

@@ -92,10 +92,13 @@ _An asterisk denotes that an option is required._
 | Option                         | Description                                                                                                                                                                                                                           |
 | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **`adminThumbnail`**           | Set the way that the [Admin Panel](../admin/overview) will display thumbnails for this Collection. [More](#admin-thumbnails)                                                                                                          |
+| **`bulkUpload`**               | Allow users to upload in bulk from the list view, default is true                                                                                                                                                                     |
 | **`crop`**                     | Set to `false` to disable the cropping tool in the [Admin Panel](../admin/overview). Crop is enabled by default. [More](#crop-and-focal-point-selector)                                                                               |
 | **`disableLocalStorage`**      | Completely disable uploading files to disk locally. [More](#disabling-local-upload-storage)                                                                                                                                           |
+| **`displayPreview`**           | Enable displaying preview of the uploaded file in Upload fields related to this Collection. Can be locally overridden by `displayPreview` option in Upload field. [More](/docs/fields/upload#config-options).                         |
 | **`externalFileHeaderFilter`** | Accepts existing headers and returns the headers after filtering or modifying.                                                                                                                                                        |
 | **`filesRequiredOnCreate`**    | Mandate file data on creation, default is true.                                                                                                                                                                                       |
+| **`filenameCompoundIndex`**    | Field slugs to use for a compount index instead of the default filename index.
 | **`focalPoint`**               | Set to `false` to disable the focal point selection tool in the [Admin Panel](../admin/overview). The focal point selector is only available when `imageSizes` or `resizeOptions` are defined. [More](#crop-and-focal-point-selector) |
 | **`formatOptions`**            | An object with `format` and `options` that are used with the Sharp image library to format the upload file. [More](https://sharp.pixelplumbing.com/api-output#toformat)                                                               |
 | **`handlers`**                 | Array of Request handlers to execute when fetching a file, if a handler returns a Response it will be sent to the client. Otherwise Payload will retrieve and send back the file.                                                     |
@@ -104,6 +107,7 @@ _An asterisk denotes that an option is required._
 | **`resizeOptions`**            | An object passed to the the Sharp image library to resize the uploaded file. [More](https://sharp.pixelplumbing.com/api-resize)                                                                                                       |
 | **`staticDir`**                | The folder directory to use to store media in. Can be either an absolute path or relative to the directory that contains your config. Defaults to your collection slug                                                                |
 | **`trimOptions`**              | An object passed to the the Sharp image library to trim the uploaded file. [More](https://sharp.pixelplumbing.com/api-resize#trim)                                                                                                    |
+| **`withMetadata`**             | If specified, appends metadata to the output image file.  Accepts a boolean or a function that receives `metadata` and `req`, returning a boolean.                                                                                    |
 
 
 ### Payload-wide Upload Options
@@ -167,6 +171,22 @@ When an uploaded image is smaller than the defined image size, we have 3 options
   image size. Use the `withoutEnlargement` prop to change this.
 </Banner>
 
+#### Custom file name per size
+
+Each image size supports a `generateImageName` function that can be used to generate a custom file name for the resized image.
+This function receives the original file name, the resize name, the extension, height and width as arguments.
+
+```ts
+{
+  name: 'thumbnail',
+  width: 400,
+  height: 300,
+  generateImageName: ({ height, sizeName, extension, width }) => {
+    return `custom-${sizeName}-${height}-${width}.${extension}`
+  },
+}
+```
+
 ## Crop and Focal Point Selector
 
 This feature is only available for image file types.

eslint.config.js

@@ -25,12 +25,12 @@ export const defaultESLintIgnores = [
 let FlatConfig
 
 export const rootParserOptions = {
-  EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,
-  EXPERIMENTAL_useProjectService: {
-    allowDefaultProjectForFiles: ['./src/*.ts', './src/*.tsx'],
-  },
   sourceType: 'module',
   ecmaVersion: 'latest',
+  projectService: {
+    maximumDefaultProjectFileMatchCount_THIS_WILL_SLOW_DOWN_LINTING: 40,
+    allowDefaultProject: ['scripts/*.ts', '*.js', '*.mjs', '*.spec.ts', '*.d.ts'],
+  },
 }
 
 /** @type {FlatConfig[]} */
@@ -39,20 +39,12 @@ export const rootEslintConfig = [
   {
     ignores: [
       ...defaultESLintIgnores,
+      'packages/eslint-*/**',
       'test/live-preview/next-app',
       'packages/**/*.spec.ts',
       'templates/**',
     ],
   },
-  {
-    languageOptions: {
-      parserOptions: {
-        project: './tsconfig.json',
-        tsconfigDirName: import.meta.dirname,
-        ...rootParserOptions,
-      },
-    },
-  },
   {
     plugins: {
       payload: payloadPlugin,
@@ -61,6 +53,7 @@ export const rootEslintConfig = [
       'payload/no-jsx-import-statements': 'warn',
       'payload/no-relative-monorepo-imports': 'error',
       'payload/no-imports-from-exports-dir': 'error',
+      'payload/no-imports-from-self': 'error',
     },
   },
   {
@@ -76,6 +69,15 @@ export const rootEslintConfig = [
 
 export default [
   ...rootEslintConfig,
+  {
+    languageOptions: {
+      parserOptions: {
+        ...rootParserOptions,
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
   {
     files: ['packages/eslint-config/**/*.ts'],
     rules: {

examples/auth/next-app/app/_components/Header/index.module.scss

@@ -15,7 +15,7 @@
   width: 150px;
 }
 
-:global([data-theme="light"]) {
+:global([data-theme='light']) {
   .logo {
     filter: invert(1);
   }

examples/auth/next-app/app/_components/RenderParams/index.tsx

@@ -10,12 +10,12 @@ export const RenderParams: React.FC<{
   className?: string
 }> = ({ params = ['error', 'message', 'success'], message, className }) => {
   const searchParams = useSearchParams()
-  const paramValues = params.map(param => searchParams.get(param)).filter(Boolean)
+  const paramValues = params.map((param) => searchParams.get(param)).filter(Boolean)
 
   if (paramValues.length) {
     return (
       <div className={className}>
-        {paramValues.map(paramValue => (
+        {paramValues.map((paramValue) => (
           <Message
             key={paramValue}
             message={(message || 'PARAM')?.replace('PARAM', paramValue || '')}

examples/auth/next-app/app/_css/app.scss

@@ -1,7 +1,7 @@
 @use './queries.scss' as *;
 @use './colors.scss' as *;
 @use './type.scss' as *;
-@import "./theme.scss";
+@import './theme.scss';
 
 :root {
   --base: 24px;
@@ -88,7 +88,7 @@ p {
   margin: var(--base) 0;
 
   @include mid-break {
-    margin: calc(var(--base) * .75) 0;
+    margin: calc(var(--base) * 0.75) 0;
   }
 }
 
@@ -102,12 +102,12 @@ a {
   color: currentColor;
 
   &:focus {
-    opacity: .8;
+    opacity: 0.8;
     outline: none;
   }
 
   &:active {
-    opacity: .7;
+    opacity: 0.7;
     outline: none;
   }
 }

examples/auth/next-app/app/_providers/Auth/index.tsx

@@ -16,7 +16,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode; api?: 'rest' |
   const [user, setUser] = useState<User | null>()
 
   const create = useCallback<Create>(
-    async args => {
+    async (args) => {
       if (api === 'rest') {
         const user = await rest(`${process.env.NEXT_PUBLIC_PAYLOAD_URL}/api/users`, args)
         setUser(user)
@@ -38,7 +38,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode; api?: 'rest' |
   )
 
   const login = useCallback<Login>(
-    async args => {
+    async (args) => {
       if (api === 'rest') {
         const user = await rest(`${process.env.NEXT_PUBLIC_PAYLOAD_URL}/api/users/login`, args)
         setUser(user)
@@ -110,7 +110,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode; api?: 'rest' |
   }, [api])
 
   const forgotPassword = useCallback<ForgotPassword>(
-    async args => {
+    async (args) => {
       if (api === 'rest') {
         const user = await rest(
           `${process.env.NEXT_PUBLIC_PAYLOAD_URL}/api/users/forgot-password`,
@@ -132,7 +132,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode; api?: 'rest' |
   )
 
   const resetPassword = useCallback<ResetPassword>(
-    async args => {
+    async (args) => {
       if (api === 'rest') {
         const user = await rest(
           `${process.env.NEXT_PUBLIC_PAYLOAD_URL}/api/users/reset-password`,

examples/auth/next-app/app/account/AccountForm/index.module.scss

@@ -1,4 +1,4 @@
-@import "../../_css/common";
+@import '../../_css/common';
 
 .form {
   margin-bottom: var(--base);

examples/auth/next-app/app/account/AccountForm/index.tsx

@@ -139,7 +139,7 @@ export const AccountForm: React.FC = () => {
             label="Confirm Password"
             required
             register={register}
-            validate={value => value === password.current || 'The passwords do not match'}
+            validate={(value) => value === password.current || 'The passwords do not match'}
             error={errors.passwordConfirm}
           />
         </Fragment>

examples/auth/next-app/app/create-account/CreateAccountForm/index.module.scss

@@ -1,4 +1,4 @@
-@import "../../_css/common";
+@import '../../_css/common';
 
 .form {
   margin-bottom: var(--base);

examples/auth/next-app/app/create-account/CreateAccountForm/index.tsx

@@ -103,7 +103,7 @@ export const CreateAccountForm: React.FC = () => {
         label="Confirm Password"
         required
         register={register}
-        validate={value => value === password.current || 'The passwords do not match'}
+        validate={(value) => value === password.current || 'The passwords do not match'}
         error={errors.passwordConfirm}
       />
       <Button

examples/auth/next-app/app/create-account/index.module.scss

@@ -1,4 +1,4 @@
-@import "../_css/common";
+@import '../_css/common';
 
 .createAccount {
   margin-bottom: var(--block-padding);

examples/auth/next-app/app/login/LoginForm/index.module.scss

@@ -1,4 +1,4 @@
-@import "../../_css/common";
+@import '../../_css/common';
 
 .form {
   margin-bottom: var(--base);

examples/auth/next-app/app/login/index.module.scss

@@ -1,4 +1,4 @@
-@import "../_css/common";
+@import '../_css/common';
 
 .login {
   margin-bottom: var(--block-padding);

examples/auth/next-app/app/logout/LogoutPage/index.tsx

@@ -5,7 +5,7 @@ import Link from 'next/link'
 
 import { useAuth } from '../../_providers/Auth'
 
-export const LogoutPage: React.FC = props => {
+export const LogoutPage: React.FC = (props) => {
   const { logout } = useAuth()
   const [success, setSuccess] = useState('')
   const [error, setError] = useState('')

examples/auth/next-app/app/recover-password/RecoverPasswordForm/index.module.scss

@@ -1,4 +1,4 @@
-@import "../../_css/common";
+@import '../../_css/common';
 
 .error {
   color: red;
@@ -20,4 +20,3 @@
 .message {
   margin-bottom: var(--base);
 }
-

examples/auth/next-app/app/recover-password/index.module.scss

@@ -1,4 +1,4 @@
-@import "../_css/common";
+@import '../_css/common';
 
 .recoverPassword {
   margin-bottom: var(--block-padding);

examples/auth/next-app/app/reset-password/ResetPasswordForm/index.module.scss

@@ -1,4 +1,4 @@
-@import "../../_css/common";
+@import '../../_css/common';
 
 .form {
   width: 66.66%;