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

Update templates with import breaking changes

.gitignore

@@ -12,6 +12,11 @@ test-results
 .localstack
 .turbo
 
+meta_client.json
+meta_server.json
+meta_index.json
+meta_shared.json
+
 .turbo
 
 # Ignore test directory media folder/files

.idea/payload.iml

@@ -74,6 +74,7 @@
       <excludeFolder url="file://$MODULE_DIR$/packages/translations/dist" />
       <excludeFolder url="file://$MODULE_DIR$/packages/ui/.swc" />
       <excludeFolder url="file://$MODULE_DIR$/packages/ui/.turbo" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/ui/dist" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

app/(payload)/layout.tsx

@@ -1,6 +1,7 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 import configPromise from '@payload-config'
 import { RootLayout } from '@payloadcms/next/layouts'
+// import '@payloadcms/ui/styles.css' // Uncomment this line if `@payloadcms/ui/client` in `tsconfig.json` points to `/ui/dist` instead of `/ui/src`
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
 

package.json

@@ -1,13 +1,15 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-beta.48",
+  "version": "3.0.0-beta.51",
   "private": true,
   "type": "module",
   "scripts": {
+    "bf": "pnpm run build:force",
     "build": "pnpm run build:core",
     "build:all": "turbo build",
     "build:app": "next build",
     "build:app:analyze": "cross-env ANALYZE=true next build",
+    "build:clean": "pnpm clean:build",
     "build:core": "turbo build --filter \"!@payloadcms/plugin-*\"",
     "build:core:force": "pnpm clean:build && turbo build --filter \"!@payloadcms/plugin-*\" --no-cache --force",
     "build:create-payload-app": "turbo build --filter create-payload-app",
@@ -16,6 +18,7 @@
     "build:email-nodemailer": "turbo build --filter email-nodemailer",
     "build:email-resend": "turbo build --filter email-resend",
     "build:eslint-config-payload": "turbo build --filter eslint-config-payload",
+    "build:force": "pnpm run build:core:force",
     "build:graphql": "turbo build --filter graphql",
     "build:live-preview": "turbo build --filter live-preview",
     "build:live-preview-react": "turbo build --filter live-preview-react",
@@ -43,8 +46,8 @@
     "build:translations": "turbo build --filter translations",
     "build:ui": "turbo build --filter ui",
     "clean": "turbo clean",
-    "clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz'",
-    "clean:build": "node ./scripts/delete-recursively.js 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz'",
+    "clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
+    "clean:build": "node ./scripts/delete-recursively.js 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
     "clean:cache": "node ./scripts/delete-recursively.js node_modules/.cache! packages/payload/node_modules/.cache! .next",
     "dev": "cross-env NODE_OPTIONS=--no-deprecation node ./test/dev.js",
     "dev:generate-graphql-schema": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateGraphQLSchema.ts",
@@ -55,6 +58,7 @@
     "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",
+    "force:build": "pnpm run build:core:force",
     "lint": "eslint \"packages/**/*.ts\"",
     "lint-staged": "lint-staged",
     "obliterate-playwright-cache-macos": "rm -rf ~/Library/Caches/ms-playwright && find /System/Volumes/Data/private/var/folders -type d -name 'playwright*' -exec rm -rf {} +",
@@ -91,7 +95,7 @@
     "@payloadcms/eslint-config": "workspace:*",
     "@payloadcms/live-preview-react": "workspace:*",
     "@playwright/test": "1.43.0",
-    "@swc/cli": "^0.1.62",
+    "@swc/cli": "0.3.12",
     "@swc/jest": "0.2.36",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
@@ -147,13 +151,12 @@
     "slash": "3.0.0",
     "sort-package-json": "^2.10.0",
     "swc-plugin-transform-remove-imports": "^1.12.1",
-    "tempfile": "^3.0.0",
     "tempy": "^1.0.1",
     "ts-node": "10.9.1",
     "tsx": "^4.7.1",
     "turbo": "^1.13.3",
     "typescript": "5.4.5",
-    "uuid": "^9.0.1"
+    "uuid": "10.0.0"
   },
   "peerDependencies": {
     "react": "^19.0.0 || ^19.0.0-rc-f994737d14-20240522",
@@ -166,8 +169,7 @@
   "pnpm": {
     "allowedDeprecatedVersions": {
       "abab": "2",
-      "domexception": "4",
-      "uuid": "3.4.0"
+      "domexception": "4"
     },
     "overrides": {
       "@types/react": "npm:types-react@19.0.0-beta.2",

packages/create-payload-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-beta.48",
+  "version": "3.0.0-beta.51",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
   ],
   "scripts": {
     "build": "pnpm pack-template-files && pnpm typecheck && pnpm build:swc",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "pack-template-files": "tsx src/scripts/pack-template-files.ts",
     "prepublishOnly": "pnpm clean && pnpm build",

packages/create-payload-app/src/lib/configure-payload-config.ts

@@ -114,7 +114,7 @@ export async function configurePayloadConfig(args: {
         startMatch: '// storage-adapter-placeholder',
       })
 
-      if (replacement?.importReplacement) {
+      if (replacement?.importReplacement !== undefined) {
         configLines = replaceInConfigLines({
           lines: configLines,
           replacement: [replacement.importReplacement],

packages/create-payload-app/src/lib/replacements.ts

@@ -63,6 +63,7 @@ const payloadCloudReplacement: StorageAdapterReplacement = {
 // Removes placeholders
 const diskReplacement: StorageAdapterReplacement = {
   configReplacement: [],
+  importReplacement: '',
 }
 
 export const storageReplacements: Record<StorageAdapterType, StorageAdapterReplacement> = {

packages/create-payload-app/src/lib/wrap-next-config.ts

@@ -4,7 +4,7 @@ import chalk from 'chalk'
 import { Syntax, parseModule } from 'esprima-next'
 import fs from 'fs'
 
-import { log , warning } from '../utils/log.js'
+import { log, warning } from '../utils/log.js'
 
 export const withPayloadStatement = {
   cjs: `const { withPayload } = require('@payloadcms/next/withPayload')\n`,

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

@@ -3,7 +3,7 @@ import chalk from 'chalk'
 import path from 'path'
 import terminalLink from 'terminal-link'
 
-import type { PackageManager , ProjectTemplate } from '../types.js'
+import type { PackageManager, ProjectTemplate } from '../types.js'
 
 import { getValidTemplates } from '../lib/templates.js'
 

packages/create-payload-app/tsconfig.json

@@ -6,7 +6,7 @@
     "emitDeclarationOnly": true,
     "outDir": "./dist" /* Specify an output folder for all emitted files. */,
     "rootDir": "./src" /* Specify the root folder within your source files. */,
-    "strict": true,
+    "strict": true
   },
   "exclude": ["dist", "build", "tests", "test", "node_modules", ".eslintrc.js"],
   "include": ["src/**/*.ts", "src/**/*.spec.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"]

packages/db-mongodb/README.md

@@ -14,7 +14,7 @@ npm install @payloadcms/db-mongodb
 ## Usage
 
 ```ts
-import { buildConfig } from 'payload/config'
+import { buildConfig } from 'payload'
 import { mongooseAdapter } from '@payloadcms/db-mongodb'
 
 export default buildConfig({

packages/db-mongodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-beta.48",
+  "version": "3.0.0-beta.51",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -26,8 +26,8 @@
     "predefinedMigrations"
   ],
   "scripts": {
-    "build": "pnpm build:swc && pnpm build:types",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc-build",
+    "build": "pnpm build:types && pnpm build:swc",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "prepublishOnly": "pnpm clean && pnpm turbo build"
@@ -39,7 +39,7 @@
     "mongoose": "6.12.3",
     "mongoose-paginate-v2": "1.7.22",
     "prompts": "2.4.2",
-    "uuid": "^9.0.1"
+    "uuid": "10.0.0"
   },
   "devDependencies": {
     "@payloadcms/eslint-config": "workspace:*",

packages/db-mongodb/src/connect.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import type { ConnectOptions } from 'mongoose'
-import type { Connect } from 'payload/database'
+import type { Connect } from 'payload'
 
 import mongoose from 'mongoose'
 

packages/db-mongodb/src/count.ts

@@ -1,8 +1,7 @@
 import type { QueryOptions } from 'mongoose'
-import type { Count } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { Count, PayloadRequestWithData } from 'payload'
 
-import { flattenWhereToOperators } from 'payload/database'
+import { flattenWhereToOperators } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/create.ts

@@ -1,5 +1,4 @@
-import type { Create } from 'payload/database'
-import type { Document, PayloadRequestWithData } from 'payload/types'
+import type { Create, Document, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/createGlobal.ts

@@ -1,5 +1,4 @@
-import type { CreateGlobal } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { CreateGlobal, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/createGlobalVersion.ts

@@ -1,5 +1,4 @@
-import type { CreateGlobalVersion } from 'payload/database'
-import type { Document , PayloadRequestWithData } from 'payload/types'
+import type { CreateGlobalVersion, Document, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/createMigration.ts

@@ -1,9 +1,9 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
-import type { CreateMigration, MigrationTemplateArgs } from 'payload/database'
+import type { CreateMigration, MigrationTemplateArgs } from 'payload'
 
 import fs from 'fs'
 import path from 'path'
-import { getPredefinedMigration } from 'payload/database'
+import { getPredefinedMigration } from 'payload'
 import { fileURLToPath } from 'url'
 
 const migrationTemplate = ({ downSQL, imports, upSQL }: MigrationTemplateArgs): string => `import {

packages/db-mongodb/src/createVersion.ts

@@ -1,5 +1,4 @@
-import type { CreateVersion } from 'payload/database'
-import type { Document , PayloadRequestWithData } from 'payload/types'
+import type { CreateVersion, Document, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/deleteMany.ts

@@ -1,5 +1,4 @@
-import type { DeleteMany } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { DeleteMany, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/deleteOne.ts

@@ -1,5 +1,4 @@
-import type { DeleteOne } from 'payload/database'
-import type { Document , PayloadRequestWithData } from 'payload/types'
+import type { DeleteOne, Document, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/deleteVersions.ts

@@ -1,5 +1,4 @@
-import type { DeleteVersions } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { DeleteVersions, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/destroy.ts

@@ -1,4 +1,4 @@
-import type { Destroy } from 'payload/database'
+import type { Destroy } from 'payload'
 
 import mongoose from 'mongoose'
 

packages/db-mongodb/src/find.ts

@@ -1,8 +1,7 @@
 import type { PaginateOptions } from 'mongoose'
-import type { Find } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { Find, PayloadRequestWithData } from 'payload'
 
-import { flattenWhereToOperators } from 'payload/database'
+import { flattenWhereToOperators } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/findGlobal.ts

@@ -1,7 +1,6 @@
-import type { FindGlobal } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { FindGlobal, PayloadRequestWithData } from 'payload'
 
-import { combineQueries } from 'payload/database'
+import { combineQueries } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/findGlobalVersions.ts

@@ -1,9 +1,7 @@
 import type { PaginateOptions } from 'mongoose'
-import type { FindGlobalVersions } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { FindGlobalVersions, PayloadRequestWithData } from 'payload'
 
-import { flattenWhereToOperators } from 'payload/database'
-import { buildVersionGlobalFields } from 'payload/versions'
+import { buildVersionGlobalFields, flattenWhereToOperators } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/findOne.ts

@@ -1,6 +1,5 @@
 import type { MongooseQueryOptions } from 'mongoose'
-import type { FindOne } from 'payload/database'
-import type { Document , PayloadRequestWithData } from 'payload/types'
+import type { Document, FindOne, PayloadRequestWithData } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/findVersions.ts

@@ -1,8 +1,7 @@
 import type { PaginateOptions } from 'mongoose'
-import type { FindVersions } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { FindVersions, PayloadRequestWithData } from 'payload'
 
-import { flattenWhereToOperators } from 'payload/database'
+import { flattenWhereToOperators } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/index.ts

@@ -1,13 +1,12 @@
 import type { TransactionOptions } from 'mongodb'
 import type { MongoMemoryReplSet } from 'mongodb-memory-server'
 import type { ClientSession, ConnectOptions, Connection } from 'mongoose'
-import type { Payload } from 'payload'
-import type { BaseDatabaseAdapter, DatabaseAdapterObj } from 'payload/database'
+import type { BaseDatabaseAdapter, DatabaseAdapterObj, Payload } from 'payload'
 
 import fs from 'fs'
 import mongoose from 'mongoose'
 import path from 'path'
-import { createDatabaseAdapter } from 'payload/database'
+import { createDatabaseAdapter } from 'payload'
 
 import type { CollectionModel, GlobalModel } from './types.js'
 

packages/db-mongodb/src/init.ts

@@ -1,11 +1,10 @@
 /* eslint-disable no-param-reassign */
 import type { PaginateOptions } from 'mongoose'
-import type { Init } from 'payload/database'
-import type { SanitizedCollectionConfig } from 'payload/types'
+import type { Init, SanitizedCollectionConfig } from 'payload'
 
 import mongoose from 'mongoose'
 import paginate from 'mongoose-paginate-v2'
-import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions'
+import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 import type { CollectionModel } from './types.js'

packages/db-mongodb/src/migrateFresh.ts

@@ -1,11 +1,6 @@
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData } from 'payload'
 
-import {
-  commitTransaction,
-  initTransaction,
-  killTransaction,
-  readMigrationFiles,
-} from 'payload/database'
+import { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload'
 import prompts from 'prompts'
 
 import type { MongooseAdapter } from './index.js'

packages/db-mongodb/src/models/buildCollectionSchema.ts

@@ -1,6 +1,5 @@
 import type { PaginateOptions, Schema } from 'mongoose'
-import type { SanitizedConfig } from 'payload/config'
-import type { SanitizedCollectionConfig } from 'payload/types'
+import type { SanitizedCollectionConfig, SanitizedConfig } from 'payload'
 
 import paginate from 'mongoose-paginate-v2'
 

packages/db-mongodb/src/models/buildGlobalModel.ts

@@ -1,4 +1,4 @@
-import type { SanitizedConfig } from 'payload/config'
+import type { SanitizedConfig } from 'payload'
 
 import mongoose from 'mongoose'
 

packages/db-mongodb/src/models/buildSchema.ts

@@ -2,7 +2,6 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import type { IndexOptions, Schema, SchemaOptions, SchemaTypeOptions } from 'mongoose'
-import type { SanitizedConfig, SanitizedLocalizationConfig } from 'payload/config'
 import type {
   ArrayField,
   Block,
@@ -23,13 +22,15 @@ import type {
   RelationshipField,
   RichTextField,
   RowField,
+  SanitizedConfig,
+  SanitizedLocalizationConfig,
   SelectField,
   Tab,
   TabsField,
   TextField,
   TextareaField,
   UploadField,
-} from 'payload/types'
+} from 'payload'
 
 import mongoose from 'mongoose'
 import {
@@ -37,7 +38,7 @@ import {
   fieldIsLocalized,
   fieldIsPresentationalOnly,
   tabHasName,
-} from 'payload/types'
+} from 'payload/shared'
 
 export type BuildSchemaOptions = {
   allowIDField?: boolean

packages/db-mongodb/src/queries/buildAndOrConditions.ts

@@ -1,5 +1,4 @@
-import type { Payload } from 'payload'
-import type { Field, Where } from 'payload/types'
+import type { Field, Payload, Where } from 'payload'
 
 import { parseParams } from './parseParams.js'
 

packages/db-mongodb/src/queries/buildQuery.ts

@@ -1,7 +1,6 @@
-import type { Payload } from 'payload'
-import type { Field, Where } from 'payload/types'
+import type { Field, Payload, Where } from 'payload'
 
-import { QueryError } from 'payload/errors'
+import { QueryError } from 'payload'
 
 import { parseParams } from './parseParams.js'
 

packages/db-mongodb/src/queries/buildSearchParams.ts

@@ -1,11 +1,9 @@
-import type { Payload } from 'payload'
-import type { PathToQuery } from 'payload/database'
-import type { Field , Operator } from 'payload/types'
+import type { Field, Operator, PathToQuery, Payload } from 'payload'
 
 import ObjectIdImport from 'bson-objectid'
 import mongoose from 'mongoose'
-import { getLocalizedPaths } from 'payload/database'
-import { fieldAffectsData , validOperators } from 'payload/types'
+import { getLocalizedPaths } from 'payload'
+import { validOperators } from 'payload/shared'
 
 import type { MongooseAdapter } from '../index.js'
 

packages/db-mongodb/src/queries/buildSortParam.ts

@@ -1,6 +1,5 @@
 import type { PaginateOptions } from 'mongoose'
-import type { SanitizedConfig } from 'payload/config'
-import type { Field } from 'payload/types'
+import type { Field, SanitizedConfig } from 'payload'
 
 import { getLocalizedSortProperty } from './getLocalizedSortProperty.js'
 

packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts

@@ -1,5 +1,5 @@
-import { SanitizedConfig, sanitizeConfig } from 'payload/config'
-import { Config } from 'payload/config'
+import { SanitizedConfig, sanitizeConfig } from 'payload'
+import { Config } from 'payload'
 import { getLocalizedSortProperty } from './getLocalizedSortProperty.js'
 
 let config: SanitizedConfig

packages/db-mongodb/src/queries/getLocalizedSortProperty.ts

@@ -1,8 +1,7 @@
-import type { SanitizedConfig } from 'payload/config'
-import type { Field } from 'payload/types'
+import type { Field, SanitizedConfig } from 'payload'
 
-import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types'
-import { flattenTopLevelFields } from 'payload/utilities'
+import { flattenTopLevelFields } from 'payload'
+import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/shared'
 
 type Args = {
   config: SanitizedConfig

packages/db-mongodb/src/queries/parseParams.ts

@@ -1,12 +1,11 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable no-await-in-loop */
 import type { FilterQuery } from 'mongoose'
-import type { Payload } from 'payload'
-import type { Field, Operator , Where } from 'payload/types'
+import type { Field, Operator, Payload, Where } from 'payload'
 
 import deepmerge from 'deepmerge'
-import { validOperators } from 'payload/types'
-import { combineMerge } from 'payload/utilities'
+import { combineMerge } from 'payload'
+import { validOperators } from 'payload/shared'
 
 import { buildAndOrConditions } from './buildAndOrConditions.js'
 import { buildSearchParam } from './buildSearchParams.js'

packages/db-mongodb/src/queries/sanitizeQueryValue.ts

@@ -1,7 +1,7 @@
-import type { Field, TabAsField } from 'payload/types'
+import type { Field, TabAsField } from 'payload'
 
 import mongoose from 'mongoose'
-import { createArrayFromCommaDelineated } from 'payload/utilities'
+import { createArrayFromCommaDelineated } from 'payload'
 
 type SanitizeQueryValueArgs = {
   field: Field | TabAsField

packages/db-mongodb/src/queryDrafts.ts

@@ -1,8 +1,7 @@
 import type { PaginateOptions } from 'mongoose'
-import type { QueryDrafts } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData, QueryDrafts } from 'payload'
 
-import { combineQueries, flattenWhereToOperators } from 'payload/database'
+import { combineQueries, flattenWhereToOperators } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/transactions/beginTransaction.ts

@@ -1,7 +1,7 @@
 import type { TransactionOptions } from 'mongodb'
-import type { BeginTransaction } from 'payload/database'
+import type { BeginTransaction } from 'payload'
 
-import { APIError } from 'payload/errors'
+import { APIError } from 'payload'
 import { v4 as uuid } from 'uuid'
 
 import type { MongooseAdapter } from '../index.js'

packages/db-mongodb/src/transactions/commitTransaction.ts

@@ -1,4 +1,4 @@
-import type { CommitTransaction } from 'payload/database'
+import type { CommitTransaction } from 'payload'
 
 export const commitTransaction: CommitTransaction = async function commitTransaction(id) {
   if (!this.sessions[id]?.inTransaction()) {

packages/db-mongodb/src/transactions/rollbackTransaction.ts

@@ -1,4 +1,4 @@
-import type { RollbackTransaction } from 'payload/database'
+import type { RollbackTransaction } from 'payload'
 
 export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(
   id = '',

packages/db-mongodb/src/types.ts

@@ -1,6 +1,4 @@
 import type { IndexDefinition, IndexOptions, Model, PaginateModel, SchemaOptions } from 'mongoose'
-import type { Payload } from 'payload'
-import type { SanitizedConfig } from 'payload/config'
 import type {
   ArrayField,
   BlockField,
@@ -13,17 +11,19 @@ import type {
   GroupField,
   JSONField,
   NumberField,
+  Payload,
   PointField,
   RadioField,
   RelationshipField,
   RichTextField,
   RowField,
+  SanitizedConfig,
   SelectField,
   TabsField,
   TextField,
   TextareaField,
   UploadField,
-} from 'payload/types'
+} from 'payload'
 
 import type { BuildQueryArgs } from './queries/buildQuery.js'
 

packages/db-mongodb/src/updateGlobal.ts

@@ -1,5 +1,4 @@
-import type { UpdateGlobal } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData, UpdateGlobal } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/updateGlobalVersion.ts

@@ -1,5 +1,4 @@
-import type { UpdateGlobalVersionArgs } from 'payload/database'
-import type { PayloadRequestWithData, TypeWithID } from 'payload/types'
+import type { PayloadRequestWithData, TypeWithID, UpdateGlobalVersionArgs } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/updateOne.ts

@@ -1,5 +1,4 @@
-import type { UpdateOne } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData, UpdateOne } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/updateVersion.ts

@@ -1,5 +1,4 @@
-import type { UpdateVersion } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData, UpdateVersion } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 

packages/db-mongodb/src/utilities/getDBName.ts

@@ -1,4 +1,4 @@
-import type { DBIdentifierName } from 'payload/database'
+import type { DBIdentifierName } from 'payload'
 
 type Args = {
   config: {

packages/db-mongodb/src/utilities/handleError.ts

@@ -1,5 +1,5 @@
 import httpStatus from 'http-status'
-import { APIError, ValidationError } from 'payload/errors'
+import { APIError, ValidationError } from 'payload'
 
 const handleError = (error, req) => {
   // Handle uniqueness error from MongoDB

packages/db-postgres/README.md

@@ -14,7 +14,7 @@ npm install @payloadcms/db-postgres
 ## Usage
 
 ```ts
-import { buildConfig } from 'payload/config'
+import { buildConfig } from 'payload'
 import { postgresAdapter } from '@payloadcms/db-postgres'
 
 export default buildConfig({

packages/db-postgres/bundle.js

@@ -0,0 +1,39 @@
+import * as esbuild from 'esbuild'
+import fs from 'fs'
+import path from 'path'
+import { fileURLToPath } from 'url'
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+import { commonjs } from '@hyrious/esbuild-plugin-commonjs'
+
+const resultServer = await esbuild
+  .build({
+    entryPoints: ['src/index.ts'],
+    bundle: true,
+    platform: 'node',
+    format: 'esm',
+    outfile: 'dist/index.js',
+    splitting: false,
+    external: [
+      '*.scss',
+      '*.css',
+      'drizzle-kit',
+      'libsql',
+      'pg',
+      '@payloadcms/translations',
+      'payload',
+      'payload/*',
+    ],
+    minify: true,
+    metafile: true,
+    tsconfig: path.resolve(dirname, './tsconfig.json'),
+    plugins: [commonjs()],
+    sourcemap: true,
+  })
+  .then((res, err) => {
+    console.log('db-postgres bundled successfully')
+    return res
+  })
+  .catch(() => process.exit(1))
+
+fs.writeFileSync('meta_server.json', JSON.stringify(resultServer.metafile))

packages/db-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-beta.48",
+  "version": "3.0.0-beta.51",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -35,8 +35,9 @@
     "mock.js"
   ],
   "scripts": {
-    "build": "pnpm build:swc && pnpm build:types && pnpm renamePredefinedMigrations",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc",
+    "build": "rimraf .dist && rimraf tsconfig.tsbuildinfo  && pnpm build:types && pnpm build:swc && pnpm build:esbuild && pnpm renamePredefinedMigrations",
+    "build:esbuild": "echo skipping esbuild",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
     "prepublishOnly": "pnpm clean && pnpm turbo build",
@@ -50,12 +51,14 @@
     "pg": "8.11.3",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
-    "uuid": "^9.0.1"
+    "uuid": "10.0.0"
   },
   "devDependencies": {
+    "@hyrious/esbuild-plugin-commonjs": "^0.2.4",
     "@payloadcms/eslint-config": "workspace:*",
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
+    "esbuild": "^0.21.4",
     "payload": "workspace:*"
   },
   "peerDependencies": {

packages/db-postgres/relationships-v2-v3.mjs

@@ -1,4 +1,4 @@
-const imports = `import { migratePostgresV2toV3 } from '@payloadcms/migratePostgresV2toV3'`;
+const imports = `import { migratePostgresV2toV3 } from '@payloadcms/migratePostgresV2toV3'`
 const up = `   await migratePostgresV2toV3({
         // enables logging of changes that will be made to the database
         debug: false,
@@ -7,7 +7,7 @@ const up = `   await migratePostgresV2toV3({
         payload,
         req,
         })
-`;
-export { imports, up };
+`
+export { imports, up }
 
-//# sourceMappingURL=relationships-v2-v3.js.map
+//# sourceMappingURL=relationships-v2-v3.js.map

packages/db-postgres/scripts/renamePredefinedMigrations.ts

@@ -13,6 +13,7 @@ const rename = () => {
       const newPath = path.join('./dist/predefinedMigrations', file)
       fs.renameSync(newPath, newPath.replace('.js', '.mjs'))
     })
+  console.log('done')
 }
 
 rename()

packages/db-postgres/src/connect.ts

@@ -1,5 +1,4 @@
-import type { Payload } from 'payload'
-import type { Connect } from 'payload/database'
+import type { Connect, Payload } from 'payload'
 
 import { sql } from 'drizzle-orm'
 import { drizzle } from 'drizzle-orm/node-postgres'

packages/db-postgres/src/count.ts

@@ -1,5 +1,4 @@
-import type { Count } from 'payload/database'
-import type { SanitizedCollectionConfig } from 'payload/types'
+import type { Count, SanitizedCollectionConfig } from 'payload'
 
 import { sql } from 'drizzle-orm'
 import toSnakeCase from 'to-snake-case'

packages/db-postgres/src/create.ts

@@ -1,4 +1,4 @@
-import type { Create } from 'payload/database'
+import type { Create } from 'payload'
 
 import toSnakeCase from 'to-snake-case'
 

packages/db-postgres/src/createGlobal.ts

@@ -1,5 +1,4 @@
-import type { CreateGlobalArgs } from 'payload/database'
-import type { PayloadRequestWithData, TypeWithID } from 'payload/types'
+import type { CreateGlobalArgs, PayloadRequestWithData, TypeWithID } from 'payload'
 
 import toSnakeCase from 'to-snake-case'
 

packages/db-postgres/src/createGlobalVersion.ts

@@ -1,9 +1,7 @@
-import type { TypeWithVersion } from 'payload/database'
-import type { PayloadRequestWithData, TypeWithID } from 'payload/types'
+import type { PayloadRequestWithData, TypeWithID, TypeWithVersion } from 'payload'
 
 import { sql } from 'drizzle-orm'
-import { type CreateGlobalVersionArgs } from 'payload/database'
-import { buildVersionGlobalFields } from 'payload/versions'
+import { type CreateGlobalVersionArgs, buildVersionGlobalFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/createMigration.ts

@@ -1,11 +1,11 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload'
-import type { CreateMigration, MigrationTemplateArgs } from 'payload/database'
+import type { CreateMigration, MigrationTemplateArgs } from 'payload'
 
 import fs from 'fs'
 import { createRequire } from 'module'
 import path from 'path'
-import { getPredefinedMigration } from 'payload/database'
+import { getPredefinedMigration } from 'payload'
 import prompts from 'prompts'
 import { fileURLToPath } from 'url'
 

packages/db-postgres/src/createVersion.ts

@@ -1,8 +1,12 @@
-import type { CreateVersionArgs, TypeWithVersion } from 'payload/database'
-import type { PayloadRequestWithData, TypeWithID } from 'payload/types'
+import type {
+  CreateVersionArgs,
+  PayloadRequestWithData,
+  TypeWithID,
+  TypeWithVersion,
+} from 'payload'
 
 import { sql } from 'drizzle-orm'
-import { buildVersionCollectionFields } from 'payload/versions'
+import { buildVersionCollectionFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/deleteMany.ts

@@ -1,5 +1,4 @@
-import type { DeleteMany } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { DeleteMany, PayloadRequestWithData } from 'payload'
 
 import { inArray } from 'drizzle-orm'
 import toSnakeCase from 'to-snake-case'

packages/db-postgres/src/deleteOne.ts

@@ -1,5 +1,4 @@
-import type { DeleteOne } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { DeleteOne, PayloadRequestWithData } from 'payload'
 
 import { eq } from 'drizzle-orm'
 import toSnakeCase from 'to-snake-case'

packages/db-postgres/src/deleteVersions.ts

@@ -1,8 +1,7 @@
-import type { DeleteVersions } from 'payload/database'
-import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types'
+import type { DeleteVersions, PayloadRequestWithData, SanitizedCollectionConfig } from 'payload'
 
 import { inArray } from 'drizzle-orm'
-import { buildVersionCollectionFields } from 'payload/versions'
+import { buildVersionCollectionFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/destroy.ts

@@ -1,4 +1,4 @@
-import type { Destroy } from 'payload/database'
+import type { Destroy } from 'payload'
 
 import type { PostgresAdapter } from './types.js'
 

packages/db-postgres/src/find.ts

@@ -1,5 +1,4 @@
-import type { Find } from 'payload/database'
-import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types'
+import type { Find, PayloadRequestWithData, SanitizedCollectionConfig } from 'payload'
 
 import toSnakeCase from 'to-snake-case'
 

packages/db-postgres/src/find/buildFindManyArgs.ts

@@ -1,5 +1,5 @@
 import type { DBQueryConfig } from 'drizzle-orm'
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 import type { PostgresAdapter } from '../types.js'
 

packages/db-postgres/src/find/findMany.ts

@@ -1,5 +1,4 @@
-import type { FindArgs } from 'payload/database'
-import type { Field, PayloadRequestWithData, TypeWithID } from 'payload/types'
+import type { Field, FindArgs, PayloadRequestWithData, TypeWithID } from 'payload'
 
 import { inArray, sql } from 'drizzle-orm'
 

packages/db-postgres/src/find/traverseFields.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-param-reassign */
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
-import { fieldAffectsData, tabHasName } from 'payload/types'
+import { fieldAffectsData, tabHasName } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from '../types.js'

packages/db-postgres/src/findGlobal.ts

@@ -1,4 +1,4 @@
-import type { FindGlobal } from 'payload/database'
+import type { FindGlobal } from 'payload'
 
 import toSnakeCase from 'to-snake-case'
 

packages/db-postgres/src/findGlobalVersions.ts

@@ -1,7 +1,6 @@
-import type { FindGlobalVersions } from 'payload/database'
-import type { PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types'
+import type { FindGlobalVersions, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload'
 
-import { buildVersionGlobalFields } from 'payload/versions'
+import { buildVersionGlobalFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/findOne.ts

@@ -1,5 +1,9 @@
-import type { FindOneArgs } from 'payload/database'
-import type { PayloadRequestWithData, SanitizedCollectionConfig, TypeWithID } from 'payload/types'
+import type {
+  FindOneArgs,
+  PayloadRequestWithData,
+  SanitizedCollectionConfig,
+  TypeWithID,
+} from 'payload'
 
 import toSnakeCase from 'to-snake-case'
 

packages/db-postgres/src/findVersions.ts

@@ -1,7 +1,6 @@
-import type { FindVersions } from 'payload/database'
-import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types'
+import type { FindVersions, PayloadRequestWithData, SanitizedCollectionConfig } from 'payload'
 
-import { buildVersionCollectionFields } from 'payload/versions'
+import { buildVersionCollectionFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/index.ts

@@ -1,9 +1,8 @@
-import type { Payload } from 'payload'
-import type { DatabaseAdapterObj } from 'payload/database'
+import type { DatabaseAdapterObj, Payload } from 'payload'
 
 import fs from 'fs'
 import path from 'path'
-import { createDatabaseAdapter } from 'payload/database'
+import { createDatabaseAdapter } from 'payload'
 
 import type { Args, PostgresAdapter } from './types.js'
 

packages/db-postgres/src/init.ts

@@ -1,9 +1,9 @@
 /* eslint-disable no-param-reassign */
-import type { Init } from 'payload/database'
-import type { SanitizedCollectionConfig } from 'payload/types'
+import type { SanitizedCollectionConfig } from 'payload'
+import type { Init } from 'payload'
 
 import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core'
-import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions'
+import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/migrate.ts

@@ -1,15 +1,10 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { Payload } from 'payload'
-import type { Migration } from 'payload/database'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData } from 'payload'
+import type { Migration } from 'payload'
 
 import { createRequire } from 'module'
-import {
-  commitTransaction,
-  initTransaction,
-  killTransaction,
-  readMigrationFiles,
-} from 'payload/database'
+import { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload'
 import prompts from 'prompts'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/migrateDown.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData } from 'payload'
 
 import {
   commitTransaction,
@@ -7,7 +7,7 @@ import {
   initTransaction,
   killTransaction,
   readMigrationFiles,
-} from 'payload/database'
+} from 'payload'
 
 import type { PostgresAdapter } from './types.js'
 

packages/db-postgres/src/migrateFresh.ts

@@ -1,12 +1,7 @@
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData } from 'payload'
 
 import { sql } from 'drizzle-orm'
-import {
-  commitTransaction,
-  initTransaction,
-  killTransaction,
-  readMigrationFiles,
-} from 'payload/database'
+import { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload'
 import prompts from 'prompts'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/migrateRefresh.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData } from 'payload'
 
 import {
   commitTransaction,
@@ -7,7 +7,7 @@ import {
   initTransaction,
   killTransaction,
   readMigrationFiles,
-} from 'payload/database'
+} from 'payload'
 
 import type { PostgresAdapter } from './types.js'
 

packages/db-postgres/src/migrateReset.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
-import type { PayloadRequestWithData } from 'payload/types'
+import type { PayloadRequestWithData } from 'payload'
 
 import {
   commitTransaction,
@@ -7,7 +7,7 @@ import {
   initTransaction,
   killTransaction,
   readMigrationFiles,
-} from 'payload/database'
+} from 'payload'
 
 import type { PostgresAdapter } from './types.js'
 

packages/db-postgres/src/migrateStatus.ts

@@ -1,5 +1,5 @@
 import { Table } from 'console-table-printer'
-import { getMigrations, readMigrationFiles } from 'payload/database'
+import { getMigrations, readMigrationFiles } from 'payload'
 
 import type { PostgresAdapter } from './types.js'
 

packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts

@@ -1,5 +1,4 @@
-import type { Payload } from 'payload'
-import type { Field, PayloadRequestWithData } from 'payload/types'
+import type { Field, Payload, PayloadRequestWithData } from 'payload'
 
 import type { DrizzleTransaction, PostgresAdapter } from '../../../types.js'
 import type { DocsToResave } from '../types.js'

packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts

@@ -1,6 +1,6 @@
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
-import { tabHasName } from 'payload/types'
+import { tabHasName } from 'payload/shared'
 
 type Args = {
   doc: Record<string, unknown>

packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts

@@ -1,11 +1,10 @@
 import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload'
-import type { Payload } from 'payload'
-import type { PayloadRequestWithData } from 'payload/types'
+import type { Payload, PayloadRequestWithData } from 'payload'
 
 import { sql } from 'drizzle-orm'
 import fs from 'fs'
 import { createRequire } from 'module'
-import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions'
+import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from '../../types.js'

packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts

@@ -1,4 +1,4 @@
-import type { Field, Payload, PayloadRequestWithData } from 'payload/types'
+import type { Field, Payload, PayloadRequestWithData } from 'payload'
 
 import { sql } from 'drizzle-orm'
 
@@ -88,7 +88,7 @@ export const migrateRelationships = async ({
       globalSlug,
       isVersions,
       payload,
-      req: req as PayloadRequestWithData,
+      req: req as unknown as PayloadRequestWithData,
       tableName,
     })
   }

packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts

@@ -1,6 +1,6 @@
-import type { Payload } from 'payload'
+import type { Field, Payload } from 'payload'
 
-import { type Field, tabHasName } from 'payload/types'
+import { tabHasName } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 
 import type { DrizzleTransaction, PostgresAdapter } from '../../types.js'

packages/db-postgres/src/queries/buildAndOrConditions.ts

@@ -1,5 +1,5 @@
 import type { SQL } from 'drizzle-orm'
-import type { Field, Where } from 'payload/types'
+import type { Field, Where } from 'payload'
 
 import type { GenericColumn, PostgresAdapter } from '../types.js'
 import type { BuildQueryJoinAliases } from './buildQuery.js'

packages/db-postgres/src/queries/buildQuery.ts

@@ -1,6 +1,6 @@
 import type { SQL } from 'drizzle-orm'
 import type { PgTableWithColumns } from 'drizzle-orm/pg-core'
-import type { Field, Where } from 'payload/types'
+import type { Field, Where } from 'payload'
 
 import { asc, desc } from 'drizzle-orm'
 

packages/db-postgres/src/queries/getTableColumnFromPath.ts

@@ -1,13 +1,12 @@
 /* eslint-disable no-param-reassign */
 import type { SQL } from 'drizzle-orm'
 import type { PgTableWithColumns } from 'drizzle-orm/pg-core'
-import type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload/types'
+import type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload'
 
 import { and, eq, like, sql } from 'drizzle-orm'
 import { alias } from 'drizzle-orm/pg-core'
-import { APIError } from 'payload/errors'
-import { fieldAffectsData, tabHasName } from 'payload/types'
-import { flattenTopLevelFields } from 'payload/utilities'
+import { APIError, flattenTopLevelFields } from 'payload'
+import { fieldAffectsData, tabHasName } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 import { v4 as uuid } from 'uuid'
 

packages/db-postgres/src/queries/parseParams.ts

@@ -1,10 +1,10 @@
 /* eslint-disable no-await-in-loop */
 import type { SQL } from 'drizzle-orm'
-import type { Field, Operator, Where } from 'payload/types'
+import type { Field, Operator, Where } from 'payload'
 
 import { and, ilike, isNotNull, isNull, ne, notInArray, or, sql } from 'drizzle-orm'
-import { QueryError } from 'payload/errors'
-import { validOperators } from 'payload/types'
+import { QueryError } from 'payload'
+import { validOperators } from 'payload/shared'
 
 import type { GenericColumn, PostgresAdapter } from '../types.js'
 import type { BuildQueryJoinAliases } from './buildQuery.js'

packages/db-postgres/src/queries/sanitizeQueryValue.ts

@@ -1,6 +1,5 @@
-import { APIError } from 'payload/errors'
-import { type Field, type TabAsField, fieldAffectsData } from 'payload/types'
-import { createArrayFromCommaDelineated } from 'payload/utilities'
+import { APIError, type Field, type TabAsField, createArrayFromCommaDelineated } from 'payload'
+import { fieldAffectsData } from 'payload/shared'
 
 import type { PostgresAdapter } from '../types.js'
 

packages/db-postgres/src/queryDrafts.ts

@@ -1,7 +1,6 @@
-import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types'
+import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload'
 
-import { type QueryDrafts, combineQueries } from 'payload/database'
-import { buildVersionCollectionFields } from 'payload/versions'
+import { type QueryDrafts, buildVersionCollectionFields, combineQueries } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'

packages/db-postgres/src/schema/build.ts

@@ -7,7 +7,7 @@ import type {
   PgTableWithColumns,
   UniqueConstraintBuilder,
 } from 'drizzle-orm/pg-core'
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 import { relations } from 'drizzle-orm'
 import {

packages/db-postgres/src/schema/createTableName.ts

@@ -1,6 +1,6 @@
-import type { DBIdentifierName } from 'payload/database'
+import type { DBIdentifierName } from 'payload'
 
-import { APIError } from 'payload/errors'
+import { APIError } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from '../types.js'

packages/db-postgres/src/schema/idToUUID.ts

@@ -1,4 +1,4 @@
-import type { Field } from 'payload/types'
+import type { Field } from 'payload'
 
 export const idToUUID = (fields: Field[]): Field[] =>
   fields.map((field) => {

packages/db-postgres/src/schema/setColumnID.ts

@@ -1,8 +1,8 @@
 import type { PgColumnBuilder } from 'drizzle-orm/pg-core'
 
 import { numeric, serial, uuid, varchar } from 'drizzle-orm/pg-core'
-import { type Field, fieldAffectsData } from 'payload/types'
-import { flattenTopLevelFields } from 'payload/utilities'
+import { type Field, flattenTopLevelFields } from 'payload'
+import { fieldAffectsData } from 'payload/shared'
 
 import type { IDType, PostgresAdapter } from '../types.js'