diff --git a/packages/next/src/layouts/Root/index.tsx b/packages/next/src/layouts/Root/index.tsx index 5ff93a3a2..257bbe70f 100644 --- a/packages/next/src/layouts/Root/index.tsx +++ b/packages/next/src/layouts/Root/index.tsx @@ -1,9 +1,9 @@ import type { SanitizedConfig } from 'payload/types' import { translations } from '@payloadcms/translations/client' -import { buildComponentMap } from '@payloadcms/ui/providers/ComponentMap' import { RootProvider } from '@payloadcms/ui/providers/Root' import '@payloadcms/ui/scss/app.scss' +import { buildComponentMap } from '@payloadcms/ui/utilities/buildComponentMap' import { headers as getHeaders, cookies as nextCookies } from 'next/headers.js' import { parseCookies } from 'payload/auth' import { createClientConfig } from 'payload/config' diff --git a/packages/next/src/views/CreateFirstUser/index.client.tsx b/packages/next/src/views/CreateFirstUser/index.client.tsx index 0641d7eff..353dd39c0 100644 --- a/packages/next/src/views/CreateFirstUser/index.client.tsx +++ b/packages/next/src/views/CreateFirstUser/index.client.tsx @@ -1,5 +1,5 @@ 'use client' -import type { FieldMap } from '@payloadcms/ui/providers/ComponentMap' +import type { FieldMap } from '@payloadcms/ui/utilities/buildComponentMap' import { RenderFields } from '@payloadcms/ui/forms/RenderFields' import { useComponentMap } from '@payloadcms/ui/providers/ComponentMap' diff --git a/packages/next/src/views/CreateFirstUser/index.tsx b/packages/next/src/views/CreateFirstUser/index.tsx index c52d78e02..f0dd3316b 100644 --- a/packages/next/src/views/CreateFirstUser/index.tsx +++ b/packages/next/src/views/CreateFirstUser/index.tsx @@ -4,7 +4,7 @@ import type { AdminViewProps } from 'payload/types' import { Form } from '@payloadcms/ui/forms/Form' import { FormSubmit } from '@payloadcms/ui/forms/Submit' import { buildStateFromSchema } from '@payloadcms/ui/forms/buildStateFromSchema' -import { mapFields } from '@payloadcms/ui/providers/ComponentMap' +import { mapFields } from '@payloadcms/ui/utilities/buildComponentMap' import React from 'react' import { CreateFirstUserFields } from './index.client.js' diff --git a/packages/next/src/views/LivePreview/index.client.tsx b/packages/next/src/views/LivePreview/index.client.tsx index 8a34dbb58..06ae55759 100644 --- a/packages/next/src/views/LivePreview/index.client.tsx +++ b/packages/next/src/views/LivePreview/index.client.tsx @@ -1,6 +1,6 @@ 'use client' import type { Props as FormProps } from '@payloadcms/ui/forms/Form' -import type { FieldMap } from '@payloadcms/ui/providers/ComponentMap' +import type { FieldMap } from '@payloadcms/ui/utilities/buildComponentMap' import type { LivePreviewConfig } from 'payload/config' import type { ClientConfig, diff --git a/packages/next/src/views/Version/Default/SetStepNav.tsx b/packages/next/src/views/Version/Default/SetStepNav.tsx index 3a27a401b..4d72dd027 100644 --- a/packages/next/src/views/Version/Default/SetStepNav.tsx +++ b/packages/next/src/views/Version/Default/SetStepNav.tsx @@ -1,5 +1,5 @@ import type { StepNavItem } from '@payloadcms/ui/elements/StepNav' -import type { FieldMap } from '@payloadcms/ui/providers/ComponentMap' +import type { FieldMap } from '@payloadcms/ui/utilities/buildComponentMap' import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload/types' import type React from 'react' diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx index f21d5fc14..c15815159 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx @@ -1,4 +1,4 @@ -import type { MappedField } from '@payloadcms/ui/providers/ComponentMap' +import type { MappedField } from '@payloadcms/ui/utilities/buildComponentMap' import { getTranslation } from '@payloadcms/translations' import { getUniqueListBy } from 'payload/utilities' diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx index b9e8f92e2..57c601e4f 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx @@ -1,5 +1,5 @@ 'use client' -import type { MappedField } from '@payloadcms/ui/providers/ComponentMap' +import type { MappedField } from '@payloadcms/ui/utilities/buildComponentMap' import type { ClientConfig } from 'payload/types' import { getTranslation } from '@payloadcms/translations' diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx index b2a808451..c82074a22 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx @@ -1,6 +1,6 @@ import type { I18n } from '@payloadcms/translations' import type { SelectFieldProps } from '@payloadcms/ui/fields/Select' -import type { MappedField } from '@payloadcms/ui/providers/ComponentMap' +import type { MappedField } from '@payloadcms/ui/utilities/buildComponentMap' import type { OptionObject, SelectField } from 'payload/types' import { getTranslation } from '@payloadcms/translations' diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx index 692f8a818..eaea86061 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx @@ -1,5 +1,5 @@ import type { TabsFieldProps } from '@payloadcms/ui/fields/Tabs' -import type { MappedField } from '@payloadcms/ui/providers/ComponentMap' +import type { MappedField } from '@payloadcms/ui/utilities/buildComponentMap' import React from 'react' diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/fields/types.ts b/packages/next/src/views/Version/RenderFieldsToDiff/fields/types.ts index c3d9f3ba0..bec4d1baa 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/types.ts +++ b/packages/next/src/views/Version/RenderFieldsToDiff/fields/types.ts @@ -1,5 +1,5 @@ import type { I18n } from '@payloadcms/translations' -import type { FieldMap, MappedField } from '@payloadcms/ui/providers/ComponentMap' +import type { FieldMap, MappedField } from '@payloadcms/ui/utilities/buildComponentMap' import type { FieldPermissions } from 'payload/auth' import type React from 'react' import type { DiffMethod } from 'react-diff-viewer-continued' diff --git a/packages/next/src/views/Version/RenderFieldsToDiff/types.ts b/packages/next/src/views/Version/RenderFieldsToDiff/types.ts index 0edae9697..a44c6c8e5 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/types.ts +++ b/packages/next/src/views/Version/RenderFieldsToDiff/types.ts @@ -1,5 +1,5 @@ import type { I18n } from '@payloadcms/translations' -import type { FieldMap, MappedField } from '@payloadcms/ui/providers/ComponentMap' +import type { FieldMap, MappedField } from '@payloadcms/ui/utilities/buildComponentMap' import type { FieldPermissions } from 'payload/auth' import type { DiffMethod } from 'react-diff-viewer-continued' diff --git a/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx b/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx index 565956a13..1ab5e9859 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx @@ -8,7 +8,7 @@ import isDeepEqual from 'deep-equal' import lexicalImport from 'lexical' const { $getNodeByKey } = lexicalImport import type { FormFieldBase } from '@payloadcms/ui/fields/shared' -import type { FieldMap, ReducedBlock } from '@payloadcms/ui/providers/ComponentMap' +import type { FieldMap, ReducedBlock } from '@payloadcms/ui/utilities/buildComponentMap' import type { CollapsedPreferences } from 'payload/types' import { Button } from '@payloadcms/ui/elements/Button' diff --git a/packages/richtext-lexical/src/field/features/blocks/component/index.tsx b/packages/richtext-lexical/src/field/features/blocks/component/index.tsx index efe3ed3cc..123e135e7 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/index.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/component/index.tsx @@ -8,7 +8,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react' import { type BlockFields } from '../nodes/BlocksNode.js' const baseClass = 'lexical-block' -import type { ReducedBlock } from '@payloadcms/ui/providers/ComponentMap' +import type { ReducedBlock } from '@payloadcms/ui/utilities/buildComponentMap' import type { FormState } from 'payload/types' import { useFieldProps } from '@payloadcms/ui/forms/FieldPropsProvider' diff --git a/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx b/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx index a40f53e6d..69bd4bdb5 100644 --- a/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx @@ -1,6 +1,6 @@ 'use client' -import type { ReducedBlock } from '@payloadcms/ui/providers/ComponentMap' +import type { ReducedBlock } from '@payloadcms/ui/utilities/buildComponentMap' import { getTranslation } from '@payloadcms/translations' diff --git a/packages/richtext-lexical/src/generateComponentMap.tsx b/packages/richtext-lexical/src/generateComponentMap.tsx index 0217c04c4..216f7dcb2 100644 --- a/packages/richtext-lexical/src/generateComponentMap.tsx +++ b/packages/richtext-lexical/src/generateComponentMap.tsx @@ -1,6 +1,6 @@ import type { RichTextAdapter } from 'payload/types' -import { mapFields } from '@payloadcms/ui/providers/ComponentMap' +import { mapFields } from '@payloadcms/ui/utilities/buildComponentMap' import { sanitizeFields } from 'payload/config' import React from 'react' diff --git a/packages/richtext-slate/src/generateComponentMap.tsx b/packages/richtext-slate/src/generateComponentMap.tsx index 311fa5808..55f396e3b 100644 --- a/packages/richtext-slate/src/generateComponentMap.tsx +++ b/packages/richtext-slate/src/generateComponentMap.tsx @@ -2,7 +2,7 @@ import type { RichTextAdapter } from 'payload/types' import { initI18n } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/client' -import { mapFields } from '@payloadcms/ui/utilities' +import { mapFields } from '@payloadcms/ui/utilities/buildComponentMap' import { sanitizeFields } from 'payload/config' import React from 'react' diff --git a/packages/ui/src/providers/ComponentMap/index.tsx b/packages/ui/src/providers/ComponentMap/index.tsx index b945160c5..79e0b4efb 100644 --- a/packages/ui/src/providers/ComponentMap/index.tsx +++ b/packages/ui/src/providers/ComponentMap/index.tsx @@ -81,7 +81,3 @@ export const ComponentMapProvider: React.FC<{ } export const useComponentMap = (): IComponentMapContext => useContext(ComponentMapContext) - -export { buildComponentMap } from './buildComponentMap/index.js' -export { mapFields } from './buildComponentMap/mapFields.js' -export type * from './buildComponentMap/types.js' diff --git a/packages/ui/src/utilities/buildComponentMap.ts b/packages/ui/src/utilities/buildComponentMap.ts new file mode 100644 index 000000000..0205acb97 --- /dev/null +++ b/packages/ui/src/utilities/buildComponentMap.ts @@ -0,0 +1,3 @@ +export { buildComponentMap } from '../providers/ComponentMap/buildComponentMap/index.js' +export { mapFields } from '../providers/ComponentMap/buildComponentMap/mapFields.js' +export type * from '../providers/ComponentMap/buildComponentMap/types.js'