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

fixes #8430

.github/actions/setup/action.yml

@@ -0,0 +1,48 @@
+name: Setup node and pnpm
+description: Configure the Node.js and pnpm versions
+
+inputs:
+  node-version:
+    description: 'The Node.js version to use'
+    required: true
+    default: 22.6.2
+  pnpm-version:
+    description: 'The pnpm version to use'
+    required: true
+    default: 9.7.1
+
+runs:
+  using: composite
+  steps:
+    # https://github.com/actions/virtual-environments/issues/1187
+    - name: tune linux network
+      shell: bash
+      run: sudo ethtool -K eth0 tx off rx off
+
+    - name: Setup Node@${{ inputs.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.node-version }}
+
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: ${{ inputs.pnpm-version }}
+        run_install: false
+
+    - name: Get pnpm store directory
+      shell: bash
+      run: |
+        echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+    - name: Setup pnpm cache
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.STORE_PATH }}
+        key: pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          pnpm-store-
+          pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+
+    - shell: bash
+      run: pnpm install

.github/workflows/label-author.yml

@@ -32,8 +32,26 @@ jobs:
           script: |
             const type = context.payload.pull_request ? 'pull_request' : 'issue';
             const association = context.payload[type].author_association;
-            let label = ''
-            if (association === 'MEMBER' || association === 'OWNER') {
+            let label = '';
+            if (
+              association === 'MEMBER' ||
+              association === 'OWNER' ||
+              [
+                'denolfe',
+                'jmikrut',
+                'danribbens',
+
+                'alessiogr',
+                'jacobsfletch',
+                'jarrodmflesch',
+                'jesschowdhury',
+                'kendelljoseph',
+                'patrikkozak',
+                'paulpopus',
+                'r1tsuu',
+                'tylandavis',
+              ].includes(context.actor.toLowerCase())
+            ) {
               label = 'created-by: Payload team';
             } else if (association === 'CONTRIBUTOR') {
               label = 'created-by: Contributor';
@@ -47,4 +65,4 @@ jobs:
               repo: context.repo.repo,
               labels: [label],
             });
-            console.log('Added created-by: Payload team label');
+            console.log(`Added '${label}' label`);

.github/workflows/main.yml

@@ -310,6 +310,7 @@ jobs:
           - fields__collections__Upload
           - live-preview
           - localization
+          - locked-documents
           - i18n
           - plugin-cloud-storage
           - plugin-form-builder

.github/workflows/post-release.yml

@@ -15,7 +15,6 @@ jobs:
           fetch-depth: 0
           # Only needed if debugging on a branch other than default
           # ref: ${{ github.event.release.target_commitish || github.ref }}
-      - run: echo "npm_version=$(npm pkg get version | tr -d '"')" >> "$GITHUB_ENV"
       - uses: ./.github/actions/release-commenter
         continue-on-error: true
         env:

.github/workflows/pr-title.yml

@@ -38,6 +38,7 @@ jobs:
             db-\*
             db-mongodb
             db-postgres
+            db-vercel-postgres
             db-sqlite
             drizzle
             email-nodemailer
@@ -52,7 +53,6 @@ jobs:
             plugin-form-builder
             plugin-nested-docs
             plugin-redirects
-            plugin-relationship-object-ids
             plugin-search
             plugin-sentry
             plugin-seo
@@ -63,6 +63,7 @@ jobs:
             storage-\*
             storage-azure
             storage-gcs
+            storage-uploadthing
             storage-vercel-blob
             storage-s3
             translations

.gitignore

@@ -313,3 +313,4 @@ test/admin-root/app/(payload)/admin/importMap.js
 test/app/(payload)/admin/importMap.js
 /test/app/(payload)/admin/importMap.js
 test/pnpm-lock.yaml
+test/databaseAdapter.js

.vscode/launch.json

@@ -118,6 +118,13 @@
       "request": "launch",
       "type": "node-terminal"
     },
+    {
+      "command": "node --no-deprecation test/dev.js locked-documents",
+      "cwd": "${workspaceFolder}",
+      "name": "Run Dev Locked Documents",
+      "request": "launch",
+      "type": "node-terminal"
+    },
     {
       "command": "node --no-deprecation test/dev.js uploads",
       "cwd": "${workspaceFolder}",

docs/admin/components.mdx

@@ -357,7 +357,7 @@ Each Custom Component receives the following props by default:
 | Prop                      | Description                                                                                           |
 | ------------------------- | ----------------------------------------------------------------------------------------------------- |
 | `payload`                 | The [Payload](../local-api/overview) class.                                                           |
-| `i18n`                    | The [i18n](../i18n) object.                                                                           |
+| `i18n`                    | The [i18n](../configuration/i18n) object.                                                                           |
 
 Custom Components also receive various other props that are specific to the context in which the Custom Component is being rendered. For example, [Custom Views](./views) receive the `user` prop. For a full list of available props, consult the documentation related to the specific component you are working with.
 

docs/admin/locked-documents.mdx

@@ -0,0 +1,79 @@
+---
+title: Document Locking
+label: Document Locking
+order: 90
+desc: Ensure your documents are locked while being edited, preventing concurrent edits from multiple users and preserving data integrity.
+keywords: locking, document locking, edit locking, document, concurrency, Payload, headless, Content Management System, cms, javascript, react, node, nextjs
+---
+
+Document locking in Payload ensures that only one user at a time can edit a document, preventing data conflicts and accidental overwrites. When a document is locked, other users are prevented from making changes until the lock is released, ensuring data integrity in collaborative environments.
+
+The lock is automatically triggered when a user begins editing a document within the Admin Panel and remains in place until the user exits the editing view or the lock expires due to inactivity.
+
+## How it works
+
+When a user starts editing a document, Payload locks the document for that user. If another user tries to access the same document, they will be notified that it is currently being edited and can choose one of the following options:
+
+- View in Read-Only Mode: View the document without making any changes.
+- Take Over Editing: Take over editing from the current user, which locks the document for the new editor and notifies the original user.
+- Return to Dashboard: Navigate away from the locked document and continue with other tasks.
+
+The lock will automatically expire after a set period of inactivity, configurable using the duration property in the lockDocuments configuration, after which others can resume editing.
+
+<Banner type="info"> <strong>Note:</strong> If your application does not require document locking, you can disable this feature for any collection by setting the <code>lockDocuments</code> property to <code>false</code>. </Banner>
+
+### Config Options
+
+The lockDocuments property exists on both the Collection Config and the Global Config. By default, document locking is enabled for all collections and globals, but you can customize the lock duration or disable the feature entirely.
+
+Here’s an example configuration for document locking:
+
+```ts
+import { CollectionConfig } from 'payload'
+
+export const Posts: CollectionConfig = {
+  slug: 'posts',
+  fields: [
+    {
+      name: 'title',
+      type: 'text',
+    },
+    // other fields...
+  ],
+  lockDocuments: {
+    duration: 600, // Duration in seconds
+  },
+}
+```
+
+#### Locking Options
+
+| Option              | Description                                                                                                                                                                    |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **`lockDocuments`** | Enables or disables document locking for the collection or global. By default, document locking is enabled. Set to an object to configure, or set to false to disable locking. |
+| **`duration`**      | Specifies the duration (in seconds) for how long a document remains locked without user interaction. The default is 300 seconds (5 minutes).                                   |
+
+### Impact on APIs
+
+Document locking affects both the Local API and the REST API, ensuring that if a document is locked, concurrent users will not be able to perform updates or deletes on that document (including globals). If a user attempts to update or delete a locked document, they will receive an error.
+
+Once the document is unlocked or the lock duration has expired, other users can proceed with updates or deletes as normal.
+
+#### Overriding Locks
+
+For operations like update and delete, Payload includes an `overrideLock` option. This boolean flag, when set to `false`, enforces document locks, ensuring that the operation will not proceed if another user currently holds the lock.
+
+By default, `overrideLock` is set to `true`, which means that document locks are ignored, and the operation will proceed even if the document is locked. To enforce locks and prevent updates or deletes on locked documents, set `overrideLock: false`.
+
+```ts
+const result = await payload.update({
+  collection: 'posts',
+  id: '123',
+  data: {
+    title: 'New title',
+  },
+  overrideLock: false, // Enforces the document lock, preventing updates if the document is locked
+})
+```
+
+This option is particularly useful in scenarios where administrative privileges or specific workflows require you to override the lock and ensure the operation is completed.

docs/admin/overview.mdx

@@ -98,6 +98,7 @@ The following options are available:
 | **`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).                                                                 |
+| **`theme`**       | Restrict the Admin Panel theme to use only one of your choice. Default is `all`.
 | **`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">

docs/authentication/cookies.mdx

@@ -85,3 +85,47 @@ const config = buildConfig({
 
 export default config
 ```
+
+#### Cross domain authentication
+
+If your frontend is on a different domain than your Payload API then you will not be able to use HTTP-only cookies for authentication by default as they will be considered third-party cookies by the browser.
+There are a few strategies to get around this:
+
+##### 1. Use subdomains
+
+Cookies can cross subdomains without being considered third party cookies, for example if your API is at api.example.com then you can authenticate from example.com.
+
+##### 2. Configure cookies
+
+If option 1 isn't possible, then you can get around this limitation by [configuring your cookies](https://payloadcms.com/docs/beta/authentication/overview#config-options) on your authentication collection to achieve the following setup:
+
+```
+SameSite: None // allows the cookie to cross domains
+Secure: true // ensures its sent over HTTPS only
+HttpOnly: true // ensures its not accessible via client side JavaScript
+```
+
+Configuration example:
+
+```ts
+{
+  slug: 'users',
+  auth: {
+    cookies: {
+      sameSite: 'None',
+      secure: true,
+    }
+  },
+  fields: [
+    // your auth fields here
+  ]
+},
+```
+
+If you're configuring [cors](https://payloadcms.com/docs/beta/production/preventing-abuse#cross-origin-resource-sharing-cors) in your Payload config, you won't be able to use a wildcard anymore, you'll need to specify the list of allowed domains.
+
+
+<Banner type="success">
+  <strong>Good to know:</strong>
+  Setting up <code>secure: true</code> will not work if you're developing on <code>http://localhost</code> or any non-https domain. For local development you should conditionally set this to <code>false</code> based on the environment.
+</Banner>

docs/configuration/collections.mdx

@@ -57,25 +57,26 @@ export const Posts: CollectionConfig = {
 
 The following options are available:
 
-| Option                 | Description                                                                                                                                                                                                              |
-|------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **`admin`**            | The configuration options for the Admin Panel. [More details](../admin/collections).                                                                                                                                            |
-| **`access`**           | Provide Access Control functions to define exactly who should be able to do what with Documents in this Collection. [More details](../access-control/collections).                                                   |
-| **`auth`**             | Specify options if you would like this Collection to feature authentication. [More details](../authentication/overview).                                                          |
-| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                          |
-| **`disableDuplicate`** | When true, do not show the "Duplicate" button while editing documents within this Collection and prevent `duplicate` from all APIs.                                                                                      |
-| **`defaultSort`**      | Pass a top-level field to sort by default in the Collection List View. Prefix the name of the field with a minus symbol ("-") to sort in descending order.                                                               |
-| **`dbName`**      | Custom table or Collection name depending on the Database Adapter. Auto-generated from slug if not defined. |
-| **`endpoints`**        | Add custom routes to the REST API. Set to `false` to disable routes. [More details](../rest-api/overview#custom-endpoints).                                                                                                    |
-| **`fields`** \*        | Array of field types that will determine the structure and functionality of the data stored within this Collection. [More details](../fields/overview). |
-| **`graphQL`**          | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. Set to `false` to disable GraphQL.                                                            |
-| **`hooks`**            | Entry point for Hooks. [More details](../hooks/overview#collection-hooks).                                                                                                         |
-| **`labels`**           | Singular and plural labels for use in identifying this Collection throughout Payload. Auto-generated from slug if not defined.                                                                                           |
-| **`slug`** \*          | Unique, URL-friendly string that will act as an identifier for this Collection.                                                                                                                                          |
-| **`timestamps`**       | Set to false to disable documents' automatically generated `createdAt` and `updatedAt` timestamps.                                                                                                                       |
-| **`typescript`**       | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined.                                                                                                                                                                                  |
-| **`upload`**           | Specify options if you would like this Collection to support file uploads. For more, consult the [Uploads](../upload/overview) documentation.                                                                         |
-| **`versions`**         | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#collection-config).                                                                                            |
+| Option                 | Description                                                                                                                                                                                    |
+|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`admin`**            | The configuration options for the Admin Panel. [More details](../admin/collections).                                                                                                           |
+| **`access`**           | Provide Access Control functions to define exactly who should be able to do what with Documents in this Collection. [More details](../access-control/collections).                             |
+| **`auth`**             | Specify options if you would like this Collection to feature authentication. [More details](../authentication/overview).                                                                       |
+| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                      |
+| **`disableDuplicate`** | When true, do not show the "Duplicate" button while editing documents within this Collection and prevent `duplicate` from all APIs.                                                            |
+| **`defaultSort`**      | Pass a top-level field to sort by default in the Collection List View. Prefix the name of the field with a minus symbol ("-") to sort in descending order.                                     |
+| **`dbName`**           | Custom table or Collection name depending on the Database Adapter. Auto-generated from slug if not defined.                                                                                    |
+| **`endpoints`**        | Add custom routes to the REST API. Set to `false` to disable routes. [More details](../rest-api/overview#custom-endpoints).                                                                    |
+| **`fields`** \*        | Array of field types that will determine the structure and functionality of the data stored within this Collection. [More details](../fields/overview).                                        |
+| **`graphQL`**          | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. Set to `false` to disable GraphQL.                                  |
+| **`hooks`**            | Entry point for Hooks. [More details](../hooks/overview#collection-hooks).                                                                                                                     |
+| **`labels`**           | Singular and plural labels for use in identifying this Collection throughout Payload. Auto-generated from slug if not defined.                                                                 |
+| **`lockDocuments`**    | Enables or disables document locking. By default, document locking is enabled. Set to an object to configure, or set to `false` to disable locking. [More details](../admin/locked-documents). |
+| **`slug`** \*          | Unique, URL-friendly string that will act as an identifier for this Collection.                                                                                                                |
+| **`timestamps`**       | Set to false to disable documents' automatically generated `createdAt` and `updatedAt` timestamps.                                                                                             |
+| **`typescript`**       | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined.                                                                            |
+| **`upload`**           | Specify options if you would like this Collection to support file uploads. For more, consult the [Uploads](../upload/overview) documentation.                                                  |
+| **`versions`**         | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#collection-config).                                                            |
 
 _\* An asterisk denotes that a property is required._
 

docs/configuration/globals.mdx

@@ -65,21 +65,22 @@ export const Nav: GlobalConfig = {
 
 The following options are available:
 
-| Option             | Description                                                                                                                                                                                                          |
-| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`access`**       | Provide Access Control functions to define exactly who should be able to do what with this Global. [More details](../access-control/globals).                                                                    |
-| **`admin`**        | The configuration options for the Admin Panel. [More details](../admin/globals).                                                                           |
-| **`custom`**       | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                            |
-| **`dbName`**       | Custom table or collection name for this Global depending on the Database Adapter. Auto-generated from slug if not defined. |
-| **`description`**  | Text or React component to display below the Global header to give editors more information.                                                                                                                         |
-| **`endpoints`**    | Add custom routes to the REST API. [More details](../rest-api/overview#custom-endpoints).                                                                                                                                  |
-| **`fields`** \*    | Array of field types that will determine the structure and functionality of the data stored within this Global. [More details](../fields/overview). |
-| **`graphQL.name`** | Text used in schema generation. Auto-generated from slug if not defined.                                                                                                                          |
-| **`hooks`**        | Entry point for Hooks. [More details](../hooks/overview#global-hooks).  |
-| **`label`**        | Text for the name in the Admin Panel or an object with keys for each language. Auto-generated from slug if not defined.                                                                                                                                                                                      |
-| **`slug`** \*      | Unique, URL-friendly string that will act as an identifier for this Global.                                                                                                                                          |
-| **`typescript`**   | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined.    |
-| **`versions`**     | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#globals-config).                                                                                           |
+| Option              | Description                                                                                                                                                                                    |
+| ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`access`**        | Provide Access Control functions to define exactly who should be able to do what with this Global. [More details](../access-control/globals).                                                  |
+| **`admin`**         | The configuration options for the Admin Panel. [More details](../admin/globals).                                                                                                               |
+| **`custom`**        | Extension point for adding custom data (e.g. for plugins)                                                                                                                                      |
+| **`dbName`**        | Custom table or collection name for this Global depending on the Database Adapter. Auto-generated from slug if not defined.                                                                    |
+| **`description`**   | Text or React component to display below the Global header to give editors more information.                                                                                                   |
+| **`endpoints`**     | Add custom routes to the REST API. [More details](../rest-api/overview#custom-endpoints).                                                                                                      |
+| **`fields`** \*     | Array of field types that will determine the structure and functionality of the data stored within this Global. [More details](../fields/overview).                                            |
+| **`graphQL.name`**  | Text used in schema generation. Auto-generated from slug if not defined.                                                                                                                       |
+| **`hooks`**         | Entry point for Hooks. [More details](../hooks/overview#global-hooks).                                                                                                                         |
+| **`label`**         | Text for the name in the Admin Panel or an object with keys for each language. Auto-generated from slug if not defined.                                                                        |
+| **`lockDocuments`** | Enables or disables document locking. By default, document locking is enabled. Set to an object to configure, or set to `false` to disable locking. [More details](../admin/locked-documents). |
+| **`slug`** \*       | Unique, URL-friendly string that will act as an identifier for this Global.                                                                                                                    |
+| **`typescript`**    | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined.                                                                            |
+| **`versions`**      | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#globals-config).                                                               |
 
 _\* An asterisk denotes that a property is required._
 

docs/database/migrations.mdx

@@ -33,10 +33,6 @@ A migration file has two exports - an `up` function, which is called when a migr
 that will be called if for some reason the migration fails to complete successfully. The `up` function should contain
 all changes that you attempt to make within the migration, and the `down` should ideally revert any changes you make.
 
-For an added level of safety, migrations should leverage Payload [transactions](/docs/database/transactions). Migration
-functions should make use of the `req` by adding it to the arguments of your Payload Local API calls such
-as `payload.create` and Database Adapter methods like `payload.db.create`.
-
 Here is an example migration file:
 
 ```ts
@@ -53,6 +49,14 @@ export async function down({ payload, req }: MigrateDownArgs): Promise<void> {
 }
 ```
 
+## Using Transactions
+
+When migrations are run, each migration is performed in a new [transactions](/docs/database/transactions) for you. All
+you need to do is pass the `req` object to any [local API](/docs/local-api/overview) or direct database calls, such as
+`payload.db.updateMany()`, to make database changes inside the transaction. Assuming no errors were thrown, the transaction is committed
+after your `up` or `down` function runs. If the migration errors at any point or fails to commit, it is caught and the
+transaction gets aborted. This way no change is made to the database if the migration fails.
+
 ## Migrations Directory
 
 Each DB adapter has an optional property `migrationDir` where you can override where you want your migrations to be

docs/database/postgres.mdx

@@ -63,6 +63,8 @@ export default buildConfig({
 | `localesSuffix`             | A string appended to the end of table names for storing localized fields. Default is '_locales'.                                                                                 |
 | `relationshipsSuffix`       | A string appended to the end of table names for storing relationships. Default is '_rels'.                                                                                       |
 | `versionsSuffix`            | A string appended to the end of table names for storing versions. Defaults to '_v'.                                                                                              |
+| `beforeSchemaInit`          | Drizzle schema hook. Runs before the schema is built. [More Details](#beforeschemainit)                                                                                          |
+| `afterSchemaInit`           | Drizzle schema hook. Runs after the schema is built. [More Details](#afterschemainit)                                                                                            |
 
 ## Access to Drizzle
 
@@ -97,3 +99,134 @@ Alternatively, you can disable `push` and rely solely on migrations to keep your
 In Postgres, migrations are a fundamental aspect of working with Payload and you should become familiar with how they work.
 
 For more information about migrations, [click here](/docs/beta/database/migrations#when-to-run-migrations).
+
+## Drizzle schema hooks
+
+### beforeSchemaInit
+
+Runs before the schema is built. You can use this hook to extend your database structure with tables that won't be managed by Payload.
+
+```ts
+import { postgresAdapter } from '@payloadcms/db-postgres'
+import { integer, pgTable, serial } from 'drizzle-orm/pg-core'
+
+postgresAdapter({
+  beforeSchemaInit: [
+    ({ schema, adapter }) => {
+      return {
+        ...schema,
+        tables: {
+          ...schema.tables,
+          addedTable: pgTable('added_table', {
+            id: serial('id').notNull(),
+          }),
+        },
+      }
+    },
+  ],
+})
+```
+
+One use case is preserving your existing database structure when migrating to Payload. By default, Payload drops the current database schema, which may not be desirable in this scenario.
+To quickly generate the Drizzle schema from your database you can use [Drizzle Introspection](https://orm.drizzle.team/kit-docs/commands#introspect--pull)
+You should get the `schema.ts` file which may look like this:
+
+```ts
+import { pgTable, uniqueIndex, serial, varchar, text } from 'drizzle-orm/pg-core'
+
+export const users = pgTable('users', {
+  id: serial('id').primaryKey(),
+  fullName: text('full_name'),
+  phone: varchar('phone', { length: 256 }),
+})
+
+export const countries = pgTable(
+  'countries',
+  {
+    id: serial('id').primaryKey(),
+    name: varchar('name', { length: 256 }),
+  },
+  (countries) => {
+    return {
+      nameIndex: uniqueIndex('name_idx').on(countries.name),
+    }
+  },
+)
+
+```
+
+You can import them into your config and append to the schema with the `beforeSchemaInit` hook like this:
+
+```ts
+import { postgresAdapter } from '@payloadcms/db-postgres'
+import { users, countries } from '../drizzle/schema'
+
+postgresAdapter({
+  beforeSchemaInit: [
+    ({ schema, adapter }) => {
+      return {
+        ...schema,
+        tables: {
+          ...schema.tables,
+          users,
+          countries
+        },
+      }
+    },
+  ],
+})
+```
+
+Make sure Payload doesn't overlap table names with its collections. For example, if you already have a collection with slug "users", you should either change the slug or `dbName` to change the table name for this collection. 
+
+
+### afterSchemaInit
+
+Runs after the Drizzle schema is built. You can use this hook to modify the schema with features that aren't supported by Payload, or if you want to add a column that you don't want to be in the Payload config.
+To extend a table, Payload exposes `extendTable` utillity to the args. You can refer to the [Drizzle documentation](https://orm.drizzle.team/docs/sql-schema-declaration).
+The following example adds the `extra_integer_column` column and a composite index on `country` and `city` columns.
+
+```ts
+import { postgresAdapter } from '@payloadcms/db-postgres'
+import { index, integer } from 'drizzle-orm/pg-core'
+import { buildConfig } from 'payload'
+
+export default buildConfig({
+  collections: [
+    {
+      slug: 'places',
+      fields: [
+        {
+          name: 'country',
+          type: 'text',
+        },
+        {
+          name: 'city',
+          type: 'text',
+        },
+      ],
+    },
+  ],
+  db: postgresAdapter({
+    afterSchemaInit: [
+      ({ schema, extendTable, adapter }) => {
+        extendTable({
+          table: schema.tables.places,
+          columns: {
+            extraIntegerColumn: integer('extra_integer_column'),
+          },
+          extraConfig: (table) => ({
+            country_city_composite_index: index('country_city_composite_index').on(
+              table.country,
+              table.city,
+            ),
+          }),
+        })
+
+        return schema
+      },
+    ],
+  }),
+})
+
+```

docs/database/sqlite.mdx

@@ -35,7 +35,7 @@ export default buildConfig({
 ## Options
 
 | Option                | Description                                                                                                                                                                      |
-|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| --------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `client` \*           | [Client connection options](https://orm.drizzle.team/docs/get-started-sqlite#turso) that will be passed to `createClient` from `@libsql/client`.                                 |
 | `push`                | Disable Drizzle's [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push) in development mode. By default, `push` is enabled for development mode only. |
 | `migrationDir`        | Customize the directory that migrations are stored.                                                                                                                              |
@@ -44,8 +44,8 @@ export default buildConfig({
 | `localesSuffix`       | A string appended to the end of table names for storing localized fields. Default is '_locales'.                                                                                 |
 | `relationshipsSuffix` | A string appended to the end of table names for storing relationships. Default is '_rels'.                                                                                       |
 | `versionsSuffix`      | A string appended to the end of table names for storing versions. Defaults to '_v'.                                                                                              |
-
-
+| `beforeSchemaInit`    | Drizzle schema hook. Runs before the schema is built. [More Details](#beforeschemainit)                                                                                          |
+| `afterSchemaInit`     | Drizzle schema hook. Runs after the schema is built. [More Details](#afterschemainit)                                                                                            |
 
 ## Access to Drizzle
 
@@ -79,3 +79,134 @@ Alternatively, you can disable `push` and rely solely on migrations to keep your
 In SQLite, migrations are a fundamental aspect of working with Payload and you should become familiar with how they work.
 
 For more information about migrations, [click here](/docs/beta/database/migrations#when-to-run-migrations).
+
+## Drizzle schema hooks
+
+### beforeSchemaInit
+
+Runs before the schema is built. You can use this hook to extend your database structure with tables that won't be managed by Payload.
+
+```ts
+import { sqliteAdapter } from '@payloadcms/db-sqlite'
+import { integer, sqliteTable } from 'drizzle-orm/sqlite-core'
+
+sqliteAdapter({
+  beforeSchemaInit: [
+    ({ schema, adapter }) => {
+      return {
+        ...schema,
+        tables: {
+          ...schema.tables,
+          addedTable: sqliteTable('added_table', {
+            id: integer('id').primaryKey({ autoIncrement: true }),
+          }),
+        },
+      }
+    },
+  ],
+})
+```
+
+One use case is preserving your existing database structure when migrating to Payload. By default, Payload drops the current database schema, which may not be desirable in this scenario.
+To quickly generate the Drizzle schema from your database you can use [Drizzle Introspection](https://orm.drizzle.team/kit-docs/commands#introspect--pull)
+You should get the `schema.ts` file which may look like this:
+
+```ts
+import { sqliteTable, text, uniqueIndex, integer } from 'drizzle-orm/sqlite-core'
+
+export const users = sqliteTable('users', {
+  id: integer('id').primaryKey({ autoIncrement: true }),
+  fullName: text('full_name'),
+  phone: text('phone', {length: 256}),
+})
+
+export const countries = sqliteTable(
+  'countries',
+  {
+    id: integer('id').primaryKey({ autoIncrement: true }),
+    name: text('name', { length: 256 }),
+  },
+  (countries) => {
+    return {
+      nameIndex: uniqueIndex('name_idx').on(countries.name),
+    }
+  },
+)
+
+```
+
+You can import them into your config and append to the schema with the `beforeSchemaInit` hook like this:
+
+```ts
+import { sqliteAdapter } from '@payloadcms/db-sqlite'
+import { users, countries } from '../drizzle/schema'
+
+sqliteAdapter({
+  beforeSchemaInit: [
+    ({ schema, adapter }) => {
+      return {
+        ...schema,
+        tables: {
+          ...schema.tables,
+          users,
+          countries
+        },
+      }
+    },
+  ],
+})
+```
+
+Make sure Payload doesn't overlap table names with its collections. For example, if you already have a collection with slug "users", you should either change the slug or `dbName` to change the table name for this collection. 
+
+
+### afterSchemaInit
+
+Runs after the Drizzle schema is built. You can use this hook to modify the schema with features that aren't supported by Payload, or if you want to add a column that you don't want to be in the Payload config.
+To extend a table, Payload exposes `extendTable` utillity to the args. You can refer to the [Drizzle documentation](https://orm.drizzle.team/docs/sql-schema-declaration).
+The following example adds the `extra_integer_column` column and a composite index on `country` and `city` columns.
+
+```ts
+import { sqliteAdapter } from '@payloadcms/db-sqlite'
+import { index, integer } from 'drizzle-orm/sqlite-core'
+import { buildConfig } from 'payload'
+
+export default buildConfig({
+  collections: [
+    {
+      slug: 'places',
+      fields: [
+        {
+          name: 'country',
+          type: 'text',
+        },
+        {
+          name: 'city',
+          type: 'text',
+        },
+      ],
+    },
+  ],
+  db: sqliteAdapter({
+    afterSchemaInit: [
+      ({ schema, extendTable, adapter }) => {
+        extendTable({
+          table: schema.tables.places,
+          columns: {
+            extraIntegerColumn: integer('extra_integer_column'),
+          },
+          extraConfig: (table) => ({
+            country_city_composite_index: index('country_city_composite_index').on(
+              table.country,
+              table.city,
+            ),
+          }),
+        })
+
+        return schema
+      },
+    ],
+  }),
+})
+
+```

docs/database/transactions.mdx

@@ -69,6 +69,48 @@ The following functions can be used for managing transactions:
 `payload.db.commitTransaction` - Takes the identifier for the transaction, finalizes any changes.
 `payload.db.rollbackTransaction` - Takes the identifier for the transaction, discards any changes.
 
+Payload uses the `req` object to pass the transaction ID through to the database adapter. If you are not using the `req` object, you can make a new object to pass the transaction ID directly to database adapter methods and local API calls.
+Example:
+
+```ts
+import payload from 'payload'
+import config from './payload.config'
+
+const standalonePayloadScript = async () => {
+  // initialize Payload
+  await payload.init({ config })
+
+  const transactionID = await payload.db.beginTransaction()
+
+  try {
+    // Make an update using the local API
+    await payload.update({
+      collection: 'posts',
+      data: {
+        some: 'data',
+      },
+      where: {
+        slug: { equals: 'my-slug' }
+      },
+      req: { transactionID },
+    })
+
+    /*
+      You can make additional db changes or run other functions
+      that need to be committed on an all or nothing basis
+     */
+
+    // Commit the transaction
+    await payload.db.commitTransaction(transactionID)
+  } catch (error) {
+    // Rollback the transaction
+    await payload.db.rollbackTransaction(transactionID)
+  }
+}
+
+standalonePayloadScript()
+```
+
 ## Disabling Transactions
 
 If you wish to disable transactions entirely, you can do so by passing `false` as the `transactionOptions` in your database adapter configuration. All the official Payload database adapters support this option.

docs/fields/array.mdx

@@ -42,24 +42,25 @@ export const MyArrayField: Field = {
 | Option                 | Description                                                                                                                                                                                                                                                                        |
 | ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                                                                                                             |
-| **`label`**            | Text used as the heading in the [Admin Panel](../admin/overview) or an object with keys for each language. Auto-generated from name if not defined.                                                                                                                                                     |
+| **`label`**            | Text used as the heading in the [Admin Panel](../admin/overview) or an object with keys for each language. Auto-generated from name if not defined.                                                                                                                                |
 | **`fields`** \*        | Array of field types to correspond to each row of the Array.                                                                                                                                                                                                                       |
-| **`validate`**         | Provide a custom validation function that will be executed on both the [Admin Panel](../admin/overview) and the backend. [More](/docs/fields/overview#validation)                                                                                                                                       |
+| **`validate`**         | Provide a custom validation function that will be executed on both the [Admin Panel](../admin/overview) and the backend. [More](/docs/fields/overview#validation)                                                                                                                  |
 | **`minRows`**          | A number for the fewest allowed items during validation when a value is present.                                                                                                                                                                                                   |
 | **`maxRows`**          | A number for the most allowed items during validation when a value is present.                                                                                                                                                                                                     |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                      |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                    |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                                              |
+| **`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 an array of row data to be used for this field's default value. [More](/docs/fields/overview#default-values)                                                                                                                                                               |
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this Array will be kept, so there is no need to specify each nested field as `localized`. |
 | **`required`**         | Require this field to have a value.                                                                                                                                                                                                                                                |
 | **`labels`**           | Customize the row labels appearing in the Admin dashboard.                                                                                                                                                                                                                         |
-| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                          |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                                      |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                                                                                          |
 | **`interfaceName`**    | Create a top level, reusable [Typescript interface](/docs/typescript/generating-types#custom-field-interfaces) & [GraphQL type](/docs/graphql/graphql-schema#custom-field-schemas).                                                                                                |
 | **`dbName`**           | Custom table name for the field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                                                                                                                                    |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                                                                                                        |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)                                                                                                                   |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/blocks.mdx

@@ -47,17 +47,18 @@ export const MyBlocksField: Field = {
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                                                                                                                       |
 | **`minRows`**          | A number for the fewest allowed items during validation when a value is present.                                                                                                                                                                                                   |
 | **`maxRows`**          | A number for the most allowed items during validation when a value is present.                                                                                                                                                                                                     |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                      |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                    |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                                              |
+| **`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 response or the Admin Panel.                                                                                                                          |
 | **`defaultValue`**     | Provide an array of block data to be used for this field's default value. [More](/docs/fields/overview#default-values)                                                                                                                                                             |
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this field will be kept, so there is no need to specify each nested field as `localized`. |
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                                                                                                                       |
 | **`labels`**           | Customize the block row labels appearing in the Admin dashboard.                                                                                                                                                                                                                   |
-| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                          |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                                      |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                                                                                          |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                                                                                                        |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)                                                                                                                   |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/checkbox.mdx

@@ -34,16 +34,17 @@ export const MyCheckboxField: Field = {
 | **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                     |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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, will default to false if field is also `required`. [More](/docs/fields/overview#default-values)                     |
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                             |
 | **`required`**         | Require this field to have a value.                                                                                                                                         |
-| **`admin`**            | Admin-specific configuration. [More details](../admin/fields#admin-options).                                                    |
+| **`admin`**            | Admin-specific configuration. [More details](../admin/fields#admin-options).                                                                                                |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/code.mdx

@@ -38,16 +38,17 @@ export const MyBlocksField: Field = {
 | **`minLength`**        | Used by the default validation function to ensure values are of a minimum character length.                                                                                 |
 | **`maxLength`**        | Used by the default validation function to ensure values are of a maximum character length.                                                                                 |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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)                                                                        |
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                             |
 | **`required`**         | Require this field to have a value.                                                                                                                                         |
-| **`admin`**            | Admin-specific configuration. See below for [more detail](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. See below for [more detail](#admin-options).                                                                                                  |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/date.mdx

@@ -34,16 +34,17 @@ export const MyDateField: Field = {
 | **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                     |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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)                                                                        |
 | **`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. [More details](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/email.mdx

@@ -35,16 +35,17 @@ export const MyEmailField: Field = {
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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)                                                                        |
 | **`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. [More details](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/group.mdx

@@ -39,16 +39,17 @@ export const MyGroupField: Field = {
 | **`fields`** \*        | Array of field types to nest within this Group.                                                                                                                                                                                                                                    |
 | **`label`**            | Used as a heading in the Admin Panel and to name the generated GraphQL type.                                                                                                                                                                                                       |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                                                                                                                       |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                      |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                    |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                                              |
+| **`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 an object of data to be used for this field's default value. [More](/docs/fields/overview#default-values)                                                                                                                                                                  |
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this Group will be kept, so there is no need to specify each nested field as `localized`. |
-| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                          |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                                                                                                                      |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                                                                                                          |
 | **`interfaceName`**    | Create a top level, reusable [Typescript interface](/docs/typescript/generating-types#custom-field-interfaces) & [GraphQL type](/docs/graphql/graphql-schema#custom-field-schemas).                                                                                                |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                                                                                                        |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)                                                                                                                   |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/join.mdx

@@ -0,0 +1,242 @@
+---
+title: Join Field
+label: Join
+order: 140
+desc: The Join field provides the ability to work on related documents. Learn how to use Join field, see examples and options.
+keywords: join, relationship, junction, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
+---
+
+The Join Field is used to make Relationship fields in the opposite direction. It is used to show the relationship from
+the other side. The field itself acts as a virtual field, in that no new data is stored on the collection with a Join
+field. Instead, the Admin UI surfaces the related documents for a better editing experience and is surfaced by Payload's
+APIs.
+
+The Join field is useful in scenarios including:
+
+- To surface `Order`s for a given `Product`
+- To view and edit `Posts` belonging to a `Category`
+- To work with any bi-directional relationship data
+
+<LightDarkImage
+  srcLight="https://payloadcms.com/images/docs/fields/join.png"
+  srcDark="https://payloadcms.com/images/docs/fields/join-dark.png"
+  alt="Shows Join field in the Payload Admin Panel"
+  caption="Admin Panel screenshot of Join field"
+/>
+
+For the Join field to work, you must have an existing [relationship](./relationship) field in the collection you are
+joining. This will reference the collection and path of the field of the related documents.
+To add a Relationship Field, set the `type` to `join` in your [Field Config](./overview):
+
+```ts
+import type { Field } from 'payload/types'
+
+export const MyJoinField: Field = {
+  // highlight-start
+  name: 'relatedPosts',
+  type: 'join',
+  collection: 'posts',
+  on: 'category',
+  // highlight-end
+}
+
+// relationship field in another collection:
+export const MyRelationshipField: Field = {
+  name: 'category',
+  type: 'relationship',
+  relationTo: 'categories',
+}
+```
+
+In this example, the field is defined to show the related `posts` when added to a `category` collection. The `on`
+property is used to
+specify the relationship field name of the field that relates to the collection document.
+
+With this example, if you navigate to a Category in the Admin UI or an API response, you'll now see that the Posts which
+are related to the Category are populated for you. This is extremely powerful and can be used to define a wide variety
+of relationship types in an easy manner.
+
+<Banner type="success">
+  The Join field is extremely performant and does not add additional query overhead to your API responses until you add depth of 1 or above. It works in all database adapters. In MongoDB, we use <strong>aggregations</strong> to automatically join in related documents, and in relational databases, we use joins.
+</Banner>
+
+### Schema advice
+
+When modeling your database, you might come across many places where you'd like to feature bi-directional relationships.
+But here's an important consideration—you generally only want to store information about a given relationship in _one_
+place.
+
+Let's take the Posts and Categories example. It makes sense to define which category a post belongs to while editing the
+post.
+
+It would generally not be necessary to have a list of post IDs stored directly on the category as well, for a few
+reasons:
+
+- You want to have a "single source of truth" for relationships, and not worry about keeping two sources in sync with
+  one another
+- If you have hundreds, thousands, or even millions of posts, you would not want to store all of those post IDs on a
+  given category
+- Etc.
+
+This is where the `join` field is especially powerful. With it, you only need to store the `category_id` on the `post`,
+and Payload will automatically join in related posts for you when you query for categories. The related category is only
+stored on the post itself - and is not duplicated on both sides. However, the `join` field is what enables
+bi-directional APIs and UI for you.
+
+### Using the Join field to have full control of your database schema
+
+For typical polymorphic / many relationships, if you're using Postgres or SQLite, Payload will automatically create
+a `posts_rels` table, which acts as a junction table to store all of a given document's relationships.
+
+However, this might not be appropriate for your use case if you'd like to have more control over your database
+architecture. You might not want to have that `_rels` table, and would prefer to maintain / control your own junction
+table design.
+
+<Banner type="success">
+  With the Join field, you can control your own junction table design, and avoid Payload's automatic _rels table creation.
+</Banner>
+
+The `join` field can be used in conjunction with _any_ collection - and if you wanted to define your own "junction"
+collection, which, say, is called `categories_posts` and has a `post_id` and a `category_id` column, you can achieve
+complete control over the shape of that junction table.
+
+You could go a step further and leverage the `admin.hidden` property of the `categories_posts` collection to hide the
+collection from appearing in the Admin UI navigation.
+
+#### Specifying additional fields on relationships
+
+Another very powerful use case of the `join` field is to be able to define "context" fields on your relationships. Let's
+say that you have Posts and Categories, and use join fields on both your Posts and Categories collection to join in
+related docs from a new pseudo-junction collection called `categories_posts`. Now, the relations are stored in this
+third junction collection, and can be surfaced on both Posts and Categories. But, importantly, you could add
+additional "context" fields to this shared junction collection.
+
+For example, on this `categories_posts` collection, in addition to having the `category` and
+post` fields, we could add custom "context" fields like `featured` or `
+spotlight`, which would allow you to store additional information directly on relationships. The `join` field gives you
+complete control over any type of relational architecture in Payload, all wrapped up in a powerful Admin UI.
+
+## Config Options
+
+| Option                 | Description                                                                                                                                                                                   |
+|------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **`name`** \*          | To be used as the property name when retrieved from the database. [More](/docs/fields/overview#field-names)                                                                                   |
+| **`collection`** \*    | The `slug`s having the relationship field.                                                                                                                                                    |
+| **`on`** \*            | The relationship field name of the field that relates to collection document. Use dot notation for nested paths, like 'myGroup.relationName'.                                                 |
+| **`maxDepth`**         | Default is 1, Sets a maximum population depth for this field, regardless of the remaining depth when this field is reached. [Max Depth](/docs/getting-started/concepts#field-level-max-depth) |
+| **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                                       |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                         |
+| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                            |
+| **`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.                                                                                                                                                                 |
+| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                     |
+| **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                   |
+
+_\* An asterisk denotes that a property is required._
+
+## Join Field Data
+
+When a document is returned that for a Join field is populated with related documents. The structure returned is an
+object with:
+
+- `docs` an array of related documents or only IDs if the depth is reached
+- `hasNextPage` a boolean indicating if there are additional documents
+
+```json
+{
+  "id": "66e3431a3f23e684075aae9c",
+  "relatedPosts": {
+    "docs": [
+      {
+        "id": "66e3431a3f23e684075aaeb9",
+        // other fields...
+        "category": "66e3431a3f23e684075aae9c",
+      },
+      // { ... }
+    ],
+    "hasNextPage": false
+  },
+  // other fields...
+}
+```
+
+## Query Options
+
+The Join Field supports custom queries to filter, sort, and limit the related documents that will be returned. In
+addition to the specific query options for each Join Field, you can pass `joins: false` to disable all Join Field from
+returning. This is useful for performance reasons when you don't need the related documents.
+
+The following query options are supported:
+
+| Property    | Description                                                  |
+|-------------|--------------------------------------------------------------|
+| **`limit`** | The maximum related documents to be returned, default is 10. |
+| **`where`** | An optional `Where` query to filter joined documents.        |
+| **`sort`**  | A string used to order related results                       |
+
+These can be applied to the local API, GraphQL, and REST API.
+
+### Local API
+
+By adding `joins` to the local API you can customize the request for each join field by the `name` of the field.
+
+```js
+const result = await db.findOne('categories', {
+  where: {
+    title: {
+      equals: 'My Category'
+    }
+  },
+  joins: {
+    relatedPosts: {
+      limit: 5,
+      where: {
+        title: {
+          equals: 'My Post'
+        }
+      },
+      sort: 'title'
+    }
+  }
+})
+```
+
+### Rest API
+
+The rest API supports the same query options as the local API. You can use the `joins` query parameter to customize the
+request for each join field by the `name` of the field. For example, an API call to get a document with the related
+posts limited to 5 and sorted by title:
+
+`/api/categories/${id}?joins[relatedPosts][limit]=5&joins[relatedPosts][sort]=title`
+
+You can specify as many `joins` parameters as needed for the same or different join fields for a single request.
+
+### GraphQL
+
+The GraphQL API supports the same query options as the local and REST APIs. You can specify the query options for each join field in your query.
+
+Example:
+
+```graphql
+query {
+  Categories {
+    docs {
+      relatedPosts(
+        sort: "createdAt"
+        limit: 5
+        where: {
+          author: {
+              equals: "66e3431a3f23e684075aaeb9"
+            }
+          }
+      ) {
+        docs {
+          title
+        }
+        hasNextPage
+      }
+    }
+  }
+}
+```

docs/fields/json.mdx

@@ -37,16 +37,17 @@ export const MyJSONField: Field = {
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
 | **`jsonSchema`**       | Provide a JSON schema that will be used for validation. [JSON schemas](https://json-schema.org/learn/getting-started-step-by-step)                                          |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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)                                                                        |
 | **`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. [More details](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/number.mdx

@@ -40,16 +40,17 @@ export const MyNumberField: Field = {
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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)                                                                        |
 | **`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. [More details](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/point.mdx

@@ -40,16 +40,17 @@ export const MyPointField: Field = {
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                              |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. To support location queries, point index defaults to `2dsphere`, to disable the index set to `false`. |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                              |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                             |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                           |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                     |
+| **`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)                                                                                      |
 | **`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. [More details](../admin/fields#admin-options).                                                                                                                    |
+| **`admin`**            | Admin-specific configuration. [More details](../admin/fields#admin-options).                                                                                                              |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                 |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                               |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)                          |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/radio.mdx

@@ -40,17 +40,18 @@ export const MyRadioField: Field = {
 | **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                     |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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. The default value must exist within provided values in `options`. [More](/docs/fields/overview#default-values)      |
 | **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                             |
 | **`required`**         | Require this field to have a value.                                                                                                                                         |
-| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`enumName`**         | Custom enum name for this field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                             |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/relationship.mdx

@@ -50,16 +50,17 @@ export const MyRelationshipField: Field = {
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                    |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                    |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often.     |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                   |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                 |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                           |
+| **`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)                                                                            |
 | **`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. [More details](#admin-options).                                                        |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                                   |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                       |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                     |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)                |
 
 _\* An asterisk denotes that a property is required._
 
@@ -196,6 +197,12 @@ You can learn more about writing queries [here](/docs/queries/overview).
   <strong>payload/shared</strong> in your validate function.
 </Banner>
 
+## Bi-directional relationships
+
+The `relationship` field on its own is used to define relationships for the document that contains the relationship field, and this can be considered as a "one-way" relationship. For example, if you have a Post that has a `category` relationship field on it, the related `category` itself will not surface any information about the posts that have the category set.
+
+However, the `relationship` field can be used in conjunction with the `Join` field to produce powerful bi-directional relationship authoring capabilities. If you're interested in bi-directional relationships, check out the [documentation for the Join field](./join).
+
 ## How the data is saved
 
 Given the variety of options possible within the `relationship` field type, the shape of the data needed for creating

docs/fields/rich-text.mdx

@@ -38,22 +38,23 @@ Right now, Payload is officially supporting two rich text editors:
 
 ## Config Options
 
-| Option                 | Description                                                                                                                                             |
-| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                  |
-| **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                 |
-| **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)            |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.           |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`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)                                                    |
-| **`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. [More details](#admin-options).                                                                               |
-| **`editor`**           | Override the rich text editor specified in your base configuration for this field.                                                                      |
-| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                               |
-| **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                             |
+| Option                 | Description                                                                                                                                                      |
+| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                           |
+| **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                          |
+| **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                     |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                  |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                            |
+| **`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)                                                             |
+| **`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. [More details](#admin-options).                                                                                                    |
+| **`editor`**           | Override the rich text editor specified in your base configuration for this field.                                                                               |
+| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                        |
+| **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                      |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges) |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/select.mdx

@@ -33,27 +33,28 @@ export const MySelectField: Field = {
 
 ## Config Options
 
-| Option                 | Description                                                                                                                                                                   |
-| ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                        |
-| **`options`** \*       | Array of options to allow the field to store. Can either be an array of strings, or an array of objects containing a `label` string and a `value` string.                     |
-| **`hasMany`**          | Boolean when, if set to `true`, allows this field to have many selections instead of only one.                                                                                |
-| **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                       |
-| **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                  |
-| **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                  |
-| **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often.   |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                 |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`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)                                                                          |
-| **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                               |
-| **`required`**         | Require this field to have a value.                                                                                                                                           |
-| **`admin`**            | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-options) for more details.                                                      |
-| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                     |
-| **`enumName`**         | Custom enum name for this field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                               |
-| **`dbName`**           | Custom table name (if `hasMany` set to `true`) for this field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined. |
-| **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                   |
+| Option                 | Description                                                                                                                                                                                  |
+| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                       |
+| **`options`** \*       | Array of options to allow the field to store. Can either be an array of strings, or an array of objects containing a `label` string and a `value` string.                                    |
+| **`hasMany`**          | Boolean when, if set to `true`, allows this field to have many selections instead of only one.                                                                                               |
+| **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                                      |
+| **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                                 |
+| **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                                 |
+| **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often.                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                              |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                        |
+| **`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)                                                                                         |
+| **`localized`**        | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                                              |
+| **`required`**         | Require this field to have a value.                                                                                                                                                          |
+| **`admin`**            | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-options) for more details.                                                                    |
+| **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                                    |
+| **`enumName`**         | Custom enum name for this field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                                              |
+| **`dbName`**           | Custom table name (if `hasMany` set to `true`) for this field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                |
+| **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                  |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)                             |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/tabs.mdx

@@ -50,6 +50,7 @@ Each tab must have either a `name` or `label` and the required `fields` array. Y
 | **`fields`** \*     | The fields to render within this tab.                                                                                                                                                                        |
 | **`description`**   | Optionally render a description within this tab to describe the contents of the tab itself.                                                                                                                  |
 | **`interfaceName`** | Create a top level, reusable [Typescript interface](/docs/typescript/generating-types#custom-field-interfaces) & [GraphQL type](/docs/graphql/graphql-schema#custom-field-schemas). (`name` must be present) |
+| **`virtual`**       | Provide `true` to disable field in the database (`name` must be present). See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)                    |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/text.mdx

@@ -37,19 +37,20 @@ export const MyTextField: Field = {
 | **`maxLength`**        | Used by the default validation function to ensure values are of a maximum character length.                                                                                 |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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)                                                                        |
 | **`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. [More details](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`hasMany`**          | Makes this field an ordered array of text instead of just a single text.                                                                                                    |
 | **`minRows`**          | Minimum number of texts in the array, if `hasMany` is set to true.                                                                                                          |
 | **`maxRows`**          | Maximum number of texts in the array, if `hasMany` is set to true.                                                                                                          |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/textarea.mdx

@@ -37,16 +37,17 @@ export const MyTextareaField: Field = {
 | **`maxLength`**        | Used by the default validation function to ensure values are of a maximum character length.                                                                                 |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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)                                                                        |
 | **`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. [More details](#admin-options).                                                                                                   |
+| **`admin`**            | Admin-specific configuration. [More details](#admin-options).                                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/fields/upload.mdx

@@ -47,22 +47,23 @@ export const MyUploadField: Field = {
 | **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                      |
 | **`*relationTo`** \*   | Provide a single collection `slug` to allow this field to accept a relation to. <strong>Note: the related collection must be configured to support Uploads.</strong>        |
 | **`filterOptions`**    | A query to filter which options appear in the UI and validate against. [More](#filtering-upload-options).                                                                   |
-| **`maxDepth`**         | Sets a number limit on iterations of related documents to populate when queried. [Depth](../queries/depth)                                              |
+| **`maxDepth`**         | Sets a number limit on iterations of related documents to populate when queried. [Depth](../queries/depth)                                                                  |
 | **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                     |
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
-| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                               |
-| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                         |
-| **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                                                                                                                  |
+| **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                             |
+| **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                       |
+| **`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).                                                    |
+| **`admin`**            | Admin-specific configuration. [Admin Options](../admin/fields#admin-options).                                                                                               |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins)                                                                                                                   |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                 |
+| **`virtual`**          | Provide `true` to disable field in the database. See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges)            |
 
 _\* An asterisk denotes that a property is required._
 

docs/hooks/collections.mdx

@@ -46,6 +46,7 @@ export const CollectionWithHooks: CollectionConfig = {
     afterRead: [(args) => {...}],
     afterDelete: [(args) => {...}],
     afterOperation: [(args) => {...}],
+    afterError: [(args) => {....}],
 
     // Auth-enabled Hooks
     beforeLogin: [(args) => {...}],
@@ -289,6 +290,30 @@ The following arguments are provided to the `afterOperation` hook:
 | **`operation`**          | The name of the operation that this hook is running within. |
 | **`result`**          |  The result of the operation, before modifications. |
 
+### afterError
+
+The `afterError` Hook is triggered when an error occurs in the Payload application. This can be useful for logging errors to a third-party service, sending an email to the development team, logging the error to Sentry or DataDog, etc. The output can be used to transform the result object / status code.
+
+```ts
+import type { CollectionAfterErrorHook } from 'payload';
+
+const afterDeleteHook: CollectionAfterErrorHook = async ({
+  req,
+  id,
+  doc,
+}) => {...}
+```
+The following arguments are provided to the `afterError` Hook:
+
+| Argument            | Description                                                                                                                                                                                     |
+| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`error`**         | The error that occurred.                                                                                                                                                                        |
+| **`context`**       | Custom context passed between Hooks. [More details](./context).                                                                                                                                 |
+| **`graphqlResult`** | The GraphQL result object, available if the hook is executed within a GraphQL context.                                                                                                          |
+| **`req`**           | The `PayloadRequest` object that extends [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request). Contains currently authenticated `user` and the Local API instance `payload`. |
+| **`collection`**    | The [Collection](../configuration/collections) in which this Hook is running against.                                                                                                           |
+| **`result`**        | The formatted error result object, available if the hook is executed from a REST context.                                                                                                       |
+
 ### beforeLogin
 
 For [Auth-enabled Collections](../authentication/overview), this hook runs during `login` operations where a user with the provided credentials exist, but before a token is generated and added to the response. You can optionally modify the user that is returned, or throw an error in order to deny the login operation.

docs/hooks/overview.mdx

@@ -43,7 +43,7 @@ export default buildConfig({
   // ...
   // highlight-start
   hooks: {
-    afterError: () => {...}
+    afterError:[() => {...}]
   },
   // highlight-end
 })
@@ -57,7 +57,7 @@ The following options are available:
 
 ### afterError
 
-The `afterError` Hook is triggered when an error occurs in the Payload application. This can be useful for logging errors to a third-party service, sending an email to the development team, logging the error to Sentry or DataDog, etc.
+The `afterError` Hook is triggered when an error occurs in the Payload application. This can be useful for logging errors to a third-party service, sending an email to the development team, logging the error to Sentry or DataDog, etc. The output can be used to transform the result object / status code.
 
 ```ts
 import {  buildConfig } from 'payload'
@@ -65,20 +65,23 @@ import {  buildConfig } from 'payload'
 export default buildConfig({
   // ...
   hooks: {
-    afterError: async ({ error }) => {
+    afterError: [async ({ error }) => {
       // Do something
-    }
+    }]
   },
 })
 ```
 
 The following arguments are provided to the `afterError` Hook:
 
-| Argument | Description                                                                                   |
-|----------|-----------------------------------------------------------------------------------------------|
-| **`error`**  | The error that occurred.                                                                      |
-| **`context`**            | Custom context passed between Hooks. [More details](./context).                                                                                                                              |
-
+| Argument            | Description                                                                                                                                                                                     |
+| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`error`**         | The error that occurred.                                                                                                                                                                        |
+| **`context`**       | Custom context passed between Hooks. [More details](./context).                                                                                                                                 |
+| **`graphqlResult`** | The GraphQL result object, available if the hook is executed within a GraphQL context.                                                                                                          |
+| **`req`**           | The `PayloadRequest` object that extends [Web Request](https://developer.mozilla.org/en-US/docs/Web/API/Request). Contains currently authenticated `user` and the Local API instance `payload`. |
+| **`collection`**    | The [Collection](../configuration/collections) in which this Hook is running against. This will be `undefined` if the hook is executed from a non-collection endpoint or GraphQL.               |
+| **`result`**        | The formatted error result object, available if the hook is executed from a REST context.                                                                                                       |
 ## Async vs. Synchronous
 
 All Hooks can be written as either synchronous or asynchronous functions. Choosing the right type depends on your use case, but switching between the two is as simple as adding or removing the `async` keyword.

docs/local-api/overview.mdx

@@ -85,10 +85,12 @@ You can specify more options within the Local API vs. REST or GraphQL due to the
 | `locale`           | Specify [locale](/docs/configuration/localization) for any returned documents. |
 | `fallbackLocale`   | Specify a [fallback locale](/docs/configuration/localization) to use for any returned documents. |
 | `overrideAccess`   | Skip access control. By default, this property is set to true within all Local API operations. |
+| `overrideLock`     | By default, document locks are ignored (`true`). Set to `false` to enforce locks and prevent operations when a document is locked by another user. [More details](../admin/locked-documents).|
 | `user`             | If you set `overrideAccess` to `false`, you can pass a user to use against the access control checks. |
 | `showHiddenFields` | Opt-in to receiving hidden fields. By default, they are hidden from returned documents in accordance to your config. |
 | `pagination`       | Set to false to return all documents and avoid querying for document counts. |
 | `context`          | [Context](/docs/hooks/context), which will then be passed to `context` and `req.context`, which can be read by hooks. Useful if you want to pass additional information to the hooks which shouldn't be necessarily part of the document, for example a `triggerBeforeChange` option which can be read by the BeforeChange hook to determine if it should run or not. |
+| `disableErrors`    | When set to `true`, errors will not be thrown. Instead, the `findByID` operation will return `null`, and the `find` operation will return an empty documents array.                                                                                                                                                                                                     |
 
 _There are more options available on an operation by operation basis outlined below._
 
@@ -205,6 +207,7 @@ const result = await payload.update({
   fallbackLocale: false,
   user: dummyUser,
   overrideAccess: false,
+  overrideLock: false, // By default, document locks are ignored. Set to false to enforce locks.
   showHiddenFields: true,
 
   // If your collection supports uploads, you can upload
@@ -243,6 +246,7 @@ const result = await payload.update({
   fallbackLocale: false,
   user: dummyUser,
   overrideAccess: false,
+  overrideLock: false, // By default, document locks are ignored. Set to false to enforce locks.
   showHiddenFields: true,
 
   // If your collection supports uploads, you can upload
@@ -269,6 +273,7 @@ const result = await payload.delete({
   fallbackLocale: false,
   user: dummyUser,
   overrideAccess: false,
+  overrideLock: false, // By default, document locks are ignored. Set to false to enforce locks.
   showHiddenFields: true,
 })
 ```
@@ -292,6 +297,7 @@ const result = await payload.delete({
   fallbackLocale: false,
   user: dummyUser,
   overrideAccess: false,
+  overrideLock: false, // By default, document locks are ignored. Set to false to enforce locks.
   showHiddenFields: true,
 })
 ```
@@ -428,6 +434,7 @@ const result = await payload.updateGlobal({
   fallbackLocale: false,
   user: dummyUser,
   overrideAccess: false,
+  overrideLock: false, // By default, document locks are ignored. Set to false to enforce locks.
   showHiddenFields: true,
 })
 ```

docs/plugins/form-builder.mdx

@@ -136,12 +136,28 @@ const beforeEmail: BeforeEmail<FormSubmission> = (emailsToSend, beforeChangePara
 }
 ```
 
+### `defaultToEmail`
+
+Provide a fallback for the email address to send form submissions to. If the email in form configuration does not have a to email set, this email address will be used. If this is not provided then it falls back to the `defaultFromAddress` in your [email configuration](https://payloadcms.com/docs/beta/email/overview).
+
+```ts
+// payload.config.ts
+formBuilder({
+  // ...
+  defaultToEmail: 'test@example.com',
+})
+```
+
 ### `formOverrides`
 
 Override anything on the `forms` collection by sending a [Payload Collection Config](https://payloadcms.com/docs/configuration/collections) to the `formOverrides` property.
 
 Note that the `fields` property is a function that receives the default fields and returns an array of fields. This is because the `fields` property is a special case that is merged with the default fields, rather than replacing them. This allows you to map over default fields and modify them as needed.
 
+<Banner type="warning">
+Good to know: The form collection is publicly available to read by default. The emails field is locked for authenticated users only. If you have any frontend users you should override the access permissions for both the collection and the emails field to make sure you don't leak out any private emails.
+</Banner>
+
 ```ts
 // payload.config.ts
 formBuilder({
@@ -149,7 +165,7 @@ formBuilder({
   formOverrides: {
     slug: 'contact-forms',
     access: {
-      read: () => true,
+      read: ({ req: { user } }) => !!user, // authenticated users only
       update: () => false,
     },
     fields: ({ defaultFields }) => {
@@ -174,7 +190,7 @@ Override anything on the `form-submissions` collection by sending a [Payload Col
   control](https://payloadcms.com/docs/access-control/collections) to restrict the `update` and
   `read` operations on the `form-submissions` collection. This is because _anyone_ should be able to
   create a form submission, even from a public-facing website, but _no one_ should be able to update
-  a submission one it has been created, or read a submission unless they have permission. You can
+  a submission once it has been created, or read a submission unless they have permission. You can
   override this behavior or any other property as needed.
 </Banner>
 
@@ -396,7 +412,19 @@ formBuilder({
 
 ## Email
 
-This plugin relies on the [email configuration](https://payloadcms.com/docs/email/overview) defined in your `payload.init()`. It will read from your config and attempt to send your emails using the credentials provided.
+This plugin relies on the [email configuration](https://payloadcms.com/docs/beta/email/overview) defined in your payload configuration. It will read from your config and attempt to send your emails using the credentials provided.
+
+### Email formatting
+
+The email contents supports rich text which will be serialised to HTML on the server before being sent. By default it reads the global configuration of your rich text editor.
+
+The email subject and body supports inserting dynamic fields from the form submission data using the `{{field_name}}` syntax. For example, if you have a field called `name` in your form, you can include this in the email body like so:
+
+```html
+Thank you for your submission, {{name}}!
+```
+
+You can also use `{{*}}` as a wildcard to output all the data in a key:value format and `{{*:table}}` to output all the data in a table format.
 
 ## TypeScript
 

docs/plugins/nested-docs.mdx

@@ -243,5 +243,5 @@ official [Nested Docs Plugin Example](https://github.com/payloadcms/payload/tree
 demonstrates exactly how to configure this plugin in Payload and implement it on your front-end.
 The [Templates Directory](https://github.com/payloadcms/payload/tree/main/templates) also contains an
 official [Website Template](https://github.com/payloadcms/payload/tree/main/templates/website)
-and [E-commerce Template](https://github.com/payloadcms/payload/tree/main/templates/ecommere), both of which use this
+and [E-commerce Template](https://github.com/payloadcms/payload/tree/main/templates/ecommerce), both of which use this
 plugin.

docs/plugins/seo.mdx

@@ -119,11 +119,33 @@ 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: ({ doc }) => `Website.com — ${doc?.title}`,
   })
 }
 ```
 
+All "generate" functions receive the following arguments:
+
+| Argument | Description |
+| --- | --- |
+| **`collectionConfig`** | The configuration of the collection. |
+| **`collectionSlug`** | The slug of the collection. |
+| **`doc`** | The data of the current document. |
+| **`docPermissions`** | The permissions of the document. |
+| **`globalConfig`** | The configuration of the global. |
+| **`globalSlug`** | The slug of the global. |
+| **`hasPublishPermission`** | Whether the user has permission to publish the document. |
+| **`hasSavePermission`** | Whether the user has permission to save the document. |
+| **`id`** | The ID of the document. |
+| **`initialData`** | The initial data of the document. |
+| **`initialState`** | The initial state of the document. |
+| **`locale`** | The locale of the document. |
+| **`preferencesKey`**  | The preferences key of the document. |
+| **`publishedDoc`** | The published document. |
+| **`req`** | The Payload request object containing `user`, `payload`, `i18n`, etc. |
+| **`title`** | The title of the document. |
+| **`versionsCount`** | The number of versions of the document. |
+
 ##### `generateDescription`
 
 A function that allows you to return any meta description, including from document's content.
@@ -133,11 +155,13 @@ A function that allows you to return any meta description, including from docume
 {
   // ...
   seoPlugin({
-    generateDescription: ({ ...docInfo, doc, locale, req }) => doc?.excerpt,
+    generateDescription: ({ doc }) => doc?.excerpt,
   })
 }
 ```
 
+For a full list of arguments, see the [`generateTitle`](#generateTitle) function.
+
 ##### `generateImage`
 
 A function that allows you to return any meta image, including from document's content.
@@ -147,11 +171,13 @@ A function that allows you to return any meta image, including from document's c
 {
   // ...
   seoPlugin({
-    generateImage: ({ ...docInfo, doc, locale, req }) => doc?.featuredImage,
+    generateImage: ({ doc }) => doc?.featuredImage,
   })
 }
 ```
 
+For a full list of arguments, see the [`generateTitle`](#generateTitle) function.
+
 ##### `generateURL`
 
 A function called by the search preview component to display the actual URL of your page.
@@ -161,12 +187,14 @@ A function called by the search preview component to display the actual URL of y
 {
   // ...
   seoPlugin({
-    generateURL: ({ ...docInfo, doc, locale, req }) =>
-      `https://yoursite.com/${collection?.slug}/${doc?.slug}`,
+    generateURL: ({ doc, collectionSlug }) =>
+      `https://yoursite.com/${collectionSlug}/${doc?.slug}`,
   })
 }
 ```
 
+For a full list of arguments, see the [`generateTitle`](#generateTitle) function.
+
 #### `interfaceName`
 
 Rename the meta group interface name that is generated for TypeScript and GraphQL.

docs/rest-api/overview.mdx

@@ -573,6 +573,11 @@ In addition to the dynamically generated endpoints above Payload also has REST e
 
 Additional REST API endpoints can be added to your application by providing an array of `endpoints` in various places within a Payload Config. Custom endpoints are useful for adding additional middleware on existing routes or for building custom functionality into Payload apps and plugins. Endpoints can be added at the top of the Payload Config, `collections`, and `globals` and accessed respective of the api and slugs you have configured.
 
+<Banner type="warning">
+  Custom endpoints are not authenticated by default. You are responsible for securing your own endpoints.
+</Banner>
+
+
 Each endpoint object needs to have:
 
 | Property      | Description                                                                                                                                                                                                                                                |
@@ -625,6 +630,22 @@ export const Orders: CollectionConfig = {
             // data to update the document with
           }
         })
+        return Response.json({
+          message: 'successfully updated tracking info'
+        })
+      }
+    },
+    {
+      path: '/:id/forbidden',
+      method: 'post',
+      handler: async (req) => {
+        // this is an example of an authenticated endpoint
+        if (!req.user) {
+          return Response.json({ error: 'forbidden' }, { status: 403 })
+        }
+
+        // do something
+
         return Response.json({
           message: 'successfully updated tracking info'
         })

eslint.config.js

@@ -21,8 +21,7 @@ export const defaultESLintIgnores = [
   '**/temp/',
 ]
 
-/** @typedef {import('eslint').Linter.FlatConfig} */
-let FlatConfig
+/** @typedef {import('eslint').Linter.Config} Config */
 
 export const rootParserOptions = {
   sourceType: 'module',
@@ -33,7 +32,7 @@ export const rootParserOptions = {
   },
 }
 
-/** @type {FlatConfig[]} */
+/** @type {Config[]} */
 export const rootEslintConfig = [
   ...payloadEsLintConfig,
   {

examples/custom-components/package.json

@@ -23,10 +23,10 @@
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "graphql": "^16.9.0",
-    "next": "15.0.0-canary.104",
+    "next": "15.0.0-canary.160",
     "payload": "3.0.0-beta.106",
-    "react": "19.0.0-rc-06d0b89e-20240801",
-    "react-dom": "19.0.0-rc-06d0b89e-20240801"
+    "react": "19.0.0-rc-5dcb0097-20240918",
+    "react-dom": "19.0.0-rc-5dcb0097-20240918"
   },
   "devDependencies": {
     "@payloadcms/graphql": "3.0.0-beta.106",

examples/custom-components/src/app/(payload)/admin/importMap.js

@@ -55,59 +55,108 @@ import { CustomDefaultRootView as CustomDefaultRootView_53 } from '@/components/
 import { CustomMinimalRootView as CustomMinimalRootView_54 } from '@/components/views/CustomMinimalRootView'
 
 export const importMap = {
-  "@/collections/Fields/array/components/server/Label#CustomArrayFieldLabelServer": CustomArrayFieldLabelServer_0,
-  "@/collections/Fields/array/components/server/Field#CustomArrayFieldServer": CustomArrayFieldServer_1,
-  "@/collections/Fields/array/components/client/Label#CustomArrayFieldLabelClient": CustomArrayFieldLabelClient_2,
-  "@/collections/Fields/array/components/client/Field#CustomArrayFieldClient": CustomArrayFieldClient_3,
-  "@/collections/Fields/blocks/components/server/Field#CustomBlocksFieldServer": CustomBlocksFieldServer_4,
-  "@/collections/Fields/blocks/components/client/Field#CustomBlocksFieldClient": CustomBlocksFieldClient_5,
-  "@/collections/Fields/checkbox/components/server/Label#CustomCheckboxFieldLabelServer": CustomCheckboxFieldLabelServer_6,
-  "@/collections/Fields/checkbox/components/server/Field#CustomCheckboxFieldServer": CustomCheckboxFieldServer_7,
-  "@/collections/Fields/checkbox/components/client/Label#CustomCheckboxFieldLabelClient": CustomCheckboxFieldLabelClient_8,
-  "@/collections/Fields/checkbox/components/client/Field#CustomCheckboxFieldClient": CustomCheckboxFieldClient_9,
-  "@/collections/Fields/date/components/server/Label#CustomDateFieldLabelServer": CustomDateFieldLabelServer_10,
-  "@/collections/Fields/date/components/server/Field#CustomDateFieldServer": CustomDateFieldServer_11,
-  "@/collections/Fields/date/components/client/Label#CustomDateFieldLabelClient": CustomDateFieldLabelClient_12,
-  "@/collections/Fields/date/components/client/Field#CustomDateFieldClient": CustomDateFieldClient_13,
-  "@/collections/Fields/email/components/server/Label#CustomEmailFieldLabelServer": CustomEmailFieldLabelServer_14,
-  "@/collections/Fields/email/components/server/Field#CustomEmailFieldServer": CustomEmailFieldServer_15,
-  "@/collections/Fields/email/components/client/Label#CustomEmailFieldLabelClient": CustomEmailFieldLabelClient_16,
-  "@/collections/Fields/email/components/client/Field#CustomEmailFieldClient": CustomEmailFieldClient_17,
-  "@/collections/Fields/number/components/server/Label#CustomNumberFieldLabelServer": CustomNumberFieldLabelServer_18,
-  "@/collections/Fields/number/components/server/Field#CustomNumberFieldServer": CustomNumberFieldServer_19,
-  "@/collections/Fields/number/components/client/Label#CustomNumberFieldLabelClient": CustomNumberFieldLabelClient_20,
-  "@/collections/Fields/number/components/client/Field#CustomNumberFieldClient": CustomNumberFieldClient_21,
-  "@/collections/Fields/point/components/server/Label#CustomPointFieldLabelServer": CustomPointFieldLabelServer_22,
-  "@/collections/Fields/point/components/server/Field#CustomPointFieldServer": CustomPointFieldServer_23,
-  "@/collections/Fields/point/components/client/Label#CustomPointFieldLabelClient": CustomPointFieldLabelClient_24,
-  "@/collections/Fields/point/components/client/Field#CustomPointFieldClient": CustomPointFieldClient_25,
-  "@/collections/Fields/radio/components/server/Label#CustomRadioFieldLabelServer": CustomRadioFieldLabelServer_26,
-  "@/collections/Fields/radio/components/server/Field#CustomRadioFieldServer": CustomRadioFieldServer_27,
-  "@/collections/Fields/radio/components/client/Label#CustomRadioFieldLabelClient": CustomRadioFieldLabelClient_28,
-  "@/collections/Fields/radio/components/client/Field#CustomRadioFieldClient": CustomRadioFieldClient_29,
-  "@/collections/Fields/relationship/components/server/Label#CustomRelationshipFieldLabelServer": CustomRelationshipFieldLabelServer_30,
-  "@/collections/Fields/relationship/components/server/Field#CustomRelationshipFieldServer": CustomRelationshipFieldServer_31,
-  "@/collections/Fields/relationship/components/client/Label#CustomRelationshipFieldLabelClient": CustomRelationshipFieldLabelClient_32,
-  "@/collections/Fields/relationship/components/client/Field#CustomRelationshipFieldClient": CustomRelationshipFieldClient_33,
-  "@/collections/Fields/select/components/server/Label#CustomSelectFieldLabelServer": CustomSelectFieldLabelServer_34,
-  "@/collections/Fields/select/components/server/Field#CustomSelectFieldServer": CustomSelectFieldServer_35,
-  "@/collections/Fields/select/components/client/Label#CustomSelectFieldLabelClient": CustomSelectFieldLabelClient_36,
-  "@/collections/Fields/select/components/client/Field#CustomSelectFieldClient": CustomSelectFieldClient_37,
-  "@/collections/Fields/text/components/server/Label#CustomTextFieldLabelServer": CustomTextFieldLabelServer_38,
-  "@/collections/Fields/text/components/server/Field#CustomTextFieldServer": CustomTextFieldServer_39,
-  "@/collections/Fields/text/components/client/Label#CustomTextFieldLabelClient": CustomTextFieldLabelClient_40,
-  "@/collections/Fields/text/components/client/Field#CustomTextFieldClient": CustomTextFieldClient_41,
-  "@/collections/Fields/textarea/components/server/Label#CustomTextareaFieldLabelServer": CustomTextareaFieldLabelServer_42,
-  "@/collections/Fields/textarea/components/server/Field#CustomTextareaFieldServer": CustomTextareaFieldServer_43,
-  "@/collections/Fields/textarea/components/client/Label#CustomTextareaFieldLabelClient": CustomTextareaFieldLabelClient_44,
-  "@/collections/Fields/textarea/components/client/Field#CustomTextareaFieldClient": CustomTextareaFieldClient_45,
-  "@/collections/Views/components/CustomTabEditView#CustomTabEditView": CustomTabEditView_46,
-  "@/collections/Views/components/CustomDefaultEditView#CustomDefaultEditView": CustomDefaultEditView_47,
-  "@/collections/RootViews/components/CustomRootEditView#CustomRootEditView": CustomRootEditView_48,
-  "@/components/afterNavLinks/LinkToCustomView#LinkToCustomView": LinkToCustomView_49,
-  "@/components/afterNavLinks/LinkToCustomMinimalView#LinkToCustomMinimalView": LinkToCustomMinimalView_50,
-  "@/components/afterNavLinks/LinkToCustomDefaultView#LinkToCustomDefaultView": LinkToCustomDefaultView_51,
-  "@/components/views/CustomRootView#CustomRootView": CustomRootView_52,
-  "@/components/views/CustomDefaultRootView#CustomDefaultRootView": CustomDefaultRootView_53,
-  "@/components/views/CustomMinimalRootView#CustomMinimalRootView": CustomMinimalRootView_54
+  '@/collections/Fields/array/components/server/Label#CustomArrayFieldLabelServer':
+    CustomArrayFieldLabelServer_0,
+  '@/collections/Fields/array/components/server/Field#CustomArrayFieldServer':
+    CustomArrayFieldServer_1,
+  '@/collections/Fields/array/components/client/Label#CustomArrayFieldLabelClient':
+    CustomArrayFieldLabelClient_2,
+  '@/collections/Fields/array/components/client/Field#CustomArrayFieldClient':
+    CustomArrayFieldClient_3,
+  '@/collections/Fields/blocks/components/server/Field#CustomBlocksFieldServer':
+    CustomBlocksFieldServer_4,
+  '@/collections/Fields/blocks/components/client/Field#CustomBlocksFieldClient':
+    CustomBlocksFieldClient_5,
+  '@/collections/Fields/checkbox/components/server/Label#CustomCheckboxFieldLabelServer':
+    CustomCheckboxFieldLabelServer_6,
+  '@/collections/Fields/checkbox/components/server/Field#CustomCheckboxFieldServer':
+    CustomCheckboxFieldServer_7,
+  '@/collections/Fields/checkbox/components/client/Label#CustomCheckboxFieldLabelClient':
+    CustomCheckboxFieldLabelClient_8,
+  '@/collections/Fields/checkbox/components/client/Field#CustomCheckboxFieldClient':
+    CustomCheckboxFieldClient_9,
+  '@/collections/Fields/date/components/server/Label#CustomDateFieldLabelServer':
+    CustomDateFieldLabelServer_10,
+  '@/collections/Fields/date/components/server/Field#CustomDateFieldServer':
+    CustomDateFieldServer_11,
+  '@/collections/Fields/date/components/client/Label#CustomDateFieldLabelClient':
+    CustomDateFieldLabelClient_12,
+  '@/collections/Fields/date/components/client/Field#CustomDateFieldClient':
+    CustomDateFieldClient_13,
+  '@/collections/Fields/email/components/server/Label#CustomEmailFieldLabelServer':
+    CustomEmailFieldLabelServer_14,
+  '@/collections/Fields/email/components/server/Field#CustomEmailFieldServer':
+    CustomEmailFieldServer_15,
+  '@/collections/Fields/email/components/client/Label#CustomEmailFieldLabelClient':
+    CustomEmailFieldLabelClient_16,
+  '@/collections/Fields/email/components/client/Field#CustomEmailFieldClient':
+    CustomEmailFieldClient_17,
+  '@/collections/Fields/number/components/server/Label#CustomNumberFieldLabelServer':
+    CustomNumberFieldLabelServer_18,
+  '@/collections/Fields/number/components/server/Field#CustomNumberFieldServer':
+    CustomNumberFieldServer_19,
+  '@/collections/Fields/number/components/client/Label#CustomNumberFieldLabelClient':
+    CustomNumberFieldLabelClient_20,
+  '@/collections/Fields/number/components/client/Field#CustomNumberFieldClient':
+    CustomNumberFieldClient_21,
+  '@/collections/Fields/point/components/server/Label#CustomPointFieldLabelServer':
+    CustomPointFieldLabelServer_22,
+  '@/collections/Fields/point/components/server/Field#CustomPointFieldServer':
+    CustomPointFieldServer_23,
+  '@/collections/Fields/point/components/client/Label#CustomPointFieldLabelClient':
+    CustomPointFieldLabelClient_24,
+  '@/collections/Fields/point/components/client/Field#CustomPointFieldClient':
+    CustomPointFieldClient_25,
+  '@/collections/Fields/radio/components/server/Label#CustomRadioFieldLabelServer':
+    CustomRadioFieldLabelServer_26,
+  '@/collections/Fields/radio/components/server/Field#CustomRadioFieldServer':
+    CustomRadioFieldServer_27,
+  '@/collections/Fields/radio/components/client/Label#CustomRadioFieldLabelClient':
+    CustomRadioFieldLabelClient_28,
+  '@/collections/Fields/radio/components/client/Field#CustomRadioFieldClient':
+    CustomRadioFieldClient_29,
+  '@/collections/Fields/relationship/components/server/Label#CustomRelationshipFieldLabelServer':
+    CustomRelationshipFieldLabelServer_30,
+  '@/collections/Fields/relationship/components/server/Field#CustomRelationshipFieldServer':
+    CustomRelationshipFieldServer_31,
+  '@/collections/Fields/relationship/components/client/Label#CustomRelationshipFieldLabelClient':
+    CustomRelationshipFieldLabelClient_32,
+  '@/collections/Fields/relationship/components/client/Field#CustomRelationshipFieldClient':
+    CustomRelationshipFieldClient_33,
+  '@/collections/Fields/select/components/server/Label#CustomSelectFieldLabelServer':
+    CustomSelectFieldLabelServer_34,
+  '@/collections/Fields/select/components/server/Field#CustomSelectFieldServer':
+    CustomSelectFieldServer_35,
+  '@/collections/Fields/select/components/client/Label#CustomSelectFieldLabelClient':
+    CustomSelectFieldLabelClient_36,
+  '@/collections/Fields/select/components/client/Field#CustomSelectFieldClient':
+    CustomSelectFieldClient_37,
+  '@/collections/Fields/text/components/server/Label#CustomTextFieldLabelServer':
+    CustomTextFieldLabelServer_38,
+  '@/collections/Fields/text/components/server/Field#CustomTextFieldServer':
+    CustomTextFieldServer_39,
+  '@/collections/Fields/text/components/client/Label#CustomTextFieldLabelClient':
+    CustomTextFieldLabelClient_40,
+  '@/collections/Fields/text/components/client/Field#CustomTextFieldClient':
+    CustomTextFieldClient_41,
+  '@/collections/Fields/textarea/components/server/Label#CustomTextareaFieldLabelServer':
+    CustomTextareaFieldLabelServer_42,
+  '@/collections/Fields/textarea/components/server/Field#CustomTextareaFieldServer':
+    CustomTextareaFieldServer_43,
+  '@/collections/Fields/textarea/components/client/Label#CustomTextareaFieldLabelClient':
+    CustomTextareaFieldLabelClient_44,
+  '@/collections/Fields/textarea/components/client/Field#CustomTextareaFieldClient':
+    CustomTextareaFieldClient_45,
+  '@/collections/Views/components/CustomTabEditView#CustomTabEditView': CustomTabEditView_46,
+  '@/collections/Views/components/CustomDefaultEditView#CustomDefaultEditView':
+    CustomDefaultEditView_47,
+  '@/collections/RootViews/components/CustomRootEditView#CustomRootEditView': CustomRootEditView_48,
+  '@/components/afterNavLinks/LinkToCustomView#LinkToCustomView': LinkToCustomView_49,
+  '@/components/afterNavLinks/LinkToCustomMinimalView#LinkToCustomMinimalView':
+    LinkToCustomMinimalView_50,
+  '@/components/afterNavLinks/LinkToCustomDefaultView#LinkToCustomDefaultView':
+    LinkToCustomDefaultView_51,
+  '@/components/views/CustomRootView#CustomRootView': CustomRootView_52,
+  '@/components/views/CustomDefaultRootView#CustomDefaultRootView': CustomDefaultRootView_53,
+  '@/components/views/CustomMinimalRootView#CustomMinimalRootView': CustomMinimalRootView_54,
 }

next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-beta.107",
+  "version": "3.0.0-beta.109",
   "private": true,
   "type": "module",
   "scripts": {
@@ -34,7 +34,6 @@
     "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\"",
@@ -70,6 +69,8 @@
     "lint:fix": "turbo run lint:fix --concurrency 1 --continue",
     "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",
+    "prepare-run-test-against-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 ..",
+    "prepare-run-test-against-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 ..",
     "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",
@@ -83,8 +84,8 @@
     "test:e2e": "pnpm runts ./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:e2e:prod": "pnpm prepare-run-test-against-prod && pnpm runts ./test/runE2E.ts --prod",
+    "test:e2e:prod:ci": "pnpm prepare-run-test-against-prod:ci && 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:int:sqlite": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=sqlite DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
@@ -104,7 +105,7 @@
   "devDependencies": {
     "@jest/globals": "29.7.0",
     "@libsql/client": "0.6.2",
-    "@next/bundle-analyzer": "15.0.0-canary.104",
+    "@next/bundle-analyzer": "15.0.0-canary.160",
     "@payloadcms/db-postgres": "workspace:*",
     "@payloadcms/eslint-config": "workspace:*",
     "@payloadcms/eslint-plugin": "workspace:*",
@@ -118,8 +119,8 @@
     "@types/minimist": "1.2.5",
     "@types/node": "22.5.4",
     "@types/prompts": "^2.4.5",
-    "@types/react": "npm:types-react@19.0.0-rc.0",
-    "@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
+    "@types/react": "npm:types-react@19.0.0-rc.1",
+    "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
     "@types/semver": "^7.5.3",
     "@types/shelljs": "0.8.15",
     "chalk": "^4.1.2",
@@ -142,15 +143,15 @@
     "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.160",
     "open": "^10.1.0",
     "p-limit": "^5.0.0",
     "playwright": "1.46.0",
     "playwright-core": "1.46.0",
     "prettier": "3.3.3",
     "prompts": "2.4.2",
-    "react": "19.0.0-rc-06d0b89e-20240801",
-    "react-dom": "19.0.0-rc-06d0b89e-20240801",
+    "react": "19.0.0-rc-5dcb0097-20240918",
+    "react-dom": "19.0.0-rc-5dcb0097-20240918",
     "rimraf": "3.0.2",
     "semver": "^7.5.4",
     "sharp": "0.32.6",
@@ -160,12 +161,12 @@
     "swc-plugin-transform-remove-imports": "1.15.0",
     "tempy": "1.0.1",
     "tsx": "4.19.1",
-    "turbo": "^2.1.1",
+    "turbo": "^2.1.2",
     "typescript": "5.6.2"
   },
   "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-5dcb0097-20240918",
+    "react-dom": "^19.0.0 || ^19.0.0-rc-5dcb0097-20240918"
   },
   "packageManager": "pnpm@9.7.1",
   "engines": {
@@ -178,8 +179,8 @@
       "domexception": "4"
     },
     "overrides": {
-      "@types/react": "npm:types-react@19.0.0-rc.0",
-      "@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
+      "@types/react": "npm:types-react@19.0.0-rc.1",
+      "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
       "copyfiles": "$copyfiles",
       "cross-env": "$cross-env",
       "dotenv": "$dotenv",
@@ -192,8 +193,8 @@
     }
   },
   "overrides": {
-    "@types/react": "npm:types-react@19.0.0-rc.0",
-    "@types/react-dom": "npm:types-react-dom@19.0.0-rc.0"
+    "@types/react": "npm:types-react@19.0.0-rc.1",
+    "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1"
   },
   "workspaces:": [
     "packages/*",

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

@@ -1,9 +1,8 @@
 import { rootEslintConfig, rootParserOptions } from '../../eslint.config.js'
 
-/** @typedef {import('eslint').Linter.FlatConfig} */
-let FlatConfig
+/** @typedef {import('eslint').Linter.Config} Config */
 
-/** @type {FlatConfig[]} */
+/** @type {Config[]} */
 export const index = [
   ...rootEslintConfig,
   {

packages/create-payload-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-beta.107",
+  "version": "3.0.0-beta.109",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

packages/create-payload-app/src/lib/get-package-manager.ts

@@ -1,8 +1,12 @@
+import execa from 'execa'
 import fse from 'fs-extra'
 
 import type { CliArgs, PackageManager } from '../types.js'
 
-export function getPackageManager(args: { cliArgs?: CliArgs; projectDir: string }): PackageManager {
+export async function getPackageManager(args: {
+  cliArgs?: CliArgs
+  projectDir: string
+}): Promise<PackageManager> {
   const { cliArgs, projectDir } = args
 
   try {
@@ -16,6 +20,9 @@ export function getPackageManager(args: { cliArgs?: CliArgs; projectDir: string
       detected = 'npm'
     } else if (cliArgs?.['--use-bun'] || fse.existsSync(`${projectDir}/bun.lockb`)) {
       detected = 'bun'
+    } else if (await commandExists('pnpm')) {
+      // Prefer pnpm if it's installed
+      detected = 'pnpm'
     } else {
       // Otherwise check the execution environment
       detected = getEnvironmentPackageManager()
@@ -44,3 +51,12 @@ function getEnvironmentPackageManager(): PackageManager {
 
   return 'npm'
 }
+
+async function commandExists(command: string): Promise<boolean> {
+  try {
+    await execa.command(`command -v ${command}`)
+    return true
+  } catch {
+    return false
+  }
+}

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

@@ -133,7 +133,7 @@ export class Main {
         ? path.dirname(nextConfigPath)
         : path.resolve(process.cwd(), slugify(projectName))
 
-      const packageManager = getPackageManager({ cliArgs: this.args, projectDir })
+      const packageManager = await getPackageManager({ cliArgs: this.args, projectDir })
 
       if (nextConfigPath) {
         p.log.step(

packages/db-mongodb/eslint.config.js

@@ -1,9 +1,8 @@
 import { rootEslintConfig, rootParserOptions } from '../../eslint.config.js'
 
-/** @typedef {import('eslint').Linter.FlatConfig} */
-let FlatConfig
+/** @typedef {import('eslint').Linter.Config} Config */
 
-/** @type {FlatConfig[]} */
+/** @type {Config[]} */
 export const index = [
   ...rootEslintConfig,
   {

packages/db-mongodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-beta.107",
+  "version": "3.0.0-beta.109",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -38,13 +38,14 @@
     "bson-objectid": "2.0.4",
     "http-status": "1.6.2",
     "mongoose": "6.12.3",
+    "mongoose-aggregate-paginate-v2": "1.0.6",
     "mongoose-paginate-v2": "1.7.22",
     "prompts": "2.4.2",
     "uuid": "10.0.0"
   },
   "devDependencies": {
     "@payloadcms/eslint-config": "workspace:*",
-    "@types/mongoose-aggregate-paginate-v2": "1.0.9",
+    "@types/mongoose-aggregate-paginate-v2": "1.0.6",
     "mongodb": "4.17.1",
     "mongodb-memory-server": "^9",
     "payload": "workspace:*"

packages/db-mongodb/src/create.ts

@@ -3,6 +3,7 @@ import type { Create, Document, PayloadRequest } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { handleError } from './utilities/handleError.js'
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
 export const create: Create = async function create(
@@ -12,8 +13,15 @@ export const create: Create = async function create(
   const Model = this.collections[collection]
   const options = await withSession(this, req)
   let doc
+
+  const sanitizedData = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data,
+    fields: this.payload.collections[collection].config.fields,
+  })
+
   try {
-    ;[doc] = await Model.create([data], options)
+    ;[doc] = await Model.create([sanitizedData], options)
   } catch (error) {
     handleError({ collection, error, req })
   }

packages/db-mongodb/src/createGlobal.ts

@@ -3,6 +3,7 @@ import type { CreateGlobal, PayloadRequest } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
 export const createGlobal: CreateGlobal = async function createGlobal(
@@ -10,10 +11,16 @@ export const createGlobal: CreateGlobal = async function createGlobal(
   { slug, data, req = {} as PayloadRequest },
 ) {
   const Model = this.globals
-  const global = {
-    globalType: slug,
-    ...data,
-  }
+
+  const global = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data: {
+      globalType: slug,
+      ...data,
+    },
+    fields: this.payload.config.globals.find((globalConfig) => globalConfig.slug === slug).fields,
+  })
+
   const options = await withSession(this, req)
 
   let [result] = (await Model.create([global], options)) as any

packages/db-mongodb/src/createGlobalVersion.ts

@@ -1,30 +1,51 @@
-import type { CreateGlobalVersion, Document, PayloadRequest } from 'payload'
+import {
+  buildVersionGlobalFields,
+  type CreateGlobalVersion,
+  type Document,
+  type PayloadRequest,
+} from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
 export const createGlobalVersion: CreateGlobalVersion = async function createGlobalVersion(
   this: MongooseAdapter,
-  { autosave, createdAt, globalSlug, parent, req = {} as PayloadRequest, updatedAt, versionData },
+  {
+    autosave,
+    createdAt,
+    globalSlug,
+    parent,
+    publishedLocale,
+    req = {} as PayloadRequest,
+    snapshot,
+    updatedAt,
+    versionData,
+  },
 ) {
   const VersionModel = this.versions[globalSlug]
   const options = await withSession(this, req)
 
-  const [doc] = await VersionModel.create(
-    [
-      {
-        autosave,
-        createdAt,
-        latest: true,
-        parent,
-        updatedAt,
-        version: versionData,
-      },
-    ],
-    options,
-    req,
-  )
+  const data = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data: {
+      autosave,
+      createdAt,
+      latest: true,
+      parent,
+      publishedLocale,
+      snapshot,
+      updatedAt,
+      version: versionData,
+    },
+    fields: buildVersionGlobalFields(
+      this.payload.config,
+      this.payload.config.globals.find((global) => global.slug === globalSlug),
+    ),
+  })
+
+  const [doc] = await VersionModel.create([data], options, req)
 
   await VersionModel.updateMany(
     {

packages/db-mongodb/src/createMigration.ts

@@ -11,11 +11,11 @@ const migrationTemplate = ({ downSQL, imports, upSQL }: MigrationTemplateArgs):
 } from '@payloadcms/db-mongodb'
 ${imports}
 
-export async function up({ payload }: MigrateUpArgs): Promise<void> {
+export async function up({ payload, req }: MigrateUpArgs): Promise<void> {
 ${upSQL ?? `  // Migration code`}
 }
 
-export async function down({ payload }: MigrateDownArgs): Promise<void> {
+export async function down({ payload, req }: MigrateDownArgs): Promise<void> {
 ${downSQL ?? `  // Migration code`}
 }
 `

packages/db-mongodb/src/createVersion.ts

@@ -1,9 +1,19 @@
-import type { CreateVersion, Document, PayloadRequest } from 'payload'
+import ObjectIdImport from 'bson-objectid'
+import { isValidObjectId } from 'mongoose'
+import {
+  buildVersionCollectionFields,
+  type CreateVersion,
+  type Document,
+  type PayloadRequest,
+} from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
+const ObjectId = (ObjectIdImport.default ||
+  ObjectIdImport) as unknown as typeof ObjectIdImport.default
 export const createVersion: CreateVersion = async function createVersion(
   this: MongooseAdapter,
   {
@@ -11,7 +21,9 @@ export const createVersion: CreateVersion = async function createVersion(
     collectionSlug,
     createdAt,
     parent,
+    publishedLocale,
     req = {} as PayloadRequest,
+    snapshot,
     updatedAt,
     versionData,
   },
@@ -19,20 +31,42 @@ export const createVersion: CreateVersion = async function createVersion(
   const VersionModel = this.versions[collectionSlug]
   const options = await withSession(this, req)
 
-  const [doc] = await VersionModel.create(
-    [
+  const data = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data: {
+      autosave,
+      createdAt,
+      latest: true,
+      parent,
+      publishedLocale,
+      snapshot,
+      updatedAt,
+      version: versionData,
+    },
+    fields: buildVersionCollectionFields(
+      this.payload.config,
+      this.payload.collections[collectionSlug].config,
+    ),
+  })
+
+  const [doc] = await VersionModel.create([data], options, req)
+
+  const parentQuery = {
+    $or: [
       {
-        autosave,
-        createdAt,
-        latest: true,
-        parent,
-        updatedAt,
-        version: versionData,
+        parent: {
+          $eq: data.parent,
+        },
       },
     ],
-    options,
-    req,
-  )
+  }
+  if (typeof data.parent === 'string' && isValidObjectId(data.parent)) {
+    parentQuery.$or.push({
+      parent: {
+        $eq: ObjectId(data.parent),
+      },
+    })
+  }
 
   await VersionModel.updateMany(
     {
@@ -42,11 +76,7 @@ export const createVersion: CreateVersion = async function createVersion(
             $ne: doc._id,
           },
         },
-        {
-          parent: {
-            $eq: parent,
-          },
-        },
+        parentQuery,
         {
           latest: {
             $eq: true,

packages/db-mongodb/src/find.ts

@@ -6,12 +6,24 @@ import { flattenWhereToOperators } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { buildSortParam } from './queries/buildSortParam.js'
+import { buildJoinAggregation } from './utilities/buildJoinAggregation.js'
 import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const find: Find = async function find(
   this: MongooseAdapter,
-  { collection, limit, locale, page, pagination, req = {} as PayloadRequest, sort: sortArg, where },
+  {
+    collection,
+    joins = {},
+    limit = 0,
+    locale,
+    page,
+    pagination,
+    projection,
+    req = {} as PayloadRequest,
+    sort: sortArg,
+    where,
+  },
 ) {
   const Model = this.collections[collection]
   const collectionConfig = this.payload.collections[collection].config
@@ -50,6 +62,7 @@ export const find: Find = async function find(
     options,
     page,
     pagination,
+    projection,
     sort,
     useEstimatedCount,
   }
@@ -88,7 +101,24 @@ export const find: Find = async function find(
     }
   }
 
-  const result = await Model.paginate(query, paginationOptions)
+  let result
+
+  const aggregate = await buildJoinAggregation({
+    adapter: this,
+    collection,
+    collectionConfig,
+    joins,
+    limit,
+    locale,
+    query,
+  })
+  // build join aggregation
+  if (aggregate) {
+    result = await Model.aggregatePaginate(Model.aggregate(aggregate), paginationOptions)
+  } else {
+    result = await Model.paginate(query, paginationOptions)
+  }
+
   const docs = JSON.parse(JSON.stringify(result.docs))
 
   return {

packages/db-mongodb/src/findGlobalVersions.ts

@@ -25,6 +25,7 @@ export const findGlobalVersions: FindGlobalVersions = async function findGlobalV
 ) {
   const Model = this.versions[global]
   const versionFields = buildVersionGlobalFields(
+    this.payload.config,
     this.payload.globals.config.find(({ slug }) => slug === global),
   )
   const options = {

packages/db-mongodb/src/findOne.ts

@@ -3,14 +3,16 @@ import type { Document, FindOne, PayloadRequest } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
+import { buildJoinAggregation } from './utilities/buildJoinAggregation.js'
 import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const findOne: FindOne = async function findOne(
   this: MongooseAdapter,
-  { collection, locale, req = {} as PayloadRequest, where },
+  { collection, joins, locale, req = {} as PayloadRequest, where },
 ) {
   const Model = this.collections[collection]
+  const collectionConfig = this.payload.collections[collection].config
   const options: MongooseQueryOptions = {
     ...(await withSession(this, req)),
     lean: true,
@@ -22,7 +24,22 @@ export const findOne: FindOne = async function findOne(
     where,
   })
 
-  const doc = await Model.findOne(query, {}, options)
+  const aggregate = await buildJoinAggregation({
+    adapter: this,
+    collection,
+    collectionConfig,
+    joins,
+    limit: 1,
+    locale,
+    query,
+  })
+
+  let doc
+  if (aggregate) {
+    ;[doc] = await Model.aggregate(aggregate, options)
+  } else {
+    doc = await Model.findOne(query, {}, options)
+  }
 
   if (!doc) {
     return null

packages/db-mongodb/src/index.ts

@@ -1,7 +1,7 @@
 import type { CollationOptions, TransactionOptions } from 'mongodb'
 import type { MongoMemoryReplSet } from 'mongodb-memory-server'
-import type { ClientSession, Connection, ConnectOptions } from 'mongoose'
-import type { BaseDatabaseAdapter, DatabaseAdapterObj, Payload } from 'payload'
+import type { ClientSession, Connection, ConnectOptions, QueryOptions } from 'mongoose'
+import type { BaseDatabaseAdapter, DatabaseAdapterObj, Payload, UpdateOneArgs } from 'payload'
 
 import fs from 'fs'
 import mongoose from 'mongoose'
@@ -36,6 +36,7 @@ import { updateGlobal } from './updateGlobal.js'
 import { updateGlobalVersion } from './updateGlobalVersion.js'
 import { updateOne } from './updateOne.js'
 import { updateVersion } from './updateVersion.js'
+import { upsert } from './upsert.js'
 
 export type { MigrateDownArgs, MigrateUpArgs } from './types.js'
 
@@ -124,6 +125,7 @@ declare module 'payload' {
     }[]
     sessions: Record<number | string, ClientSession>
     transactionOptions: TransactionOptions
+    updateOne: (args: { options?: QueryOptions } & UpdateOneArgs) => Promise<Document>
     versions: {
       [slug: string]: CollectionModel
     }
@@ -191,6 +193,7 @@ export function mongooseAdapter({
       updateGlobalVersion,
       updateOne,
       updateVersion,
+      upsert,
     })
   }
 

packages/db-mongodb/src/init.ts

@@ -2,6 +2,7 @@ import type { PaginateOptions } from 'mongoose'
 import type { Init, SanitizedCollectionConfig } from 'payload'
 
 import mongoose from 'mongoose'
+import mongooseAggregatePaginate from 'mongoose-aggregate-paginate-v2'
 import paginate from 'mongoose-paginate-v2'
 import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'
 
@@ -21,7 +22,7 @@ export const init: Init = function init(this: MongooseAdapter) {
     if (collection.versions) {
       const versionModelName = getDBName({ config: collection, versions: true })
 
-      const versionCollectionFields = buildVersionCollectionFields(collection)
+      const versionCollectionFields = buildVersionCollectionFields(this.payload.config, collection)
 
       const versionSchema = buildSchema(this.payload.config, versionCollectionFields, {
         disableUnique: true,
@@ -40,12 +41,16 @@ export const init: Init = function init(this: MongooseAdapter) {
         }),
       )
 
+      if (Object.keys(collection.joins).length > 0) {
+        versionSchema.plugin(mongooseAggregatePaginate)
+      }
+
       const model = mongoose.model(
         versionModelName,
         versionSchema,
         this.autoPluralization === true ? undefined : versionModelName,
       ) as CollectionModel
-      // this.payload.versions[collection.slug] = model;
+
       this.versions[collection.slug] = model
     }
 
@@ -64,7 +69,7 @@ export const init: Init = function init(this: MongooseAdapter) {
     if (global.versions) {
       const versionModelName = getDBName({ config: global, versions: true })
 
-      const versionGlobalFields = buildVersionGlobalFields(global)
+      const versionGlobalFields = buildVersionGlobalFields(this.payload.config, global)
 
       const versionSchema = buildSchema(this.payload.config, versionGlobalFields, {
         disableUnique: true,

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

@@ -1,6 +1,7 @@
 import type { PaginateOptions, Schema } from 'mongoose'
 import type { SanitizedCollectionConfig, SanitizedConfig } from 'payload'
 
+import mongooseAggregatePaginate from 'mongoose-aggregate-paginate-v2'
 import paginate from 'mongoose-paginate-v2'
 
 import { getBuildQueryPlugin } from '../queries/buildQuery.js'
@@ -42,5 +43,9 @@ export const buildCollectionSchema = (
     .plugin<any, PaginateOptions>(paginate, { useEstimatedCount: true })
     .plugin(getBuildQueryPlugin({ collectionSlug: collection.slug }))
 
+  if (Object.keys(collection.joins).length > 0) {
+    schema.plugin(mongooseAggregatePaginate)
+  }
+
   return schema
 }

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

@@ -34,6 +34,7 @@ import {
   fieldAffectsData,
   fieldIsLocalized,
   fieldIsPresentationalOnly,
+  fieldIsVirtual,
   tabHasName,
 } from 'payload/shared'
 
@@ -136,6 +137,10 @@ export const buildSchema = (
   const schema = new mongoose.Schema(fields, options)
 
   schemaFields.forEach((field) => {
+    if (fieldIsVirtual(field)) {
+      return
+    }
+
     if (!fieldIsPresentationalOnly(field)) {
       const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[field.type]
 

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

@@ -165,7 +165,7 @@ export async function buildSearchParam({
           const subQuery = priorQueryResult.value
           const result = await SubModel.find(subQuery, subQueryOptions)
 
-          const $in = result.map((doc) => doc._id.toString())
+          const $in = result.map((doc) => doc._id)
 
           // If it is the last recursion
           // then pass through the search param

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

@@ -1,5 +1,6 @@
 import type { Field, TabAsField } from 'payload'
 
+import ObjectIdImport from 'bson-objectid'
 import mongoose from 'mongoose'
 import { createArrayFromCommaDelineated } from 'payload'
 
@@ -11,6 +12,8 @@ type SanitizeQueryValueArgs = {
   val: any
 }
 
+const ObjectId = (ObjectIdImport.default ||
+  ObjectIdImport) as unknown as typeof ObjectIdImport.default
 export const sanitizeQueryValue = ({
   field,
   hasCustomID,
@@ -26,21 +29,49 @@ export const sanitizeQueryValue = ({
   let formattedOperator = operator
 
   // Disregard invalid _ids
-  if (path === '_id' && typeof val === 'string' && val.split(',').length === 1) {
-    if (!hasCustomID) {
-      const isValid = mongoose.Types.ObjectId.isValid(val)
+  if (path === '_id') {
+    if (typeof val === 'string' && val.split(',').length === 1) {
+      if (!hasCustomID) {
+        const isValid = mongoose.Types.ObjectId.isValid(val)
 
-      if (!isValid) {
-        return { operator: formattedOperator, val: undefined }
+        if (!isValid) {
+          return { operator: formattedOperator, val: undefined }
+        } else {
+          if (['in', 'not_in'].includes(operator)) {
+            formattedValue = createArrayFromCommaDelineated(formattedValue).map((id) =>
+              ObjectId(id),
+            )
+          } else {
+            formattedValue = ObjectId(val)
+          }
+        }
       }
-    }
 
-    if (field.type === 'number') {
-      const parsedNumber = parseFloat(val)
+      if (field.type === 'number') {
+        const parsedNumber = parseFloat(val)
 
-      if (Number.isNaN(parsedNumber)) {
-        return { operator: formattedOperator, val: undefined }
+        if (Number.isNaN(parsedNumber)) {
+          return { operator: formattedOperator, val: undefined }
+        }
       }
+    } else if (Array.isArray(val)) {
+      formattedValue = formattedValue.reduce((formattedValues, inVal) => {
+        const newValues = [inVal]
+        if (!hasCustomID) {
+          if (mongoose.Types.ObjectId.isValid(inVal)) {
+            newValues.push(ObjectId(inVal))
+          }
+        }
+
+        if (field.type === 'number') {
+          const parsedNumber = parseFloat(inVal)
+          if (!Number.isNaN(parsedNumber)) {
+            newValues.push(parsedNumber)
+          }
+        }
+
+        return [...formattedValues, ...newValues]
+      }, [])
     }
   }
 
@@ -86,6 +117,13 @@ export const sanitizeQueryValue = ({
       formattedValue.value &&
       formattedValue.relationTo
     ) {
+      const { value } = formattedValue
+      const isValid = mongoose.Types.ObjectId.isValid(value)
+
+      if (isValid) {
+        formattedValue.value = ObjectId(value)
+      }
+
       return {
         rawQuery: {
           $and: [
@@ -96,11 +134,11 @@ export const sanitizeQueryValue = ({
       }
     }
 
-    if (operator === 'in' && Array.isArray(formattedValue)) {
+    if (['in', 'not_in'].includes(operator) && Array.isArray(formattedValue)) {
       formattedValue = formattedValue.reduce((formattedValues, inVal) => {
         const newValues = [inVal]
         if (mongoose.Types.ObjectId.isValid(inVal)) {
-          newValues.push(new mongoose.Types.ObjectId(inVal))
+          newValues.push(ObjectId(inVal))
         }
 
         const parsedNumber = parseFloat(inVal)
@@ -111,6 +149,12 @@ export const sanitizeQueryValue = ({
         return [...formattedValues, ...newValues]
       }, [])
     }
+
+    if (operator === 'contains' && typeof formattedValue === 'string') {
+      if (mongoose.Types.ObjectId.isValid(formattedValue)) {
+        formattedValue = ObjectId(formattedValue)
+      }
+    }
   }
 
   // Set up specific formatting necessary by operators
@@ -152,12 +196,38 @@ export const sanitizeQueryValue = ({
   }
 
   if (path !== '_id' || (path === '_id' && hasCustomID && field.type === 'text')) {
-    if (operator === 'contains') {
+    if (operator === 'contains' && !mongoose.Types.ObjectId.isValid(formattedValue)) {
       formattedValue = {
         $options: 'i',
         $regex: formattedValue.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'),
       }
     }
+
+    if (operator === 'exists') {
+      formattedValue = formattedValue === 'true' || formattedValue === true
+
+      if (formattedValue) {
+        return {
+          rawQuery: {
+            $and: [
+              { [path]: { $exists: true } },
+              { [path]: { $ne: null } },
+              { [path]: { $ne: '' } },
+            ],
+          },
+        }
+      } else {
+        return {
+          rawQuery: {
+            $or: [
+              { [path]: { $exists: false } },
+              { [path]: { $eq: null } },
+              { [path]: { $eq: '' } }, // Treat empty string as null / undefined
+            ],
+          },
+        }
+      }
+    }
   }
 
   if (

packages/db-mongodb/src/types.ts

@@ -1,4 +1,11 @@
-import type { IndexDefinition, IndexOptions, Model, PaginateModel, SchemaOptions } from 'mongoose'
+import type {
+  AggregatePaginateModel,
+  IndexDefinition,
+  IndexOptions,
+  Model,
+  PaginateModel,
+  SchemaOptions,
+} from 'mongoose'
 import type {
   ArrayField,
   BlocksField,
@@ -9,9 +16,11 @@ import type {
   EmailField,
   Field,
   GroupField,
+  JoinField,
   JSONField,
   NumberField,
   Payload,
+  PayloadRequest,
   PointField,
   RadioField,
   RelationshipField,
@@ -27,7 +36,10 @@ import type {
 
 import type { BuildQueryArgs } from './queries/buildQuery.js'
 
-export interface CollectionModel extends Model<any>, PaginateModel<any> {
+export interface CollectionModel
+  extends Model<any>,
+    PaginateModel<any>,
+    AggregatePaginateModel<any> {
   /** buildQuery is used to transform payload's where operator into what can be used by mongoose (e.g. id => _id) */
   buildQuery: (args: BuildQueryArgs) => Promise<Record<string, unknown>> // TODO: Delete this
 }
@@ -83,6 +95,7 @@ export type FieldToSchemaMap<TSchema> = {
   date: FieldGeneratorFunction<TSchema, DateField>
   email: FieldGeneratorFunction<TSchema, EmailField>
   group: FieldGeneratorFunction<TSchema, GroupField>
+  join: FieldGeneratorFunction<TSchema, JoinField>
   json: FieldGeneratorFunction<TSchema, JSONField>
   number: FieldGeneratorFunction<TSchema, NumberField>
   point: FieldGeneratorFunction<TSchema, PointField>
@@ -97,5 +110,5 @@ export type FieldToSchemaMap<TSchema> = {
   upload: FieldGeneratorFunction<TSchema, UploadField>
 }
 
-export type MigrateUpArgs = { payload: Payload }
-export type MigrateDownArgs = { payload: Payload }
+export type MigrateUpArgs = { payload: Payload; req: PayloadRequest }
+export type MigrateDownArgs = { payload: Payload; req: PayloadRequest }

packages/db-mongodb/src/updateGlobal.ts

@@ -3,6 +3,7 @@ import type { PayloadRequest, UpdateGlobal } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
 export const updateGlobal: UpdateGlobal = async function updateGlobal(
@@ -17,7 +18,14 @@ export const updateGlobal: UpdateGlobal = async function updateGlobal(
   }
 
   let result
-  result = await Model.findOneAndUpdate({ globalType: slug }, data, options)
+
+  const sanitizedData = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data,
+    fields: this.payload.config.globals.find((global) => global.slug === slug).fields,
+  })
+
+  result = await Model.findOneAndUpdate({ globalType: slug }, sanitizedData, options)
 
   result = JSON.parse(JSON.stringify(result))
 

packages/db-mongodb/src/updateGlobalVersion.ts

@@ -1,21 +1,27 @@
-import type { PayloadRequest, TypeWithID, UpdateGlobalVersionArgs } from 'payload'
+import {
+  buildVersionGlobalFields,
+  type PayloadRequest,
+  type TypeWithID,
+  type UpdateGlobalVersionArgs,
+} from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
 export async function updateGlobalVersion<T extends TypeWithID>(
   this: MongooseAdapter,
   {
     id,
-    global,
+    global: globalSlug,
     locale,
     req = {} as PayloadRequest,
     versionData,
     where,
   }: UpdateGlobalVersionArgs<T>,
 ) {
-  const VersionModel = this.versions[global]
+  const VersionModel = this.versions[globalSlug]
   const whereToUse = where || { id: { equals: id } }
   const options = {
     ...(await withSession(this, req)),
@@ -29,7 +35,16 @@ export async function updateGlobalVersion<T extends TypeWithID>(
     where: whereToUse,
   })
 
-  const doc = await VersionModel.findOneAndUpdate(query, versionData, options)
+  const sanitizedData = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data: versionData,
+    fields: buildVersionGlobalFields(
+      this.payload.config,
+      this.payload.config.globals.find((global) => global.slug === globalSlug),
+    ),
+  })
+
+  const doc = await VersionModel.findOneAndUpdate(query, sanitizedData, options)
 
   const result = JSON.parse(JSON.stringify(doc))
 

packages/db-mongodb/src/updateOne.ts

@@ -1,18 +1,29 @@
+import type { QueryOptions } from 'mongoose'
 import type { PayloadRequest, UpdateOne } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
 import { handleError } from './utilities/handleError.js'
 import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
 export const updateOne: UpdateOne = async function updateOne(
   this: MongooseAdapter,
-  { id, collection, data, locale, req = {} as PayloadRequest, where: whereArg },
+  {
+    id,
+    collection,
+    data,
+    locale,
+    options: optionsArgs = {},
+    req = {} as PayloadRequest,
+    where: whereArg,
+  },
 ) {
   const where = id ? { id: { equals: id } } : whereArg
   const Model = this.collections[collection]
-  const options = {
+  const options: QueryOptions = {
+    ...optionsArgs,
     ...(await withSession(this, req)),
     lean: true,
     new: true,
@@ -26,8 +37,14 @@ export const updateOne: UpdateOne = async function updateOne(
 
   let result
 
+  const sanitizedData = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data,
+    fields: this.payload.collections[collection].config.fields,
+  })
+
   try {
-    result = await Model.findOneAndUpdate(query, data, options)
+    result = await Model.findOneAndUpdate(query, sanitizedData, options)
   } catch (error) {
     handleError({ collection, error, req })
   }

packages/db-mongodb/src/updateVersion.ts

@@ -1,7 +1,8 @@
-import type { PayloadRequest, UpdateVersion } from 'payload'
+import { buildVersionCollectionFields, type PayloadRequest, type UpdateVersion } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'
 
 export const updateVersion: UpdateVersion = async function updateVersion(
@@ -22,7 +23,16 @@ export const updateVersion: UpdateVersion = async function updateVersion(
     where: whereToUse,
   })
 
-  const doc = await VersionModel.findOneAndUpdate(query, versionData, options)
+  const sanitizedData = sanitizeRelationshipIDs({
+    config: this.payload.config,
+    data: versionData,
+    fields: buildVersionCollectionFields(
+      this.payload.config,
+      this.payload.collections[collection].config,
+    ),
+  })
+
+  const doc = await VersionModel.findOneAndUpdate(query, sanitizedData, options)
 
   const result = JSON.parse(JSON.stringify(doc))
 

packages/db-mongodb/src/upsert.ts

@@ -0,0 +1,10 @@
+import type { PayloadRequest, Upsert } from 'payload'
+
+import type { MongooseAdapter } from './index.js'
+
+export const upsert: Upsert = async function upsert(
+  this: MongooseAdapter,
+  { collection, data, locale, req = {} as PayloadRequest, where },
+) {
+  return this.updateOne({ collection, data, locale, options: { upsert: true }, req, where })
+}

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

@@ -0,0 +1,175 @@
+import type { PipelineStage } from 'mongoose'
+import type { CollectionSlug, JoinQuery, SanitizedCollectionConfig, Where } from 'payload'
+
+import type { MongooseAdapter } from '../index.js'
+
+import { buildSortParam } from '../queries/buildSortParam.js'
+
+type BuildJoinAggregationArgs = {
+  adapter: MongooseAdapter
+  collection: CollectionSlug
+  collectionConfig: SanitizedCollectionConfig
+  joins: JoinQuery
+  // the number of docs to get at the top collection level
+  limit?: number
+  locale: string
+  // the where clause for the top collection
+  query?: Where
+}
+
+export const buildJoinAggregation = async ({
+  adapter,
+  collection,
+  collectionConfig,
+  joins,
+  limit,
+  locale,
+  query,
+}: BuildJoinAggregationArgs): Promise<PipelineStage[] | undefined> => {
+  if (Object.keys(collectionConfig.joins).length === 0 || joins === false) {
+    return
+  }
+
+  const joinConfig = adapter.payload.collections[collection].config.joins
+  const aggregate: PipelineStage[] = [
+    {
+      $sort: { createdAt: -1 },
+    },
+  ]
+
+  if (query) {
+    aggregate.push({
+      $match: query,
+    })
+  }
+
+  if (limit) {
+    aggregate.push({
+      $limit: limit,
+    })
+  }
+
+  for (const slug of Object.keys(joinConfig)) {
+    for (const join of joinConfig[slug]) {
+      const joinModel = adapter.collections[join.field.collection]
+
+      const {
+        limit: limitJoin = 10,
+        sort: sortJoin,
+        where: whereJoin,
+      } = joins?.[join.schemaPath] || {}
+
+      const sort = buildSortParam({
+        config: adapter.payload.config,
+        fields: adapter.payload.collections[slug].config.fields,
+        locale,
+        sort: sortJoin || collectionConfig.defaultSort,
+        timestamps: true,
+      })
+      const sortProperty = Object.keys(sort)[0]
+      const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1
+
+      const $match = await joinModel.buildQuery({
+        locale,
+        payload: adapter.payload,
+        where: whereJoin,
+      })
+
+      const pipeline: Exclude<PipelineStage, PipelineStage.Merge | PipelineStage.Out>[] = [
+        { $match },
+        {
+          $sort: { [sortProperty]: sortDirection },
+        },
+      ]
+
+      if (limitJoin > 0) {
+        pipeline.push({
+          $limit: limitJoin + 1,
+        })
+      }
+
+      if (adapter.payload.config.localization && locale === 'all') {
+        adapter.payload.config.localization.localeCodes.forEach((code) => {
+          const as = `${join.schemaPath}${code}`
+
+          aggregate.push(
+            {
+              $lookup: {
+                as: `${as}.docs`,
+                foreignField: `${join.field.on}${code}`,
+                from: slug,
+                localField: '_id',
+                pipeline,
+              },
+            },
+            {
+              $addFields: {
+                [`${as}.docs`]: {
+                  $map: {
+                    as: 'doc',
+                    in: '$$doc._id',
+                    input: `$${as}.docs`,
+                  },
+                }, // Slicing the docs to match the limit
+                [`${as}.hasNextPage`]: limitJoin
+                  ? { $gt: [{ $size: `$${as}.docs` }, limitJoin] }
+                  : false,
+                // Boolean indicating if more docs than limit
+              },
+            },
+          )
+          if (limitJoin > 0) {
+            aggregate.push({
+              $addFields: {
+                [`${as}.docs`]: {
+                  $slice: [`$${as}.docs`, limitJoin],
+                },
+              },
+            })
+          }
+        })
+      } else {
+        const localeSuffix =
+          join.field.localized && adapter.payload.config.localization && locale ? `.${locale}` : ''
+        const as = `${join.schemaPath}${localeSuffix}`
+
+        aggregate.push(
+          {
+            $lookup: {
+              as: `${as}.docs`,
+              foreignField: `${join.field.on}${localeSuffix}`,
+              from: slug,
+              localField: '_id',
+              pipeline,
+            },
+          },
+          {
+            $addFields: {
+              [`${as}.docs`]: {
+                $map: {
+                  as: 'doc',
+                  in: '$$doc._id',
+                  input: `$${as}.docs`,
+                },
+              }, // Slicing the docs to match the limit
+              [`${as}.hasNextPage`]: {
+                $gt: [{ $size: `$${as}.docs` }, limitJoin || Number.MAX_VALUE],
+              }, // Boolean indicating if more docs than limit
+            },
+          },
+        )
+        if (limitJoin > 0) {
+          aggregate.push({
+            $addFields: {
+              [`${as}.docs`]: {
+                $slice: [`$${as}.docs`, limitJoin],
+              },
+            },
+          })
+        }
+      }
+    }
+  }
+
+  return aggregate
+}

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

@@ -0,0 +1,140 @@
+import type { CollectionConfig, Field, SanitizedConfig, TraverseFieldsCallback } from 'payload'
+
+import mongoose from 'mongoose'
+import { traverseFields } from 'payload'
+import { fieldAffectsData } from 'payload/shared'
+
+type Args = {
+  config: SanitizedConfig
+  data: Record<string, unknown>
+  fields: Field[]
+}
+
+interface RelationObject {
+  relationTo: string
+  value: number | string
+}
+
+function isValidRelationObject(value: unknown): value is RelationObject {
+  return typeof value === 'object' && value !== null && 'relationTo' in value && 'value' in value
+}
+
+const convertValue = ({
+  relatedCollection,
+  value,
+}: {
+  relatedCollection: CollectionConfig
+  value: number | string
+}): mongoose.Types.ObjectId | number | string => {
+  const customIDField = relatedCollection.fields.find(
+    (field) => fieldAffectsData(field) && field.name === 'id',
+  )
+
+  if (!customIDField) {
+    return new mongoose.Types.ObjectId(value)
+  }
+
+  return value
+}
+
+const sanitizeRelationship = ({ config, field, locale, ref, value }) => {
+  let relatedCollection: CollectionConfig | undefined
+  let result = value
+
+  const hasManyRelations = typeof field.relationTo !== 'string'
+
+  if (!hasManyRelations) {
+    relatedCollection = config.collections?.find(({ slug }) => slug === field.relationTo)
+  }
+
+  if (Array.isArray(value)) {
+    result = value.map((val) => {
+      // Handle has many
+      if (relatedCollection && val && (typeof val === 'string' || typeof val === 'number')) {
+        return convertValue({
+          relatedCollection,
+          value: val,
+        })
+      }
+
+      // Handle has many - polymorphic
+      if (isValidRelationObject(val)) {
+        const relatedCollectionForSingleValue = config.collections?.find(
+          ({ slug }) => slug === val.relationTo,
+        )
+
+        if (relatedCollectionForSingleValue) {
+          return {
+            relationTo: val.relationTo,
+            value: convertValue({
+              relatedCollection: relatedCollectionForSingleValue,
+              value: val.value,
+            }),
+          }
+        }
+      }
+
+      return val
+    })
+  }
+
+  // Handle has one - polymorphic
+  if (isValidRelationObject(value)) {
+    relatedCollection = config.collections?.find(({ slug }) => slug === value.relationTo)
+
+    if (relatedCollection) {
+      result = {
+        relationTo: value.relationTo,
+        value: convertValue({ relatedCollection, value: value.value }),
+      }
+    }
+  }
+
+  // Handle has one
+  if (relatedCollection && value && (typeof value === 'string' || typeof value === 'number')) {
+    result = convertValue({
+      relatedCollection,
+      value,
+    })
+  }
+  if (locale) {
+    ref[locale] = result
+  } else {
+    ref[field.name] = result
+  }
+}
+
+export const sanitizeRelationshipIDs = ({
+  config,
+  data,
+  fields,
+}: Args): Record<string, unknown> => {
+  const sanitize: TraverseFieldsCallback = ({ field, ref }) => {
+    if (field.type === 'relationship' || field.type === 'upload') {
+      // handle localized relationships
+      if (config.localization && field.localized) {
+        const locales = config.localization.locales
+        const fieldRef = ref[field.name]
+        for (const { code } of locales) {
+          if (ref[field.name]?.[code]) {
+            const value = ref[field.name][code]
+            sanitizeRelationship({ config, field, locale: code, ref: fieldRef, value })
+          }
+        }
+      } else {
+        // handle non-localized relationships
+        sanitizeRelationship({
+          config,
+          field,
+          locale: undefined,
+          ref,
+          value: ref[field.name],
+        })
+      }
+    }
+  }
+
+  traverseFields({ callback: sanitize, fields, ref: data })
+
+  return data
+}

packages/db-mongodb/src/withSession.ts

@@ -10,7 +10,7 @@ import type { MongooseAdapter } from './index.js'
 export async function withSession(
   db: MongooseAdapter,
   req: PayloadRequest,
-): Promise<{ session: ClientSession } | object> {
+): Promise<{ session: ClientSession } | Record<string, never>> {
   let transactionID = req.transactionID
 
   if (transactionID instanceof Promise) {

packages/db-postgres/eslint.config.js

@@ -1,9 +1,8 @@
 import { rootEslintConfig, rootParserOptions } from '../../eslint.config.js'
 
-/** @typedef {import('eslint').Linter.FlatConfig} */
-let FlatConfig
+/** @typedef {import('eslint').Linter.Config} Config */
 
-/** @type {FlatConfig[]} */
+/** @type {Config[]} */
 export const index = [
   ...rootEslintConfig,
   {

packages/db-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-beta.107",
+  "version": "3.0.0-beta.109",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/db-postgres/src/index.ts

@@ -76,6 +76,8 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
 
     return createDatabaseAdapter<PostgresAdapter>({
       name: 'postgres',
+      afterSchemaInit: args.afterSchemaInit ?? [],
+      beforeSchemaInit: args.beforeSchemaInit ?? [],
       defaultDrizzleSnapshot,
       drizzle: undefined,
       enums: {},
@@ -150,6 +152,7 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
       updateGlobalVersion,
       updateOne,
       updateVersion,
+      upsert: updateOne,
     })
   }
 

packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts

@@ -118,7 +118,7 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
       const versionsTableName = adapter.tableNameMap.get(
         `_${toSnakeCase(collection.slug)}${adapter.versionsSuffix}`,
       )
-      const versionFields = buildVersionCollectionFields(collection)
+      const versionFields = buildVersionCollectionFields(payload.config, collection)
       const versionPathsToQuery: PathsToQuery = new Set()
 
       traverseFields({
@@ -191,7 +191,7 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
         `_${toSnakeCase(global.slug)}${adapter.versionsSuffix}`,
       )
 
-      const versionFields = buildVersionGlobalFields(global)
+      const versionFields = buildVersionGlobalFields(payload.config, global)
 
       const versionPathsToQuery: PathsToQuery = new Set()
 

packages/db-postgres/src/types.ts

@@ -4,6 +4,7 @@ import type {
   MigrateDownArgs,
   MigrateUpArgs,
   PostgresDB,
+  PostgresSchemaHook,
 } from '@payloadcms/drizzle/postgres'
 import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
 import type { DrizzleConfig } from 'drizzle-orm'
@@ -11,6 +12,18 @@ import type { PgSchema, PgTableFn, PgTransactionConfig } from 'drizzle-orm/pg-co
 import type { Pool, PoolConfig } from 'pg'
 
 export type Args = {
+  /**
+   * Transform the schema after it's built.
+   * You can use it to customize the schema with features that aren't supported by Payload.
+   * Examples may include: composite indices, generated columns, vectors
+   */
+  afterSchemaInit?: PostgresSchemaHook[]
+  /**
+   * Transform the schema before it's built.
+   * You can use it to preserve an existing database schema and if there are any collissions Payload will override them.
+   * To generate Drizzle schema from the database, see [Drizzle Kit introspection](https://orm.drizzle.team/kit-docs/commands#introspect--pull)
+   */
+  beforeSchemaInit?: PostgresSchemaHook[]
   idType?: 'serial' | 'uuid'
   localesSuffix?: string
   logger?: DrizzleConfig['logger']
@@ -41,6 +54,8 @@ declare module 'payload' {
   export interface DatabaseAdapter
     extends Omit<Args, 'idType' | 'logger' | 'migrationDir' | 'pool'>,
       DrizzleAdapter {
+    afterSchemaInit: PostgresSchemaHook[]
+    beforeSchemaInit: PostgresSchemaHook[]
     beginTransaction: (options?: PgTransactionConfig) => Promise<null | number | string>
     drizzle: PostgresDB
     enums: Record<string, GenericEnum>

packages/db-sqlite/eslint.config.js

@@ -1,9 +1,8 @@
 import { rootEslintConfig, rootParserOptions } from '../../eslint.config.js'
 
-/** @typedef {import('eslint').Linter.FlatConfig} */
-let FlatConfig
+/** @typedef {import('eslint').Linter.Config} Config */
 
-/** @type {FlatConfig[]} */
+/** @type {Config[]} */
 export const index = [
   ...rootEslintConfig,
   {

packages/db-sqlite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-sqlite",
-  "version": "3.0.0-beta.107",
+  "version": "3.0.0-beta.109",
   "description": "The officially supported SQLite database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/db-sqlite/src/countDistinct.ts

@@ -1,7 +1,7 @@
 import type { ChainedMethods } from '@payloadcms/drizzle/types'
 
 import { chainMethods } from '@payloadcms/drizzle'
-import { sql } from 'drizzle-orm'
+import { count, sql } from 'drizzle-orm'
 
 import type { CountDistinct, SQLiteAdapter } from './types.js'
 
@@ -22,8 +22,11 @@ export const countDistinct: CountDistinct = async function countDistinct(
     methods: chainedMethods,
     query: db
       .select({
-        count: sql<number>`count
-            (DISTINCT ${this.tables[tableName].id})`,
+        count:
+          joins.length > 0
+            ? sql`count
+    (DISTINCT ${this.tables[tableName].id})`.mapWith(Number)
+            : count(),
       })
       .from(this.tables[tableName])
       .where(where),

packages/db-sqlite/src/index.ts

@@ -79,6 +79,8 @@ export function sqliteAdapter(args: Args): DatabaseAdapterObj<SQLiteAdapter> {
 
     return createDatabaseAdapter<SQLiteAdapter>({
       name: 'sqlite',
+      afterSchemaInit: args.afterSchemaInit ?? [],
+      beforeSchemaInit: args.beforeSchemaInit ?? [],
       client: undefined,
       clientConfig: args.client,
       defaultDrizzleSnapshot,
@@ -151,6 +153,7 @@ export function sqliteAdapter(args: Args): DatabaseAdapterObj<SQLiteAdapter> {
       updateGlobalVersion,
       updateOne,
       updateVersion,
+      upsert: updateOne,
     })
   }
 

packages/db-sqlite/src/init.ts

@@ -1,7 +1,7 @@
 import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
 import type { Init, SanitizedCollectionConfig } from 'payload'
 
-import { createTableName } from '@payloadcms/drizzle'
+import { createTableName, executeSchemaHooks } from '@payloadcms/drizzle'
 import { uniqueIndex } from 'drizzle-orm/sqlite-core'
 import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
@@ -11,8 +11,10 @@ import type { SQLiteAdapter } from './types.js'
 
 import { buildTable } from './schema/build.js'
 
-export const init: Init = function init(this: SQLiteAdapter) {
+export const init: Init = async function init(this: SQLiteAdapter) {
   let locales: [string, ...string[]] | undefined
+  await executeSchemaHooks({ type: 'beforeSchemaInit', adapter: this })
+
   if (this.payload.config.localization) {
     locales = this.payload.config.localization.locales.map(({ code }) => code) as [
       string,
@@ -37,6 +39,7 @@ export const init: Init = function init(this: SQLiteAdapter) {
   })
   this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {
     const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))
+    const config = this.payload.config
 
     const baseExtraConfig: BaseExtraConfig = {}
 
@@ -51,6 +54,17 @@ export const init: Init = function init(this: SQLiteAdapter) {
       }
     }
 
+    if (collection.upload.filenameCompoundIndex) {
+      const indexName = `${tableName}_filename_compound_idx`
+
+      baseExtraConfig.filename_compound_index = (cols) => {
+        const colsConstraint = collection.upload.filenameCompoundIndex.map((f) => {
+          return cols[f]
+        })
+        return uniqueIndex(indexName).on(colsConstraint[0], ...colsConstraint.slice(1))
+      }
+    }
+
     buildTable({
       adapter: this,
       disableNotNull: !!collection?.versions?.drafts,
@@ -66,7 +80,7 @@ export const init: Init = function init(this: SQLiteAdapter) {
       const versionsTableName = this.tableNameMap.get(
         `_${toSnakeCase(collection.slug)}${this.versionsSuffix}`,
       )
-      const versionFields = buildVersionCollectionFields(collection)
+      const versionFields = buildVersionCollectionFields(config, collection)
 
       buildTable({
         adapter: this,
@@ -105,7 +119,8 @@ export const init: Init = function init(this: SQLiteAdapter) {
         versions: true,
         versionsCustomName: true,
       })
-      const versionFields = buildVersionGlobalFields(global)
+      const config = this.payload.config
+      const versionFields = buildVersionGlobalFields(config, global)
 
       buildTable({
         adapter: this,
@@ -119,4 +134,6 @@ export const init: Init = function init(this: SQLiteAdapter) {
       })
     }
   })
+
+  await executeSchemaHooks({ type: 'afterSchemaInit', adapter: this })
 }

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

@@ -35,7 +35,15 @@ export type BaseExtraConfig = Record<
   }) => ForeignKeyBuilder | IndexBuilder | UniqueConstraintBuilder
 >
 
-export type RelationMap = Map<string, { localized: boolean; target: string; type: 'many' | 'one' }>
+export type RelationMap = Map<
+  string,
+  {
+    localized: boolean
+    relationName?: string
+    target: string
+    type: 'many' | 'one'
+  }
+>
 
 type Args = {
   adapter: SQLiteAdapter
@@ -144,9 +152,9 @@ export const buildTable = ({
   const localizedRelations = new Map()
   const nonLocalizedRelations = new Map()
 
-  relationsToBuild.forEach(({ type, localized, target }, key) => {
+  relationsToBuild.forEach(({ type, localized, relationName, target }, key) => {
     const map = localized ? localizedRelations : nonLocalizedRelations
-    map.set(key, { type, target })
+    map.set(key, { type, relationName, target })
   })
 
   if (timestamps) {
@@ -458,7 +466,7 @@ export const buildTable = ({
   adapter.relations[`relations_${tableName}`] = relations(table, ({ many, one }) => {
     const result: Record<string, Relation<string>> = {}
 
-    nonLocalizedRelations.forEach(({ type, target }, key) => {
+    nonLocalizedRelations.forEach(({ type, relationName, target }, key) => {
       if (type === 'one') {
         result[key] = one(adapter.tables[target], {
           fields: [table[key]],
@@ -467,7 +475,7 @@ export const buildTable = ({
         })
       }
       if (type === 'many') {
-        result[key] = many(adapter.tables[target], { relationName: key })
+        result[key] = many(adapter.tables[target], { relationName: relationName || key })
       }
     })
 

packages/db-sqlite/src/schema/traverseFields.ts

@@ -19,7 +19,7 @@ import {
   text,
 } from 'drizzle-orm/sqlite-core'
 import { InvalidConfiguration } from 'payload'
-import { fieldAffectsData, optionIsObject } from 'payload/shared'
+import { fieldAffectsData, fieldIsVirtual, optionIsObject } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 
 import type { GenericColumns, IDType, SQLiteAdapter } from '../types.js'
@@ -113,6 +113,11 @@ export const traverseFields = ({
     if ('name' in field && field.name === 'id') {
       return
     }
+
+    if (fieldIsVirtual(field)) {
+      return
+    }
+
     let columnName: string
     let fieldName: string
 
@@ -153,7 +158,7 @@ export const traverseFields = ({
           adapter.fieldConstraints[rootTableName][`${columnName}_idx`] = constraintValue
         }
         targetIndexes[`${newTableName}_${field.name}Idx`] = createIndex({
-          name: fieldName,
+          name: field.localized ? [fieldName, '_locale'] : fieldName,
           columnName,
           tableName: newTableName,
           unique,
@@ -874,7 +879,7 @@ export const traverseFields = ({
           // add relationship to table
           relationsToBuild.set(fieldName, {
             type: 'one',
-            localized: adapter.payload.config.localization && field.localized,
+            localized: adapter.payload.config.localization && (field.localized || forceLocalized),
             target: tableName,
           })
 
@@ -893,6 +898,21 @@ export const traverseFields = ({
 
         break
 
+      case 'join': {
+        // fieldName could be 'posts' or 'group_posts'
+        // using on as the key for the relation
+        const localized = adapter.payload.config.localization && field.localized
+        const target = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${localized ? adapter.localesSuffix : ''}`
+        relationsToBuild.set(fieldName, {
+          type: 'many',
+          // joins are not localized on the parent table
+          localized: false,
+          relationName: toSnakeCase(field.on),
+          target,
+        })
+        break
+      }
+
       default:
         break
     }

packages/db-sqlite/src/types.ts

@@ -1,5 +1,5 @@
 import type { Client, Config, ResultSet } from '@libsql/client'
-import type { Operators } from '@payloadcms/drizzle'
+import type { extendDrizzleTable, Operators } from '@payloadcms/drizzle'
 import type { BuildQueryJoinAliases, DrizzleAdapter } from '@payloadcms/drizzle/types'
 import type { DrizzleConfig, Relation, Relations, SQL } from 'drizzle-orm'
 import type { LibSQLDatabase } from 'drizzle-orm/libsql'
@@ -12,7 +12,31 @@ import type {
 import type { SQLiteRaw } from 'drizzle-orm/sqlite-core/query-builders/raw'
 import type { Payload, PayloadRequest } from 'payload'
 
+type SQLiteSchema = {
+  relations: Record<string, GenericRelation>
+  tables: Record<string, SQLiteTableWithColumns<any>>
+}
+
+type SQLiteSchemaHookArgs = {
+  extendTable: typeof extendDrizzleTable
+  schema: SQLiteSchema
+}
+
+export type SQLiteSchemaHook = (args: SQLiteSchemaHookArgs) => Promise<SQLiteSchema> | SQLiteSchema
+
 export type Args = {
+  /**
+   * Transform the schema after it's built.
+   * You can use it to customize the schema with features that aren't supported by Payload.
+   * Examples may include: composite indices, generated columns, vectors
+   */
+  afterSchemaInit?: SQLiteSchemaHook[]
+  /**
+   * Transform the schema before it's built.
+   * You can use it to preserve an existing database schema and if there are any collissions Payload will override them.
+   * To generate Drizzle schema from the database, see [Drizzle Kit introspection](https://orm.drizzle.team/kit-docs/commands#introspect--pull)
+   */
+  beforeSchemaInit?: SQLiteSchemaHook[]
   client: Config
   idType?: 'serial' | 'uuid'
   localesSuffix?: string
@@ -86,6 +110,8 @@ type SQLiteDrizzleAdapter = Omit<
 >
 
 export type SQLiteAdapter = {
+  afterSchemaInit: SQLiteSchemaHook[]
+  beforeSchemaInit: SQLiteSchemaHook[]
   client: Client
   clientConfig: Args['client']
   countDistinct: CountDistinct
@@ -127,11 +153,11 @@ export type IDType = 'integer' | 'numeric' | 'text'
 
 export type MigrateUpArgs = {
   payload: Payload
-  req?: Partial<PayloadRequest>
+  req: PayloadRequest
 }
 export type MigrateDownArgs = {
   payload: Payload
-  req?: Partial<PayloadRequest>
+  req: PayloadRequest
 }
 
 declare module 'payload' {

packages/db-vercel-postgres/eslint.config.js

@@ -1,9 +1,8 @@
 import { rootEslintConfig, rootParserOptions } from '../../eslint.config.js'
 
-/** @typedef {import('eslint').Linter.FlatConfig} */
-let FlatConfig
+/** @typedef {import('eslint').Linter.Config} Config */
 
-/** @type {FlatConfig[]} */
+/** @type {Config[]} */
 export const index = [
   ...rootEslintConfig,
   {

packages/db-vercel-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-vercel-postgres",
-  "version": "3.0.0-beta.107",
+  "version": "3.0.0-beta.109",
   "description": "Vercel Postgres adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -62,7 +62,8 @@
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
     "esbuild": "0.23.1",
-    "payload": "workspace:*"
+    "payload": "workspace:*",
+    "pg": "8.11.3"
   },
   "peerDependencies": {
     "payload": "workspace:*"

packages/db-vercel-postgres/src/index.ts

@@ -76,6 +76,8 @@ export function vercelPostgresAdapter(args: Args = {}): DatabaseAdapterObj<Verce
 
     return createDatabaseAdapter<VercelPostgresAdapter>({
       name: 'postgres',
+      afterSchemaInit: args.afterSchemaInit ?? [],
+      beforeSchemaInit: args.beforeSchemaInit ?? [],
       defaultDrizzleSnapshot,
       drizzle: undefined,
       enums: {},
@@ -150,6 +152,7 @@ export function vercelPostgresAdapter(args: Args = {}): DatabaseAdapterObj<Verce
       updateGlobalVersion,
       updateOne,
       updateVersion,
+      upsert: updateOne,
     })
   }
 

packages/db-vercel-postgres/src/predefinedMigrations/v2-v3/index.ts

@@ -118,7 +118,8 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
       const versionsTableName = adapter.tableNameMap.get(
         `_${toSnakeCase(collection.slug)}${adapter.versionsSuffix}`,
       )
-      const versionFields = buildVersionCollectionFields(collection)
+
+      const versionFields = buildVersionCollectionFields(payload.config, collection)
       const versionPathsToQuery: PathsToQuery = new Set()
 
       traverseFields({
@@ -191,7 +192,7 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
         `_${toSnakeCase(global.slug)}${adapter.versionsSuffix}`,
       )
 
-      const versionFields = buildVersionGlobalFields(global)
+      const versionFields = buildVersionGlobalFields(payload.config, global)
 
       const versionPathsToQuery: PathsToQuery = new Set()
 

packages/db-vercel-postgres/src/types.ts

@@ -4,6 +4,7 @@ import type {
   MigrateDownArgs,
   MigrateUpArgs,
   PostgresDB,
+  PostgresSchemaHook,
 } from '@payloadcms/drizzle/postgres'
 import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
 import type { VercelPool, VercelPostgresPoolConfig } from '@vercel/postgres'
@@ -11,6 +12,18 @@ import type { DrizzleConfig } from 'drizzle-orm'
 import type { PgSchema, PgTableFn, PgTransactionConfig } from 'drizzle-orm/pg-core'
 
 export type Args = {
+  /**
+   * Transform the schema after it's built.
+   * You can use it to customize the schema with features that aren't supported by Payload.
+   * Examples may include: composite indices, generated columns, vectors
+   */
+  afterSchemaInit?: PostgresSchemaHook[]
+  /**
+   * Transform the schema before it's built.
+   * You can use it to preserve an existing database schema and if there are any collissions Payload will override them.
+   * To generate Drizzle schema from the database, see [Drizzle Kit introspection](https://orm.drizzle.team/kit-docs/commands#introspect--pull)
+   */
+  beforeSchemaInit?: PostgresSchemaHook[]
   connectionString?: string
   idType?: 'serial' | 'uuid'
   localesSuffix?: string
@@ -46,6 +59,8 @@ declare module 'payload' {
   export interface DatabaseAdapter
     extends Omit<Args, 'idType' | 'logger' | 'migrationDir' | 'pool'>,
       DrizzleAdapter {
+    afterSchemaInit: PostgresSchemaHook[]
+    beforeSchemaInit: PostgresSchemaHook[]
     beginTransaction: (options?: PgTransactionConfig) => Promise<null | number | string>
     drizzle: PostgresDB
     enums: Record<string, GenericEnum>

packages/drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.0.0-beta.107",
+  "version": "3.0.0-beta.109",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/drizzle/src/count.ts

@@ -16,7 +16,7 @@ export const count: Count = async function count(
 
   const db = this.sessions[await req?.transactionID]?.db || this.drizzle
 
-  const { joins, where } = await buildQuery({
+  const { joins, where } = buildQuery({
     adapter: this,
     fields: collectionConfig.fields,
     locale,

packages/drizzle/src/createGlobalVersion.ts

@@ -10,7 +10,14 @@ import { upsertRow } from './upsertRow/index.js'
 
 export async function createGlobalVersion<T extends TypeWithID>(
   this: DrizzleAdapter,
-  { autosave, globalSlug, req = {} as PayloadRequest, versionData }: CreateGlobalVersionArgs,
+  {
+    autosave,
+    globalSlug,
+    publishedLocale,
+    req = {} as PayloadRequest,
+    snapshot,
+    versionData,
+  }: CreateGlobalVersionArgs,
 ) {
   const db = this.sessions[await req?.transactionID]?.db || this.drizzle
   const global = this.payload.globals.config.find(({ slug }) => slug === globalSlug)
@@ -22,10 +29,12 @@ export async function createGlobalVersion<T extends TypeWithID>(
     data: {
       autosave,
       latest: true,
+      publishedLocale,
+      snapshot,
       version: versionData,
     },
     db,
-    fields: buildVersionGlobalFields(global),
+    fields: buildVersionGlobalFields(this.payload.config, global),
     operation: 'create',
     req,
     tableName,

packages/drizzle/src/createVersion.ts

@@ -14,7 +14,9 @@ export async function createVersion<T extends TypeWithID>(
     autosave,
     collectionSlug,
     parent,
+    publishedLocale,
     req = {} as PayloadRequest,
+    snapshot,
     versionData,
   }: CreateVersionArgs<T>,
 ) {
@@ -33,6 +35,8 @@ export async function createVersion<T extends TypeWithID>(
     autosave,
     latest: true,
     parent,
+    publishedLocale,
+    snapshot,
     version,
   }
 
@@ -44,7 +48,7 @@ export async function createVersion<T extends TypeWithID>(
     adapter: this,
     data,
     db,
-    fields: buildVersionCollectionFields(collection),
+    fields: buildVersionCollectionFields(this.payload.config, collection),
     operation: 'create',
     req,
     tableName,
@@ -56,11 +60,11 @@ export async function createVersion<T extends TypeWithID>(
     await this.execute({
       db,
       sql: sql`
-      UPDATE ${table}
-      SET latest = false
-      WHERE ${table.id} != ${result.id}
-        AND ${table.parent} = ${parent}
-    `,
+        UPDATE ${table}
+        SET latest = false
+        WHERE ${table.id} != ${result.id}
+          AND ${table.parent} = ${parent}
+      `,
     })
   }
 

packages/drizzle/src/deleteOne.ts

@@ -12,7 +12,7 @@ import { transform } from './transform/read/index.js'
 
 export const deleteOne: DeleteOne = async function deleteOne(
   this: DrizzleAdapter,
-  { collection: collectionSlug, req = {} as PayloadRequest, where: whereArg },
+  { collection: collectionSlug, joins: joinQuery, req = {} as PayloadRequest, where: whereArg },
 ) {
   const db = this.sessions[await req?.transactionID]?.db || this.drizzle
   const collection = this.payload.collections[collectionSlug].config
@@ -21,7 +21,7 @@ export const deleteOne: DeleteOne = async function deleteOne(
 
   let docToDelete: Record<string, unknown>
 
-  const { joins, selectFields, where } = await buildQuery({
+  const { joins, selectFields, where } = buildQuery({
     adapter: this,
     fields: collection.fields,
     locale: req.locale,
@@ -48,6 +48,7 @@ export const deleteOne: DeleteOne = async function deleteOne(
       adapter: this,
       depth: 0,
       fields: collection.fields,
+      joinQuery,
       tableName,
     })
 
@@ -61,6 +62,7 @@ export const deleteOne: DeleteOne = async function deleteOne(
     config: this.payload.config,
     data: docToDelete,
     fields: collection.fields,
+    joinQuery,
   })
 
   await this.deleteWhere({