From bc98567f4110e74fc9247cf573279fb7dfa29125 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Wed, 19 Jun 2024 12:36:00 -0400 Subject: [PATCH] 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 | 2 +- packages/db-mongodb/package.json | 10 +- packages/db-postgres/package.json | 24 +- packages/email-nodemailer/package.json | 8 +- packages/email-resend/package.json | 8 +- packages/graphql/package.json | 36 ++- packages/live-preview-react/package.json | 5 +- packages/live-preview-vue/package.json | 11 +- packages/live-preview/package.json | 5 +- packages/next/package.json | 68 ++++-- .../DocumentHeader/Tabs/ShouldRenderTabs.tsx | 2 +- .../DocumentHeader/Tabs/Tab/TabLink.tsx | 2 +- .../Tabs/tabs/VersionsPill/index.tsx | 2 +- .../src/elements/DocumentHeader/index.tsx | 2 +- .../src/elements/LeaveWithoutSaving/index.tsx | 9 +- .../src/elements/Nav/NavHamburger/index.tsx | 2 +- .../src/elements/Nav/NavWrapper/index.tsx | 2 +- .../next/src/elements/Nav/index.client.tsx | 2 +- packages/next/src/elements/Nav/index.tsx | 2 +- packages/next/src/layouts/Root/index.tsx | 2 +- .../templates/Default/NavHamburger/index.tsx | 2 +- .../src/templates/Default/Wrapper/index.tsx | 2 +- packages/next/src/templates/Default/index.tsx | 2 +- .../next/src/utilities/getRequestTheme.ts | 2 +- .../src/views/API/LocaleSelector/index.tsx | 2 +- .../next/src/views/API/RenderJSON/index.tsx | 2 +- packages/next/src/views/API/index.client.tsx | 2 +- .../Account/Settings/LanguageSelector.tsx | 2 +- .../next/src/views/Account/Settings/index.tsx | 2 +- .../src/views/Account/ToggleTheme/index.tsx | 2 +- packages/next/src/views/Account/index.tsx | 6 +- .../views/CreateFirstUser/index.client.tsx | 2 +- .../src/views/Dashboard/Default/index.tsx | 2 +- packages/next/src/views/Dashboard/index.tsx | 2 +- packages/next/src/views/Document/index.tsx | 2 +- .../src/views/Edit/Default/Auth/APIKey.tsx | 2 +- .../src/views/Edit/Default/Auth/index.tsx | 2 +- .../Edit/Default/SetDocumentStepNav/index.tsx | 2 +- .../Edit/Default/SetDocumentTitle/index.tsx | 2 +- .../next/src/views/Edit/Default/index.tsx | 2 +- packages/next/src/views/Edit/index.client.tsx | 2 +- .../ForgotPasswordForm/index.tsx | 4 +- .../next/src/views/ForgotPassword/index.tsx | 2 +- .../next/src/views/List/Default/index.tsx | 2 +- packages/next/src/views/List/Default/types.ts | 2 +- packages/next/src/views/List/index.tsx | 2 +- .../src/views/LivePreview/Device/index.tsx | 2 +- .../src/views/LivePreview/Preview/index.tsx | 2 +- .../LivePreview/Toolbar/Controls/index.tsx | 9 +- .../src/views/LivePreview/Toolbar/index.tsx | 2 +- .../src/views/LivePreview/index.client.tsx | 2 +- .../src/views/LivePreview/usePopupWindow.ts | 2 +- .../next/src/views/Login/LoginForm/index.tsx | 2 +- .../next/src/views/Logout/LogoutClient.tsx | 2 +- .../next/src/views/NotFound/index.client.tsx | 2 +- packages/next/src/views/NotFound/index.tsx | 2 +- .../src/views/ResetPassword/index.client.tsx | 2 +- .../next/src/views/ResetPassword/index.tsx | 2 +- .../next/src/views/Unauthorized/index.tsx | 2 +- .../src/views/Version/Default/SetStepNav.tsx | 2 +- .../next/src/views/Version/Default/index.tsx | 2 +- .../fields/Relationship/index.tsx | 2 +- .../RenderFieldsToDiff/fields/Tabs/index.tsx | 2 +- .../next/src/views/Version/Restore/index.tsx | 2 +- .../views/Version/SelectComparison/index.tsx | 2 +- .../src/views/Version/SelectLocales/index.tsx | 2 +- .../next/src/views/Versions/buildColumns.tsx | 2 +- .../Versions/cells/AutosaveCell/index.tsx | 2 +- .../views/Versions/cells/CreatedAt/index.tsx | 2 +- .../src/views/Versions/cells/ID/index.tsx | 2 +- .../next/src/views/Versions/index.client.tsx | 2 +- packages/next/src/views/Versions/index.tsx | 2 +- packages/payload/package.json | 39 ++- packages/plugin-cloud-storage/package.json | 72 ++++-- packages/plugin-cloud/package.json | 8 +- packages/plugin-form-builder/package.json | 24 +- packages/plugin-nested-docs/package.json | 24 +- packages/plugin-redirects/package.json | 24 +- .../package.json | 8 +- packages/plugin-search/package.json | 12 +- packages/plugin-sentry/package.json | 8 +- packages/plugin-seo/package.json | 20 +- packages/plugin-stripe/package.json | 20 +- packages/richtext-lexical/package.json | 16 +- packages/richtext-lexical/src/cell/index.tsx | 2 +- packages/richtext-lexical/src/field/Field.tsx | 2 +- .../blocks/component/BlockContent.tsx | 2 +- .../blocks/component/FormSavePlugin.tsx | 2 +- .../field/features/blocks/component/index.tsx | 2 +- .../field/features/blocks/drawer/index.tsx | 2 +- .../features/createFeaturePropComponent.tsx | 2 +- .../src/field/features/link/drawer/index.tsx | 2 +- .../floatingLinkEditor/LinkEditor/index.tsx | 8 +- .../features/relationship/drawer/index.tsx | 2 +- .../components/RelationshipComponent.tsx | 8 +- .../features/relationship/plugins/index.tsx | 2 +- .../utils/EnabledRelationshipsCondition.tsx | 2 +- .../features/toolbars/fixed/Toolbar/index.tsx | 2 +- .../toolbars/shared/ToolbarDropdown/index.tsx | 2 +- .../component/ExtraFieldsDrawer/index.tsx | 2 +- .../field/features/upload/component/index.tsx | 2 +- .../field/features/upload/drawer/index.tsx | 2 +- .../field/features/upload/plugin/index.tsx | 2 +- packages/richtext-lexical/src/field/index.tsx | 2 +- .../src/field/lexical/LexicalEditor.tsx | 2 +- .../field/lexical/plugins/SlashMenu/index.tsx | 2 +- .../src/useLexicalFeature.tsx | 2 +- packages/richtext-slate/package.json | 8 +- packages/richtext-slate/src/cell/index.tsx | 2 +- .../richtext-slate/src/field/RichText.tsx | 2 +- .../src/field/elements/Button.tsx | 2 +- .../EnabledRelationshipsCondition.tsx | 2 +- .../src/field/elements/link/Button/index.tsx | 8 +- .../src/field/elements/link/Element/index.tsx | 2 +- .../field/elements/link/LinkDrawer/index.tsx | 2 +- .../elements/relationship/Button/index.tsx | 2 +- .../elements/relationship/Element/index.tsx | 2 +- .../field/elements/upload/Button/index.tsx | 2 +- .../upload/Element/UploadDrawer/index.tsx | 2 +- .../field/elements/upload/Element/index.tsx | 2 +- packages/richtext-slate/src/field/index.tsx | 2 +- .../src/utilities/useSlatePlugin.tsx | 2 +- packages/storage-azure/package.json | 8 +- packages/storage-gcs/package.json | 8 +- packages/storage-s3/package.json | 8 +- packages/storage-uploadthing/package.json | 8 +- packages/storage-vercel-blob/package.json | 8 +- packages/translations/package.json | 31 +-- packages/ui/package.json | 231 ++++++++---------- test/tsconfig.json | 3 +- tsconfig.json | 2 +- 131 files changed, 520 insertions(+), 483 deletions(-) diff --git a/app/(payload)/layout.tsx b/app/(payload)/layout.tsx index eb272a6d57..57c61a3a67 100644 --- a/app/(payload)/layout.tsx +++ b/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' diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index bbfb8f2139..faee532846 100644 --- a/packages/db-mongodb/package.json +++ b/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", diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json index 84d210eff3..a8385bef42 100644 --- a/packages/db-postgres/package.json +++ b/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", diff --git a/packages/email-nodemailer/package.json b/packages/email-nodemailer/package.json index 626c3f0557..22decaa356 100644 --- a/packages/email-nodemailer/package.json +++ b/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", diff --git a/packages/email-resend/package.json b/packages/email-resend/package.json index 4199ce33a1..a64e08be31 100644 --- a/packages/email-resend/package.json +++ b/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", diff --git a/packages/graphql/package.json b/packages/graphql/package.json index f09b34198f..61d6f6898e 100644 --- a/packages/graphql/package.json +++ b/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" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./types": { + "import": "./src/exports/types.ts", + "types": "./src/exports/types.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./types": { + "import": "./dist/exports/types.js", + "types": "./dist/exports/types.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", diff --git a/packages/live-preview-react/package.json b/packages/live-preview-react/package.json index 8214655e2b..0aadd9c4f1 100644 --- a/packages/live-preview-react/package.json +++ b/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", diff --git a/packages/live-preview-vue/package.json b/packages/live-preview-vue/package.json index 6228857ae0..af1ec87d06 100644 --- a/packages/live-preview-vue/package.json +++ b/packages/live-preview-vue/package.json @@ -13,8 +13,9 @@ "type": "module", "exports": { ".": { - "default": "./src/index.ts", - "types": "./src/index.ts" + "import": "./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", - "require": "./dist/index.js", - "types": "./dist/index.d.ts" + "default": "./dist/index.js", + "types": "./dist/index.d.ts", + "import": "./dist/index.js" } }, "main": "./dist/index.js", diff --git a/packages/live-preview/package.json b/packages/live-preview/package.json index 1801ae4ca9..54b8a47374 100644 --- a/packages/live-preview/package.json +++ b/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", diff --git a/packages/next/package.json b/packages/next/package.json index c821fd4f5a..f3a2995e77 100644 --- a/packages/next/package.json +++ b/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" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./layouts": { + "import": "./src/exports/layouts.ts", + "types": "./src/exports/layouts.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./layouts": { + "import": "./dist/exports/layouts.js", + "types": "./dist/exports/layouts.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", diff --git a/packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx b/packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx index 19abd43531..f6921acbfb 100644 --- a/packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx @@ -1,7 +1,7 @@ 'use client' import type React from 'react' -import { useDocumentInfo } from '@payloadcms/ui/client' +import { useDocumentInfo } from '@payloadcms/ui' export const ShouldRenderTabs: React.FC<{ children: React.ReactNode diff --git a/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx b/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx index a9d7a5f219..9dbc5fc35f 100644 --- a/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx +++ b/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' diff --git a/packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx index 1810e5a256..18f8125613 100644 --- a/packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx +++ b/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' diff --git a/packages/next/src/elements/DocumentHeader/index.tsx b/packages/next/src/elements/DocumentHeader/index.tsx index 496c1db8b4..f2d3fd4e0b 100644 --- a/packages/next/src/elements/DocumentHeader/index.tsx +++ b/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' diff --git a/packages/next/src/elements/LeaveWithoutSaving/index.tsx b/packages/next/src/elements/LeaveWithoutSaving/index.tsx index b96f5448c4..969063b4a3 100644 --- a/packages/next/src/elements/LeaveWithoutSaving/index.tsx +++ b/packages/next/src/elements/LeaveWithoutSaving/index.tsx @@ -1,12 +1,5 @@ 'use client' -import { - Button, - Modal, - useAuth, - useFormModified, - useModal, - useTranslation, -} from '@payloadcms/ui/client' +import { Button, Modal, useAuth, useFormModified, useModal, useTranslation } from '@payloadcms/ui' import React, { useCallback, useEffect } from 'react' import './index.scss' diff --git a/packages/next/src/elements/Nav/NavHamburger/index.tsx b/packages/next/src/elements/Nav/NavHamburger/index.tsx index e0f60d8f54..e8e550f34b 100644 --- a/packages/next/src/elements/Nav/NavHamburger/index.tsx +++ b/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<{ diff --git a/packages/next/src/elements/Nav/NavWrapper/index.tsx b/packages/next/src/elements/Nav/NavWrapper/index.tsx index fca1a5959a..c7e802dcb7 100644 --- a/packages/next/src/elements/Nav/NavWrapper/index.tsx +++ b/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' diff --git a/packages/next/src/elements/Nav/index.client.tsx b/packages/next/src/elements/Nav/index.client.tsx index 7a4879ebf5..56abf720ce 100644 --- a/packages/next/src/elements/Nav/index.client.tsx +++ b/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' diff --git a/packages/next/src/elements/Nav/index.tsx b/packages/next/src/elements/Nav/index.tsx index 7ead54cc9f..898c1699f8 100644 --- a/packages/next/src/elements/Nav/index.tsx +++ b/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' diff --git a/packages/next/src/layouts/Root/index.tsx b/packages/next/src/layouts/Root/index.tsx index d07ba9c5ad..e024760867 100644 --- a/packages/next/src/layouts/Root/index.tsx +++ b/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' diff --git a/packages/next/src/templates/Default/NavHamburger/index.tsx b/packages/next/src/templates/Default/NavHamburger/index.tsx index 5ea89cdf34..b0f97a49a6 100644 --- a/packages/next/src/templates/Default/NavHamburger/index.tsx +++ b/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 = () => { diff --git a/packages/next/src/templates/Default/Wrapper/index.tsx b/packages/next/src/templates/Default/Wrapper/index.tsx index e2c3e662a6..27378b23a8 100644 --- a/packages/next/src/templates/Default/Wrapper/index.tsx +++ b/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' diff --git a/packages/next/src/templates/Default/index.tsx b/packages/next/src/templates/Default/index.tsx index 915ce95937..7c7b21aa1a 100644 --- a/packages/next/src/templates/Default/index.tsx +++ b/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' diff --git a/packages/next/src/utilities/getRequestTheme.ts b/packages/next/src/utilities/getRequestTheme.ts index 4d7db8c8ac..74d979878a 100644 --- a/packages/next/src/utilities/getRequestTheme.ts +++ b/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 diff --git a/packages/next/src/views/API/LocaleSelector/index.tsx b/packages/next/src/views/API/LocaleSelector/index.tsx index 93d8bf7dda..a5a29755f6 100644 --- a/packages/next/src/views/API/LocaleSelector/index.tsx +++ b/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<{ diff --git a/packages/next/src/views/API/RenderJSON/index.tsx b/packages/next/src/views/API/RenderJSON/index.tsx index 9feee0111c..a933f30451 100644 --- a/packages/next/src/views/API/RenderJSON/index.tsx +++ b/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' diff --git a/packages/next/src/views/API/index.client.tsx b/packages/next/src/views/API/index.client.tsx index 9ef02ddbee..c707146c3b 100644 --- a/packages/next/src/views/API/index.client.tsx +++ b/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' diff --git a/packages/next/src/views/Account/Settings/LanguageSelector.tsx b/packages/next/src/views/Account/Settings/LanguageSelector.tsx index 710a325e77..b8a4e2e22e 100644 --- a/packages/next/src/views/Account/Settings/LanguageSelector.tsx +++ b/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<{ diff --git a/packages/next/src/views/Account/Settings/index.tsx b/packages/next/src/views/Account/Settings/index.tsx index c65b5fb0d7..ffce5ff152 100644 --- a/packages/next/src/views/Account/Settings/index.tsx +++ b/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' diff --git a/packages/next/src/views/Account/ToggleTheme/index.tsx b/packages/next/src/views/Account/ToggleTheme/index.tsx index e4ea89f84b..0dbb60c765 100644 --- a/packages/next/src/views/Account/ToggleTheme/index.tsx +++ b/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 = () => { diff --git a/packages/next/src/views/Account/index.tsx b/packages/next/src/views/Account/index.tsx index bd0129f82b..814b08f253 100644 --- a/packages/next/src/views/Account/index.tsx +++ b/packages/next/src/views/Account/index.tsx @@ -1,10 +1,6 @@ import type { AdminViewProps, ServerSideEditViewProps } from 'payload' -import { - DocumentInfoProvider, - FormQueryParamsProvider, - HydrateClientUser, -} from '@payloadcms/ui/client' +import { DocumentInfoProvider, FormQueryParamsProvider, HydrateClientUser } from '@payloadcms/ui' import { RenderCustomComponent } from '@payloadcms/ui/shared' import { notFound } from 'next/navigation.js' import React from 'react' diff --git a/packages/next/src/views/CreateFirstUser/index.client.tsx b/packages/next/src/views/CreateFirstUser/index.client.tsx index a5b8f7e277..745912f1b2 100644 --- a/packages/next/src/views/CreateFirstUser/index.client.tsx +++ b/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' diff --git a/packages/next/src/views/Dashboard/Default/index.tsx b/packages/next/src/views/Dashboard/Default/index.tsx index f044c50948..8232ce3bd6 100644 --- a/packages/next/src/views/Dashboard/Default/index.tsx +++ b/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' diff --git a/packages/next/src/views/Dashboard/index.tsx b/packages/next/src/views/Dashboard/index.tsx index 62cce01595..a122b2efb1 100644 --- a/packages/next/src/views/Dashboard/index.tsx +++ b/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' diff --git a/packages/next/src/views/Document/index.tsx b/packages/next/src/views/Document/index.tsx index 2fed6ac2f6..6da24b7bed 100644 --- a/packages/next/src/views/Document/index.tsx +++ b/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' diff --git a/packages/next/src/views/Edit/Default/Auth/APIKey.tsx b/packages/next/src/views/Edit/Default/Auth/APIKey.tsx index de4b3e40db..ce76fadd52 100644 --- a/packages/next/src/views/Edit/Default/Auth/APIKey.tsx +++ b/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' diff --git a/packages/next/src/views/Edit/Default/Auth/index.tsx b/packages/next/src/views/Edit/Default/Auth/index.tsx index 37d41226aa..533d0a44b9 100644 --- a/packages/next/src/views/Edit/Default/Auth/index.tsx +++ b/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' diff --git a/packages/next/src/views/Edit/Default/SetDocumentStepNav/index.tsx b/packages/next/src/views/Edit/Default/SetDocumentStepNav/index.tsx index 9bcd391128..bc0dceaf99 100644 --- a/packages/next/src/views/Edit/Default/SetDocumentStepNav/index.tsx +++ b/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<{ diff --git a/packages/next/src/views/Edit/Default/SetDocumentTitle/index.tsx b/packages/next/src/views/Edit/Default/SetDocumentTitle/index.tsx index 64e4479c60..6173a151c1 100644 --- a/packages/next/src/views/Edit/Default/SetDocumentTitle/index.tsx +++ b/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' diff --git a/packages/next/src/views/Edit/Default/index.tsx b/packages/next/src/views/Edit/Default/index.tsx index f853ace2c8..6f93eb1699 100644 --- a/packages/next/src/views/Edit/Default/index.tsx +++ b/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' diff --git a/packages/next/src/views/Edit/index.client.tsx b/packages/next/src/views/Edit/index.client.tsx index 656ebd5639..85769035f5 100644 --- a/packages/next/src/views/Edit/index.client.tsx +++ b/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 = () => { diff --git a/packages/next/src/views/ForgotPassword/ForgotPasswordForm/index.tsx b/packages/next/src/views/ForgotPassword/ForgotPasswordForm/index.tsx index f64017e270..a6c8f975f0 100644 --- a/packages/next/src/views/ForgotPassword/ForgotPasswordForm/index.tsx +++ b/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' diff --git a/packages/next/src/views/ForgotPassword/index.tsx b/packages/next/src/views/ForgotPassword/index.tsx index 5f8a54c972..07fcff2d5f 100644 --- a/packages/next/src/views/ForgotPassword/index.tsx +++ b/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' diff --git a/packages/next/src/views/List/Default/index.tsx b/packages/next/src/views/List/Default/index.tsx index dddbf27e9b..1c41d4ee8d 100644 --- a/packages/next/src/views/List/Default/index.tsx +++ b/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' diff --git a/packages/next/src/views/List/Default/types.ts b/packages/next/src/views/List/Default/types.ts index 3c85487854..075b7f4eda 100644 --- a/packages/next/src/views/List/Default/types.ts +++ b/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 = { diff --git a/packages/next/src/views/List/index.tsx b/packages/next/src/views/List/index.tsx index f186a10348..b32e579807 100644 --- a/packages/next/src/views/List/index.tsx +++ b/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' diff --git a/packages/next/src/views/LivePreview/Device/index.tsx b/packages/next/src/views/LivePreview/Device/index.tsx index 6a7bbf4b5f..246e5f95b8 100644 --- a/packages/next/src/views/LivePreview/Device/index.tsx +++ b/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' diff --git a/packages/next/src/views/LivePreview/Preview/index.tsx b/packages/next/src/views/LivePreview/Preview/index.tsx index 35802858b2..2fe8450413 100644 --- a/packages/next/src/views/LivePreview/Preview/index.tsx +++ b/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' diff --git a/packages/next/src/views/LivePreview/Toolbar/Controls/index.tsx b/packages/next/src/views/LivePreview/Toolbar/Controls/index.tsx index 6654ad40c0..f931328d65 100644 --- a/packages/next/src/views/LivePreview/Toolbar/Controls/index.tsx +++ b/packages/next/src/views/LivePreview/Toolbar/Controls/index.tsx @@ -2,14 +2,7 @@ import type { EditViewProps } from 'payload' -import { - ChevronIcon, - LinkIcon, - Popup, - PopupList, - XIcon, - useTranslation, -} from '@payloadcms/ui/client' +import { ChevronIcon, LinkIcon, Popup, PopupList, XIcon, useTranslation } from '@payloadcms/ui' import React from 'react' import { useLivePreviewContext } from '../../Context/context.js' diff --git a/packages/next/src/views/LivePreview/Toolbar/index.tsx b/packages/next/src/views/LivePreview/Toolbar/index.tsx index afd84f75a3..a3cf974ae5 100644 --- a/packages/next/src/views/LivePreview/Toolbar/index.tsx +++ b/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' diff --git a/packages/next/src/views/LivePreview/index.client.tsx b/packages/next/src/views/LivePreview/index.client.tsx index 6fe8c71675..2f6ea77bb4 100644 --- a/packages/next/src/views/LivePreview/index.client.tsx +++ b/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' diff --git a/packages/next/src/views/LivePreview/usePopupWindow.ts b/packages/next/src/views/LivePreview/usePopupWindow.ts index 65a360a967..1947190eec 100644 --- a/packages/next/src/views/LivePreview/usePopupWindow.ts +++ b/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 { diff --git a/packages/next/src/views/Login/LoginForm/index.tsx b/packages/next/src/views/Login/LoginForm/index.tsx index 6e612850cc..ec80a19f21 100644 --- a/packages/next/src/views/Login/LoginForm/index.tsx +++ b/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' diff --git a/packages/next/src/views/Logout/LogoutClient.tsx b/packages/next/src/views/Logout/LogoutClient.tsx index 460994b9bc..34a2044a47 100644 --- a/packages/next/src/views/Logout/LogoutClient.tsx +++ b/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' diff --git a/packages/next/src/views/NotFound/index.client.tsx b/packages/next/src/views/NotFound/index.client.tsx index 1c5a96639b..c7b09ad048 100644 --- a/packages/next/src/views/NotFound/index.client.tsx +++ b/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' diff --git a/packages/next/src/views/NotFound/index.tsx b/packages/next/src/views/NotFound/index.tsx index bbe1cd4a47..0c5a9959da 100644 --- a/packages/next/src/views/NotFound/index.tsx +++ b/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' diff --git a/packages/next/src/views/ResetPassword/index.client.tsx b/packages/next/src/views/ResetPassword/index.client.tsx index 706c894a5c..fbb930e0fc 100644 --- a/packages/next/src/views/ResetPassword/index.client.tsx +++ b/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' diff --git a/packages/next/src/views/ResetPassword/index.tsx b/packages/next/src/views/ResetPassword/index.tsx index 8ea1dad62a..eb709292e4 100644 --- a/packages/next/src/views/ResetPassword/index.tsx +++ b/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' diff --git a/packages/next/src/views/Unauthorized/index.tsx b/packages/next/src/views/Unauthorized/index.tsx index ba43211db8..bbd59ddad3 100644 --- a/packages/next/src/views/Unauthorized/index.tsx +++ b/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' diff --git a/packages/next/src/views/Version/Default/SetStepNav.tsx b/packages/next/src/views/Version/Default/SetStepNav.tsx index 277fd0471c..832e505a7a 100644 --- a/packages/next/src/views/Version/Default/SetStepNav.tsx +++ b/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' diff --git a/packages/next/src/views/Version/Default/index.tsx b/packages/next/src/views/Version/Default/index.tsx index 715e6f9b7e..fb53f2d69b 100644 --- a/packages/next/src/views/Version/Default/index.tsx +++ b/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' 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 a8cf473e10..9c5ae384ef 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx +++ b/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' 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 9e90b08089..9a87f95d25 100644 --- a/packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx +++ b/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' diff --git a/packages/next/src/views/Version/Restore/index.tsx b/packages/next/src/views/Version/Restore/index.tsx index 0fcefb1e47..c30f0367ef 100644 --- a/packages/next/src/views/Version/Restore/index.tsx +++ b/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' diff --git a/packages/next/src/views/Version/SelectComparison/index.tsx b/packages/next/src/views/Version/SelectComparison/index.tsx index f069657301..c0a806d98a 100644 --- a/packages/next/src/views/Version/SelectComparison/index.tsx +++ b/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' diff --git a/packages/next/src/views/Version/SelectLocales/index.tsx b/packages/next/src/views/Version/SelectLocales/index.tsx index ae81f06098..75e144b422 100644 --- a/packages/next/src/views/Version/SelectLocales/index.tsx +++ b/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' diff --git a/packages/next/src/views/Versions/buildColumns.tsx b/packages/next/src/views/Versions/buildColumns.tsx index 2ee2fe7cb8..50c80b8403 100644 --- a/packages/next/src/views/Versions/buildColumns.tsx +++ b/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' diff --git a/packages/next/src/views/Versions/cells/AutosaveCell/index.tsx b/packages/next/src/views/Versions/cells/AutosaveCell/index.tsx index 17a7d34c34..60c3a664b3 100644 --- a/packages/next/src/views/Versions/cells/AutosaveCell/index.tsx +++ b/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 = () => { diff --git a/packages/next/src/views/Versions/cells/CreatedAt/index.tsx b/packages/next/src/views/Versions/cells/CreatedAt/index.tsx index 9a957874a2..22b6849fca 100644 --- a/packages/next/src/views/Versions/cells/CreatedAt/index.tsx +++ b/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' diff --git a/packages/next/src/views/Versions/cells/ID/index.tsx b/packages/next/src/views/Versions/cells/ID/index.tsx index 0753b8f276..9396e1b4ba 100644 --- a/packages/next/src/views/Versions/cells/ID/index.tsx +++ b/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 = () => { diff --git a/packages/next/src/views/Versions/index.client.tsx b/packages/next/src/views/Versions/index.client.tsx index 1ce32e791b..105a7859c8 100644 --- a/packages/next/src/views/Versions/index.client.tsx +++ b/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' diff --git a/packages/next/src/views/Versions/index.tsx b/packages/next/src/views/Versions/index.tsx index 4081caff70..27d7e2d75d 100644 --- a/packages/next/src/views/Versions/index.tsx +++ b/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' diff --git a/packages/payload/package.json b/packages/payload/package.json index 9f64ff3caa..92cc1a06c2 100644 --- a/packages/payload/package.json +++ b/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", - "*.js", - "*.d.ts", - "!jest.config.js", - "!jest.components.config.js" + "bin.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", diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json index b9eea12dca..7a80c4fe41 100644 --- a/packages/plugin-cloud-storage/package.json +++ b/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" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./utilities": { + "import": "./src/exports/utilities.ts", + "types": "./src/exports/utilities.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./utilities": { + "import": "./dist/exports/utilities.js", + "types": "./dist/exports/utilities.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", diff --git a/packages/plugin-cloud/package.json b/packages/plugin-cloud/package.json index 0992a6f4c3..31cb1b8d71 100644 --- a/packages/plugin-cloud/package.json +++ b/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", diff --git a/packages/plugin-form-builder/package.json b/packages/plugin-form-builder/package.json index 9e74e30fc6..b55aaef767 100644 --- a/packages/plugin-form-builder/package.json +++ b/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" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./types": { + "import": "./src/exports/types.ts", + "types": "./src/exports/types.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./types": { + "import": "./dist/exports/types.js", + "types": "./dist/exports/types.d.ts", + "default": "./dist/exports/types.js" } }, "main": "./dist/index.js", diff --git a/packages/plugin-nested-docs/package.json b/packages/plugin-nested-docs/package.json index caf8468f4b..96a488796a 100644 --- a/packages/plugin-nested-docs/package.json +++ b/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" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./types": { + "import": "./src/exports/types.ts", + "types": "./src/exports/types.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./types": { + "import": "./dist/exports/types.js", + "types": "./dist/exports/types.d.ts", + "default": "./dist/exports/types.js" } }, "main": "./dist/index.js", diff --git a/packages/plugin-redirects/package.json b/packages/plugin-redirects/package.json index 24576b31b9..a2ce9be950 100644 --- a/packages/plugin-redirects/package.json +++ b/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" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./types": { + "import": "./src/exports/types.ts", + "types": "./src/exports/types.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./types": { + "import": "./dist/exports/types.js", + "types": "./dist/exports/types.d.ts", + "default": "./dist/exports/types.js" } }, "main": "./dist/index.js", diff --git a/packages/plugin-relationship-object-ids/package.json b/packages/plugin-relationship-object-ids/package.json index a69f352024..4345139036 100644 --- a/packages/plugin-relationship-object-ids/package.json +++ b/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", diff --git a/packages/plugin-search/package.json b/packages/plugin-search/package.json index a2e87142ff..5ee46efe23 100644 --- a/packages/plugin-search/package.json +++ b/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", diff --git a/packages/plugin-sentry/package.json b/packages/plugin-sentry/package.json index dde5728d9d..ae52156d0b 100644 --- a/packages/plugin-sentry/package.json +++ b/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", diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json index 10cf12989a..660f748981 100644 --- a/packages/plugin-seo/package.json +++ b/packages/plugin-seo/package.json @@ -25,10 +25,10 @@ "types": "./src/index.tsx", "default": "./src/index.tsx" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./types": { + "import": "./src/exports/types.ts", + "types": "./src/exports/types.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./types": { + "import": "./dist/exports/types.js", + "types": "./dist/exports/types.d.ts", + "default": "./dist/exports/types.js" } }, "main": "./dist/index.js", diff --git a/packages/plugin-stripe/package.json b/packages/plugin-stripe/package.json index 37b9113c5b..154c406046 100644 --- a/packages/plugin-stripe/package.json +++ b/packages/plugin-stripe/package.json @@ -27,10 +27,10 @@ "types": "./src/index.ts", "default": "./src/index.ts" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts", - "types": "./src/exports/*.ts" + "./types": { + "import": "./src/exports/types.ts", + "types": "./src/exports/types.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" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./types": { + "import": "./dist/exports/types.js", + "types": "./dist/exports/types.d.ts", + "default": "./dist/exports/types.js" } }, "main": "./dist/index.js", diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json index 95fa1153f0..49d1a4d519 100644 --- a/packages/richtext-lexical/package.json +++ b/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", diff --git a/packages/richtext-lexical/src/cell/index.tsx b/packages/richtext-lexical/src/cell/index.tsx index 5f865ebd0a..f9972b6d0c 100644 --- a/packages/richtext-lexical/src/cell/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/Field.tsx b/packages/richtext-lexical/src/field/Field.tsx index 05ccf18c8d..be44c2fbec 100644 --- a/packages/richtext-lexical/src/field/Field.tsx +++ b/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' 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 bf8fd4df3b..bc7fc851fb 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/blocks/component/FormSavePlugin.tsx b/packages/richtext-lexical/src/field/features/blocks/component/FormSavePlugin.tsx index bee78880bc..d0b87adc2c 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/FormSavePlugin.tsx +++ b/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' 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 215b6c52ae..661d123b7d 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx b/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx index a368007cf1..face1f8581 100644 --- a/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/createFeaturePropComponent.tsx b/packages/richtext-lexical/src/field/features/createFeaturePropComponent.tsx index 7c0e022466..02ca388503 100644 --- a/packages/richtext-lexical/src/field/features/createFeaturePropComponent.tsx +++ b/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 = (featureKey: string, componentKey: string, prop: T) => { const { schemaPath: schemaPathFromFieldProps } = useFieldProps() diff --git a/packages/richtext-lexical/src/field/features/link/drawer/index.tsx b/packages/richtext-lexical/src/field/features/link/drawer/index.tsx index 07f9866729..3d0f7759e3 100644 --- a/packages/richtext-lexical/src/field/features/link/drawer/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx index 4a46b5aef9..38cc318dec 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx +++ b/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 { - formatDrawerSlug, - useConfig, - useEditDepth, - useModal, - useTranslation, -} from '@payloadcms/ui/client' +import { formatDrawerSlug, useConfig, useEditDepth, useModal, useTranslation } from '@payloadcms/ui' import { $getSelection, $isLineBreakNode, diff --git a/packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx b/packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx index 226ea2c474..9821966fe3 100644 --- a/packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx b/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx index f0dfd8d1d7..20d4b4e18c 100644 --- a/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx +++ b/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 { - Button, - useConfig, - useDocumentDrawer, - usePayloadAPI, - useTranslation, -} from '@payloadcms/ui/client' +import { Button, useConfig, useDocumentDrawer, usePayloadAPI, useTranslation } from '@payloadcms/ui' import { $getNodeByKey, $getSelection, diff --git a/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx b/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx index fffcc07c3b..14040ebb7c 100644 --- a/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx +++ b/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, diff --git a/packages/richtext-lexical/src/field/features/relationship/utils/EnabledRelationshipsCondition.tsx b/packages/richtext-lexical/src/field/features/relationship/utils/EnabledRelationshipsCondition.tsx index af0f478e9f..75d894fa0a 100644 --- a/packages/richtext-lexical/src/field/features/relationship/utils/EnabledRelationshipsCondition.tsx +++ b/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 = { diff --git a/packages/richtext-lexical/src/field/features/toolbars/fixed/Toolbar/index.tsx b/packages/richtext-lexical/src/field/features/toolbars/fixed/Toolbar/index.tsx index 5cf9b53c4c..09e3cc344a 100644 --- a/packages/richtext-lexical/src/field/features/toolbars/fixed/Toolbar/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/toolbars/shared/ToolbarDropdown/index.tsx b/packages/richtext-lexical/src/field/features/toolbars/shared/ToolbarDropdown/index.tsx index fd8fca4a7d..653568f0ea 100644 --- a/packages/richtext-lexical/src/field/features/toolbars/shared/ToolbarDropdown/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx b/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx index 1d8f3d6209..5e5a74bada 100644 --- a/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx +++ b/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' diff --git a/packages/richtext-lexical/src/field/features/upload/component/index.tsx b/packages/richtext-lexical/src/field/features/upload/component/index.tsx index 71072b1055..c34a422b37 100644 --- a/packages/richtext-lexical/src/field/features/upload/component/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/component/index.tsx @@ -14,7 +14,7 @@ import { useDrawerSlug, usePayloadAPI, useTranslation, -} from '@payloadcms/ui/client' +} from '@payloadcms/ui' import { $getNodeByKey, $getSelection, diff --git a/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx b/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx index 750d9ab4e5..3ede35443a 100644 --- a/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/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' diff --git a/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx b/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx index 5f225328d8..a8158110fd 100644 --- a/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx @@ -3,7 +3,7 @@ import type { LexicalCommand } from 'lexical' import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { $insertNodeToNearestRoot, mergeRegister } from '@lexical/utils' -import { useConfig } from '@payloadcms/ui/client' +import { useConfig } from '@payloadcms/ui' import { $getPreviousSelection, $getSelection, diff --git a/packages/richtext-lexical/src/field/index.tsx b/packages/richtext-lexical/src/field/index.tsx index f5541d7265..b167e68bb1 100644 --- a/packages/richtext-lexical/src/field/index.tsx +++ b/packages/richtext-lexical/src/field/index.tsx @@ -2,7 +2,7 @@ import type { FormFieldBase } from '@payloadcms/ui/fields/shared' import type { EditorConfig as LexicalEditorConfig } from 'lexical' -import { ShimmerEffect, useClientFunctions, useFieldProps } from '@payloadcms/ui/client' +import { ShimmerEffect, useClientFunctions, useFieldProps } from '@payloadcms/ui' import React, { Suspense, lazy, useEffect, useState } from 'react' import type { GeneratedFeatureProviderComponent, LexicalFieldAdminProps } from '../types.js' diff --git a/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx b/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx index 599ad066f2..e305ff2282 100644 --- a/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx +++ b/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx @@ -5,7 +5,7 @@ import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin.js' import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin.js' import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin.js' import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin.js' -import { useTranslation } from '@payloadcms/ui/client' +import { useTranslation } from '@payloadcms/ui' import { BLUR_COMMAND, COMMAND_PRIORITY_LOW, FOCUS_COMMAND } from 'lexical' import * as React from 'react' import { useEffect, useState } from 'react' diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx index 1fe5d7056d..7c8f526f10 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx @@ -2,7 +2,7 @@ import type { TextNode } from 'lexical' import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' -import { useTranslation } from '@payloadcms/ui/client' +import { useTranslation } from '@payloadcms/ui' import { useCallback, useMemo, useState } from 'react' import * as React from 'react' import * as ReactDOM from 'react-dom' diff --git a/packages/richtext-lexical/src/useLexicalFeature.tsx b/packages/richtext-lexical/src/useLexicalFeature.tsx index f8aea3d5a3..4a76f3a969 100644 --- a/packages/richtext-lexical/src/useLexicalFeature.tsx +++ b/packages/richtext-lexical/src/useLexicalFeature.tsx @@ -1,6 +1,6 @@ 'use client' -import { useAddClientFunction, useFieldProps, useTableCell } from '@payloadcms/ui/client' +import { useAddClientFunction, useFieldProps, useTableCell } from '@payloadcms/ui' import type { FeatureProviderClient } from './field/features/types.js' diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json index 1aff315b4d..a6d000b80b 100644 --- a/packages/richtext-slate/package.json +++ b/packages/richtext-slate/package.json @@ -14,8 +14,8 @@ "exports": { ".": { "import": "./src/index.tsx", - "require": "./src/index.tsx", - "types": "./src/index.tsx" + "types": "./src/index.tsx", + "default": "./src/index.tsx" } }, "main": "./src/index.tsx", @@ -60,8 +60,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", diff --git a/packages/richtext-slate/src/cell/index.tsx b/packages/richtext-slate/src/cell/index.tsx index 67bf711a29..aa2ce9f4ce 100644 --- a/packages/richtext-slate/src/cell/index.tsx +++ b/packages/richtext-slate/src/cell/index.tsx @@ -1,7 +1,7 @@ 'use client' import type { DefaultCellComponentProps } from 'payload' -import { useTableCell } from '@payloadcms/ui/client' +import { useTableCell } from '@payloadcms/ui' import React from 'react' export const RichTextCell: React.FC> = () => { diff --git a/packages/richtext-slate/src/field/RichText.tsx b/packages/richtext-slate/src/field/RichText.tsx index 4f2d72dca9..8a146c5859 100644 --- a/packages/richtext-slate/src/field/RichText.tsx +++ b/packages/richtext-slate/src/field/RichText.tsx @@ -16,7 +16,7 @@ import { useFieldProps, useTranslation, withCondition, -} from '@payloadcms/ui/client' +} from '@payloadcms/ui' import { isHotkey } from 'is-hotkey' import React, { useCallback, useEffect, useMemo, useRef } from 'react' import { Node, Element as SlateElement, Text, Transforms, createEditor } from 'slate' diff --git a/packages/richtext-slate/src/field/elements/Button.tsx b/packages/richtext-slate/src/field/elements/Button.tsx index 3c00ff0e77..cb931302ba 100644 --- a/packages/richtext-slate/src/field/elements/Button.tsx +++ b/packages/richtext-slate/src/field/elements/Button.tsx @@ -1,7 +1,7 @@ 'use client' import type { ElementType } from 'react' -import { Tooltip } from '@payloadcms/ui/client' +import { Tooltip } from '@payloadcms/ui' import React, { useCallback, useState } from 'react' import { useSlate } from 'slate-react' diff --git a/packages/richtext-slate/src/field/elements/EnabledRelationshipsCondition.tsx b/packages/richtext-slate/src/field/elements/EnabledRelationshipsCondition.tsx index 7ce7e3e2d4..9e46db04ec 100644 --- a/packages/richtext-slate/src/field/elements/EnabledRelationshipsCondition.tsx +++ b/packages/richtext-slate/src/field/elements/EnabledRelationshipsCondition.tsx @@ -2,7 +2,7 @@ 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 = { diff --git a/packages/richtext-slate/src/field/elements/link/Button/index.tsx b/packages/richtext-slate/src/field/elements/link/Button/index.tsx index 50b5e21a8b..b121129792 100644 --- a/packages/richtext-slate/src/field/elements/link/Button/index.tsx +++ b/packages/richtext-slate/src/field/elements/link/Button/index.tsx @@ -2,13 +2,7 @@ import type { FormState } from 'payload' -import { - useConfig, - useDrawerSlug, - useFieldProps, - useModal, - useTranslation, -} from '@payloadcms/ui/client' +import { useConfig, useDrawerSlug, useFieldProps, useModal, useTranslation } from '@payloadcms/ui' import { getFormState, reduceFieldsToValues } from '@payloadcms/ui/shared' import React, { Fragment, useState } from 'react' import { Editor, Range, Transforms } from 'slate' diff --git a/packages/richtext-slate/src/field/elements/link/Element/index.tsx b/packages/richtext-slate/src/field/elements/link/Element/index.tsx index 26ccb22319..bf7b91cfdf 100644 --- a/packages/richtext-slate/src/field/elements/link/Element/index.tsx +++ b/packages/richtext-slate/src/field/elements/link/Element/index.tsx @@ -13,7 +13,7 @@ import { useLocale, useModal, useTranslation, -} from '@payloadcms/ui/client' +} from '@payloadcms/ui' import { getFormState, reduceFieldsToValues } from '@payloadcms/ui/shared' import { deepCopyObject } from 'payload/shared' import React, { useCallback, useEffect, useState } from 'react' diff --git a/packages/richtext-slate/src/field/elements/link/LinkDrawer/index.tsx b/packages/richtext-slate/src/field/elements/link/LinkDrawer/index.tsx index 4faef5c73c..394157c6ce 100644 --- a/packages/richtext-slate/src/field/elements/link/LinkDrawer/index.tsx +++ b/packages/richtext-slate/src/field/elements/link/LinkDrawer/index.tsx @@ -13,7 +13,7 @@ import { useFieldProps, useHotkey, useTranslation, -} from '@payloadcms/ui/client' +} from '@payloadcms/ui' import { getFormState } from '@payloadcms/ui/shared' import React, { useCallback, useRef } from 'react' diff --git a/packages/richtext-slate/src/field/elements/relationship/Button/index.tsx b/packages/richtext-slate/src/field/elements/relationship/Button/index.tsx index ff92534e4a..9592d5ade9 100644 --- a/packages/richtext-slate/src/field/elements/relationship/Button/index.tsx +++ b/packages/richtext-slate/src/field/elements/relationship/Button/index.tsx @@ -1,6 +1,6 @@ 'use client' -import { useListDrawer, useTranslation } from '@payloadcms/ui/client' +import { useListDrawer, useTranslation } from '@payloadcms/ui' import React, { Fragment, useCallback, useEffect, useState } from 'react' import { ReactEditor, useSlate } from 'slate-react' diff --git a/packages/richtext-slate/src/field/elements/relationship/Element/index.tsx b/packages/richtext-slate/src/field/elements/relationship/Element/index.tsx index 34dd60f378..e106be7866 100644 --- a/packages/richtext-slate/src/field/elements/relationship/Element/index.tsx +++ b/packages/richtext-slate/src/field/elements/relationship/Element/index.tsx @@ -10,7 +10,7 @@ import { useListDrawer, usePayloadAPI, useTranslation, -} from '@payloadcms/ui/client' +} from '@payloadcms/ui' import React, { useCallback, useReducer, useState } from 'react' import { Transforms } from 'slate' import { ReactEditor, useFocused, useSelected, useSlateStatic } from 'slate-react' diff --git a/packages/richtext-slate/src/field/elements/upload/Button/index.tsx b/packages/richtext-slate/src/field/elements/upload/Button/index.tsx index 1ee5ba4280..c132a711e3 100644 --- a/packages/richtext-slate/src/field/elements/upload/Button/index.tsx +++ b/packages/richtext-slate/src/field/elements/upload/Button/index.tsx @@ -1,6 +1,6 @@ 'use client' -import { useListDrawer, useTranslation } from '@payloadcms/ui/client' +import { useListDrawer, useTranslation } from '@payloadcms/ui' import React, { Fragment, useCallback } from 'react' import { ReactEditor, useSlate } from 'slate-react' diff --git a/packages/richtext-slate/src/field/elements/upload/Element/UploadDrawer/index.tsx b/packages/richtext-slate/src/field/elements/upload/Element/UploadDrawer/index.tsx index a93c838a92..3c2f10b4a9 100644 --- a/packages/richtext-slate/src/field/elements/upload/Element/UploadDrawer/index.tsx +++ b/packages/richtext-slate/src/field/elements/upload/Element/UploadDrawer/index.tsx @@ -14,7 +14,7 @@ import { useLocale, useModal, useTranslation, -} from '@payloadcms/ui/client' +} from '@payloadcms/ui' import { type FormProps } from '@payloadcms/ui/forms/Form' import { RenderFields } from '@payloadcms/ui/forms/RenderFields' import { getFormState } from '@payloadcms/ui/shared' diff --git a/packages/richtext-slate/src/field/elements/upload/Element/index.tsx b/packages/richtext-slate/src/field/elements/upload/Element/index.tsx index 76fbabc31a..64a908422f 100644 --- a/packages/richtext-slate/src/field/elements/upload/Element/index.tsx +++ b/packages/richtext-slate/src/field/elements/upload/Element/index.tsx @@ -13,7 +13,7 @@ import { useListDrawer, usePayloadAPI, useTranslation, -} from '@payloadcms/ui/client' +} from '@payloadcms/ui' import { File } from '@payloadcms/ui/graphics/File' import React, { useCallback, useReducer, useState } from 'react' import { Transforms } from 'slate' diff --git a/packages/richtext-slate/src/field/index.tsx b/packages/richtext-slate/src/field/index.tsx index 859c9a1625..36f8c70cd5 100644 --- a/packages/richtext-slate/src/field/index.tsx +++ b/packages/richtext-slate/src/field/index.tsx @@ -2,7 +2,7 @@ import type { FormFieldBase } from '@payloadcms/ui/fields/shared' -import { ShimmerEffect, useClientFunctions, useFieldProps } from '@payloadcms/ui/client' +import { ShimmerEffect, useClientFunctions, useFieldProps } from '@payloadcms/ui' import React, { Suspense, lazy, useEffect, useState } from 'react' import type { RichTextPlugin } from '../types.js' diff --git a/packages/richtext-slate/src/utilities/useSlatePlugin.tsx b/packages/richtext-slate/src/utilities/useSlatePlugin.tsx index f12459f660..03629268ab 100644 --- a/packages/richtext-slate/src/utilities/useSlatePlugin.tsx +++ b/packages/richtext-slate/src/utilities/useSlatePlugin.tsx @@ -1,6 +1,6 @@ import type { Editor } from 'slate' -import { useAddClientFunction, useFieldProps } from '@payloadcms/ui/client' +import { useAddClientFunction, useFieldProps } from '@payloadcms/ui' type Plugin = (editor: Editor) => Editor diff --git a/packages/storage-azure/package.json b/packages/storage-azure/package.json index 7c4dde6174..d60cbc25ad 100644 --- a/packages/storage-azure/package.json +++ b/packages/storage-azure/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", @@ -51,8 +51,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", diff --git a/packages/storage-gcs/package.json b/packages/storage-gcs/package.json index 1c76aa5df5..16a56f42ad 100644 --- a/packages/storage-gcs/package.json +++ b/packages/storage-gcs/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", diff --git a/packages/storage-s3/package.json b/packages/storage-s3/package.json index 44b1ec7350..c0a2c2c58f 100644 --- a/packages/storage-s3/package.json +++ b/packages/storage-s3/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", @@ -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", diff --git a/packages/storage-uploadthing/package.json b/packages/storage-uploadthing/package.json index e8266ba1f4..fe3b80af79 100644 --- a/packages/storage-uploadthing/package.json +++ b/packages/storage-uploadthing/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", diff --git a/packages/storage-vercel-blob/package.json b/packages/storage-vercel-blob/package.json index 385b151a42..47fcfee773 100644 --- a/packages/storage-vercel-blob/package.json +++ b/packages/storage-vercel-blob/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", diff --git a/packages/translations/package.json b/packages/translations/package.json index f7e808c7a7..1ce6ef5bb2 100644 --- a/packages/translations/package.json +++ b/packages/translations/package.json @@ -11,19 +11,22 @@ "exports": { ".": { "import": "./src/exports/index.ts", - "require": "./src/exports/index.ts" + "types": "./src/exports/index.ts", + "default": "./src/exports/index.ts" }, - "./*": { - "import": "./src/exports/*.ts", - "require": "./src/exports/*.ts" + "./all": { + "import": "./src/exports/all.ts", + "types": "./src/exports/all.ts", + "default": "./src/exports/all.ts" }, "./languages/*": { "import": "./src/languages/*.ts", - "require": "./src/languages/*.ts" + "types": "./src/languages/*.ts", + "default": "./src/languages/*.ts" } }, "main": "./src/exports/index.ts", - "types": "./src/types.ts", + "types": "./src/exports/index.ts", "files": [ "dist" ], @@ -50,18 +53,18 @@ "exports": { ".": { "import": "./dist/exports/index.js", - "require": "./dist/exports/index.js", - "types": "./dist/exports/*.d.ts" + "types": "./dist/exports/index.d.ts", + "default": "./dist/exports/index.js" }, - "./*": { - "import": "./dist/exports/*.js", - "require": "./dist/exports/*.js", - "types": "./dist/exports/*.d.ts" + "./all": { + "import": "./dist/exports/all.js", + "types": "./dist/exports/all.d.ts", + "default": "./dist/exports/all.js" }, "./languages/*": { "import": "./dist/languages/*.js", - "require": "./dist/languages/*.js", - "types": "./dist/languages/*.d.ts" + "types": "./dist/languages/*.d.ts", + "default": "./dist/languages/*.js" } }, "main": "./dist/exports/index.js", diff --git a/packages/ui/package.json b/packages/ui/package.json index 27564fac6e..3de1b4031d 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -10,78 +10,70 @@ "sideEffects": false, "type": "module", "exports": { - "./assets": { - "import": "./src/assets/index.ts", - "require": "./src/assets/index.ts", - "default": "./src/assets/index.ts", - "types": "./src/assets/index.tsx" - }, - "./client": { + ".": { "import": "./src/exports/client/index.ts", - "require": "./src/exports/client/index.ts", - "types": "./src/exports/client/index.ts" - }, - "./elements/*": { - "import": "./src/elements/*/index.tsx", - "require": "./src/elements/*/index.tsx", - "default": "./src/elements/*/index.tsx", - "types": "./src/elements/*/index.tsx" - }, - "./fields/*": { - "import": "./src/fields/*/index.tsx", - "require": "./src/fields/*/index.tsx", - "default": "./src/fields/*/index.tsx", - "types": "./src/fields/*/index.tsx" - }, - "./forms/*": { - "import": "./src/forms/*/index.tsx", - "require": "./src/forms/*/index.tsx", - "default": "./src/forms/*/index.tsx", - "types": "./src/forms/*/index.tsx" - }, - "./graphics/*": { - "import": "./src/graphics/*/index.tsx", - "require": "./src/graphics/*/index.tsx", - "default": "./src/graphics/*/index.tsx", - "types": "./src/graphics/*/index.tsx" - }, - "./hooks/*": { - "import": "./src/hooks/*.ts", - "require": "./src/hooks/*.ts", - "default": "./src/hooks/*.ts", - "types": "./src/hooks/*.ts" - }, - "./icons/*": { - "import": "./src/icons/*/index.tsx", - "require": "./src/icons/*/index.tsx", - "default": "./src/icons/*/index.tsx", - "types": "./src/icons/*/index.tsx" - }, - "./providers/*": { - "import": "./src/providers/*/index.tsx", - "require": "./src/providers/*/index.tsx", - "default": "./src/providers/*/index.tsx", - "types": "./src/providers/*/index.tsx" + "types": "./src/exports/client/index.ts", + "default": "./src/exports/client/index.ts" }, "./shared": { "import": "./src/exports/shared/index.ts", - "require": "./src/exports/shared/index.ts", - "types": "./src/exports/shared/index.ts" + "types": "./src/exports/shared/index.ts", + "default": "./src/exports/shared/index.ts" }, - "./utilities/*": { - "import": "./src/utilities/*.ts", - "require": "./src/utilities/*.ts", - "default": "./src/utilities/*.ts", - "types": "./src/utilities/*.ts" + "./assets": { + "import": "./src/assets/index.ts", + "types": "./src/assets/index.ts", + "default": "./src/assets/index.ts" }, "./scss": { "import": "./src/scss/styles.scss", - "require": "./src/scss/styles.scss", "default": "./src/scss/styles.scss" }, "./scss/app.scss": "./src/scss/app.scss", - "./styles.css": "./dist/styles.css" + "./styles.css": "./dist/styles.css", + "./elements/*": { + "import": "./src/elements/*/index.tsx", + "types": "./src/elements/*/index.tsx", + "default": "./src/elements/*/index.tsx" + }, + "./fields/*": { + "import": "./src/fields/*/index.tsx", + "types": "./src/fields/*/index.tsx", + "default": "./src/fields/*/index.tsx" + }, + "./forms/*": { + "import": "./src/forms/*/index.tsx", + "types": "./src/forms/*/index.tsx", + "default": "./src/forms/*/index.tsx" + }, + "./graphics/*": { + "import": "./src/graphics/*/index.tsx", + "types": "./src/graphics/*/index.tsx", + "default": "./src/graphics/*/index.tsx" + }, + "./hooks/*": { + "import": "./src/hooks/*.ts", + "types": "./src/hooks/*.ts", + "default": "./src/hooks/*.ts" + }, + "./icons/*": { + "import": "./src/icons/*/index.tsx", + "types": "./src/icons/*/index.tsx", + "default": "./src/icons/*/index.tsx" + }, + "./providers/*": { + "import": "./src/providers/*/index.tsx", + "types": "./src/providers/*/index.tsx", + "default": "./src/providers/*/index.tsx" + }, + "./utilities/*": { + "import": "./src/utilities/*.ts", + "types": "./src/utilities/*.ts", + "default": "./src/utilities/*.ts" + } }, + "main": "./src/exports/client/index.ts", + "types": "./src/exports/client/index.ts", "files": [ "dist" ], @@ -161,84 +153,75 @@ }, "publishConfig": { "exports": { - "./assets/*": "./dist/assets/*", - "./assets": { - "import": "./dist/assets/index.js", - "require": "./dist/assets/index.js", - "default": "./dist/assets/index.js", - "types": "./dist/assets/index.d.ts" - }, - "./client": { + ".": { "import": "./dist/exports/client/index.js", - "require": "./dist/exports/client/index.js", - "types": "./dist/exports/client/index.d.ts" - }, - "./elements/*": { - "import": "./dist/elements/*/index.js", - "require": "./dist/elements/*/index.js", - "default": "./dist/elements/*/index.js", - "types": "./dist/elements/*/index.d.ts" - }, - "./fields/*": { - "import": "./dist/fields/*/index.js", - "require": "./dist/fields/*/index.js", - "default": "./dist/fields/*/index.js", - "types": "./dist/fields/*/index.d.ts" - }, - "./forms/*": { - "import": "./dist/forms/*/index.js", - "require": "./dist/forms/*/index.js", - "default": "./dist/forms/*/index.js", - "types": "./dist/forms/*/index.d.ts" - }, - "./graphics/*": { - "import": "./dist/graphics/*/index.js", - "require": "./dist/graphics/*/index.js", - "default": "./dist/graphics/*/index.js", - "types": "./dist/graphics/*/index.d.ts" - }, - "./hooks/*": { - "import": "./dist/hooks/*.js", - "require": "./dist/hooks/*.js", - "default": "./dist/hooks/*.js", - "types": "./dist/hooks/*.d.ts" - }, - "./icons/*": { - "import": "./dist/icons/*/index.js", - "require": "./dist/icons/*/index.js", - "default": "./dist/icons/*/index.js", - "types": "./dist/icons/*/index.d.ts" - }, - "./providers/*": { - "import": "./dist/providers/*/index.js", - "require": "./dist/providers/*/index.js", - "default": "./dist/providers/*/index.js", - "types": "./dist/providers/*/index.d.ts" + "types": "./dist/exports/client/index.d.ts", + "default": "./dist/exports/client/index.js" }, "./shared": { "import": "./dist/exports/shared/index.js", - "require": "./dist/exports/shared/index.js", - "types": "./dist/exports/shared/index.d.ts" - }, - "./utilities/*": { - "import": "./dist/utilities/*.js", - "require": "./dist/utilities/*.js", - "default": "./dist/utilities/*.js", - "types": "./dist/utilities/*.d.ts" + "types": "./dist/exports/shared/index.d.ts", + "default": "./dist/exports/shared/index.js" }, "./css": { "import": "./dist/prod/styles.css", - "require": "./dist/prod/styles.css", "default": "./dist/prod/styles.css" }, "./scss": { "import": "./dist/scss/styles.scss", - "require": "./dist/scss/styles.scss", "default": "./dist/scss/styles.scss" }, "./scss/app.scss": "./dist/scss/app.scss", - "./styles.css": "./dist/styles.css" - } + "./styles.css": "./dist/styles.css", + "./assets": { + "import": "./dist/assets/index.js", + "types": "./dist/assets/index.d.ts", + "default": "./dist/assets/index.js" + }, + "./assets/*": "./dist/assets/*", + "./elements/*": { + "import": "./dist/elements/*/index.js", + "types": "./dist/elements/*/index.d.ts", + "default": "./dist/elements/*/index.js" + }, + "./fields/*": { + "import": "./dist/fields/*/index.js", + "types": "./dist/fields/*/index.d.ts", + "default": "./dist/fields/*/index.js" + }, + "./forms/*": { + "import": "./dist/forms/*/index.js", + "types": "./dist/forms/*/index.d.ts", + "default": "./dist/forms/*/index.js" + }, + "./graphics/*": { + "import": "./dist/graphics/*/index.js", + "types": "./dist/graphics/*/index.d.ts", + "default": "./dist/graphics/*/index.js" + }, + "./hooks/*": { + "import": "./dist/hooks/*.js", + "types": "./dist/hooks/*.d.ts", + "default": "./dist/hooks/*.js" + }, + "./icons/*": { + "import": "./dist/icons/*/index.js", + "types": "./dist/icons/*/index.d.ts", + "default": "./dist/icons/*/index.js" + }, + "./providers/*": { + "import": "./dist/providers/*/index.js", + "types": "./dist/providers/*/index.d.ts", + "default": "./dist/providers/*/index.js" + }, + "./utilities/*": { + "import": "./dist/utilities/*.js", + "types": "./dist/utilities/*.d.ts", + "default": "./dist/utilities/*.js" + } + }, + "main": "./dist/exports/client/index.js", + "types": "./dist/exports/client/index.d.ts" }, "overrides": { "@types/react": "npm:types-react@19.0.0-beta.2", diff --git a/test/tsconfig.json b/test/tsconfig.json index fb18812248..49a53ebf5b 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -38,10 +38,9 @@ "@payloadcms/ui/templates/*": ["../packages/ui/src/templates/*/index.tsx"], "@payloadcms/ui/utilities/*": ["../packages/ui/src/utilities/*.ts"], "@payloadcms/ui/scss": ["../packages/ui/src/scss.scss"], - "@payloadcms/ui/client": ["../packages/ui/src/exports/client/index.ts"], + "@payloadcms/ui": ["../packages/ui/src/exports/client/index.ts"], "@payloadcms/ui/server": ["../packages/ui/src/exports/shared/index.ts"], "@payloadcms/ui/scss/app.scss": ["../packages/ui/src/scss/app.scss"], - "payload/types": ["../packages/payload/src/exports/types/index.ts"], "@payloadcms/next/*": ["./packages/next/src/exports/*.ts"], "@payload-config": ["./_community/config.ts"] } diff --git a/tsconfig.json b/tsconfig.json index 822c42d3b4..324a2c8bc7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -75,7 +75,7 @@ "@payloadcms/ui/utilities/*": [ "./packages/ui/src/utilities/*.ts" ], - "@payloadcms/ui/client": [ + "@payloadcms/ui": [ "./packages/ui/src/exports/client/index.ts" ], "@payloadcms/ui/shared": [