feat!: rename @payloadcms/ui/client to @payloadcms/ui, and other auto-suggestion & exports improvements (#6848)

**BREAKING:** All `@payloadcms/ui/client` exports have been renamed to
`@payloadcms/ui`. A simple find & replace across your entire project
will be enough to migrate. This change greatly improves import
auto-completions in IDEs which lack proper support for package.json
exports, like Webstorm.

app/(payload)/layout.tsx

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

packages/db-mongodb/package.json

@@ -14,12 +14,12 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
-  "types": "./src/types.ts",
+  "types": "./src/index.ts",
   "files": [
     "dist",
     "mock.js",
@@ -55,8 +55,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/db-postgres/package.json

@@ -14,18 +14,18 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
     "./types": {
       "import": "./src/types.ts",
-      "require": "./src/types.ts",
+      "types": "./src/types.ts",
-      "types": "./src/types.ts"
+      "default": "./src/types.ts"
     },
     "./migration-utils": {
       "import": "./src/exports/migration-utils.ts",
-      "require": "./src/exports/migration-utils.ts",
+      "types": "./src/exports/migration-utils.ts",
-      "types": "./src/exports/migration-utils.ts"
+      "default": "./src/exports/migration-utils.ts"
     }
   },
   "main": "./src/index.ts",
@@ -68,18 +68,18 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
       "./types": {
         "import": "./dist/types.js",
-        "require": "./dist/types.js",
+        "types": "./dist/types.d.ts",
-        "types": "./dist/types.d.ts"
+        "default": "./dist/types.js"
       },
       "./migration-utils": {
         "import": "./dist/exports/migration-utils.js",
-        "require": "./dist/exports/migration-utils.js",
+        "types": "./dist/exports/migration-utils.d.ts",
-        "types": "./dist/exports/migration-utils.d.ts"
+        "default": "./dist/exports/migration-utils.js"
       }
     },
     "main": "./dist/index.js",

packages/email-nodemailer/package.json

@@ -14,8 +14,8 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -48,8 +48,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/email-resend/package.json

@@ -14,8 +14,8 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -46,8 +46,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/graphql/package.json

@@ -11,17 +11,22 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
-    "./*": {
+    "./types": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/types.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/types.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/types.ts"
+    },
+    "./utilities": {
+      "import": "./src/exports/utilities.ts",
+      "types": "./src/exports/utilities.ts",
+      "default": "./src/exports/utilities.ts"
     }
   },
   "main": "./src/index.ts",
-  "types": "./src/index.d.ts",
+  "types": "./src/index.ts",
   "bin": {
     "payload-graphql": "bin.js"
   },
@@ -54,13 +59,18 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
-      "./*": {
+      "./types": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/types.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/types.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/types.js"
+      },
+      "./utilities": {
+        "import": "./dist/exports/utilities.js",
+        "types": "./dist/exports/utilities.d.ts",
+        "default": "./dist/exports/utilities.js"
       }
     },
     "main": "./dist/index.js",

packages/live-preview-react/package.json

@@ -13,6 +13,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "import": "./src/index.ts",
       "types": "./src/index.ts",
       "default": "./src/index.ts"
     }
@@ -47,8 +48,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/live-preview-vue/package.json

@@ -13,8 +13,9 @@
   "type": "module",
   "exports": {
     ".": {
-      "default": "./src/index.ts",
+      "import": "./src/index.ts",
-      "types": "./src/index.ts"
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -44,9 +45,9 @@
   "publishConfig": {
     "exports": {
       ".": {
-        "import": "./dist/index.js",
+        "default": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "import": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/live-preview/package.json

@@ -13,6 +13,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "import": "./src/index.ts",
       "types": "./src/index.ts",
       "default": "./src/index.ts"
     }
@@ -38,8 +39,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/next/package.json

@@ -11,17 +11,37 @@
   "exports": {
     ".": {
       "import": "./src/index.js",
-      "require": "./src/index.js",
+      "types": "./src/index.js",
-      "types": "./src/index.js"
+      "default": "./src/index.js"
     },
     "./withPayload": {
       "import": "./src/withPayload.js",
-      "require": "./src/withPayload.js"
+      "default": "./src/withPayload.js"
     },
-    "./*": {
+    "./layouts": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/layouts.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/layouts.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/layouts.ts"
+    },
+    "./routes": {
+      "import": "./src/exports/routes.ts",
+      "types": "./src/exports/routes.ts",
+      "default": "./src/exports/routes.ts"
+    },
+    "./templates": {
+      "import": "./src/exports/templates.ts",
+      "types": "./src/exports/templates.ts",
+      "default": "./src/exports/templates.ts"
+    },
+    "./utilities": {
+      "import": "./src/exports/utilities.ts",
+      "types": "./src/exports/utilities.ts",
+      "default": "./src/exports/utilities.ts"
+    },
+    "./views": {
+      "import": "./src/exports/views.ts",
+      "types": "./src/exports/views.ts",
+      "default": "./src/exports/views.ts"
     }
   },
   "main": "./src/index.js",
@@ -90,22 +110,42 @@
     "exports": {
       "./css": {
         "import": "./dist/prod/styles.css",
-        "require": "./dist/prod/styles.css",
         "default": "./dist/prod/styles.css"
       },
       "./withPayload": {
         "import": "./dist/withPayload.js",
-        "require": "./dist/cjs/withPayload.cjs"
+        "require": "./dist/cjs/withPayload.cjs",
+        "default": "./dist/withPayload.js"
       },
-      "./*": {
+      "./layouts": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/layouts.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/layouts.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/layouts.js"
+      },
+      "./routes": {
+        "import": "./dist/exports/routes.js",
+        "types": "./dist/exports/routes.d.ts",
+        "default": "./dist/exports/routes.js"
+      },
+      "./templates": {
+        "import": "./dist/exports/templates.js",
+        "types": "./dist/exports/templates.d.ts",
+        "default": "./dist/exports/templates.js"
+      },
+      "./utilities": {
+        "import": "./dist/exports/utilities.js",
+        "types": "./dist/exports/utilities.d.ts",
+        "default": "./dist/exports/utilities.js"
+      },
+      "./views": {
+        "import": "./dist/exports/views.js",
+        "types": "./dist/exports/views.d.ts",
+        "default": "./dist/exports/views.js"
       }
     },
     "main": "./dist/index.js",
     "registry": "https://registry.npmjs.org/",
-    "types": "./dist/index.d.ts"
+    "types": "./dist/index.js"
   },
   "overrides": {
     "@types/react": "npm:types-react@19.0.0-beta.2",

packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx

@@ -1,7 +1,7 @@
 'use client'
 import type React from 'react'
 
-import { useDocumentInfo } from '@payloadcms/ui/client'
+import { useDocumentInfo } from '@payloadcms/ui'
 
 export const ShouldRenderTabs: React.FC<{
   children: React.ReactNode

packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx

@@ -1,7 +1,7 @@
 'use client'
 import type { SanitizedConfig } from 'payload'
 
-import { useSearchParams } from '@payloadcms/ui/client'
+import { useSearchParams } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import { useParams, usePathname } from 'next/navigation.js'
 import React from 'react'

packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { useDocumentInfo } from '@payloadcms/ui/client'
+import { useDocumentInfo } from '@payloadcms/ui'
 import React, { Fragment } from 'react'
 
 import { baseClass } from '../../Tab/index.js'

packages/next/src/elements/DocumentHeader/index.tsx

@@ -6,7 +6,7 @@ import type {
   SanitizedGlobalConfig,
 } from 'payload'
 
-import { Gutter, RenderTitle } from '@payloadcms/ui/client'
+import { Gutter, RenderTitle } from '@payloadcms/ui'
 import React, { Fragment } from 'react'
 
 import { DocumentTabs } from './Tabs/index.js'

packages/next/src/elements/LeaveWithoutSaving/index.tsx

@@ -1,12 +1,5 @@
 'use client'
-import {
+import { Button, Modal, useAuth, useFormModified, useModal, useTranslation } from '@payloadcms/ui'
-  Button,
-  Modal,
-  useAuth,
-  useFormModified,
-  useModal,
-  useTranslation,
-} from '@payloadcms/ui/client'
 import React, { useCallback, useEffect } from 'react'
 
 import './index.scss'

packages/next/src/elements/Nav/NavHamburger/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { Hamburger, useNav } from '@payloadcms/ui/client'
+import { Hamburger, useNav } from '@payloadcms/ui'
 import React from 'react'
 
 export const NavHamburger: React.FC<{

packages/next/src/elements/Nav/NavWrapper/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { useNav } from '@payloadcms/ui/client'
+import { useNav } from '@payloadcms/ui'
 import React from 'react'
 
 import './index.scss'

packages/next/src/elements/Nav/index.client.tsx

@@ -11,7 +11,7 @@ import {
   useEntityVisibility,
   useNav,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { EntityType, groupNavItems } from '@payloadcms/ui/shared'
 import LinkWithDefault from 'next/link.js'
 import React, { Fragment } from 'react'

packages/next/src/elements/Nav/index.tsx

@@ -1,6 +1,6 @@
 import type { ServerProps } from 'payload'
 
-import { Logout } from '@payloadcms/ui/client'
+import { Logout } from '@payloadcms/ui'
 import React from 'react'
 
 import { NavHamburger } from './NavHamburger/index.js'

packages/next/src/layouts/Root/index.tsx

@@ -2,7 +2,7 @@ import type { AcceptedLanguages, I18nClient } from '@payloadcms/translations'
 import type { SanitizedConfig } from 'payload'
 
 import { initI18n, rtlLanguages } from '@payloadcms/translations'
-import { RootProvider } from '@payloadcms/ui/client'
+import { RootProvider } from '@payloadcms/ui'
 import { buildComponentMap } from '@payloadcms/ui/providers/ComponentMap/buildComponentMap'
 import '@payloadcms/ui/scss/app.scss'
 import { Merriweather } from 'next/font/google'

packages/next/src/templates/Default/NavHamburger/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { Hamburger, useNav } from '@payloadcms/ui/client'
+import { Hamburger, useNav } from '@payloadcms/ui'
 import React from 'react'
 
 export const NavHamburger: React.FC = () => {

packages/next/src/templates/Default/Wrapper/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { useNav } from '@payloadcms/ui/client'
+import { useNav } from '@payloadcms/ui'
 import React from 'react'
 
 import './index.scss'

packages/next/src/templates/Default/index.tsx

@@ -1,6 +1,6 @@
 import type { ServerProps, VisibleEntities } from 'payload'
 
-import { AppHeader, EntityVisibilityProvider, NavToggler } from '@payloadcms/ui/client'
+import { AppHeader, EntityVisibilityProvider, NavToggler } from '@payloadcms/ui'
 import { RenderCustomComponent } from '@payloadcms/ui/shared'
 import React from 'react'
 

packages/next/src/utilities/getRequestTheme.ts

@@ -1,7 +1,7 @@
 import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies.js'
 import type { SanitizedConfig } from 'payload'
 
-import { type Theme, defaultTheme } from '@payloadcms/ui/client'
+import { type Theme, defaultTheme } from '@payloadcms/ui'
 
 type GetRequestLanguageArgs = {
   config: SanitizedConfig

packages/next/src/views/API/LocaleSelector/index.tsx

@@ -1,4 +1,4 @@
-import { SelectField, useTranslation } from '@payloadcms/ui/client'
+import { SelectField, useTranslation } from '@payloadcms/ui'
 import React from 'react'
 
 export const LocaleSelector: React.FC<{

packages/next/src/views/API/RenderJSON/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { ChevronIcon } from '@payloadcms/ui/client'
+import { ChevronIcon } from '@payloadcms/ui'
 import * as React from 'react'
 
 import './index.scss'

packages/next/src/views/API/index.client.tsx

@@ -13,7 +13,7 @@ import {
   useDocumentInfo,
   useLocale,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { useSearchParams } from 'next/navigation.js'
 import qs from 'qs'
 import * as React from 'react'

packages/next/src/views/Account/Settings/LanguageSelector.tsx

@@ -3,7 +3,7 @@ import type { AcceptedLanguages } from '@payloadcms/translations'
 import type { Option } from '@payloadcms/ui/elements/ReactSelect'
 import type { LanguageOptions } from 'payload'
 
-import { ReactSelect, useTranslation } from '@payloadcms/ui/client'
+import { ReactSelect, useTranslation } from '@payloadcms/ui'
 import React from 'react'
 
 export const LanguageSelector: React.FC<{

packages/next/src/views/Account/Settings/index.tsx

@@ -1,7 +1,7 @@
 import type { I18n } from '@payloadcms/translations'
 import type { LanguageOptions } from 'payload'
 
-import { FieldLabel } from '@payloadcms/ui/client'
+import { FieldLabel } from '@payloadcms/ui'
 import React from 'react'
 
 import { ToggleTheme } from '../ToggleTheme/index.js'

packages/next/src/views/Account/ToggleTheme/index.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { RadioGroupField, useTheme, useTranslation } from '@payloadcms/ui/client'
+import { RadioGroupField, useTheme, useTranslation } from '@payloadcms/ui'
 import React, { useCallback } from 'react'
 
 export const ToggleTheme: React.FC = () => {

packages/next/src/views/Account/index.tsx

@@ -1,10 +1,6 @@
 import type { AdminViewProps, ServerSideEditViewProps } from 'payload'
 
-import {
+import { DocumentInfoProvider, FormQueryParamsProvider, HydrateClientUser } from '@payloadcms/ui'
-  DocumentInfoProvider,
-  FormQueryParamsProvider,
-  HydrateClientUser,
-} from '@payloadcms/ui/client'
 import { RenderCustomComponent } from '@payloadcms/ui/shared'
 import { notFound } from 'next/navigation.js'
 import React from 'react'

packages/next/src/views/CreateFirstUser/index.client.tsx

@@ -12,7 +12,7 @@ import {
   useComponentMap,
   useConfig,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { getFormState } from '@payloadcms/ui/shared'
 import React from 'react'
 

packages/next/src/views/Dashboard/Default/index.tsx

@@ -2,7 +2,7 @@ import type { groupNavItems } from '@payloadcms/ui/shared'
 import type { Permissions, ServerProps, VisibleEntities } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
-import { Button, Card, Gutter, SetStepNav, SetViewActions } from '@payloadcms/ui/client'
+import { Button, Card, Gutter, SetStepNav, SetViewActions } from '@payloadcms/ui'
 import { EntityType, WithServerSideProps } from '@payloadcms/ui/shared'
 import React, { Fragment } from 'react'
 

packages/next/src/views/Dashboard/index.tsx

@@ -1,7 +1,7 @@
 import type { EntityToGroup } from '@payloadcms/ui/utilities/groupNavItems'
 import type { AdminViewProps } from 'payload'
 
-import { HydrateClientUser } from '@payloadcms/ui/client'
+import { HydrateClientUser } from '@payloadcms/ui'
 import { EntityType, RenderCustomComponent, groupNavItems } from '@payloadcms/ui/shared'
 import LinkImport from 'next/link.js'
 import React, { Fragment } from 'react'

packages/next/src/views/Document/index.tsx

@@ -10,7 +10,7 @@ import {
   EditDepthProvider,
   FormQueryParamsProvider,
   HydrateClientUser,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { RenderCustomComponent, isEditing as getIsEditing } from '@payloadcms/ui/shared'
 import { notFound, redirect } from 'next/navigation.js'
 import QueryString from 'qs'

packages/next/src/views/Edit/Default/Auth/APIKey.tsx

@@ -9,7 +9,7 @@ import {
   useField,
   useFormFields,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { text } from 'payload/shared'
 import React, { useEffect, useMemo, useState } from 'react'
 import { v4 as uuidv4 } from 'uuid'

packages/next/src/views/Edit/Default/Auth/index.tsx

@@ -11,7 +11,7 @@ import {
   useFormFields,
   useFormModified,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import React, { useCallback, useEffect, useState } from 'react'
 import { toast } from 'sonner'
 

packages/next/src/views/Edit/Default/SetDocumentStepNav/index.tsx

@@ -10,7 +10,7 @@ import {
   useEntityVisibility,
   useStepNav,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { useEffect } from 'react'
 
 export const SetDocumentStepNav: React.FC<{

packages/next/src/views/Edit/Default/SetDocumentTitle/index.tsx

@@ -1,7 +1,7 @@
 'use client'
 import type { ClientCollectionConfig, ClientConfig, ClientGlobalConfig } from 'payload'
 
-import { useDocumentInfo, useFormFields, useTranslation } from '@payloadcms/ui/client'
+import { useDocumentInfo, useFormFields, useTranslation } from '@payloadcms/ui'
 import { formatDocTitle } from '@payloadcms/ui/shared'
 import { useEffect, useRef } from 'react'
 

packages/next/src/views/Edit/Default/index.tsx

@@ -14,7 +14,7 @@ import {
   useDocumentInfo,
   useEditDepth,
   useFormQueryParams,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { getFormState } from '@payloadcms/ui/shared'
 import { useRouter, useSearchParams } from 'next/navigation.js'
 import React, { Fragment, useCallback } from 'react'

packages/next/src/views/Edit/index.client.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { SetViewActions, useComponentMap, useDocumentInfo } from '@payloadcms/ui/client'
+import { SetViewActions, useComponentMap, useDocumentInfo } from '@payloadcms/ui'
 import React, { Fragment } from 'react'
 
 export const EditViewClient: React.FC = () => {

packages/next/src/views/ForgotPassword/ForgotPasswordForm/index.tsx

@@ -1,9 +1,9 @@
 'use client'
 
-import type { FormProps } from '@payloadcms/ui/client'
+import type { FormProps } from '@payloadcms/ui'
 import type { FormState, PayloadRequestWithData } from 'payload'
 
-import { EmailField, Form, FormSubmit, useConfig, useTranslation } from '@payloadcms/ui/client'
+import { EmailField, Form, FormSubmit, useConfig, useTranslation } from '@payloadcms/ui'
 import { email } from 'payload/shared'
 import React, { Fragment, useState } from 'react'
 

packages/next/src/views/ForgotPassword/index.tsx

@@ -1,6 +1,6 @@
 import type { AdminViewProps } from 'payload'
 
-import { Button, Translation } from '@payloadcms/ui/client'
+import { Button, Translation } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import React, { Fragment } from 'react'
 

packages/next/src/views/List/Default/index.tsx

@@ -29,7 +29,7 @@ import {
   useStepNav,
   useTranslation,
   useWindowInfo,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import { formatFilesize, isNumber } from 'payload/shared'
 import React, { Fragment, useEffect } from 'react'

packages/next/src/views/List/Default/types.ts

@@ -1,4 +1,4 @@
-import type { ColumnPreferences } from '@payloadcms/ui/client'
+import type { ColumnPreferences } from '@payloadcms/ui'
 import type { SanitizedCollectionConfig } from 'payload'
 
 export type DefaultListViewProps = {

packages/next/src/views/List/index.tsx

@@ -5,7 +5,7 @@ import {
   ListInfoProvider,
   ListQueryProvider,
   TableColumnsProvider,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { RenderCustomComponent } from '@payloadcms/ui/shared'
 import { notFound } from 'next/navigation.js'
 import { createClientCollectionConfig, mergeListSearchAndWhere } from 'payload'

packages/next/src/views/LivePreview/Device/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { useResize } from '@payloadcms/ui/client'
+import { useResize } from '@payloadcms/ui'
 import React, { useEffect } from 'react'
 
 import { useLivePreviewContext } from '../Context/context.js'

packages/next/src/views/LivePreview/Preview/index.tsx

@@ -2,7 +2,7 @@
 
 import type { EditViewProps } from 'payload'
 
-import { ShimmerEffect, useAllFormFields, useDocumentEvents } from '@payloadcms/ui/client'
+import { ShimmerEffect, useAllFormFields, useDocumentEvents } from '@payloadcms/ui'
 import { reduceFieldsToValues } from '@payloadcms/ui/shared'
 import React, { useEffect } from 'react'
 

packages/next/src/views/LivePreview/Toolbar/Controls/index.tsx

@@ -2,14 +2,7 @@
 
 import type { EditViewProps } from 'payload'
 
-import {
+import { ChevronIcon, LinkIcon, Popup, PopupList, XIcon, useTranslation } from '@payloadcms/ui'
-  ChevronIcon,
-  LinkIcon,
-  Popup,
-  PopupList,
-  XIcon,
-  useTranslation,
-} from '@payloadcms/ui/client'
 import React from 'react'
 
 import { useLivePreviewContext } from '../../Context/context.js'

packages/next/src/views/LivePreview/Toolbar/index.tsx

@@ -2,7 +2,7 @@
 import type { EditViewProps } from 'payload'
 
 import { useDraggable } from '@dnd-kit/core'
-import { DragHandleIcon } from '@payloadcms/ui/client'
+import { DragHandleIcon } from '@payloadcms/ui'
 import React from 'react'
 
 import { useLivePreviewContext } from '../Context/context.js'

packages/next/src/views/LivePreview/index.client.tsx

@@ -21,7 +21,7 @@ import {
   useDocumentEvents,
   useDocumentInfo,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { getFormState } from '@payloadcms/ui/shared'
 import React, { Fragment, useCallback } from 'react'
 

packages/next/src/views/LivePreview/usePopupWindow.ts

@@ -1,5 +1,5 @@
 'use client'
-import { useConfig } from '@payloadcms/ui/client'
+import { useConfig } from '@payloadcms/ui'
 import { useCallback, useEffect, useRef, useState } from 'react'
 
 export interface PopupMessage {

packages/next/src/views/Login/LoginForm/index.tsx

@@ -15,7 +15,7 @@ import {
   PasswordField,
   useConfig,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { email, password } from 'payload/shared'
 
 import './index.scss'

packages/next/src/views/Logout/LogoutClient.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { Button, useAuth, useTranslation } from '@payloadcms/ui/client'
+import { Button, useAuth, useTranslation } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import React, { Fragment, useEffect } from 'react'
 

packages/next/src/views/NotFound/index.client.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui/client'
+import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import React, { useEffect } from 'react'
 

packages/next/src/views/NotFound/index.tsx

@@ -2,7 +2,7 @@ import type { I18n } from '@payloadcms/translations'
 import type { Metadata } from 'next'
 import type { AdminViewComponent, SanitizedConfig } from 'payload'
 
-import { HydrateClientUser } from '@payloadcms/ui/client'
+import { HydrateClientUser } from '@payloadcms/ui'
 import React, { Fragment } from 'react'
 
 import { DefaultTemplate } from '../../templates/Default/index.js'

packages/next/src/views/ResetPassword/index.client.tsx

@@ -11,7 +11,7 @@ import {
   useConfig,
   useFormFields,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { useRouter } from 'next/navigation.js'
 import React from 'react'
 import { toast } from 'sonner'

packages/next/src/views/ResetPassword/index.tsx

@@ -1,6 +1,6 @@
 import type { AdminViewProps } from 'payload'
 
-import { Button, Translation } from '@payloadcms/ui/client'
+import { Button, Translation } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import React from 'react'
 

packages/next/src/views/Unauthorized/index.tsx

@@ -1,6 +1,6 @@
 import type { AdminViewComponent } from 'payload'
 
-import { Button, Gutter } from '@payloadcms/ui/client'
+import { Button, Gutter } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import React from 'react'
 

packages/next/src/views/Version/Default/SetStepNav.tsx

@@ -4,7 +4,7 @@ import type { ClientCollectionConfig, ClientGlobalConfig } from 'payload'
 import type React from 'react'
 
 import { getTranslation } from '@payloadcms/translations'
-import { useConfig, useLocale, useStepNav, useTranslation } from '@payloadcms/ui/client'
+import { useConfig, useLocale, useStepNav, useTranslation } from '@payloadcms/ui'
 import { formatDate } from '@payloadcms/ui/shared'
 import { useEffect } from 'react'
 

packages/next/src/views/Version/Default/index.tsx

@@ -9,7 +9,7 @@ import {
   useDocumentInfo,
   usePayloadAPI,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { formatDate } from '@payloadcms/ui/shared'
 import React, { useState } from 'react'
 

packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx

@@ -2,7 +2,7 @@
 import type { ClientCollectionConfig } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
-import { type MappedField, useConfig } from '@payloadcms/ui/client'
+import { type MappedField, useConfig } from '@payloadcms/ui'
 import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/shared'
 import React from 'react'
 import ReactDiffViewerImport from 'react-diff-viewer-continued'

packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx

@@ -1,4 +1,4 @@
-import type { MappedField, TabsFieldProps } from '@payloadcms/ui/client'
+import type { MappedField, TabsFieldProps } from '@payloadcms/ui'
 
 import React from 'react'
 

packages/next/src/views/Version/Restore/index.tsx

@@ -1,6 +1,6 @@
 'use client'
 import { getTranslation } from '@payloadcms/translations'
-import { Button, Modal, Pill, useConfig, useModal, useTranslation } from '@payloadcms/ui/client'
+import { Button, Modal, Pill, useConfig, useModal, useTranslation } from '@payloadcms/ui'
 import { requests } from '@payloadcms/ui/shared'
 import { useRouter } from 'next/navigation.js'
 import React, { Fragment, useCallback, useState } from 'react'

packages/next/src/views/Version/SelectComparison/index.tsx

@@ -7,7 +7,7 @@ import {
   useConfig,
   useDocumentInfo,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { formatDate } from '@payloadcms/ui/shared'
 import qs from 'qs'
 import React, { useCallback, useEffect, useState } from 'react'

packages/next/src/views/Version/SelectLocales/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { ReactSelect, useLocale, useTranslation } from '@payloadcms/ui/client'
+import { ReactSelect, useLocale, useTranslation } from '@payloadcms/ui'
 import React from 'react'
 
 import type { Props } from './types.js'

packages/next/src/views/Versions/buildColumns.tsx

@@ -1,7 +1,7 @@
 import type { I18n } from '@payloadcms/translations'
 import type { SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload'
 
-import { type Column, SortColumn } from '@payloadcms/ui/client'
+import { type Column, SortColumn } from '@payloadcms/ui'
 import React from 'react'
 
 import { AutosaveCell } from './cells/AutosaveCell/index.js'

packages/next/src/views/Versions/cells/AutosaveCell/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { Pill, useTableCell, useTranslation } from '@payloadcms/ui/client'
+import { Pill, useTableCell, useTranslation } from '@payloadcms/ui'
 import React, { Fragment } from 'react'
 
 export const AutosaveCell: React.FC = () => {

packages/next/src/views/Versions/cells/CreatedAt/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { useConfig, useTableCell, useTranslation } from '@payloadcms/ui/client'
+import { useConfig, useTableCell, useTranslation } from '@payloadcms/ui'
 import { formatDate } from '@payloadcms/ui/shared'
 import LinkImport from 'next/link.js'
 import React from 'react'

packages/next/src/views/Versions/cells/ID/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { useTableCell } from '@payloadcms/ui/client'
+import { useTableCell } from '@payloadcms/ui'
 import React, { Fragment } from 'react'
 
 export const IDCell: React.FC = () => {

packages/next/src/views/Versions/index.client.tsx

@@ -12,7 +12,7 @@ import {
   useDocumentInfo,
   useListQuery,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { useSearchParams } from 'next/navigation.js'
 import React from 'react'
 

packages/next/src/views/Versions/index.tsx

@@ -1,6 +1,6 @@
 import type { EditViewComponent, PaginatedDocs } from 'payload'
 
-import { Gutter, ListQueryProvider } from '@payloadcms/ui/client'
+import { Gutter, ListQueryProvider } from '@payloadcms/ui'
 import { notFound } from 'next/navigation.js'
 import { isNumber } from 'payload/shared'
 import React from 'react'

packages/payload/package.json

@@ -42,23 +42,23 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
     "./shared": {
       "import": "./src/exports/shared.ts",
-      "require": "./src/exports/shared.ts",
+      "types": "./src/exports/shared.ts",
-      "types": "./src/exports/shared.ts"
+      "default": "./src/exports/shared.ts"
     },
     "./node": {
       "import": "./src/exports/node.ts",
-      "require": "./src/exports/node.ts",
+      "types": "./src/exports/node.ts",
-      "types": "./src/exports/node.ts"
+      "default": "./src/exports/node.ts"
     },
     "./i18n/*": {
       "import": "./src/exports/i18n/*.ts",
-      "require": "./src/exports/i18n/*.ts",
+      "types": "./src/exports/i18n/*.ts",
-      "types": "./src/exports/i18n/*.ts"
+      "default": "./src/exports/i18n/*.ts"
     }
   },
   "main": "./src/index.ts",
@@ -67,13 +67,8 @@
     "payload": "bin.js"
   },
   "files": [
-    "bin.js",
     "dist",
-    "docs",
+    "bin.js"
-    "*.js",
-    "*.d.ts",
-    "!jest.config.js",
-    "!jest.components.config.js"
   ],
   "scripts": {
     "build": "rimraf .dist && rimraf tsconfig.tsbuildinfo && pnpm copyfiles && pnpm build:types && pnpm build:swc && pnpm build:esbuild",
@@ -156,23 +151,23 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
       "./node": {
         "import": "./dist/exports/node.js",
-        "require": "./dist/exports/node.js",
+        "types": "./dist/exports/node.d.ts",
-        "types": "./dist/exports/node.d.ts"
+        "default": "./dist/exports/node.js"
       },
       "./shared": {
         "import": "./dist/exports/shared.js",
-        "require": "./dist/exports/shared.js",
+        "types": "./dist/exports/shared.d.ts",
-        "types": "./dist/exports/shared.d.ts"
+        "default": "./dist/exports/shared.js"
       },
       "./i18n/*": {
         "import": "./dist/exports/i18n/*.js",
-        "require": "./dist/exports/i18n/*.js",
+        "types": "./dist/exports/i18n/*.d.ts",
-        "types": "./dist/exports/i18n/*.d.ts"
+        "default": "./dist/exports/i18n/*.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-cloud-storage/package.json

@@ -13,18 +13,38 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
     "./types": {
       "import": "./src/types.ts",
-      "require": "./src/types.ts",
+      "types": "./src/types.ts",
-      "types": "./src/types.ts"
+      "default": "./src/types.ts"
     },
-    "./*": {
+    "./utilities": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/utilities.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/utilities.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/utilities.ts"
+    },
+    "./azure": {
+      "import": "./src/exports/azure.ts",
+      "types": "./src/exports/azure.ts",
+      "default": "./src/exports/azure.ts"
+    },
+    "./gcs": {
+      "import": "./src/exports/gcs.ts",
+      "types": "./src/exports/gcs.ts",
+      "default": "./src/exports/gcs.ts"
+    },
+    "./s3": {
+      "import": "./src/exports/s3.ts",
+      "types": "./src/exports/s3.ts",
+      "default": "./src/exports/s3.ts"
+    },
+    "./vercelBlob": {
+      "import": "./src/exports/vercelBlob.ts",
+      "types": "./src/exports/vercelBlob.ts",
+      "default": "./src/exports/vercelBlob.ts"
     }
   },
   "main": "./src/index.ts",
@@ -88,18 +108,38 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
       "./types": {
         "import": "./dist/types.js",
-        "require": "./dist/types.js",
+        "types": "./dist/types.d.ts",
-        "types": "./dist/types.d.ts"
+        "default": "./dist/types.js"
       },
-      "./*": {
+      "./utilities": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/utilities.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/utilities.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/utilities.js"
+      },
+      "./azure": {
+        "import": "./dist/exports/azure.js",
+        "types": "./dist/exports/azure.d.ts",
+        "default": "./dist/exports/azure.js"
+      },
+      "./gcs": {
+        "import": "./dist/exports/gcs.js",
+        "types": "./dist/exports/gcs.d.ts",
+        "default": "./dist/exports/gcs.js"
+      },
+      "./s3": {
+        "import": "./dist/exports/s3.js",
+        "types": "./dist/exports/s3.d.ts",
+        "default": "./dist/exports/s3.js"
+      },
+      "./vercelBlob": {
+        "import": "./dist/exports/vercelBlob.js",
+        "types": "./dist/exports/vercelBlob.d.ts",
+        "default": "./dist/exports/vercelBlob.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-cloud/package.json

@@ -13,8 +13,8 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -53,8 +53,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.js",
-        "types": "./dist/index.js"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-form-builder/package.json

@@ -24,13 +24,13 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
-    "./*": {
+    "./types": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/types.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/types.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/types.ts"
     }
   },
   "main": "./src/index.ts",
@@ -72,13 +72,13 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
-      "./*": {
+      "./types": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/types.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/types.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/types.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-nested-docs/package.json

@@ -14,13 +14,13 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
-    "./*": {
+    "./types": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/types.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/types.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/types.ts"
     }
   },
   "main": "./src/index.ts",
@@ -47,13 +47,13 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
-      "./*": {
+      "./types": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/types.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/types.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/types.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-redirects/package.json

@@ -22,13 +22,13 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
-    "./*": {
+    "./types": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/types.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/types.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/types.ts"
     }
   },
   "main": "./src/index.ts",
@@ -60,13 +60,13 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
-      "./*": {
+      "./types": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/types.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/types.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/types.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-relationship-object-ids/package.json

@@ -20,8 +20,8 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -49,8 +49,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-search/package.json

@@ -26,8 +26,8 @@
     },
     "./*": {
       "import": "./src/exports/*.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/*.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/*.ts"
     }
   },
   "main": "./src/index.ts",
@@ -63,13 +63,13 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
       "./*": {
         "import": "./dist/exports/*.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/*.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/*.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-sentry/package.json

@@ -21,8 +21,8 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -66,8 +66,8 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-seo/package.json

@@ -25,10 +25,10 @@
       "types": "./src/index.tsx",
       "default": "./src/index.tsx"
     },
-    "./*": {
+    "./types": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/types.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/types.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/types.ts"
     }
   },
   "main": "./src/index.tsx",
@@ -66,13 +66,13 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
-      "./*": {
+      "./types": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/types.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/types.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/types.js"
       }
     },
     "main": "./dist/index.js",

packages/plugin-stripe/package.json

@@ -27,10 +27,10 @@
       "types": "./src/index.ts",
       "default": "./src/index.ts"
     },
-    "./*": {
+    "./types": {
-      "import": "./src/exports/*.ts",
+      "import": "./src/exports/types.ts",
-      "require": "./src/exports/*.ts",
+      "types": "./src/exports/types.ts",
-      "types": "./src/exports/*.ts"
+      "default": "./src/exports/types.ts"
     }
   },
   "main": "./src/index.ts",
@@ -75,13 +75,13 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
-      "./*": {
+      "./types": {
-        "import": "./dist/exports/*.js",
+        "import": "./dist/exports/types.js",
-        "require": "./dist/exports/*.js",
+        "types": "./dist/exports/types.d.ts",
-        "types": "./dist/exports/*.d.ts"
+        "default": "./dist/exports/types.js"
       }
     },
     "main": "./dist/index.js",

packages/richtext-lexical/package.json

@@ -15,13 +15,13 @@
   "exports": {
     ".": {
       "import": "./src/index.ts",
-      "require": "./src/index.ts",
+      "types": "./src/index.ts",
-      "types": "./src/index.ts"
+      "default": "./src/index.ts"
     },
     "./client": {
       "import": "./src/exports/client/index.ts",
-      "require": "./src/exports/client/index.ts",
+      "types": "./src/exports/client/index.ts",
-      "types": "./src/exports/client/index.ts"
+      "default": "./src/exports/client/index.ts"
     }
   },
   "main": "./src/index.ts",
@@ -99,13 +99,13 @@
     "exports": {
       ".": {
         "import": "./dist/index.js",
-        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts",
-        "types": "./dist/index.d.ts"
+        "default": "./dist/index.js"
       },
       "./client": {
         "import": "./dist/exports/client/index.js",
-        "require": "./dist/exports/*client/index.js",
+        "types": "./dist/exports/client/index.d.ts",
-        "types": "./dist/exports/client/index.d.ts"
+        "default": "./dist/exports/client/index.js"
       }
     },
     "main": "./dist/index.js",

packages/richtext-lexical/src/cell/index.tsx

@@ -3,7 +3,7 @@ import type { EditorConfig as LexicalEditorConfig } from 'lexical'
 import type { CellComponentProps } from 'payload'
 
 import { createHeadlessEditor } from '@lexical/headless'
-import { useClientFunctions, useTableCell } from '@payloadcms/ui/client'
+import { useClientFunctions, useTableCell } from '@payloadcms/ui'
 import { $getRoot } from 'lexical'
 import React, { useEffect, useState } from 'react'
 

packages/richtext-lexical/src/field/Field.tsx

@@ -9,7 +9,7 @@ import {
   useField,
   useFieldProps,
   withCondition,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import React, { useCallback } from 'react'
 import { ErrorBoundary } from 'react-error-boundary'
 

packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx

@@ -14,7 +14,7 @@ import {
   useDocumentInfo,
   useFormSubmitted,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import isDeepEqual from 'deep-equal'
 import { $getNodeByKey } from 'lexical'
 import React, { useCallback } from 'react'

packages/richtext-lexical/src/field/features/blocks/component/FormSavePlugin.tsx

@@ -1,7 +1,7 @@
 import type { Data, FormState } from 'payload'
 import type React from 'react'
 
-import { useAllFormFields } from '@payloadcms/ui/client'
+import { useAllFormFields } from '@payloadcms/ui'
 import { reduceFieldsToValues } from '@payloadcms/ui/shared'
 import { useEffect } from 'react'
 

packages/richtext-lexical/src/field/features/blocks/component/index.tsx

@@ -13,7 +13,7 @@ import {
   useFieldProps,
   useFormSubmitted,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { type BlockFields } from '../nodes/BlocksNode.js'

packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx

@@ -8,7 +8,7 @@ import {
   useEditDepth,
   useModal,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { $getNodeByKey, COMMAND_PRIORITY_EDITOR, createCommand } from 'lexical'
 import React, { useCallback, useEffect, useState } from 'react'
 

packages/richtext-lexical/src/field/features/createFeaturePropComponent.tsx

@@ -2,7 +2,7 @@
 
 import type React from 'react'
 
-import { useAddClientFunction, useFieldProps, useTableCell } from '@payloadcms/ui/client'
+import { useAddClientFunction, useFieldProps, useTableCell } from '@payloadcms/ui'
 
 const useLexicalFeatureProp = <T,>(featureKey: string, componentKey: string, prop: T) => {
   const { schemaPath: schemaPathFromFieldProps } = useFieldProps()

packages/richtext-lexical/src/field/features/link/drawer/index.tsx

@@ -10,7 +10,7 @@ import {
   useDocumentInfo,
   useFieldProps,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { getFormState } from '@payloadcms/ui/shared'
 import React, { useCallback, useEffect, useState } from 'react'
 import { v4 as uuid } from 'uuid'

packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx

@@ -5,13 +5,7 @@ import type { Data, FormState } from 'payload'
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
 import { $findMatchingParent, mergeRegister } from '@lexical/utils'
 import { getTranslation } from '@payloadcms/translations'
-import {
+import { formatDrawerSlug, useConfig, useEditDepth, useModal, useTranslation } from '@payloadcms/ui'
-  formatDrawerSlug,
-  useConfig,
-  useEditDepth,
-  useModal,
-  useTranslation,
-} from '@payloadcms/ui/client'
 import {
   $getSelection,
   $isLineBreakNode,

packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx

@@ -2,7 +2,7 @@
 import type { LexicalEditor } from 'lexical'
 
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
-import { useListDrawer } from '@payloadcms/ui/client'
+import { useListDrawer } from '@payloadcms/ui'
 import { $getNodeByKey, COMMAND_PRIORITY_EDITOR } from 'lexical'
 import React, { useCallback, useEffect, useState } from 'react'
 

packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx

@@ -5,13 +5,7 @@ import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext
 import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection.js'
 import { mergeRegister } from '@lexical/utils'
 import { getTranslation } from '@payloadcms/translations'
-import {
+import { Button, useConfig, useDocumentDrawer, usePayloadAPI, useTranslation } from '@payloadcms/ui'
-  Button,
-  useConfig,
-  useDocumentDrawer,
-  usePayloadAPI,
-  useTranslation,
-} from '@payloadcms/ui/client'
 import {
   $getNodeByKey,
   $getSelection,

packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx

@@ -3,7 +3,7 @@ import type { LexicalCommand } from 'lexical'
 
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
 import { $insertNodeToNearestRoot } from '@lexical/utils'
-import { useConfig } from '@payloadcms/ui/client'
+import { useConfig } from '@payloadcms/ui'
 import {
   $getPreviousSelection,
   $getSelection,

packages/richtext-lexical/src/field/features/relationship/utils/EnabledRelationshipsCondition.tsx

@@ -1,6 +1,6 @@
 import type { ClientCollectionConfig, ClientUser, VisibleEntities } from 'payload'
 
-import { useAuth, useConfig, useEntityVisibility } from '@payloadcms/ui/client'
+import { useAuth, useConfig, useEntityVisibility } from '@payloadcms/ui'
 import * as React from 'react'
 
 type Options = {

packages/richtext-lexical/src/field/features/toolbars/fixed/Toolbar/index.tsx

@@ -2,7 +2,7 @@
 import type { LexicalEditor } from 'lexical'
 
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
-import { useScrollInfo, useThrottledEffect, useTranslation } from '@payloadcms/ui/client'
+import { useScrollInfo, useThrottledEffect, useTranslation } from '@payloadcms/ui'
 import * as React from 'react'
 import { useMemo } from 'react'
 

packages/richtext-lexical/src/field/features/toolbars/shared/ToolbarDropdown/index.tsx

@@ -6,7 +6,7 @@ const baseClass = 'toolbar-popup__dropdown'
 import type { LexicalEditor } from 'lexical'
 
 import { mergeRegister } from '@lexical/utils'
-import { useTranslation } from '@payloadcms/ui/client'
+import { useTranslation } from '@payloadcms/ui'
 import { $getSelection } from 'lexical'
 
 import type { ToolbarGroupItem } from '../../types.js'

packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx

@@ -14,7 +14,7 @@ import {
   useFieldProps,
   useModal,
   useTranslation,
-} from '@payloadcms/ui/client'
+} from '@payloadcms/ui'
 import { getFormState } from '@payloadcms/ui/shared'
 import { $getNodeByKey } from 'lexical'
 import { deepCopyObject } from 'payload/shared'