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

Co-authored-by: Elliot DeNolf <denolfe@gmail.com>
Co-authored-by: James <james@trbl.design>
Co-authored-by: Alessio Gravili <alessio@gravili.de>

.github/workflows/main.yml

@@ -13,6 +13,8 @@ concurrency:
 env:
   NODE_VERSION: 18.20.2
   PNPM_VERSION: 8.15.7
+  DO_NOT_TRACK: 1 # Disable Turbopack telemetry
+  NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 
 jobs:
   changes:
@@ -89,6 +91,8 @@ jobs:
 
       - run: pnpm install
       - run: pnpm run build:all
+        env:
+          DO_NOT_TRACK: 1 # Disable Turbopack telemetry
 
       - name: Cache build
         uses: actions/cache@v4
@@ -253,7 +257,8 @@ jobs:
           - plugin-seo
           - versions
           - uploads
-
+    env:
+      SUITE_NAME: ${{ matrix.suite }}
     steps:
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -281,11 +286,33 @@ jobs:
         run: pnpm docker:start
         if: ${{ matrix.suite == 'plugin-cloud-storage' }}
 
-      - name: Install Playwright
-        run: pnpm exec playwright install --with-deps
+      - 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@v3
+        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: pnpm test:e2e ${{ matrix.suite }}
+        run: PLAYWRIGHT_JSON_OUTPUT_NAME=results_${{ matrix.suite }}.json pnpm test:e2e ${{ matrix.suite }}
+        env:
+          PLAYWRIGHT_JSON_OUTPUT_NAME: results_${{ matrix.suite }}.json
+          NEXT_TELEMETRY_DISABLED: 1
 
       - uses: actions/upload-artifact@v4
         if: always()
@@ -295,6 +322,13 @@ jobs:
           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
+
   app-build-with-packed:
     runs-on: ubuntu-latest
     needs: build

docs/configuration/localization.mdx

@@ -49,7 +49,8 @@ export default buildConfig({
       {
         label: 'Arabic',
         code: 'ar',
-        // opt-in to setting default text-alignment on Input fields to rtl (right-to-left) when current locale is rtl
+        // opt-in to setting default text-alignment on Input fields to rtl (right-to-left)
+        // when current locale is rtl
         rtl: true,
       },
     ],
@@ -134,13 +135,9 @@ to support localization, you need to specify each field that you would like to l
 ```js
 {
   name: 'title',
-    type
-:
-  'text',
-    // highlight-start
-    localized
-:
-  true,
+  type: 'text',
+  // highlight-start
+  localized: true,
   // highlight-end
 }
 ```

docs/database/transactions.mdx

@@ -20,7 +20,8 @@ The initial request made to Payload will begin a new transaction and attach it t
 
 ```ts
 const afterChange: CollectionAfterChangeHook = async ({ req }) => {
-  // because req.transactionID is assigned from Payload and passed through, my-slug will only persist if the entire request is successful
+  // because req.transactionID is assigned from Payload and passed through,
+  // my-slug will only persist if the entire request is successful
   await req.payload.create({
     req,
     collection: 'my-slug',

docs/rich-text/lexical.mdx

@@ -196,7 +196,8 @@ const Pages: CollectionConfig = {
       editor: lexicalEditor({
         features: ({ defaultFeatures }) => [
           ...defaultFeatures,
-          // The HTMLConverter Feature is the feature which manages the HTML serializers. If you do not pass any arguments to it, it will use the default serializers.
+          // The HTMLConverter Feature is the feature which manages the HTML serializers.
+          // If you do not pass any arguments to it, it will use the default serializers.
           HTMLConverterFeature({}),
         ],
       }),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "private": true,
   "type": "module",
   "scripts": {
@@ -154,7 +154,7 @@
     "tempy": "^1.0.1",
     "ts-node": "10.9.1",
     "tsx": "^4.7.1",
-    "turbo": "^1.13.2",
+    "turbo": "^1.13.3",
     "typescript": "5.4.5",
     "uuid": "^9.0.1",
     "yocto-queue": "^1.0.0"

packages/create-payload-app/package.json

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

packages/db-mongodb/package.json

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

packages/db-postgres/package.json

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

packages/email-nodemailer/package.json

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

packages/email-resend/package.json

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

packages/graphql/package.json

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

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

packages/next/src/exports/utilities.ts

@@ -5,3 +5,4 @@ export { createPayloadRequest } from '../utilities/createPayloadRequest.js'
 export { getNextRequestI18n } from '../utilities/getNextRequestI18n.js'
 export { getPayloadHMR, reload } from '../utilities/getPayloadHMR.js'
 export { headersWithCors } from '../utilities/headersWithCors.js'
+export { initPage } from '../utilities/initPage.js'

packages/next/src/utilities/initPage.ts

@@ -99,7 +99,8 @@ export const initPage = async ({
   const globalSlug = entityType === 'globals' ? entitySlug : undefined
   const docID = collectionSlug && createOrID !== 'create' ? createOrID : undefined
 
-  const isAuthRoute = authRoutes.some((r) => r === route.replace(adminRoute, ''))
+  const isAdminRoute = route.startsWith(adminRoute)
+  const isAuthRoute = authRoutes.some((r) => route.replace(adminRoute, '').startsWith(r))
 
   if (redirectUnauthenticatedUser && !user && !isAuthRoute) {
     if (searchParams && 'redirect' in searchParams) delete searchParams.redirect
@@ -111,7 +112,7 @@ export const initPage = async ({
     redirect(`${routes.admin}/login?redirect=${route + stringifiedSearchParams}`)
   }
 
-  if (!permissions.canAccessAdmin && !isAuthRoute) {
+  if (!permissions.canAccessAdmin && isAdminRoute && !isAuthRoute) {
     notFound()
   }
 

packages/next/src/views/NotFound/index.tsx

@@ -46,10 +46,13 @@ export const NotFoundPage = async ({
     [key: string]: string | string[]
   }
 }) => {
+  const config = await configPromise
+  const { routes: { admin: adminRoute } = {} } = config
+
   const initPageResult = await initPage({
-    config: configPromise,
+    config,
     redirectUnauthenticatedUser: true,
-    route: '/not-found',
+    route: `${adminRoute}/not-found`,
     searchParams,
   })
 

packages/next/src/views/ResetPassword/index.client.tsx

@@ -0,0 +1,103 @@
+'use client'
+import type { FormState } from 'payload/types'
+
+import { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword'
+import { HiddenInput } from '@payloadcms/ui/fields/HiddenInput'
+import { Password } from '@payloadcms/ui/fields/Password'
+import { Form, useFormFields } from '@payloadcms/ui/forms/Form'
+import { FormSubmit } from '@payloadcms/ui/forms/Submit'
+import { useAuth } from '@payloadcms/ui/providers/Auth'
+import { useConfig } from '@payloadcms/ui/providers/Config'
+import { useTranslation } from '@payloadcms/ui/providers/Translation'
+import { useRouter } from 'next/navigation.js'
+import React from 'react'
+import { toast } from 'react-toastify'
+
+type Args = {
+  token: string
+}
+
+const initialState: FormState = {
+  'confirm-password': {
+    initialValue: '',
+    valid: false,
+    value: '',
+  },
+  password: {
+    initialValue: '',
+    valid: false,
+    value: '',
+  },
+}
+
+export const ResetPasswordClient: React.FC<Args> = ({ token }) => {
+  const i18n = useTranslation()
+  const {
+    admin: { user: userSlug },
+    routes: { admin, api },
+    serverURL,
+  } = useConfig()
+
+  const history = useRouter()
+
+  const { fetchFullUser } = useAuth()
+
+  const onSuccess = React.useCallback(
+    async (data) => {
+      if (data.token) {
+        await fetchFullUser()
+        history.push(`${admin}`)
+      } else {
+        history.push(`${admin}/login`)
+        toast.success(i18n.t('general:updatedSuccessfully'), { autoClose: 3000 })
+      }
+    },
+    [fetchFullUser, history, admin, i18n],
+  )
+
+  return (
+    <Form
+      action={`${serverURL}${api}/${userSlug}/reset-password`}
+      initialState={initialState}
+      method="POST"
+      onSuccess={onSuccess}
+    >
+      <PasswordToConfirm />
+      <ConfirmPassword />
+      <HiddenInput forceUsePathFromProps name="token" value={token} />
+      <FormSubmit>{i18n.t('authentication:resetPassword')}</FormSubmit>
+    </Form>
+  )
+}
+
+const PasswordToConfirm = () => {
+  const { t } = useTranslation()
+  const { value: confirmValue } = useFormFields(([fields]) => {
+    return fields['confirm-password']
+  })
+
+  const validate = React.useCallback(
+    (value: string) => {
+      if (!value) {
+        return t('validation:required')
+      }
+
+      if (value === confirmValue) {
+        return true
+      }
+
+      return t('fields:passwordsDoNotMatch')
+    },
+    [confirmValue, t],
+  )
+
+  return (
+    <Password
+      autoComplete="off"
+      label={t('authentication:newPassword')}
+      name="password"
+      required
+      validate={validate}
+    />
+  )
+}

packages/next/src/views/ResetPassword/index.scss

@@ -1,15 +1,5 @@
 .reset-password {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  min-height: 100vh;
-
-  &__wrap {
-    margin: 0 auto var(--base);
-    width: 100%;
-
-    svg {
-      width: 100%;
-    }
+  form > .field-type {
+    margin-bottom: var(--base);
   }
 }

packages/next/src/views/ResetPassword/index.tsx

@@ -2,15 +2,11 @@ import type { AdminViewProps } from 'payload/types'
 
 import { Button } from '@payloadcms/ui/elements/Button'
 import { Translation } from '@payloadcms/ui/elements/Translation'
-import { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword'
-import { HiddenInput } from '@payloadcms/ui/fields/HiddenInput'
-import { Password } from '@payloadcms/ui/fields/Password'
-import { Form } from '@payloadcms/ui/forms/Form'
-import { FormSubmit } from '@payloadcms/ui/forms/Submit'
 import { MinimalTemplate } from '@payloadcms/ui/templates/Minimal'
 import LinkImport from 'next/link.js'
 import React from 'react'
 
+import { ResetPasswordClient } from './index.client.js'
 import './index.scss'
 
 export const resetPasswordBaseClass = 'reset-password'
@@ -22,7 +18,9 @@ export { generateResetPasswordMetadata } from './meta.js'
 export const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params }) => {
   const { req } = initPageResult
 
-  const { token } = params
+  const {
+    segments: [_, token],
+  } = params
 
   const {
     i18n,
@@ -31,21 +29,9 @@ export const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params
   } = req
 
   const {
-    admin: { user: userSlug },
-    routes: { admin, api },
-    serverURL,
+    routes: { admin },
   } = config
 
-  // const onSuccess = async (data) => {
-  //   if (data.token) {
-  //     await fetchFullUser()
-  //     history.push(`${admin}`)
-  //   } else {
-  //     history.push(`${admin}/login`)
-  //     toast.success(i18n.t('general:updatedSuccessfully'), { autoClose: 3000 })
-  //   }
-  // }
-
   if (user) {
     return (
       <MinimalTemplate className={resetPasswordBaseClass}>
@@ -73,22 +59,7 @@ export const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params
     <MinimalTemplate className={resetPasswordBaseClass}>
       <div className={`${resetPasswordBaseClass}__wrap`}>
         <h1>{i18n.t('authentication:resetPassword')}</h1>
-        <Form
-          action={`${serverURL}${api}/${userSlug}/reset-password`}
-          method="POST"
-          // onSuccess={onSuccess}
-          redirect={admin}
-        >
-          <Password
-            autoComplete="off"
-            label={i18n.t('authentication:newPassword')}
-            name="password"
-            required
-          />
-          <ConfirmPassword />
-          <HiddenInput forceUsePathFromProps name="token" value={token} />
-          <FormSubmit>{i18n.t('authentication:resetPassword')}</FormSubmit>
-        </Form>
+        <ResetPasswordClient token={token} />
       </div>
     </MinimalTemplate>
   )

packages/payload/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Node, React, Headless CMS and Application Framework built on Next.js",
   "keywords": [
     "admin panel",

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

@@ -141,6 +141,10 @@ export const loginOperation = async <TSlug extends keyof GeneratedTypes['collect
       user,
     })
 
+    // /////////////////////////////////////
+    // beforeLogin - Collection
+    // /////////////////////////////////////
+
     await collectionConfig.hooks.beforeLogin.reduce(async (priorHook, hook) => {
       await priorHook
 

packages/plugin-cloud-storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-cloud-storage",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "The official cloud storage plugin for Payload CMS",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/plugin-cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-cloud",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "The official Payload Cloud plugin",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/plugin-form-builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-form-builder",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Form builder plugin for Payload CMS",
   "keywords": [
     "payload",

packages/plugin-nested-docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-nested-docs",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "The official Nested Docs plugin for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/plugin-redirects/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-redirects",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Redirects plugin for Payload",
   "keywords": [
     "payload",

packages/plugin-search/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-search",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Search plugin for Payload",
   "keywords": [
     "payload",

packages/plugin-seo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-seo",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "SEO plugin for Payload",
   "keywords": [
     "payload",

packages/plugin-stripe/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-stripe",
-  "version": "0.0.16",
+  "version": "3.0.0-beta.23",
   "description": "Stripe plugin for Payload",
   "keywords": [
     "payload",
@@ -24,8 +24,8 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
-      "types": "./src/index.ts"
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -36,12 +36,14 @@
     "types.d.ts"
   ],
   "scripts": {
-    "build": "echo \"Build temporarily disabled.\" && exit 0",
+    "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
-    "prepublishOnly": "pnpm clean && pnpm turbo run build && pnpm test",
-    "test": "echo 'No tests available.'"
+    "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
+    "lint": "eslint src",
+    "lint:fix": "eslint --fix --ext .ts,.tsx src",
+    "prepublishOnly": "pnpm clean && pnpm turbo build"
   },
   "dependencies": {
     "@payloadcms/ui": "workspace:*",
@@ -51,17 +53,19 @@
   },
   "devDependencies": {
     "@payloadcms/eslint-config": "workspace:*",
+    "@payloadcms/next": "workspace:*",
+    "@payloadcms/translations": "workspace:*",
+    "@payloadcms/ui": "workspace:*",
     "@types/express": "^4.17.9",
     "@types/lodash.get": "^4.4.7",
     "@types/react": "18.2.74",
     "@types/uuid": "^9.0.0",
-    "payload": "workspace:*",
-    "prettier": "^2.7.1",
-    "webpack": "^5.78.0"
+    "payload": "workspace:*"
   },
   "peerDependencies": {
-    "payload": "workspace:*",
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+    "@payloadcms/translations": "workspace:*",
+    "@payloadcms/ui": "workspace:*",
+    "payload": "workspace:*"
   },
   "publishConfig": {
     "exports": {
@@ -72,6 +76,7 @@
       }
     },
     "main": "./dist/index.js",
+    "registry": "https://registry.npmjs.org/",
     "types": "./dist/index.d.ts"
   },
   "homepage:": "https://payloadcms.com"

packages/plugin-stripe/src/admin.ts

@@ -1,10 +1,10 @@
 import type { Config } from 'payload/config'
 
-import type { SanitizedStripeConfig, StripeConfig } from './types'
+import type { SanitizedStripeConfig, StripeConfig } from './types.js'
 
-import { getFields } from './fields/getFields'
+import { getFields } from './fields/getFields.js'
 
-const stripePlugin =
+export const stripePlugin =
   (incomingStripeConfig: StripeConfig) =>
   (config: Config): Config => {
     const { collections } = config
@@ -42,5 +42,3 @@ const stripePlugin =
       }),
     }
   }
-
-export default stripePlugin

packages/plugin-stripe/src/fields/getFields.ts

@@ -1,8 +1,8 @@
 import type { CollectionConfig, Field } from 'payload/types'
 
-import type { SanitizedStripeConfig } from '../types'
+import type { SanitizedStripeConfig } from '../types.js'
 
-import { LinkToDoc } from '../ui/LinkToDoc'
+import { LinkToDoc } from '../ui/LinkToDoc.js'
 
 interface Args {
   collection: CollectionConfig
@@ -39,13 +39,12 @@ export const getFields = ({ collection, stripeConfig, syncConfig }: Args): Field
     type: 'ui',
     admin: {
       components: {
-        Field: (args) =>
-          LinkToDoc({
-            ...args,
-            isTestKey: stripeConfig.isTestKey,
-            nameOfIDField: 'stripeID',
-            stripeResourceType: syncConfig.stripeResourceType,
-          }),
+        Field: LinkToDoc,
+      },
+      custom: {
+        isTestKey: stripeConfig.isTestKey,
+        nameOfIDField: 'stripeID',
+        stripeResourceType: syncConfig.stripeResourceType,
       },
       position: 'sidebar',
     },

packages/plugin-stripe/src/hooks/createNewInStripe.ts

@@ -3,11 +3,12 @@ import type { CollectionBeforeValidateHook, CollectionConfig } from 'payload/typ
 import { APIError } from 'payload/errors'
 import Stripe from 'stripe'
 
-import type { StripeConfig } from '../types'
+import type { StripeConfig } from '../types.js'
 
-import { deepen } from '../utilities/deepen'
+import { deepen } from '../utilities/deepen.js'
 
 const stripeSecretKey = process.env.STRIPE_SECRET_KEY
+// api version can only be the latest, stripe recommends ts ignoring it
 const stripe = new Stripe(stripeSecretKey || '', { apiVersion: '2022-08-01' })
 
 type HookArgsWithCustomCollection = Omit<
@@ -52,12 +53,15 @@ export const createNewInStripe: CollectionBeforeValidateHookWithArgs = async (ar
 
       if (syncConfig) {
         // combine all fields of this object and match their respective values within the document
-        let syncedFields = syncConfig.fields.reduce((acc, field) => {
-          const { fieldPath, stripeProperty } = field
+        let syncedFields = syncConfig.fields.reduce(
+          (acc, field) => {
+            const { fieldPath, stripeProperty } = field
 
-          acc[stripeProperty] = dataRef[fieldPath]
-          return acc
-        }, {} as Record<string, any>)
+            acc[stripeProperty] = dataRef[fieldPath]
+            return acc
+          },
+          {} as Record<string, any>,
+        )
 
         syncedFields = deepen(syncedFields)
 
@@ -72,6 +76,7 @@ export const createNewInStripe: CollectionBeforeValidateHookWithArgs = async (ar
             try {
               // NOTE: Typed as "any" because the "create" method is not standard across all Stripe resources
               const stripeResource = await stripe?.[syncConfig.stripeResourceType]?.create(
+                // @ts-expect-error
                 syncedFields,
               )
 
@@ -105,6 +110,7 @@ export const createNewInStripe: CollectionBeforeValidateHookWithArgs = async (ar
 
             // NOTE: Typed as "any" because the "create" method is not standard across all Stripe resources
             const stripeResource = await stripe?.[syncConfig.stripeResourceType]?.create(
+              // @ts-expect-error
               syncedFields,
             )
 

packages/plugin-stripe/src/hooks/deleteFromStripe.ts

@@ -3,9 +3,10 @@ import type { CollectionAfterDeleteHook, CollectionConfig } from 'payload/types'
 import { APIError } from 'payload/errors'
 import Stripe from 'stripe'
 
-import type { StripeConfig } from '../types'
+import type { StripeConfig } from '../types.js'
 
 const stripeSecretKey = process.env.STRIPE_SECRET_KEY
+// api version can only be the latest, stripe recommends ts ignoring it
 const stripe = new Stripe(stripeSecretKey || '', { apiVersion: '2022-08-01' })
 
 type HookArgsWithCustomCollection = Omit<Parameters<CollectionAfterDeleteHook>[0], 'collection'> & {

packages/plugin-stripe/src/hooks/syncExistingWithStripe.ts

@@ -3,11 +3,12 @@ import type { CollectionBeforeChangeHook, CollectionConfig } from 'payload/types
 import { APIError } from 'payload/errors'
 import Stripe from 'stripe'
 
-import type { StripeConfig } from '../types'
+import type { StripeConfig } from '../types.js'
 
-import { deepen } from '../utilities/deepen'
+import { deepen } from '../utilities/deepen.js'
 
 const stripeSecretKey = process.env.STRIPE_SECRET_KEY
+// api version can only be the latest, stripe recommends ts ignoring it
 const stripe = new Stripe(stripeSecretKey || '', { apiVersion: '2022-08-01' })
 
 type HookArgsWithCustomCollection = Omit<
@@ -39,12 +40,15 @@ export const syncExistingWithStripe: CollectionBeforeChangeHookWithArgs = async
     if (syncConfig) {
       if (operation === 'update') {
         // combine all fields of this object and match their respective values within the document
-        let syncedFields = syncConfig.fields.reduce((acc, field) => {
-          const { fieldPath, stripeProperty } = field
+        let syncedFields = syncConfig.fields.reduce(
+          (acc, field) => {
+            const { fieldPath, stripeProperty } = field
 
-          acc[stripeProperty] = data[fieldPath]
-          return acc
-        }, {} as Record<string, any>)
+            acc[stripeProperty] = data[fieldPath]
+            return acc
+          },
+          {} as Record<string, any>,
+        )
 
         syncedFields = deepen(syncedFields)
 

packages/plugin-stripe/src/index.ts

@@ -9,7 +9,10 @@ import { syncExistingWithStripe } from './hooks/syncExistingWithStripe.js'
 import { stripeREST } from './routes/rest.js'
 import { stripeWebhooks } from './routes/webhooks.js'
 
-const stripePlugin =
+export { LinkToDoc } from './ui/LinkToDoc.js'
+export { stripeProxy } from './utilities/stripeProxy.js'
+
+export const stripePlugin =
   (incomingStripeConfig: StripeConfig) =>
   (config: Config): Config => {
     const { collections } = config
@@ -112,5 +115,3 @@ const stripePlugin =
       endpoints,
     }
   }
-
-export default stripePlugin

packages/plugin-stripe/src/mocks/mockFile.js

@@ -1,9 +0,0 @@
-export const createNewInStripe = () => null
-export const deleteFromStripe = () => null
-export const stripeREST = () => null
-export const stripeWebhooks = () => null
-export const syncExistingWithStripe = () => null
-
-export default {
-  raw: () => {}, // mock express fn
-}

packages/plugin-stripe/src/routes/rest.ts

@@ -33,7 +33,9 @@ export const stripeREST = async (args: {
     }
 
     responseJSON = await stripeProxy({
+      // @ts-expect-error
       stripeArgs,
+      // @ts-expect-error
       stripeMethod,
       stripeSecretKey,
     })

packages/plugin-stripe/src/routes/webhooks.ts

@@ -19,6 +19,7 @@ export const stripeWebhooks = async (args: {
 
   if (stripeWebhooksEndpointSecret) {
     const stripe = new Stripe(stripeSecretKey, {
+      // api version can only be the latest, stripe recommends ts ignoring it
       apiVersion: '2022-08-01',
       appInfo: {
         name: 'Stripe Payload Plugin',
@@ -26,17 +27,14 @@ export const stripeWebhooks = async (args: {
       },
     })
 
+    const body = await req.text()
     const stripeSignature = req.headers.get('stripe-signature')
 
     if (stripeSignature) {
       let event: Stripe.Event | undefined
 
       try {
-        event = stripe.webhooks.constructEvent(
-          await req.text(),
-          stripeSignature,
-          stripeWebhooksEndpointSecret,
-        )
+        event = stripe.webhooks.constructEvent(body, stripeSignature, stripeWebhooksEndpointSecret)
       } catch (err: unknown) {
         const msg: string = err instanceof Error ? err.message : JSON.stringify(err)
         req.payload.logger.error(`Error constructing Stripe event: ${msg}`)

packages/plugin-stripe/src/ui/LinkToDoc.tsx

@@ -1,17 +1,15 @@
+'use client'
+import type { CustomComponent } from 'payload/config'
 import type { UIField } from 'payload/types'
 
+import { useFieldProps } from '@payloadcms/ui/forms/FieldPropsProvider'
 // import CopyToClipboard from 'payload/dist/admin/components/elements/CopyToClipboard'
 import { useFormFields } from '@payloadcms/ui/forms/Form'
 import React from 'react'
 
-export const LinkToDoc: React.FC<
-  UIField & {
-    isTestKey: boolean
-    nameOfIDField: string
-    stripeResourceType: string
-  }
-> = (props) => {
-  const { isTestKey, nameOfIDField, stripeResourceType } = props
+export const LinkToDoc: CustomComponent<UIField> = () => {
+  const { custom } = useFieldProps()
+  const { isTestKey, nameOfIDField, stripeResourceType } = custom
 
   const field = useFormFields(([fields]) => fields[nameOfIDField])
   const { value: stripeID } = field || {}

packages/plugin-stripe/src/utilities/stripeProxy.ts

@@ -1,7 +1,7 @@
 import lodashGet from 'lodash.get'
 import Stripe from 'stripe'
 
-import type { StripeProxy } from '../types'
+import type { StripeProxy } from '../types.js'
 
 export const stripeProxy: StripeProxy = async ({ stripeArgs, stripeMethod, stripeSecretKey }) => {
   const stripe = new Stripe(stripeSecretKey, {

packages/plugin-stripe/src/webhooks/handleCreatedOrUpdated.ts

@@ -1,8 +1,8 @@
 import { v4 as uuid } from 'uuid'
 
-import type { SanitizedStripeConfig, StripeWebhookHandler } from '../types'
+import type { SanitizedStripeConfig, StripeWebhookHandler } from '../types.js'
 
-import { deepen } from '../utilities/deepen'
+import { deepen } from '../utilities/deepen.js'
 
 type HandleCreatedOrUpdated = (
   args: Parameters<StripeWebhookHandler>[0] & {
@@ -62,12 +62,15 @@ export const handleCreatedOrUpdated: HandleCreatedOrUpdated = async (args) => {
     const foundDoc = payloadQuery.docs[0] as any
 
     // combine all properties of the Stripe doc and match their respective fields within the document
-    let syncedData = syncConfig.fields.reduce((acc, field) => {
-      const { fieldPath, stripeProperty } = field
+    let syncedData = syncConfig.fields.reduce(
+      (acc, field) => {
+        const { fieldPath, stripeProperty } = field
 
-      acc[fieldPath] = stripeDoc[stripeProperty]
-      return acc
-    }, {} as Record<string, any>)
+        acc[fieldPath] = stripeDoc[stripeProperty]
+        return acc
+      },
+      {} as Record<string, any>,
+    )
 
     syncedData = deepen({
       ...syncedData,

packages/plugin-stripe/src/webhooks/handleDeleted.ts

@@ -1,4 +1,4 @@
-import type { SanitizedStripeConfig, StripeWebhookHandler } from '../types'
+import type { SanitizedStripeConfig, StripeWebhookHandler } from '../types.js'
 
 type HandleDeleted = (
   args: Parameters<StripeWebhookHandler>[0] & {
@@ -58,6 +58,7 @@ export const handleDeleted: HandleDeleted = async (args) => {
         if (logs) payload.logger.info(`- Deleting Payload document with ID: '${foundDoc.id}'...`)
 
         try {
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
           payload.delete({
             id: foundDoc.id,
             collection: collectionSlug,

packages/plugin-stripe/src/webhooks/index.ts

@@ -1,9 +1,9 @@
-import type { StripeWebhookHandler } from '../types'
+import type { StripeWebhookHandler } from '../types.js'
 
-import { handleCreatedOrUpdated } from './handleCreatedOrUpdated'
-import { handleDeleted } from './handleDeleted'
+import { handleCreatedOrUpdated } from './handleCreatedOrUpdated.js'
+import { handleDeleted } from './handleDeleted.js'
 
-export const handleWebhooks: StripeWebhookHandler = async (args) => {
+export const handleWebhooks: StripeWebhookHandler = (args) => {
   const { event, payload, stripeConfig } = args
 
   if (stripeConfig?.logs)
@@ -21,7 +21,7 @@ export const handleWebhooks: StripeWebhookHandler = async (args) => {
   if (syncConfig) {
     switch (method) {
       case 'created': {
-        await handleCreatedOrUpdated({
+        void handleCreatedOrUpdated({
           ...args,
           resourceType,
           stripeConfig,
@@ -30,7 +30,7 @@ export const handleWebhooks: StripeWebhookHandler = async (args) => {
         break
       }
       case 'updated': {
-        await handleCreatedOrUpdated({
+        void handleCreatedOrUpdated({
           ...args,
           resourceType,
           stripeConfig,
@@ -39,7 +39,7 @@ export const handleWebhooks: StripeWebhookHandler = async (args) => {
         break
       }
       case 'deleted': {
-        await handleDeleted({
+        void handleDeleted({
           ...args,
           resourceType,
           stripeConfig,

packages/richtext-lexical/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/richtext-lexical",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "The officially supported Lexical richtext adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/richtext-lexical/src/index.ts

@@ -346,7 +346,10 @@ export { StrikethroughFeature } from './field/features/format/strikethrough/feat
 export { SubscriptFeature } from './field/features/format/subscript/feature.server.js'
 export { SuperscriptFeature } from './field/features/format/superscript/feature.server.js'
 export { UnderlineFeature } from './field/features/format/underline/feature.server.js'
-export { HeadingFeature } from './field/features/heading/feature.server.js'
+export {
+  HeadingFeature,
+  type HeadingFeatureProps,
+} from './field/features/heading/feature.server.js'
 
 export { HorizontalRuleFeature } from './field/features/horizontalrule/feature.server.js'
 export { IndentFeature } from './field/features/indent/feature.server.js'
@@ -395,7 +398,10 @@ export type {
 } from './field/features/migrations/slateToLexical/converter/types.js'
 export { SlateToLexicalFeature } from './field/features/migrations/slateToLexical/feature.server.js'
 export { ParagraphFeature } from './field/features/paragraph/feature.server.js'
-export { RelationshipFeature } from './field/features/relationship/feature.server.js'
+export {
+  RelationshipFeature,
+  type RelationshipFeatureProps,
+} from './field/features/relationship/feature.server.js'
 export {
   $createRelationshipNode,
   $isRelationshipNode,

packages/richtext-slate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/richtext-slate",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "The officially supported Slate richtext adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/storage-azure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-azure",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Payload storage adapter for Azure Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/storage-gcs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-gcs",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Payload storage adapter for Google Cloud Storage",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/storage-s3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-s3",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Payload storage adapter for Amazon S3",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/storage-vercel-blob/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-vercel-blob",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "description": "Payload storage adapter for Vercel Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {

packages/translations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/translations",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

packages/translations/src/clientKeys.ts

@@ -27,6 +27,8 @@ export const clientTranslationKeys = [
   'authentication:loggingOut',
   'authentication:login',
   'authentication:logOut',
+  'authentication:loggedIn',
+  'authentication:loggedInChangePassword',
   'authentication:logout',
   'authentication:logoutUser',
   'authentication:logoutSuccessful',

packages/translations/src/languages/cs.ts

@@ -8,7 +8,7 @@ export const cs: Language = {
       accountOfCurrentUser: 'Účet současného uživatele',
       alreadyActivated: 'Již aktivováno',
       alreadyLoggedIn: 'Již přihlášen',
-      apiKey: 'Klíč API',
+      apiKey: 'API klíč',
       backToLogin: 'Zpět na přihlášení',
       beginCreateFirstUser: 'Začněte vytvořením svého prvního uživatele.',
       changePassword: 'Změnit heslo',
@@ -19,7 +19,7 @@ export const cs: Language = {
       createFirstUser: 'Vytvořit prvního uživatele',
       emailNotValid: 'Zadaný email není platný',
       emailSent: 'Email odeslán',
-      enableAPIKey: 'Povolit klíč API',
+      enableAPIKey: 'Povolit API klíč',
       failedToUnlock: 'Nepodařilo se odemknout',
       forceUnlock: 'Vynutit odemčení',
       forgotPassword: 'Zapomněli jste heslo?',
@@ -27,9 +27,9 @@ export const cs: Language = {
         'Zadejte svůj email níže. Obdržíte email s instrukcemi, jak resetovat vaše heslo.',
       forgotPasswordQuestion: 'Zapomněli jste heslo?',
       generate: 'Generovat',
-      generateNewAPIKey: 'Generovat nový klíč API',
+      generateNewAPIKey: 'Generovat nový API klíč',
       generatingNewAPIKeyWillInvalidate:
-        'Vytvoření nového klíče API <1>zneplatní</1> předchozí klíč. Opravdu chcete pokračovat?',
+        'Vytvoření nového API klíče <1>zneplatní</1> předchozí klíč. Opravdu chcete pokračovat?',
       lockUntil: 'Uzamknout do',
       logBackIn: 'Znovu se přihlásit',
       logOut: 'Odhlásit se',
@@ -45,7 +45,7 @@ export const cs: Language = {
         'Abyste se mohli přihlásit s jiným uživatelem, nejdříve se <0>odhlaste</0>.',
       logout: 'Odhlásit se',
       logoutUser: 'Odhlásit uživatele',
-      newAPIKeyGenerated: 'Byl vygenerován nový klíč API.',
+      newAPIKeyGenerated: 'Byl vygenerován nový API klíč.',
       newAccountCreated:
         'Pro přístup k <a href="{{serverURL}}">{{serverURL}}</a> byl pro vás vytvořen nový účet. Klepněte na následující odkaz nebo zkopírujte URL do svého prohlížeče pro ověření vašeho emailu: <a href="{{verificationURL}}">{{verificationURL}}</a><br> Po ověření vašeho emailu se budete moci úspěšně přihlásit.',
       newPassword: 'Nové heslo',
@@ -109,7 +109,7 @@ export const cs: Language = {
     },
     fields: {
       addLabel: 'Přidat {{label}}',
-      addLink: 'Přidat Odkaz',
+      addLink: 'Přidat odkaz',
       addNew: 'Přidat nový',
       addNewLabel: 'Přidat nový {{label}}',
       addRelationship: 'Přidat vztah',
@@ -161,10 +161,10 @@ export const cs: Language = {
       addBelow: 'Přidat pod',
       addFilter: 'Přidat filtr',
       adminTheme: 'Motiv administračního rozhraní',
-      and: 'A',
+      and: 'a',
       applyChanges: 'Použít změny',
       ascending: 'Vzestupně',
-      automatic: 'Automatické',
+      automatic: 'Automatický',
       backToDashboard: 'Zpět na nástěnku',
       cancel: 'Zrušit',
       changesNotSaved: 'Vaše změny nebyly uloženy. Pokud teď odejdete, ztratíte své změny.',
@@ -185,7 +185,7 @@ export const cs: Language = {
       createdAt: 'Vytvořeno v',
       creating: 'Vytváření',
       creatingNewLabel: 'Vytváření nového {{label}}',
-      dark: 'Tmavé',
+      dark: 'Tmavý',
       dashboard: 'Nástěnka',
       delete: 'Odstranit',
       deletedCountSuccessfully: 'Úspěšně smazáno {{count}} {{label}}.',
@@ -199,7 +199,7 @@ export const cs: Language = {
       duplicateWithoutSaving: 'Duplikovat bez uložení změn',
       edit: 'Upravit',
       editLabel: 'Upravit {{label}}',
-      editing: 'Úpravy',
+      editing: 'Úprava',
       editingLabel_many: 'Úprava {{count}} {{label}}',
       editingLabel_one: 'Úprava {{count}} {{label}}',
       editingLabel_other: 'Úprava {{count}} {{label}}',
@@ -241,7 +241,7 @@ export const cs: Language = {
       order: 'Pořadí',
       pageNotFound: 'Stránka nenalezena',
       password: 'Heslo',
-      payloadSettings: 'Nastavení datového záběru',
+      payloadSettings: 'Payload nastavení',
       perPage: 'Na stránku: {{limit}}',
       remove: 'Odstranit',
       reset: 'Resetovat',
@@ -289,20 +289,20 @@ export const cs: Language = {
       isLessThanOrEqualTo: 'je menší nebo rovno',
       isLike: 'je jako',
       isNotEqualTo: 'není rovno',
-      isNotIn: 'není in',
+      isNotIn: 'není v',
       near: 'blízko',
     },
     upload: {
-      crop: 'Plodina',
+      crop: 'Ořez',
       cropToolDescription:
-        'Přetáhněte rohy vybrané oblasti, nakreslete novou oblast nebo upravte hodnoty níže.',
+        'Přetáhněte rohy vybrané oblasti, nakreslete novou oblast nebo upravte níže uvedené hodnoty.',
       dragAndDrop: 'Přetáhněte soubor',
       dragAndDropHere: 'nebo sem přetáhněte soubor',
       editImage: 'Upravit obrázek',
       fileName: 'Název souboru',
       fileSize: 'Velikost souboru',
       focalPoint: 'Středobod',
-      focalPointDescription: 'Přetáhněte bod zaměření přímo na náhled nebo upravte hodnoty níže.',
+      focalPointDescription: 'Přetáhněte bod zaměření přímo na náhled nebo upravte níže uvedené hodnoty.',
       height: 'Výška',
       lessInfo: 'Méně informací',
       moreInfo: 'Více informací',
@@ -310,7 +310,7 @@ export const cs: Language = {
       selectCollectionToBrowse: 'Vyberte kolekci pro procházení',
       selectFile: 'Vyberte soubor',
       setCropArea: 'Nastavit oblast ořezu',
-      setFocalPoint: 'Nastavit ohnisko',
+      setFocalPoint: 'Nastavit středobod',
       sizes: 'Velikosti',
       sizesFor: 'Velikosti pro {{label}}',
       width: 'Šířka',

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/ui",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

packages/ui/src/elements/ListControls/index.tsx

@@ -1,9 +1,9 @@
 'use client'
-import type { ClientCollectionConfig, FieldAffectingData, Where } from 'payload/types'
+import type { ClientCollectionConfig, Where } from 'payload/types'
 
 import * as facelessUIImport from '@faceless-ui/window-info'
 import { getTranslation } from '@payloadcms/translations'
-import React, { useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import AnimateHeightImport from 'react-animate-height'
 
 const AnimateHeight = (AnimateHeightImport.default ||
@@ -59,11 +59,22 @@ export const ListControls: React.FC<ListControlsProps> = (props) => {
     breakpoints: { s: smallBreak },
   } = useWindowInfo()
 
+  const hasWhereParam = useRef(Boolean(searchParams?.where))
+
   const shouldInitializeWhereOpened = validateWhereQuery(searchParams?.where)
   const [visibleDrawer, setVisibleDrawer] = useState<'columns' | 'sort' | 'where'>(
     shouldInitializeWhereOpened ? 'where' : undefined,
   )
 
+  useEffect(() => {
+    if (hasWhereParam.current && !searchParams?.where) {
+      setVisibleDrawer(undefined)
+      hasWhereParam.current = false
+    } else if (searchParams?.where) {
+      hasWhereParam.current = true
+    }
+  }, [setVisibleDrawer, searchParams?.where])
+
   return (
     <div className={baseClass}>
       <div className={`${baseClass}__wrap`}>
@@ -156,6 +167,7 @@ export const ListControls: React.FC<ListControlsProps> = (props) => {
         <WhereBuilder
           collectionPluralLabel={collectionConfig?.labels?.plural}
           collectionSlug={collectionConfig.slug}
+          key={String(hasWhereParam.current && !searchParams?.where)}
         />
       </AnimateHeight>
       {enableSort && (

packages/ui/src/fields/ConfirmPassword/index.tsx

@@ -18,7 +18,7 @@ export type ConfirmPasswordFieldProps = {
 export const ConfirmPassword: React.FC<ConfirmPasswordFieldProps> = (props) => {
   const { disabled } = props
 
-  const password = useFormFields<FormField>(([fields]) => fields.password)
+  const password = useFormFields<FormField>(([fields]) => fields?.password)
   const { t } = useTranslation()
 
   const validate = useCallback(

packages/ui/src/forms/useField/index.tsx

@@ -58,6 +58,7 @@ export const useField = <T,>(options: Options): FieldType<T> => {
   const showError = valid === false && submitted
 
   const prevValid = useRef(valid)
+  const prevErrorMessage = useRef(field?.errorMessage)
 
   // Method to return from `useField`, used to
   // update field values from field component(s)
@@ -175,8 +176,9 @@ export const useField = <T,>(options: Options): FieldType<T> => {
 
         // Only dispatch if the validation result has changed
         // This will prevent unnecessary rerenders
-        if (valid !== prevValid.current) {
+        if (valid !== prevValid.current || errorMessage !== prevErrorMessage.current) {
           prevValid.current = valid
+          prevErrorMessage.current = errorMessage
 
           const update: UPDATE = {
             type: 'UPDATE',

pnpm-lock.yaml

@@ -170,7 +170,7 @@ importers:
         version: 9.1.8
       next:
         specifier: ^14.3.0-canary.7
-        version: 14.3.0-canary.7(@babel/core@7.24.4)(@playwright/test@1.43.0)(react-dom@18.2.0)(react@18.2.0)
+        version: 14.3.0-canary.7(@babel/core@7.24.4)(@playwright/test@1.43.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.74.1)
       node-mocks-http:
         specifier: ^1.14.1
         version: 1.14.1
@@ -253,8 +253,8 @@ importers:
         specifier: ^4.7.1
         version: 4.7.2
       turbo:
-        specifier: ^1.13.2
-        version: 1.13.2
+        specifier: ^1.13.3
+        version: 1.13.3
       typescript:
         specifier: 5.4.5
         version: 5.4.5
@@ -1188,9 +1188,6 @@ importers:
       lodash.get:
         specifier: ^4.4.2
         version: 4.4.2
-      react:
-        specifier: ^18.0.0
-        version: 18.2.0
       stripe:
         specifier: ^10.2.0
         version: 10.17.0
@@ -1201,6 +1198,12 @@ importers:
       '@payloadcms/eslint-config':
         specifier: workspace:*
         version: link:../eslint-config-payload
+      '@payloadcms/next':
+        specifier: workspace:*
+        version: link:../next
+      '@payloadcms/translations':
+        specifier: workspace:*
+        version: link:../translations
       '@types/express':
         specifier: ^4.17.9
         version: 4.17.21
@@ -1216,12 +1219,6 @@ importers:
       payload:
         specifier: workspace:*
         version: link:../payload
-      prettier:
-        specifier: ^2.7.1
-        version: 2.8.8
-      webpack:
-        specifier: ^5.78.0
-        version: 5.91.0(@swc/core@1.4.13)(esbuild@0.19.12)(webpack-cli@5.1.4)
 
   packages/richtext-lexical:
     dependencies:
@@ -1485,7 +1482,7 @@ importers:
         version: 2.3.0
       next:
         specifier: ^14.3.0-canary.7
-        version: 14.3.0-canary.7(@babel/core@7.24.4)(@playwright/test@1.43.0)(react-dom@18.2.0)(react@18.2.0)
+        version: 14.3.0-canary.7(@babel/core@7.24.4)(@playwright/test@1.43.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.74.1)
       object-to-formdata:
         specifier: 4.5.1
         version: 4.5.1
@@ -12354,48 +12351,6 @@ packages:
   /next-tick@1.1.0:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
 
-  /next@14.3.0-canary.7(@babel/core@7.24.4)(@playwright/test@1.43.0)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-loPrWTCvHvZgOy3rgL9+2WpxNDxlRNt462ihqm/DUuyK8LUZV1F4H920YTAu1wEiYC8RrpNUbpz8K7KRYAkQiA==}
-    engines: {node: '>=18.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.41.2
-      react: ^18.0.0
-      react-dom: ^18.0.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      '@playwright/test':
-        optional: true
-      sass:
-        optional: true
-    dependencies:
-      '@next/env': 14.3.0-canary.7
-      '@playwright/test': 1.43.0
-      '@swc/helpers': 0.5.5
-      busboy: 1.6.0
-      caniuse-lite: 1.0.30001607
-      graceful-fs: 4.2.11
-      postcss: 8.4.31
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      styled-jsx: 5.1.1(@babel/core@7.24.4)(react@18.2.0)
-    optionalDependencies:
-      '@next/swc-darwin-arm64': 14.3.0-canary.7
-      '@next/swc-darwin-x64': 14.3.0-canary.7
-      '@next/swc-linux-arm64-gnu': 14.3.0-canary.7
-      '@next/swc-linux-arm64-musl': 14.3.0-canary.7
-      '@next/swc-linux-x64-gnu': 14.3.0-canary.7
-      '@next/swc-linux-x64-musl': 14.3.0-canary.7
-      '@next/swc-win32-arm64-msvc': 14.3.0-canary.7
-      '@next/swc-win32-ia32-msvc': 14.3.0-canary.7
-      '@next/swc-win32-x64-msvc': 14.3.0-canary.7
-    transitivePeerDependencies:
-      - '@babel/core'
-      - babel-plugin-macros
-
   /next@14.3.0-canary.7(@babel/core@7.24.4)(@playwright/test@1.43.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.74.1):
     resolution: {integrity: sha512-loPrWTCvHvZgOy3rgL9+2WpxNDxlRNt462ihqm/DUuyK8LUZV1F4H920YTAu1wEiYC8RrpNUbpz8K7KRYAkQiA==}
     engines: {node: '>=18.17.0'}
@@ -12438,7 +12393,6 @@ packages:
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
-    dev: false
 
   /node-abi@3.57.0:
     resolution: {integrity: sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==}
@@ -13918,6 +13872,7 @@ packages:
     resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
     engines: {node: '>=10.13.0'}
     hasBin: true
+    dev: false
 
   /prettier@3.2.5:
     resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
@@ -15788,64 +15743,64 @@ packages:
     resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
     engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
 
-  /turbo-darwin-64@1.13.2:
-    resolution: {integrity: sha512-CCSuD8CfmtncpohCuIgq7eAzUas0IwSbHfI8/Q3vKObTdXyN8vAo01gwqXjDGpzG9bTEVedD0GmLbD23dR0MLA==}
+  /turbo-darwin-64@1.13.3:
+    resolution: {integrity: sha512-glup8Qx1qEFB5jerAnXbS8WrL92OKyMmg5Hnd4PleLljAeYmx+cmmnsmLT7tpaVZIN58EAAwu8wHC6kIIqhbWA==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-darwin-arm64@1.13.2:
-    resolution: {integrity: sha512-0HySm06/D2N91rJJ89FbiI/AodmY8B3WDSFTVEpu2+8spUw7hOJ8okWOT0e5iGlyayUP9gr31eOeL3VFZkpfCw==}
+  /turbo-darwin-arm64@1.13.3:
+    resolution: {integrity: sha512-/np2xD+f/+9qY8BVtuOQXRq5f9LehCFxamiQnwdqWm5iZmdjygC5T3uVSYuagVFsZKMvX3ycySwh8dylGTl6lg==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-64@1.13.2:
-    resolution: {integrity: sha512-7HnibgbqZrjn4lcfIouzlPu8ZHSBtURG4c7Bedu7WJUDeZo+RE1crlrQm8wuwO54S0siYqUqo7GNHxu4IXbioQ==}
+  /turbo-linux-64@1.13.3:
+    resolution: {integrity: sha512-G+HGrau54iAnbXLfl+N/PynqpDwi/uDzb6iM9hXEDG+yJnSJxaHMShhOkXYJPk9offm9prH33Khx2scXrYVW1g==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-arm64@1.13.2:
-    resolution: {integrity: sha512-sUq4dbpk6SNKg/Hkwn256Vj2AEYSQdG96repio894h5/LEfauIK2QYiC/xxAeW3WBMc6BngmvNyURIg7ltrePg==}
+  /turbo-linux-arm64@1.13.3:
+    resolution: {integrity: sha512-qWwEl5VR02NqRyl68/3pwp3c/olZuSp+vwlwrunuoNTm6JXGLG5pTeme4zoHNnk0qn4cCX7DFrOboArlYxv0wQ==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-64@1.13.2:
-    resolution: {integrity: sha512-DqzhcrciWq3dpzllJR2VVIyOhSlXYCo4mNEWl98DJ3FZ08PEzcI3ceudlH6F0t/nIcfSItK1bDP39cs7YoZHEA==}
+  /turbo-windows-64@1.13.3:
+    resolution: {integrity: sha512-Nudr4bRChfJzBPzEmpVV85VwUYRCGKecwkBFpbp2a4NtrJ3+UP1VZES653ckqCu2FRyRuS0n03v9euMbAvzH+Q==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-arm64@1.13.2:
-    resolution: {integrity: sha512-WnPMrwfCXxK69CdDfS1/j2DlzcKxSmycgDAqV0XCYpK/812KB0KlvsVAt5PjEbZGXkY88pCJ1BLZHAjF5FcbqA==}
+  /turbo-windows-arm64@1.13.3:
+    resolution: {integrity: sha512-ouJCgsVLd3icjRLmRvHQDDZnmGzT64GBupM1Y+TjtYn2LVaEBoV6hicFy8x5DUpnqdLy+YpCzRMkWlwhmkX7sQ==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo@1.13.2:
-    resolution: {integrity: sha512-rX/d9f4MgRT3yK6cERPAkfavIxbpBZowDQpgvkYwGMGDQ0Nvw1nc0NVjruE76GrzXQqoxR1UpnmEP54vBARFHQ==}
+  /turbo@1.13.3:
+    resolution: {integrity: sha512-n17HJv4F4CpsYTvKzUJhLbyewbXjq1oLCi90i5tW1TiWDz16ML1eDG7wi5dHaKxzh5efIM56SITnuVbMq5dk4g==}
     hasBin: true
     optionalDependencies:
-      turbo-darwin-64: 1.13.2
-      turbo-darwin-arm64: 1.13.2
-      turbo-linux-64: 1.13.2
-      turbo-linux-arm64: 1.13.2
-      turbo-windows-64: 1.13.2
-      turbo-windows-arm64: 1.13.2
+      turbo-darwin-64: 1.13.3
+      turbo-darwin-arm64: 1.13.3
+      turbo-linux-64: 1.13.3
+      turbo-linux-arm64: 1.13.3
+      turbo-windows-64: 1.13.3
+      turbo-windows-arm64: 1.13.3
     dev: true
 
   /type-check@0.4.0:

scripts/release.ts

@@ -52,7 +52,7 @@ const packageWhitelist = [
   'plugin-redirects',
   'plugin-search',
   'plugin-seo',
-  // 'plugin-stripe',
+  'plugin-stripe',
   // 'plugin-sentry',
 ]
 

templates/blank-3.0/src/app/(payload)/layout.tsx

@@ -1,5 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 import configPromise from '@payload-config'
+import '@payloadcms/next/css'
 import { RootLayout } from '@payloadcms/next/layouts'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'

test/_community/e2e.spec.ts

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'url'
 import { ensureAutoLoginAndCompilationIsDone, initPageConsoleErrorCatch } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
+import { TEST_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -15,7 +16,9 @@ test.describe('Admin Panel', () => {
   let page: Page
   let url: AdminUrlUtil
 
-  test.beforeAll(async ({ browser }) => {
+  test.beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
+
     const { payload, serverURL } = await initPayloadE2ENoConfig({ dirname })
     url = new AdminUrlUtil(serverURL, 'posts')
 

test/access-control/e2e.spec.ts

@@ -1,4 +1,4 @@
-import type { Page } from '@playwright/test'
+import type { BrowserContext, Page } from '@playwright/test'
 import type { TypeWithID } from 'payload/types'
 
 import { expect, test } from '@playwright/test'
@@ -22,7 +22,7 @@ import {
 } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import {
   docLevelAccessSlug,
   noAdminAccessEmail,
@@ -59,7 +59,8 @@ describe('access control', () => {
   let serverURL: string
   let context: BrowserContext
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({ dirname }))
 
     url = new AdminUrlUtil(serverURL, slug)
@@ -73,6 +74,7 @@ describe('access control', () => {
     initPageConsoleErrorCatch(page)
 
     await login({ page, serverURL })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
 
   test('field without read access should not show', async () => {

test/admin/components/views/CustomView/index.client.tsx

@@ -0,0 +1,54 @@
+'use client'
+import { ConfirmPassword } from '@payloadcms/ui/fields/ConfirmPassword'
+import { Password } from '@payloadcms/ui/fields/Password'
+import { Form, useFormFields } from '@payloadcms/ui/forms/Form'
+import { FormSubmit } from '@payloadcms/ui/forms/Submit'
+import React from 'react'
+
+export const ClientForm: React.FC = () => {
+  return (
+    <Form
+      initialState={{
+        'confirm-password': {
+          initialValue: '',
+          valid: false,
+          value: '',
+        },
+        password: {
+          initialValue: '',
+          valid: false,
+          value: '',
+        },
+      }}
+    >
+      <CustomPassword />
+      <ConfirmPassword />
+
+      <FormSubmit>Submit</FormSubmit>
+    </Form>
+  )
+}
+
+const CustomPassword: React.FC = () => {
+  const confirmPassword = useFormFields(([fields]) => {
+    return fields['confirm-password']
+  })
+
+  const confirmValue = confirmPassword.value
+
+  return (
+    <Password
+      autoComplete="off"
+      label="Password"
+      name="password"
+      required
+      validate={(value) => {
+        if (value && confirmValue) {
+          return confirmValue === value ? true : 'Passwords must match!!!!'
+        }
+
+        return 'Field is required'
+      }}
+    />
+  )
+}

test/admin/components/views/CustomView/index.tsx

@@ -1,13 +1,14 @@
+import type { AdminViewProps } from 'payload/types'
+
 import LinkImport from 'next/link.js'
 import React from 'react'
 
-import type { AdminViewProps } from '../../../../../packages/payload/types.js'
-
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
 import { Button } from '@payloadcms/ui/elements/Button'
 
 import { customNestedViewPath, customViewTitle } from '../../../shared.js'
+import { ClientForm } from './index.client.js'
 
 export const CustomView: React.FC<AdminViewProps> = ({ initPageResult }) => {
   const {
@@ -48,6 +49,7 @@ export const CustomView: React.FC<AdminViewProps> = ({ initPageResult }) => {
         >
           Go to Nested View
         </Button>
+        <ClientForm />
       </div>
     </div>
   )

test/admin/e2e.spec.ts

@@ -61,7 +61,7 @@ import { fileURLToPath } from 'url'
 import type { PayloadTestSDK } from '../helpers/sdk/index.js'
 
 import { reInitializeDB } from '../helpers/reInitializeDB.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
@@ -76,7 +76,7 @@ describe('admin', () => {
   beforeAll(async ({ browser }, testInfo) => {
     const prebuild = Boolean(process.env.CI)
 
-    if (prebuild) testInfo.setTimeout(testInfo.timeout * 3)
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
 
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({
@@ -91,6 +91,11 @@ describe('admin', () => {
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'adminTests',
+    })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
   beforeEach(async () => {
     await reInitializeDB({

test/auth/e2e.spec.ts

@@ -10,10 +10,14 @@ import { v4 as uuid } from 'uuid'
 import type { PayloadTestSDK } from '../helpers/sdk/index.js'
 import type { Config } from './payload-types.js'
 
-import { initPageConsoleErrorCatch, saveDocAndAssert } from '../helpers.js'
+import {
+  ensureAutoLoginAndCompilationIsDone,
+  initPageConsoleErrorCatch,
+  saveDocAndAssert,
+} from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import { apiKeysSlug, slug } from './shared.js'
 
 const filename = fileURLToPath(import.meta.url)
@@ -52,7 +56,8 @@ describe('auth', () => {
   // Allows for testing create-first-user
   process.env.SKIP_ON_INIT = 'true'
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({ dirname }))
     apiURL = `${serverURL}/api`
     url = new AdminUrlUtil(serverURL, slug)
@@ -78,6 +83,7 @@ describe('auth', () => {
         enableAPIKey: true,
       },
     })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
 
   describe('authenticated users', () => {

test/field-error-states/e2e.spec.ts

@@ -6,6 +6,7 @@ import { fileURLToPath } from 'url'
 
 import { ensureAutoLoginAndCompilationIsDone, initPageConsoleErrorCatch } from '../helpers.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
+import { TEST_TIMEOUT_LONG } from '../playwright.config.js'
 
 const { beforeAll, describe } = test
 const filename = fileURLToPath(import.meta.url)
@@ -15,7 +16,8 @@ describe('field error states', () => {
   let serverURL: string
   let page: Page
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ serverURL } = await initPayloadE2ENoConfig({ dirname }))
     const context = await browser.newContext()
     page = await context.newPage()

test/fields-relationship/e2e.spec.ts

@@ -17,15 +17,16 @@ import type {
 } from './payload-types.js'
 
 import {
-  delayNetwork,
   ensureAutoLoginAndCompilationIsDone,
   initPageConsoleErrorCatch,
   openDocControls,
   openDocDrawer,
   saveDocAndAssert,
+  throttleTest,
 } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
+import { TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import {
   relationFalseFilterOptionSlug,
   relationOneSlug,
@@ -56,7 +57,8 @@ describe('fields - relationship', () => {
   let relationWithTitle: RelationWithTitle
   let serverURL: string
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({ dirname }))
 
     url = new AdminUrlUtil(serverURL, slug)
@@ -65,6 +67,7 @@ describe('fields - relationship', () => {
     page = await context.newPage()
 
     initPageConsoleErrorCatch(page)
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
 
   beforeEach(async () => {
@@ -374,6 +377,7 @@ describe('fields - relationship', () => {
     await expect(options).not.toContainText('whatever')
   })
 
+  // TODO: Flaky test in CI - fix.
   test('should show a relationship when filterOptions returns true', async () => {
     await payload.create({
       collection: relationTrueFilterOptionSlug,
@@ -393,7 +397,8 @@ describe('fields - relationship', () => {
     await expect(options).toContainText('truth')
   })
 
-  test('should open document drawer from read-only relationships', async () => {
+  // TODO: Flaky test in CI - fix.
+  test.skip('should open document drawer from read-only relationships', async () => {
     const editURL = url.edit(docWithExistingRelations.id)
     await page.goto(editURL)
     await page.waitForURL(editURL)

test/fields/collections/Array/e2e.spec.ts

@@ -17,6 +17,7 @@ import { AdminUrlUtil } from '../../../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../../../helpers/initPayloadE2ENoConfig.js'
 import { reInitializeDB } from '../../../helpers/reInitializeDB.js'
 import { RESTClient } from '../../../helpers/rest.js'
+import { TEST_TIMEOUT_LONG } from '../../../playwright.config.js'
 
 const filename = fileURLToPath(import.meta.url)
 const currentFolder = path.dirname(filename)
@@ -31,7 +32,9 @@ let serverURL: string
 // If we want to make this run in parallel: test.describe.configure({ mode: 'parallel' })
 
 describe('Array', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
+
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ payload, serverURL } = await initPayloadE2ENoConfig({
       dirname,
@@ -40,6 +43,12 @@ describe('Array', () => {
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'fieldsArrayTest',
+      uploadsDir: path.resolve(dirname, '../Upload/uploads'),
+    })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
   beforeEach(async () => {
     await reInitializeDB({

test/fields/collections/Blocks/e2e.spec.ts

@@ -13,6 +13,7 @@ import { AdminUrlUtil } from '../../../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../../../helpers/initPayloadE2ENoConfig.js'
 import { reInitializeDB } from '../../../helpers/reInitializeDB.js'
 import { RESTClient } from '../../../helpers/rest.js'
+import { TEST_TIMEOUT_LONG } from '../../../playwright.config.js'
 
 const filename = fileURLToPath(import.meta.url)
 const currentFolder = path.dirname(filename)
@@ -26,7 +27,9 @@ let serverURL: string
 // If we want to make this run in parallel: test.describe.configure({ mode: 'parallel' })
 
 describe('Block fields', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
+
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ serverURL } = await initPayloadE2ENoConfig({
       dirname,
@@ -35,6 +38,12 @@ describe('Block fields', () => {
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'blockFieldsTest',
+      uploadsDir: path.resolve(dirname, '../Upload/uploads'),
+    })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
   beforeEach(async () => {
     await reInitializeDB({

test/fields/collections/Lexical/e2e.spec.ts

@@ -1,5 +1,5 @@
 import type { SerializedBlockNode, SerializedLinkNode } from '@payloadcms/richtext-lexical'
-import type { Page } from '@playwright/test'
+import type { BrowserContext, Page } from '@playwright/test'
 import type { PayloadTestSDK } from 'helpers/sdk/index.js'
 import type { SerializedEditorState, SerializedParagraphNode, SerializedTextNode } from 'lexical'
 
@@ -12,10 +12,15 @@ import { fileURLToPath } from 'url'
 
 import type { Config, LexicalField, Upload } from '../../payload-types.js'
 
-import { initPageConsoleErrorCatch, saveDocAndAssert } from '../../../helpers.js'
+import {
+  ensureAutoLoginAndCompilationIsDone,
+  initPageConsoleErrorCatch,
+  saveDocAndAssert,
+  throttleTest,
+} from '../../../helpers.js'
 import { AdminUrlUtil } from '../../../helpers/adminUrlUtil.js'
 import { RESTClient } from '../../../helpers/rest.js'
-import { POLL_TOPASS_TIMEOUT } from '../../../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../../../playwright.config.js'
 import { lexicalFieldsSlug } from '../../slugs.js'
 import { lexicalDocData } from './data.js'
 
@@ -28,6 +33,7 @@ const { beforeAll, beforeEach, describe } = test
 let payload: PayloadTestSDK<Config>
 let client: RESTClient
 let page: Page
+let context: BrowserContext
 let serverURL: string
 
 /**
@@ -55,16 +61,28 @@ async function navigateToLexicalFields(
 }
 
 describe('lexical', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ payload, serverURL } = await initPayloadE2ENoConfig({ dirname }))
 
-    const context = await browser.newContext()
+    context = await browser.newContext()
     page = await context.newPage()
 
     initPageConsoleErrorCatch(page)
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'fieldsLexicalTest',
+      uploadsDir: path.resolve(dirname, '../Upload/uploads'),
+    })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
   beforeEach(async () => {
+    /*await throttleTest({
+      page,
+      context,
+      delay: 'Slow 4G',
+    })*/
     await reInitializeDB({
       serverURL,
       snapshotKey: 'fieldsLexicalTest',

test/fields/collections/Relationship/e2e.spec.ts

@@ -20,7 +20,7 @@ import { AdminUrlUtil } from '../../../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../../../helpers/initPayloadE2ENoConfig.js'
 import { reInitializeDB } from '../../../helpers/reInitializeDB.js'
 import { RESTClient } from '../../../helpers/rest.js'
-import { POLL_TOPASS_TIMEOUT } from '../../../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../../../playwright.config.js'
 import { relationshipFieldsSlug, textFieldsSlug } from '../../slugs.js'
 const filename = fileURLToPath(import.meta.url)
 const currentFolder = path.dirname(filename)
@@ -35,7 +35,8 @@ let serverURL: string
 // If we want to make this run in parallel: test.describe.configure({ mode: 'parallel' })
 
 describe('relationship', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ payload, serverURL } = await initPayloadE2ENoConfig({
       dirname,
@@ -44,6 +45,12 @@ describe('relationship', () => {
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'fieldsRelationshipTest',
+      uploadsDir: path.resolve(dirname, '../Upload/uploads'),
+    })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
   beforeEach(async () => {
     await reInitializeDB({
@@ -163,7 +170,8 @@ describe('relationship', () => {
     expect(count).toEqual(0)
   })
 
-  test('should clear relationship values', async () => {
+  // TODO: Flaky test in CI - fix this. https://github.com/payloadcms/payload/actions/runs/8910825395/job/24470963991
+  test.skip('should clear relationship values', async () => {
     await page.goto(url.create)
 
     const field = page.locator('#field-relationship')
@@ -380,9 +388,12 @@ describe('relationship', () => {
   test('should sort relationship options by sortOptions property (ID in ascending order)', async () => {
     await page.goto(url.create)
     await page.waitForURL(url.create)
+    await wait(400)
 
     const field = page.locator('#field-relationship')
+    await wait(400)
     await field.click()
+    await wait(400)
 
     const textDocsGroup = page.locator('.rs__group-heading:has-text("Text Fields")')
     const firstTextDocOption = textDocsGroup.locator('+div .rs__option').first()

test/fields/collections/RichText/e2e.spec.ts

@@ -14,6 +14,7 @@ import { AdminUrlUtil } from '../../../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../../../helpers/initPayloadE2ENoConfig.js'
 import { reInitializeDB } from '../../../helpers/reInitializeDB.js'
 import { RESTClient } from '../../../helpers/rest.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../../../playwright.config.js'
 
 const filename = fileURLToPath(import.meta.url)
 const currentFolder = path.dirname(filename)
@@ -27,7 +28,8 @@ let serverURL: string
 // If we want to make this run in parallel: test.describe.configure({ mode: 'parallel' })
 
 describe('Rich Text', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ serverURL } = await initPayloadE2ENoConfig({
       dirname,
@@ -36,6 +38,12 @@ describe('Rich Text', () => {
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'fieldsRichTextTest',
+      uploadsDir: path.resolve(dirname, '../Upload/uploads'),
+    })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
   beforeEach(async () => {
     await reInitializeDB({
@@ -57,7 +65,14 @@ describe('Rich Text', () => {
     const url: AdminUrlUtil = new AdminUrlUtil(serverURL, 'rich-text-fields')
     await page.goto(url.list)
     await page.waitForURL(url.list)
-    await page.locator('.row-1 .cell-title a').click()
+
+    const linkToDoc = page.locator('.row-1 .cell-title a').first()
+    await expect(() => expect(linkToDoc).toBeTruthy()).toPass({ timeout: POLL_TOPASS_TIMEOUT })
+    const linkDocHref = await linkToDoc.getAttribute('href')
+
+    await linkToDoc.click()
+
+    await page.waitForURL(`**${linkDocHref}`)
   }
 
   describe('cell', () => {
@@ -71,9 +86,19 @@ describe('Rich Text', () => {
       const entireRow = table.locator('.row-1').first()
 
       // Make sure each of the 3 above are no larger than 300px in height:
-      expect((await lexicalCell.boundingBox()).height).toBeLessThanOrEqual(300)
-      expect((await lexicalHtmlCell.boundingBox()).height).toBeLessThanOrEqual(300)
-      expect((await entireRow.boundingBox()).height).toBeLessThanOrEqual(300)
+      await expect
+        .poll(async () => (await lexicalCell.boundingBox()).height, {
+          timeout: POLL_TOPASS_TIMEOUT,
+        })
+        .toBeLessThanOrEqual(300)
+      await expect
+        .poll(async () => (await lexicalHtmlCell.boundingBox()).height, {
+          timeout: POLL_TOPASS_TIMEOUT,
+        })
+        .toBeLessThanOrEqual(300)
+      await expect
+        .poll(async () => (await entireRow.boundingBox()).height, { timeout: POLL_TOPASS_TIMEOUT })
+        .toBeLessThanOrEqual(300)
     })
   })
 
@@ -102,7 +127,8 @@ describe('Rich Text', () => {
       expect(hasErrorClass).toBe(true)
     })
 
-    test('should create new url custom link', async () => {
+    // TODO: Flaky test flakes consistently in CI: https://github.com/payloadcms/payload/actions/runs/8913431889/job/24478995959?pr=6155
+    test.skip('should create new url custom link', async () => {
       await navigateToRichTextFields()
 
       // Open link drawer
@@ -118,6 +144,7 @@ describe('Rich Text', () => {
       await editLinkModal.locator('label[for="field-linkType-custom"]').click()
       await editLinkModal.locator('#field-url').fill('https://payloadcms.com')
       await editLinkModal.locator('button[type="submit"]').click()
+      await expect(editLinkModal).toBeHidden()
       await wait(400)
       await saveDocAndAssert(page)
 
@@ -129,7 +156,8 @@ describe('Rich Text', () => {
       await expect(page.locator('span >> text="link text"')).toHaveCount(0)
     })
 
-    test('should create new internal link', async () => {
+    // TODO: Flaky test flakes consistently in CI: https://github.com/payloadcms/payload/actions/runs/8913769794/job/24480056251?pr=6155
+    test.skip('should create new internal link', async () => {
       await navigateToRichTextFields()
 
       // Open link drawer
@@ -245,7 +273,8 @@ describe('Rich Text', () => {
       await expect(menu).not.toContainText('Uploads')
     })
 
-    test('should respect customizing the default fields', async () => {
+    // TODO: Flaky test in CI. Flake: https://github.com/payloadcms/payload/actions/runs/8914532814/job/24482407114
+    test.skip('should respect customizing the default fields', async () => {
       const linkText = 'link'
       const value = 'test value'
       await navigateToRichTextFields()

test/fields/e2e.spec.ts

@@ -20,7 +20,7 @@ import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
 import { reInitializeDB } from '../helpers/reInitializeDB.js'
 import { RESTClient } from '../helpers/rest.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import { jsonDoc } from './collections/JSON/shared.js'
 import { numberDoc } from './collections/Number/shared.js'
 import { textDoc } from './collections/Text/shared.js'
@@ -37,7 +37,8 @@ let serverURL: string
 // If we want to make this run in parallel: test.describe.configure({ mode: 'parallel' })
 
 describe('fields', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ payload, serverURL } = await initPayloadE2ENoConfig({
       dirname,
@@ -47,6 +48,12 @@ describe('fields', () => {
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'fieldsTest',
+      uploadsDir: path.resolve(dirname, './collections/Upload/uploads'),
+    })
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
   beforeEach(async () => {
     await reInitializeDB({

test/helpers.ts

@@ -1,8 +1,9 @@
-import type { BrowserContext, Locator, Page } from '@playwright/test'
+import type { BrowserContext, ChromiumBrowserContext, Locator, Page } from '@playwright/test'
 
 import { expect } from '@playwright/test'
 import { wait } from 'payload/utilities'
 import shelljs from 'shelljs'
+import { setTimeout } from 'timers/promises'
 
 import { devUser } from './credentials.js'
 import { POLL_TOPASS_TIMEOUT } from './playwright.config.js'
@@ -20,6 +21,7 @@ type LoginArgs = {
   page: Page
   serverURL: string
 }
+const random = (min: number, max: number) => Math.floor(Math.random() * (max - min + 1)) + min
 
 const networkConditions = {
   'Slow 3G': {
@@ -61,9 +63,14 @@ export async function ensureAutoLoginAndCompilationIsDone({
   await expect(() => expect(page.url()).not.toContain(`/admin/create-first-user`)).toPass({
     timeout: POLL_TOPASS_TIMEOUT,
   })
+  // Check if hero is there
+  await expect(page.locator('.dashboard__label').first()).toBeVisible()
 }
 
-export async function delayNetwork({
+/**
+ * CPU throttling & 2 different kinds of network throttling
+ */
+export async function throttleTest({
   context,
   page,
   delay,
@@ -80,6 +87,14 @@ export async function delayNetwork({
     latency: networkConditions[delay].latency,
     offline: false,
   })
+
+  await page.route('**/*', async (route) => {
+    await setTimeout(random(500, 1000))
+    await route.continue()
+  })
+
+  const client = await (page.context() as ChromiumBrowserContext).newCDPSession(page)
+  await client.send('Emulation.setCPUThrottlingRate', { rate: 8 }) // 8x slowdown
 }
 
 export async function firstRegister(args: FirstRegisterArgs): Promise<void> {

test/live-preview/e2e.spec.ts

@@ -13,7 +13,7 @@ import {
 } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import { mobileBreakpoint } from './shared.js'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -44,7 +44,8 @@ describe('Live Preview', () => {
     await page.waitForURL(previewURL)
   }
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ serverURL } = await initPayloadE2ENoConfig({ dirname }))
     url = new AdminUrlUtil(serverURL, 'pages')
     const context = await browser.newContext()

test/localization/e2e.spec.ts

@@ -17,7 +17,7 @@ import {
 } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import {
   englishTitle,
   localizedPostsSlug,
@@ -51,7 +51,8 @@ let payload: PayloadTestSDK<Config>
 let serverURL: string
 
 describe('Localization', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ payload, serverURL } = await initPayloadE2ENoConfig({ dirname }))
 
     url = new AdminUrlUtil(serverURL, localizedPostsSlug)

test/playwright.bail.config.ts

@@ -4,7 +4,7 @@ import baseConfig from './playwright.config.js'
 
 const config: PlaywrightTestConfig = {
   ...baseConfig,
-  maxFailures: 1,
+  maxFailures: process.env.CI ? undefined : 1,
 }
 
 export default config

test/playwright.config.ts

@@ -8,14 +8,16 @@ const dirname = path.dirname(filename)
 
 dotenv.config({ path: path.resolve(dirname, 'test.env') })
 
-export const EXPECT_TIMEOUT = 45000
+export const TEST_TIMEOUT_LONG = 480000 // 8 minutes - used as timeOut for the beforeAll
+export const TEST_TIMEOUT = 60000
+export const EXPECT_TIMEOUT = 8000
 export const POLL_TOPASS_TIMEOUT = EXPECT_TIMEOUT * 4 // That way expect.poll() or expect().toPass can retry 4 times. 4x higher than default expect timeout => can retry 4 times if retryable expects are used inside
 
 export default defineConfig({
   // Look for test files in the "test" directory, relative to this configuration file
   testDir: '',
   testMatch: '*e2e.spec.ts',
-  timeout: 120000,
+  timeout: TEST_TIMEOUT, // 1 minute
   use: {
     screenshot: 'only-on-failure',
     trace: 'retain-on-failure',
@@ -25,5 +27,9 @@ export default defineConfig({
     timeout: EXPECT_TIMEOUT,
   },
   workers: 16,
-  maxFailures: process.env.CI ? 1 : undefined,
+  maxFailures: process.env.CI ? undefined : undefined,
+  retries: process.env.CI ? 5 : undefined,
+  reporter: process.env.CI
+    ? [['list', { printSteps: true }], ['json']]
+    : [['list', { printSteps: true }]],
 })

test/plugin-cloud-storage/e2e.spec.ts

@@ -4,9 +4,10 @@ import { expect, test } from '@playwright/test'
 import * as path from 'path'
 import { fileURLToPath } from 'url'
 
-import { saveDocAndAssert } from '../helpers.js'
+import { ensureAutoLoginAndCompilationIsDone, saveDocAndAssert } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
+import { TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import { mediaSlug } from './shared.js'
 
 const filename = fileURLToPath(import.meta.url)
@@ -16,12 +17,14 @@ test.describe('Admin Panel', () => {
   let page: Page
   let mediaURL: AdminUrlUtil
 
-  test.beforeAll(async ({ browser }) => {
+  test.beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     const { serverURL } = await initPayloadE2ENoConfig({ dirname })
     mediaURL = new AdminUrlUtil(serverURL, mediaSlug)
 
     const context = await browser.newContext()
     page = await context.newPage()
+    await ensureAutoLoginAndCompilationIsDone({ page, serverURL })
   })
 
   test('should create file upload', async () => {

test/plugin-form-builder/e2e.spec.ts

@@ -10,7 +10,7 @@ import type { Config } from './payload-types.js'
 import { ensureAutoLoginAndCompilationIsDone, initPageConsoleErrorCatch } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -21,7 +21,8 @@ test.describe('Form Builder', () => {
   let submissionsUrl: AdminUrlUtil
   let payload: PayloadTestSDK<Config>
 
-  test.beforeAll(async ({ browser }) => {
+  test.beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     const { payload: payloadFromInit, serverURL } = await initPayloadE2ENoConfig<Config>({
       dirname,
     })

test/plugin-nested-docs/e2e.spec.ts

@@ -9,6 +9,7 @@ import type { Config, Page as PayloadPage } from './payload-types.js'
 import { ensureAutoLoginAndCompilationIsDone, initPageConsoleErrorCatch } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
+import { TEST_TIMEOUT_LONG } from '../playwright.config.js'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
@@ -21,7 +22,8 @@ let draftChildId: string
 let childId: string
 
 describe('Nested Docs Plugin', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     const { serverURL, payload } = await initPayloadE2ENoConfig<Config>({ dirname })
     url = new AdminUrlUtil(serverURL, 'pages')
     const context = await browser.newContext()

test/plugin-seo/e2e.spec.ts

@@ -3,6 +3,7 @@ import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import path from 'path'
 import { getFileByPath } from 'payload/uploads'
+import { wait } from 'payload/utilities'
 import { fileURLToPath } from 'url'
 
 import type { Config, Page as PayloadPage } from './payload-types.js'
@@ -10,6 +11,7 @@ import type { Config, Page as PayloadPage } from './payload-types.js'
 import { ensureAutoLoginAndCompilationIsDone, initPageConsoleErrorCatch } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
+import { TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import { mediaSlug } from './shared.js'
 
 const filename = fileURLToPath(import.meta.url)
@@ -22,7 +24,8 @@ let page: Page
 let id: string
 
 describe('SEO Plugin', () => {
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     const { serverURL, payload } = await initPayloadE2ENoConfig<Config>({ dirname })
     url = new AdminUrlUtil(serverURL, 'pages')
 
@@ -149,13 +152,17 @@ describe('SEO Plugin', () => {
 
       // Change language to Spanish
       await languageField.click()
+      await wait(200)
       await options.locator('text=Español').click()
       await expect(languageField).toContainText('Español')
+      await wait(600)
 
       // Navigate back to the page
       await page.goto(url.edit(id))
+      await wait(600)
 
       await secondTab.click()
+      await wait(600)
 
       await expect(autoGenButton).toContainText('Auto-génerar')
     })

test/plugin-stripe/collections/Customers.ts

@@ -1,6 +1,7 @@
 import type { CollectionConfig } from 'payload/types'
 
-import { LinkToDoc } from '../../../packages/plugin-stripe/src/ui/LinkToDoc.js'
+import { LinkToDoc } from '@payloadcms/plugin-stripe'
+
 import { customersSlug } from '../shared.js'
 
 export const Customers: CollectionConfig = {
@@ -31,13 +32,12 @@ export const Customers: CollectionConfig = {
           type: 'ui',
           admin: {
             components: {
-              Field: (args) =>
-                LinkToDoc({
-                  ...args,
-                  isTestKey: process.env.PAYLOAD_PUBLIC_IS_STRIPE_TEST_KEY === 'true',
-                  nameOfIDField: `${args.path}.stripeSubscriptionID`,
-                  stripeResourceType: 'subscriptions',
-                }),
+              Field: LinkToDoc,
+            },
+            custom: {
+              isTestKey: process.env.PAYLOAD_PUBLIC_IS_STRIPE_TEST_KEY === 'true',
+              nameOfIDField: `stripeSubscriptionID`,
+              stripeResourceType: 'subscriptions',
             },
           },
           label: 'Link',

test/plugin-stripe/config.ts

@@ -1,4 +1,4 @@
-import stripePlugin from '@payloadcms/plugin-stripe'
+import { stripePlugin } from '@payloadcms/plugin-stripe'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'

test/uploads/e2e.spec.ts

@@ -18,6 +18,7 @@ import {
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
 import { RESTClient } from '../helpers/rest.js'
+import { TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import {
   adminThumbnailFunctionSlug,
   adminThumbnailSizeSlug,
@@ -44,7 +45,8 @@ describe('uploads', () => {
   let pngDoc: Media
   let audioDoc: Media
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({ dirname }))
     client = new RESTClient(null, { defaultSlug: 'users', serverURL })
     await client.login()

test/versions/e2e.spec.ts

@@ -44,7 +44,7 @@ import {
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../helpers/initPayloadE2ENoConfig.js'
 import { reInitializeDB } from '../helpers/reInitializeDB.js'
-import { POLL_TOPASS_TIMEOUT } from '../playwright.config.js'
+import { POLL_TOPASS_TIMEOUT, TEST_TIMEOUT_LONG } from '../playwright.config.js'
 import { titleToDelete } from './shared.js'
 import {
   autoSaveGlobalSlug,
@@ -93,7 +93,9 @@ describe('versions', () => {
   let customIDURL: AdminUrlUtil
   let postURL: AdminUrlUtil
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
+
     process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
     ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({ dirname }))
     const context = await browser.newContext()