chore(release): v3.0.0-alpha.25 [skip ci]

Feat/next esm

.env.example

@@ -0,0 +1,4 @@
+DATABASE_URI=mongodb://127.0.0.1/payloadtests
+PAYLOAD_SECRET=laijflieawfjlweifjewalifjwe
+# PAYLOAD_CONFIG_PATH=MUST BE SET PROGRAMMATICALLY
+PAYLOAD_DROP_DATABASE=true

.eslintrc.cjs

@@ -0,0 +1,51 @@
+module.exports = {
+  extends: ['@payloadcms'],
+  overrides: [
+    {
+      files: ['scripts/**'],
+      rules: {
+        '@typescript-eslint/no-unused-vars': 'off',
+        'no-console': 'off',
+        'perfectionist/sort-object-types': 'off',
+        'perfectionist/sort-objects': 'off',
+      },
+    },
+    {
+      extends: ['plugin:@typescript-eslint/disable-type-checked'],
+      files: ['*.js', '*.cjs', '*.json', '*.md', '*.yml', '*.yaml'],
+    },
+    {
+      files: ['packages/eslint-config-payload/**'],
+      rules: {
+        'perfectionist/sort-objects': 'off',
+      },
+    },
+    {
+      files: ['package.json', 'tsconfig.json'],
+      rules: {
+        'perfectionist/sort-array-includes': 'off',
+        'perfectionist/sort-astro-attributes': 'off',
+        'perfectionist/sort-classes': 'off',
+        'perfectionist/sort-enums': 'off',
+        'perfectionist/sort-exports': 'off',
+        'perfectionist/sort-imports': 'off',
+        'perfectionist/sort-interfaces': 'off',
+        'perfectionist/sort-jsx-props': 'off',
+        'perfectionist/sort-keys': 'off',
+        'perfectionist/sort-maps': 'off',
+        'perfectionist/sort-named-exports': 'off',
+        'perfectionist/sort-named-imports': 'off',
+        'perfectionist/sort-object-types': 'off',
+        'perfectionist/sort-objects': 'off',
+        'perfectionist/sort-svelte-attributes': 'off',
+        'perfectionist/sort-union-types': 'off',
+        'perfectionist/sort-vue-attributes': 'off',
+      },
+    },
+  ],
+  parserOptions: {
+    project: ['./tsconfig.json'],
+    tsconfigRootDir: __dirname,
+  },
+  root: true,
+}

.github/workflows/main.yml

@@ -2,9 +2,9 @@ name: build
 
 on:
   pull_request:
-    types: [opened, reopened, synchronize]
+    types: [ opened, reopened, synchronize ]
   push:
-    branches: ['main']
+    branches: ['main', 'feat/next-poc']
 
 jobs:
   changes:
@@ -15,25 +15,25 @@ jobs:
       needs_build: ${{ steps.filter.outputs.needs_build }}
       templates: ${{ steps.filter.outputs.templates }}
     steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 25
-    - uses: dorny/paths-filter@v2
-      id: filter
-      with:
-        filters: |
-          needs_build:
-            - '.github/workflows/**'
-            - 'packages/**'
-            - 'test/**'
-            - 'pnpm-lock.yaml'
-            - 'package.json'
-          templates:
-            - 'templates/**'
-    - name: Log all filter results
-      run: |
-        echo "needs_build: ${{ steps.filter.outputs.needs_build }}"
-        echo "templates: ${{ steps.filter.outputs.templates }}"
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            needs_build:
+              - '.github/workflows/**'
+              - 'packages/**'
+              - 'test/**'
+              - 'pnpm-lock.yaml'
+              - 'package.json'
+            templates:
+              - 'templates/**'
+      - name: Log all filter results
+        run: |
+          echo "needs_build: ${{ steps.filter.outputs.needs_build }}"
+          echo "templates: ${{ steps.filter.outputs.templates }}"
 
   core-build:
     needs: changes
@@ -71,7 +71,7 @@ jobs:
             ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
 
       - run: pnpm install
-      - run: pnpm run build
+      - run: pnpm run build:core
 
       - name: Cache build
         uses: actions/cache@v3
@@ -79,17 +79,59 @@ jobs:
           path: ./*
           key: ${{ github.sha }}-${{ github.run_number }}
 
+  plugins-build:
+    needs: changes
+    if: ${{ needs.changes.outputs.needs_build == 'true' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
+
+      - name: Use Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+
+      - run: pnpm install
+      - run: pnpm run build:plugins
+
   tests:
     runs-on: ubuntu-latest
     needs: core-build
     strategy:
       fail-fast: false
       matrix:
-        database: [mongoose, postgres, supabase]
+        database: [mongoose, postgres, postgres-custom-schema, postgres-uuid, supabase]
     env:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: payloadtests
+      AWS_ENDPOINT_URL: http://127.0.0.1:4566
+      AWS_ACCESS_KEY_ID: localstack
+      AWS_SECRET_ACCESS_KEY: localstack
+      AWS_REGION: us-east-1
 
     steps:
       - name: Use Node.js 18
@@ -109,6 +151,9 @@ jobs:
           path: ./*
           key: ${{ github.sha }}-${{ github.run_number }}
 
+      - name: Start LocalStack
+        run: pnpm docker:start
+
       - name: Start PostgreSQL
         uses: CasperWA/postgresql-action@v1.2
         with:
@@ -116,7 +161,7 @@ jobs:
           postgresql db: ${{ env.POSTGRES_DB }}
           postgresql user: ${{ env.POSTGRES_USER }}
           postgresql password: ${{ env.POSTGRES_PASSWORD }}
-        if: matrix.database == 'postgres'
+        if: startsWith(matrix.database, 'postgres')
 
       - name: Install Supabase CLI
         uses: supabase/setup-cli@v1
@@ -132,14 +177,19 @@ jobs:
 
       - name: Wait for PostgreSQL
         run: sleep 30
-        if: matrix.database == 'postgres'
+        if: startsWith(matrix.database, 'postgres')
 
       - name: Configure PostgreSQL
         run: |
           psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB" -c "CREATE ROLE runner SUPERUSER LOGIN;"
           psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB" -c "SELECT version();"
           echo "POSTGRES_URL=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB" >> $GITHUB_ENV
-        if: matrix.database == 'postgres'
+        if: startsWith(matrix.database, 'postgres')
+
+      - name: Configure PostgreSQL with custom schema
+        run: |
+          psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB" -c "CREATE SCHEMA custom;"
+        if: matrix.database == 'postgres-custom-schema'
 
       - name: Configure Supabase
         run: |
@@ -162,7 +212,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        part: [1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8, 8/8]
+        part: [ 1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8, 8/8 ]
 
     steps:
       - name: Use Node.js 18
@@ -225,43 +275,6 @@ jobs:
       - name: Generate GraphQL schema file
         run: pnpm dev:generate-graphql-schema graphql-schema-gen
 
-  build-packages:
-    runs-on: ubuntu-latest
-    needs: core-build
-    strategy:
-      fail-fast: false
-      matrix:
-        pkg:
-          - db-mongodb
-          - db-postgres
-          - bundler-webpack
-          - bundler-vite
-          - richtext-slate
-          - richtext-lexical
-          - live-preview
-          - live-preview-react
-
-    steps:
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          run_install: false
-
-      - name: Restore build
-        uses: actions/cache@v3
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
-
-      - name: Build ${{ matrix.pkg }}
-        run: pnpm turbo run build --filter=${{ matrix.pkg }}
-
   plugins:
     runs-on: ubuntu-latest
     needs: core-build
@@ -310,7 +323,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        template: [blank, website, ecommerce]
+        template: [ blank, website, ecommerce ]
 
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -6,7 +6,13 @@ dist
 
 test-results
 .devcontainer
+.localstack
 /migrations
+/media
+.localstack
+.turbo
+
+.turbo
 
 # Created by https://www.toptal.com/developers/gitignore/api/node,macos,windows,webstorm,sublimetext,visualstudiocode
 # Edit at https://www.toptal.com/developers/gitignore?templates=node,macos,windows,webstorm,sublimetext,visualstudiocode

.idea/runConfigurations/Run_Dev_Fields.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Dev Fields" type="NodeJSConfigurationType" application-parameters="fields" path-to-js-file="node_modules/.pnpm/nodemon@3.0.1/node_modules/nodemon/bin/nodemon.js" working-dir="$PROJECT_DIR$">
+  <configuration default="false" name="Run Dev Fields" type="NodeJSConfigurationType" application-parameters="fields" path-to-js-file="node_modules/.pnpm/nodemon@3.0.3/node_modules/nodemon/bin/nodemon.js" working-dir="$PROJECT_DIR$">
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Run_Dev__community.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Dev _community" type="NodeJSConfigurationType" application-parameters="_community" path-to-js-file="node_modules/.pnpm/nodemon@3.0.1/node_modules/nodemon/bin/nodemon.js" working-dir="$PROJECT_DIR$">
+  <configuration default="false" name="Run Dev _community" type="NodeJSConfigurationType" application-parameters="_community" path-to-js-file="node_modules/.pnpm/nodemon@3.0.3/node_modules/nodemon/bin/nodemon.js" working-dir="$PROJECT_DIR$">
     <method v="2" />
   </configuration>
 </component>

.node-version

@@ -1 +1 @@
-v18.17.1
+v18.19.1

.nvmrc

@@ -1 +1 @@
-v18.17.1
+v18.19.1

.vscode/launch.json

@@ -3,7 +3,7 @@
   // Hover to view descriptions of existing attributes.
   "configurations": [
     {
-      "command": "pnpm run dev _community",
+      "command": "pnpm run dev _community -- --no-turbo",
       "cwd": "${workspaceFolder}",
       "name": "Run Dev Community",
       "request": "launch",
@@ -27,7 +27,7 @@
       "type": "node-terminal"
     },
     {
-      "command": "pnpm run dev:postgres fields",
+      "command": "pnpm run dev:postgres versions",
       "cwd": "${workspaceFolder}",
       "name": "Run Dev Postgres",
       "request": "launch",

.vscode/settings.json

@@ -5,21 +5,21 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
   "[typescriptreact]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
   "[json]": {
@@ -35,5 +35,30 @@
   "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }],
   "typescript.tsdk": "node_modules/typescript/lib",
   // Load .git-blame-ignore-revs file
-  "gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".git-blame-ignore-revs"]
+  "gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".git-blame-ignore-revs"],
+  "[javascript][typescript][typescriptreact]": {
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": "explicit"
+    }
+  },
+  "workbench.colorCustomizations": {
+    "activityBar.activeBackground": "#8cb5b6",
+    "activityBar.background": "#8cb5b6",
+    "activityBar.foreground": "#15202b",
+    "activityBar.inactiveForeground": "#15202b99",
+    "activityBarBadge.background": "#9c639b",
+    "activityBarBadge.foreground": "#e7e7e7",
+    "commandCenter.border": "#15202b99",
+    "sash.hoverBorder": "#8cb5b6",
+    "statusBar.background": "#6da1a2",
+    "statusBar.foreground": "#15202b",
+    "statusBarItem.hoverBackground": "#568586",
+    "statusBarItem.remoteBackground": "#6da1a2",
+    "statusBarItem.remoteForeground": "#15202b",
+    "titleBar.activeBackground": "#6da1a2",
+    "titleBar.activeForeground": "#15202b",
+    "titleBar.inactiveBackground": "#6da1a299",
+    "titleBar.inactiveForeground": "#15202b99"
+  },
+  "peacock.color": "#6da1a2"
 }

CHANGELOG.md

@@ -1,3 +1,71 @@
+## [2.11.2](https://github.com/payloadcms/payload/compare/v2.11.1...v2.11.2) (2024-02-23)
+
+
+### Features
+
+* **db-postgres:** configurable custom schema to use ([#5047](https://github.com/payloadcms/payload/issues/5047)) ([e8f2ca4](https://github.com/payloadcms/payload/commit/e8f2ca484ee56cd7767d5111e46ebd24752ff8de))
+
+
+### Bug Fixes
+
+* Add Context Provider in EditMany Component ([#5005](https://github.com/payloadcms/payload/issues/5005)) ([70e57fe](https://github.com/payloadcms/payload/commit/70e57fef184f7fcf56344ea755465f246f2253a5))
+* **db-mongodb:** unique sparse for not required fields ([#5114](https://github.com/payloadcms/payload/issues/5114)) ([815bdfa](https://github.com/payloadcms/payload/commit/815bdfac0b0afbff2a20e54d5aee64b90f6b3a77))
+* **db-postgres:** set _parentID for array nested localized fields ([#5117](https://github.com/payloadcms/payload/issues/5117)) ([ceca5c4](https://github.com/payloadcms/payload/commit/ceca5c4e97f53f1346797a31b6abfc0375e98215))
+* disabling API Key does not remove the key ([#5145](https://github.com/payloadcms/payload/issues/5145)) ([7a7f0ed](https://github.com/payloadcms/payload/commit/7a7f0ed7e8132253be607c111c160163b84bd770))
+* handle thrown errors in config-level afterError hook ([#5147](https://github.com/payloadcms/payload/issues/5147)) ([32ed95e](https://github.com/payloadcms/payload/commit/32ed95e1ee87409db234f1b7bd6d2e462fd9ed5d))
+* only replace the drawer content with full edit component if it exists ([#5144](https://github.com/payloadcms/payload/issues/5144)) ([0a07f60](https://github.com/payloadcms/payload/commit/0a07f607b9fb1217ad956cd05b2a84a4042a19ca))
+* transaction error from access endpoint ([#5156](https://github.com/payloadcms/payload/issues/5156)) ([ad42d54](https://github.com/payloadcms/payload/commit/ad42d541b342ed56463b81cee6d6307df6f06d7f))
+
+## [2.11.1](https://github.com/payloadcms/payload/compare/v2.11.0...v2.11.1) (2024-02-16)
+
+
+### Features
+
+* **db-postgres:** adds idType to use uuid or serial id columns ([#3864](https://github.com/payloadcms/payload/issues/3864)) ([d6c2578](https://github.com/payloadcms/payload/commit/d6c25783cfa97983bf9db27ceb5ccd39a62c62f1))
+* **db-postgres:** reconnect after disconnection from database ([#5086](https://github.com/payloadcms/payload/issues/5086)) ([bf942fd](https://github.com/payloadcms/payload/commit/bf942fdfa6ea9c26cf05295cc9db646bf31fa622))
+* **plugin-search:** add req to beforeSync args for transactions ([#5068](https://github.com/payloadcms/payload/issues/5068)) ([98b87e2](https://github.com/payloadcms/payload/commit/98b87e22782c0a788f79326f22be05a6b176ad74))
+* **richtext-lexical:** add justify aligment to AlignFeature ([#4035](https://github.com/payloadcms/payload/issues/4035)) ([#4868](https://github.com/payloadcms/payload/issues/4868)) ([6d6823c](https://github.com/payloadcms/payload/commit/6d6823c3e5609a58eeeeb8d043945a762f9463df))
+* **richtext-lexical:** AddBlock handle for all nodes, even if they aren't empty paragraphs ([#5063](https://github.com/payloadcms/payload/issues/5063)) ([00fc034](https://github.com/payloadcms/payload/commit/00fc0343dabf184d5bab418d47c403b3ad11698f))
+* **richtext-lexical:** Update lexical from 0.12.6 to 0.13.1, port over all useful changes from playground ([#5066](https://github.com/payloadcms/payload/issues/5066)) ([0d18822](https://github.com/payloadcms/payload/commit/0d18822062275c1826c8e2c3da2571a2b3483310))
+
+
+### Bug Fixes
+
+* **db-mongodb:** find versions pagination ([#5091](https://github.com/payloadcms/payload/issues/5091)) ([5d4022f](https://github.com/payloadcms/payload/commit/5d4022f1445e2809c01cb1dd599280f0a56cdc6e))
+* **db-postgres:** query using blockType ([#5044](https://github.com/payloadcms/payload/issues/5044)) ([35c2a08](https://github.com/payloadcms/payload/commit/35c2a085efa6d5ad59779960874bc9728a17e3a0))
+* filterOptions errors cause transaction to abort ([#5079](https://github.com/payloadcms/payload/issues/5079)) ([5f3d016](https://github.com/payloadcms/payload/commit/5f3d0169bee21e1c0963dbd7ede9fe5f1c46a5a5))
+* **plugin-form-builder:** hooks do not respect transactions ([#5069](https://github.com/payloadcms/payload/issues/5069)) ([82e9d31](https://github.com/payloadcms/payload/commit/82e9d31127c8df83c5bed92a5ffdab76d331900f))
+* remove collection findByID caching ([#5034](https://github.com/payloadcms/payload/issues/5034)) ([1ac943e](https://github.com/payloadcms/payload/commit/1ac943ed5e8416883b863147fdf3c23380955559))
+* **richtext-lexical:** do not remove adjacent paragraph node when inserting certain nodes in empty editor ([#5061](https://github.com/payloadcms/payload/issues/5061)) ([6323965](https://github.com/payloadcms/payload/commit/6323965c652ea68dffeb716957b124d165b9ce96))
+* **uploads:** account for serverURL when retrieving external file ([#5102](https://github.com/payloadcms/payload/issues/5102)) ([25cee8b](https://github.com/payloadcms/payload/commit/25cee8bb102bf80b3a4bfb4b4e46712722cc7f0d))
+
+
+### ⚠ BREAKING CHANGES: @payloadcms/richtext-lexical
+
+* **richtext-lexical:** Update lexical from 0.12.6 to 0.13.1, port over all useful changes from playground (#5066)
+
+- You HAVE to make sure that any versions of the lexical packages (IF you have any installed) match the lexical version which richtext-lexical uses: v0.13.1. If you do not do this, you may be plagued by React useContext / "cannot find active editor state" errors
+- Updates to lexical's API, e.g. the removal of INTERNAL_isPointSelection, could be breaking depending on your code. Please consult the [lexical changelog](https://github.com/facebook/lexical/blob/main/CHANGELOG.md).
+
+## [2.11.0](https://github.com/payloadcms/payload/compare/v2.10.1...v2.11.0) (2024-02-09)
+
+
+### Features
+
+* exposes collapsible provider with more functionality ([#5043](https://github.com/payloadcms/payload/issues/5043)) ([df39602](https://github.com/payloadcms/payload/commit/df39602758ae8dc3765bb48e51f7a657babfa559))
+
+## [2.10.1](https://github.com/payloadcms/payload/compare/v2.10.0...v2.10.1) (2024-02-09)
+
+
+### Bug Fixes
+
+* clearable cells handle null values ([#5038](https://github.com/payloadcms/payload/issues/5038)) ([f6d7da7](https://github.com/payloadcms/payload/commit/f6d7da751039df25066b51bb91d6453e1a4efd82))
+* **db-mongodb:** handle null values with exists ([#5037](https://github.com/payloadcms/payload/issues/5037)) ([cdc4cb9](https://github.com/payloadcms/payload/commit/cdc4cb971b9180ba2ed09741f5af1a3c18292828))
+* **db-postgres:** handle nested docs with drafts ([#5012](https://github.com/payloadcms/payload/issues/5012)) ([da184d4](https://github.com/payloadcms/payload/commit/da184d40ece74bffb224002eb5df8f6987d65043))
+* ensures docs with the same id are shown in relationship field select ([#4859](https://github.com/payloadcms/payload/issues/4859)) ([e1813fb](https://github.com/payloadcms/payload/commit/e1813fb884e0dc84203fcbab87527a99a4d3a5d7))
+* query relationships by explicit id field ([#5022](https://github.com/payloadcms/payload/issues/5022)) ([a0a58e7](https://github.com/payloadcms/payload/commit/a0a58e7fd20dff54d210c968f4d5defd67441bdd))
+* **richtext-lexical:** make editor reactive to initialValue changes ([#5010](https://github.com/payloadcms/payload/issues/5010)) ([2315781](https://github.com/payloadcms/payload/commit/2315781f1891ddde4b4c5f2f0cfa1c17af85b7a9))
+
 ## [2.10.0](https://github.com/payloadcms/payload/compare/v2.9.0...v2.10.0) (2024-02-06)
 
 

app/(payload)/admin/[[...segments]]/not-found.tsx

@@ -0,0 +1,17 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+import config from '@payload-config'
+/* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
+import { NotFoundView } from '@payloadcms/next/views/NotFound/index'
+
+type Args = {
+  params: {
+    segments: string[]
+  }
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
+
+const NotFound = ({ params, searchParams }: Args) => NotFoundView({ config, params, searchParams })
+
+export default NotFound

app/(payload)/admin/[[...segments]]/page.tsx

@@ -0,0 +1,20 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+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'
+
+type Args = {
+  params: {
+    segments: string[]
+  }
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
+
+export const generateMetadata = ({ params, searchParams }: Args) =>
+  generatePageMetadata({ config, params, searchParams })
+
+const Page = ({ params, searchParams }: Args) => RootPage({ config, params, searchParams })
+
+export default Page

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'
+
+export const GET = REST_GET(config)
+export const POST = REST_POST(config)
+export const DELETE = REST_DELETE(config)
+export const PATCH = REST_PATCH(config)

app/(payload)/api/[collection]/file/[filename]/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 { GET_STATIC_FILE } from '@payloadcms/next/routes'
+
+export const GET = GET_STATIC_FILE(config)

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'
+
+export const GET = GRAPHQL_PLAYGROUND_GET(config)

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'
+
+export const POST = GRAPHQL_POST(config)

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'
+/* 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

app/my-route/route.ts

@@ -0,0 +1,5 @@
+export const GET = () => {
+  return Response.json({
+    hello: 'elliot',
+  })
+}

docs/admin/hooks.mdx

@@ -635,6 +635,37 @@ export const CustomArrayManager = () => {
   ]}
 />
 
+### useCollapsible
+
+The `useCollapsible` hook allows you to control parent collapsibles:
+
+| Property                  | Description                                                                                                        |
+|---------------------------|--------------------------------------------------------------------------------------------------------------------|
+| **`collapsed`**          | State of the collapsible. `true` if open, `false` if collapsed                                                 |
+| **`isVisible`**              | If nested, determine if the nearest collapsible is visible. `true` if no parent is closed, `false` otherwise                                                        |
+| **`toggle`**                  | Toggles the state of the nearest collapsible                                                                |
+| **`withinCollapsible`**      | Determine when you are within another collaspible                                 |                                               |
+
+**Example:**
+
+```tsx
+import React from 'react'
+
+import { useCollapsible } from 'payload/components/utilities'
+
+const CustomComponent: React.FC = () => {
+  const { collapsed, toggle } = useCollapsible()
+  return (
+    <div>
+      <p className="field-type">I am {collapsed ? 'closed' : 'open'}</p>
+      <button onClick={toggle} type="button">
+        Toggle
+      </button>
+    </div>
+  )
+}
+```
+
 ### useDocumentInfo
 
 The `useDocumentInfo` hook provides lots of information about the document currently being edited, including the following:
@@ -774,8 +805,8 @@ const MyComponent: React.FC = () => {
   return (
     <>
       <span>The current theme is {theme} and autoMode is {autoMode}</span>
-      <button 
-        type="button" 
+      <button
+        type="button"
         onClick={() => setTheme(prev => prev === "light" ? "dark" : "light")}
       >
         Toggle theme

docs/database/postgres.mdx

@@ -2,7 +2,7 @@
 title: Postgres
 label: Postgres
 order: 50
-desc: Payload supports Postgres through an officially supported Drizzle database adapter. 
+desc: Payload supports Postgres through an officially supported Drizzle database adapter.
 keywords: Postgres, documentation, typescript, Content Management System, cms, headless, javascript, node, react, express
 ---
 
@@ -37,11 +37,12 @@ export default buildConfig({
 
 ### Options
 
-| Option            | Description                                                                                                                                                                      |
-| ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `pool`            | [Pool connection options](https://orm.drizzle.team/docs/quick-postgresql/node-postgres) that will be passed to Drizzle and `node-postgres`.                                      |
-| `push`            | Disable Drizzle's [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push) in development mode. By default, `push` is enabled for development mode only. |
-| `migrationDir`    | Customize the directory that migrations are stored. |
+| Option         | Description                                                                                                                                                                      |
+|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `pool`         | [Pool connection options](https://orm.drizzle.team/docs/quick-postgresql/node-postgres) that will be passed to Drizzle and `node-postgres`.                                      |
+| `push`         | Disable Drizzle's [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push) in development mode. By default, `push` is enabled for development mode only. |
+| `migrationDir` | Customize the directory that migrations are stored.                                                                                                                              |
+| `schemaName`   | A string for the postgres schema to use, defaults to 'public'.                                                                                                                   |
 
 ### Access to Drizzle
 
@@ -65,7 +66,7 @@ In addition to exposing Drizzle directly, all of the tables, Drizzle relations,
 
 Drizzle exposes two ways to work locally in development mode.
 
-The first is [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push), which automatically pushes changes you make to your Payload config (and therefore, Drizzle schema) to your database so you don't have to manually migrate every time you change your Payload config. This only works in development mode, and should not be mixed with manually running [`migrate`](/docs/database/migrations) commands. 
+The first is [`db push`](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push), which automatically pushes changes you make to your Payload config (and therefore, Drizzle schema) to your database so you don't have to manually migrate every time you change your Payload config. This only works in development mode, and should not be mixed with manually running [`migrate`](/docs/database/migrations) commands.
 
 You will be warned if any changes that you make will entail data loss while in development mode. Push is enabled by default, but you can opt out if you'd like.
 
@@ -77,11 +78,11 @@ Migrations are extremely powerful thanks to the seamless way that Payload and Dr
 
 1. You are building your Payload config locally, with a local database used for testing.
 1. You have left the default setting of `push` enabled, so every time you change your Payload config (add or remove fields, collections, etc.), Drizzle will automatically push changes to your local DB.
-1. Once you're done with your changes, or have completed a feature, you can run `npm run payload migrate:create`. 
+1. Once you're done with your changes, or have completed a feature, you can run `npm run payload migrate:create`.
 1. Payload and Drizzle will look for any existing migrations, and automatically generate all SQL changes necessary to convert your schema from its prior state into the state of your current Payload config, and store the resulting DDL in a newly created migration.
 1. Once you're ready to go to production, you will be able to run `npm run payload migrate` against your production database, which will apply any new migrations that have not yet run.
 1. Now your production database is in sync with your Payload config!
 
 <Banner type="warning">
   Warning: do not mix "push" and migrations with your local development database. If you use "push" locally, and then try to migrate, Payload will throw a warning, telling you that these two methods are not meant to be used interchangeably.
-</Banner>
+</Banner>

docs/getting-started/installation.mdx

@@ -11,7 +11,7 @@ keywords: documentation, getting started, guide, Content Management System, cms,
 Payload requires the following software:
 
 - Any JavaScript package manager (Yarn, NPM, or pnpm)
-- Node.js version 16+
+- Node.js version 18+
 - Any [compatible database](/docs/database/overview) (MongoDB or Postgres)
 
 <Banner type="warning">

docs/hooks/overview.mdx

@@ -36,7 +36,7 @@ If your Hook simply performs a side-effect, such as updating a CRM, it might be
 
 #### Server-only execution
 
-Payload Hooks do not have any effect within the Payload Admin panel. You can safely [remove your hooks](/docs/admin/webpack#aliasing-server-only-modules) from your Admin panel's code by customizing the Webpack config, which not only keeps your Admin bundles' filesize small but also ensures that any server-side only code does not cause problems within browser environments.
+Payload Hooks are only triggered on the server. You can safely [remove your hooks](/docs/admin/webpack#aliasing-server-only-modules) from your Admin panel's client-side code by customizing the Webpack config, which not only keeps your Admin bundles' filesize small but also ensures that any server-side only code does not cause problems within browser environments.
 
 ## Hook Types
 

examples/auth/payload/yarn.lock

@@ -4508,9 +4508,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/custom-server/yarn.lock

@@ -4701,9 +4701,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/draft-preview/payload/yarn.lock

@@ -4508,9 +4508,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/email/yarn.lock

@@ -4258,14 +4258,14 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^1.1.5:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
-  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396"
+  integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/form-builder/next-pages/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@apollo/client": "^3.7.0",
     "@faceless-ui/css-grid": "^1.2.0",
-    "@faceless-ui/modal": "^2.0.1",
+    "@faceless-ui/modal": "^2.0.2",
     "escape-html": "^1.0.3",
     "graphql": "^16.8.1",
     "next": "^13.5.6",

examples/form-builder/payload/package.json

@@ -18,7 +18,7 @@
     "@payloadcms/bundler-webpack": "latest",
     "@payloadcms/db-mongodb": "latest",
     "@payloadcms/richtext-slate": "latest",
-    "@faceless-ui/modal": "^2.0.1",
+    "@faceless-ui/modal": "^2.0.2",
     "@payloadcms/plugin-form-builder": "^1.0.12",
     "@payloadcms/plugin-seo": "^1.0.8",
     "dotenv": "^8.2.0",

examples/form-builder/payload/yarn.lock

@@ -3924,9 +3924,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/hierarchy/yarn.lock

@@ -4347,9 +4347,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/live-preview/payload/yarn.lock

@@ -4508,9 +4508,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/multi-tenant/yarn.lock

@@ -4625,9 +4625,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/nested-docs/payload/yarn.lock

@@ -4599,9 +4599,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/redirects/payload/yarn.lock

@@ -4513,9 +4513,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/testing/package.json

@@ -16,7 +16,6 @@
     "@swc/core": "^1.3.84",
     "@swc/jest": "^0.2.29",
     "@types/jest": "^29.5.4",
-    "isomorphic-fetch": "^3.0.0",
     "jest": "^29.7.0",
     "mongodb-memory-server": "^8.15.1",
     "nodemon": "^3.0.1",

examples/testing/yarn.lock

@@ -4835,9 +4835,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

examples/whitelabel/yarn.lock

@@ -3748,9 +3748,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

jest.config.js

@@ -1,4 +1,11 @@
-module.exports = {
+// const nextJest = require('next/jest.js')
+
+// const createJestConfig = nextJest({
+//   // Provide the path to your Next.js app to load next.config.js and .env files in your test environment
+//   dir: './',
+// })
+
+const customJestConfig = {
   globalSetup: './test/jest.setup.ts',
   moduleNameMapper: {
     '\\.(css|scss)$': '<rootDir>/packages/payload/src/bundlers/mocks/emptyModule.js',
@@ -13,3 +20,6 @@ module.exports = {
   },
   verbose: true,
 }
+
+// module.exports = createJestConfig(customJestConfig)
+export default customJestConfig

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.

next.config.mjs

@@ -0,0 +1,29 @@
+import withPayload from './packages/next/src/withPayload.js'
+import bundleAnalyzer from '@next/bundle-analyzer'
+
+const withBundleAnalyzer = bundleAnalyzer({
+  enabled: process.env.ANALYZE === 'true',
+})
+
+export default withBundleAnalyzer(
+  withPayload({
+    reactStrictMode: false,
+    webpack: (webpackConfig) => {
+      webpackConfig.resolve.extensionAlias = {
+        '.js': ['.ts', '.tsx', '.js', '.jsx'],
+        '.mjs': ['.mts', '.mjs'],
+        '.cjs': ['.cts', '.cjs'],
+      }
+      return webpackConfig
+    },
+    async redirects() {
+      return [
+        {
+          destination: '/admin',
+          permanent: true,
+          source: '/',
+        },
+      ]
+    },
+  }),
+)

package.json

@@ -1,38 +1,71 @@
 {
   "name": "payload-monorepo",
-  "version": "0.0.1",
+  "version": "3.0.0-alpha.25",
   "private": true,
+  "type": "module",
   "workspaces:": [
     "packages/*"
   ],
   "scripts": {
-    "build": "pnpm --filter payload run build",
+    "build": "pnpm run build:core",
     "build:all": "turbo build",
-    "clean": "rimraf dist && rimraf packages/payload/dist",
-    "clean:cache": "rimraf node_modules/.cache && rimraf packages/payload/node_modules/.cache",
-    "clean:unix": "find . \\( -type d \\( -name node_modules -o -name dist -o -name .cache \\) -o -type f -name tsconfig.tsbuildinfo \\) -exec rm -rf {} +",
-    "dev": "nodemon",
-    "dev:generate-graphql-schema": "ts-node -T ./test/generateGraphQLSchema.ts",
-    "dev:generate-types": "ts-node -T ./test/generateTypes.ts",
+    "build:core": "turbo build --filter \"!@payloadcms/plugin-*\"",
+    "build:plugins": "turbo build --filter \"@payloadcms/plugin-*\" --filter \"!@payloadcms/plugin-search\" --filter \"!@payloadcms/plugin-redirects\" --filter \"!@payloadcms/plugin-nested-docs\"",
+    "build:app": "next build",
+    "build:create-payload-app": "turbo build --filter create-payload-app",
+    "build:db-mongodb": "turbo build --filter db-mongodb",
+    "build:db-postgres": "turbo build --filter db-postgres",
+    "build:eslint-config-payload": "turbo build --filter eslint-config-payload",
+    "build:graphql": "turbo build --filter graphql",
+    "build:live-preview": "turbo build --filter live-preview",
+    "build:live-preview-react": "turbo build --filter live-preview-react",
+    "build:next": "turbo build --filter next",
+    "build:payload": "turbo build --filter payload",
+    "build:plugin-cloud": "turbo build --filter plugin-cloud",
+    "build:plugin-cloud-storage": "turbo build --filter plugin-cloud-storage",
+    "build:plugin-form-builder": "turbo build --filter plugin-form-builder",
+    "build:plugin-nested-docs": "turbo build --filter plugin-nested-docs",
+    "build:plugin-redirects": "turbo build --filter plugin-redirects",
+    "build:plugin-search": "turbo build --filter plugin-search",
+    "build:plugin-sentry": "turbo build --filter plugin-sentry",
+    "build:plugin-seo": "turbo build --filter plugin-seo",
+    "build:plugin-stripe": "turbo build --filter plugin-stripe",
+    "build:richtext-lexical": "turbo build --filter richtext-lexical",
+    "build:richtext-slate": "turbo build --filter richtext-slate",
+    "build:translations": "turbo build --filter translations",
+    "build:ui": "turbo build --filter ui",
+    "clean": "turbo clean",
+    "clean:cache": "rimraf node_modules/.cache && rimraf packages/payload/node_modules/.cache && rimraf .next",
+    "clean:all": "find . \\( -type d \\( -name node_modules -o -name dist -o -name .cache \\) -o -type f -name tsconfig.tsbuildinfo \\) -exec rm -rf {} +",
+    "dev": "cross-env node --no-deprecation ./test/dev.js",
+    "dev:generate-graphql-schema": "NODE_OPTIONS=--no-deprecation ts-node -T ./test/generateGraphQLSchema.ts",
+    "dev:generate-types": "NODE_OPTIONS=--no-deprecation ts-node -T ./test/generateTypes.ts",
     "dev:postgres": "pnpm --filter payload run dev:postgres",
+    "docker:restart": "pnpm docker:stop --remove-orphans && pnpm docker:start",
+    "docker:start": "docker-compose -f packages/plugin-cloud-storage/docker-compose.yml up -d",
+    "docker:stop": "docker-compose -f packages/plugin-cloud-storage/docker-compose.yml down",
     "fix": "eslint \"packages/**/*.ts\" --fix",
     "lint": "eslint \"packages/**/*.ts\"",
     "lint-staged": "lint-staged",
+    "prepare": "husky install",
     "pretest": "pnpm build",
-    "reinstall": "pnpm clean:unix && pnpm install",
+    "reinstall": "pnpm clean:all && pnpm install",
     "script:list-packages": "tsx ./scripts/list-packages.ts",
-    "script:release": "tsx ./scripts/release.ts",
+    "release:alpha": "tsx ./scripts/release.ts --bump prerelease --tag alpha",
+    "release:beta": "tsx ./scripts/release.ts --bump prerelease --tag beta",
     "test": "pnpm test:int && pnpm test:components && pnpm test:e2e",
-    "test:components": "cross-env jest --config=jest.components.config.js",
-    "test:e2e": "npx playwright install --with-deps chromium && ts-node -T ./test/runE2E.ts",
-    "test:e2e:debug": "cross-env PWDEBUG=1 DISABLE_LOGGING=true playwright test",
-    "test:e2e:headed": "cross-env DISABLE_LOGGING=true playwright test --headed",
-    "test:int:postgres": "cross-env PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
-    "test:int": "cross-env DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
-    "translateNewKeys": "pnpm --filter payload run translateNewKeys",
-    "prepare": "husky install"
+    "test:components": "cross-env NODE_OPTIONS=--no-deprecation jest --config=jest.components.config.js",
+    "test:e2e": "NODE_OPTIONS=--no-deprecation npx playwright install --with-deps chromium && NODE_OPTIONS=--no-deprecation ts-node -T ./test/runE2E.ts",
+    "test:e2e:debug": "cross-env NODE_OPTIONS=--no-deprecation PWDEBUG=1 DISABLE_LOGGING=true playwright test",
+    "test:e2e:headed": "cross-env NODE_OPTIONS=--no-deprecation DISABLE_LOGGING=true playwright test --headed",
+    "test:int:postgres": "cross-env NODE_OPTIONS=--no-deprecation PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
+    "test:int": "cross-env NODE_OPTIONS=--no-deprecation DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
+    "translateNewKeys": "pnpm --filter payload run translateNewKeys"
   },
   "devDependencies": {
+    "@aws-sdk/client-s3": "^3.142.0",
+    "@next/bundle-analyzer": "^14.1.0",
+    "@octokit/core": "^5.1.0",
     "@payloadcms/eslint-config": "workspace:*",
     "@playwright/test": "1.40.1",
     "@swc/cli": "^0.1.62",
@@ -44,6 +77,7 @@
     "@types/conventional-changelog": "^3.1.4",
     "@types/conventional-changelog-core": "^4.2.5",
     "@types/conventional-changelog-preset-loader": "^2.3.4",
+    "@types/conventional-changelog-writer": "^4.0.10",
     "@types/fs-extra": "^11.0.2",
     "@types/jest": "29.5.7",
     "@types/minimist": "1.2.2",
@@ -55,67 +89,66 @@
     "@types/shelljs": "0.8.12",
     "@types/testing-library__jest-dom": "5.14.8",
     "add-stream": "^1.0.0",
-    "chalk": "^5.3.0",
-    "chalk-template": "1.1.0",
+    "chalk": "^4.1.2",
+    "comment-json": "^4.2.3",
     "concat-stream": "^2.0.0",
     "conventional-changelog": "^5.1.0",
+    "conventional-changelog-conventionalcommits": "^7.0.2",
     "conventional-changelog-core": "^7.0.0",
     "conventional-changelog-preset-loader": "^4.1.0",
+    "conventional-changelog-writer": "^7.0.1",
     "copyfiles": "2.4.1",
     "cross-env": "7.0.3",
     "dotenv": "8.6.0",
-    "drizzle-orm": "0.29.3",
+    "drizzle-orm": "0.29.4",
+    "execa": "5.1.1",
     "express": "4.18.2",
     "form-data": "3.0.1",
     "fs-extra": "10.1.0",
     "get-port": "5.1.1",
     "get-stream": "6.0.1",
     "glob": "8.1.0",
-    "graphql-request": "6.1.0",
     "husky": "^8.0.3",
-    "isomorphic-fetch": "3.0.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
+    "json5": "^2.2.3",
     "jwt-decode": "3.1.2",
-    "lexical": "0.12.5",
+    "lexical": "0.13.1",
     "lint-staged": "^14.0.1",
     "minimist": "1.2.8",
     "mongodb-memory-server": "^9",
-    "node-fetch": "2.6.12",
-    "nodemon": "3.0.2",
+    "next": "14.1.2",
+    "node-mocks-http": "^1.14.1",
+    "nodemon": "3.0.3",
+    "pino": "8.15.0",
+    "pino-pretty": "10.2.0",
     "prettier": "^3.0.3",
     "prompts": "2.4.2",
     "qs": "6.11.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "read-stream": "^2.1.1",
     "rimraf": "3.0.2",
     "semver": "^7.5.4",
+    "sharp": "0.32.6",
     "shelljs": "0.8.5",
     "simple-git": "^3.20.0",
     "slash": "3.0.0",
     "slate": "0.91.4",
     "tempfile": "^3.0.0",
     "ts-node": "10.9.2",
-    "turbo": "^1.11.1",
+    "tsx": "^4.7.1",
+    "turbo": "^1.12.4",
     "typescript": "5.2.2",
-    "uuid": "^9.0.1"
+    "uuid": "^9.0.1",
+    "yocto-queue": "^1.0.0"
   },
   "peerDependencies": {
     "react": "18.2.0",
-    "react-i18next": "11.18.6",
     "react-router-dom": "5.3.4"
   },
-  "pnpm": {
-    "overrides": {
-      "copyfiles": "2.4.1",
-      "cross-env": "7.0.3",
-      "dotenv": "8.6.0",
-      "drizzle-orm": "0.29.3",
-      "ts-node": "10.9.2",
-      "typescript": "5.2.2"
-    }
-  },
   "engines": {
-    "node": ">=14",
+    "node": ">=18.17.0",
     "pnpm": ">=8"
   },
   "lint-staged": {
@@ -124,6 +157,25 @@
     ]
   },
   "dependencies": {
-    "@sentry/react": "^7.77.0"
+    "@sentry/react": "^7.77.0",
+    "passport-strategy": "1.0.0"
+  },
+  "pnpm": {
+    "overrides": {
+      "copyfiles": "$copyfiles",
+      "cross-env": "$cross-env",
+      "dotenv": "$dotenv",
+      "drizzle-orm": "$drizzle-orm",
+      "graphql": "^16.8.1",
+      "react": "$react",
+      "react-dom": "$react-dom",
+      "ts-node": "$ts-node",
+      "typescript": "$typescript"
+    },
+    "allowedDeprecatedVersions": {
+      "uuid": "3.4.0",
+      "abab": "2",
+      "domexception": "4"
+    }
   }
 }

packages/bundler-vite/.prettierignore

@@ -1,10 +0,0 @@
-.tmp
-**/.git
-**/.hg
-**/.pnp.*
-**/.svn
-**/.yarn/**
-**/build
-**/dist/**
-**/node_modules
-**/temp

packages/bundler-vite/README.md

@@ -1,28 +0,0 @@
-# Payload Vite Adapter
-
-Official Vite adapter for [Payload](https://payloadcms.com).
-
-- [Main Repository](https://github.com/payloadcms/payload)
-- [Payload Docs](https://payloadcms.com/docs)
-
-## Installation
-
-```bash
-npm install @payloadcms/bundler-vite
-```
-
-## Usage
-
-```ts
-import { buildConfig } from 'payload/config'
-import { viteBundler } from '@payloadcms/bundler-vite'
-
-export default buildConfig({
-  bundler: viteBundler(),
-  // ...rest of config
-})
-
-```
-
-More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
-

packages/bundler-vite/mock.js

@@ -1,3 +0,0 @@
-export const viteBundler = () => {}
-export const mongooseAdapter = () => ({})
-export const postgresAdapter = () => ({})

packages/bundler-vite/package.json

@@ -1,51 +0,0 @@
-{
-  "name": "@payloadcms/bundler-vite",
-  "version": "0.1.6",
-  "description": "The officially supported Vite bundler adapter for Payload",
-  "repository": "https://github.com/payloadcms/payload",
-  "license": "MIT",
-  "homepage": "https://payloadcms.com",
-  "author": {
-    "email": "info@payloadcms.com",
-    "name": "Payload",
-    "url": "https://payloadcms.com"
-  },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types && pnpm copyTsx",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc",
-    "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "clean": "rimraf {dist,*.tsbuildinfo}",
-    "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
-    "copyTsx": "copyfiles -u 1 \"src/entry.tsx\" dist/",
-    "prepublishOnly": "pnpm clean && pnpm build"
-  },
-  "dependencies": {
-    "@rollup/plugin-image": "^3.0.2",
-    "@vitejs/plugin-react": "^4.0.4",
-    "compression": "1.7.4",
-    "connect-history-api-fallback": "1.6.0",
-    "get-port": "5.1.1",
-    "path-browserify": "1.0.1",
-    "vite": "^4.4.9",
-    "vite-plugin-virtual": "^0.2.0"
-  },
-  "devDependencies": {
-    "@payloadcms/eslint-config": "workspace:*",
-    "payload": "workspace:*"
-  },
-  "peerDependencies": {
-    "payload": "^2.0.0",
-    "react-dom": "18.2.0"
-  },
-  "publishConfig": {
-    "main": "./dist/index.js",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/index.d.ts"
-  },
-  "files": [
-    "dist",
-    "mock.js"
-  ]
-}

packages/bundler-vite/src/config.ts

@@ -1,157 +0,0 @@
-/* eslint-disable no-param-reassign */
-import type { SanitizedConfig } from 'payload/config'
-// @ts-expect-error
-import type { InlineConfig } from 'vite'
-
-import image from '@rollup/plugin-image'
-import react from '@vitejs/plugin-react'
-import getPort from 'get-port'
-import path from 'path'
-import virtual from 'vite-plugin-virtual'
-
-const mockModulePath = path.resolve(__dirname, './mocks/emptyModule.js')
-const mockDotENVPath = path.resolve(__dirname, './mocks/dotENV.js')
-
-export const getViteConfig = async (payloadConfig: SanitizedConfig): Promise<InlineConfig> => {
-  const { createLogger, searchForWorkspaceRoot } = await import('vite')
-
-  const logger = createLogger('warn', { allowClearScreen: false, prefix: '[VITE-WARNING]' })
-  const originalWarning = logger.warn
-  logger.warn = (msg, options) => {
-    // TODO: fix this? removed these warnings to make debugging easier
-    if (msg.includes('Default and named imports from CSS files are deprecated')) return
-    originalWarning(msg, options)
-  }
-
-  const hmrPort = await getPort()
-
-  const absoluteAliases = {}
-
-  const alias = [
-    { find: '@payloadcms/bundler-vite', replacement: path.resolve(__dirname, '../mock.js') },
-    { find: '@payloadcms/db-mongodb', replacement: path.resolve(__dirname, '../mock.js') },
-    { find: '@payloadcms/db-postgres', replacement: path.resolve(__dirname, '../mock.js') },
-    { find: 'path', replacement: require.resolve('path-browserify') },
-    { find: 'payload-config', replacement: payloadConfig.paths.rawConfig },
-    { find: /payload$/, replacement: mockModulePath },
-    { find: '~payload-user-css', replacement: payloadConfig.admin.css },
-    { find: '~react-toastify', replacement: 'react-toastify' },
-    { find: 'dotenv', replacement: mockDotENVPath },
-  ]
-
-  if (payloadConfig.admin.webpack && typeof payloadConfig.admin.webpack === 'function') {
-    const webpackConfig = payloadConfig.admin.webpack({
-      resolve: {
-        alias: {},
-      },
-    })
-
-    if (Object.keys(webpackConfig.resolve.alias).length > 0) {
-      Object.entries(webpackConfig.resolve.alias).forEach(([source, target]) => {
-        if (path.isAbsolute(source)) {
-          absoluteAliases[source] = target
-        } else {
-          alias.push({
-            find: source,
-            replacement: target,
-          })
-        }
-      })
-    }
-  }
-
-  const define = {
-    __dirname: '"/"',
-    'module.hot': 'undefined',
-    'process.argv': '[]',
-    'process.cwd': 'function () { return "/" }',
-    'process?.cwd': 'function () { return "/" }',
-  }
-
-  Object.entries(process.env).forEach(([key, val]) => {
-    if (key.indexOf('PAYLOAD_PUBLIC_') === 0) {
-      define[`process.env.${key}`] = `'${val}'`
-    } else {
-      define[`process.env.${key}`] = `''`
-    }
-  })
-
-  let viteConfig: InlineConfig = {
-    base: payloadConfig.routes.admin,
-    build: {
-      chunkSizeWarningLimit: 4000,
-      emptyOutDir: true,
-      outDir: payloadConfig.admin.buildPath,
-      rollupOptions: {
-        plugins: [image()],
-        treeshake: true,
-      },
-    },
-    customLogger: logger,
-    define,
-    optimizeDeps: {
-      exclude: [
-        // Dependencies that need aliases should be excluded
-        // from pre-bundling
-        '@payloadcms/bundler-vite',
-        '@payloadcms/db-mongodb',
-        '@payloadcms/db-postgres',
-        ...(Object.keys(absoluteAliases) || []),
-      ],
-      include: ['payload/components/root', 'react-dom/client'],
-    },
-    plugins: [
-      {
-        name: 'absolute-aliases',
-        enforce: 'pre',
-        resolveId(source, importer) {
-          let fullSourcePath: string
-
-          // TODO: need to handle this better. This is overly simple.
-          if (source.startsWith('.')) {
-            fullSourcePath = path.resolve(path.dirname(importer), source)
-
-            if (fullSourcePath) {
-              const exactMatch = absoluteAliases[fullSourcePath]
-              if (exactMatch) return exactMatch
-
-              const indexMatch = absoluteAliases[`${fullSourcePath}/index`]
-              if (indexMatch) return indexMatch
-
-              const withoutFileExtensionMatch =
-                absoluteAliases[`${fullSourcePath.replace(/\.[^/.]+$/, '')}`]
-              if (withoutFileExtensionMatch) return withoutFileExtensionMatch
-            }
-          }
-
-          return null
-        },
-      },
-      virtual({
-        crypto: 'export default {}',
-        http: 'export default {}',
-        https: 'export default {}',
-      }),
-      react(),
-    ],
-    resolve: {
-      alias,
-    },
-    root: path.resolve(__dirname, './'),
-    server: {
-      fs: {
-        allow: [searchForWorkspaceRoot(process.cwd()), path.resolve(__dirname, '../../../payload')],
-      },
-      hmr: {
-        port: hmrPort,
-      },
-      middlewareMode: true,
-    },
-  }
-
-  if (payloadConfig.admin.vite && typeof payloadConfig.admin.vite === 'function') {
-    viteConfig = payloadConfig.admin.vite(viteConfig)
-  }
-
-  return viteConfig
-}

packages/bundler-vite/src/entry.tsx

@@ -1,9 +0,0 @@
-import { Root } from 'payload/components/root'
-// @ts-expect-error
-import config from 'payload-config'
-import React from 'react'
-import { createRoot } from 'react-dom/client'
-
-const container = document.getElementById('app')
-const root = createRoot(container)
-root.render(<Root config={config} />)

packages/bundler-vite/src/index.html

@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
-    <link rel="icon" href="data:," data-placeholder-favicon />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <div id="portal"></div>
-    <script type="module" src="./entry.tsx"></script>
-  </body>
-</html>

packages/bundler-vite/src/index.ts

@@ -1,14 +0,0 @@
-// @ts-expect-error
-import type { InlineConfig } from 'vite'
-
-import type { PayloadBundler } from './types'
-
-import { buildAdmin } from './scripts/build'
-import { devAdmin } from './scripts/dev'
-import { serveAdmin } from './scripts/serve'
-
-export const viteBundler: (viteConfig?: InlineConfig) => PayloadBundler = (viteConfig) => ({
-  build: async (payloadConfig) => buildAdmin({ payloadConfig, viteConfig }),
-  dev: async (payload) => devAdmin({ payload, viteConfig }),
-  serve: async (payload) => serveAdmin({ payload }),
-})

packages/bundler-vite/src/mocks/dotENV.js

@@ -1,3 +0,0 @@
-export default {
-  config: () => null,
-}

packages/bundler-vite/src/mocks/emptyModule.js

@@ -1 +0,0 @@
-export default () => {}

packages/bundler-vite/src/mocks/fileMock.js

@@ -1 +0,0 @@
-export default 'file-stub'

packages/bundler-vite/src/scripts/build.ts

@@ -1,21 +0,0 @@
-import type { SanitizedConfig } from 'payload/config'
-// @ts-expect-error
-import type { InlineConfig } from 'vite'
-
-import { getViteConfig } from '../config'
-
-type BuildAdminType = (options: {
-  payloadConfig: SanitizedConfig
-  viteConfig: InlineConfig
-}) => Promise<void>
-export const buildAdmin: BuildAdminType = async ({ payloadConfig, viteConfig: viteConfigArg }) => {
-  const vite = await import('vite')
-  const viteConfig = await getViteConfig(payloadConfig)
-
-  try {
-    await vite.build(viteConfig)
-  } catch (e) {
-    console.error(e)
-    throw new Error('Error: there was an error building the vite prod config.')
-  }
-}

packages/bundler-vite/src/scripts/dev.ts

@@ -1,31 +0,0 @@
-import type { PayloadHandler } from 'payload/config'
-// @ts-expect-error
-import type { InlineConfig } from 'vite'
-
-import express from 'express'
-
-import type { Payload } from '../../../payload'
-
-import { getViteConfig } from '../config'
-
-const router = express.Router()
-
-type DevAdminType = (options: {
-  payload: Payload
-  viteConfig: InlineConfig
-}) => Promise<PayloadHandler>
-export const devAdmin: DevAdminType = async ({ payload, viteConfig: viteConfigArg }) => {
-  const vite = await import('vite')
-
-  try {
-    const viteConfig = await getViteConfig(payload.config)
-    const viteServer = await vite.createServer(viteConfig)
-
-    router.use(viteServer.middlewares)
-  } catch (err) {
-    console.error(err)
-    throw new Error('Error: there was an error creating the vite dev server.')
-  }
-
-  return router
-}

packages/bundler-vite/src/scripts/serve.ts

@@ -1,28 +0,0 @@
-import type { Payload } from 'payload'
-import type { PayloadHandler } from 'payload/config'
-
-import compression from 'compression'
-import history from 'connect-history-api-fallback'
-import express from 'express'
-
-const router = express.Router()
-
-type ServeAdminType = (options: { payload: Payload }) => Promise<PayloadHandler>
-
-export const serveAdmin: ServeAdminType = async ({ payload }) => {
-  router.use(history())
-
-  router.get('*', (req, res, next) => {
-    if (req.path.substr(-1) === '/' && req.path.length > 1) {
-      const query = req.url.slice(req.path.length)
-      res.redirect(301, req.path.slice(0, -1) + query)
-    } else {
-      next()
-    }
-  })
-
-  router.use(compression(payload.config.express.compression))
-  router.use(express.static(payload.config.admin.buildPath, { redirect: false }))
-
-  return router
-}

packages/bundler-vite/src/types.ts

@@ -1,8 +0,0 @@
-import type { Payload } from 'payload'
-import type { PayloadHandler, SanitizedConfig } from 'payload/config'
-
-export interface PayloadBundler {
-  build: (payloadConfig: SanitizedConfig) => Promise<void> // used in `payload build`
-  dev: (payload: Payload) => Promise<PayloadHandler> // this would be a typical Express middleware handler
-  serve: (payload: Payload) => Promise<PayloadHandler> // serve built files in production
-}

packages/bundler-webpack/.prettierignore

@@ -1,10 +0,0 @@
-.tmp
-**/.git
-**/.hg
-**/.pnp.*
-**/.svn
-**/.yarn/**
-**/build
-**/dist/**
-**/node_modules
-**/temp

packages/bundler-webpack/README.md

@@ -1,28 +0,0 @@
-# Payload Webpack Adapter
-
-Official Webpack adapter for [Payload](https://payloadcms.com).
-
-- [Main Repository](https://github.com/payloadcms/payload)
-- [Payload Docs](https://payloadcms.com/docs)
-
-## Installation
-
-```bash
-npm install @payloadcms/bundler-webpack
-```
-
-## Usage
-
-```ts
-import { buildConfig } from 'payload/config'
-import { webpackBundler } from '@payloadcms/bundler-webpack'
-
-export default buildConfig({
-  bundler: webpackBundler()
-  // ...rest of config
-})
-
-```
-
-More detailed usage can be found in the [Payload Docs](https://payloadcms.com/docs/configuration/overview).
-

packages/bundler-webpack/package.json

@@ -1,72 +0,0 @@
-{
-  "name": "@payloadcms/bundler-webpack",
-  "version": "1.0.6",
-  "description": "The officially supported Webpack bundler adapter for Payload",
-  "repository": "https://github.com/payloadcms/payload",
-  "license": "MIT",
-  "homepage": "https://payloadcms.com",
-  "author": {
-    "email": "info@payloadcms.com",
-    "name": "Payload",
-    "url": "https://payloadcms.com"
-  },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "pnpm build:swc && pnpm build:types",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc",
-    "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "clean": "rimraf {dist,*.tsbuildinfo}",
-    "prepublishOnly": "pnpm clean && pnpm build"
-  },
-  "dependencies": {
-    "compression": "1.7.4",
-    "connect-history-api-fallback": "1.6.0",
-    "css-loader": "5.2.7",
-    "css-minimizer-webpack-plugin": "^5.0.0",
-    "file-loader": "6.2.0",
-    "find-node-modules": "^2.1.3",
-    "html-webpack-plugin": "^5.5.0",
-    "md5": "2.3.0",
-    "mini-css-extract-plugin": "1.6.2",
-    "path-browserify": "1.0.1",
-    "postcss": "8.4.31",
-    "postcss-loader": "6.2.1",
-    "postcss-preset-env": "9.0.0",
-    "process": "0.11.10",
-    "sass-loader": "12.6.0",
-    "style-loader": "^2.0.0",
-    "swc-loader": "^0.2.3",
-    "swc-minify-webpack-plugin": "^2.1.0",
-    "terser-webpack-plugin": "^5.3.6",
-    "url-loader": "4.1.1",
-    "webpack": "^5.78.0",
-    "webpack-bundle-analyzer": "^4.8.0",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-middleware": "6.0.1",
-    "webpack-hot-middleware": "^2.25.3"
-  },
-  "devDependencies": {
-    "@payloadcms/eslint-config": "workspace:*",
-    "@types/extract-text-webpack-plugin": "^3.0.7",
-    "@types/find-node-modules": "^2.1.0",
-    "@types/html-webpack-plugin": "^3.2.6",
-    "@types/mini-css-extract-plugin": "^1.4.3",
-    "@types/optimize-css-assets-webpack-plugin": "^5.0.5",
-    "@types/webpack-bundle-analyzer": "^4.6.0",
-    "@types/webpack-env": "^1.18.0",
-    "@types/webpack-hot-middleware": "2.25.6",
-    "payload": "workspace:*"
-  },
-  "peerDependencies": {
-    "payload": "^2.0.0"
-  },
-  "publishConfig": {
-    "main": "./dist/index.js",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/index.d.ts"
-  },
-  "files": [
-    "dist"
-  ]
-}

packages/bundler-webpack/src/configs/base.ts

@@ -1,105 +0,0 @@
-import type { SanitizedConfig } from 'payload/config'
-import type { Configuration } from 'webpack'
-
-import findNodeModules from 'find-node-modules'
-import fs from 'fs'
-import HtmlWebpackPlugin from 'html-webpack-plugin'
-import path from 'path'
-import webpack from 'webpack'
-
-const mockModulePath = path.resolve(__dirname, '../mocks/emptyModule.js')
-const mockDotENVPath = path.resolve(__dirname, '../mocks/dotENV.js')
-const mockDBAdapterPath = path.resolve(__dirname, '../mocks/db-adapters.js')
-
-const nodeModulesPaths = findNodeModules({ cwd: process.cwd(), relative: false })
-
-export const getBaseConfig = (payloadConfig: SanitizedConfig): Configuration => {
-  let nodeModulesPath = nodeModulesPaths.find((p) => {
-    const guess = path.resolve(p, 'payload/dist/admin')
-    if (fs.existsSync(guess)) {
-      return true
-    }
-    return false
-  })
-
-  if (!nodeModulesPath) {
-    nodeModulesPath = process.cwd()
-  }
-
-  const adminFolderPath = path.resolve(nodeModulesPath, 'payload/dist/admin')
-
-  const config: Configuration = {
-    entry: {
-      main: [adminFolderPath],
-    },
-    module: {
-      rules: [
-        {
-          exclude: /\/node_modules\/(?!.+\.tsx?$).*$/,
-          test: /\.(t|j)sx?$/,
-          use: [
-            {
-              loader: require.resolve('swc-loader'),
-              options: {
-                jsc: {
-                  parser: {
-                    syntax: 'typescript',
-                    tsx: true,
-                  },
-                },
-              },
-            },
-          ],
-        },
-        {
-          oneOf: [
-            {
-              test: /\.(?:ico|gif|png|jpg|jpeg|woff(2)?|eot|ttf|otf|svg)$/i,
-              type: 'asset/resource',
-            },
-          ],
-        },
-      ],
-    },
-    plugins: [
-      new webpack.ProvidePlugin({ process: require.resolve('process/browser') }),
-      new webpack.DefinePlugin(
-        Object.entries(process.env).reduce((values, [key, val]) => {
-          if (key.indexOf('PAYLOAD_PUBLIC_') === 0) {
-            return {
-              ...values,
-              [`process.env.${key}`]: `'${val}'`,
-            }
-          }
-
-          return values
-        }, {}),
-      ),
-      new HtmlWebpackPlugin({
-        filename: path.normalize('./index.html'),
-        template: payloadConfig.admin.indexHTML,
-      }),
-    ],
-    resolve: {
-      alias: {
-        '@payloadcms/bundler-webpack': mockModulePath,
-        '@payloadcms/db-mongodb': mockDBAdapterPath,
-        '@payloadcms/db-postgres': mockDBAdapterPath,
-        dotenv: mockDotENVPath,
-        path: require.resolve('path-browserify'),
-        payload$: mockModulePath,
-        'payload-config': payloadConfig.paths.rawConfig,
-        'payload-user-css': payloadConfig.admin.css,
-      },
-      extensions: ['.ts', '.tsx', '.js', '.json'],
-      fallback: {
-        crypto: false,
-        http: false,
-        https: false,
-      },
-      modules: ['node_modules', nodeModulesPath, path.resolve(__dirname, '../../node_modules')],
-    },
-  }
-
-  return config
-}

packages/bundler-webpack/src/configs/dev.ts

@@ -1,82 +0,0 @@
-import type { SanitizedConfig } from 'payload/config'
-import type { Configuration } from 'webpack'
-
-import md5 from 'md5'
-import webpack from 'webpack'
-
-import { getBaseConfig } from './base'
-
-export const getDevConfig = (payloadConfig: SanitizedConfig): Configuration => {
-  const baseConfig = getBaseConfig(payloadConfig) as any
-
-  let webpackConfig: Configuration = {
-    ...baseConfig,
-    cache: {
-      type: 'filesystem',
-      // version cache when there are changes to aliases
-      buildDependencies: {
-        config: [__filename],
-      },
-      version: md5(Object.entries(baseConfig.resolve.alias).join()),
-    },
-    devtool: 'inline-source-map',
-    entry: {
-      ...baseConfig.entry,
-      main: [
-        `${require.resolve('webpack-hot-middleware/client')}?path=${
-          payloadConfig.routes.admin
-        }/__webpack_hmr`,
-        ...(baseConfig.entry.main as string[]),
-      ],
-    },
-    mode: 'development',
-    module: {
-      ...baseConfig.module,
-      rules: [
-        ...baseConfig.module.rules,
-        {
-          sideEffects: true,
-          test: /\.(scss|css)$/,
-          /*
-           * The loaders here are run in reverse order. Here is how your loaders are being processed:
-           * 1. sass-loader: This loader compiles your SCSS into CSS.
-           * 2. postcss-loader: This loader applies postcss transformations (with preset-env plugin in your case).
-           * 3. css-loader: This loader interprets @import and url() like import/require() and will resolve them.
-           * 4. style-loader: This loader injects CSS into the DOM.
-           */
-          use: [
-            require.resolve('style-loader'),
-            {
-              loader: require.resolve('css-loader'),
-              options: {
-                url: (url) => !url.startsWith('/'),
-              },
-            },
-            {
-              loader: require.resolve('postcss-loader'),
-              options: {
-                postcssOptions: {
-                  plugins: [require.resolve('postcss-preset-env')],
-                },
-              },
-            },
-            require.resolve('sass-loader'),
-          ],
-        },
-      ],
-    },
-    output: {
-      filename: '[name].js',
-      path: '/',
-      publicPath: `${payloadConfig.routes.admin}/`,
-    },
-    plugins: [...baseConfig.plugins, new webpack.HotModuleReplacementPlugin()],
-    stats: 'errors-warnings',
-  }
-
-  if (payloadConfig.admin.webpack && typeof payloadConfig.admin.webpack === 'function') {
-    webpackConfig = payloadConfig.admin.webpack(webpackConfig)
-  }
-
-  return webpackConfig
-}

packages/bundler-webpack/src/configs/prod.ts

@@ -1,80 +0,0 @@
-import type { SanitizedConfig } from 'payload/config'
-import type { Configuration } from 'webpack'
-
-import MiniCSSExtractPlugin from 'mini-css-extract-plugin'
-import { SwcMinifyWebpackPlugin } from 'swc-minify-webpack-plugin'
-import { WebpackPluginInstance } from 'webpack'
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
-
-import { getBaseConfig } from './base'
-
-export const getProdConfig = (payloadConfig: SanitizedConfig): Configuration => {
-  const baseConfig = getBaseConfig(payloadConfig) as any
-
-  let webpackConfig: Configuration = {
-    ...baseConfig,
-    mode: 'production',
-    module: {
-      ...baseConfig.module,
-      rules: [
-        ...baseConfig.module.rules,
-        {
-          sideEffects: true,
-          test: /\.(scss|css)$/,
-          use: [
-            MiniCSSExtractPlugin.loader,
-            {
-              loader: require.resolve('css-loader'),
-              options: {
-                url: (url) => !url.startsWith('/'),
-              },
-            },
-            {
-              loader: require.resolve('postcss-loader'),
-              options: {
-                postcssOptions: {
-                  plugins: [require.resolve('postcss-preset-env')],
-                },
-              },
-            },
-            require.resolve('sass-loader'),
-          ],
-        },
-      ],
-    },
-    optimization: {
-      minimizer: [new SwcMinifyWebpackPlugin()],
-      splitChunks: {
-        cacheGroups: {
-          styles: {
-            name: 'styles',
-            chunks: 'all',
-            enforce: true,
-            test: /\.(sa|sc|c)ss$/,
-          },
-        },
-      },
-    },
-    output: {
-      chunkFilename: '[name].[chunkhash].js',
-      filename: '[name].[chunkhash].js',
-      path: payloadConfig.admin.buildPath,
-      publicPath: `${payloadConfig.routes.admin}/`,
-    },
-    plugins: [
-      ...baseConfig.plugins,
-      new MiniCSSExtractPlugin({
-        filename: '[name].[contenthash].css',
-        ignoreOrder: true,
-      }),
-      ...(process.env.PAYLOAD_ANALYZE_BUNDLE ? [new BundleAnalyzerPlugin()] : []),
-    ],
-    stats: 'errors-only',
-  }
-
-  if (payloadConfig.admin.webpack && typeof payloadConfig.admin.webpack === 'function') {
-    webpackConfig = payloadConfig.admin.webpack(webpackConfig)
-  }
-
-  return webpackConfig
-}

packages/bundler-webpack/src/index.ts

@@ -1,12 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-import type { PayloadBundler } from '../../payload/dist/bundlers/types'
-
-import { buildAdmin } from './scripts/build'
-import { devAdmin } from './scripts/dev'
-import { serveAdmin } from './scripts/serve'
-
-export const webpackBundler: () => PayloadBundler = () => ({
-  build: async (payloadConfig) => buildAdmin({ payloadConfig }),
-  dev: async (payload) => devAdmin({ payload }),
-  serve: async (payload) => serveAdmin({ payload }),
-})

packages/bundler-webpack/src/mocks/db-adapters.js

@@ -1,2 +0,0 @@
-export const mongooseAdapter = () => ({})
-export const postgresAdapter = () => ({})

packages/bundler-webpack/src/mocks/dotENV.js

@@ -1,3 +0,0 @@
-export default {
-  config: () => null,
-}

packages/bundler-webpack/src/mocks/emptyModule.js

@@ -1,3 +0,0 @@
-export const webpackBundler = () => {}
-
-export default () => {}

packages/bundler-webpack/src/mocks/fileMock.js

@@ -1 +0,0 @@
-export default 'file-stub'

packages/bundler-webpack/src/scripts/build.ts

@@ -1,31 +0,0 @@
-import type { SanitizedConfig } from 'payload/config'
-
-import webpack from 'webpack'
-
-import { getProdConfig } from '../configs/prod'
-
-type BuildAdminType = (options: { payloadConfig: SanitizedConfig }) => Promise<void>
-export const buildAdmin: BuildAdminType = async ({ payloadConfig }) => {
-  try {
-    const webpackConfig = getProdConfig(payloadConfig)
-    webpack(webpackConfig, (err, stats) => {
-      if (err || stats.hasErrors()) {
-        // Handle errors here
-
-        if (stats) {
-          console.error(
-            stats.toString({
-              chunks: false,
-              colors: true,
-            }),
-          )
-        } else {
-          console.error(err.message)
-        }
-      }
-    })
-  } catch (err) {
-    console.error(err)
-    throw new Error('Error: there was an error building the webpack prod config.')
-  }
-}

packages/bundler-webpack/src/scripts/dev.ts

@@ -1,35 +0,0 @@
-import type { Payload } from 'payload'
-import type { PayloadHandler } from 'payload/config'
-
-import history from 'connect-history-api-fallback'
-import express from 'express'
-import webpack from 'webpack'
-import webpackDevMiddleware from 'webpack-dev-middleware'
-import webpackHotMiddleware from 'webpack-hot-middleware'
-
-import { getDevConfig } from '../configs/dev'
-
-const router = express.Router()
-
-type DevAdminType = (options: { payload: Payload }) => Promise<PayloadHandler>
-export const devAdmin: DevAdminType = async ({ payload }) => {
-  router.use(history())
-
-  try {
-    const webpackConfig = getDevConfig(payload.config)
-    const compiler = webpack(webpackConfig)
-
-    router.use(
-      webpackDevMiddleware(compiler, {
-        publicPath: '/',
-      }),
-    )
-
-    router.use(webpackHotMiddleware(compiler))
-  } catch (err) {
-    console.error(err)
-    throw new Error('Error: there was an error creating the webpack dev server.')
-  }
-
-  return router
-}

packages/bundler-webpack/src/scripts/serve.ts

@@ -1,41 +0,0 @@
-import type { Payload } from 'payload'
-import type { PayloadHandler } from 'payload/config'
-
-import compression from 'compression'
-import history from 'connect-history-api-fallback'
-import express from 'express'
-
-const router = express.Router()
-
-type ServeAdminType = (options: { payload: Payload }) => Promise<PayloadHandler>
-
-export const serveAdmin: ServeAdminType = async ({ payload }) => {
-  router.use(history())
-
-  router.get('*', (req, res, next) => {
-    if (req.path.substr(-1) === '/' && req.path.length > 1) {
-      const query = req.url.slice(req.path.length)
-      res.redirect(301, req.path.slice(0, -1) + query)
-    } else {
-      next()
-    }
-  })
-
-  router.use(compression(payload.config.express.compression))
-  router.use(
-    express.static(payload.config.admin.buildPath, {
-      redirect: false,
-      setHeaders: (res, path) => {
-        const staticFilesRegex = new RegExp(
-          '.(svg|css|js|jp(e)?g|png|avif|webp|webm|gif|ico|woff|woff2|ttf|otf)$',
-          'i',
-        )
-        if (path.match(staticFilesRegex)) {
-          res.set('Cache-Control', `public, max-age=${60 * 60 * 24 * 365}, immutable`)
-        }
-      },
-    }),
-  )
-
-  return router
-}

packages/create-payload-app/package.json

@@ -6,7 +6,8 @@
     "create-payload-app": "bin/cli.js"
   },
   "scripts": {
-    "build": "pnpm build:swc",
+    "build": "pnpm copyfiles && pnpm build:swc",
+    "copyfiles": "copyfiles -u 2 \"../../app/(payload)/**\" \"dist\"",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "test": "jest",
@@ -22,10 +23,13 @@
     "arg": "^5.0.0",
     "chalk": "^4.1.0",
     "command-exists": "^1.2.9",
+    "comment-json": "^4.2.3",
     "degit": "^2.8.4",
+    "detect-package-manager": "^3.0.1",
     "execa": "^5.0.0",
     "figures": "^3.2.0",
     "fs-extra": "^9.0.1",
+    "globby": "11.1.0",
     "handlebars": "^4.7.7",
     "ora": "^5.1.0",
     "prompts": "^2.4.2",

packages/create-payload-app/src/lib/init-next.ts

@@ -0,0 +1,219 @@
+import type { CompilerOptions } from 'typescript'
+
+import chalk from 'chalk'
+import * as CommentJson from 'comment-json'
+import { detect } from 'detect-package-manager'
+import execa from 'execa'
+import fs from 'fs'
+import fse from 'fs-extra'
+import globby from 'globby'
+import path from 'path'
+
+import type { CliArgs } from '../types'
+
+import { copyRecursiveSync } from '../utils/copy-recursive-sync'
+import { error, info, debug as origDebug, success, warning } from '../utils/log'
+
+type InitNextArgs = Pick<CliArgs, '--debug'> & {
+  projectDir?: string
+  useDistFiles?: boolean
+}
+type InitNextResult = { reason?: string; success: boolean; userAppDir?: string }
+
+export async function initNext(args: InitNextArgs): Promise<InitNextResult> {
+  args.projectDir = args.projectDir || process.cwd()
+  const { projectDir } = args
+  const templateResult = await applyPayloadTemplateFiles(args)
+  if (!templateResult.success) return templateResult
+
+  const { success: installSuccess } = await installDeps(projectDir)
+  if (!installSuccess) {
+    return { ...templateResult, reason: 'Failed to install dependencies', success: false }
+  }
+
+  // Create or find payload.config.ts
+  const createConfigResult = findOrCreatePayloadConfig(projectDir)
+  if (!createConfigResult.success) {
+    return { ...templateResult, ...createConfigResult }
+  }
+
+  // Add `@payload-config` to tsconfig.json `paths`
+  await addPayloadConfigToTsConfig(projectDir)
+
+  // Output directions for user to update next.config.js
+  const withPayloadMessage = `
+
+  ${chalk.bold(`Wrap your existing next.config.js with the withPayload function. Here is an example:`)}
+
+  const { withPayload } = require("@payloadcms/next");
+
+  const nextConfig = {
+    // Your Next.js config
+  };
+
+  module.exports = withPayload(nextConfig);
+
+`
+
+  console.log(withPayloadMessage)
+
+  return templateResult
+}
+
+async function addPayloadConfigToTsConfig(projectDir: string) {
+  const tsConfigPath = path.resolve(projectDir, 'tsconfig.json')
+  const userTsConfigContent = await fse.readFile(tsConfigPath, {
+    encoding: 'utf8',
+  })
+  const userTsConfig = CommentJson.parse(userTsConfigContent) as {
+    compilerOptions?: CompilerOptions
+  }
+  if (!userTsConfig.compilerOptions && !('extends' in userTsConfig)) {
+    userTsConfig.compilerOptions = {}
+  }
+
+  if (!userTsConfig.compilerOptions.paths?.['@payload-config']) {
+    userTsConfig.compilerOptions.paths = {
+      ...(userTsConfig.compilerOptions.paths || {}),
+      '@payload-config': ['./payload.config.ts'],
+    }
+    await fse.writeFile(tsConfigPath, CommentJson.stringify(userTsConfig, null, 2))
+  }
+}
+
+async function applyPayloadTemplateFiles(args: InitNextArgs): Promise<InitNextResult> {
+  const { '--debug': debug, projectDir, useDistFiles } = args
+
+  info('Initializing Payload app in Next.js project', 1)
+
+  const logDebug = (message: string) => {
+    if (debug) origDebug(message)
+  }
+
+  if (!fs.existsSync(projectDir)) {
+    return { reason: `Could not find specified project directory at ${projectDir}`, success: false }
+  }
+
+  // Next.js configs can be next.config.js, next.config.mjs, etc.
+  const foundConfig = (await globby('next.config.*js', { cwd: projectDir }))?.[0]
+  const nextConfigPath = path.resolve(projectDir, foundConfig)
+  if (!fs.existsSync(nextConfigPath)) {
+    return {
+      reason: `No next.config.js found at ${nextConfigPath}. Ensure you are in a Next.js project directory.`,
+      success: false,
+    }
+  } else {
+    if (debug) logDebug(`Found Next config at ${nextConfigPath}`)
+  }
+
+  const templateFilesPath =
+    __dirname.endsWith('dist') || useDistFiles
+      ? path.resolve(__dirname, '../..', 'dist/app')
+      : path.resolve(__dirname, '../../../../app')
+
+  if (debug) logDebug(`Using template files from: ${templateFilesPath}`)
+
+  if (!fs.existsSync(templateFilesPath)) {
+    return {
+      reason: `Could not find template source files from ${templateFilesPath}`,
+      success: false,
+    }
+  } else {
+    if (debug) logDebug('Found template source files')
+  }
+
+  // src/app or app
+  const userAppDirGlob = await globby(['**/app'], {
+    cwd: projectDir,
+    onlyDirectories: true,
+  })
+  const userAppDir = path.resolve(projectDir, userAppDirGlob?.[0])
+  if (!fs.existsSync(userAppDir)) {
+    return { reason: `Could not find user app directory inside ${projectDir}`, success: false }
+  } else {
+    logDebug(`Found user app directory: ${userAppDir}`)
+  }
+
+  logDebug(`Copying template files from ${templateFilesPath} to ${userAppDir}`)
+  copyRecursiveSync(templateFilesPath, userAppDir, debug)
+  success('Successfully initialized.')
+  return { success: true, userAppDir }
+}
+
+async function installDeps(projectDir: string) {
+  const packageManager = await detect({ cwd: projectDir })
+  if (!packageManager) {
+    throw new Error('Could not detect package manager')
+  }
+
+  info(`Installing dependencies with ${packageManager}`, 1)
+  const packagesToInstall = [
+    'payload',
+    '@payloadcms/db-mongodb',
+    '@payloadcms/next',
+    '@payloadcms/richtext-slate',
+    '@payloadcms/ui',
+  ].map((pkg) => `${pkg}@alpha`)
+
+  let exitCode = 0
+  switch (packageManager) {
+    case 'npm': {
+      ;({ exitCode } = await execa('npm', ['install', '--save', ...packagesToInstall], {
+        cwd: projectDir,
+      }))
+      break
+    }
+    case 'yarn':
+    case 'pnpm': {
+      ;({ exitCode } = await execa(packageManager, ['add', ...packagesToInstall], {
+        cwd: projectDir,
+      }))
+      break
+    }
+    case 'bun': {
+      warning('Bun support is untested.')
+      ;({ exitCode } = await execa('bun', ['add', ...packagesToInstall], { cwd: projectDir }))
+      break
+    }
+  }
+
+  if (exitCode !== 0) {
+    error(`Failed to install dependencies with ${packageManager}`)
+  } else {
+    success(`Successfully installed dependencies`)
+  }
+  return { success: exitCode === 0 }
+}
+function findOrCreatePayloadConfig(projectDir: string) {
+  const configPath = path.resolve(projectDir, 'payload.config.ts')
+  if (fs.existsSync(configPath)) {
+    return { message: 'Found existing payload.config.ts', success: true }
+  } else {
+    // Create default config
+    // TODO: Pull this from templates
+    const defaultConfig = `import path from "path";
+
+import { mongooseAdapter } from "@payloadcms/db-mongodb"; // database-adapter-import
+import { slateEditor } from "@payloadcms/richtext-slate"; // editor-import
+import { buildConfig } from "payload/config";
+
+export default buildConfig({
+  editor: slateEditor({}), // editor-config
+  collections: [],
+  secret: "asdfasdf",
+  typescript: {
+    outputFile: path.resolve(__dirname, "payload-types.ts"),
+  },
+  graphQL: {
+    schemaOutputFile: path.resolve(__dirname, "generated-schema.graphql"),
+  },
+  db: mongooseAdapter({
+    url: "mongodb://localhost:27017/next-payload-3",
+  }),
+});
+`
+
+    fse.writeFileSync(configPath, defaultConfig)
+    return { message: 'Created default payload.config.ts', success: true }
+  }
+}

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

@@ -6,12 +6,13 @@ import type { CliArgs, PackageManager } from './types'
 
 import { createProject } from './lib/create-project'
 import { generateSecret } from './lib/generate-secret'
+import { initNext } from './lib/init-next'
 import { parseProjectName } from './lib/parse-project-name'
 import { parseTemplate } from './lib/parse-template'
 import { selectDb } from './lib/select-db'
 import { getValidTemplates, validateTemplate } from './lib/templates'
 import { writeEnvFile } from './lib/write-env-file'
-import { success } from './utils/log'
+import { error, success } from './utils/log'
 import { helpMessage, successMessage, welcomeMessage } from './utils/messages'
 
 export class Main {
@@ -27,6 +28,9 @@ export class Main {
         '--secret': String,
         '--template': String,
 
+        // Next.js
+        '--init-next': Boolean,
+
         // Package manager
         '--no-deps': Boolean,
         '--use-npm': Boolean,
@@ -35,6 +39,7 @@ export class Main {
 
         // Flags
         '--beta': Boolean,
+        '--debug': Boolean,
         '--dry-run': Boolean,
 
         // Aliases
@@ -53,6 +58,17 @@ export class Main {
         console.log(helpMessage())
         process.exit(0)
       }
+
+      if (this.args['--init-next']) {
+        const result = await initNext(this.args)
+        if (!result.success) {
+          error(result.reason || 'Failed to initialize Payload app in Next.js project')
+        } else {
+          success('Payload app successfully initialized in Next.js project')
+        }
+        process.exit(result.success ? 0 : 1)
+      }
+
       const templateArg = this.args['--template']
       if (templateArg) {
         const valid = validateTemplate(templateArg)

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

@@ -3,8 +3,10 @@ import type arg from 'arg'
 export interface Args extends arg.Spec {
   '--beta': BooleanConstructor
   '--db': StringConstructor
+  '--debug': BooleanConstructor
   '--dry-run': BooleanConstructor
   '--help': BooleanConstructor
+  '--init-next': BooleanConstructor
   '--name': StringConstructor
   '--no-deps': BooleanConstructor
   '--secret': StringConstructor
@@ -12,6 +14,9 @@ export interface Args extends arg.Spec {
   '--use-npm': BooleanConstructor
   '--use-pnpm': BooleanConstructor
   '--use-yarn': BooleanConstructor
+
+  // Aliases
+
   '-h': string
   '-n': string
   '-t': string

packages/create-payload-app/src/utils/copy-recursive-sync.ts

@@ -0,0 +1,19 @@
+import fs from 'fs'
+import path from 'path'
+
+/**
+ * Recursively copy files from src to dest
+ */
+export function copyRecursiveSync(src: string, dest: string, debug?: boolean) {
+  const exists = fs.existsSync(src)
+  const stats = exists && fs.statSync(src)
+  const isDirectory = exists && stats.isDirectory()
+  if (isDirectory) {
+    fs.mkdirSync(dest, { recursive: true })
+    fs.readdirSync(src).forEach((childItemName) => {
+      copyRecursiveSync(path.join(src, childItemName), path.join(dest, childItemName))
+    })
+  } else {
+    fs.copyFileSync(src, dest)
+  }
+}

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

@@ -9,10 +9,18 @@ export const warning = (message: string): void => {
   console.log(chalk.yellow('? ') + chalk.bold(message))
 }
 
-export const info = (message: string): void => {
-  console.log(`${chalk.yellow(figures.info)} ${chalk.bold(message)}`)
+export const info = (message: string, paddingTop?: number): void => {
+  console.log(
+    `${'\n'.repeat(paddingTop || 0)}${chalk.green(figures.pointerSmall)} ${chalk.bold(message)}`,
+  )
 }
 
 export const error = (message: string): void => {
   console.log(`${chalk.red(figures.cross)} ${chalk.bold(message)}`)
 }
+
+export const debug = (message: string): void => {
+  console.log(
+    `${chalk.gray(figures.pointerSmall)} ${chalk.bgGray('[DEBUG]')} ${chalk.gray(message)}`,
+  )
+}

packages/db-mongodb/.swcrc

@@ -10,6 +10,6 @@
     }
   },
   "module": {
-    "type": "commonjs"
+    "type": "es6"
   }
 }