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

Bump Next.js to 15.0.0

CONTRIBUTING.md

@@ -122,3 +122,19 @@ This is how you can preview changes you made locally to the docs:
 4. Add a `DOCS_DIR` environment variable to the `.env` file which points to the absolute path of your modified docs folder. For example `DOCS_DIR=/Users/yourname/Documents/GitHub/payload/docs`
 5. Run `yarn run fetchDocs:local`. If this was successful, you should see no error messages and the following output: _Docs successfully written to /.../website/src/app/docs.json_. There could be error messages if you have incorrect markdown in your local docs folder. In this case, it will tell you how you can fix it
 6. You're done! Now you can start the website locally using `yarn run dev` and preview the docs under [http://localhost:3000/docs/](http://localhost:3000/docs/)
+
+## Internationalization (i18n)
+
+If your PR adds a string to the UI, we need to make sure to translate it into all the languages ​​that Payload supports. To do that:
+
+- Find the appropriate internationalization file for your package. These are typically located in `packages/translations/src/languages`, although some packages (e.g., richtext-lexical) have separate i18n files for each feature.
+- Add the string to the English locale "en".
+- Translate it to other languages. You can use the `translateNewKeys` script if you have an OpenAI API key in your `.env` (under `OPENAI_KEY`), or you can use ChatGPT or Google translate - whatever is easier for you. For payload core translations (in packages/translations) you can run the `translateNewKeys` script using `cd packages/translations && pnpm translateNewKeys`. For lexical translations, you can run it using `cd packages/richtext-lexical && pnpm translateNewKeys`. External contributors can skip this step and leave it to us.
+
+To display translation strings in the UI, make sure to use the `t` utility of the `useTranslation` hook:
+
+```ts
+const { t } = useTranslation()
+// ...
+t('yourStringKey')
+```

docs/access-control/collections.mdx

@@ -79,7 +79,7 @@ Returns a boolean which allows/denies access to the `create` request.
 To add create Access Control to a Collection, use the `create` property in the [Collection Config](../collections/overview):
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const CollectionWithCreateAccess: CollectionConfig = {
   // ...

docs/access-control/fields.mdx

@@ -33,7 +33,7 @@ Access Control is specific to the operation of the request.
 To add Access Control to a Field, use the `access` property in the [Field Config](../fields/overview):
 
 ```ts
-import { CollectionConfig } from 'payload';
+import type { CollectionConfig } from 'payload';
 
 export const Posts: CollectionConfig = {
   slug: 'posts',

docs/admin/collections.mdx

@@ -11,7 +11,7 @@ The behavior of [Collections](../configuration/collections) within the [Admin Pa
 To configure Admin Options for Collections, use the `admin` property in your Collection Config:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const MyCollection: CollectionConfig = {
   // ...
@@ -89,7 +89,7 @@ It is possible to display a Preview Button within the Edit View of the Admin Pan
 To configure the Preview Button, set the `admin.preview` property to a function in your [Collection Config](../configuration/collections):
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Posts: CollectionConfig = {
   // ...
@@ -126,7 +126,7 @@ All Collections receive their own List View which displays a paginated list of d
 To configure pagination options, use the `admin.pagination` property in your [Collection Config](../configuration/collections):
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Posts: CollectionConfig = {
   // ...
@@ -155,7 +155,7 @@ In the List View, there is a "search" box that allows you to quickly find a docu
 To define which fields should be searched, use the `admin.listSearchableFields` property in your [Collection Config](../configuration/collections):
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Posts: CollectionConfig = {
   // ...

docs/admin/components.mdx

@@ -145,7 +145,7 @@ Instead, we utilize component paths to reference React Components. This method e
 
 When constructing the `ClientConfig`, Payload uses the component paths as keys to fetch the corresponding React Component imports from the Import Map. It then substitutes the `PayloadComponent` with a `MappedComponent`. A `MappedComponent` includes the React Component and additional metadata, such as whether it's a server or a client component and which props it should receive. These components are then rendered through the `<RenderComponent />` component within the Payload Admin Panel.
 
-Import maps are regenerated whenever you modify any element related to component paths. This regeneration occurs at startup and whenever Hot Module Replacement (HMR) runs. If the import maps fail to regenerate during HMR, you can restart your application and execute the `payload generate:importmap` command to manually create a new import map. If you encounter any errors running this command, see the [Troubleshooting](/docs/beta/local-api/outside-nextjs#troubleshooting) section.
+Import maps are regenerated whenever you modify any element related to component paths. This regeneration occurs at startup and whenever Hot Module Replacement (HMR) runs. If the import maps fail to regenerate during HMR, you can restart your application and execute the `payload generate:importmap` command to manually create a new import map. If you encounter any errors running this command, see the [Troubleshooting](../local-api/outside-nextjs#troubleshooting) section.
 
 ### Component paths in external packages
 

docs/admin/fields.mdx

@@ -217,6 +217,7 @@ Client Component:
 'use client'
 import React from 'react'
 import type { TextFieldClientComponent } from 'payload'
+import { TextField } from '@payloadcms/ui'
 
 export const MyTextField: TextFieldClientComponent = ({ field }) => {
   return <TextField field={field} />

docs/admin/locked-documents.mdx

@@ -29,7 +29,7 @@ The lockDocuments property exists on both the Collection Config and the Global C
 Here’s an example configuration for document locking:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Posts: CollectionConfig = {
   slug: 'posts',

docs/admin/metadata.mdx

@@ -151,7 +151,7 @@ Collection Metadata is the metadata that is applied to all pages within any give
 To customize Collection Metadata, use the `admin.meta` key within your Collection Config:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const MyCollection: CollectionConfig = {
   // ...

docs/authentication/cookies.mdx

@@ -97,7 +97,7 @@ Cookies can cross subdomains without being considered third party cookies, for e
 
 ##### 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:
+If option 1 isn't possible, then you can get around this limitation by [configuring your cookies](./overview#config-options) on your authentication collection to achieve the following setup:
 
 ```
 SameSite: None // allows the cookie to cross domains
@@ -122,7 +122,7 @@ Configuration example:
 },
 ```
 
-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.
+If you're configuring [cors](../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">

docs/authentication/custom-strategies.mdx

@@ -38,7 +38,7 @@ At its core a strategy simply takes information from the incoming request and re
 Your `authenticate` method should return an object containing a Payload user document and any optional headers that you'd like Payload to set for you when we return a response.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Users: CollectionConfig = {
   slug: 'users',

docs/authentication/email.mdx

@@ -15,7 +15,7 @@ Email Verification forces users to prove they have access to the email address t
 To enable Email Verification, use the `auth.verify` property on your [Collection Config](../configuration/collections):
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Customers: CollectionConfig = {
   // ...
@@ -42,7 +42,7 @@ The following options are available:
 Function that accepts one argument, containing `{ req, token, user }`, that allows for overriding the HTML within emails that are sent to users indicating how to validate their account. The function should return a string that supports HTML, which can optionally be a full HTML email.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Customers: CollectionConfig = {
   // ...
@@ -74,7 +74,7 @@ export const Customers: CollectionConfig = {
 Similarly to the above `generateEmailHTML`, you can also customize the subject of the email. The function argument are the same but you can only return a string - not HTML.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Customers: CollectionConfig = {
   // ...
@@ -95,7 +95,7 @@ export const Customers: CollectionConfig = {
 You can customize how the Forgot Password workflow operates with the following options on the `auth.forgotPassword` property:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Customers: CollectionConfig = {
   // ...
@@ -119,7 +119,7 @@ The following options are available:
 This function allows for overriding the HTML within emails that are sent to users attempting to reset their password. The function should return a string that supports HTML, which can be a full HTML email.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Customers: CollectionConfig = {
   // ...
@@ -179,7 +179,7 @@ The following arguments are passed to the `generateEmailHTML` function:
 Similarly to the above `generateEmailHTML`, you can also customize the subject of the email. The function argument are the same but you can only return a string - not HTML.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Customers: CollectionConfig = {
   // ...

docs/authentication/overview.mdx

@@ -25,7 +25,7 @@ When Authentication is enabled on a [Collection](../configuration/collections),
 To enable Authentication on a Collection, use the `auth` property in the [Collection Config](../configuration/collection#auth):
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Users: CollectionConfig = {
   // ...
@@ -48,7 +48,7 @@ Any [Collection](../configuration/collections) can opt-in to supporting Authenti
 To enable Authentication on a Collection, use the `auth` property in the [Collection Config](../configuration/collections):
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Admins: CollectionConfig = {
   // ...

docs/cloud/projects.mdx

@@ -84,7 +84,7 @@ export default buildConfig({
 
 ## Email
 
-Powered by [Resend](https://resend.com), Payload Cloud comes with integrated email support out of the box. No configuration is needed, and you can use `payload.sendEmail()` to send email right from your Payload app. To learn more about sending email with Payload, checkout the [Email Configuration](https://payloadcms.com/docs/email/overview) overview.
+Powered by [Resend](https://resend.com), Payload Cloud comes with integrated email support out of the box. No configuration is needed, and you can use `payload.sendEmail()` to send email right from your Payload app. To learn more about sending email with Payload, checkout the [Email Configuration](../email/overview) overview.
 
 If you are on the Pro or Enterprise plan, you can add your own custom Email domain name. From the Email page of your project’s Settings, add the domain you wish to use for email delivery. This will generate a set of DNS records. Add these records to your DNS provider and click verify to check that your records are resolving properly. Once verified, your emails will now be sent from your custom domain name.
 

docs/configuration/collections.mdx

@@ -37,7 +37,7 @@ It's often best practice to write your Collections in separate files and then im
 Here is what a simple Collection Config might look like:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Posts: CollectionConfig = {
   slug: 'posts',

docs/configuration/i18n.mdx

@@ -117,7 +117,7 @@ While Payload's built-in features come fully translated, you may also want to tr
 To do this, provide the translations wherever applicable, keyed to the language code:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Articles: CollectionConfig = {
   slug: 'articles',

docs/configuration/overview.mdx

@@ -216,7 +216,7 @@ Cross-origin resource sharing (CORS) can be configured with either a whitelist a
 Here's an example showing how to allow incoming requests from any domain:
 
 ```ts
-import { buildConfig } from 'payload/config'
+import { buildConfig } from 'payload'
 
 export default buildConfig({
   // ...
@@ -227,7 +227,7 @@ export default buildConfig({
 Here's an example showing how to append a new header (`x-custom-header`) in `Access-Control-Allow-Headers`:
 
 ```ts
-import { buildConfig } from 'payload/config'
+import { buildConfig } from 'payload'
 
 export default buildConfig({
   // ...

docs/database/migrations.mdx

@@ -157,7 +157,7 @@ You can disable this setting and solely use migrations to manage your local deve
 
 For this reason, we suggest that you leave `push` as its default setting and treat your local dev database as a sandbox.
 
-For more information about push mode and prototyping in development, [click here](/docs/beta/database/postgres#prototyping-in-dev-mode).
+For more information about push mode and prototyping in development, [click here](./postgres#prototyping-in-dev-mode).
 
 The typical workflow in Payload is to build out your Payload configs, install plugins, and make progress in development mode - allowing Drizzle to push your changes to your local database for you. Once you're finished, you can create a migration.
 

docs/database/postgres.mdx

@@ -99,7 +99,7 @@ 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).
+For more information about migrations, [click here](./migrations#when-to-run-migrations).
 
 ## Drizzle schema hooks
 

docs/database/sqlite.mdx

@@ -78,7 +78,7 @@ 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).
+For more information about migrations, [click here](./migrations#when-to-run-migrations).
 
 ## Drizzle schema hooks
 

docs/fields/array.mdx

@@ -24,7 +24,7 @@ Arrays are useful for many different types of content from simple to complex, su
 To create an Array Field, set the `type` to `array` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyArrayField: Field = {
   // ...
@@ -69,7 +69,7 @@ _\* An asterisk denotes that a property is required._
 To customize the appearance and behavior of the Array Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyArrayField: Field = {
   // ...
@@ -92,7 +92,7 @@ The Array Field inherits all of the default options from the base [Field Admin C
 In this example, we have an Array Field called `slider` that contains a set of fields for a simple image slider. Each row in the array has a `title`, `image`, and `caption`. We also customize the row label to display the title if it exists, or a default label if it doesn't.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/blocks.mdx

@@ -24,7 +24,7 @@ Blocks are a great way to create a flexible content model that can be used to bu
 To add a Blocks Field, set the `type` to `blocks` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyBlocksField: Field = {
   // ...
@@ -67,7 +67,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Blocks Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyBlocksField: Field = {
   // ...

docs/fields/checkbox.mdx

@@ -18,7 +18,7 @@ The Checkbox Field saves a boolean in the database.
 To add a Checkbox Field, set the `type` to `checkbox` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyCheckboxField: Field = {
   // ...
@@ -53,7 +53,7 @@ _\* An asterisk denotes that a property is required._
 Here is an example of a Checkbox Field in a Collection:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/code.mdx

@@ -19,7 +19,7 @@ The Code Field saves a string in the database, but provides the [Admin Panel](..
 To add a Code Field, set the `type` to `code` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyBlocksField: Field = {
   // ...
@@ -57,7 +57,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Code Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyCodeField: Field = {
   // ...
@@ -79,7 +79,7 @@ The Code Field inherits all of the default options from the base [Field Admin Co
 `collections/ExampleCollection.ts
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/collapsible.mdx

@@ -18,7 +18,7 @@ The Collapsible Field is presentational-only and only affects the Admin Panel. B
 To add a Collapsible Field, set the `type` to `collapsible` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyCollapsibleField: Field = {
   // ...
@@ -47,7 +47,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Collapsible Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyCollapsibleField: Field = {
   // ...
@@ -68,7 +68,7 @@ The Collapsible Field inherits all of the default options from the base [Field A
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/date.mdx

@@ -18,7 +18,7 @@ The Date Field saves a Date in the database and provides the [Admin Panel](../ad
 To add a Date Field, set the `type` to `date` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyDateField: Field = {
   // ...
@@ -53,7 +53,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Date Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyDateField: Field = {
   // ...
@@ -97,7 +97,7 @@ When only `pickerAppearance` is set, an equivalent format will be rendered in th
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/email.mdx

@@ -18,7 +18,7 @@ The Email Field enforces that the value provided is a valid email address.
 To create an Email Field, set the `type` to `email` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyEmailField: Field = {
   // ...
@@ -54,7 +54,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Email Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyEmailField: Field = {
   // ...
@@ -76,7 +76,7 @@ The Email Field inherits all of the default options from the base [Field Admin C
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/group.mdx

@@ -18,7 +18,7 @@ The Group Field allows [Fields](./overview) to be nested under a common property
 To add a Group Field, set the `type` to `group` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyGroupField: Field = {
   // ...
@@ -58,7 +58,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Group Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyGroupField: Field = {
   // ...
@@ -79,7 +79,7 @@ The Group Field inherits all of the default options from the base [Field Admin C
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/join.mdx

@@ -30,7 +30,7 @@ collection you are joining. This will reference the collection and path of the f
 To add a Relationship Field, set the `type` to `join` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyJoinField: Field = {
   // highlight-start

docs/fields/json.mdx

@@ -19,7 +19,7 @@ The JSON Field saves actual JSON in the database, which differs from the Code fi
 To add a JSON Field, set the `type` to `json` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyJSONField: Field = {
   // ...
@@ -56,7 +56,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the JSON Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyJSONField: Field = {
   // ...
@@ -77,7 +77,7 @@ The JSON Field inherits all of the default options from the base [Field Admin Co
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',
@@ -102,7 +102,7 @@ If you only provide a URL to a schema, Payload will fetch the desired schema if
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',
@@ -135,7 +135,7 @@ export const ExampleCollection: CollectionConfig = {
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/number.mdx

@@ -18,7 +18,7 @@ The Number Field stores and validates numeric entry and supports additional nume
 To add a Number Field, set the `type` to `number` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyNumberField: Field = {
   // ...
@@ -59,7 +59,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Number Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyNumberField: Field = {
   // ...
@@ -82,7 +82,7 @@ The Number Field inherits all of the default options from the base [Field Admin
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/point.mdx

@@ -18,7 +18,7 @@ The Point Field saves a pair of coordinates in the database and assigns an index
 To add a Point Field, set the `type` to `point` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyPointField: Field = {
   // ...
@@ -59,7 +59,7 @@ _\* An asterisk denotes that a property is required._
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/radio.mdx

@@ -18,7 +18,7 @@ The Radio Field allows for the selection of one value from a predefined set of p
 To add a Radio Field, set the `type` to `radio` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyRadioField: Field = {
   // ...
@@ -69,7 +69,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Radio Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyRadioField: Field = {
   // ...
@@ -90,7 +90,7 @@ The Radio Field inherits all of the default options from the base [Field Admin C
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/relationship.mdx

@@ -24,7 +24,7 @@ The Relationship field is used in a variety of ways, including:
 To add a Relationship Field, set the `type` to `relationship` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyRelationshipField: Field = {
   // ...
@@ -74,7 +74,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Relationship Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyRelationshipField: Field = {
   // ...
@@ -159,7 +159,7 @@ called with an argument object with the following properties:
 ## Example
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/rich-text.mdx

@@ -63,7 +63,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Rich Text Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyRichTextField: Field = {
   // ...

docs/fields/row.mdx

@@ -18,7 +18,7 @@ The Row Field is presentational-only and only affects the [Admin Panel](../admin
 To add a Row Field, set the `type` to `row` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyRowField: Field = {
   // ...
@@ -46,7 +46,7 @@ _\* An asterisk denotes that a property is required._
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/select.mdx

@@ -18,7 +18,7 @@ The Select Field provides a dropdown-style interface for choosing options from a
 To add a Select Field, set the `type` to `select` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MySelectField: Field = {
   // ...
@@ -71,7 +71,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Select Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MySelectField: Field = {
   // ...
@@ -93,7 +93,7 @@ The Select Field inherits all of the default options from the base [Field Admin
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',
@@ -156,8 +156,7 @@ You can import the existing Select component directly from Payload, then extend
 
 ```ts
 import * as React from 'react';
-import { SelectInput, useField } from 'payload/components/forms';
-import { useAuth } from 'payload/components/utilities';
+import { SelectInput, useAuth, useField } from '@payloadcms/ui';
 
 type CustomSelectProps = {
   path: string;

docs/fields/tabs.mdx

@@ -18,7 +18,7 @@ The Tabs Field is presentational-only and only affects the [Admin Panel](../admi
 To add a Tabs Field, set the `type` to `tabs` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyTabsField: Field = {
   // ...
@@ -59,7 +59,7 @@ _\* An asterisk denotes that a property is required._
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/text.mdx

@@ -18,7 +18,7 @@ The Text Field is one of the most commonly used fields. It saves a string to the
 To add a Text Field, set the `type` to `text` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyTextField: Field = {
   // ...
@@ -59,7 +59,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Text Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyTextField: Field = {
   // ...
@@ -82,7 +82,7 @@ The Text Field inherits all of the default options from the base [Field Admin Co
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/textarea.mdx

@@ -18,7 +18,7 @@ The Textarea Field is nearly identical to the [Text Field](./text) but it featur
 To add a Textarea Field, set the `type` to `textarea` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyTextareaField: Field = {
   // ...
@@ -56,7 +56,7 @@ _\* An asterisk denotes that a property is required._
 The customize the appearance and behavior of the Textarea Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyTextareaField: Field = {
   // ...
@@ -79,7 +79,7 @@ The Textarea Field inherits all of the default options from the base [Field Admi
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/ui.mdx

@@ -18,7 +18,7 @@ With the UI Field, you can:
 To add a UI Field, set the `type` to `ui` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyUIField: Field = {
   // ...
@@ -44,7 +44,7 @@ _\* An asterisk denotes that a property is required._
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/fields/upload.mdx

@@ -25,7 +25,7 @@ caption="Admin Panel screenshot of an Upload field"
 To create an Upload Field, set the `type` to `upload` in your [Field Config](./overview):
 
 ```ts
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const MyUploadField: Field = {
   // ...
@@ -73,7 +73,7 @@ _\* An asterisk denotes that a property is required._
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',

docs/local-api/overview.mdx

@@ -71,7 +71,7 @@ import config from '@payload-config'
 const payload = await getPayload({ config })
 ```
 
-Both options function in exactly the same way outside of one having HMR support and the other not. For more information about using Payload outside of Next.js, [click here](/docs/beta/local-api/outside-nextjs).
+Both options function in exactly the same way outside of one having HMR support and the other not. For more information about using Payload outside of Next.js, [click here](./outside-nextjs).
 
 ## Local options available
 

docs/plugins/form-builder.mdx

@@ -138,7 +138,7 @@ 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).
+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](../email/overview).
 
 ```ts
 // payload.config.ts
@@ -412,7 +412,7 @@ formBuilder({
 
 ## Email
 
-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.
+This plugin relies on the [email configuration](../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
 

docs/plugins/nested-docs.mdx

@@ -177,7 +177,7 @@ You can also extend the built-in `parent` and `breadcrumbs` fields per collectio
 and `createBreadcrumbField` methods. They will merge your customizations overtop the plugin's base field configurations.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 import { createParentField } from '@payloadcms/plugin-nested-docs/fields'
 import { createBreadcrumbsField } from '@payloadcms/plugin-nested-docs/fields'
 

docs/plugins/seo.mdx

@@ -276,6 +276,10 @@ OverviewField({
 })
 ```
 
+<Banner type="info">
+Tip: You can override the length rules by changing the minLength and maxLength props on the fields. In the case of the OverviewField you can use `titleOverrides` and `descriptionOverrides` to override the length rules.
+</Banner>
+
 ## TypeScript
 
 All types can be directly imported:

docs/rest-api/overview.mdx

@@ -591,7 +591,7 @@ Each endpoint object needs to have:
 Example:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 // a collection of 'orders' with an additional route for tracking details, reachable at /api/orders/:id/tracking
 export const Orders: CollectionConfig = {

docs/rich-text/slate.mdx

@@ -34,7 +34,7 @@ export default buildConfig({
 And here's an example for how to install the Slate editor on a field-by-field basis, while customizing its options:
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 import { slateEditor } from '@payloadcms/richtext-slate'
 
 export const Pages: CollectionConfig = {

docs/upload/overview.mdx

@@ -43,7 +43,7 @@ Every Payload Collection can opt-in to supporting Uploads by specifying the `upl
 </Banner>
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Media: CollectionConfig = {
   slug: 'media',
@@ -217,7 +217,7 @@ You can specify how Payload retrieves admin thumbnails for your upload-enabled C
 1. `adminThumbnail` as a **string**, equal to one of your provided image size names.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Media: CollectionConfig = {
   slug: 'media',
@@ -246,7 +246,7 @@ export const Media: CollectionConfig = {
 2. `adminThumbnail` as a **function** that takes the document's data and sends back a full URL to load the thumbnail.
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Media: CollectionConfig = {
   slug: 'media',
@@ -267,7 +267,7 @@ Some example values are: `image/*`, `audio/*`, `video/*`, `image/png`, `applicat
 **Example mimeTypes usage:**
 
 ```ts
-import { CollectionConfig } from 'payload'
+import type { CollectionConfig } from 'payload'
 
 export const Media: CollectionConfig = {
   slug: 'media',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "private": true,
   "type": "module",
   "scripts": {
@@ -105,12 +105,12 @@
   "devDependencies": {
     "@jest/globals": "29.7.0",
     "@libsql/client": "0.14.0",
-    "@next/bundle-analyzer": "15.0.0-canary.173",
+    "@next/bundle-analyzer": "15.0.0",
     "@payloadcms/db-postgres": "workspace:*",
     "@payloadcms/eslint-config": "workspace:*",
     "@payloadcms/eslint-plugin": "workspace:*",
     "@payloadcms/live-preview-react": "workspace:*",
-    "@playwright/test": "1.46.0",
+    "@playwright/test": "1.48.1",
     "@sentry/nextjs": "^8.33.1",
     "@sentry/node": "^8.33.1",
     "@swc-node/register": "1.10.9",
@@ -132,8 +132,8 @@
     "create-payload-app": "workspace:*",
     "cross-env": "7.0.3",
     "dotenv": "16.4.5",
-    "drizzle-kit": "0.26.1",
-    "drizzle-orm": "0.35.0",
+    "drizzle-kit": "0.26.2",
+    "drizzle-orm": "0.35.1",
     "escape-html": "^1.0.3",
     "execa": "5.1.1",
     "form-data": "3.0.1",
@@ -145,15 +145,15 @@
     "lint-staged": "15.2.7",
     "minimist": "1.2.8",
     "mongodb-memory-server": "^9.0",
-    "next": "15.0.0-canary.173",
+    "next": "15.0.0",
     "open": "^10.1.0",
     "p-limit": "^5.0.0",
-    "playwright": "1.46.0",
-    "playwright-core": "1.46.0",
+    "playwright": "1.48.1",
+    "playwright-core": "1.48.1",
     "prettier": "3.3.3",
     "prompts": "2.4.2",
-    "react": "19.0.0-rc-3edc000d-20240926",
-    "react-dom": "19.0.0-rc-3edc000d-20240926",
+    "react": "19.0.0-rc-65a56d0e-20241020",
+    "react-dom": "19.0.0-rc-65a56d0e-20241020",
     "rimraf": "3.0.2",
     "semver": "^7.5.4",
     "sharp": "0.32.6",
@@ -164,11 +164,11 @@
     "tempy": "1.0.1",
     "tsx": "4.19.1",
     "turbo": "^2.1.3",
-    "typescript": "5.6.2"
+    "typescript": "5.6.3"
   },
   "peerDependencies": {
-    "react": "^19.0.0 || ^19.0.0-rc-3edc000d-20240926",
-    "react-dom": "^19.0.0 || ^19.0.0-rc-3edc000d-20240926"
+    "react": "^19.0.0 || ^19.0.0-rc-65a56d0e-20241020",
+    "react-dom": "^19.0.0 || ^19.0.0-rc-65a56d0e-20241020"
   },
   "packageManager": "pnpm@9.7.1",
   "engines": {

packages/create-payload-app/package.json

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

packages/db-mongodb/package.json

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

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

@@ -246,6 +246,10 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     field.fields.forEach((subField: Field) => {
+      if (fieldIsVirtual(subField)) {
+        return
+      }
+
       const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[subField.type]
 
       if (addFieldSchema) {
@@ -501,6 +505,10 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     buildSchemaOptions: BuildSchemaOptions,
   ): void => {
     field.fields.forEach((subField: Field) => {
+      if (fieldIsVirtual(subField)) {
+        return
+      }
+
       const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[subField.type]
 
       if (addFieldSchema) {
@@ -545,6 +553,9 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
   ): void => {
     field.tabs.forEach((tab) => {
       if (tabHasName(tab)) {
+        if (fieldIsVirtual(tab)) {
+          return
+        }
         const baseSchema = {
           type: buildSchema(config, tab.fields, {
             disableUnique: buildSchemaOptions.disableUnique,
@@ -562,6 +573,9 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
         })
       } else {
         tab.fields.forEach((subField: Field) => {
+          if (fieldIsVirtual(subField)) {
+            return
+          }
           const addFieldSchema: FieldSchemaGenerator = fieldToSchemaMap[subField.type]
 
           if (addFieldSchema) {

packages/db-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -50,8 +50,8 @@
     "@payloadcms/drizzle": "workspace:*",
     "@types/pg": "8.10.2",
     "console-table-printer": "2.11.2",
-    "drizzle-kit": "0.26.1",
-    "drizzle-orm": "0.35.0",
+    "drizzle-kit": "0.26.2",
+    "drizzle-orm": "0.35.1",
     "pg": "8.11.3",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",

packages/db-postgres/src/connect.ts

@@ -66,7 +66,7 @@ export const connect: Connect = async function connect(
     }
 
     const logger = this.logger || false
-    this.drizzle = drizzle(this.pool, { logger, schema: this.schema })
+    this.drizzle = drizzle({ client: this.pool, logger, schema: this.schema })
 
     if (!hotReload) {
       if (process.env.PAYLOAD_DROP_DATABASE === 'true') {

packages/db-postgres/src/index.ts

@@ -136,6 +136,7 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
       findGlobalVersions,
       findOne,
       findVersions,
+      indexes: new Set<string>(),
       init,
       insert,
       migrate,

packages/db-sqlite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-sqlite",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "The officially supported SQLite database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -48,8 +48,8 @@
     "@libsql/client": "0.14.0",
     "@payloadcms/drizzle": "workspace:*",
     "console-table-printer": "2.11.2",
-    "drizzle-kit": "0.26.1",
-    "drizzle-orm": "0.35.0",
+    "drizzle-kit": "0.26.2",
+    "drizzle-orm": "0.35.1",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
     "uuid": "9.0.0"

packages/db-sqlite/src/index.ts

@@ -133,6 +133,7 @@ export function sqliteAdapter(args: Args): DatabaseAdapterObj<SQLiteAdapter> {
       findGlobalVersions,
       findOne,
       findVersions,
+      indexes: new Set<string>(),
       init,
       insert,
       migrate,

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

@@ -1,3 +1,4 @@
+import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
 import type { Relation } from 'drizzle-orm'
 import type {
   AnySQLiteColumn,
@@ -9,7 +10,7 @@ import type {
 } from 'drizzle-orm/sqlite-core'
 import type { Field, SanitizedJoins } from 'payload'
 
-import { createTableName } from '@payloadcms/drizzle'
+import { buildIndexName, createTableName } from '@payloadcms/drizzle'
 import { relations, sql } from 'drizzle-orm'
 import {
   foreignKey,
@@ -416,21 +417,25 @@ export const buildTable = ({
             foreignColumns: [adapter.tables[formattedRelationTo].id],
           }).onDelete('cascade')
 
-        const indexName = [colName]
+        const indexColumns = [colName]
 
         const unique = !disableUnique && uniqueRelationships.has(relationTo)
 
         if (unique) {
-          indexName.push('path')
+          indexColumns.push('path')
         }
         if (hasLocalizedRelationshipField) {
-          indexName.push('locale')
+          indexColumns.push('locale')
         }
 
-        relationExtraConfig[`${relationTo}IdIdx`] = createIndex({
-          name: indexName,
-          columnName: `${formattedRelationTo}_id`,
-          tableName: relationshipsTableName,
+        const indexName = buildIndexName({
+          name: `${relationshipsTableName}_${formattedRelationTo}_id`,
+          adapter: adapter as unknown as DrizzleAdapter,
+        })
+
+        relationExtraConfig[indexName] = createIndex({
+          name: indexColumns,
+          indexName,
           unique,
         })
       })

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

@@ -3,13 +3,12 @@ import type { AnySQLiteColumn } from 'drizzle-orm/sqlite-core'
 import { index, uniqueIndex } from 'drizzle-orm/sqlite-core'
 
 type CreateIndexArgs = {
-  columnName: string
+  indexName: string
   name: string | string[]
-  tableName: string
   unique?: boolean
 }
 
-export const createIndex = ({ name, columnName, tableName, unique }: CreateIndexArgs) => {
+export const createIndex = ({ name, indexName, unique }: CreateIndexArgs) => {
   return (table: { [x: string]: AnySQLiteColumn }) => {
     let columns
     if (Array.isArray(name)) {
@@ -21,8 +20,8 @@ export const createIndex = ({ name, columnName, tableName, unique }: CreateIndex
       columns = [table[name]]
     }
     if (unique) {
-      return uniqueIndex(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1))
+      return uniqueIndex(indexName).on(columns[0], ...columns.slice(1))
     }
-    return index(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1))
+    return index(indexName).on(columns[0], ...columns.slice(1))
   }
 }

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

@@ -1,8 +1,10 @@
+import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
 import type { Relation } from 'drizzle-orm'
 import type { IndexBuilder, SQLiteColumnBuilder } from 'drizzle-orm/sqlite-core'
 import type { Field, SanitizedJoins, TabAsField } from 'payload'
 
 import {
+  buildIndexName,
   createTableName,
   hasLocalesTable,
   validateExistingBlockIsIdentical,
@@ -164,10 +166,15 @@ export const traverseFields = ({
           }
           adapter.fieldConstraints[rootTableName][`${columnName}_idx`] = constraintValue
         }
-        targetIndexes[`${newTableName}_${field.name}Idx`] = createIndex({
+
+        const indexName = buildIndexName({
+          name: `${newTableName}_${columnName}`,
+          adapter: adapter as unknown as DrizzleAdapter,
+        })
+
+        targetIndexes[indexName] = createIndex({
           name: field.localized ? [fieldName, '_locale'] : fieldName,
-          columnName,
-          tableName: newTableName,
+          indexName,
           unique,
         })
       }

packages/db-vercel-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-vercel-postgres",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "Vercel Postgres adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -50,8 +50,8 @@
     "@payloadcms/drizzle": "workspace:*",
     "@vercel/postgres": "^0.9.0",
     "console-table-printer": "2.11.2",
-    "drizzle-kit": "0.26.1",
-    "drizzle-orm": "0.35.0",
+    "drizzle-kit": "0.26.2",
+    "drizzle-orm": "0.35.1",
     "pg": "8.11.3",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",

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

@@ -26,7 +26,8 @@ export const connect: Connect = async function connect(
     const logger = this.logger || false
     // Passed the poolOptions if provided,
     // else have vercel/postgres detect the connection string from the environment
-    this.drizzle = drizzle(this.poolOptions ? new VercelPool(this.poolOptions) : sql, {
+    this.drizzle = drizzle({
+      client: this.poolOptions ? new VercelPool(this.poolOptions) : sql,
       logger,
       schema: this.schema,
     })

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

@@ -90,6 +90,7 @@ export function vercelPostgresAdapter(args: Args = {}): DatabaseAdapterObj<Verce
       fieldConstraints: {},
       getMigrationTemplate,
       idType: postgresIDType,
+      indexes: new Set<string>(),
       initializing,
       localesSuffix: args.localesSuffix || '_locales',
       logger: args.logger,

packages/drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "console-table-printer": "2.11.2",
-    "drizzle-orm": "0.34.1-1f15bfd",
+    "drizzle-orm": "0.35.1",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
     "uuid": "9.0.0"

packages/drizzle/src/index.ts

@@ -32,6 +32,7 @@ export { updateGlobal } from './updateGlobal.js'
 export { updateGlobalVersion } from './updateGlobalVersion.js'
 export { updateVersion } from './updateVersion.js'
 export { upsertRow } from './upsertRow/index.js'
+export { buildIndexName } from './utilities/buildIndexName.js'
 export { executeSchemaHooks } from './utilities/executeSchemaHooks.js'
 export { extendDrizzleTable } from './utilities/extendDrizzleTable.js'
 export { hasLocalesTable } from './utilities/hasLocalesTable.js'

packages/drizzle/src/postgres/createDatabase.ts

@@ -54,7 +54,7 @@ export const createDatabase = async function (this: BasePostgresAdapter, args: A
   }
 
   // import pg only when createDatabase is used
-  const pg = await import('pg')
+  const pg = await import('pg').then((mod) => mod.default)
 
   const managementClient = new pg.Client(managementClientConfig)
 

packages/drizzle/src/postgres/schema/build.ts

@@ -30,6 +30,7 @@ import type {
 } from '../types.js'
 
 import { createTableName } from '../../createTableName.js'
+import { buildIndexName } from '../../utilities/buildIndexName.js'
 import { createIndex } from './createIndex.js'
 import { parentIDColumnMap } from './parentIDColumnMap.js'
 import { setColumnID } from './setColumnID.js'
@@ -389,21 +390,25 @@ export const buildTable = ({
             foreignColumns: [adapter.tables[formattedRelationTo].id],
           }).onDelete('cascade')
 
-        const indexName = [colName]
+        const indexColumns = [colName]
 
         const unique = !disableUnique && uniqueRelationships.has(relationTo)
 
         if (unique) {
-          indexName.push('path')
+          indexColumns.push('path')
         }
         if (hasLocalizedRelationshipField) {
-          indexName.push('locale')
+          indexColumns.push('locale')
         }
 
-        relationExtraConfig[`${relationTo}IdIdx`] = createIndex({
-          name: indexName,
-          columnName: `${formattedRelationTo}_id`,
-          tableName: relationshipsTableName,
+        const indexName = buildIndexName({
+          name: `${relationshipsTableName}_${formattedRelationTo}_id`,
+          adapter,
+        })
+
+        relationExtraConfig[indexName] = createIndex({
+          name: indexColumns,
+          indexName,
           unique,
         })
       })

packages/drizzle/src/postgres/schema/createIndex.ts

@@ -3,13 +3,12 @@ import { index, uniqueIndex } from 'drizzle-orm/pg-core'
 import type { GenericColumn } from '../types.js'
 
 type CreateIndexArgs = {
-  columnName: string
+  indexName: string
   name: string | string[]
-  tableName: string
   unique?: boolean
 }
 
-export const createIndex = ({ name, columnName, tableName, unique }: CreateIndexArgs) => {
+export const createIndex = ({ name, indexName, unique }: CreateIndexArgs) => {
   return (table: { [x: string]: GenericColumn }) => {
     let columns
     if (Array.isArray(name)) {
@@ -21,8 +20,8 @@ export const createIndex = ({ name, columnName, tableName, unique }: CreateIndex
       columns = [table[name]]
     }
     if (unique) {
-      return uniqueIndex(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1))
+      return uniqueIndex(indexName).on(columns[0], ...columns.slice(1))
     }
-    return index(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1))
+    return index(indexName).on(columns[0], ...columns.slice(1))
   }
 }

packages/drizzle/src/postgres/schema/traverseFields.ts

@@ -30,6 +30,7 @@ import type {
 } from '../types.js'
 
 import { createTableName } from '../../createTableName.js'
+import { buildIndexName } from '../../utilities/buildIndexName.js'
 import { hasLocalesTable } from '../../utilities/hasLocalesTable.js'
 import { validateExistingBlockIsIdentical } from '../../utilities/validateExistingBlockIsIdentical.js'
 import { buildTable } from './build.js'
@@ -169,10 +170,12 @@ export const traverseFields = ({
           }
           adapter.fieldConstraints[rootTableName][`${columnName}_idx`] = constraintValue
         }
-        targetIndexes[`${newTableName}_${field.name}Idx`] = createIndex({
+
+        const indexName = buildIndexName({ name: `${newTableName}_${columnName}`, adapter })
+
+        targetIndexes[indexName] = createIndex({
           name: field.localized ? [fieldName, '_locale'] : fieldName,
-          columnName,
-          tableName: newTableName,
+          indexName,
           unique,
         })
       }

packages/drizzle/src/transform/write/traverseFields.ts

@@ -212,6 +212,9 @@ export const traverseFields = ({
       if (typeof data[field.name] === 'object' && data[field.name] !== null) {
         if (field.localized) {
           Object.entries(data[field.name]).forEach(([localeKey, localeData]) => {
+            // preserve array ID if there is
+            localeData._uuid = data.id || data._uuid
+
             traverseFields({
               adapter,
               arrays,
@@ -237,6 +240,10 @@ export const traverseFields = ({
             })
           })
         } else {
+          // preserve array ID if there is
+          const groupData = data[field.name] as Record<string, unknown>
+          groupData._uuid = data.id || data._uuid
+
           traverseFields({
             adapter,
             arrays,
@@ -244,7 +251,7 @@ export const traverseFields = ({
             blocks,
             blocksToDelete,
             columnPrefix: `${columnName}_`,
-            data: data[field.name] as Record<string, unknown>,
+            data: groupData,
             existingLocales,
             fieldPrefix: `${fieldName}_`,
             fields: field.fields,
@@ -275,6 +282,9 @@ export const traverseFields = ({
           if (typeof data[tab.name] === 'object' && data[tab.name] !== null) {
             if (tab.localized) {
               Object.entries(data[tab.name]).forEach(([localeKey, localeData]) => {
+                // preserve array ID if there is
+                localeData._uuid = data.id || data._uuid
+
                 traverseFields({
                   adapter,
                   arrays,
@@ -300,6 +310,10 @@ export const traverseFields = ({
                 })
               })
             } else {
+              const tabData = data[tab.name] as Record<string, unknown>
+              // preserve array ID if there is
+              tabData._uuid = data.id || data._uuid
+
               traverseFields({
                 adapter,
                 arrays,
@@ -307,7 +321,7 @@ export const traverseFields = ({
                 blocks,
                 blocksToDelete,
                 columnPrefix: `${columnPrefix || ''}${toSnakeCase(tab.name)}_`,
-                data: data[tab.name] as Record<string, unknown>,
+                data: tabData,
                 existingLocales,
                 fieldPrefix: `${fieldPrefix || ''}${tab.name}_`,
                 fields: tab.fields,

packages/drizzle/src/types.ts

@@ -174,6 +174,7 @@ export interface DrizzleAdapter extends BaseDatabaseAdapter {
   fieldConstraints: Record<string, Record<string, string>>
   getMigrationTemplate: (args: MigrationTemplateArgs) => string
   idType: 'serial' | 'uuid'
+  indexes: Set<string>
   initializing: Promise<void>
   insert: Insert
   localesSuffix?: string

packages/drizzle/src/utilities/buildIndexName.ts

@@ -0,0 +1,24 @@
+import type { DrizzleAdapter } from '../types.js'
+
+export const buildIndexName = ({
+  name,
+  adapter,
+  number = 0,
+}: {
+  adapter: DrizzleAdapter
+  name: string
+  number?: number
+}): string => {
+  const indexName = `${name}${number ? `_${number}` : ''}_idx`
+
+  if (!adapter.indexes.has(indexName)) {
+    adapter.indexes.add(indexName)
+    return indexName
+  }
+
+  return buildIndexName({
+    name,
+    adapter,
+    number: number + 1,
+  })
+}

packages/email-nodemailer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-nodemailer",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "Payload Nodemailer Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/email-resend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-resend",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "Payload Resend Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/eslint-config/package.json

@@ -33,7 +33,7 @@
     "eslint-plugin-react-hooks": "5.1.0-rc-a19a8ab4-20240829",
     "eslint-plugin-regexp": "2.6.0",
     "globals": "15.9.0",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "typescript-eslint": "8.3.0"
   }
 }

packages/eslint-plugin/package.json

@@ -32,7 +32,7 @@
     "eslint-plugin-react-hooks": "5.1.0-rc-a19a8ab4-20240829",
     "eslint-plugin-regexp": "2.6.0",
     "globals": "15.9.0",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "typescript-eslint": "8.3.0"
   }
 }

packages/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/graphql",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

packages/live-preview-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/live-preview-react",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "The official React SDK for Payload Live Preview",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -43,8 +43,8 @@
     "payload": "workspace:*"
   },
   "peerDependencies": {
-    "react": "^19.0.0 || ^19.0.0-rc-3edc000d-20240926",
-    "react-dom": "^19.0.0 || ^19.0.0-rc-3edc000d-20240926"
+    "react": "^19.0.0 || ^19.0.0-rc-65a56d0e-20241020",
+    "react-dom": "^19.0.0 || ^19.0.0-rc-65a56d0e-20241020"
   },
   "publishConfig": {
     "exports": {

packages/live-preview-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/live-preview-vue",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "The official Vue SDK for Payload Live Preview",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/live-preview/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/live-preview",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "The official live preview JavaScript SDK for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -96,7 +96,7 @@
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.24.1",
-    "@next/eslint-plugin-next": "15.0.0-canary.173",
+    "@next/eslint-plugin-next": "15.0.0",
     "@payloadcms/eslint-config": "workspace:*",
     "@types/busboy": "1.5.4",
     "@types/react": "npm:types-react@19.0.0-rc.1",
@@ -112,7 +112,7 @@
   },
   "peerDependencies": {
     "graphql": "^16.8.1",
-    "next": "^15.0.0-canary.173",
+    "next": "^15.0.0",
     "payload": "workspace:*"
   },
   "engines": {

packages/next/src/layouts/Root/index.tsx

@@ -66,17 +66,17 @@ export const RootLayout = async ({
       dependencyVersions: {
         next: {
           required: false,
-          version: '>=15.0.0-canary.173',
+          version: '>=15.0.0',
         },
         react: {
           customVersionParser: customReactVersionParser,
           required: false,
-          version: '>=19.0.0-rc-3edc000d-20240926',
+          version: '>=19.0.0-rc-65a56d0e-20241020',
         },
         'react-dom': {
           customVersionParser: customReactVersionParser,
           required: false,
-          version: '>=19.0.0-rc-3edc000d-20240926',
+          version: '>=19.0.0-rc-65a56d0e-20241020',
         },
       },
     })

packages/next/src/routes/rest/collections/delete.ts

@@ -10,14 +10,16 @@ import type { CollectionRouteHandler } from '../types.js'
 import { headersWithCors } from '../../../utilities/headersWithCors.js'
 
 export const deleteDoc: CollectionRouteHandler = async ({ collection, req }) => {
-  const { depth, where } = req.query as {
+  const { depth, overrideLock, where } = req.query as {
     depth?: string
+    overrideLock?: string
     where?: Where
   }
 
   const result = await deleteOperation({
     collection,
     depth: isNumber(depth) ? Number(depth) : undefined,
+    overrideLock: Boolean(overrideLock === 'true'),
     req,
     where,
   })

packages/next/src/routes/rest/collections/deleteByID.ts

@@ -14,6 +14,7 @@ export const deleteByID: CollectionRouteHandlerWithID = async ({
 }) => {
   const { searchParams } = req
   const depth = searchParams.get('depth')
+  const overrideLock = searchParams.get('overrideLock')
 
   const id = sanitizeCollectionID({
     id: incomingID,
@@ -25,6 +26,7 @@ export const deleteByID: CollectionRouteHandlerWithID = async ({
     id,
     collection,
     depth: isNumber(depth) ? depth : undefined,
+    overrideLock: Boolean(overrideLock === 'true'),
     req,
   })
 

packages/next/src/routes/rest/collections/update.ts

@@ -10,10 +10,11 @@ import type { CollectionRouteHandler } from '../types.js'
 import { headersWithCors } from '../../../utilities/headersWithCors.js'
 
 export const update: CollectionRouteHandler = async ({ collection, req }) => {
-  const { depth, draft, limit, where } = req.query as {
+  const { depth, draft, limit, overrideLock, where } = req.query as {
     depth?: string
     draft?: string
     limit?: string
+    overrideLock?: string
     where?: Where
   }
 
@@ -23,6 +24,7 @@ export const update: CollectionRouteHandler = async ({ collection, req }) => {
     depth: isNumber(depth) ? Number(depth) : undefined,
     draft: draft === 'true',
     limit: isNumber(limit) ? Number(limit) : undefined,
+    overrideLock: Boolean(overrideLock === 'true'),
     req,
     where,
   })

packages/next/src/routes/rest/collections/updateByID.ts

@@ -16,6 +16,7 @@ export const updateByID: CollectionRouteHandlerWithID = async ({
   const depth = searchParams.get('depth')
   const autosave = searchParams.get('autosave') === 'true'
   const draft = searchParams.get('draft') === 'true'
+  const overrideLock = searchParams.get('overrideLock')
   const publishSpecificLocale = req.query.publishSpecificLocale as string | undefined
 
   const id = sanitizeCollectionID({
@@ -31,6 +32,7 @@ export const updateByID: CollectionRouteHandlerWithID = async ({
     data: req.data,
     depth: isNumber(depth) ? Number(depth) : undefined,
     draft,
+    overrideLock: Boolean(overrideLock === 'true'),
     publishSpecificLocale,
     req,
   })

packages/next/src/views/Edit/Default/index.tsx

@@ -343,7 +343,7 @@ export const DefaultEditView: React.FC = () => {
   const shouldShowDocumentLockedModal =
     documentIsLocked &&
     currentEditor &&
-    currentEditor.id !== user.id &&
+    currentEditor.id !== user?.id &&
     !isReadOnlyForIncomingUser &&
     !showTakeOverModal &&
     !documentLockStateRef.current?.hasShownLockedModal

packages/payload/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "3.0.0-beta.114",
+  "version": "3.0.0-beta.117",
   "description": "Node, React, Headless CMS and Application Framework built on Next.js",
   "keywords": [
     "admin panel",
@@ -85,7 +85,7 @@
   },
   "dependencies": {
     "@monaco-editor/react": "4.6.0",
-    "@next/env": "^15.0.0-canary.173",
+    "@next/env": "^15.0.0",
     "@payloadcms/translations": "workspace:*",
     "@types/busboy": "1.5.4",
     "ajv": "8.17.1",
@@ -98,11 +98,11 @@
     "get-tsconfig": "^4.7.2",
     "http-status": "1.6.2",
     "image-size": "^1.1.1",
+    "jose": "5.9.2",
     "json-schema-to-typescript": "15.0.1",
-    "jsonwebtoken": "9.0.2",
     "minimist": "1.2.8",
-    "pino": "9.3.1",
-    "pino-pretty": "11.2.1",
+    "pino": "9.5.0",
+    "pino-pretty": "11.3.0",
     "pluralize": "8.0.0",
     "sanitize-filename": "1.6.3",
     "scmp": "2.1.0",
@@ -114,7 +114,6 @@
     "@hyrious/esbuild-plugin-commonjs": "^0.2.4",
     "@payloadcms/eslint-config": "workspace:*",
     "@types/json-schema": "7.0.15",
-    "@types/jsonwebtoken": "8.5.9",
     "@types/minimist": "1.2.2",
     "@types/nodemailer": "6.4.14",
     "@types/pluralize": "0.0.33",

packages/payload/src/auth/jwt.ts

@@ -0,0 +1,21 @@
+import { SignJWT } from 'jose'
+
+export const jwtSign = async ({
+  fieldsToSign,
+  secret,
+  tokenExpiration,
+}: {
+  fieldsToSign: Record<string, unknown>
+  secret: string
+  tokenExpiration: number
+}) => {
+  const secretKey = new TextEncoder().encode(secret)
+  const issuedAt = Math.floor(Date.now() / 1000)
+  const exp = issuedAt + tokenExpiration
+  const token = await new SignJWT(fieldsToSign)
+    .setProtectedHeader({ alg: 'HS256', typ: 'JWT' })
+    .setIssuedAt(issuedAt)
+    .setExpirationTime(exp)
+    .sign(secretKey)
+  return { exp, token }
+}

packages/payload/src/auth/operations/login.ts

@@ -1,5 +1,3 @@
-import jwt from 'jsonwebtoken'
-
 import type {
   AuthOperationsFromCollectionSlug,
   Collection,
@@ -16,6 +14,7 @@ import { killTransaction } from '../../utilities/killTransaction.js'
 import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'
 import { getFieldsToSign } from '../getFieldsToSign.js'
 import isLocked from '../isLocked.js'
+import { jwtSign } from '../jwt.js'
 import { authenticateLocalStrategy } from '../strategies/local/authenticate.js'
 import { incrementLoginAttempts } from '../strategies/local/incrementLoginAttempts.js'
 import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts.js'
@@ -234,8 +233,10 @@ export const loginOperation = async <TSlug extends CollectionSlug>(
         })) || user
     }, Promise.resolve())
 
-    const token = jwt.sign(fieldsToSign, secret, {
-      expiresIn: collectionConfig.auth.tokenExpiration,
+    const { exp, token } = await jwtSign({
+      fieldsToSign,
+      secret,
+      tokenExpiration: collectionConfig.auth.tokenExpiration,
     })
 
     req.user = user
@@ -308,7 +309,7 @@ export const loginOperation = async <TSlug extends CollectionSlug>(
     }, Promise.resolve())
 
     let result: { user: DataFromCollectionSlug<TSlug> } & Result = {
-      exp: (jwt.decode(token) as jwt.JwtPayload).exp,
+      exp,
       token,
       user,
     }

packages/payload/src/auth/operations/me.ts

@@ -1,4 +1,4 @@
-import jwt from 'jsonwebtoken'
+import { decodeJwt } from 'jose'
 
 import type { Collection } from '../../collections/config/types.js'
 import type { PayloadRequest } from '../../types/index.js'
@@ -70,7 +70,7 @@ export const meOperation = async (args: Arguments): Promise<MeOperationResult> =
       result.user = user
 
       if (currentToken) {
-        const decoded = jwt.decode(currentToken) as jwt.JwtPayload
+        const decoded = decodeJwt(currentToken)
         if (decoded) {
           result.exp = decoded.exp
         }

packages/payload/src/auth/operations/refresh.ts

@@ -1,4 +1,3 @@
-import jwt from 'jsonwebtoken'
 import url from 'url'
 
 import type { BeforeOperationHook, Collection } from '../../collections/config/types.js'
@@ -10,6 +9,7 @@ import { commitTransaction } from '../../utilities/commitTransaction.js'
 import { initTransaction } from '../../utilities/initTransaction.js'
 import { killTransaction } from '../../utilities/killTransaction.js'
 import { getFieldsToSign } from '../getFieldsToSign.js'
+import { jwtSign } from '../jwt.js'
 
 export type Result = {
   exp: number
@@ -102,12 +102,12 @@ export const refreshOperation = async (incomingArgs: Arguments): Promise<Result>
         user: args?.req?.user,
       })
 
-      const refreshedToken = jwt.sign(fieldsToSign, secret, {
-        expiresIn: collectionConfig.auth.tokenExpiration,
+      const { exp, token: refreshedToken } = await jwtSign({
+        fieldsToSign,
+        secret,
+        tokenExpiration: collectionConfig.auth.tokenExpiration,
       })
 
-      const exp = (jwt.decode(refreshedToken) as Record<string, unknown>).exp as number
-
       result = {
         exp,
         refreshedToken,

packages/payload/src/auth/operations/resetPassword.ts

@@ -1,5 +1,4 @@
 import httpStatus from 'http-status'
-import jwt from 'jsonwebtoken'
 
 import type { Collection } from '../../collections/config/types.js'
 import type { PayloadRequest } from '../../types/index.js'
@@ -9,6 +8,7 @@ import { commitTransaction } from '../../utilities/commitTransaction.js'
 import { initTransaction } from '../../utilities/initTransaction.js'
 import { killTransaction } from '../../utilities/killTransaction.js'
 import { getFieldsToSign } from '../getFieldsToSign.js'
+import { jwtSign } from '../jwt.js'
 import { authenticateLocalStrategy } from '../strategies/local/authenticate.js'
 import { generatePasswordSaltHash } from '../strategies/local/generatePasswordSaltHash.js'
 
@@ -118,8 +118,10 @@ export const resetPasswordOperation = async (args: Arguments): Promise<Result> =
       user,
     })
 
-    const token = jwt.sign(fieldsToSign, secret, {
-      expiresIn: collectionConfig.auth.tokenExpiration,
+    const { token } = await jwtSign({
+      fieldsToSign,
+      secret,
+      tokenExpiration: collectionConfig.auth.tokenExpiration,
     })
 
     const fullUser = await payload.findByID({

packages/payload/src/auth/strategies/jwt.ts

@@ -1,4 +1,4 @@
-import jwt from 'jsonwebtoken'
+import { jwtVerify } from 'jose'
 
 import type { Payload, Where } from '../../types/index.js'
 import type { AuthStrategyFunction, User } from '../index.js'
@@ -81,8 +81,8 @@ export const JWTAuthentication: AuthStrategyFunction = async ({
       return { user: null }
     }
 
-    const decodedPayload = jwt.verify(token, payload.secret) as jwt.JwtPayload & JWTToken
-
+    const secretKey = new TextEncoder().encode(payload.secret)
+    const { payload: decodedPayload } = await jwtVerify<JWTToken>(token, secretKey)
     const collection = payload.collections[decodedPayload.collection]
 
     const user = await payload.findByID({

packages/payload/src/database/migrations/migrationsCollection.ts

@@ -18,4 +18,5 @@ export const migrationsCollection: CollectionConfig = {
     },
   ],
   graphQL: false,
+  lockDocuments: false,
 }

packages/payload/src/lockedDocuments/lockedDocumentsCollection.ts

@@ -29,4 +29,5 @@ export const getLockedDocumentsCollection = (config: Config): CollectionConfig =
       required: true,
     },
   ],
+  lockDocuments: false,
 })

packages/payload/src/preferences/preferencesCollection.ts

@@ -70,6 +70,7 @@ const getPreferencesCollection = (config: Config): CollectionConfig => ({
       type: 'json',
     },
   ],
+  lockDocuments: false,
 })
 
 export default getPreferencesCollection

packages/payload/src/utilities/checkDocumentLockStatus.ts

@@ -47,8 +47,12 @@ export const checkDocumentLockStatus = async ({
     throw new Error('Either collectionSlug or globalSlug must be provided.')
   }
 
+  if (!isLockingEnabled) {
+    return
+  }
+
   // Only perform lock checks if overrideLock is false and locking is enabled
-  if (!overrideLock && isLockingEnabled !== false) {
+  if (!overrideLock) {
     const defaultLockErrorMessage = collectionSlug
       ? `Document with ID ${id} is currently locked by another user and cannot be modified.`
       : `Global document with slug "${globalSlug}" is currently locked by another user and cannot be modified.`

packages/payload/src/utilities/getEntityPolicies.ts

@@ -5,6 +5,7 @@ import type { Field, FieldAccess } from '../fields/config/types.js'
 import type { SanitizedGlobalConfig } from '../globals/config/types.js'
 import type { AllOperations, Document, PayloadRequest, Where } from '../types/index.js'
 
+import { combineQueries } from '../database/combineQueries.js'
 import { tabHasName } from '../fields/config/types.js'
 
 type Args = {
@@ -63,17 +64,7 @@ export async function getEntityPolicies<T extends Args>(args: T): Promise<Return
             overrideAccess: true,
             pagination: false,
             req,
-            where: {
-              ...where,
-              and: [
-                ...(where.and || []),
-                {
-                  id: {
-                    equals: id,
-                  },
-                },
-              ],
-            },
+            where: combineQueries(where, { id: { equals: id } }),
           })
 
           return paginatedRes?.docs?.[0] || undefined

packages/payload/src/utilities/logger.ts

@@ -1,5 +1,5 @@
 import { type Logger, pino } from 'pino'
-import { build, type PrettyOptions } from 'pino-pretty'
+import { build, type PinoPretty, type PrettyOptions } from 'pino-pretty'
 
 import type { Config } from '../config/types.js'
 
@@ -15,13 +15,13 @@ const prettyOptions: PrettyOptions = {
   translateTime: 'SYS:HH:MM:ss',
 }
 
-export const prettySyncLoggerDestination = build({
+export const prettySyncLoggerDestination: PinoPretty.PrettyStream = build({
   ...prettyOptions,
   destination: 1, // stdout
   sync: true,
 })
 
-export const defaultLoggerOptions = build(prettyOptions)
+export const defaultLoggerOptions: PinoPretty.PrettyStream = build(prettyOptions)
 
 export const getLogger = (name = 'payload', logger?: Config['logger']): PayloadLogger => {
   if (!logger) {