From c5ecf48d943f302c2789831fed0e5f64e0549d4f Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Tue, 19 Mar 2024 00:59:56 -0400 Subject: [PATCH] chore: add test/ to workspace, update most references --- pnpm-lock.yaml | 69 +++++++++++++++++++ pnpm-workspace.yaml | 2 +- test/_community/collections/Media/index.ts | 4 +- test/_community/collections/Posts/index.ts | 2 +- test/_community/globals/Menu/index.ts | 2 +- test/_community/int.spec.ts | 3 +- test/access-control/config.ts | 2 +- test/access-control/e2e.spec.ts | 2 +- test/access-control/int.spec.ts | 6 +- test/admin/collections/CustomIdRow.ts | 2 +- test/admin/collections/CustomIdTab.ts | 2 +- test/admin/collections/CustomViews1.ts | 2 +- test/admin/collections/CustomViews2.ts | 2 +- test/admin/collections/Geo.ts | 2 +- test/admin/collections/Group1A.ts | 2 +- test/admin/collections/Group1B.ts | 2 +- test/admin/collections/Group2A.ts | 2 +- test/admin/collections/Group2B.ts | 2 +- test/admin/collections/Hidden.ts | 2 +- test/admin/collections/NoApiView.ts | 2 +- test/admin/collections/Posts.ts | 47 ++++++------- test/admin/collections/Users.ts | 2 +- test/admin/components/AfterNavLinks/index.tsx | 4 +- test/admin/components/BeforeLogin/index.tsx | 2 +- .../components/CustomTabComponent/index.tsx | 4 +- .../components/FieldDescription/index.tsx | 7 +- test/admin/components/Logout/index.tsx | 4 +- .../components/views/CustomAccount/index.tsx | 4 +- .../views/CustomDashboard/index.tsx | 4 +- .../components/views/CustomDefault/index.tsx | 2 +- .../components/views/CustomEdit/index.tsx | 2 +- .../views/CustomEditDefault/index.tsx | 2 +- .../components/views/CustomMinimal/index.tsx | 4 +- .../components/views/CustomTab/index.tsx | 2 +- .../components/views/CustomTab2/index.tsx | 2 +- .../views/CustomTabNested/index.tsx | 2 +- .../components/views/CustomVersions/index.tsx | 2 +- .../components/views/CustomView/index.tsx | 4 +- .../views/CustomViewNested/index.tsx | 2 +- .../views/CustomViewWithParam/index.tsx | 2 +- test/admin/e2e.spec.ts | 6 +- test/admin/globals/CustomViews1.ts | 2 +- test/admin/globals/CustomViews2.ts | 2 +- test/admin/globals/Global.ts | 2 +- test/admin/globals/Group1A.ts | 2 +- test/admin/globals/Group1B.ts | 2 +- test/admin/globals/Hidden.ts | 2 +- test/admin/globals/NoApiView.ts | 2 +- test/admin/seed.ts | 5 +- test/array-update/int.spec.ts | 2 +- test/auth/AuthDebug.tsx | 9 ++- test/auth/custom-strategy/int.spec.ts | 4 +- test/auth/e2e.spec.ts | 2 +- test/auth/int.spec.ts | 5 +- test/auth/removed-token/int.spec.ts | 4 +- test/auth/ui/AuthDebug.tsx | 11 ++- test/buildConfigWithDefaults.ts | 17 +++-- test/collections-graphql/config.ts | 2 +- test/collections-graphql/int.spec.ts | 4 +- test/collections-rest/config.ts | 2 +- test/collections-rest/int.spec.ts | 8 ++- test/config/int.spec.ts | 4 +- test/custom-graphql/config.ts | 5 +- test/custom-graphql/int.spec.ts | 2 +- test/database/int.spec.ts | 12 ++-- test/dataloader/config.ts | 3 +- test/dataloader/int.spec.ts | 13 ++-- test/endpoints/endpoints/collections.ts | 2 +- test/endpoints/endpoints/globals.ts | 2 +- test/endpoints/endpoints/root.ts | 2 +- test/endpoints/int.spec.ts | 2 +- .../collections/ErrorFields/index.ts | 4 +- .../collections/Upload/index.ts | 2 +- .../PrePopulateFieldUI/index.tsx | 2 +- test/fields-relationship/config.ts | 10 +-- test/fields-relationship/e2e.spec.ts | 2 +- .../collections/Array/LabelComponent.tsx | 4 +- test/fields/collections/Array/index.ts | 2 +- .../components/AddCustomBlocks/index.tsx | 4 +- test/fields/collections/Blocks/index.ts | 4 +- test/fields/collections/Checkbox/index.ts | 2 +- test/fields/collections/Code/index.tsx | 2 +- .../Collapsible/LabelComponent.tsx | 4 +- test/fields/collections/Collapsible/index.ts | 2 +- .../collections/ConditionalLogic/index.ts | 2 +- test/fields/collections/Date/index.ts | 2 +- test/fields/collections/Group/index.ts | 2 +- test/fields/collections/Indexed/index.ts | 5 +- test/fields/collections/JSON/index.tsx | 2 +- test/fields/collections/Lexical/blocks.ts | 5 +- test/fields/collections/Lexical/index.ts | 4 +- .../collections/LexicalMigrate/index.ts | 4 +- test/fields/collections/Number/index.ts | 2 +- test/fields/collections/Point/index.ts | 2 +- test/fields/collections/Radio/index.ts | 2 +- test/fields/collections/Relationship/index.ts | 2 +- test/fields/collections/RichText/blocks.ts | 4 +- test/fields/collections/RichText/index.ts | 6 +- test/fields/collections/Row/index.ts | 2 +- test/fields/collections/Select/index.ts | 2 +- test/fields/collections/Tabs/index.ts | 2 +- test/fields/collections/Text/CustomError.tsx | 4 +- test/fields/collections/Text/CustomLabel.tsx | 5 +- test/fields/collections/Text/index.ts | 2 +- test/fields/collections/Upload/index.ts | 2 +- test/fields/collections/Upload2/index.ts | 2 +- test/fields/collections/Uploads3/index.ts | 2 +- test/fields/config.ts | 2 +- test/fields/e2e.spec.ts | 2 +- test/fields/globals/TabsWithRichText.ts | 4 +- test/fields/int.spec.ts | 9 +-- test/fields/lexical.e2e.spec.ts | 22 +++--- test/fields/lexical.int.spec.ts | 39 ++++++----- test/fields/seed.ts | 2 +- test/globals/int.spec.ts | 2 +- test/helpers/NextRESTClient.ts | 5 +- test/helpers/idToString.ts | 2 +- test/helpers/initPayloadE2E.ts | 6 +- test/helpers/initPayloadInt.ts | 5 +- test/helpers/isMongoose.ts | 2 +- test/helpers/reset.ts | 6 +- test/helpers/rest.ts | 8 +-- test/helpers/seed.ts | 4 +- test/helpers/snapshot.ts | 5 +- .../hooks/collections/AfterOperation/index.ts | 9 +-- test/hooks/collections/ChainingHooks/index.ts | 2 +- test/hooks/collections/ContextHooks/index.ts | 4 +- test/hooks/collections/Data/index.ts | 8 +-- test/hooks/collections/Hook/index.ts | 2 +- .../collections/NestedAfterReadHooks/index.ts | 2 +- test/hooks/collections/Relations/index.ts | 2 +- test/hooks/collections/Transform/index.ts | 2 +- .../hooks/collections/Users/afterLoginHook.ts | 4 +- test/hooks/collections/Users/index.ts | 10 ++- test/hooks/config.ts | 2 +- test/hooks/globals/Data/index.ts | 6 +- test/hooks/int.spec.ts | 6 +- .../live-preview/blocks/ArchiveBlock/index.ts | 4 +- .../live-preview/blocks/CallToAction/index.ts | 5 +- test/live-preview/blocks/Content/index.ts | 5 +- test/live-preview/blocks/MediaBlock/index.ts | 2 +- test/live-preview/collections/Categories.ts | 2 +- test/live-preview/collections/Media.ts | 2 +- test/live-preview/collections/Pages.ts | 6 +- test/live-preview/collections/Posts.ts | 2 +- test/live-preview/collections/Tenants.ts | 2 +- test/live-preview/collections/Users.ts | 2 +- test/live-preview/e2e.spec.ts | 2 +- test/live-preview/fields/hero.ts | 4 +- test/live-preview/fields/invertBackground.ts | 2 +- test/live-preview/fields/link.ts | 2 +- test/live-preview/fields/linkGroup.ts | 3 +- test/live-preview/globals/Footer.ts | 2 +- test/live-preview/globals/Header.ts | 2 +- test/live-preview/int.spec.ts | 6 +- test/live-preview/seed/index.ts | 4 +- test/live-preview/startLivePreviewDemo.ts | 2 +- test/live-preview/utilities/formatSlug.ts | 2 +- test/localization-rtl/collections/posts.ts | 2 +- test/localization-rtl/collections/users.ts | 2 +- test/localization/collections/Array/index.ts | 2 +- .../NestedToArrayAndBlock/index.ts | 2 +- test/localization/e2e.spec.ts | 2 +- test/localization/int.spec.ts | 34 ++++----- test/package.json | 38 ++++++++++ .../plugin-cloud-storage/collections/Media.ts | 2 +- .../plugin-cloud-storage/collections/Users.ts | 2 +- test/plugin-cloud-storage/config.ts | 48 ++++++------- test/plugin-cloud-storage/int.spec.ts | 2 +- test/plugin-cloud/collections/Media.ts | 2 +- test/plugin-cloud/collections/Users.ts | 2 +- test/plugin-cloud/config.ts | 6 +- test/plugin-cloud/int.spec.ts | 2 +- test/plugin-form-builder/collections/Pages.ts | 2 +- test/plugin-form-builder/collections/Users.ts | 2 +- test/plugin-form-builder/config.ts | 7 +- test/plugin-form-builder/int.spec.ts | 6 +- test/plugin-form-builder/seed/index.ts | 12 ++-- .../collections/Categories.ts | 2 +- test/plugin-nested-docs/collections/Pages.ts | 2 +- test/plugin-nested-docs/collections/Users.ts | 2 +- .../collections/populateFullTitle.ts | 4 +- test/plugin-nested-docs/config.ts | 3 +- test/plugin-nested-docs/e2e.spec.ts | 2 +- test/plugin-nested-docs/int.spec.ts | 7 +- test/plugin-nested-docs/seed/index.ts | 2 +- test/plugin-redirects/collections/Pages.ts | 2 +- test/plugin-redirects/collections/Users.ts | 2 +- test/plugin-redirects/config.ts | 5 +- test/plugin-redirects/int.spec.ts | 3 +- test/plugin-redirects/seed/index.ts | 2 +- test/plugin-search/collections/Pages.ts | 2 +- test/plugin-search/collections/Posts.ts | 2 +- test/plugin-search/collections/Users.ts | 2 +- test/plugin-search/config.ts | 29 ++++---- test/plugin-search/int.spec.ts | 2 +- test/plugin-search/seed/index.ts | 2 +- test/plugin-sentry/collections/Posts.ts | 2 +- test/plugin-sentry/collections/Users.ts | 2 +- test/plugin-sentry/config.ts | 3 +- test/plugin-sentry/int.spec.ts | 2 +- test/plugin-seo/collections/Media.ts | 2 +- test/plugin-seo/collections/Pages.ts | 2 +- test/plugin-seo/collections/Users.ts | 2 +- test/plugin-seo/config.ts | 3 +- test/plugin-seo/e2e.spec.ts | 2 +- test/plugin-seo/int.spec.ts | 2 +- test/plugin-seo/seed/index.ts | 2 +- test/plugin-stripe/collections/Customers.ts | 2 +- test/plugin-stripe/collections/Products.ts | 2 +- test/plugin-stripe/collections/Users.ts | 2 +- test/plugin-stripe/config.ts | 3 +- test/plugin-stripe/int.spec.ts | 2 +- test/plugin-stripe/seed/index.ts | 2 +- .../webhooks/subscriptionCreatedOrUpdated.ts | 2 +- .../webhooks/subscriptionDeleted.ts | 2 +- test/plugins/int.spec.ts | 2 +- .../GlobalViewWithRefresh.tsx | 10 +-- test/relationships/config.ts | 2 +- test/relationships/int.spec.ts | 3 +- test/startMemoryDB.ts | 8 +-- test/tsconfig.json | 3 +- test/tsconfig.typecheck.json | 41 +++++++++++ test/uploads/collections/Upload1/index.ts | 2 +- test/uploads/collections/Upload2/index.ts | 2 +- .../admin-thumbnail/RegisterThumbnailFn.tsx | 2 +- .../collections/admin-thumbnail/index.ts | 2 +- test/uploads/e2e.spec.ts | 2 +- test/uploads/int.spec.ts | 4 +- test/versions/collections/Autosave.ts | 2 +- test/versions/collections/CustomIDs.ts | 2 +- test/versions/collections/DisablePublish.ts | 2 +- test/versions/collections/Drafts.ts | 2 +- test/versions/collections/Posts.ts | 2 +- test/versions/collections/Versions.ts | 2 +- test/versions/e2e.spec.ts | 2 +- .../elements/CustomSaveButton/index.tsx | 2 +- test/versions/globals/Autosave.ts | 2 +- test/versions/globals/DisablePublish.ts | 2 +- test/versions/globals/Draft.ts | 2 +- test/versions/int.spec.ts | 2 +- test/versions/seed.ts | 2 +- 242 files changed, 641 insertions(+), 481 deletions(-) create mode 100644 test/package.json create mode 100644 test/tsconfig.typecheck.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8ebed3816..824b2fc0d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1440,6 +1440,75 @@ importers: specifier: ^5.1.4 version: 5.1.4(webpack@5.90.3) + test: + devDependencies: + '@payloadcms/db-mongodb': + specifier: workspace:* + version: link:../packages/db-mongodb + '@payloadcms/db-postgres': + specifier: workspace:* + version: link:../packages/db-postgres + '@payloadcms/eslint-config': + specifier: workspace:* + version: link:../packages/eslint-config-payload + '@payloadcms/graphql': + specifier: workspace:* + version: link:../packages/graphql + '@payloadcms/live-preview': + specifier: workspace:* + version: link:../packages/live-preview + '@payloadcms/live-preview-react': + specifier: workspace:* + version: link:../packages/live-preview-react + '@payloadcms/next': + specifier: workspace:* + version: link:../packages/next + '@payloadcms/plugin-cloud': + specifier: workspace:* + version: link:../packages/plugin-cloud + '@payloadcms/plugin-cloud-storage': + specifier: workspace:* + version: link:../packages/plugin-cloud-storage + '@payloadcms/plugin-form-builder': + specifier: workspace:* + version: link:../packages/plugin-form-builder + '@payloadcms/plugin-nested-docs': + specifier: workspace:* + version: link:../packages/plugin-nested-docs + '@payloadcms/plugin-redirects': + specifier: workspace:* + version: link:../packages/plugin-redirects + '@payloadcms/plugin-search': + specifier: workspace:* + version: link:../packages/plugin-search + '@payloadcms/plugin-sentry': + specifier: workspace:* + version: link:../packages/plugin-sentry + '@payloadcms/plugin-seo': + specifier: workspace:* + version: link:../packages/plugin-seo + '@payloadcms/plugin-stripe': + specifier: workspace:* + version: link:../packages/plugin-stripe + '@payloadcms/richtext-lexical': + specifier: workspace:* + version: link:../packages/richtext-lexical + '@payloadcms/richtext-slate': + specifier: workspace:* + version: link:../packages/richtext-slate + '@payloadcms/translations': + specifier: workspace:* + version: link:../packages/translations + '@payloadcms/ui': + specifier: workspace:* + version: link:../packages/ui + create-payload-app: + specifier: workspace:* + version: link:../packages/create-payload-app + payload: + specifier: workspace:* + version: link:../packages/payload + packages: /@aashutoshrathi/word-wrap@1.2.6: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b29c3ce75..285dddccd 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,6 +1,6 @@ packages: # all packages in direct subdirs of packages/ - 'packages/*' - - 'test/REST_API' + - 'test' # exclude packages that are inside test directories # - '!**/test/**' diff --git a/test/_community/collections/Media/index.ts b/test/_community/collections/Media/index.ts index 5610002e2..3c523e01e 100644 --- a/test/_community/collections/Media/index.ts +++ b/test/_community/collections/Media/index.ts @@ -1,4 +1,6 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' + +import { getPayload } from 'payload' export const mediaSlug = 'media' diff --git a/test/_community/collections/Posts/index.ts b/test/_community/collections/Posts/index.ts index e45245c25..ac6689d00 100644 --- a/test/_community/collections/Posts/index.ts +++ b/test/_community/collections/Posts/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { mediaSlug } from '../Media/index.js' diff --git a/test/_community/globals/Menu/index.ts b/test/_community/globals/Menu/index.ts index afdd01b4d..cd9ec96de 100644 --- a/test/_community/globals/Menu/index.ts +++ b/test/_community/globals/Menu/index.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' export const menuSlug = 'menu' diff --git a/test/_community/int.spec.ts b/test/_community/int.spec.ts index ae28bceb8..3244effde 100644 --- a/test/_community/int.spec.ts +++ b/test/_community/int.spec.ts @@ -1,4 +1,5 @@ -import type { Payload } from '../../packages/payload/types.js' +import type { Payload } from 'payload' + import type { NextRESTClient } from '../helpers/NextRESTClient.js' import { devUser } from '../credentials.js' diff --git a/test/access-control/config.ts b/test/access-control/config.ts index a621d0f0a..04d9889d0 100644 --- a/test/access-control/config.ts +++ b/test/access-control/config.ts @@ -1,4 +1,4 @@ -import type { FieldAccess } from '../../packages/payload/src/fields/config/types.js' +import type { FieldAccess } from 'payload/types' import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' import { devUser } from '../credentials.js' diff --git a/test/access-control/e2e.spec.ts b/test/access-control/e2e.spec.ts index 8b0200bf2..62c2ec746 100644 --- a/test/access-control/e2e.spec.ts +++ b/test/access-control/e2e.spec.ts @@ -1,10 +1,10 @@ import type { Page } from '@playwright/test' +import type { Payload } from 'payload/types' import { expect, test } from '@playwright/test' import path from 'path' import { fileURLToPath } from 'url' -import type { Payload } from '../../packages/payload/src/types/index.js' import type { ReadOnlyCollection, RestrictedVersion } from './payload-types.js' import wait from '../../packages/payload/src/utilities/wait.js' diff --git a/test/access-control/int.spec.ts b/test/access-control/int.spec.ts index 27af91dc1..a0587902f 100644 --- a/test/access-control/int.spec.ts +++ b/test/access-control/int.spec.ts @@ -1,7 +1,9 @@ -import type { Payload, PayloadRequest } from '../../packages/payload/src/types/index.js' +import type { Payload, PayloadRequest } from 'payload/types' + +import { Forbidden } from 'payload/errors' + import type { Post, RelyOnRequestHeader, Restricted } from './payload-types.js' -import { Forbidden } from '../../packages/payload/src/errors/index.js' import { initPayloadInt } from '../helpers/initPayloadInt.js' import configPromise, { requestHeaders } from './config.js' import { diff --git a/test/admin/collections/CustomIdRow.ts b/test/admin/collections/CustomIdRow.ts index fec1f247f..93edcfe3e 100644 --- a/test/admin/collections/CustomIdRow.ts +++ b/test/admin/collections/CustomIdRow.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' export const CustomIdRow: CollectionConfig = { slug: 'customIdRow', diff --git a/test/admin/collections/CustomIdTab.ts b/test/admin/collections/CustomIdTab.ts index 902bfef81..9efdd772e 100644 --- a/test/admin/collections/CustomIdTab.ts +++ b/test/admin/collections/CustomIdTab.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' export const CustomIdTab: CollectionConfig = { slug: 'customIdTab', diff --git a/test/admin/collections/CustomViews1.ts b/test/admin/collections/CustomViews1.ts index 01b34adf7..c5a843337 100644 --- a/test/admin/collections/CustomViews1.ts +++ b/test/admin/collections/CustomViews1.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { CustomEditView } from '../components/views/CustomEdit/index.js' import { customViews1CollectionSlug } from '../slugs.js' diff --git a/test/admin/collections/CustomViews2.ts b/test/admin/collections/CustomViews2.ts index b470b9805..96e1e570e 100644 --- a/test/admin/collections/CustomViews2.ts +++ b/test/admin/collections/CustomViews2.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { CustomTabComponent } from '../components/CustomTabComponent/index.js' import { CustomTabView } from '../components/views/CustomTab/index.js' diff --git a/test/admin/collections/Geo.ts b/test/admin/collections/Geo.ts index 1470539e6..e0931eb59 100644 --- a/test/admin/collections/Geo.ts +++ b/test/admin/collections/Geo.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { CollectionAPIButton } from '../components/CollectionAPIButton/index.js' import { CollectionEditButton } from '../components/CollectionEditButton/index.js' diff --git a/test/admin/collections/Group1A.ts b/test/admin/collections/Group1A.ts index c9fed46e6..8c7f92e48 100644 --- a/test/admin/collections/Group1A.ts +++ b/test/admin/collections/Group1A.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { group1Collection1Slug } from '../slugs.js' diff --git a/test/admin/collections/Group1B.ts b/test/admin/collections/Group1B.ts index 880385f4f..28cf6ac28 100644 --- a/test/admin/collections/Group1B.ts +++ b/test/admin/collections/Group1B.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { group1Collection2Slug } from '../slugs.js' diff --git a/test/admin/collections/Group2A.ts b/test/admin/collections/Group2A.ts index c7ab714d9..5753d70fd 100644 --- a/test/admin/collections/Group2A.ts +++ b/test/admin/collections/Group2A.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { group2Collection1Slug } from '../slugs.js' diff --git a/test/admin/collections/Group2B.ts b/test/admin/collections/Group2B.ts index 1c2375db7..eca407950 100644 --- a/test/admin/collections/Group2B.ts +++ b/test/admin/collections/Group2B.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { group2Collection2Slug } from '../slugs.js' diff --git a/test/admin/collections/Hidden.ts b/test/admin/collections/Hidden.ts index 4960f342c..a56bc1bfc 100644 --- a/test/admin/collections/Hidden.ts +++ b/test/admin/collections/Hidden.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { hiddenCollectionSlug } from '../slugs.js' diff --git a/test/admin/collections/NoApiView.ts b/test/admin/collections/NoApiView.ts index c956a64e0..025aad681 100644 --- a/test/admin/collections/NoApiView.ts +++ b/test/admin/collections/NoApiView.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { noApiViewCollectionSlug } from '../slugs.js' diff --git a/test/admin/collections/Posts.ts b/test/admin/collections/Posts.ts index 992c58919..ac992965b 100644 --- a/test/admin/collections/Posts.ts +++ b/test/admin/collections/Posts.ts @@ -1,6 +1,7 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import { slateEditor } from '@payloadcms/richtext-slate' + +import type { CollectionConfig } from 'payload/types' -import { slateEditor } from '../../../packages/richtext-slate/src/index.js' import { DemoUIFieldCell } from '../components/DemoUIField/Cell.js' import { DemoUIField } from '../components/DemoUIField/Field.js' import { @@ -12,27 +13,19 @@ import { postsCollectionSlug } from '../slugs.js' export const Posts: CollectionConfig = { slug: postsCollectionSlug, - labels: { - singular: slugSingularLabel, - plural: slugPluralLabel, - }, admin: { - description: 'Description', - listSearchableFields: ['id', 'title', 'description', 'number'], - group: 'One', - useAsTitle: 'title', defaultColumns: ['id', 'number', 'title', 'description', 'demoUIField'], + description: 'Description', + group: 'One', + listSearchableFields: ['id', 'title', 'description', 'number'], preview: () => 'https://payloadcms.com', - }, - versions: { - drafts: true, + useAsTitle: 'title', }, fields: [ { type: 'tabs', tabs: [ { - label: 'Tab 1', fields: [ { name: 'title', @@ -56,17 +49,18 @@ export const Posts: CollectionConfig = { }), }, { - type: 'ui', name: 'demoUIField', - label: 'Demo UI Field', + type: 'ui', admin: { components: { - Field: DemoUIField, Cell: DemoUIFieldCell, + Field: DemoUIField, }, }, + label: 'Demo UI Field', }, ], + label: 'Tab 1', }, ], }, @@ -83,22 +77,22 @@ export const Posts: CollectionConfig = { { name: 'relationship', type: 'relationship', - relationTo: 'posts', admin: { position: 'sidebar', }, + relationTo: 'posts', }, { name: 'sidebarField', type: 'text', - admin: { - position: 'sidebar', - description: - 'This is a very long description that takes many characters to complete and hopefully will wrap instead of push the sidebar open, lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, voluptatum voluptates. Quisquam, voluptatum voluptates.', - }, access: { update: () => false, }, + admin: { + description: + 'This is a very long description that takes many characters to complete and hopefully will wrap instead of push the sidebar open, lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, voluptatum voluptates. Quisquam, voluptatum voluptates.', + position: 'sidebar', + }, }, { name: 'descriptionAsString', @@ -122,4 +116,11 @@ export const Posts: CollectionConfig = { }, }, ], + labels: { + plural: slugPluralLabel, + singular: slugSingularLabel, + }, + versions: { + drafts: true, + }, } diff --git a/test/admin/collections/Users.ts b/test/admin/collections/Users.ts index 2e0d71f3e..2391d32a1 100644 --- a/test/admin/collections/Users.ts +++ b/test/admin/collections/Users.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { usersCollectionSlug } from '../slugs.js' diff --git a/test/admin/components/AfterNavLinks/index.tsx b/test/admin/components/AfterNavLinks/index.tsx index 22ab3cabc..ee476edca 100644 --- a/test/admin/components/AfterNavLinks/index.tsx +++ b/test/admin/components/AfterNavLinks/index.tsx @@ -1,12 +1,14 @@ 'use client' +import { useConfig } from '@payloadcms/ui' import LinkImport from 'next/link.js' const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default import React from 'react' // As this is the demo project, we import our dependencies from the `src` directory. -import { useConfig } from '../../../../packages/ui/src/providers/Config/index.js' +// import { useConfig } from '@payloadcms/ui' +// import { useConfig } from '@payloadcms/ui' // In your projects, you can import as follows: // import { useConfig } from 'payload/components/utilities'; diff --git a/test/admin/components/BeforeLogin/index.tsx b/test/admin/components/BeforeLogin/index.tsx index 6db239d1b..76ffd609a 100644 --- a/test/admin/components/BeforeLogin/index.tsx +++ b/test/admin/components/BeforeLogin/index.tsx @@ -2,7 +2,7 @@ import React from 'react' -import { useTranslation } from '../../../../packages/ui/src/providers/Translation/index.js' +import { useTranslation } from '@payloadcms/ui' export const BeforeLogin: React.FC = () => { const translation = useTranslation() diff --git a/test/admin/components/CustomTabComponent/index.tsx b/test/admin/components/CustomTabComponent/index.tsx index 6eb570a44..a4eac5855 100644 --- a/test/admin/components/CustomTabComponent/index.tsx +++ b/test/admin/components/CustomTabComponent/index.tsx @@ -1,10 +1,10 @@ 'use client' +import type { DocumentTabComponent } from 'payload/types' + import React from 'react' import { Link, useRouteMatch } from 'react-router-dom' -import type { DocumentTabComponent } from '../../../../packages/payload/src/admin/types.js' - import './index.scss' export const CustomTabComponent: DocumentTabComponent = (props) => { diff --git a/test/admin/components/FieldDescription/index.tsx b/test/admin/components/FieldDescription/index.tsx index 5c132233e..0f4c57fb1 100644 --- a/test/admin/components/FieldDescription/index.tsx +++ b/test/admin/components/FieldDescription/index.tsx @@ -1,9 +1,6 @@ -import React from 'react' +import type { DescriptionComponent, DescriptionFunction } from 'payload/types' -import type { - DescriptionComponent, - DescriptionFunction, -} from '../../../../packages/payload/src/admin/types.js' +import React from 'react' export const FieldDescriptionComponent: DescriptionComponent = ({ path, value }) => { return ( diff --git a/test/admin/components/Logout/index.tsx b/test/admin/components/Logout/index.tsx index 76120ee63..ca3b99ff2 100644 --- a/test/admin/components/Logout/index.tsx +++ b/test/admin/components/Logout/index.tsx @@ -2,8 +2,8 @@ import React from 'react' -import { LogOut } from '../../../../packages/ui/src/icons/LogOut/index.js' -import { useConfig } from '../../../../packages/ui/src/providers/Config/index.js' +import { LogOut } from '@payloadcms/ui' +import { useConfig } from '@payloadcms/ui' export const Logout: React.FC = () => { const config = useConfig() diff --git a/test/admin/components/views/CustomAccount/index.tsx b/test/admin/components/views/CustomAccount/index.tsx index 05eba5832..d917a65f0 100644 --- a/test/admin/components/views/CustomAccount/index.tsx +++ b/test/admin/components/views/CustomAccount/index.tsx @@ -1,6 +1,6 @@ -import React, { Fragment } from 'react' +import type { AdminViewComponent } from 'payload/types' -import type { AdminViewComponent } from '../../../../../packages/payload/src/admin/types.js' +import React, { Fragment } from 'react' export const CustomAccountView: AdminViewComponent = () => { return ( diff --git a/test/admin/components/views/CustomDashboard/index.tsx b/test/admin/components/views/CustomDashboard/index.tsx index 9a92f391e..75e6dc757 100644 --- a/test/admin/components/views/CustomDashboard/index.tsx +++ b/test/admin/components/views/CustomDashboard/index.tsx @@ -1,6 +1,6 @@ -import React, { Fragment } from 'react' +import type { AdminViewComponent } from 'payload/types' -import type { AdminViewComponent } from '../../../../../packages/payload/src/admin/types.js' +import React, { Fragment } from 'react' export const CustomDashboardView: AdminViewComponent = () => { return ( diff --git a/test/admin/components/views/CustomDefault/index.tsx b/test/admin/components/views/CustomDefault/index.tsx index 1c7c80791..c12c914b7 100644 --- a/test/admin/components/views/CustomDefault/index.tsx +++ b/test/admin/components/views/CustomDefault/index.tsx @@ -4,7 +4,7 @@ import React from 'react' import type { AdminViewProps } from '../../../../../packages/payload/types.js' -import { Button, DefaultTemplate, SetStepNav } from '../../../../../packages/ui/src/index.js' +import { Button, DefaultTemplate, SetStepNav } from '@payloadcms/ui' const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default diff --git a/test/admin/components/views/CustomEdit/index.tsx b/test/admin/components/views/CustomEdit/index.tsx index 558ba1e77..697d9a8a4 100644 --- a/test/admin/components/views/CustomEdit/index.tsx +++ b/test/admin/components/views/CustomEdit/index.tsx @@ -3,7 +3,7 @@ import React, { Fragment } from 'react' import type { EditViewComponent } from '../../../../../packages/payload/types.js' -import { SetStepNav } from '../../../../../packages/ui/src/index.js' +import { SetStepNav } from '@payloadcms/ui' export const CustomEditView: EditViewComponent = ({ initPageResult }) => { if (!initPageResult) { diff --git a/test/admin/components/views/CustomEditDefault/index.tsx b/test/admin/components/views/CustomEditDefault/index.tsx index 91d6b4b73..6dc44cec3 100644 --- a/test/admin/components/views/CustomEditDefault/index.tsx +++ b/test/admin/components/views/CustomEditDefault/index.tsx @@ -3,7 +3,7 @@ import React, { Fragment } from 'react' import type { EditViewComponent } from '../../../../../packages/payload/types.js' -import { SetStepNav } from '../../../../../packages/ui/src/index.js' +import { SetStepNav } from '@payloadcms/ui' export const CustomDefaultEditView: EditViewComponent = ({ initPageResult }) => { if (!initPageResult) { diff --git a/test/admin/components/views/CustomMinimal/index.tsx b/test/admin/components/views/CustomMinimal/index.tsx index a13124cf5..d989b83b4 100644 --- a/test/admin/components/views/CustomMinimal/index.tsx +++ b/test/admin/components/views/CustomMinimal/index.tsx @@ -1,9 +1,9 @@ import LinkImport from 'next/link.js' import React from 'react' -import { Button } from '../../../../../packages/ui/src/elements/Button/index.js' +import { Button } from '@payloadcms/ui' // As this is the demo project, we import our dependencies from the `src` directory. -import { MinimalTemplate } from '../../../../../packages/ui/src/templates/Minimal/index.js' +import { MinimalTemplate } from '@payloadcms/ui' const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default diff --git a/test/admin/components/views/CustomTab/index.tsx b/test/admin/components/views/CustomTab/index.tsx index 06c7990a4..7033fc5b1 100644 --- a/test/admin/components/views/CustomTab/index.tsx +++ b/test/admin/components/views/CustomTab/index.tsx @@ -3,7 +3,7 @@ import React, { Fragment } from 'react' import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js' -import { SetStepNav } from '../../../../../packages/ui/src/index.js' +import { SetStepNav } from '@payloadcms/ui' import { customTabViewTitle } from '../../../shared.js' export const CustomTabView: React.FC = ({ initPageResult }) => { diff --git a/test/admin/components/views/CustomTab2/index.tsx b/test/admin/components/views/CustomTab2/index.tsx index 465b5fe88..f622c34fe 100644 --- a/test/admin/components/views/CustomTab2/index.tsx +++ b/test/admin/components/views/CustomTab2/index.tsx @@ -3,7 +3,7 @@ import React, { Fragment } from 'react' import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js' -import { SetStepNav } from '../../../../../packages/ui/src/index.js' +import { SetStepNav } from '@payloadcms/ui' import { customTabViewTitle } from '../../../shared.js' export const CustomTabView2: React.FC = ({ initPageResult }) => { diff --git a/test/admin/components/views/CustomTabNested/index.tsx b/test/admin/components/views/CustomTabNested/index.tsx index 72c5437b7..8ad5a1fb4 100644 --- a/test/admin/components/views/CustomTabNested/index.tsx +++ b/test/admin/components/views/CustomTabNested/index.tsx @@ -3,7 +3,7 @@ import React, { Fragment } from 'react' import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js' -import { SetStepNav } from '../../../../../packages/ui/src/index.js' +import { SetStepNav } from '@payloadcms/ui' import { customNestedTabViewTitle } from '../../../shared.js' export const CustomNestedTabView: React.FC = ({ initPageResult }) => { diff --git a/test/admin/components/views/CustomVersions/index.tsx b/test/admin/components/views/CustomVersions/index.tsx index a41bad2f4..a48ded766 100644 --- a/test/admin/components/views/CustomVersions/index.tsx +++ b/test/admin/components/views/CustomVersions/index.tsx @@ -3,7 +3,7 @@ import React, { Fragment } from 'react' import type { EditViewComponent } from '../../../../../packages/payload/types.js' -import { SetStepNav } from '../../../../../packages/ui/src/index.js' +import { SetStepNav } from '@payloadcms/ui' export const CustomVersionsView: EditViewComponent = ({ initPageResult }) => { if (!initPageResult) { diff --git a/test/admin/components/views/CustomView/index.tsx b/test/admin/components/views/CustomView/index.tsx index 5b1e752d3..0eeb1915c 100644 --- a/test/admin/components/views/CustomView/index.tsx +++ b/test/admin/components/views/CustomView/index.tsx @@ -1,4 +1,4 @@ -// import { Button } from '../../../../../packages/ui/src/index.js' +// import { Button } from '@payloadcms/ui' import LinkImport from 'next/link.js' import React from 'react' @@ -6,7 +6,7 @@ import type { AdminViewProps } from '../../../../../packages/payload/types.js' const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default -import { Button } from '../../../../../packages/ui/src/elements/Button/index.js' +import { Button } from '@payloadcms/ui' import { customNestedViewPath, customViewTitle } from '../../../shared.js' export const CustomView: React.FC = ({ initPageResult }) => { diff --git a/test/admin/components/views/CustomViewNested/index.tsx b/test/admin/components/views/CustomViewNested/index.tsx index 968942afb..4943b7909 100644 --- a/test/admin/components/views/CustomViewNested/index.tsx +++ b/test/admin/components/views/CustomViewNested/index.tsx @@ -3,7 +3,7 @@ import React from 'react' import type { AdminViewProps } from '../../../../../packages/payload/types.js' -import { Button } from '../../../../../packages/ui/src/index.js' +import { Button } from '@payloadcms/ui' import { customNestedViewTitle, customViewPath } from '../../../shared.js' const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default diff --git a/test/admin/components/views/CustomViewWithParam/index.tsx b/test/admin/components/views/CustomViewWithParam/index.tsx index 33e396fac..15aa721f3 100644 --- a/test/admin/components/views/CustomViewWithParam/index.tsx +++ b/test/admin/components/views/CustomViewWithParam/index.tsx @@ -3,7 +3,7 @@ import React from 'react' import type { AdminViewProps } from '../../../../../packages/payload/types.js' -import { Button } from '../../../../../packages/ui/src/elements/Button/index.js' +import { Button } from '@payloadcms/ui' const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts index 13c9eb413..9478e5cba 100644 --- a/test/admin/e2e.spec.ts +++ b/test/admin/e2e.spec.ts @@ -1,9 +1,9 @@ import type { Page } from '@playwright/test' +import type { Payload } from 'payload' import { expect, test } from '@playwright/test' import qs from 'qs' -import type { Payload } from '../../packages/payload/src/index.js' import type { Geo, Post } from './payload-types.js' import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js' @@ -872,8 +872,8 @@ describe('admin', () => { const whereQueryJSON = { point: { within: { - coordinates: [polygon], type: 'Polygon', + coordinates: [polygon], }, }, } @@ -1299,8 +1299,8 @@ async function deleteAllPosts() { await Promise.all([ ...posts.docs.map((post) => { return payload.delete({ - collection: postsCollectionSlug, id: post.id, + collection: postsCollectionSlug, }) }), ]) diff --git a/test/admin/globals/CustomViews1.ts b/test/admin/globals/CustomViews1.ts index 33490bc7f..2505b4e22 100644 --- a/test/admin/globals/CustomViews1.ts +++ b/test/admin/globals/CustomViews1.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { CustomEditView } from '../components/views/CustomEdit/index.js' import { customGlobalViews1GlobalSlug } from '../slugs.js' diff --git a/test/admin/globals/CustomViews2.ts b/test/admin/globals/CustomViews2.ts index d2ea375be..373dc7b4e 100644 --- a/test/admin/globals/CustomViews2.ts +++ b/test/admin/globals/CustomViews2.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { CustomTabComponent } from '../components/CustomTabComponent/index.js' import { CustomDefaultEditView } from '../components/views/CustomEditDefault/index.js' diff --git a/test/admin/globals/Global.ts b/test/admin/globals/Global.ts index ff0437904..204127e93 100644 --- a/test/admin/globals/Global.ts +++ b/test/admin/globals/Global.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { GlobalAPIButton } from '../components/GlobalAPIButton/index.js' import { GlobalEditButton } from '../components/GlobalEditButton/index.js' diff --git a/test/admin/globals/Group1A.ts b/test/admin/globals/Group1A.ts index 9a96ff079..47d2df400 100644 --- a/test/admin/globals/Group1A.ts +++ b/test/admin/globals/Group1A.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { group1GlobalSlug } from '../slugs.js' diff --git a/test/admin/globals/Group1B.ts b/test/admin/globals/Group1B.ts index 1cb4c7f96..19b504969 100644 --- a/test/admin/globals/Group1B.ts +++ b/test/admin/globals/Group1B.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { group2GlobalSlug } from '../slugs.js' diff --git a/test/admin/globals/Hidden.ts b/test/admin/globals/Hidden.ts index fde11bf27..2a150ff74 100644 --- a/test/admin/globals/Hidden.ts +++ b/test/admin/globals/Hidden.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { hiddenGlobalSlug } from '../slugs.js' diff --git a/test/admin/globals/NoApiView.ts b/test/admin/globals/NoApiView.ts index aaaad8bea..6ed6d3b0c 100644 --- a/test/admin/globals/NoApiView.ts +++ b/test/admin/globals/NoApiView.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { noApiViewGlobalSlug } from '../slugs.js' diff --git a/test/admin/seed.ts b/test/admin/seed.ts index 66a99f501..f6fdb2fa3 100644 --- a/test/admin/seed.ts +++ b/test/admin/seed.ts @@ -1,11 +1,10 @@ -import type { Payload } from '../../packages/payload/src/index.js' +import type { Payload } from 'payload' import { devUser } from '../credentials.js' import { seedDB } from '../helpers/seed.js' import { collectionSlugs, customIdCollectionId, - customIdCollectionSlug, customViews1CollectionSlug, customViews2CollectionSlug, geoCollectionSlug, @@ -30,7 +29,7 @@ export async function clearAndSeedEverything(_payload: Payload) { }, }), ...[...Array(11)].map(() => { - _payload.create({ + void _payload.create({ collection: postsCollectionSlug, data: { title: 'Title', diff --git a/test/array-update/int.spec.ts b/test/array-update/int.spec.ts index 3c3a1dc67..d3d4f3ffa 100644 --- a/test/array-update/int.spec.ts +++ b/test/array-update/int.spec.ts @@ -1,4 +1,4 @@ -import type { Payload } from '../../packages/payload/src/index.js' +import type { Payload } from 'payload' import { initPayloadInt } from '../helpers/initPayloadInt.js' import configPromise from './config.js' diff --git a/test/auth/AuthDebug.tsx b/test/auth/AuthDebug.tsx index 8a6de5096..32e018abf 100644 --- a/test/auth/AuthDebug.tsx +++ b/test/auth/AuthDebug.tsx @@ -1,12 +1,11 @@ 'use client' +import type { User } from 'payload/auth' +import type { UIField } from 'payload/types' + +import { useAuth } from '@payloadcms/ui' import React, { useEffect, useState } from 'react' -import type { User } from '../../packages/payload/src/auth/types.js' -import type { UIField } from '../../packages/payload/src/fields/config/types.js' - -import { useAuth } from '../../packages/ui/src/providers/Auth/index.js' - export const AuthDebug: React.FC = () => { const [state, setState] = useState() const { user } = useAuth() diff --git a/test/auth/custom-strategy/int.spec.ts b/test/auth/custom-strategy/int.spec.ts index 2322d5e6f..bf7b9b9e8 100644 --- a/test/auth/custom-strategy/int.spec.ts +++ b/test/auth/custom-strategy/int.spec.ts @@ -1,6 +1,6 @@ -import type { Payload } from '../../../packages/payload/src/index.js' +import type { Payload } from 'payload' -import { getPayload } from '../../../packages/payload/src/index.js' +import { getPayload } from 'payload' import { NextRESTClient } from '../../helpers/NextRESTClient.js' import { startMemoryDB } from '../../startMemoryDB.js' import configPromise from './config.js' diff --git a/test/auth/e2e.spec.ts b/test/auth/e2e.spec.ts index 0ea953078..c7a86d185 100644 --- a/test/auth/e2e.spec.ts +++ b/test/auth/e2e.spec.ts @@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test' import path from 'path' import { fileURLToPath } from 'url' -import type { Payload } from '../../packages/payload/src/index.js' +import type { Payload } from 'payload' import { initPageConsoleErrorCatch, login, saveDocAndAssert } from '../helpers.js' import { AdminUrlUtil } from '../helpers/adminUrlUtil.js' diff --git a/test/auth/int.spec.ts b/test/auth/int.spec.ts index b125ea160..2b28a2d78 100644 --- a/test/auth/int.spec.ts +++ b/test/auth/int.spec.ts @@ -1,7 +1,8 @@ +import type { Payload } from 'payload' +import type { User } from 'payload/auth' + import jwtDecode from 'jwt-decode' -import type { User } from '../../packages/payload/src/auth/index.js' -import type { Payload } from '../../packages/payload/src/index.js' import type { NextRESTClient } from '../helpers/NextRESTClient.js' import { devUser } from '../credentials.js' diff --git a/test/auth/removed-token/int.spec.ts b/test/auth/removed-token/int.spec.ts index 7b3becbff..4ed86fca0 100644 --- a/test/auth/removed-token/int.spec.ts +++ b/test/auth/removed-token/int.spec.ts @@ -1,6 +1,6 @@ -import type { Payload } from '../../../packages/payload/src/index.js' +import type { Payload } from 'payload' -import { getPayload } from '../../../packages/payload/src/index.js' +import { getPayload } from 'payload' import { devUser } from '../../credentials.js' import { NextRESTClient } from '../../helpers/NextRESTClient.js' import { startMemoryDB } from '../../startMemoryDB.js' diff --git a/test/auth/ui/AuthDebug.tsx b/test/auth/ui/AuthDebug.tsx index d6035a468..65db93769 100644 --- a/test/auth/ui/AuthDebug.tsx +++ b/test/auth/ui/AuthDebug.tsx @@ -1,17 +1,16 @@ +import type { User } from 'payload/auth' +import type { UIField } from 'payload/types' + +import { useAuth } from '@payloadcms/ui' import React, { useEffect, useState } from 'react' -import type { User } from '../../../packages/payload/src/auth/index.js' -import type { UIField } from '../../../packages/payload/src/fields/config/types.js' - -import { useAuth } from '../../../packages/ui/src/providers/Auth/index.js' - export const AuthDebug: React.FC = () => { const [state, setState] = useState() const { user } = useAuth() useEffect(() => { if (user) { - fetch(`/api/users/${user.id}`) + void fetch(`/api/users/${user.id}`) .then((r) => r.json()) .then((newUser) => { setState(newUser) diff --git a/test/buildConfigWithDefaults.ts b/test/buildConfigWithDefaults.ts index def09eece..cf12ad42e 100644 --- a/test/buildConfigWithDefaults.ts +++ b/test/buildConfigWithDefaults.ts @@ -1,10 +1,7 @@ -import sharp from 'sharp' +import type { SanitizedConfig } from 'payload/types' -import type { Config, SanitizedConfig } from '../packages/payload/src/config/types.js' - -import { mongooseAdapter } from '../packages/db-mongodb/src/index.js' -import { postgresAdapter } from '../packages/db-postgres/src/index.js' -import { buildConfig as buildPayloadConfig } from '../packages/payload/src/config/build.js' +import { mongooseAdapter } from '@payloadcms/db-mongodb' +import { postgresAdapter } from '@payloadcms/db-postgres' import { AlignFeature, BlockQuoteFeature, @@ -27,8 +24,10 @@ import { UnorderedListFeature, UploadFeature, lexicalEditor, -} from '../packages/richtext-lexical/src/index.js' -// import { slateEditor } from '../packages/richtext-slate/src/index.js' +} from '@payloadcms/richtext-lexical' +import { slateEditor } from '@payloadcms/richtext-slate' +import { type Config, buildConfig } from 'payload/config' +import sharp from 'sharp' // process.env.PAYLOAD_DATABASE = 'postgres' const databaseAdapters = { @@ -184,5 +183,5 @@ export function buildConfigWithDefaults(testConfig?: Partial): Promise { it('should sort find results by nearest distance', async () => { // creating twice as many records as we are querying to get a random sample + // eslint-disable-next-line @typescript-eslint/require-await await mapAsync([...Array(10)], async () => { // setTimeout used to randomize the creation timestamp setTimeout(async () => { diff --git a/test/config/int.spec.ts b/test/config/int.spec.ts index 9a1619172..49dc8ae44 100644 --- a/test/config/int.spec.ts +++ b/test/config/int.spec.ts @@ -1,5 +1,5 @@ -import type { BlockField } from '../../packages/payload/src/fields/config/types.js' -import type { Payload } from '../../packages/payload/src/index.js' +import type { Payload } from 'payload' +import type { BlockField } from 'payload/types' import { initPayloadInt } from '../helpers/initPayloadInt.js' import configPromise from './config.js' diff --git a/test/custom-graphql/config.ts b/test/custom-graphql/config.ts index 8beef34d5..48f2538d2 100644 --- a/test/custom-graphql/config.ts +++ b/test/custom-graphql/config.ts @@ -1,6 +1,5 @@ -import { commitTransaction } from '../../packages/payload/src/utilities/commitTransaction.js' -import { initTransaction } from '../../packages/payload/src/utilities/initTransaction.js' -import { killTransaction } from '../../packages/payload/src/utilities/killTransaction.js' +import { commitTransaction, initTransaction, killTransaction } from 'payload/database' + import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' import { devUser } from '../credentials.js' diff --git a/test/custom-graphql/int.spec.ts b/test/custom-graphql/int.spec.ts index eb2df1543..758a5e219 100644 --- a/test/custom-graphql/int.spec.ts +++ b/test/custom-graphql/int.spec.ts @@ -1,4 +1,4 @@ -import type { Payload } from '../../packages/payload/src/index.js' +import type { Payload } from 'payload' import type { NextRESTClient } from '../helpers/NextRESTClient.js' import { initPayloadInt } from '../helpers/initPayloadInt.js' diff --git a/test/database/int.spec.ts b/test/database/int.spec.ts index 1a4b7a9a3..dc0a09299 100644 --- a/test/database/int.spec.ts +++ b/test/database/int.spec.ts @@ -1,15 +1,13 @@ +import type { PostgresAdapter } from '@payloadcms/db-postgres/types' +import type { Payload } from 'payload' +import type { PayloadRequest, TypeWithID } from 'payload/types' + import { sql } from 'drizzle-orm' import fs from 'fs' import path from 'path' +import { commitTransaction, initTransaction } from 'payload/database' import { fileURLToPath } from 'url' -import type { PostgresAdapter } from '../../packages/db-postgres/src/types.js' -import type { TypeWithID } from '../../packages/payload/src/collections/config/types.js' -import type { Payload } from '../../packages/payload/src/index.js' -import type { PayloadRequest } from '../../packages/payload/src/types/index.js' - -import { commitTransaction } from '../../packages/payload/src/utilities/commitTransaction.js' -import { initTransaction } from '../../packages/payload/src/utilities/initTransaction.js' import { devUser } from '../credentials.js' import { initPayloadInt } from '../helpers/initPayloadInt.js' import removeFiles from '../helpers/removeFiles.js' diff --git a/test/dataloader/config.ts b/test/dataloader/config.ts index 5ebf49e03..be3424a43 100644 --- a/test/dataloader/config.ts +++ b/test/dataloader/config.ts @@ -1,4 +1,5 @@ -import { slateEditor } from '../../packages/richtext-slate/src/index.js' +import { slateEditor } from '@payloadcms/richtext-slate' + import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' import { devUser } from '../credentials.js' diff --git a/test/dataloader/int.spec.ts b/test/dataloader/int.spec.ts index c3259b7d1..c86dddd8d 100644 --- a/test/dataloader/int.spec.ts +++ b/test/dataloader/int.spec.ts @@ -1,4 +1,5 @@ -import type { Payload } from '../../packages/payload/src/index.js' +import type { Payload } from 'payload' + import type { NextRESTClient } from '../helpers/NextRESTClient.js' import { devUser } from '../credentials.js' @@ -92,8 +93,8 @@ describe('dataloader', () => { expect(relationB.id).toBeDefined() await payload.update({ - collection: 'relation-a', id: relationA.id, + collection: 'relation-a', data: { relationship: relationB.id, richText: [ @@ -105,32 +106,32 @@ describe('dataloader', () => { ], }, { + type: 'relationship', children: [ { text: '', }, ], - type: 'relationship', + relationTo: 'relation-b', value: { id: relationB.id, }, - relationTo: 'relation-b', }, ], }, }) const relationANoDepth = await payload.findByID({ - collection: 'relation-a', id: relationA.id, + collection: 'relation-a', depth: 0, }) expect(relationANoDepth.relationship).toStrictEqual(relationB.id) const relationAWithDepth = await payload.findByID({ - collection: 'relation-a', id: relationA.id, + collection: 'relation-a', depth: 4, }) diff --git a/test/endpoints/endpoints/collections.ts b/test/endpoints/endpoints/collections.ts index 16b858b4e..4a09a2b40 100644 --- a/test/endpoints/endpoints/collections.ts +++ b/test/endpoints/endpoints/collections.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' export const collectionEndpoints: CollectionConfig['endpoints'] = [ { diff --git a/test/endpoints/endpoints/globals.ts b/test/endpoints/endpoints/globals.ts index d51668f16..345eab9a7 100644 --- a/test/endpoints/endpoints/globals.ts +++ b/test/endpoints/endpoints/globals.ts @@ -1,4 +1,4 @@ -import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js' +import type { GlobalConfig } from 'payload/types' import { globalEndpoint } from '../shared.js' diff --git a/test/endpoints/endpoints/root.ts b/test/endpoints/endpoints/root.ts index f268fc729..76b8da624 100644 --- a/test/endpoints/endpoints/root.ts +++ b/test/endpoints/endpoints/root.ts @@ -1,4 +1,4 @@ -import type { Config } from '../../../packages/payload/src/config/types.js' +import type { Config } from 'payload/config' import { applicationEndpoint, rootEndpoint } from '../shared.js' diff --git a/test/endpoints/int.spec.ts b/test/endpoints/int.spec.ts index 444ac9532..2f65bcad0 100644 --- a/test/endpoints/int.spec.ts +++ b/test/endpoints/int.spec.ts @@ -1,6 +1,6 @@ import type { NextRESTClient } from '../helpers/NextRESTClient.js' -import { type Payload } from '../../packages/payload/src/index.js' +import { type Payload } from 'payload' import { initPayloadInt } from '../helpers/initPayloadInt.js' import configPromise from './config.js' import { diff --git a/test/field-error-states/collections/ErrorFields/index.ts b/test/field-error-states/collections/ErrorFields/index.ts index a44d029b3..4bbd1d152 100644 --- a/test/field-error-states/collections/ErrorFields/index.ts +++ b/test/field-error-states/collections/ErrorFields/index.ts @@ -1,5 +1,5 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' -import type { Field } from '../../../../packages/payload/src/fields/config/types.js' +import type { CollectionConfig } from 'payload/types' +import type { Field } from 'payload/types' export const errorFieldsSlug = 'error-fields' diff --git a/test/field-error-states/collections/Upload/index.ts b/test/field-error-states/collections/Upload/index.ts index 1903c46e2..03a73093c 100644 --- a/test/field-error-states/collections/Upload/index.ts +++ b/test/field-error-states/collections/Upload/index.ts @@ -1,6 +1,6 @@ import path from 'path' -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' const Uploads: CollectionConfig = { slug: 'uploads', diff --git a/test/fields-relationship/PrePopulateFieldUI/index.tsx b/test/fields-relationship/PrePopulateFieldUI/index.tsx index ea80ecc9d..0232b27ca 100644 --- a/test/fields-relationship/PrePopulateFieldUI/index.tsx +++ b/test/fields-relationship/PrePopulateFieldUI/index.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { useField } from '../../../packages/ui/src/forms/useField/index.js' +import { useField } from '@payloadcms/ui' import { collection1Slug } from '../collectionSlugs.js' export const PrePopulateFieldUI: React.FC<{ diff --git a/test/fields-relationship/config.ts b/test/fields-relationship/config.ts index cbe68db79..cd039e4b7 100644 --- a/test/fields-relationship/config.ts +++ b/test/fields-relationship/config.ts @@ -1,5 +1,5 @@ -import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js' -import type { FilterOptionsProps } from '../../packages/payload/src/fields/config/types.js' +import type { CollectionConfig } from 'payload/types' +import type { FilterOptionsProps } from 'payload/types' import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js' import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' @@ -105,7 +105,7 @@ export default buildConfigWithDefaults({ }, { name: 'relationshipFilteredAsync', - filterOptions: async (args: FilterOptionsProps) => { + filterOptions: (args: FilterOptionsProps) => { return { id: { equals: args.data.relationship, @@ -410,13 +410,13 @@ export default buildConfigWithDefaults({ }) }) ;[...Array(15)].forEach((_, i) => { - payload.create({ + void payload.create({ collection: collection1Slug, data: { name: `relationship-test ${i}`, }, }) - payload.create({ + void payload.create({ collection: collection2Slug, data: { name: `relationship-test ${i}`, diff --git a/test/fields-relationship/e2e.spec.ts b/test/fields-relationship/e2e.spec.ts index e90db58a3..2b5d214ec 100644 --- a/test/fields-relationship/e2e.spec.ts +++ b/test/fields-relationship/e2e.spec.ts @@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test' import path from 'path' import { fileURLToPath } from 'url' -import type { Payload } from '../../packages/payload/src/index.js' +import type { Payload } from 'payload' import type { FieldsRelationship as CollectionWithRelationships, RelationOne, diff --git a/test/fields/collections/Array/LabelComponent.tsx b/test/fields/collections/Array/LabelComponent.tsx index 285a3286d..234716d05 100644 --- a/test/fields/collections/Array/LabelComponent.tsx +++ b/test/fields/collections/Array/LabelComponent.tsx @@ -1,6 +1,6 @@ -import React from 'react' +import type { RowLabelComponent } from 'payload/types' -import type { RowLabelComponent } from '../../../../packages/payload/src/admin/forms/RowLabel.js' +import React from 'react' export const ArrayRowLabel: RowLabelComponent = ({ data }) => { return ( diff --git a/test/fields/collections/Array/index.ts b/test/fields/collections/Array/index.ts index 6480153f6..9e3d6cdac 100644 --- a/test/fields/collections/Array/index.ts +++ b/test/fields/collections/Array/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { arrayFieldsSlug } from '../../slugs.js' import { ArrayRowLabel } from './LabelComponent.js' diff --git a/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx b/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx index 2c19dda2f..df6cff919 100644 --- a/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx +++ b/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx @@ -1,8 +1,8 @@ 'use client' import * as React from 'react' -import { useForm } from '../../../../../../packages/ui/src/forms/Form/context.js' -import { useField } from '../../../../../../packages/ui/src/forms/useField/index.js' +import { useForm } from '@payloadcms/ui' +import { useField } from '@payloadcms/ui' import './index.scss' const baseClass = 'custom-blocks-field-management' diff --git a/test/fields/collections/Blocks/index.ts b/test/fields/collections/Blocks/index.ts index 59d4cca4c..25028748b 100644 --- a/test/fields/collections/Blocks/index.ts +++ b/test/fields/collections/Blocks/index.ts @@ -1,5 +1,5 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' -import type { BlockField } from '../../../../packages/payload/src/fields/config/types.js' +import type { CollectionConfig } from 'payload/types' +import type { BlockField } from 'payload/types' import { blockFieldsSlug, textFieldsSlug } from '../../slugs.js' import { AddCustomBlocks } from './components/AddCustomBlocks/index.js' diff --git a/test/fields/collections/Checkbox/index.ts b/test/fields/collections/Checkbox/index.ts index 37c729285..5802522e1 100644 --- a/test/fields/collections/Checkbox/index.ts +++ b/test/fields/collections/Checkbox/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { checkboxFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Code/index.tsx b/test/fields/collections/Code/index.tsx index b7164e664..32b265b8d 100644 --- a/test/fields/collections/Code/index.tsx +++ b/test/fields/collections/Code/index.tsx @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { codeFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Collapsible/LabelComponent.tsx b/test/fields/collections/Collapsible/LabelComponent.tsx index fb9b31942..1e7e548aa 100644 --- a/test/fields/collections/Collapsible/LabelComponent.tsx +++ b/test/fields/collections/Collapsible/LabelComponent.tsx @@ -1,6 +1,6 @@ -import React from 'react' +import type { RowLabelComponent } from 'payload/types' -import type { RowLabelComponent } from '../../../../packages/payload/src/admin/forms/RowLabel.js' +import React from 'react' export const CollapsibleLabelComponent: RowLabelComponent = ({ data }) => { return ( diff --git a/test/fields/collections/Collapsible/index.ts b/test/fields/collections/Collapsible/index.ts index 8b7bb292b..d65e26304 100644 --- a/test/fields/collections/Collapsible/index.ts +++ b/test/fields/collections/Collapsible/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { collapsibleFieldsSlug } from '../../slugs.js' import { CollapsibleLabelComponent } from './LabelComponent.js' diff --git a/test/fields/collections/ConditionalLogic/index.ts b/test/fields/collections/ConditionalLogic/index.ts index 94c90e17a..9e3c67038 100644 --- a/test/fields/collections/ConditionalLogic/index.ts +++ b/test/fields/collections/ConditionalLogic/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { conditionalLogicSlug } from '../../slugs.js' diff --git a/test/fields/collections/Date/index.ts b/test/fields/collections/Date/index.ts index 07859fa54..85a029858 100644 --- a/test/fields/collections/Date/index.ts +++ b/test/fields/collections/Date/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { dateFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Group/index.ts b/test/fields/collections/Group/index.ts index 7547570fe..a5d5bab8e 100644 --- a/test/fields/collections/Group/index.ts +++ b/test/fields/collections/Group/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { groupFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Indexed/index.ts b/test/fields/collections/Indexed/index.ts index ce3ab3f43..1c3a3744b 100644 --- a/test/fields/collections/Indexed/index.ts +++ b/test/fields/collections/Indexed/index.ts @@ -1,7 +1,4 @@ -import type { - BeforeDuplicate, - CollectionConfig, -} from '../../../../packages/payload/src/collections/config/types.js' +import type { BeforeDuplicate, CollectionConfig } from 'payload/types' import type { IndexedField } from '../../payload-types.js' import { indexedFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/JSON/index.tsx b/test/fields/collections/JSON/index.tsx index c859634ea..8d9f3eada 100644 --- a/test/fields/collections/JSON/index.tsx +++ b/test/fields/collections/JSON/index.tsx @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { jsonFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Lexical/blocks.ts b/test/fields/collections/Lexical/blocks.ts index 6391bb4a8..af0cd1e11 100644 --- a/test/fields/collections/Lexical/blocks.ts +++ b/test/fields/collections/Lexical/blocks.ts @@ -1,6 +1,7 @@ -import type { ArrayField, Block } from '../../../../packages/payload/src/fields/config/types.js' +import type { ArrayField, Block } from 'payload/types' + +import { lexicalEditor } from '@payloadcms/richtext-lexical' -import { lexicalEditor } from '../../../../packages/richtext-lexical/src/index.js' import { textFieldsSlug } from '../Text/shared.js' export const BlockColumns = ({ name }: { name: string }): ArrayField => ({ diff --git a/test/fields/collections/Lexical/index.ts b/test/fields/collections/Lexical/index.ts index 18f007e60..449999aa6 100644 --- a/test/fields/collections/Lexical/index.ts +++ b/test/fields/collections/Lexical/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { BlocksFeature, @@ -6,7 +6,7 @@ import { TreeViewFeature, UploadFeature, lexicalEditor, -} from '../../../../packages/richtext-lexical/src/index.js' +} from '@payloadcms/richtext-lexical' import { lexicalFieldsSlug } from '../../slugs.js' import { ConditionalLayoutBlock, diff --git a/test/fields/collections/LexicalMigrate/index.ts b/test/fields/collections/LexicalMigrate/index.ts index 25dbd7d0f..1316070a1 100644 --- a/test/fields/collections/LexicalMigrate/index.ts +++ b/test/fields/collections/LexicalMigrate/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { HTMLConverterFeature, @@ -9,7 +9,7 @@ import { UploadFeature, lexicalEditor, lexicalHTML, -} from '../../../../packages/richtext-lexical/src/index.js' +} from '@payloadcms/richtext-lexical' import { lexicalMigrateFieldsSlug } from '../../slugs.js' import { getSimpleLexicalData } from './data.js' diff --git a/test/fields/collections/Number/index.ts b/test/fields/collections/Number/index.ts index 1df299e1c..207ec2fba 100644 --- a/test/fields/collections/Number/index.ts +++ b/test/fields/collections/Number/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { numberFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Point/index.ts b/test/fields/collections/Point/index.ts index ff674439d..ba9c0184e 100644 --- a/test/fields/collections/Point/index.ts +++ b/test/fields/collections/Point/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { pointFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Radio/index.ts b/test/fields/collections/Radio/index.ts index 8fd5e112e..833dd634b 100644 --- a/test/fields/collections/Radio/index.ts +++ b/test/fields/collections/Radio/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { radioFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Relationship/index.ts b/test/fields/collections/Relationship/index.ts index 83857d219..014a39d4b 100644 --- a/test/fields/collections/Relationship/index.ts +++ b/test/fields/collections/Relationship/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { relationshipFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/RichText/blocks.ts b/test/fields/collections/RichText/blocks.ts index 5d4745fe0..13e3d20ea 100644 --- a/test/fields/collections/RichText/blocks.ts +++ b/test/fields/collections/RichText/blocks.ts @@ -1,6 +1,6 @@ -import type { Block } from '../../../../packages/payload/src/fields/config/types.js' +import type { Block } from 'payload/types' -import { lexicalEditor } from '../../../../packages/richtext-lexical/src/index.js' +import { lexicalEditor } from '@payloadcms/richtext-lexical' export const TextBlock: Block = { fields: [ diff --git a/test/fields/collections/RichText/index.ts b/test/fields/collections/RichText/index.ts index 245a107b3..a3b0aaa87 100644 --- a/test/fields/collections/RichText/index.ts +++ b/test/fields/collections/RichText/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { lexicalHTML } from '../../../../packages/richtext-lexical/src/field/features/converters/html/field/index.js' import { @@ -8,8 +8,8 @@ import { TreeViewFeature, UploadFeature, lexicalEditor, -} from '../../../../packages/richtext-lexical/src/index.js' -import { slateEditor } from '../../../../packages/richtext-slate/src/index.js' +} from '@payloadcms/richtext-lexical' +import { slateEditor } from '@payloadcms/richtext-slate' import { richTextFieldsSlug } from '../../slugs.js' import { RelationshipBlock, SelectFieldBlock, TextBlock, UploadAndRichTextBlock } from './blocks.js' diff --git a/test/fields/collections/Row/index.ts b/test/fields/collections/Row/index.ts index fbe68af49..bda9997cb 100644 --- a/test/fields/collections/Row/index.ts +++ b/test/fields/collections/Row/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { rowFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Select/index.ts b/test/fields/collections/Select/index.ts index f2d984e1a..3afc7f17c 100644 --- a/test/fields/collections/Select/index.ts +++ b/test/fields/collections/Select/index.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { selectFieldsSlug } from '../../slugs.js' diff --git a/test/fields/collections/Tabs/index.ts b/test/fields/collections/Tabs/index.ts index 79d5933ff..9e891793b 100644 --- a/test/fields/collections/Tabs/index.ts +++ b/test/fields/collections/Tabs/index.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js' +import type { CollectionConfig } from 'payload/types' import { tabsFieldsSlug } from '../../slugs.js' import { getBlocksField } from '../Blocks/index.js' diff --git a/test/fields/collections/Text/CustomError.tsx b/test/fields/collections/Text/CustomError.tsx index ab5325e9b..0ed81b661 100644 --- a/test/fields/collections/Text/CustomError.tsx +++ b/test/fields/collections/Text/CustomError.tsx @@ -2,8 +2,8 @@ import React from 'react' -import { useFormFields, useFormSubmitted } from '../../../../packages/ui/src/forms/Form/context.js' -import { useField } from '../../../../packages/ui/src/forms/useField/index.js' +import { useFormFields, useFormSubmitted } from '@payloadcms/ui' +import { useField } from '@payloadcms/ui' const CustomError: React.FC = (props) => { const { path: pathFromProps } = props diff --git a/test/fields/collections/Text/CustomLabel.tsx b/test/fields/collections/Text/CustomLabel.tsx index eacf5b043..52682363e 100644 --- a/test/fields/collections/Text/CustomLabel.tsx +++ b/test/fields/collections/Text/CustomLabel.tsx @@ -1,11 +1,10 @@ 'use client' +import { useFieldPath } from '@payloadcms/ui' import React from 'react' -import { useFieldProps } from '../../../../packages/ui/src/forms/FieldPropsProvider/index.js' - const CustomLabel = () => { - const { path } = useFieldProps() + const { path } = useFieldPath() return (