Merge branch 'feat/folders' of github.com:payloadcms/payload into fix/findValueInPath

.github/ISSUE_TEMPLATE/1.bug_report_v3.yml

@@ -43,7 +43,6 @@ body:
         - 'plugin: cloud'
         - 'plugin: cloud-storage'
         - 'plugin: form-builder'
-        - 'plugin: multi-tenant'
         - 'plugin: nested-docs'
         - 'plugin: richtext-lexical'
         - 'plugin: richtext-slate'
@@ -60,7 +59,10 @@ body:
       label: Environment Info
       description: Paste output from `pnpm payload info` _or_ Payload, Node.js, and Next.js versions. Please avoid using "latest"—specific version numbers help us accurately diagnose and resolve issues.
       render: text
-      placeholder: Run `pnpm payload info` in your terminal and paste the output here.
+      placeholder: |
+        Payload:
+        Node.js:
+        Next.js:
     validations:
       required: true
 

.github/workflows/main.yml

@@ -6,7 +6,6 @@ on:
       - opened
       - reopened
       - synchronize
-      - labeled
   push:
     branches:
       - main
@@ -384,142 +383,6 @@ jobs:
       #     report-tag: ${{ matrix.suite }}
       #     job-summary: true
 
-  tests-e2e-turbo:
-    runs-on: ubuntu-24.04
-    needs: [changes, build]
-    if: >-
-      needs.changes.outputs.needs_tests == 'true' &&
-      (
-        contains(github.event.pull_request.labels.*.name, 'run-e2e-turbo') ||
-        github.event.label.name == 'run-e2e-turbo'
-      )
-    name: e2e-turbo-${{ matrix.suite }}
-    strategy:
-      fail-fast: false
-      matrix:
-        # find test -type f -name 'e2e.spec.ts' | sort | xargs dirname | xargs -I {} basename {}
-        suite:
-          - _community
-          - access-control
-          - admin__e2e__general
-          - admin__e2e__list-view
-          - admin__e2e__document-view
-          - admin-bar
-          - admin-root
-          - auth
-          - auth-basic
-          - bulk-edit
-          - joins
-          - field-error-states
-          - fields-relationship
-          - fields__collections__Array
-          - fields__collections__Blocks
-          - fields__collections__Blocks#config.blockreferences.ts
-          - fields__collections__Checkbox
-          - fields__collections__Collapsible
-          - fields__collections__ConditionalLogic
-          - fields__collections__CustomID
-          - fields__collections__Date
-          - fields__collections__Email
-          - fields__collections__Indexed
-          - fields__collections__JSON
-          - fields__collections__Number
-          - fields__collections__Point
-          - fields__collections__Radio
-          - fields__collections__Relationship
-          - fields__collections__Row
-          - fields__collections__Select
-          - fields__collections__Tabs
-          - fields__collections__Tabs2
-          - fields__collections__Text
-          - fields__collections__UI
-          - fields__collections__Upload
-          - hooks
-          - lexical__collections__Lexical__e2e__main
-          - lexical__collections__Lexical__e2e__blocks
-          - lexical__collections__Lexical__e2e__blocks#config.blockreferences.ts
-          - lexical__collections__RichText
-          - query-presets
-          - form-state
-          - live-preview
-          - localization
-          - locked-documents
-          - i18n
-          - plugin-cloud-storage
-          - plugin-form-builder
-          - plugin-import-export
-          - plugin-nested-docs
-          - plugin-seo
-          - sort
-          - versions
-          - uploads
-    env:
-      SUITE_NAME: ${{ matrix.suite }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Node setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          pnpm-version: ${{ env.PNPM_VERSION }}
-          pnpm-run-install: false
-          pnpm-restore-cache: false # Full build is restored below
-          pnpm-install-cache-key: pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-
-      - name: Restore build
-        uses: actions/cache@v4
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
-
-      - name: Start LocalStack
-        run: pnpm docker:start
-        if: ${{ matrix.suite == 'plugin-cloud-storage' }}
-
-      - name: Store Playwright's Version
-        run: |
-          # Extract the version number using a more targeted regex pattern with awk
-          PLAYWRIGHT_VERSION=$(pnpm ls @playwright/test --depth=0 | awk '/@playwright\/test/ {print $2}')
-          echo "Playwright's Version: $PLAYWRIGHT_VERSION"
-          echo "PLAYWRIGHT_VERSION=$PLAYWRIGHT_VERSION" >> $GITHUB_ENV
-
-      - name: Cache Playwright Browsers for Playwright's Version
-        id: cache-playwright-browsers
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ env.PLAYWRIGHT_VERSION }}
-
-      - name: Setup Playwright - Browsers and Dependencies
-        if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
-        run: pnpm exec playwright install --with-deps chromium
-
-      - name: Setup Playwright - Dependencies-only
-        if: steps.cache-playwright-browsers.outputs.cache-hit == 'true'
-        run: pnpm exec playwright install-deps chromium
-
-      - name: E2E Tests
-        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e:prod:ci:turbo ${{ matrix.suite }}
-        env:
-          PLAYWRIGHT_JSON_OUTPUT_NAME: results_${{ matrix.suite }}.json
-          NEXT_TELEMETRY_DISABLED: 1
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: test-results-turbo${{ matrix.suite }}
-          path: test/test-results/
-          if-no-files-found: ignore
-          retention-days: 1
-
-      # Disabled until this is fixed: https://github.com/daun/playwright-report-summary/issues/156
-      # - uses: daun/playwright-report-summary@v3
-      #   with:
-      #     report-file: results_${{ matrix.suite }}.json
-      #     report-tag: ${{ matrix.suite }}
-      #     job-summary: true
-
   # Build listed templates with packed local packages
   build-templates:
     runs-on: ubuntu-24.04

.gitignore

@@ -311,8 +311,6 @@ test/admin-bar/app/(payload)/admin/importMap.js
 /test/admin-bar/app/(payload)/admin/importMap.js
 test/live-preview/app/(payload)/admin/importMap.js
 /test/live-preview/app/(payload)/admin/importMap.js
-test/plugin-ecommerce/app/(payload)/admin/importMap.js
-/test/plugin-ecommerce/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

CONTRIBUTING.md

@@ -87,43 +87,41 @@ You can run the entire test suite using `pnpm test`. If you wish to only run e2e
 
 By default, `pnpm test:int` will only run int test against MongoDB. To run int tests against postgres, you can use `pnpm test:int:postgres`. You will have to have postgres installed on your system for this to work.
 
-### Pull Requests
+### Commits
 
-For all Pull Requests, you should be extremely descriptive about both your problem and proposed solution. If there are any affected open or closed issues, please leave the issue number in your PR description.
+We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for our commit messages. Please follow this format when creating commits. Here are some examples:
 
-All commits within a PR are squashed when merged, using the PR title as the commit message. For that reason, please use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for your PR titles.
+- `feat: adds new feature`
+- `fix: fixes bug`
+- `docs: adds documentation`
+- `chore: does chore`
 
-Here are some examples:
+Here's a breakdown of the format. At the top-level, we use the following types to categorize our commits:
 
-- `feat: add new feature`
-- `fix: fix bug`
-- `docs: add documentation`
-- `test: add/fix tests`
-- `refactor: refactor code`
-- `chore: anything that does not fit into the above categories`
-
-If applicable, you must indicate the affected packages in parentheses to "scope" the changes. Changes to the payload chore package do not require scoping.
-
-Here are some examples:
-
-- `feat(ui): add new feature`
-- `fix(richtext-lexical): fix bug`
+- `feat`: new feature that adds functionality. These are automatically added to the changelog when creating new releases.
+- `fix`: a fix to an existing feature. These are automatically added to the changelog when creating new releases.
+- `docs`: changes to [docs](./docs) only. These do not appear in the changelog.
+- `chore`: changes to code that is neither a fix nor a feature (e.g. refactoring, adding tests, etc.). These do not appear in the changelog.
 
 If you are committing to [templates](./templates) or [examples](./examples), use the `chore` type with the proper scope, like this:
 
 - `chore(templates): adds feature to template`
 - `chore(examples): fixes bug in example`
 
+## Pull Requests
+
+For all Pull Requests, you should be extremely descriptive about both your problem and proposed solution. If there are any affected open or closed issues, please leave the issue number in your PR message.
+
 ## Previewing docs
 
 This is how you can preview changes you made locally to the docs:
 
 1. Clone our [website repository](https://github.com/payloadcms/website)
-2. Run `pnpm install`
+2. Run `yarn install`
 3. Duplicate the `.env.example` file and rename it to `.env`
 4. Add a `DOCS_DIR` environment variable to the `.env` file which points to the absolute path of your modified docs folder. For example `DOCS_DIR=/Users/yourname/Documents/GitHub/payload/docs`
-5. Run `pnpm fetchDocs:local`. If this was successful, you should see no error messages and the following output: _Docs successfully written to /.../website/src/app/docs.json_. There could be error messages if you have incorrect markdown in your local docs folder. In this case, it will tell you how you can fix it
-6. You're done! Now you can start the website locally using `pnpm dev` and preview the docs under [http://localhost:3000/docs/local](http://localhost:3000/docs/local)
+5. Run `yarn run fetchDocs:local`. If this was successful, you should see no error messages and the following output: _Docs successfully written to /.../website/src/app/docs.json_. There could be error messages if you have incorrect markdown in your local docs folder. In this case, it will tell you how you can fix it
+6. You're done! Now you can start the website locally using `yarn run dev` and preview the docs under [http://localhost:3000/docs/](http://localhost:3000/docs/)
 
 ## Internationalization (i18n)
 

docs/access-control/globals.mdx

@@ -39,7 +39,7 @@ const GlobalWithAccessControl: GlobalConfig = {
     update: ({ req: { user } }) => {...},
 
     // Version-enabled Globals only
-    readVersions: () => {...},
+    readVersion: () => {...},
   },
   // highlight-end
 }
@@ -64,7 +64,7 @@ If a Global supports [Versions](../versions/overview), the following additional
 
 Returns a boolean result or optionally a [query constraint](../queries/overview) which limits who can read this global based on its current properties.
 
-To add read Access Control to a [Global](../configuration/globals), use the `access` property in the [Global Config](../configuration/globals):
+To add read Access Control to a [Global](../configuration/globals), use the `read` property in the [Global Config](../configuration/globals):
 
 ```ts
 import { GlobalConfig } from 'payload'
@@ -72,7 +72,7 @@ import { GlobalConfig } from 'payload'
 const Header: GlobalConfig = {
   // ...
   // highlight-start
-  access: {
+  read: {
     read: ({ req: { user } }) => {
       return Boolean(user)
     },

docs/admin/preview.mdx

@@ -65,7 +65,7 @@ preview: (doc, { req }) => `${req.protocol}//${req.host}/${doc.slug}` // highlig
 
 The Preview feature can be used to achieve "Draft Preview". After clicking the preview button from the Admin Panel, you can enter into "draft mode" within your front-end application. This will allow you to adjust your page queries to include the `draft: true` param. When this param is present on the request, Payload will send back a draft document as opposed to a published one based on the document's `_status` field.
 
-To enter draft mode, the URL provided to the `preview` function can point to a custom endpoint in your front-end application that sets a cookie or session variable to indicate that draft mode is enabled. This is framework specific, so the mechanisms here vary from framework to framework although the underlying concept is the same.
+To enter draft mode, the URL provided to the `preview` function can point to a custom endpoint in your front-end application that sets a cookie or session variable to indicate that draft mode is enabled. This is framework specific, so the mechanisms here very from framework to framework although the underlying concept is the same.
 
 ### Next.js
 

docs/admin/react-hooks.mdx

@@ -605,7 +605,7 @@ return (
         textField: {
           initialValue: 'Updated text',
           valid: true,
-          value: 'Updated text',
+          value: 'Upddated text',
         },
       },
       // blockType: "yourBlockSlug",
@@ -875,7 +875,7 @@ Useful to retrieve info about the currently logged in user as well as methods fo
 | **`refreshCookie`**      | A method to trigger the silent refreshing of a user's auth token                        |
 | **`setToken`**           | Set the token of the user, to be decoded and used to reset the user and token in memory |
 | **`token`**              | The logged in user's token (useful for creating preview links, etc.)                    |
-| **`refreshPermissions`** | Load new permissions (useful when content that affects permissions has been changed)    |
+| **`refreshPermissions`** | Load new permissions (useful when content that effects permissions has been changed)    |
 | **`permissions`**        | The permissions of the current user                                                     |
 
 ```tsx
@@ -981,15 +981,7 @@ const MyComponent: React.FC = () => {
 
 ## useTableColumns
 
-Returns properties and methods to manipulate table columns:
-| Property | Description |
-| ------------------------ | ------------------------------------------------------------------------------------------ |
-| **`columns`** | The current state of columns including their active status and configuration |
-| **`LinkedCellOverride`** | A component override for linked cells in the table |
-| **`moveColumn`** | A method to reorder columns. Accepts `{ fromIndex: number, toIndex: number }` as arguments |
-| **`resetColumnsState`** | A method to reset columns back to their default configuration as defined in the collection config |
-| **`setActiveColumns`** | A method to set specific columns to active state while preserving the existing column order. Accepts an array of column names to activate |
-| **`toggleColumn`** | A method to toggle a single column's visibility. Accepts a column name as string |
+Returns methods to manipulate table columns
 
 ```tsx
 'use client'
@@ -997,30 +989,17 @@ import { useTableColumns } from '@payloadcms/ui'
 
 const MyComponent: React.FC = () => {
   // highlight-start
-  const { setActiveColumns, resetColumnsState } = useTableColumns()
+  const { setActiveColumns } = useTableColumns()
 
-  const activateSpecificColumns = () => {
-    // Only activates the id and createdAt columns
-    // Other columns retain their current active/inactive state
-    // The original column order is preserved
-    setActiveColumns(['id', 'createdAt'])
-  }
-
-  const resetToDefaults = () => {
-    // Resets to the default columns defined in the collection config
-    resetColumnsState()
+  const resetColumns = () => {
+    setActiveColumns(['id', 'createdAt', 'updatedAt'])
   }
   // highlight-end
 
   return (
-    <div>
-      <button type="button" onClick={activateSpecificColumns}>
-        Activate Specific Columns
-      </button>
-      <button type="button" onClick={resetToDefaults}>
-        Reset To Defaults
-      </button>
-    </div>
+    <button type="button" onClick={resetColumns}>
+      Reset columns
+    </button>
   )
 }
 ```
@@ -1164,7 +1143,7 @@ This is useful for scenarios where you need to trigger another fetch regardless
 
 Route transitions are useful in showing immediate visual feedback to the user when navigating between pages. This is especially useful on slow networks when navigating to data heavy or process intensive pages.
 
-By default, any instances of `Link` from `@payloadcms/ui` will trigger route transitions by default.
+By default, any instances of `Link` from `@payloadcms/ui` will trigger route transitions dy default.
 
 ```tsx
 import { Link } from '@payloadcms/ui'

docs/authentication/cookies.mdx

@@ -62,7 +62,7 @@ In this scenario, if your cookie was still valid, malicious-intent.com would be
 
 ### CSRF Prevention
 
-Define domains that you trust and are willing to accept Payload HTTP-only cookie based requests from. Use the `csrf` option on the base Payload Config to do this:
+Define domains that your trust and are willing to accept Payload HTTP-only cookie based requests from. Use the `csrf` option on the base Payload Config to do this:
 
 ```ts
 // payload.config.ts
@@ -102,8 +102,8 @@ If option 1 isn't possible, then you can get around this limitation by [configur
 
 ```
 SameSite: None // allows the cookie to cross domains
-Secure: true // ensures it's sent over HTTPS only
-HttpOnly: true // ensures it's not accessible via client side JavaScript
+Secure: true // ensures its sent over HTTPS only
+HttpOnly: true // ensures its not accessible via client side JavaScript
 ```
 
 Configuration example:

docs/authentication/custom-strategies.mdx

@@ -25,12 +25,11 @@ A strategy is made up of the following:
 
 The `authenticate` function is passed the following arguments:
 
-| Argument               | Description                                                                                                         |
-| ---------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| **`canSetHeaders`** \* | Whether or not the strategy is being executed from a context where response headers can be set. Default is `false`. |
-| **`headers`** \*       | The headers on the incoming request. Useful for retrieving identifiable information on a request.                   |
-| **`payload`** \*       | The Payload class. Useful for authenticating the identifiable information against Payload.                          |
-| **`isGraphQL`**        | Whether or not the strategy is being executed within the GraphQL endpoint. Default is `false`.                      |
+| Argument         | Description                                                                                       |
+| ---------------- | ------------------------------------------------------------------------------------------------- |
+| **`headers`** \* | The headers on the incoming request. Useful for retrieving identifiable information on a request. |
+| **`payload`** \* | The Payload class. Useful for authenticating the identifiable information against Payload.        |
+| **`isGraphQL`**  | Whether or not the request was made from a GraphQL endpoint. Default is `false`.                  |
 
 ### Example Strategy
 

docs/authentication/email.mdx

@@ -71,7 +71,7 @@ export const Customers: CollectionConfig = {
 
 #### generateEmailSubject
 
-Similarly to the above `generateEmailHTML`, you can also customize the subject of the email. The function arguments are the same but you can only return a string - not HTML.
+Similarly to the above `generateEmailHTML`, you can also customize the subject of the email. The function argument are the same but you can only return a string - not HTML.
 
 ```ts
 import type { CollectionConfig } from 'payload'
@@ -178,7 +178,7 @@ The following arguments are passed to the `generateEmailHTML` function:
 
 #### generateEmailSubject
 
-Similarly to the above `generateEmailHTML`, you can also customize the subject of the email. The function arguments are the same but you can only return a string - not HTML.
+Similarly to the above `generateEmailHTML`, you can also customize the subject of the email. The function argument are the same but you can only return a string - not HTML.
 
 ```ts
 import type { CollectionConfig } from 'payload'

docs/authentication/jwt.mdx

@@ -38,7 +38,7 @@ const request = await fetch('http://localhost:3000', {
 
 ### Omitting The Token
 
-In some cases you may want to prevent the token from being returned from the auth operations. You can do that by setting `removeTokenFromResponses` to `true` like so:
+In some cases you may want to prevent the token from being returned from the auth operations. You can do that by setting `removeTokenFromResponse` to `true` like so:
 
 ```ts
 import type { CollectionConfig } from 'payload'
@@ -46,7 +46,7 @@ import type { CollectionConfig } from 'payload'
 export const UsersWithoutJWTs: CollectionConfig = {
   slug: 'users-without-jwts',
   auth: {
-    removeTokenFromResponses: true, // highlight-line
+    removeTokenFromResponse: true, // highlight-line
   },
 }
 ```

docs/authentication/operations.mdx

@@ -67,7 +67,7 @@ query {
 }
 ```
 
-Document access can also be queried on a collection/global basis. Access on a global can be queried like `http://localhost:3000/api/global-slug/access`, Collection document access can be queried like `http://localhost:3000/api/collection-slug/access/:id`.
+Document access can also be queried on a collection/global basis. Access on a global can queried like `http://localhost:3000/api/global-slug/access`, Collection document access can be queried like `http://localhost:3000/api/collection-slug/access/:id`.
 
 ## Me
 

docs/authentication/overview.mdx

@@ -71,7 +71,7 @@ export const Admins: CollectionConfig = {
 </Banner>
 
 <Banner type="warning">
-  **Note:** Auth-enabled Collections will be automatically injected with the
+  **Note:** Auth-enabled Collections with be automatically injected with the
   `hash`, `salt`, and `email` fields. [More
   details](../fields/overview#field-names).
 </Banner>
@@ -142,17 +142,14 @@ import { buildConfig } from 'payload'
 export default buildConfig({
   // ...
   // highlight-start
-  admin: {
-    autoLogin:
-      process.env.NODE_ENV === 'development'
-        ? {
-            email: 'test@example.com',
-            password: 'test',
-            prefillOnly: true,
-          }
-        : false,
-  },
-
+  autoLogin:
+    process.env.NEXT_PUBLIC_ENABLE_AUTOLOGIN === 'true'
+      ? {
+          email: 'test@example.com',
+          password: 'test',
+          prefillOnly: true,
+        }
+      : false,
   // highlight-end
 })
 ```

docs/authentication/token-data.mdx

@@ -8,7 +8,7 @@ keywords: authentication, config, configuration, documentation, Content Manageme
 
 During the lifecycle of a request you will be able to access the data you have configured to be stored in the JWT by accessing `req.user`. The user object is automatically appended to the request for you.
 
-### Defining Token Data
+### Definining Token Data
 
 You can specify what data gets encoded to the Cookie/JWT-Token by setting `saveToJWT` property on fields within your auth collection.
 

docs/configuration/collections.mdx

@@ -177,7 +177,7 @@ The following options are available:
 #### Edit View Options
 
 ```ts
-import type { CollectionConfig } from 'payload'
+import type { CollectionCOnfig } from 'payload'
 
 export const MyCollection: CollectionConfig = {
   // ...
@@ -194,15 +194,13 @@ export const MyCollection: CollectionConfig = {
 
 The following options are available:
 
-| Option                   | Description                                                                                                                                                                                             |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `beforeDocumentControls` | Inject custom components before the Save / Publish buttons. [More details](../custom-components/edit-view#beforedocumentcontrols).                                                                      |
-| `editMenuItems`          | Inject custom components within the 3-dot menu dropdown located in the document controls bar. [More details](../custom-components/edit-view#editmenuitems).                                             |
-| `SaveButton`             | Replace the default Save Button within the Edit View. [Drafts](../versions/drafts) must be disabled. [More details](../custom-components/edit-view#savebutton).                                         |
-| `SaveDraftButton`        | Replace the default Save Draft Button within the Edit View. [Drafts](../versions/drafts) must be enabled and autosave must be disabled. [More details](../custom-components/edit-view#savedraftbutton). |
-| `PublishButton`          | Replace the default Publish Button within the Edit View. [Drafts](../versions/drafts) must be enabled. [More details](../custom-components/edit-view#publishbutton).                                    |
-| `PreviewButton`          | Replace the default Preview Button within the Edit View. [Preview](../admin/preview) must be enabled. [More details](../custom-components/edit-view#previewbutton).                                     |
-| `Upload`                 | Replace the default Upload component within the Edit View. [Upload](../upload/overview) must be enabled. [More details](../custom-components/edit-view#upload).                                         |
+| Option            | Description                                                                                                                                                                                             |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `SaveButton`      | Replace the default Save Button within the Edit View. [Drafts](../versions/drafts) must be disabled. [More details](../custom-components/edit-view#savebutton).                                         |
+| `SaveDraftButton` | Replace the default Save Draft Button within the Edit View. [Drafts](../versions/drafts) must be enabled and autosave must be disabled. [More details](../custom-components/edit-view#savedraftbutton). |
+| `PublishButton`   | Replace the default Publish Button within the Edit View. [Drafts](../versions/drafts) must be enabled. [More details](../custom-components/edit-view#publishbutton).                                    |
+| `PreviewButton`   | Replace the default Preview Button within the Edit View. [Preview](../admin/preview) must be enabled. [More details](../custom-components/edit-view#previewbutton).                                     |
+| `Upload`          | Replace the default Upload component within the Edit View. [Upload](../upload/overview) must be enabled. [More details](../custom-components/edit-view#upload).                                         |
 
 <Banner type="success">
   **Note:** For details on how to build Custom Components, see [Building Custom
@@ -277,7 +275,7 @@ You can also pass an object to the collection's `graphQL` property, which allows
 
 ## TypeScript
 
-You can import types from Payload to help make writing your Collection configs easier and type-safe. There are two main types that represent the Collection Config, `CollectionConfig` and `SanitizedCollectionConfig`.
+You can import types from Payload to help make writing your Collection configs easier and type-safe. There are two main types that represent the Collection Config, `CollectionConfig` and `SanitizeCollectionConfig`.
 
 The `CollectionConfig` type represents a raw Collection Config in its full form, where only the bare minimum properties are marked as required. The `SanitizedCollectionConfig` type represents a Collection Config after it has been fully sanitized. Generally, this is only used internally by Payload.
 

docs/configuration/globals.mdx

@@ -205,7 +205,7 @@ You can also pass an object to the global's `graphQL` property, which allows you
 
 ## TypeScript
 
-You can import types from Payload to help make writing your Global configs easier and type-safe. There are two main types that represent the Global Config, `GlobalConfig` and `SanitizedGlobalConfig`.
+You can import types from Payload to help make writing your Global configs easier and type-safe. There are two main types that represent the Global Config, `GlobalConfig` and `SanitizeGlobalConfig`.
 
 The `GlobalConfig` type represents a raw Global Config in its full form, where only the bare minimum properties are marked as required. The `SanitizedGlobalConfig` type represents a Global Config after it has been fully sanitized. Generally, this is only used internally by Payload.
 

docs/configuration/overview.mdx

@@ -213,7 +213,7 @@ For more information about what we track, take a look at our [privacy policy](/p
 
 ## Cross-origin resource sharing (CORS)#cors
 
-Cross-origin resource sharing (CORS) can be configured with either a whitelist array of URLS to allow CORS requests from, a wildcard string (`*`) to accept incoming requests from any domain, or an object with the following properties:
+Cross-origin resource sharing (CORS) can be configured with either a whitelist array of URLS to allow CORS requests from, a wildcard string (`*`) to accept incoming requests from any domain, or a object with the following properties:
 
 | Option        | Description                                                                                                                             |
 | ------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
@@ -292,7 +292,7 @@ export const script = async (config: SanitizedConfig) => {
     collection: 'pages',
     data: { title: 'my title' },
   })
-  payload.logger.info('Successfully seeded!')
+  payload.logger.info('Succesffully seeded!')
   process.exit(0)
 }
 ```

docs/custom-components/document-views.mdx

@@ -59,7 +59,7 @@ _For details on how to build Custom Views, including all available props, see [B
 
 ### Document Root
 
-The Document Root is mounted on the top-level route for a Document. Setting this property will completely take over the entire Document View layout, including the title, [Document Tabs](#document-tabs), _and all other nested Document Views_ including the [Edit View](./edit-view), API View, etc.
+The Document Root is mounted on the top-level route for a Document. Setting this property will completely take over the entire Document View layout, including the title, [Document Tabs](#ocument-tabs), _and all other nested Document Views_ including the [Edit View](./edit-view), API View, etc.
 
 When setting a Document Root, you are responsible for rendering all necessary components and controls, as no document controls or tabs would be rendered. To replace only the Edit View precisely, use the `edit.default` key instead.
 

docs/custom-components/edit-view.mdx

@@ -101,16 +101,15 @@ export const MyCollection: CollectionConfig = {
 
 The following options are available:
 
-| Path                     | Description                                                                                                                  |
-| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------- |
-| `beforeDocumentControls` | Inject custom components before the Save / Publish buttons. [More details](#beforedocumentcontrols).                         |
-| `editMenuItems`          | Inject custom components within the 3-dot menu dropdown located in the document control bar. [More details](#editmenuitems). |
-| `SaveButton`             | A button that saves the current document. [More details](#savebutton).                                                       |
-| `SaveDraftButton`        | A button that saves the current document as a draft. [More details](#savedraftbutton).                                       |
-| `PublishButton`          | A button that publishes the current document. [More details](#publishbutton).                                                |
-| `PreviewButton`          | A button that previews the current document. [More details](#previewbutton).                                                 |
-| `Description`            | A description of the Collection. [More details](#description).                                                               |
-| `Upload`                 | A file upload component. [More details](#upload).                                                                            |
+| Path                     | Description                                                                                          |
+| ------------------------ | ---------------------------------------------------------------------------------------------------- |
+| `beforeDocumentControls` | Inject custom components before the Save / Publish buttons. [More details](#beforedocumentcontrols). |
+| `SaveButton`             | A button that saves the current document. [More details](#savebutton).                               |
+| `SaveDraftButton`        | A button that saves the current document as a draft. [More details](#savedraftbutton).               |
+| `PublishButton`          | A button that publishes the current document. [More details](#publishbutton).                        |
+| `PreviewButton`          | A button that previews the current document. [More details](#previewbutton).                         |
+| `Description`            | A description of the Collection. [More details](#description).                                       |
+| `Upload`                 | A file upload component. [More details](#upload).                                                    |
 
 #### Globals
 
@@ -135,15 +134,14 @@ export const MyGlobal: GlobalConfig = {
 
 The following options are available:
 
-| Path                     | Description                                                                                                                  |
-| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------- |
-| `beforeDocumentControls` | Inject custom components before the Save / Publish buttons. [More details](#beforedocumentcontrols).                         |
-| `editMenuItems`          | Inject custom components within the 3-dot menu dropdown located in the document control bar. [More details](#editmenuitems). |
-| `SaveButton`             | A button that saves the current document. [More details](#savebutton).                                                       |
-| `SaveDraftButton`        | A button that saves the current document as a draft. [More details](#savedraftbutton).                                       |
-| `PublishButton`          | A button that publishes the current document. [More details](#publishbutton).                                                |
-| `PreviewButton`          | A button that previews the current document. [More details](#previewbutton).                                                 |
-| `Description`            | A description of the Global. [More details](#description).                                                                   |
+| Path                     | Description                                                                                          |
+| ------------------------ | ---------------------------------------------------------------------------------------------------- |
+| `beforeDocumentControls` | Inject custom components before the Save / Publish buttons. [More details](#beforedocumentcontrols). |
+| `SaveButton`             | A button that saves the current document. [More details](#savebutton).                               |
+| `SaveDraftButton`        | A button that saves the current document as a draft. [More details](#savedraftbutton).               |
+| `PublishButton`          | A button that publishes the current document. [More details](#publishbutton).                        |
+| `PreviewButton`          | A button that previews the current document. [More details](#previewbutton).                         |
+| `Description`            | A description of the Global. [More details](#description).                                           |
 
 ### SaveButton
 
@@ -262,92 +260,6 @@ export function MyCustomDocumentControlButton(
 }
 ```
 
-### editMenuItems
-
-The `editMenuItems` property allows you to inject custom components into the 3-dot menu dropdown located in the document controls bar. This dropdown contains default options including `Create New`, `Duplicate`, `Delete`, and other options when additional features are enabled. Any custom components you add will appear below these default items.
-
-To add `editMenuItems`, use the `components.edit.editMenuItems` property in your [Collection Config](../configuration/collections):
-
-#### Config Example
-
-```ts
-import type { CollectionConfig } from 'payload'
-
-export const Pages: CollectionConfig = {
-  slug: 'pages',
-  admin: {
-    components: {
-      edit: {
-        // highlight-start
-        editMenuItems: ['/path/to/CustomEditMenuItem'],
-        // highlight-end
-      },
-    },
-  },
-}
-```
-
-Here's an example of a custom `editMenuItems` component:
-
-#### Server Component
-
-```tsx
-import React from 'react'
-import { PopupList } from '@payloadcms/ui'
-
-import type { EditMenuItemsServerProps } from 'payload'
-
-export const EditMenuItems = async (props: EditMenuItemsServerProps) => {
-  const href = `/custom-action?id=${props.id}`
-
-  return (
-    <PopupList.ButtonGroup>
-      <PopupList.Button href={href}>Custom Edit Menu Item</PopupList.Button>
-      <PopupList.Button href={href}>
-        Another Custom Edit Menu Item - add as many as you need!
-      </PopupList.Button>
-    </PopupList.ButtonGroup>
-  )
-}
-```
-
-#### Client Component
-
-```tsx
-'use client'
-
-import React from 'react'
-import { PopupList } from '@payloadcms/ui'
-
-import type { EditViewMenuItemClientProps } from 'payload'
-
-export const EditMenuItems = (props: EditViewMenuItemClientProps) => {
-  const handleClick = () => {
-    console.log('Custom button clicked!')
-  }
-
-  return (
-    <PopupList.ButtonGroup>
-      <PopupList.Button onClick={handleClick}>
-        Custom Edit Menu Item
-      </PopupList.Button>
-      <PopupList.Button onClick={handleClick}>
-        Another Custom Edit Menu Item - add as many as you need!
-      </PopupList.Button>
-    </PopupList.ButtonGroup>
-  )
-}
-```
-
-<Banner type="info">
-  **Styling:** Use Payload&apos;s built-in <code>PopupList.Button</code> to
-  ensure your menu items automatically match the default dropdown styles. If you
-  want a different look, you can customize the appearance by passing your own{' '}
-  <code>className</code> to <code>PopupList.Button</code>, or use a completely
-  custom button built with a standard HTML <code>&lt;button&gt;</code> element
-  or any other component that fits your design preferences.
-</Banner>
-
 ### SaveDraftButton
 
 The `SaveDraftButton` property allows you to render a custom Save Draft Button in the Edit View.

docs/custom-components/list-view.mdx

@@ -94,7 +94,6 @@ The following options are available:
 | `beforeListTable` | An array of custom components to inject before the table of documents in the List View. [More details](#beforelisttable). |
 | `afterList`       | An array of custom components to inject after the list of documents in the List View. [More details](#afterlist).         |
 | `afterListTable`  | An array of custom components to inject after the table of documents in the List View. [More details](#afterlisttable).   |
-| `listMenuItems`   | An array of components to render within a menu next to the List Controls (after the Columns and Filters options)          |
 | `Description`     | A component to render a description of the Collection. [More details](#description).                                      |
 
 ### beforeList

docs/custom-components/root-components.mdx

@@ -40,7 +40,7 @@ The following options are available:
 | `beforeDashboard` | An array of Custom Components to inject into the built-in Dashboard, _before_ the default dashboard contents. [More details](#beforedashboard).                          |
 | `beforeLogin`     | An array of Custom Components to inject into the built-in Login, _before_ the default login form. [More details](#beforelogin).                                          |
 | `beforeNavLinks`  | An array of Custom Components to inject into the built-in Nav, _before_ the links themselves. [More details](#beforenavlinks).                                           |
-| `graphics.Icon`   | The simplified logo used in contexts like the `Nav` component. [More details](#graphicsicon).                                                                            |
+| `graphics.Icon`   | The simplified logo used in contexts like the the `Nav` component. [More details](#graphicsicon).                                                                        |
 | `graphics.Logo`   | The full logo used in contexts like the `Login` view. [More details](#graphicslogo).                                                                                     |
 | `header`          | An array of Custom Components to be injected above the Payload header. [More details](#header).                                                                          |
 | `logout.Button`   | The button displayed in the sidebar that logs the user out. [More details](#logoutbutton).                                                                               |
@@ -345,7 +345,7 @@ export default function MyCustomIcon() {
 
 The `Logo` property is the full logo used in contexts like the `Login` view. This is typically a larger, more detailed representation of your brand.
 
-To add a custom logo, use the `admin.components.graphics.Logo` property in your Payload Config:
+To add a custom logo, use the `admin.components.graphic.Logo` property in your Payload Config:
 
 ```ts
 import { buildConfig } from 'payload'

docs/database/migrations.mdx

@@ -183,13 +183,13 @@ Depending on which Database Adapter you use, your migration workflow might diffe
 
 In relational databases, migrations will be **required** for non-development database environments. But with MongoDB, you might only need to run migrations once in a while (or never even need them).
 
-#### MongoDB#mongodb-migrations
+#### MongoDB
 
 In MongoDB, you'll only ever really need to run migrations for times where you change your database shape, and you have lots of existing data that you'd like to transform from Shape A to Shape B.
 
 In this case, you can create a migration by running `pnpm payload migrate:create`, and then write the logic that you need to perform to migrate your documents to their new shape. You can then either run your migrations in CI before you build / deploy, or you can run them locally, against your production database, by using your production database connection string on your local computer and running the `pnpm payload migrate` command.
 
-#### Postgres#postgres-migrations
+#### Postgres
 
 In relational databases like Postgres, migrations are a bit more important, because each time you add a new field or a new collection, you'll need to update the shape of your database to match your Payload Config (otherwise you'll see errors upon trying to read / write your data).
 

docs/database/postgres.mdx

@@ -39,7 +39,7 @@ export default buildConfig({
 import { vercelPostgresAdapter } from '@payloadcms/db-vercel-postgres'
 
 export default buildConfig({
-  // Automatically uses process.env.POSTGRES_URL if no options are provided.
+  // Automatically uses proces.env.POSTGRES_URL if no options are provided.
   db: vercelPostgresAdapter(),
   // Optionally, can accept the same options as the @vercel/postgres package.
   db: vercelPostgresAdapter({
@@ -224,7 +224,7 @@ Make sure Payload doesn't overlap table names with its collections. For example,
 ### afterSchemaInit
 
 Runs after the Drizzle schema is built. You can use this hook to modify the schema with features that aren't supported by Payload, or if you want to add a column that you don't want to be in the Payload config.
-To extend a table, Payload exposes `extendTable` utility to the args. You can refer to the [Drizzle documentation](https://orm.drizzle.team/docs/sql-schema-declaration).
+To extend a table, Payload exposes `extendTable` utillity to the args. You can refer to the [Drizzle documentation](https://orm.drizzle.team/docs/sql-schema-declaration).
 The following example adds the `extra_integer_column` column and a composite index on `country` and `city` columns.
 
 ```ts

docs/database/sqlite.mdx

@@ -189,7 +189,7 @@ Make sure Payload doesn't overlap table names with its collections. For example,
 ### afterSchemaInit
 
 Runs after the Drizzle schema is built. You can use this hook to modify the schema with features that aren't supported by Payload, or if you want to add a column that you don't want to be in the Payload config.
-To extend a table, Payload exposes `extendTable` utility to the args. You can refer to the [Drizzle documentation](https://orm.drizzle.team/docs/sql-schema-declaration).
+To extend a table, Payload exposes `extendTable` utillity to the args. You can refer to the [Drizzle documentation](https://orm.drizzle.team/docs/sql-schema-declaration).
 The following example adds the `extra_integer_column` column and a composite index on `country` and `city` columns.
 
 ```ts

docs/fields/array.mdx

@@ -80,7 +80,7 @@ export const MyArrayField: Field = {
 }
 ```
 
-The Array Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Array Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option                    | Description                                                                         |
 | ------------------------- | ----------------------------------------------------------------------------------- |

docs/fields/blocks.mdx

@@ -78,7 +78,7 @@ export const MyBlocksField: Field = {
 }
 ```
 
-The Blocks Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Blocks Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option                 | Description                                                                |
 | ---------------------- | -------------------------------------------------------------------------- |

docs/fields/code.mdx

@@ -68,7 +68,7 @@ export const MyCodeField: Field = {
 }
 ```
 
-The Code Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Code Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option              | Description                                                                                                                                                                     |
 | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/collapsible.mdx

@@ -58,7 +58,7 @@ export const MyCollapsibleField: Field = {
 }
 ```
 
-The Collapsible Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Collapsible Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option              | Description                     |
 | ------------------- | ------------------------------- |

docs/fields/date.mdx

@@ -65,7 +65,7 @@ export const MyDateField: Field = {
 }
 ```
 
-The Date Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Date Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Property                       | Description                                                                                                                            |
 | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/email.mdx

@@ -65,7 +65,7 @@ export const MyEmailField: Field = {
 }
 ```
 
-The Email Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Email Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Property           | Description                                                               |
 | ------------------ | ------------------------------------------------------------------------- |

docs/fields/group.mdx

@@ -37,7 +37,7 @@ export const MyGroupField: Field = {
 | ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **`name`**             | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                                                                                                             |
 | **`fields`** \*        | Array of field types to nest within this Group.                                                                                                                                                                                                                                    |
-| **`label`**            | Used as a heading in the Admin Panel and to name the generated GraphQL type. Defaults to the field name, if defined.                                                                                                                                                               |
+| **`label`**            | Used as a heading in the Admin Panel and to name the generated GraphQL type. Required when name is undefined, defaults to name converted to words.                                                                                                                                 |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                                                                                                                       |
 | **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                    |
 | **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                                              |
@@ -69,7 +69,7 @@ export const MyGroupField: Field = {
 }
 ```
 
-The Group Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Group Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option           | Description                                                                                                                                                                                                                                      |
 | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -113,7 +113,8 @@ export const ExampleCollection: CollectionConfig = {
 
 ## Presentational group fields
 
-You can also use the Group field to only visually group fields without affecting the data structure. Not defining a label will render just the grouped fields.
+You can also use the Group field to create a presentational group of fields. This is useful when you want to group fields together visually without affecting the data structure.
+The label will be required when a `name` is not provided.
 
 ```ts
 import type { CollectionConfig } from 'payload'

docs/fields/json.mdx

@@ -67,7 +67,7 @@ export const MyJSONField: Field = {
 }
 ```
 
-The JSON Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The JSON Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option              | Description                                                                                                                                                   |
 | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/number.mdx

@@ -70,7 +70,7 @@ export const MyNumberField: Field = {
 }
 ```
 
-The Number Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Number Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Property           | Description                                                                       |
 | ------------------ | --------------------------------------------------------------------------------- |

docs/fields/radio.mdx

@@ -36,7 +36,7 @@ export const MyRadioField: Field = {
 | Option                 | Description                                                                                                                                                                                                                                                                                             |
 | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                                                                                                                                  |
-| **`options`** \*       | Array of options to allow the field to store. Can either be an array of strings, or an array of objects containing a `label` string and a `value` string.                                                                                                                                               |
+| **`options`** \*       | Array of options to allow the field to store. Can either be an array of strings, or an array of objects containing an `label` string and a `value` string.                                                                                                                                              |
 | **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                                                                                                                                                 |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                                                                                                                                            |
 | **`index`**            | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often.                                                                                                                             |
@@ -82,7 +82,7 @@ export const MyRadioField: Field = {
 }
 ```
 
-The Radio Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Radio Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Property     | Description                                                                                                                  |
 | ------------ | ---------------------------------------------------------------------------------------------------------------------------- |

docs/fields/relationship.mdx

@@ -86,7 +86,7 @@ export const MyRelationshipField: Field = {
 }
 ```
 
-The Relationship Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Relationship Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Property          | Description                                                                                                                                 |
 | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/select.mdx

@@ -54,7 +54,6 @@ export const MySelectField: Field = {
 | **`enumName`**         | Custom enum name for this field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                                                                                                                                                         |
 | **`dbName`**           | Custom table name (if `hasMany` set to `true`) for this field when using SQL Database Adapter ([Postgres](/docs/database/postgres)). Auto-generated from name if not defined.                                                                                                                           |
 | **`interfaceName`**    | Create a top level, reusable [Typescript interface](/docs/typescript/generating-types#custom-field-interfaces) & [GraphQL type](/docs/graphql/graphql-schema#custom-field-schemas).                                                                                                                     |
-| **`filterOptions`**    | Dynamically filter which options are available based on the user, data, etc. [More details](#filterOptions)                                                                                                                                                                                             |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema                                                                                                                                                                                                                                             |
 | **`virtual`**          | Provide `true` to disable field in the database, or provide a string path to [link the field with a relationship](/docs/fields/relationship#linking-virtual-fields-with-relationships). See [Virtual Fields](https://payloadcms.com/blog/learn-how-virtual-fields-can-help-solve-common-cms-challenges) |
 
@@ -68,61 +67,6 @@ _\* An asterisk denotes that a property is required._
   used as a GraphQL enum.
 </Banner>
 
-### filterOptions
-
-Used to dynamically filter which options are available based on the current user, document data, or other criteria.
-
-Some examples of this might include:
-
-- Restricting options based on a user's role, e.g. admin-only options
-- Displaying different options based on the value of another field, e.g. a city/state selector
-
-The result of `filterOptions` will determine:
-
-- Which options are displayed in the Admin Panel
-- Which options can be saved to the database
-
-To do this, use the `filterOptions` property in your [Field Config](./overview):
-
-```ts
-import type { Field } from 'payload'
-
-export const MySelectField: Field = {
-  // ...
-  // highlight-start
-  type: 'select',
-  options: [
-    {
-      label: 'One',
-      value: 'one',
-    },
-    {
-      label: 'Two',
-      value: 'two',
-    },
-    {
-      label: 'Three',
-      value: 'three',
-    },
-  ],
-  filterOptions: ({ options, data }) =>
-    data.disallowOption1
-      ? options.filter(
-          (option) =>
-            (typeof option === 'string' ? options : option.value) !== 'one',
-        )
-      : options,
-  // highlight-end
-}
-```
-
-<Banner type="warning">
-  **Note:** This property is similar to `filterOptions` in
-  [Relationship](./relationship) or [Upload](./upload) fields, except that the
-  return value of this function is simply an array of options, not a query
-  constraint.
-</Banner>
-
 ## Admin Options
 
 To customize the appearance and behavior of the Select Field in the [Admin Panel](../admin/overview), you can use the `admin` option:
@@ -139,7 +83,7 @@ export const MySelectField: Field = {
 }
 ```
 
-The Select Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Select Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Property          | Description                                                                                                                                 |
 | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |

docs/fields/text.mdx

@@ -70,7 +70,7 @@ export const MyTextField: Field = {
 }
 ```
 
-The Text Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Text Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option             | Description                                                                                                                 |
 | ------------------ | --------------------------------------------------------------------------------------------------------------------------- |

docs/fields/textarea.mdx

@@ -67,7 +67,7 @@ export const MyTextareaField: Field = {
 }
 ```
 
-The Textarea Field inherits all of the default admin options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
+The Textarea Field inherits all of the default options from the base [Field Admin Config](./overview#admin-options), plus the following additional options:
 
 | Option             | Description                                                                                                                 |
 | ------------------ | --------------------------------------------------------------------------------------------------------------------------- |

docs/folders/overview.mdx

@@ -1,6 +1,6 @@
 ---
 title: Folders
-label: Overview
+label: Folders
 order: 10
 desc: Folders allow you to group documents across collections, and are a great way to organize your content.
 keywords: folders, folder, content organization
@@ -10,11 +10,6 @@ Folders allow you to group documents across collections, and are a great way to
 
 The configuration for folders is done in two places, the collection config and the Payload config. The collection config is where you enable folders, and the Payload config is where you configure the global folder settings.
 
-<Banner type="warning">
-  **Note:** The Folders feature is currently in beta and may be subject to
-  change in minor versions updates prior to being stable.
-</Banner>
-
 ## Folder Configuration
 
 On the payload config, you can configure the following settings under the `folders` property:
@@ -23,12 +18,6 @@ On the payload config, you can configure the following settings under the `folde
 // Type definition
 
 type RootFoldersConfiguration = {
-  /**
-   * If true, the browse by folder view will be enabled
-   *
-   * @default true
-   */
-  browseByFolder?: boolean
   /**
    * An array of functions to be ran when the folder collection is initialized
    * This allows plugins to modify the collection configuration
@@ -88,16 +77,7 @@ To enable folders on a collection, you need to set the `admin.folders` property
 ```ts
 // Type definition
 
-type CollectionFoldersConfiguration =
-  | boolean
-  | {
-      /**
-       * If true, the collection will be included in the browse by folder view
-       *
-       * @default true
-       */
-      browseByFolder?: boolean
-    }
+type CollectionFoldersConfiguration = boolean
 ```
 
 ```ts
@@ -110,7 +90,9 @@ const config = buildConfig({
     {
       slug: 'pages',
       // highlight-start
-      folders: true, // defaults to false
+      admin: {
+        folders: true, // defaults to false
+      },
       // highlight-end
     },
   ],

docs/hooks/context.mdx

@@ -23,7 +23,7 @@ Let's see examples on how context can be used in the first two scenarios mention
 
 ### Passing Data Between Hooks
 
-To pass data between hooks, you can assign values to context in an earlier hook in the lifecycle of a request and expect it in the context of a later hook.
+To pass data between hooks, you can assign values to context in an earlier hook in the lifecycle of a request and expect it the context in a later hook.
 
 For example:
 

docs/jobs-queue/tasks.mdx

@@ -33,7 +33,7 @@ Simply add a task to the `jobs.tasks` array in your Payload config. A task consi
 | `onSuccess`     | Function to be executed if the task succeeds.                                                                                                                                                                                                                                                                                                                                                                                                    |
 | `retries`       | Specify the number of times that this step should be retried if it fails. If this is undefined, the task will either inherit the retries from the workflow or have no retries. If this is 0, the task will not be retried. By default, this is undefined.                                                                                                                                                                                        |
 
-The logic for the Task is defined in the `handler` - which can be defined as a function, or a path to a function. The `handler` will run once a worker picks up a Job that includes this task.
+The logic for the Task is defined in the `handler` - which can be defined as a function, or a path to a function. The `handler` will run once a worker picks picks up a Job that includes this task.
 
 It should return an object with an `output` key, which should contain the output of the task as you've defined.
 
@@ -213,7 +213,7 @@ export default buildConfig({
 
 ## Nested tasks
 
-You can run sub-tasks within an existing task, by using the `tasks` or `inlineTask` arguments passed to the task `handler` function:
+You can run sub-tasks within an existing task, by using the `tasks` or `ìnlineTask` arguments passed to the task `handler` function:
 
 ```ts
 export default buildConfig({

docs/live-preview/client.mdx

@@ -260,7 +260,7 @@ If you are using relationships or uploads in your front-end application, and you
 {
   // ...
   // If your site is running on a different domain than your Payload server,
-  // This will allow requests to be made between the two domains
+  // This will allows requests to be made between the two domains
   cors: [
     'http://localhost:3001' // Your front-end application
   ],

docs/local-api/overview.mdx

@@ -329,7 +329,7 @@ available:
 //    responseHeaders: { ... } // returned headers from the response
 // }
 
-const result = await payload.auth({ headers, canSetHeaders: false })
+const result = await payload.auth({ headers })
 ```
 
 ### Login

docs/plugins/multi-tenant.mdx

@@ -16,8 +16,8 @@ This plugin sets up multi-tenancy for your application from within your [Admin P
   If you need help, check out our [Community
   Help](https://payloadcms.com/community-help). If you think you've found a bug,
   please [open a new
-  issue](https://github.com/payloadcms/payload/issues/new/choose) with as much
-  detail as possible.
+  issue](https://github.com/payloadcms/payload/issues/new?assignees=&labels=plugin%3A%multi-tenant&template=bug_report.md&title=plugin-multi-tenant%3A)
+  with as much detail as possible.
 </Banner>
 
 ## Core features
@@ -35,7 +35,7 @@ This plugin sets up multi-tenancy for your application from within your [Admin P
 By default this plugin cleans up documents when a tenant is deleted. You should ensure you have
 strong access control on your tenants collection to prevent deletions by unauthorized users.
 
-You can disable this behavior by setting `cleanupAfterTenantDelete` to `false` in the plugin options.
+You can disabled this behavior by setting `cleanupAfterTenantDelete` to `false` in the plugin options.
 
 </Banner>
 

docs/plugins/seo.mdx

@@ -115,7 +115,6 @@ Set the `uploadsCollection` to your application's upload-enabled collection slug
 ##### `tabbedUI`
 
 When the `tabbedUI` property is `true`, it appends an `SEO` tab onto your config using Payload's [Tabs Field](../fields/tabs). If your collection is not already tab-enabled, meaning the first field in your config is not of type `tabs`, then one will be created for you called `Content`. Defaults to `false`.
-Note that the order of plugins or fields in your config may affect whether or not the plugin can smartly merge tabs with your existing fields. If you have a complex structure we recommend you [make use of the fields directly](#direct-use-of-fields) instead of relying on this config option.
 
 <Banner type="info">
   If you wish to continue to use top-level or sidebar fields with `tabbedUI`,

docs/production/building-without-a-db-connection.mdx

@@ -1,32 +0,0 @@
----
-title: Building without a DB connection
-label: Building without a DB connection
-order: 10
-desc: You don't want to have a DB connection while building your Docker container? Learn how to prevent that!
-keywords: deployment, production, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, nextjs
----
-
-# Building without a DB connection
-
-One of the most common problems when building a site for production, especially with Docker - is the DB connection requirement.
-
-The important note is that Payload by itself does not have this requirement, But [Next.js' SSG ](https://nextjs.org/docs/pages/building-your-application/rendering/static-site-generation) does if any of your route segments have SSG enabled (which is default, unless you opted out or used a [Dynamic API](https://nextjs.org/docs/app/deep-dive/caching#dynamic-apis)) and use the Payload Local API.
-
-Solutions:
-
-## Using the experimental-build-mode Next.js build flag
-
-You can run Next.js build using the `pnpx next build --experimental-build-mode compile` command to only compile the code without static generation, which does not require a DB connection. In that case, your pages will be rendered dynamically, but after that, you can still generate static pages using the `pnpx next build --experimental-build-mode generate` command when you have a DB connection.
-
-[Next.js documentation](https://nextjs.org/docs/pages/api-reference/cli/next#next-build-options)
-
-## Opting-out of SSG
-
-You can opt out of SSG by adding this all the route segment files:
-
-```ts
-export const dynamic = 'force-dynamic'
-```
-
-**Note that it will disable static optimization and your site will be slower**.
-More on [Next.js documentation](https://nextjs.org/docs/app/deep-dive/caching#opting-out-2)

docs/production/deployment.mdx

@@ -150,7 +150,7 @@ Follow the docs to configure any one of these storage providers. For local devel
 ## Docker
 
 This is an example of a multi-stage docker build of Payload for production. Ensure you are setting your environment
-variables on deployment, like `PAYLOAD_SECRET`, `PAYLOAD_CONFIG_PATH`, and `DATABASE_URI` if needed. If you don't want to have a DB connection and your build requires that, learn [here](./building-without-a-db-connection) how to prevent that.
+variables on deployment, like `PAYLOAD_SECRET`, `PAYLOAD_CONFIG_PATH`, and `DATABASE_URI` if needed.
 
 In your Next.js config, set the `output` property `standalone`.
 

docs/query-presets/overview.mdx

@@ -46,12 +46,11 @@ const config = buildConfig({
 
 The following options are available for Query Presets:
 
-| Option              | Description                                                                                                                     |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `access`            | Used to define custom collection-level access control that applies to all presets. [More details](#access-control).             |
-| `filterConstraints` | Used to define which constraints are available to users when managing presets. [More details](#constraint-access-control).      |
-| `constraints`       | Used to define custom document-level access control that apply to individual presets. [More details](#document-access-control). |
-| `labels`            | Custom labels to use for the Query Presets collection.                                                                          |
+| Option        | Description                                                                                                                     |
+| ------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| `access`      | Used to define custom collection-level access control that applies to all presets. [More details](#access-control).             |
+| `constraints` | Used to define custom document-level access control that apply to individual presets. [More details](#document-access-control). |
+| `labels`      | Custom labels to use for the Query Presets collection.                                                                          |
 
 ## Access Control
 
@@ -60,7 +59,7 @@ Query Presets are subject to the same [Access Control](../access-control/overvie
 Access Control for Query Presets can be customized in two ways:
 
 1. [Collection Access Control](#collection-access-control): Applies to all presets. These rules are not controllable by the user and are statically defined in the config.
-2. [Document Access Control](#document-access-control): Applies to each individual preset. These rules are controllable by the user and are dynamically defined on each record in the database.
+2. [Document Access Control](#document-access-control): Applies to each individual preset. These rules are controllable by the user and are saved to the document.
 
 ### Collection Access Control
 
@@ -98,7 +97,7 @@ This example restricts all Query Presets to users with the role of `admin`.
 
 ### Document Access Control
 
-You can also define access control rules that apply to each specific preset. Users have the ability to define and modify these rules on the fly as they manage presets. These are saved dynamically in the database on each record.
+You can also define access control rules that apply to each specific preset. Users have the ability to define and modify these rules on the fly as they manage presets. These are saved dynamically in the database on each document.
 
 When a user manages a preset, document-level access control options will be available to them in the Admin Panel for each operation.
 
@@ -151,8 +150,8 @@ const config = buildConfig({
           }),
         },
       ],
+      // highlight-end
     },
-    // highlight-end
   },
 })
 ```
@@ -172,39 +171,3 @@ The following options are available for each constraint:
 | `value`  | The value to store in the database when this constraint is selected.     |
 | `fields` | An array of fields to render when this constraint is selected.           |
 | `access` | A function that determines the access control rules for this constraint. |
-
-### Constraint Access Control
-
-Used to dynamically filter which constraints are available based on the current user, document data, or other criteria.
-
-Some examples of this might include:
-
-- Ensuring that only "admins" are allowed to make a preset available to "everyone"
-- Preventing the "onlyMe" option from being selected based on a hypothetical "disablePrivatePresets" checkbox
-
-When a user lacks the permission to set a constraint, the option will either be hidden from them, or disabled if it is already saved to that preset.
-
-To do this, you can use the `filterConstraints` property in your [Payload Config](../configuration/overview):
-
-```ts
-import { buildConfig } from 'payload'
-
-const config = buildConfig({
-  // ...
-  queryPresets: {
-    // ...
-    // highlight-start
-    filterConstraints: ({ req, options }) =>
-      !req.user?.roles?.includes('admin')
-        ? options.filter(
-            (option) =>
-              (typeof option === 'string' ? option : option.value) !==
-              'everyone',
-          )
-        : options,
-    // highlight-end
-  },
-})
-```
-
-The `filterConstraints` function receives the same arguments as [`filterOptions`](../fields/select#filterOptions) in the [Select field](../fields/select).

docs/rest-api/overview.mdx

@@ -738,7 +738,7 @@ Payload supports a method override feature that allows you to send GET requests
 
 ### How to Use
 
-To use this feature, include the `X-Payload-HTTP-Method-Override` header set to `GET` in your POST request. The parameters should be sent in the body of the request with the `Content-Type` set to `application/x-www-form-urlencoded`.
+To use this feature, include the `X-HTTP-Method-Override` header set to `GET` in your POST request. The parameters should be sent in the body of the request with the `Content-Type` set to `application/x-www-form-urlencoded`.
 
 ### Example
 
@@ -753,7 +753,7 @@ const res = await fetch(`${api}/${collectionSlug}`, {
   headers: {
     'Accept-Language': i18n.language,
     'Content-Type': 'application/x-www-form-urlencoded',
-    'X-Payload-HTTP-Method-Override': 'GET',
+    'X-HTTP-Method-Override': 'GET',
   },
   body: qs.stringify({
     depth: 1,

docs/rich-text/converting-jsx.mdx

@@ -135,7 +135,7 @@ export const MyComponent: React.FC<{
 
 ### Overriding Converters
 
-You can override any of the default JSX converters by passing your custom converter, keyed to the node type, to the `converters` prop / the converters function.
+You can override any of the default JSX converters by passing passing your custom converter, keyed to the node type, to the `converters` prop / the converters function.
 
 Example - overriding the upload node converter to use next/image:
 

docs/versions/autosave.mdx

@@ -3,7 +3,7 @@ title: Autosave
 label: Autosave
 order: 30
 desc: Using Payload's Draft functionality, you can configure your collections and globals to autosave changes as drafts, and publish only you're ready.
-keywords: version history, revisions, audit log, draft, publish, autosave, Content Management System, cms, headless, javascript, node, react, nextjs
+keywords: version history, revisions, audit log, draft, publish, autosave, Content Management System, cms, headless, javascript, node, react, nextjss
 ---
 
 Extending on Payload's [Draft](/docs/versions/drafts) functionality, you can configure your collections and globals to autosave changes as drafts, and publish only you're ready. The Admin UI will automatically adapt to autosaving progress at an interval that you define, and will store all autosaved changes as a new Draft version. Never lose your work - and publish changes to the live document only when you're ready.

eslint.config.js

@@ -42,7 +42,6 @@ export const rootEslintConfig = [
       ...defaultESLintIgnores,
       'packages/eslint-*/**',
       'test/live-preview/next-app',
-      'test/plugin-ecommerce/next-app',
       'packages/**/*.spec.ts',
       'templates/**',
       'examples/**',

examples/auth/src/collections/Users.ts

@@ -1,7 +1,7 @@
 import type { CollectionConfig } from 'payload/types'
 
 import { admins } from './access/admins'
-import { adminsAndUser } from './access/adminsAndUser'
+import adminsAndUser from './access/adminsAndUser'
 import { anyone } from './access/anyone'
 import { checkRole } from './access/checkRole'
 import { loginAfterCreate } from './hooks/loginAfterCreate'
@@ -25,7 +25,6 @@ export const Users: CollectionConfig = {
     create: anyone,
     update: adminsAndUser,
     delete: admins,
-    unlock: admins,
     admin: ({ req: { user } }) => checkRole(['admin'], user),
   },
   hooks: {

examples/auth/src/collections/access/admins.ts

@@ -1,4 +1,4 @@
-import type { Access } from 'payload'
+import type { Access } from 'payload/config'
 
 import { checkRole } from './checkRole'
 

examples/auth/src/collections/access/adminsAndUser.ts

@@ -1,17 +1,19 @@
-import type { Access } from 'payload'
+import type { Access } from 'payload/config'
 
 import { checkRole } from './checkRole'
 
-export const adminsAndUser: Access = ({ req: { user } }) => {
+const adminsAndUser: Access = ({ req: { user } }) => {
   if (user) {
     if (checkRole(['admin'], user)) {
       return true
     }
 
     return {
-      id: { equals: user.id },
+      id: user.id,
     }
   }
 
   return false
 }
+
+export default adminsAndUser

examples/auth/src/collections/access/anyone.ts

@@ -1,3 +1,3 @@
-import type { Access } from 'payload'
+import type { Access } from 'payload/config'
 
 export const anyone: Access = () => true

examples/auth/src/collections/access/checkRole.ts

@@ -1,6 +1,6 @@
 import type { User } from '../../payload-types'
 
-export const checkRole = (allRoles: User['roles'] = [], user: User | null = null): boolean => {
+export const checkRole = (allRoles: User['roles'] = [], user: User = undefined): boolean => {
   if (user) {
     if (
       allRoles.some((role) => {
@@ -8,9 +8,8 @@ export const checkRole = (allRoles: User['roles'] = [], user: User | null = null
           return individualRole === role
         })
       })
-    ) {
-      return true
-    }
+    )
+      {return true}
   }
 
   return false

examples/auth/src/collections/hooks/protectRoles.ts

@@ -1,4 +1,4 @@
-import type { FieldHook } from 'payload'
+import type { FieldHook } from 'payload/types'
 
 import type { User } from '../../payload-types'
 

examples/custom-server/src/payload.config.ts

@@ -1,6 +1,7 @@
 import { mongooseAdapter } from '@payloadcms/db-mongodb'
 import { lexicalEditor } from '@payloadcms/richtext-lexical'
 import path from 'path'
+import express from 'express'
 import { buildConfig } from 'payload'
 import { fileURLToPath } from 'url'
 

examples/custom-server/src/server.ts

@@ -1,4 +1,5 @@
 import express from 'express'
+import type { Request, Response } from 'express'
 import { parse } from 'url'
 import next from 'next'
 

examples/form-builder/src/components/icons/Check/index.module.scss

@@ -3,8 +3,14 @@
   width: var(--base);
 
   .stroke {
-    stroke-width: 2px;
+    stroke-width: 1px;
     fill: none;
     stroke: currentColor;
   }
+
+  &:local() {
+    .stroke {
+      stroke-width: 2px;
+    }
+  }
 }

examples/live-preview/next-env.d.ts

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

examples/live-preview/package.json

@@ -3,7 +3,6 @@
   "version": "1.0.0",
   "description": "Payload Live Preview example.",
   "license": "MIT",
-  "type": "module",
   "main": "dist/server.js",
   "scripts": {
     "build": "cross-env NODE_OPTIONS=--no-deprecation next build",

examples/live-preview/src/migrations/seed.ts

@@ -1,9 +1,8 @@
 import type { MigrateUpArgs } from '@payloadcms/db-mongodb'
 
 import type { Page } from '../payload-types'
-import { DefaultDocumentIDType } from 'payload'
 
-export const home = (id: DefaultDocumentIDType): Partial<Page> => ({
+export const home: Partial<Page> = {
   slug: 'home',
   richText: [
     {
@@ -42,26 +41,11 @@ export const home = (id: DefaultDocumentIDType): Partial<Page> => ({
         {
           text: ' you can edit this page in the admin panel and see the changes reflected here in real time.',
         },
-        ...(id
-          ? [
-              {
-                text: ' To get started, visit ',
-              },
-              {
-                type: 'link',
-                children: [{ text: 'this page' }],
-                linkType: 'custom',
-                newTab: true,
-                url: `/admin/collections/pages/${id}/preview`,
-              },
-              { text: '.' },
-            ]
-          : []),
       ],
     },
   ],
   title: 'Home',
-})
+}
 
 export const examplePage: Partial<Page> = {
   slug: 'example-page',
@@ -99,18 +83,11 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
     data: examplePage as any, // eslint-disable-line
   })
 
-  const { id: ogHomePageID } = await payload.create({
-    collection: 'pages',
-    data: {
-      title: 'Home',
-      richText: [],
-    },
-  })
+  const homepageJSON = JSON.parse(JSON.stringify(home))
 
-  const { id: homePageID } = await payload.update({
-    id: ogHomePageID,
+  const { id: homePageID } = await payload.create({
     collection: 'pages',
-    data: home(ogHomePageID),
+    data: homepageJSON,
   })
 
   await payload.updateGlobal({
@@ -144,7 +121,7 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
             type: 'custom',
             label: 'Dashboard',
             reference: undefined,
-            url: '/admin',
+            url: 'http://localhost:3000/admin',
           },
         },
       ],

examples/live-preview/src/payload-types.ts

@@ -6,66 +6,10 @@
  * and re-run `payload generate:types` to regenerate this file.
  */
 
-/**
- * Supported timezones in IANA format.
- *
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "supportedTimezones".
- */
-export type SupportedTimezones =
-  | 'Pacific/Midway'
-  | 'Pacific/Niue'
-  | 'Pacific/Honolulu'
-  | 'Pacific/Rarotonga'
-  | 'America/Anchorage'
-  | 'Pacific/Gambier'
-  | 'America/Los_Angeles'
-  | 'America/Tijuana'
-  | 'America/Denver'
-  | 'America/Phoenix'
-  | 'America/Chicago'
-  | 'America/Guatemala'
-  | 'America/New_York'
-  | 'America/Bogota'
-  | 'America/Caracas'
-  | 'America/Santiago'
-  | 'America/Buenos_Aires'
-  | 'America/Sao_Paulo'
-  | 'Atlantic/South_Georgia'
-  | 'Atlantic/Azores'
-  | 'Atlantic/Cape_Verde'
-  | 'Europe/London'
-  | 'Europe/Berlin'
-  | 'Africa/Lagos'
-  | 'Europe/Athens'
-  | 'Africa/Cairo'
-  | 'Europe/Moscow'
-  | 'Asia/Riyadh'
-  | 'Asia/Dubai'
-  | 'Asia/Baku'
-  | 'Asia/Karachi'
-  | 'Asia/Tashkent'
-  | 'Asia/Calcutta'
-  | 'Asia/Dhaka'
-  | 'Asia/Almaty'
-  | 'Asia/Jakarta'
-  | 'Asia/Bangkok'
-  | 'Asia/Shanghai'
-  | 'Asia/Singapore'
-  | 'Asia/Tokyo'
-  | 'Asia/Seoul'
-  | 'Australia/Brisbane'
-  | 'Australia/Sydney'
-  | 'Pacific/Guam'
-  | 'Pacific/Noumea'
-  | 'Pacific/Auckland'
-  | 'Pacific/Fiji';
-
 export interface Config {
   auth: {
     users: UserAuthOperations;
   };
-  blocks: {};
   collections: {
     pages: Page;
     users: User;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -84,7 +84,7 @@
     "publish-prerelease": "pnpm --filter releaser publish-prerelease",
     "reinstall": "pnpm clean:all && pnpm install",
     "release": "pnpm --filter releaser release --tag latest",
-    "runts": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" node --no-deprecation --no-experimental-strip-types --import @swc-node/register/esm-register",
+    "runts": "cross-env NODE_OPTIONS=--no-deprecation node --no-deprecation --import @swc-node/register/esm-register",
     "script:build-template-with-local-pkgs": "pnpm --filter scripts build-template-with-local-pkgs",
     "script:gen-templates": "pnpm --filter scripts gen-templates",
     "script:gen-templates:build": "pnpm --filter scripts gen-templates --build",
@@ -93,19 +93,17 @@
     "script:pack": "pnpm --filter scripts pack-all-to-dest",
     "pretest": "pnpm build",
     "test": "pnpm test:int && pnpm test:components && pnpm test:e2e",
-    "test:components": "cross-env NODE_OPTIONS=\" --no-deprecation --no-experimental-strip-types\" jest --config=jest.components.config.js",
+    "test:components": "cross-env NODE_OPTIONS=\" --no-deprecation\" jest --config=jest.components.config.js",
     "test:e2e": "pnpm runts ./test/runE2E.ts",
-    "test:e2e:debug": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 PWDEBUG=1 DISABLE_LOGGING=true playwright test",
-    "test:e2e:headed": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true playwright test --headed",
+    "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 prepare-run-test-against-prod && pnpm runts ./test/runE2E.ts --prod",
     "test:e2e:prod:ci": "pnpm prepare-run-test-against-prod:ci && pnpm runts ./test/runE2E.ts --prod",
-    "test:e2e:prod:ci:turbo": "pnpm prepare-run-test-against-prod:ci && pnpm runts ./test/runE2E.ts --prod --turbo",
-    "test:e2e:turbo": "pnpm runts ./test/runE2E.ts --turbo",
-    "test:int": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" 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 --no-experimental-strip-types\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
-    "test:int:sqlite": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=sqlite DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int:postgres": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int:sqlite": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=sqlite DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
     "test:types": "tstyche",
-    "test:unit": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=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",
     "translateNewKeys": "pnpm --filter translations run translateNewKeys"
   },
   "lint-staged": {
@@ -122,7 +120,7 @@
   "devDependencies": {
     "@jest/globals": "29.7.0",
     "@libsql/client": "0.14.0",
-    "@next/bundle-analyzer": "15.3.2",
+    "@next/bundle-analyzer": "15.3.0",
     "@payloadcms/db-postgres": "workspace:*",
     "@payloadcms/eslint-config": "workspace:*",
     "@payloadcms/eslint-plugin": "workspace:*",
@@ -130,9 +128,9 @@
     "@playwright/test": "1.50.0",
     "@sentry/nextjs": "^8.33.1",
     "@sentry/node": "^8.33.1",
-    "@swc-node/register": "1.10.10",
-    "@swc/cli": "0.7.7",
-    "@swc/jest": "0.2.38",
+    "@swc-node/register": "1.10.9",
+    "@swc/cli": "0.6.0",
+    "@swc/jest": "0.2.37",
     "@types/fs-extra": "^11.0.2",
     "@types/jest": "29.5.12",
     "@types/minimist": "1.2.5",
@@ -147,6 +145,8 @@
     "cross-env": "7.0.3",
     "dotenv": "16.4.7",
     "drizzle-kit": "0.28.0",
+    "drizzle-orm": "0.36.1",
+    "escape-html": "^1.0.3",
     "execa": "5.1.1",
     "form-data": "3.0.1",
     "fs-extra": "10.1.0",
@@ -156,7 +156,7 @@
     "lint-staged": "15.2.7",
     "minimist": "1.2.8",
     "mongodb-memory-server": "^10",
-    "next": "15.3.2",
+    "next": "15.3.0",
     "open": "^10.1.0",
     "p-limit": "^5.0.0",
     "playwright": "1.50.0",
@@ -169,7 +169,7 @@
     "shelljs": "0.8.5",
     "slash": "3.0.0",
     "sort-package-json": "^2.10.0",
-    "swc-plugin-transform-remove-imports": "4.0.4",
+    "swc-plugin-transform-remove-imports": "3.1.0",
     "tempy": "1.0.1",
     "tstyche": "^3.1.1",
     "tsx": "4.19.2",
@@ -186,6 +186,7 @@
       "copyfiles": "$copyfiles",
       "cross-env": "$cross-env",
       "dotenv": "$dotenv",
+      "drizzle-orm": "$drizzle-orm",
       "graphql": "^16.8.1",
       "mongodb-memory-server": "$mongodb-memory-server",
       "react": "$react",

packages/admin-bar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/admin-bar",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "description": "An admin bar for React apps using Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/create-payload-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -16,7 +16,6 @@
       "url": "https://payloadcms.com"
     }
   ],
-  "sideEffects": false,
   "type": "module",
   "exports": {
     "./types": {
@@ -61,7 +60,7 @@
   "dependencies": {
     "@clack/prompts": "^0.7.0",
     "@sindresorhus/slugify": "^1.1.0",
-    "@swc/core": "1.11.29",
+    "@swc/core": "1.10.12",
     "arg": "^5.0.0",
     "chalk": "^4.1.0",
     "comment-json": "^4.2.3",

packages/create-payload-app/src/lib/configure-plugin-project.ts

@@ -16,15 +16,12 @@ export const configurePluginProject = ({
   const devPayloadConfigPath = path.resolve(projectDirPath, './dev/payload.config.ts')
   const devTsConfigPath = path.resolve(projectDirPath, './dev/tsconfig.json')
   const indexTsPath = path.resolve(projectDirPath, './src/index.ts')
-  const devImportMapPath = path.resolve(projectDirPath, './dev/app/(payload)/admin/importMap.js')
 
   const devPayloadConfig = fse.readFileSync(devPayloadConfigPath, 'utf8')
   const devTsConfig = fse.readFileSync(devTsConfigPath, 'utf8')
   const indexTs = fse.readFileSync(indexTsPath, 'utf-8')
-  const devImportMap = fse.readFileSync(devImportMapPath, 'utf-8')
 
   const updatedTsConfig = devTsConfig.replaceAll('plugin-package-name-placeholder', projectName)
-  const updatedImportMap = devImportMap.replaceAll('plugin-package-name-placeholder', projectName)
   let updatedIndexTs = indexTs.replaceAll('plugin-package-name-placeholder', projectName)
 
   const pluginExportVariableName = toCamelCase(projectName)
@@ -46,5 +43,4 @@ export const configurePluginProject = ({
   fse.writeFileSync(devPayloadConfigPath, updatedPayloadConfig)
   fse.writeFileSync(devTsConfigPath, updatedTsConfig)
   fse.writeFileSync(indexTsPath, updatedIndexTs)
-  fse.writeFileSync(devImportMapPath, updatedImportMap)
 }

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

@@ -0,0 +1,8 @@
+import { readFileSync } from 'fs'
+import { fileURLToPath } from 'node:url'
+import path from 'path'
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
+const packageJson = JSON.parse(readFileSync(path.resolve(dirname, '../../package.json'), 'utf-8'))
+export const PACKAGE_VERSION = packageJson.version

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

@@ -10,10 +10,10 @@ import type { CliArgs, DbType, ProjectExample, ProjectTemplate } from '../types.
 import { createProject } from './create-project.js'
 import { dbReplacements } from './replacements.js'
 import { getValidTemplates } from './templates.js'
+import { manageEnvFiles } from './manage-env-files.js'
 
 describe('createProject', () => {
   let projectDir: string
-
   beforeAll(() => {
     // eslint-disable-next-line no-console
     console.log = jest.fn()
@@ -63,30 +63,6 @@ describe('createProject', () => {
       expect(packageJson.name).toStrictEqual(projectName)
     })
 
-    it('updates project name in plugin template importMap file', async () => {
-      const projectName = 'my-custom-plugin'
-      const template: ProjectTemplate = {
-        name: 'plugin',
-        type: 'plugin',
-        description: 'Template for creating a Payload plugin',
-        url: 'https://github.com/payloadcms/payload/templates/plugin',
-      }
-
-      await createProject({
-        cliArgs: { ...args, '--local-template': 'plugin' } as CliArgs,
-        packageManager,
-        projectDir,
-        projectName,
-        template,
-      })
-
-      const importMapPath = path.resolve(projectDir, './dev/app/(payload)/admin/importMap.js')
-      const importMapFile = fse.readFileSync(importMapPath, 'utf-8')
-
-      expect(importMapFile).not.toContain('plugin-package-name-placeholder')
-      expect(importMapFile).toContain('my-custom-plugin')
-    })
-
     it('creates example', async () => {
       const projectName = 'custom-server-example'
       const example: ProjectExample = {
@@ -179,5 +155,75 @@ describe('createProject', () => {
         expect(content).toContain(dbReplacement.configReplacement().join('\n'))
       })
     })
+    describe('managing env files', () => {
+      it('updates .env files without overwriting existing data', async () => {
+        const envFilePath = path.join(projectDir, '.env')
+        const envExampleFilePath = path.join(projectDir, '.env.example')
+
+        fse.ensureDirSync(projectDir)
+        fse.ensureFileSync(envFilePath)
+        fse.ensureFileSync(envExampleFilePath)
+
+        const initialEnvContent = `CUSTOM_VAR=custom-value\nDATABASE_URI=old-connection\n`
+        const initialEnvExampleContent = `CUSTOM_VAR=custom-value\nDATABASE_URI=old-connection\nPAYLOAD_SECRET=YOUR_SECRET_HERE\n`
+
+        fse.writeFileSync(envFilePath, initialEnvContent)
+        fse.writeFileSync(envExampleFilePath, initialEnvExampleContent)
+
+        await manageEnvFiles({
+          cliArgs: {
+            '--debug': true,
+          } as CliArgs,
+          databaseType: 'mongodb',
+          databaseUri: 'mongodb://localhost:27017/test',
+          payloadSecret: 'test-secret',
+          projectDir,
+          template: undefined,
+        })
+
+        const updatedEnvContent = fse.readFileSync(envFilePath, 'utf-8')
+
+        expect(updatedEnvContent).toContain('CUSTOM_VAR=custom-value')
+        expect(updatedEnvContent).toContain('DATABASE_URI=mongodb://localhost:27017/test')
+        expect(updatedEnvContent).toContain('PAYLOAD_SECRET=test-secret')
+
+        const updatedEnvExampleContent = fse.readFileSync(envExampleFilePath, 'utf-8')
+
+        expect(updatedEnvExampleContent).toContain('CUSTOM_VAR=custom-value')
+        expect(updatedEnvContent).toContain('DATABASE_URI=mongodb://localhost:27017/test')
+        expect(updatedEnvContent).toContain('PAYLOAD_SECRET=test-secret')
+      })
+
+      it('creates .env and .env.example if they do not exist', async () => {
+        const envFilePath = path.join(projectDir, '.env')
+        const envExampleFilePath = path.join(projectDir, '.env.example')
+
+        fse.ensureDirSync(projectDir)
+
+        if (fse.existsSync(envFilePath)) fse.removeSync(envFilePath)
+        if (fse.existsSync(envExampleFilePath)) fse.removeSync(envExampleFilePath)
+
+        await manageEnvFiles({
+          cliArgs: {
+            '--debug': true,
+          } as CliArgs,
+          databaseUri: '',
+          payloadSecret: '',
+          projectDir,
+          template: undefined,
+        })
+
+        expect(fse.existsSync(envFilePath)).toBe(true)
+        expect(fse.existsSync(envExampleFilePath)).toBe(true)
+
+        const updatedEnvContent = fse.readFileSync(envFilePath, 'utf-8')
+        expect(updatedEnvContent).toContain('DATABASE_URI=your-connection-string-here')
+        expect(updatedEnvContent).toContain('PAYLOAD_SECRET=YOUR_SECRET_HERE')
+
+        const updatedEnvExampleContent = fse.readFileSync(envExampleFilePath, 'utf-8')
+        expect(updatedEnvExampleContent).toContain('DATABASE_URI=your-connection-string-here')
+        expect(updatedEnvExampleContent).toContain('PAYLOAD_SECRET=YOUR_SECRET_HERE')
+      })
+    })
   })
 })

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

@@ -144,14 +144,17 @@ export async function createProject(
     }
   }
 
-  await manageEnvFiles({
-    cliArgs,
-    databaseType: dbDetails?.type,
-    databaseUri: dbDetails?.dbUri,
-    payloadSecret: generateSecret(),
-    projectDir,
-    template: 'template' in args ? args.template : undefined,
-  })
+  // Call manageEnvFiles before initializing Git
+  if (dbDetails) {
+    await manageEnvFiles({
+      cliArgs,
+      databaseType: dbDetails.type,
+      databaseUri: dbDetails.dbUri,
+      payloadSecret: generateSecret(),
+      projectDir,
+      template: 'template' in args ? args.template : undefined,
+    })
+  }
 
   // Remove yarn.lock file. This is only desired in Payload Cloud.
   const lockPath = path.resolve(projectDir, 'pnpm-lock.yaml')

packages/create-payload-app/src/lib/manage-env-files.spec.ts

@@ -1,165 +0,0 @@
-import { jest } from '@jest/globals'
-import fs from 'fs'
-import fse from 'fs-extra'
-import * as os from 'node:os'
-import path from 'path'
-
-import type { CliArgs } from '../types.js'
-
-import { manageEnvFiles } from './manage-env-files.js'
-
-describe('createProject', () => {
-  let projectDir: string
-  let envFilePath = ''
-  let envExampleFilePath = ''
-
-  beforeAll(() => {
-    // eslint-disable-next-line no-console
-    console.log = jest.fn()
-  })
-
-  beforeEach(() => {
-    const tempDirectory = fs.realpathSync(os.tmpdir())
-    projectDir = `${tempDirectory}/${Math.random().toString(36).substring(7)}`
-
-    envFilePath = path.join(projectDir, '.env')
-    envExampleFilePath = path.join(projectDir, '.env.example')
-
-    if (fse.existsSync(envFilePath)) {
-      fse.removeSync(envFilePath)
-    }
-
-    fse.ensureDirSync(projectDir)
-  })
-
-  afterEach(() => {
-    if (fse.existsSync(projectDir)) {
-      fse.rmSync(projectDir, { recursive: true })
-    }
-  })
-
-  it('generates .env using defaults (not from .env.example)', async () => {
-    // ensure no .env.example exists so that the default values are used
-    // the `manageEnvFiles` function will look for .env.example in the file system
-    if (fse.existsSync(envExampleFilePath)) {
-      fse.removeSync(envExampleFilePath)
-    }
-
-    await manageEnvFiles({
-      cliArgs: {
-        '--debug': true,
-      } as CliArgs,
-      databaseUri: '', // omitting this will ensure the default vars are used
-      payloadSecret: '', // omitting this will ensure the default vars are used
-      projectDir,
-      template: undefined,
-    })
-
-    expect(fse.existsSync(envFilePath)).toBe(true)
-
-    const updatedEnvContent = fse.readFileSync(envFilePath, 'utf-8')
-
-    expect(updatedEnvContent).toBe(
-      `# Added by Payload\nPAYLOAD_SECRET=YOUR_SECRET_HERE\nDATABASE_URI=your-connection-string-here`,
-    )
-  })
-
-  it('generates .env from .env.example', async () => {
-    // create or override the .env.example file with a connection string that will NOT be overridden
-    fse.ensureFileSync(envExampleFilePath)
-    fse.writeFileSync(
-      envExampleFilePath,
-      `DATABASE_URI=example-connection-string\nCUSTOM_VAR=custom-value\n`,
-    )
-
-    await manageEnvFiles({
-      cliArgs: {
-        '--debug': true,
-      } as CliArgs,
-      databaseUri: '', // omitting this will ensure the `.env.example` vars are used
-      payloadSecret: '', // omitting this will ensure the `.env.example` vars are used
-      projectDir,
-      template: undefined,
-    })
-
-    expect(fse.existsSync(envFilePath)).toBe(true)
-
-    const updatedEnvContent = fse.readFileSync(envFilePath, 'utf-8')
-
-    expect(updatedEnvContent).toBe(
-      `DATABASE_URI=example-connection-string\nCUSTOM_VAR=custom-value\nPAYLOAD_SECRET=YOUR_SECRET_HERE\n# Added by Payload`,
-    )
-  })
-
-  it('updates existing .env without overriding vars', async () => {
-    // create an existing .env file with some custom variables that should NOT be overridden
-    fse.ensureFileSync(envFilePath)
-    fse.writeFileSync(
-      envFilePath,
-      `CUSTOM_VAR=custom-value\nDATABASE_URI=example-connection-string\n`,
-    )
-
-    // create an .env.example file to ensure that its contents DO NOT override existing .env vars
-    fse.ensureFileSync(envExampleFilePath)
-    fse.writeFileSync(
-      envExampleFilePath,
-      `CUSTOM_VAR=custom-value-2\nDATABASE_URI=example-connection-string-2\n`,
-    )
-
-    await manageEnvFiles({
-      cliArgs: {
-        '--debug': true,
-      } as CliArgs,
-      databaseUri: '', // omitting this will ensure the `.env` vars are kept
-      payloadSecret: '', // omitting this will ensure the `.env` vars are kept
-      projectDir,
-      template: undefined,
-    })
-
-    expect(fse.existsSync(envFilePath)).toBe(true)
-
-    const updatedEnvContent = fse.readFileSync(envFilePath, 'utf-8')
-
-    expect(updatedEnvContent).toBe(
-      `# Added by Payload\nPAYLOAD_SECRET=YOUR_SECRET_HERE\nDATABASE_URI=example-connection-string\nCUSTOM_VAR=custom-value`,
-    )
-  })
-
-  it('sanitizes .env based on selected database type', async () => {
-    await manageEnvFiles({
-      cliArgs: {
-        '--debug': true,
-      } as CliArgs,
-      databaseType: 'mongodb', // this mimics the CLI selection and will be used as the DATABASE_URI
-      databaseUri: 'mongodb://localhost:27017/test', // this mimics the CLI selection and will be used as the DATABASE_URI
-      payloadSecret: 'test-secret', // this mimics the CLI selection and will be used as the PAYLOAD_SECRET
-      projectDir,
-      template: undefined,
-    })
-
-    const updatedEnvContent = fse.readFileSync(envFilePath, 'utf-8')
-
-    expect(updatedEnvContent).toBe(
-      `# Added by Payload\nPAYLOAD_SECRET=test-secret\nDATABASE_URI=mongodb://localhost:27017/test`,
-    )
-
-    // delete the generated .env file and do it again, but this time, omit the databaseUri to ensure the default is generated
-    fse.removeSync(envFilePath)
-
-    await manageEnvFiles({
-      cliArgs: {
-        '--debug': true,
-      } as CliArgs,
-      databaseType: 'mongodb', // this mimics the CLI selection and will be used as the DATABASE_URI
-      databaseUri: '', // omit this to ensure the default is generated based on the selected database type
-      payloadSecret: 'test-secret',
-      projectDir,
-      template: undefined,
-    })
-
-    const updatedEnvContentWithDefault = fse.readFileSync(envFilePath, 'utf-8')
-    expect(updatedEnvContentWithDefault).toBe(
-      `# Added by Payload\nPAYLOAD_SECRET=test-secret\nDATABASE_URI=mongodb://127.0.0.1/your-database-name`,
-    )
-  })
-})

packages/create-payload-app/src/lib/manage-env-files.ts

@@ -6,42 +6,21 @@ import type { CliArgs, DbType, ProjectTemplate } from '../types.js'
 import { debug, error } from '../utils/log.js'
 import { dbChoiceRecord } from './select-db.js'
 
-const sanitizeEnv = ({
-  contents,
-  databaseType,
-  databaseUri,
-  payloadSecret,
-}: {
-  contents: string
-  databaseType: DbType | undefined
-  databaseUri?: string
-  payloadSecret?: string
-}): string => {
+const updateEnvExampleVariables = (
+  contents: string,
+  databaseType: DbType | undefined,
+  payloadSecret?: string,
+  databaseUri?: string,
+): string => {
   const seenKeys = new Set<string>()
-
-  // add defaults
-  let withDefaults = contents
-
-  if (
-    !contents.includes('DATABASE_URI') &&
-    !contents.includes('POSTGRES_URL') &&
-    !contents.includes('MONGODB_URI')
-  ) {
-    withDefaults += '\nDATABASE_URI=your-connection-string-here'
-  }
-
-  if (!contents.includes('PAYLOAD_SECRET')) {
-    withDefaults += '\nPAYLOAD_SECRET=YOUR_SECRET_HERE'
-  }
-
-  let updatedEnv = withDefaults
+  const updatedEnv = contents
     .split('\n')
     .map((line) => {
       if (line.startsWith('#') || !line.includes('=')) {
         return line
       }
 
-      const [key, value] = line.split('=')
+      const [key] = line.split('=')
 
       if (!key) {
         return
@@ -49,7 +28,6 @@ const sanitizeEnv = ({
 
       if (key === 'DATABASE_URI' || key === 'POSTGRES_URL' || key === 'MONGODB_URI') {
         const dbChoice = databaseType ? dbChoiceRecord[databaseType] : null
-
         if (dbChoice) {
           const placeholderUri = databaseUri
             ? databaseUri
@@ -58,8 +36,6 @@ const sanitizeEnv = ({
             databaseType === 'vercel-postgres'
               ? `POSTGRES_URL=${placeholderUri}`
               : `DATABASE_URI=${placeholderUri}`
-        } else {
-          line = `${key}=${value}`
         }
       }
 
@@ -80,10 +56,6 @@ const sanitizeEnv = ({
     .reverse()
     .join('\n')
 
-  if (!updatedEnv.includes('# Added by Payload')) {
-    updatedEnv = `# Added by Payload\n${updatedEnv}`
-  }
-
   return updatedEnv
 }
 
@@ -91,7 +63,7 @@ const sanitizeEnv = ({
 export async function manageEnvFiles(args: {
   cliArgs: CliArgs
   databaseType?: DbType
-  databaseUri?: string
+  databaseUri: string
   payloadSecret: string
   projectDir: string
   template?: ProjectTemplate
@@ -105,63 +77,70 @@ export async function manageEnvFiles(args: {
     return
   }
 
-  const pathToEnvExample = path.join(projectDir, '.env.example')
+  const envExamplePath = path.join(projectDir, '.env.example')
   const envPath = path.join(projectDir, '.env')
-
-  let exampleEnv: null | string = ''
-
+  const emptyEnvContent = `# Added by Payload\nDATABASE_URI=your-connection-string-here\nPAYLOAD_SECRET=YOUR_SECRET_HERE\n`
   try {
+    let updatedExampleContents: string
+
     if (template?.type === 'plugin') {
       if (debugFlag) {
         debug(`plugin template detected - no .env added .env.example added`)
       }
-
       return
     }
 
-    // If there's a .env.example file, use it to create or update the .env file
-    if (fs.existsSync(pathToEnvExample)) {
-      const envExampleContents = await fs.readFile(pathToEnvExample, 'utf8')
-
-      exampleEnv = sanitizeEnv({
-        contents: envExampleContents,
+    if (!fs.existsSync(envExamplePath)) {
+      updatedExampleContents = updateEnvExampleVariables(
+        emptyEnvContent,
         databaseType,
-        databaseUri,
         payloadSecret,
-      })
+        databaseUri,
+      )
 
+      await fs.writeFile(envExamplePath, updatedExampleContents)
       if (debugFlag) {
-        debug(`.env.example file successfully read`)
+        debug(`.env.example file successfully created`)
+      }
+    } else {
+      const envExampleContents = await fs.readFile(envExamplePath, 'utf8')
+      const mergedEnvs = envExampleContents + '\n' + emptyEnvContent
+      updatedExampleContents = updateEnvExampleVariables(
+        mergedEnvs,
+        databaseType,
+        payloadSecret,
+        databaseUri,
+      )
+
+      await fs.writeFile(envExamplePath, updatedExampleContents)
+      if (debugFlag) {
+        debug(`.env.example file successfully updated`)
       }
     }
 
-    // If there's no .env file, create it using the .env.example content (if it exists)
     if (!fs.existsSync(envPath)) {
-      const envContent = sanitizeEnv({
-        contents: exampleEnv,
+      const envContent = updateEnvExampleVariables(
+        emptyEnvContent,
         databaseType,
-        databaseUri,
         payloadSecret,
-      })
-
+        databaseUri,
+      )
       await fs.writeFile(envPath, envContent)
 
       if (debugFlag) {
         debug(`.env file successfully created`)
       }
     } else {
-      // If the .env file already exists, sanitize it as-is
       const envContents = await fs.readFile(envPath, 'utf8')
-
-      const updatedEnvContents = sanitizeEnv({
-        contents: envContents,
+      const mergedEnvs = envContents + '\n' + emptyEnvContent
+      const updatedEnvContents = updateEnvExampleVariables(
+        mergedEnvs,
         databaseType,
-        databaseUri,
         payloadSecret,
-      })
+        databaseUri,
+      )
 
       await fs.writeFile(envPath, updatedEnvContents)
-
       if (debugFlag) {
         debug(`.env file successfully updated`)
       }

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

@@ -1,8 +1,9 @@
 import type { ProjectTemplate } from '../types.js'
 
 import { error, info } from '../utils/log.js'
+import { PACKAGE_VERSION } from './constants.js'
 
-export function validateTemplate({ templateName }: { templateName: string }): boolean {
+export function validateTemplate(templateName: string): boolean {
   const validTemplates = getValidTemplates()
   if (!validTemplates.map((t) => t.name).includes(templateName)) {
     error(`'${templateName}' is not a valid template.`)
@@ -19,13 +20,13 @@ export function getValidTemplates(): ProjectTemplate[] {
       name: 'blank',
       type: 'starter',
       description: 'Blank 3.0 Template',
-      url: `https://github.com/payloadcms/payload/templates/blank#main`,
+      url: `https://github.com/payloadcms/payload/templates/blank#v${PACKAGE_VERSION}`,
     },
     {
       name: 'website',
       type: 'starter',
       description: 'Website Template',
-      url: `https://github.com/payloadcms/payload/templates/website#main`,
+      url: `https://github.com/payloadcms/payload/templates/website#v${PACKAGE_VERSION}`,
     },
     {
       name: 'plugin',

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

@@ -1,3 +1,4 @@
+import execa from 'execa'
 import fse from 'fs-extra'
 import { fileURLToPath } from 'node:url'
 import path from 'path'
@@ -8,7 +9,6 @@ const dirname = path.dirname(filename)
 import type { NextAppDetails } from '../types.js'
 
 import { copyRecursiveSync } from '../utils/copy-recursive-sync.js'
-import { getLatestPackageVersion } from '../utils/getLatestPackageVersion.js'
 import { info } from '../utils/log.js'
 import { getPackageManager } from './get-package-manager.js'
 import { installPackages } from './install-packages.js'
@@ -36,8 +36,15 @@ export async function updatePayloadInProject(
 
   const packageManager = await getPackageManager({ projectDir })
 
-  // Fetch latest Payload version
-  const latestPayloadVersion = await getLatestPackageVersion({ packageName: 'payload' })
+  // Fetch latest Payload version from npm
+  const { exitCode: getLatestVersionExitCode, stdout: latestPayloadVersion } = await execa('npm', [
+    'show',
+    'payload',
+    'version',
+  ])
+  if (getLatestVersionExitCode !== 0) {
+    throw new Error('Failed to fetch latest Payload version')
+  }
 
   if (payloadVersion === latestPayloadVersion) {
     return { message: `Payload v${payloadVersion} is already up to date.`, success: true }

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

@@ -8,6 +8,7 @@ import path from 'path'
 import type { CliArgs } from './types.js'
 
 import { configurePayloadConfig } from './lib/configure-payload-config.js'
+import { PACKAGE_VERSION } from './lib/constants.js'
 import { createProject } from './lib/create-project.js'
 import { parseExample } from './lib/examples.js'
 import { generateSecret } from './lib/generate-secret.js'
@@ -19,7 +20,6 @@ import { parseTemplate } from './lib/parse-template.js'
 import { selectDb } from './lib/select-db.js'
 import { getValidTemplates, validateTemplate } from './lib/templates.js'
 import { updatePayloadInProject } from './lib/update-payload-in-project.js'
-import { getLatestPackageVersion } from './utils/getLatestPackageVersion.js'
 import { debug, error, info } from './utils/log.js'
 import {
   feedbackOutro,
@@ -78,18 +78,13 @@ export class Main {
 
   async init(): Promise<void> {
     try {
-      const debugFlag = this.args['--debug']
-
-      const LATEST_VERSION = await getLatestPackageVersion({
-        debug: debugFlag,
-        packageName: 'payload',
-      })
-
       if (this.args['--help']) {
         helpMessage()
         process.exit(0)
       }
 
+      const debugFlag = this.args['--debug']
+
       // eslint-disable-next-line no-console
       console.log('\n')
       p.intro(chalk.bgCyan(chalk.black(' create-payload-app ')))
@@ -205,7 +200,7 @@ export class Main {
 
       const templateArg = this.args['--template']
       if (templateArg) {
-        const valid = validateTemplate({ templateName: templateArg })
+        const valid = validateTemplate(templateArg)
         if (!valid) {
           helpMessage()
           process.exit(1)
@@ -235,7 +230,7 @@ export class Main {
       }
 
       if (debugFlag) {
-        debug(`Using ${exampleArg ? 'examples' : 'templates'} from git tag: v${LATEST_VERSION}`)
+        debug(`Using ${exampleArg ? 'examples' : 'templates'} from git tag: v${PACKAGE_VERSION}`)
       }
 
       if (!exampleArg) {

packages/create-payload-app/src/utils/getLatestPackageVersion.ts

@@ -1,34 +0,0 @@
-/**
- * Fetches the latest version of a package from the NPM registry.
- *
- * Used in determining the latest version of Payload to use in the generated templates.
- */
-export async function getLatestPackageVersion({
-  debug = false,
-  packageName = 'payload',
-}: {
-  debug?: boolean
-  /**
-   * Package name to fetch the latest version for based on the NPM registry URL
-   *
-   * Eg. for `'payload'`, it will fetch the version from `https://registry.npmjs.org/payload`
-   *
-   * @default 'payload'
-   */
-  packageName?: string
-}) {
-  try {
-    const response = await fetch(`https://registry.npmjs.org/${packageName}`)
-    const data = await response.json()
-    const latestVersion = data['dist-tags'].latest
-
-    if (debug) {
-      console.log(`Found latest version of ${packageName}: ${latestVersion}`)
-    }
-
-    return latestVersion
-  } catch (error) {
-    console.error('Error fetching Payload version:', error)
-    throw error
-  }
-}

packages/db-mongodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -18,7 +18,6 @@
     }
   ],
   "type": "module",
-  "sideEffects": false,
   "exports": {
     ".": {
       "import": "./src/index.ts",

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

@@ -417,7 +417,7 @@ export const sanitizeQueryValue = ({
       return buildExistsQuery(
         formattedValue,
         path,
-        !['checkbox', 'relationship', 'upload'].includes(field.type),
+        !['relationship', 'upload'].includes(field.type),
       )
     }
   }

packages/db-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -17,7 +17,6 @@
       "url": "https://payloadcms.com"
     }
   ],
-  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
@@ -86,10 +85,10 @@
     "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@hyrious/esbuild-plugin-commonjs": "0.2.6",
+    "@hyrious/esbuild-plugin-commonjs": "^0.2.4",
     "@payloadcms/eslint-config": "workspace:*",
     "@types/to-snake-case": "1.0.0",
-    "esbuild": "0.25.5",
+    "esbuild": "0.24.2",
     "payload": "workspace:*"
   },
   "peerDependencies": {

packages/db-postgres/src/connect.ts

@@ -51,6 +51,13 @@ export const connect: Connect = async function connect(
 ) {
   const { hotReload } = options
 
+  this.schema = {
+    pgSchema: this.pgSchema,
+    ...this.tables,
+    ...this.relations,
+    ...this.enums,
+  }
+
   try {
     if (!this.pool) {
       this.pool = new this.pg.Pool(this.poolOptions)

packages/db-sqlite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-sqlite",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "description": "The officially supported SQLite database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -18,7 +18,6 @@
     }
   ],
   "type": "module",
-  "sideEffects": false,
   "exports": {
     ".": {
       "import": "./src/index.ts",

packages/db-sqlite/src/connect.ts

@@ -15,6 +15,11 @@ export const connect: Connect = async function connect(
 ) {
   const { hotReload } = options
 
+  this.schema = {
+    ...this.tables,
+    ...this.relations,
+  }
+
   try {
     if (!this.client) {
       this.client = createClient(this.clientConfig)

packages/db-sqlite/src/init.ts

@@ -36,9 +36,4 @@ export const init: Init = async function init(this: SQLiteAdapter) {
   })
 
   await executeSchemaHooks({ type: 'afterSchemaInit', adapter: this })
-
-  this.schema = {
-    ...this.tables,
-    ...this.relations,
-  }
 }

packages/db-vercel-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-vercel-postgres",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "description": "Vercel Postgres adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -17,7 +17,6 @@
       "url": "https://payloadcms.com"
     }
   ],
-  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
@@ -86,11 +85,11 @@
     "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@hyrious/esbuild-plugin-commonjs": "0.2.6",
+    "@hyrious/esbuild-plugin-commonjs": "^0.2.4",
     "@payloadcms/eslint-config": "workspace:*",
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
-    "esbuild": "0.25.5",
+    "esbuild": "0.24.2",
     "payload": "workspace:*"
   },
   "peerDependencies": {

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

@@ -16,6 +16,13 @@ export const connect: Connect = async function connect(
 ) {
   const { hotReload } = options
 
+  this.schema = {
+    pgSchema: this.pgSchema,
+    ...this.tables,
+    ...this.relations,
+    ...this.enums,
+  }
+
   try {
     const logger = this.logger || false
 

packages/drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.40.0",
+  "version": "3.38.0",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -18,7 +18,6 @@
     }
   ],
   "type": "module",
-  "sideEffects": false,
   "exports": {
     ".": {
       "import": "./src/index.ts",

packages/drizzle/src/migrateReset.ts

@@ -28,8 +28,6 @@ export async function migrateReset(this: DrizzleAdapter): Promise<void> {
 
   const req = await createLocalReq({}, payload)
 
-  existingMigrations.reverse()
-
   // Rollback all migrations in order
   for (const migration of existingMigrations) {
     const migrationFile = migrationFiles.find((m) => m.name === migration.name)

packages/drizzle/src/postgres/init.ts

@@ -35,11 +35,4 @@ export const init: Init = async function init(this: BasePostgresAdapter) {
   })
 
   await executeSchemaHooks({ type: 'afterSchemaInit', adapter: this })
-
-  this.schema = {
-    pgSchema: this.pgSchema,
-    ...this.tables,
-    ...this.relations,
-    ...this.enums,
-  }
 }

packages/drizzle/src/queries/parseParams.ts

@@ -367,25 +367,7 @@ export function parseParams({
                   break
                 }
 
-                const orConditions: SQL<unknown>[] = []
-                let resolvedQueryValue = queryValue
-                if (
-                  operator === 'in' &&
-                  Array.isArray(queryValue) &&
-                  queryValue.some((v) => v === null)
-                ) {
-                  orConditions.push(isNull(resolvedColumn))
-                  resolvedQueryValue = queryValue.filter((v) => v !== null)
-                }
-                let constraint = adapter.operators[queryOperator](
-                  resolvedColumn,
-                  resolvedQueryValue,
-                )
-                if (orConditions.length) {
-                  orConditions.push(constraint)
-                  constraint = or(...orConditions)
-                }
-                constraints.push(constraint)
+                constraints.push(adapter.operators[queryOperator](resolvedColumn, queryValue))
               }
             }
           }

packages/drizzle/src/schema/withDefault.ts

@@ -7,6 +7,14 @@ export const withDefault = (column: RawColumn, field: FieldAffectingData): RawCo
     return column
   }
 
+  if (typeof field.defaultValue === 'string' && field.defaultValue.includes("'")) {
+    const escapedString = field.defaultValue.replaceAll("'", "''")
+    return {
+      ...column,
+      default: escapedString,
+    }
+  }
+
   return {
     ...column,
     default: field.defaultValue,

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

@@ -98,8 +98,6 @@ export const traverseFields = <T extends Record<string, unknown>>({
   withinArrayOrBlockLocale,
 }: TraverseFieldsArgs): T => {
   const sanitizedPath = path ? `${path}.` : path
-  const localeCodes =
-    adapter.payload.config.localization && adapter.payload.config.localization.localeCodes
 
   const formatted = fields.reduce((result, field) => {
     if (fieldIsVirtual(field)) {
@@ -508,10 +506,6 @@ export const traverseFields = <T extends Record<string, unknown>>({
     if (field.type === 'text' && field?.hasMany) {
       const textPathMatch = texts[`${sanitizedPath}${field.name}`]
       if (!textPathMatch) {
-        result[field.name] =
-          isLocalized && localeCodes
-            ? Object.fromEntries(localeCodes.map((locale) => [locale, []]))
-            : []
         return result
       }
 
@@ -551,10 +545,6 @@ export const traverseFields = <T extends Record<string, unknown>>({
     if (field.type === 'number' && field.hasMany) {
       const numberPathMatch = numbers[`${sanitizedPath}${field.name}`]
       if (!numberPathMatch) {
-        result[field.name] =
-          isLocalized && localeCodes
-            ? Object.fromEntries(localeCodes.map((locale) => [locale, []]))
-            : []
         return result
       }
 
@@ -616,8 +606,10 @@ export const traverseFields = <T extends Record<string, unknown>>({
     }
 
     if (isLocalized && Array.isArray(table._locales)) {
-      if (!table._locales.length && localeCodes) {
-        localeCodes.forEach((_locale) => (table._locales as unknown[]).push({ _locale }))
+      if (!table._locales.length && adapter.payload.config.localization) {
+        adapter.payload.config.localization.localeCodes.forEach((_locale) =>
+          (table._locales as unknown[]).push({ _locale }),
+        )
       }
 
       table._locales.forEach((localeRow) => {
@@ -733,6 +725,8 @@ export const traverseFields = <T extends Record<string, unknown>>({
     }
 
     return result
+
+    return result
   }, dataRef)
 
   if (Array.isArray(table._locales)) {

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

@@ -3,13 +3,7 @@ import type { FlattenedArrayField } from 'payload'
 import { fieldShouldBeLocalized } from 'payload/shared'
 
 import type { DrizzleAdapter } from '../../types.js'
-import type {
-  ArrayRowToInsert,
-  BlockRowToInsert,
-  NumberToDelete,
-  RelationshipToDelete,
-  TextToDelete,
-} from './types.js'
+import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types.js'
 
 import { isArrayOfRows } from '../../utilities/isArrayOfRows.js'
 import { traverseFields } from './traverseFields.js'
@@ -26,7 +20,6 @@ type Args = {
   field: FlattenedArrayField
   locale?: string
   numbers: Record<string, unknown>[]
-  numbersToDelete: NumberToDelete[]
   parentIsLocalized: boolean
   path: string
   relationships: Record<string, unknown>[]
@@ -35,7 +28,6 @@ type Args = {
     [tableName: string]: Record<string, unknown>[]
   }
   texts: Record<string, unknown>[]
-  textsToDelete: TextToDelete[]
   /**
    * Set to a locale code if this set of fields is traversed within a
    * localized array or block field
@@ -53,14 +45,12 @@ export const transformArray = ({
   field,
   locale,
   numbers,
-  numbersToDelete,
   parentIsLocalized,
   path,
   relationships,
   relationshipsToDelete,
   selects,
   texts,
-  textsToDelete,
   withinArrayOrBlockLocale,
 }: Args) => {
   const newRows: ArrayRowToInsert[] = []
@@ -114,7 +104,6 @@ export const transformArray = ({
         insideArrayOrBlock: true,
         locales: newRow.locales,
         numbers,
-        numbersToDelete,
         parentIsLocalized: parentIsLocalized || field.localized,
         parentTableName: arrayTableName,
         path: `${path || ''}${field.name}.${i}.`,
@@ -123,7 +112,6 @@ export const transformArray = ({
         row: newRow.row,
         selects,
         texts,
-        textsToDelete,
         withinArrayOrBlockLocale,
       })
 

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

@@ -4,12 +4,7 @@ import { fieldShouldBeLocalized } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 
 import type { DrizzleAdapter } from '../../types.js'
-import type {
-  BlockRowToInsert,
-  NumberToDelete,
-  RelationshipToDelete,
-  TextToDelete,
-} from './types.js'
+import type { BlockRowToInsert, RelationshipToDelete } from './types.js'
 
 import { resolveBlockTableName } from '../../utilities/validateExistingBlockIsIdentical.js'
 import { traverseFields } from './traverseFields.js'
@@ -25,7 +20,6 @@ type Args = {
   field: FlattenedBlocksField
   locale?: string
   numbers: Record<string, unknown>[]
-  numbersToDelete: NumberToDelete[]
   parentIsLocalized: boolean
   path: string
   relationships: Record<string, unknown>[]
@@ -34,7 +28,6 @@ type Args = {
     [tableName: string]: Record<string, unknown>[]
   }
   texts: Record<string, unknown>[]
-  textsToDelete: TextToDelete[]
   /**
    * Set to a locale code if this set of fields is traversed within a
    * localized array or block field
@@ -50,14 +43,12 @@ export const transformBlocks = ({
   field,
   locale,
   numbers,
-  numbersToDelete,
   parentIsLocalized,
   path,
   relationships,
   relationshipsToDelete,
   selects,
   texts,
-  textsToDelete,
   withinArrayOrBlockLocale,
 }: Args) => {
   data.forEach((blockRow, i) => {
@@ -126,7 +117,6 @@ export const transformBlocks = ({
       insideArrayOrBlock: true,
       locales: newRow.locales,
       numbers,
-      numbersToDelete,
       parentIsLocalized: parentIsLocalized || field.localized,
       parentTableName: blockTableName,
       path: `${path || ''}${field.name}.${i}.`,
@@ -135,7 +125,6 @@ export const transformBlocks = ({
       row: newRow.row,
       selects,
       texts,
-      textsToDelete,
       withinArrayOrBlockLocale,
     })
 

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

@@ -29,13 +29,11 @@ export const transformForWrite = ({
     blocksToDelete: new Set(),
     locales: {},
     numbers: [],
-    numbersToDelete: [],
     relationships: [],
     relationshipsToDelete: [],
     row: {},
     selects: {},
     texts: [],
-    textsToDelete: [],
   }
 
   // This function is responsible for building up the
@@ -52,7 +50,6 @@ export const transformForWrite = ({
     fields,
     locales: rowToInsert.locales,
     numbers: rowToInsert.numbers,
-    numbersToDelete: rowToInsert.numbersToDelete,
     parentIsLocalized,
     parentTableName: tableName,
     path,
@@ -61,7 +58,6 @@ export const transformForWrite = ({
     row: rowToInsert.row,
     selects: rowToInsert.selects,
     texts: rowToInsert.texts,
-    textsToDelete: rowToInsert.textsToDelete,
   })
 
   return rowToInsert

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

@@ -5,13 +5,7 @@ import { fieldIsVirtual, fieldShouldBeLocalized } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 
 import type { DrizzleAdapter } from '../../types.js'
-import type {
-  ArrayRowToInsert,
-  BlockRowToInsert,
-  NumberToDelete,
-  RelationshipToDelete,
-  TextToDelete,
-} from './types.js'
+import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types.js'
 
 import { isArrayOfRows } from '../../utilities/isArrayOfRows.js'
 import { resolveBlockTableName } from '../../utilities/validateExistingBlockIsIdentical.js'
@@ -57,7 +51,6 @@ type Args = {
     [locale: string]: Record<string, unknown>
   }
   numbers: Record<string, unknown>[]
-  numbersToDelete: NumberToDelete[]
   parentIsLocalized: boolean
   /**
    * This is the name of the parent table
@@ -71,7 +64,6 @@ type Args = {
     [tableName: string]: Record<string, unknown>[]
   }
   texts: Record<string, unknown>[]
-  textsToDelete: TextToDelete[]
   /**
    * Set to a locale code if this set of fields is traversed within a
    * localized array or block field
@@ -94,7 +86,6 @@ export const traverseFields = ({
   insideArrayOrBlock = false,
   locales,
   numbers,
-  numbersToDelete,
   parentIsLocalized,
   parentTableName,
   path,
@@ -103,7 +94,6 @@ export const traverseFields = ({
   row,
   selects,
   texts,
-  textsToDelete,
   withinArrayOrBlockLocale,
 }: Args) => {
   if (row._uuid) {
@@ -146,14 +136,12 @@ export const traverseFields = ({
                 field,
                 locale: localeKey,
                 numbers,
-                numbersToDelete,
                 parentIsLocalized: parentIsLocalized || field.localized,
                 path,
                 relationships,
                 relationshipsToDelete,
                 selects,
                 texts,
-                textsToDelete,
                 withinArrayOrBlockLocale: localeKey,
               })
 
@@ -171,14 +159,12 @@ export const traverseFields = ({
           data: data[field.name],
           field,
           numbers,
-          numbersToDelete,
           parentIsLocalized: parentIsLocalized || field.localized,
           path,
           relationships,
           relationshipsToDelete,
           selects,
           texts,
-          textsToDelete,
           withinArrayOrBlockLocale,
         })
 
@@ -216,14 +202,12 @@ export const traverseFields = ({
                 field,
                 locale: localeKey,
                 numbers,
-                numbersToDelete,
                 parentIsLocalized: parentIsLocalized || field.localized,
                 path,
                 relationships,
                 relationshipsToDelete,
                 selects,
                 texts,
-                textsToDelete,
                 withinArrayOrBlockLocale: localeKey,
               })
             }
@@ -238,14 +222,12 @@ export const traverseFields = ({
           data: fieldData,
           field,
           numbers,
-          numbersToDelete,
           parentIsLocalized: parentIsLocalized || field.localized,
           path,
           relationships,
           relationshipsToDelete,
           selects,
           texts,
-          textsToDelete,
           withinArrayOrBlockLocale,
         })
       }
@@ -275,7 +257,6 @@ export const traverseFields = ({
               insideArrayOrBlock,
               locales,
               numbers,
-              numbersToDelete,
               parentIsLocalized: parentIsLocalized || field.localized,
               parentTableName,
               path: `${path || ''}${field.name}.`,
@@ -284,7 +265,6 @@ export const traverseFields = ({
               row,
               selects,
               texts,
-              textsToDelete,
               withinArrayOrBlockLocale: localeKey,
             })
           })
@@ -307,7 +287,6 @@ export const traverseFields = ({
             insideArrayOrBlock,
             locales,
             numbers,
-            numbersToDelete,
             parentIsLocalized: parentIsLocalized || field.localized,
             parentTableName,
             path: `${path || ''}${field.name}.`,
@@ -316,7 +295,6 @@ export const traverseFields = ({
             row,
             selects,
             texts,
-            textsToDelete,
             withinArrayOrBlockLocale,
           })
         }
@@ -402,11 +380,6 @@ export const traverseFields = ({
         if (typeof fieldData === 'object') {
           Object.entries(fieldData).forEach(([localeKey, localeData]) => {
             if (Array.isArray(localeData)) {
-              if (!localeData.length) {
-                textsToDelete.push({ locale: localeKey, path: textPath })
-                return
-              }
-
               transformTexts({
                 baseRow: {
                   locale: localeKey,
@@ -419,11 +392,6 @@ export const traverseFields = ({
           })
         }
       } else if (Array.isArray(fieldData)) {
-        if (!fieldData.length) {
-          textsToDelete.push({ locale: withinArrayOrBlockLocale, path: textPath })
-          return
-        }
-
         transformTexts({
           baseRow: {
             locale: withinArrayOrBlockLocale,
@@ -444,11 +412,6 @@ export const traverseFields = ({
         if (typeof fieldData === 'object') {
           Object.entries(fieldData).forEach(([localeKey, localeData]) => {
             if (Array.isArray(localeData)) {
-              if (!localeData.length) {
-                numbersToDelete.push({ locale: localeKey, path: numberPath })
-                return
-              }
-
               transformNumbers({
                 baseRow: {
                   locale: localeKey,
@@ -461,11 +424,6 @@ export const traverseFields = ({
           })
         }
       } else if (Array.isArray(fieldData)) {
-        if (!fieldData.length) {
-          numbersToDelete.push({ locale: withinArrayOrBlockLocale, path: numberPath })
-          return
-        }
-
         transformNumbers({
           baseRow: {
             locale: withinArrayOrBlockLocale,

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

@@ -23,16 +23,6 @@ export type RelationshipToDelete = {
   path: string
 }
 
-export type TextToDelete = {
-  locale?: string
-  path: string
-}
-
-export type NumberToDelete = {
-  locale?: string
-  path: string
-}
-
 export type RowToInsert = {
   arrays: {
     [tableName: string]: ArrayRowToInsert[]
@@ -45,7 +35,6 @@ export type RowToInsert = {
     [locale: string]: Record<string, unknown>
   }
   numbers: Record<string, unknown>[]
-  numbersToDelete: NumberToDelete[]
   relationships: Record<string, unknown>[]
   relationshipsToDelete: RelationshipToDelete[]
   row: Record<string, unknown>
@@ -53,5 +42,4 @@ export type RowToInsert = {
     [tableName: string]: Record<string, unknown>[]
   }
   texts: Record<string, unknown>[]
-  textsToDelete: TextToDelete[]
 }

packages/drizzle/src/upsertRow/index.ts

@@ -211,7 +211,7 @@ export const upsertRow = async <T extends Record<string, unknown> | TypeWithID>(
         parentColumnName: 'parent',
         parentID: insertedRow.id,
         pathColumnName: 'path',
-        rows: [...textsToInsert, ...rowToInsert.textsToDelete],
+        rows: textsToInsert,
         tableName: textsTableName,
       })
     }
@@ -238,7 +238,7 @@ export const upsertRow = async <T extends Record<string, unknown> | TypeWithID>(
         parentColumnName: 'parent',
         parentID: insertedRow.id,
         pathColumnName: 'path',
-        rows: [...numbersToInsert, ...rowToInsert.numbersToDelete],
+        rows: numbersToInsert,
         tableName: numbersTableName,
       })
     }