diff --git a/.gitignore b/.gitignore index 1aa06de886..ed4d41093b 100644 --- a/.gitignore +++ b/.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 diff --git a/.idea/payload.iml b/.idea/payload.iml index 4bbc3ad89b..b5f41b2a2d 100644 --- a/.idea/payload.iml +++ b/.idea/payload.iml @@ -74,6 +74,7 @@ + diff --git a/app/(payload)/layout.tsx b/app/(payload)/layout.tsx index 78db7265e1..eb272a6d57 100644 --- a/app/(payload)/layout.tsx +++ b/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' diff --git a/package.json b/package.json index 93d8fb487c..a2d7c64dca 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,12 @@ "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", diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json index 1a9aaec39f..8c0d421f2e 100644 --- a/packages/create-payload-app/package.json +++ b/packages/create-payload-app/package.json @@ -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", diff --git a/packages/create-payload-app/src/lib/wrap-next-config.ts b/packages/create-payload-app/src/lib/wrap-next-config.ts index 62d842fc39..b06195773a 100644 --- a/packages/create-payload-app/src/lib/wrap-next-config.ts +++ b/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`, diff --git a/packages/create-payload-app/src/utils/messages.ts b/packages/create-payload-app/src/utils/messages.ts index 9f96894bf9..368192d237 100644 --- a/packages/create-payload-app/src/utils/messages.ts +++ b/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' diff --git a/packages/create-payload-app/tsconfig.json b/packages/create-payload-app/tsconfig.json index 271a35b895..6402cb8677 100644 --- a/packages/create-payload-app/tsconfig.json +++ b/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"] diff --git a/packages/db-mongodb/README.md b/packages/db-mongodb/README.md index 6fe35e72f6..cd52f67aa8 100644 --- a/packages/db-mongodb/README.md +++ b/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({ diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index 12c4d5d16d..78e09cd728 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -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:*", diff --git a/packages/db-mongodb/src/connect.ts b/packages/db-mongodb/src/connect.ts index b3bb25d493..aab57c894f 100644 --- a/packages/db-mongodb/src/connect.ts +++ b/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' diff --git a/packages/db-mongodb/src/count.ts b/packages/db-mongodb/src/count.ts index a8fafe9bf1..7f684d45df 100644 --- a/packages/db-mongodb/src/count.ts +++ b/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' diff --git a/packages/db-mongodb/src/create.ts b/packages/db-mongodb/src/create.ts index cbcbbdd226..948d20ef14 100644 --- a/packages/db-mongodb/src/create.ts +++ b/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' diff --git a/packages/db-mongodb/src/createGlobal.ts b/packages/db-mongodb/src/createGlobal.ts index b976339599..67fb560c22 100644 --- a/packages/db-mongodb/src/createGlobal.ts +++ b/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' diff --git a/packages/db-mongodb/src/createGlobalVersion.ts b/packages/db-mongodb/src/createGlobalVersion.ts index 1bc0d3c57a..f93dfb800e 100644 --- a/packages/db-mongodb/src/createGlobalVersion.ts +++ b/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' diff --git a/packages/db-mongodb/src/createMigration.ts b/packages/db-mongodb/src/createMigration.ts index 61df13e919..a1d3efe7e3 100644 --- a/packages/db-mongodb/src/createMigration.ts +++ b/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 { diff --git a/packages/db-mongodb/src/createVersion.ts b/packages/db-mongodb/src/createVersion.ts index e4c78a801d..8d096c0a62 100644 --- a/packages/db-mongodb/src/createVersion.ts +++ b/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' diff --git a/packages/db-mongodb/src/deleteMany.ts b/packages/db-mongodb/src/deleteMany.ts index 56fc8e64da..bc14df489b 100644 --- a/packages/db-mongodb/src/deleteMany.ts +++ b/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' diff --git a/packages/db-mongodb/src/deleteOne.ts b/packages/db-mongodb/src/deleteOne.ts index a8f8404470..b0888eaa8d 100644 --- a/packages/db-mongodb/src/deleteOne.ts +++ b/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' diff --git a/packages/db-mongodb/src/deleteVersions.ts b/packages/db-mongodb/src/deleteVersions.ts index ec09ca1698..1b845f60d0 100644 --- a/packages/db-mongodb/src/deleteVersions.ts +++ b/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' diff --git a/packages/db-mongodb/src/destroy.ts b/packages/db-mongodb/src/destroy.ts index 9e9888ae5b..36aaafc354 100644 --- a/packages/db-mongodb/src/destroy.ts +++ b/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' diff --git a/packages/db-mongodb/src/find.ts b/packages/db-mongodb/src/find.ts index b425be710f..b92056cdb3 100644 --- a/packages/db-mongodb/src/find.ts +++ b/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' diff --git a/packages/db-mongodb/src/findGlobal.ts b/packages/db-mongodb/src/findGlobal.ts index 17d490cab8..63b1050137 100644 --- a/packages/db-mongodb/src/findGlobal.ts +++ b/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' diff --git a/packages/db-mongodb/src/findGlobalVersions.ts b/packages/db-mongodb/src/findGlobalVersions.ts index 41f120ed5d..f55ae3d154 100644 --- a/packages/db-mongodb/src/findGlobalVersions.ts +++ b/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' diff --git a/packages/db-mongodb/src/findOne.ts b/packages/db-mongodb/src/findOne.ts index 28a068c3ed..01ac89eddd 100644 --- a/packages/db-mongodb/src/findOne.ts +++ b/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' diff --git a/packages/db-mongodb/src/findVersions.ts b/packages/db-mongodb/src/findVersions.ts index 510c3edb4b..fe919e10fb 100644 --- a/packages/db-mongodb/src/findVersions.ts +++ b/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' diff --git a/packages/db-mongodb/src/index.ts b/packages/db-mongodb/src/index.ts index 90e61fe83f..0a6fa72a5f 100644 --- a/packages/db-mongodb/src/index.ts +++ b/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' diff --git a/packages/db-mongodb/src/init.ts b/packages/db-mongodb/src/init.ts index facae23cb4..740e62a324 100644 --- a/packages/db-mongodb/src/init.ts +++ b/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' diff --git a/packages/db-mongodb/src/migrateFresh.ts b/packages/db-mongodb/src/migrateFresh.ts index c22545cac5..28c69f641e 100644 --- a/packages/db-mongodb/src/migrateFresh.ts +++ b/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' diff --git a/packages/db-mongodb/src/models/buildCollectionSchema.ts b/packages/db-mongodb/src/models/buildCollectionSchema.ts index 4f1d1a24e0..19e72a07ad 100644 --- a/packages/db-mongodb/src/models/buildCollectionSchema.ts +++ b/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' diff --git a/packages/db-mongodb/src/models/buildGlobalModel.ts b/packages/db-mongodb/src/models/buildGlobalModel.ts index 492d1bc43e..65927f606c 100644 --- a/packages/db-mongodb/src/models/buildGlobalModel.ts +++ b/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' diff --git a/packages/db-mongodb/src/models/buildSchema.ts b/packages/db-mongodb/src/models/buildSchema.ts index 4dacc35665..a7ea67cb45 100644 --- a/packages/db-mongodb/src/models/buildSchema.ts +++ b/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 diff --git a/packages/db-mongodb/src/queries/buildAndOrConditions.ts b/packages/db-mongodb/src/queries/buildAndOrConditions.ts index 207b760e91..1ff5746fcb 100644 --- a/packages/db-mongodb/src/queries/buildAndOrConditions.ts +++ b/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' diff --git a/packages/db-mongodb/src/queries/buildQuery.ts b/packages/db-mongodb/src/queries/buildQuery.ts index 822abd0486..3224e62904 100644 --- a/packages/db-mongodb/src/queries/buildQuery.ts +++ b/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' diff --git a/packages/db-mongodb/src/queries/buildSearchParams.ts b/packages/db-mongodb/src/queries/buildSearchParams.ts index 4aec22ee8a..aaa629dbc6 100644 --- a/packages/db-mongodb/src/queries/buildSearchParams.ts +++ b/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' diff --git a/packages/db-mongodb/src/queries/buildSortParam.ts b/packages/db-mongodb/src/queries/buildSortParam.ts index 2503e659f7..b539fe4812 100644 --- a/packages/db-mongodb/src/queries/buildSortParam.ts +++ b/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' diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts index 803a9a8c64..cfc6302be6 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts +++ b/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 diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts index 915046fed8..4ba9c2eda6 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts +++ b/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 diff --git a/packages/db-mongodb/src/queries/parseParams.ts b/packages/db-mongodb/src/queries/parseParams.ts index fd84c958ad..1b6dd82dec 100644 --- a/packages/db-mongodb/src/queries/parseParams.ts +++ b/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' diff --git a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts index 5912254ffe..096227afb7 100644 --- a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts +++ b/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 diff --git a/packages/db-mongodb/src/queryDrafts.ts b/packages/db-mongodb/src/queryDrafts.ts index 62bc6c66af..707aa470d1 100644 --- a/packages/db-mongodb/src/queryDrafts.ts +++ b/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' diff --git a/packages/db-mongodb/src/transactions/beginTransaction.ts b/packages/db-mongodb/src/transactions/beginTransaction.ts index 6c4c0ce9f8..8f97c01c93 100644 --- a/packages/db-mongodb/src/transactions/beginTransaction.ts +++ b/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' diff --git a/packages/db-mongodb/src/transactions/commitTransaction.ts b/packages/db-mongodb/src/transactions/commitTransaction.ts index 13ff010518..dbc45cb752 100644 --- a/packages/db-mongodb/src/transactions/commitTransaction.ts +++ b/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()) { diff --git a/packages/db-mongodb/src/transactions/rollbackTransaction.ts b/packages/db-mongodb/src/transactions/rollbackTransaction.ts index 8875b194d2..0dba07ee87 100644 --- a/packages/db-mongodb/src/transactions/rollbackTransaction.ts +++ b/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 = '', diff --git a/packages/db-mongodb/src/types.ts b/packages/db-mongodb/src/types.ts index 4d5dd47793..25ff7a8218 100644 --- a/packages/db-mongodb/src/types.ts +++ b/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' diff --git a/packages/db-mongodb/src/updateGlobal.ts b/packages/db-mongodb/src/updateGlobal.ts index 48186d299d..6a65cff19b 100644 --- a/packages/db-mongodb/src/updateGlobal.ts +++ b/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' diff --git a/packages/db-mongodb/src/updateGlobalVersion.ts b/packages/db-mongodb/src/updateGlobalVersion.ts index ac65188df9..32fdb5b841 100644 --- a/packages/db-mongodb/src/updateGlobalVersion.ts +++ b/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' diff --git a/packages/db-mongodb/src/updateOne.ts b/packages/db-mongodb/src/updateOne.ts index aacb596b4c..fc48e4908c 100644 --- a/packages/db-mongodb/src/updateOne.ts +++ b/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' diff --git a/packages/db-mongodb/src/updateVersion.ts b/packages/db-mongodb/src/updateVersion.ts index 2120b5f8ee..5add9f0cfd 100644 --- a/packages/db-mongodb/src/updateVersion.ts +++ b/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' diff --git a/packages/db-mongodb/src/utilities/getDBName.ts b/packages/db-mongodb/src/utilities/getDBName.ts index c35097ba03..ae78695f90 100644 --- a/packages/db-mongodb/src/utilities/getDBName.ts +++ b/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: { diff --git a/packages/db-mongodb/src/utilities/handleError.ts b/packages/db-mongodb/src/utilities/handleError.ts index 20179270ec..dbf95b9867 100644 --- a/packages/db-mongodb/src/utilities/handleError.ts +++ b/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 diff --git a/packages/db-postgres/README.md b/packages/db-postgres/README.md index a818a90e51..e7542964b5 100644 --- a/packages/db-postgres/README.md +++ b/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({ diff --git a/packages/db-postgres/bundle.js b/packages/db-postgres/bundle.js new file mode 100644 index 0000000000..653394a076 --- /dev/null +++ b/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)) diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json index ec55ec0a91..cb6f1bbbcc 100644 --- a/packages/db-postgres/package.json +++ b/packages/db-postgres/package.json @@ -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": { diff --git a/packages/db-postgres/relationships-v2-v3.mjs b/packages/db-postgres/relationships-v2-v3.mjs index 3ae893d5ec..4f946ea815 100644 --- a/packages/db-postgres/relationships-v2-v3.mjs +++ b/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 \ No newline at end of file +//# sourceMappingURL=relationships-v2-v3.js.map diff --git a/packages/db-postgres/scripts/renamePredefinedMigrations.ts b/packages/db-postgres/scripts/renamePredefinedMigrations.ts index 6519ffad79..625f82cf00 100644 --- a/packages/db-postgres/scripts/renamePredefinedMigrations.ts +++ b/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() diff --git a/packages/db-postgres/src/connect.ts b/packages/db-postgres/src/connect.ts index f834f7f08d..a8ba989a91 100644 --- a/packages/db-postgres/src/connect.ts +++ b/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' diff --git a/packages/db-postgres/src/count.ts b/packages/db-postgres/src/count.ts index 95bb12c4d2..f206f363fe 100644 --- a/packages/db-postgres/src/count.ts +++ b/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' diff --git a/packages/db-postgres/src/create.ts b/packages/db-postgres/src/create.ts index 177b7744b0..5e9af9f64d 100644 --- a/packages/db-postgres/src/create.ts +++ b/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' diff --git a/packages/db-postgres/src/createGlobal.ts b/packages/db-postgres/src/createGlobal.ts index 23f5280184..ebe5d1234b 100644 --- a/packages/db-postgres/src/createGlobal.ts +++ b/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' diff --git a/packages/db-postgres/src/createGlobalVersion.ts b/packages/db-postgres/src/createGlobalVersion.ts index ce085d1671..f7708671ba 100644 --- a/packages/db-postgres/src/createGlobalVersion.ts +++ b/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' diff --git a/packages/db-postgres/src/createMigration.ts b/packages/db-postgres/src/createMigration.ts index a9c2fe855c..c80ee79adb 100644 --- a/packages/db-postgres/src/createMigration.ts +++ b/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' diff --git a/packages/db-postgres/src/createVersion.ts b/packages/db-postgres/src/createVersion.ts index f99b14b107..46ccf6640d 100644 --- a/packages/db-postgres/src/createVersion.ts +++ b/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' diff --git a/packages/db-postgres/src/deleteMany.ts b/packages/db-postgres/src/deleteMany.ts index d0ad26f4c8..cabc03ab24 100644 --- a/packages/db-postgres/src/deleteMany.ts +++ b/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' diff --git a/packages/db-postgres/src/deleteOne.ts b/packages/db-postgres/src/deleteOne.ts index 564638e058..71de146857 100644 --- a/packages/db-postgres/src/deleteOne.ts +++ b/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' diff --git a/packages/db-postgres/src/deleteVersions.ts b/packages/db-postgres/src/deleteVersions.ts index 4d84bdd546..45b23a2ca7 100644 --- a/packages/db-postgres/src/deleteVersions.ts +++ b/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' diff --git a/packages/db-postgres/src/destroy.ts b/packages/db-postgres/src/destroy.ts index aced64118c..9d57827104 100644 --- a/packages/db-postgres/src/destroy.ts +++ b/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' diff --git a/packages/db-postgres/src/find.ts b/packages/db-postgres/src/find.ts index 39b3c7cfaf..58bb1209b3 100644 --- a/packages/db-postgres/src/find.ts +++ b/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' diff --git a/packages/db-postgres/src/find/buildFindManyArgs.ts b/packages/db-postgres/src/find/buildFindManyArgs.ts index fa48dcec12..32ec372235 100644 --- a/packages/db-postgres/src/find/buildFindManyArgs.ts +++ b/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' diff --git a/packages/db-postgres/src/find/findMany.ts b/packages/db-postgres/src/find/findMany.ts index a86d17ad1d..857c323928 100644 --- a/packages/db-postgres/src/find/findMany.ts +++ b/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' diff --git a/packages/db-postgres/src/find/traverseFields.ts b/packages/db-postgres/src/find/traverseFields.ts index 9bda489340..3836dccaf5 100644 --- a/packages/db-postgres/src/find/traverseFields.ts +++ b/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' diff --git a/packages/db-postgres/src/findGlobal.ts b/packages/db-postgres/src/findGlobal.ts index 261ad14a65..1ed00bd789 100644 --- a/packages/db-postgres/src/findGlobal.ts +++ b/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' diff --git a/packages/db-postgres/src/findGlobalVersions.ts b/packages/db-postgres/src/findGlobalVersions.ts index 3c2ab911f1..9fcf5325aa 100644 --- a/packages/db-postgres/src/findGlobalVersions.ts +++ b/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' diff --git a/packages/db-postgres/src/findOne.ts b/packages/db-postgres/src/findOne.ts index 76a467652e..7856a17300 100644 --- a/packages/db-postgres/src/findOne.ts +++ b/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' diff --git a/packages/db-postgres/src/findVersions.ts b/packages/db-postgres/src/findVersions.ts index a6523e9e0d..6b89aadf4c 100644 --- a/packages/db-postgres/src/findVersions.ts +++ b/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' diff --git a/packages/db-postgres/src/index.ts b/packages/db-postgres/src/index.ts index aadfcd1b2c..f28875735f 100644 --- a/packages/db-postgres/src/index.ts +++ b/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' diff --git a/packages/db-postgres/src/init.ts b/packages/db-postgres/src/init.ts index 1c8357d906..35c87c71d9 100644 --- a/packages/db-postgres/src/init.ts +++ b/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' diff --git a/packages/db-postgres/src/migrate.ts b/packages/db-postgres/src/migrate.ts index 63ef9af8c4..b96bb496f2 100644 --- a/packages/db-postgres/src/migrate.ts +++ b/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' diff --git a/packages/db-postgres/src/migrateDown.ts b/packages/db-postgres/src/migrateDown.ts index 5d3ef1648e..e3fde11ae2 100644 --- a/packages/db-postgres/src/migrateDown.ts +++ b/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' diff --git a/packages/db-postgres/src/migrateFresh.ts b/packages/db-postgres/src/migrateFresh.ts index 361417d7bf..014e8bd99b 100644 --- a/packages/db-postgres/src/migrateFresh.ts +++ b/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' diff --git a/packages/db-postgres/src/migrateRefresh.ts b/packages/db-postgres/src/migrateRefresh.ts index e06ab909b4..500b5cc03f 100644 --- a/packages/db-postgres/src/migrateRefresh.ts +++ b/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' diff --git a/packages/db-postgres/src/migrateReset.ts b/packages/db-postgres/src/migrateReset.ts index 722f3e37ee..ddec943739 100644 --- a/packages/db-postgres/src/migrateReset.ts +++ b/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' diff --git a/packages/db-postgres/src/migrateStatus.ts b/packages/db-postgres/src/migrateStatus.ts index 85eb0a9ae7..a5dd7b787a 100644 --- a/packages/db-postgres/src/migrateStatus.ts +++ b/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' diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts index 674834a1ee..f296b25a76 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts +++ b/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' diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts index f3eb840f9e..768cff23c8 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts +++ b/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 diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts index a0b63b965e..d4bfa1d995 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts +++ b/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' diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts index d23f1d97d2..4d73a0d6fa 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts +++ b/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, }) } diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts index be15b624e1..905e47b7c4 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts +++ b/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' diff --git a/packages/db-postgres/src/queries/buildAndOrConditions.ts b/packages/db-postgres/src/queries/buildAndOrConditions.ts index 3648c83149..54d83b061b 100644 --- a/packages/db-postgres/src/queries/buildAndOrConditions.ts +++ b/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' diff --git a/packages/db-postgres/src/queries/buildQuery.ts b/packages/db-postgres/src/queries/buildQuery.ts index 7a134d8130..bf9395d21e 100644 --- a/packages/db-postgres/src/queries/buildQuery.ts +++ b/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' diff --git a/packages/db-postgres/src/queries/getTableColumnFromPath.ts b/packages/db-postgres/src/queries/getTableColumnFromPath.ts index 978f2414ba..b687a98e73 100644 --- a/packages/db-postgres/src/queries/getTableColumnFromPath.ts +++ b/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' diff --git a/packages/db-postgres/src/queries/parseParams.ts b/packages/db-postgres/src/queries/parseParams.ts index 8924df6dcb..6c2795f5a1 100644 --- a/packages/db-postgres/src/queries/parseParams.ts +++ b/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' diff --git a/packages/db-postgres/src/queries/sanitizeQueryValue.ts b/packages/db-postgres/src/queries/sanitizeQueryValue.ts index 31157266c4..168a28da25 100644 --- a/packages/db-postgres/src/queries/sanitizeQueryValue.ts +++ b/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' diff --git a/packages/db-postgres/src/queryDrafts.ts b/packages/db-postgres/src/queryDrafts.ts index 581b35b71d..b1d957e7d3 100644 --- a/packages/db-postgres/src/queryDrafts.ts +++ b/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' diff --git a/packages/db-postgres/src/schema/build.ts b/packages/db-postgres/src/schema/build.ts index 3a35b3a651..fe09f8b236 100644 --- a/packages/db-postgres/src/schema/build.ts +++ b/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 { diff --git a/packages/db-postgres/src/schema/createTableName.ts b/packages/db-postgres/src/schema/createTableName.ts index 083c8f5e36..220947794a 100644 --- a/packages/db-postgres/src/schema/createTableName.ts +++ b/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' diff --git a/packages/db-postgres/src/schema/idToUUID.ts b/packages/db-postgres/src/schema/idToUUID.ts index f84138af63..466ec63b3d 100644 --- a/packages/db-postgres/src/schema/idToUUID.ts +++ b/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) => { diff --git a/packages/db-postgres/src/schema/setColumnID.ts b/packages/db-postgres/src/schema/setColumnID.ts index 84c562a721..0d4de2d786 100644 --- a/packages/db-postgres/src/schema/setColumnID.ts +++ b/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' diff --git a/packages/db-postgres/src/schema/traverseFields.ts b/packages/db-postgres/src/schema/traverseFields.ts index 1f9f9748bc..0d3fc4f4d0 100644 --- a/packages/db-postgres/src/schema/traverseFields.ts +++ b/packages/db-postgres/src/schema/traverseFields.ts @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import type { Relation } from 'drizzle-orm' import type { IndexBuilder, PgColumnBuilder } from 'drizzle-orm/pg-core' -import type { Field, TabAsField } from 'payload/types' +import type { Field, TabAsField } from 'payload' import { relations } from 'drizzle-orm' import { @@ -19,8 +19,8 @@ import { timestamp, varchar, } from 'drizzle-orm/pg-core' -import { InvalidConfiguration } from 'payload/errors' -import { fieldAffectsData, optionIsObject } from 'payload/types' +import { InvalidConfiguration } from 'payload' +import { fieldAffectsData, optionIsObject } from 'payload/shared' import toSnakeCase from 'to-snake-case' import type { GenericColumns, IDType, PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts b/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts index 01d68b3f1f..ff115f4219 100644 --- a/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts +++ b/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts @@ -1,7 +1,7 @@ -import type { Block, Field } from 'payload/types' +import type { Block, Field } from 'payload' -import { InvalidConfiguration } from 'payload/errors' -import { fieldAffectsData, fieldHasSubFields, tabHasName } from 'payload/types' +import { InvalidConfiguration } from 'payload' +import { fieldAffectsData, fieldHasSubFields, tabHasName } from 'payload/shared' import type { GenericTable } from '../types.js' diff --git a/packages/db-postgres/src/transactions/beginTransaction.ts b/packages/db-postgres/src/transactions/beginTransaction.ts index 496b16ff91..0d59329261 100644 --- a/packages/db-postgres/src/transactions/beginTransaction.ts +++ b/packages/db-postgres/src/transactions/beginTransaction.ts @@ -1,4 +1,4 @@ -import type { BeginTransaction } from 'payload/database' +import type { BeginTransaction } from 'payload' import { v4 as uuid } from 'uuid' diff --git a/packages/db-postgres/src/transactions/commitTransaction.ts b/packages/db-postgres/src/transactions/commitTransaction.ts index cc8a0a2ab6..ecc0082e81 100644 --- a/packages/db-postgres/src/transactions/commitTransaction.ts +++ b/packages/db-postgres/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 the session was deleted it has already been aborted diff --git a/packages/db-postgres/src/transactions/rollbackTransaction.ts b/packages/db-postgres/src/transactions/rollbackTransaction.ts index d3f0471d9d..2a70ceac71 100644 --- a/packages/db-postgres/src/transactions/rollbackTransaction.ts +++ b/packages/db-postgres/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 = '', diff --git a/packages/db-postgres/src/transform/read/hasManyNumber.ts b/packages/db-postgres/src/transform/read/hasManyNumber.ts index ad673bb1e6..0ce1533984 100644 --- a/packages/db-postgres/src/transform/read/hasManyNumber.ts +++ b/packages/db-postgres/src/transform/read/hasManyNumber.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { NumberField } from 'payload/types' +import type { NumberField } from 'payload' type Args = { field: NumberField diff --git a/packages/db-postgres/src/transform/read/hasManyText.ts b/packages/db-postgres/src/transform/read/hasManyText.ts index 1392c73d24..e37c70a445 100644 --- a/packages/db-postgres/src/transform/read/hasManyText.ts +++ b/packages/db-postgres/src/transform/read/hasManyText.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { TextField } from 'payload/types' +import type { TextField } from 'payload' type Args = { field: TextField diff --git a/packages/db-postgres/src/transform/read/index.ts b/packages/db-postgres/src/transform/read/index.ts index b584c7e98c..9eeadbb33c 100644 --- a/packages/db-postgres/src/transform/read/index.ts +++ b/packages/db-postgres/src/transform/read/index.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -import type { SanitizedConfig } from 'payload/config' -import type { Field, TypeWithID } from 'payload/types' +import type { Field, TypeWithID } from 'payload' +import type { SanitizedConfig } from 'payload' import type { PostgresAdapter } from '../../types.js' diff --git a/packages/db-postgres/src/transform/read/relationship.ts b/packages/db-postgres/src/transform/read/relationship.ts index 5d40484d2d..65e99d2bf4 100644 --- a/packages/db-postgres/src/transform/read/relationship.ts +++ b/packages/db-postgres/src/transform/read/relationship.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { RelationshipField, UploadField } from 'payload/types' +import type { RelationshipField, UploadField } from 'payload' type Args = { field: RelationshipField | UploadField diff --git a/packages/db-postgres/src/transform/read/traverseFields.ts b/packages/db-postgres/src/transform/read/traverseFields.ts index 444be1d525..783b791a87 100644 --- a/packages/db-postgres/src/transform/read/traverseFields.ts +++ b/packages/db-postgres/src/transform/read/traverseFields.ts @@ -1,8 +1,8 @@ /* eslint-disable no-param-reassign */ -import type { SanitizedConfig } from 'payload/config' -import type { Field, TabAsField } from 'payload/types' +import type { Field, TabAsField } from 'payload' +import type { SanitizedConfig } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' import type { PostgresAdapter } from '../../types.js' import type { BlocksMap } from '../../utilities/createBlocksMap.js' diff --git a/packages/db-postgres/src/transform/write/array.ts b/packages/db-postgres/src/transform/write/array.ts index c2741cc40a..140253709c 100644 --- a/packages/db-postgres/src/transform/write/array.ts +++ b/packages/db-postgres/src/transform/write/array.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { ArrayField } from 'payload/types' +import type { ArrayField } from 'payload' import type { PostgresAdapter } from '../../types.js' import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types.js' diff --git a/packages/db-postgres/src/transform/write/blocks.ts b/packages/db-postgres/src/transform/write/blocks.ts index 35d6605f80..b23f848552 100644 --- a/packages/db-postgres/src/transform/write/blocks.ts +++ b/packages/db-postgres/src/transform/write/blocks.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { BlockField } from 'payload/types' +import type { BlockField } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/transform/write/index.ts b/packages/db-postgres/src/transform/write/index.ts index 24307e8163..2a32848caf 100644 --- a/packages/db-postgres/src/transform/write/index.ts +++ b/packages/db-postgres/src/transform/write/index.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { Field } from 'payload/types' +import type { Field } from 'payload' import type { PostgresAdapter } from '../../types.js' import type { RowToInsert } from './types.js' diff --git a/packages/db-postgres/src/transform/write/relationships.ts b/packages/db-postgres/src/transform/write/relationships.ts index b7c4e23eda..445feef31c 100644 --- a/packages/db-postgres/src/transform/write/relationships.ts +++ b/packages/db-postgres/src/transform/write/relationships.ts @@ -1,6 +1,6 @@ -import type { RelationshipField, UploadField } from 'payload/types' +import type { RelationshipField, UploadField } from 'payload' -import { valueIsValueWithRelation } from 'payload/types' +import { valueIsValueWithRelation } from 'payload/shared' type Args = { baseRow: Record diff --git a/packages/db-postgres/src/transform/write/traverseFields.ts b/packages/db-postgres/src/transform/write/traverseFields.ts index 8680414976..92a829e15f 100644 --- a/packages/db-postgres/src/transform/write/traverseFields.ts +++ b/packages/db-postgres/src/transform/write/traverseFields.ts @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ -import type { Field } from 'payload/types' +import type { Field } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from '../../types.js' diff --git a/packages/db-postgres/src/types.ts b/packages/db-postgres/src/types.ts index 32a9732c2d..0832304d6f 100644 --- a/packages/db-postgres/src/types.ts +++ b/packages/db-postgres/src/types.ts @@ -15,9 +15,7 @@ import type { PgTransaction, } from 'drizzle-orm/pg-core' import type { PgTableFn } from 'drizzle-orm/pg-core/table' -import type { Payload } from 'payload' -import type { BaseDatabaseAdapter } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { BaseDatabaseAdapter, Payload, PayloadRequestWithData } from 'payload' import type { Pool, PoolConfig } from 'pg' export type DrizzleDB = NodePgDatabase> diff --git a/packages/db-postgres/src/update.ts b/packages/db-postgres/src/update.ts index c9caa28adc..859937c04e 100644 --- a/packages/db-postgres/src/update.ts +++ b/packages/db-postgres/src/update.ts @@ -1,4 +1,4 @@ -import type { UpdateOne } from 'payload/database' +import type { UpdateOne } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/updateGlobal.ts b/packages/db-postgres/src/updateGlobal.ts index 84713b65a5..db1dec14a9 100644 --- a/packages/db-postgres/src/updateGlobal.ts +++ b/packages/db-postgres/src/updateGlobal.ts @@ -1,5 +1,4 @@ -import type { UpdateGlobalArgs } from 'payload/database' -import type { PayloadRequestWithData, TypeWithID } from 'payload/types' +import type { PayloadRequestWithData, TypeWithID, UpdateGlobalArgs } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/updateGlobalVersion.ts b/packages/db-postgres/src/updateGlobalVersion.ts index 313c352a27..dc89c7cea0 100644 --- a/packages/db-postgres/src/updateGlobalVersion.ts +++ b/packages/db-postgres/src/updateGlobalVersion.ts @@ -1,7 +1,12 @@ -import type { TypeWithVersion, UpdateGlobalVersionArgs } from 'payload/database' -import type { PayloadRequestWithData, SanitizedGlobalConfig, TypeWithID } from 'payload/types' +import type { + PayloadRequestWithData, + SanitizedGlobalConfig, + TypeWithID, + TypeWithVersion, + UpdateGlobalVersionArgs, +} from 'payload' -import { buildVersionGlobalFields } from 'payload/versions' +import { buildVersionGlobalFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/updateVersion.ts b/packages/db-postgres/src/updateVersion.ts index e87177e18d..b5756a9190 100644 --- a/packages/db-postgres/src/updateVersion.ts +++ b/packages/db-postgres/src/updateVersion.ts @@ -1,7 +1,12 @@ -import type { TypeWithVersion, UpdateVersionArgs } from 'payload/database' -import type { PayloadRequestWithData, SanitizedCollectionConfig, TypeWithID } from 'payload/types' +import type { + PayloadRequestWithData, + SanitizedCollectionConfig, + TypeWithID, + TypeWithVersion, + UpdateVersionArgs, +} from 'payload' -import { buildVersionCollectionFields } from 'payload/versions' +import { buildVersionCollectionFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/upsertRow/index.ts b/packages/db-postgres/src/upsertRow/index.ts index 55f13fa242..04cc2b0642 100644 --- a/packages/db-postgres/src/upsertRow/index.ts +++ b/packages/db-postgres/src/upsertRow/index.ts @@ -1,8 +1,8 @@ /* eslint-disable no-param-reassign */ -import type { TypeWithID } from 'payload/types' +import type { TypeWithID } from 'payload' import { eq } from 'drizzle-orm' -import { ValidationError } from 'payload/errors' +import { ValidationError } from 'payload' import type { BlockRowToInsert } from '../transform/write/types.js' import type { Args } from './types.js' diff --git a/packages/db-postgres/src/upsertRow/types.ts b/packages/db-postgres/src/upsertRow/types.ts index b00cd1e761..b0babe7ce3 100644 --- a/packages/db-postgres/src/upsertRow/types.ts +++ b/packages/db-postgres/src/upsertRow/types.ts @@ -1,5 +1,5 @@ import type { SQL } from 'drizzle-orm' -import type { Field, PayloadRequestWithData } from 'payload/types' +import type { Field, PayloadRequestWithData } from 'payload' import type { DrizzleDB, GenericColumn, PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/utilities/hasLocalesTable.ts b/packages/db-postgres/src/utilities/hasLocalesTable.ts index ef49631246..949414fa6d 100644 --- a/packages/db-postgres/src/utilities/hasLocalesTable.ts +++ b/packages/db-postgres/src/utilities/hasLocalesTable.ts @@ -1,6 +1,6 @@ -import type { Field } from 'payload/types' +import type { Field } from 'payload' -import { fieldAffectsData, fieldHasSubFields } from 'payload/types' +import { fieldAffectsData, fieldHasSubFields } from 'payload/shared' export const hasLocalesTable = (fields: Field[]): boolean => { return fields.some((field) => { diff --git a/packages/email-nodemailer/package.json b/packages/email-nodemailer/package.json index 3a50904a9d..953ab44e67 100644 --- a/packages/email-nodemailer/package.json +++ b/packages/email-nodemailer/package.json @@ -24,9 +24,9 @@ "dist" ], "scripts": { - "build": "pnpm build:swc && pnpm build:types", + "build": "pnpm build:types && pnpm build:swc", "build:clean": "find . \\( -type d \\( -name build -o -name dist -o -name .cache \\) -o -type f -name tsconfig.tsbuildinfo \\) -exec rm -rf {} + && pnpm build", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "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" diff --git a/packages/email-nodemailer/src/index.ts b/packages/email-nodemailer/src/index.ts index 41945d7b81..78187186ae 100644 --- a/packages/email-nodemailer/src/index.ts +++ b/packages/email-nodemailer/src/index.ts @@ -1,10 +1,10 @@ /* eslint-disable no-console */ import type { Transporter } from 'nodemailer' import type SMTPConnection from 'nodemailer/lib/smtp-connection' -import type { EmailAdapter } from 'payload/config' +import type { EmailAdapter } from 'payload' import nodemailer from 'nodemailer' -import { InvalidConfiguration } from 'payload/errors' +import { InvalidConfiguration } from 'payload' export type NodemailerAdapterArgs = { defaultFromAddress: string diff --git a/packages/email-nodemailer/tsconfig.json b/packages/email-nodemailer/tsconfig.json index 79ddab46b9..763126eed7 100644 --- a/packages/email-nodemailer/tsconfig.json +++ b/packages/email-nodemailer/tsconfig.json @@ -6,14 +6,9 @@ "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", - "node_modules", - ], + "exclude": ["dist", "node_modules"], "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"], - "references": [ - { "path": "../payload" }, - ] + "references": [{ "path": "../payload" }] } diff --git a/packages/email-resend/package.json b/packages/email-resend/package.json index 0ee1bc8412..7529d69ffc 100644 --- a/packages/email-resend/package.json +++ b/packages/email-resend/package.json @@ -24,8 +24,8 @@ "dist" ], "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", diff --git a/packages/email-resend/src/email-resend.spec.ts b/packages/email-resend/src/email-resend.spec.ts index 4fe2e9cd22..48c1f4f359 100644 --- a/packages/email-resend/src/email-resend.spec.ts +++ b/packages/email-resend/src/email-resend.spec.ts @@ -1,5 +1,5 @@ import { resendAdapter } from './index.js' -import { Payload } from 'payload/types' +import { Payload } from 'payload' import { jest } from '@jest/globals' describe('email-resend', () => { diff --git a/packages/email-resend/src/index.ts b/packages/email-resend/src/index.ts index da36ec7c14..728e4202d7 100644 --- a/packages/email-resend/src/index.ts +++ b/packages/email-resend/src/index.ts @@ -1,7 +1,6 @@ -import type { EmailAdapter } from 'payload/config' -import type { SendEmailOptions } from 'payload/types' +import type { EmailAdapter, SendEmailOptions } from 'payload' -import { APIError } from 'payload/errors' +import { APIError } from 'payload' export type ResendAdapterArgs = { apiKey: string diff --git a/packages/email-resend/tsconfig.json b/packages/email-resend/tsconfig.json index 664001de39..fd981033ae 100644 --- a/packages/email-resend/tsconfig.json +++ b/packages/email-resend/tsconfig.json @@ -6,15 +6,9 @@ "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", - "node_modules", - "src/**/*.spec.ts", - ], + "exclude": ["dist", "node_modules", "src/**/*.spec.ts"], "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"], - "references": [ - { "path": "../payload" }, - ] + "references": [{ "path": "../payload" }] } diff --git a/packages/graphql/package.json b/packages/graphql/package.json index fb8da7f872..20d961303d 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -29,8 +29,8 @@ "dist" ], "scripts": { - "build": "pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm build:types && pnpm build:swc", + "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" diff --git a/packages/graphql/src/bin/generateSchema.ts b/packages/graphql/src/bin/generateSchema.ts index 2d19106fb8..0bbb870d58 100644 --- a/packages/graphql/src/bin/generateSchema.ts +++ b/packages/graphql/src/bin/generateSchema.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-floating-promises */ -import type { SanitizedConfig } from 'payload/types' +import type { SanitizedConfig } from 'payload' import fs from 'fs' import { printSchema } from 'graphql' diff --git a/packages/graphql/src/index.ts b/packages/graphql/src/index.ts index 3ddbee0fac..7081012e22 100644 --- a/packages/graphql/src/index.ts +++ b/packages/graphql/src/index.ts @@ -1,7 +1,6 @@ /* eslint-disable no-param-reassign */ import type { OperationArgs } from 'graphql-http' -import type { GraphQLInfo } from 'payload/config' -import type { SanitizedConfig } from 'payload/types' +import type { GraphQLInfo, SanitizedConfig } from 'payload' import * as GraphQL from 'graphql' diff --git a/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts b/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts index 219972d8f2..4c28a862f0 100644 --- a/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts +++ b/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts @@ -18,7 +18,8 @@ import type { GraphQLSchema, GraphQLUnionType, InlineFragmentNode, - OperationDefinitionNode} from 'graphql'; + OperationDefinitionNode, +} from 'graphql' import { GraphQLError, diff --git a/packages/graphql/src/resolvers/auth/access.ts b/packages/graphql/src/resolvers/auth/access.ts index f40142d764..0ec80f0ba8 100644 --- a/packages/graphql/src/resolvers/auth/access.ts +++ b/packages/graphql/src/resolvers/auth/access.ts @@ -1,7 +1,6 @@ -import type { SanitizedConfig } from 'payload/types' +import type { SanitizedConfig } from 'payload' -import { accessOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { accessOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/forgotPassword.ts b/packages/graphql/src/resolvers/auth/forgotPassword.ts index 7c8933e3a7..7a2ee1df55 100644 --- a/packages/graphql/src/resolvers/auth/forgotPassword.ts +++ b/packages/graphql/src/resolvers/auth/forgotPassword.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { forgotPasswordOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { forgotPasswordOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/init.ts b/packages/graphql/src/resolvers/auth/init.ts index faaace2135..e9d72cd628 100644 --- a/packages/graphql/src/resolvers/auth/init.ts +++ b/packages/graphql/src/resolvers/auth/init.ts @@ -1,5 +1,4 @@ -import { initOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { initOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/login.ts b/packages/graphql/src/resolvers/auth/login.ts index 7cfe683824..6584d01f0d 100644 --- a/packages/graphql/src/resolvers/auth/login.ts +++ b/packages/graphql/src/resolvers/auth/login.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { generatePayloadCookie } from 'payload/auth' -import { loginOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { generatePayloadCookie, isolateObjectProperty, loginOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/logout.ts b/packages/graphql/src/resolvers/auth/logout.ts index 7e65b544f7..73d9f175b9 100644 --- a/packages/graphql/src/resolvers/auth/logout.ts +++ b/packages/graphql/src/resolvers/auth/logout.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { generateExpiredPayloadCookie } from 'payload/auth' -import { logoutOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { generateExpiredPayloadCookie, isolateObjectProperty, logoutOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/me.ts b/packages/graphql/src/resolvers/auth/me.ts index b406b59682..69bb1ce7fb 100644 --- a/packages/graphql/src/resolvers/auth/me.ts +++ b/packages/graphql/src/resolvers/auth/me.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { meOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, meOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/refresh.ts b/packages/graphql/src/resolvers/auth/refresh.ts index 5747d86d62..0722fed8a3 100644 --- a/packages/graphql/src/resolvers/auth/refresh.ts +++ b/packages/graphql/src/resolvers/auth/refresh.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { extractJWT, generatePayloadCookie } from 'payload/auth' -import { refreshOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { extractJWT, generatePayloadCookie, isolateObjectProperty, refreshOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/resetPassword.ts b/packages/graphql/src/resolvers/auth/resetPassword.ts index 6610b5c003..27d7eda0eb 100644 --- a/packages/graphql/src/resolvers/auth/resetPassword.ts +++ b/packages/graphql/src/resolvers/auth/resetPassword.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { generatePayloadCookie } from 'payload/auth' -import { resetPasswordOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { generatePayloadCookie, isolateObjectProperty, resetPasswordOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/unlock.ts b/packages/graphql/src/resolvers/auth/unlock.ts index 4bb15242dd..1ac27673a2 100644 --- a/packages/graphql/src/resolvers/auth/unlock.ts +++ b/packages/graphql/src/resolvers/auth/unlock.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { unlockOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, unlockOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/verifyEmail.ts b/packages/graphql/src/resolvers/auth/verifyEmail.ts index ce4ffde6e3..c6d50b055f 100644 --- a/packages/graphql/src/resolvers/auth/verifyEmail.ts +++ b/packages/graphql/src/resolvers/auth/verifyEmail.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { verifyEmailOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, verifyEmailOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/count.ts b/packages/graphql/src/resolvers/collections/count.ts index 0563ed3564..127e28b7f2 100644 --- a/packages/graphql/src/resolvers/collections/count.ts +++ b/packages/graphql/src/resolvers/collections/count.ts @@ -1,7 +1,6 @@ -import type { Collection, PayloadRequestWithData , Where } from 'payload/types' +import type { Collection, PayloadRequestWithData, Where } from 'payload' -import { countOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { countOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/create.ts b/packages/graphql/src/resolvers/collections/create.ts index 6999bb8f6c..86c11f1c52 100644 --- a/packages/graphql/src/resolvers/collections/create.ts +++ b/packages/graphql/src/resolvers/collections/create.ts @@ -1,9 +1,7 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' import type { MarkOptional } from 'ts-essentials' -import { createOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { createOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/delete.ts b/packages/graphql/src/resolvers/collections/delete.ts index c78f12dad4..343004cb39 100644 --- a/packages/graphql/src/resolvers/collections/delete.ts +++ b/packages/graphql/src/resolvers/collections/delete.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { deleteByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { deleteByIDOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/docAccess.ts b/packages/graphql/src/resolvers/collections/docAccess.ts index f4e6f41355..f5f7b95ecb 100644 --- a/packages/graphql/src/resolvers/collections/docAccess.ts +++ b/packages/graphql/src/resolvers/collections/docAccess.ts @@ -1,8 +1,11 @@ -import type { CollectionPermission, GlobalPermission } from 'payload/auth' -import type { Collection, PayloadRequestWithData } from 'payload/types' +import type { + Collection, + CollectionPermission, + GlobalPermission, + PayloadRequestWithData, +} from 'payload' -import { docAccessOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { docAccessOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/duplicate.ts b/packages/graphql/src/resolvers/collections/duplicate.ts index c714fdf519..9fd041d7b2 100644 --- a/packages/graphql/src/resolvers/collections/duplicate.ts +++ b/packages/graphql/src/resolvers/collections/duplicate.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { duplicateOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { duplicateOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/find.ts b/packages/graphql/src/resolvers/collections/find.ts index 60a82ff917..c25da5ac6b 100644 --- a/packages/graphql/src/resolvers/collections/find.ts +++ b/packages/graphql/src/resolvers/collections/find.ts @@ -1,8 +1,6 @@ -import type { PaginatedDocs } from 'payload/database' -import type { Collection, PayloadRequestWithData , Where } from 'payload/types' +import type { Collection, PaginatedDocs, PayloadRequestWithData, Where } from 'payload' -import { findOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/findByID.ts b/packages/graphql/src/resolvers/collections/findByID.ts index 0bbcf85a9c..a2623edaec 100644 --- a/packages/graphql/src/resolvers/collections/findByID.ts +++ b/packages/graphql/src/resolvers/collections/findByID.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { findByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findByIDOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/findVersionByID.ts b/packages/graphql/src/resolvers/collections/findVersionByID.ts index 14b8b1c354..85729327fe 100644 --- a/packages/graphql/src/resolvers/collections/findVersionByID.ts +++ b/packages/graphql/src/resolvers/collections/findVersionByID.ts @@ -1,8 +1,6 @@ -import type { Collection , PayloadRequestWithData, TypeWithID } from 'payload/types' -import type { TypeWithVersion } from 'payload/versions' +import type { Collection, PayloadRequestWithData, TypeWithID, TypeWithVersion } from 'payload' -import { findVersionByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionByIDOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/findVersions.ts b/packages/graphql/src/resolvers/collections/findVersions.ts index 6e379e5400..c4f256f969 100644 --- a/packages/graphql/src/resolvers/collections/findVersions.ts +++ b/packages/graphql/src/resolvers/collections/findVersions.ts @@ -1,8 +1,6 @@ -import type { PaginatedDocs } from 'payload/database' -import type { Collection, PayloadRequestWithData , Where } from 'payload/types' +import type { Collection, PaginatedDocs, PayloadRequestWithData, Where } from 'payload' -import { findVersionsOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionsOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/restoreVersion.ts b/packages/graphql/src/resolvers/collections/restoreVersion.ts index 882e5888e4..396fae0643 100644 --- a/packages/graphql/src/resolvers/collections/restoreVersion.ts +++ b/packages/graphql/src/resolvers/collections/restoreVersion.ts @@ -1,7 +1,6 @@ -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, PayloadRequestWithData } from 'payload' -import { restoreVersionOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, restoreVersionOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/update.ts b/packages/graphql/src/resolvers/collections/update.ts index d8efc320ae..e8b2203044 100644 --- a/packages/graphql/src/resolvers/collections/update.ts +++ b/packages/graphql/src/resolvers/collections/update.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { updateByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, updateByIDOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/docAccess.ts b/packages/graphql/src/resolvers/globals/docAccess.ts index 1a36d15050..bbccdd5c7c 100644 --- a/packages/graphql/src/resolvers/globals/docAccess.ts +++ b/packages/graphql/src/resolvers/globals/docAccess.ts @@ -1,8 +1,11 @@ -import type { CollectionPermission, GlobalPermission } from 'payload/auth' -import type { PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { + CollectionPermission, + GlobalPermission, + PayloadRequestWithData, + SanitizedGlobalConfig, +} from 'payload' -import { docAccessOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { docAccessOperationGlobal, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/findOne.ts b/packages/graphql/src/resolvers/globals/findOne.ts index c5d499e4fa..b8bd357fda 100644 --- a/packages/graphql/src/resolvers/globals/findOne.ts +++ b/packages/graphql/src/resolvers/globals/findOne.ts @@ -1,7 +1,6 @@ -import type { Document, SanitizedGlobalConfig } from 'payload/types' +import type { Document, SanitizedGlobalConfig } from 'payload' -import { findOneOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findOneOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/findVersionByID.ts b/packages/graphql/src/resolvers/globals/findVersionByID.ts index be6a072e14..57717768d8 100644 --- a/packages/graphql/src/resolvers/globals/findVersionByID.ts +++ b/packages/graphql/src/resolvers/globals/findVersionByID.ts @@ -1,7 +1,6 @@ -import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload' -import { findVersionByIDOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionByIDOperationGlobal, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/findVersions.ts b/packages/graphql/src/resolvers/globals/findVersions.ts index 38ef27d9be..824646aae2 100644 --- a/packages/graphql/src/resolvers/globals/findVersions.ts +++ b/packages/graphql/src/resolvers/globals/findVersions.ts @@ -1,7 +1,6 @@ -import type { Document, PayloadRequestWithData, SanitizedGlobalConfig, Where } from 'payload/types' +import type { Document, PayloadRequestWithData, SanitizedGlobalConfig, Where } from 'payload' -import { findVersionsOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionsOperationGlobal, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/restoreVersion.ts b/packages/graphql/src/resolvers/globals/restoreVersion.ts index f8eb61dcee..fb289d50f8 100644 --- a/packages/graphql/src/resolvers/globals/restoreVersion.ts +++ b/packages/graphql/src/resolvers/globals/restoreVersion.ts @@ -1,7 +1,6 @@ -import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload' -import { restoreVersionOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, restoreVersionOperationGlobal } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/update.ts b/packages/graphql/src/resolvers/globals/update.ts index 3b574af920..bb4ef65058 100644 --- a/packages/graphql/src/resolvers/globals/update.ts +++ b/packages/graphql/src/resolvers/globals/update.ts @@ -1,9 +1,7 @@ -import type { GeneratedTypes } from 'payload' -import type { PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { GeneratedTypes, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload' import type { DeepPartial } from 'ts-essentials' -import { updateOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, updateOperationGlobal } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/types.ts b/packages/graphql/src/resolvers/types.ts index 53d0fcabea..8309193bf0 100644 --- a/packages/graphql/src/resolvers/types.ts +++ b/packages/graphql/src/resolvers/types.ts @@ -1,4 +1,4 @@ -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' export type Context = { headers: { diff --git a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts index ac0168026a..5b5ee0e8da 100644 --- a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts +++ b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts @@ -1,4 +1,4 @@ -import type { SanitizedLocalizationConfig } from 'payload/config' +import type { SanitizedLocalizationConfig } from 'payload' import { GraphQLEnumType } from 'graphql' diff --git a/packages/graphql/src/schema/buildLocaleInputType.ts b/packages/graphql/src/schema/buildLocaleInputType.ts index 7be6bdff93..73d414e04b 100644 --- a/packages/graphql/src/schema/buildLocaleInputType.ts +++ b/packages/graphql/src/schema/buildLocaleInputType.ts @@ -1,5 +1,5 @@ import type { GraphQLScalarType } from 'graphql' -import type { SanitizedLocalizationConfig } from 'payload/config' +import type { SanitizedLocalizationConfig } from 'payload' import { GraphQLEnumType } from 'graphql' diff --git a/packages/graphql/src/schema/buildMutationInputType.ts b/packages/graphql/src/schema/buildMutationInputType.ts index 2e249f59d9..1260b6883c 100644 --- a/packages/graphql/src/schema/buildMutationInputType.ts +++ b/packages/graphql/src/schema/buildMutationInputType.ts @@ -1,5 +1,4 @@ import type { GraphQLInputFieldConfig, GraphQLScalarType, GraphQLType } from 'graphql' -import type { GraphQLInfo } from 'payload/config' import type { ArrayField, BlockField, @@ -9,6 +8,7 @@ import type { DateField, EmailField, Field, + GraphQLInfo, GroupField, JSONField, NumberField, @@ -24,7 +24,7 @@ import type { TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import { GraphQLBoolean, @@ -36,8 +36,8 @@ import { GraphQLNonNull, GraphQLString, } from 'graphql' -import { fieldAffectsData, optionIsObject, tabHasName } from 'payload/types' -import { flattenTopLevelFields , toWords } from 'payload/utilities' +import { flattenTopLevelFields, toWords } from 'payload' +import { fieldAffectsData, optionIsObject, tabHasName } from 'payload/shared' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' import combineParentName from '../utilities/combineParentName.js' diff --git a/packages/graphql/src/schema/buildObjectType.ts b/packages/graphql/src/schema/buildObjectType.ts index 8464a03526..a718e8c741 100644 --- a/packages/graphql/src/schema/buildObjectType.ts +++ b/packages/graphql/src/schema/buildObjectType.ts @@ -2,7 +2,6 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable no-restricted-syntax */ import type { GraphQLFieldConfig, GraphQLType } from 'graphql' -import type { GraphQLInfo } from 'payload/config' import type { ArrayField, BlockField, @@ -12,6 +11,7 @@ import type { DateField, EmailField, Field, + GraphQLInfo, GroupField, JSONField, NumberField, @@ -27,7 +27,7 @@ import type { TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import { GraphQLBoolean, @@ -41,9 +41,8 @@ import { GraphQLUnionType, } from 'graphql' import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars' -import { MissingEditorProp } from 'payload/errors' -import { tabHasName } from 'payload/types' -import { createDataloaderCacheKey, toWords } from 'payload/utilities' +import { MissingEditorProp, createDataloaderCacheKey, toWords } from 'payload' +import { tabHasName } from 'payload/shared' import type { Context } from '../resolvers/types.js' diff --git a/packages/graphql/src/schema/buildPoliciesType.ts b/packages/graphql/src/schema/buildPoliciesType.ts index 14a2c8c396..921045ccec 100644 --- a/packages/graphql/src/schema/buildPoliciesType.ts +++ b/packages/graphql/src/schema/buildPoliciesType.ts @@ -5,10 +5,10 @@ import type { SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig, -} from 'payload/types' +} from 'payload' import { GraphQLBoolean, GraphQLNonNull, GraphQLObjectType } from 'graphql' -import { toWords } from 'payload/utilities' +import { toWords } from 'payload' import { GraphQLJSONObject } from '../packages/graphql-type-json/index.js' import formatName from '../utilities/formatName.js' diff --git a/packages/graphql/src/schema/buildWhereInputType.ts b/packages/graphql/src/schema/buildWhereInputType.ts index aacc5170e9..9a14337fd0 100644 --- a/packages/graphql/src/schema/buildWhereInputType.ts +++ b/packages/graphql/src/schema/buildWhereInputType.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ -import type { Field, FieldAffectingData } from 'payload/types' +import type { Field, FieldAffectingData } from 'payload' import { GraphQLInputObjectType, GraphQLList } from 'graphql' -import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from 'payload/types' -import { flattenTopLevelFields } from 'payload/utilities' +import { flattenTopLevelFields } from 'payload' +import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from 'payload/shared' import formatName from '../utilities/formatName.js' import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' diff --git a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts index 0650f37995..69b0f3da5d 100644 --- a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts +++ b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts @@ -18,7 +18,7 @@ import type { TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import { GraphQLEnumType, GraphQLInputObjectType } from 'graphql' diff --git a/packages/graphql/src/schema/initCollections.ts b/packages/graphql/src/schema/initCollections.ts index 33e057d8c3..caf47d093c 100644 --- a/packages/graphql/src/schema/initCollections.ts +++ b/packages/graphql/src/schema/initCollections.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -import type { GraphQLInfo } from 'payload/config' -import type { Collection, Field, SanitizedCollectionConfig, SanitizedConfig } from 'payload/types' +import type { GraphQLInfo } from 'payload' +import type { Collection, Field, SanitizedCollectionConfig, SanitizedConfig } from 'payload' import { GraphQLBoolean, @@ -9,9 +9,8 @@ import { GraphQLObjectType, GraphQLString, } from 'graphql' -import { fieldAffectsData } from 'payload/types' -import { flattenTopLevelFields, formatNames, toWords } from 'payload/utilities' -import { buildVersionCollectionFields } from 'payload/versions' +import { buildVersionCollectionFields, flattenTopLevelFields, formatNames, toWords } from 'payload' +import { fieldAffectsData } from 'payload/shared' import type { ObjectTypeConfig } from './buildObjectType.js' diff --git a/packages/graphql/src/schema/initGlobals.ts b/packages/graphql/src/schema/initGlobals.ts index 6f8875ef90..37dc6c567b 100644 --- a/packages/graphql/src/schema/initGlobals.ts +++ b/packages/graphql/src/schema/initGlobals.ts @@ -3,11 +3,9 @@ import { GraphQLBoolean, GraphQLInt, GraphQLNonNull, GraphQLString } from 'graph import pluralize from 'pluralize' const { singular } = pluralize -import type { GraphQLInfo } from 'payload/config' -import type { Field, SanitizedConfig, SanitizedGlobalConfig } from 'payload/types' +import type { Field, GraphQLInfo, SanitizedConfig, SanitizedGlobalConfig } from 'payload' -import { toWords } from 'payload/utilities' -import { buildVersionGlobalFields } from 'payload/versions' +import { buildVersionGlobalFields, toWords } from 'payload' import { docAccessResolver } from '../resolvers/globals/docAccess.js' import findOneResolver from '../resolvers/globals/findOne.js' diff --git a/packages/graphql/src/schema/isFieldNullable.ts b/packages/graphql/src/schema/isFieldNullable.ts index 2d6f15fe3c..f85d64e7b6 100644 --- a/packages/graphql/src/schema/isFieldNullable.ts +++ b/packages/graphql/src/schema/isFieldNullable.ts @@ -1,6 +1,6 @@ -import type { FieldAffectingData } from 'payload/types' +import type { FieldAffectingData } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean => { const hasReadAccessControl = field.access && field.access.read diff --git a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts index 3051efb9bb..aa0d21076d 100644 --- a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts +++ b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts @@ -1,6 +1,6 @@ -import type { FieldWithSubFields, TabsField } from 'payload/types' +import type { FieldWithSubFields, TabsField } from 'payload' -import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types' +import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/shared' import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' diff --git a/packages/graphql/src/schema/withNullableType.ts b/packages/graphql/src/schema/withNullableType.ts index a71628f79f..84f4a21d8d 100644 --- a/packages/graphql/src/schema/withNullableType.ts +++ b/packages/graphql/src/schema/withNullableType.ts @@ -1,5 +1,5 @@ import type { GraphQLType } from 'graphql' -import type { FieldAffectingData } from 'payload/types' +import type { FieldAffectingData } from 'payload' import { GraphQLNonNull } from 'graphql' diff --git a/packages/graphql/src/schema/withOperators.ts b/packages/graphql/src/schema/withOperators.ts index be1767d378..8e0d153d54 100644 --- a/packages/graphql/src/schema/withOperators.ts +++ b/packages/graphql/src/schema/withOperators.ts @@ -1,5 +1,5 @@ import type { GraphQLType } from 'graphql' -import type { FieldAffectingData, NumberField, RadioField, SelectField } from 'payload/types' +import type { FieldAffectingData, NumberField, RadioField, SelectField } from 'payload' import { GraphQLBoolean, @@ -11,7 +11,7 @@ import { GraphQLString, } from 'graphql' import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars' -import { optionIsObject } from 'payload/types' +import { optionIsObject } from 'payload/shared' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' import combineParentName from '../utilities/combineParentName.js' diff --git a/packages/graphql/src/utilities/formatOptions.ts b/packages/graphql/src/utilities/formatOptions.ts index 82eaffd762..2b137289b5 100644 --- a/packages/graphql/src/utilities/formatOptions.ts +++ b/packages/graphql/src/utilities/formatOptions.ts @@ -1,4 +1,4 @@ -import type { RadioField, SelectField } from 'payload/types' +import type { RadioField, SelectField } from 'payload' import formatName from './formatName.js' diff --git a/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts b/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts index c317a7e415..77458dcc30 100644 --- a/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts +++ b/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts @@ -1,6 +1,6 @@ -import type { Field, Tab } from 'payload/types' +import type { Field, Tab } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' export const groupOrTabHasRequiredSubfield = (entity: Field | Tab): boolean => { if ('type' in entity && entity.type === 'group') { diff --git a/packages/graphql/src/utilities/wrapCustomResolver.ts b/packages/graphql/src/utilities/wrapCustomResolver.ts index 4f02ba4a8b..6e44734fbc 100644 --- a/packages/graphql/src/utilities/wrapCustomResolver.ts +++ b/packages/graphql/src/utilities/wrapCustomResolver.ts @@ -1,8 +1,8 @@ import type { ObjMap } from 'graphql/jsutils/ObjMap.js' import type { GraphQLFieldConfig, GraphQLFieldResolver } from 'graphql/type/definition.js' -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty } from 'payload' type PayloadContext = { req: PayloadRequestWithData } diff --git a/packages/graphql/tsconfig.json b/packages/graphql/tsconfig.json index b9f266b7ee..7da6b51b77 100644 --- a/packages/graphql/tsconfig.json +++ b/packages/graphql/tsconfig.json @@ -5,7 +5,7 @@ "noEmit": false /* Do not emit outputs. */, "emitDeclarationOnly": true, "outDir": "./dist" /* Specify an output folder for all emitted files. */, - "rootDir": "./src" /* Specify the root folder within your source files. */, + "rootDir": "./src" /* Specify the root folder within your source files. */ }, "exclude": [ "dist", diff --git a/packages/live-preview-react/package.json b/packages/live-preview-react/package.json index 9c9c990055..d9de4dc0d8 100644 --- a/packages/live-preview-react/package.json +++ b/packages/live-preview-react/package.json @@ -23,8 +23,8 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm copyfiles && pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/", diff --git a/packages/live-preview-vue/package.json b/packages/live-preview-vue/package.json index fe6763a96e..6228857ae0 100644 --- a/packages/live-preview-vue/package.json +++ b/packages/live-preview-vue/package.json @@ -23,8 +23,8 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm copyfiles && pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/", diff --git a/packages/live-preview/package.json b/packages/live-preview/package.json index eaaf7448b6..9fbbc85037 100644 --- a/packages/live-preview/package.json +++ b/packages/live-preview/package.json @@ -23,8 +23,8 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm copyfiles && pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/", diff --git a/packages/live-preview/src/mergeData.ts b/packages/live-preview/src/mergeData.ts index e1cf642747..a40a2e2d11 100644 --- a/packages/live-preview/src/mergeData.ts +++ b/packages/live-preview/src/mergeData.ts @@ -1,5 +1,5 @@ -import type { PaginatedDocs } from 'payload/database' -import type { fieldSchemaToJSON } from 'payload/utilities' +import type { PaginatedDocs } from 'payload' +import type { fieldSchemaToJSON } from 'payload/shared' import type { PopulationsByCollection, UpdatedDocument } from './types.js' diff --git a/packages/live-preview/src/traverseFields.ts b/packages/live-preview/src/traverseFields.ts index 096901ae3c..fa7b722c1b 100644 --- a/packages/live-preview/src/traverseFields.ts +++ b/packages/live-preview/src/traverseFields.ts @@ -1,4 +1,4 @@ -import type { fieldSchemaToJSON } from 'payload/utilities' +import type { fieldSchemaToJSON } from 'payload/shared' import type { PopulationsByCollection, UpdatedDocument } from './types.js' diff --git a/packages/next/package.json b/packages/next/package.json index 1323abfb41..7fd6184d8e 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -30,9 +30,9 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:cjs && pnpm build:types && pnpm build:webpack && rm dist/prod/index.js", - "build:cjs": "swc ./src/withPayload.js -o ./dist/cjs/withPayload.cjs --config-file .swcrc-cjs", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "rm -rf dist && rm -rf tsconfig.tsbuildinfo && pnpm copyfiles && pnpm build:types && pnpm build:swc && pnpm build:cjs && pnpm build:webpack", + "build:cjs": "swc ./src/withPayload.js -o ./dist/cjs/withPayload.cjs --config-file .swcrc-cjs --strip-leading-paths", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "build:webpack": "webpack --config webpack.config.js", "clean": "rimraf {dist,*.tsbuildinfo}", diff --git a/packages/next/src/config.ts b/packages/next/src/config.ts index e27fdc9694..b091e2b604 100644 --- a/packages/next/src/config.ts +++ b/packages/next/src/config.ts @@ -1,3 +1,3 @@ -import type { SanitizedConfig } from 'payload/config' +import type { SanitizedConfig } from 'payload' export default {} as Promise diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx b/packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx similarity index 84% rename from packages/ui/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx index 9df2e3f258..19abd43531 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx @@ -1,7 +1,7 @@ 'use client' import type React from 'react' -import { useDocumentInfo } from '../../../providers/DocumentInfo/index.js' +import { useDocumentInfo } from '@payloadcms/ui/client' export const ShouldRenderTabs: React.FC<{ children: React.ReactNode diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx b/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx similarity index 93% rename from packages/ui/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx index 2b5b558252..a9d7a5f219 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx @@ -1,12 +1,11 @@ 'use client' -import type { SanitizedConfig } from 'payload/types' +import type { SanitizedConfig } from 'payload' +import { useSearchParams } from '@payloadcms/ui/client' import LinkImport from 'next/link.js' import { useParams, usePathname } from 'next/navigation.js' import React from 'react' -import { useSearchParams } from '../../../../providers/SearchParams/index.js' - const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default export const DocumentTabLink: React.FC<{ diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.scss b/packages/next/src/elements/DocumentHeader/Tabs/Tab/index.scss similarity index 100% rename from packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.scss rename to packages/next/src/elements/DocumentHeader/Tabs/Tab/index.scss diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/Tab/index.tsx similarity index 99% rename from packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/Tab/index.tsx index aba6ace78d..46b48e442a 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/Tab/index.tsx @@ -1,4 +1,4 @@ -import type { DocumentTabConfig, DocumentTabProps } from 'payload/types' +import type { DocumentTabConfig, DocumentTabProps } from 'payload' import React, { Fragment } from 'react' diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/getCustomViews.ts b/packages/next/src/elements/DocumentHeader/Tabs/getCustomViews.ts similarity index 90% rename from packages/ui/src/elements/DocumentHeader/Tabs/getCustomViews.ts rename to packages/next/src/elements/DocumentHeader/Tabs/getCustomViews.ts index 7e837c2052..e791169649 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/getCustomViews.ts +++ b/packages/next/src/elements/DocumentHeader/Tabs/getCustomViews.ts @@ -1,5 +1,4 @@ -import type { EditViewConfig } from 'payload/config' -import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload/types' +import type { EditViewConfig, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload' import { documentViewKeys } from './tabs/index.js' diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/getViewConfig.ts b/packages/next/src/elements/DocumentHeader/Tabs/getViewConfig.ts similarity index 86% rename from packages/ui/src/elements/DocumentHeader/Tabs/getViewConfig.ts rename to packages/next/src/elements/DocumentHeader/Tabs/getViewConfig.ts index db781cc31b..1b12d6342c 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/getViewConfig.ts +++ b/packages/next/src/elements/DocumentHeader/Tabs/getViewConfig.ts @@ -1,5 +1,4 @@ -import type { EditViewConfig } from 'payload/config' -import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload/types' +import type { EditViewConfig, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload' export const getViewConfig = (args: { collectionConfig: SanitizedCollectionConfig diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/index.scss b/packages/next/src/elements/DocumentHeader/Tabs/index.scss similarity index 100% rename from packages/ui/src/elements/DocumentHeader/Tabs/index.scss rename to packages/next/src/elements/DocumentHeader/Tabs/index.scss diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/index.tsx similarity index 96% rename from packages/ui/src/elements/DocumentHeader/Tabs/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/index.tsx index 4ad8e03199..2d40465f9a 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/index.tsx @@ -1,12 +1,12 @@ import type { I18n } from '@payloadcms/translations' -import type { Permissions } from 'payload/auth' import type { + Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig, -} from 'payload/types' +} from 'payload' -import { isPlainObject } from 'payload/utilities' +import { isPlainObject } from 'payload' import React from 'react' import { ShouldRenderTabs } from './ShouldRenderTabs.js' diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx similarity index 90% rename from packages/ui/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx index ec0e3baefb..1810e5a256 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx @@ -1,7 +1,7 @@ 'use client' +import { useDocumentInfo } from '@payloadcms/ui/client' import React, { Fragment } from 'react' -import { useDocumentInfo } from '../../../../../providers/DocumentInfo/index.js' import { baseClass } from '../../Tab/index.js' export const VersionsPill: React.FC = () => { diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/tabs/index.tsx similarity index 97% rename from packages/ui/src/elements/DocumentHeader/Tabs/tabs/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/tabs/index.tsx index 2b01af9a10..913945ad59 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/tabs/index.tsx @@ -1,4 +1,4 @@ -import type { DocumentTabConfig } from 'payload/types' +import type { DocumentTabConfig } from 'payload' import { VersionsPill } from './VersionsPill/index.js' diff --git a/packages/ui/src/elements/DocumentHeader/index.scss b/packages/next/src/elements/DocumentHeader/index.scss similarity index 100% rename from packages/ui/src/elements/DocumentHeader/index.scss rename to packages/next/src/elements/DocumentHeader/index.scss diff --git a/packages/ui/src/elements/DocumentHeader/index.tsx b/packages/next/src/elements/DocumentHeader/index.tsx similarity index 87% rename from packages/ui/src/elements/DocumentHeader/index.tsx rename to packages/next/src/elements/DocumentHeader/index.tsx index 10fda0cef7..496c1db8b4 100644 --- a/packages/ui/src/elements/DocumentHeader/index.tsx +++ b/packages/next/src/elements/DocumentHeader/index.tsx @@ -1,15 +1,14 @@ import type { I18n } from '@payloadcms/translations' -import type { Permissions } from 'payload/auth' import type { + Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig, -} from 'payload/types' +} from 'payload' +import { Gutter, RenderTitle } from '@payloadcms/ui/client' import React, { Fragment } from 'react' -import { Gutter } from '../Gutter/index.js' -import { RenderTitle } from '../RenderTitle/index.js' import { DocumentTabs } from './Tabs/index.js' import './index.scss' diff --git a/packages/next/src/elements/LeaveWithoutSaving/index.tsx b/packages/next/src/elements/LeaveWithoutSaving/index.tsx index 8956fd42db..b96f5448c4 100644 --- a/packages/next/src/elements/LeaveWithoutSaving/index.tsx +++ b/packages/next/src/elements/LeaveWithoutSaving/index.tsx @@ -1,9 +1,12 @@ 'use client' -import { Button } from '@payloadcms/ui/elements/Button' -import { Modal, useModal } from '@payloadcms/ui/elements/Modal' -import { useFormModified } from '@payloadcms/ui/forms/Form' -import { useAuth } from '@payloadcms/ui/providers/Auth' -import { useTranslation } from '@payloadcms/ui/providers/Translation' +import { + Button, + Modal, + useAuth, + useFormModified, + useModal, + useTranslation, +} from '@payloadcms/ui/client' import React, { useCallback, useEffect } from 'react' import './index.scss' diff --git a/packages/next/src/elements/Logo/index.tsx b/packages/next/src/elements/Logo/index.tsx new file mode 100644 index 0000000000..b14688c002 --- /dev/null +++ b/packages/next/src/elements/Logo/index.tsx @@ -0,0 +1,34 @@ +import type { ServerProps } from 'payload' + +import { PayloadLogo, RenderCustomComponent } from '@payloadcms/ui/shared' +import React from 'react' + +export const Logo: React.FC = (props) => { + const { i18n, locale, params, payload, permissions, searchParams, user } = props + + const { + admin: { + components: { + graphics: { Logo: CustomLogo } = { + Logo: undefined, + }, + } = {}, + } = {}, + } = payload.config + + return ( + + ) +} diff --git a/packages/ui/src/elements/Nav/NavHamburger/index.tsx b/packages/next/src/elements/Nav/NavHamburger/index.tsx similarity index 81% rename from packages/ui/src/elements/Nav/NavHamburger/index.tsx rename to packages/next/src/elements/Nav/NavHamburger/index.tsx index 441a09463c..e0f60d8f54 100644 --- a/packages/ui/src/elements/Nav/NavHamburger/index.tsx +++ b/packages/next/src/elements/Nav/NavHamburger/index.tsx @@ -1,9 +1,7 @@ 'use client' +import { Hamburger, useNav } from '@payloadcms/ui/client' import React from 'react' -import { Hamburger } from '../../Hamburger/index.js' -import { useNav } from '../context.js' - export const NavHamburger: React.FC<{ baseClass?: string }> = ({ baseClass }) => { diff --git a/packages/ui/src/elements/Nav/NavWrapper/index.scss b/packages/next/src/elements/Nav/NavWrapper/index.scss similarity index 100% rename from packages/ui/src/elements/Nav/NavWrapper/index.scss rename to packages/next/src/elements/Nav/NavWrapper/index.scss diff --git a/packages/ui/src/elements/Nav/NavWrapper/index.tsx b/packages/next/src/elements/Nav/NavWrapper/index.tsx similarity index 90% rename from packages/ui/src/elements/Nav/NavWrapper/index.tsx rename to packages/next/src/elements/Nav/NavWrapper/index.tsx index 995a3985a5..fca1a5959a 100644 --- a/packages/ui/src/elements/Nav/NavWrapper/index.tsx +++ b/packages/next/src/elements/Nav/NavWrapper/index.tsx @@ -1,7 +1,7 @@ 'use client' +import { useNav } from '@payloadcms/ui/client' import React from 'react' -import { useNav } from '../context.js' import './index.scss' export const NavWrapper: React.FC<{ diff --git a/packages/ui/src/elements/Nav/index.client.tsx b/packages/next/src/elements/Nav/index.client.tsx similarity index 81% rename from packages/ui/src/elements/Nav/index.client.tsx rename to packages/next/src/elements/Nav/index.client.tsx index dbfe58562d..7a4879ebf5 100644 --- a/packages/ui/src/elements/Nav/index.client.tsx +++ b/packages/next/src/elements/Nav/index.client.tsx @@ -1,20 +1,21 @@ 'use client' +import type { EntityToGroup } from '@payloadcms/ui/utilities/groupNavItems' + import { getTranslation } from '@payloadcms/translations' +import { + ChevronIcon, + NavGroup, + useAuth, + useConfig, + useEntityVisibility, + useNav, + useTranslation, +} from '@payloadcms/ui/client' +import { EntityType, groupNavItems } from '@payloadcms/ui/shared' import LinkWithDefault from 'next/link.js' import React, { Fragment } from 'react' -import type { EntityToGroup } from '../../utilities/groupNavItems.js' - -import { Chevron } from '../../icons/Chevron/index.js' -import { useAuth } from '../../providers/Auth/index.js' -import { useConfig } from '../../providers/Config/index.js' -import { useEntityVisibility } from '../../providers/EntityVisibility/index.js' -import { useTranslation } from '../../providers/Translation/index.js' -import { EntityType, groupNavItems } from '../../utilities/groupNavItems.js' -import { NavGroup } from '../NavGroup/index.js' -import { useNav } from './context.js' - const baseClass = 'nav' export const DefaultNavClient: React.FC = () => { @@ -93,7 +94,7 @@ export const DefaultNavClient: React.FC = () => { tabIndex={!navOpen ? -1 : undefined} > - + {entityLabel} diff --git a/packages/ui/src/elements/Nav/index.scss b/packages/next/src/elements/Nav/index.scss similarity index 100% rename from packages/ui/src/elements/Nav/index.scss rename to packages/next/src/elements/Nav/index.scss diff --git a/packages/ui/src/elements/Nav/index.tsx b/packages/next/src/elements/Nav/index.tsx similarity index 92% rename from packages/ui/src/elements/Nav/index.tsx rename to packages/next/src/elements/Nav/index.tsx index d51e49b871..7ead54cc9f 100644 --- a/packages/ui/src/elements/Nav/index.tsx +++ b/packages/next/src/elements/Nav/index.tsx @@ -1,15 +1,16 @@ -import type { ServerProps } from 'payload/config' +import type { ServerProps } from 'payload' +import { Logout } from '@payloadcms/ui/client' import React from 'react' -import { Logout } from '../Logout/index.js' import { NavHamburger } from './NavHamburger/index.js' import { NavWrapper } from './NavWrapper/index.js' import './index.scss' const baseClass = 'nav' -import { WithServerSideProps } from '../WithServerSideProps/index.js' +import { WithServerSideProps } from '@payloadcms/ui/shared' + import { DefaultNavClient } from './index.client.js' export type NavProps = ServerProps @@ -67,10 +68,8 @@ export const DefaultNav: React.FC = (props) => {