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

Export `Banner` component

.github/CODEOWNERS

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

.github/workflows/main.yml

@@ -18,7 +18,7 @@ concurrency:
 
 env:
   NODE_VERSION: 18.20.2
-  PNPM_VERSION: 9.7.0
+  PNPM_VERSION: 9.7.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 
@@ -207,6 +207,9 @@ jobs:
       AWS_REGION: us-east-1
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
         run: sudo ethtool -K eth0 tx off rx off
@@ -222,12 +225,7 @@ jobs:
           version: ${{ env.PNPM_VERSION }}
           run_install: false
 
-      - name: Restore build
-        uses: actions/cache@v4
-        timeout-minutes: 10
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
+      - run: pnpm install
 
       - name: Start LocalStack
         run: pnpm docker:start
@@ -371,7 +369,7 @@ jobs:
         run: pnpm exec playwright install-deps chromium
 
       - name: E2E Tests
-        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e ${{ matrix.suite }}
+        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e:prod:ci ${{ matrix.suite }}
         env:
           PLAYWRIGHT_JSON_OUTPUT_NAME: results_${{ matrix.suite }}.json
           NEXT_TELEMETRY_DISABLED: 1

.github/workflows/release-canary.yml

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

.gitignore

@@ -5,7 +5,7 @@ dist
 !/.idea/runConfigurations
 !/.idea/payload.iml
 
-
+test/packed
 test-results
 .devcontainer
 .localstack
@@ -306,3 +306,6 @@ test/live-preview/app/(payload)/admin/importMap.js
 /test/live-preview/app/(payload)/admin/importMap.js
 test/admin-root/app/(payload)/admin/importMap.js
 /test/admin-root/app/(payload)/admin/importMap.js
+test/app/(payload)/admin/importMap.js
+/test/app/(payload)/admin/importMap.js
+test/pnpm-lock.yaml

.husky/pre-commit

@@ -0,0 +1 @@
+pnpm run lint-staged --quiet

docs/admin/collections.mdx

@@ -36,7 +36,7 @@ The following options are available:
 | **`hideAPIURL`**                 | Hides the "API URL" meta field while editing documents within this Collection.                                                                                                                        |
 | **`enableRichTextLink`**         | The [Rich Text](../fields/rich-text) field features a `Link` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default.         |
 | **`enableRichTextRelationship`** | The [Rich Text](../fields/rich-text) field features a `Relationship` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default. |
-| **`meta`**                       | Metadata overrides to apply to the Admin Panel. Included properties are `description` and `openGraph`.                                                                           |
+| **`meta`**                       | Page metadata overrides to apply to this Collection within the Admin Panel. [More details](./metadata).                                                                           |
 | **`preview`**                    | Function to generate preview URLs within the Admin Panel that can point to your app. [More details](#preview).                                                                                                |
 | **`livePreview`**                | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).                                                                              |
 | **`components`**                 | Swap in your own React components to be used within this Collection. [More details](#components).                                                                                       |

docs/admin/fields.mdx

@@ -347,31 +347,13 @@ Custom Label Components receive all [Field Component](#the-field-component) prop
 
 #### TypeScript
 
-When building Custom Label Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Label Component, one for every [Field Type](../fields/overview). The convention is to append `LabelComponent` to the type of field, i.e. `TextFieldLabelComponent`.
+When building Custom Label Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Label Component, one for every [Field Type](../fields/overview) and server/client environment. The convention is to append `LabelServerComponent` or `LabelClientComponent` to the type of field, i.e. `TextFieldLabelClientComponent`.
 
 ```tsx
 import type {
-  ArrayFieldLabelComponent,
-  BlocksFieldLabelComponent,
-  CheckboxFieldLabelComponent,
-  CodeFieldLabelComponent,
-  CollapsibleFieldLabelComponent,
-  DateFieldLabelComponent,
-  EmailFieldLabelComponent,
-  GroupFieldLabelComponent,
-  HiddenFieldLabelComponent,
-  JSONFieldLabelComponent,
-  NumberFieldLabelComponent,
-  PointFieldLabelComponent,
-  RadioFieldLabelComponent,
-  RelationshipFieldLabelComponent,
-  RichTextFieldLabelComponent,
-  RowFieldLabelComponent,
-  SelectFieldLabelComponent,
-  TabsFieldLabelComponent,
-  TextFieldLabelComponent,
-  TextareaFieldLabelComponent,
-  UploadFieldLabelComponent
+  TextFieldLabelServerComponent,
+  TextFieldLabelClientComponent,
+  // And so on for each Field Type
 } from 'payload'
 ```
 
@@ -410,31 +392,13 @@ Custom Error Components receive all [Field Component](#the-field-component) prop
 
 #### TypeScript
 
-When building Custom Error Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Error Component, one for every [Field Type](../fields/overview). The convention is to append `ErrorComponent` to the type of field, i.e. `TextFieldErrorComponent`.
+When building Custom Error Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Error Component, one for every [Field Type](../fields/overview) and server/client environment. The convention is to append `ErrorServerComponent` or `ErrorClientComponent` to the type of field, i.e. `TextFieldErrorClientComponent`.
 
 ```tsx
 import type {
-  ArrayFieldErrorComponent,
-  BlocksFieldErrorComponent,
-  CheckboxFieldErrorComponent,
-  CodeFieldErrorComponent,
-  CollapsibleFieldErrorComponent,
-  DateFieldErrorComponent,
-  EmailFieldErrorComponent,
-  GroupFieldErrorComponent,
-  HiddenFieldErrorComponent,
-  JSONFieldErrorComponent,
-  NumberFieldErrorComponent,
-  PointFieldErrorComponent,
-  RadioFieldErrorComponent,
-  RelationshipFieldErrorComponent,
-  RichTextFieldErrorComponent,
-  RowFieldErrorComponent,
-  SelectFieldErrorComponent,
-  TabsFieldErrorComponent,
-  TextFieldErrorComponent,
-  TextareaFieldErrorComponent,
-  UploadFieldErrorComponent
+  TextFieldErrorServerComponent,
+  TextFieldErrorClientComponent,
+  // And so on for each Field Type
 } from 'payload'
 ```
 
@@ -544,31 +508,13 @@ Custom Description Components receive all [Field Component](#the-field-component
 
 #### TypeScript
 
-When building Custom Description Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Description Component, one for every [Field Type](../fields/overview). The convention is to append `DescriptionComponent` to the type of field, i.e. `TextFieldDescriptionComponent`.
+When building Custom Description Components, you can import the component props to ensure type safety in your component. There is an explicit type for the Description Component, one for every [Field Type](../fields/overview) and server/client environment. The convention is to append `DescriptionServerComponent` or `DescriptionClientComponent` to the type of field, i.e. `TextFieldDescriptionClientComponent`.
 
 ```tsx
 import type {
-  ArrayFieldDescriptionComponent,
-  BlocksFieldDescriptionComponent,
-  CheckboxFieldDescriptionComponent,
-  CodeFieldDescriptionComponent,
-  CollapsibleFieldDescriptionComponent,
-  DateFieldDescriptionComponent,
-  EmailFieldDescriptionComponent,
-  GroupFieldDescriptionComponent,
-  HiddenFieldDescriptionComponent,
-  JSONFieldDescriptionComponent,
-  NumberFieldDescriptionComponent,
-  PointFieldDescriptionComponent,
-  RadioFieldDescriptionComponent,
-  RelationshipFieldDescriptionComponent,
-  RichTextFieldDescriptionComponent,
-  RowFieldDescriptionComponent,
-  SelectFieldDescriptionComponent,
-  TabsFieldDescriptionComponent,
-  TextFieldDescriptionComponent,
-  TextareaFieldDescriptionComponent,
-  UploadFieldDescriptionComponent
+  TextFieldDescriptionServerComponent,
+  TextFieldDescriptionClientComponent,
+  // And so on for each Field Type
 } from 'payload'
 ```
 

docs/admin/globals.mdx

@@ -33,7 +33,7 @@ The following options are available:
 | **`preview`**     | Function to generate a preview URL within the Admin Panel for this Global that can point to your app. [More details](#preview).           |
 | **`livePreview`** | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).          |
 | **`hideAPIURL`**  | Hides the "API URL" meta field while editing documents within this collection.                                                    |
-| **`meta`**        | Metadata overrides to apply to the Admin Panel. Included properties are `description` and `openGraph`.       |
+| **`meta`**        | Page metadata overrides to apply to this Global within the Admin Panel. [More details](./metadata).                                                                           |
 
 ### Components
 

docs/admin/metadata.mdx

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

docs/admin/overview.mdx

@@ -88,17 +88,17 @@ The following options are available:
 
 | Option        | Description                                                                                                                                                           |
 |---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `avatar`      | Set account profile picture. Options: `gravatar`, `default` or a custom React component.                                                                              |
-| `autoLogin`   | Used to automate log-in for dev and demonstration convenience. [More details](../authentication/overview).                                                            |
-| `buildPath`   | Specify an absolute path for where to store the built Admin bundle used in production. Defaults to `path.resolve(process.cwd(), 'build')`.                            |
-| `components`  | Component overrides that affect the entirety of the Admin Panel. [More details](./components).                                                                        |
-| `custom`      | Any custom properties you wish to pass to the Admin Panel.                                                                                                            |
-| `dateFormat`  | The date format that will be used for all dates within the Admin Panel. Any valid [date-fns](https://date-fns.org/) format pattern can be used.                       |
-| `disable`     | If set to `true`, the entire Admin Panel will be disabled.                                                                                                            |
-| `livePreview` | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).                                         |
-| `meta`        | Base metadata to use for the Admin Panel. Included properties are `titleSuffix`, `icons`, and `openGraph`. Can be overridden on a per Collection or per Global basis. |
-| `routes`      | Replace built-in Admin Panel routes with your own custom routes. [More details](#customizing-routes).                                                                 |
-| `user`        | The `slug` of the Collection that you want to allow to login to the Admin Panel. [More details](#the-admin-user-collection).                                          |
+| **`avatar`**      | Set account profile picture. Options: `gravatar`, `default` or a custom React component.                                                                              |
+| **`autoLogin`**   | Used to automate log-in for dev and demonstration convenience. [More details](../authentication/overview).                                                            |
+| **`buildPath`**   | Specify an absolute path for where to store the built Admin bundle used in production. Defaults to `path.resolve(process.cwd(), 'build')`.                            |
+| **`components`**  | Component overrides that affect the entirety of the Admin Panel. [More details](./components).                                                                        |
+| **`custom`**      | Any custom properties you wish to pass to the Admin Panel.                                                                                                            |
+| **`dateFormat`**  | The date format that will be used for all dates within the Admin Panel. Any valid [date-fns](https://date-fns.org/) format pattern can be used.                       |
+| **`disable`**     | If set to `true`, the entire Admin Panel will be disabled.                                                                                                            |
+| **`livePreview`** | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).                                         |
+| **`meta`**        | Base metadata to use for the Admin Panel. [More details](./metadata). |
+| **`routes`**      | Replace built-in Admin Panel routes with your own custom routes. [More details](#customizing-routes).                                                                 |
+| **`user`**        | The `slug` of the Collection that you want to allow to login to the Admin Panel. [More details](#the-admin-user-collection).                                          |
 
 <Banner type="success">
   <strong>Reminder:</strong>

docs/admin/views.mdx

@@ -57,7 +57,8 @@ For more granular control, pass a configuration object instead. Payload exposes
 | **`path`** \*      | Any valid URL path or array of paths that [`path-to-regexp`](https://www.npmjs.com/package/path-to-regex) understands.                                                                     |
 | **`exact`**        | Boolean. When true, will only match if the path matches the `usePathname()` exactly.                                                                                                     |
 | **`strict`**       | When true, a path that has a trailing slash will only match a `location.pathname` with a trailing slash. This has no effect when there are additional URL segments in the pathname. |
-| **`sensitive`**    | When true, will match if the path is case sensitive.                                                                                                                                       |
+| **`sensitive`**    | When true, will match if the path is case sensitive.
+| **`meta`**         | Page metadata overrides to apply to this view within the Admin Panel. [More details](./metadata).                                                                           |
 
 _\* An asterisk denotes that a property is required._
 

docs/migration-guide/overview.mdx

@@ -467,10 +467,10 @@ export const ServerRenderedDescription = () => <ClientRenderedDescription />
 // file: components/ClientRenderedDescription.tsx
 'use client'
 import React from 'react'
-import type { DescriptionComponent } from 'payload'
+import type { TextFieldDescriptionClientComponent } from 'payload'
 import { useFieldProps, useFormFields } from '@payloadcms/ui'
 
-export const ClientRenderedDescription: DescriptionComponent = () ={
+export const ClientRenderedDescription: TextFieldDescriptionClientComponent = () ={
   const { path } = useFieldProps()
   const { value } = useFormFields(([fields]) => fields[path])
   const customDescription = `Component description: ${path} - ${value}`
@@ -659,8 +659,8 @@ export const ClientArrayRowLabel = () => {
   admin: {
     components: {
       views: {
-        Edit: {
-          Tab: {
+        edit: {
+          tab: {
             pillLabel: '',
           },
         },
@@ -675,9 +675,11 @@ export const ClientArrayRowLabel = () => {
   admin: {
     components: {
       views: {
-        Edit: {
-          Tab: {
-            Pill: MyPill,
+        edit: {
+          tab: {
+            pill: {
+              Component: './path/to/CustomPill.js',
+            },
           },
         },
       },

next.config.mjs

@@ -23,6 +23,7 @@ export default withBundleAnalyzer(
     env: {
       PAYLOAD_CORE_DEV: 'true',
       ROOT_DIR: path.resolve(dirname),
+      PAYLOAD_DISABLE_DEPENDENCY_CHECKER: 'true',
     },
     async redirects() {
       return [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "private": true,
   "type": "module",
   "scripts": {
@@ -53,12 +53,11 @@
     "clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media/*' '**/dist/' '**/.cache/*' '**/.next/*' '**/.turbo/*' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
     "clean:build": "node ./scripts/delete-recursively.js 'media/' '**/dist/' '**/.cache/' '**/.next/' '**/.turbo/' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
     "clean:cache": "node ./scripts/delete-recursively.js node_modules/.cache! packages/payload/node_modules/.cache! .next/*",
-    "dev": "pnpm runts ./test/dev.ts",
-    "runts": "node --no-deprecation --import @swc-node/register/esm-register",
+    "dev": "tsx ./test/dev.ts",
     "dev:generate-graphql-schema": "pnpm runts ./test/generateGraphQLSchema.ts",
     "dev:generate-importmap": "pnpm runts ./test/generateImportMap.ts",
     "dev:generate-types": "pnpm runts ./test/generateTypes.ts",
-    "dev:postgres": "pnpm runts ./test/dev.ts",
+    "dev:postgres": "cross-env PAYLOAD_DATABASE=postgres pnpm runts ./test/dev.ts",
     "devsafe": "node ./scripts/delete-recursively.js '**/.next' && pnpm dev",
     "docker:restart": "pnpm docker:stop --remove-orphans && pnpm docker:start",
     "docker:start": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml up -d",
@@ -72,6 +71,7 @@
     "reinstall": "pnpm clean:all && pnpm install",
     "release:alpha": "pnpm runts ./scripts/release.ts --bump prerelease --tag alpha",
     "release:beta": "pnpm runts ./scripts/release.ts --bump prerelease --tag beta",
+    "runts": "node --no-deprecation --import @swc-node/register/esm-register",
     "script:gen-templates": "pnpm runts ./scripts/generate-template-variations.ts",
     "script:list-published": "pnpm runts scripts/lib/getPackageRegistryVersions.ts",
     "script:pack": "pnpm runts scripts/pack-all-to-dest.ts",
@@ -81,6 +81,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:int": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
     "test:int:postgres": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
     "test:unit": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=jest.config.js --runInBand",
@@ -93,18 +95,17 @@
       "prettier --write",
       "eslint --cache --fix"
     ],
-    "templates/website/**/*": "sh -c \"cd templates/website; pnpm install --ignore-workspace --frozen-lockfile; pnpm run lint --fix\"",
+    "templates/website/**/*": "sh -c \"cd templates/website; pnpm install --ignore-workspace; pnpm run lint --fix\"",
     "tsconfig.json": "node scripts/reset-tsconfig.js"
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",
     "@libsql/client": "0.6.2",
     "@next/bundle-analyzer": "15.0.0-canary.104",
+    "@payloadcms/db-postgres": "workspace:*",
     "@payloadcms/eslint-config": "workspace:*",
     "@payloadcms/eslint-plugin": "workspace:*",
     "@payloadcms/live-preview-react": "workspace:*",
-    "@payloadcms/db-postgres": "workspace:*",
-    "drizzle-kit": "0.23.2-df9e596",
     "@playwright/test": "1.46.0",
     "@swc-node/register": "1.10.9",
     "@swc/cli": "0.4.0",
@@ -125,6 +126,7 @@
     "create-payload-app": "workspace:*",
     "cross-env": "7.0.3",
     "dotenv": "16.4.5",
+    "drizzle-kit": "0.23.2-df9e596",
     "drizzle-orm": "0.32.1",
     "escape-html": "^1.0.3",
     "execa": "5.1.1",
@@ -166,7 +168,6 @@
     "node": "^18.20.2 || >=20.9.0",
     "pnpm": "^9.7.0"
   },
-  "packageManager": "pnpm@9.7.0",
   "pnpm": {
     "allowedDeprecatedVersions": {
       "abab": "2",

packages/create-payload-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "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.84",
+  "version": "3.0.0-beta.88",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/db-postgres/package.json

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

packages/db-postgres/src/index.ts

@@ -32,28 +32,26 @@ import {
   updateOne,
   updateVersion,
 } from '@payloadcms/drizzle'
+import {
+  convertPathToJSONTraversal,
+  countDistinct,
+  createJSONQuery,
+  createMigration,
+  defaultDrizzleSnapshot,
+  deleteWhere,
+  dropDatabase,
+  execute,
+  getMigrationTemplate,
+  init,
+  insert,
+  requireDrizzleKit,
+} from '@payloadcms/drizzle/postgres'
 import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core'
 import { createDatabaseAdapter } from 'payload'
 
 import type { Args, PostgresAdapter } from './types.js'
 
 import { connect } from './connect.js'
-import { countDistinct } from './countDistinct.js'
-import { convertPathToJSONTraversal } from './createJSONQuery/convertPathToJSONTraversal.js'
-import { createJSONQuery } from './createJSONQuery/index.js'
-import { createMigration } from './createMigration.js'
-import { defaultDrizzleSnapshot } from './defaultSnapshot.js'
-import { deleteWhere } from './deleteWhere.js'
-import { dropDatabase } from './dropDatabase.js'
-import { execute } from './execute.js'
-import { getMigrationTemplate } from './getMigrationTemplate.js'
-import { init } from './init.js'
-import { insert } from './insert.js'
-import { requireDrizzleKit } from './requireDrizzleKit.js'
-
-export type { MigrateDownArgs, MigrateUpArgs } from './types.js'
-
-export { sql } from 'drizzle-orm'
 
 export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter> {
   const postgresIDType = args.idType || 'serial'
@@ -159,3 +157,6 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
     init: adapter,
   }
 }
+
+export type { MigrateDownArgs, MigrateUpArgs } from '@payloadcms/drizzle/postgres'
+export { sql } from 'drizzle-orm'

packages/db-postgres/src/types.ts

@@ -1,31 +1,14 @@
-import type { Operators } from '@payloadcms/drizzle'
 import type {
-  BuildQueryJoinAliases,
-  DrizzleAdapter,
-  TransactionPg,
-} from '@payloadcms/drizzle/types'
-import type { DrizzleSnapshotJSON } from 'drizzle-kit/api'
-import type {
-  ColumnBaseConfig,
-  ColumnDataType,
-  DrizzleConfig,
-  Relation,
-  Relations,
-  SQL,
-} from 'drizzle-orm'
-import type { NodePgDatabase } from 'drizzle-orm/node-postgres'
-import type {
-  PgColumn,
-  PgEnum,
-  PgInsertOnConflictDoUpdateConfig,
-  PgSchema,
-  PgTableWithColumns,
-  PgTransactionConfig,
-  pgEnum,
-} from 'drizzle-orm/pg-core'
-import type { PgTableFn } from 'drizzle-orm/pg-core/table'
-import type { Payload, PayloadRequest } from 'payload'
-import type { Pool, PoolConfig, QueryResult } from 'pg'
+  BasePostgresAdapter,
+  GenericEnum,
+  MigrateDownArgs,
+  MigrateUpArgs,
+  PostgresDB,
+} from '@payloadcms/drizzle/postgres'
+import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
+import type { DrizzleConfig } from 'drizzle-orm'
+import type { PgSchema, PgTableFn, PgTransactionConfig } from 'drizzle-orm/pg-core'
+import type { Pool, PoolConfig } from 'pg'
 
 export type Args = {
   idType?: 'serial' | 'uuid'
@@ -49,125 +32,10 @@ export type Args = {
   versionsSuffix?: string
 }
 
-export type GenericColumn = PgColumn<
-  ColumnBaseConfig<ColumnDataType, string>,
-  Record<string, unknown>
->
-
-export type GenericColumns = {
-  [x: string]: GenericColumn
-}
-
-export type GenericTable = PgTableWithColumns<{
-  columns: GenericColumns
-  dialect: string
-  name: string
-  schema: string
-}>
-
-export type GenericEnum = PgEnum<[string, ...string[]]>
-
-export type GenericRelation = Relations<string, Record<string, Relation<string>>>
-
-export type PostgresDB = NodePgDatabase<Record<string, unknown>>
-
-export type CountDistinct = (args: {
-  db: PostgresDB | TransactionPg
-  joins: BuildQueryJoinAliases
-  tableName: string
-  where: SQL
-}) => Promise<number>
-
-export type DeleteWhere = (args: {
-  db: PostgresDB | TransactionPg
-  tableName: string
-  where: SQL
-}) => Promise<void>
-
-export type DropDatabase = (args: { adapter: PostgresAdapter }) => Promise<void>
-
-export type Execute<T> = (args: {
-  db?: PostgresDB | TransactionPg
-  drizzle?: PostgresDB
-  raw?: string
-  sql?: SQL<unknown>
-}) => Promise<QueryResult<Record<string, T>>>
-
-export type Insert = (args: {
-  db: PostgresDB | TransactionPg
-  onConflictDoUpdate?: PgInsertOnConflictDoUpdateConfig<any>
-  tableName: string
-  values: Record<string, unknown> | Record<string, unknown>[]
-}) => Promise<Record<string, unknown>[]>
-
-type PostgresDrizzleAdapter = Omit<
-  DrizzleAdapter,
-  | 'countDistinct'
-  | 'deleteWhere'
-  | 'drizzle'
-  | 'dropDatabase'
-  | 'execute'
-  | 'insert'
-  | 'operators'
-  | 'relations'
->
-
-type Schema =
-  | {
-      enum: typeof pgEnum
-      table: PgTableFn
-    }
-  | PgSchema
-
 export type PostgresAdapter = {
-  countDistinct: CountDistinct
-  defaultDrizzleSnapshot: DrizzleSnapshotJSON
-  deleteWhere: DeleteWhere
-  drizzle: PostgresDB
-  dropDatabase: DropDatabase
-  enums: Record<string, GenericEnum>
-  execute: Execute<unknown>
-  /**
-   * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name
-   * Used for returning properly formed errors from unique fields
-   */
-  fieldConstraints: Record<string, Record<string, string>>
-  idType: Args['idType']
-  initializing: Promise<void>
-  insert: Insert
-  localesSuffix?: string
-  logger: DrizzleConfig['logger']
-  operators: Operators
-  pgSchema?: Schema
   pool: Pool
-  poolOptions: Args['pool']
-  prodMigrations?: {
-    down: (args: MigrateDownArgs) => Promise<void>
-    name: string
-    up: (args: MigrateUpArgs) => Promise<void>
-  }[]
-  push: boolean
-  rejectInitializing: () => void
-  relations: Record<string, GenericRelation>
-  relationshipsSuffix?: string
-  resolveInitializing: () => void
-  schemaName?: Args['schemaName']
-  sessions: {
-    [id: string]: {
-      db: PostgresDB | TransactionPg
-      reject: () => Promise<void>
-      resolve: () => Promise<void>
-    }
-  }
-  tableNameMap: Map<string, string>
-  tables: Record<string, GenericTable>
-  versionsSuffix?: string
-} & PostgresDrizzleAdapter
-
-export type IDType = 'integer' | 'numeric' | 'uuid' | 'varchar'
-
-export type MigrateUpArgs = { payload: Payload; req?: Partial<PayloadRequest> }
-export type MigrateDownArgs = { payload: Payload; req?: Partial<PayloadRequest> }
+  poolOptions: PoolConfig
+} & BasePostgresAdapter
 
 declare module 'payload' {
   export interface DatabaseAdapter

packages/db-sqlite/package.json

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

packages/drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -17,6 +17,11 @@
       "types": "./src/index.ts",
       "default": "./src/index.ts"
     },
+    "./postgres": {
+      "import": "./src/exports/postgres.ts",
+      "types": "./src/exports/postgres.ts",
+      "default": "./src/exports/postgres.ts"
+    },
     "./types": {
       "import": "./src/types.ts",
       "types": "./src/types.ts",
@@ -61,6 +66,11 @@
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       },
+      "./postgres": {
+        "import": "./dist/exports/postgres.js",
+        "types": "./dist/exports/postgres.d.ts",
+        "default": "./dist/exports/postgres.js"
+      },
       "./types": {
         "import": "./dist/types.js",
         "types": "./dist/types.d.ts",

packages/drizzle/src/exports/postgres.ts

@@ -0,0 +1,13 @@
+export { countDistinct } from '../postgres/countDistinct.js'
+export { convertPathToJSONTraversal } from '../postgres/createJSONQuery/convertPathToJSONTraversal.js'
+export { createJSONQuery } from '../postgres/createJSONQuery/index.js'
+export { createMigration } from '../postgres/createMigration.js'
+export { defaultDrizzleSnapshot } from '../postgres/defaultSnapshot.js'
+export { deleteWhere } from '../postgres/deleteWhere.js'
+export { dropDatabase } from '../postgres/dropDatabase.js'
+export { execute } from '../postgres/execute.js'
+export { getMigrationTemplate } from '../postgres/getMigrationTemplate.js'
+export { init } from '../postgres/init.js'
+export { insert } from '../postgres/insert.js'
+export { requireDrizzleKit } from '../postgres/requireDrizzleKit.js'
+export * from '../postgres/types.js'

packages/drizzle/src/postgres/countDistinct.ts

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

packages/drizzle/src/postgres/createMigration.ts

@@ -8,7 +8,7 @@ import { getPredefinedMigration, writeMigrationIndex } from 'payload'
 import prompts from 'prompts'
 import { fileURLToPath } from 'url'
 
-import type { PostgresAdapter } from './types.js'
+import type { BasePostgresAdapter } from './types.js'
 
 import { defaultDrizzleSnapshot } from './defaultSnapshot.js'
 import { getMigrationTemplate } from './getMigrationTemplate.js'
@@ -16,7 +16,7 @@ import { getMigrationTemplate } from './getMigrationTemplate.js'
 const require = createRequire(import.meta.url)
 
 export const createMigration: CreateMigration = async function createMigration(
-  this: PostgresAdapter,
+  this: BasePostgresAdapter,
   { file, forceAcceptWarning, migrationName, payload },
 ) {
   const filename = fileURLToPath(import.meta.url)

packages/drizzle/src/postgres/deleteWhere.ts

@@ -1,5 +1,4 @@
-import type { TransactionPg } from '@payloadcms/drizzle/types'
-
+import type { TransactionPg } from '../types.js'
 import type { DeleteWhere } from './types.js'
 
 export const deleteWhere: DeleteWhere = async function deleteWhere({ db, tableName, where }) {

packages/drizzle/src/postgres/init.ts

@@ -1,16 +1,15 @@
 import type { Init, SanitizedCollectionConfig } from 'payload'
 
-import { createTableName } from '@payloadcms/drizzle'
 import { uniqueIndex } from 'drizzle-orm/pg-core'
 import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
-import type { BaseExtraConfig } from './schema/build.js'
-import type { PostgresAdapter } from './types.js'
+import type { BaseExtraConfig, BasePostgresAdapter } from './types.js'
 
+import { createTableName } from '../createTableName.js'
 import { buildTable } from './schema/build.js'
 
-export const init: Init = function init(this: PostgresAdapter) {
+export const init: Init = function init(this: BasePostgresAdapter) {
   if (this.payload.config.localization) {
     this.enums.enum__locales = this.pgSchema.enum(
       '_locales',

packages/drizzle/src/postgres/insert.ts

@@ -1,5 +1,4 @@
-import type { TransactionPg } from '@payloadcms/drizzle/types'
-
+import type { TransactionPg } from '../types.js'
 import type { Insert } from './types.js'
 
 export const insert: Insert = async function insert({

packages/drizzle/src/postgres/requireDrizzleKit.ts

@@ -1,5 +1,6 @@
-import type { RequireDrizzleKit } from '@payloadcms/drizzle/types'
-
 import { createRequire } from 'module'
+
+import type { RequireDrizzleKit } from '../types.js'
+
 const require = createRequire(import.meta.url)
 export const requireDrizzleKit: RequireDrizzleKit = () => require('drizzle-kit/api')

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

@@ -4,11 +4,9 @@ import type {
   IndexBuilder,
   PgColumnBuilder,
   PgTableWithColumns,
-  UniqueConstraintBuilder,
 } from 'drizzle-orm/pg-core'
 import type { Field } from 'payload'
 
-import { createTableName } from '@payloadcms/drizzle'
 import { relations } from 'drizzle-orm'
 import {
   foreignKey,
@@ -22,21 +20,22 @@ import {
 } from 'drizzle-orm/pg-core'
 import toSnakeCase from 'to-snake-case'
 
-import type { GenericColumns, GenericTable, IDType, PostgresAdapter } from '../types.js'
+import type {
+  BaseExtraConfig,
+  BasePostgresAdapter,
+  GenericColumns,
+  GenericTable,
+  IDType,
+  RelationMap,
+} from '../types.js'
 
+import { createTableName } from '../../createTableName.js'
 import { parentIDColumnMap } from './parentIDColumnMap.js'
 import { setColumnID } from './setColumnID.js'
 import { traverseFields } from './traverseFields.js'
 
-export type BaseExtraConfig = Record<
-  string,
-  (cols: GenericColumns) => ForeignKeyBuilder | IndexBuilder | UniqueConstraintBuilder
->
-
-export type RelationMap = Map<string, { localized: boolean; target: string; type: 'many' | 'one' }>
-
 type Args = {
-  adapter: PostgresAdapter
+  adapter: BasePostgresAdapter
   baseColumns?: Record<string, PgColumnBuilder>
   /**
    * After table is created, run these functions to add extra config to the table

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

@@ -4,9 +4,13 @@ import { numeric, serial, uuid, varchar } from 'drizzle-orm/pg-core'
 import { type Field, flattenTopLevelFields } from 'payload'
 import { fieldAffectsData } from 'payload/shared'
 
-import type { IDType, PostgresAdapter } from '../types.js'
+import type { BasePostgresAdapter, IDType } from '../types.js'
 
-type Args = { adapter: PostgresAdapter; columns: Record<string, PgColumnBuilder>; fields: Field[] }
+type Args = {
+  adapter: BasePostgresAdapter
+  columns: Record<string, PgColumnBuilder>
+  fields: Field[]
+}
 export const setColumnID = ({ adapter, columns, fields }: Args): IDType => {
   const idField = flattenTopLevelFields(fields).find(
     (field) => fieldAffectsData(field) && field.name === 'id',

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

@@ -2,11 +2,6 @@ import type { Relation } from 'drizzle-orm'
 import type { IndexBuilder, PgColumnBuilder } from 'drizzle-orm/pg-core'
 import type { Field, TabAsField } from 'payload'
 
-import {
-  createTableName,
-  hasLocalesTable,
-  validateExistingBlockIsIdentical,
-} from '@payloadcms/drizzle'
 import { relations } from 'drizzle-orm'
 import {
   PgNumericBuilder,
@@ -26,9 +21,17 @@ import { InvalidConfiguration } from 'payload'
 import { fieldAffectsData, optionIsObject } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 
-import type { GenericColumns, IDType, PostgresAdapter } from '../types.js'
-import type { BaseExtraConfig, RelationMap } from './build.js'
+import type {
+  BaseExtraConfig,
+  BasePostgresAdapter,
+  GenericColumns,
+  IDType,
+  RelationMap,
+} from '../types.js'
 
+import { createTableName } from '../../createTableName.js'
+import { hasLocalesTable } from '../../utilities/hasLocalesTable.js'
+import { validateExistingBlockIsIdentical } from '../../utilities/validateExistingBlockIsIdentical.js'
 import { buildTable } from './build.js'
 import { createIndex } from './createIndex.js'
 import { idToUUID } from './idToUUID.js'
@@ -36,7 +39,7 @@ import { parentIDColumnMap } from './parentIDColumnMap.js'
 import { withDefault } from './withDefault.js'
 
 type Args = {
-  adapter: PostgresAdapter
+  adapter: BasePostgresAdapter
   columnPrefix?: string
   columns: Record<string, PgColumnBuilder>
   disableNotNull: boolean

packages/drizzle/src/postgres/types.ts

@@ -0,0 +1,154 @@
+import type { DrizzleSnapshotJSON } from 'drizzle-kit/api'
+import type {
+  ColumnBaseConfig,
+  ColumnDataType,
+  DrizzleConfig,
+  Relation,
+  Relations,
+  SQL,
+} from 'drizzle-orm'
+import type { NodePgDatabase } from 'drizzle-orm/node-postgres'
+import type {
+  ForeignKeyBuilder,
+  IndexBuilder,
+  PgColumn,
+  PgEnum,
+  PgInsertOnConflictDoUpdateConfig,
+  PgSchema,
+  PgTableWithColumns,
+  UniqueConstraintBuilder,
+  pgEnum,
+} from 'drizzle-orm/pg-core'
+import type { PgTableFn } from 'drizzle-orm/pg-core/table'
+import type { Payload, PayloadRequest } from 'payload'
+import type { QueryResult } from 'pg'
+
+import type { Operators } from '../index.js'
+import type { BuildQueryJoinAliases, DrizzleAdapter, TransactionPg } from '../types.js'
+
+export type BaseExtraConfig = Record<
+  string,
+  (cols: GenericColumns) => ForeignKeyBuilder | IndexBuilder | UniqueConstraintBuilder
+>
+
+export type RelationMap = Map<string, { localized: boolean; target: string; type: 'many' | 'one' }>
+
+export type GenericColumn = PgColumn<
+  ColumnBaseConfig<ColumnDataType, string>,
+  Record<string, unknown>
+>
+
+export type GenericColumns = {
+  [x: string]: GenericColumn
+}
+
+export type GenericTable = PgTableWithColumns<{
+  columns: GenericColumns
+  dialect: string
+  name: string
+  schema: string
+}>
+
+export type GenericEnum = PgEnum<[string, ...string[]]>
+
+export type GenericRelation = Relations<string, Record<string, Relation<string>>>
+
+export type PostgresDB = NodePgDatabase<Record<string, unknown>>
+
+export type CountDistinct = (args: {
+  db: PostgresDB | TransactionPg
+  joins: BuildQueryJoinAliases
+  tableName: string
+  where: SQL
+}) => Promise<number>
+
+export type DeleteWhere = (args: {
+  db: PostgresDB | TransactionPg
+  tableName: string
+  where: SQL
+}) => Promise<void>
+
+export type DropDatabase = (args: { adapter: BasePostgresAdapter }) => Promise<void>
+
+export type Execute<T> = (args: {
+  db?: PostgresDB | TransactionPg
+  drizzle?: PostgresDB
+  raw?: string
+  sql?: SQL<unknown>
+}) => Promise<QueryResult<Record<string, T>>>
+
+export type Insert = (args: {
+  db: PostgresDB | TransactionPg
+  onConflictDoUpdate?: PgInsertOnConflictDoUpdateConfig<any>
+  tableName: string
+  values: Record<string, unknown> | Record<string, unknown>[]
+}) => Promise<Record<string, unknown>[]>
+
+type Schema =
+  | {
+      enum: typeof pgEnum
+      table: PgTableFn
+    }
+  | PgSchema
+
+export type BasePostgresAdapter = {
+  countDistinct: CountDistinct
+  defaultDrizzleSnapshot: DrizzleSnapshotJSON
+  deleteWhere: DeleteWhere
+  drizzle: PostgresDB
+  dropDatabase: DropDatabase
+  enums: Record<string, GenericEnum>
+  execute: Execute<unknown>
+  /**
+   * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name
+   * Used for returning properly formed errors from unique fields
+   */
+  fieldConstraints: Record<string, Record<string, string>>
+  idType: 'serial' | 'uuid'
+  initializing: Promise<void>
+  insert: Insert
+  localesSuffix?: string
+  logger: DrizzleConfig['logger']
+  operators: Operators
+  pgSchema?: Schema
+  // pool: Pool
+  // poolOptions: Args['pool']
+  prodMigrations?: {
+    down: (args: MigrateDownArgs) => Promise<void>
+    name: string
+    up: (args: MigrateUpArgs) => Promise<void>
+  }[]
+  push: boolean
+  rejectInitializing: () => void
+  relations: Record<string, GenericRelation>
+  relationshipsSuffix?: string
+  resolveInitializing: () => void
+  schemaName?: string
+  sessions: {
+    [id: string]: {
+      db: PostgresDB | TransactionPg
+      reject: () => Promise<void>
+      resolve: () => Promise<void>
+    }
+  }
+  tableNameMap: Map<string, string>
+  tables: Record<string, GenericTable>
+  versionsSuffix?: string
+} & PostgresDrizzleAdapter
+
+export type PostgresDrizzleAdapter = Omit<
+  DrizzleAdapter,
+  | 'countDistinct'
+  | 'deleteWhere'
+  | 'drizzle'
+  | 'dropDatabase'
+  | 'execute'
+  | 'insert'
+  | 'operators'
+  | 'relations'
+>
+
+export type IDType = 'integer' | 'numeric' | 'uuid' | 'varchar'
+
+export type MigrateUpArgs = { payload: Payload; req?: Partial<PayloadRequest> }
+export type MigrateDownArgs = { payload: Payload; req?: Partial<PayloadRequest> }

packages/email-nodemailer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-nodemailer",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "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.84",
+  "version": "3.0.0-beta.88",
   "description": "Payload Resend Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/graphql",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -43,8 +43,8 @@
   "dependencies": {
     "graphql-scalars": "1.22.2",
     "pluralize": "8.0.0",
-    "tsx": "4.17.0",
-    "ts-essentials": "7.0.3"
+    "ts-essentials": "7.0.3",
+    "tsx": "4.17.0"
   },
   "devDependencies": {
     "@payloadcms/eslint-config": "workspace:*",

packages/live-preview-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/live-preview-react",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "description": "The official React SDK for Payload Live Preview",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/live-preview-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/live-preview-vue",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "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.84",
+  "version": "3.0.0-beta.88",
   "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.84",
+  "version": "3.0.0-beta.88",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

packages/next/src/elements/DocumentHeader/Tabs/index.tsx

@@ -7,7 +7,6 @@ import type {
 } from 'payload'
 
 import { RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared'
-import { isPlainObject } from 'payload'
 import React from 'react'
 
 import { ShouldRenderTabs } from './ShouldRenderTabs.js'

packages/next/src/elements/DocumentHeader/index.scss

@@ -27,7 +27,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     margin: 0;
-    padding-bottom: base(0.2);
+    padding-bottom: base(0.4);
     line-height: 1;
     vertical-align: top;
   }

packages/next/src/utilities/getPayloadHMR.ts

@@ -14,7 +14,11 @@ if (!cached) {
   cached = global._payload = { payload: null, promise: null, reload: false, ws: null }
 }
 
-export const reload = async (config: SanitizedConfig, payload: Payload): Promise<void> => {
+export const reload = async (
+  config: SanitizedConfig,
+  payload: Payload,
+  skipImportMapGeneration?: boolean,
+): Promise<void> => {
   if (typeof payload.db.destroy === 'function') {
     await payload.db.destroy()
   }
@@ -46,7 +50,7 @@ export const reload = async (config: SanitizedConfig, payload: Payload): Promise
   }
 
   // Generate component map
-  if (config.admin?.importMap?.autoGenerate !== false) {
+  if (skipImportMapGeneration !== true && config.admin?.importMap?.autoGenerate !== false) {
     await generateImportMap(config, {
       log: true,
     })
@@ -87,6 +91,7 @@ export const getPayloadHMR = async (options: InitOptions): Promise<Payload> => {
     return cached.payload
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   if (!cached.promise) {
     // no need to await options.config here, as it's already awaited in the BasePayload.init
     cached.promise = new BasePayload().init(options)

packages/next/src/utilities/meta.ts

@@ -45,7 +45,7 @@ export const meta = async (args: { serverURL: string } & MetaConfig): Promise<an
     icons = customIcons
   }
 
-  const metaTitle = `${title} ${titleSuffix}`
+  const metaTitle = [title, titleSuffix].filter(Boolean).join(' ')
 
   const ogTitle = `${typeof openGraphFromProps?.title === 'string' ? openGraphFromProps.title : title} ${titleSuffix}`
 

packages/next/src/views/API/meta.ts

@@ -16,18 +16,25 @@ export const generateMetadata: GenerateEditViewMetadata = async ({
       ? getTranslation(globalConfig.label, i18n)
       : ''
 
-  const metaTitle = `API - ${entityLabel}`
-  const description = `API - ${entityLabel}`
-
   return Promise.resolve(
     meta({
       ...(config.admin.meta || {}),
-      description,
+      description: `API - ${entityLabel}`,
       keywords: 'API',
       serverURL: config.serverURL,
-      title: metaTitle,
-      ...(collectionConfig?.admin.meta || {}),
-      ...(globalConfig?.admin.meta || {}),
+      title: `API - ${entityLabel}`,
+      ...(collectionConfig
+        ? {
+            ...(collectionConfig?.admin.meta || {}),
+            ...(collectionConfig?.admin?.components?.views?.edit?.api?.meta || {}),
+          }
+        : {}),
+      ...(globalConfig
+        ? {
+            ...(globalConfig?.admin.meta || {}),
+            ...(globalConfig?.admin?.components?.views?.edit?.api?.meta || {}),
+          }
+        : {}),
     }),
   )
 }

packages/next/src/views/Account/Settings/index.tsx

@@ -11,9 +11,9 @@ import './index.scss'
 const baseClass = 'payload-settings'
 
 export const Settings: React.FC<{
-  className?: string
-  i18n: I18n
-  languageOptions: LanguageOptions
+  readonly className?: string
+  readonly i18n: I18n
+  readonly languageOptions: LanguageOptions
 }> = (props) => {
   const { className, i18n, languageOptions } = props
 
@@ -21,7 +21,7 @@ export const Settings: React.FC<{
     <div className={[baseClass, className].filter(Boolean).join(' ')}>
       <h3>{i18n.t('general:payloadSettings')}</h3>
       <div className={`${baseClass}__language`}>
-        <FieldLabel htmlFor="language-select" label={i18n.t('general:language')} />
+        <FieldLabel field={null} htmlFor="language-select" label={i18n.t('general:language')} />
         <LanguageSelector languageOptions={languageOptions} />
       </div>
       <ToggleTheme />

packages/next/src/views/Document/getCustomViewByRoute.tsx

@@ -12,25 +12,42 @@ export const getCustomViewByRoute = ({
   views:
     | SanitizedCollectionConfig['admin']['components']['views']
     | SanitizedGlobalConfig['admin']['components']['views']
-}): EditViewComponent => {
-  if (typeof views?.edit === 'object' && typeof views?.edit !== 'function') {
-    const foundViewConfig = Object.entries(views.edit).find(([, view]) => {
-      if (typeof view === 'object' && typeof view !== 'function' && 'path' in view) {
+}): {
+  Component: EditViewComponent
+  viewKey?: string
+} => {
+  if (typeof views?.edit === 'object') {
+    let viewKey: string
+
+    const foundViewConfig = Object.entries(views.edit).find(([key, view]) => {
+      if (typeof view === 'object' && 'path' in view) {
         const viewPath = `${baseRoute}${view.path}`
 
-        return isPathMatchingRoute({
+        const isMatching = isPathMatchingRoute({
           currentRoute,
           exact: true,
           path: viewPath,
         })
+
+        if (isMatching) {
+          viewKey = key
+        }
+
+        return isMatching
       }
+
       return false
     })?.[1]
 
     if (foundViewConfig && 'Component' in foundViewConfig) {
-      return foundViewConfig.Component
+      return {
+        Component: foundViewConfig.Component,
+        viewKey,
+      }
     }
   }
 
-  return null
+  return {
+    Component: null,
+  }
 }

packages/next/src/views/Document/getMetaBySegment.tsx

@@ -1,5 +1,5 @@
 import type { Metadata } from 'next'
-import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'
+import type { EditConfig, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'
 
 import type { GenerateViewMetadata } from '../Root/index.js'
 
@@ -10,11 +10,13 @@ import { generateMetadata as livePreviewMeta } from '../LivePreview/meta.js'
 import { generateNotFoundMeta } from '../NotFound/meta.js'
 import { generateMetadata as versionMeta } from '../Version/meta.js'
 import { generateMetadata as versionsMeta } from '../Versions/meta.js'
+import { getViewsFromConfig } from './getViewsFromConfig.js'
 
 export type GenerateEditViewMetadata = (
   args: {
     collectionConfig?: SanitizedCollectionConfig | null
     globalConfig?: SanitizedGlobalConfig | null
+    view?: keyof EditConfig
   } & Parameters<GenerateViewMetadata>[0],
 ) => Promise<Metadata>
 
@@ -36,54 +38,71 @@ export const getMetaBySegment: GenerateEditViewMetadata = async ({
     isGlobal || Boolean(isCollection && segments?.length > 2 && segments[2] !== 'create')
 
   if (isCollection) {
-    // `/:id`
+    // `/:collection/:id`
     if (params.segments.length === 3) {
       fn = editMeta
     }
 
-    // `/:id/api`
-    if (params.segments.length === 4 && params.segments[3] === 'api') {
-      fn = apiMeta
+    // `/:collection/:id/:view`
+    if (params.segments.length === 4) {
+      switch (params.segments[3]) {
+        case 'api':
+          // `/:collection/:id/api`
+          fn = apiMeta
+          break
+        case 'preview':
+          // `/:collection/:id/preview`
+          fn = livePreviewMeta
+          break
+        case 'versions':
+          // `/:collection/:id/versions`
+          fn = versionsMeta
+          break
+        default:
+          break
+      }
     }
 
-    // `/:id/preview`
-    if (params.segments.length === 4 && params.segments[3] === 'preview') {
-      fn = livePreviewMeta
-    }
-
-    // `/:id/versions`
-    if (params.segments.length === 4 && params.segments[3] === 'versions') {
-      fn = versionsMeta
-    }
-
-    // `/:id/versions/:version`
-    if (params.segments.length === 5 && params.segments[3] === 'versions') {
-      fn = versionMeta
+    // `/:collection/:id/:slug-1/:slug-2`
+    if (params.segments.length === 5) {
+      switch (params.segments[3]) {
+        case 'versions':
+          // `/:collection/:id/versions/:version`
+          fn = versionMeta
+          break
+        default:
+          break
+      }
     }
   }
 
   if (isGlobal) {
-    // `/:slug`
+    // `/:global`
     if (params.segments?.length === 2) {
       fn = editMeta
     }
 
-    // `/:slug/api`
-    if (params.segments?.length === 3 && params.segments[2] === 'api') {
-      fn = apiMeta
+    // `/:global/:view`
+    if (params.segments?.length === 3) {
+      switch (params.segments[2]) {
+        case 'api':
+          // `/:global/api`
+          fn = apiMeta
+          break
+        case 'preview':
+          // `/:global/preview`
+          fn = livePreviewMeta
+          break
+        case 'versions':
+          // `/:global/versions`
+          fn = versionsMeta
+          break
+        default:
+          break
+      }
     }
 
-    // `/:slug/preview`
-    if (params.segments?.length === 3 && params.segments[2] === 'preview') {
-      fn = livePreviewMeta
-    }
-
-    // `/:slug/versions`
-    if (params.segments?.length === 3 && params.segments[2] === 'versions') {
-      fn = versionsMeta
-    }
-
-    // `/:slug/versions/:version`
+    // `/:global/versions/:version`
     if (params.segments?.length === 4 && params.segments[2] === 'versions') {
       fn = versionMeta
     }
@@ -101,6 +120,31 @@ export const getMetaBySegment: GenerateEditViewMetadata = async ({
       i18n,
       isEditing,
     })
+  } else {
+    const { viewKey } = getViewsFromConfig({
+      collectionConfig,
+      config,
+      globalConfig,
+      overrideDocPermissions: true,
+      routeSegments: typeof segments === 'string' ? [segments] : segments,
+    })
+
+    if (viewKey) {
+      const customViewConfig =
+        collectionConfig?.admin?.components?.views?.edit?.[viewKey] ||
+        globalConfig?.admin?.components?.views?.edit?.[viewKey]
+
+      if (customViewConfig) {
+        return editMeta({
+          collectionConfig,
+          config,
+          globalConfig,
+          i18n,
+          isEditing,
+          view: viewKey as keyof EditConfig,
+        })
+      }
+    }
   }
 
   return generateNotFoundMeta({ config, i18n })

packages/next/src/views/Document/getViewsFromConfig.tsx

@@ -31,25 +31,36 @@ export const getViewsFromConfig = ({
   config,
   docPermissions,
   globalConfig,
+  overrideDocPermissions,
   routeSegments,
 }: {
   collectionConfig?: SanitizedCollectionConfig
   config: SanitizedConfig
-  docPermissions: CollectionPermission | GlobalPermission
   globalConfig?: SanitizedGlobalConfig
   routeSegments: string[]
-}): {
+} & (
+  | {
+      docPermissions: CollectionPermission | GlobalPermission
+      overrideDocPermissions?: false | undefined
+    }
+  | {
+      docPermissions?: never
+      overrideDocPermissions: true
+    }
+)): {
   CustomView: ViewFromConfig<ServerSideEditViewProps>
   DefaultView: ViewFromConfig<ServerSideEditViewProps>
   /**
    * The error view to display if CustomView or DefaultView do not exist (could be either due to not found, or unauthorized). Can be null
    */
   ErrorView: ViewFromConfig<AdminViewProps>
+  viewKey: string
 } | null => {
   // Conditionally import and lazy load the default view
   let DefaultView: ViewFromConfig<ServerSideEditViewProps> = null
   let CustomView: ViewFromConfig<ServerSideEditViewProps> = null
   let ErrorView: ViewFromConfig<AdminViewProps> = null
+  let viewKey: string
 
   const {
     routes: { admin: adminRoute },
@@ -69,7 +80,7 @@ export const getViewsFromConfig = ({
     const [collectionEntity, collectionSlug, segment3, segment4, segment5, ...remainingSegments] =
       routeSegments
 
-    if (!docPermissions?.read?.permission) {
+    if (!overrideDocPermissions && !docPermissions?.read?.permission) {
       notFound()
     } else {
       // `../:id`, or `../create`
@@ -77,7 +88,11 @@ export const getViewsFromConfig = ({
         case 3: {
           switch (segment3) {
             case 'create': {
-              if ('create' in docPermissions && docPermissions?.create?.permission) {
+              if (
+                !overrideDocPermissions &&
+                'create' in docPermissions &&
+                docPermissions?.create?.permission
+              ) {
                 CustomView = {
                   payloadComponent: getCustomViewByKey(views, 'default'),
                 }
@@ -93,12 +108,42 @@ export const getViewsFromConfig = ({
             }
 
             default: {
-              CustomView = {
-                payloadComponent: getCustomViewByKey(views, 'default'),
-              }
-              DefaultView = {
-                Component: DefaultEditView,
+              const baseRoute = [
+                adminRoute !== '/' && adminRoute,
+                'collections',
+                collectionSlug,
+                segment3,
+              ]
+                .filter(Boolean)
+                .join('/')
+
+              const currentRoute = [baseRoute, segment4, segment5, ...remainingSegments]
+                .filter(Boolean)
+                .join('/')
+
+              const { Component: CustomViewComponent, viewKey: customViewKey } =
+                getCustomViewByRoute({
+                  baseRoute,
+                  currentRoute,
+                  views,
+                })
+
+              if (customViewKey) {
+                viewKey = customViewKey
+
+                CustomView = {
+                  payloadComponent: CustomViewComponent,
+                }
+              } else {
+                CustomView = {
+                  payloadComponent: getCustomViewByKey(views, 'default'),
+                }
+
+                DefaultView = {
+                  Component: DefaultEditView,
+                }
               }
+
               break
             }
           }
@@ -130,7 +175,7 @@ export const getViewsFromConfig = ({
             }
 
             case 'versions': {
-              if (docPermissions?.readVersions?.permission) {
+              if (!overrideDocPermissions && docPermissions?.readVersions?.permission) {
                 CustomView = {
                   payloadComponent: getCustomViewByKey(views, 'versions'),
                 }
@@ -159,13 +204,21 @@ export const getViewsFromConfig = ({
                 .filter(Boolean)
                 .join('/')
 
-              CustomView = {
-                payloadComponent: getCustomViewByRoute({
+              const { Component: CustomViewComponent, viewKey: customViewKey } =
+                getCustomViewByRoute({
                   baseRoute,
                   currentRoute,
                   views,
-                }),
+                })
+
+              if (customViewKey) {
+                viewKey = customViewKey
+
+                CustomView = {
+                  payloadComponent: CustomViewComponent,
+                }
               }
+
               break
             }
           }
@@ -175,7 +228,7 @@ export const getViewsFromConfig = ({
         // `../:id/versions/:version`, etc
         default: {
           if (segment4 === 'versions') {
-            if (docPermissions?.readVersions?.permission) {
+            if (!overrideDocPermissions && docPermissions?.readVersions?.permission) {
               CustomView = {
                 payloadComponent: getCustomViewByKey(views, 'version'),
               }
@@ -201,14 +254,23 @@ export const getViewsFromConfig = ({
               .filter(Boolean)
               .join('/')
 
-            CustomView = {
-              payloadComponent: getCustomViewByRoute({
+            const { Component: CustomViewComponent, viewKey: customViewKey } = getCustomViewByRoute(
+              {
                 baseRoute,
                 currentRoute,
                 views,
-              }),
+              },
+            )
+
+            if (customViewKey) {
+              viewKey = customViewKey
+
+              CustomView = {
+                payloadComponent: CustomViewComponent,
+              }
             }
           }
+
           break
         }
       }
@@ -218,7 +280,7 @@ export const getViewsFromConfig = ({
   if (globalConfig) {
     const [globalEntity, globalSlug, segment3, ...remainingSegments] = routeSegments
 
-    if (!docPermissions?.read?.permission) {
+    if (!overrideDocPermissions && !docPermissions?.read?.permission) {
       notFound()
     } else {
       switch (routeSegments.length) {
@@ -257,10 +319,11 @@ export const getViewsFromConfig = ({
             }
 
             case 'versions': {
-              if (docPermissions?.readVersions?.permission) {
+              if (!overrideDocPermissions && docPermissions?.readVersions?.permission) {
                 CustomView = {
                   payloadComponent: getCustomViewByKey(views, 'versions'),
                 }
+
                 DefaultView = {
                   Component: DefaultVersionsView,
                 }
@@ -273,7 +336,7 @@ export const getViewsFromConfig = ({
             }
 
             default: {
-              if (docPermissions?.read?.permission) {
+              if (!overrideDocPermissions && docPermissions?.read?.permission) {
                 const baseRoute = [adminRoute, globalEntity, globalSlug, segment3]
                   .filter(Boolean)
                   .join('/')
@@ -282,15 +345,23 @@ export const getViewsFromConfig = ({
                   .filter(Boolean)
                   .join('/')
 
-                CustomView = {
-                  payloadComponent: getCustomViewByRoute({
+                const { Component: CustomViewComponent, viewKey: customViewKey } =
+                  getCustomViewByRoute({
                     baseRoute,
                     currentRoute,
                     views,
-                  }),
-                }
-                DefaultView = {
-                  Component: DefaultEditView,
+                  })
+
+                if (customViewKey) {
+                  viewKey = customViewKey
+
+                  CustomView = {
+                    payloadComponent: CustomViewComponent,
+                  }
+                } else {
+                  DefaultView = {
+                    Component: DefaultEditView,
+                  }
                 }
               } else {
                 ErrorView = {
@@ -306,7 +377,7 @@ export const getViewsFromConfig = ({
         default: {
           // `../:slug/versions/:version`, etc
           if (segment3 === 'versions') {
-            if (docPermissions?.readVersions?.permission) {
+            if (!overrideDocPermissions && docPermissions?.readVersions?.permission) {
               CustomView = {
                 payloadComponent: getCustomViewByKey(views, 'version'),
               }
@@ -327,14 +398,23 @@ export const getViewsFromConfig = ({
               .filter(Boolean)
               .join('/')
 
-            CustomView = {
-              payloadComponent: getCustomViewByRoute({
+            const { Component: CustomViewComponent, viewKey: customViewKey } = getCustomViewByRoute(
+              {
                 baseRoute,
                 currentRoute,
                 views,
-              }),
+              },
+            )
+
+            if (customViewKey) {
+              viewKey = customViewKey
+
+              CustomView = {
+                payloadComponent: CustomViewComponent,
+              }
             }
           }
+
           break
         }
       }
@@ -345,5 +425,6 @@ export const getViewsFromConfig = ({
     CustomView,
     DefaultView,
     ErrorView,
+    viewKey,
   }
 }

packages/next/src/views/Edit/Default/Auth/APIKey.tsx

@@ -129,6 +129,7 @@ export const APIKey: React.FC<{ readonly enabled: boolean; readonly readOnly?: b
             Component: null,
             RenderedComponent: APIKeyLabel,
           }}
+          field={null}
           htmlFor={path}
         />
         <input

packages/next/src/views/Edit/meta.ts

@@ -1,4 +1,5 @@
 import type { Metadata } from 'next'
+import type { MetaConfig } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
 
@@ -12,6 +13,7 @@ export const generateMetadata: GenerateEditViewMetadata = async ({
   globalConfig,
   i18n,
   isEditing,
+  view = 'default',
 }): Promise<Metadata> => {
   const { t } = i18n
 
@@ -21,34 +23,45 @@ export const generateMetadata: GenerateEditViewMetadata = async ({
       ? getTranslation(globalConfig.label, i18n)
       : ''
 
-  const metaTitle = `${isEditing ? t('general:editing') : t('general:creating')} - ${entityLabel}`
+  const metaToUse: MetaConfig = {
+    ...(config.admin.meta || {}),
+    description: `${isEditing ? t('general:editing') : t('general:creating')} - ${entityLabel}`,
+    keywords: `${entityLabel}, Payload, CMS`,
+    title: `${isEditing ? t('general:editing') : t('general:creating')} - ${entityLabel}`,
+  }
 
-  const ogTitle = `${isEditing ? t('general:edit') : t('general:edit')} - ${entityLabel}`
-
-  const description = `${isEditing ? t('general:editing') : t('general:creating')} - ${entityLabel}`
-
-  const keywords = `${entityLabel}, Payload, CMS`
-
-  const baseOGOverrides = config.admin.meta.openGraph || {}
-
-  const entityOGOverrides = collectionConfig
-    ? collectionConfig.admin?.meta?.openGraph
-    : globalConfig
-      ? globalConfig.admin?.meta?.openGraph
-      : {}
+  const ogToUse: MetaConfig['openGraph'] = {
+    title: `${isEditing ? t('general:edit') : t('general:edit')} - ${entityLabel}`,
+    ...(config.admin.meta.openGraph || {}),
+    ...(collectionConfig
+      ? {
+          ...(collectionConfig?.admin.meta?.openGraph || {}),
+          ...(collectionConfig?.admin?.components?.views?.edit?.[view]?.meta?.openGraph || {}),
+        }
+      : {}),
+    ...(globalConfig
+      ? {
+          ...(globalConfig?.admin.meta?.openGraph || {}),
+          ...(globalConfig?.admin?.components?.views?.edit?.[view]?.meta?.openGraph || {}),
+        }
+      : {}),
+  }
 
   return meta({
-    ...(config.admin.meta || {}),
-    description,
-    keywords,
-    openGraph: {
-      title: ogTitle,
-      ...baseOGOverrides,
-      ...entityOGOverrides,
-    },
-    ...(collectionConfig?.admin.meta || {}),
-    ...(globalConfig?.admin.meta || {}),
+    ...metaToUse,
+    openGraph: ogToUse,
+    ...(collectionConfig
+      ? {
+          ...(collectionConfig?.admin.meta || {}),
+          ...(collectionConfig?.admin?.components?.views?.edit?.[view]?.meta || {}),
+        }
+      : {}),
+    ...(globalConfig
+      ? {
+          ...(globalConfig?.admin.meta || {}),
+          ...(globalConfig?.admin?.components?.views?.edit?.[view]?.meta || {}),
+        }
+      : {}),
     serverURL: config.serverURL,
-    title: metaTitle,
   })
 }

packages/next/src/views/LivePreview/meta.ts

@@ -17,4 +17,5 @@ export const generateMetadata: GenerateEditViewMetadata = async ({
     globalConfig,
     i18n,
     isEditing,
+    view: 'livePreview',
   })

packages/next/src/views/Root/generateCustomViewMetadata.ts

@@ -0,0 +1,42 @@
+import type { I18nClient } from '@payloadcms/translations'
+import type { Metadata } from 'next'
+import type {
+  AdminViewConfig,
+  SanitizedCollectionConfig,
+  SanitizedConfig,
+  SanitizedGlobalConfig,
+} from 'payload'
+
+import { meta } from '../../utilities/meta.js'
+
+export const generateCustomViewMetadata = async (args: {
+  collectionConfig?: SanitizedCollectionConfig
+  config: SanitizedConfig
+  globalConfig?: SanitizedGlobalConfig
+  i18n: I18nClient
+  viewConfig: AdminViewConfig
+}): Promise<Metadata> => {
+  const {
+    config,
+    // i18n: { t },
+    viewConfig,
+  } = args
+
+  if (!viewConfig) {
+    return null
+  }
+
+  return meta({
+    description: `Payload`,
+    keywords: `Payload`,
+    serverURL: config.serverURL,
+    title: 'Payload',
+    ...(config.admin.meta || {}),
+    ...(viewConfig.meta || {}),
+    openGraph: {
+      title: 'Payload',
+      ...(config.admin.meta?.openGraph || {}),
+      ...(viewConfig.meta?.openGraph || {}),
+    },
+  })
+}

packages/next/src/views/Root/getCustomViewByRoute.ts

@@ -0,0 +1,65 @@
+import type { AdminViewConfig, SanitizedConfig } from 'payload'
+
+import type { ViewFromConfig } from './getViewFromConfig.js'
+
+import { isPathMatchingRoute } from './isPathMatchingRoute.js'
+
+export const getCustomViewByRoute = ({
+  config,
+  currentRoute: currentRouteWithAdmin,
+}: {
+  config: SanitizedConfig
+  currentRoute: string
+}): {
+  view: ViewFromConfig
+  viewConfig: AdminViewConfig
+  viewKey: string
+} => {
+  const {
+    admin: {
+      components: { views },
+    },
+    routes: { admin: adminRoute },
+  } = config
+
+  const currentRoute = currentRouteWithAdmin.replace(adminRoute, '')
+  let viewKey: string
+
+  const foundViewConfig =
+    (views &&
+      typeof views === 'object' &&
+      Object.entries(views).find(([key, view]) => {
+        const isMatching = isPathMatchingRoute({
+          currentRoute,
+          exact: view.exact,
+          path: view.path,
+          sensitive: view.sensitive,
+          strict: view.strict,
+        })
+
+        if (isMatching) {
+          viewKey = key
+        }
+
+        return isMatching
+      })?.[1]) ||
+    undefined
+
+  if (!foundViewConfig) {
+    return {
+      view: {
+        Component: null,
+      },
+      viewConfig: null,
+      viewKey: null,
+    }
+  }
+
+  return {
+    view: {
+      payloadComponent: foundViewConfig.Component,
+    },
+    viewConfig: foundViewConfig,
+    viewKey,
+  }
+}

packages/next/src/views/Root/getCustomViewByRoute.tsx

@@ -1,43 +0,0 @@
-import type { SanitizedConfig } from 'payload'
-
-import type { ViewFromConfig } from './getViewFromConfig.js'
-
-import { isPathMatchingRoute } from './isPathMatchingRoute.js'
-
-export const getCustomViewByRoute = ({
-  config,
-  currentRoute: currentRouteWithAdmin,
-}: {
-  config: SanitizedConfig
-  currentRoute: string
-}): ViewFromConfig => {
-  const {
-    admin: {
-      components: { views },
-    },
-    routes: { admin: adminRoute },
-  } = config
-
-  const currentRoute = currentRouteWithAdmin.replace(adminRoute, '')
-
-  const foundViewConfig =
-    views &&
-    typeof views === 'object' &&
-    Object.entries(views).find(([, view]) => {
-      return isPathMatchingRoute({
-        currentRoute,
-        exact: view.exact,
-        path: view.path,
-        sensitive: view.sensitive,
-        strict: view.strict,
-      })
-    })?.[1]
-
-  if (!foundViewConfig) {
-    return null
-  }
-
-  return {
-    payloadComponent: foundViewConfig.Component,
-  }
-}

packages/next/src/views/Root/getViewFromConfig.ts

@@ -99,7 +99,7 @@ export const getViewFromConfig = ({
     case 1: {
       // users can override the default routes via `admin.routes` config
       // i.e.{ admin: { routes: { logout: '/sign-out', inactivity: '/idle' }}}
-      let viewToRender: keyof typeof oneSegmentViews
+      let viewKey: keyof typeof oneSegmentViews
 
       if (config.admin.routes) {
         const matchedRoute = Object.entries(config.admin.routes).find(([, route]) => {
@@ -111,11 +111,11 @@ export const getViewFromConfig = ({
         })
 
         if (matchedRoute) {
-          viewToRender = matchedRoute[0] as keyof typeof oneSegmentViews
+          viewKey = matchedRoute[0] as keyof typeof oneSegmentViews
         }
       }
 
-      if (oneSegmentViews[viewToRender]) {
+      if (oneSegmentViews[viewKey]) {
         // --> /account
         // --> /create-first-user
         // --> /forgot
@@ -125,12 +125,13 @@ export const getViewFromConfig = ({
         // --> /unauthorized
 
         ViewToRender = {
-          Component: oneSegmentViews[viewToRender],
+          Component: oneSegmentViews[viewKey],
         }
-        templateClassName = baseClasses[viewToRender]
+
+        templateClassName = baseClasses[viewKey]
         templateType = 'minimal'
 
-        if (viewToRender === 'account') {
+        if (viewKey === 'account') {
           initPageOptions.redirectUnauthenticatedUser = true
           templateType = 'default'
         }
@@ -150,17 +151,21 @@ export const getViewFromConfig = ({
       if (isCollection) {
         // --> /collections/:collectionSlug
         initPageOptions.redirectUnauthenticatedUser = true
+
         ViewToRender = {
           Component: ListView,
         }
+
         templateClassName = `${segmentTwo}-list`
         templateType = 'default'
       } else if (isGlobal) {
         // --> /globals/:globalSlug
         initPageOptions.redirectUnauthenticatedUser = true
+
         ViewToRender = {
           Component: DocumentView,
         }
+
         templateClassName = 'global-edit'
         templateType = 'default'
       }
@@ -172,6 +177,7 @@ export const getViewFromConfig = ({
         ViewToRender = {
           Component: Verify,
         }
+
         templateClassName = 'verify'
         templateType = 'minimal'
       } else if (isCollection) {
@@ -182,9 +188,11 @@ export const getViewFromConfig = ({
         // --> /collections/:collectionSlug/:id/versions/:versionId
         // --> /collections/:collectionSlug/:id/api
         initPageOptions.redirectUnauthenticatedUser = true
+
         ViewToRender = {
           Component: DocumentView,
         }
+
         templateClassName = `collection-default-edit`
         templateType = 'default'
       } else if (isGlobal) {
@@ -194,9 +202,11 @@ export const getViewFromConfig = ({
         // --> /globals/:globalSlug/versions/:versionId
         // --> /globals/:globalSlug/api
         initPageOptions.redirectUnauthenticatedUser = true
+
         ViewToRender = {
           Component: DocumentView,
         }
+
         templateClassName = `global-edit`
         templateType = 'default'
       }
@@ -204,7 +214,7 @@ export const getViewFromConfig = ({
   }
 
   if (!ViewToRender) {
-    ViewToRender = getCustomViewByRoute({ config, currentRoute })
+    ViewToRender = getCustomViewByRoute({ config, currentRoute })?.view
   }
 
   return {

packages/next/src/views/Root/meta.ts

@@ -13,6 +13,8 @@ import { generateNotFoundMeta } from '../NotFound/meta.js'
 import { generateResetPasswordMetadata } from '../ResetPassword/index.js'
 import { generateUnauthorizedMetadata } from '../Unauthorized/index.js'
 import { generateVerifyMetadata } from '../Verify/index.js'
+import { generateCustomViewMetadata } from './generateCustomViewMetadata.js'
+import { getCustomViewByRoute } from './getCustomViewByRoute.js'
 
 const oneSegmentMeta = {
   'create-first-user': generateCreateFirstUserMetadata,
@@ -38,6 +40,7 @@ export const generatePageMetadata = async ({ config: configPromise, params }: Ar
 
   const segments = Array.isArray(params.segments) ? params.segments : []
 
+  const currentRoute = `/${segments.join('/')}`
   const [segmentOne, segmentTwo] = segments
 
   const isGlobal = segmentOne === 'globals'
@@ -130,7 +133,22 @@ export const generatePageMetadata = async ({ config: configPromise, params }: Ar
   }
 
   if (!meta) {
-    meta = await generateNotFoundMeta({ config, i18n })
+    const { viewConfig, viewKey } = getCustomViewByRoute({
+      config,
+      currentRoute,
+    })
+
+    if (viewKey) {
+      // Custom Views
+      // --> /:path
+      meta = await generateCustomViewMetadata({
+        config,
+        i18n,
+        viewConfig,
+      })
+    } else {
+      meta = await generateNotFoundMeta({ config, i18n })
+    }
   }
 
   return meta

packages/next/src/views/Version/meta.ts

@@ -1,4 +1,5 @@
 import type { Metadata } from 'next'
+import type { MetaConfig } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
 import { formatDate } from '@payloadcms/ui/shared'
@@ -15,9 +16,9 @@ export const generateMetadata: GenerateEditViewMetadata = async ({
 }): Promise<Metadata> => {
   const { t } = i18n
 
-  let title: string = ''
-  let description: string = ''
-  const keywords: string = ''
+  let metaToUse: MetaConfig = {
+    ...(config.admin.meta || {}),
+  }
 
   const doc: any = {} // TODO: figure this out
 
@@ -29,23 +30,30 @@ export const generateMetadata: GenerateEditViewMetadata = async ({
     const useAsTitle = collectionConfig?.admin?.useAsTitle || 'id'
     const entityLabel = getTranslation(collectionConfig.labels.singular, i18n)
     const titleFromData = doc?.[useAsTitle]
-    title = `${t('version:version')}${formattedCreatedAt ? ` - ${formattedCreatedAt}` : ''}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`
-    description = t('version:viewingVersion', { documentTitle: doc[useAsTitle], entityLabel })
+
+    metaToUse = {
+      ...(config.admin.meta || {}),
+      description: t('version:viewingVersion', { documentTitle: doc[useAsTitle], entityLabel }),
+      title: `${t('version:version')}${formattedCreatedAt ? ` - ${formattedCreatedAt}` : ''}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`,
+      ...(collectionConfig?.admin?.meta || {}),
+      ...(collectionConfig?.admin?.components?.views?.edit?.version?.meta || {}),
+    }
   }
 
   if (globalConfig) {
     const entityLabel = getTranslation(globalConfig.label, i18n)
-    title = `${t('version:version')}${formattedCreatedAt ? ` - ${formattedCreatedAt}` : ''}${entityLabel}`
-    description = t('version:viewingVersionGlobal', { entityLabel })
+
+    metaToUse = {
+      ...(config.admin.meta || {}),
+      description: t('version:viewingVersionGlobal', { entityLabel }),
+      title: `${t('version:version')}${formattedCreatedAt ? ` - ${formattedCreatedAt}` : ''}${entityLabel}`,
+      ...(globalConfig?.admin?.meta || {}),
+      ...(globalConfig?.admin?.components?.views?.edit?.version?.meta || {}),
+    }
   }
 
   return meta({
-    ...(config.admin.meta || {}),
-    description,
-    keywords,
+    ...metaToUse,
     serverURL: config.serverURL,
-    title,
-    ...(collectionConfig?.admin.meta || {}),
-    ...(globalConfig?.admin.meta || {}),
   })
 }

packages/next/src/views/Versions/meta.ts

@@ -1,4 +1,5 @@
 import type { Metadata } from 'next'
+import type { MetaConfig } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
 
@@ -20,34 +21,40 @@ export const generateMetadata: GenerateEditViewMetadata = async ({
       ? getTranslation(globalConfig.label, i18n)
       : ''
 
-  let title: string = ''
-  let description: string = ''
-  const keywords: string = ''
+  let metaToUse: MetaConfig = {
+    ...(config.admin.meta || {}),
+  }
 
   const data: any = {} // TODO: figure this out
 
   if (collectionConfig) {
     const useAsTitle = collectionConfig?.admin?.useAsTitle || 'id'
     const titleFromData = data?.[useAsTitle]
-    title = `${t('version:versions')}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`
-    description = t('version:viewingVersions', {
-      documentTitle: data?.[useAsTitle],
-      entitySlug: collectionConfig.slug,
-    })
+
+    metaToUse = {
+      ...(config.admin.meta || {}),
+      description: t('version:viewingVersions', {
+        documentTitle: data?.[useAsTitle],
+        entitySlug: collectionConfig.slug,
+      }),
+      title: `${t('version:versions')}${titleFromData ? ` - ${titleFromData}` : ''} - ${entityLabel}`,
+      ...(collectionConfig?.admin.meta || {}),
+      ...(collectionConfig?.admin?.components?.views?.edit?.versions?.meta || {}),
+    }
   }
 
   if (globalConfig) {
-    title = `${t('version:versions')} - ${entityLabel}`
-    description = t('version:viewingVersionsGlobal', { entitySlug: globalConfig.slug })
+    metaToUse = {
+      ...(config.admin.meta || {}),
+      description: t('version:viewingVersionsGlobal', { entitySlug: globalConfig.slug }),
+      title: `${t('version:versions')} - ${entityLabel}`,
+      ...(globalConfig?.admin.meta || {}),
+      ...(globalConfig?.admin?.components?.views?.edit?.versions?.meta || {}),
+    }
   }
 
   return meta({
-    ...(config.admin.meta || {}),
-    description,
-    keywords,
+    ...metaToUse,
     serverURL: config.serverURL,
-    title,
-    ...(collectionConfig?.admin.meta || {}),
-    ...(globalConfig?.admin.meta || {}),
   })
 }

packages/payload/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "3.0.0-beta.84",
+  "version": "3.0.0-beta.88",
   "description": "Node, React, Headless CMS and Application Framework built on Next.js",
   "keywords": [
     "admin panel",
@@ -86,7 +86,6 @@
   "dependencies": {
     "@next/env": "^15.0.0-canary.104",
     "@payloadcms/translations": "workspace:*",
-    "tsx": "4.17.0",
     "ajv": "8.14.0",
     "bson-objectid": "2.0.4",
     "ci-info": "^4.0.0",
@@ -108,6 +107,7 @@
     "sanitize-filename": "1.6.3",
     "scmp": "2.1.0",
     "ts-essentials": "7.0.3",
+    "tsx": "4.17.0",
     "uuid": "10.0.0"
   },
   "devDependencies": {

packages/payload/src/admin/fields/Array.ts

@@ -1,23 +1,33 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { ArrayFieldClient } from '../../fields/config/types.js'
+import type { ArrayField, ArrayFieldClient } from '../../fields/config/types.js'
 import type { ArrayFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
 import type {
-  DescriptionComponent,
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
   FormFieldBase,
-  LabelComponent,
   MappedComponent,
 } from '../types.js'
 
+type ArrayFieldClientWithoutType = MarkOptional<ArrayFieldClient, 'type'>
+
 export type ArrayFieldProps = {
   readonly CustomRowLabel?: MappedComponent
-  readonly field: MarkOptional<ArrayFieldClient, 'type'>
   readonly validate?: ArrayFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<ArrayFieldClientWithoutType>, 'validate'>
 
-export type ArrayFieldLabelComponent = LabelComponent<'array'>
+export type ArrayFieldLabelServerComponent = FieldLabelServerComponent<ArrayField>
 
-export type ArrayFieldDescriptionComponent = DescriptionComponent<'array'>
+export type ArrayFieldLabelClientComponent = FieldLabelClientComponent<ArrayFieldClientWithoutType>
 
-export type ArrayFieldErrorComponent = ErrorComponent<'array'>
+export type ArrayFieldDescriptionServerComponent = FieldDescriptionServerComponent<ArrayField>
+
+export type ArrayFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<ArrayFieldClientWithoutType>
+
+export type ArrayFieldErrorServerComponent = FieldErrorServerComponent<ArrayField>
+
+export type ArrayFieldErrorClientComponent = FieldErrorClientComponent<ArrayFieldClientWithoutType>

packages/payload/src/admin/fields/Blocks.ts

@@ -1,17 +1,31 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { BlockFieldClient } from '../../fields/config/types.js'
+import type { BlockField, BlockFieldClient } from '../../fields/config/types.js'
 import type { BlockFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type BlocksFieldClientWithoutType = MarkOptional<BlockFieldClient, 'type'>
 
 export type BlockFieldProps = {
-  readonly field: MarkOptional<BlockFieldClient, 'type'>
   readonly validate?: BlockFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<BlocksFieldClientWithoutType>, 'validate'>
 
-export type BlockFieldLabelComponent = LabelComponent<'blocks'>
+export type BlockFieldLabelServerComponent = FieldLabelServerComponent<BlockField>
 
-export type BlockFieldDescriptionComponent = DescriptionComponent<'blocks'>
+export type BlockFieldLabelClientComponent = FieldLabelClientComponent<BlocksFieldClientWithoutType>
 
-export type BlockFieldErrorComponent = ErrorComponent<'blocks'>
+export type BlockFieldDescriptionServerComponent = FieldDescriptionServerComponent<BlockField>
+
+export type BlockFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<BlocksFieldClientWithoutType>
+
+export type BlockFieldErrorServerComponent = FieldErrorServerComponent<BlockField>
+
+export type BlockFieldErrorClientComponent = FieldErrorClientComponent<BlocksFieldClientWithoutType>

packages/payload/src/admin/fields/Checkbox.ts

@@ -1,22 +1,38 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { CheckboxFieldClient } from '../../fields/config/types.js'
+import type { CheckboxField, CheckboxFieldClient } from '../../fields/config/types.js'
 import type { CheckboxFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type CheckboxFieldClientWithoutType = MarkOptional<CheckboxFieldClient, 'type'>
 
 export type CheckboxFieldProps = {
   readonly checked?: boolean
   readonly disableFormData?: boolean
-  readonly field: MarkOptional<CheckboxFieldClient, 'type'>
   readonly id?: string
   readonly onChange?: (value: boolean) => void
   readonly partialChecked?: boolean
   readonly validate?: CheckboxFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<CheckboxFieldClientWithoutType>, 'validate'>
 
-export type CheckboxFieldLabelComponent = LabelComponent<'checkbox'>
+export type CheckboxFieldLabelServerComponent = FieldLabelServerComponent<CheckboxField>
 
-export type CheckboxFieldDescriptionComponent = DescriptionComponent<'checkbox'>
+export type CheckboxFieldLabelClientComponent =
+  FieldLabelClientComponent<CheckboxFieldClientWithoutType>
 
-export type CheckboxFieldErrorComponent = ErrorComponent<'checkbox'>
+export type CheckboxFieldDescriptionServerComponent = FieldDescriptionServerComponent<CheckboxField>
+
+export type CheckboxFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<CheckboxFieldClientWithoutType>
+
+export type CheckboxFieldErrorServerComponent = FieldErrorServerComponent<CheckboxField>
+
+export type CheckboxFieldErrorClientComponent =
+  FieldErrorClientComponent<CheckboxFieldClientWithoutType>

packages/payload/src/admin/fields/Code.ts

@@ -1,18 +1,32 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { CodeFieldClient } from '../../fields/config/types.js'
+import type { CodeField, CodeFieldClient } from '../../fields/config/types.js'
 import type { CodeFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type CodeFieldClientWithoutType = MarkOptional<CodeFieldClient, 'type'>
 
 export type CodeFieldProps = {
   readonly autoComplete?: string
-  readonly field: MarkOptional<CodeFieldClient, 'type'>
   readonly validate?: CodeFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<CodeFieldClientWithoutType>, 'validate'>
 
-export type CodeFieldLabelComponent = LabelComponent<'code'>
+export type CodeFieldLabelServerComponent = FieldLabelServerComponent<CodeField>
 
-export type CodeFieldDescriptionComponent = DescriptionComponent<'code'>
+export type CodeFieldLabelClientComponent = FieldLabelClientComponent<CodeFieldClientWithoutType>
 
-export type CodeFieldErrorComponent = ErrorComponent<'code'>
+export type CodeFieldDescriptionServerComponent = FieldDescriptionServerComponent<CodeField>
+
+export type CodeFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<CodeFieldClientWithoutType>
+
+export type CodeFieldErrorServerComponent = FieldErrorServerComponent<CodeField>
+
+export type CodeFieldErrorClientComponent = FieldErrorClientComponent<CodeFieldClientWithoutType>

packages/payload/src/admin/fields/Collapsible.ts

@@ -1,15 +1,31 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { CollapsibleFieldClient } from '../../fields/config/types.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { CollapsibleField, CollapsibleFieldClient } from '../../fields/config/types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
 
-export type CollapsibleFieldProps = {
-  readonly field: MarkOptional<CollapsibleFieldClient, 'type'>
-} & FormFieldBase
+type CollapsibleFieldClientWithoutType = MarkOptional<CollapsibleFieldClient, 'type'>
 
-export type CollapsibleFieldLabelComponent = LabelComponent<'collapsible'>
+export type CollapsibleFieldProps = FormFieldBase<CollapsibleFieldClientWithoutType>
 
-export type CollapsibleFieldDescriptionComponent = DescriptionComponent<'collapsible'>
+export type CollapsibleFieldLabelServerComponent = FieldLabelServerComponent<CollapsibleField>
 
-export type CollapsibleFieldErrorComponent = ErrorComponent<'collapsible'>
+export type CollapsibleFieldLabelClientComponent =
+  FieldLabelClientComponent<CollapsibleFieldClientWithoutType>
+
+export type CollapsibleFieldDescriptionServerComponent =
+  FieldDescriptionServerComponent<CollapsibleField>
+
+export type CollapsibleFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<CollapsibleFieldClientWithoutType>
+
+export type CollapsibleFieldErrorServerComponent = FieldErrorServerComponent<CollapsibleField>
+
+export type CollapsibleFieldErrorClientComponent =
+  FieldErrorClientComponent<CollapsibleFieldClientWithoutType>

packages/payload/src/admin/fields/Date.ts

@@ -1,17 +1,31 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { DateFieldClient } from '../../fields/config/types.js'
+import type { DateField, DateFieldClient } from '../../fields/config/types.js'
 import type { DateFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type DateFieldClientWithoutType = MarkOptional<DateFieldClient, 'type'>
 
 export type DateFieldProps = {
-  readonly field: MarkOptional<DateFieldClient, 'type'>
   readonly validate?: DateFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<DateFieldClientWithoutType>, 'validate'>
 
-export type DateFieldLabelComponent = LabelComponent<'date'>
+export type DateFieldLabelServerComponent = FieldLabelServerComponent<DateField>
 
-export type DateFieldDescriptionComponent = DescriptionComponent<'date'>
+export type DateFieldLabelClientComponent = FieldLabelClientComponent<DateFieldClientWithoutType>
 
-export type DateFieldErrorComponent = ErrorComponent<'date'>
+export type DateFieldDescriptionServerComponent = FieldDescriptionServerComponent<DateField>
+
+export type DateFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<DateFieldClientWithoutType>
+
+export type DateFieldErrorServerComponent = FieldErrorServerComponent<DateField>
+
+export type DateFieldErrorClientComponent = FieldErrorClientComponent<DateFieldClientWithoutType>

packages/payload/src/admin/fields/Email.ts

@@ -1,18 +1,32 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { EmailFieldClient } from '../../fields/config/types.js'
+import type { EmailField, EmailFieldClient } from '../../fields/config/types.js'
 import type { EmailFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type EmailFieldClientWithoutType = MarkOptional<EmailFieldClient, 'type'>
 
 export type EmailFieldProps = {
   readonly autoComplete?: string
-  readonly field: MarkOptional<EmailFieldClient, 'type'>
   readonly validate?: EmailFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<EmailFieldClientWithoutType>, 'validate'>
 
-export type EmailFieldLabelComponent = LabelComponent<'email'>
+export type EmailFieldLabelServerComponent = FieldLabelServerComponent<EmailField>
 
-export type EmailFieldDescriptionComponent = DescriptionComponent<'email'>
+export type EmailFieldLabelClientComponent = FieldLabelClientComponent<EmailFieldClientWithoutType>
 
-export type EmailFieldErrorComponent = ErrorComponent<'email'>
+export type EmailFieldDescriptionServerComponent = FieldDescriptionServerComponent<EmailField>
+
+export type EmailFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<EmailFieldClientWithoutType>
+
+export type EmailFieldErrorServerComponent = FieldErrorServerComponent<EmailField>
+
+export type EmailFieldErrorClientComponent = FieldErrorClientComponent<EmailFieldClientWithoutType>

packages/payload/src/admin/fields/Group.ts

@@ -1,15 +1,28 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { GroupFieldClient } from '../../fields/config/types.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { GroupField, GroupFieldClient } from '../../fields/config/types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
 
-export type GroupFieldProps = {
-  readonly field: MarkOptional<GroupFieldClient, 'type'>
-} & FormFieldBase
+type GroupFieldClientWithoutType = MarkOptional<GroupFieldClient, 'type'>
 
-export type GroupFieldLabelComponent = LabelComponent<'group'>
+export type GroupFieldProps = FormFieldBase<GroupFieldClientWithoutType>
 
-export type GroupFieldDescriptionComponent = DescriptionComponent<'group'>
+export type GroupFieldLabelServerComponent = FieldLabelServerComponent<GroupField>
 
-export type GroupFieldErrorComponent = ErrorComponent<'group'>
+export type GroupFieldLabelClientComponent = FieldLabelClientComponent<GroupFieldClientWithoutType>
+
+export type GroupFieldDescriptionServerComponent = FieldDescriptionServerComponent<GroupField>
+
+export type GroupFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<GroupFieldClientWithoutType>
+
+export type GroupFieldErrorServerComponent = FieldErrorServerComponent<GroupField>
+
+export type GroupFieldErrorClientComponent = FieldErrorClientComponent<GroupFieldClientWithoutType>

packages/payload/src/admin/fields/Hidden.ts

@@ -1,6 +1,5 @@
 import type { ClientField } from '../../fields/config/client.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FormFieldBase } from '../types.js'
 
 export type HiddenFieldProps = {
   readonly disableModifyingForm?: false
@@ -10,9 +9,3 @@ export type HiddenFieldProps = {
   readonly forceUsePathFromProps?: boolean
   readonly value?: unknown
 } & FormFieldBase
-
-export type HiddenFieldLabelComponent = LabelComponent<'hidden'>
-
-export type HiddenFieldDescriptionComponent = DescriptionComponent<'hidden'>
-
-export type HiddenFieldErrorComponent = ErrorComponent<'hidden'>

packages/payload/src/admin/fields/JSON.ts

@@ -1,17 +1,31 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { JSONFieldClient } from '../../fields/config/types.js'
+import type { JSONField, JSONFieldClient } from '../../fields/config/types.js'
 import type { JSONFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type JSONFieldClientWithoutType = MarkOptional<JSONFieldClient, 'type'>
 
 export type JSONFieldProps = {
-  readonly field: MarkOptional<JSONFieldClient, 'type'>
   readonly validate?: JSONFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<JSONFieldClientWithoutType>, 'validate'>
 
-export type JSONFieldLabelComponent = LabelComponent<'json'>
+export type JSONFieldLabelServerComponent = FieldLabelServerComponent<JSONField>
 
-export type JSONFieldDescriptionComponent = DescriptionComponent<'json'>
+export type JSONFieldLabelClientComponent = FieldLabelClientComponent<JSONFieldClientWithoutType>
 
-export type JSONFieldErrorComponent = ErrorComponent<'json'>
+export type JSONFieldDescriptionServerComponent = FieldDescriptionServerComponent<JSONField>
+
+export type JSONFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<JSONFieldClientWithoutType>
+
+export type JSONFieldErrorServerComponent = FieldErrorServerComponent<JSONField>
+
+export type JSONFieldErrorClientComponent = FieldErrorClientComponent<JSONFieldClientWithoutType>

packages/payload/src/admin/fields/Number.ts

@@ -1,18 +1,34 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { NumberFieldClient } from '../../fields/config/types.js'
+import type { NumberField, NumberFieldClient } from '../../fields/config/types.js'
 import type { NumberFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type NumberFieldClientWithoutType = MarkOptional<NumberFieldClient, 'type'>
 
 export type NumberFieldProps = {
-  readonly field: MarkOptional<NumberFieldClient, 'type'>
   readonly onChange?: (e: number) => void
   readonly validate?: NumberFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<NumberFieldClientWithoutType>, 'validate'>
 
-export type NumberFieldLabelComponent = LabelComponent<'number'>
+export type NumberFieldLabelServerComponent = FieldLabelServerComponent<NumberField>
 
-export type NumberFieldDescriptionComponent = DescriptionComponent<'number'>
+export type NumberFieldLabelClientComponent =
+  FieldLabelClientComponent<NumberFieldClientWithoutType>
 
-export type NumberFieldErrorComponent = ErrorComponent<'number'>
+export type NumberFieldDescriptionServerComponent = FieldDescriptionServerComponent<NumberField>
+
+export type NumberFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<NumberFieldClientWithoutType>
+
+export type NumberFieldErrorServerComponent = FieldErrorServerComponent<NumberField>
+
+export type NumberFieldErrorClientComponent =
+  FieldErrorClientComponent<NumberFieldClientWithoutType>

packages/payload/src/admin/fields/Point.ts

@@ -1,17 +1,31 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { PointFieldClient } from '../../fields/config/types.js'
+import type { PointField, PointFieldClient } from '../../fields/config/types.js'
 import type { PointFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type PointFieldClientWithoutType = MarkOptional<PointFieldClient, 'type'>
 
 export type PointFieldProps = {
-  readonly field: MarkOptional<PointFieldClient, 'type'>
   readonly validate?: PointFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<PointFieldClientWithoutType>, 'validate'>
 
-export type PointFieldLabelComponent = LabelComponent<'point'>
+export type PointFieldLabelServerComponent = FieldLabelServerComponent<PointField>
 
-export type PointFieldDescriptionComponent = DescriptionComponent<'point'>
+export type PointFieldLabelClientComponent = FieldLabelClientComponent<PointFieldClientWithoutType>
 
-export type PointFieldErrorComponent = ErrorComponent<'point'>
+export type PointFieldDescriptionServerComponent = FieldDescriptionServerComponent<PointField>
+
+export type PointFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<PointFieldClientWithoutType>
+
+export type PointFieldErrorServerComponent = FieldErrorServerComponent<PointField>
+
+export type PointFieldErrorClientComponent = FieldErrorClientComponent<PointFieldClientWithoutType>

packages/payload/src/admin/fields/Radio.ts

@@ -1,21 +1,35 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { RadioFieldClient } from '../../fields/config/types.js'
+import type { RadioField, RadioFieldClient } from '../../fields/config/types.js'
 import type { RadioFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type RadioFieldClientWithoutType = MarkOptional<RadioFieldClient, 'type'>
 
 export type RadioFieldProps = {
-  readonly field: MarkOptional<RadioFieldClient, 'type'>
   readonly onChange?: OnChange
   readonly validate?: RadioFieldValidation
   readonly value?: string
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<RadioFieldClientWithoutType>, 'validate'>
 
 export type OnChange<T = string> = (value: T) => void
 
-export type RadioFieldLabelComponent = LabelComponent<'radio'>
+export type RadioFieldLabelServerComponent = FieldLabelServerComponent<RadioField>
 
-export type RadioFieldDescriptionComponent = DescriptionComponent<'radio'>
+export type RadioFieldLabelClientComponent = FieldLabelClientComponent<RadioFieldClientWithoutType>
 
-export type RadioFieldErrorComponent = ErrorComponent<'radio'>
+export type RadioFieldDescriptionServerComponent = FieldDescriptionServerComponent<RadioField>
+
+export type RadioFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<RadioFieldClientWithoutType>
+
+export type RadioFieldErrorServerComponent = FieldErrorServerComponent<RadioField>
+
+export type RadioFieldErrorClientComponent = FieldErrorClientComponent<RadioFieldClientWithoutType>

packages/payload/src/admin/fields/Relationship.ts

@@ -1,17 +1,34 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { RelationshipFieldClient } from '../../fields/config/types.js'
+import type { RelationshipField, RelationshipFieldClient } from '../../fields/config/types.js'
 import type { RelationshipFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type RelationshipFieldClientWithoutType = MarkOptional<RelationshipFieldClient, 'type'>
 
 export type RelationshipFieldProps = {
-  readonly field: MarkOptional<RelationshipFieldClient, 'type'>
   readonly validate?: RelationshipFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<RelationshipFieldClientWithoutType>, 'validate'>
 
-export type RelationshipFieldLabelComponent = LabelComponent<'relationship'>
+export type RelationshipFieldLabelServerComponent = FieldLabelServerComponent<RelationshipField>
 
-export type RelationshipFieldDescriptionComponent = DescriptionComponent<'relationship'>
+export type RelationshipFieldLabelClientComponent =
+  FieldLabelClientComponent<RelationshipFieldClientWithoutType>
 
-export type RelationshipFieldErrorComponent = ErrorComponent<'relationship'>
+export type RelationshipFieldDescriptionServerComponent =
+  FieldDescriptionServerComponent<RelationshipField>
+
+export type RelationshipFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<RelationshipFieldClientWithoutType>
+
+export type RelationshipFieldErrorServerComponent = FieldErrorServerComponent<RelationshipField>
+
+export type RelationshipFieldErrorClientComponent =
+  FieldErrorClientComponent<RelationshipFieldClientWithoutType>

packages/payload/src/admin/fields/RichText.ts

@@ -1,21 +1,37 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { RichTextFieldClient } from '../../fields/config/types.js'
+import type { RichTextField, RichTextFieldClient } from '../../fields/config/types.js'
 import type { RichTextFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type RichTextFieldClientWithoutType = MarkOptional<RichTextFieldClient, 'type'>
 
 export type RichTextFieldProps<
   TValue extends object = any,
   TAdapterProps = any,
   TExtraProperties = object,
 > = {
-  readonly field: MarkOptional<RichTextFieldClient<TValue, TAdapterProps, TExtraProperties>, 'type'>
   readonly validate?: RichTextFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<RichTextFieldClientWithoutType>, 'validate'>
 
-export type RichTextFieldLabelComponent = LabelComponent<'richText'>
+export type RichTextFieldLabelServerComponent = FieldLabelServerComponent<RichTextField>
 
-export type RichTextFieldDescriptionComponent = DescriptionComponent<'richText'>
+export type RichTextFieldLabelClientComponent =
+  FieldLabelClientComponent<RichTextFieldClientWithoutType>
 
-export type RichTextFieldErrorComponent = ErrorComponent<'richText'>
+export type RichTextFieldDescriptionServerComponent = FieldDescriptionServerComponent<RichTextField>
+
+export type RichTextFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<RichTextFieldClientWithoutType>
+
+export type RichTextFieldErrorServerComponent = FieldErrorServerComponent<RichTextField>
+
+export type RichTextFieldErrorClientComponent =
+  FieldErrorClientComponent<RichTextFieldClientWithoutType>

packages/payload/src/admin/fields/Row.ts

@@ -1,17 +1,32 @@
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from 'payload'
 import type { MarkOptional } from 'ts-essentials'
 
-import type { RowFieldClient } from '../../fields/config/types.js'
-import type { ErrorComponent } from '../forms/Error.js'
+import type { RowField, RowFieldClient } from '../../fields/config/types.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldErrorClientComponent,
+  FieldErrorServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type RowFieldClientWithoutType = MarkOptional<RowFieldClient, 'type'>
 
 export type RowFieldProps = {
-  field: MarkOptional<RowFieldClient, 'type'>
-  forceRender?: boolean
-  indexPath: string
-} & FormFieldBase
+  readonly forceRender?: boolean
+  readonly indexPath: string
+} & FormFieldBase<RowFieldClientWithoutType>
 
-export type RowFieldLabelComponent = LabelComponent<'row'>
+export type RowFieldLabelServerComponent = FieldLabelServerComponent<RowField>
 
-export type RowFieldDescriptionComponent = DescriptionComponent<'row'>
+export type RowFieldLabelClientComponent = FieldLabelClientComponent<RowFieldClientWithoutType>
 
-export type RowFieldErrorComponent = ErrorComponent<'row'>
+export type RowFieldDescriptionServerComponent = FieldDescriptionServerComponent<RowField>
+
+export type RowFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<RowFieldClientWithoutType>
+
+export type RowFieldErrorServerComponent = FieldErrorServerComponent<RowField>
+
+export type RowFieldErrorClientComponent = FieldErrorClientComponent<RowFieldClientWithoutType>

packages/payload/src/admin/fields/Select.ts

@@ -1,19 +1,35 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { SelectFieldClient } from '../../fields/config/types.js'
+import type { SelectField, SelectFieldClient } from '../../fields/config/types.js'
 import type { SelectFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type SelectFieldClientWithoutType = MarkOptional<SelectFieldClient, 'type'>
 
 export type SelectFieldProps = {
-  readonly field: MarkOptional<SelectFieldClient, 'type'>
   readonly onChange?: (e: string | string[]) => void
   readonly validate?: SelectFieldValidation
   readonly value?: string
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<SelectFieldClientWithoutType>, 'validate'>
 
-export type SelectFieldLabelComponent = LabelComponent<'select'>
+export type SelectFieldLabelServerComponent = FieldLabelServerComponent<SelectField>
 
-export type SelectFieldDescriptionComponent = DescriptionComponent<'select'>
+export type SelectFieldLabelClientComponent =
+  FieldLabelClientComponent<SelectFieldClientWithoutType>
 
-export type SelectFieldErrorComponent = ErrorComponent<'select'>
+export type SelectFieldDescriptionServerComponent = FieldDescriptionServerComponent<SelectField>
+
+export type SelectFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<SelectFieldClientWithoutType>
+
+export type SelectFieldErrorServerComponent = FieldErrorServerComponent<SelectField>
+
+export type SelectFieldErrorClientComponent =
+  FieldErrorClientComponent<SelectFieldClientWithoutType>

packages/payload/src/admin/fields/Tabs.ts

@@ -3,22 +3,36 @@ import type { MarkOptional } from 'ts-essentials'
 import type {
   ClientField,
   NamedTab,
+  TabsField,
   TabsFieldClient,
   UnnamedTab,
 } from '../../fields/config/types.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
 
 export type ClientTab =
   | ({ fields: ClientField[] } & Omit<NamedTab, 'fields'>)
   | ({ fields: ClientField[] } & Omit<UnnamedTab, 'fields'>)
 
-export type TabsFieldProps = {
-  readonly field: MarkOptional<TabsFieldClient, 'type'>
-} & FormFieldBase
+export type TabsFieldClientWithoutType = MarkOptional<TabsFieldClient, 'type'>
 
-export type TabsFieldLabelComponent = LabelComponent<'tabs'>
+export type TabsFieldProps = FormFieldBase<TabsFieldClientWithoutType>
 
-export type TabsFieldDescriptionComponent = DescriptionComponent<'tabs'>
+export type TabsFieldLabelServerComponent = FieldLabelServerComponent<TabsField>
 
-export type TabsFieldErrorComponent = ErrorComponent<'tabs'>
+export type TabsFieldLabelClientComponent = FieldLabelClientComponent<TabsFieldClientWithoutType>
+
+export type TabsFieldDescriptionServerComponent = FieldDescriptionServerComponent<TabsField>
+
+export type TabsFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<TabsFieldClientWithoutType>
+
+export type TabsFieldErrorServerComponent = FieldErrorServerComponent<TabsField>
+
+export type TabsFieldErrorClientComponent = FieldErrorClientComponent<TabsFieldClientWithoutType>

packages/payload/src/admin/fields/Text.ts

@@ -1,20 +1,34 @@
 import type React from 'react'
 import type { MarkOptional } from 'ts-essentials'
 
-import type { TextFieldClient } from '../../fields/config/types.js'
+import type { TextField, TextFieldClient } from '../../fields/config/types.js'
 import type { TextFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type TextFieldClientWithoutType = MarkOptional<TextFieldClient, 'type'>
 
 export type TextFieldProps = {
-  readonly field: MarkOptional<TextFieldClient, 'type'>
   readonly inputRef?: React.RefObject<HTMLInputElement>
   readonly onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>
   readonly validate?: TextFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<TextFieldClientWithoutType>, 'validate'>
 
-export type TextFieldLabelComponent = LabelComponent<'text'>
+export type TextFieldLabelServerComponent = FieldLabelServerComponent<TextField>
 
-export type TextFieldDescriptionComponent = DescriptionComponent<'text'>
+export type TextFieldLabelClientComponent = FieldLabelClientComponent<TextFieldClientWithoutType>
 
-export type TextFieldErrorComponent = ErrorComponent<'text'>
+export type TextFieldDescriptionServerComponent = FieldDescriptionServerComponent<TextField>
+
+export type TextFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<TextFieldClientWithoutType>
+
+export type TextFieldErrorServerComponent = FieldErrorServerComponent<TextField>
+
+export type TextFieldErrorClientComponent = FieldErrorClientComponent<TextFieldClientWithoutType>

packages/payload/src/admin/fields/Textarea.ts

@@ -1,20 +1,36 @@
 import type React from 'react'
 import type { MarkOptional } from 'ts-essentials'
 
-import type { TextareaFieldClient } from '../../fields/config/types.js'
+import type { TextareaField, TextareaFieldClient } from '../../fields/config/types.js'
 import type { TextareaFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type TextareaFieldClientWithoutType = MarkOptional<TextareaFieldClient, 'type'>
 
 export type TextareaFieldProps = {
-  readonly field: MarkOptional<TextareaFieldClient, 'type'>
   readonly inputRef?: React.Ref<HTMLInputElement>
   readonly onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>
   readonly validate?: TextareaFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<TextareaFieldClientWithoutType>, 'validate'>
 
-export type TextareaFieldLabelComponent = LabelComponent<'textarea'>
+export type TextareaFieldLabelServerComponent = FieldLabelServerComponent<TextareaField>
 
-export type TextareaFieldDescriptionComponent = DescriptionComponent<'textarea'>
+export type TextareaFieldLabelClientComponent =
+  FieldLabelClientComponent<TextareaFieldClientWithoutType>
 
-export type TextareaFieldErrorComponent = ErrorComponent<'textarea'>
+export type TextareaFieldDescriptionServerComponent = FieldDescriptionServerComponent<TextareaField>
+
+export type TextareaFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<TextareaFieldClientWithoutType>
+
+export type TextareaFieldErrorServerComponent = FieldErrorServerComponent<TextareaField>
+
+export type TextareaFieldErrorClientComponent =
+  FieldErrorClientComponent<TextareaFieldClientWithoutType>

packages/payload/src/admin/fields/Upload.ts

@@ -1,17 +1,33 @@
 import type { MarkOptional } from 'ts-essentials'
 
-import type { UploadFieldClient } from '../../fields/config/types.js'
+import type { UploadField, UploadFieldClient } from '../../fields/config/types.js'
 import type { UploadFieldValidation } from '../../fields/validations.js'
-import type { ErrorComponent } from '../forms/Error.js'
-import type { DescriptionComponent, FormFieldBase, LabelComponent } from '../types.js'
+import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
+import type {
+  FieldDescriptionClientComponent,
+  FieldDescriptionServerComponent,
+  FieldLabelClientComponent,
+  FieldLabelServerComponent,
+  FormFieldBase,
+} from '../types.js'
+
+type UploadFieldClientWithoutType = MarkOptional<UploadFieldClient, 'type'>
 
 export type UploadFieldProps = {
-  readonly field: MarkOptional<UploadFieldClient, 'type'>
   readonly validate?: UploadFieldValidation
-} & Omit<FormFieldBase, 'validate'>
+} & Omit<FormFieldBase<UploadFieldClientWithoutType>, 'validate'>
 
-export type UploadFieldLabelComponent = LabelComponent<'upload'>
+export type UploadFieldLabelServerComponent = FieldLabelServerComponent<UploadField>
 
-export type UploadFieldDescriptionComponent = DescriptionComponent<'upload'>
+export type UploadFieldLabelClientComponent =
+  FieldLabelClientComponent<UploadFieldClientWithoutType>
 
-export type UploadFieldErrorComponent = ErrorComponent<'upload'>
+export type UploadFieldDescriptionServerComponent = FieldDescriptionServerComponent<UploadField>
+
+export type UploadFieldDescriptionClientComponent =
+  FieldDescriptionClientComponent<UploadFieldClientWithoutType>
+
+export type UploadFieldErrorServerComponent = FieldErrorServerComponent<UploadField>
+
+export type UploadFieldErrorClientComponent =
+  FieldErrorClientComponent<UploadFieldClientWithoutType>

packages/payload/src/admin/forms/Description.ts

@@ -0,0 +1,38 @@
+import type { MarkOptional } from 'ts-essentials'
+
+import type { LabelFunction, ServerProps } from '../../config/types.js'
+import type { ClientField, Field } from '../../fields/config/types.js'
+import type { MappedComponent } from '../types.js'
+
+export type DescriptionFunction = LabelFunction
+
+type ClientFieldWithOptionalType = MarkOptional<ClientField, 'type'>
+
+export type FieldDescriptionClientComponent<
+  TFieldClient extends ClientFieldWithOptionalType = ClientFieldWithOptionalType,
+> = React.ComponentType<FieldDescriptionClientProps<TFieldClient>>
+
+export type FieldDescriptionServerComponent<TFieldServer extends Field = Field> =
+  React.ComponentType<FieldDescriptionServerProps<TFieldServer>>
+
+export type StaticDescription = Record<string, string> | string
+
+export type Description = DescriptionFunction | StaticDescription
+
+export type GenericDescriptionProps = {
+  readonly Description?: MappedComponent
+  readonly className?: string
+  readonly description?: StaticDescription
+  readonly marginPlacement?: 'bottom' | 'top'
+}
+
+export type FieldDescriptionServerProps<TFieldServer extends Field = Field> = {
+  field: TFieldServer
+} & GenericDescriptionProps &
+  Partial<ServerProps>
+
+export type FieldDescriptionClientProps<
+  TFieldClient extends ClientFieldWithOptionalType = ClientFieldWithOptionalType,
+> = {
+  field: TFieldClient
+} & GenericDescriptionProps

packages/payload/src/admin/forms/Error.ts

@@ -1,5 +1,7 @@
-import type { CustomComponent, ServerProps } from '../../config/types.js'
-import type { FieldTypes } from '../../fields/config/types.js'
+import type { MarkOptional } from 'ts-essentials'
+
+import type { ServerProps } from '../../config/types.js'
+import type { ClientField, Field } from '../../fields/config/types.js'
 import type { MappedComponent } from '../types.js'
 
 export type GenericErrorProps = {
@@ -10,9 +12,23 @@ export type GenericErrorProps = {
   readonly showError?: boolean
 }
 
-export type ErrorProps<T extends 'hidden' | FieldTypes = any> = {
-  type: T
+type ClientFieldWithOptionalType = MarkOptional<ClientField, 'type'>
+
+export type FieldErrorClientProps<
+  TFieldClient extends ClientFieldWithOptionalType = ClientFieldWithOptionalType,
+> = {
+  field: TFieldClient
+} & GenericErrorProps
+
+export type FieldErrorServerProps<TFieldServer extends Field> = {
+  field: TFieldServer
 } & GenericErrorProps &
   Partial<ServerProps>
 
-export type ErrorComponent<T extends 'hidden' | FieldTypes = any> = CustomComponent<ErrorProps<T>>
+export type FieldErrorClientComponent<
+  TFieldClient extends ClientFieldWithOptionalType = ClientFieldWithOptionalType,
+> = React.ComponentType<FieldErrorClientProps<TFieldClient>>
+
+export type FieldErrorServerComponent<TFieldServer extends Field = Field> = React.ComponentType<
+  FieldErrorServerProps<TFieldServer>
+>

packages/payload/src/admin/forms/Field.ts

@@ -1,24 +1,28 @@
+import type { MarkOptional } from 'ts-essentials'
+
 import type { User } from '../../auth/types.js'
 import type { Locale } from '../../config/types.js'
-import type { Validate } from '../../fields/config/types.js'
+import type { ClientField, Validate } from '../../fields/config/types.js'
 import type { DocumentPreferences } from '../../preferences/types.js'
-import type { ErrorProps } from './Error.js'
-import type { FieldDescriptionProps } from './FieldDescription.js'
-import type { LabelProps } from './Label.js'
+import type { FieldDescriptionClientProps } from './Description.js'
+import type { FieldErrorClientProps } from './Error.js'
+import type { FieldLabelClientProps } from './Label.js'
 
-// TODO: Check if we still need this. Shouldnt most of it be present in the field type?
-export type FormFieldBase = {
-  readonly descriptionProps?: FieldDescriptionProps
+export type FormFieldBase<
+  TFieldClient extends MarkOptional<ClientField, 'type'> = MarkOptional<ClientField, 'type'>,
+> = {
+  readonly descriptionProps?: FieldDescriptionClientProps<TFieldClient>
   readonly docPreferences?: DocumentPreferences
-  readonly errorProps?: ErrorProps
+  readonly errorProps?: FieldErrorClientProps<TFieldClient>
+  readonly field: TFieldClient
   /**
-   * forceRender is added by RenderField automatically
+   * `forceRender` is added by RenderField automatically.
    */
   readonly forceRender?: boolean
-  readonly labelProps?: LabelProps
+  readonly labelProps?: FieldLabelClientProps<TFieldClient>
   readonly locale?: Locale
   /**
-   * forceRender is added by RenderField automatically. This should be used instead of field.admin.readOnly
+   * `readOnly` is added by RenderField automatically. This should be used instead of `field.admin.readOnly`.
    */
   readonly readOnly?: boolean
   readonly user?: User

packages/payload/src/admin/forms/FieldDescription.ts

@@ -1,23 +0,0 @@
-import type { CustomComponent, LabelFunction, ServerProps } from '../../config/types.js'
-import type { FieldTypes } from '../../fields/config/types.js'
-import type { MappedComponent } from '../types.js'
-
-export type DescriptionFunction = LabelFunction
-
-export type DescriptionComponent<T extends 'hidden' | FieldTypes = any> = CustomComponent<
-  FieldDescriptionProps<T>
->
-
-export type StaticDescription = Record<string, string> | string
-
-export type Description = DescriptionFunction | StaticDescription
-export type GenericDescriptionProps = {
-  readonly Description?: MappedComponent
-  readonly className?: string
-  readonly description?: StaticDescription
-  readonly marginPlacement?: 'bottom' | 'top'
-}
-export type FieldDescriptionProps<T extends 'hidden' | FieldTypes = any> = {
-  type: T
-} & GenericDescriptionProps &
-  Partial<ServerProps>

packages/payload/src/admin/forms/Label.ts

@@ -1,5 +1,7 @@
-import type { CustomComponent, ServerProps, StaticLabel } from '../../config/types.js'
-import type { FieldTypes } from '../../fields/config/types.js'
+import type { MarkOptional } from 'ts-essentials'
+
+import type { ServerProps, StaticLabel } from '../../config/types.js'
+import type { ClientField, Field } from '../../fields/config/types.js'
 import type { MappedComponent } from '../types.js'
 
 export type GenericLabelProps = {
@@ -11,14 +13,28 @@ export type GenericLabelProps = {
   readonly unstyled?: boolean
 }
 
-export type LabelProps<T extends 'hidden' | FieldTypes = any> = {
-  type: T
+type ClientFieldWithOptionalType = MarkOptional<ClientField, 'type'>
+
+export type FieldLabelClientProps<
+  TFieldClient extends ClientFieldWithOptionalType = ClientFieldWithOptionalType,
+> = {
+  field: TFieldClient
+} & GenericLabelProps
+
+export type FieldLabelServerProps<TFieldServer extends Field> = {
+  field: TFieldServer
 } & GenericLabelProps &
   Partial<ServerProps>
 
-export type SanitizedLabelProps<T extends 'hidden' | FieldTypes = any> = Omit<
-  LabelProps<T>,
+export type SanitizedLabelProps<TFieldClient extends ClientField> = Omit<
+  FieldLabelClientProps<TFieldClient>,
   'label' | 'required'
 >
 
-export type LabelComponent<T extends 'hidden' | FieldTypes = any> = CustomComponent<LabelProps<T>>
+export type FieldLabelClientComponent<
+  TFieldClient extends ClientFieldWithOptionalType = ClientFieldWithOptionalType,
+> = React.ComponentType<FieldLabelClientProps<TFieldClient>>
+
+export type FieldLabelServerComponent<TFieldServer extends Field = Field> = React.ComponentType<
+  FieldLabelServerProps<TFieldServer>
+>

packages/payload/src/admin/types.ts

@@ -33,172 +33,237 @@ export type {
 } from './elements/WithServerSideProps.js'
 
 export type {
-  ArrayFieldDescriptionComponent,
-  ArrayFieldErrorComponent,
-  ArrayFieldLabelComponent,
+  ArrayFieldDescriptionClientComponent,
+  ArrayFieldDescriptionServerComponent,
+  ArrayFieldErrorClientComponent,
+  ArrayFieldErrorServerComponent,
+  ArrayFieldLabelClientComponent,
+  ArrayFieldLabelServerComponent,
   ArrayFieldProps,
 } from './fields/Array.js'
 
 export type {
-  BlockFieldDescriptionComponent,
-  BlockFieldErrorComponent,
-  BlockFieldLabelComponent,
+  BlockFieldDescriptionClientComponent,
+  BlockFieldDescriptionServerComponent,
+  BlockFieldErrorClientComponent,
+  BlockFieldErrorServerComponent,
+  BlockFieldLabelClientComponent,
+  BlockFieldLabelServerComponent,
   BlockFieldProps,
 } from './fields/Blocks.js'
 
 export type {
-  CheckboxFieldDescriptionComponent,
-  CheckboxFieldErrorComponent,
-  CheckboxFieldLabelComponent,
+  CheckboxFieldDescriptionClientComponent,
+  CheckboxFieldDescriptionServerComponent,
+  CheckboxFieldErrorClientComponent,
+  CheckboxFieldErrorServerComponent,
+  CheckboxFieldLabelClientComponent,
+  CheckboxFieldLabelServerComponent,
   CheckboxFieldProps,
 } from './fields/Checkbox.js'
 
 export type {
-  CodeFieldDescriptionComponent,
-  CodeFieldErrorComponent,
-  CodeFieldLabelComponent,
+  CodeFieldDescriptionClientComponent,
+  CodeFieldDescriptionServerComponent,
+  CodeFieldErrorClientComponent,
+  CodeFieldErrorServerComponent,
+  CodeFieldLabelClientComponent,
+  CodeFieldLabelServerComponent,
   CodeFieldProps,
 } from './fields/Code.js'
 
 export type {
-  CollapsibleFieldDescriptionComponent,
-  CollapsibleFieldErrorComponent,
-  CollapsibleFieldLabelComponent,
+  CollapsibleFieldDescriptionClientComponent,
+  CollapsibleFieldDescriptionServerComponent,
+  CollapsibleFieldErrorClientComponent,
+  CollapsibleFieldErrorServerComponent,
+  CollapsibleFieldLabelClientComponent,
+  CollapsibleFieldLabelServerComponent,
   CollapsibleFieldProps,
 } from './fields/Collapsible.js'
 
 export type {
-  DateFieldDescriptionComponent,
-  DateFieldErrorComponent,
-  DateFieldLabelComponent,
+  DateFieldDescriptionClientComponent,
+  DateFieldDescriptionServerComponent,
+  DateFieldErrorClientComponent,
+  DateFieldErrorServerComponent,
+  DateFieldLabelClientComponent,
+  DateFieldLabelServerComponent,
   DateFieldProps,
 } from './fields/Date.js'
 
 export type {
-  EmailFieldDescriptionComponent,
-  EmailFieldErrorComponent,
-  EmailFieldLabelComponent,
+  EmailFieldDescriptionClientComponent,
+  EmailFieldDescriptionServerComponent,
+  EmailFieldErrorClientComponent,
+  EmailFieldErrorServerComponent,
+  EmailFieldLabelClientComponent,
+  EmailFieldLabelServerComponent,
   EmailFieldProps,
 } from './fields/Email.js'
 
 export type {
-  GroupFieldDescriptionComponent,
-  GroupFieldErrorComponent,
-  GroupFieldLabelComponent,
+  GroupFieldDescriptionClientComponent,
+  GroupFieldDescriptionServerComponent,
+  GroupFieldErrorClientComponent,
+  GroupFieldErrorServerComponent,
+  GroupFieldLabelClientComponent,
+  GroupFieldLabelServerComponent,
   GroupFieldProps,
 } from './fields/Group.js'
 
-export type {
-  HiddenFieldDescriptionComponent,
-  HiddenFieldErrorComponent,
-  HiddenFieldLabelComponent,
-  HiddenFieldProps,
-} from './fields/Hidden.js'
+export type { HiddenFieldProps } from './fields/Hidden.js'
 
 export type {
-  JSONFieldDescriptionComponent,
-  JSONFieldErrorComponent,
-  JSONFieldLabelComponent,
+  JSONFieldDescriptionClientComponent,
+  JSONFieldDescriptionServerComponent,
+  JSONFieldErrorClientComponent,
+  JSONFieldErrorServerComponent,
+  JSONFieldLabelClientComponent,
+  JSONFieldLabelServerComponent,
   JSONFieldProps,
 } from './fields/JSON.js'
 
 export type {
-  NumberFieldDescriptionComponent,
-  NumberFieldErrorComponent,
-  NumberFieldLabelComponent,
+  NumberFieldDescriptionClientComponent,
+  NumberFieldDescriptionServerComponent,
+  NumberFieldErrorClientComponent,
+  NumberFieldErrorServerComponent,
+  NumberFieldLabelClientComponent,
+  NumberFieldLabelServerComponent,
   NumberFieldProps,
 } from './fields/Number.js'
 
 export type {
-  PointFieldDescriptionComponent,
-  PointFieldErrorComponent,
-  PointFieldLabelComponent,
+  PointFieldDescriptionClientComponent,
+  PointFieldDescriptionServerComponent,
+  PointFieldErrorClientComponent,
+  PointFieldErrorServerComponent,
+  PointFieldLabelClientComponent,
+  PointFieldLabelServerComponent,
   PointFieldProps,
 } from './fields/Point.js'
 
 export type {
-  RadioFieldDescriptionComponent,
-  RadioFieldErrorComponent,
-  RadioFieldLabelComponent,
+  RadioFieldDescriptionClientComponent,
+  RadioFieldDescriptionServerComponent,
+  RadioFieldErrorClientComponent,
+  RadioFieldErrorServerComponent,
+  RadioFieldLabelClientComponent,
+  RadioFieldLabelServerComponent,
   RadioFieldProps,
 } from './fields/Radio.js'
 
 export type {
-  RelationshipFieldDescriptionComponent,
-  RelationshipFieldErrorComponent,
-  RelationshipFieldLabelComponent,
+  RelationshipFieldDescriptionClientComponent,
+  RelationshipFieldDescriptionServerComponent,
+  RelationshipFieldErrorClientComponent,
+  RelationshipFieldErrorServerComponent,
+  RelationshipFieldLabelClientComponent,
+  RelationshipFieldLabelServerComponent,
   RelationshipFieldProps,
 } from './fields/Relationship.js'
 
 export type {
-  RichTextFieldDescriptionComponent,
-  RichTextFieldErrorComponent,
-  RichTextFieldLabelComponent,
+  RichTextFieldDescriptionClientComponent,
+  RichTextFieldDescriptionServerComponent,
+  RichTextFieldErrorClientComponent,
+  RichTextFieldErrorServerComponent,
+  RichTextFieldLabelClientComponent,
+  RichTextFieldLabelServerComponent,
   RichTextFieldProps,
 } from './fields/RichText.js'
 
 export type {
-  RowFieldDescriptionComponent,
-  RowFieldErrorComponent,
-  RowFieldLabelComponent,
+  RowFieldDescriptionClientComponent,
+  RowFieldDescriptionServerComponent,
+  RowFieldErrorClientComponent,
+  RowFieldErrorServerComponent,
+  RowFieldLabelClientComponent,
+  RowFieldLabelServerComponent,
   RowFieldProps,
 } from './fields/Row.js'
 
 export type {
-  SelectFieldDescriptionComponent,
-  SelectFieldErrorComponent,
-  SelectFieldLabelComponent,
+  SelectFieldDescriptionClientComponent,
+  SelectFieldDescriptionServerComponent,
+  SelectFieldErrorClientComponent,
+  SelectFieldErrorServerComponent,
+  SelectFieldLabelClientComponent,
+  SelectFieldLabelServerComponent,
   SelectFieldProps,
 } from './fields/Select.js'
 
 export type {
   ClientTab,
-  TabsFieldDescriptionComponent,
-  TabsFieldErrorComponent,
-  TabsFieldLabelComponent,
+  TabsFieldDescriptionClientComponent,
+  TabsFieldDescriptionServerComponent,
+  TabsFieldErrorClientComponent,
+  TabsFieldErrorServerComponent,
+  TabsFieldLabelClientComponent,
+  TabsFieldLabelServerComponent,
   TabsFieldProps,
 } from './fields/Tabs.js'
 
 export type {
-  TextFieldDescriptionComponent,
-  TextFieldErrorComponent,
-  TextFieldLabelComponent,
+  TextFieldDescriptionClientComponent,
+  TextFieldDescriptionServerComponent,
+  TextFieldErrorClientComponent,
+  TextFieldErrorServerComponent,
+  TextFieldLabelClientComponent,
+  TextFieldLabelServerComponent,
   TextFieldProps,
 } from './fields/Text.js'
 
 export type {
-  TextareaFieldDescriptionComponent,
-  TextareaFieldErrorComponent,
-  TextareaFieldLabelComponent,
+  TextareaFieldDescriptionClientComponent,
+  TextareaFieldDescriptionServerComponent,
+  TextareaFieldErrorClientComponent,
+  TextareaFieldErrorServerComponent,
+  TextareaFieldLabelClientComponent,
+  TextareaFieldLabelServerComponent,
   TextareaFieldProps,
 } from './fields/Textarea.js'
 
 export type {
-  UploadFieldDescriptionComponent,
-  UploadFieldErrorComponent,
-  UploadFieldLabelComponent,
+  UploadFieldDescriptionClientComponent,
+  UploadFieldDescriptionServerComponent,
+  UploadFieldErrorClientComponent,
+  UploadFieldErrorServerComponent,
+  UploadFieldLabelClientComponent,
+  UploadFieldLabelServerComponent,
   UploadFieldProps,
 } from './fields/Upload.js'
 
-export type { ErrorComponent, ErrorProps, GenericErrorProps } from './forms/Error.js'
-
-export type { FormFieldBase } from './forms/Field.js'
-
 export type {
   Description,
-  DescriptionComponent,
   DescriptionFunction,
-  FieldDescriptionProps,
+  FieldDescriptionClientComponent,
+  FieldDescriptionClientProps,
+  FieldDescriptionServerComponent,
+  FieldDescriptionServerProps,
   GenericDescriptionProps,
   StaticDescription,
-} from './forms/FieldDescription.js'
+} from './forms/Description.js'
+
+export type {
+  FieldErrorClientComponent,
+  FieldErrorClientProps,
+  FieldErrorServerComponent,
+  FieldErrorServerProps,
+  GenericErrorProps,
+} from './forms/Error.js'
+
+export type { FormFieldBase } from './forms/Field.js'
 
 export type { Data, FilterOptionsResult, FormField, FormState, Row } from './forms/Form.js'
 
 export type {
+  FieldLabelClientComponent,
+  FieldLabelClientProps,
+  FieldLabelServerComponent,
+  FieldLabelServerProps,
   GenericLabelProps,
-  LabelComponent,
-  LabelProps,
   SanitizedLabelProps,
 } from './forms/Label.js'
 
@@ -206,6 +271,7 @@ export type { RowLabel, RowLabelComponent } from './forms/RowLabel.js'
 
 export type {
   AdminViewComponent,
+  AdminViewConfig,
   AdminViewProps,
   EditViewProps,
   InitPageResult,
@@ -240,14 +306,20 @@ export type MappedComponent<TComponentClientProps extends JsonObject = JsonObjec
 export type CreateMappedComponent = {
   <T extends JsonObject>(
     component: { Component: React.FC<T> } | PayloadComponent<T> | null,
-    props: object,
+    props: {
+      clientProps?: JsonObject
+      serverProps?: object
+    },
     fallback: React.FC,
     identifier: string,
   ): MappedComponent<T>
 
   <T extends JsonObject>(
     components: ({ Component: React.FC<T> } | PayloadComponent<T>)[],
-    props: object,
+    props: {
+      clientProps?: JsonObject
+      serverProps?: object
+    },
     fallback: React.FC,
     identifier: string,
   ): MappedComponent<T>[]

packages/payload/src/admin/views/types.ts

@@ -4,7 +4,7 @@ import type { Permissions } from '../../auth/index.js'
 import type { ImportMap } from '../../bin/generateImportMap/index.js'
 import type { SanitizedCollectionConfig } from '../../collections/config/types.js'
 import type { ClientConfig } from '../../config/client.js'
-import type { Locale, PayloadComponent } from '../../config/types.js'
+import type { Locale, MetaConfig, PayloadComponent } from '../../config/types.js'
 import type { SanitizedGlobalConfig } from '../../globals/config/types.js'
 import type { PayloadRequest } from '../../types/index.js'
 import type { LanguageOptions } from '../LanguageOptions.js'
@@ -14,6 +14,7 @@ export type AdminViewConfig = {
   Component: AdminViewComponent
   /** Whether the path should be matched exactly or as a prefix */
   exact?: boolean
+  meta?: MetaConfig
   path?: string
   sensitive?: boolean
   strict?: boolean

packages/payload/src/collections/config/client.ts

@@ -1,4 +1,4 @@
-import type { MappedComponent } from '../../admin/types.js'
+import type { MappedComponent, StaticDescription } from '../../admin/types.js'
 import type { MappedView } from '../../admin/views/types.js'
 import type { LivePreviewConfig, ServerOnlyLivePreviewProperties } from '../../config/types.js'
 import type { ClientField } from '../../fields/config/client.js'
@@ -46,7 +46,7 @@ export type ClientCollectionConfig = {
         }
       }
     }
-    description?: Record<string, string> | string
+    description?: StaticDescription
     livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>
   } & Omit<
     SanitizedCollectionConfig['admin'],

packages/payload/src/collections/config/types.ts

@@ -24,6 +24,7 @@ import type {
   GeneratePreviewURL,
   LabelFunction,
   LivePreviewConfig,
+  MetaConfig,
   OpenGraphConfig,
   PayloadComponent,
   StaticLabel,
@@ -329,10 +330,7 @@ export type CollectionAdminOptions = {
    * Live preview options
    */
   livePreview?: LivePreviewConfig
-  meta?: {
-    description?: string
-    openGraph?: OpenGraphConfig
-  }
+  meta?: MetaConfig
   pagination?: {
     defaultLimit?: number
     limits?: number[]