From f48335444bf11231ab2409b59280c9191dd25ec2 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Thu, 4 Apr 2024 21:01:38 -0400
Subject: [PATCH 01/17] chore: flake

---
 test/fields/e2e.spec.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index 8f22ec34a0..ace2c2ba7c 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -696,6 +696,8 @@ describe('fields', () => {
             '#field-customBlocks input[name="customBlocks.0.block1Title"]',
           )
 
+          await page.mouse.wheel(0, 1750)
+
           await customBlocks.scrollIntoViewIfNeeded()
 
           await expect(customBlocks).toHaveValue('Block 1: Prefilled Title')
@@ -775,6 +777,7 @@ describe('fields', () => {
         const assertText3 = 'array row 3'
         const assertGroupText3 = 'text in group in row 3'
         await page.goto(url.create)
+        await page.mouse.wheel(0, 1750)
         await page.locator('#field-potentiallyEmptyArray').scrollIntoViewIfNeeded()
         await wait(300)
 

From 0c45d5773a51aef5e5d7688b84a4ab3c345321fd Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Thu, 4 Apr 2024 21:02:31 -0400
Subject: [PATCH 02/17] chore: brings back admin and fields

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cc8af141cd..2cb9cfc6c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -246,11 +246,11 @@ jobs:
         suite:
           - _community
           - access-control
-          # - admin
+          - admin
           - auth
           - field-error-states
           - fields-relationship
-          # - fields
+          - fields
           - fields/lexical
           - live-preview
           - localization

From 3bd455ced2abb3ead297ca8b923b2cb334b19f0d Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 5 Apr 2024 11:46:02 -0400
Subject: [PATCH 03/17] chore: pre-builds in CI

---
 .../admin/[[...segments]]/not-found.tsx        |  4 ++--
 next.config.mjs                                |  6 ++++++
 packages/next/src/views/NotFound/index.tsx     | 12 +++++++++---
 packages/next/src/views/Root/meta.ts           |  2 +-
 test/helpers/initPayloadE2ENoConfig.ts         | 18 +++++++++++++++++-
 tsconfig.json                                  |  3 ++-
 6 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/app/(payload)/admin/[[...segments]]/not-found.tsx b/app/(payload)/admin/[[...segments]]/not-found.tsx
index f3a7743293..8b7a445fe7 100644
--- a/app/(payload)/admin/[[...segments]]/not-found.tsx
+++ b/app/(payload)/admin/[[...segments]]/not-found.tsx
@@ -14,8 +14,8 @@ type Args = {
   }
 }
 
-export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
-  generatePageMetadata({ config, params, searchParams })
+export const generateMetadata = ({ params }: Args): Promise<Metadata> =>
+  generatePageMetadata({ config, params })
 
 const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
 
diff --git a/next.config.mjs b/next.config.mjs
index bbc02170f4..891e51caf9 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -10,6 +10,12 @@ const withBundleAnalyzer = bundleAnalyzer({
 export default withBundleAnalyzer(
   withPayload({
     reactStrictMode: false,
+    eslint: {
+      ignoreDuringBuilds: true,
+    },
+    typescript: {
+      ignoreBuildErrors: true,
+    },
     async redirects() {
       return [
         {
diff --git a/packages/next/src/views/NotFound/index.tsx b/packages/next/src/views/NotFound/index.tsx
index 3b8718a9d2..a87050e0a5 100644
--- a/packages/next/src/views/NotFound/index.tsx
+++ b/packages/next/src/views/NotFound/index.tsx
@@ -2,6 +2,7 @@ import type { I18n } from '@payloadcms/translations'
 import type { Metadata } from 'next'
 import type { SanitizedConfig } from 'payload/types'
 
+import { getNextI18n } from '@payloadcms/next/utilities/getNextI18n.js'
 import { HydrateClientUser } from '@payloadcms/ui/elements/HydrateClientUser'
 import { DefaultTemplate } from '@payloadcms/ui/templates/Default'
 import React, { Fragment } from 'react'
@@ -10,13 +11,18 @@ import { initPage } from '../../utilities/initPage.js'
 import { NotFoundClient } from './index.client.js'
 
 export const generatePageMetadata = async ({
-  i18n,
+  config: configPromise,
 }: {
-  config: SanitizedConfig
-  i18n: I18n
+  config: Promise<SanitizedConfig> | SanitizedConfig
   params?: { [key: string]: string | string[] }
   //eslint-disable-next-line @typescript-eslint/require-await
 }): Promise<Metadata> => {
+  const config = await configPromise
+
+  const i18n = getNextI18n({
+    config,
+  })
+
   return {
     title: i18n.t('general:notFound'),
   }
diff --git a/packages/next/src/views/Root/meta.ts b/packages/next/src/views/Root/meta.ts
index dbbed934d6..0edcfd5319 100644
--- a/packages/next/src/views/Root/meta.ts
+++ b/packages/next/src/views/Root/meta.ts
@@ -49,7 +49,7 @@ export const generatePageMetadata = async ({ config: configPromise, params }: Ar
   const isGlobal = segmentOne === 'globals'
   const isCollection = segmentOne === 'collections'
 
-  const i18n = await getNextI18n({
+  const i18n = getNextI18n({
     config,
   })
 
diff --git a/test/helpers/initPayloadE2ENoConfig.ts b/test/helpers/initPayloadE2ENoConfig.ts
index 278fd23e98..c3c1643cc9 100644
--- a/test/helpers/initPayloadE2ENoConfig.ts
+++ b/test/helpers/initPayloadE2ENoConfig.ts
@@ -1,5 +1,6 @@
 import { createServer } from 'http'
 import nextImport from 'next'
+import nextBuild from 'next/dist/build/index.js'
 import path from 'path'
 import { wait } from 'payload/utilities'
 import { parse } from 'url'
@@ -32,9 +33,24 @@ export async function initPayloadE2ENoConfig<T extends GeneratedTypes<T>>({
 
   await startMemoryDB()
 
+  // process.env.CI = 'true'
+
+  if (process.env.CI) {
+    await nextBuild.default(
+      path.resolve(dirname, '../../'),
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      'default',
+    )
+  }
+
   // @ts-expect-error
   const app = nextImport({
-    dev: true,
+    dev: !process.env.CI,
     hostname: 'localhost',
     port,
     dir: path.resolve(dirname, '../../'),
diff --git a/tsconfig.json b/tsconfig.json
index 5e34fd5bc9..55baff19c7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -37,7 +37,7 @@
     ],
     "paths": {
       "@payload-config": [
-        "./test/fields/config.ts"
+        "./test/_community/config.ts"
       ],
       "@payloadcms/live-preview": [
         "./packages/live-preview/src"
@@ -156,6 +156,7 @@
     }
   ],
   "include": [
+    "app",
     "next-env.d.ts",
     ".next/types/**/*.ts",
     "scripts/**/*.ts"

From 6217c70fb57950c1e178e595e78751b114cec0f3 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 5 Apr 2024 14:13:14 -0400
Subject: [PATCH 04/17] chore: prebuilds fields and admin in ci

---
 app/live-preview/_api/fetchDoc.ts             | 35 -------------
 app/live-preview/_api/fetchDocs.ts            | 19 -------
 app/live-preview/_api/fetchFooter.ts          | 25 ---------
 app/live-preview/_api/fetchHeader.ts          | 25 ---------
 test/admin/e2e.spec.ts                        |  5 +-
 test/dev.js                                   | 10 ++--
 test/fields/e2e.spec.ts                       |  5 +-
 test/helpers/getNextJSRootDir.js              | 25 +++++++++
 test/helpers/initPayloadE2ENoConfig.ts        | 23 +++-----
 test/helpers/startMemoryDB.ts                 |  2 -
 .../admin/[[...segments]]/not-found.tsx       | 22 ++++++++
 .../(payload)/admin/[[...segments]]/page.tsx  | 22 ++++++++
 .../app/(payload)/api/[...slug]/route.ts      |  9 ++++
 .../(payload)/api/graphql-playground/route.ts |  6 +++
 .../app/(payload)/api/graphql/route.ts        |  6 +++
 test/live-preview/app/(payload)/custom.scss   |  8 +++
 test/live-preview/app/(payload)/layout.tsx    | 15 ++++++
 .../(pages)/[slug]/page.client.tsx            |  0
 .../app}/live-preview/(pages)/[slug]/page.tsx |  0
 .../(pages)/posts/[slug]/page.client.tsx      |  2 +-
 .../(pages)/posts/[slug]/page.tsx             |  2 +-
 .../app/live-preview/_api/fetchDoc.ts         | 35 +++++++++++++
 .../app/live-preview/_api/fetchDocs.ts        | 20 +++++++
 .../app/live-preview/_api/fetchFooter.ts      | 20 +++++++
 .../app/live-preview/_api/fetchHeader.ts      | 20 +++++++
 .../app}/live-preview/_api/serverURL.ts       |  0
 .../_blocks/ArchiveBlock/index.module.scss    |  0
 .../_blocks/ArchiveBlock/index.tsx            |  0
 .../_blocks/ArchiveBlock/types.ts             |  2 +-
 .../_blocks/CallToAction/index.module.scss    |  0
 .../_blocks/CallToAction/index.tsx            |  2 +-
 .../_blocks/Content/index.module.scss         |  0
 .../live-preview/_blocks/Content/index.tsx    |  2 +-
 .../_blocks/MediaBlock/index.module.scss      |  0
 .../live-preview/_blocks/MediaBlock/index.tsx |  2 +-
 .../_blocks/RelatedPosts/index.module.scss    |  0
 .../_blocks/RelatedPosts/index.tsx            |  2 +-
 .../_blocks/Relationships/index.module.scss   |  0
 .../_blocks/Relationships/index.tsx           |  2 +-
 .../BackgroundColor/index.module.scss         |  0
 .../_components/BackgroundColor/index.tsx     |  0
 .../live-preview/_components/Blocks/index.tsx |  2 +-
 .../_components/Button/index.module.scss      |  0
 .../live-preview/_components/Button/index.tsx |  0
 .../_components/Card/index.module.scss        |  0
 .../live-preview/_components/Card/index.tsx   |  2 +-
 .../_components/Chevron/index.tsx             |  0
 .../PopulateByCollection/index.module.scss    |  0
 .../PopulateByCollection/index.tsx            |  2 +-
 .../PopulateBySelection/index.module.scss     |  0
 .../PopulateBySelection/index.tsx             |  0
 .../_components/CollectionArchive/index.tsx   |  0
 .../_components/Footer/index.module.scss      |  0
 .../live-preview/_components/Footer/index.tsx |  0
 .../_components/Gutter/index.module.scss      |  0
 .../live-preview/_components/Gutter/index.tsx |  0
 .../_components/Header/Nav/index.module.scss  |  0
 .../_components/Header/Nav/index.tsx          |  0
 .../_components/Header/index.module.scss      |  0
 .../live-preview/_components/Header/index.tsx |  0
 .../live-preview/_components/Hero/index.tsx   |  0
 .../live-preview/_components/Link/index.tsx   |  2 +-
 .../_components/Media/Image/index.module.scss |  0
 .../_components/Media/Image/index.tsx         |  0
 .../_components/Media/Video/index.module.scss |  0
 .../_components/Media/Video/index.tsx         |  0
 .../live-preview/_components/Media/index.tsx  |  2 +-
 .../live-preview/_components/Media/types.ts   |  2 +-
 .../_components/PageRange/index.module.scss   |  0
 .../_components/PageRange/index.tsx           |  0
 .../_components/Pagination/index.module.scss  |  0
 .../_components/Pagination/index.tsx          |  0
 .../_components/RichText/index.module.scss    |  0
 .../_components/RichText/index.tsx            |  0
 .../_components/RichText/serializeLexical.tsx |  0
 .../_components/RichText/serializeSlate.tsx   |  0
 .../VerticalPadding/index.module.scss         |  0
 .../_components/VerticalPadding/index.tsx     |  0
 .../app}/live-preview/_css/app.scss           |  0
 .../app}/live-preview/_css/colors.scss        |  0
 .../app}/live-preview/_css/common.scss        |  0
 .../app}/live-preview/_css/queries.scss       |  0
 .../app}/live-preview/_css/type.scss          |  0
 .../_heros/HighImpact/index.module.scss       |  0
 .../live-preview/_heros/HighImpact/index.tsx  |  0
 .../_heros/LowImpact/index.module.scss        |  0
 .../live-preview/_heros/LowImpact/index.tsx   |  0
 .../_heros/PostHero/index.module.scss         |  0
 .../live-preview/_heros/PostHero/index.tsx    |  2 +-
 .../live-preview/_utilities/formatDateTime.ts |  0
 .../live-preview/_utilities/toKebabCase.ts    |  0
 .../app}/live-preview/cssVariables.js         |  0
 .../live-preview/app}/live-preview/layout.tsx |  0
 .../app}/live-preview/not-found.tsx           |  0
 .../live-preview/app}/live-preview/page.tsx   |  0
 test/live-preview/next-env.d.ts               |  5 ++
 test/live-preview/next.config.mjs             |  3 ++
 test/live-preview/tsconfig.json               | 52 +++++++++++++++++++
 test/tsconfig.json                            |  5 +-
 tsconfig.json                                 |  5 +-
 100 files changed, 310 insertions(+), 147 deletions(-)
 delete mode 100644 app/live-preview/_api/fetchDoc.ts
 delete mode 100644 app/live-preview/_api/fetchDocs.ts
 delete mode 100644 app/live-preview/_api/fetchFooter.ts
 delete mode 100644 app/live-preview/_api/fetchHeader.ts
 create mode 100644 test/helpers/getNextJSRootDir.js
 create mode 100644 test/live-preview/app/(payload)/admin/[[...segments]]/not-found.tsx
 create mode 100644 test/live-preview/app/(payload)/admin/[[...segments]]/page.tsx
 create mode 100644 test/live-preview/app/(payload)/api/[...slug]/route.ts
 create mode 100644 test/live-preview/app/(payload)/api/graphql-playground/route.ts
 create mode 100644 test/live-preview/app/(payload)/api/graphql/route.ts
 create mode 100644 test/live-preview/app/(payload)/custom.scss
 create mode 100644 test/live-preview/app/(payload)/layout.tsx
 rename {app => test/live-preview/app}/live-preview/(pages)/[slug]/page.client.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/(pages)/[slug]/page.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/(pages)/posts/[slug]/page.client.tsx (95%)
 rename {app => test/live-preview/app}/live-preview/(pages)/posts/[slug]/page.tsx (90%)
 create mode 100644 test/live-preview/app/live-preview/_api/fetchDoc.ts
 create mode 100644 test/live-preview/app/live-preview/_api/fetchDocs.ts
 create mode 100644 test/live-preview/app/live-preview/_api/fetchFooter.ts
 create mode 100644 test/live-preview/app/live-preview/_api/fetchHeader.ts
 rename {app => test/live-preview/app}/live-preview/_api/serverURL.ts (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/ArchiveBlock/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/ArchiveBlock/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/ArchiveBlock/types.ts (59%)
 rename {app => test/live-preview/app}/live-preview/_blocks/CallToAction/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/CallToAction/index.tsx (93%)
 rename {app => test/live-preview/app}/live-preview/_blocks/Content/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/Content/index.tsx (93%)
 rename {app => test/live-preview/app}/live-preview/_blocks/MediaBlock/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/MediaBlock/index.tsx (93%)
 rename {app => test/live-preview/app}/live-preview/_blocks/RelatedPosts/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/RelatedPosts/index.tsx (94%)
 rename {app => test/live-preview/app}/live-preview/_blocks/Relationships/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_blocks/Relationships/index.tsx (98%)
 rename {app => test/live-preview/app}/live-preview/_components/BackgroundColor/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/BackgroundColor/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Blocks/index.tsx (97%)
 rename {app => test/live-preview/app}/live-preview/_components/Button/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Button/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Card/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Card/index.tsx (97%)
 rename {app => test/live-preview/app}/live-preview/_components/Chevron/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/CollectionArchive/PopulateByCollection/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/CollectionArchive/PopulateByCollection/index.tsx (98%)
 rename {app => test/live-preview/app}/live-preview/_components/CollectionArchive/PopulateBySelection/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/CollectionArchive/PopulateBySelection/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/CollectionArchive/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Footer/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Footer/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Gutter/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Gutter/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Header/Nav/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Header/Nav/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Header/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Header/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Hero/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Link/index.tsx (94%)
 rename {app => test/live-preview/app}/live-preview/_components/Media/Image/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Media/Image/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Media/Video/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Media/Video/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Media/index.tsx (92%)
 rename {app => test/live-preview/app}/live-preview/_components/Media/types.ts (89%)
 rename {app => test/live-preview/app}/live-preview/_components/PageRange/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/PageRange/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Pagination/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/Pagination/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/RichText/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/RichText/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/RichText/serializeLexical.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/RichText/serializeSlate.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_components/VerticalPadding/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_components/VerticalPadding/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_css/app.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_css/colors.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_css/common.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_css/queries.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_css/type.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_heros/HighImpact/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_heros/HighImpact/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_heros/LowImpact/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_heros/LowImpact/index.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/_heros/PostHero/index.module.scss (100%)
 rename {app => test/live-preview/app}/live-preview/_heros/PostHero/index.tsx (96%)
 rename {app => test/live-preview/app}/live-preview/_utilities/formatDateTime.ts (100%)
 rename {app => test/live-preview/app}/live-preview/_utilities/toKebabCase.ts (100%)
 rename {app => test/live-preview/app}/live-preview/cssVariables.js (100%)
 rename {app => test/live-preview/app}/live-preview/layout.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/not-found.tsx (100%)
 rename {app => test/live-preview/app}/live-preview/page.tsx (100%)
 create mode 100644 test/live-preview/next-env.d.ts
 create mode 100644 test/live-preview/next.config.mjs
 create mode 100644 test/live-preview/tsconfig.json

diff --git a/app/live-preview/_api/fetchDoc.ts b/app/live-preview/_api/fetchDoc.ts
deleted file mode 100644
index d1dc1c2a3a..0000000000
--- a/app/live-preview/_api/fetchDoc.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import QueryString from 'qs'
-
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export const fetchDoc = async <T>(args: {
-  collection: string
-  depth?: number
-  id?: string
-  slug?: string
-}): Promise<T> => {
-  const { id, slug, collection, depth = 2 } = args || {}
-
-  const queryString = QueryString.stringify(
-    {
-      ...(slug ? { 'where[slug][equals]': slug } : {}),
-      ...(depth ? { depth } : {}),
-    },
-    { addQueryPrefix: true },
-  )
-
-  const doc: T = await fetch(`${PAYLOAD_SERVER_URL}/api/${collection}${queryString}`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    ?.then((res) => res.json())
-    ?.then((res) => {
-      if (res.errors) throw new Error(res?.errors?.[0]?.message ?? 'Error fetching doc')
-      return res?.docs?.[0]
-    })
-
-  return doc
-}
diff --git a/app/live-preview/_api/fetchDocs.ts b/app/live-preview/_api/fetchDocs.ts
deleted file mode 100644
index 104f5e2586..0000000000
--- a/app/live-preview/_api/fetchDocs.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export const fetchDocs = async <T>(collection: string): Promise<T[]> => {
-  const docs: T[] = await fetch(`${PAYLOAD_SERVER_URL}/api/${collection}?depth=0&limit=100`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    ?.then((res) => res.json())
-    ?.then((res) => {
-      if (res.errors) throw new Error(res?.errors?.[0]?.message ?? 'Error fetching docs')
-
-      return res?.docs
-    })
-
-  return docs
-}
diff --git a/app/live-preview/_api/fetchFooter.ts b/app/live-preview/_api/fetchFooter.ts
deleted file mode 100644
index 26b531b620..0000000000
--- a/app/live-preview/_api/fetchFooter.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { Footer } from '../../../test/live-preview/payload-types.js'
-
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export async function fetchFooter(): Promise<Footer> {
-  if (!PAYLOAD_SERVER_URL) throw new Error('PAYLOAD_SERVER_URL not found')
-
-  const footer = await fetch(`${PAYLOAD_SERVER_URL}/api/globals/footer`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    .then((res) => {
-      if (!res.ok) throw new Error('Error fetching doc')
-      return res.json()
-    })
-    ?.then((res) => {
-      if (res?.errors) throw new Error(res?.errors[0]?.message || 'Error fetching footer')
-      return res
-    })
-
-  return footer
-}
diff --git a/app/live-preview/_api/fetchHeader.ts b/app/live-preview/_api/fetchHeader.ts
deleted file mode 100644
index 79a35adb5d..0000000000
--- a/app/live-preview/_api/fetchHeader.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { Header } from '../../../test/live-preview/payload-types.js'
-
-import { PAYLOAD_SERVER_URL } from './serverURL.js'
-
-export async function fetchHeader(): Promise<Header> {
-  if (!PAYLOAD_SERVER_URL) throw new Error('PAYLOAD_SERVER_URL not found')
-
-  const header = await fetch(`${PAYLOAD_SERVER_URL}/api/globals/header`, {
-    cache: 'no-store',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'GET',
-  })
-    ?.then((res) => {
-      if (!res.ok) throw new Error('Error fetching doc')
-      return res.json()
-    })
-    ?.then((res) => {
-      if (res?.errors) throw new Error(res?.errors[0]?.message || 'Error fetching header')
-      return res
-    })
-
-  return header
-}
diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
index fad521a771..3f8d8e6217 100644
--- a/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -72,7 +72,10 @@ describe('admin', () => {
 
   beforeAll(async ({ browser }) => {
     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 }))
+    ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({
+      dirname,
+      prebuild: Boolean(process.env.CI),
+    }))
     geoUrl = new AdminUrlUtil(serverURL, geoCollectionSlug)
     postsUrl = new AdminUrlUtil(serverURL, postsCollectionSlug)
     customViewsURL = new AdminUrlUtil(serverURL, customViews2CollectionSlug)
diff --git a/test/dev.js b/test/dev.js
index 124bedb1d8..ca40005042 100644
--- a/test/dev.js
+++ b/test/dev.js
@@ -1,15 +1,11 @@
 import minimist from 'minimist'
 import { MongoMemoryReplSet } from 'mongodb-memory-server'
 import { nextDev } from 'next/dist/cli/next-dev.js'
-import { dirname, resolve } from 'path'
-import { fileURLToPath } from 'url'
-import open, { openApp, apps } from 'open'
+import open from 'open'
+import { getNextJSRootDir } from './helpers/getNextJSRootDir.js'
 
 import { createTestHooks } from './testHooks.js'
 
-const _filename = fileURLToPath(import.meta.url)
-const _dirname = dirname(_filename)
-
 process.env.PAYLOAD_DROP_DATABASE = 'true'
 
 const {
@@ -26,7 +22,7 @@ process.env.PAYLOAD_DROP_DATABASE = 'true'
 const { afterTest, beforeTest } = await createTestHooks(testSuiteArg)
 await beforeTest()
 
-const rootDir = resolve(_dirname, '../')
+const rootDir = getNextJSRootDir(testSuiteArg)
 
 // Open the admin if the -o flag is passed
 if (args.o) {
diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index 8f22ec34a0..3ea9cd1d82 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -44,7 +44,10 @@ let serverURL: string
 describe('fields', () => {
   beforeAll(async ({ browser }) => {
     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 }))
+    ;({ payload, serverURL } = await initPayloadE2ENoConfig({
+      dirname,
+      prebuild: Boolean(process.env.CI),
+    }))
 
     const context = await browser.newContext()
     page = await context.newPage()
diff --git a/test/helpers/getNextJSRootDir.js b/test/helpers/getNextJSRootDir.js
new file mode 100644
index 0000000000..996e80fc15
--- /dev/null
+++ b/test/helpers/getNextJSRootDir.js
@@ -0,0 +1,25 @@
+import fs from 'fs'
+import { dirname, resolve } from 'path'
+import { fileURLToPath } from 'url'
+
+const _filename = fileURLToPath(import.meta.url)
+const _dirname = dirname(_filename)
+
+export const getNextJSRootDir = (testSuite) => {
+  const testSuiteDir = resolve(_dirname, `../${testSuite}`)
+
+  let hasNextConfig = false
+
+  try {
+    fs.accessSync(`${testSuiteDir}/next.config.mjs`, fs.constants.F_OK)
+    hasNextConfig = true
+  } catch (err) {
+    // Swallow err - no config found
+  }
+
+  if (hasNextConfig) return testSuiteDir
+
+  // If no next config found in test suite,
+  // return monorepo root dir
+  return resolve(_dirname, '../../')
+}
diff --git a/test/helpers/initPayloadE2ENoConfig.ts b/test/helpers/initPayloadE2ENoConfig.ts
index c3c1643cc9..b381a07466 100644
--- a/test/helpers/initPayloadE2ENoConfig.ts
+++ b/test/helpers/initPayloadE2ENoConfig.ts
@@ -1,18 +1,19 @@
 import { createServer } from 'http'
 import nextImport from 'next'
 import nextBuild from 'next/dist/build/index.js'
-import path from 'path'
 import { wait } from 'payload/utilities'
 import { parse } from 'url'
 
 import type { GeneratedTypes } from './sdk/types.js'
 
 import { createTestHooks } from '../testHooks.js'
+import { getNextJSRootDir } from './getNextJSRootDir.js'
 import { PayloadTestSDK } from './sdk/index.js'
 import startMemoryDB from './startMemoryDB.js'
 
 type Args = {
   dirname: string
+  prebuild?: boolean
 }
 
 type Result<T extends GeneratedTypes<T>> = {
@@ -22,6 +23,7 @@ type Result<T extends GeneratedTypes<T>> = {
 
 export async function initPayloadE2ENoConfig<T extends GeneratedTypes<T>>({
   dirname,
+  prebuild,
 }: Args): Promise<Result<T>> {
   const testSuiteName = dirname.split('/').pop()
   const { beforeTest } = await createTestHooks(testSuiteName)
@@ -33,27 +35,18 @@ export async function initPayloadE2ENoConfig<T extends GeneratedTypes<T>>({
 
   await startMemoryDB()
 
-  // process.env.CI = 'true'
+  const dir = getNextJSRootDir(testSuiteName)
 
-  if (process.env.CI) {
-    await nextBuild.default(
-      path.resolve(dirname, '../../'),
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      'default',
-    )
+  if (prebuild) {
+    await nextBuild.default(dir, false, false, false, true, true, false, 'default')
   }
 
   // @ts-expect-error
   const app = nextImport({
-    dev: !process.env.CI,
+    dev: !prebuild,
     hostname: 'localhost',
     port,
-    dir: path.resolve(dirname, '../../'),
+    dir,
   })
 
   const handle = app.getRequestHandler()
diff --git a/test/helpers/startMemoryDB.ts b/test/helpers/startMemoryDB.ts
index cc67692aa0..d5f64f7078 100644
--- a/test/helpers/startMemoryDB.ts
+++ b/test/helpers/startMemoryDB.ts
@@ -22,7 +22,5 @@ export default async () => {
     global._mongoMemoryServer = db
 
     process.env.MONGODB_MEMORY_SERVER_URI = `${global._mongoMemoryServer.getUri()}&retryWrites=true`
-
-    console.log(process.env.MONGODB_MEMORY_SERVER_URI)
   }
 }
diff --git a/test/live-preview/app/(payload)/admin/[[...segments]]/not-found.tsx b/test/live-preview/app/(payload)/admin/[[...segments]]/not-found.tsx
new file mode 100644
index 0000000000..8b7a445fe7
--- /dev/null
+++ b/test/live-preview/app/(payload)/admin/[[...segments]]/not-found.tsx
@@ -0,0 +1,22 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+import type { Metadata } from 'next'
+
+import config from '@payload-config'
+/* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
+import { NotFoundPage, generatePageMetadata } from '@payloadcms/next/views/NotFound/index.js'
+
+type Args = {
+  params: {
+    segments: string[]
+  }
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
+
+export const generateMetadata = ({ params }: Args): Promise<Metadata> =>
+  generatePageMetadata({ config, params })
+
+const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
+
+export default NotFound
diff --git a/test/live-preview/app/(payload)/admin/[[...segments]]/page.tsx b/test/live-preview/app/(payload)/admin/[[...segments]]/page.tsx
new file mode 100644
index 0000000000..ee9bd415c3
--- /dev/null
+++ b/test/live-preview/app/(payload)/admin/[[...segments]]/page.tsx
@@ -0,0 +1,22 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+import type { Metadata } from 'next'
+
+import config from '@payload-config'
+/* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
+import { RootPage, generatePageMetadata } from '@payloadcms/next/views/Root/index.js'
+
+type Args = {
+  params: {
+    segments: string[]
+  }
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
+
+export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
+  generatePageMetadata({ config, params, searchParams })
+
+const Page = ({ params, searchParams }: Args) => RootPage({ config, params, searchParams })
+
+export default Page
diff --git a/test/live-preview/app/(payload)/api/[...slug]/route.ts b/test/live-preview/app/(payload)/api/[...slug]/route.ts
new file mode 100644
index 0000000000..eacae29614
--- /dev/null
+++ b/test/live-preview/app/(payload)/api/[...slug]/route.ts
@@ -0,0 +1,9 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+/* DO NOT MODIFY it because it could be re-written at any time. */
+import config from '@payload-config'
+import { REST_DELETE, REST_GET, REST_PATCH, REST_POST } from '@payloadcms/next/routes/index.js'
+
+export const GET = REST_GET(config)
+export const POST = REST_POST(config)
+export const DELETE = REST_DELETE(config)
+export const PATCH = REST_PATCH(config)
diff --git a/test/live-preview/app/(payload)/api/graphql-playground/route.ts b/test/live-preview/app/(payload)/api/graphql-playground/route.ts
new file mode 100644
index 0000000000..7832c8ba92
--- /dev/null
+++ b/test/live-preview/app/(payload)/api/graphql-playground/route.ts
@@ -0,0 +1,6 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+/* DO NOT MODIFY it because it could be re-written at any time. */
+import config from '@payload-config'
+import { GRAPHQL_PLAYGROUND_GET } from '@payloadcms/next/routes/index.js'
+
+export const GET = GRAPHQL_PLAYGROUND_GET(config)
diff --git a/test/live-preview/app/(payload)/api/graphql/route.ts b/test/live-preview/app/(payload)/api/graphql/route.ts
new file mode 100644
index 0000000000..4caee1b7cb
--- /dev/null
+++ b/test/live-preview/app/(payload)/api/graphql/route.ts
@@ -0,0 +1,6 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+/* DO NOT MODIFY it because it could be re-written at any time. */
+import config from '@payload-config'
+import { GRAPHQL_POST } from '@payloadcms/next/routes/index.js'
+
+export const POST = GRAPHQL_POST(config)
diff --git a/test/live-preview/app/(payload)/custom.scss b/test/live-preview/app/(payload)/custom.scss
new file mode 100644
index 0000000000..ddfc972f49
--- /dev/null
+++ b/test/live-preview/app/(payload)/custom.scss
@@ -0,0 +1,8 @@
+#custom-css {
+  font-family: monospace;
+  background-image: url('/placeholder.png');
+}
+
+#custom-css::after {
+  content: 'custom-css';
+}
diff --git a/test/live-preview/app/(payload)/layout.tsx b/test/live-preview/app/(payload)/layout.tsx
new file mode 100644
index 0000000000..88fedb4042
--- /dev/null
+++ b/test/live-preview/app/(payload)/layout.tsx
@@ -0,0 +1,15 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+import configPromise from '@payload-config'
+import { RootLayout } from '@payloadcms/next/layouts/Root/index.js'
+/* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
+import React from 'react'
+
+import './custom.scss'
+
+type Args = {
+  children: React.ReactNode
+}
+
+const Layout = ({ children }: Args) => <RootLayout config={configPromise}>{children}</RootLayout>
+
+export default Layout
diff --git a/app/live-preview/(pages)/[slug]/page.client.tsx b/test/live-preview/app/live-preview/(pages)/[slug]/page.client.tsx
similarity index 100%
rename from app/live-preview/(pages)/[slug]/page.client.tsx
rename to test/live-preview/app/live-preview/(pages)/[slug]/page.client.tsx
diff --git a/app/live-preview/(pages)/[slug]/page.tsx b/test/live-preview/app/live-preview/(pages)/[slug]/page.tsx
similarity index 100%
rename from app/live-preview/(pages)/[slug]/page.tsx
rename to test/live-preview/app/live-preview/(pages)/[slug]/page.tsx
diff --git a/app/live-preview/(pages)/posts/[slug]/page.client.tsx b/test/live-preview/app/live-preview/(pages)/posts/[slug]/page.client.tsx
similarity index 95%
rename from app/live-preview/(pages)/posts/[slug]/page.client.tsx
rename to test/live-preview/app/live-preview/(pages)/posts/[slug]/page.client.tsx
index e5c52f8048..0d8182945b 100644
--- a/app/live-preview/(pages)/posts/[slug]/page.client.tsx
+++ b/test/live-preview/app/live-preview/(pages)/posts/[slug]/page.client.tsx
@@ -3,7 +3,7 @@
 import { useLivePreview } from '@payloadcms/live-preview-react'
 import React from 'react'
 
-import type { Post as PostType } from '../../../../../test/live-preview/payload-types.js'
+import type { Post as PostType } from '../../../../../payload-types.js'
 
 import { PAYLOAD_SERVER_URL } from '../../../_api/serverURL.js'
 import { Blocks } from '../../../_components/Blocks/index.js'
diff --git a/app/live-preview/(pages)/posts/[slug]/page.tsx b/test/live-preview/app/live-preview/(pages)/posts/[slug]/page.tsx
similarity index 90%
rename from app/live-preview/(pages)/posts/[slug]/page.tsx
rename to test/live-preview/app/live-preview/(pages)/posts/[slug]/page.tsx
index 91053d2934..c6476a1304 100644
--- a/app/live-preview/(pages)/posts/[slug]/page.tsx
+++ b/test/live-preview/app/live-preview/(pages)/posts/[slug]/page.tsx
@@ -1,7 +1,7 @@
 import { notFound } from 'next/navigation.js'
 import React from 'react'
 
-import type { Post } from '../../../../../test/live-preview/payload-types.js'
+import type { Post } from '../../../../../payload-types.js'
 
 import { fetchDoc } from '../../../_api/fetchDoc.js'
 import { fetchDocs } from '../../../_api/fetchDocs.js'
diff --git a/test/live-preview/app/live-preview/_api/fetchDoc.ts b/test/live-preview/app/live-preview/_api/fetchDoc.ts
new file mode 100644
index 0000000000..829b3fca69
--- /dev/null
+++ b/test/live-preview/app/live-preview/_api/fetchDoc.ts
@@ -0,0 +1,35 @@
+import type { Where } from 'payload/types'
+
+import config from '@payload-config'
+import { getPayloadHMR } from '@payloadcms/next/utilities/getPayloadHMR.js'
+
+export const fetchDoc = async <T>(args: {
+  collection: string
+  depth?: number
+  slug?: string
+}): Promise<T> => {
+  const payload = await getPayloadHMR({ config })
+  const { slug, collection, depth = 2 } = args || {}
+
+  const where: Where = {}
+
+  if (slug) {
+    where.slug = {
+      equals: slug,
+    }
+  }
+
+  try {
+    const { docs } = await payload.find({
+      collection,
+      depth,
+      where,
+    })
+
+    if (docs[0]) return docs[0] as T
+  } catch (err) {
+    console.log('Error fetching doc', err)
+  }
+
+  throw new Error('Error fetching doc')
+}
diff --git a/test/live-preview/app/live-preview/_api/fetchDocs.ts b/test/live-preview/app/live-preview/_api/fetchDocs.ts
new file mode 100644
index 0000000000..1fe18db2e6
--- /dev/null
+++ b/test/live-preview/app/live-preview/_api/fetchDocs.ts
@@ -0,0 +1,20 @@
+import config from '@payload-config'
+import { getPayloadHMR } from '@payloadcms/next/utilities/getPayloadHMR.js'
+
+export const fetchDocs = async <T>(collection: string): Promise<T[]> => {
+  const payload = await getPayloadHMR({ config })
+
+  try {
+    const { docs } = await payload.find({
+      collection,
+      depth: 0,
+      limit: 100,
+    })
+
+    return docs as T[]
+  } catch (err) {
+    console.error(err)
+  }
+
+  throw new Error('Error fetching docs')
+}
diff --git a/test/live-preview/app/live-preview/_api/fetchFooter.ts b/test/live-preview/app/live-preview/_api/fetchFooter.ts
new file mode 100644
index 0000000000..6f295c9259
--- /dev/null
+++ b/test/live-preview/app/live-preview/_api/fetchFooter.ts
@@ -0,0 +1,20 @@
+import config from '@payload-config'
+import { getPayloadHMR } from '@payloadcms/next/utilities/getPayloadHMR.js'
+
+import type { Footer } from '../../../payload-types.js'
+
+export async function fetchFooter(): Promise<Footer> {
+  const payload = await getPayloadHMR({ config })
+
+  try {
+    const footer = await payload.findGlobal({
+      slug: 'footer',
+    })
+
+    return footer as Footer
+  } catch (err) {
+    console.error(err)
+  }
+
+  throw new Error('Error fetching footer.')
+}
diff --git a/test/live-preview/app/live-preview/_api/fetchHeader.ts b/test/live-preview/app/live-preview/_api/fetchHeader.ts
new file mode 100644
index 0000000000..b86c10a605
--- /dev/null
+++ b/test/live-preview/app/live-preview/_api/fetchHeader.ts
@@ -0,0 +1,20 @@
+import config from '@payload-config'
+import { getPayloadHMR } from '@payloadcms/next/utilities/getPayloadHMR.js'
+
+import type { Header } from '../../../payload-types.js'
+
+export async function fetchHeader(): Promise<Header> {
+  const payload = await getPayloadHMR({ config })
+
+  try {
+    const header = await payload.findGlobal({
+      slug: 'header',
+    })
+
+    return header as Header
+  } catch (err) {
+    console.error(err)
+  }
+
+  throw new Error('Error fetching header.')
+}
diff --git a/app/live-preview/_api/serverURL.ts b/test/live-preview/app/live-preview/_api/serverURL.ts
similarity index 100%
rename from app/live-preview/_api/serverURL.ts
rename to test/live-preview/app/live-preview/_api/serverURL.ts
diff --git a/app/live-preview/_blocks/ArchiveBlock/index.module.scss b/test/live-preview/app/live-preview/_blocks/ArchiveBlock/index.module.scss
similarity index 100%
rename from app/live-preview/_blocks/ArchiveBlock/index.module.scss
rename to test/live-preview/app/live-preview/_blocks/ArchiveBlock/index.module.scss
diff --git a/app/live-preview/_blocks/ArchiveBlock/index.tsx b/test/live-preview/app/live-preview/_blocks/ArchiveBlock/index.tsx
similarity index 100%
rename from app/live-preview/_blocks/ArchiveBlock/index.tsx
rename to test/live-preview/app/live-preview/_blocks/ArchiveBlock/index.tsx
diff --git a/app/live-preview/_blocks/ArchiveBlock/types.ts b/test/live-preview/app/live-preview/_blocks/ArchiveBlock/types.ts
similarity index 59%
rename from app/live-preview/_blocks/ArchiveBlock/types.ts
rename to test/live-preview/app/live-preview/_blocks/ArchiveBlock/types.ts
index 9a810028be..b28c15a1a1 100644
--- a/app/live-preview/_blocks/ArchiveBlock/types.ts
+++ b/test/live-preview/app/live-preview/_blocks/ArchiveBlock/types.ts
@@ -1,4 +1,4 @@
-import type { Page } from '../../../../test/live-preview/payload-types.js'
+import type { Page } from '../../../../payload-types.js'
 
 export type ArchiveBlockProps = Extract<
   Exclude<Page['layout'], undefined>[0],
diff --git a/app/live-preview/_blocks/CallToAction/index.module.scss b/test/live-preview/app/live-preview/_blocks/CallToAction/index.module.scss
similarity index 100%
rename from app/live-preview/_blocks/CallToAction/index.module.scss
rename to test/live-preview/app/live-preview/_blocks/CallToAction/index.module.scss
diff --git a/app/live-preview/_blocks/CallToAction/index.tsx b/test/live-preview/app/live-preview/_blocks/CallToAction/index.tsx
similarity index 93%
rename from app/live-preview/_blocks/CallToAction/index.tsx
rename to test/live-preview/app/live-preview/_blocks/CallToAction/index.tsx
index d66ee2a3d5..857810241a 100644
--- a/app/live-preview/_blocks/CallToAction/index.tsx
+++ b/test/live-preview/app/live-preview/_blocks/CallToAction/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import type { Page } from '../../../../test/live-preview/payload-types.js'
+import type { Page } from '../../../../payload-types.js'
 
 import { Gutter } from '../../_components/Gutter/index.js'
 import { CMSLink } from '../../_components/Link/index.js'
diff --git a/app/live-preview/_blocks/Content/index.module.scss b/test/live-preview/app/live-preview/_blocks/Content/index.module.scss
similarity index 100%
rename from app/live-preview/_blocks/Content/index.module.scss
rename to test/live-preview/app/live-preview/_blocks/Content/index.module.scss
diff --git a/app/live-preview/_blocks/Content/index.tsx b/test/live-preview/app/live-preview/_blocks/Content/index.tsx
similarity index 93%
rename from app/live-preview/_blocks/Content/index.tsx
rename to test/live-preview/app/live-preview/_blocks/Content/index.tsx
index 8f3ba77b46..330200a5bb 100644
--- a/app/live-preview/_blocks/Content/index.tsx
+++ b/test/live-preview/app/live-preview/_blocks/Content/index.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react'
 
-import type { Page } from '../../../../test/live-preview/payload-types.js'
+import type { Page } from '../../../../payload-types.js'
 
 import { Gutter } from '../../_components/Gutter/index.js'
 import { CMSLink } from '../../_components/Link/index.js'
diff --git a/app/live-preview/_blocks/MediaBlock/index.module.scss b/test/live-preview/app/live-preview/_blocks/MediaBlock/index.module.scss
similarity index 100%
rename from app/live-preview/_blocks/MediaBlock/index.module.scss
rename to test/live-preview/app/live-preview/_blocks/MediaBlock/index.module.scss
diff --git a/app/live-preview/_blocks/MediaBlock/index.tsx b/test/live-preview/app/live-preview/_blocks/MediaBlock/index.tsx
similarity index 93%
rename from app/live-preview/_blocks/MediaBlock/index.tsx
rename to test/live-preview/app/live-preview/_blocks/MediaBlock/index.tsx
index 800ebf0ad2..c80c2fffd9 100644
--- a/app/live-preview/_blocks/MediaBlock/index.tsx
+++ b/test/live-preview/app/live-preview/_blocks/MediaBlock/index.tsx
@@ -2,7 +2,7 @@ import type { StaticImageData } from 'next/image.js'
 
 import React from 'react'
 
-import type { Page } from '../../../../test/live-preview/payload-types.js'
+import type { Page } from '../../../../payload-types.js'
 
 import { Gutter } from '../../_components/Gutter/index.js'
 import { Media } from '../../_components/Media/index.js'
diff --git a/app/live-preview/_blocks/RelatedPosts/index.module.scss b/test/live-preview/app/live-preview/_blocks/RelatedPosts/index.module.scss
similarity index 100%
rename from app/live-preview/_blocks/RelatedPosts/index.module.scss
rename to test/live-preview/app/live-preview/_blocks/RelatedPosts/index.module.scss
diff --git a/app/live-preview/_blocks/RelatedPosts/index.tsx b/test/live-preview/app/live-preview/_blocks/RelatedPosts/index.tsx
similarity index 94%
rename from app/live-preview/_blocks/RelatedPosts/index.tsx
rename to test/live-preview/app/live-preview/_blocks/RelatedPosts/index.tsx
index c421decae0..2a20aa19f8 100644
--- a/app/live-preview/_blocks/RelatedPosts/index.tsx
+++ b/test/live-preview/app/live-preview/_blocks/RelatedPosts/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import type { Post } from '../../../../test/live-preview/payload-types.js'
+import type { Post } from '../../../../payload-types.js'
 
 import { Card } from '../../_components/Card/index.js'
 import { Gutter } from '../../_components/Gutter/index.js'
diff --git a/app/live-preview/_blocks/Relationships/index.module.scss b/test/live-preview/app/live-preview/_blocks/Relationships/index.module.scss
similarity index 100%
rename from app/live-preview/_blocks/Relationships/index.module.scss
rename to test/live-preview/app/live-preview/_blocks/Relationships/index.module.scss
diff --git a/app/live-preview/_blocks/Relationships/index.tsx b/test/live-preview/app/live-preview/_blocks/Relationships/index.tsx
similarity index 98%
rename from app/live-preview/_blocks/Relationships/index.tsx
rename to test/live-preview/app/live-preview/_blocks/Relationships/index.tsx
index aac29b6a08..fb825da6ce 100644
--- a/app/live-preview/_blocks/Relationships/index.tsx
+++ b/test/live-preview/app/live-preview/_blocks/Relationships/index.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react'
 
-import type { Page } from '../../../../test/live-preview/payload-types.js'
+import type { Page } from '../../../../payload-types.js'
 
 import { Gutter } from '../../_components/Gutter/index.js'
 import RichText from '../../_components/RichText/index.js'
diff --git a/app/live-preview/_components/BackgroundColor/index.module.scss b/test/live-preview/app/live-preview/_components/BackgroundColor/index.module.scss
similarity index 100%
rename from app/live-preview/_components/BackgroundColor/index.module.scss
rename to test/live-preview/app/live-preview/_components/BackgroundColor/index.module.scss
diff --git a/app/live-preview/_components/BackgroundColor/index.tsx b/test/live-preview/app/live-preview/_components/BackgroundColor/index.tsx
similarity index 100%
rename from app/live-preview/_components/BackgroundColor/index.tsx
rename to test/live-preview/app/live-preview/_components/BackgroundColor/index.tsx
diff --git a/app/live-preview/_components/Blocks/index.tsx b/test/live-preview/app/live-preview/_components/Blocks/index.tsx
similarity index 97%
rename from app/live-preview/_components/Blocks/index.tsx
rename to test/live-preview/app/live-preview/_components/Blocks/index.tsx
index cd126bb251..9df8595f26 100644
--- a/app/live-preview/_components/Blocks/index.tsx
+++ b/test/live-preview/app/live-preview/_components/Blocks/index.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react'
 
-import type { Page } from '../../../../test/live-preview/payload-types.js'
+import type { Page } from '../../../../payload-types.js'
 import type { RelationshipsBlockProps } from '../../_blocks/Relationships/index.js'
 import type { VerticalPaddingOptions } from '../VerticalPadding/index.js'
 
diff --git a/app/live-preview/_components/Button/index.module.scss b/test/live-preview/app/live-preview/_components/Button/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Button/index.module.scss
rename to test/live-preview/app/live-preview/_components/Button/index.module.scss
diff --git a/app/live-preview/_components/Button/index.tsx b/test/live-preview/app/live-preview/_components/Button/index.tsx
similarity index 100%
rename from app/live-preview/_components/Button/index.tsx
rename to test/live-preview/app/live-preview/_components/Button/index.tsx
diff --git a/app/live-preview/_components/Card/index.module.scss b/test/live-preview/app/live-preview/_components/Card/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Card/index.module.scss
rename to test/live-preview/app/live-preview/_components/Card/index.module.scss
diff --git a/app/live-preview/_components/Card/index.tsx b/test/live-preview/app/live-preview/_components/Card/index.tsx
similarity index 97%
rename from app/live-preview/_components/Card/index.tsx
rename to test/live-preview/app/live-preview/_components/Card/index.tsx
index fb05f07381..b4ee0787b8 100644
--- a/app/live-preview/_components/Card/index.tsx
+++ b/test/live-preview/app/live-preview/_components/Card/index.tsx
@@ -1,7 +1,7 @@
 import LinkWithDefault from 'next/link.js'
 import React, { Fragment } from 'react'
 
-import type { Post } from '../../../../test/live-preview/payload-types.js'
+import type { Post } from '../../../../payload-types.js'
 
 import { Media } from '../Media/index.js'
 import classes from './index.module.scss'
diff --git a/app/live-preview/_components/Chevron/index.tsx b/test/live-preview/app/live-preview/_components/Chevron/index.tsx
similarity index 100%
rename from app/live-preview/_components/Chevron/index.tsx
rename to test/live-preview/app/live-preview/_components/Chevron/index.tsx
diff --git a/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.module.scss b/test/live-preview/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.module.scss
similarity index 100%
rename from app/live-preview/_components/CollectionArchive/PopulateByCollection/index.module.scss
rename to test/live-preview/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.module.scss
diff --git a/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.tsx b/test/live-preview/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.tsx
similarity index 98%
rename from app/live-preview/_components/CollectionArchive/PopulateByCollection/index.tsx
rename to test/live-preview/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.tsx
index b2f4a8f22c..242d2ddb18 100644
--- a/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.tsx
+++ b/test/live-preview/app/live-preview/_components/CollectionArchive/PopulateByCollection/index.tsx
@@ -3,7 +3,7 @@
 import qs from 'qs'
 import React, { Fragment, useCallback, useEffect, useRef, useState } from 'react'
 
-import type { Post } from '../../../../../test/live-preview/payload-types.js'
+import type { Post } from '../../../../../payload-types.js'
 import type { ArchiveBlockProps } from '../../../_blocks/ArchiveBlock/types.js'
 
 import { PAYLOAD_SERVER_URL } from '../../../_api/serverURL.js'
diff --git a/app/live-preview/_components/CollectionArchive/PopulateBySelection/index.module.scss b/test/live-preview/app/live-preview/_components/CollectionArchive/PopulateBySelection/index.module.scss
similarity index 100%
rename from app/live-preview/_components/CollectionArchive/PopulateBySelection/index.module.scss
rename to test/live-preview/app/live-preview/_components/CollectionArchive/PopulateBySelection/index.module.scss
diff --git a/app/live-preview/_components/CollectionArchive/PopulateBySelection/index.tsx b/test/live-preview/app/live-preview/_components/CollectionArchive/PopulateBySelection/index.tsx
similarity index 100%
rename from app/live-preview/_components/CollectionArchive/PopulateBySelection/index.tsx
rename to test/live-preview/app/live-preview/_components/CollectionArchive/PopulateBySelection/index.tsx
diff --git a/app/live-preview/_components/CollectionArchive/index.tsx b/test/live-preview/app/live-preview/_components/CollectionArchive/index.tsx
similarity index 100%
rename from app/live-preview/_components/CollectionArchive/index.tsx
rename to test/live-preview/app/live-preview/_components/CollectionArchive/index.tsx
diff --git a/app/live-preview/_components/Footer/index.module.scss b/test/live-preview/app/live-preview/_components/Footer/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Footer/index.module.scss
rename to test/live-preview/app/live-preview/_components/Footer/index.module.scss
diff --git a/app/live-preview/_components/Footer/index.tsx b/test/live-preview/app/live-preview/_components/Footer/index.tsx
similarity index 100%
rename from app/live-preview/_components/Footer/index.tsx
rename to test/live-preview/app/live-preview/_components/Footer/index.tsx
diff --git a/app/live-preview/_components/Gutter/index.module.scss b/test/live-preview/app/live-preview/_components/Gutter/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Gutter/index.module.scss
rename to test/live-preview/app/live-preview/_components/Gutter/index.module.scss
diff --git a/app/live-preview/_components/Gutter/index.tsx b/test/live-preview/app/live-preview/_components/Gutter/index.tsx
similarity index 100%
rename from app/live-preview/_components/Gutter/index.tsx
rename to test/live-preview/app/live-preview/_components/Gutter/index.tsx
diff --git a/app/live-preview/_components/Header/Nav/index.module.scss b/test/live-preview/app/live-preview/_components/Header/Nav/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Header/Nav/index.module.scss
rename to test/live-preview/app/live-preview/_components/Header/Nav/index.module.scss
diff --git a/app/live-preview/_components/Header/Nav/index.tsx b/test/live-preview/app/live-preview/_components/Header/Nav/index.tsx
similarity index 100%
rename from app/live-preview/_components/Header/Nav/index.tsx
rename to test/live-preview/app/live-preview/_components/Header/Nav/index.tsx
diff --git a/app/live-preview/_components/Header/index.module.scss b/test/live-preview/app/live-preview/_components/Header/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Header/index.module.scss
rename to test/live-preview/app/live-preview/_components/Header/index.module.scss
diff --git a/app/live-preview/_components/Header/index.tsx b/test/live-preview/app/live-preview/_components/Header/index.tsx
similarity index 100%
rename from app/live-preview/_components/Header/index.tsx
rename to test/live-preview/app/live-preview/_components/Header/index.tsx
diff --git a/app/live-preview/_components/Hero/index.tsx b/test/live-preview/app/live-preview/_components/Hero/index.tsx
similarity index 100%
rename from app/live-preview/_components/Hero/index.tsx
rename to test/live-preview/app/live-preview/_components/Hero/index.tsx
diff --git a/app/live-preview/_components/Link/index.tsx b/test/live-preview/app/live-preview/_components/Link/index.tsx
similarity index 94%
rename from app/live-preview/_components/Link/index.tsx
rename to test/live-preview/app/live-preview/_components/Link/index.tsx
index d7e632088a..a940a83e4c 100644
--- a/app/live-preview/_components/Link/index.tsx
+++ b/test/live-preview/app/live-preview/_components/Link/index.tsx
@@ -1,7 +1,7 @@
 import LinkWithDefault from 'next/link.js'
 import React from 'react'
 
-import type { Page, Post } from '../../../../test/live-preview/payload-types.js'
+import type { Page, Post } from '../../../../payload-types.js'
 import type { Props as ButtonProps } from '../Button/index.js'
 
 import { Button } from '../Button/index.js'
diff --git a/app/live-preview/_components/Media/Image/index.module.scss b/test/live-preview/app/live-preview/_components/Media/Image/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Media/Image/index.module.scss
rename to test/live-preview/app/live-preview/_components/Media/Image/index.module.scss
diff --git a/app/live-preview/_components/Media/Image/index.tsx b/test/live-preview/app/live-preview/_components/Media/Image/index.tsx
similarity index 100%
rename from app/live-preview/_components/Media/Image/index.tsx
rename to test/live-preview/app/live-preview/_components/Media/Image/index.tsx
diff --git a/app/live-preview/_components/Media/Video/index.module.scss b/test/live-preview/app/live-preview/_components/Media/Video/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Media/Video/index.module.scss
rename to test/live-preview/app/live-preview/_components/Media/Video/index.module.scss
diff --git a/app/live-preview/_components/Media/Video/index.tsx b/test/live-preview/app/live-preview/_components/Media/Video/index.tsx
similarity index 100%
rename from app/live-preview/_components/Media/Video/index.tsx
rename to test/live-preview/app/live-preview/_components/Media/Video/index.tsx
diff --git a/app/live-preview/_components/Media/index.tsx b/test/live-preview/app/live-preview/_components/Media/index.tsx
similarity index 92%
rename from app/live-preview/_components/Media/index.tsx
rename to test/live-preview/app/live-preview/_components/Media/index.tsx
index d4555438a6..61934ad5b1 100644
--- a/app/live-preview/_components/Media/index.tsx
+++ b/test/live-preview/app/live-preview/_components/Media/index.tsx
@@ -11,7 +11,7 @@ export const Media: React.FC<Props> = (props) => {
   const { className, htmlElement = 'div', resource } = props
 
   const isVideo = typeof resource !== 'string' && resource?.mimeType?.includes('video')
-  const Tag = (htmlElement as ElementType) || Fragment
+  const Tag = (htmlElement) || Fragment
 
   return (
     <Tag
diff --git a/app/live-preview/_components/Media/types.ts b/test/live-preview/app/live-preview/_components/Media/types.ts
similarity index 89%
rename from app/live-preview/_components/Media/types.ts
rename to test/live-preview/app/live-preview/_components/Media/types.ts
index 4612310be9..932aaf82b7 100644
--- a/app/live-preview/_components/Media/types.ts
+++ b/test/live-preview/app/live-preview/_components/Media/types.ts
@@ -1,7 +1,7 @@
 import type { StaticImageData } from 'next/image'
 import type { ElementType, Ref } from 'react'
 
-import type { Media as MediaType } from '../../../payload-types'
+import type { Media as MediaType } from '../../../payload-types.js'
 
 export interface Props {
   alt?: string
diff --git a/app/live-preview/_components/PageRange/index.module.scss b/test/live-preview/app/live-preview/_components/PageRange/index.module.scss
similarity index 100%
rename from app/live-preview/_components/PageRange/index.module.scss
rename to test/live-preview/app/live-preview/_components/PageRange/index.module.scss
diff --git a/app/live-preview/_components/PageRange/index.tsx b/test/live-preview/app/live-preview/_components/PageRange/index.tsx
similarity index 100%
rename from app/live-preview/_components/PageRange/index.tsx
rename to test/live-preview/app/live-preview/_components/PageRange/index.tsx
diff --git a/app/live-preview/_components/Pagination/index.module.scss b/test/live-preview/app/live-preview/_components/Pagination/index.module.scss
similarity index 100%
rename from app/live-preview/_components/Pagination/index.module.scss
rename to test/live-preview/app/live-preview/_components/Pagination/index.module.scss
diff --git a/app/live-preview/_components/Pagination/index.tsx b/test/live-preview/app/live-preview/_components/Pagination/index.tsx
similarity index 100%
rename from app/live-preview/_components/Pagination/index.tsx
rename to test/live-preview/app/live-preview/_components/Pagination/index.tsx
diff --git a/app/live-preview/_components/RichText/index.module.scss b/test/live-preview/app/live-preview/_components/RichText/index.module.scss
similarity index 100%
rename from app/live-preview/_components/RichText/index.module.scss
rename to test/live-preview/app/live-preview/_components/RichText/index.module.scss
diff --git a/app/live-preview/_components/RichText/index.tsx b/test/live-preview/app/live-preview/_components/RichText/index.tsx
similarity index 100%
rename from app/live-preview/_components/RichText/index.tsx
rename to test/live-preview/app/live-preview/_components/RichText/index.tsx
diff --git a/app/live-preview/_components/RichText/serializeLexical.tsx b/test/live-preview/app/live-preview/_components/RichText/serializeLexical.tsx
similarity index 100%
rename from app/live-preview/_components/RichText/serializeLexical.tsx
rename to test/live-preview/app/live-preview/_components/RichText/serializeLexical.tsx
diff --git a/app/live-preview/_components/RichText/serializeSlate.tsx b/test/live-preview/app/live-preview/_components/RichText/serializeSlate.tsx
similarity index 100%
rename from app/live-preview/_components/RichText/serializeSlate.tsx
rename to test/live-preview/app/live-preview/_components/RichText/serializeSlate.tsx
diff --git a/app/live-preview/_components/VerticalPadding/index.module.scss b/test/live-preview/app/live-preview/_components/VerticalPadding/index.module.scss
similarity index 100%
rename from app/live-preview/_components/VerticalPadding/index.module.scss
rename to test/live-preview/app/live-preview/_components/VerticalPadding/index.module.scss
diff --git a/app/live-preview/_components/VerticalPadding/index.tsx b/test/live-preview/app/live-preview/_components/VerticalPadding/index.tsx
similarity index 100%
rename from app/live-preview/_components/VerticalPadding/index.tsx
rename to test/live-preview/app/live-preview/_components/VerticalPadding/index.tsx
diff --git a/app/live-preview/_css/app.scss b/test/live-preview/app/live-preview/_css/app.scss
similarity index 100%
rename from app/live-preview/_css/app.scss
rename to test/live-preview/app/live-preview/_css/app.scss
diff --git a/app/live-preview/_css/colors.scss b/test/live-preview/app/live-preview/_css/colors.scss
similarity index 100%
rename from app/live-preview/_css/colors.scss
rename to test/live-preview/app/live-preview/_css/colors.scss
diff --git a/app/live-preview/_css/common.scss b/test/live-preview/app/live-preview/_css/common.scss
similarity index 100%
rename from app/live-preview/_css/common.scss
rename to test/live-preview/app/live-preview/_css/common.scss
diff --git a/app/live-preview/_css/queries.scss b/test/live-preview/app/live-preview/_css/queries.scss
similarity index 100%
rename from app/live-preview/_css/queries.scss
rename to test/live-preview/app/live-preview/_css/queries.scss
diff --git a/app/live-preview/_css/type.scss b/test/live-preview/app/live-preview/_css/type.scss
similarity index 100%
rename from app/live-preview/_css/type.scss
rename to test/live-preview/app/live-preview/_css/type.scss
diff --git a/app/live-preview/_heros/HighImpact/index.module.scss b/test/live-preview/app/live-preview/_heros/HighImpact/index.module.scss
similarity index 100%
rename from app/live-preview/_heros/HighImpact/index.module.scss
rename to test/live-preview/app/live-preview/_heros/HighImpact/index.module.scss
diff --git a/app/live-preview/_heros/HighImpact/index.tsx b/test/live-preview/app/live-preview/_heros/HighImpact/index.tsx
similarity index 100%
rename from app/live-preview/_heros/HighImpact/index.tsx
rename to test/live-preview/app/live-preview/_heros/HighImpact/index.tsx
diff --git a/app/live-preview/_heros/LowImpact/index.module.scss b/test/live-preview/app/live-preview/_heros/LowImpact/index.module.scss
similarity index 100%
rename from app/live-preview/_heros/LowImpact/index.module.scss
rename to test/live-preview/app/live-preview/_heros/LowImpact/index.module.scss
diff --git a/app/live-preview/_heros/LowImpact/index.tsx b/test/live-preview/app/live-preview/_heros/LowImpact/index.tsx
similarity index 100%
rename from app/live-preview/_heros/LowImpact/index.tsx
rename to test/live-preview/app/live-preview/_heros/LowImpact/index.tsx
diff --git a/app/live-preview/_heros/PostHero/index.module.scss b/test/live-preview/app/live-preview/_heros/PostHero/index.module.scss
similarity index 100%
rename from app/live-preview/_heros/PostHero/index.module.scss
rename to test/live-preview/app/live-preview/_heros/PostHero/index.module.scss
diff --git a/app/live-preview/_heros/PostHero/index.tsx b/test/live-preview/app/live-preview/_heros/PostHero/index.tsx
similarity index 96%
rename from app/live-preview/_heros/PostHero/index.tsx
rename to test/live-preview/app/live-preview/_heros/PostHero/index.tsx
index 6c6d7507fd..7cf19c4f5d 100644
--- a/app/live-preview/_heros/PostHero/index.tsx
+++ b/test/live-preview/app/live-preview/_heros/PostHero/index.tsx
@@ -1,7 +1,7 @@
 import LinkWithDefault from 'next/link.js'
 import React, { Fragment } from 'react'
 
-import type { Post } from '../../../../test/live-preview/payload-types.js'
+import type { Post } from '../../../../payload-types.js'
 
 import { PAYLOAD_SERVER_URL } from '../../_api/serverURL.js'
 import { Gutter } from '../../_components/Gutter/index.js'
diff --git a/app/live-preview/_utilities/formatDateTime.ts b/test/live-preview/app/live-preview/_utilities/formatDateTime.ts
similarity index 100%
rename from app/live-preview/_utilities/formatDateTime.ts
rename to test/live-preview/app/live-preview/_utilities/formatDateTime.ts
diff --git a/app/live-preview/_utilities/toKebabCase.ts b/test/live-preview/app/live-preview/_utilities/toKebabCase.ts
similarity index 100%
rename from app/live-preview/_utilities/toKebabCase.ts
rename to test/live-preview/app/live-preview/_utilities/toKebabCase.ts
diff --git a/app/live-preview/cssVariables.js b/test/live-preview/app/live-preview/cssVariables.js
similarity index 100%
rename from app/live-preview/cssVariables.js
rename to test/live-preview/app/live-preview/cssVariables.js
diff --git a/app/live-preview/layout.tsx b/test/live-preview/app/live-preview/layout.tsx
similarity index 100%
rename from app/live-preview/layout.tsx
rename to test/live-preview/app/live-preview/layout.tsx
diff --git a/app/live-preview/not-found.tsx b/test/live-preview/app/live-preview/not-found.tsx
similarity index 100%
rename from app/live-preview/not-found.tsx
rename to test/live-preview/app/live-preview/not-found.tsx
diff --git a/app/live-preview/page.tsx b/test/live-preview/app/live-preview/page.tsx
similarity index 100%
rename from app/live-preview/page.tsx
rename to test/live-preview/app/live-preview/page.tsx
diff --git a/test/live-preview/next-env.d.ts b/test/live-preview/next-env.d.ts
new file mode 100644
index 0000000000..4f11a03dc6
--- /dev/null
+++ b/test/live-preview/next-env.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/test/live-preview/next.config.mjs b/test/live-preview/next.config.mjs
new file mode 100644
index 0000000000..b2ea037192
--- /dev/null
+++ b/test/live-preview/next.config.mjs
@@ -0,0 +1,3 @@
+import nextConfig from '../../next.config.mjs'
+
+export default nextConfig
diff --git a/test/live-preview/tsconfig.json b/test/live-preview/tsconfig.json
new file mode 100644
index 0000000000..b85fda49c8
--- /dev/null
+++ b/test/live-preview/tsconfig.json
@@ -0,0 +1,52 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "noEmit": true,
+    "incremental": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@payload-config": ["./config.ts"],
+      "@payloadcms/ui/assets": ["../../packages/ui/src/assets/index.ts"],
+      "@payloadcms/ui/elements/*": ["../../packages/ui/src/elements/*/index.tsx"],
+      "@payloadcms/ui/fields/*": ["../../packages/ui/src/fields/*/index.tsx"],
+      "@payloadcms/ui/forms/*": ["../../packages/ui/src/forms/*/index.tsx"],
+      "@payloadcms/ui/graphics/*": ["../../packages/ui/src/graphics/*/index.tsx"],
+      "@payloadcms/ui/hooks/*": ["../../packages/ui/src/hooks/*.ts"],
+      "@payloadcms/ui/icons/*": ["../../packages/ui/src/icons/*/index.tsx"],
+      "@payloadcms/ui/providers/*": ["../../packages/ui/src/providers/*/index.tsx"],
+      "@payloadcms/ui/templates/*": ["../../packages/ui/src/templates/*/index.tsx"],
+      "@payloadcms/ui/utilities/*": ["../../packages/ui/src/utilities/*.ts"],
+      "@payloadcms/ui/scss": ["../../packages/ui/src/scss.scss"],
+      "@payloadcms/ui/scss/app.scss": ["../../packages/ui/src/scss/app.scss"],
+      "payload/types": ["../../packages/payload/src/exports/types/index.ts"],
+      "@payloadcms/next/*": ["../../packages/next/src/*"],
+      "@payloadcms/next": ["../../packages/next/src/exports/*"],
+    }
+  },
+  "include": [
+    "next-env.d.ts",
+    ".next/types/**/*.ts",
+    "**/*.ts",
+    "**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 6b11763be6..e2ac241919 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -39,9 +39,12 @@
       "@payloadcms/ui/scss": ["./packages/ui/src/scss.scss"],
       "@payloadcms/ui/scss/app.scss": ["./packages/ui/src/scss/app.scss"],
       "payload/types": ["./packages/payload/src/exports/types/index.ts"],
+      "@payloadcms/next/*": ["./packages/next/src/*"],
+      "@payloadcms/next": ["./packages/next/src/exports/*"],
+      "@payload-config": ["./_community/config.ts"]
     }
   },
   "exclude": ["dist", "build", "node_modules", ".eslintrc.js", "dist/**/*.js", "**/dist/**/*.js"],
-  "include": ["./**/*.ts", ".next/types/**/*.ts", "setup.js"],
+  "include": ["./**/*.ts", ".next/types/**/*.ts", "setup.js", "helpers/getNextJSRootDir.js"],
   "references": []
 }
diff --git a/tsconfig.json b/tsconfig.json
index 55baff19c7..ab94c2a8c5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -36,8 +36,11 @@
       }
     ],
     "paths": {
+      "payload/types": [
+        "./packages/payload/src/exports/types.ts"
+      ],
       "@payload-config": [
-        "./test/_community/config.ts"
+        "./test/fields/config.ts"
       ],
       "@payloadcms/live-preview": [
         "./packages/live-preview/src"

From 3c09b95a8ce1cb6007df1e21e901559afa084b57 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 5 Apr 2024 15:23:07 -0400
Subject: [PATCH 05/17] chore: builds in child process for e2e

---
 test/helpers/build.js                  |  7 +++++++
 test/helpers/initPayloadE2ENoConfig.ts | 27 ++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 test/helpers/build.js

diff --git a/test/helpers/build.js b/test/helpers/build.js
new file mode 100644
index 0000000000..05450c97a8
--- /dev/null
+++ b/test/helpers/build.js
@@ -0,0 +1,7 @@
+import nextBuild from 'next/dist/build/index.js'
+
+const build = async () => {
+  await nextBuild.default(process.env.NEXTJS_DIR, false, false, false, true, true, false, 'default')
+}
+
+build()
diff --git a/test/helpers/initPayloadE2ENoConfig.ts b/test/helpers/initPayloadE2ENoConfig.ts
index b381a07466..c8889bd0b0 100644
--- a/test/helpers/initPayloadE2ENoConfig.ts
+++ b/test/helpers/initPayloadE2ENoConfig.ts
@@ -1,8 +1,10 @@
 import { createServer } from 'http'
 import nextImport from 'next'
-import nextBuild from 'next/dist/build/index.js'
+import { spawn } from 'node:child_process'
+import { dirname, resolve } from 'path'
 import { wait } from 'payload/utilities'
 import { parse } from 'url'
+import { fileURLToPath } from 'url'
 
 import type { GeneratedTypes } from './sdk/types.js'
 
@@ -11,6 +13,9 @@ import { getNextJSRootDir } from './getNextJSRootDir.js'
 import { PayloadTestSDK } from './sdk/index.js'
 import startMemoryDB from './startMemoryDB.js'
 
+const _filename = fileURLToPath(import.meta.url)
+const _dirname = dirname(_filename)
+
 type Args = {
   dirname: string
   prebuild?: boolean
@@ -38,9 +43,27 @@ export async function initPayloadE2ENoConfig<T extends GeneratedTypes<T>>({
   const dir = getNextJSRootDir(testSuiteName)
 
   if (prebuild) {
-    await nextBuild.default(dir, false, false, false, true, true, false, 'default')
+    await new Promise<void>((res, rej) => {
+      const buildArgs = ['--max-old-space-size=8192', resolve(_dirname, 'build.js')]
+
+      const childProcess = spawn('node', buildArgs, {
+        stdio: 'inherit',
+        env: {
+          PATH: process.env.PATH,
+          NODE_ENV: 'production',
+          NEXTJS_DIR: dir,
+        },
+      })
+
+      childProcess.on('close', (code) => {
+        if (code === 0) res()
+        rej()
+      })
+    })
   }
 
+  process.env.NODE_OPTIONS = '--max-old-space-size=8192'
+
   // @ts-expect-error
   const app = nextImport({
     dev: !prebuild,

From 60dd71c59ea996b480ce1aa5567c952b5107ef71 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 5 Apr 2024 15:49:12 -0400
Subject: [PATCH 06/17] chore: sets longer timeout for prebuild in admin and
 fields

---
 test/admin/e2e.spec.ts  | 8 ++++++--
 test/fields/e2e.spec.ts | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
index 3f8d8e6217..f278bf8e08 100644
--- a/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -70,11 +70,15 @@ describe('admin', () => {
   let customViewsURL: AdminUrlUtil
   let serverURL: string
 
-  beforeAll(async ({ browser }) => {
+  beforeAll(async ({ browser }, testInfo) => {
+    const prebuild = Boolean(process.env.CI)
+
+    if (prebuild) testInfo.setTimeout(testInfo.timeout * 2)
+
     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,
-      prebuild: Boolean(process.env.CI),
+      prebuild,
     }))
     geoUrl = new AdminUrlUtil(serverURL, geoCollectionSlug)
     postsUrl = new AdminUrlUtil(serverURL, postsCollectionSlug)
diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index 3be0734e35..147487d2f7 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -42,11 +42,15 @@ 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) => {
+    const prebuild = Boolean(process.env.CI)
+
+    if (prebuild) testInfo.setTimeout(testInfo.timeout * 2)
+
     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,
-      prebuild: Boolean(process.env.CI),
+      prebuild,
     }))
 
     const context = await browser.newContext()

From 3ee39ecca3c0a64ed8f4c0d15d55774c9d6c321b Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 5 Apr 2024 16:06:00 -0400
Subject: [PATCH 07/17] chore: increases timeout for fields prebuild

---
 test/fields/e2e.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index 147487d2f7..fa155eca53 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -45,7 +45,7 @@ describe('fields', () => {
   beforeAll(async ({ browser }, testInfo) => {
     const prebuild = Boolean(process.env.CI)
 
-    if (prebuild) testInfo.setTimeout(testInfo.timeout * 2)
+    if (prebuild) testInfo.setTimeout(testInfo.timeout * 3)
 
     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({

From 31502d2da3a0d32b58a73fe0578441ca0bce6f82 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 5 Apr 2024 16:12:49 -0400
Subject: [PATCH 08/17] chore: attempts to de-flake admin

---
 test/admin/e2e.spec.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
index f278bf8e08..75585afbc1 100644
--- a/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -1267,9 +1267,14 @@ describe('admin', () => {
         const downChevron = page.locator('#heading-number .sort-column__desc')
 
         await upChevron.click()
+
+        await wait(300)
+
         await expect(page.locator('.row-1 .cell-number')).toHaveText('1')
         await expect(page.locator('.row-2 .cell-number')).toHaveText('2')
 
+        await wait(300)
+
         await downChevron.click()
         await expect(page.locator('.row-1 .cell-number')).toHaveText('2')
         await expect(page.locator('.row-2 .cell-number')).toHaveText('1')

From 684c4d2113cf78024ce86e1175e442638d584ec2 Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <jarrodmflesch@gmail.com>
Date: Fri, 5 Apr 2024 16:39:13 -0400
Subject: [PATCH 09/17] chore: fix admin sort flake, fix console warning for
 test package.json

---
 test/admin/e2e.spec.ts | 7 +++----
 test/package.json      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
index 75585afbc1..821579af31 100644
--- a/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -1267,15 +1267,14 @@ describe('admin', () => {
         const downChevron = page.locator('#heading-number .sort-column__desc')
 
         await upChevron.click()
-
-        await wait(300)
+        await page.waitForURL(/sort=number/)
 
         await expect(page.locator('.row-1 .cell-number')).toHaveText('1')
         await expect(page.locator('.row-2 .cell-number')).toHaveText('2')
 
-        await wait(300)
-
         await downChevron.click()
+        await page.waitForURL(/sort=-number/)
+
         await expect(page.locator('.row-1 .cell-number')).toHaveText('2')
         await expect(page.locator('.row-2 .cell-number')).toHaveText('1')
       })
diff --git a/test/package.json b/test/package.json
index 151f758d2e..c78d9bce94 100644
--- a/test/package.json
+++ b/test/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "test",
+  "name": "payload-test-suite",
   "version": "0.0.1",
   "description": "Payload test suite",
   "private": true,

From c10f0f4a9ed5e28e81d83104298c41b74e741779 Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <jarrodmflesch@gmail.com>
Date: Fri, 5 Apr 2024 22:34:04 -0400
Subject: [PATCH 10/17] chore: fix sort header route replace

---
 packages/ui/src/elements/SortColumn/index.tsx | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/ui/src/elements/SortColumn/index.tsx b/packages/ui/src/elements/SortColumn/index.tsx
index 1c15f72e10..11b04096e8 100644
--- a/packages/ui/src/elements/SortColumn/index.tsx
+++ b/packages/ui/src/elements/SortColumn/index.tsx
@@ -1,7 +1,6 @@
 'use client'
 // TODO: abstract the `next/navigation` dependency out from this component
-import { usePathname, useRouter } from 'next/navigation.js'
-import queryString from 'qs'
+import { useRouter } from 'next/navigation.js'
 import React, { useCallback } from 'react'
 
 export type SortColumnProps = {
@@ -22,9 +21,8 @@ const baseClass = 'sort-column'
 
 export const SortColumn: React.FC<SortColumnProps> = (props) => {
   const { name, Label, disable = false, label } = props
-  const { searchParams } = useSearchParams()
+  const { searchParams, stringifyParams } = useSearchParams()
   const router = useRouter()
-  const pathname = usePathname()
   const { t } = useTranslation()
 
   const { sort } = searchParams
@@ -40,17 +38,16 @@ export const SortColumn: React.FC<SortColumnProps> = (props) => {
 
   const setSort = useCallback(
     (newSort) => {
-      const search = queryString.stringify(
-        {
-          ...searchParams,
-          sort: newSort,
-        },
-        { addQueryPrefix: true },
+      router.replace(
+        stringifyParams({
+          params: {
+            sort: newSort,
+          },
+          replace: true,
+        }),
       )
-
-      router.replace(`${pathname}?${search}`)
     },
-    [searchParams, pathname, router],
+    [router, stringifyParams],
   )
 
   return (

From 25cb146fde10492ba75ba21cbbd630204a1ed6f9 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Sat, 6 Apr 2024 13:35:09 -0400
Subject: [PATCH 11/17] feat: moduleResolution: bundler in config loaders

---
 packages/payload/src/bin/register/index.ts | 31 +++++++++++++++-------
 test/config-loader/int.spec.ts             |  8 ++++++
 test/config-loader/load.ts                 | 16 +++++++++++
 test/config-loader/next-navigation-test.js |  3 +++
 test/tsconfig.json                         |  1 +
 tsconfig.json                              |  2 +-
 6 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 test/config-loader/int.spec.ts
 create mode 100644 test/config-loader/load.ts
 create mode 100644 test/config-loader/next-navigation-test.js

diff --git a/packages/payload/src/bin/register/index.ts b/packages/payload/src/bin/register/index.ts
index ef20abb3b9..a44daa0e18 100644
--- a/packages/payload/src/bin/register/index.ts
+++ b/packages/payload/src/bin/register/index.ts
@@ -27,7 +27,13 @@ const locatedConfig = getTsconfig()
 const tsconfig = locatedConfig.config.compilerOptions as unknown as ts.CompilerOptions
 
 tsconfig.module = ts.ModuleKind.ESNext
-tsconfig.moduleResolution = ts.ModuleResolutionKind.NodeNext
+
+// Specify bundler resolution for Next.js compatibility.
+// We will use TS to resolve file paths for most flexibility
+tsconfig.moduleResolution = ts.ModuleResolutionKind.Bundler
+
+// Don't resolve d.ts files, because we aren't type-checking
+tsconfig.noDtsResolution = true
 
 const moduleResolutionCache = ts.createModuleResolutionCache(
   ts.sys.getCurrentDirectory(),
@@ -78,16 +84,21 @@ export const resolve: ResolveFn = async (specifier, context, nextResolve) => {
   )
 
   // import from local project to local project TS file
-  if (
-    resolvedModule &&
-    !resolvedModule.resolvedFileName.includes('/node_modules/') &&
-    EXTENSIONS.includes(resolvedModule.extension)
-  ) {
-    return {
-      format: 'ts',
-      shortCircuit: true,
-      url: pathToFileURL(resolvedModule.resolvedFileName).href,
+  if (resolvedModule) {
+    const resolvedIsNodeModule = resolvedModule.resolvedFileName.includes('/node_modules/')
+    const resolvedIsTS = EXTENSIONS.includes(resolvedModule.extension)
+
+    if (!resolvedIsNodeModule && resolvedIsTS) {
+      return {
+        format: 'ts',
+        shortCircuit: true,
+        url: pathToFileURL(resolvedModule.resolvedFileName).href,
+      }
     }
+
+    // We want to use TS "Bundler" moduleResolution for just about all files
+    // so we pass the TS result here
+    return nextResolve(pathToFileURL(resolvedModule.resolvedFileName).href)
   }
 
   // import from local project to either:
diff --git a/test/config-loader/int.spec.ts b/test/config-loader/int.spec.ts
new file mode 100644
index 0000000000..bf3cc1fad6
--- /dev/null
+++ b/test/config-loader/int.spec.ts
@@ -0,0 +1,8 @@
+import { load } from './load.js'
+
+describe('Config Loader', () => {
+  it('should load using TS moduleResolution: bundler', async () => {
+    const file = await load('./next-navigation-test.js')
+    expect(typeof file.redirect).toStrictEqual('function')
+  })
+})
diff --git a/test/config-loader/load.ts b/test/config-loader/load.ts
new file mode 100644
index 0000000000..c32f8fd2db
--- /dev/null
+++ b/test/config-loader/load.ts
@@ -0,0 +1,16 @@
+import { register } from 'node:module'
+import path from 'node:path'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+
+export const load = async (filePath) => {
+  const filename = fileURLToPath(import.meta.url)
+  const dirname = path.dirname(filename)
+  const url = pathToFileURL(dirname).toString() + '/'
+
+  // Need to register loader from payload/dist for a true test of functionality
+  register('../../packages/payload/dist/bin/register/index.js', url)
+
+  const result = await import(filePath)
+
+  return result
+}
diff --git a/test/config-loader/next-navigation-test.js b/test/config-loader/next-navigation-test.js
new file mode 100644
index 0000000000..fc44a00f82
--- /dev/null
+++ b/test/config-loader/next-navigation-test.js
@@ -0,0 +1,3 @@
+import { redirect } from 'next/navigation'
+
+export { redirect }
diff --git a/test/tsconfig.json b/test/tsconfig.json
index e2ac241919..cbdf7dc691 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -25,6 +25,7 @@
         "name": "next"
       }
     ],
+    "baseUrl": ".",
     "paths": {
       "@payloadcms/ui/assets": ["./packages/ui/src/assets/index.ts"],
       "@payloadcms/ui/elements/*": ["./packages/ui/src/elements/*/index.tsx"],
diff --git a/tsconfig.json b/tsconfig.json
index cb0b346566..99002cb035 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -164,4 +164,4 @@
     ".next/types/**/*.ts",
     "scripts/**/*.ts"
   ]
-}
\ No newline at end of file
+}

From 38e5b6e8e3dc7f6e237a24828d8bd0bfdc178c53 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Sat, 6 Apr 2024 13:38:14 -0400
Subject: [PATCH 12/17] chore: temp disables fields

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2cb9cfc6c7..fc605be1da 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -250,7 +250,7 @@ jobs:
           - auth
           - field-error-states
           - fields-relationship
-          - fields
+          # - fields
           - fields/lexical
           - live-preview
           - localization

From e79f431f14a1b128b4cd360b28423906b95bed66 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Sat, 6 Apr 2024 13:40:30 -0400
Subject: [PATCH 13/17] chore: cleans up tsconfigs

---
 test/tsconfig.json | 2 +-
 tsconfig.json      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/tsconfig.json b/test/tsconfig.json
index cbdf7dc691..1ac7877359 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -46,6 +46,6 @@
     }
   },
   "exclude": ["dist", "build", "node_modules", ".eslintrc.js", "dist/**/*.js", "**/dist/**/*.js"],
-  "include": ["./**/*.ts", ".next/types/**/*.ts", "setup.js", "helpers/getNextJSRootDir.js"],
+  "include": ["./**/*.ts", ".next/types/**/*.ts", "setup.js"],
   "references": []
 }
diff --git a/tsconfig.json b/tsconfig.json
index 99002cb035..090f15aa77 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -40,7 +40,7 @@
         "./packages/payload/src/exports/types.ts"
       ],
       "@payload-config": [
-        "./test/live-preview/config.ts"
+        "./test/_community/config.ts"
       ],
       "@payloadcms/live-preview": [
         "./packages/live-preview/src"
@@ -164,4 +164,4 @@
     ".next/types/**/*.ts",
     "scripts/**/*.ts"
   ]
-}
+}
\ No newline at end of file

From a49243a42a0170111c4b2b87c0b0c287968b0062 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Sat, 6 Apr 2024 13:58:05 -0400
Subject: [PATCH 14/17] chore: cleanup

---
 packages/payload/bin.js                       |   2 +-
 .../{register => loader}/clientExtensions.ts  |   0
 packages/payload/src/bin/loader/compile.ts    |  40 ++++++
 .../src/bin/{register => loader}/index.ts     |  15 ++-
 .../read-default-tsconfig.ts                  |   0
 packages/payload/src/bin/register/register.ts | 125 ------------------
 packages/payload/src/config/load.ts           |  44 ------
 test/{config-loader => loader}/int.spec.ts    |   2 +-
 test/{config-loader => loader}/load.ts        |   2 +-
 .../next-navigation-test.js                   |   0
 10 files changed, 53 insertions(+), 177 deletions(-)
 rename packages/payload/src/bin/{register => loader}/clientExtensions.ts (100%)
 create mode 100644 packages/payload/src/bin/loader/compile.ts
 rename packages/payload/src/bin/{register => loader}/index.ts (93%)
 rename packages/payload/src/bin/{register => loader}/read-default-tsconfig.ts (100%)
 delete mode 100644 packages/payload/src/bin/register/register.ts
 delete mode 100644 packages/payload/src/config/load.ts
 rename test/{config-loader => loader}/int.spec.ts (86%)
 rename test/{config-loader => loader}/load.ts (86%)
 rename test/{config-loader => loader}/next-navigation-test.js (100%)

diff --git a/packages/payload/bin.js b/packages/payload/bin.js
index a83c55283a..93e8599b8b 100755
--- a/packages/payload/bin.js
+++ b/packages/payload/bin.js
@@ -12,7 +12,7 @@ if (process.env.DISABLE_SWC !== 'true') {
   const dirname = path.dirname(filename)
   const url = pathToFileURL(dirname).toString() + '/'
 
-  register('./dist/bin/register/index.js', url)
+  register('./dist/bin/loader/index.js', url)
 }
 
 bin()
diff --git a/packages/payload/src/bin/register/clientExtensions.ts b/packages/payload/src/bin/loader/clientExtensions.ts
similarity index 100%
rename from packages/payload/src/bin/register/clientExtensions.ts
rename to packages/payload/src/bin/loader/clientExtensions.ts
diff --git a/packages/payload/src/bin/loader/compile.ts b/packages/payload/src/bin/loader/compile.ts
new file mode 100644
index 0000000000..a2895d7d75
--- /dev/null
+++ b/packages/payload/src/bin/loader/compile.ts
@@ -0,0 +1,40 @@
+import type * as ts from 'typescript'
+
+import { transform } from '@swc-node/core'
+import { SourcemapMap } from '@swc-node/sourcemap-support'
+
+import { tsCompilerOptionsToSwcConfig } from './read-default-tsconfig.js'
+
+const injectInlineSourceMap = ({
+  code,
+  filename,
+  map,
+}: {
+  code: string
+  filename: string
+  map: string | undefined
+}): string => {
+  if (map) {
+    SourcemapMap.set(filename, map)
+    const base64Map = Buffer.from(map, 'utf8').toString('base64')
+    const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`
+    return `${code}\n${sourceMapContent}`
+  }
+  return code
+}
+
+export async function compile(
+  sourcecode: string,
+  filename: string,
+  options: ts.CompilerOptions & { fallbackToTs?: (filename: string) => boolean },
+): Promise<string> {
+  if (filename.endsWith('.d.ts')) {
+    return ''
+  }
+
+  const swcRegisterConfig = tsCompilerOptionsToSwcConfig(options, filename)
+
+  return transform(sourcecode, filename, swcRegisterConfig).then(({ code, map }) => {
+    return injectInlineSourceMap({ code, filename, map })
+  })
+}
diff --git a/packages/payload/src/bin/register/index.ts b/packages/payload/src/bin/loader/index.ts
similarity index 93%
rename from packages/payload/src/bin/register/index.ts
rename to packages/payload/src/bin/loader/index.ts
index a44daa0e18..ef2c6dbee8 100644
--- a/packages/payload/src/bin/register/index.ts
+++ b/packages/payload/src/bin/loader/index.ts
@@ -5,7 +5,7 @@ import ts from 'typescript'
 import { fileURLToPath, pathToFileURL } from 'url'
 
 import { CLIENT_EXTENSIONS } from './clientExtensions.js'
-import { compile } from './register.js'
+import { compile } from './compile.js'
 
 interface ResolveContext {
   conditions: string[]
@@ -44,10 +44,15 @@ const host: ts.ModuleResolutionHost = {
   fileExists: ts.sys.fileExists,
   readFile: ts.sys.readFile,
 }
-const EXTENSIONS: string[] = [ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Dts, ts.Extension.Mts]
+const TS_EXTENSIONS: string[] = [
+  ts.Extension.Ts,
+  ts.Extension.Tsx,
+  ts.Extension.Dts,
+  ts.Extension.Mts,
+]
 
 export const resolve: ResolveFn = async (specifier, context, nextResolve) => {
-  const isTS = EXTENSIONS.some((ext) => specifier.endsWith(ext))
+  const isTS = TS_EXTENSIONS.some((ext) => specifier.endsWith(ext))
   const isClient = CLIENT_EXTENSIONS.some((ext) => specifier.endsWith(ext))
 
   if (isClient) {
@@ -86,7 +91,7 @@ export const resolve: ResolveFn = async (specifier, context, nextResolve) => {
   // import from local project to local project TS file
   if (resolvedModule) {
     const resolvedIsNodeModule = resolvedModule.resolvedFileName.includes('/node_modules/')
-    const resolvedIsTS = EXTENSIONS.includes(resolvedModule.extension)
+    const resolvedIsTS = TS_EXTENSIONS.includes(resolvedModule.extension)
 
     if (!resolvedIsNodeModule && resolvedIsTS) {
       return {
@@ -151,7 +156,7 @@ export const load: LoadFn = async (url, context, nextLoad) => {
   if (context.format === 'ts') {
     const { source } = await nextLoad(url, context)
     const code = typeof source === 'string' ? source : Buffer.from(source).toString()
-    const compiled = await compile(code, fileURLToPath(url), swcOptions, true)
+    const compiled = await compile(code, fileURLToPath(url), swcOptions)
     return {
       format: 'module',
       shortCircuit: true,
diff --git a/packages/payload/src/bin/register/read-default-tsconfig.ts b/packages/payload/src/bin/loader/read-default-tsconfig.ts
similarity index 100%
rename from packages/payload/src/bin/register/read-default-tsconfig.ts
rename to packages/payload/src/bin/loader/read-default-tsconfig.ts
diff --git a/packages/payload/src/bin/register/register.ts b/packages/payload/src/bin/register/register.ts
deleted file mode 100644
index c36ad1349d..0000000000
--- a/packages/payload/src/bin/register/register.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import type { Options } from '@swc-node/core'
-
-import { transform, transformSync } from '@swc-node/core'
-import { SourcemapMap, installSourceMapSupport } from '@swc-node/sourcemap-support'
-import { getTsconfig } from 'get-tsconfig'
-import { platform } from 'os'
-import { resolve } from 'path'
-import { addHook } from 'pirates'
-import * as ts from 'typescript'
-
-import { tsCompilerOptionsToSwcConfig } from './read-default-tsconfig.js'
-
-const DEFAULT_EXTENSIONS = ['.js', '.jsx', '.es6', '.es', '.mjs', '.ts', '.tsx']
-const PLATFORM = platform()
-
-const injectInlineSourceMap = ({
-  code,
-  filename,
-  map,
-}: {
-  code: string
-  filename: string
-  map: string | undefined
-}): string => {
-  if (map) {
-    SourcemapMap.set(filename, map)
-    const base64Map = Buffer.from(map, 'utf8').toString('base64')
-    const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`
-    return `${code}\n${sourceMapContent}`
-  }
-  return code
-}
-
-export function compile(
-  sourcecode: string,
-  filename: string,
-  options: ts.CompilerOptions & { fallbackToTs?: (filename: string) => boolean },
-): string
-
-export function compile(
-  sourcecode: string,
-  filename: string,
-  options: ts.CompilerOptions & { fallbackToTs?: (filename: string) => boolean },
-  async: false,
-): string
-
-export function compile(
-  sourcecode: string,
-  filename: string,
-  options: ts.CompilerOptions & { fallbackToTs?: (filename: string) => boolean },
-  async: true,
-): Promise<string>
-
-export function compile(
-  sourcecode: string,
-  filename: string,
-  options: ts.CompilerOptions & { fallbackToTs?: (filename: string) => boolean },
-  async: boolean,
-): Promise<string> | string
-
-export function compile(
-  sourcecode: string,
-  filename: string,
-  options: ts.CompilerOptions & { fallbackToTs?: (filename: string) => boolean },
-  async = false,
-) {
-  if (filename.endsWith('.d.ts')) {
-    return ''
-  }
-  if (options.files && (options.files as string[]).length) {
-    if (
-      PLATFORM === 'win32' &&
-      (options.files as string[]).every((file) => filename !== resolve(process.cwd(), file))
-    ) {
-      return sourcecode
-    }
-    if (
-      PLATFORM !== 'win32' &&
-      (options.files as string[]).every((file) => !filename.endsWith(file))
-    ) {
-      return sourcecode
-    }
-  }
-  if (options && typeof options.fallbackToTs === 'function' && options.fallbackToTs(filename)) {
-    delete options.fallbackToTs
-    const { outputText, sourceMapText } = ts.transpileModule(sourcecode, {
-      compilerOptions: options,
-      fileName: filename,
-    })
-    return injectInlineSourceMap({ code: outputText, filename, map: sourceMapText })
-  }
-
-  let swcRegisterConfig: Options
-  if (process.env.SWCRC) {
-    // when SWCRC environment variable is set to true it will use swcrc file
-    swcRegisterConfig = {
-      swc: {
-        swcrc: true,
-      },
-    }
-  } else {
-    swcRegisterConfig = tsCompilerOptionsToSwcConfig(options, filename)
-  }
-
-  if (async) {
-    return transform(sourcecode, filename, swcRegisterConfig).then(({ code, map }) => {
-      return injectInlineSourceMap({ code, filename, map })
-    })
-  } else {
-    const { code, map } = transformSync(sourcecode, filename, swcRegisterConfig)
-    return injectInlineSourceMap({ code, filename, map })
-  }
-}
-
-export function register(options: Partial<ts.CompilerOptions> = {}, hookOpts = {}) {
-  const locatedConfig = getTsconfig()
-  const tsconfig = locatedConfig.config.compilerOptions as unknown as ts.CompilerOptions
-  options = tsconfig
-  // options.module = ts.ModuleKind.CommonJS
-  installSourceMapSupport()
-  return addHook((code, filename) => compile(code, filename, options), {
-    exts: DEFAULT_EXTENSIONS,
-    ...hookOpts,
-  })
-}
diff --git a/packages/payload/src/config/load.ts b/packages/payload/src/config/load.ts
deleted file mode 100644
index 35350e3631..0000000000
--- a/packages/payload/src/config/load.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type pino from 'pino'
-
-import { createRequire } from 'module'
-import path from 'path'
-
-import type { SanitizedConfig } from './types.js'
-
-import { CLIENT_EXTENSIONS } from '../bin/register/clientExtensions.js'
-import Logger from '../utilities/logger.js'
-import { findConfig } from './find.js'
-import { validateSchema } from './validate.js'
-
-const require = createRequire(import.meta.url)
-
-const loadConfig = async (logger?: pino.Logger): Promise<SanitizedConfig> => {
-  const localLogger = logger ?? Logger()
-
-  const configPath = findConfig()
-
-  CLIENT_EXTENSIONS.forEach((ext) => {
-    require.extensions[ext] = () => null
-  })
-
-  const configPromise = await import(configPath)
-
-  let config = await configPromise
-
-  if ('default' in config) config = await config.default
-
-  if (process.env.NODE_ENV !== 'production') {
-    config = validateSchema(config, localLogger)
-  }
-
-  return {
-    ...config,
-    paths: {
-      config: configPath,
-      configDir: path.dirname(configPath),
-      rawConfig: configPath,
-    },
-  }
-}
-
-export default loadConfig
diff --git a/test/config-loader/int.spec.ts b/test/loader/int.spec.ts
similarity index 86%
rename from test/config-loader/int.spec.ts
rename to test/loader/int.spec.ts
index bf3cc1fad6..413e5576c8 100644
--- a/test/config-loader/int.spec.ts
+++ b/test/loader/int.spec.ts
@@ -1,6 +1,6 @@
 import { load } from './load.js'
 
-describe('Config Loader', () => {
+describe('Loader', () => {
   it('should load using TS moduleResolution: bundler', async () => {
     const file = await load('./next-navigation-test.js')
     expect(typeof file.redirect).toStrictEqual('function')
diff --git a/test/config-loader/load.ts b/test/loader/load.ts
similarity index 86%
rename from test/config-loader/load.ts
rename to test/loader/load.ts
index c32f8fd2db..1d9ae8a075 100644
--- a/test/config-loader/load.ts
+++ b/test/loader/load.ts
@@ -8,7 +8,7 @@ export const load = async (filePath) => {
   const url = pathToFileURL(dirname).toString() + '/'
 
   // Need to register loader from payload/dist for a true test of functionality
-  register('../../packages/payload/dist/bin/register/index.js', url)
+  register('../../packages/payload/dist/bin/loader/index.js', url)
 
   const result = await import(filePath)
 
diff --git a/test/config-loader/next-navigation-test.js b/test/loader/next-navigation-test.js
similarity index 100%
rename from test/config-loader/next-navigation-test.js
rename to test/loader/next-navigation-test.js

From f085d7609b90d9fd0c1961f51d46d312701f3a0f Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Sat, 6 Apr 2024 13:59:29 -0400
Subject: [PATCH 15/17] chore: cleanup

---
 packages/payload/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/payload/package.json b/packages/payload/package.json
index 6022db275f..23dc87db0a 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -61,7 +61,6 @@
     "nodemailer": "6.9.10",
     "pino": "8.15.0",
     "pino-pretty": "10.2.0",
-    "pirates": "^4.0.6",
     "pluralize": "8.0.0",
     "probe-image-size": "^7.2.3",
     "sanitize-filename": "1.6.3",

From 9d2aad7bf9726579f06b2d4bf483ba1c01239802 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Sat, 6 Apr 2024 14:01:16 -0400
Subject: [PATCH 16/17] chore: lockfile

---
 pnpm-lock.yaml | 72 ++------------------------------------------------
 1 file changed, 2 insertions(+), 70 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b367a650f3..687d89dfc3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -775,9 +775,6 @@ importers:
       pino-pretty:
         specifier: 10.2.0
         version: 10.2.0
-      pirates:
-        specifier: ^4.0.6
-        version: 4.0.6
       pluralize:
         specifier: 8.0.0
         version: 8.0.0
@@ -9774,7 +9771,7 @@ packages:
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 3.3.0
-      webpack: 5.90.3(@swc/core@1.4.2)
+      webpack: 5.90.3(@swc/core@1.4.2)(esbuild@0.19.12)(webpack-cli@5.1.4)
     dev: true
 
   /file-type@16.5.4:
@@ -12275,7 +12272,7 @@ packages:
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 3.3.0
-      webpack: 5.90.3(@swc/core@1.4.2)
+      webpack: 5.90.3(@swc/core@1.4.2)(esbuild@0.19.12)(webpack-cli@5.1.4)
       webpack-sources: 1.4.3
     dev: true
 
@@ -15656,31 +15653,6 @@ packages:
       webpack: 5.90.3(@swc/core@1.4.2)(esbuild@0.19.12)(webpack-cli@5.1.4)
     dev: true
 
-  /terser-webpack-plugin@5.3.10(@swc/core@1.4.2)(webpack@5.90.3):
-    resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.23
-      '@swc/core': 1.4.2
-      jest-worker: 27.5.1
-      schema-utils: 3.3.0
-      serialize-javascript: 6.0.2
-      terser: 5.28.1
-      webpack: 5.90.3(@swc/core@1.4.2)
-    dev: true
-
   /terser@5.28.1:
     resolution: {integrity: sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==}
     engines: {node: '>=10'}
@@ -16440,46 +16412,6 @@ packages:
     engines: {node: '>=10.13.0'}
     dev: true
 
-  /webpack@5.90.3(@swc/core@1.4.2):
-    resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
-    dependencies:
-      '@types/eslint-scope': 3.7.7
-      '@types/estree': 1.0.5
-      '@webassemblyjs/ast': 1.11.6
-      '@webassemblyjs/wasm-edit': 1.11.6
-      '@webassemblyjs/wasm-parser': 1.11.6
-      acorn: 8.11.3
-      acorn-import-assertions: 1.9.0(acorn@8.11.3)
-      browserslist: 4.23.0
-      chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.15.1
-      es-module-lexer: 1.4.1
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.11
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 3.3.0
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(@swc/core@1.4.2)(webpack@5.90.3)
-      watchpack: 2.4.0
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-    dev: true
-
   /webpack@5.90.3(@swc/core@1.4.2)(esbuild@0.19.12)(webpack-cli@5.1.4):
     resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
     engines: {node: '>=10.13.0'}

From 7d2dc5b6c68a25ddcb865d261a99c4c33589a5d7 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Sat, 6 Apr 2024 14:07:17 -0400
Subject: [PATCH 17/17] chore: adds more tests to loader int suite

---
 test/loader/int.spec.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/loader/int.spec.ts b/test/loader/int.spec.ts
index 413e5576c8..a8d79398f4 100644
--- a/test/loader/int.spec.ts
+++ b/test/loader/int.spec.ts
@@ -1,8 +1,23 @@
 import { load } from './load.js'
 
+const loadConfig = async (configPath: string) => {
+  const configPromise = await load(configPath)
+  return configPromise.default
+}
+
 describe('Loader', () => {
   it('should load using TS moduleResolution: bundler', async () => {
     const file = await load('./next-navigation-test.js')
     expect(typeof file.redirect).toStrictEqual('function')
   })
+
+  it('should import complex configs', async () => {
+    const config = await loadConfig('../fields/config.ts')
+    expect(Array.isArray(config.collections)).toStrictEqual(true)
+  })
+
+  it('should import configs that rely on custom components', async () => {
+    const config = await loadConfig('../admin/config.ts')
+    expect(Array.isArray(config.collections)).toStrictEqual(true)
+  })
 })