chore: adds db name

.github/CODEOWNERS

@@ -1,23 +1,24 @@
 # 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 @DanRibbens
+/**/exports/ @denolfe @jmikrut
 
 ### Packages ###
-/packages/plugin-cloud*/src/ @denolfe
-/packages/email-*/src/ @denolfe
-/packages/storage-*/src/ @denolfe
-/packages/create-payload-app/src/ @denolfe
-/packages/eslint-*/ @denolfe @AlessioGr
+/packages/richtext-*/ @AlessioGr
+/packages/plugin-cloud*/ @denolfe
+/packages/email-*/ @denolfe
+/packages/storage-*/ @denolfe
+/packages/create-payload-app/ @denolfe
+/packages/eslint-*/ @denolfe
 
 ### Templates ###
-/templates/_data/ @denolfe
-/templates/_template/ @denolfe
+/templates/ @jacobsfletch @denolfe
 
 ### Build Files ###
+/**/package.json @denolfe
 /tsconfig.json @denolfe
 /**/tsconfig*.json @denolfe
+
 /jest.config.js @denolfe
 /**/jest.config.js @denolfe
 
@@ -25,5 +26,5 @@
 /package.json @denolfe
 /scripts/ @denolfe
 /.husky/ @denolfe
-/.vscode/ @denolfe @AlessioGr
+/.vscode/ @denolfe
 /.github/ @denolfe

.github/actions/setup/action.yml

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

.github/workflows/main.yml

@@ -18,7 +18,7 @@ concurrency:
 
 env:
   NODE_VERSION: 18.20.2
-  PNPM_VERSION: 9.7.1
+  PNPM_VERSION: 8.15.7
   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@v4
+        uses: pnpm/action-setup@v3
         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@v4
+        uses: pnpm/action-setup@v3
         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@v4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -196,7 +196,6 @@ jobs:
           - postgres-custom-schema
           - postgres-uuid
           - supabase
-          - sqlite
     env:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -207,9 +206,6 @@ 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
@@ -220,12 +216,17 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
 
-      - run: pnpm install
+      - name: Restore build
+        uses: actions/cache@v4
+        timeout-minutes: 10
+        with:
+          path: ./*
+          key: ${{ github.sha }}-${{ github.run_number }}
 
       - name: Start LocalStack
         run: pnpm docker:start
@@ -330,7 +331,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -369,7 +370,7 @@ jobs:
         run: pnpm exec playwright install-deps chromium
 
       - name: E2E Tests
-        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e:prod:ci ${{ matrix.suite }}
+        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e ${{ matrix.suite }}
         env:
           PLAYWRIGHT_JSON_OUTPUT_NAME: results_${{ matrix.suite }}.json
           NEXT_TELEMETRY_DISABLED: 1
@@ -405,7 +406,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -418,15 +419,15 @@ jobs:
           key: ${{ github.sha }}-${{ github.run_number }}
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.11.0
+        uses: supercharge/mongodb-github-action@1.10.0
         with:
           mongodb-version: 6.0
 
       - name: Pack and build app
         run: |
           set -ex
-          pnpm run script:pack --dest templates/blank
-          cd templates/blank
+          pnpm run script:pack --dest templates/blank-3.0
+          cd templates/blank-3.0
           cp .env.example .env
           ls -la
           pnpm add ./*.tgz --ignore-workspace
@@ -449,7 +450,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -490,7 +491,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.11.0
+        uses: supercharge/mongodb-github-action@1.10.0
         with:
           mongodb-version: 6.0
 
@@ -518,7 +519,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
@@ -547,16 +548,3 @@ 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/release-canary.yml

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

.gitignore

@@ -5,7 +5,6 @@ dist
 !/.idea/runConfigurations
 !/.idea/payload.iml
 
-test/packed
 test-results
 .devcontainer
 .localstack
@@ -154,7 +153,6 @@ out
 # Nuxt.js build / generate output
 .nuxt
 dist
-dist_optimized
 
 # Gatsby files
 .cache/
@@ -302,11 +300,3 @@ $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,7 +26,6 @@
       <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" />

.idea/runConfigurations/Run_Dev_Fields.xml

@@ -1,13 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <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 />
+  <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>
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Run_Dev__community.xml

@@ -1,13 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <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 />
+  <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>
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Run_Dev_admin.xml

@@ -1,13 +0,0 @@
-<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="--no-deprecation" />
+    <node-options value="--experimental-vm-modules --no-deprecation" />
     <envs />
     <scope-kind value="ALL" />
     <method v="2" />

.npmrc

@@ -1,3 +1,2 @@
 symlink=true
-node-linker=isolated
-hoist-workspace-packages=false # the default in pnpm v9 is true, but that can break our runtime dependency checks
+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

.vscode/launch.json

@@ -56,20 +56,6 @@
       "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

@@ -42,8 +42,8 @@
     }
   },
   "files.insertFinalNewline": true,
-  "jestrunner.jestCommand": "pnpm exec cross-env NODE_OPTIONS=\"--no-deprecation\" node 'node_modules/jest/bin/jest.js'",
+  "jestrunner.jestCommand": "pnpm exec cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" node 'node_modules/jest/bin/jest.js'",
   "jestrunner.debugOptions": {
-    "runtimeArgs": ["--no-deprecation"]
+    "runtimeArgs": ["--experimental-vm-modules", "--no-deprecation"]
   }
 }

app/(app)/layout.tsx

@@ -1,14 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,8 +5,6 @@ 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[]
@@ -19,7 +17,6 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const NotFound = ({ params, searchParams }: Args) =>
-  NotFoundPage({ config, importMap, params, searchParams })
+const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
 
 export default NotFound

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

@@ -5,8 +5,6 @@ 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[]
@@ -19,7 +17,6 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const Page = ({ params, searchParams }: Args) =>
-  RootPage({ config, importMap, params, searchParams })
+const Page = ({ params, searchParams }: Args) => RootPage({ config, params, searchParams })
 
 export default Page

app/(payload)/layout.tsx

@@ -1,9 +1,6 @@
 /* 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'
@@ -14,10 +11,6 @@ type Args = {
   children: React.ReactNode
 }
 
-const Layout = ({ children }: Args) => (
-  <RootLayout config={configPromise} importMap={importMap}>
-    {children}
-  </RootLayout>
-)
+const Layout = ({ children }: Args) => <RootLayout config={configPromise}>{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 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). |
+| **`description`**                | Text or React component to display below the Collection label in the List View to give editors more information.                                                                                      |
 | **`defaultColumns`**             | Array of field names that correspond to which columns to show by default in this Collection's List View.                                                                                              |
 | **`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`**                       | Page metadata overrides to apply to this Collection within the Admin Panel. [More details](./metadata).                                                                           |
+| **`meta`**                       | Metadata overrides to apply to the Admin Panel. Included properties are `description` and `openGraph`.                                                                           |
 | **`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,6 +51,7 @@ 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 = {
   // ...
@@ -69,8 +70,7 @@ 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
-| **`Description`**          | A component to render below the Collection label in the List View. An alternative to the `admin.description` property. |
+| **`afterListTable`**       | An array of components to inject _after_ the built-in List View's table                                                   |
 | **`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,220 +24,6 @@ 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.
@@ -247,6 +33,8 @@ 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: {
@@ -293,11 +81,13 @@ 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: ['/path/to/MyProvider'], // highlight-line
+      providers: [MyProvider], // highlight-line
     },
   },
 })
@@ -417,7 +207,7 @@ import React from 'react'
 import { useConfig } from '@payloadcms/ui'
 
 export const MyClientComponent: React.FC = () => {
-  const { config: { serverURL } } = useConfig() // highlight-line
+  const { serverURL } = useConfig() // highlight-line
 
   return (
     <Link href={serverURL}>
@@ -431,22 +221,6 @@ export const MyClientComponent: React.FC = () => {
   See [Using Hooks](#using-hooks) for more details.
 </Banner>
 
-All [Field Components](./fields) automatically receive their respective Client Field Config through a common [`field`](./fields#the-field-prop) prop:
-
-```tsx
-'use client'
-import React from 'react'
-import type { TextFieldProps } from 'payload'
-
-export const MyClientFieldComponent: TextFieldProps = ({ 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: '/path/to/MyFieldComponent', // highlight-line
+          Field: MyFieldComponent, // highlight-line
         },
       },
     }
@@ -135,12 +135,32 @@ All Field Components receive the following props:
 
 | Property         | Description                                                                                                                                                                                                                      |
 | ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`docPreferences`** | An object that contains the [Preferences](./preferences) for the document.
-| **`field`** | The sanitized, client-friendly version of the field's config. [More details](#the-field-prop) |
+| **`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.                                                                                                                                                                   |
 | **`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>
@@ -173,105 +193,6 @@ 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 props to ensure type safety in your component. There is an explicit type for the Field Component, one for every [Field Type](../fields/overview). The convention is to append `Props` to the type of field, i.e. `TextFieldProps`.
-
-```tsx
-import type {
-  ArrayFieldProps,
-  BlocksFieldProps,
-  CheckboxFieldProps,
-  CodeFieldProps,
-  CollapsibleFieldProps,
-  DateFieldProps,
-  EmailFieldProps,
-  GroupFieldProps,
-  HiddenFieldProps,
-  JSONFieldProps,
-  NumberFieldProps,
-  PointFieldProps,
-  RadioFieldProps,
-  RelationshipFieldProps,
-  RichTextFieldProps,
-  RowFieldProps,
-  SelectFieldProps,
-  TabsFieldProps,
-  TextFieldProps,
-  TextareaFieldProps,
-  UploadFieldProps
-} from 'payload'
-```
-
-### The `field` Prop
-
-All Field Components are passed a client-friendly version of their Field Config through a common `field` prop. Since the raw Field Config is [non-serializable](https://react.dev/reference/rsc/use-client#serializable-types), Payload sanitized it into a [Client Config](./components#accessing-the-payload-config) that is safe to pass into Client Components.
-
-The exact shape of this prop is unique to the specific [Field Type](../fields/overview) being rendered, minus all non-serializable properties. Any [Custom Components](../components) are also resolved into a "mapped component" that is safe to pass.
-
-```tsx
-'use client'
-import React from 'react'
-import type { TextFieldProps } from 'payload'
-
-export const MyClientFieldComponent: React.FC<TextFieldProps> = ({ field: { name } }) => {
-  return (
-    <p>
-      {`This field's name is ${name}`}
-    </p>
-  )
-}
-```
-
-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). The convention is to append `Client` to the type of field, i.e. `TextFieldClient`.
-
-```tsx
-import type {
-  ArrayFieldClient,
-  BlocksFieldClient,
-  CheckboxFieldClient,
-  CodeFieldClient,
-  CollapsibleFieldClient,
-  DateFieldClient,
-  EmailFieldClient,
-  GroupFieldClient,
-  HiddenFieldClient,
-  JSONFieldClient,
-  NumberFieldClient,
-  PointFieldClient,
-  RadioFieldClient,
-  RelationshipFieldClient,
-  RichTextFieldClient,
-  RowFieldClient,
-  SelectFieldClient,
-  TabsFieldClient,
-  TextFieldClient,
-  TextareaFieldClient,
-  UploadFieldClient
-} from 'payload'
-```
-
-When working on the client, you will never have access to objects of type `Field`. This is reserved for the server-side. Instead, you can use `ClientField` which is a union type of all the client fields:
-
-```tsx
-import type { ClientField } 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.
@@ -286,7 +207,7 @@ export const myField: Field = {
   type: 'text',
   admin: {
     components: {
-      Cell: '/path/to/MyCustomCellComponent', // highlight-line
+      Cell: MyCustomCell, // highlight-line
     },
   },
 }
@@ -298,9 +219,20 @@ All Cell Components receive the following props:
 
 | Property         | Description                                                       |
 | ---------------- | ----------------------------------------------------------------- |
-| **`field`** | The sanitized, client-friendly version of the field's config. [More details](#the-field-prop) |
+| **`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. |
 | **`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>
@@ -326,7 +258,7 @@ export const myField: Field = {
   type: 'text',
   admin: {
     components: {
-      Label: '/path/to/MyCustomLabelComponent', // highlight-line
+      Label: MyCustomLabel, // highlight-line
     },
   },
 }
@@ -338,7 +270,7 @@ Custom Label Components receive all [Field Component](#the-field-component) prop
 
 | Property       | Description                                                      |
 | -------------- | ---------------------------------------------------------------- |
-| **`field`** | The sanitized, client-friendly version of the field's config. [More details](#the-field-prop) |
+| **`schemaPath`** | The path to the field in the schema. Similar to `path`, but without dynamic indices. |
 
 <Banner type="success">
   <strong>Reminder:</strong>
@@ -347,13 +279,31 @@ Custom Label Components receive all [Field Component](#the-field-component) prop
 
 #### 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`.
+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). The convention is to append `ErrorComponent` to the type of field, i.e. `TextFieldErrorComponent`.
 
 ```tsx
 import type {
-  TextFieldLabelServerComponent,
-  TextFieldLabelClientComponent,
-  // And so on for each Field Type
+  ArrayFieldLabelComponent,
+  BlocksFieldLabelComponent,
+  CheckboxFieldLabelComponent,
+  CodeFieldLabelComponent,
+  CollapsibleFieldLabelComponent,
+  DateFieldLabelComponent,
+  EmailFieldLabelComponent,
+  GroupFieldLabelComponent,
+  HiddenFieldLabelComponent,
+  JSONFieldLabelComponent,
+  NumberFieldLabelComponent,
+  PointFieldLabelComponent,
+  RadioFieldLabelComponent,
+  RelationshipFieldLabelComponent,
+  RichTextFieldLabelComponent,
+  RowFieldLabelComponent,
+  SelectFieldLabelComponent,
+  TabsFieldLabelComponent,
+  TextFieldLabelComponent,
+  TextareaFieldLabelComponent,
+  UploadFieldLabelComponent
 } from 'payload'
 ```
 
@@ -371,7 +321,7 @@ export const myField: Field = {
   type: 'text',
   admin: {
     components: {
-      Error: '/path/to/MyCustomErrorComponent', // highlight-line
+      Error: MyCustomError, // highlight-line
     },
   },
 }
@@ -383,7 +333,7 @@ Custom Error Components receive all [Field Component](#the-field-component) prop
 
 | Property        | Description                                                   |
 | --------------- | ------------------------------------------------------------- |
-| **`field`** | The sanitized, client-friendly version of the field's config. [More details](#the-field-prop) |
+| **`path`***       | The static path of the field at render time. [More details](./hooks#usefieldprops). |
 
 <Banner type="success">
   <strong>Reminder:</strong>
@@ -392,13 +342,31 @@ Custom Error Components receive all [Field Component](#the-field-component) prop
 
 #### 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`.
+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). The convention is to append `ErrorComponent` to the type of field, i.e. `TextFieldErrorComponent`.
 
 ```tsx
 import type {
-  TextFieldErrorServerComponent,
-  TextFieldErrorClientComponent,
-  // And so on for each Field Type
+  ArrayFieldErrorComponent,
+  BlocksFieldErrorComponent,
+  CheckboxFieldErrorComponent,
+  CodeFieldErrorComponent,
+  CollapsibleFieldErrorComponent,
+  DateFieldErrorComponent,
+  EmailFieldErrorComponent,
+  GroupFieldErrorComponent,
+  HiddenFieldErrorComponent,
+  JSONFieldErrorComponent,
+  NumberFieldErrorComponent,
+  PointFieldErrorComponent,
+  RadioFieldErrorComponent,
+  RelationshipFieldErrorComponent,
+  RichTextFieldErrorComponent,
+  RowFieldErrorComponent,
+  SelectFieldErrorComponent,
+  TabsFieldErrorComponent,
+  TextFieldErrorComponent,
+  TextareaFieldErrorComponent,
+  UploadFieldErrorComponent
 } from 'payload'
 ```
 
@@ -475,6 +443,7 @@ 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 = {
   // ...
@@ -485,7 +454,7 @@ export const MyCollectionConfig: SanitizedCollectionConfig = {
       type: 'text',
       admin: {
         components: {
-          Description: '/path/to/MyCustomDescriptionComponent', // highlight-line
+          Description: MyCustomDescription, // highlight-line
         }
       }
     }
@@ -499,7 +468,7 @@ Custom Description Components receive all [Field Component](#the-field-component
 
 | Property       | Description                                                      |
 | -------------- | ---------------------------------------------------------------- |
-| **`field`** | The sanitized, client-friendly version of the field's config. [More details](#the-field-prop) |
+| **`description`**    | The `description` property defined in the [Field Config](../fields/overview).         |
 
 <Banner type="success">
   <strong>Reminder:</strong>
@@ -508,13 +477,31 @@ Custom Description Components receive all [Field Component](#the-field-component
 
 #### 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`.
+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). The convention is to append `DescriptionComponent` to the type of field, i.e. `TextFieldDescriptionComponent`.
 
 ```tsx
 import type {
-  TextFieldDescriptionServerComponent,
-  TextFieldDescriptionClientComponent,
-  // And so on for each Field Type
+  ArrayFieldDescriptionComponent,
+  BlocksFieldDescriptionComponent,
+  CheckboxFieldDescriptionComponent,
+  CodeFieldDescriptionComponent,
+  CollapsibleFieldDescriptionComponent,
+  DateFieldDescriptionComponent,
+  EmailFieldDescriptionComponent,
+  GroupFieldDescriptionComponent,
+  HiddenFieldDescriptionComponent,
+  JSONFieldDescriptionComponent,
+  NumberFieldDescriptionComponent,
+  PointFieldDescriptionComponent,
+  RadioFieldDescriptionComponent,
+  RelationshipFieldDescriptionComponent,
+  RichTextFieldDescriptionComponent,
+  RowFieldDescriptionComponent,
+  SelectFieldDescriptionComponent,
+  TabsFieldDescriptionComponent,
+  TextFieldDescriptionComponent,
+  TextareaFieldDescriptionComponent,
+  UploadFieldDescriptionComponent
 } from 'payload'
 ```
 
@@ -537,8 +524,8 @@ export const MyCollectionConfig: SanitizedCollectionConfig = {
       admin: {
         components: {
           // highlight-start
-          beforeInput: ['/path/to/MyCustomComponent'],
-          afterInput: ['/path/to/MyOtherCustomComponent'],
+          beforeInput: [MyCustomComponent],
+          afterInput: [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`**        | Page metadata overrides to apply to this Global within the Admin Panel. [More details](./metadata).                                                                           |
+| **`meta`**        | Metadata overrides to apply to the Admin Panel. Included properties are `description` and `openGraph`.       |
 
 ### Components
 
@@ -43,6 +43,7 @@ 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 FieldType<T> = {
+type FieldResult<T> = {
   errorMessage?: string
   errorPaths?: string[]
   filterOptions?: FilterOptionsResult
@@ -65,7 +65,7 @@ type FieldType<T> = {
   readOnly?: boolean
   rows?: Row[]
   schemaPath: string
-  setValue: (val: unknown, disableModifyingForm?: boolean) => void
+  setValue: (val: unknown, disableModifyingForm?: boolean) => voi
   showError: boolean
   valid?: boolean
   value: T
@@ -74,9 +74,9 @@ type FieldType<T> = {
 
 ## useFieldProps
 
-[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.
+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.
 
-You can use the `useFieldProps` hooks to access dynamic props like `path`:
+For this reason, dynamic props like `path` are managed in their own React context, which can be accessed using the `useFieldProps` hook:
 
 ```tsx
 'use client'
@@ -463,7 +463,7 @@ export const CustomArrayManager = () => {
       name: "customArrayManager",
       admin: {
         components: {
-          Field: '/path/to/CustomArrayManagerField',
+          Field: CustomArrayManager,
         },
       },
     },
@@ -560,7 +560,7 @@ export const CustomArrayManager = () => {
       name: "customArrayManager",
       admin: {
         components: {
-          Field: '/path/to/CustomArrayManagerField',
+          Field: CustomArrayManager,
         },
       },
     },
@@ -670,7 +670,7 @@ export const CustomArrayManager = () => {
       name: "customArrayManager",
       admin: {
         components: {
-          Field: '/path/to/CustomArrayManagerField',
+          Field: CustomArrayManager,
         },
       },
     },
@@ -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

@@ -1,216 +0,0 @@
----
-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

@@ -88,17 +88,17 @@ The following options are available:
 
 | 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).                                          |
+| `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. 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).                                          |
 
 <Banner type="success">
   <strong>Reminder:</strong>
@@ -167,12 +167,12 @@ 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.                           |
+| 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>

docs/admin/views.mdx

@@ -31,9 +31,7 @@ const config = buildConfig({
   admin: {
     components: {
       views: {
-        dashboard: {
-          Component: '/path/to/MyCustomDashboardView#MyCustomDashboardViewComponent', // highlight-line
-        }
+        Dashboard: MyCustomDashboardView, // highlight-line
       },
     },
   },
@@ -46,19 +44,18 @@ 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 path that should be rendered when a user navigates to this route.                                                                                                         |
+| **`Component`** \* | Pass in the component 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.
-| **`meta`**         | Page metadata overrides to apply to this view within the Admin Panel. [More details](./metadata).                                                                           |
+| **`sensitive`**    | When true, will match if the path is case sensitive.                                                                                                                                       |
 
 _\* An asterisk denotes that a property is required._
 
@@ -75,9 +72,9 @@ const config = buildConfig({
     components: {
       views: {
         // highlight-start
-        myCustomView: {
+        MyCustomView: {
         // highlight-end
-          Component: '/path/to/MyCustomView#MyCustomViewComponent',
+          Component: MyCustomView,
           path: '/my-custom-view',
         },
       },
@@ -111,22 +108,7 @@ export const MyCollectionConfig: SanitizedCollectionConfig = {
   admin: {
     components: {
       views: {
-        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',
-        }
+        Edit: MyCustomEditView, // highlight-line
       },
     },
   },
@@ -137,15 +119,15 @@ _For details on how to build Custom Views, see [Building Custom Views](#building
 
 <Banner type="warning">
   <strong>Note:</strong>
-  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.
+  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.
 </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>
@@ -166,36 +148,25 @@ export const MyGlobalConfig: SanitizedGlobalConfig = {
   admin: {
     components: {
       views: {
-        edit: {
-          root: {
-            Component: '/path/to/MyCustomEditView', // highlight-line
-          }
-          // other options include:
-          // default
-          // versions
-          // version
-          // api
-          // livePreview
-          // [key: string]
-        },
+        Edit: MyCustomEditView, // highlight-line
       },
     },
   },
-}
+})
 ```
 
 _For details on how to build Custom Views, see [Building Custom Views](#building-custom-views)._
 
 <Banner type="warning">
   <strong>Note:</strong>
-  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.
+  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.
 </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>
@@ -216,38 +187,37 @@ export const MyCollectionOrGlobalConfig: SanitizedCollectionConfig = {
   admin: {
     components: {
       views: {
-        edit: {
-          api: {
-            Component: '/path/to/MyCustomAPIViewComponent', // highlight-line
+        Edit: {
+          API: {
+            Component: MyCustomAPIView, // highlight-line
           },
         },
       },
     },
   },
-}
+})
 ```
 
 _For details on how to build Custom Views, 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 `root` key. 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 `Edit` key itself. See [Custom Collection Views](#collection-views) or [Custom Global Views](#global-views) for more information.
 </Banner>
 
 The following options are available:
 
 | Property          | Description                                                                                                                 |
 | ----------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| **`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).                        |
+| **`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).                        |
 
 ### 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 `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 `Component.Tab` key:
 
 ```ts
 import type { SanitizedCollectionConfig } from 'payload'
@@ -257,19 +227,17 @@ export const MyCollection: SanitizedCollectionConfig = {
   admin: {
     components: {
       views: {
-        edit: {
-          myCustomTab: {
-            Component: '/path/to/MyCustomTab',
+        Edit: {
+          MyCustomTab: {
+            Component: MyCustomTab,
             path: '/my-custom-tab',
-            tab: {
-              Component: '/path/to/MyCustomTabComponent' // highlight-line
-            }
+            Tab: MyCustomTab // highlight-line
           },
-          anotherCustomTab: {
-            Component: '/path/to/AnotherCustomView',
+          AnotherCustomView: {
+            Component: AnotherCustomView,
             path: '/another-custom-view',
             // highlight-start
-            tab: {
+            Tab: {
               label: 'Another Custom View',
               href: '/another-custom-view',
             }
@@ -293,15 +261,14 @@ 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: {
-          Component: '/path/to/MyCustomView' // highlight-line
-        }
+        Edit: MyCustomView, // highlight-line
       },
     },
   },

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 type { CollectionConfig, SanitizedCollectionConfig } from 'payload'
+import { 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 type { GlobalConfig, SanitizedGlobalConfig } from 'payload'
+import { GlobalConfig, SanitizedGlobalConfig } from 'payload'
 ```

docs/configuration/overview.mdx

@@ -36,6 +36,7 @@ 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,
@@ -245,11 +246,5 @@ 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 type { Config, SanitizedConfig } from 'payload'
+import { 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.

docs/database/migrations.mdx

@@ -211,32 +211,3 @@ 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

@@ -33,6 +33,9 @@ export default buildConfig({
 | Option               | Description |
 | -------------------- | ----------- |
 | `autoPluralization`  | Tell Mongoose to auto-pluralize any collection names if it encounters any singular words used as collection `slug`s. |
+| `schemaOptions`      | Customize schema options for all Mongoose schemas created internally.   |
+| `collections`        | Options on a collection-by-collection basis. [More](#collections-options)  |
+| `globals`            | Options for the Globals collection created by Payload. [More](#globals-options) |
 | `connectOptions`     | Customize MongoDB connection options. Payload will connect to your MongoDB database using default options which you can override and extend to include all the [options](https://mongoosejs.com/docs/connections.html#options) available to mongoose. |
 | `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. |
@@ -49,3 +52,27 @@ You can access Mongoose models as follows:
 - Collection models - `payload.db.collections[myCollectionSlug]`
 - Globals model - `payload.db.globals`
 - Versions model (both collections and globals) - `payload.db.versions[myEntitySlug]`
+
+### Collections Options
+
+You can configure the way the MongoDB adapter works on a collection-by-collection basis, including customizing Mongoose `schemaOptions` for each collection schema created.
+
+Example:
+
+```ts
+const db = mongooseAdapter({
+  url: 'your-url-here',
+  collections: {
+    users: {
+      // 
+      schemaOptions: {
+        strict: false,
+      }
+    }
+  }
+})
+```
+
+### Global Options
+
+Payload automatically creates a single `globals` collection that correspond with any Payload globals that you define. When you initialize the `mongooseAdapter`, you can specify settings here for your globals in a similar manner to how you can for collections above. Right now, the only property available is `schemaOptions` but more may be added in the future.

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/)
-- [SQLite](/docs/database/sqlite) with [Drizzle](https://drizzle.team/)
+- Coming soon: SQLite and MySQL using Drizzle.
 
 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 or SQLite if:
+You should prefer a relational DB like Postgres if:
 
 - You are comfortable with [Migrations](./migrations)
 - You require enforced data consistency at the database level

docs/database/postgres.mdx

@@ -8,20 +8,18 @@ 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.
@@ -33,28 +31,11 @@ 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` or to `@vercel/postgres`              |
+|-----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `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.                                                                                           |

docs/fields/overview.mdx

@@ -205,9 +205,7 @@ export const MyField: Field = {
 }
 ```
 
-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:
+Default values can be defined as a static string or a function that returns a string. Functions are called with the following arguments:
 
 - `user` - the authenticated user object
 - `locale` - the currently selected locale string

docs/fields/ui.mdx

@@ -54,8 +54,8 @@ export const ExampleCollection: CollectionConfig = {
       type: 'ui', // required
       admin: {
         components: {
-          Field: '/path/to/MyCustomUIField',
-          Cell: '/path/to/MyCustomUICell',
+          Field: MyCustomUIField,
+          Cell: MyCustomUICell,
         },
       },
     },

docs/fields/upload.mdx

@@ -57,7 +57,6 @@ export const MyUploadField: Field = {
 | **`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. [Admin Options](../admin/fields#admin-options).                                                    |

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-vercel-postgres`, `@payloadcms/db-mongodb`
+`@payloadcms/db-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/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-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:
 
 ```plaintext
 app/

docs/lexical/migration.mdx

@@ -18,10 +18,9 @@ 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/migrate'
+import { migrateSlateToLexical } from '@payloadcms/richtext-lexical'
 
 await migrateSlateToLexical({ payload })
 ```
@@ -35,8 +34,7 @@ Simply add the `SlateToLexicalFeature` to your editor:
 ```ts
 import type { CollectionConfig } from 'payload'
 
-import { SlateToLexicalFeature } from '@payloadcms/richtext-lexical/migrate'
-import { lexicalEditor } from '@payloadcms/richtext-lexical'
+import { SlateToLexicalFeature, lexicalEditor } from '@payloadcms/richtext-lexical'
 
 const Pages: CollectionConfig = {
   slug: 'pages',
@@ -66,8 +64,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/migrate'
+import type { SerializedUploadNode } from '../uploadNode.'
+import type { SlateNodeConverter } from '@payloadcms/richtext-lexical'
 
 export const SlateUploadConverter: SlateNodeConverter = {
   converter({ slateNode }) {
@@ -97,9 +95,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,16 +16,38 @@ Payload can be used completely outside of Next.js which is helpful in cases like
 
 ## Importing the Payload Config outside of Next.js
 
-Payload provides a convenient way to run standalone scripts, which can be useful for tasks like seeding your database or performing one-off operations.
+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.
 
-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.
+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.
 
 ```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'
-import config from '@payload-config'
+
+// 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'),
+})
 
 const seed = async () => {
   // Get a local copy of Payload by passing your config
@@ -49,39 +71,6 @@ const seed = async () => {
 }
 
 // Call the function here to run your seed script
-await seed()
+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,16 +62,19 @@ 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. Instead of using `getPayloadHMR`, you can use `getPayload`.
+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.
 
 ```ts
 import { getPayload } from 'payload'
-import config from '@payload-config'
+import { importConfig } from 'payload/node'
 
+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. 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. 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).
 
 ## Local options available
 

docs/migration-guide/overview.mdx

@@ -159,6 +159,7 @@ import {
   useAllFormFields,
   useAuth,
   useClientFunctions,
+  useComponentMap,
   useConfig,
   useDebounce,
   useDebouncedCallback,
@@ -211,6 +212,7 @@ import {
   ActionsProvider,
   AuthProvider,
   ClientFunctionProvider,
+  ComponentMapProvider,
   ConfigProvider,
   DocumentEventsProvider,
   DocumentInfoProvider,
@@ -297,10 +299,14 @@ import {
   fieldBaseClass,
 
   // TS Types
+  ActionMap,
+  CollectionComponentMap,
   ColumnPreferences,
+  ConfigComponentMapBase,
   DocumentInfoContext,
   DocumentInfoProps,
   FieldType,
+  FieldComponentProps,
   FormProps,
   RowLabelProps,
   SelectFieldProps,
@@ -317,6 +323,7 @@ import {
   AppHeader,
   BlocksDrawer,
   Column,
+  ComponentMap,
   DefaultBlockImage,
   DeleteMany,
   DocumentControls,
@@ -331,6 +338,7 @@ import {
   FormLoadingOverlayToggle,
   FormSubmit,
   GenerateConfirmation,
+  GlobalComponentMap,
   HydrateClientUser,
   ListControls,
   ListSelection,
@@ -341,8 +349,7 @@ import {
   PublishMany,
   ReactSelect,
   ReactSelectOption,
-  ClientField,
-  ClientBlock,
+  ReducedBlock,
   RenderFields,
   SectionTitle,
   Select,
@@ -467,10 +474,10 @@ export const ServerRenderedDescription = () => <ClientRenderedDescription />
 // file: components/ClientRenderedDescription.tsx
 'use client'
 import React from 'react'
-import type { TextFieldDescriptionClientComponent } from 'payload'
+import type { DescriptionComponent } from 'payload'
 import { useFieldProps, useFormFields } from '@payloadcms/ui'
 
-export const ClientRenderedDescription: TextFieldDescriptionClientComponent = () ={
+export const ClientRenderedDescription: DescriptionComponent = () ={
   const { path } = useFieldProps()
   const { value } = useFormFields(([fields]) => fields[path])
   const customDescription = `Component description: ${path} - ${value}`
@@ -659,8 +666,8 @@ export const ClientArrayRowLabel = () => {
   admin: {
     components: {
       views: {
-        edit: {
-          tab: {
+        Edit: {
+          Tab: {
             pillLabel: '',
           },
         },
@@ -675,11 +682,9 @@ export const ClientArrayRowLabel = () => {
   admin: {
     components: {
       views: {
-        edit: {
-          tab: {
-            pill: {
-              Component: './path/to/CustomPill.js',
-            },
+        Edit: {
+          Tab: {
+            Pill: MyPill,
           },
         },
       },
@@ -711,7 +716,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 `SanitizedConfig`.
+17. The `useConfig` hook now returns a `ClientConfig` and not a `SanizitedConfig`.
 
 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: 20
+order: 50
 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,60 +159,36 @@ export const seed = async (payload: Payload): Promise<void> => {
 
 ```
 
-## Building a Plugin
+## Overview of the src folder
 
 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 }
 
-    /**
-    * This is where you could modify the
-    * config based on the plugin options
-    */
+   // do something cool with the config here
 
-    // 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
  }
 ```
 
-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.
+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.
 
-
-### 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.
 
@@ -230,7 +206,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 array and object like properties such as admin, globals and hooks:
+This same logic is applied to other properties like admin, globals, hooks:
 
 ```
 config.globals = [
@@ -244,10 +220,7 @@ config.hooks = {
 }
 ```
 
-### 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:
+Some properties will be slightly different to extend, for instance the `onInit` property:
 
 ```
 config.onInit = async payload => {
@@ -258,6 +231,10 @@ 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: 40
+order: 20
 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, beforeChangeParams) => {
+  beforeEmail: (emailsToSend) => {
     // modify the emails in any way before they are sent
     return emails.map((email) => ({
       ...email,
@@ -119,23 +119,6 @@ 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: 40
+order: 20
 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: 40
+order: 20
 desc: Automatically create redirects for your Payload application
 keywords: plugins, redirects, redirect, plugin, payload, cms, seo, indexing, search, search engine
 ---
@@ -66,8 +66,6 @@ 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.
 
@@ -85,10 +83,6 @@ redirectsPlugin({
       ]
     },
   },
-  redirectTypes: ['301', '302'],
-  redirectTypeFieldOverride: {
-    label: 'Redirect Type (Overridden)',
-  },
 })
 ```
 

docs/plugins/search.mdx

@@ -1,7 +1,7 @@
 ---
 title: Search Plugin
 label: Search
-order: 40
+order: 20
 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: 40
+order: 20
 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: 30
+order: 20
 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, req }) => `Website.com — ${doc?.title}`,
+    generateTitle: ({ ...docInfo, doc, locale }) => `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, req }) => doc?.excerpt,
+    generateDescription: ({ ...docInfo, doc, locale }) => 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, req }) => doc?.featuredImage,
+    generateImage: ({ ...docInfo, doc, locale }) => 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, req }) =>
+    generateURL: ({ ...docInfo, doc, locale }) =>
       `https://yoursite.com/${collection?.slug}/${doc?.slug}`,
   })
 }

docs/plugins/stripe.mdx

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

docs/upload/overview.mdx

@@ -92,13 +92,10 @@ _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.                                                     |
@@ -171,22 +168,6 @@ 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

@@ -28,7 +28,6 @@ export const rootParserOptions = {
   EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,
   EXPERIMENTAL_useProjectService: {
     allowDefaultProjectForFiles: ['./src/*.ts', './src/*.tsx'],
-    maximumDefaultProjectFileMatchCount_THIS_WILL_SLOW_DOWN_LINTING: 100,
   },
   sourceType: 'module',
   ecmaVersion: 'latest',
@@ -62,7 +61,6 @@ 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',
     },
   },
   {

examples/multi-tenant-single-domain/src/app/(payload)/admin/[[...segments]]/not-found.tsx

@@ -5,8 +5,6 @@ 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[]
@@ -19,7 +17,6 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const NotFound = ({ params, searchParams }: Args) =>
-  NotFoundPage({ config, importMap, params, searchParams })
+const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
 
 export default NotFound

examples/multi-tenant-single-domain/src/app/(payload)/admin/[[...segments]]/page.tsx

@@ -5,8 +5,6 @@ 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[]
@@ -19,7 +17,6 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const Page = ({ params, searchParams }: Args) =>
-  RootPage({ config, importMap, params, searchParams })
+const Page = ({ params, searchParams }: Args) => RootPage({ config, params, searchParams })
 
 export default Page

examples/multi-tenant-single-domain/src/app/(payload)/admin/importMap.js

@@ -1,7 +0,0 @@
-import { TenantFieldComponent as TenantFieldComponent_0 } from '@/fields/TenantField/components/Field'
-import { TenantSelectorRSC as TenantSelectorRSC_1 } from '@/components/TenantSelector'
-
-export const importMap = {
-  '@/fields/TenantField/components/Field#TenantFieldComponent': TenantFieldComponent_0,
-  '@/components/TenantSelector#TenantSelectorRSC': TenantSelectorRSC_1,
-}

examples/multi-tenant-single-domain/src/app/(payload)/layout.tsx

@@ -1,21 +1,18 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
-import configPromise from '@payload-config'
-import '@payloadcms/next/css'
-import { RootLayout } from '@payloadcms/next/layouts'
+import configPromise from "@payload-config";
+import "@payloadcms/next/css";
+import { RootLayout } from "@payloadcms/next/layouts";
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import React from 'react'
+import React from "react";
 
-import { importMap } from './admin/importMap.js'
-import './custom.scss'
+import "./custom.scss";
 
 type Args = {
-  children: React.ReactNode
-}
+  children: React.ReactNode;
+};
 
 const Layout = ({ children }: Args) => (
-  <RootLayout config={configPromise} importMap={importMap}>
-    {children}
-  </RootLayout>
-)
+  <RootLayout config={configPromise}>{children}</RootLayout>
+);
 
-export default Layout
+export default Layout;

examples/multi-tenant-single-domain/src/collections/Users/access/create.ts

@@ -1,6 +1,6 @@
 import type { Access } from 'payload'
 
-import type { User } from '../../../payload-types'
+import type { User } from '../../../../payload-types'
 
 import { isSuperAdmin } from '../../../access/isSuperAdmin'
 import { getTenantAdminTenantAccessIDs } from '../../../utilities/getTenantAccessIDs'

examples/multi-tenant-single-domain/src/collections/Users/index.ts

@@ -1,6 +1,6 @@
 import type { CollectionConfig } from 'payload'
 
-import type { User } from '../../payload-types'
+import type { User } from '../../../payload-types'
 
 import { getTenantAdminTenantAccessIDs } from '../../utilities/getTenantAccessIDs'
 import { createAccess } from './access/create'
@@ -37,6 +37,32 @@ const Users: CollectionConfig = {
         {
           name: 'tenant',
           type: 'relationship',
+          filterOptions: ({ user }) => {
+            if (!user) {
+              // Would like to query where exists true on id
+              // but that is not working
+              return {
+                id: {
+                  like: '',
+                },
+              }
+            }
+            if (user?.roles?.includes('super-admin')) {
+              // Would like to query where exists true on id
+              // but that is not working
+              return {
+                id: {
+                  like: '',
+                },
+              }
+            }
+            const adminTenantAccessIDs = getTenantAdminTenantAccessIDs(user as User)
+            return {
+              id: {
+                in: adminTenantAccessIDs,
+              },
+            }
+          },
           index: true,
           relationTo: 'tenants',
           required: true,

examples/multi-tenant-single-domain/src/components/TenantSelector/index.client.tsx

@@ -2,18 +2,17 @@
 import type { Option } from '@payloadcms/ui/elements/ReactSelect'
 import type { OptionObject } from 'payload'
 
-import { getTenantAdminTenantAccessIDs } from '@/utilities/getTenantAccessIDs'
 import { SelectInput, useAuth } from '@payloadcms/ui'
-import * as qs from 'qs-esm'
 import React from 'react'
 
-import type { Tenant, User } from '../../payload-types'
+import type { Tenant, User } from '../../../payload-types.js'
 
 import './index.scss'
 
 export const TenantSelector = ({ initialCookie }: { initialCookie?: string }) => {
   const { user } = useAuth<User>()
   const [options, setOptions] = React.useState<OptionObject[]>([])
+  const [value, setValue] = React.useState<string | undefined>(initialCookie)
 
   const isSuperAdmin = user?.roles?.includes('super-admin')
   const tenantIDs =
@@ -29,6 +28,18 @@ export const TenantSelector = ({ initialCookie }: { initialCookie?: string }) =>
     document.cookie = name + '=' + (value || '') + expires + '; path=/'
   }
 
+  React.useEffect(() => {
+    const fetchTenants = async () => {
+      const res = await fetch(`/api/tenants?depth=0&limit=100&sort=name`, {
+        credentials: 'include',
+      }).then((res) => res.json())
+
+      setOptions(res.docs.map((doc: Tenant) => ({ label: doc.name, value: doc.id })))
+    }
+
+    void fetchTenants()
+  }, [])
+
   const handleChange = React.useCallback((option: Option | Option[]) => {
     if (!option) {
       setCookie('payload-tenant', undefined)
@@ -39,44 +50,7 @@ export const TenantSelector = ({ initialCookie }: { initialCookie?: string }) =>
     }
   }, [])
 
-  React.useEffect(() => {
-    const fetchTenants = async () => {
-      const adminOfTenants = getTenantAdminTenantAccessIDs(user ?? null)
-
-      const queryString = qs.stringify(
-        {
-          depth: 0,
-          limit: 100,
-          sort: 'name',
-          where: {
-            id: {
-              in: adminOfTenants,
-            },
-          },
-        },
-        {
-          addQueryPrefix: true,
-        },
-      )
-
-      const res = await fetch(`/api/tenants${queryString}`, {
-        credentials: 'include',
-      }).then((res) => res.json())
-
-      const optionsToSet = res.docs.map((doc: Tenant) => ({ label: doc.name, value: doc.id }))
-
-      if (optionsToSet.length === 1) {
-        setCookie('payload-tenant', optionsToSet[0].value)
-      }
-      setOptions(optionsToSet)
-    }
-
-    if (user) {
-      void fetchTenants()
-    }
-  }, [user])
-
-  if ((isSuperAdmin || tenantIDs.length > 1) && options.length > 1) {
+  if (isSuperAdmin || tenantIDs.length > 1) {
     return (
       <div className="tenant-selector">
         <SelectInput
@@ -85,7 +59,7 @@ export const TenantSelector = ({ initialCookie }: { initialCookie?: string }) =>
           onChange={handleChange}
           options={options}
           path="setTenant"
-          value={options.find((opt) => opt.value === initialCookie)?.value}
+          value={value}
         />
       </div>
     )

examples/multi-tenant-single-domain/src/fields/TenantField/components/Field.client.tsx

@@ -1,34 +0,0 @@
-'use client'
-import { RelationshipField, useField } from '@payloadcms/ui'
-import React from 'react'
-
-type Props = {
-  initialValue?: string
-  path: string
-  readOnly: boolean
-}
-export function TenantFieldComponentClient({ initialValue, path, readOnly }: Props) {
-  const { formInitializing, setValue } = useField({ path })
-  const hasSetInitialValue = React.useRef(false)
-
-  React.useEffect(() => {
-    if (!hasSetInitialValue.current && !formInitializing && initialValue) {
-      setValue(initialValue)
-      hasSetInitialValue.current = true
-    }
-  }, [initialValue, setValue, formInitializing])
-
-  return (
-    <RelationshipField
-      field={{
-        name: path,
-        type: 'relationship',
-        _path: path,
-        label: 'Tenant',
-        relationTo: 'tenants',
-        required: true,
-      }}
-      readOnly={readOnly}
-    />
-  )
-}

examples/multi-tenant-single-domain/src/fields/TenantField/components/Field.tsx

@@ -1,32 +1,26 @@
-import type { Payload } from 'payload'
-
-import { cookies as getCookies, headers as getHeaders } from 'next/headers'
+'use client'
+import { RelationshipField, useAuth, useFieldProps } from '@payloadcms/ui'
 import React from 'react'
 
-import { TenantFieldComponentClient } from './Field.client'
+import type { User } from '../../../../payload-types.js'
 
-export const TenantFieldComponent: React.FC<{
-  path: string
-  payload: Payload
-  readOnly: boolean
-}> = async (args) => {
-  const cookies = getCookies()
-  const headers = getHeaders()
-  const { user } = await args.payload.auth({ headers })
+export const TenantFieldComponent = () => {
+  const { user } = useAuth<User>()
+  const { path, readOnly } = useFieldProps()
 
-  if (
-    user &&
-    ((Array.isArray(user.tenants) && user.tenants.length > 1) ||
-      user?.roles?.includes('super-admin'))
-  ) {
-    return (
-      <TenantFieldComponentClient
-        initialValue={cookies.get('payload-tenant')?.value || undefined}
-        path={args.path}
-        readOnly={args.readOnly}
-      />
-    )
+  if (user) {
+    if ((user.tenants && user.tenants.length > 1) || user?.roles?.includes('super-admin')) {
+      return (
+        <RelationshipField
+          label="Tenant"
+          name={path}
+          path={path}
+          readOnly={readOnly}
+          relationTo="tenants"
+          required
+        />
+      )
+    }
   }
-
   return null
 }

examples/multi-tenant-single-domain/src/fields/TenantField/index.ts

@@ -2,6 +2,7 @@ import type { Field } from 'payload'
 
 import { isSuperAdmin } from '../../access/isSuperAdmin'
 import { tenantFieldUpdate } from './access/update'
+import { TenantFieldComponent } from './components/Field'
 import { autofillTenant } from './hooks/autofillTenant'
 
 export const tenantField: Field = {
@@ -16,7 +17,7 @@ export const tenantField: Field = {
   },
   admin: {
     components: {
-      Field: '@/fields/TenantField/components/Field#TenantFieldComponent',
+      Field: TenantFieldComponent,
     },
     position: 'sidebar',
   },

examples/multi-tenant-single-domain/src/payload-types.ts

@@ -17,9 +17,6 @@ export interface Config {
     'payload-preferences': PayloadPreference;
     'payload-migrations': PayloadMigration;
   };
-  db: {
-    defaultIDType: string;
-  };
   globals: {};
   locale: null;
   user: User & {
@@ -29,20 +26,15 @@ export interface Config {
 export interface UserAuthOperations {
   forgotPassword: {
     email: string;
-    password: string;
   };
   login: {
-    email: string;
     password: string;
+    email: string;
   };
   registerFirstUser: {
     email: string;
     password: string;
   };
-  unlock: {
-    email: string;
-    password: string;
-  };
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema

examples/multi-tenant-single-domain/src/payload.config.ts

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'url'
 import { Pages } from './collections/Pages'
 import { Tenants } from './collections/Tenants'
 import Users from './collections/Users'
+import { TenantSelectorRSC } from './components/TenantSelector'
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -14,7 +15,7 @@ const dirname = path.dirname(filename)
 export default buildConfig({
   admin: {
     components: {
-      afterNavLinks: ['@/components/TenantSelector#TenantSelectorRSC'],
+      afterNavLinks: [TenantSelectorRSC],
     },
     user: 'users',
   },

examples/multi-tenant-single-domain/src/utilities/getTenantAccessIDs.ts

@@ -1,4 +1,4 @@
-import type { User } from '../payload-types'
+import type { User } from '../../payload-types'
 
 export const getTenantAccessIDs = (user: User | null): string[] => {
   if (!user) return []

examples/testing/README.md

@@ -134,7 +134,7 @@ describe('Users', () => {
 
 ```json
 "scripts": {
-  "test": "jest --forceExit --detectOpenHandles"
+  "test": "NODE_OPTIONS=--experimental-vm-modules jest --forceExit --detectOpenHandles"
 }
 ```
 

examples/testing/package.json

@@ -29,6 +29,6 @@
     "build:server": "tsc",
     "build": "yarn build:server && yarn build:payload",
     "serve": "PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
-    "test": "jest --forceExit --detectOpenHandles"
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --forceExit --detectOpenHandles"
   }
 }

jest.config.js

@@ -1,28 +1,8 @@
-const esModules = [
-  // file-type and all dependencies: https://github.com/sindresorhus/file-type
-  'file-type',
-  'strtok3',
-  'readable-web-to-node-stream',
-  'token-types',
-  'peek-readable',
-  'find-up',
-  'locate-path',
-  'p-locate',
-  'p-limit',
-  'yocto-queue',
-  'unicorn-magic',
-  'path-exists',
-  'qs-esm',
-].join('|')
-
 /** @type {import('jest').Config}  */
 const baseJestConfig = {
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  setupFiles: ['<rootDir>/test/jest.setup.env.js'],
   setupFilesAfterEnv: ['<rootDir>/test/jest.setup.js'],
-  transformIgnorePatterns: [
-    `/node_modules/(?!.pnpm)(?!(${esModules})/)`,
-    `/node_modules/.pnpm/(?!(${esModules.replace(/\//g, '\\+')})@)`,
-  ],
   moduleNameMapper: {
     '\\.(css|scss)$': '<rootDir>/test/helpers/mocks/emptyModule.js',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':

next.config.mjs

@@ -1,11 +1,6 @@
 import bundleAnalyzer from '@next/bundle-analyzer'
 
 import withPayload from './packages/next/src/withPayload.js'
-import path from 'path'
-import { fileURLToPath } from 'url'
-
-const __filename = fileURLToPath(import.meta.url)
-const dirname = path.dirname(__filename)
 
 const withBundleAnalyzer = bundleAnalyzer({
   enabled: process.env.ANALYZE === 'true',
@@ -20,11 +15,6 @@ export default withBundleAnalyzer(
     typescript: {
       ignoreBuildErrors: true,
     },
-    env: {
-      PAYLOAD_CORE_DEV: 'true',
-      ROOT_DIR: path.resolve(dirname),
-      PAYLOAD_CI_DEPENDENCY_CHECKER: 'true',
-    },
     async redirects() {
       return [
         {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.71",
   "private": true,
   "type": "module",
   "scripts": {
@@ -10,56 +10,52 @@
     "build:app": "next build",
     "build:app:analyze": "cross-env ANALYZE=true next build",
     "build:clean": "pnpm clean:build",
-    "build:core": "turbo build --filter \"!@payloadcms/plugin-*\" --filter \"!@payloadcms/storage-*\"",
-    "build:core:force": "pnpm clean:build && pnpm build:core --no-cache --force",
+    "build:core": "turbo build --filter \"!@payloadcms/plugin-*\"",
+    "build:core:force": "pnpm clean:build && turbo build --filter \"!@payloadcms/plugin-*\" --no-cache --force",
     "build:create-payload-app": "turbo build --filter create-payload-app",
-    "build:db-mongodb": "turbo build --filter \"@payloadcms/db-mongodb\"",
-    "build:db-postgres": "turbo build --filter \"@payloadcms/db-postgres\"",
-    "build:db-sqlite": "turbo build --filter \"@payloadcms/db-sqlite\"",
-    "build:db-vercel-postgres": "turbo build --filter \"@payloadcms/db-vercel-postgres\"",
-    "build:drizzle": "turbo build --filter \"@payloadcms/drizzle\"",
-    "build:email-nodemailer": "turbo build --filter \"@payloadcms/email-nodemailer\"",
-    "build:email-resend": "turbo build --filter \"@payloadcms/email-resend\"",
-    "build:eslint-config": "turbo build --filter \"@payloadcms/eslint-config\"",
-    "build:essentials:force": "pnpm clean:build && turbo build --filter=\"payload...\" --filter=\"@payloadcms/ui\" --filter=\"@payloadcms/next\" --filter=\"@payloadcms/db-mongodb\" --filter=\"@payloadcms/db-postgres\" --filter=\"@payloadcms/richtext-lexical\" --filter=\"@payloadcms/translations\" --filter=\"@payloadcms/plugin-cloud\" --filter=\"@payloadcms/graphql\" --no-cache --force",
+    "build:db-mongodb": "turbo build --filter db-mongodb",
+    "build:db-postgres": "turbo build --filter db-postgres",
+    "build:db-sqlite": "turbo build --filter db-sqlite",
+    "build:drizzle": "turbo build --filter drizzle",
+    "build:email-nodemailer": "turbo build --filter email-nodemailer",
+    "build:email-resend": "turbo build --filter email-resend",
+    "build:eslint-config": "turbo build --filter eslint-config",
     "build:force": "pnpm run build:core:force",
-    "build:graphql": "turbo build --filter \"@payloadcms/graphql\"",
-    "build:live-preview": "turbo build --filter \"@payloadcms/live-preview\"",
-    "build:live-preview-react": "turbo build --filter \"@payloadcms/live-preview-react\"",
-    "build:live-preview-vue": "turbo build --filter \"@payloadcms/live-preview-vue\"",
-    "build:next": "turbo build --filter \"@payloadcms/next\"",
+    "build:graphql": "turbo build --filter graphql",
+    "build:live-preview": "turbo build --filter live-preview",
+    "build:live-preview-react": "turbo build --filter live-preview-react",
+    "build:live-preview-vue": "turbo build --filter live-preview-vue",
+    "build:next": "turbo build --filter next",
     "build:payload": "turbo build --filter payload",
-    "build:plugin-cloud": "turbo build --filter \"@payloadcms/plugin-cloud\"",
-    "build:plugin-cloud-storage": "turbo build --filter \"@payloadcms/plugin-cloud-storage\"",
-    "build:plugin-form-builder": "turbo build --filter \"@payloadcms/plugin-form-builder\"",
-    "build:plugin-nested-docs": "turbo build --filter \"@payloadcms/plugin-nested-docs\"",
-    "build:plugin-redirects": "turbo build --filter \"@payloadcms/plugin-redirects\"",
-    "build:plugin-relationship-object-ids": "turbo build --filter \"@payloadcms/plugin-relationship-object-ids\"",
-    "build:plugin-search": "turbo build --filter \"@payloadcms/plugin-search\"",
-    "build:plugin-sentry": "turbo build --filter \"@payloadcms/plugin-sentry\"",
-    "build:plugin-seo": "turbo build --filter \"@payloadcms/plugin-seo\"",
-    "build:plugin-stripe": "turbo build --filter \"@payloadcms/plugin-stripe\"",
+    "build:plugin-cloud": "turbo build --filter plugin-cloud",
+    "build:plugin-cloud-storage": "turbo build --filter plugin-cloud-storage",
+    "build:plugin-form-builder": "turbo build --filter plugin-form-builder",
+    "build:plugin-nested-docs": "turbo build --filter plugin-nested-docs",
+    "build:plugin-redirects": "turbo build --filter plugin-redirects",
+    "build:plugin-relationship-object-ids": "turbo build --filter plugin-relationship-object-ids",
+    "build:plugin-search": "turbo build --filter plugin-search",
+    "build:plugin-sentry": "turbo build --filter plugin-sentry",
+    "build:plugin-seo": "turbo build --filter plugin-seo",
+    "build:plugin-stripe": "turbo build --filter plugin-stripe",
     "build:plugins": "turbo build --filter \"@payloadcms/plugin-*\"",
-    "build:richtext-lexical": "turbo build --filter \"@payloadcms/richtext-lexical\"",
-    "build:richtext-slate": "turbo build --filter \"@payloadcms/richtext-slate\"",
-    "build:storage-azure": "turbo build --filter \"@payloadcms/storage-azure\"",
-    "build:storage-gcs": "turbo build --filter \"@payloadcms/storage-gcs\"",
-    "build:storage-s3": "turbo build --filter \"@payloadcms/storage-s3\"",
-    "build:storage-uploadthing": "turbo build --filter \"@payloadcms/storage-uploadthing\"",
-    "build:storage-vercel-blob": "turbo build --filter \"@payloadcms/storage-vercel-blob\"",
+    "build:richtext-lexical": "turbo build --filter richtext-lexical",
+    "build:richtext-slate": "turbo build --filter richtext-slate",
+    "build:storage-azure": "turbo build --filter storage-azure",
+    "build:storage-gcs": "turbo build --filter storage-gcs",
+    "build:storage-s3": "turbo build --filter storage-s3",
+    "build:storage-uploadthing": "turbo build --filter storage-uploadthing",
+    "build:storage-vercel-blob": "turbo build --filter storage-vercel-blob",
     "build:tests": "pnpm --filter payload-test-suite run typecheck",
-    "build:translations": "turbo build --filter \"@payloadcms/translations\"",
-    "build:ui": "turbo build --filter \"@payloadcms/ui\"",
+    "build:translations": "turbo build --filter translations",
+    "build:ui": "turbo build --filter ui",
     "clean": "turbo clean",
     "clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media/*' '**/dist/' '**/.cache/*' '**/.next/*' '**/.turbo/*' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
     "clean:build": "node ./scripts/delete-recursively.js 'media/' '**/dist/' '**/.cache/' '**/.next/' '**/.turbo/' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
     "clean:cache": "node ./scripts/delete-recursively.js node_modules/.cache! packages/payload/node_modules/.cache! .next/*",
-    "dev": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/dev.ts",
-    "dev:generate-graphql-schema": "pnpm runts ./test/generateGraphQLSchema.ts",
-    "dev:generate-importmap": "pnpm runts ./test/generateImportMap.ts",
-    "dev:generate-types": "pnpm runts ./test/generateTypes.ts",
-    "dev:postgres": "cross-env PAYLOAD_DATABASE=postgres pnpm runts ./test/dev.ts",
-    "dev:vercel-postgres": "cross-env PAYLOAD_DATABASE=vercel-postgres pnpm runts ./test/dev.ts",
+    "dev": "cross-env NODE_OPTIONS=--no-deprecation node ./test/dev.js",
+    "dev:generate-graphql-schema": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateGraphQLSchema.ts",
+    "dev:generate-types": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateTypes.ts",
+    "dev:postgres": "cross-env NODE_OPTIONS=--no-deprecation PAYLOAD_DATABASE=postgres node ./test/dev.js",
     "devsafe": "node ./scripts/delete-recursively.js '**/.next' && pnpm dev",
     "docker:restart": "pnpm docker:stop --remove-orphans && pnpm docker:start",
     "docker:start": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml up -d",
@@ -71,23 +67,20 @@
     "obliterate-playwright-cache-macos": "rm -rf ~/Library/Caches/ms-playwright && find /System/Volumes/Data/private/var/folders -type d -name 'playwright*' -exec rm -rf {} +",
     "prepare": "husky",
     "reinstall": "pnpm clean:all && pnpm install",
-    "release:alpha": "pnpm runts ./scripts/release.ts --bump prerelease --tag alpha",
-    "release:beta": "pnpm runts ./scripts/release.ts --bump prerelease --tag beta",
-    "runts": "cross-env NODE_OPTIONS=--no-deprecation node --no-deprecation --import @swc-node/register/esm-register",
-    "script:gen-templates": "pnpm runts ./scripts/generate-template-variations.ts",
-    "script:list-published": "pnpm runts scripts/lib/getPackageRegistryVersions.ts",
-    "script:pack": "pnpm runts scripts/pack-all-to-dest.ts",
+    "release:alpha": "tsx ./scripts/release.ts --bump prerelease --tag alpha",
+    "release:beta": "tsx ./scripts/release.ts --bump prerelease --tag beta",
+    "script:gen-templates": "tsx ./scripts/generate-template-variations.ts",
+    "script:list-published": "tsx scripts/lib/getPackageRegistryVersions.ts",
+    "script:pack": "tsx scripts/pack-all-to-dest.ts",
     "pretest": "pnpm build",
     "test": "pnpm test:int && pnpm test:components && pnpm test:e2e",
-    "test:components": "cross-env NODE_OPTIONS=\" --no-deprecation\" jest --config=jest.components.config.js",
-    "test:e2e": "pnpm runts ./test/runE2E.ts",
+    "test:components": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" jest --config=jest.components.config.js",
+    "test:e2e": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 tsx ./test/runE2E.ts",
     "test:e2e:debug": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PWDEBUG=1 DISABLE_LOGGING=true playwright test",
     "test:e2e:headed": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true playwright test --headed",
-    "test:e2e:prod": "pnpm bf && rm -rf test/packed && rm -rf test/node_modules && rm -f test/pnpm-lock.yaml && pnpm run script:pack --all --no-build --dest test/packed && pnpm runts test/setupProd.ts && cd test && pnpm i --ignore-workspace && cd .. && pnpm runts ./test/runE2E.ts --prod",
-    "test:e2e:prod:ci": "rm -rf test/node_modules && rm -f test/pnpm-lock.yaml && pnpm run script:pack --all --no-build --dest test/packed && pnpm runts test/setupProd.ts && cd test && pnpm i --ignore-workspace && cd .. && pnpm runts ./test/runE2E.ts --prod",
-    "test:int": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
-    "test:int:postgres": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
-    "test:unit": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=jest.config.js --runInBand",
+    "test:int": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int:postgres": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:unit": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=jest.config.js --runInBand",
     "translateNewKeys": "pnpm --filter payload run translateNewKeys"
   },
   "lint-staged": {
@@ -97,20 +90,18 @@
       "prettier --write",
       "eslint --cache --fix"
     ],
-    "templates/website/**/*": "sh -c \"cd templates/website; pnpm install --ignore-workspace; pnpm run lint --fix\"",
+    "templates/website/**/*": "sh -c \"cd templates/website; pnpm install --ignore-workspace --frozen-lockfile; pnpm run lint --fix\"",
     "tsconfig.json": "node scripts/reset-tsconfig.js"
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",
     "@libsql/client": "0.6.2",
-    "@next/bundle-analyzer": "15.0.0-canary.104",
-    "@payloadcms/db-postgres": "workspace:*",
+    "@next/bundle-analyzer": "15.0.0-canary.53",
     "@payloadcms/eslint-config": "workspace:*",
     "@payloadcms/eslint-plugin": "workspace:*",
     "@payloadcms/live-preview-react": "workspace:*",
-    "@playwright/test": "1.46.0",
-    "@swc-node/register": "1.10.9",
-    "@swc/cli": "0.4.0",
+    "@playwright/test": "1.43.0",
+    "@swc/cli": "0.3.12",
     "@swc/jest": "0.2.36",
     "@types/fs-extra": "^11.0.2",
     "@types/jest": "29.5.12",
@@ -128,8 +119,7 @@
     "create-payload-app": "workspace:*",
     "cross-env": "7.0.3",
     "dotenv": "16.4.5",
-    "drizzle-kit": "0.23.2-df9e596",
-    "drizzle-orm": "0.32.1",
+    "drizzle-orm": "0.29.4",
     "escape-html": "^1.0.3",
     "execa": "5.1.1",
     "form-data": "3.0.1",
@@ -141,35 +131,34 @@
     "lint-staged": "15.2.7",
     "minimist": "1.2.8",
     "mongodb-memory-server": "^9.0",
-    "next": "15.0.0-canary.104",
+    "next": "15.0.0-canary.53",
     "open": "^10.1.0",
     "p-limit": "^5.0.0",
-    "playwright": "1.46.0",
-    "playwright-core": "1.46.0",
+    "playwright": "1.43.0",
+    "playwright-core": "1.43.0",
     "prettier": "3.3.2",
     "prompts": "2.4.2",
-    "react": "19.0.0-rc-06d0b89e-20240801",
-    "react-dom": "19.0.0-rc-06d0b89e-20240801",
+    "react": "^19.0.0-rc-6230622a1a-20240610",
+    "react-dom": "^19.0.0-rc-6230622a1a-20240610",
     "rimraf": "3.0.2",
     "semver": "^7.5.4",
     "sharp": "0.32.6",
     "shelljs": "0.8.5",
     "slash": "3.0.0",
     "sort-package-json": "^2.10.0",
-    "swc-plugin-transform-remove-imports": "1.15.0",
+    "swc-plugin-transform-remove-imports": "1.14.0",
     "tempy": "1.0.1",
-    "tsx": "4.17.0",
-    "turbo": "^2.1.0",
+    "tsx": "4.16.2",
+    "turbo": "^1.13.3",
     "typescript": "5.5.4"
   },
   "peerDependencies": {
-    "react": "^19.0.0 || ^19.0.0-rc-06d0b89e-20240801",
-    "react-dom": "^19.0.0 || ^19.0.0-rc-06d0b89e-20240801"
+    "react": "^19.0.0 || ^19.0.0-rc-6230622a1a-20240610",
+    "react-dom": "^19.0.0 || ^19.0.0-rc-6230622a1a-20240610"
   },
-  "packageManager": "pnpm@9.7.1",
   "engines": {
     "node": "^18.20.2 || >=20.9.0",
-    "pnpm": "^9.7.0"
+    "pnpm": "^8.15.7"
   },
   "pnpm": {
     "allowedDeprecatedVersions": {
@@ -188,6 +177,9 @@
       "react": "$react",
       "react-dom": "$react-dom",
       "typescript": "$typescript"
+    },
+    "patchedDependencies": {
+      "playwright@1.43.0": "patches/playwright@1.43.0.patch"
     }
   },
   "overrides": {

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

@@ -22,7 +22,7 @@ const customJestConfig = {
   },
   testEnvironment: 'node',
   testMatch: ['<rootDir>/**/*spec.ts'],
-  testTimeout: 160000,
+  testTimeout: 90000,
   transform: {
     '^.+\\.(t|j)sx?$': ['@swc/jest'],
   },

packages/create-payload-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.71",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "build": "pnpm pack-template-files && pnpm typecheck && pnpm build:swc",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "clean": "rimraf {dist,*.tsbuildinfo}",
-    "pack-template-files": "node --no-deprecation --import @swc-node/register/esm-register src/scripts/pack-template-files.ts",
+    "pack-template-files": "tsx src/scripts/pack-template-files.ts",
     "prepublishOnly": "pnpm clean && pnpm build",
     "test": "jest",
     "typecheck": "tsc"
@@ -50,7 +50,7 @@
   "dependencies": {
     "@clack/prompts": "^0.7.0",
     "@sindresorhus/slugify": "^1.1.0",
-    "@swc/core": "1.7.10",
+    "@swc/core": "^1.6.13",
     "arg": "^5.0.0",
     "chalk": "^4.1.0",
     "comment-json": "^4.2.3",

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

@@ -32,7 +32,7 @@ describe('createProject', () => {
     const args = {
       _: ['project-name'],
       '--db': 'mongodb',
-      '--local-template': 'blank',
+      '--local-template': 'blank-3.0',
       '--no-deps': true,
     } as CliArgs
     const packageManager = 'yarn'
@@ -64,8 +64,8 @@ describe('createProject', () => {
       const templates = getValidTemplates()
 
       it.each([
-        ['blank', 'mongodb'],
-        ['blank', 'postgres'],
+        ['blank-3.0', 'mongodb'],
+        ['blank-3.0', 'postgres'],
 
         // TODO: Re-enable these once 3.0 is stable and templates updated
         // ['website', 'mongodb'],

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

@@ -182,7 +182,7 @@ async function installAndConfigurePayload(
   const templateFilesPath =
     dirname.endsWith('dist') || useDistFiles
       ? path.resolve(dirname, '../..', 'dist/template')
-      : path.resolve(dirname, '../../../../templates/blank')
+      : path.resolve(dirname, '../../../../templates/blank-3.0')
 
   logDebug(`Using template files from: ${templateFilesPath}`)
 

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

@@ -29,35 +29,9 @@ const postgresReplacement: DbAdapterReplacement = {
   packageName: '@payloadcms/db-postgres',
 }
 
-const vercelPostgresReplacement: DbAdapterReplacement = {
-  configReplacement: (envName = 'POSTGRES_URL') => [
-    '  db: vercelPostgresAdapter({',
-    '    pool: {',
-    `      connectionString: process.env.${envName} || '',`,
-    '    },',
-    '  }),',
-  ],
-  importReplacement: "import { vercelPostgresAdapter } from '@payloadcms/db-vercel-postgres'",
-  packageName: '@payloadcms/db-vercel-postgres',
-}
-
-const sqliteReplacement: DbAdapterReplacement = {
-  configReplacement: (envName = 'DATABASE_URI') => [
-    '  db: sqliteAdapter({',
-    '    client: {',
-    `      url: process.env.${envName} || '',`,
-    '    },',
-    '  }),',
-  ],
-  importReplacement: "import { sqliteAdapter } from '@payloadcms/db-sqlite'",
-  packageName: '@payloadcms/db-sqlite',
-}
-
 export const dbReplacements: Record<DbType, DbAdapterReplacement> = {
   mongodb: mongodbReplacement,
   postgres: postgresReplacement,
-  sqlite: sqliteReplacement,
-  vercelPostgres: vercelPostgresReplacement,
 }
 
 type StorageAdapterReplacement = {

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

@@ -5,7 +5,6 @@ import type { CliArgs, DbDetails, DbType } from '../types.js'
 
 type DbChoice = {
   dbConnectionPrefix: `${string}/`
-  dbConnectionSuffix?: string
   title: string
   value: DbType
 }
@@ -21,17 +20,6 @@ const dbChoiceRecord: Record<DbType, DbChoice> = {
     title: 'PostgreSQL (beta)',
     value: 'postgres',
   },
-  sqlite: {
-    dbConnectionPrefix: 'file:./',
-    dbConnectionSuffix: '.db',
-    title: 'SQLite (beta)',
-    value: 'sqlite',
-  },
-  vercelPostgres: {
-    dbConnectionPrefix: 'postgres://postgres:<password>@127.0.0.1:5432/',
-    title: 'Vercel Postgres (beta)',
-    value: 'vercelPostgres',
-  },
 }
 
 export async function selectDb(args: CliArgs, projectName: string): Promise<DbDetails> {
@@ -49,10 +37,10 @@ export async function selectDb(args: CliArgs, projectName: string): Promise<DbDe
     dbType = await p.select<{ label: string; value: DbType }[], DbType>({
       initialValue: 'mongodb',
       message: `Select a database`,
-      options: Object.values(dbChoiceRecord).map((dbChoice) => ({
-        label: dbChoice.title,
-        value: dbChoice.value,
-      })),
+      options: [
+        { label: 'MongoDB', value: 'mongodb' },
+        { label: 'Postgres', value: 'postgres' },
+      ],
     })
     if (p.isCancel(dbType)) process.exit(0)
   }
@@ -62,7 +50,7 @@ export async function selectDb(args: CliArgs, projectName: string): Promise<DbDe
   let dbUri: string | symbol | undefined = undefined
   const initialDbUri = `${dbChoice.dbConnectionPrefix}${
     projectName === '.' ? `payload-${getRandomDigitSuffix()}` : slugify(projectName)
-  }${dbChoice.dbConnectionSuffix || ''}`
+  }`
 
   if (args['--db-accept-recommended']) {
     dbUri = initialDbUri

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

@@ -18,7 +18,7 @@ export function getValidTemplates(): ProjectTemplate[] {
       name: 'blank',
       type: 'starter',
       description: 'Blank 3.0 Template',
-      url: 'https://github.com/payloadcms/payload/templates/blank#beta',
+      url: 'https://github.com/payloadcms/payload/templates/blank-3.0#beta',
     },
     {
       name: 'website',

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

@@ -74,11 +74,9 @@ export async function updatePayloadInProject(
   info('Payload packages updated successfully.')
 
   info(`Updating Payload Next.js files...`)
-
-  const templateFilesPath =
-    process.env.JEST_WORKER_ID !== undefined
-      ? path.resolve(dirname, '../../../../templates/blank')
-      : path.resolve(dirname, '../..', 'dist/template')
+  const templateFilesPath = dirname.endsWith('dist')
+    ? path.resolve(dirname, '../..', 'dist/template')
+    : path.resolve(dirname, '../../../../templates/blank-3.0')
 
   const templateSrcDir = path.resolve(templateFilesPath, 'src/app/(payload)')
 

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

@@ -1,6 +1,6 @@
 import type { ExportDefaultExpression, ModuleItem } from '@swc/core'
 
-import { parse } from '@swc/core'
+import swc from '@swc/core'
 import chalk from 'chalk'
 import { Syntax, parseModule } from 'esprima-next'
 import fs from 'fs'
@@ -281,10 +281,10 @@ async function compileTypeScriptFileToAST(
    * https://github.com/swc-project/swc/issues/1366
    */
   if (process.env.NODE_ENV === 'test') {
-    parseOffset = (await parse('')).span.end
+    parseOffset = (await swc.parse('')).span.end
   }
 
-  const module = await parse(fileContent, {
+  const module = await swc.parse(fileContent, {
     syntax: 'typescript',
   })
 

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

@@ -42,12 +42,7 @@ export async function writeEnvFile(args: {
             const key = split[0]
             let value = split[1]
 
-            if (
-              key === 'MONGODB_URI' ||
-              key === 'MONGO_URL' ||
-              key === 'DATABASE_URI' ||
-              key === 'POSTGRES_URL'
-            ) {
+            if (key === 'MONGODB_URI' || key === 'MONGO_URL' || key === 'DATABASE_URI') {
               value = databaseUri
             }
             if (key === 'PAYLOAD_SECRET' || key === 'PAYLOAD_SECRET_KEY') {

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

@@ -9,7 +9,7 @@ const dirname = path.dirname(filename)
 main()
 
 /**
- * Copy the necessary template files from `templates/blank` to `dist/template`
+ * Copy the necessary template files from `templates/blank-3.0` to `dist/template`
  *
  * Eventually, this should be replaced with using tar.x to stream from the git repo
  */
@@ -17,7 +17,7 @@ main()
 async function main() {
   const root = path.resolve(dirname, '../../../../')
   const outputPath = path.resolve(dirname, '../../dist/template')
-  const sourceTemplatePath = path.resolve(root, 'templates/blank')
+  const sourceTemplatePath = path.resolve(root, 'templates/blank-3.0')
 
   if (!fs.existsSync(sourceTemplatePath)) {
     throw new Error(`Source path does not exist: ${sourceTemplatePath}`)
@@ -27,7 +27,7 @@ async function main() {
     fs.mkdirSync(outputPath, { recursive: true })
   }
 
-  // Copy the src directory from `templates/blank` to `dist`
+  // Copy the src directory from `templates/blank-3.0` to `dist`
   const srcPath = path.resolve(sourceTemplatePath, 'src')
   const distSrcPath = path.resolve(outputPath, 'src')
   // Copy entire file structure from src to dist

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

@@ -57,7 +57,7 @@ interface Template {
 
 export type PackageManager = 'bun' | 'npm' | 'pnpm' | 'yarn'
 
-export type DbType = 'mongodb' | 'postgres' | 'sqlite' | 'vercelPostgres'
+export type DbType = 'mongodb' | 'postgres'
 
 export type DbDetails = {
   dbUri: string

packages/db-mongodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.71",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/db-mongodb/src/connect.ts

@@ -54,10 +54,6 @@ export const connect: Connect = async function connect(
         this.payload.logger.info('---- DROPPED DATABASE ----')
       }
     }
-
-    if (process.env.NODE_ENV === 'production' && this.prodMigrations) {
-      await this.migrate({ migrations: this.prodMigrations })
-    }
   } catch (err) {
     console.log(err)
     this.payload.logger.error(`Error: cannot connect to MongoDB. Details: ${err.message}`, err)

packages/db-mongodb/src/findGlobalVersions.ts

@@ -64,7 +64,7 @@ export const findGlobalVersions: FindGlobalVersions = async function findGlobalV
     forceCountFn: hasNearConstraint,
     lean: true,
     leanWithId: true,
-    limit,
+    offset: skip,
     options,
     page,
     pagination,

packages/db-mongodb/src/index.ts

@@ -1,6 +1,6 @@
 import type { CollationOptions, TransactionOptions } from 'mongodb'
 import type { MongoMemoryReplSet } from 'mongodb-memory-server'
-import type { ClientSession, ConnectOptions, Connection } from 'mongoose'
+import type { ClientSession, ConnectOptions, Connection, SchemaOptions } from 'mongoose'
 import type { BaseDatabaseAdapter, DatabaseAdapterObj, Payload } from 'payload'
 
 import fs from 'fs'
@@ -8,7 +8,7 @@ import mongoose from 'mongoose'
 import path from 'path'
 import { createDatabaseAdapter } from 'payload'
 
-import type { CollectionModel, GlobalModel, MigrateDownArgs, MigrateUpArgs } from './types.js'
+import type { CollectionModel, GlobalModel } from './types.js'
 
 import { connect } from './connect.js'
 import { count } from './count.js'
@@ -66,6 +66,15 @@ export interface Args {
    * Defaults to disabled.
    */
   collation?: Omit<CollationOptions, 'locale'>
+  /** Define Mongoose options on a collection-by-collection basis.
+   */
+  collections?: {
+    [slug: string]: {
+      /** Define Mongoose schema options for a given collection.
+       */
+      schemaOptions?: SchemaOptions
+    }
+  }
   /** Extra configuration options */
   connectOptions?: {
     /** Set false to disable $facet aggregation in non-supporting databases, Defaults to true */
@@ -73,33 +82,40 @@ export interface Args {
   } & ConnectOptions
   /** Set to true to disable hinting to MongoDB to use 'id' as index. This is currently done when counting documents for pagination. Disabling this optimization might fix some problems with AWS DocumentDB. Defaults to false */
   disableIndexHints?: boolean
+  /** Define Mongoose options for the globals collection.
+   */
+  globals?: {
+    schemaOptions?: SchemaOptions
+  }
   migrationDir?: string
   /**
    * typed as any to avoid dependency
    */
   mongoMemoryServer?: MongoMemoryReplSet
-  prodMigrations?: {
-    down: (args: MigrateDownArgs) => Promise<void>
-    name: string
-    up: (args: MigrateUpArgs) => Promise<void>
-  }[]
+  /** Define default Mongoose schema options for all schemas created.
+   */
+  schemaOptions?: SchemaOptions
   transactionOptions?: TransactionOptions | false
   /** The URL to connect to MongoDB or false to start payload and prevent connecting */
   url: false | string
 }
 
 export type MongooseAdapter = {
+  collectionOptions: {
+    [slug: string]: {
+      schemaOptions?: SchemaOptions
+    }
+  }
   collections: {
     [slug: string]: CollectionModel
   }
   connection: Connection
   globals: GlobalModel
+  globalsOptions: {
+    schemaOptions?: SchemaOptions
+  }
   mongoMemoryServer: MongoMemoryReplSet
-  prodMigrations?: {
-    down: (args: MigrateDownArgs) => Promise<void>
-    name: string
-    up: (args: MigrateUpArgs) => Promise<void>
-  }[]
+  schemaOptions?: SchemaOptions
   sessions: Record<number | string, ClientSession>
   versions: {
     [slug: string]: CollectionModel
@@ -110,18 +126,22 @@ export type MongooseAdapter = {
 declare module 'payload' {
   export interface DatabaseAdapter
     extends Omit<BaseDatabaseAdapter, 'sessions'>,
-      Omit<Args, 'migrationDir'> {
+      Omit<Args, 'collections' | 'globals' | 'migrationDir'> {
+    collectionOptions: {
+      [slug: string]: {
+        schemaOptions?: SchemaOptions
+      }
+    }
     collections: {
       [slug: string]: CollectionModel
     }
     connection: Connection
     globals: GlobalModel
+    globalsOptions: {
+      schemaOptions?: SchemaOptions
+    }
     mongoMemoryServer: MongoMemoryReplSet
-    prodMigrations?: {
-      down: (args: MigrateDownArgs) => Promise<void>
-      name: string
-      up: (args: MigrateUpArgs) => Promise<void>
-    }[]
+    schemaOptions?: SchemaOptions
     sessions: Record<number | string, ClientSession>
     transactionOptions: TransactionOptions
     versions: {
@@ -132,11 +152,13 @@ declare module 'payload' {
 
 export function mongooseAdapter({
   autoPluralization = true,
+  collections,
   connectOptions,
   disableIndexHints = false,
+  globals,
   migrationDir: migrationDirArg,
   mongoMemoryServer,
-  prodMigrations,
+  schemaOptions,
   transactionOptions = {},
   url,
 }: Args): DatabaseAdapterObj {
@@ -149,17 +171,21 @@ export function mongooseAdapter({
 
       // Mongoose-specific
       autoPluralization,
+      collectionOptions: collections || {},
       collections: {},
       connectOptions: connectOptions || {},
       connection: undefined,
       count,
       disableIndexHints,
       globals: undefined,
+      globalsOptions: globals || {},
       mongoMemoryServer,
+      schemaOptions: schemaOptions || {},
       sessions: {},
       transactionOptions: transactionOptions === false ? undefined : transactionOptions,
       url,
       versions: {},
+
       // DatabaseAdapter
       beginTransaction: transactionOptions ? beginTransaction : undefined,
       commitTransaction,
@@ -182,9 +208,7 @@ export function mongooseAdapter({
       init,
       migrateFresh,
       migrationDir,
-      packageName: '@payloadcms/db-mongodb',
       payload,
-      prodMigrations,
       queryDrafts,
       rollbackTransaction,
       updateGlobal,

packages/db-mongodb/src/init.ts

@@ -16,20 +16,22 @@ import { getDBName } from './utilities/getDBName.js'
 
 export const init: Init = function init(this: MongooseAdapter) {
   this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {
-    const schema = buildCollectionSchema(collection, this.payload.config)
+    const schema = buildCollectionSchema(collection, this)
 
     if (collection.versions) {
       const versionModelName = getDBName({ config: collection, versions: true })
 
       const versionCollectionFields = buildVersionCollectionFields(collection)
 
-      const versionSchema = buildSchema(this.payload.config, versionCollectionFields, {
+      const versionSchema = buildSchema(this, versionCollectionFields, {
         disableUnique: true,
         draftsEnabled: true,
         indexSortableFields: this.payload.config.indexSortableFields,
         options: {
           minimize: false,
           timestamps: false,
+          ...this.schemaOptions,
+          ...(this.collectionOptions[collection.slug]?.schemaOptions || {}),
         },
       })
 
@@ -57,7 +59,7 @@ export const init: Init = function init(this: MongooseAdapter) {
     this.collections[collection.slug] = model
   })
 
-  const model = buildGlobalModel(this.payload.config)
+  const model = buildGlobalModel(this)
   this.globals = model
 
   this.payload.config.globals.forEach((global) => {
@@ -66,13 +68,15 @@ export const init: Init = function init(this: MongooseAdapter) {
 
       const versionGlobalFields = buildVersionGlobalFields(global)
 
-      const versionSchema = buildSchema(this.payload.config, versionGlobalFields, {
+      const versionSchema = buildSchema(this, versionGlobalFields, {
         disableUnique: true,
         draftsEnabled: true,
         indexSortableFields: this.payload.config.indexSortableFields,
         options: {
           minimize: false,
           timestamps: false,
+          ...this.schemaOptions,
+          ...(this.globalsOptions.schemaOptions || {}),
         },
       })
 

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

@@ -1,39 +1,29 @@
 import type { PaginateOptions, Schema } from 'mongoose'
-import type { SanitizedCollectionConfig, SanitizedConfig } from 'payload'
+import type { SanitizedCollectionConfig } from 'payload'
 
 import paginate from 'mongoose-paginate-v2'
 
+import type { MongooseAdapter } from '../index.js'
+
 import getBuildQueryPlugin from '../queries/buildQuery.js'
 import buildSchema from './buildSchema.js'
 
 const buildCollectionSchema = (
   collection: SanitizedCollectionConfig,
-  config: SanitizedConfig,
-  schemaOptions = {},
+  adapter: MongooseAdapter,
 ): Schema => {
-  const schema = buildSchema(config, collection.fields, {
+  const schema = buildSchema(adapter, collection.fields, {
     draftsEnabled: Boolean(typeof collection?.versions === 'object' && collection.versions.drafts),
-    indexSortableFields: config.indexSortableFields,
+    indexSortableFields: adapter.payload.config.indexSortableFields,
     options: {
       minimize: false,
       timestamps: collection.timestamps !== false,
-      ...schemaOptions,
+      ...adapter.schemaOptions,
+      ...(adapter.collectionOptions[collection.slug]?.schemaOptions || {}),
     },
   })
 
-  if (Array.isArray(collection.upload.filenameCompoundIndex)) {
-    const indexDefinition: Record<string, 1> = collection.upload.filenameCompoundIndex.reduce(
-      (acc, index) => {
-        acc[index] = 1
-        return acc
-      },
-      {},
-    )
-
-    schema.index(indexDefinition, { unique: true })
-  }
-
-  if (config.indexSortableFields && collection.timestamps !== false) {
+  if (adapter.payload.config.indexSortableFields && collection.timestamps !== false) {
     schema.index({ updatedAt: 1 })
     schema.index({ createdAt: 1 })
   }

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

@@ -1,27 +1,34 @@
-import type { SanitizedConfig } from 'payload'
-
 import mongoose from 'mongoose'
 
+import type { MongooseAdapter } from '../index.js'
 import type { GlobalModel } from '../types.js'
 
 import getBuildQueryPlugin from '../queries/buildQuery.js'
 import buildSchema from './buildSchema.js'
 
-export const buildGlobalModel = (config: SanitizedConfig): GlobalModel | null => {
-  if (config.globals && config.globals.length > 0) {
+export const buildGlobalModel = (adapter: MongooseAdapter): GlobalModel | null => {
+  if (adapter.payload.config.globals && adapter.payload.config.globals.length > 0) {
     const globalsSchema = new mongoose.Schema(
       {},
-      { discriminatorKey: 'globalType', minimize: false, timestamps: true },
+      {
+        discriminatorKey: 'globalType',
+        minimize: false,
+        ...adapter.schemaOptions,
+        ...(adapter.globalsOptions.schemaOptions || {}),
+        timestamps: true,
+      },
     )
 
     globalsSchema.plugin(getBuildQueryPlugin())
 
     const Globals = mongoose.model('globals', globalsSchema, 'globals') as unknown as GlobalModel
 
-    Object.values(config.globals).forEach((globalConfig) => {
-      const globalSchema = buildSchema(config, globalConfig.fields, {
+    Object.values(adapter.payload.config.globals).forEach((globalConfig) => {
+      const globalSchema = buildSchema(adapter, globalConfig.fields, {
         options: {
           minimize: false,
+          ...adapter.schemaOptions,
+          ...(adapter.globalsOptions.schemaOptions || {}),
         },
       })
       Globals.discriminator(globalConfig.slug, globalSchema)

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

@@ -19,7 +19,6 @@ import type {
   RelationshipField,
   RichTextField,
   RowField,
-  SanitizedConfig,
   SanitizedLocalizationConfig,
   SelectField,
   Tab,
@@ -37,6 +36,8 @@ import {
   tabHasName,
 } from 'payload/shared'
 
+import type { MongooseAdapter } from '../index.js'
+
 export type BuildSchemaOptions = {
   allowIDField?: boolean
   disableUnique?: boolean
@@ -48,23 +49,13 @@ export type BuildSchemaOptions = {
 type FieldSchemaGenerator = (
   field: Field,
   schema: Schema,
-  config: SanitizedConfig,
+  adapter: MongooseAdapter,
   buildSchemaOptions: BuildSchemaOptions,
 ) => void
 
-/**
- * get a field's defaultValue only if defined and not dynamic so that it can be set on the field schema
- * @param field
- */
-const formatDefaultValue = (field: FieldAffectingData) =>
-  typeof field.defaultValue !== 'undefined' && typeof field.defaultValue !== 'function'
-    ? field.defaultValue
-    : undefined
-
 const formatBaseSchema = (field: FieldAffectingData, buildSchemaOptions: BuildSchemaOptions) => {
   const { disableUnique, draftsEnabled, indexSortableFields } = buildSchemaOptions
   const schema: SchemaTypeOptions<unknown> = {
-    default: formatDefaultValue(field),
     index: field.index || (!disableUnique && field.unique) || indexSortableFields || false,
     required: false,
     unique: (!disableUnique && field.unique) || false,
@@ -97,10 +88,10 @@ const localizeSchema = (
   if (fieldIsLocalized(entity) && localization && Array.isArray(localization.locales)) {
     return {
       type: localization.localeCodes.reduce(
-        (localeSchema, locale) => ({
-          ...localeSchema,
-          [locale]: schema,
-        }),
+        (localeSchema, locale) => {
+          localeSchema[locale] = schema
+          return localeSchema
+        },
         {
           _id: false,
         },
@@ -112,7 +103,7 @@ const localizeSchema = (
 }
 
 const buildSchema = (
-  config: SanitizedConfig,
+  adapter: MongooseAdapter,
   configFields: Field[],
   buildSchemaOptions: BuildSchemaOptions = {},
 ): Schema => {
@@ -140,7 +131,7 @@ const buildSchema = (
       const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[field.type]
 
       if (addFieldSchema) {
-        addFieldSchema(field, schema, config, buildSchemaOptions)
+        addFieldSchema(field, schema, adapter, buildSchemaOptions)
       }
     }
   })
@@ -152,55 +143,77 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
   array: (
     field: ArrayField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ) => {
     const baseSchema = {
       ...formatBaseSchema(field, buildSchemaOptions),
       type: [
-        buildSchema(config, field.fields, {
+        buildSchema(adapter, field.fields, {
           allowIDField: true,
           disableUnique: buildSchemaOptions.disableUnique,
           draftsEnabled: buildSchemaOptions.draftsEnabled,
           options: {
+            minimize: false,
+            ...(buildSchemaOptions.options || {}),
             _id: false,
             id: false,
-            minimize: false,
+            timestamps: false,
           },
         }),
       ],
+      default: undefined,
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   blocks: (
     field: BlockField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const fieldSchema = {
-      type: [new mongoose.Schema({}, { _id: false, discriminatorKey: 'blockType' })],
+      type: [
+        new mongoose.Schema(
+          {},
+          {
+            _id: false,
+            discriminatorKey: 'blockType',
+            ...(buildSchemaOptions.options || {}),
+            timestamps: false,
+          },
+        ),
+      ],
+      default: undefined,
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, fieldSchema, config.localization),
+      [field.name]: localizeSchema(field, fieldSchema, adapter.payload.config.localization),
     })
 
     field.blocks.forEach((blockItem: Block) => {
-      const blockSchema = new mongoose.Schema({}, { _id: false, id: false })
+      const blockSchema = new mongoose.Schema(
+        {},
+        {
+          ...(buildSchemaOptions.options || {}),
+          _id: false,
+          id: false,
+          timestamps: false,
+        },
+      )
 
       blockItem.fields.forEach((blockField) => {
         const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[blockField.type]
         if (addFieldSchema) {
-          addFieldSchema(blockField, blockSchema, config, buildSchemaOptions)
+          addFieldSchema(blockField, blockSchema, adapter, buildSchemaOptions)
         }
       })
 
-      if (field.localized && config.localization) {
-        config.localization.localeCodes.forEach((localeCode) => {
+      if (field.localized && adapter.payload.config.localization) {
+        adapter.payload.config.localization.localeCodes.forEach((localeCode) => {
           // @ts-expect-error Possible incorrect typing in mongoose types, this works
           schema.path(`${field.name}.${localeCode}`).discriminator(blockItem.slug, blockSchema)
         })
@@ -213,69 +226,69 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
   checkbox: (
     field: CheckboxField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = { ...formatBaseSchema(field, buildSchemaOptions), type: Boolean }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   code: (
     field: CodeField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = { ...formatBaseSchema(field, buildSchemaOptions), type: String }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   collapsible: (
     field: CollapsibleField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     field.fields.forEach((subField: Field) => {
       const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[subField.type]
 
       if (addFieldSchema) {
-        addFieldSchema(subField, schema, config, buildSchemaOptions)
+        addFieldSchema(subField, schema, adapter, buildSchemaOptions)
       }
     })
   },
   date: (
     field: DateField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = { ...formatBaseSchema(field, buildSchemaOptions), type: Date }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   email: (
     field: EmailField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = { ...formatBaseSchema(field, buildSchemaOptions), type: String }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   group: (
     field: GroupField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const formattedBaseSchema = formatBaseSchema(field, buildSchemaOptions)
@@ -288,26 +301,28 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
 
     const baseSchema = {
       ...formattedBaseSchema,
-      type: buildSchema(config, field.fields, {
+      type: buildSchema(adapter, field.fields, {
         disableUnique: buildSchemaOptions.disableUnique,
         draftsEnabled: buildSchemaOptions.draftsEnabled,
         indexSortableFields,
         options: {
+          minimize: false,
+          ...(buildSchemaOptions.options || {}),
           _id: false,
           id: false,
-          minimize: false,
+          timestamps: false,
         },
       }),
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   json: (
     field: JSONField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = {
@@ -316,13 +331,13 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   number: (
     field: NumberField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = {
@@ -331,13 +346,13 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   point: (
     field: PointField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema: SchemaTypeOptions<unknown> = {
@@ -347,7 +362,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
       },
       coordinates: {
         type: [Number],
-        default: formatDefaultValue(field),
+        default: field.defaultValue || undefined,
         required: false,
       },
     }
@@ -356,7 +371,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
 
     if (field.index === true || field.index === undefined) {
@@ -365,8 +380,8 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
         indexOptions.sparse = true
         indexOptions.unique = true
       }
-      if (field.localized && config.localization) {
-        config.localization.locales.forEach((locale) => {
+      if (field.localized && adapter.payload.config.localization) {
+        adapter.payload.config.localization.locales.forEach((locale) => {
           schema.index({ [`${field.name}.${locale.code}`]: '2dsphere' }, indexOptions)
         })
       } else {
@@ -377,7 +392,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
   radio: (
     field: RadioField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = {
@@ -390,21 +405,21 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   relationship: (
     field: RelationshipField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ) => {
     const hasManyRelations = Array.isArray(field.relationTo)
     let schemaToReturn: { [key: string]: any } = {}
 
-    if (field.localized && config.localization) {
+    if (field.localized && adapter.payload.config.localization) {
       schemaToReturn = {
-        type: config.localization.localeCodes.reduce((locales, locale) => {
+        type: adapter.payload.config.localization.localeCodes.reduce((locales, locale) => {
           let localeSchema: { [key: string]: any } = {}
 
           if (hasManyRelations) {
@@ -428,9 +443,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
 
           return {
             ...locales,
-            [locale]: field.hasMany
-              ? { type: [localeSchema], default: formatDefaultValue(field) }
-              : localeSchema,
+            [locale]: field.hasMany ? { type: [localeSchema], default: undefined } : localeSchema,
           }
         }, {}),
         localized: true,
@@ -450,7 +463,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
       if (field.hasMany) {
         schemaToReturn = {
           type: [schemaToReturn],
-          default: formatDefaultValue(field),
+          default: undefined,
         }
       }
     } else {
@@ -463,7 +476,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
       if (field.hasMany) {
         schemaToReturn = {
           type: [schemaToReturn],
-          default: formatDefaultValue(field),
+          default: undefined,
         }
       }
     }
@@ -475,7 +488,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
   richText: (
     field: RichTextField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = {
@@ -484,27 +497,27 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   row: (
     field: RowField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     field.fields.forEach((subField: Field) => {
       const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[subField.type]
 
       if (addFieldSchema) {
-        addFieldSchema(subField, schema, config, buildSchemaOptions)
+        addFieldSchema(subField, schema, adapter, buildSchemaOptions)
       }
     })
   },
   select: (
     field: SelectField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = {
@@ -524,39 +537,41 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
       [field.name]: localizeSchema(
         field,
         field.hasMany ? [baseSchema] : baseSchema,
-        config.localization,
+        adapter.payload.config.localization,
       ),
     })
   },
   tabs: (
     field: TabsField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     field.tabs.forEach((tab) => {
       if (tabHasName(tab)) {
         const baseSchema = {
-          type: buildSchema(config, tab.fields, {
+          type: buildSchema(adapter, tab.fields, {
             disableUnique: buildSchemaOptions.disableUnique,
             draftsEnabled: buildSchemaOptions.draftsEnabled,
             options: {
+              minimize: false,
+              ...(buildSchemaOptions.options || {}),
               _id: false,
               id: false,
-              minimize: false,
+              timestamps: false,
             },
           }),
         }
 
         schema.add({
-          [tab.name]: localizeSchema(tab, baseSchema, config.localization),
+          [tab.name]: localizeSchema(tab, baseSchema, adapter.payload.config.localization),
         })
       } else {
         tab.fields.forEach((subField: Field) => {
           const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[subField.type]
 
           if (addFieldSchema) {
-            addFieldSchema(subField, schema, config, buildSchemaOptions)
+            addFieldSchema(subField, schema, adapter, buildSchemaOptions)
           }
         })
       }
@@ -565,7 +580,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
   text: (
     field: TextField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = {
@@ -574,98 +589,35 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   textarea: (
     field: TextareaField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     const baseSchema = { ...formatBaseSchema(field, buildSchemaOptions), type: String }
 
     schema.add({
-      [field.name]: localizeSchema(field, baseSchema, config.localization),
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
   upload: (
     field: UploadField,
     schema: Schema,
-    config: SanitizedConfig,
+    adapter: MongooseAdapter,
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
-    const hasManyRelations = Array.isArray(field.relationTo)
-    let schemaToReturn: { [key: string]: any } = {}
-
-    if (field.localized && config.localization) {
-      schemaToReturn = {
-        type: config.localization.localeCodes.reduce((locales, locale) => {
-          let localeSchema: { [key: string]: any } = {}
-
-          if (hasManyRelations) {
-            localeSchema = {
-              ...formatBaseSchema(field, buildSchemaOptions),
-              _id: false,
-              type: mongoose.Schema.Types.Mixed,
-              relationTo: { type: String, enum: field.relationTo },
-              value: {
-                type: mongoose.Schema.Types.Mixed,
-                refPath: `${field.name}.${locale}.relationTo`,
-              },
-            }
-          } else {
-            localeSchema = {
-              ...formatBaseSchema(field, buildSchemaOptions),
-              type: mongoose.Schema.Types.Mixed,
-              ref: field.relationTo,
-            }
-          }
-
-          return {
-            ...locales,
-            [locale]: field.hasMany
-              ? { type: [localeSchema], default: formatDefaultValue(field) }
-              : localeSchema,
-          }
-        }, {}),
-        localized: true,
-      }
-    } else if (hasManyRelations) {
-      schemaToReturn = {
-        ...formatBaseSchema(field, buildSchemaOptions),
-        _id: false,
-        type: mongoose.Schema.Types.Mixed,
-        relationTo: { type: String, enum: field.relationTo },
-        value: {
-          type: mongoose.Schema.Types.Mixed,
-          refPath: `${field.name}.relationTo`,
-        },
-      }
-
-      if (field.hasMany) {
-        schemaToReturn = {
-          type: [schemaToReturn],
-          default: formatDefaultValue(field),
-        }
-      }
-    } else {
-      schemaToReturn = {
-        ...formatBaseSchema(field, buildSchemaOptions),
-        type: mongoose.Schema.Types.Mixed,
-        ref: field.relationTo,
-      }
-
-      if (field.hasMany) {
-        schemaToReturn = {
-          type: [schemaToReturn],
-          default: formatDefaultValue(field),
-        }
-      }
+    const baseSchema = {
+      ...formatBaseSchema(field, buildSchemaOptions),
+      type: mongoose.Schema.Types.Mixed,
+      ref: field.relationTo,
     }
 
     schema.add({
-      [field.name]: schemaToReturn,
+      [field.name]: localizeSchema(field, baseSchema, adapter.payload.config.localization),
     })
   },
 }

packages/db-mongodb/src/types.ts

@@ -67,6 +67,31 @@ export type FieldGenerator<TSchema, TField> = {
   schema: TSchema
 }
 
+/**
+ * Field config types that need representation in the database
+ */
+type FieldType =
+  | 'array'
+  | 'blocks'
+  | 'checkbox'
+  | 'code'
+  | 'collapsible'
+  | 'date'
+  | 'email'
+  | 'group'
+  | 'json'
+  | 'number'
+  | 'point'
+  | 'radio'
+  | 'relationship'
+  | 'richText'
+  | 'row'
+  | 'select'
+  | 'tabs'
+  | 'text'
+  | 'textarea'
+  | 'upload'
+
 export type FieldGeneratorFunction<TSchema, TField extends Field> = (
   args: FieldGenerator<TSchema, TField>,
 ) => void

packages/db-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.71",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -42,13 +42,13 @@
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "prepack": "pnpm clean && pnpm turbo build",
     "prepublishOnly": "pnpm clean && pnpm turbo build",
-    "renamePredefinedMigrations": "node --no-deprecation --import @swc-node/register/esm-register ./scripts/renamePredefinedMigrations.ts"
+    "renamePredefinedMigrations": "tsx ./scripts/renamePredefinedMigrations.ts"
   },
   "dependencies": {
     "@payloadcms/drizzle": "workspace:*",
     "console-table-printer": "2.11.2",
-    "drizzle-kit": "0.23.2-df9e596",
-    "drizzle-orm": "0.32.1",
+    "drizzle-kit": "0.20.14-1f2c838",
+    "drizzle-orm": "0.29.4",
     "pg": "8.11.3",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
@@ -59,7 +59,7 @@
     "@payloadcms/eslint-config": "workspace:*",
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
-    "esbuild": "0.23.1",
+    "esbuild": "0.23.0",
     "payload": "workspace:*"
   },
   "peerDependencies": {

packages/db-postgres/src/connect.ts

@@ -53,7 +53,6 @@ export const connect: Connect = async function connect(
   const { hotReload } = options
 
   this.schema = {
-    pgSchema: this.pgSchema,
     ...this.tables,
     ...this.relations,
     ...this.enums,
@@ -91,8 +90,4 @@ export const connect: Connect = async function connect(
   }
 
   if (typeof this.resolveInitializing === 'function') this.resolveInitializing()
-
-  if (process.env.NODE_ENV === 'production' && this.prodMigrations) {
-    await this.migrate({ migrations: this.prodMigrations })
-  }
 }

packages/db-postgres/src/countDistinct.ts

@@ -1,12 +1,12 @@
+import type { ChainedMethods, TransactionPg } from '@payloadcms/drizzle/types'
+
+import { chainMethods } from '@payloadcms/drizzle'
 import { sql } from 'drizzle-orm'
 
-import type { ChainedMethods, TransactionPg } from '../types.js'
-import type { BasePostgresAdapter, CountDistinct } from './types.js'
-
-import { chainMethods } from '../find/chainMethods.js'
+import type { CountDistinct, PostgresAdapter } from './types.js'
 
 export const countDistinct: CountDistinct = async function countDistinct(
-  this: BasePostgresAdapter,
+  this: PostgresAdapter,
   { db, joins, tableName, where },
 ) {
   const chainedMethods: ChainedMethods = []

packages/db-postgres/src/createMigration.ts

@@ -1,13 +1,14 @@
+import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload'
 import type { CreateMigration } from 'payload'
 
 import fs from 'fs'
 import { createRequire } from 'module'
 import path from 'path'
-import { getPredefinedMigration, writeMigrationIndex } from 'payload'
+import { getPredefinedMigration } from 'payload'
 import prompts from 'prompts'
 import { fileURLToPath } from 'url'
 
-import type { BasePostgresAdapter } from './types.js'
+import type { PostgresAdapter } from './types.js'
 
 import { defaultDrizzleSnapshot } from './defaultSnapshot.js'
 import { getMigrationTemplate } from './getMigrationTemplate.js'
@@ -15,7 +16,7 @@ import { getMigrationTemplate } from './getMigrationTemplate.js'
 const require = createRequire(import.meta.url)
 
 export const createMigration: CreateMigration = async function createMigration(
-  this: BasePostgresAdapter,
+  this: PostgresAdapter,
   { file, forceAcceptWarning, migrationName, payload },
 ) {
   const filename = fileURLToPath(import.meta.url)
@@ -24,7 +25,7 @@ export const createMigration: CreateMigration = async function createMigration(
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir)
   }
-  const { generateDrizzleJson, generateMigration, upPgSnapshot } = require('drizzle-kit/api')
+  const { generateDrizzleJson, generateMigration } = require('drizzle-kit/payload')
   const drizzleJsonAfter = generateDrizzleJson(this.schema)
   const [yyymmdd, hhmmss] = new Date().toISOString().split('T')
   const formattedDate = yyymmdd.replace(/\D/g, '')
@@ -48,12 +49,6 @@ export const createMigration: CreateMigration = async function createMigration(
 
   let drizzleJsonBefore = defaultDrizzleSnapshot
 
-  if (this.schemaName) {
-    drizzleJsonBefore.schemas = {
-      [this.schemaName]: this.schemaName,
-    }
-  }
-
   if (!upSQL) {
     // Get latest migration snapshot
     const latestSnapshot = fs
@@ -63,11 +58,9 @@ export const createMigration: CreateMigration = async function createMigration(
       .reverse()?.[0]
 
     if (latestSnapshot) {
-      drizzleJsonBefore = JSON.parse(fs.readFileSync(`${dir}/${latestSnapshot}`, 'utf8'))
-
-      if (drizzleJsonBefore.version < drizzleJsonAfter.version) {
-        drizzleJsonBefore = upPgSnapshot(drizzleJsonBefore)
-      }
+      drizzleJsonBefore = JSON.parse(
+        fs.readFileSync(`${dir}/${latestSnapshot}`, 'utf8'),
+      ) as DrizzleSnapshotJSON
     }
 
     const sqlStatementsUp = await generateMigration(drizzleJsonBefore, drizzleJsonAfter)
@@ -111,12 +104,8 @@ export const createMigration: CreateMigration = async function createMigration(
     getMigrationTemplate({
       downSQL: downSQL || `  // Migration code`,
       imports,
-      packageName: payload.db.packageName,
       upSQL: upSQL || `  // Migration code`,
     }),
   )
-
-  writeMigrationIndex({ migrationsDir: payload.db.migrationDir })
-
   payload.logger.info({ msg: `Migration created at ${filePath}.ts` })
 }

packages/db-postgres/src/defaultSnapshot.ts

@@ -1,4 +1,4 @@
-import type { DrizzleSnapshotJSON } from 'drizzle-kit/api'
+import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload'
 
 export const defaultDrizzleSnapshot: DrizzleSnapshotJSON = {
   id: '00000000-0000-0000-0000-000000000000',
@@ -7,11 +7,10 @@ export const defaultDrizzleSnapshot: DrizzleSnapshotJSON = {
     schemas: {},
     tables: {},
   },
-  dialect: 'postgresql',
+  dialect: 'pg',
   enums: {},
   prevId: '00000000-0000-0000-0000-00000000000',
   schemas: {},
-  sequences: {},
   tables: {},
-  version: '7',
+  version: '5',
 }