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

* chore(deps): add lerna-lite

* feat: update-1

* feat(db-mongodb): update 2

* chore: lerna init

* chore: add version option to lerna config

* chore(ci): add gh usernames to changelog and user root package.json for version

* chore(ci): whitelist poc branches

* chore(ci): add contributors section

* chore(ci): use turbo for prepublishOnly scripts, enable caching

* chore(deps): update turborepo, add execa

* feat(plugin-stripe): adjust type import

* chore: remove lerna-lite

* chore(ci): new and improved release script for fixed versioning

* chore: remove unused lerna-lite packages

* chore: sync root package.json version

* chore: remove remnants of bundler packages

* chore(plugin-seo): update packagea.json from main, disable build

* chore: disable turbo caching

* chore(ci): update release script

* chore: sync pnpm-lock.yaml

* chore: ci cleanup

.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.js

@@ -1,6 +1,15 @@
 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'],
@@ -34,5 +43,9 @@ module.exports = {
       },
     },
   ],
+  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]
+        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,15 +161,40 @@ 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
+        with:
+          version: latest
+        if: matrix.database == 'supabase'
+
+      - name: Initialize Supabase
+        run: |
+          supabase init
+          supabase start
+        if: matrix.database == 'supabase'
+
+      - name: Wait for PostgreSQL
+        run: sleep 30
+        if: startsWith(matrix.database, 'postgres')
 
-      - run: sleep 30
       - 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: |
+          echo "POSTGRES_URL=postgresql://postgres:postgres@127.0.0.1:54322/postgres" >> $GITHUB_ENV
+        if: matrix.database == 'supabase'
 
       - name: Component Tests
         run: pnpm test:components
@@ -142,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
@@ -205,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
@@ -290,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

@@ -2,6 +2,12 @@
   // Use IntelliSense to learn about possible attributes.
   // Hover to view descriptions of existing attributes.
   "configurations": [
+    {
+      "command": "pnpm dev",
+      "name": "Run Dev 3.0",
+      "request": "launch",
+      "type": "node-terminal"
+    },
     {
       "command": "pnpm run dev _community",
       "cwd": "${workspaceFolder}",
@@ -27,7 +33,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,112 @@
+## [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)
+
+
+### Features
+
+* add more options to addFieldStatePromise so that it can be used for field flattening ([#4799](https://github.com/payloadcms/payload/issues/4799)) ([8725d41](https://github.com/payloadcms/payload/commit/8725d411645bb0270376e235669f46be2227ecc0))
+* extend transactions to cover after and beforeOperation hooks ([#4960](https://github.com/payloadcms/payload/issues/4960)) ([1e8a6b7](https://github.com/payloadcms/payload/commit/1e8a6b7899f7b1e6451cc4d777602208478b483c))
+* previousValue and previousSiblingDoc args added to beforeChange field hooks ([#4958](https://github.com/payloadcms/payload/issues/4958)) ([5d934ba](https://github.com/payloadcms/payload/commit/5d934ba02d07d98f781ce983228858ee5ce5c226))
+* re-use existing logger instance passed to payload.init ([#3124](https://github.com/payloadcms/payload/issues/3124)) ([471d211](https://github.com/payloadcms/payload/commit/471d2113a790dc0d54b2f8ed84e6899310efd600))
+* **richtext-lexical:** Blocks: generate type definitions for blocks fields ([#4529](https://github.com/payloadcms/payload/issues/4529)) ([90d7ee3](https://github.com/payloadcms/payload/commit/90d7ee3e6535d51290fc734b284ff3811dbda1f8))
+* use deletion success message from server if provided ([#4966](https://github.com/payloadcms/payload/issues/4966)) ([e3c8105](https://github.com/payloadcms/payload/commit/e3c8105cc2ed6fdf8007d97cd7b5556fc71ed724))
+
+
+### Bug Fixes
+
+* **db-postgres:** filtering relationships with drafts enabled ([#4998](https://github.com/payloadcms/payload/issues/4998)) ([c3a3942](https://github.com/payloadcms/payload/commit/c3a39429697e9d335e9be199e7caafb82eb26219))
+* **db-postgres:** handle schema changes with supabase ([#4968](https://github.com/payloadcms/payload/issues/4968)) ([5d3659d](https://github.com/payloadcms/payload/commit/5d3659d48ad8bbf5d96fbcd80434d2287cab97e0))
+* **db-postgres:** indexes not created for non unique field names ([#4967](https://github.com/payloadcms/payload/issues/4967)) ([64f705c](https://github.com/payloadcms/payload/commit/64f705c3c94148972f67e8175e718015760d6430))
+* **db-postgres:** indexes not creating for relationships, arrays, hasmany and blocks ([#4976](https://github.com/payloadcms/payload/issues/4976)) ([47106d5](https://github.com/payloadcms/payload/commit/47106d5a1af2ebd073fbbc6e474174c3d3835e5c))
+* **db-postgres:** localized field sort count ([#4997](https://github.com/payloadcms/payload/issues/4997)) ([f3876c2](https://github.com/payloadcms/payload/commit/f3876c2a39efe19a1864213306725aadcc14f130))
+* ensures docPermissions fallback to collection permissions on create ([#4969](https://github.com/payloadcms/payload/issues/4969)) ([afa2b94](https://github.com/payloadcms/payload/commit/afa2b942e0aad90c55744ae13e0ffe1cefa4585d))
+* **migrations:** safely create migration file when no name passed ([#4995](https://github.com/payloadcms/payload/issues/4995)) ([0740d50](https://github.com/payloadcms/payload/commit/0740d5095ee1aef13e4e37f6b174d529f0f2d993))
+* **plugin-seo:** tabbedUI with email field causes duplicate field ([#4944](https://github.com/payloadcms/payload/issues/4944)) ([db22cbd](https://github.com/payloadcms/payload/commit/db22cbdf21a39ed0604ab96c57ca4242eac82ce7))
+
+## [2.9.0](https://github.com/payloadcms/payload/compare/v2.8.2...v2.9.0) (2024-01-26)
+
+
+### Features
+
+* forceAcceptWarning migration arg added to accept prompts ([#4874](https://github.com/payloadcms/payload/issues/4874)) ([eba53ba](https://github.com/payloadcms/payload/commit/eba53ba60afd7c5d37389377ed06a9b556058d49))
+
+### Bug Fixes
+
+* afterLogin hook write conflicts ([#4904](https://github.com/payloadcms/payload/issues/4904)) ([3eb681e](https://github.com/payloadcms/payload/commit/3eb681e847e9c55eaaa69c22bea4f4e66c7eac36))
+* **db-postgres:** migrate down error ([#4861](https://github.com/payloadcms/payload/issues/4861)) ([dfba522](https://github.com/payloadcms/payload/commit/dfba5222f3abf3f236dc9212a28e1aec7d7214d5))
+* **db-postgres:** query unset relation ([#4862](https://github.com/payloadcms/payload/issues/4862)) ([8ce15c8](https://github.com/payloadcms/payload/commit/8ce15c8b07800397a50dcf790c263ed5b3cfad53))
+* migrate down missing filter for latest batch ([#4860](https://github.com/payloadcms/payload/issues/4860)) ([b99d24f](https://github.com/payloadcms/payload/commit/b99d24fcfa698c493ea01c41621201abe18fabe3))
+* **plugin-cloud-storage:** slow get file performance large collections ([#4927](https://github.com/payloadcms/payload/issues/4927)) ([f73d503](https://github.com/payloadcms/payload/commit/f73d503fecdfa5cefdc26ab9aad60b00563f881e))
+* remove No Options dropdown from hasMany fields ([#4899](https://github.com/payloadcms/payload/issues/4899)) ([e5a7907](https://github.com/payloadcms/payload/commit/e5a7907a72c1371447ac2f71fce213ed22246092))
+* upload input drawer does not show draft versions ([#4903](https://github.com/payloadcms/payload/issues/4903)) ([6930c4e](https://github.com/payloadcms/payload/commit/6930c4e9f2200853121391ad8f8df48ea66c40a4))
+
 ## [2.8.2](https://github.com/payloadcms/payload/compare/v2.8.1...v2.8.2) (2024-01-16)
 
 

app/(payload)/admin/[[...segments]]/page.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 { RootPage } from '@payloadcms/next/views/Root/index'
+
+type Args = {
+  params: {
+    segments: string[]
+  }
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
+
+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_GET, REST_DELETE, 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,10 @@
+export const GET = async () => {
+  console.log('1')
+  console.log('1')
+  console.log('1')
+  console.log('1')
+  console.log('1')
+  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/fields/json.mdx

@@ -28,7 +28,7 @@ This field uses the `monaco-react` editor syntax highlighting.
 | **`name`** \*      | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                              |
 | **`label`**        | Text used as a field label in the Admin panel or an object with keys for each language.                                                                                                             |
 | **`unique`**       | Enforce that each entry in the Collection has a unique value for this field.                                                                                                                        |
-| **`index`**        | Build a an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
+| **`index`**        | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
 | **`validate`**     | Provide a custom validation function that will be executed on both the Admin panel and the backend. [More](/docs/fields/overview#validation)                                                        |
 | **`saveToJWT`**    | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/config), include its data in the user JWT.                                                       |
 | **`hooks`**        | Provide field-based hooks to control logic for this field. [More](/docs/fields/overview#field-level-hooks)                                                                                          |

docs/fields/overview.mdx

@@ -46,6 +46,7 @@ export const Page: CollectionConfig = {
 - [Date](/docs/fields/date) - date / time field that saves a timestamp
 - [Email](/docs/fields/email) - validates the entry is a properly formatted email
 - [Group](/docs/fields/group) - nest fields within an object
+- [JSON](/docs/fields/json) - saves actual JSON in the database
 - [Number](/docs/fields/number) - field that enforces that its value be a number
 - [Point](/docs/fields/point) - geometric coordinates for location data
 - [Radio](/docs/fields/radio) - radio button group, allowing only one value to be selected

docs/fields/relationship.mdx

@@ -38,7 +38,7 @@ caption="Admin panel screenshot of a Relationship field"
 | **`label`**         | Text used as a field label in the Admin panel or an object with keys for each language.                                                                                       |
 | **`unique`**        | Enforce that each entry in the Collection has a unique value for this field.                                                                                                  |
 | **`validate`**      | Provide a custom validation function that will be executed on both the Admin panel and the backend. [More](/docs/fields/overview#validation)                                  |
-| **`index`**         | Build a an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
+| **`index`**         | Build an [index](/docs/database/overview) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
 | **`saveToJWT`**     | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/config), include its data in the user JWT.                                 |
 | **`hooks`**         | Provide field-based hooks to control logic for this field. [More](/docs/fields/overview#field-level-hooks)                                                                    |
 | **`access`**        | Provide field-based access control to denote what users can see and do with this field's data. [More](/docs/fields/overview#field-level-access-control)                       |

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/collections.mdx

@@ -75,6 +75,7 @@ import { CollectionBeforeOperationHook } from 'payload/types'
 const beforeOperationHook: CollectionBeforeOperationHook = async ({
   args, // original arguments passed into the operation
   operation, // name of the operation
+  req, // full express request
 }) => {
   return args // return modified operation arguments as necessary
 }
@@ -209,6 +210,7 @@ import { CollectionAfterOperationHook } from 'payload/types'
 const afterOperationHook: CollectionAfterOperationHook = async ({
   args, // arguments passed into the operation
   operation, // name of the operation
+  req, // full express request
   result, // the result of the operation, before modifications
 }) => {
   return result // return modified result as necessary

docs/hooks/fields.mdx

@@ -6,7 +6,8 @@ desc: Hooks can be added to any fields, and optionally modify the return value o
 keywords: hooks, fields, config, configuration, documentation, Content Management System, cms, headless, javascript, node, react, express
 ---
 
-Field-level hooks offer incredible potential for encapsulating your logic. They help to isolate concerns and package up functionalities to be easily reusable across your projects.
+Field-level hooks offer incredible potential for encapsulating your logic. They help to isolate concerns and package up
+functionalities to be easily reusable across your projects.
 
 **Example use cases include:**
 
@@ -46,7 +47,8 @@ const ExampleField: Field = {
 
 ## Arguments and return values
 
-All field-level hooks are formatted to accept the same arguments, although some arguments may be `undefined` based on which field hook you are utilizing.
+All field-level hooks are formatted to accept the same arguments, although some arguments may be `undefined` based on
+which field hook you are utilizing.
 
 <Banner type="success">
   <strong>Tip:</strong>
@@ -69,10 +71,10 @@ Field Hooks receive one `args` argument that contains the following properties:
 | **`operation`**          | A string relating to which operation the field type is currently executing within. Useful within `beforeValidate`, `beforeChange`, and `afterChange` hooks to differentiate between `create` and `update` operations. |
 | **`originalDoc`**        | The full original document in `update` operations. In the `afterChange` hook, this is the resulting document of the operation.                                                                                        |
 | **`previousDoc`**        | The document before changes were applied, only in `afterChange` hooks.                                                                                                                                                |
-| **`previousSiblingDoc`** | The sibling data from the previous document in `afterChange` hook.                                                                                                                                                    |
+| **`previousSiblingDoc`** | The sibling data of the document before changes being applied, only in `beforeChange` and `afterChange` hook.                                                                                                         |
 | **`req`**                | The Express `request` object. It is mocked for Local API operations.                                                                                                                                                  |
 | **`value`**              | The value of the field.                                                                                                                                                                                               |
-| **`previousValue`**      | The previous value of the field, before changes were applied, only in `afterChange` hooks.                                                                                                                            |
+| **`previousValue`**      | The previous value of the field, before changes, only in `beforeChange` and `afterChange` hooks.                                                                                                                      |
 | **`context`**            | Context passed to this hook. More info can be found under [Context](/docs/hooks/context)                                                                                                                              |
 | **`field`**              | The field which the hook is running against.                                                                                                                                                                          |
 | **`collection`**         | The collection which the field belongs to. If the field belongs to a global, this will be null.                                                                                                                       |
@@ -80,7 +82,8 @@ Field Hooks receive one `args` argument that contains the following properties:
 
 #### Return value
 
-All field hooks can optionally modify the return value of the field before the operation continues. Field Hooks may optionally return the value that should be used within the field.
+All field hooks can optionally modify the return value of the field before the operation continues. Field Hooks may
+optionally return the value that should be used within the field.
 
 <Banner type="warning">
   <strong>Important</strong>
@@ -92,11 +95,14 @@ All field hooks can optionally modify the return value of the field before the o
 
 ## Examples of Field Hooks
 
-To better illustrate how field-level hooks can be applied, here are some specific examples. These demonstrate the flexibility and potential of field hooks in different contexts. Remember, these examples are just a starting point - the true potential of field-level hooks lies in their adaptability to a wide array of use cases.
+To better illustrate how field-level hooks can be applied, here are some specific examples. These demonstrate the
+flexibility and potential of field hooks in different contexts. Remember, these examples are just a starting point - the
+true potential of field-level hooks lies in their adaptability to a wide array of use cases.
 
 ### beforeValidate
 
-Runs before the `update` operation. This hook allows you to pre-process or format field data before it undergoes validation.
+Runs before the `update` operation. This hook allows you to pre-process or format field data before it undergoes
+validation.
 
 ```ts
 import { Field } from 'payload/types'
@@ -113,11 +119,15 @@ const usernameField: Field = {
 }
 ```
 
-In this example, the `beforeValidate` hook is used to process the `username` field. The hook takes the incoming value of the field and transforms it by trimming whitespace and converting it to lowercase. This ensures that the username is stored in a consistent format in the database.
+In this example, the `beforeValidate` hook is used to process the `username` field. The hook takes the incoming value of
+the field and transforms it by trimming whitespace and converting it to lowercase. This ensures that the username is
+stored in a consistent format in the database.
 
 ### beforeChange
 
-Immediately following validation, `beforeChange` hooks will run within `create` and `update` operations. At this stage, you can be confident that the field data that will be saved to the document is valid in accordance to your field validations.
+Immediately following validation, `beforeChange` hooks will run within `create` and `update` operations. At this stage,
+you can be confident that the field data that will be saved to the document is valid in accordance to your field
+validations.
 
 ```ts
 import { Field } from 'payload/types'
@@ -136,11 +146,14 @@ const emailField: Field = {
 }
 ```
 
-In the `emailField`, the `beforeChange` hook checks the `operation` type. If the operation is `create`, it performs additional validation or transformation on the email field value. This allows for operation-specific logic to be applied to the field.
+In the `emailField`, the `beforeChange` hook checks the `operation` type. If the operation is `create`, it performs
+additional validation or transformation on the email field value. This allows for operation-specific logic to be applied
+to the field.
 
 ### afterChange
 
-The `afterChange` hook is executed after a field's value has been changed and saved in the database. This hook is useful for post-processing or triggering side effects based on the new value of the field.
+The `afterChange` hook is executed after a field's value has been changed and saved in the database. This hook is useful
+for post-processing or triggering side effects based on the new value of the field.
 
 ```ts
 import { Field } from 'payload/types'
@@ -165,11 +178,15 @@ const membershipStatusField: Field = {
 }
 ```
 
-In this example, the `afterChange` hook is used with a `membershipStatusField`, which allows users to select their membership level (Standard, Premium, VIP). The hook monitors changes in the membership status. When a change occurs, it logs the update and can be used to trigger further actions, such as tracking conversion from one tier to another or notifying them about changes in their membership benefits.
+In this example, the `afterChange` hook is used with a `membershipStatusField`, which allows users to select their
+membership level (Standard, Premium, VIP). The hook monitors changes in the membership status. When a change occurs, it
+logs the update and can be used to trigger further actions, such as tracking conversion from one tier to another or
+notifying them about changes in their membership benefits.
 
 ### afterRead
 
-The `afterRead` hook is invoked after a field value is read from the database. This is ideal for formatting or transforming the field data for output.
+The `afterRead` hook is invoked after a field value is read from the database. This is ideal for formatting or
+transforming the field data for output.
 
 ```ts
 import { Field } from 'payload/types'
@@ -186,8 +203,9 @@ const dateField: Field = {
 }
 ```
 
-Here, the `afterRead` hook for the `dateField` is used to format the date into a more readable format using `toLocaleDateString()`. This hook modifies the way the date is presented to the user, making it more user-friendly.
-
+Here, the `afterRead` hook for the `dateField` is used to format the date into a more readable format
+using `toLocaleDateString()`. This hook modifies the way the date is presented to the user, making it more
+user-friendly.
 
 ## TypeScript
 

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/README.md

@@ -98,6 +98,13 @@ On boot, a seed script is included to scaffold a basic database for you to use a
 
 > NOTICE: seeding the database is destructive because it drops your current database to populate a fresh one from the seed template. Only run this command if you are starting a new project or can afford to lose your current data.
 
+### Conflicting routes
+
+>In a monorepo when routes are bootstrapped to the same host, they can conflict with Payload's own routes if they have the same name. In our template we've named the Nextjs API routes to `next` to avoid this conflict.
+>
+>This can happen with any other routes conflicting with Payload such as `admin` and we recommend using different names for custom routes.  
+>Alternatively you can also rename Payload's own routes via the [configuration](https://payloadcms.com/docs/configuration/overview).
+
 ## Production
 
 To run Payload in production, you need to build and serve the Admin panel. To do so, follow these steps:

examples/custom-server/src/app/api/test-get/route.ts

@@ -1,5 +0,0 @@
-import { NextResponse } from 'next/server'
-
-export async function GET(): Promise<NextResponse> {
-  return NextResponse.json({ success: true })
-}

examples/custom-server/src/app/api/test-post/route.ts

@@ -1,5 +0,0 @@
-import { NextResponse } from 'next/server'
-
-export async function POST(): Promise<NextResponse> {
-  return NextResponse.json({ success: true })
-}

examples/custom-server/src/app/next/test-get/route.ts

@@ -0,0 +1,10 @@
+import { NextResponse } from 'next/server'
+
+/**
+ * The Next.js API routes can conflict with Payload's own routes if they share the same path
+ * To avoid this you can customise the path of Payload or the API route of Nextjs as we've done here
+ * See readme: https://github.com/payloadcms/payload/tree/main/examples/custom-server#conflicting-routes
+ *  */
+export async function GET(): Promise<NextResponse> {
+  return NextResponse.json({ success: true })
+}

examples/custom-server/src/app/next/test-post/route.ts

@@ -0,0 +1,10 @@
+import { NextResponse } from 'next/server'
+
+/**
+ * The Next.js API routes can conflict with Payload's own routes if they share the same path
+ * To avoid this you can customise the path of Payload or the API route of Nextjs as we've done here
+ * See readme: https://github.com/payloadcms/payload/tree/main/examples/custom-server#conflicting-routes
+ *  */
+export async function POST(): Promise<NextResponse> {
+  return NextResponse.json({ success: true })
+}

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/.env.example

@@ -0,0 +1,2 @@
+DATABASE_URI=mongodb://127.0.0.1/payload-template-blank
+PAYLOAD_SECRET=YOUR_SECRET_HERE

examples/hierarchy/.gitignore

@@ -0,0 +1,6 @@
+build
+dist
+/media
+node_modules
+.DS_Store
+.env

examples/hierarchy/.prettierrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  printWidth: 100,
+  parser: 'typescript',
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'all',
+  arrowParens: 'avoid',
+}

examples/hierarchy/README.md

@@ -0,0 +1,58 @@
+# Payload Hierarchy Example
+
+This example demonstrates how to achieve a virtual hierarchy between documents in your [Payload](https://github.com/payloadcms/payload) application.
+
+## Quick Start
+
+To spin up the project locally, follow these steps:
+
+1. First clone the repo
+1. Then `cd YOUR_PROJECT_REPO && cp .env.example .env`
+1. Next `yarn && yarn dev` (or `docker-compose up`, see [Docker](#docker))
+1. Now `open http://localhost:3000/admin` to access the admin panel
+1. Create your first admin user using the form on the page
+
+That's it! Changes made in `./src` will be reflected in your app.
+
+## How it works
+
+This example achieves parent/child relationships between your documents through the use of virtual fields. When you query a document with the `?children=true` query param, an afterRead hook is used to populate the documents within its own tree.
+
+For more information on how virtual fields, see the [Official Virtual Fields Example](https://github.com/payloadcms/payload/tree/main/examples/virtual-fields).
+
+### Collections
+
+See the [Collections](https://payloadcms.com/docs/configuration/collections) docs for details on how to extend any of this functionality.
+
+- #### Users
+
+  The `users` collection is a default payload users collection.
+
+- #### Entities
+
+  The `entities` collection can define a parent as any other entity.  It has a virtual field that will also populate children when it is called via the API using a query `children=true`. See [Virtual Fields](https://github.com/payloadcms/payload/tree/main/examples/virtual-fields) for more details on how virtual fields work. 
+  
+  The virtual field retrieves __all__ children which includes other entities and people.
+
+- #### People
+
+  The `people` collection is a collection that can define an array of parent entities.  It also has an allocation field.  This is for demonstrating attaching data to a parent-child relationship.
+
+## Development
+
+To spin up this example locally, follow the [Quick Start](#quick-start).
+
+## Production
+
+To run Payload in production, you need to build and serve the Admin panel. To do so, follow these steps:
+
+1. First invoke the `payload build` script by running `yarn build` or `npm run build` in your project root. This creates a `./build` directory with a production-ready admin bundle.
+1. Then run `yarn serve` or `npm run serve` to run Node in production and serve Payload from the `./build` directory.
+
+### Deployment
+
+The easiest way to deploy your project is to use [Payload Cloud](https://payloadcms.com/new/import), a one-click hosting solution to deploy production-ready instances of your Payload apps directly from your GitHub repo. You can also deploy your app manually, check out the [deployment documentation](https://payloadcms.com/docs/production/deployment) for full details.
+
+## Questions
+
+If you have any issues or questions, reach out to us on [Discord](https://discord.com/invite/payload) or start a [GitHub discussion](https://github.com/payloadcms/payload/discussions).

examples/hierarchy/nodemon.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://json.schemastore.org/nodemon.json",
+  "ext": "ts",
+  "exec": "ts-node src/server.ts -- -I",
+  "stdin": false
+}

examples/hierarchy/package.json

@@ -0,0 +1,35 @@
+{
+  "name": "hierarchy",
+  "description": "A hierarchy example with Payload",
+  "version": "1.0.0",
+  "main": "dist/server.js",
+  "license": "MIT",
+  "scripts": {
+    "dev": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts nodemon",
+    "build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
+    "build:server": "tsc",
+    "build": "yarn copyfiles && yarn build:payload && yarn build:server",
+    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
+    "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png}\" dist/",
+    "generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types",
+    "generate:graphQLSchema": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:graphQLSchema",
+    "payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload"
+  },
+  "dependencies": {
+    "@payloadcms/bundler-webpack": "^1.0.0",
+    "@payloadcms/db-mongodb": "^1.0.0",
+    "@payloadcms/plugin-cloud": "^3.0.0",
+    "@payloadcms/richtext-slate": "^1.0.0",
+    "cross-env": "^7.0.3",
+    "dotenv": "^8.2.0",
+    "express": "^4.17.1",
+    "payload": "^2.0.0"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.9",
+    "copyfiles": "^2.4.1",
+    "nodemon": "^2.0.6",
+    "ts-node": "^9.1.1",
+    "typescript": "^4.8.4"
+  }
+}

examples/hierarchy/src/collections/Entities.ts

@@ -0,0 +1,79 @@
+import { CollectionConfig } from 'payload/types'
+
+export const Entities: CollectionConfig = {
+  slug: 'entities',
+  admin: {
+    useAsTitle: 'name',
+  },
+  fields: [
+    {
+      name: 'name',
+      type: 'text',
+      required: true,
+    },
+    // - This field is populated by setting the query parameter 'children=true'
+    // - This is a virtual field used to track a child relationship
+    // - Only relationship information is returned by this field
+    // - Data beyond relationships is not stored in this field
+    {
+      name: 'children',
+      type: 'relationship',
+      relationTo: ['entities', 'people'],
+      access: {
+        create: () => false,
+        update: () => false,
+      },
+      hooks: {
+        afterRead: [
+          async ({ data, req }) => {
+            const { id } = data
+
+            if (!req.query.children) return
+
+            const people = await req.payload.find({
+              req,
+              collection: 'people',
+              where: {
+                'parents.parent': { equals: id },
+              },
+              limit: 0,
+              depth: 0,
+              pagination: false,
+            })
+
+            const entities = await req.payload.find({
+              req,
+              collection: 'entities',
+              where: {
+                parent: { equals: id },
+              },
+              limit: 0,
+              depth: 0,
+              pagination: false,
+            })
+
+            return [
+              ...entities.docs.map(entity => {
+                return {
+                  relationTo: 'entity',
+                  value: entity,
+                }
+              }),
+              ...people.docs.map(person => {
+                return {
+                  relationTo: 'people',
+                  value: person,
+                }
+              }),
+            ]
+          },
+        ],
+      },
+    },
+    {
+      name: 'parent',
+      type: 'relationship',
+      relationTo: 'entities',
+    },
+  ],
+}

examples/hierarchy/src/collections/People.ts

@@ -0,0 +1,32 @@
+import { CollectionConfig } from 'payload/types'
+
+export const People: CollectionConfig = {
+  slug: 'people',
+  admin: {
+    useAsTitle: 'name',
+  },
+  fields: [
+    {
+      name: 'name',
+      type: 'text',
+      required: true,
+    },
+    {
+      name: 'parents',
+      type: 'array',
+      fields: [
+        {
+          name: 'parent',
+          type: 'relationship',
+          relationTo: 'entities',
+        },
+        {
+          name: 'allocation',
+          type: 'number',
+          min: 0,
+          max: 100,
+        },
+      ],
+    },
+  ],
+}

examples/hierarchy/src/collections/Users.ts

@@ -0,0 +1,15 @@
+import { CollectionConfig } from 'payload/types'
+
+const Users: CollectionConfig = {
+  slug: 'users',
+  auth: true,
+  admin: {
+    useAsTitle: 'email',
+  },
+  fields: [
+    // Email added by default
+    // Add more fields as needed
+  ],
+}
+
+export default Users

examples/hierarchy/src/payload.config.ts

@@ -0,0 +1,30 @@
+import path from 'path'
+
+import { payloadCloud } from '@payloadcms/plugin-cloud'
+import { mongooseAdapter } from '@payloadcms/db-mongodb'
+import { webpackBundler } from '@payloadcms/bundler-webpack'
+import { slateEditor } from '@payloadcms/richtext-slate'
+import { buildConfig } from 'payload/config'
+
+import Users from './collections/Users'
+import { Entities } from './collections/Entities'
+import { People } from './collections/People'
+
+export default buildConfig({
+  admin: {
+    user: Users.slug,
+    bundler: webpackBundler(),
+  },
+  editor: slateEditor({}),
+  collections: [Users, Entities, People],
+  typescript: {
+    outputFile: path.resolve(__dirname, 'payload-types.ts'),
+  },
+  graphQL: {
+    schemaOutputFile: path.resolve(__dirname, 'generated-schema.graphql'),
+  },
+  plugins: [payloadCloud()],
+  db: mongooseAdapter({
+    url: process.env.DATABASE_URI,
+  }),
+})

examples/hierarchy/src/server.ts

@@ -0,0 +1,27 @@
+import express from 'express'
+import payload from 'payload'
+
+require('dotenv').config()
+const app = express()
+
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin')
+})
+
+const start = async () => {
+  // Initialize Payload
+  await payload.init({
+    secret: process.env.PAYLOAD_SECRET,
+    express: app,
+    onInit: async () => {
+      payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`)
+    },
+  })
+
+  // Add your own express routes here
+
+  app.listen(3000)
+}
+
+start()

examples/hierarchy/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "strict": false,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "jsx": "react",
+    "paths": {
+      "payload/generated-types": ["./src/payload-types.ts"]
+    }
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", "dist", "build"],
+  "ts-node": {
+    "transpileOnly": true,
+    "swc": true
+  }
+}

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/src/collections/Users/hooks/recordLastLoggedInTenant.ts

@@ -2,26 +2,27 @@ import type { AfterLoginHook } from 'payload/dist/collections/config/types'
 
 export const recordLastLoggedInTenant: AfterLoginHook = async ({ req, user }) => {
   try {
-    const relatedOrg = await req.payload.find({
-      collection: 'tenants',
-      where: {
-        'domains.domain': {
-          in: [req.headers.host],
-        },
-      },
-      depth: 0,
-      limit: 1,
-    })
-
-    if (relatedOrg.docs.length > 0) {
-      await req.payload.update({
-        id: user.id,
-        collection: 'users',
-        data: {
-          lastLoggedInTenant: relatedOrg.docs[0].id,
+    const relatedOrg = await req.payload
+      .find({
+        collection: 'tenants',
+        where: {
+          'domains.domain': {
+            in: [req.headers.host],
+          },
         },
+        depth: 0,
+        limit: 1,
       })
-    }
+      ?.then(res => res.docs?.[0])
+
+    await req.payload.update({
+      id: user.id,
+      collection: 'users',
+      data: {
+        lastLoggedInTenant: relatedOrg?.id || null,
+      },
+      req,
+    })
   } catch (err: unknown) {
     req.payload.logger.error(`Error recording last logged in tenant for user ${user.id}: ${err}`)
   }

examples/multi-tenant/src/collections/Users/utilities/isSuperOrTenantAdmin.ts

@@ -30,6 +30,7 @@ export const isSuperOrTenantAdmin = async (args: { req: PayloadRequest }): Promi
     },
     depth: 0,
     limit: 1,
+    req,
   })
 
   // if this tenant does not exist, deny access

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)
+module.exports = 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.js

@@ -0,0 +1,10 @@
+const { withPayload } = require('./packages/next/src/withPayload')
+const withBundleAnalyzer = require('@next/bundle-analyzer')({
+  enabled: process.env.ANALYZE === 'true',
+})
+
+module.exports = withBundleAnalyzer(
+  withPayload({
+    reactStrictMode: false,
+  }),
+)

package.json

@@ -1,27 +1,57 @@
 {
   "name": "payload-monorepo",
-  "version": "0.0.1",
+  "version": "3.0.0-alpha.10",
   "private": true,
   "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",
+    "build:core": "turbo build --filter \"!@payloadcms/plugin-*\"",
+    "build:plugins": "turbo build --filter \"@payloadcms/plugin-*\"",
+    "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 ./test/dev.js",
     "dev:generate-graphql-schema": "ts-node -T ./test/generateGraphQLSchema.ts",
     "dev:generate-types": "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",
@@ -29,10 +59,12 @@
     "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"
+    "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 +76,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,57 +88,65 @@
     "@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",
     "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.28.5",
+    "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.1-canary.26",
+    "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.33.2",
     "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.1",
-    "turbo": "^1.11.1",
+    "ts-node": "10.9.2",
+    "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"
   },
   "engines": {
-    "node": ">=14",
+    "node": ">=18.17.0",
     "pnpm": ">=8"
   },
   "lint-staged": {
@@ -114,6 +155,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/bundler-webpack/tsconfig.json

@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "composite": true, // Make sure typescript knows that this module depends on their references
-    "noEmit": false /* Do not emit outputs. */,
-    "emitDeclarationOnly": true,
-    "outDir": "./dist" /* Specify an output folder for all emitted files. */,
-    "rootDir": "./src" /* Specify the root folder within your source files. */
-  },
-  "exclude": ["dist", "node_modules", ".eslintrc.js"],
-  "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"],
-  "references": [{ "path": "../payload" }]
-}

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 4 \"../next/src/app/(payload)/**\" \"dist/app\"",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "test": "jest",
@@ -26,6 +27,7 @@
     "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,69 @@
+import fs from 'fs'
+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 } from '../utils/log'
+
+export async function initNext(
+  args: Pick<CliArgs, '--debug'> & { nextDir?: string; useDistFiles?: boolean },
+): Promise<{ success: boolean }> {
+  const { '--debug': debug, nextDir, useDistFiles } = args
+
+  info('Initializing Payload app in Next.js project', 1)
+
+  const logDebug = (message: string) => {
+    if (debug) origDebug(message)
+  }
+
+  let projectDir = process.cwd()
+  if (nextDir) {
+    projectDir = path.resolve(projectDir, nextDir)
+    if (debug) logDebug(`Overriding project directory to ${projectDir}`)
+  }
+
+  if (!fs.existsSync(projectDir)) {
+    error(`Could not find specified project directory at ${projectDir}`)
+    return { success: false }
+  }
+
+  const foundConfig = (await globby('next.config.*js', { cwd: projectDir }))?.[0]
+  const nextConfigPath = path.resolve(projectDir, foundConfig)
+  if (!fs.existsSync(nextConfigPath)) {
+    error(
+      `No next.config.js found at ${nextConfigPath}. Ensure you are in a Next.js project directory.`,
+    )
+    return { 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, '../../../next/src/app')
+
+  if (debug) logDebug(`Using template files from: ${templateFilesPath}`)
+
+  if (!fs.existsSync(templateFilesPath)) {
+    error(`Could not find template source files from ${templateFilesPath}`)
+    return { success: false }
+  } else {
+    if (debug) logDebug('Found template source files')
+  }
+
+  const userAppDir = path.resolve(projectDir, 'src/app')
+  if (!fs.existsSync(userAppDir)) {
+    error(`Could not find user app directory at ${userAppDir}`)
+    return { 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 }
+}

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

@@ -6,6 +6,7 @@ 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'
@@ -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,12 @@ export class Main {
         console.log(helpMessage())
         process.exit(0)
       }
+
+      if (this.args['--init-next']) {
+        const result = await initNext(this.args)
+        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