Merge pull request #5359 from payloadcms/chore/test-dir-to-workspace

chore: add test dir to workspace

packages/db-mongodb/package.json

@@ -41,10 +41,23 @@
   "peerDependencies": {
     "payload": "workspace:*"
   },
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "types": "./src/index.ts"
+    }
+  },
   "publishConfig": {
     "main": "./dist/index.js",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/index.d.ts"
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.ts",
+        "require": "./dist/index.ts",
+        "types": "./dist/index.d.ts"
+      }
+    }
   },
   "files": [
     "dist",

packages/db-postgres/package.json

@@ -39,10 +39,33 @@
   "peerDependencies": {
     "payload": "workspace:*"
   },
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "types": "./src/index.ts"
+    },
+    "./types": {
+      "import": "./src/types.ts",
+      "require": "./src/types.ts",
+      "types": "./src/types.ts"
+    }
+  },
   "publishConfig": {
     "main": "./dist/index.js",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/index.d.ts"
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      },
+      "./types": {
+        "import": "./dist/types.js",
+        "require": "./dist/types.js",
+        "types": "./dist/types.d.ts"
+      }
+    }
   },
   "files": [
     "dist",

packages/graphql/package.json

@@ -45,8 +45,7 @@
         "require": "./dist/index.js",
         "types": "./dist/index.d.ts"
       }
-    },
-    "registry": "https://registry.npmjs.org/"
+    }
   },
   "files": [
     "dist"

packages/live-preview-react/package.json

@@ -30,8 +30,8 @@
   },
   "exports": {
     ".": {
-      "default": "./src/index.ts",
-      "types": "./src/index.ts"
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
     }
   },
   "publishConfig": {

packages/live-preview/package.json

@@ -23,8 +23,8 @@
   },
   "exports": {
     ".": {
-      "default": "./src/index.ts",
-      "types": "./src/index.ts"
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
     }
   },
   "publishConfig": {

packages/next/src/utilities/getRequestLanguage.ts

@@ -1,5 +1,5 @@
 import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js'
-import type { SanitizedConfig } from 'packages/payload/src/exports/types.js'
+import type { SanitizedConfig } from 'payload/config'
 
 import { matchLanguage } from '@payloadcms/translations'
 

packages/next/src/views/Root/getViewFromConfig.tsx

@@ -1,4 +1,5 @@
-import type { AdminViewComponent, SanitizedConfig } from 'packages/payload/src/exports/types.js'
+import type { SanitizedConfig } from 'payload/config'
+import type { AdminViewComponent } from 'payload/types'
 
 import type { initPage } from '../../utilities/initPage.js'
 

packages/payload/src/exports/uploads.ts

@@ -0,0 +1 @@
+export { default as getFileByPath } from '../uploads/getFileByPath.js'

packages/payload/src/exports/utilities.ts

@@ -7,8 +7,8 @@ export { extractTranslations } from '../translations/extractTranslations.js'
 export { formatFilesize } from '../uploads/formatFilesize.js'
 
 export { default as isImage } from '../uploads/isImage.js'
-export { combineMerge } from '../utilities/combineMerge.js'
 
+export { combineMerge } from '../utilities/combineMerge.js'
 export {
   configToJSONSchema,
   entityToJSONSchema,
@@ -19,26 +19,27 @@ export { createArrayFromCommaDelineated } from '../utilities/createArrayFromComm
 export { createLocalReq } from '../utilities/createLocalReq.js'
 export { deepCopyObject } from '../utilities/deepCopyObject.js'
 export { deepMerge } from '../utilities/deepMerge.js'
-export { fieldSchemaToJSON } from '../utilities/fieldSchemaToJSON.js'
 
+export { fieldSchemaToJSON } from '../utilities/fieldSchemaToJSON.js'
 export { default as flattenTopLevelFields } from '../utilities/flattenTopLevelFields.js'
+
 export { formatLabels, formatNames, toWords } from '../utilities/formatLabels.js'
 
 export { getCollectionIDFieldTypes } from '../utilities/getCollectionIDFieldTypes.js'
-
 export { getIDType } from '../utilities/getIDType.js'
 export { getObjectDotNotation } from '../utilities/getObjectDotNotation.js'
 export { default as getUniqueListBy } from '../utilities/getUniqueListBy.js'
 export { isEntityHidden } from '../utilities/isEntityHidden.js'
+
 export { isNumber } from '../utilities/isNumber.js'
 
 export { isPlainObject } from '../utilities/isPlainObject.js'
 
 export { isValidID } from '../utilities/isValidID.js'
-
 export { default as isolateObjectProperty } from '../utilities/isolateObjectProperty.js'
-export { setsAreEqual } from '../utilities/setsAreEqual.js'
 
+export { mapAsync } from '../utilities/mapAsync.js'
+export { setsAreEqual } from '../utilities/setsAreEqual.js'
 export { default as toKebabCase } from '../utilities/toKebabCase.js'
 export { default as wait } from '../utilities/wait.js'
 export { default as wordBoundariesRegex } from '../utilities/wordBoundariesRegex.js'

packages/plugin-cloud-storage/package.json

@@ -2,8 +2,8 @@
   "name": "@payloadcms/plugin-cloud-storage",
   "description": "The official cloud storage plugin for Payload CMS",
   "version": "3.0.0-alpha.48",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
   "type": "module",
   "license": "MIT",
   "scripts": {
@@ -62,15 +62,15 @@
       "require": "./src/index.ts",
       "types": "./src/index.ts"
     },
+    "./types": {
+      "import": "./src/types.ts",
+      "require": "./src/types.ts",
+      "types": "./src/types.ts"
+    },
     "./*": {
       "import": "./src/exports/*.ts",
       "require": "./src/exports/*.ts",
       "types": "./src/exports/*.ts"
-    },
-    "./dist/*": {
-      "import": "./src/*.ts",
-      "require": "./src/*.ts",
-      "types": "./src/*.ts"
     }
   },
   "publishConfig": {
@@ -80,15 +80,15 @@
         "require": "./dist/index.js",
         "types": "./dist/index.d.ts"
       },
+      "./types": {
+        "import": "./dist/types.js",
+        "require": "./dist/types.js",
+        "types": "./dist/types.d.ts"
+      },
       "./*": {
         "import": "./dist/exports/*.js",
         "require": "./dist/exports/*.js",
         "types": "./dist/exports/*.d.ts"
-      },
-      "./dist/*": {
-        "import": "./dist/*.js",
-        "require": "./dist/*.js",
-        "types": "./dist/*.d.ts"
       }
     },
     "main": "./dist/index.js",

packages/plugin-cloud/package.json

@@ -2,8 +2,8 @@
   "name": "@payloadcms/plugin-cloud",
   "description": "The official Payload Cloud plugin",
   "version": "3.0.0-alpha.48",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -32,6 +32,24 @@
     "payload": "workspace:*",
     "ts-jest": "^29.1.0"
   },
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "types": "./src/index.ts"
+    }
+  },
+  "publishConfig": {
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js",
+        "types": "./dist/index.js"
+      }
+    }
+  },
   "files": [
     "dist"
   ]

packages/plugin-form-builder/package.json

@@ -4,8 +4,8 @@
   "version": "1.2.1",
   "homepage:": "https://payloadcms.com",
   "repository": "git@github.com:payloadcms/plugin-form-builder.git",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
   "license": "MIT",
   "author": "dev@payloadcms.com",
   "type": "module",
@@ -38,6 +38,24 @@
     "react": "^18.0.0",
     "ts-node": "10.9.1"
   },
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "types": "./src/index.ts"
+    }
+  },
+  "publishConfig": {
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      }
+    }
+  },
   "files": [
     "dist",
     "types.js",

packages/plugin-nested-docs/package.json

@@ -26,15 +26,21 @@
   },
   "exports": {
     ".": {
-      "default": "./src/index.ts",
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
       "types": "./src/index.ts"
     }
   },
   "publishConfig": {
-    "exports": null,
     "main": "./dist/index.js",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/index.d.ts"
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      }
+    }
   },
   "files": [
     "dist",

packages/plugin-redirects/package.json

@@ -4,8 +4,8 @@
   "homepage:": "https://payloadcms.com",
   "repository": "git@github.com:payloadcms/plugin-redirects.git",
   "description": "Redirects plugin for Payload",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
   "type": "module",
   "scripts": {
     "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types",
@@ -38,15 +38,21 @@
   },
   "exports": {
     ".": {
-      "default": "./src/index.ts",
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
       "types": "./src/index.ts"
     }
   },
   "publishConfig": {
-    "exports": null,
     "main": "./dist/index.js",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/index.d.ts"
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      }
+    }
   },
   "files": [
     "dist",

packages/plugin-redirects/src/index.ts

@@ -79,4 +79,4 @@ const redirects =
     ],
   })
 
-export default redirects
+export { redirects }

packages/plugin-search/package.json

@@ -43,8 +43,8 @@
   },
   "exports": {
     ".": {
-      "default": "./src/index.ts",
-      "types": "./src/index.ts"
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
     }
   },
   "publishConfig": {

packages/plugin-sentry/package.json

@@ -4,8 +4,8 @@
   "homepage:": "https://payloadcms.com",
   "repository": "git@github.com:payloadcms/plugin-sentry.git",
   "description": "Sentry plugin for Payload",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
   "type": "module",
   "scripts": {
     "build": "echo \"Build temporarily disabled.\" && exit 0",
@@ -50,5 +50,23 @@
     "payload": "workspace:*",
     "ts-jest": "^29.1.0",
     "webpack": "^5.78.0"
+  },
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "types": "./src/index.ts"
+    }
+  },
+  "publishConfig": {
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      }
+    }
   }
 }

packages/plugin-seo/package.json

@@ -4,8 +4,8 @@
   "homepage:": "https://payloadcms.com",
   "repository": "git@github.com:payloadcms/plugin-seo.git",
   "description": "SEO plugin for Payload",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./src/index.tsx",
+  "types": "./src/index.tsx",
   "type": "module",
   "scripts": {
     "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types",
@@ -44,8 +44,9 @@
   },
   "exports": {
     ".": {
-      "default": "./src/index.ts",
-      "types": "./src/index.ts"
+      "import": "./src/index.tsx",
+      "types": "./src/index.tsx",
+      "default": "./src/index.tsx"
     }
   },
   "publishConfig": {

packages/plugin-stripe/package.json

@@ -4,8 +4,8 @@
   "homepage:": "https://payloadcms.com",
   "repository": "git@github.com:payloadcms/plugin-stripe.git",
   "description": "Stripe plugin for Payload",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
   "type": "module",
   "scripts": {
     "build": "echo \"Build temporarily disabled.\" && exit 0",
@@ -48,6 +48,24 @@
     "react": "^18.0.0",
     "webpack": "^5.78.0"
   },
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "types": "./src/index.ts"
+    }
+  },
+  "publishConfig": {
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      }
+    }
+  },
   "files": [
     "dist",
     "types.js",

packages/richtext-slate/package.json

@@ -6,8 +6,8 @@
   "license": "MIT",
   "homepage": "https://payloadcms.com",
   "author": "Payload CMS, Inc.",
-  "main": "./src/index.ts",
-  "types": "./dist/index.d.ts",
+  "main": "./src/index.tsx",
+  "types": "./src/index.tsx",
   "type": "module",
   "scripts": {
     "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types",
@@ -40,18 +40,13 @@
   },
   "exports": {
     ".": {
-      "default": "./src/index.ts",
-      "types": "./src/index.ts"
+      "import": "./src/index.tsx",
+      "require": "./src/index.tsx",
+      "types": "./src/index.tsx"
     }
   },
   "publishConfig": {
-    "exports": {
-      ".": {
-        "import": "./dist/index.js",
-        "require": "./dist/index.js",
-        "types": "./dist/index.d.ts"
-      }
-    },
+    "exports": null,
     "main": "./dist/index.js",
     "registry": "https://registry.npmjs.org/",
     "types": "./dist/index.d.ts"

pnpm-lock.yaml

@@ -1443,6 +1443,75 @@ importers:
         specifier: ^5.1.4
         version: 5.1.4(webpack@5.90.3)
 
+  test:
+    devDependencies:
+      '@payloadcms/db-mongodb':
+        specifier: workspace:*
+        version: link:../packages/db-mongodb
+      '@payloadcms/db-postgres':
+        specifier: workspace:*
+        version: link:../packages/db-postgres
+      '@payloadcms/eslint-config':
+        specifier: workspace:*
+        version: link:../packages/eslint-config-payload
+      '@payloadcms/graphql':
+        specifier: workspace:*
+        version: link:../packages/graphql
+      '@payloadcms/live-preview':
+        specifier: workspace:*
+        version: link:../packages/live-preview
+      '@payloadcms/live-preview-react':
+        specifier: workspace:*
+        version: link:../packages/live-preview-react
+      '@payloadcms/next':
+        specifier: workspace:*
+        version: link:../packages/next
+      '@payloadcms/plugin-cloud':
+        specifier: workspace:*
+        version: link:../packages/plugin-cloud
+      '@payloadcms/plugin-cloud-storage':
+        specifier: workspace:*
+        version: link:../packages/plugin-cloud-storage
+      '@payloadcms/plugin-form-builder':
+        specifier: workspace:*
+        version: link:../packages/plugin-form-builder
+      '@payloadcms/plugin-nested-docs':
+        specifier: workspace:*
+        version: link:../packages/plugin-nested-docs
+      '@payloadcms/plugin-redirects':
+        specifier: workspace:*
+        version: link:../packages/plugin-redirects
+      '@payloadcms/plugin-search':
+        specifier: workspace:*
+        version: link:../packages/plugin-search
+      '@payloadcms/plugin-sentry':
+        specifier: workspace:*
+        version: link:../packages/plugin-sentry
+      '@payloadcms/plugin-seo':
+        specifier: workspace:*
+        version: link:../packages/plugin-seo
+      '@payloadcms/plugin-stripe':
+        specifier: workspace:*
+        version: link:../packages/plugin-stripe
+      '@payloadcms/richtext-lexical':
+        specifier: workspace:*
+        version: link:../packages/richtext-lexical
+      '@payloadcms/richtext-slate':
+        specifier: workspace:*
+        version: link:../packages/richtext-slate
+      '@payloadcms/translations':
+        specifier: workspace:*
+        version: link:../packages/translations
+      '@payloadcms/ui':
+        specifier: workspace:*
+        version: link:../packages/ui
+      create-payload-app:
+        specifier: workspace:*
+        version: link:../packages/create-payload-app
+      payload:
+        specifier: workspace:*
+        version: link:../packages/payload
+
 packages:
 
   /@aashutoshrathi/word-wrap@1.2.6:

pnpm-workspace.yaml

@@ -1,6 +1,6 @@
 packages:
   # all packages in direct subdirs of packages/
   - 'packages/*'
-  - 'test/REST_API'
+  - 'test'
   # exclude packages that are inside test directories
   # - '!**/test/**'

test/_community/collections/Media/index.ts

@@ -1,4 +1,6 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
+
+import { getPayload } from 'payload'
 
 export const mediaSlug = 'media'
 

test/_community/collections/Posts/index.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { mediaSlug } from '../Media/index.js'
 

test/_community/config.ts

@@ -1,6 +1,6 @@
 import path from 'path'
+import { getFileByPath } from 'payload/uploads'
 
-import getFileByPath from '../../packages/payload/src/uploads/getFileByPath.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { MediaCollection } from './collections/Media/index.js'

test/_community/globals/Menu/index.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 export const menuSlug = 'menu'
 

test/_community/int.spec.ts

@@ -1,4 +1,5 @@
-import type { Payload } from '../../packages/payload/types.js'
+import type { Payload } from 'payload'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { devUser } from '../credentials.js'

test/access-control/config.ts

@@ -1,4 +1,4 @@
-import type { FieldAccess } from '../../packages/payload/src/fields/config/types.js'
+import type { FieldAccess } from 'payload/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'

test/access-control/e2e.spec.ts

@@ -1,13 +1,13 @@
 import type { Page } from '@playwright/test'
+import type { Payload } from 'payload/types'
 
 import { expect, test } from '@playwright/test'
 import path from 'path'
+import { wait } from 'payload/utilities'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/types/index.js'
 import type { ReadOnlyCollection, RestrictedVersion } from './payload-types.js'
 
-import wait from '../../packages/payload/src/utilities/wait.js'
 import { exactText, initPageConsoleErrorCatch, openDocControls, openNav } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2E } from '../helpers/initPayloadE2E.js'

test/access-control/int.spec.ts

@@ -1,7 +1,9 @@
-import type { Payload, PayloadRequest } from '../../packages/payload/src/types/index.js'
+import type { Payload, PayloadRequest } from 'payload/types'
+
+import { Forbidden } from 'payload/errors'
+
 import type { Post, RelyOnRequestHeader, Restricted } from './payload-types.js'
 
-import { Forbidden } from '../../packages/payload/src/errors/index.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise, { requestHeaders } from './config.js'
 import {

test/admin/collections/CustomIdRow.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const CustomIdRow: CollectionConfig = {
   slug: 'customIdRow',

test/admin/collections/CustomIdTab.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const CustomIdTab: CollectionConfig = {
   slug: 'customIdTab',

test/admin/collections/CustomViews1.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { CustomEditView } from '../components/views/CustomEdit/index.js'
 import { customViews1CollectionSlug } from '../slugs.js'

test/admin/collections/CustomViews2.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { CustomTabComponent } from '../components/CustomTabComponent/index.js'
 import { CustomTabView } from '../components/views/CustomTab/index.js'

test/admin/collections/Geo.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { CollectionAPIButton } from '../components/CollectionAPIButton/index.js'
 import { CollectionEditButton } from '../components/CollectionEditButton/index.js'

test/admin/collections/Group1A.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group1Collection1Slug } from '../slugs.js'
 

test/admin/collections/Group1B.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group1Collection2Slug } from '../slugs.js'
 

test/admin/collections/Group2A.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group2Collection1Slug } from '../slugs.js'
 

test/admin/collections/Group2B.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group2Collection2Slug } from '../slugs.js'
 

test/admin/collections/Hidden.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { hiddenCollectionSlug } from '../slugs.js'
 

test/admin/collections/NoApiView.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { noApiViewCollectionSlug } from '../slugs.js'
 

test/admin/collections/Posts.ts

@@ -1,6 +1,7 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import { slateEditor } from '@payloadcms/richtext-slate'
+
+import type { CollectionConfig } from 'payload/types'
 
-import { slateEditor } from '../../../packages/richtext-slate/src/index.js'
 import { DemoUIFieldCell } from '../components/DemoUIField/Cell.js'
 import { DemoUIField } from '../components/DemoUIField/Field.js'
 import {
@@ -12,27 +13,19 @@ import { postsCollectionSlug } from '../slugs.js'
 
 export const Posts: CollectionConfig = {
   slug: postsCollectionSlug,
-  labels: {
-    singular: slugSingularLabel,
-    plural: slugPluralLabel,
-  },
   admin: {
-    description: 'Description',
-    listSearchableFields: ['id', 'title', 'description', 'number'],
-    group: 'One',
-    useAsTitle: 'title',
     defaultColumns: ['id', 'number', 'title', 'description', 'demoUIField'],
+    description: 'Description',
+    group: 'One',
+    listSearchableFields: ['id', 'title', 'description', 'number'],
     preview: () => 'https://payloadcms.com',
-  },
-  versions: {
-    drafts: true,
+    useAsTitle: 'title',
   },
   fields: [
     {
       type: 'tabs',
       tabs: [
         {
-          label: 'Tab 1',
           fields: [
             {
               name: 'title',
@@ -56,17 +49,18 @@ export const Posts: CollectionConfig = {
               }),
             },
             {
-              type: 'ui',
               name: 'demoUIField',
-              label: 'Demo UI Field',
+              type: 'ui',
               admin: {
                 components: {
-                  Field: DemoUIField,
                   Cell: DemoUIFieldCell,
+                  Field: DemoUIField,
                 },
               },
+              label: 'Demo UI Field',
             },
           ],
+          label: 'Tab 1',
         },
       ],
     },
@@ -83,22 +77,22 @@ export const Posts: CollectionConfig = {
     {
       name: 'relationship',
       type: 'relationship',
-      relationTo: 'posts',
       admin: {
         position: 'sidebar',
       },
+      relationTo: 'posts',
     },
     {
       name: 'sidebarField',
       type: 'text',
-      admin: {
-        position: 'sidebar',
-        description:
-          'This is a very long description that takes many characters to complete and hopefully will wrap instead of push the sidebar open, lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, voluptatum voluptates. Quisquam, voluptatum voluptates.',
-      },
       access: {
         update: () => false,
       },
+      admin: {
+        description:
+          'This is a very long description that takes many characters to complete and hopefully will wrap instead of push the sidebar open, lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, voluptatum voluptates. Quisquam, voluptatum voluptates.',
+        position: 'sidebar',
+      },
     },
     {
       name: 'descriptionAsString',
@@ -122,4 +116,11 @@ export const Posts: CollectionConfig = {
       },
     },
   ],
+  labels: {
+    plural: slugPluralLabel,
+    singular: slugSingularLabel,
+  },
+  versions: {
+    drafts: true,
+  },
 }

test/admin/collections/Users.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { usersCollectionSlug } from '../slugs.js'
 

test/admin/components/AfterNavLinks/index.tsx

@@ -1,12 +1,14 @@
 'use client'
 
+import { useConfig } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
 import React from 'react'
 
 // As this is the demo project, we import our dependencies from the `src` directory.
-import { useConfig } from '../../../../packages/ui/src/providers/Config/index.js'
+// import { useConfig } from '@payloadcms/ui'
+// import { useConfig } from '@payloadcms/ui'
 
 // In your projects, you can import as follows:
 // import { useConfig } from 'payload/components/utilities';

test/admin/components/BeforeLogin/index.tsx

@@ -2,7 +2,7 @@
 
 import React from 'react'
 
-import { useTranslation } from '../../../../packages/ui/src/providers/Translation/index.js'
+import { useTranslation } from '@payloadcms/ui'
 
 export const BeforeLogin: React.FC = () => {
   const translation = useTranslation()

test/admin/components/CustomTabComponent/index.tsx

@@ -1,10 +1,10 @@
 'use client'
 
+import type { DocumentTabComponent } from 'payload/types'
+
 import React from 'react'
 import { Link, useRouteMatch } from 'react-router-dom'
 
-import type { DocumentTabComponent } from '../../../../packages/payload/src/admin/types.js'
-
 import './index.scss'
 
 export const CustomTabComponent: DocumentTabComponent = (props) => {

test/admin/components/FieldDescription/index.tsx

@@ -1,9 +1,6 @@
-import React from 'react'
+import type { DescriptionComponent, DescriptionFunction } from 'payload/types'
 
-import type {
-  DescriptionComponent,
-  DescriptionFunction,
-} from '../../../../packages/payload/src/admin/types.js'
+import React from 'react'
 
 export const FieldDescriptionComponent: DescriptionComponent<string> = ({ path, value }) => {
   return (

test/admin/components/Logout/index.tsx

@@ -2,8 +2,8 @@
 
 import React from 'react'
 
-import { LogOut } from '../../../../packages/ui/src/icons/LogOut/index.js'
-import { useConfig } from '../../../../packages/ui/src/providers/Config/index.js'
+import { LogOut } from '@payloadcms/ui'
+import { useConfig } from '@payloadcms/ui'
 
 export const Logout: React.FC = () => {
   const config = useConfig()

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

@@ -1,6 +1,6 @@
-import React, { Fragment } from 'react'
+import type { AdminViewComponent } from 'payload/types'
 
-import type { AdminViewComponent } from '../../../../../packages/payload/src/admin/types.js'
+import React, { Fragment } from 'react'
 
 export const CustomAccountView: AdminViewComponent = () => {
   return (

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

@@ -1,6 +1,6 @@
-import React, { Fragment } from 'react'
+import type { AdminViewComponent } from 'payload/types'
 
-import type { AdminViewComponent } from '../../../../../packages/payload/src/admin/types.js'
+import React, { Fragment } from 'react'
 
 export const CustomDashboardView: AdminViewComponent = () => {
   return (

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

@@ -4,7 +4,7 @@ import React from 'react'
 
 import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
-import { Button, DefaultTemplate, SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { Button, DefaultTemplate, SetStepNav } from '@payloadcms/ui'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 

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

@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { EditViewComponent } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 
 export const CustomEditView: EditViewComponent = ({ initPageResult }) => {
   if (!initPageResult) {

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

@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { EditViewComponent } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 
 export const CustomDefaultEditView: EditViewComponent = ({ initPageResult }) => {
   if (!initPageResult) {

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

@@ -1,9 +1,9 @@
 import LinkImport from 'next/link.js'
 import React from 'react'
 
-import { Button } from '../../../../../packages/ui/src/elements/Button/index.js'
+import { Button } from '@payloadcms/ui'
 // As this is the demo project, we import our dependencies from the `src` directory.
-import { MinimalTemplate } from '../../../../../packages/ui/src/templates/Minimal/index.js'
+import { MinimalTemplate } from '@payloadcms/ui'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 

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

@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 import { customTabViewTitle } from '../../../shared.js'
 
 export const CustomTabView: React.FC<ServerSideEditViewProps> = ({ initPageResult }) => {

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

@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 import { customTabViewTitle } from '../../../shared.js'
 
 export const CustomTabView2: React.FC<ServerSideEditViewProps> = ({ initPageResult }) => {

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

@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 import { customNestedTabViewTitle } from '../../../shared.js'
 
 export const CustomNestedTabView: React.FC<ServerSideEditViewProps> = ({ initPageResult }) => {

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

@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { EditViewComponent } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 
 export const CustomVersionsView: EditViewComponent = ({ initPageResult }) => {
   if (!initPageResult) {

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

@@ -1,4 +1,4 @@
-// import { Button } from '../../../../../packages/ui/src/index.js'
+// import { Button } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import React from 'react'
 
@@ -6,7 +6,7 @@ import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
-import { Button } from '../../../../../packages/ui/src/elements/Button/index.js'
+import { Button } from '@payloadcms/ui'
 import { customNestedViewPath, customViewTitle } from '../../../shared.js'
 
 export const CustomView: React.FC<AdminViewProps> = ({ initPageResult }) => {

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

@@ -3,7 +3,7 @@ import React from 'react'
 
 import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
-import { Button } from '../../../../../packages/ui/src/index.js'
+import { Button } from '@payloadcms/ui'
 import { customNestedViewTitle, customViewPath } from '../../../shared.js'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default

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

@@ -3,7 +3,7 @@ import React from 'react'
 
 import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
-import { Button } from '../../../../../packages/ui/src/elements/Button/index.js'
+import { Button } from '@payloadcms/ui'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 

test/admin/e2e.spec.ts

@@ -1,13 +1,13 @@
 import type { Page } from '@playwright/test'
+import type { Payload } from 'payload'
 
 import { expect, test } from '@playwright/test'
+import { wait } from 'payload/utilities'
+import { mapAsync } from 'payload/utilities'
 import qs from 'qs'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { Geo, Post } from './payload-types.js'
 
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
-import wait from '../../packages/payload/src/utilities/wait.js'
 import {
   checkBreadcrumb,
   checkPageTitle,
@@ -872,8 +872,8 @@ describe('admin', () => {
         const whereQueryJSON = {
           point: {
             within: {
-              coordinates: [polygon],
               type: 'Polygon',
+              coordinates: [polygon],
             },
           },
         }
@@ -1299,8 +1299,8 @@ async function deleteAllPosts() {
   await Promise.all([
     ...posts.docs.map((post) => {
       return payload.delete({
-        collection: postsCollectionSlug,
         id: post.id,
+        collection: postsCollectionSlug,
       })
     }),
   ])

test/admin/globals/CustomViews1.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { CustomEditView } from '../components/views/CustomEdit/index.js'
 import { customGlobalViews1GlobalSlug } from '../slugs.js'

test/admin/globals/CustomViews2.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { CustomTabComponent } from '../components/CustomTabComponent/index.js'
 import { CustomDefaultEditView } from '../components/views/CustomEditDefault/index.js'

test/admin/globals/Global.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { GlobalAPIButton } from '../components/GlobalAPIButton/index.js'
 import { GlobalEditButton } from '../components/GlobalEditButton/index.js'

test/admin/globals/Group1A.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { group1GlobalSlug } from '../slugs.js'
 

test/admin/globals/Group1B.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { group2GlobalSlug } from '../slugs.js'
 

test/admin/globals/Hidden.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { hiddenGlobalSlug } from '../slugs.js'
 

test/admin/globals/NoApiView.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { noApiViewGlobalSlug } from '../slugs.js'
 

test/admin/seed.ts

@@ -1,11 +1,10 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { devUser } from '../credentials.js'
 import { seedDB } from '../helpers/seed.js'
 import {
   collectionSlugs,
   customIdCollectionId,
-  customIdCollectionSlug,
   customViews1CollectionSlug,
   customViews2CollectionSlug,
   geoCollectionSlug,
@@ -30,7 +29,7 @@ export async function clearAndSeedEverything(_payload: Payload) {
           },
         }),
         ...[...Array(11)].map(() => {
-          _payload.create({
+          void _payload.create({
             collection: postsCollectionSlug,
             data: {
               title: 'Title',

test/array-update/int.spec.ts

@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'

test/auth/AuthDebug.tsx

@@ -1,12 +1,11 @@
 'use client'
 
+import type { User } from 'payload/auth'
+import type { UIField } from 'payload/types'
+
+import { useAuth } from '@payloadcms/ui'
 import React, { useEffect, useState } from 'react'
 
-import type { User } from '../../packages/payload/src/auth/types.js'
-import type { UIField } from '../../packages/payload/src/fields/config/types.js'
-
-import { useAuth } from '../../packages/ui/src/providers/Auth/index.js'
-
 export const AuthDebug: React.FC<UIField> = () => {
   const [state, setState] = useState<User | null | undefined>()
   const { user } = useAuth()

test/auth/config.ts

@@ -1,6 +1,6 @@
+import { mapAsync } from 'payload/utilities'
 import { v4 as uuid } from 'uuid'
 
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { AuthDebug } from './AuthDebug.js'

test/auth/custom-strategy/int.spec.ts

@@ -1,6 +1,6 @@
-import type { Payload } from '../../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
-import { getPayload } from '../../../packages/payload/src/index.js'
+import { getPayload } from 'payload'
 import { NextRESTClient } from '../../helpers/NextRESTClient.js'
 import { startMemoryDB } from '../../startMemoryDB.js'
 import configPromise from './config.js'

test/auth/e2e.spec.ts

@@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPageConsoleErrorCatch, login, saveDocAndAssert } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'

test/auth/int.spec.ts

@@ -1,7 +1,8 @@
+import type { Payload } from 'payload'
+import type { User } from 'payload/auth'
+
 import jwtDecode from 'jwt-decode'
 
-import type { User } from '../../packages/payload/src/auth/index.js'
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { devUser } from '../credentials.js'

test/auth/removed-token/int.spec.ts

@@ -1,6 +1,6 @@
-import type { Payload } from '../../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
-import { getPayload } from '../../../packages/payload/src/index.js'
+import { getPayload } from 'payload'
 import { devUser } from '../../credentials.js'
 import { NextRESTClient } from '../../helpers/NextRESTClient.js'
 import { startMemoryDB } from '../../startMemoryDB.js'

test/auth/ui/AuthDebug.tsx

@@ -1,17 +1,16 @@
+import type { User } from 'payload/auth'
+import type { UIField } from 'payload/types'
+
+import { useAuth } from '@payloadcms/ui'
 import React, { useEffect, useState } from 'react'
 
-import type { User } from '../../../packages/payload/src/auth/index.js'
-import type { UIField } from '../../../packages/payload/src/fields/config/types.js'
-
-import { useAuth } from '../../../packages/ui/src/providers/Auth/index.js'
-
 export const AuthDebug: React.FC<UIField> = () => {
   const [state, setState] = useState<User | null | undefined>()
   const { user } = useAuth()
 
   useEffect(() => {
     if (user) {
-      fetch(`/api/users/${user.id}`)
+      void fetch(`/api/users/${user.id}`)
         .then((r) => r.json())
         .then((newUser) => {
           setState(newUser)

test/buildConfigWithDefaults.ts

@@ -1,10 +1,7 @@
-import sharp from 'sharp'
+import type { SanitizedConfig } from 'payload/types'
 
-import type { Config, SanitizedConfig } from '../packages/payload/src/config/types.js'
-
-import { mongooseAdapter } from '../packages/db-mongodb/src/index.js'
-import { postgresAdapter } from '../packages/db-postgres/src/index.js'
-import { buildConfig as buildPayloadConfig } from '../packages/payload/src/config/build.js'
+import { mongooseAdapter } from '@payloadcms/db-mongodb'
+import { postgresAdapter } from '@payloadcms/db-postgres'
 import {
   AlignFeature,
   BlockQuoteFeature,
@@ -27,8 +24,10 @@ import {
   UnorderedListFeature,
   UploadFeature,
   lexicalEditor,
-} from '../packages/richtext-lexical/src/index.js'
-// import { slateEditor } from '../packages/richtext-slate/src/index.js'
+} from '@payloadcms/richtext-lexical'
+// import { slateEditor } from '@payloadcms/richtext-slate'
+import { type Config, buildConfig } from 'payload/config'
+import sharp from 'sharp'
 // process.env.PAYLOAD_DATABASE = 'postgres'
 
 const databaseAdapters = {
@@ -184,5 +183,5 @@ export function buildConfigWithDefaults(testConfig?: Partial<Config>): Promise<S
     config.admin.disable = true
   }
 
-  return buildPayloadConfig(config)
+  return buildConfig(config)
 }

test/collections-graphql/config.ts

@@ -1,8 +1,8 @@
+import type { CollectionConfig } from 'payload/types'
+
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
-
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 const filename = fileURLToPath(import.meta.url)

test/collections-graphql/int.spec.ts

@@ -1,8 +1,10 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+
+import { getPayload } from 'payload'
+import { mapAsync } from 'payload/utilities'
+
 import type { Post } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
 import { NextRESTClient } from '../helpers/NextRESTClient.js'
 import { idToString } from '../helpers/idToString.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'

test/collections-rest/config.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'

test/collections-rest/int.spec.ts

@@ -1,11 +1,12 @@
-import { randomBytes } from 'crypto'
+import type { Payload } from 'payload'
+
+import { randomBytes } from 'crypto'
+import { getPayload } from 'payload'
+import { mapAsync } from 'payload/utilities'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { Relation } from './config.js'
 import type { Post } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
 import { NextRESTClient } from '../helpers/NextRESTClient.js'
 import { startMemoryDB } from '../startMemoryDB.js'
 import configPromise, {
@@ -1021,6 +1022,7 @@ describe('collections-rest', () => {
 
           it('should sort find results by nearest distance', async () => {
             // creating twice as many records as we are querying to get a random sample
+            // eslint-disable-next-line @typescript-eslint/require-await
             await mapAsync([...Array(10)], async () => {
               // setTimeout used to randomize the creation timestamp
               setTimeout(async () => {

test/config/int.spec.ts

@@ -1,5 +1,5 @@
-import type { BlockField } from '../../packages/payload/src/fields/config/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+import type { BlockField } from 'payload/types'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'

test/custom-graphql/config.ts

@@ -1,6 +1,5 @@
-import { commitTransaction } from '../../packages/payload/src/utilities/commitTransaction.js'
-import { initTransaction } from '../../packages/payload/src/utilities/initTransaction.js'
-import { killTransaction } from '../../packages/payload/src/utilities/killTransaction.js'
+import { commitTransaction, initTransaction, killTransaction } from 'payload/database'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 

test/custom-graphql/int.spec.ts

@@ -1,4 +1,5 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'

test/database/int.spec.ts

@@ -1,15 +1,13 @@
+import type { PostgresAdapter } from '@payloadcms/db-postgres/types'
+import type { Payload } from 'payload'
+import type { PayloadRequest, TypeWithID } from 'payload/types'
+
 import { sql } from 'drizzle-orm'
 import fs from 'fs'
 import path from 'path'
+import { commitTransaction, initTransaction } from 'payload/database'
 import { fileURLToPath } from 'url'
 
-import type { PostgresAdapter } from '../../packages/db-postgres/src/types.js'
-import type { TypeWithID } from '../../packages/payload/src/collections/config/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
-import type { PayloadRequest } from '../../packages/payload/src/types/index.js'
-
-import { commitTransaction } from '../../packages/payload/src/utilities/commitTransaction.js'
-import { initTransaction } from '../../packages/payload/src/utilities/initTransaction.js'
 import { devUser } from '../credentials.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import removeFiles from '../helpers/removeFiles.js'

test/dataloader/config.ts

@@ -1,4 +1,5 @@
-import { slateEditor } from '../../packages/richtext-slate/src/index.js'
+import { slateEditor } from '@payloadcms/richtext-slate'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 

test/dataloader/int.spec.ts

@@ -1,4 +1,5 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { devUser } from '../credentials.js'
@@ -92,8 +93,8 @@ describe('dataloader', () => {
       expect(relationB.id).toBeDefined()
 
       await payload.update({
-        collection: 'relation-a',
         id: relationA.id,
+        collection: 'relation-a',
         data: {
           relationship: relationB.id,
           richText: [
@@ -105,32 +106,32 @@ describe('dataloader', () => {
               ],
             },
             {
+              type: 'relationship',
               children: [
                 {
                   text: '',
                 },
               ],
-              type: 'relationship',
+              relationTo: 'relation-b',
               value: {
                 id: relationB.id,
               },
-              relationTo: 'relation-b',
             },
           ],
         },
       })
 
       const relationANoDepth = await payload.findByID({
-        collection: 'relation-a',
         id: relationA.id,
+        collection: 'relation-a',
         depth: 0,
       })
 
       expect(relationANoDepth.relationship).toStrictEqual(relationB.id)
 
       const relationAWithDepth = await payload.findByID({
-        collection: 'relation-a',
         id: relationA.id,
+        collection: 'relation-a',
         depth: 4,
       })
 

test/endpoints/endpoints/collections.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const collectionEndpoints: CollectionConfig['endpoints'] = [
   {

test/endpoints/endpoints/globals.ts

@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { globalEndpoint } from '../shared.js'
 

test/endpoints/endpoints/root.ts

@@ -1,4 +1,4 @@
-import type { Config } from '../../../packages/payload/src/config/types.js'
+import type { Config } from 'payload/config'
 
 import { applicationEndpoint, rootEndpoint } from '../shared.js'
 

test/endpoints/int.spec.ts

@@ -1,6 +1,7 @@
+import { type Payload } from 'payload'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
-import { type Payload } from '../../packages/payload/src/index.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
 import {

test/field-error-states/collections/ErrorFields/index.ts

@@ -1,5 +1,5 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
-import type { Field } from '../../../../packages/payload/src/fields/config/types.js'
+import type { CollectionConfig } from 'payload/types'
+import type { Field } from 'payload/types'
 
 export const errorFieldsSlug = 'error-fields'
 

test/field-error-states/collections/Upload/index.ts

@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 const Uploads: CollectionConfig = {
   slug: 'uploads',

test/field-perf/config.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 

test/fields-relationship/PrePopulateFieldUI/index.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { useField } from '../../../packages/ui/src/forms/useField/index.js'
+import { useField } from '@payloadcms/ui'
 import { collection1Slug } from '../collectionSlugs.js'
 
 export const PrePopulateFieldUI: React.FC<{

test/fields-relationship/config.ts

@@ -1,7 +1,8 @@
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
-import type { FilterOptionsProps } from '../../packages/payload/src/fields/config/types.js'
+import type { CollectionConfig } from 'payload/types'
+import type { FilterOptionsProps } from 'payload/types'
+
+import { mapAsync } from 'payload/utilities'
 
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { PrePopulateFieldUI } from './PrePopulateFieldUI/index.js'
@@ -105,7 +106,7 @@ export default buildConfigWithDefaults({
         },
         {
           name: 'relationshipFilteredAsync',
-          filterOptions: async (args: FilterOptionsProps<FieldsRelationship>) => {
+          filterOptions: (args: FilterOptionsProps<FieldsRelationship>) => {
             return {
               id: {
                 equals: args.data.relationship,
@@ -410,13 +411,13 @@ export default buildConfigWithDefaults({
       })
     })
     ;[...Array(15)].forEach((_, i) => {
-      payload.create({
+      void payload.create({
         collection: collection1Slug,
         data: {
           name: `relationship-test ${i}`,
         },
       })
-      payload.create({
+      void payload.create({
         collection: collection2Slug,
         data: {
           name: `relationship-test ${i}`,

test/fields-relationship/e2e.spec.ts

@@ -1,10 +1,11 @@
 import type { Page } from '@playwright/test'
+import type { Payload } from 'payload'
 
 import { expect, test } from '@playwright/test'
 import path from 'path'
+import { wait } from 'payload/utilities'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type {
   FieldsRelationship as CollectionWithRelationships,
   RelationOne,
@@ -13,7 +14,6 @@ import type {
   RelationWithTitle,
 } from './payload-types.js'
 
-import wait from '../../packages/payload/src/utilities/wait.js'
 import { initPageConsoleErrorCatch, openDocControls, saveDocAndAssert } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2E } from '../helpers/initPayloadE2E.js'

test/fields/collections/Array/LabelComponent.tsx

@@ -1,6 +1,6 @@
-import React from 'react'
+import type { RowLabelComponent } from 'payload/types'
 
-import type { RowLabelComponent } from '../../../../packages/payload/src/admin/forms/RowLabel.js'
+import React from 'react'
 
 export const ArrayRowLabel: RowLabelComponent = ({ data }) => {
   return (