From 99adfd2bba4a692d0744bc37badefe02dc767fc2 Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Tue, 19 Mar 2024 01:34:12 -0400 Subject: [PATCH] chore: export mapAsync, fix some packages/next refs --- packages/next/src/utilities/getRequestLanguage.ts | 2 +- packages/next/src/views/Root/getViewFromConfig.tsx | 3 ++- packages/payload/src/exports/utilities.ts | 1 + test/access-control/e2e.spec.ts | 2 +- test/admin/e2e.spec.ts | 4 ++-- test/auth/config.ts | 2 +- test/collections-graphql/int.spec.ts | 2 +- test/collections-rest/int.spec.ts | 2 +- test/fields-relationship/config.ts | 3 ++- test/fields-relationship/e2e.spec.ts | 2 +- test/fields/e2e.spec.ts | 2 +- test/helpers.ts | 2 +- test/helpers/initPayloadE2E.ts | 2 +- test/live-preview/e2e.spec.ts | 5 ++--- test/localization/e2e.spec.ts | 2 +- test/plugin-search/int.spec.ts | 3 ++- test/plugin-seo/seed/index.ts | 3 ++- test/uploads/e2e.spec.ts | 2 +- test/versions/e2e.spec.ts | 2 +- 19 files changed, 25 insertions(+), 21 deletions(-) diff --git a/packages/next/src/utilities/getRequestLanguage.ts b/packages/next/src/utilities/getRequestLanguage.ts index 0d962b8b6..bb9bd93c9 100644 --- a/packages/next/src/utilities/getRequestLanguage.ts +++ b/packages/next/src/utilities/getRequestLanguage.ts @@ -1,5 +1,5 @@ import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js' -import type { SanitizedConfig } from 'packages/payload/src/exports/types.js' +import type { SanitizedConfig } from 'payload/config' import { matchLanguage } from '@payloadcms/translations' diff --git a/packages/next/src/views/Root/getViewFromConfig.tsx b/packages/next/src/views/Root/getViewFromConfig.tsx index 5554120ae..90fc42f89 100644 --- a/packages/next/src/views/Root/getViewFromConfig.tsx +++ b/packages/next/src/views/Root/getViewFromConfig.tsx @@ -1,4 +1,5 @@ -import type { AdminViewComponent, SanitizedConfig } from 'packages/payload/src/exports/types.js' +import type { SanitizedConfig } from 'payload/config' +import type { AdminViewComponent } from 'payload/types' import type { initPage } from '../../utilities/initPage.js' diff --git a/packages/payload/src/exports/utilities.ts b/packages/payload/src/exports/utilities.ts index cc730c531..809d4d1d7 100644 --- a/packages/payload/src/exports/utilities.ts +++ b/packages/payload/src/exports/utilities.ts @@ -39,6 +39,7 @@ export { isPlainObject } from '../utilities/isPlainObject.js' export { isValidID } from '../utilities/isValidID.js' export { default as isolateObjectProperty } from '../utilities/isolateObjectProperty.js' +export { mapAsync } from '../utilities/mapAsync.js' export { setsAreEqual } from '../utilities/setsAreEqual.js' export { default as toKebabCase } from '../utilities/toKebabCase.js' export { default as wait } from '../utilities/wait.js' diff --git a/test/access-control/e2e.spec.ts b/test/access-control/e2e.spec.ts index 62c2ec746..e82d896f6 100644 --- a/test/access-control/e2e.spec.ts +++ b/test/access-control/e2e.spec.ts @@ -3,11 +3,11 @@ import type { Payload } from 'payload/types' import { expect, test } from '@playwright/test' import path from 'path' +import { wait } from 'payload/utilities' import { fileURLToPath } from 'url' import type { ReadOnlyCollection, RestrictedVersion } from './payload-types.js' -import wait from '../../packages/payload/src/utilities/wait.js' import { exactText, initPageConsoleErrorCatch, openDocControls, openNav } from '../helpers.js' import { AdminUrlUtil } from '../helpers/adminUrlUtil.js' import { initPayloadE2E } from '../helpers/initPayloadE2E.js' diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts index 9478e5cba..736415edf 100644 --- a/test/admin/e2e.spec.ts +++ b/test/admin/e2e.spec.ts @@ -2,12 +2,12 @@ import type { Page } from '@playwright/test' import type { Payload } from 'payload' import { expect, test } from '@playwright/test' +import { wait } from 'payload/utilities' +import { mapAsync } from 'payload/utilities' import qs from 'qs' import type { Geo, Post } from './payload-types.js' -import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js' -import wait from '../../packages/payload/src/utilities/wait.js' import { checkBreadcrumb, checkPageTitle, diff --git a/test/auth/config.ts b/test/auth/config.ts index a48ce8761..60ed08088 100644 --- a/test/auth/config.ts +++ b/test/auth/config.ts @@ -1,6 +1,6 @@ +import { mapAsync } from 'payload/utilities' import { v4 as uuid } from 'uuid' -import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js' import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' import { devUser } from '../credentials.js' import { AuthDebug } from './AuthDebug.js' diff --git a/test/collections-graphql/int.spec.ts b/test/collections-graphql/int.spec.ts index 389be69c9..76ca1edc6 100644 --- a/test/collections-graphql/int.spec.ts +++ b/test/collections-graphql/int.spec.ts @@ -1,10 +1,10 @@ import type { Payload } from 'payload' import { getPayload } from 'payload' +import { mapAsync } from 'payload/utilities' import type { Post } from './payload-types.js' -import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js' import { NextRESTClient } from '../helpers/NextRESTClient.js' import { idToString } from '../helpers/idToString.js' import { initPayloadInt } from '../helpers/initPayloadInt.js' diff --git a/test/collections-rest/int.spec.ts b/test/collections-rest/int.spec.ts index 41cdb3577..c224574f0 100644 --- a/test/collections-rest/int.spec.ts +++ b/test/collections-rest/int.spec.ts @@ -2,11 +2,11 @@ import type { Payload } from 'payload' import { randomBytes } from 'crypto' import { getPayload } from 'payload' +import { mapAsync } from 'payload/utilities' import type { Relation } from './config.js' import type { Post } from './payload-types.js' -import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js' import { NextRESTClient } from '../helpers/NextRESTClient.js' import { startMemoryDB } from '../startMemoryDB.js' import configPromise, { diff --git a/test/fields-relationship/config.ts b/test/fields-relationship/config.ts index cd039e4b7..50bd542de 100644 --- a/test/fields-relationship/config.ts +++ b/test/fields-relationship/config.ts @@ -1,7 +1,8 @@ import type { CollectionConfig } from 'payload/types' import type { FilterOptionsProps } from 'payload/types' -import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js' +import { mapAsync } from 'payload/utilities' + import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' import { devUser } from '../credentials.js' import { PrePopulateFieldUI } from './PrePopulateFieldUI/index.js' diff --git a/test/fields-relationship/e2e.spec.ts b/test/fields-relationship/e2e.spec.ts index f79b1ae6f..e35e67ea0 100644 --- a/test/fields-relationship/e2e.spec.ts +++ b/test/fields-relationship/e2e.spec.ts @@ -3,6 +3,7 @@ import type { Payload } from 'payload' import { expect, test } from '@playwright/test' import path from 'path' +import { wait } from 'payload/utilities' import { fileURLToPath } from 'url' import type { @@ -13,7 +14,6 @@ import type { RelationWithTitle, } from './payload-types.js' -import wait from '../../packages/payload/src/utilities/wait.js' import { initPageConsoleErrorCatch, openDocControls, saveDocAndAssert } from '../helpers.js' import { AdminUrlUtil } from '../helpers/adminUrlUtil.js' import { initPayloadE2E } from '../helpers/initPayloadE2E.js' diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts index a1f2593b3..abb4a1a4a 100644 --- a/test/fields/e2e.spec.ts +++ b/test/fields/e2e.spec.ts @@ -3,11 +3,11 @@ import type { Payload } from 'payload' import { expect, test } from '@playwright/test' import path from 'path' +import { wait } from 'payload/utilities' import { fileURLToPath } from 'url' import type { RelationshipField, TextField } from './payload-types.js' -import wait from '../../packages/payload/src/utilities/wait.js' import { exactText, initPageConsoleErrorCatch, diff --git a/test/helpers.ts b/test/helpers.ts index 720f4f13d..830c7e8c6 100644 --- a/test/helpers.ts +++ b/test/helpers.ts @@ -1,9 +1,9 @@ import type { Locator, Page } from '@playwright/test' import { expect } from '@playwright/test' +import { wait } from 'payload/utilities' import shelljs from 'shelljs' -import wait from '../packages/payload/src/utilities/wait.js' import { devUser } from './credentials.js' type FirstRegisterArgs = { diff --git a/test/helpers/initPayloadE2E.ts b/test/helpers/initPayloadE2E.ts index 8687e0071..06efaa2b9 100644 --- a/test/helpers/initPayloadE2E.ts +++ b/test/helpers/initPayloadE2E.ts @@ -3,10 +3,10 @@ import type { SanitizedConfig } from 'payload/config' import { createServer } from 'http' import nextImport from 'next' import { type Payload } from 'payload' +import { wait } from 'payload/utilities' import { parse } from 'url' import { getPayloadHMR } from '../../packages/next/src/utilities/getPayloadHMR.js' -import wait from '../../packages/payload/src/utilities/wait.js' import { startMemoryDB } from '../startMemoryDB.js' import { createTestHooks } from '../testHooks.js' diff --git a/test/live-preview/e2e.spec.ts b/test/live-preview/e2e.spec.ts index 9c578250b..74bbf2280 100644 --- a/test/live-preview/e2e.spec.ts +++ b/test/live-preview/e2e.spec.ts @@ -1,12 +1,11 @@ import type { Page } from '@playwright/test' +import type { Payload } from 'payload' import { expect, test } from '@playwright/test' import path from 'path' +import { wait } from 'payload/utilities' import { fileURLToPath } from 'url' -import type { Payload } from 'payload' - -import wait from '../../packages/payload/src/utilities/wait.js' import { exactText, initPageConsoleErrorCatch, saveDocAndAssert } from '../helpers.js' import { AdminUrlUtil } from '../helpers/adminUrlUtil.js' import { initPayloadE2E } from '../helpers/initPayloadE2E.js' diff --git a/test/localization/e2e.spec.ts b/test/localization/e2e.spec.ts index 1a257dc0f..4bd19da98 100644 --- a/test/localization/e2e.spec.ts +++ b/test/localization/e2e.spec.ts @@ -3,11 +3,11 @@ import type { Payload } from 'payload' import { expect, test } from '@playwright/test' import path from 'path' +import { wait } from 'payload/utilities' import { fileURLToPath } from 'url' import type { LocalizedPost } from './payload-types.js' -import wait from '../../packages/payload/src/utilities/wait.js' import { changeLocale, initPageConsoleErrorCatch, diff --git a/test/plugin-search/int.spec.ts b/test/plugin-search/int.spec.ts index 0756de3b7..399c26479 100644 --- a/test/plugin-search/int.spec.ts +++ b/test/plugin-search/int.spec.ts @@ -1,6 +1,7 @@ import type { Payload } from 'payload' -import wait from '../../packages/payload/src/utilities/wait.js' +import { wait } from 'payload/utilities' + import { initPayloadInt } from '../helpers/initPayloadInt.js' import configPromise from './config.js' diff --git a/test/plugin-seo/seed/index.ts b/test/plugin-seo/seed/index.ts index 9d8dee83b..11f1e1b27 100644 --- a/test/plugin-seo/seed/index.ts +++ b/test/plugin-seo/seed/index.ts @@ -1,4 +1,5 @@ -import type { Payload, PayloadRequest } from 'payload' +import type { Payload } from 'payload' +import type { PayloadRequest } from 'payload/types' import path from 'path' import { getFileByPath } from 'payload/utilities' diff --git a/test/uploads/e2e.spec.ts b/test/uploads/e2e.spec.ts index c831126b3..b7cc6a59f 100644 --- a/test/uploads/e2e.spec.ts +++ b/test/uploads/e2e.spec.ts @@ -3,11 +3,11 @@ import type { Payload } from 'payload/types' import { expect, test } from '@playwright/test' import path from 'path' +import { wait } from 'payload/utilities' import { fileURLToPath } from 'url' import type { Media } from './payload-types.js' -import wait from '../../packages/payload/src/utilities/wait.js' import { initPageConsoleErrorCatch, saveDocAndAssert } from '../helpers.js' import { AdminUrlUtil } from '../helpers/adminUrlUtil.js' import { initPayloadE2E } from '../helpers/initPayloadE2E.js' diff --git a/test/versions/e2e.spec.ts b/test/versions/e2e.spec.ts index fd7b2b3dd..9942e4d42 100644 --- a/test/versions/e2e.spec.ts +++ b/test/versions/e2e.spec.ts @@ -28,9 +28,9 @@ import type { Payload } from 'payload/types' import { expect, test } from '@playwright/test' import path from 'path' +import { wait } from 'payload/utilities' import { fileURLToPath } from 'url' -import wait from '../../packages/payload/src/utilities/wait.js' import { globalSlug } from '../admin/slugs.js' import { changeLocale,