From 9e76c8f4e31de8a3a2fa981f82ecd9e87ea9a11e Mon Sep 17 00:00:00 2001 From: Jacob Fletcher Date: Mon, 17 Jun 2024 14:25:36 -0400 Subject: [PATCH] feat!: prebundle payload, ui, richtext-lexical (#6579) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Breaking Changes ### New file import locations Exports from the `payload` package have been _significantly_ cleaned up. Now, just about everything is able to be imported from `payload` directly, rather than an assortment of subpath exports. This means that things like `import { buildConfig } from 'payload/config'` are now just imported via `import { buildConfig } from 'payload'`. The mental model is significantly simpler for developers, but you might need to update some of your imports. Payload now exposes only three exports: 1. `payload` - all types and server-only Payload code 2. `payload/shared` - utilities that can be used in either the browser or in Node environments 3. `payload/node` - heavy utilities that should only be imported in Node scripts and never be imported into bundled code like Next.js ### UI library pre-bundling With this release, we've dramatically sped up the compile time for Payload by pre-bundling our entire UI package for use inside of the Payload admin itself. There are new exports that should be used within Payload custom components: 1. `@payloadcms/ui/client` - all client components 2. `@payloadcms/ui/server` - all server components For all of your custom Payload admin UI components, you should be importing from one of these two pre-compiled barrel files rather than importing from the more deeply nested exports directly. That will keep compile times nice and speedy, and will also make sure that the bundled JS for your admin UI is kept small. For example, whereas before, if you imported the Payload `Button`, you would have imported it like this: ```ts import { Button } from '@payloadcms/ui/elements/Button' ``` Now, you would import it like this: ```ts import { Button } from '@payloadcms/ui/client' ``` This is a significant DX / performance optimization that we're pretty pumped about. However, if you are importing or re-using Payload UI components _outside_ of the Payload admin UI, for example in your own frontend apps, you can import from the individual component exports which will make sure that the bundled JS is kept to a minimum in your frontend apps. So in your own frontend, you can continue to import directly to the components that you want to consume rather than importing from the pre-compiled barrel files. Individual component exports will now come with their corresponding CSS and everything will work perfectly as-expected. ### Specific exports have changed - `'@payloadcms/ui/templates/Default'` and `'@payloadcms/ui/templates/Minimal`' are now exported from `'@payloadcms/next/templates'` - Old: `import { LogOut } from '@payloadcms/ui/icons/LogOut'` new: `import { LogOutIcon } from '@payloadcms/ui/icons/LogOut'` ## Background info In effort to make local dev as fast as possible, we need to import as few files as possible so that the compiler has less to process. One way we've achieved this in the Admin Panel was to _remove_ all .scss imports from all components in the `@payloadcms/ui` module using a build process. This stripped all `import './index.scss'` statements out of each component before injecting them into `dist`. Instead, it bundles all of the CSS into a single `main.css` file, and we import _that_ at the root of the app. While this concept is _still_ the right solution to the problem, this particular approach is not viable when using these components outside the Admin Panel, where not only does this root stylesheet not exist, but where it would also bloat your app with unused styles. Instead, we need to _keep_ these .scss imports in place so they are imported directly alongside your components, as expected. Then, we need create a _new_ build step that _separately_ compiles the components _without_ their stylesheets—this way your app can consume either as needed from the new `client` and `server` barrel files within `@payloadcms/ui`, i.e. from within `@payloadcms/next` and all other admin-specific packages and plugins. This way, all other applications will simply import using the direct file paths, just as they did before. Except now they come with stylesheets. And we've gotten a pretty awesome initial compilation performance boost. --------- Co-authored-by: James Co-authored-by: Alessio Gravili --- .gitignore | 5 + .idea/payload.iml | 1 + app/(payload)/layout.tsx | 1 + package.json | 16 +- packages/create-payload-app/package.json | 2 +- .../src/lib/wrap-next-config.ts | 2 +- .../create-payload-app/src/utils/messages.ts | 2 +- packages/create-payload-app/tsconfig.json | 2 +- packages/db-mongodb/README.md | 2 +- packages/db-mongodb/package.json | 6 +- packages/db-mongodb/src/connect.ts | 2 +- packages/db-mongodb/src/count.ts | 5 +- packages/db-mongodb/src/create.ts | 3 +- packages/db-mongodb/src/createGlobal.ts | 3 +- .../db-mongodb/src/createGlobalVersion.ts | 3 +- packages/db-mongodb/src/createMigration.ts | 4 +- packages/db-mongodb/src/createVersion.ts | 3 +- packages/db-mongodb/src/deleteMany.ts | 3 +- packages/db-mongodb/src/deleteOne.ts | 3 +- packages/db-mongodb/src/deleteVersions.ts | 3 +- packages/db-mongodb/src/destroy.ts | 2 +- packages/db-mongodb/src/find.ts | 5 +- packages/db-mongodb/src/findGlobal.ts | 5 +- packages/db-mongodb/src/findGlobalVersions.ts | 6 +- packages/db-mongodb/src/findOne.ts | 3 +- packages/db-mongodb/src/findVersions.ts | 5 +- packages/db-mongodb/src/index.ts | 5 +- packages/db-mongodb/src/init.ts | 5 +- packages/db-mongodb/src/migrateFresh.ts | 9 +- .../src/models/buildCollectionSchema.ts | 3 +- .../db-mongodb/src/models/buildGlobalModel.ts | 2 +- packages/db-mongodb/src/models/buildSchema.ts | 7 +- .../src/queries/buildAndOrConditions.ts | 3 +- packages/db-mongodb/src/queries/buildQuery.ts | 5 +- .../src/queries/buildSearchParams.ts | 8 +- .../db-mongodb/src/queries/buildSortParam.ts | 3 +- .../queries/getLocalizedSortProperty.spec.ts | 4 +- .../src/queries/getLocalizedSortProperty.ts | 7 +- .../db-mongodb/src/queries/parseParams.ts | 7 +- .../src/queries/sanitizeQueryValue.ts | 4 +- packages/db-mongodb/src/queryDrafts.ts | 5 +- .../src/transactions/beginTransaction.ts | 4 +- .../src/transactions/commitTransaction.ts | 2 +- .../src/transactions/rollbackTransaction.ts | 2 +- packages/db-mongodb/src/types.ts | 6 +- packages/db-mongodb/src/updateGlobal.ts | 3 +- .../db-mongodb/src/updateGlobalVersion.ts | 3 +- packages/db-mongodb/src/updateOne.ts | 3 +- packages/db-mongodb/src/updateVersion.ts | 3 +- .../db-mongodb/src/utilities/getDBName.ts | 2 +- .../db-mongodb/src/utilities/handleError.ts | 2 +- packages/db-postgres/README.md | 2 +- packages/db-postgres/bundle.js | 39 + packages/db-postgres/package.json | 9 +- packages/db-postgres/relationships-v2-v3.mjs | 8 +- .../scripts/renamePredefinedMigrations.ts | 1 + packages/db-postgres/src/connect.ts | 3 +- packages/db-postgres/src/count.ts | 3 +- packages/db-postgres/src/create.ts | 2 +- packages/db-postgres/src/createGlobal.ts | 3 +- .../db-postgres/src/createGlobalVersion.ts | 6 +- packages/db-postgres/src/createMigration.ts | 4 +- packages/db-postgres/src/createVersion.ts | 10 +- packages/db-postgres/src/deleteMany.ts | 3 +- packages/db-postgres/src/deleteOne.ts | 3 +- packages/db-postgres/src/deleteVersions.ts | 5 +- packages/db-postgres/src/destroy.ts | 2 +- packages/db-postgres/src/find.ts | 3 +- .../db-postgres/src/find/buildFindManyArgs.ts | 2 +- packages/db-postgres/src/find/findMany.ts | 3 +- .../db-postgres/src/find/traverseFields.ts | 4 +- packages/db-postgres/src/findGlobal.ts | 2 +- .../db-postgres/src/findGlobalVersions.ts | 5 +- packages/db-postgres/src/findOne.ts | 8 +- packages/db-postgres/src/findVersions.ts | 5 +- packages/db-postgres/src/index.ts | 5 +- packages/db-postgres/src/init.ts | 6 +- packages/db-postgres/src/migrate.ts | 11 +- packages/db-postgres/src/migrateDown.ts | 4 +- packages/db-postgres/src/migrateFresh.ts | 9 +- packages/db-postgres/src/migrateRefresh.ts | 4 +- packages/db-postgres/src/migrateReset.ts | 4 +- packages/db-postgres/src/migrateStatus.ts | 2 +- .../v2-v3/fetchAndResave/index.ts | 3 +- .../v2-v3/fetchAndResave/traverseFields.ts | 4 +- .../src/predefinedMigrations/v2-v3/index.ts | 5 +- .../v2-v3/migrateRelationships.ts | 4 +- .../v2-v3/traverseFields.ts | 4 +- .../src/queries/buildAndOrConditions.ts | 2 +- .../db-postgres/src/queries/buildQuery.ts | 2 +- .../src/queries/getTableColumnFromPath.ts | 7 +- .../db-postgres/src/queries/parseParams.ts | 6 +- .../src/queries/sanitizeQueryValue.ts | 5 +- packages/db-postgres/src/queryDrafts.ts | 5 +- packages/db-postgres/src/schema/build.ts | 2 +- .../db-postgres/src/schema/createTableName.ts | 4 +- packages/db-postgres/src/schema/idToUUID.ts | 2 +- .../db-postgres/src/schema/setColumnID.ts | 4 +- .../db-postgres/src/schema/traverseFields.ts | 6 +- .../validateExistingBlockIsIdentical.ts | 6 +- .../src/transactions/beginTransaction.ts | 2 +- .../src/transactions/commitTransaction.ts | 2 +- .../src/transactions/rollbackTransaction.ts | 2 +- .../src/transform/read/hasManyNumber.ts | 2 +- .../src/transform/read/hasManyText.ts | 2 +- .../db-postgres/src/transform/read/index.ts | 4 +- .../src/transform/read/relationship.ts | 2 +- .../src/transform/read/traverseFields.ts | 6 +- .../db-postgres/src/transform/write/array.ts | 2 +- .../db-postgres/src/transform/write/blocks.ts | 2 +- .../db-postgres/src/transform/write/index.ts | 2 +- .../src/transform/write/relationships.ts | 4 +- .../src/transform/write/traverseFields.ts | 4 +- packages/db-postgres/src/types.ts | 4 +- packages/db-postgres/src/update.ts | 2 +- packages/db-postgres/src/updateGlobal.ts | 3 +- .../db-postgres/src/updateGlobalVersion.ts | 11 +- packages/db-postgres/src/updateVersion.ts | 11 +- packages/db-postgres/src/upsertRow/index.ts | 4 +- packages/db-postgres/src/upsertRow/types.ts | 2 +- .../src/utilities/hasLocalesTable.ts | 4 +- packages/email-nodemailer/package.json | 4 +- packages/email-nodemailer/src/index.ts | 4 +- packages/email-nodemailer/tsconfig.json | 11 +- packages/email-resend/package.json | 4 +- .../email-resend/src/email-resend.spec.ts | 2 +- packages/email-resend/src/index.ts | 5 +- packages/email-resend/tsconfig.json | 12 +- packages/graphql/package.json | 4 +- packages/graphql/src/bin/generateSchema.ts | 2 +- packages/graphql/src/index.ts | 3 +- .../QueryComplexity.ts | 3 +- packages/graphql/src/resolvers/auth/access.ts | 5 +- .../src/resolvers/auth/forgotPassword.ts | 5 +- packages/graphql/src/resolvers/auth/init.ts | 3 +- packages/graphql/src/resolvers/auth/login.ts | 6 +- packages/graphql/src/resolvers/auth/logout.ts | 6 +- packages/graphql/src/resolvers/auth/me.ts | 5 +- .../graphql/src/resolvers/auth/refresh.ts | 6 +- .../src/resolvers/auth/resetPassword.ts | 6 +- packages/graphql/src/resolvers/auth/unlock.ts | 5 +- .../graphql/src/resolvers/auth/verifyEmail.ts | 5 +- .../src/resolvers/collections/count.ts | 5 +- .../src/resolvers/collections/create.ts | 6 +- .../src/resolvers/collections/delete.ts | 6 +- .../src/resolvers/collections/docAccess.ts | 11 +- .../src/resolvers/collections/duplicate.ts | 6 +- .../graphql/src/resolvers/collections/find.ts | 6 +- .../src/resolvers/collections/findByID.ts | 6 +- .../resolvers/collections/findVersionByID.ts | 6 +- .../src/resolvers/collections/findVersions.ts | 6 +- .../resolvers/collections/restoreVersion.ts | 5 +- .../src/resolvers/collections/update.ts | 6 +- .../src/resolvers/globals/docAccess.ts | 11 +- .../graphql/src/resolvers/globals/findOne.ts | 5 +- .../src/resolvers/globals/findVersionByID.ts | 5 +- .../src/resolvers/globals/findVersions.ts | 5 +- .../src/resolvers/globals/restoreVersion.ts | 5 +- .../graphql/src/resolvers/globals/update.ts | 6 +- packages/graphql/src/resolvers/types.ts | 2 +- .../schema/buildFallbackLocaleInputType.ts | 2 +- .../src/schema/buildLocaleInputType.ts | 2 +- .../src/schema/buildMutationInputType.ts | 8 +- .../graphql/src/schema/buildObjectType.ts | 9 +- .../graphql/src/schema/buildPoliciesType.ts | 4 +- .../graphql/src/schema/buildWhereInputType.ts | 6 +- .../src/schema/fieldToWhereInputSchemaMap.ts | 2 +- .../graphql/src/schema/initCollections.ts | 9 +- packages/graphql/src/schema/initGlobals.ts | 6 +- .../graphql/src/schema/isFieldNullable.ts | 4 +- .../src/schema/recursivelyBuildNestedPaths.ts | 4 +- .../graphql/src/schema/withNullableType.ts | 2 +- packages/graphql/src/schema/withOperators.ts | 4 +- .../graphql/src/utilities/formatOptions.ts | 2 +- .../groupOrTabHasRequiredSubfield.ts | 4 +- .../src/utilities/wrapCustomResolver.ts | 4 +- packages/graphql/tsconfig.json | 2 +- packages/live-preview-react/package.json | 4 +- packages/live-preview-vue/package.json | 4 +- packages/live-preview/package.json | 4 +- packages/live-preview/src/mergeData.ts | 4 +- packages/live-preview/src/traverseFields.ts | 2 +- packages/next/package.json | 6 +- packages/next/src/config.ts | 2 +- .../DocumentHeader/Tabs/ShouldRenderTabs.tsx | 2 +- .../DocumentHeader/Tabs/Tab/TabLink.tsx | 5 +- .../DocumentHeader/Tabs/Tab/index.scss | 0 .../DocumentHeader/Tabs/Tab/index.tsx | 2 +- .../DocumentHeader/Tabs/getCustomViews.ts | 3 +- .../DocumentHeader/Tabs/getViewConfig.ts | 3 +- .../elements/DocumentHeader/Tabs/index.scss | 0 .../elements/DocumentHeader/Tabs/index.tsx | 6 +- .../Tabs/tabs/VersionsPill/index.tsx | 2 +- .../DocumentHeader/Tabs/tabs/index.tsx | 2 +- .../src/elements/DocumentHeader/index.scss | 0 .../src/elements/DocumentHeader/index.tsx | 7 +- .../src/elements/LeaveWithoutSaving/index.tsx | 13 +- packages/next/src/elements/Logo/index.tsx | 34 + .../src/elements/Nav/NavHamburger/index.tsx | 4 +- .../src/elements/Nav/NavWrapper/index.scss | 0 .../src/elements/Nav/NavWrapper/index.tsx | 2 +- .../src/elements/Nav/index.client.tsx | 25 +- .../{ui => next}/src/elements/Nav/index.scss | 0 .../{ui => next}/src/elements/Nav/index.tsx | 9 +- packages/next/src/exports/templates.ts | 2 + packages/next/src/fetchAPI-multipart/index.ts | 2 +- .../fetchAPI-multipart/processMultipart.ts | 2 +- packages/next/src/layouts/Root/index.tsx | 12 +- packages/next/src/routes/graphql/handler.ts | 2 +- .../next/src/routes/graphql/playground.ts | 2 +- packages/next/src/routes/rest/auth/access.ts | 2 +- .../src/routes/rest/auth/forgotPassword.ts | 2 +- packages/next/src/routes/rest/auth/init.ts | 2 +- packages/next/src/routes/rest/auth/login.ts | 5 +- packages/next/src/routes/rest/auth/logout.ts | 3 +- packages/next/src/routes/rest/auth/me.ts | 3 +- packages/next/src/routes/rest/auth/refresh.ts | 3 +- .../src/routes/rest/auth/registerFirstUser.ts | 3 +- .../src/routes/rest/auth/resetPassword.ts | 3 +- packages/next/src/routes/rest/auth/unlock.ts | 2 +- .../next/src/routes/rest/auth/verifyEmail.ts | 2 +- .../next/src/routes/rest/buildFormState.ts | 2 +- .../next/src/routes/rest/collections/count.ts | 4 +- .../src/routes/rest/collections/create.ts | 4 +- .../src/routes/rest/collections/delete.ts | 6 +- .../src/routes/rest/collections/deleteByID.ts | 4 +- .../src/routes/rest/collections/docAccess.ts | 2 +- .../src/routes/rest/collections/duplicate.ts | 4 +- .../next/src/routes/rest/collections/find.ts | 6 +- .../src/routes/rest/collections/findByID.ts | 4 +- .../rest/collections/findVersionByID.ts | 4 +- .../routes/rest/collections/findVersions.ts | 6 +- .../src/routes/rest/collections/preview.ts | 5 +- .../routes/rest/collections/restoreVersion.ts | 4 +- .../src/routes/rest/collections/update.ts | 6 +- .../src/routes/rest/collections/updateByID.ts | 4 +- .../src/routes/rest/files/checkFileAccess.ts | 5 +- .../next/src/routes/rest/files/getFile.ts | 4 +- .../next/src/routes/rest/globals/docAccess.ts | 2 +- .../next/src/routes/rest/globals/findOne.ts | 4 +- .../routes/rest/globals/findVersionByID.ts | 4 +- .../src/routes/rest/globals/findVersions.ts | 6 +- .../next/src/routes/rest/globals/preview.ts | 5 +- .../src/routes/rest/globals/restoreVersion.ts | 4 +- .../next/src/routes/rest/globals/update.ts | 4 +- packages/next/src/routes/rest/index.ts | 4 +- packages/next/src/routes/rest/og/index.tsx | 4 +- packages/next/src/routes/rest/routeError.ts | 4 +- packages/next/src/routes/rest/types.ts | 2 +- .../rest/utilities/sanitizeCollectionID.ts | 2 +- .../templates/Default/NavHamburger/index.tsx | 4 +- .../src/templates/Default/Wrapper/index.scss | 0 .../src/templates/Default/Wrapper/index.tsx | 2 +- .../src/templates/Default/index.scss | 0 .../src/templates/Default/index.tsx | 13 +- .../src/templates/Minimal/index.scss | 0 .../src/templates/Minimal/index.tsx | 0 .../src/utilities/addDataAndFileToRequest.ts | 4 +- .../next/src/utilities/addLocalesToRequest.ts | 2 +- .../src/utilities/createPayloadRequest.ts | 5 +- .../next/src/utilities/getNextRequestI18n.ts | 2 +- packages/next/src/utilities/getPayloadHMR.ts | 3 +- .../next/src/utilities/getRequestLanguage.ts | 2 +- .../next/src/utilities/getRequestTheme.ts | 5 +- .../next/src/utilities/headersWithCors.ts | 2 +- .../src/utilities/initPage/handleAdminPage.ts | 4 +- packages/next/src/utilities/initPage/index.ts | 8 +- .../next/src/utilities/initPage/shared.ts | 2 +- packages/next/src/utilities/initPage/types.ts | 2 +- packages/next/src/utilities/meta.ts | 4 +- .../src/views/API/LocaleSelector/index.tsx | 5 +- .../next/src/views/API/RenderJSON/index.tsx | 4 +- packages/next/src/views/API/index.client.tsx | 32 +- packages/next/src/views/API/index.tsx | 2 +- .../Account/Settings/LanguageSelector.tsx | 5 +- .../next/src/views/Account/Settings/index.tsx | 4 +- .../src/views/Account/ToggleTheme/index.tsx | 6 +- packages/next/src/views/Account/index.tsx | 15 +- .../views/CreateFirstUser/index.client.tsx | 32 +- .../next/src/views/CreateFirstUser/index.tsx | 2 +- .../src/views/Dashboard/Default/index.tsx | 14 +- packages/next/src/views/Dashboard/index.tsx | 7 +- .../src/views/Document/getCustomViewByKey.tsx | 5 +- .../views/Document/getCustomViewByRoute.tsx | 3 +- .../src/views/Document/getDocumentData.tsx | 6 +- .../views/Document/getDocumentPermissions.tsx | 12 +- .../src/views/Document/getMetaBySegment.tsx | 2 +- .../src/views/Document/getViewsFromConfig.tsx | 7 +- packages/next/src/views/Document/index.tsx | 23 +- .../src/views/Edit/Default/Auth/APIKey.tsx | 20 +- .../src/views/Edit/Default/Auth/index.tsx | 31 +- .../next/src/views/Edit/Default/Auth/types.ts | 3 +- .../Edit/Default/SetDocumentStepNav/index.tsx | 18 +- .../Edit/Default/SetDocumentTitle/index.tsx | 8 +- .../next/src/views/Edit/Default/index.tsx | 33 +- packages/next/src/views/Edit/Default/types.ts | 2 +- packages/next/src/views/Edit/index.client.tsx | 4 +- packages/next/src/views/Edit/index.tsx | 2 +- .../src/views/Edit/sanitizeEditViewProps.ts | 2 +- .../ForgotPasswordForm/index.tsx | 14 +- .../next/src/views/ForgotPassword/index.tsx | 5 +- .../next/src/views/List/Default/index.tsx | 54 +- packages/next/src/views/List/Default/types.ts | 4 +- packages/next/src/views/List/index.tsx | 19 +- packages/next/src/views/List/meta.ts | 2 +- .../src/views/LivePreview/Context/context.ts | 4 +- .../src/views/LivePreview/Context/index.tsx | 5 +- .../src/views/LivePreview/Device/index.tsx | 2 +- .../src/views/LivePreview/Preview/index.tsx | 8 +- .../LivePreview/Toolbar/Controls/index.tsx | 21 +- .../src/views/LivePreview/Toolbar/index.tsx | 6 +- .../src/views/LivePreview/index.client.tsx | 35 +- packages/next/src/views/LivePreview/index.tsx | 3 +- .../src/views/LivePreview/usePopupWindow.ts | 2 +- .../next/src/views/Login/LoginForm/index.tsx | 22 +- packages/next/src/views/Login/index.tsx | 6 +- .../next/src/views/Logout/LogoutClient.tsx | 4 +- packages/next/src/views/Logout/index.tsx | 2 +- .../next/src/views/NotFound/index.client.tsx | 6 +- packages/next/src/views/NotFound/index.tsx | 6 +- packages/next/src/views/NotFound/meta.ts | 2 +- .../src/views/ResetPassword/index.client.tsx | 27 +- .../next/src/views/ResetPassword/index.tsx | 7 +- .../src/views/Root/getCustomViewByRoute.tsx | 2 +- .../next/src/views/Root/getViewFromConfig.tsx | 3 +- packages/next/src/views/Root/index.tsx | 8 +- packages/next/src/views/Root/meta.ts | 2 +- .../next/src/views/Unauthorized/index.tsx | 5 +- packages/next/src/views/Verify/index.tsx | 4 +- .../src/views/Version/Default/SetStepNav.tsx | 9 +- .../next/src/views/Version/Default/index.tsx | 20 +- .../next/src/views/Version/Default/types.ts | 3 +- .../fields/Iterable/index.tsx | 2 +- .../fields/Relationship/index.tsx | 7 +- .../fields/Select/index.tsx | 2 +- .../RenderFieldsToDiff/fields/Tabs/index.tsx | 3 +- .../RenderFieldsToDiff/fields/types.ts | 2 +- .../views/Version/RenderFieldsToDiff/types.ts | 2 +- .../next/src/views/Version/Restore/index.tsx | 11 +- .../next/src/views/Version/Restore/types.ts | 2 +- .../views/Version/SelectComparison/index.tsx | 17 +- .../views/Version/SelectComparison/types.ts | 3 +- .../src/views/Version/SelectLocales/index.tsx | 4 +- .../src/views/Version/SelectLocales/types.ts | 2 +- packages/next/src/views/Version/index.tsx | 10 +- packages/next/src/views/Version/meta.ts | 2 +- .../next/src/views/Versions/buildColumns.tsx | 9 +- .../Versions/cells/AutosaveCell/index.tsx | 4 +- .../views/Versions/cells/CreatedAt/index.tsx | 6 +- .../src/views/Versions/cells/ID/index.tsx | 2 +- .../next/src/views/Versions/index.client.tsx | 24 +- packages/next/src/views/Versions/index.tsx | 8 +- packages/next/src/views/Versions/types.ts | 6 +- packages/next/webpack.config.js | 4 +- packages/payload/auth.d.ts | 6 - packages/payload/auth.js | 6 - packages/payload/bundle.js | 75 + packages/payload/components.d.ts | 14 - packages/payload/components.js | 71 - packages/payload/components/elements.d.ts | 14 - packages/payload/components/elements.js | 104 -- packages/payload/components/fields/Array.d.ts | 2 - packages/payload/components/fields/Array.js | 6 - .../payload/components/fields/Blocks.d.ts | 9 - packages/payload/components/fields/Blocks.js | 39 - packages/payload/components/fields/Cell.d.ts | 2 - packages/payload/components/fields/Cell.js | 6 - .../payload/components/fields/Checkbox.d.ts | 2 - .../payload/components/fields/Checkbox.js | 6 - packages/payload/components/fields/Code.d.ts | 2 - packages/payload/components/fields/Code.js | 6 - .../payload/components/fields/DateTime.d.ts | 2 - .../payload/components/fields/DateTime.js | 6 - packages/payload/components/fields/Email.d.ts | 2 - packages/payload/components/fields/Email.js | 6 - packages/payload/components/fields/Group.d.ts | 2 - packages/payload/components/fields/Group.js | 6 - packages/payload/components/fields/Json.d.ts | 2 - packages/payload/components/fields/Json.js | 6 - .../payload/components/fields/Number.d.ts | 2 - packages/payload/components/fields/Number.js | 6 - .../payload/components/fields/Password.d.ts | 2 - .../payload/components/fields/Password.js | 6 - .../fields/RadioGroup/RadioInput.d.ts | 2 - .../fields/RadioGroup/RadioInput.js | 6 - .../components/fields/RadioGroup/index.d.ts | 2 - .../components/fields/RadioGroup/index.js | 6 - .../components/fields/Relationship.d.ts | 3 - .../payload/components/fields/Relationship.js | 18 - .../payload/components/fields/RichText.d.ts | 2 - .../payload/components/fields/RichText.js | 6 - packages/payload/components/fields/Row.d.ts | 2 - packages/payload/components/fields/Row.js | 6 - .../payload/components/fields/Select.d.ts | 3 - packages/payload/components/fields/Select.js | 18 - packages/payload/components/fields/Text.d.ts | 2 - packages/payload/components/fields/Text.js | 6 - .../payload/components/fields/Textarea.d.ts | 2 - .../payload/components/fields/Textarea.js | 6 - .../payload/components/fields/Upload.d.ts | 2 - packages/payload/components/fields/Upload.js | 6 - packages/payload/components/forms.d.ts | 38 - packages/payload/components/forms.js | 157 --- packages/payload/components/graphics.d.ts | 7 - packages/payload/components/graphics.js | 43 - packages/payload/components/hooks.d.ts | 15 - packages/payload/components/hooks.js | 119 -- packages/payload/components/icons.d.ts | 3 - packages/payload/components/icons.js | 27 - packages/payload/components/index.js | 27 - packages/payload/components/preferences.d.ts | 2 - packages/payload/components/preferences.js | 13 - packages/payload/components/rich-text.d.ts | 4 - packages/payload/components/rich-text.js | 31 - packages/payload/components/root.d.ts | 2 - packages/payload/components/root.js | 18 - packages/payload/components/styles.css | 1 - packages/payload/components/templates.d.ts | 3 - packages/payload/components/templates.js | 27 - packages/payload/components/utilities.d.ts | 2 - packages/payload/components/utilities.js | 2 - packages/payload/components/views/Cell.d.ts | 3 - packages/payload/components/views/Cell.js | 18 - .../payload/components/views/Dashboard.d.ts | 3 - .../payload/components/views/Dashboard.js | 18 - packages/payload/components/views/Edit.d.ts | 2 - packages/payload/components/views/Edit.js | 18 - packages/payload/components/views/List.d.ts | 3 - packages/payload/components/views/List.js | 18 - packages/payload/config.d.ts | 14 - packages/payload/config.js | 14 - packages/payload/database.d.ts | 23 - packages/payload/database.js | 22 - packages/payload/errors.d.ts | 2 - packages/payload/errors.js | 3 - packages/payload/fields/index.d.ts | 3 - packages/payload/fields/index.js | 4 - packages/payload/fields/validations.d.ts | 2 - packages/payload/fields/validations.js | 3 - packages/payload/graphql.d.ts | 3 - packages/payload/graphql.js | 27 - packages/payload/operations.d.ts | 30 - packages/payload/operations.js | 31 - packages/payload/package.json | 73 +- .../src/auth/operations/local/login.ts | 2 +- .../auth/operations/local/resetPassword.ts | 2 +- .../src/auth/operations/local/unlock.ts | 2 +- .../src/auth/operations/local/verifyEmail.ts | 2 +- .../payload/src/auth/operations/refresh.ts | 2 +- .../collections/operations/local/create.ts | 2 +- .../collections/operations/local/delete.ts | 9 +- .../src/config/shared/openGraphSchema.ts | 2 +- packages/payload/src/exports/auth.ts | 18 - packages/payload/src/exports/config.ts | 14 - packages/payload/src/exports/database.ts | 96 -- packages/payload/src/exports/errors.ts | 23 - packages/payload/src/exports/fields/index.ts | 2 - .../payload/src/exports/fields/validations.ts | 1 - packages/payload/src/exports/i18n.ts | 1 - packages/payload/src/exports/index.ts | 359 +++++ packages/payload/src/exports/node.ts | 2 +- packages/payload/src/exports/operations.ts | 32 - packages/payload/src/exports/shared.ts | 51 + packages/payload/src/exports/types.ts | 139 -- packages/payload/src/exports/uploads.ts | 1 - packages/payload/src/exports/utilities.ts | 57 - packages/payload/src/exports/versions.ts | 9 - packages/payload/src/globals/config/types.ts | 2 +- .../payload/src/utilities/getUniqueListBy.ts | 2 +- .../payload/src/utilities/telemetry/index.ts | 4 +- packages/payload/types.d.ts | 17 - packages/payload/types.js | 5 - packages/payload/utilities.d.ts | 33 - packages/payload/utilities.js | 34 - packages/payload/versions.d.ts | 9 - packages/payload/versions.js | 9 - packages/plugin-cloud-storage/README.md | 2 +- packages/plugin-cloud-storage/azure.d.ts | 4 +- packages/plugin-cloud-storage/azure.js | 4 +- packages/plugin-cloud-storage/gcs.d.ts | 4 +- packages/plugin-cloud-storage/gcs.js | 4 +- packages/plugin-cloud-storage/package.json | 4 +- packages/plugin-cloud-storage/s3.d.ts | 4 +- packages/plugin-cloud-storage/s3.js | 4 +- .../src/adapters/azure/handleDelete.ts | 2 +- .../src/adapters/azure/handleUpload.ts | 2 +- .../src/adapters/azure/staticHandler.ts | 2 +- .../src/adapters/gcs/handleUpload.ts | 2 +- .../src/adapters/gcs/staticHandler.ts | 2 +- .../src/adapters/s3/handleUpload.ts | 2 +- .../src/adapters/s3/staticHandler.ts | 2 +- .../src/adapters/vercelBlob/staticHandler.ts | 2 +- .../src/admin/fields/getFields.ts | 2 +- .../plugin-cloud-storage/src/admin/index.ts | 2 +- .../src/fields/getFields.ts | 2 +- .../src/hooks/afterDelete.ts | 2 +- .../src/hooks/afterRead.ts | 2 +- .../src/hooks/beforeChange.ts | 2 +- packages/plugin-cloud-storage/src/plugin.ts | 2 +- packages/plugin-cloud-storage/src/types.ts | 9 +- .../src/utilities/getFilePrefix.ts | 2 +- .../src/utilities/getIncomingFiles.ts | 2 +- packages/plugin-cloud/README.md | 2 +- packages/plugin-cloud/package.json | 4 +- packages/plugin-cloud/src/email.spec.ts | 4 +- .../plugin-cloud/src/hooks/afterDelete.ts | 7 +- .../plugin-cloud/src/hooks/beforeChange.ts | 7 +- .../plugin-cloud/src/hooks/uploadCache.ts | 2 +- packages/plugin-cloud/src/plugin.spec.ts | 4 +- packages/plugin-cloud/src/plugin.ts | 2 +- packages/plugin-cloud/src/staticHandler.ts | 2 +- packages/plugin-cloud/src/types.ts | 9 +- .../src/utilities/getIncomingFiles.ts | 2 +- packages/plugin-form-builder/package.json | 4 +- .../src/collections/FormSubmissions/index.ts | 2 +- .../Forms/DynamicPriceSelector.tsx | 2 +- .../src/collections/Forms/fields.ts | 2 +- .../src/collections/Forms/index.ts | 2 +- packages/plugin-form-builder/src/index.ts | 2 +- packages/plugin-form-builder/src/types.ts | 2 +- packages/plugin-nested-docs/package.json | 4 +- .../src/fields/breadcrumbs.ts | 2 +- .../plugin-nested-docs/src/fields/parent.ts | 2 +- .../src/fields/parentFilterOptions.ts | 2 +- .../src/hooks/resaveChildren.ts | 6 +- .../src/hooks/resaveSelfAfterCreate.ts | 2 +- packages/plugin-nested-docs/src/index.ts | 3 +- .../src/utilities/formatBreadcrumb.ts | 2 +- .../src/utilities/getParents.ts | 2 +- .../src/utilities/populateBreadcrumbs.ts | 2 +- packages/plugin-redirects/package.json | 4 +- packages/plugin-redirects/src/index.ts | 3 +- packages/plugin-redirects/src/types.ts | 2 +- .../plugin-relationship-object-ids/README.md | 2 +- .../package.json | 4 +- .../src/hooks/beforeChange.ts | 5 +- .../src/index.ts | 3 +- packages/plugin-search/package.json | 4 +- .../src/Search/hooks/deleteFromSearch.ts | 2 +- packages/plugin-search/src/Search/index.ts | 2 +- .../src/Search/ui/index.client.tsx | 2 +- .../plugin-search/src/Search/ui/index.tsx | 2 +- packages/plugin-search/src/index.ts | 2 +- packages/plugin-search/src/types.ts | 4 +- packages/plugin-sentry/package.json | 2 +- packages/plugin-sentry/src/plugin.spec.ts | 4 +- packages/plugin-sentry/src/plugin.ts | 2 +- packages/plugin-seo/package.json | 4 +- .../plugin-seo/src/fields/MetaDescription.tsx | 2 +- packages/plugin-seo/src/fields/MetaImage.tsx | 2 +- packages/plugin-seo/src/fields/MetaTitle.tsx | 5 +- packages/plugin-seo/src/fields/index.scss | 2 +- packages/plugin-seo/src/index.tsx | 5 +- packages/plugin-seo/src/types.ts | 2 +- packages/plugin-seo/src/ui/Overview.tsx | 2 +- packages/plugin-seo/src/ui/Preview.tsx | 2 +- packages/plugin-stripe/package.json | 6 +- packages/plugin-stripe/src/admin.ts | 2 +- .../plugin-stripe/src/fields/getFields.ts | 2 +- .../src/hooks/createNewInStripe.ts | 4 +- .../src/hooks/deleteFromStripe.ts | 4 +- .../src/hooks/syncExistingWithStripe.ts | 4 +- packages/plugin-stripe/src/index.ts | 2 +- packages/plugin-stripe/src/routes/rest.ts | 4 +- packages/plugin-stripe/src/routes/webhooks.ts | 3 +- packages/plugin-stripe/src/types.ts | 4 +- packages/plugin-stripe/src/ui/LinkToDoc.tsx | 3 +- packages/richtext-lexical/.eslintrc.cjs | 4 +- packages/richtext-lexical/.swcrc | 10 + packages/richtext-lexical/README.md | 2 +- packages/richtext-lexical/bundle.js | 105 ++ packages/richtext-lexical/components.d.ts | 6 - packages/richtext-lexical/components.js | 7 - packages/richtext-lexical/package.json | 34 +- packages/richtext-lexical/src/cell/index.tsx | 5 +- .../src/exports/client/index.ts | 73 + .../src/exports/components.ts | 13 - packages/richtext-lexical/src/field/Field.tsx | 15 +- .../src/field/bundled.css} | 0 .../field/features/align/feature.server.ts | 3 +- .../features/blockquote/feature.server.ts | 3 +- .../blocks/component/BlockContent.tsx | 24 +- .../blocks/component/FormSavePlugin.tsx | 7 +- .../field/features/blocks/component/index.tsx | 26 +- .../component/removeEmptyArrayValues.ts | 2 +- .../field/features/blocks/drawer/index.tsx | 5 +- .../field/features/blocks/feature.server.ts | 9 +- .../features/converters/html/field/index.ts | 2 +- .../features/createFeaturePropComponent.tsx | 4 +- .../debug/testRecorder/feature.server.ts | 3 +- .../features/debug/treeView/feature.server.ts | 3 +- .../features/format/bold/feature.server.ts | 3 +- .../format/inlineCode/feature.server.ts | 3 +- .../features/format/italic/feature.server.ts | 3 +- .../format/strikethrough/feature.server.ts | 3 +- .../format/subscript/feature.server.ts | 3 +- .../format/superscript/feature.server.ts | 3 +- .../format/underline/feature.server.ts | 3 +- .../field/features/heading/feature.client.tsx | 3 +- .../field/features/heading/feature.server.ts | 3 +- .../features/horizontalRule/feature.server.ts | 3 +- .../field/features/indent/feature.server.ts | 3 +- .../field/features/link/drawer/baseFields.ts | 4 +- .../src/field/features/link/drawer/index.tsx | 22 +- .../src/field/features/link/drawer/types.ts | 2 +- .../src/field/features/link/feature.server.ts | 12 +- .../src/field/features/link/nodes/LinkNode.ts | 3 +- .../features/link/plugins/autoLink/index.tsx | 2 +- .../floatingLinkEditor/LinkEditor/index.tsx | 13 +- .../plugins/floatingLinkEditor/utilities.ts | 3 +- .../src/field/features/link/validate.ts | 2 +- .../lists/checklist/feature.server.ts | 3 +- .../lists/orderedList/feature.server.ts | 3 +- .../lists/unorderedList/feature.server.ts | 3 +- .../lexicalPluginToLexical/feature.server.ts | 3 +- .../nodes/unknownConvertedNode/index.tsx | 3 +- .../slateToLexical/feature.server.ts | 3 +- .../nodes/unknownConvertedNode/index.tsx | 3 +- .../features/paragraph/feature.server.ts | 3 +- .../features/relationship/drawer/index.tsx | 2 +- .../features/relationship/feature.server.ts | 3 +- .../components/RelationshipComponent.tsx | 14 +- .../features/relationship/plugins/index.tsx | 5 +- .../utils/EnabledRelationshipsCondition.tsx | 7 +- .../toolbars/fixed/Toolbar/index.scss | 5 +- .../features/toolbars/fixed/Toolbar/index.tsx | 3 +- .../features/toolbars/fixed/feature.server.ts | 3 +- .../toolbars/inline/Toolbar/index.scss | 1 - .../toolbars/inline/feature.server.ts | 3 +- .../shared/ToolbarDropdown/DropDown.tsx | 3 +- .../shared/ToolbarDropdown/index.scss | 3 +- .../toolbars/shared/ToolbarDropdown/index.tsx | 2 +- .../src/field/features/types.ts | 15 +- .../component/ExtraFieldsDrawer/index.tsx | 24 +- .../field/features/upload/component/index.tsx | 20 +- .../field/features/upload/drawer/index.tsx | 2 +- .../field/features/upload/feature.server.ts | 8 +- .../features/upload/nodes/UploadNode.tsx | 3 +- .../field/features/upload/plugin/index.tsx | 2 +- .../src/field/features/upload/validate.ts | 2 +- .../richtext-lexical/src/field/index.scss | 1 - packages/richtext-lexical/src/field/index.tsx | 4 +- .../src/field/lexical/LexicalEditor.scss | 2 +- .../src/field/lexical/LexicalEditor.tsx | 2 +- .../src/field/lexical/LexicalProvider.tsx | 6 +- .../src/field/lexical/config/server/loader.ts | 2 +- .../field/lexical/config/server/sanitize.ts | 2 +- .../src/field/lexical/nodes/index.ts | 2 +- .../field/lexical/plugins/SlashMenu/index.tsx | 4 +- .../handles/DraggableBlockPlugin/index.scss | 11 +- .../src/field/lexical/ui/ContentEditable.scss | 30 +- .../src/generateComponentMap.tsx | 2 +- .../richtext-lexical/src/generateSchemaMap.ts | 2 +- packages/richtext-lexical/src/index.ts | 39 +- .../src/populateGraphQL/populate.ts | 4 +- .../populateLexicalPopulationPromises.ts | 2 +- .../recursivelyPopulateFieldsForGraphQL.ts | 5 +- packages/richtext-lexical/src/types.ts | 10 +- .../src/useLexicalFeature.tsx | 4 +- .../richtext-lexical/src/validate/index.ts | 2 +- .../src/validate/validateNodes.ts | 2 +- packages/richtext-slate/README.md | 2 +- packages/richtext-slate/package.json | 4 +- packages/richtext-slate/src/cell/index.tsx | 4 +- packages/richtext-slate/src/data/populate.ts | 4 +- .../src/data/recurseNestedFields.ts | 4 +- .../src/data/richTextRelationshipPromise.ts | 2 +- .../richtext-slate/src/data/validation.ts | 2 +- .../richtext-slate/src/field/RichText.tsx | 20 +- .../src/field/elements/Button.tsx | 2 +- .../EnabledRelationshipsCondition.tsx | 7 +- .../src/field/elements/indent/Button.tsx | 3 +- .../src/field/elements/link/Button/index.tsx | 10 +- .../src/field/elements/link/Element/index.tsx | 28 +- .../elements/link/LinkDrawer/baseFields.ts | 4 +- .../field/elements/link/LinkDrawer/index.tsx | 24 +- .../field/elements/link/LinkDrawer/types.ts | 2 +- .../src/field/elements/link/utilities.tsx | 3 +- .../elements/relationship/Button/index.tsx | 3 +- .../elements/relationship/Element/index.tsx | 14 +- .../field/elements/upload/Button/index.tsx | 3 +- .../upload/Element/UploadDrawer/index.tsx | 25 +- .../field/elements/upload/Element/index.tsx | 19 +- packages/richtext-slate/src/field/index.tsx | 4 +- .../src/generateComponentMap.tsx | 2 +- .../richtext-slate/src/generateSchemaMap.ts | 2 +- packages/richtext-slate/src/index.tsx | 6 +- packages/richtext-slate/src/types.ts | 3 +- .../src/utilities/useSlatePlugin.tsx | 3 +- packages/storage-azure/package.json | 4 +- packages/storage-azure/src/handleDelete.ts | 2 +- packages/storage-azure/src/handleUpload.ts | 2 +- packages/storage-azure/src/index.ts | 2 +- packages/storage-azure/src/staticHandler.ts | 2 +- packages/storage-azure/tsconfig.json | 12 +- packages/storage-gcs/package.json | 4 +- packages/storage-gcs/src/handleUpload.ts | 2 +- packages/storage-gcs/src/index.ts | 2 +- packages/storage-gcs/src/staticHandler.ts | 2 +- packages/storage-gcs/tsconfig.json | 12 +- packages/storage-s3/package.json | 4 +- packages/storage-s3/src/handleUpload.ts | 2 +- packages/storage-s3/src/index.ts | 2 +- packages/storage-s3/src/staticHandler.ts | 2 +- packages/storage-s3/tsconfig.json | 12 +- packages/storage-uploadthing/package.json | 4 +- .../storage-uploadthing/src/handleDelete.ts | 2 +- .../storage-uploadthing/src/handleUpload.ts | 2 +- packages/storage-uploadthing/src/index.ts | 3 +- .../storage-uploadthing/src/staticHandler.ts | 2 +- packages/storage-uploadthing/tsconfig.json | 12 +- packages/storage-vercel-blob/package.json | 4 +- packages/storage-vercel-blob/src/index.ts | 6 +- .../storage-vercel-blob/src/staticHandler.ts | 2 +- packages/storage-vercel-blob/tsconfig.json | 12 +- packages/translations/package.json | 2 +- packages/translations/src/utilities/init.ts | 3 +- packages/translations/tsconfig.json | 2 +- packages/ui/.swcrc | 10 - packages/ui/babel.config.cjs | 9 +- packages/ui/bundle.js | 140 ++ packages/ui/package.json | 59 +- packages/ui/src/elements/AppHeader/index.scss | 2 +- .../ui/src/elements/ArrayAction/index.tsx | 21 +- packages/ui/src/elements/Autosave/index.tsx | 4 +- packages/ui/src/elements/Button/index.tsx | 20 +- .../ui/src/elements/Collapsible/index.tsx | 8 +- .../ui/src/elements/ColumnSelector/index.tsx | 8 +- .../ui/src/elements/CopyToClipboard/index.tsx | 4 +- .../ui/src/elements/DatePicker/DatePicker.tsx | 4 +- packages/ui/src/elements/DatePicker/types.ts | 2 +- .../ui/src/elements/DeleteDocument/index.tsx | 7 +- packages/ui/src/elements/DeleteMany/index.tsx | 7 +- .../src/elements/DocumentControls/index.tsx | 3 +- .../elements/DocumentDrawer/DrawerContent.tsx | 4 +- .../ui/src/elements/DocumentFields/index.tsx | 2 +- packages/ui/src/elements/Drawer/index.tsx | 4 +- .../src/elements/DuplicateDocument/index.tsx | 7 +- packages/ui/src/elements/EditMany/index.tsx | 10 +- packages/ui/src/elements/EditUpload/index.tsx | 4 +- .../ui/src/elements/FieldSelect/index.tsx | 4 +- .../elements/FileDetails/FileMeta/index.tsx | 6 +- .../ui/src/elements/FileDetails/index.tsx | 4 +- .../elements/GenerateConfirmation/index.tsx | 5 +- packages/ui/src/elements/Hamburger/index.tsx | 4 +- .../src/elements/HydrateClientUser/index.tsx | 3 +- .../ui/src/elements/ListControls/index.tsx | 12 +- .../src/elements/ListDrawer/DrawerContent.tsx | 10 +- packages/ui/src/elements/ListDrawer/types.ts | 2 +- .../Localizer/LocalizerLabel/index.tsx | 4 +- packages/ui/src/elements/Localizer/index.tsx | 3 +- packages/ui/src/elements/Logout/index.tsx | 4 +- packages/ui/src/elements/NavGroup/index.tsx | 4 +- .../Pagination/ClickableArrow/index.tsx | 4 +- packages/ui/src/elements/PerPage/index.tsx | 9 +- packages/ui/src/elements/Pill/index.tsx | 4 +- .../ui/src/elements/PreviewSizes/index.tsx | 7 +- .../ui/src/elements/PublishMany/index.tsx | 7 +- .../ReactSelect/ClearIndicator/index.tsx | 4 +- .../ReactSelect/DropdownIndicator/index.tsx | 4 +- .../ReactSelect/MultiValueRemove/index.tsx | 4 +- .../elements/RenderCustomComponent/index.tsx | 2 +- .../ui/src/elements/SearchFilter/index.tsx | 4 +- packages/ui/src/elements/SortColumn/index.tsx | 8 +- .../ui/src/elements/SortComplex/index.tsx | 6 +- packages/ui/src/elements/Status/index.tsx | 9 +- .../ui/src/elements/StepNav/SetStepNav.tsx | 4 +- packages/ui/src/elements/StepNav/context.tsx | 22 + packages/ui/src/elements/StepNav/index.tsx | 37 +- packages/ui/src/elements/StepNav/types.ts | 11 + .../Table/DefaultCell/fields/Array/index.tsx | 2 +- .../Table/DefaultCell/fields/Blocks/index.tsx | 2 +- .../DefaultCell/fields/Checkbox/index.tsx | 2 +- .../Table/DefaultCell/fields/Code/index.tsx | 2 +- .../Table/DefaultCell/fields/Date/index.tsx | 2 +- .../Table/DefaultCell/fields/File/index.tsx | 2 +- .../Table/DefaultCell/fields/JSON/index.tsx | 2 +- .../DefaultCell/fields/Relationship/index.tsx | 2 +- .../Table/DefaultCell/fields/Select/index.tsx | 4 +- .../DefaultCell/fields/Textarea/index.tsx | 2 +- .../Table/DefaultCell/fields/index.tsx | 1 + .../src/elements/Table/DefaultCell/index.tsx | 2 +- .../Table/RelationshipProvider/index.tsx | 2 +- .../Table/RelationshipProvider/reducer.ts | 2 +- .../Table/TableCellProvider/index.tsx | 2 +- packages/ui/src/elements/Table/index.tsx | 4 +- .../TableColumns/buildColumnState.tsx | 4 +- .../ui/src/elements/TableColumns/index.tsx | 2 +- packages/ui/src/elements/Thumbnail/index.tsx | 2 +- .../ui/src/elements/ThumbnailCard/index.tsx | 2 +- packages/ui/src/elements/Tooltip/index.scss | 2 - .../ui/src/elements/UnpublishMany/index.tsx | 7 +- packages/ui/src/elements/Upload/index.tsx | 8 +- .../Condition/Relationship/index.tsx | 4 +- .../Condition/Relationship/types.ts | 3 +- .../WhereBuilder/Condition/Select/index.tsx | 2 +- .../WhereBuilder/Condition/Select/types.ts | 2 +- .../elements/WhereBuilder/Condition/index.tsx | 2 +- .../elements/WhereBuilder/Condition/types.ts | 2 +- .../ui/src/elements/WhereBuilder/index.tsx | 2 +- .../WhereBuilder/transformWhereQuery.ts | 2 +- .../ui/src/elements/WhereBuilder/types.ts | 2 +- .../WhereBuilder/validateWhereQuery.ts | 4 +- .../elements/WithServerSideProps/index.tsx | 4 +- .../ui/src/elements/withMergedProps/index.tsx | 3 +- packages/ui/src/exports/client/index.ts | 200 +++ packages/ui/src/exports/elements.ts | 50 - packages/ui/src/exports/fields.ts | 1 - packages/ui/src/exports/providers.ts | 1 - packages/ui/src/exports/shared/index.ts | 14 + packages/ui/src/fields/Array/ArrayRow.tsx | 3 +- packages/ui/src/fields/Array/index.tsx | 9 +- packages/ui/src/fields/Blocks/BlockRow.tsx | 3 +- .../Blocks/BlocksDrawer/BlockSearch/index.tsx | 4 +- .../src/fields/Blocks/BlocksDrawer/index.tsx | 2 +- packages/ui/src/fields/Blocks/RowActions.tsx | 2 +- packages/ui/src/fields/Blocks/index.tsx | 9 +- packages/ui/src/fields/Checkbox/Input.tsx | 12 +- packages/ui/src/fields/Checkbox/index.tsx | 6 +- packages/ui/src/fields/Code/index.tsx | 8 +- packages/ui/src/fields/Collapsible/index.tsx | 6 +- .../ui/src/fields/ConfirmPassword/index.tsx | 6 +- packages/ui/src/fields/DateTime/index.tsx | 8 +- packages/ui/src/fields/Email/index.tsx | 8 +- .../FieldDescription/index.scss | 0 .../FieldDescription/index.tsx | 4 +- .../{forms => fields}/FieldError/index.scss | 0 .../{forms => fields}/FieldError/index.tsx | 6 +- .../{forms => fields}/FieldLabel/index.scss | 0 .../{forms => fields}/FieldLabel/index.tsx | 6 +- packages/ui/src/fields/Group/index.tsx | 4 +- packages/ui/src/fields/JSON/index.tsx | 8 +- packages/ui/src/fields/Number/index.tsx | 10 +- packages/ui/src/fields/Password/index.tsx | 6 +- packages/ui/src/fields/Point/index.tsx | 8 +- .../ui/src/fields/RadioGroup/Radio/index.tsx | 2 +- packages/ui/src/fields/RadioGroup/index.tsx | 10 +- .../src/fields/Relationship/AddNew/index.tsx | 8 +- .../AddNew/useRelatedCollections.ts | 2 +- packages/ui/src/fields/Relationship/index.tsx | 11 +- .../MultiValueLabel/index.tsx | 4 +- .../select-components/SingleValue/index.tsx | 4 +- packages/ui/src/fields/Relationship/types.ts | 2 +- packages/ui/src/fields/Row/types.ts | 2 +- packages/ui/src/fields/Select/Input.tsx | 8 +- packages/ui/src/fields/Select/index.tsx | 2 +- packages/ui/src/fields/Tabs/index.tsx | 7 +- packages/ui/src/fields/Text/Input.tsx | 6 +- packages/ui/src/fields/Text/index.tsx | 2 +- packages/ui/src/fields/Text/types.ts | 2 +- packages/ui/src/fields/Textarea/Input.tsx | 6 +- packages/ui/src/fields/Textarea/index.tsx | 2 +- packages/ui/src/fields/Textarea/types.ts | 2 +- packages/ui/src/fields/Upload/Input.tsx | 8 +- packages/ui/src/fields/Upload/types.ts | 2 +- packages/ui/src/fields/index.tsx | 2 +- packages/ui/src/fields/shared/index.tsx | 7 +- .../ui/src/forms/FieldPropsProvider/index.tsx | 3 +- .../src/forms/Form/createNestedFieldPath.ts | 4 +- packages/ui/src/forms/Form/fieldReducer.ts | 4 +- packages/ui/src/forms/Form/getDataByPath.ts | 2 +- packages/ui/src/forms/Form/getSiblingData.ts | 2 +- packages/ui/src/forms/Form/index.tsx | 6 +- .../ui/src/forms/Form/initContextState.ts | 2 +- .../ui/src/forms/Form/mergeServerFormState.ts | 2 +- packages/ui/src/forms/Form/rows.ts | 2 +- packages/ui/src/forms/Form/types.ts | 3 +- .../ui/src/forms/RenderFields/RenderField.tsx | 3 +- packages/ui/src/forms/RenderFields/types.ts | 2 +- packages/ui/src/forms/RowLabel/types.ts | 2 +- .../getFieldStateFromPaths.ts | 2 +- .../WatchChildErrors/getNestedFieldState.ts | 2 +- .../ui/src/forms/WatchChildErrors/index.tsx | 2 +- .../addFieldStatePromise.ts | 4 +- .../calculateDefaultValues/index.ts | 3 +- .../calculateDefaultValues/iterateFields.ts | 3 +- .../calculateDefaultValues/promise.ts | 7 +- .../getFilterOptionsQuery.ts | 2 +- .../src/forms/buildStateFromSchema/index.tsx | 2 +- .../buildStateFromSchema/iterateFields.ts | 4 +- packages/ui/src/forms/useField/index.tsx | 2 +- packages/ui/src/forms/useField/types.ts | 2 +- .../forms/withCondition/WatchCondition.tsx | 5 +- packages/ui/src/graphics/Logo/index.tsx | 36 +- packages/ui/src/graphics/Search/index.tsx | 23 - packages/ui/src/hooks/useHotkey.ts | 4 +- packages/ui/src/hooks/usePayloadAPI.ts | 4 +- packages/ui/src/hooks/useThrottledEffect.ts | 4 +- packages/ui/src/hooks/useUseAsTitle.ts | 4 +- packages/ui/src/icons/Calendar/index.tsx | 2 +- packages/ui/src/icons/Check/index.tsx | 2 +- packages/ui/src/icons/Chevron/index.tsx | 2 +- packages/ui/src/icons/CloseMenu/index.scss | 2 +- packages/ui/src/icons/CloseMenu/index.tsx | 2 +- packages/ui/src/icons/Copy/index.tsx | 2 +- packages/ui/src/icons/DragHandle/index.tsx | 2 +- packages/ui/src/icons/Edit/index.tsx | 2 +- packages/ui/src/icons/Line/index.tsx | 2 +- packages/ui/src/icons/LogOut/index.tsx | 2 +- packages/ui/src/icons/Menu/index.tsx | 2 +- .../ui/src/icons/MinimizeMaximize/index.tsx | 2 +- packages/ui/src/icons/Plus/index.tsx | 2 +- packages/ui/src/icons/Search/index.tsx | 2 +- packages/ui/src/icons/Swap/index.tsx | 2 +- packages/ui/src/icons/X/index.tsx | 2 +- packages/ui/src/providers/Auth/index.tsx | 3 +- .../buildComponentMap/actions.tsx | 2 +- .../buildComponentMap/collections.tsx | 8 +- .../ComponentMap/buildComponentMap/fields.tsx | 14 +- .../buildComponentMap/globals.tsx | 8 +- .../ComponentMap/buildComponentMap/index.tsx | 4 +- .../ComponentMap/buildComponentMap/types.ts | 4 +- packages/ui/src/providers/Config/index.tsx | 2 +- .../ui/src/providers/DocumentInfo/index.tsx | 14 +- .../ui/src/providers/DocumentInfo/types.ts | 5 +- .../src/providers/EntityVisibility/index.tsx | 6 +- .../src/providers/FieldComponents/index.tsx | 2 +- .../ui/src/providers/FormQueryParams/types.ts | 2 +- packages/ui/src/providers/ListInfo/index.tsx | 2 +- packages/ui/src/providers/ListQuery/index.tsx | 5 +- packages/ui/src/providers/Locale/index.tsx | 2 +- packages/ui/src/providers/Root/index.tsx | 2 +- .../ui/src/providers/ScrollInfo/index.tsx | 10 + packages/ui/src/providers/Selection/index.tsx | 2 +- .../ui/src/providers/Translation/index.tsx | 8 +- .../ui/src/providers/WindowInfo/index.tsx | 10 + packages/ui/src/scss/toastify.scss | 59 + packages/ui/src/styles.css | 0 .../utilities/buildFieldSchemaMap/index.ts | 2 +- .../buildFieldSchemaMap/traverseFields.ts | 6 +- .../utilities/buildFieldSchemaMap/types.ts | 2 +- packages/ui/src/utilities/buildFormState.ts | 12 +- .../ui/src/utilities/findLocaleFromCode.ts | 2 +- packages/ui/src/utilities/formatDocTitle.ts | 2 +- packages/ui/src/utilities/formatFields.ts | 4 +- packages/ui/src/utilities/getFormState.ts | 2 +- packages/ui/src/utilities/groupNavItems.ts | 3 +- .../ui/src/utilities/hasSavePermission.ts | 2 +- .../ui/src/utilities/reduceFieldsToValues.ts | 2 +- .../reduceFieldsToValuesWithValidation.ts | 2 +- packages/ui/tsconfig.json | 4 +- packages/ui/webpack.config.js | 114 -- pnpm-lock.yaml | 1003 +++++++++++--- scripts/pack-all-to-dest.ts | 8 +- test/_community/collections/Media/index.ts | 2 +- .../collections/Posts/MyComponent.tsx | 16 + test/_community/collections/Posts/index.ts | 2 +- test/_community/globals/Menu/index.ts | 2 +- .../migrations/20240513_181104_test.js | 14 +- .../migrations/20240513_181104_test.json | 96 +- test/_community/payload-types.ts | 141 +- test/_community/schema.graphql | 24 +- test/_community/tsconfig.json | 2 +- test/access-control/config.ts | 2 +- test/access-control/e2e.spec.ts | 2 +- test/access-control/int.spec.ts | 4 +- test/access-control/payload-types.ts | 325 +++-- test/access-control/tsconfig.json | 2 +- test/admin/collections/CustomIdRow.ts | 2 +- test/admin/collections/CustomIdTab.ts | 2 +- test/admin/collections/CustomViews1.ts | 2 +- test/admin/collections/CustomViews2.ts | 2 +- test/admin/collections/DisableDuplicate.ts | 2 +- test/admin/collections/Geo.ts | 2 +- test/admin/collections/Group1A.ts | 2 +- test/admin/collections/Group1B.ts | 2 +- test/admin/collections/Group2A.ts | 2 +- test/admin/collections/Group2B.ts | 2 +- test/admin/collections/Hidden.ts | 2 +- test/admin/collections/NoApiView.ts | 2 +- test/admin/collections/Posts.ts | 2 +- test/admin/collections/Upload.ts | 2 +- test/admin/collections/Users.ts | 2 +- test/admin/components/AdminButton/index.tsx | 2 +- .../admin/components/AfterDashboard/index.tsx | 2 +- test/admin/components/AfterNavLinks/index.tsx | 2 +- test/admin/components/BeforeLogin/index.tsx | 2 +- .../components/CollectionAPIButton/index.tsx | 2 +- .../components/CollectionEditButton/index.tsx | 2 +- .../components/CollectionListButton/index.tsx | 2 +- test/admin/components/CustomCell/index.tsx | 2 +- .../components/CustomTabComponent/index.tsx | 2 +- .../components/FieldDescription/index.tsx | 2 +- test/admin/components/Logout/index.tsx | 4 +- .../components/views/CustomAccount/index.tsx | 2 +- .../views/CustomDashboard/index.tsx | 2 +- .../components/views/CustomDefault/index.tsx | 4 +- .../components/views/CustomEdit/index.tsx | 2 +- .../components/views/CustomMinimal/index.tsx | 6 +- .../components/views/CustomTabLabel/index.tsx | 2 +- .../views/CustomTabNested/index.tsx | 2 +- .../views/CustomTabWithParam/index.tsx | 2 +- .../components/views/CustomVersions/index.tsx | 2 +- .../components/views/CustomView/index.tsx | 2 +- test/admin/e2e/1/e2e.spec.ts | 5 +- test/admin/e2e/2/e2e.spec.ts | 7 +- test/admin/globals/CustomViews1.ts | 2 +- test/admin/globals/CustomViews2.ts | 2 +- test/admin/globals/Global.ts | 2 +- test/admin/globals/Group1A.ts | 2 +- test/admin/globals/Group1B.ts | 2 +- test/admin/globals/Hidden.ts | 2 +- test/admin/globals/NoApiView.ts | 2 +- test/admin/payload-types.ts | 337 +++-- test/admin/tsconfig.json | 2 +- test/array-update/int.spec.ts | 2 +- test/array-update/payload-types.ts | 95 +- test/array-update/tsconfig.json | 2 +- test/auth/AuthDebug.tsx | 3 +- test/auth/custom-strategy/config.ts | 2 +- test/auth/e2e.spec.ts | 4 +- test/auth/int.spec.ts | 3 +- test/auth/payload-types.ts | 175 ++- test/auth/tsconfig.json | 2 +- test/auth/ui/AuthDebug.tsx | 3 +- test/buildConfigWithDefaults.ts | 4 +- test/collections-graphql/config.ts | 2 +- test/collections-graphql/int.spec.ts | 3 +- test/collections-graphql/payload-types.ts | 265 ++-- test/collections-graphql/tsconfig.json | 2 +- test/collections-rest/config.ts | 2 +- test/collections-rest/int.spec.ts | 2 +- test/collections-rest/payload-types.ts | 187 ++- test/collections-rest/tsconfig.json | 2 +- test/config/int.spec.ts | 3 +- test/config/payload-types.ts | 103 +- test/config/tsconfig.json | 2 +- test/create-payload-app/tsconfig.json | 2 +- test/custom-graphql/config.ts | 2 +- test/custom-graphql/payload-types.ts | 71 +- test/custom-graphql/tsconfig.json | 2 +- test/database/int.spec.ts | 5 +- test/database/payload-types.ts | 243 ++-- test/database/tsconfig.json | 2 +- test/dataloader/payload-types.ts | 111 +- test/dataloader/tsconfig.json | 2 +- test/email-nodemailer/payload-types.ts | 71 +- test/email-nodemailer/tsconfig.json | 2 +- test/email-resend/payload-types.ts | 71 +- test/email-resend/tsconfig.json | 2 +- test/email/collections/Media/index.ts | 2 +- test/email/collections/Posts/index.ts | 2 +- test/email/config.ts | 2 +- test/email/globals/Menu/index.ts | 2 +- test/email/payload-types.ts | 165 ++- test/email/tsconfig.json | 2 +- test/endpoints/endpoints/collections.ts | 2 +- test/endpoints/endpoints/globals.ts | 2 +- test/endpoints/endpoints/root.ts | 2 +- test/endpoints/payload-types.ts | 109 +- test/endpoints/tsconfig.json | 2 +- .../collections/ErrorFields/index.ts | 3 +- .../collections/Upload/index.ts | 2 +- .../collections/ValidateDraftsOff/index.ts | 2 +- .../collections/ValidateDraftsOn/index.ts | 2 +- .../ValidateDraftsOnAutosave/index.ts | 2 +- .../globals/ValidateDraftsOn/index.ts | 2 +- test/field-error-states/payload-types.ts | 397 +++--- test/field-error-states/tsconfig.json | 2 +- test/field-perf/payload-types.ts | 129 +- test/fields-relationship/config.ts | 3 +- test/fields-relationship/e2e.spec.ts | 2 +- test/fields-relationship/payload-types.ts | 277 ++-- test/fields-relationship/tsconfig.json | 2 +- .../collections/Array/LabelComponent.tsx | 2 +- test/fields/collections/Array/e2e.spec.ts | 2 +- test/fields/collections/Array/index.ts | 2 +- test/fields/collections/Blocks/index.ts | 3 +- test/fields/collections/Checkbox/index.ts | 2 +- test/fields/collections/Code/index.tsx | 2 +- test/fields/collections/Collapsible/index.ts | 2 +- .../collections/ConditionalLogic/index.ts | 2 +- test/fields/collections/Date/index.ts | 2 +- test/fields/collections/Group/index.ts | 2 +- test/fields/collections/Indexed/index.ts | 2 +- test/fields/collections/JSON/index.tsx | 2 +- test/fields/collections/Lexical/blocks.ts | 2 +- .../Lexical/e2e/blocks/e2e.spec.ts | 2 +- .../collections/Lexical/e2e/main/e2e.spec.ts | 2 +- test/fields/collections/Lexical/index.ts | 2 +- .../collections/LexicalLocalized/index.ts | 2 +- .../collections/LexicalMigrate/index.ts | 2 +- test/fields/collections/Number/e2e.spec.ts | 2 +- test/fields/collections/Number/index.ts | 2 +- test/fields/collections/Point/index.ts | 2 +- test/fields/collections/Radio/index.ts | 2 +- .../collections/Relationship/e2e.spec.ts | 2 +- test/fields/collections/Relationship/index.ts | 2 +- test/fields/collections/RichText/blocks.ts | 2 +- test/fields/collections/RichText/e2e.spec.ts | 2 +- test/fields/collections/RichText/index.ts | 4 +- test/fields/collections/Row/index.ts | 2 +- test/fields/collections/Select/index.ts | 2 +- test/fields/collections/Tabs/e2e.spec.ts | 2 +- test/fields/collections/Tabs/index.ts | 2 +- test/fields/collections/Tabs2/index.ts | 2 +- test/fields/collections/Text/e2e.spec.ts | 2 +- test/fields/collections/Text/index.ts | 2 +- test/fields/collections/UI/index.ts | 2 +- test/fields/collections/Upload/e2e.spec.ts | 2 +- test/fields/collections/Upload/index.ts | 2 +- test/fields/collections/Upload2/index.ts | 2 +- test/fields/collections/Uploads3/index.ts | 2 +- test/fields/config.ts | 2 +- test/fields/e2e.spec.ts | 2 +- test/fields/globals/TabsWithRichText.ts | 2 +- test/fields/int.spec.ts | 3 +- test/fields/lexical.int.spec.ts | 3 +- test/fields/seed.ts | 2 +- test/fields/tsconfig.json | 2 +- test/generateTypes.ts | 2 +- test/globals/payload-types.ts | 133 +- test/globals/tsconfig.json | 2 +- test/graphql-schema-gen/payload-types.ts | 145 +- test/graphql-schema-gen/schema.graphql | 56 +- test/graphql-schema-gen/tsconfig.json | 2 +- test/helpers.ts | 6 +- test/helpers/NextRESTClient.ts | 5 +- test/helpers/initPayloadE2E.ts | 4 +- test/helpers/initPayloadE2ENoConfig.ts | 5 +- test/helpers/initPayloadInt.ts | 2 +- test/helpers/reInit.ts | 2 +- test/helpers/rest.ts | 6 +- test/helpers/sdk/endpoint.ts | 2 +- test/helpers/sdk/index.ts | 3 +- test/helpers/sdk/types.ts | 2 +- .../hooks/collections/AfterOperation/index.ts | 2 +- test/hooks/collections/ChainingHooks/index.ts | 2 +- test/hooks/collections/ContextHooks/index.ts | 4 +- test/hooks/collections/Data/index.ts | 2 +- test/hooks/collections/Hook/index.ts | 2 +- .../collections/NestedAfterReadHooks/index.ts | 2 +- test/hooks/collections/Relations/index.ts | 2 +- test/hooks/collections/Transform/index.ts | 2 +- .../hooks/collections/Users/afterLoginHook.ts | 2 +- test/hooks/collections/Users/index.ts | 5 +- test/hooks/config.ts | 4 +- test/hooks/globals/Data/index.ts | 2 +- test/hooks/int.spec.ts | 2 +- test/hooks/payload-types.ts | 221 ++- test/hooks/tsconfig.json | 2 +- test/i18n/payload-types.ts | 89 +- test/i18n/tsconfig.json | 2 +- .../app/live-preview/_api/getDoc.ts | 2 +- .../live-preview/_components/Media/index.tsx | 2 +- .../live-preview/blocks/ArchiveBlock/index.ts | 2 +- .../live-preview/blocks/CallToAction/index.ts | 2 +- test/live-preview/blocks/Content/index.ts | 2 +- test/live-preview/blocks/MediaBlock/index.ts | 2 +- test/live-preview/collections/Categories.ts | 2 +- test/live-preview/collections/Media.ts | 2 +- test/live-preview/collections/Pages.ts | 2 +- test/live-preview/collections/Posts.ts | 2 +- test/live-preview/collections/SSR.ts | 2 +- test/live-preview/collections/SSRAutosave.ts | 2 +- test/live-preview/collections/Tenants.ts | 2 +- test/live-preview/collections/Users.ts | 2 +- test/live-preview/fields/hero.ts | 2 +- test/live-preview/fields/invertBackground.ts | 2 +- test/live-preview/fields/link.ts | 2 +- test/live-preview/fields/linkGroup.ts | 2 +- test/live-preview/globals/Footer.ts | 2 +- test/live-preview/globals/Header.ts | 2 +- test/live-preview/int.spec.ts | 5 +- test/live-preview/payload-types.ts | 921 +++++++------ test/live-preview/seed/index.ts | 2 +- test/live-preview/tsconfig.json | 13 +- .../utilities/formatLivePreviewURL.ts | 2 +- test/live-preview/utilities/formatSlug.ts | 2 +- test/localization-rtl/collections/posts.ts | 2 +- test/localization-rtl/collections/users.ts | 2 +- test/localization-rtl/payload-types.ts | 107 +- test/localization-rtl/tsconfig.json | 2 +- test/localization/collections/Array/index.ts | 2 +- .../NestedToArrayAndBlock/index.ts | 2 +- test/localization/e2e.spec.ts | 2 +- test/localization/int.spec.ts | 3 +- test/localization/payload-types.ts | 291 ++-- test/localization/tsconfig.json | 2 +- test/migrations-cli/payload-types.ts | 71 +- test/migrations-cli/tsconfig.json | 2 +- test/nested-fields/payload-types.ts | 157 ++- test/nested-fields/tsconfig.json | 2 +- .../plugin-cloud-storage/collections/Media.ts | 2 +- .../collections/MediaWithPrefix.ts | 2 +- .../plugin-cloud-storage/collections/Users.ts | 2 +- test/plugin-cloud-storage/payload-types.ts | 157 ++- test/plugin-cloud-storage/tsconfig.json | 2 +- test/plugin-cloud/collections/Media.ts | 2 +- test/plugin-cloud/collections/Users.ts | 2 +- test/plugin-cloud/payload-types.ts | 129 +- test/plugin-cloud/tsconfig.json | 2 +- test/plugin-form-builder/collections/Pages.ts | 2 +- test/plugin-form-builder/collections/Users.ts | 2 +- test/plugin-form-builder/config.ts | 2 +- test/plugin-form-builder/int.spec.ts | 2 +- test/plugin-form-builder/payload-types.ts | 357 +++-- test/plugin-form-builder/seed/index.ts | 3 +- test/plugin-form-builder/tsconfig.json | 2 +- .../collections/Categories.ts | 5 +- test/plugin-nested-docs/collections/Pages.ts | 2 +- test/plugin-nested-docs/collections/Users.ts | 2 +- .../collections/populateFullTitle.ts | 2 +- test/plugin-nested-docs/int.spec.ts | 3 +- test/plugin-nested-docs/payload-types.ts | 123 +- test/plugin-nested-docs/tsconfig.json | 2 +- test/plugin-redirects/collections/Pages.ts | 2 +- test/plugin-redirects/collections/Users.ts | 2 +- test/plugin-redirects/payload-types.ts | 107 +- test/plugin-redirects/tsconfig.json | 2 +- .../payload-types.ts | 151 +-- test/plugin-search/collections/Pages.ts | 2 +- test/plugin-search/collections/Posts.ts | 2 +- test/plugin-search/collections/Users.ts | 2 +- test/plugin-search/int.spec.ts | 2 +- test/plugin-search/payload-types.ts | 123 +- test/plugin-search/seed/index.ts | 2 +- test/plugin-search/tsconfig.json | 2 +- test/plugin-sentry/collections/Posts.ts | 2 +- test/plugin-sentry/collections/Users.ts | 2 +- test/plugin-sentry/payload-types.ts | 81 +- test/plugin-sentry/tsconfig.json | 2 +- test/plugin-seo/collections/Media.ts | 2 +- test/plugin-seo/collections/Pages.ts | 2 +- test/plugin-seo/collections/Users.ts | 2 +- test/plugin-seo/e2e.spec.ts | 4 +- test/plugin-seo/int.spec.ts | 2 +- test/plugin-seo/payload-types.ts | 149 +- test/plugin-seo/seed/index.ts | 5 +- test/plugin-seo/tsconfig.json | 2 +- test/plugin-stripe/collections/Customers.ts | 2 +- test/plugin-stripe/collections/Products.ts | 2 +- test/plugin-stripe/collections/Users.ts | 2 +- test/plugin-stripe/payload-types.ts | 157 ++- test/plugin-stripe/seed/index.ts | 2 +- test/plugin-stripe/tsconfig.json | 2 +- .../webhooks/subscriptionCreatedOrUpdated.ts | 2 +- .../webhooks/subscriptionDeleted.ts | 2 +- test/plugins/payload-types.ts | 81 +- test/plugins/tsconfig.json | 2 +- test/relationships/config.ts | 2 +- test/relationships/int.spec.ts | 9 +- test/relationships/payload-types.ts | 243 ++-- test/relationships/tsconfig.json | 2 +- test/storage-azure/collections/Media.ts | 2 +- .../collections/MediaWithPrefix.ts | 2 +- test/storage-azure/collections/Users.ts | 2 +- test/storage-azure/payload-types.ts | 157 ++- test/storage-azure/tsconfig.json | 2 +- test/storage-gcs/collections/Media.ts | 2 +- .../collections/MediaWithPrefix.ts | 2 +- test/storage-gcs/collections/Users.ts | 2 +- test/storage-gcs/payload-types.ts | 157 ++- test/storage-gcs/tsconfig.json | 2 +- test/storage-s3/collections/Media.ts | 2 +- .../storage-s3/collections/MediaWithPrefix.ts | 2 +- test/storage-s3/collections/Users.ts | 2 +- test/storage-s3/payload-types.ts | 157 ++- test/storage-s3/tsconfig.json | 2 +- test/storage-uploadthing/collections/Media.ts | 2 +- .../collections/MediaWithPrefix.ts | 2 +- test/storage-uploadthing/collections/Users.ts | 2 +- test/storage-uploadthing/payload-types.ts | 161 ++- test/storage-uploadthing/tsconfig.json | 2 +- test/storage-vercel-blob/collections/Media.ts | 2 +- .../collections/MediaWithPrefix.ts | 2 +- test/storage-vercel-blob/collections/Users.ts | 2 +- test/storage-vercel-blob/payload-types.ts | 157 ++- test/storage-vercel-blob/tsconfig.json | 2 +- test/testEmailAdapter.ts | 2 +- test/tsconfig.json | 6 +- .../AdminThumbnailFunction/index.ts | 2 +- .../collections/AdminThumbnailSize/index.ts | 2 +- test/uploads/collections/Upload1/index.ts | 2 +- test/uploads/collections/Upload2/index.ts | 2 +- test/uploads/config.ts | 2 +- test/uploads/e2e.spec.ts | 4 +- test/uploads/int.spec.ts | 2 +- test/uploads/payload-types.ts | 1207 ++++++++--------- test/uploads/tsconfig.json | 2 +- test/versions/collections/Autosave.ts | 2 +- test/versions/collections/CustomIDs.ts | 2 +- test/versions/collections/DisablePublish.ts | 2 +- test/versions/collections/Drafts.ts | 2 +- test/versions/collections/DraftsWithMax.ts | 2 +- test/versions/collections/Posts.ts | 2 +- test/versions/collections/Versions.ts | 2 +- test/versions/e2e.spec.ts | 2 +- .../elements/CustomSaveButton/index.tsx | 2 +- test/versions/globals/Autosave.ts | 2 +- test/versions/globals/DisablePublish.ts | 2 +- test/versions/globals/Draft.ts | 2 +- test/versions/globals/DraftWithMax.ts | 2 +- test/versions/int.spec.ts | 2 +- test/versions/payload-types.ts | 245 ++-- test/versions/tsconfig.json | 2 +- tsconfig.json | 8 +- 1297 files changed, 9146 insertions(+), 9612 deletions(-) create mode 100644 packages/db-postgres/bundle.js rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx (84%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx (93%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/Tab/index.scss (100%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/Tab/index.tsx (99%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/getCustomViews.ts (90%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/getViewConfig.ts (86%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/index.scss (100%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/index.tsx (96%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx (90%) rename packages/{ui => next}/src/elements/DocumentHeader/Tabs/tabs/index.tsx (97%) rename packages/{ui => next}/src/elements/DocumentHeader/index.scss (100%) rename packages/{ui => next}/src/elements/DocumentHeader/index.tsx (87%) create mode 100644 packages/next/src/elements/Logo/index.tsx rename packages/{ui => next}/src/elements/Nav/NavHamburger/index.tsx (81%) rename packages/{ui => next}/src/elements/Nav/NavWrapper/index.scss (100%) rename packages/{ui => next}/src/elements/Nav/NavWrapper/index.tsx (90%) rename packages/{ui => next}/src/elements/Nav/index.client.tsx (81%) rename packages/{ui => next}/src/elements/Nav/index.scss (100%) rename packages/{ui => next}/src/elements/Nav/index.tsx (92%) create mode 100644 packages/next/src/exports/templates.ts rename packages/{ui => next}/src/templates/Default/NavHamburger/index.tsx (59%) rename packages/{ui => next}/src/templates/Default/Wrapper/index.scss (100%) rename packages/{ui => next}/src/templates/Default/Wrapper/index.tsx (88%) rename packages/{ui => next}/src/templates/Default/index.scss (100%) rename packages/{ui => next}/src/templates/Default/index.tsx (76%) rename packages/{ui => next}/src/templates/Minimal/index.scss (100%) rename packages/{ui => next}/src/templates/Minimal/index.tsx (100%) delete mode 100644 packages/payload/auth.d.ts delete mode 100644 packages/payload/auth.js create mode 100644 packages/payload/bundle.js delete mode 100644 packages/payload/components.d.ts delete mode 100644 packages/payload/components.js delete mode 100644 packages/payload/components/elements.d.ts delete mode 100644 packages/payload/components/elements.js delete mode 100644 packages/payload/components/fields/Array.d.ts delete mode 100644 packages/payload/components/fields/Array.js delete mode 100644 packages/payload/components/fields/Blocks.d.ts delete mode 100644 packages/payload/components/fields/Blocks.js delete mode 100644 packages/payload/components/fields/Cell.d.ts delete mode 100644 packages/payload/components/fields/Cell.js delete mode 100644 packages/payload/components/fields/Checkbox.d.ts delete mode 100644 packages/payload/components/fields/Checkbox.js delete mode 100644 packages/payload/components/fields/Code.d.ts delete mode 100644 packages/payload/components/fields/Code.js delete mode 100644 packages/payload/components/fields/DateTime.d.ts delete mode 100644 packages/payload/components/fields/DateTime.js delete mode 100644 packages/payload/components/fields/Email.d.ts delete mode 100644 packages/payload/components/fields/Email.js delete mode 100644 packages/payload/components/fields/Group.d.ts delete mode 100644 packages/payload/components/fields/Group.js delete mode 100644 packages/payload/components/fields/Json.d.ts delete mode 100644 packages/payload/components/fields/Json.js delete mode 100644 packages/payload/components/fields/Number.d.ts delete mode 100644 packages/payload/components/fields/Number.js delete mode 100644 packages/payload/components/fields/Password.d.ts delete mode 100644 packages/payload/components/fields/Password.js delete mode 100644 packages/payload/components/fields/RadioGroup/RadioInput.d.ts delete mode 100644 packages/payload/components/fields/RadioGroup/RadioInput.js delete mode 100644 packages/payload/components/fields/RadioGroup/index.d.ts delete mode 100644 packages/payload/components/fields/RadioGroup/index.js delete mode 100644 packages/payload/components/fields/Relationship.d.ts delete mode 100644 packages/payload/components/fields/Relationship.js delete mode 100644 packages/payload/components/fields/RichText.d.ts delete mode 100644 packages/payload/components/fields/RichText.js delete mode 100644 packages/payload/components/fields/Row.d.ts delete mode 100644 packages/payload/components/fields/Row.js delete mode 100644 packages/payload/components/fields/Select.d.ts delete mode 100644 packages/payload/components/fields/Select.js delete mode 100644 packages/payload/components/fields/Text.d.ts delete mode 100644 packages/payload/components/fields/Text.js delete mode 100644 packages/payload/components/fields/Textarea.d.ts delete mode 100644 packages/payload/components/fields/Textarea.js delete mode 100644 packages/payload/components/fields/Upload.d.ts delete mode 100644 packages/payload/components/fields/Upload.js delete mode 100644 packages/payload/components/forms.d.ts delete mode 100644 packages/payload/components/forms.js delete mode 100644 packages/payload/components/graphics.d.ts delete mode 100644 packages/payload/components/graphics.js delete mode 100644 packages/payload/components/hooks.d.ts delete mode 100644 packages/payload/components/hooks.js delete mode 100644 packages/payload/components/icons.d.ts delete mode 100644 packages/payload/components/icons.js delete mode 100644 packages/payload/components/index.js delete mode 100644 packages/payload/components/preferences.d.ts delete mode 100644 packages/payload/components/preferences.js delete mode 100644 packages/payload/components/rich-text.d.ts delete mode 100644 packages/payload/components/rich-text.js delete mode 100644 packages/payload/components/root.d.ts delete mode 100644 packages/payload/components/root.js delete mode 100644 packages/payload/components/styles.css delete mode 100644 packages/payload/components/templates.d.ts delete mode 100644 packages/payload/components/templates.js delete mode 100644 packages/payload/components/utilities.d.ts delete mode 100644 packages/payload/components/utilities.js delete mode 100644 packages/payload/components/views/Cell.d.ts delete mode 100644 packages/payload/components/views/Cell.js delete mode 100644 packages/payload/components/views/Dashboard.d.ts delete mode 100644 packages/payload/components/views/Dashboard.js delete mode 100644 packages/payload/components/views/Edit.d.ts delete mode 100644 packages/payload/components/views/Edit.js delete mode 100644 packages/payload/components/views/List.d.ts delete mode 100644 packages/payload/components/views/List.js delete mode 100644 packages/payload/config.d.ts delete mode 100644 packages/payload/config.js delete mode 100644 packages/payload/database.d.ts delete mode 100644 packages/payload/database.js delete mode 100644 packages/payload/errors.d.ts delete mode 100644 packages/payload/errors.js delete mode 100644 packages/payload/fields/index.d.ts delete mode 100644 packages/payload/fields/index.js delete mode 100644 packages/payload/fields/validations.d.ts delete mode 100644 packages/payload/fields/validations.js delete mode 100644 packages/payload/graphql.d.ts delete mode 100644 packages/payload/graphql.js delete mode 100644 packages/payload/operations.d.ts delete mode 100644 packages/payload/operations.js delete mode 100644 packages/payload/src/exports/auth.ts delete mode 100644 packages/payload/src/exports/config.ts delete mode 100644 packages/payload/src/exports/database.ts delete mode 100644 packages/payload/src/exports/errors.ts delete mode 100644 packages/payload/src/exports/fields/index.ts delete mode 100644 packages/payload/src/exports/fields/validations.ts delete mode 100644 packages/payload/src/exports/i18n.ts create mode 100644 packages/payload/src/exports/index.ts delete mode 100644 packages/payload/src/exports/operations.ts create mode 100644 packages/payload/src/exports/shared.ts delete mode 100644 packages/payload/src/exports/types.ts delete mode 100644 packages/payload/src/exports/uploads.ts delete mode 100644 packages/payload/src/exports/utilities.ts delete mode 100644 packages/payload/src/exports/versions.ts delete mode 100644 packages/payload/types.d.ts delete mode 100644 packages/payload/types.js delete mode 100644 packages/payload/utilities.d.ts delete mode 100644 packages/payload/utilities.js delete mode 100644 packages/payload/versions.d.ts delete mode 100644 packages/payload/versions.js create mode 100644 packages/richtext-lexical/bundle.js delete mode 100644 packages/richtext-lexical/components.d.ts delete mode 100644 packages/richtext-lexical/components.js create mode 100644 packages/richtext-lexical/src/exports/client/index.ts delete mode 100644 packages/richtext-lexical/src/exports/components.ts rename packages/{payload/src/exports/components/utilities.ts => richtext-lexical/src/field/bundled.css} (100%) create mode 100644 packages/ui/bundle.js create mode 100644 packages/ui/src/elements/StepNav/context.tsx create mode 100644 packages/ui/src/elements/StepNav/types.ts create mode 100644 packages/ui/src/exports/client/index.ts delete mode 100644 packages/ui/src/exports/elements.ts delete mode 100644 packages/ui/src/exports/fields.ts delete mode 100644 packages/ui/src/exports/providers.ts create mode 100644 packages/ui/src/exports/shared/index.ts rename packages/ui/src/{forms => fields}/FieldDescription/index.scss (100%) rename packages/ui/src/{forms => fields}/FieldDescription/index.tsx (89%) rename packages/ui/src/{forms => fields}/FieldError/index.scss (100%) rename packages/ui/src/{forms => fields}/FieldError/index.tsx (85%) rename packages/ui/src/{forms => fields}/FieldLabel/index.scss (100%) rename packages/ui/src/{forms => fields}/FieldLabel/index.tsx (88%) delete mode 100644 packages/ui/src/graphics/Search/index.tsx create mode 100644 packages/ui/src/providers/ScrollInfo/index.tsx create mode 100644 packages/ui/src/providers/WindowInfo/index.tsx create mode 100644 packages/ui/src/scss/toastify.scss create mode 100644 packages/ui/src/styles.css delete mode 100644 packages/ui/webpack.config.js create mode 100644 test/_community/collections/Posts/MyComponent.tsx diff --git a/.gitignore b/.gitignore index 1aa06de886..ed4d41093b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,11 @@ test-results .localstack .turbo +meta_client.json +meta_server.json +meta_index.json +meta_shared.json + .turbo # Ignore test directory media folder/files diff --git a/.idea/payload.iml b/.idea/payload.iml index 4bbc3ad89b..b5f41b2a2d 100644 --- a/.idea/payload.iml +++ b/.idea/payload.iml @@ -74,6 +74,7 @@ + diff --git a/app/(payload)/layout.tsx b/app/(payload)/layout.tsx index 78db7265e1..eb272a6d57 100644 --- a/app/(payload)/layout.tsx +++ b/app/(payload)/layout.tsx @@ -1,6 +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` /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */ import React from 'react' diff --git a/package.json b/package.json index 93d8fb487c..a2d7c64dca 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,12 @@ "private": true, "type": "module", "scripts": { + "bf": "pnpm run build:force", "build": "pnpm run build:core", "build:all": "turbo build", "build:app": "next build", "build:app:analyze": "cross-env ANALYZE=true next build", + "build:clean": "pnpm clean:build", "build:core": "turbo build --filter \"!@payloadcms/plugin-*\"", "build:core:force": "pnpm clean:build && turbo build --filter \"!@payloadcms/plugin-*\" --no-cache --force", "build:create-payload-app": "turbo build --filter create-payload-app", @@ -16,6 +18,7 @@ "build:email-nodemailer": "turbo build --filter email-nodemailer", "build:email-resend": "turbo build --filter email-resend", "build:eslint-config-payload": "turbo build --filter eslint-config-payload", + "build:force": "pnpm run build:core:force", "build:graphql": "turbo build --filter graphql", "build:live-preview": "turbo build --filter live-preview", "build:live-preview-react": "turbo build --filter live-preview-react", @@ -43,8 +46,8 @@ "build:translations": "turbo build --filter translations", "build:ui": "turbo build --filter ui", "clean": "turbo clean", - "clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz'", - "clean:build": "node ./scripts/delete-recursively.js 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz'", + "clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'", + "clean:build": "node ./scripts/delete-recursively.js 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'", "clean:cache": "node ./scripts/delete-recursively.js node_modules/.cache! packages/payload/node_modules/.cache! .next", "dev": "cross-env NODE_OPTIONS=--no-deprecation node ./test/dev.js", "dev:generate-graphql-schema": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateGraphQLSchema.ts", @@ -55,6 +58,7 @@ "docker:start": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml up -d", "docker:stop": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml down", "fix": "eslint \"packages/**/*.ts\" --fix", + "force:build": "pnpm run build:core:force", "lint": "eslint \"packages/**/*.ts\"", "lint-staged": "lint-staged", "obliterate-playwright-cache-macos": "rm -rf ~/Library/Caches/ms-playwright && find /System/Volumes/Data/private/var/folders -type d -name 'playwright*' -exec rm -rf {} +", @@ -91,7 +95,7 @@ "@payloadcms/eslint-config": "workspace:*", "@payloadcms/live-preview-react": "workspace:*", "@playwright/test": "1.43.0", - "@swc/cli": "^0.1.62", + "@swc/cli": "0.3.12", "@swc/jest": "0.2.36", "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "14.2.1", @@ -147,13 +151,12 @@ "slash": "3.0.0", "sort-package-json": "^2.10.0", "swc-plugin-transform-remove-imports": "^1.12.1", - "tempfile": "^3.0.0", "tempy": "^1.0.1", "ts-node": "10.9.1", "tsx": "^4.7.1", "turbo": "^1.13.3", "typescript": "5.4.5", - "uuid": "^9.0.1" + "uuid": "10.0.0" }, "peerDependencies": { "react": "^19.0.0 || ^19.0.0-rc-f994737d14-20240522", @@ -166,8 +169,7 @@ "pnpm": { "allowedDeprecatedVersions": { "abab": "2", - "domexception": "4", - "uuid": "3.4.0" + "domexception": "4" }, "overrides": { "@types/react": "npm:types-react@19.0.0-beta.2", diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json index 1a9aaec39f..8c0d421f2e 100644 --- a/packages/create-payload-app/package.json +++ b/packages/create-payload-app/package.json @@ -40,7 +40,7 @@ ], "scripts": { "build": "pnpm pack-template-files && pnpm typecheck && pnpm build:swc", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "clean": "rimraf {dist,*.tsbuildinfo}", "pack-template-files": "tsx src/scripts/pack-template-files.ts", "prepublishOnly": "pnpm clean && pnpm build", diff --git a/packages/create-payload-app/src/lib/wrap-next-config.ts b/packages/create-payload-app/src/lib/wrap-next-config.ts index 62d842fc39..b06195773a 100644 --- a/packages/create-payload-app/src/lib/wrap-next-config.ts +++ b/packages/create-payload-app/src/lib/wrap-next-config.ts @@ -4,7 +4,7 @@ import chalk from 'chalk' import { Syntax, parseModule } from 'esprima-next' import fs from 'fs' -import { log , warning } from '../utils/log.js' +import { log, warning } from '../utils/log.js' export const withPayloadStatement = { cjs: `const { withPayload } = require('@payloadcms/next/withPayload')\n`, diff --git a/packages/create-payload-app/src/utils/messages.ts b/packages/create-payload-app/src/utils/messages.ts index 9f96894bf9..368192d237 100644 --- a/packages/create-payload-app/src/utils/messages.ts +++ b/packages/create-payload-app/src/utils/messages.ts @@ -3,7 +3,7 @@ import chalk from 'chalk' import path from 'path' import terminalLink from 'terminal-link' -import type { PackageManager , ProjectTemplate } from '../types.js' +import type { PackageManager, ProjectTemplate } from '../types.js' import { getValidTemplates } from '../lib/templates.js' diff --git a/packages/create-payload-app/tsconfig.json b/packages/create-payload-app/tsconfig.json index 271a35b895..6402cb8677 100644 --- a/packages/create-payload-app/tsconfig.json +++ b/packages/create-payload-app/tsconfig.json @@ -6,7 +6,7 @@ "emitDeclarationOnly": true, "outDir": "./dist" /* Specify an output folder for all emitted files. */, "rootDir": "./src" /* Specify the root folder within your source files. */, - "strict": true, + "strict": true }, "exclude": ["dist", "build", "tests", "test", "node_modules", ".eslintrc.js"], "include": ["src/**/*.ts", "src/**/*.spec.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"] diff --git a/packages/db-mongodb/README.md b/packages/db-mongodb/README.md index 6fe35e72f6..cd52f67aa8 100644 --- a/packages/db-mongodb/README.md +++ b/packages/db-mongodb/README.md @@ -14,7 +14,7 @@ npm install @payloadcms/db-mongodb ## Usage ```ts -import { buildConfig } from 'payload/config' +import { buildConfig } from 'payload' import { mongooseAdapter } from '@payloadcms/db-mongodb' export default buildConfig({ diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index 12c4d5d16d..78e09cd728 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -26,8 +26,8 @@ "predefinedMigrations" ], "scripts": { - "build": "pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc-build", + "build": "pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "prepublishOnly": "pnpm clean && pnpm turbo build" @@ -39,7 +39,7 @@ "mongoose": "6.12.3", "mongoose-paginate-v2": "1.7.22", "prompts": "2.4.2", - "uuid": "^9.0.1" + "uuid": "10.0.0" }, "devDependencies": { "@payloadcms/eslint-config": "workspace:*", diff --git a/packages/db-mongodb/src/connect.ts b/packages/db-mongodb/src/connect.ts index b3bb25d493..aab57c894f 100644 --- a/packages/db-mongodb/src/connect.ts +++ b/packages/db-mongodb/src/connect.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ import type { ConnectOptions } from 'mongoose' -import type { Connect } from 'payload/database' +import type { Connect } from 'payload' import mongoose from 'mongoose' diff --git a/packages/db-mongodb/src/count.ts b/packages/db-mongodb/src/count.ts index a8fafe9bf1..7f684d45df 100644 --- a/packages/db-mongodb/src/count.ts +++ b/packages/db-mongodb/src/count.ts @@ -1,8 +1,7 @@ import type { QueryOptions } from 'mongoose' -import type { Count } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { Count, PayloadRequestWithData } from 'payload' -import { flattenWhereToOperators } from 'payload/database' +import { flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/create.ts b/packages/db-mongodb/src/create.ts index cbcbbdd226..948d20ef14 100644 --- a/packages/db-mongodb/src/create.ts +++ b/packages/db-mongodb/src/create.ts @@ -1,5 +1,4 @@ -import type { Create } from 'payload/database' -import type { Document, PayloadRequestWithData } from 'payload/types' +import type { Create, Document, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/createGlobal.ts b/packages/db-mongodb/src/createGlobal.ts index b976339599..67fb560c22 100644 --- a/packages/db-mongodb/src/createGlobal.ts +++ b/packages/db-mongodb/src/createGlobal.ts @@ -1,5 +1,4 @@ -import type { CreateGlobal } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { CreateGlobal, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/createGlobalVersion.ts b/packages/db-mongodb/src/createGlobalVersion.ts index 1bc0d3c57a..f93dfb800e 100644 --- a/packages/db-mongodb/src/createGlobalVersion.ts +++ b/packages/db-mongodb/src/createGlobalVersion.ts @@ -1,5 +1,4 @@ -import type { CreateGlobalVersion } from 'payload/database' -import type { Document , PayloadRequestWithData } from 'payload/types' +import type { CreateGlobalVersion, Document, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/createMigration.ts b/packages/db-mongodb/src/createMigration.ts index 61df13e919..a1d3efe7e3 100644 --- a/packages/db-mongodb/src/createMigration.ts +++ b/packages/db-mongodb/src/createMigration.ts @@ -1,9 +1,9 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { CreateMigration, MigrationTemplateArgs } from 'payload/database' +import type { CreateMigration, MigrationTemplateArgs } from 'payload' import fs from 'fs' import path from 'path' -import { getPredefinedMigration } from 'payload/database' +import { getPredefinedMigration } from 'payload' import { fileURLToPath } from 'url' const migrationTemplate = ({ downSQL, imports, upSQL }: MigrationTemplateArgs): string => `import { diff --git a/packages/db-mongodb/src/createVersion.ts b/packages/db-mongodb/src/createVersion.ts index e4c78a801d..8d096c0a62 100644 --- a/packages/db-mongodb/src/createVersion.ts +++ b/packages/db-mongodb/src/createVersion.ts @@ -1,5 +1,4 @@ -import type { CreateVersion } from 'payload/database' -import type { Document , PayloadRequestWithData } from 'payload/types' +import type { CreateVersion, Document, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/deleteMany.ts b/packages/db-mongodb/src/deleteMany.ts index 56fc8e64da..bc14df489b 100644 --- a/packages/db-mongodb/src/deleteMany.ts +++ b/packages/db-mongodb/src/deleteMany.ts @@ -1,5 +1,4 @@ -import type { DeleteMany } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { DeleteMany, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/deleteOne.ts b/packages/db-mongodb/src/deleteOne.ts index a8f8404470..b0888eaa8d 100644 --- a/packages/db-mongodb/src/deleteOne.ts +++ b/packages/db-mongodb/src/deleteOne.ts @@ -1,5 +1,4 @@ -import type { DeleteOne } from 'payload/database' -import type { Document , PayloadRequestWithData } from 'payload/types' +import type { DeleteOne, Document, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/deleteVersions.ts b/packages/db-mongodb/src/deleteVersions.ts index ec09ca1698..1b845f60d0 100644 --- a/packages/db-mongodb/src/deleteVersions.ts +++ b/packages/db-mongodb/src/deleteVersions.ts @@ -1,5 +1,4 @@ -import type { DeleteVersions } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { DeleteVersions, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/destroy.ts b/packages/db-mongodb/src/destroy.ts index 9e9888ae5b..36aaafc354 100644 --- a/packages/db-mongodb/src/destroy.ts +++ b/packages/db-mongodb/src/destroy.ts @@ -1,4 +1,4 @@ -import type { Destroy } from 'payload/database' +import type { Destroy } from 'payload' import mongoose from 'mongoose' diff --git a/packages/db-mongodb/src/find.ts b/packages/db-mongodb/src/find.ts index b425be710f..b92056cdb3 100644 --- a/packages/db-mongodb/src/find.ts +++ b/packages/db-mongodb/src/find.ts @@ -1,8 +1,7 @@ import type { PaginateOptions } from 'mongoose' -import type { Find } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { Find, PayloadRequestWithData } from 'payload' -import { flattenWhereToOperators } from 'payload/database' +import { flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/findGlobal.ts b/packages/db-mongodb/src/findGlobal.ts index 17d490cab8..63b1050137 100644 --- a/packages/db-mongodb/src/findGlobal.ts +++ b/packages/db-mongodb/src/findGlobal.ts @@ -1,7 +1,6 @@ -import type { FindGlobal } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { FindGlobal, PayloadRequestWithData } from 'payload' -import { combineQueries } from 'payload/database' +import { combineQueries } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/findGlobalVersions.ts b/packages/db-mongodb/src/findGlobalVersions.ts index 41f120ed5d..f55ae3d154 100644 --- a/packages/db-mongodb/src/findGlobalVersions.ts +++ b/packages/db-mongodb/src/findGlobalVersions.ts @@ -1,9 +1,7 @@ import type { PaginateOptions } from 'mongoose' -import type { FindGlobalVersions } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { FindGlobalVersions, PayloadRequestWithData } from 'payload' -import { flattenWhereToOperators } from 'payload/database' -import { buildVersionGlobalFields } from 'payload/versions' +import { buildVersionGlobalFields, flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/findOne.ts b/packages/db-mongodb/src/findOne.ts index 28a068c3ed..01ac89eddd 100644 --- a/packages/db-mongodb/src/findOne.ts +++ b/packages/db-mongodb/src/findOne.ts @@ -1,6 +1,5 @@ import type { MongooseQueryOptions } from 'mongoose' -import type { FindOne } from 'payload/database' -import type { Document , PayloadRequestWithData } from 'payload/types' +import type { Document, FindOne, PayloadRequestWithData } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/findVersions.ts b/packages/db-mongodb/src/findVersions.ts index 510c3edb4b..fe919e10fb 100644 --- a/packages/db-mongodb/src/findVersions.ts +++ b/packages/db-mongodb/src/findVersions.ts @@ -1,8 +1,7 @@ import type { PaginateOptions } from 'mongoose' -import type { FindVersions } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { FindVersions, PayloadRequestWithData } from 'payload' -import { flattenWhereToOperators } from 'payload/database' +import { flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/index.ts b/packages/db-mongodb/src/index.ts index 90e61fe83f..0a6fa72a5f 100644 --- a/packages/db-mongodb/src/index.ts +++ b/packages/db-mongodb/src/index.ts @@ -1,13 +1,12 @@ import type { TransactionOptions } from 'mongodb' import type { MongoMemoryReplSet } from 'mongodb-memory-server' import type { ClientSession, ConnectOptions, Connection } from 'mongoose' -import type { Payload } from 'payload' -import type { BaseDatabaseAdapter, DatabaseAdapterObj } from 'payload/database' +import type { BaseDatabaseAdapter, DatabaseAdapterObj, Payload } from 'payload' import fs from 'fs' import mongoose from 'mongoose' import path from 'path' -import { createDatabaseAdapter } from 'payload/database' +import { createDatabaseAdapter } from 'payload' import type { CollectionModel, GlobalModel } from './types.js' diff --git a/packages/db-mongodb/src/init.ts b/packages/db-mongodb/src/init.ts index facae23cb4..740e62a324 100644 --- a/packages/db-mongodb/src/init.ts +++ b/packages/db-mongodb/src/init.ts @@ -1,11 +1,10 @@ /* eslint-disable no-param-reassign */ import type { PaginateOptions } from 'mongoose' -import type { Init } from 'payload/database' -import type { SanitizedCollectionConfig } from 'payload/types' +import type { Init, SanitizedCollectionConfig } from 'payload' import mongoose from 'mongoose' import paginate from 'mongoose-paginate-v2' -import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions' +import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload' import type { MongooseAdapter } from './index.js' import type { CollectionModel } from './types.js' diff --git a/packages/db-mongodb/src/migrateFresh.ts b/packages/db-mongodb/src/migrateFresh.ts index c22545cac5..28c69f641e 100644 --- a/packages/db-mongodb/src/migrateFresh.ts +++ b/packages/db-mongodb/src/migrateFresh.ts @@ -1,11 +1,6 @@ -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' -import { - commitTransaction, - initTransaction, - killTransaction, - readMigrationFiles, -} from 'payload/database' +import { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload' import prompts from 'prompts' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/models/buildCollectionSchema.ts b/packages/db-mongodb/src/models/buildCollectionSchema.ts index 4f1d1a24e0..19e72a07ad 100644 --- a/packages/db-mongodb/src/models/buildCollectionSchema.ts +++ b/packages/db-mongodb/src/models/buildCollectionSchema.ts @@ -1,6 +1,5 @@ import type { PaginateOptions, Schema } from 'mongoose' -import type { SanitizedConfig } from 'payload/config' -import type { SanitizedCollectionConfig } from 'payload/types' +import type { SanitizedCollectionConfig, SanitizedConfig } from 'payload' import paginate from 'mongoose-paginate-v2' diff --git a/packages/db-mongodb/src/models/buildGlobalModel.ts b/packages/db-mongodb/src/models/buildGlobalModel.ts index 492d1bc43e..65927f606c 100644 --- a/packages/db-mongodb/src/models/buildGlobalModel.ts +++ b/packages/db-mongodb/src/models/buildGlobalModel.ts @@ -1,4 +1,4 @@ -import type { SanitizedConfig } from 'payload/config' +import type { SanitizedConfig } from 'payload' import mongoose from 'mongoose' diff --git a/packages/db-mongodb/src/models/buildSchema.ts b/packages/db-mongodb/src/models/buildSchema.ts index 4dacc35665..a7ea67cb45 100644 --- a/packages/db-mongodb/src/models/buildSchema.ts +++ b/packages/db-mongodb/src/models/buildSchema.ts @@ -2,7 +2,6 @@ /* eslint-disable class-methods-use-this */ /* eslint-disable @typescript-eslint/no-use-before-define */ import type { IndexOptions, Schema, SchemaOptions, SchemaTypeOptions } from 'mongoose' -import type { SanitizedConfig, SanitizedLocalizationConfig } from 'payload/config' import type { ArrayField, Block, @@ -23,13 +22,15 @@ import type { RelationshipField, RichTextField, RowField, + SanitizedConfig, + SanitizedLocalizationConfig, SelectField, Tab, TabsField, TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import mongoose from 'mongoose' import { @@ -37,7 +38,7 @@ import { fieldIsLocalized, fieldIsPresentationalOnly, tabHasName, -} from 'payload/types' +} from 'payload/shared' export type BuildSchemaOptions = { allowIDField?: boolean diff --git a/packages/db-mongodb/src/queries/buildAndOrConditions.ts b/packages/db-mongodb/src/queries/buildAndOrConditions.ts index 207b760e91..1ff5746fcb 100644 --- a/packages/db-mongodb/src/queries/buildAndOrConditions.ts +++ b/packages/db-mongodb/src/queries/buildAndOrConditions.ts @@ -1,5 +1,4 @@ -import type { Payload } from 'payload' -import type { Field, Where } from 'payload/types' +import type { Field, Payload, Where } from 'payload' import { parseParams } from './parseParams.js' diff --git a/packages/db-mongodb/src/queries/buildQuery.ts b/packages/db-mongodb/src/queries/buildQuery.ts index 822abd0486..3224e62904 100644 --- a/packages/db-mongodb/src/queries/buildQuery.ts +++ b/packages/db-mongodb/src/queries/buildQuery.ts @@ -1,7 +1,6 @@ -import type { Payload } from 'payload' -import type { Field, Where } from 'payload/types' +import type { Field, Payload, Where } from 'payload' -import { QueryError } from 'payload/errors' +import { QueryError } from 'payload' import { parseParams } from './parseParams.js' diff --git a/packages/db-mongodb/src/queries/buildSearchParams.ts b/packages/db-mongodb/src/queries/buildSearchParams.ts index 4aec22ee8a..aaa629dbc6 100644 --- a/packages/db-mongodb/src/queries/buildSearchParams.ts +++ b/packages/db-mongodb/src/queries/buildSearchParams.ts @@ -1,11 +1,9 @@ -import type { Payload } from 'payload' -import type { PathToQuery } from 'payload/database' -import type { Field , Operator } from 'payload/types' +import type { Field, Operator, PathToQuery, Payload } from 'payload' import ObjectIdImport from 'bson-objectid' import mongoose from 'mongoose' -import { getLocalizedPaths } from 'payload/database' -import { fieldAffectsData , validOperators } from 'payload/types' +import { getLocalizedPaths } from 'payload' +import { validOperators } from 'payload/shared' import type { MongooseAdapter } from '../index.js' diff --git a/packages/db-mongodb/src/queries/buildSortParam.ts b/packages/db-mongodb/src/queries/buildSortParam.ts index 2503e659f7..b539fe4812 100644 --- a/packages/db-mongodb/src/queries/buildSortParam.ts +++ b/packages/db-mongodb/src/queries/buildSortParam.ts @@ -1,6 +1,5 @@ import type { PaginateOptions } from 'mongoose' -import type { SanitizedConfig } from 'payload/config' -import type { Field } from 'payload/types' +import type { Field, SanitizedConfig } from 'payload' import { getLocalizedSortProperty } from './getLocalizedSortProperty.js' diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts index 803a9a8c64..cfc6302be6 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts +++ b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts @@ -1,5 +1,5 @@ -import { SanitizedConfig, sanitizeConfig } from 'payload/config' -import { Config } from 'payload/config' +import { SanitizedConfig, sanitizeConfig } from 'payload' +import { Config } from 'payload' import { getLocalizedSortProperty } from './getLocalizedSortProperty.js' let config: SanitizedConfig diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts index 915046fed8..4ba9c2eda6 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts +++ b/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts @@ -1,8 +1,7 @@ -import type { SanitizedConfig } from 'payload/config' -import type { Field } from 'payload/types' +import type { Field, SanitizedConfig } from 'payload' -import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types' -import { flattenTopLevelFields } from 'payload/utilities' +import { flattenTopLevelFields } from 'payload' +import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/shared' type Args = { config: SanitizedConfig diff --git a/packages/db-mongodb/src/queries/parseParams.ts b/packages/db-mongodb/src/queries/parseParams.ts index fd84c958ad..1b6dd82dec 100644 --- a/packages/db-mongodb/src/queries/parseParams.ts +++ b/packages/db-mongodb/src/queries/parseParams.ts @@ -1,12 +1,11 @@ /* eslint-disable no-restricted-syntax */ /* eslint-disable no-await-in-loop */ import type { FilterQuery } from 'mongoose' -import type { Payload } from 'payload' -import type { Field, Operator , Where } from 'payload/types' +import type { Field, Operator, Payload, Where } from 'payload' import deepmerge from 'deepmerge' -import { validOperators } from 'payload/types' -import { combineMerge } from 'payload/utilities' +import { combineMerge } from 'payload' +import { validOperators } from 'payload/shared' import { buildAndOrConditions } from './buildAndOrConditions.js' import { buildSearchParam } from './buildSearchParams.js' diff --git a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts index 5912254ffe..096227afb7 100644 --- a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts +++ b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts @@ -1,7 +1,7 @@ -import type { Field, TabAsField } from 'payload/types' +import type { Field, TabAsField } from 'payload' import mongoose from 'mongoose' -import { createArrayFromCommaDelineated } from 'payload/utilities' +import { createArrayFromCommaDelineated } from 'payload' type SanitizeQueryValueArgs = { field: Field | TabAsField diff --git a/packages/db-mongodb/src/queryDrafts.ts b/packages/db-mongodb/src/queryDrafts.ts index 62bc6c66af..707aa470d1 100644 --- a/packages/db-mongodb/src/queryDrafts.ts +++ b/packages/db-mongodb/src/queryDrafts.ts @@ -1,8 +1,7 @@ import type { PaginateOptions } from 'mongoose' -import type { QueryDrafts } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData, QueryDrafts } from 'payload' -import { combineQueries, flattenWhereToOperators } from 'payload/database' +import { combineQueries, flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/transactions/beginTransaction.ts b/packages/db-mongodb/src/transactions/beginTransaction.ts index 6c4c0ce9f8..8f97c01c93 100644 --- a/packages/db-mongodb/src/transactions/beginTransaction.ts +++ b/packages/db-mongodb/src/transactions/beginTransaction.ts @@ -1,7 +1,7 @@ import type { TransactionOptions } from 'mongodb' -import type { BeginTransaction } from 'payload/database' +import type { BeginTransaction } from 'payload' -import { APIError } from 'payload/errors' +import { APIError } from 'payload' import { v4 as uuid } from 'uuid' import type { MongooseAdapter } from '../index.js' diff --git a/packages/db-mongodb/src/transactions/commitTransaction.ts b/packages/db-mongodb/src/transactions/commitTransaction.ts index 13ff010518..dbc45cb752 100644 --- a/packages/db-mongodb/src/transactions/commitTransaction.ts +++ b/packages/db-mongodb/src/transactions/commitTransaction.ts @@ -1,4 +1,4 @@ -import type { CommitTransaction } from 'payload/database' +import type { CommitTransaction } from 'payload' export const commitTransaction: CommitTransaction = async function commitTransaction(id) { if (!this.sessions[id]?.inTransaction()) { diff --git a/packages/db-mongodb/src/transactions/rollbackTransaction.ts b/packages/db-mongodb/src/transactions/rollbackTransaction.ts index 8875b194d2..0dba07ee87 100644 --- a/packages/db-mongodb/src/transactions/rollbackTransaction.ts +++ b/packages/db-mongodb/src/transactions/rollbackTransaction.ts @@ -1,4 +1,4 @@ -import type { RollbackTransaction } from 'payload/database' +import type { RollbackTransaction } from 'payload' export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction( id = '', diff --git a/packages/db-mongodb/src/types.ts b/packages/db-mongodb/src/types.ts index 4d5dd47793..25ff7a8218 100644 --- a/packages/db-mongodb/src/types.ts +++ b/packages/db-mongodb/src/types.ts @@ -1,6 +1,4 @@ import type { IndexDefinition, IndexOptions, Model, PaginateModel, SchemaOptions } from 'mongoose' -import type { Payload } from 'payload' -import type { SanitizedConfig } from 'payload/config' import type { ArrayField, BlockField, @@ -13,17 +11,19 @@ import type { GroupField, JSONField, NumberField, + Payload, PointField, RadioField, RelationshipField, RichTextField, RowField, + SanitizedConfig, SelectField, TabsField, TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import type { BuildQueryArgs } from './queries/buildQuery.js' diff --git a/packages/db-mongodb/src/updateGlobal.ts b/packages/db-mongodb/src/updateGlobal.ts index 48186d299d..6a65cff19b 100644 --- a/packages/db-mongodb/src/updateGlobal.ts +++ b/packages/db-mongodb/src/updateGlobal.ts @@ -1,5 +1,4 @@ -import type { UpdateGlobal } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData, UpdateGlobal } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/updateGlobalVersion.ts b/packages/db-mongodb/src/updateGlobalVersion.ts index ac65188df9..32fdb5b841 100644 --- a/packages/db-mongodb/src/updateGlobalVersion.ts +++ b/packages/db-mongodb/src/updateGlobalVersion.ts @@ -1,5 +1,4 @@ -import type { UpdateGlobalVersionArgs } from 'payload/database' -import type { PayloadRequestWithData, TypeWithID } from 'payload/types' +import type { PayloadRequestWithData, TypeWithID, UpdateGlobalVersionArgs } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/updateOne.ts b/packages/db-mongodb/src/updateOne.ts index aacb596b4c..fc48e4908c 100644 --- a/packages/db-mongodb/src/updateOne.ts +++ b/packages/db-mongodb/src/updateOne.ts @@ -1,5 +1,4 @@ -import type { UpdateOne } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData, UpdateOne } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/updateVersion.ts b/packages/db-mongodb/src/updateVersion.ts index 2120b5f8ee..5add9f0cfd 100644 --- a/packages/db-mongodb/src/updateVersion.ts +++ b/packages/db-mongodb/src/updateVersion.ts @@ -1,5 +1,4 @@ -import type { UpdateVersion } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData, UpdateVersion } from 'payload' import type { MongooseAdapter } from './index.js' diff --git a/packages/db-mongodb/src/utilities/getDBName.ts b/packages/db-mongodb/src/utilities/getDBName.ts index c35097ba03..ae78695f90 100644 --- a/packages/db-mongodb/src/utilities/getDBName.ts +++ b/packages/db-mongodb/src/utilities/getDBName.ts @@ -1,4 +1,4 @@ -import type { DBIdentifierName } from 'payload/database' +import type { DBIdentifierName } from 'payload' type Args = { config: { diff --git a/packages/db-mongodb/src/utilities/handleError.ts b/packages/db-mongodb/src/utilities/handleError.ts index 20179270ec..dbf95b9867 100644 --- a/packages/db-mongodb/src/utilities/handleError.ts +++ b/packages/db-mongodb/src/utilities/handleError.ts @@ -1,5 +1,5 @@ import httpStatus from 'http-status' -import { APIError, ValidationError } from 'payload/errors' +import { APIError, ValidationError } from 'payload' const handleError = (error, req) => { // Handle uniqueness error from MongoDB diff --git a/packages/db-postgres/README.md b/packages/db-postgres/README.md index a818a90e51..e7542964b5 100644 --- a/packages/db-postgres/README.md +++ b/packages/db-postgres/README.md @@ -14,7 +14,7 @@ npm install @payloadcms/db-postgres ## Usage ```ts -import { buildConfig } from 'payload/config' +import { buildConfig } from 'payload' import { postgresAdapter } from '@payloadcms/db-postgres' export default buildConfig({ diff --git a/packages/db-postgres/bundle.js b/packages/db-postgres/bundle.js new file mode 100644 index 0000000000..653394a076 --- /dev/null +++ b/packages/db-postgres/bundle.js @@ -0,0 +1,39 @@ +import * as esbuild from 'esbuild' +import fs from 'fs' +import path from 'path' +import { fileURLToPath } from 'url' +const filename = fileURLToPath(import.meta.url) +const dirname = path.dirname(filename) +import { commonjs } from '@hyrious/esbuild-plugin-commonjs' + +const resultServer = await esbuild + .build({ + entryPoints: ['src/index.ts'], + bundle: true, + platform: 'node', + format: 'esm', + outfile: 'dist/index.js', + splitting: false, + external: [ + '*.scss', + '*.css', + 'drizzle-kit', + 'libsql', + 'pg', + '@payloadcms/translations', + 'payload', + 'payload/*', + ], + minify: true, + metafile: true, + tsconfig: path.resolve(dirname, './tsconfig.json'), + plugins: [commonjs()], + sourcemap: true, + }) + .then((res, err) => { + console.log('db-postgres bundled successfully') + return res + }) + .catch(() => process.exit(1)) + +fs.writeFileSync('meta_server.json', JSON.stringify(resultServer.metafile)) diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json index ec55ec0a91..cb6f1bbbcc 100644 --- a/packages/db-postgres/package.json +++ b/packages/db-postgres/package.json @@ -35,8 +35,9 @@ "mock.js" ], "scripts": { - "build": "pnpm build:swc && pnpm build:types && pnpm renamePredefinedMigrations", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "rimraf .dist && rimraf tsconfig.tsbuildinfo && pnpm build:types && pnpm build:swc && pnpm build:esbuild && pnpm renamePredefinedMigrations", + "build:esbuild": "echo skipping esbuild", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "prepublishOnly": "pnpm clean && pnpm turbo build", @@ -50,12 +51,14 @@ "pg": "8.11.3", "prompts": "2.4.2", "to-snake-case": "1.0.0", - "uuid": "^9.0.1" + "uuid": "10.0.0" }, "devDependencies": { + "@hyrious/esbuild-plugin-commonjs": "^0.2.4", "@payloadcms/eslint-config": "workspace:*", "@types/pg": "8.10.2", "@types/to-snake-case": "1.0.0", + "esbuild": "^0.21.4", "payload": "workspace:*" }, "peerDependencies": { diff --git a/packages/db-postgres/relationships-v2-v3.mjs b/packages/db-postgres/relationships-v2-v3.mjs index 3ae893d5ec..4f946ea815 100644 --- a/packages/db-postgres/relationships-v2-v3.mjs +++ b/packages/db-postgres/relationships-v2-v3.mjs @@ -1,4 +1,4 @@ -const imports = `import { migratePostgresV2toV3 } from '@payloadcms/migratePostgresV2toV3'`; +const imports = `import { migratePostgresV2toV3 } from '@payloadcms/migratePostgresV2toV3'` const up = ` await migratePostgresV2toV3({ // enables logging of changes that will be made to the database debug: false, @@ -7,7 +7,7 @@ const up = ` await migratePostgresV2toV3({ payload, req, }) -`; -export { imports, up }; +` +export { imports, up } -//# sourceMappingURL=relationships-v2-v3.js.map \ No newline at end of file +//# sourceMappingURL=relationships-v2-v3.js.map diff --git a/packages/db-postgres/scripts/renamePredefinedMigrations.ts b/packages/db-postgres/scripts/renamePredefinedMigrations.ts index 6519ffad79..625f82cf00 100644 --- a/packages/db-postgres/scripts/renamePredefinedMigrations.ts +++ b/packages/db-postgres/scripts/renamePredefinedMigrations.ts @@ -13,6 +13,7 @@ const rename = () => { const newPath = path.join('./dist/predefinedMigrations', file) fs.renameSync(newPath, newPath.replace('.js', '.mjs')) }) + console.log('done') } rename() diff --git a/packages/db-postgres/src/connect.ts b/packages/db-postgres/src/connect.ts index f834f7f08d..a8ba989a91 100644 --- a/packages/db-postgres/src/connect.ts +++ b/packages/db-postgres/src/connect.ts @@ -1,5 +1,4 @@ -import type { Payload } from 'payload' -import type { Connect } from 'payload/database' +import type { Connect, Payload } from 'payload' import { sql } from 'drizzle-orm' import { drizzle } from 'drizzle-orm/node-postgres' diff --git a/packages/db-postgres/src/count.ts b/packages/db-postgres/src/count.ts index 95bb12c4d2..f206f363fe 100644 --- a/packages/db-postgres/src/count.ts +++ b/packages/db-postgres/src/count.ts @@ -1,5 +1,4 @@ -import type { Count } from 'payload/database' -import type { SanitizedCollectionConfig } from 'payload/types' +import type { Count, SanitizedCollectionConfig } from 'payload' import { sql } from 'drizzle-orm' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/create.ts b/packages/db-postgres/src/create.ts index 177b7744b0..5e9af9f64d 100644 --- a/packages/db-postgres/src/create.ts +++ b/packages/db-postgres/src/create.ts @@ -1,4 +1,4 @@ -import type { Create } from 'payload/database' +import type { Create } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/createGlobal.ts b/packages/db-postgres/src/createGlobal.ts index 23f5280184..ebe5d1234b 100644 --- a/packages/db-postgres/src/createGlobal.ts +++ b/packages/db-postgres/src/createGlobal.ts @@ -1,5 +1,4 @@ -import type { CreateGlobalArgs } from 'payload/database' -import type { PayloadRequestWithData, TypeWithID } from 'payload/types' +import type { CreateGlobalArgs, PayloadRequestWithData, TypeWithID } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/createGlobalVersion.ts b/packages/db-postgres/src/createGlobalVersion.ts index ce085d1671..f7708671ba 100644 --- a/packages/db-postgres/src/createGlobalVersion.ts +++ b/packages/db-postgres/src/createGlobalVersion.ts @@ -1,9 +1,7 @@ -import type { TypeWithVersion } from 'payload/database' -import type { PayloadRequestWithData, TypeWithID } from 'payload/types' +import type { PayloadRequestWithData, TypeWithID, TypeWithVersion } from 'payload' import { sql } from 'drizzle-orm' -import { type CreateGlobalVersionArgs } from 'payload/database' -import { buildVersionGlobalFields } from 'payload/versions' +import { type CreateGlobalVersionArgs, buildVersionGlobalFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/createMigration.ts b/packages/db-postgres/src/createMigration.ts index a9c2fe855c..c80ee79adb 100644 --- a/packages/db-postgres/src/createMigration.ts +++ b/packages/db-postgres/src/createMigration.ts @@ -1,11 +1,11 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload' -import type { CreateMigration, MigrationTemplateArgs } from 'payload/database' +import type { CreateMigration, MigrationTemplateArgs } from 'payload' import fs from 'fs' import { createRequire } from 'module' import path from 'path' -import { getPredefinedMigration } from 'payload/database' +import { getPredefinedMigration } from 'payload' import prompts from 'prompts' import { fileURLToPath } from 'url' diff --git a/packages/db-postgres/src/createVersion.ts b/packages/db-postgres/src/createVersion.ts index f99b14b107..46ccf6640d 100644 --- a/packages/db-postgres/src/createVersion.ts +++ b/packages/db-postgres/src/createVersion.ts @@ -1,8 +1,12 @@ -import type { CreateVersionArgs, TypeWithVersion } from 'payload/database' -import type { PayloadRequestWithData, TypeWithID } from 'payload/types' +import type { + CreateVersionArgs, + PayloadRequestWithData, + TypeWithID, + TypeWithVersion, +} from 'payload' import { sql } from 'drizzle-orm' -import { buildVersionCollectionFields } from 'payload/versions' +import { buildVersionCollectionFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/deleteMany.ts b/packages/db-postgres/src/deleteMany.ts index d0ad26f4c8..cabc03ab24 100644 --- a/packages/db-postgres/src/deleteMany.ts +++ b/packages/db-postgres/src/deleteMany.ts @@ -1,5 +1,4 @@ -import type { DeleteMany } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { DeleteMany, PayloadRequestWithData } from 'payload' import { inArray } from 'drizzle-orm' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/deleteOne.ts b/packages/db-postgres/src/deleteOne.ts index 564638e058..71de146857 100644 --- a/packages/db-postgres/src/deleteOne.ts +++ b/packages/db-postgres/src/deleteOne.ts @@ -1,5 +1,4 @@ -import type { DeleteOne } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { DeleteOne, PayloadRequestWithData } from 'payload' import { eq } from 'drizzle-orm' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/deleteVersions.ts b/packages/db-postgres/src/deleteVersions.ts index 4d84bdd546..45b23a2ca7 100644 --- a/packages/db-postgres/src/deleteVersions.ts +++ b/packages/db-postgres/src/deleteVersions.ts @@ -1,8 +1,7 @@ -import type { DeleteVersions } from 'payload/database' -import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types' +import type { DeleteVersions, PayloadRequestWithData, SanitizedCollectionConfig } from 'payload' import { inArray } from 'drizzle-orm' -import { buildVersionCollectionFields } from 'payload/versions' +import { buildVersionCollectionFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/destroy.ts b/packages/db-postgres/src/destroy.ts index aced64118c..9d57827104 100644 --- a/packages/db-postgres/src/destroy.ts +++ b/packages/db-postgres/src/destroy.ts @@ -1,4 +1,4 @@ -import type { Destroy } from 'payload/database' +import type { Destroy } from 'payload' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/find.ts b/packages/db-postgres/src/find.ts index 39b3c7cfaf..58bb1209b3 100644 --- a/packages/db-postgres/src/find.ts +++ b/packages/db-postgres/src/find.ts @@ -1,5 +1,4 @@ -import type { Find } from 'payload/database' -import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types' +import type { Find, PayloadRequestWithData, SanitizedCollectionConfig } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/find/buildFindManyArgs.ts b/packages/db-postgres/src/find/buildFindManyArgs.ts index fa48dcec12..32ec372235 100644 --- a/packages/db-postgres/src/find/buildFindManyArgs.ts +++ b/packages/db-postgres/src/find/buildFindManyArgs.ts @@ -1,5 +1,5 @@ import type { DBQueryConfig } from 'drizzle-orm' -import type { Field } from 'payload/types' +import type { Field } from 'payload' import type { PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/find/findMany.ts b/packages/db-postgres/src/find/findMany.ts index a86d17ad1d..857c323928 100644 --- a/packages/db-postgres/src/find/findMany.ts +++ b/packages/db-postgres/src/find/findMany.ts @@ -1,5 +1,4 @@ -import type { FindArgs } from 'payload/database' -import type { Field, PayloadRequestWithData, TypeWithID } from 'payload/types' +import type { Field, FindArgs, PayloadRequestWithData, TypeWithID } from 'payload' import { inArray, sql } from 'drizzle-orm' diff --git a/packages/db-postgres/src/find/traverseFields.ts b/packages/db-postgres/src/find/traverseFields.ts index 9bda489340..3836dccaf5 100644 --- a/packages/db-postgres/src/find/traverseFields.ts +++ b/packages/db-postgres/src/find/traverseFields.ts @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ -import type { Field } from 'payload/types' +import type { Field } from 'payload' -import { fieldAffectsData, tabHasName } from 'payload/types' +import { fieldAffectsData, tabHasName } from 'payload/shared' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/findGlobal.ts b/packages/db-postgres/src/findGlobal.ts index 261ad14a65..1ed00bd789 100644 --- a/packages/db-postgres/src/findGlobal.ts +++ b/packages/db-postgres/src/findGlobal.ts @@ -1,4 +1,4 @@ -import type { FindGlobal } from 'payload/database' +import type { FindGlobal } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/findGlobalVersions.ts b/packages/db-postgres/src/findGlobalVersions.ts index 3c2ab911f1..9fcf5325aa 100644 --- a/packages/db-postgres/src/findGlobalVersions.ts +++ b/packages/db-postgres/src/findGlobalVersions.ts @@ -1,7 +1,6 @@ -import type { FindGlobalVersions } from 'payload/database' -import type { PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { FindGlobalVersions, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload' -import { buildVersionGlobalFields } from 'payload/versions' +import { buildVersionGlobalFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/findOne.ts b/packages/db-postgres/src/findOne.ts index 76a467652e..7856a17300 100644 --- a/packages/db-postgres/src/findOne.ts +++ b/packages/db-postgres/src/findOne.ts @@ -1,5 +1,9 @@ -import type { FindOneArgs } from 'payload/database' -import type { PayloadRequestWithData, SanitizedCollectionConfig, TypeWithID } from 'payload/types' +import type { + FindOneArgs, + PayloadRequestWithData, + SanitizedCollectionConfig, + TypeWithID, +} from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/findVersions.ts b/packages/db-postgres/src/findVersions.ts index a6523e9e0d..6b89aadf4c 100644 --- a/packages/db-postgres/src/findVersions.ts +++ b/packages/db-postgres/src/findVersions.ts @@ -1,7 +1,6 @@ -import type { FindVersions } from 'payload/database' -import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types' +import type { FindVersions, PayloadRequestWithData, SanitizedCollectionConfig } from 'payload' -import { buildVersionCollectionFields } from 'payload/versions' +import { buildVersionCollectionFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/index.ts b/packages/db-postgres/src/index.ts index aadfcd1b2c..f28875735f 100644 --- a/packages/db-postgres/src/index.ts +++ b/packages/db-postgres/src/index.ts @@ -1,9 +1,8 @@ -import type { Payload } from 'payload' -import type { DatabaseAdapterObj } from 'payload/database' +import type { DatabaseAdapterObj, Payload } from 'payload' import fs from 'fs' import path from 'path' -import { createDatabaseAdapter } from 'payload/database' +import { createDatabaseAdapter } from 'payload' import type { Args, PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/init.ts b/packages/db-postgres/src/init.ts index 1c8357d906..35c87c71d9 100644 --- a/packages/db-postgres/src/init.ts +++ b/packages/db-postgres/src/init.ts @@ -1,9 +1,9 @@ /* eslint-disable no-param-reassign */ -import type { Init } from 'payload/database' -import type { SanitizedCollectionConfig } from 'payload/types' +import type { SanitizedCollectionConfig } from 'payload' +import type { Init } from 'payload' import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core' -import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions' +import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/migrate.ts b/packages/db-postgres/src/migrate.ts index 63ef9af8c4..b96bb496f2 100644 --- a/packages/db-postgres/src/migrate.ts +++ b/packages/db-postgres/src/migrate.ts @@ -1,15 +1,10 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ import type { Payload } from 'payload' -import type { Migration } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' +import type { Migration } from 'payload' import { createRequire } from 'module' -import { - commitTransaction, - initTransaction, - killTransaction, - readMigrationFiles, -} from 'payload/database' +import { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload' import prompts from 'prompts' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/migrateDown.ts b/packages/db-postgres/src/migrateDown.ts index 5d3ef1648e..e3fde11ae2 100644 --- a/packages/db-postgres/src/migrateDown.ts +++ b/packages/db-postgres/src/migrateDown.ts @@ -1,5 +1,5 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' import { commitTransaction, @@ -7,7 +7,7 @@ import { initTransaction, killTransaction, readMigrationFiles, -} from 'payload/database' +} from 'payload' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/migrateFresh.ts b/packages/db-postgres/src/migrateFresh.ts index 361417d7bf..014e8bd99b 100644 --- a/packages/db-postgres/src/migrateFresh.ts +++ b/packages/db-postgres/src/migrateFresh.ts @@ -1,12 +1,7 @@ -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' import { sql } from 'drizzle-orm' -import { - commitTransaction, - initTransaction, - killTransaction, - readMigrationFiles, -} from 'payload/database' +import { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload' import prompts from 'prompts' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/migrateRefresh.ts b/packages/db-postgres/src/migrateRefresh.ts index e06ab909b4..500b5cc03f 100644 --- a/packages/db-postgres/src/migrateRefresh.ts +++ b/packages/db-postgres/src/migrateRefresh.ts @@ -1,5 +1,5 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' import { commitTransaction, @@ -7,7 +7,7 @@ import { initTransaction, killTransaction, readMigrationFiles, -} from 'payload/database' +} from 'payload' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/migrateReset.ts b/packages/db-postgres/src/migrateReset.ts index 722f3e37ee..ddec943739 100644 --- a/packages/db-postgres/src/migrateReset.ts +++ b/packages/db-postgres/src/migrateReset.ts @@ -1,5 +1,5 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' import { commitTransaction, @@ -7,7 +7,7 @@ import { initTransaction, killTransaction, readMigrationFiles, -} from 'payload/database' +} from 'payload' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/migrateStatus.ts b/packages/db-postgres/src/migrateStatus.ts index 85eb0a9ae7..a5dd7b787a 100644 --- a/packages/db-postgres/src/migrateStatus.ts +++ b/packages/db-postgres/src/migrateStatus.ts @@ -1,5 +1,5 @@ import { Table } from 'console-table-printer' -import { getMigrations, readMigrationFiles } from 'payload/database' +import { getMigrations, readMigrationFiles } from 'payload' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts index 674834a1ee..f296b25a76 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts +++ b/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/index.ts @@ -1,5 +1,4 @@ -import type { Payload } from 'payload' -import type { Field, PayloadRequestWithData } from 'payload/types' +import type { Field, Payload, PayloadRequestWithData } from 'payload' import type { DrizzleTransaction, PostgresAdapter } from '../../../types.js' import type { DocsToResave } from '../types.js' diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts index f3eb840f9e..768cff23c8 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts +++ b/packages/db-postgres/src/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts @@ -1,6 +1,6 @@ -import type { Field } from 'payload/types' +import type { Field } from 'payload' -import { tabHasName } from 'payload/types' +import { tabHasName } from 'payload/shared' type Args = { doc: Record diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts index a0b63b965e..d4bfa1d995 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts +++ b/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts @@ -1,11 +1,10 @@ import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload' -import type { Payload } from 'payload' -import type { PayloadRequestWithData } from 'payload/types' +import type { Payload, PayloadRequestWithData } from 'payload' import { sql } from 'drizzle-orm' import fs from 'fs' import { createRequire } from 'module' -import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions' +import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from '../../types.js' diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts index d23f1d97d2..4d73a0d6fa 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts +++ b/packages/db-postgres/src/predefinedMigrations/v2-v3/migrateRelationships.ts @@ -1,4 +1,4 @@ -import type { Field, Payload, PayloadRequestWithData } from 'payload/types' +import type { Field, Payload, PayloadRequestWithData } from 'payload' import { sql } from 'drizzle-orm' @@ -88,7 +88,7 @@ export const migrateRelationships = async ({ globalSlug, isVersions, payload, - req: req as PayloadRequestWithData, + req: req as unknown as PayloadRequestWithData, tableName, }) } diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts index be15b624e1..905e47b7c4 100644 --- a/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts +++ b/packages/db-postgres/src/predefinedMigrations/v2-v3/traverseFields.ts @@ -1,6 +1,6 @@ -import type { Payload } from 'payload' +import type { Field, Payload } from 'payload' -import { type Field, tabHasName } from 'payload/types' +import { tabHasName } from 'payload/shared' import toSnakeCase from 'to-snake-case' import type { DrizzleTransaction, PostgresAdapter } from '../../types.js' diff --git a/packages/db-postgres/src/queries/buildAndOrConditions.ts b/packages/db-postgres/src/queries/buildAndOrConditions.ts index 3648c83149..54d83b061b 100644 --- a/packages/db-postgres/src/queries/buildAndOrConditions.ts +++ b/packages/db-postgres/src/queries/buildAndOrConditions.ts @@ -1,5 +1,5 @@ import type { SQL } from 'drizzle-orm' -import type { Field, Where } from 'payload/types' +import type { Field, Where } from 'payload' import type { GenericColumn, PostgresAdapter } from '../types.js' import type { BuildQueryJoinAliases } from './buildQuery.js' diff --git a/packages/db-postgres/src/queries/buildQuery.ts b/packages/db-postgres/src/queries/buildQuery.ts index 7a134d8130..bf9395d21e 100644 --- a/packages/db-postgres/src/queries/buildQuery.ts +++ b/packages/db-postgres/src/queries/buildQuery.ts @@ -1,6 +1,6 @@ import type { SQL } from 'drizzle-orm' import type { PgTableWithColumns } from 'drizzle-orm/pg-core' -import type { Field, Where } from 'payload/types' +import type { Field, Where } from 'payload' import { asc, desc } from 'drizzle-orm' diff --git a/packages/db-postgres/src/queries/getTableColumnFromPath.ts b/packages/db-postgres/src/queries/getTableColumnFromPath.ts index 978f2414ba..b687a98e73 100644 --- a/packages/db-postgres/src/queries/getTableColumnFromPath.ts +++ b/packages/db-postgres/src/queries/getTableColumnFromPath.ts @@ -1,13 +1,12 @@ /* eslint-disable no-param-reassign */ import type { SQL } from 'drizzle-orm' import type { PgTableWithColumns } from 'drizzle-orm/pg-core' -import type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload/types' +import type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload' import { and, eq, like, sql } from 'drizzle-orm' import { alias } from 'drizzle-orm/pg-core' -import { APIError } from 'payload/errors' -import { fieldAffectsData, tabHasName } from 'payload/types' -import { flattenTopLevelFields } from 'payload/utilities' +import { APIError, flattenTopLevelFields } from 'payload' +import { fieldAffectsData, tabHasName } from 'payload/shared' import toSnakeCase from 'to-snake-case' import { v4 as uuid } from 'uuid' diff --git a/packages/db-postgres/src/queries/parseParams.ts b/packages/db-postgres/src/queries/parseParams.ts index 8924df6dcb..6c2795f5a1 100644 --- a/packages/db-postgres/src/queries/parseParams.ts +++ b/packages/db-postgres/src/queries/parseParams.ts @@ -1,10 +1,10 @@ /* eslint-disable no-await-in-loop */ import type { SQL } from 'drizzle-orm' -import type { Field, Operator, Where } from 'payload/types' +import type { Field, Operator, Where } from 'payload' import { and, ilike, isNotNull, isNull, ne, notInArray, or, sql } from 'drizzle-orm' -import { QueryError } from 'payload/errors' -import { validOperators } from 'payload/types' +import { QueryError } from 'payload' +import { validOperators } from 'payload/shared' import type { GenericColumn, PostgresAdapter } from '../types.js' import type { BuildQueryJoinAliases } from './buildQuery.js' diff --git a/packages/db-postgres/src/queries/sanitizeQueryValue.ts b/packages/db-postgres/src/queries/sanitizeQueryValue.ts index 31157266c4..168a28da25 100644 --- a/packages/db-postgres/src/queries/sanitizeQueryValue.ts +++ b/packages/db-postgres/src/queries/sanitizeQueryValue.ts @@ -1,6 +1,5 @@ -import { APIError } from 'payload/errors' -import { type Field, type TabAsField, fieldAffectsData } from 'payload/types' -import { createArrayFromCommaDelineated } from 'payload/utilities' +import { APIError, type Field, type TabAsField, createArrayFromCommaDelineated } from 'payload' +import { fieldAffectsData } from 'payload/shared' import type { PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/queryDrafts.ts b/packages/db-postgres/src/queryDrafts.ts index 581b35b71d..b1d957e7d3 100644 --- a/packages/db-postgres/src/queryDrafts.ts +++ b/packages/db-postgres/src/queryDrafts.ts @@ -1,7 +1,6 @@ -import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload/types' +import type { PayloadRequestWithData, SanitizedCollectionConfig } from 'payload' -import { type QueryDrafts, combineQueries } from 'payload/database' -import { buildVersionCollectionFields } from 'payload/versions' +import { type QueryDrafts, buildVersionCollectionFields, combineQueries } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/schema/build.ts b/packages/db-postgres/src/schema/build.ts index 3a35b3a651..fe09f8b236 100644 --- a/packages/db-postgres/src/schema/build.ts +++ b/packages/db-postgres/src/schema/build.ts @@ -7,7 +7,7 @@ import type { PgTableWithColumns, UniqueConstraintBuilder, } from 'drizzle-orm/pg-core' -import type { Field } from 'payload/types' +import type { Field } from 'payload' import { relations } from 'drizzle-orm' import { diff --git a/packages/db-postgres/src/schema/createTableName.ts b/packages/db-postgres/src/schema/createTableName.ts index 083c8f5e36..220947794a 100644 --- a/packages/db-postgres/src/schema/createTableName.ts +++ b/packages/db-postgres/src/schema/createTableName.ts @@ -1,6 +1,6 @@ -import type { DBIdentifierName } from 'payload/database' +import type { DBIdentifierName } from 'payload' -import { APIError } from 'payload/errors' +import { APIError } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/schema/idToUUID.ts b/packages/db-postgres/src/schema/idToUUID.ts index f84138af63..466ec63b3d 100644 --- a/packages/db-postgres/src/schema/idToUUID.ts +++ b/packages/db-postgres/src/schema/idToUUID.ts @@ -1,4 +1,4 @@ -import type { Field } from 'payload/types' +import type { Field } from 'payload' export const idToUUID = (fields: Field[]): Field[] => fields.map((field) => { diff --git a/packages/db-postgres/src/schema/setColumnID.ts b/packages/db-postgres/src/schema/setColumnID.ts index 84c562a721..0d4de2d786 100644 --- a/packages/db-postgres/src/schema/setColumnID.ts +++ b/packages/db-postgres/src/schema/setColumnID.ts @@ -1,8 +1,8 @@ import type { PgColumnBuilder } from 'drizzle-orm/pg-core' import { numeric, serial, uuid, varchar } from 'drizzle-orm/pg-core' -import { type Field, fieldAffectsData } from 'payload/types' -import { flattenTopLevelFields } from 'payload/utilities' +import { type Field, flattenTopLevelFields } from 'payload' +import { fieldAffectsData } from 'payload/shared' import type { IDType, PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/schema/traverseFields.ts b/packages/db-postgres/src/schema/traverseFields.ts index 1f9f9748bc..0d3fc4f4d0 100644 --- a/packages/db-postgres/src/schema/traverseFields.ts +++ b/packages/db-postgres/src/schema/traverseFields.ts @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import type { Relation } from 'drizzle-orm' import type { IndexBuilder, PgColumnBuilder } from 'drizzle-orm/pg-core' -import type { Field, TabAsField } from 'payload/types' +import type { Field, TabAsField } from 'payload' import { relations } from 'drizzle-orm' import { @@ -19,8 +19,8 @@ import { timestamp, varchar, } from 'drizzle-orm/pg-core' -import { InvalidConfiguration } from 'payload/errors' -import { fieldAffectsData, optionIsObject } from 'payload/types' +import { InvalidConfiguration } from 'payload' +import { fieldAffectsData, optionIsObject } from 'payload/shared' import toSnakeCase from 'to-snake-case' import type { GenericColumns, IDType, PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts b/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts index 01d68b3f1f..ff115f4219 100644 --- a/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts +++ b/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts @@ -1,7 +1,7 @@ -import type { Block, Field } from 'payload/types' +import type { Block, Field } from 'payload' -import { InvalidConfiguration } from 'payload/errors' -import { fieldAffectsData, fieldHasSubFields, tabHasName } from 'payload/types' +import { InvalidConfiguration } from 'payload' +import { fieldAffectsData, fieldHasSubFields, tabHasName } from 'payload/shared' import type { GenericTable } from '../types.js' diff --git a/packages/db-postgres/src/transactions/beginTransaction.ts b/packages/db-postgres/src/transactions/beginTransaction.ts index 496b16ff91..0d59329261 100644 --- a/packages/db-postgres/src/transactions/beginTransaction.ts +++ b/packages/db-postgres/src/transactions/beginTransaction.ts @@ -1,4 +1,4 @@ -import type { BeginTransaction } from 'payload/database' +import type { BeginTransaction } from 'payload' import { v4 as uuid } from 'uuid' diff --git a/packages/db-postgres/src/transactions/commitTransaction.ts b/packages/db-postgres/src/transactions/commitTransaction.ts index cc8a0a2ab6..ecc0082e81 100644 --- a/packages/db-postgres/src/transactions/commitTransaction.ts +++ b/packages/db-postgres/src/transactions/commitTransaction.ts @@ -1,4 +1,4 @@ -import type { CommitTransaction } from 'payload/database' +import type { CommitTransaction } from 'payload' export const commitTransaction: CommitTransaction = async function commitTransaction(id) { // if the session was deleted it has already been aborted diff --git a/packages/db-postgres/src/transactions/rollbackTransaction.ts b/packages/db-postgres/src/transactions/rollbackTransaction.ts index d3f0471d9d..2a70ceac71 100644 --- a/packages/db-postgres/src/transactions/rollbackTransaction.ts +++ b/packages/db-postgres/src/transactions/rollbackTransaction.ts @@ -1,4 +1,4 @@ -import type { RollbackTransaction } from 'payload/database' +import type { RollbackTransaction } from 'payload' export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction( id = '', diff --git a/packages/db-postgres/src/transform/read/hasManyNumber.ts b/packages/db-postgres/src/transform/read/hasManyNumber.ts index ad673bb1e6..0ce1533984 100644 --- a/packages/db-postgres/src/transform/read/hasManyNumber.ts +++ b/packages/db-postgres/src/transform/read/hasManyNumber.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { NumberField } from 'payload/types' +import type { NumberField } from 'payload' type Args = { field: NumberField diff --git a/packages/db-postgres/src/transform/read/hasManyText.ts b/packages/db-postgres/src/transform/read/hasManyText.ts index 1392c73d24..e37c70a445 100644 --- a/packages/db-postgres/src/transform/read/hasManyText.ts +++ b/packages/db-postgres/src/transform/read/hasManyText.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { TextField } from 'payload/types' +import type { TextField } from 'payload' type Args = { field: TextField diff --git a/packages/db-postgres/src/transform/read/index.ts b/packages/db-postgres/src/transform/read/index.ts index b584c7e98c..9eeadbb33c 100644 --- a/packages/db-postgres/src/transform/read/index.ts +++ b/packages/db-postgres/src/transform/read/index.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -import type { SanitizedConfig } from 'payload/config' -import type { Field, TypeWithID } from 'payload/types' +import type { Field, TypeWithID } from 'payload' +import type { SanitizedConfig } from 'payload' import type { PostgresAdapter } from '../../types.js' diff --git a/packages/db-postgres/src/transform/read/relationship.ts b/packages/db-postgres/src/transform/read/relationship.ts index 5d40484d2d..65e99d2bf4 100644 --- a/packages/db-postgres/src/transform/read/relationship.ts +++ b/packages/db-postgres/src/transform/read/relationship.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { RelationshipField, UploadField } from 'payload/types' +import type { RelationshipField, UploadField } from 'payload' type Args = { field: RelationshipField | UploadField diff --git a/packages/db-postgres/src/transform/read/traverseFields.ts b/packages/db-postgres/src/transform/read/traverseFields.ts index 444be1d525..783b791a87 100644 --- a/packages/db-postgres/src/transform/read/traverseFields.ts +++ b/packages/db-postgres/src/transform/read/traverseFields.ts @@ -1,8 +1,8 @@ /* eslint-disable no-param-reassign */ -import type { SanitizedConfig } from 'payload/config' -import type { Field, TabAsField } from 'payload/types' +import type { Field, TabAsField } from 'payload' +import type { SanitizedConfig } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' import type { PostgresAdapter } from '../../types.js' import type { BlocksMap } from '../../utilities/createBlocksMap.js' diff --git a/packages/db-postgres/src/transform/write/array.ts b/packages/db-postgres/src/transform/write/array.ts index c2741cc40a..140253709c 100644 --- a/packages/db-postgres/src/transform/write/array.ts +++ b/packages/db-postgres/src/transform/write/array.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { ArrayField } from 'payload/types' +import type { ArrayField } from 'payload' import type { PostgresAdapter } from '../../types.js' import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types.js' diff --git a/packages/db-postgres/src/transform/write/blocks.ts b/packages/db-postgres/src/transform/write/blocks.ts index 35d6605f80..b23f848552 100644 --- a/packages/db-postgres/src/transform/write/blocks.ts +++ b/packages/db-postgres/src/transform/write/blocks.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { BlockField } from 'payload/types' +import type { BlockField } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/transform/write/index.ts b/packages/db-postgres/src/transform/write/index.ts index 24307e8163..2a32848caf 100644 --- a/packages/db-postgres/src/transform/write/index.ts +++ b/packages/db-postgres/src/transform/write/index.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import type { Field } from 'payload/types' +import type { Field } from 'payload' import type { PostgresAdapter } from '../../types.js' import type { RowToInsert } from './types.js' diff --git a/packages/db-postgres/src/transform/write/relationships.ts b/packages/db-postgres/src/transform/write/relationships.ts index b7c4e23eda..445feef31c 100644 --- a/packages/db-postgres/src/transform/write/relationships.ts +++ b/packages/db-postgres/src/transform/write/relationships.ts @@ -1,6 +1,6 @@ -import type { RelationshipField, UploadField } from 'payload/types' +import type { RelationshipField, UploadField } from 'payload' -import { valueIsValueWithRelation } from 'payload/types' +import { valueIsValueWithRelation } from 'payload/shared' type Args = { baseRow: Record diff --git a/packages/db-postgres/src/transform/write/traverseFields.ts b/packages/db-postgres/src/transform/write/traverseFields.ts index 8680414976..92a829e15f 100644 --- a/packages/db-postgres/src/transform/write/traverseFields.ts +++ b/packages/db-postgres/src/transform/write/traverseFields.ts @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ -import type { Field } from 'payload/types' +import type { Field } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from '../../types.js' diff --git a/packages/db-postgres/src/types.ts b/packages/db-postgres/src/types.ts index 32a9732c2d..0832304d6f 100644 --- a/packages/db-postgres/src/types.ts +++ b/packages/db-postgres/src/types.ts @@ -15,9 +15,7 @@ import type { PgTransaction, } from 'drizzle-orm/pg-core' import type { PgTableFn } from 'drizzle-orm/pg-core/table' -import type { Payload } from 'payload' -import type { BaseDatabaseAdapter } from 'payload/database' -import type { PayloadRequestWithData } from 'payload/types' +import type { BaseDatabaseAdapter, Payload, PayloadRequestWithData } from 'payload' import type { Pool, PoolConfig } from 'pg' export type DrizzleDB = NodePgDatabase> diff --git a/packages/db-postgres/src/update.ts b/packages/db-postgres/src/update.ts index c9caa28adc..859937c04e 100644 --- a/packages/db-postgres/src/update.ts +++ b/packages/db-postgres/src/update.ts @@ -1,4 +1,4 @@ -import type { UpdateOne } from 'payload/database' +import type { UpdateOne } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/updateGlobal.ts b/packages/db-postgres/src/updateGlobal.ts index 84713b65a5..db1dec14a9 100644 --- a/packages/db-postgres/src/updateGlobal.ts +++ b/packages/db-postgres/src/updateGlobal.ts @@ -1,5 +1,4 @@ -import type { UpdateGlobalArgs } from 'payload/database' -import type { PayloadRequestWithData, TypeWithID } from 'payload/types' +import type { PayloadRequestWithData, TypeWithID, UpdateGlobalArgs } from 'payload' import toSnakeCase from 'to-snake-case' diff --git a/packages/db-postgres/src/updateGlobalVersion.ts b/packages/db-postgres/src/updateGlobalVersion.ts index 313c352a27..dc89c7cea0 100644 --- a/packages/db-postgres/src/updateGlobalVersion.ts +++ b/packages/db-postgres/src/updateGlobalVersion.ts @@ -1,7 +1,12 @@ -import type { TypeWithVersion, UpdateGlobalVersionArgs } from 'payload/database' -import type { PayloadRequestWithData, SanitizedGlobalConfig, TypeWithID } from 'payload/types' +import type { + PayloadRequestWithData, + SanitizedGlobalConfig, + TypeWithID, + TypeWithVersion, + UpdateGlobalVersionArgs, +} from 'payload' -import { buildVersionGlobalFields } from 'payload/versions' +import { buildVersionGlobalFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/updateVersion.ts b/packages/db-postgres/src/updateVersion.ts index e87177e18d..b5756a9190 100644 --- a/packages/db-postgres/src/updateVersion.ts +++ b/packages/db-postgres/src/updateVersion.ts @@ -1,7 +1,12 @@ -import type { TypeWithVersion, UpdateVersionArgs } from 'payload/database' -import type { PayloadRequestWithData, SanitizedCollectionConfig, TypeWithID } from 'payload/types' +import type { + PayloadRequestWithData, + SanitizedCollectionConfig, + TypeWithID, + TypeWithVersion, + UpdateVersionArgs, +} from 'payload' -import { buildVersionCollectionFields } from 'payload/versions' +import { buildVersionCollectionFields } from 'payload' import toSnakeCase from 'to-snake-case' import type { PostgresAdapter } from './types.js' diff --git a/packages/db-postgres/src/upsertRow/index.ts b/packages/db-postgres/src/upsertRow/index.ts index 55f13fa242..04cc2b0642 100644 --- a/packages/db-postgres/src/upsertRow/index.ts +++ b/packages/db-postgres/src/upsertRow/index.ts @@ -1,8 +1,8 @@ /* eslint-disable no-param-reassign */ -import type { TypeWithID } from 'payload/types' +import type { TypeWithID } from 'payload' import { eq } from 'drizzle-orm' -import { ValidationError } from 'payload/errors' +import { ValidationError } from 'payload' import type { BlockRowToInsert } from '../transform/write/types.js' import type { Args } from './types.js' diff --git a/packages/db-postgres/src/upsertRow/types.ts b/packages/db-postgres/src/upsertRow/types.ts index b00cd1e761..b0babe7ce3 100644 --- a/packages/db-postgres/src/upsertRow/types.ts +++ b/packages/db-postgres/src/upsertRow/types.ts @@ -1,5 +1,5 @@ import type { SQL } from 'drizzle-orm' -import type { Field, PayloadRequestWithData } from 'payload/types' +import type { Field, PayloadRequestWithData } from 'payload' import type { DrizzleDB, GenericColumn, PostgresAdapter } from '../types.js' diff --git a/packages/db-postgres/src/utilities/hasLocalesTable.ts b/packages/db-postgres/src/utilities/hasLocalesTable.ts index ef49631246..949414fa6d 100644 --- a/packages/db-postgres/src/utilities/hasLocalesTable.ts +++ b/packages/db-postgres/src/utilities/hasLocalesTable.ts @@ -1,6 +1,6 @@ -import type { Field } from 'payload/types' +import type { Field } from 'payload' -import { fieldAffectsData, fieldHasSubFields } from 'payload/types' +import { fieldAffectsData, fieldHasSubFields } from 'payload/shared' export const hasLocalesTable = (fields: Field[]): boolean => { return fields.some((field) => { diff --git a/packages/email-nodemailer/package.json b/packages/email-nodemailer/package.json index 3a50904a9d..953ab44e67 100644 --- a/packages/email-nodemailer/package.json +++ b/packages/email-nodemailer/package.json @@ -24,9 +24,9 @@ "dist" ], "scripts": { - "build": "pnpm build:swc && pnpm build:types", + "build": "pnpm build:types && pnpm build:swc", "build:clean": "find . \\( -type d \\( -name build -o -name dist -o -name .cache \\) -o -type f -name tsconfig.tsbuildinfo \\) -exec rm -rf {} + && pnpm build", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "prepublishOnly": "pnpm clean && pnpm turbo build" diff --git a/packages/email-nodemailer/src/index.ts b/packages/email-nodemailer/src/index.ts index 41945d7b81..78187186ae 100644 --- a/packages/email-nodemailer/src/index.ts +++ b/packages/email-nodemailer/src/index.ts @@ -1,10 +1,10 @@ /* eslint-disable no-console */ import type { Transporter } from 'nodemailer' import type SMTPConnection from 'nodemailer/lib/smtp-connection' -import type { EmailAdapter } from 'payload/config' +import type { EmailAdapter } from 'payload' import nodemailer from 'nodemailer' -import { InvalidConfiguration } from 'payload/errors' +import { InvalidConfiguration } from 'payload' export type NodemailerAdapterArgs = { defaultFromAddress: string diff --git a/packages/email-nodemailer/tsconfig.json b/packages/email-nodemailer/tsconfig.json index 79ddab46b9..763126eed7 100644 --- a/packages/email-nodemailer/tsconfig.json +++ b/packages/email-nodemailer/tsconfig.json @@ -6,14 +6,9 @@ "emitDeclarationOnly": true, "outDir": "./dist" /* Specify an output folder for all emitted files. */, "rootDir": "./src" /* Specify the root folder within your source files. */, - "strict": true, + "strict": true }, - "exclude": [ - "dist", - "node_modules", - ], + "exclude": ["dist", "node_modules"], "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"], - "references": [ - { "path": "../payload" }, - ] + "references": [{ "path": "../payload" }] } diff --git a/packages/email-resend/package.json b/packages/email-resend/package.json index 0ee1bc8412..7529d69ffc 100644 --- a/packages/email-resend/package.json +++ b/packages/email-resend/package.json @@ -24,8 +24,8 @@ "dist" ], "scripts": { - "build": "pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc-build", + "build": "pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "prepublishOnly": "pnpm clean && pnpm turbo build", diff --git a/packages/email-resend/src/email-resend.spec.ts b/packages/email-resend/src/email-resend.spec.ts index 4fe2e9cd22..48c1f4f359 100644 --- a/packages/email-resend/src/email-resend.spec.ts +++ b/packages/email-resend/src/email-resend.spec.ts @@ -1,5 +1,5 @@ import { resendAdapter } from './index.js' -import { Payload } from 'payload/types' +import { Payload } from 'payload' import { jest } from '@jest/globals' describe('email-resend', () => { diff --git a/packages/email-resend/src/index.ts b/packages/email-resend/src/index.ts index da36ec7c14..728e4202d7 100644 --- a/packages/email-resend/src/index.ts +++ b/packages/email-resend/src/index.ts @@ -1,7 +1,6 @@ -import type { EmailAdapter } from 'payload/config' -import type { SendEmailOptions } from 'payload/types' +import type { EmailAdapter, SendEmailOptions } from 'payload' -import { APIError } from 'payload/errors' +import { APIError } from 'payload' export type ResendAdapterArgs = { apiKey: string diff --git a/packages/email-resend/tsconfig.json b/packages/email-resend/tsconfig.json index 664001de39..fd981033ae 100644 --- a/packages/email-resend/tsconfig.json +++ b/packages/email-resend/tsconfig.json @@ -6,15 +6,9 @@ "emitDeclarationOnly": true, "outDir": "./dist" /* Specify an output folder for all emitted files. */, "rootDir": "./src" /* Specify the root folder within your source files. */, - "strict": true, + "strict": true }, - "exclude": [ - "dist", - "node_modules", - "src/**/*.spec.ts", - ], + "exclude": ["dist", "node_modules", "src/**/*.spec.ts"], "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.d.ts", "src/**/*.json"], - "references": [ - { "path": "../payload" }, - ] + "references": [{ "path": "../payload" }] } diff --git a/packages/graphql/package.json b/packages/graphql/package.json index fb8da7f872..20d961303d 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -29,8 +29,8 @@ "dist" ], "scripts": { - "build": "pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "prepublishOnly": "pnpm clean && pnpm turbo build" diff --git a/packages/graphql/src/bin/generateSchema.ts b/packages/graphql/src/bin/generateSchema.ts index 2d19106fb8..0bbb870d58 100644 --- a/packages/graphql/src/bin/generateSchema.ts +++ b/packages/graphql/src/bin/generateSchema.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-floating-promises */ -import type { SanitizedConfig } from 'payload/types' +import type { SanitizedConfig } from 'payload' import fs from 'fs' import { printSchema } from 'graphql' diff --git a/packages/graphql/src/index.ts b/packages/graphql/src/index.ts index 3ddbee0fac..7081012e22 100644 --- a/packages/graphql/src/index.ts +++ b/packages/graphql/src/index.ts @@ -1,7 +1,6 @@ /* eslint-disable no-param-reassign */ import type { OperationArgs } from 'graphql-http' -import type { GraphQLInfo } from 'payload/config' -import type { SanitizedConfig } from 'payload/types' +import type { GraphQLInfo, SanitizedConfig } from 'payload' import * as GraphQL from 'graphql' diff --git a/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts b/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts index 219972d8f2..4c28a862f0 100644 --- a/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts +++ b/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts @@ -18,7 +18,8 @@ import type { GraphQLSchema, GraphQLUnionType, InlineFragmentNode, - OperationDefinitionNode} from 'graphql'; + OperationDefinitionNode, +} from 'graphql' import { GraphQLError, diff --git a/packages/graphql/src/resolvers/auth/access.ts b/packages/graphql/src/resolvers/auth/access.ts index f40142d764..0ec80f0ba8 100644 --- a/packages/graphql/src/resolvers/auth/access.ts +++ b/packages/graphql/src/resolvers/auth/access.ts @@ -1,7 +1,6 @@ -import type { SanitizedConfig } from 'payload/types' +import type { SanitizedConfig } from 'payload' -import { accessOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { accessOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/forgotPassword.ts b/packages/graphql/src/resolvers/auth/forgotPassword.ts index 7c8933e3a7..7a2ee1df55 100644 --- a/packages/graphql/src/resolvers/auth/forgotPassword.ts +++ b/packages/graphql/src/resolvers/auth/forgotPassword.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { forgotPasswordOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { forgotPasswordOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/init.ts b/packages/graphql/src/resolvers/auth/init.ts index faaace2135..e9d72cd628 100644 --- a/packages/graphql/src/resolvers/auth/init.ts +++ b/packages/graphql/src/resolvers/auth/init.ts @@ -1,5 +1,4 @@ -import { initOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { initOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/login.ts b/packages/graphql/src/resolvers/auth/login.ts index 7cfe683824..6584d01f0d 100644 --- a/packages/graphql/src/resolvers/auth/login.ts +++ b/packages/graphql/src/resolvers/auth/login.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { generatePayloadCookie } from 'payload/auth' -import { loginOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { generatePayloadCookie, isolateObjectProperty, loginOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/logout.ts b/packages/graphql/src/resolvers/auth/logout.ts index 7e65b544f7..73d9f175b9 100644 --- a/packages/graphql/src/resolvers/auth/logout.ts +++ b/packages/graphql/src/resolvers/auth/logout.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { generateExpiredPayloadCookie } from 'payload/auth' -import { logoutOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { generateExpiredPayloadCookie, isolateObjectProperty, logoutOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/me.ts b/packages/graphql/src/resolvers/auth/me.ts index b406b59682..69bb1ce7fb 100644 --- a/packages/graphql/src/resolvers/auth/me.ts +++ b/packages/graphql/src/resolvers/auth/me.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { meOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, meOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/refresh.ts b/packages/graphql/src/resolvers/auth/refresh.ts index 5747d86d62..0722fed8a3 100644 --- a/packages/graphql/src/resolvers/auth/refresh.ts +++ b/packages/graphql/src/resolvers/auth/refresh.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { extractJWT, generatePayloadCookie } from 'payload/auth' -import { refreshOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { extractJWT, generatePayloadCookie, isolateObjectProperty, refreshOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/resetPassword.ts b/packages/graphql/src/resolvers/auth/resetPassword.ts index 6610b5c003..27d7eda0eb 100644 --- a/packages/graphql/src/resolvers/auth/resetPassword.ts +++ b/packages/graphql/src/resolvers/auth/resetPassword.ts @@ -1,8 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { generatePayloadCookie } from 'payload/auth' -import { resetPasswordOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { generatePayloadCookie, isolateObjectProperty, resetPasswordOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/unlock.ts b/packages/graphql/src/resolvers/auth/unlock.ts index 4bb15242dd..1ac27673a2 100644 --- a/packages/graphql/src/resolvers/auth/unlock.ts +++ b/packages/graphql/src/resolvers/auth/unlock.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { unlockOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, unlockOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/auth/verifyEmail.ts b/packages/graphql/src/resolvers/auth/verifyEmail.ts index ce4ffde6e3..c6d50b055f 100644 --- a/packages/graphql/src/resolvers/auth/verifyEmail.ts +++ b/packages/graphql/src/resolvers/auth/verifyEmail.ts @@ -1,7 +1,6 @@ -import type { Collection } from 'payload/types' +import type { Collection } from 'payload' -import { verifyEmailOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, verifyEmailOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/count.ts b/packages/graphql/src/resolvers/collections/count.ts index 0563ed3564..127e28b7f2 100644 --- a/packages/graphql/src/resolvers/collections/count.ts +++ b/packages/graphql/src/resolvers/collections/count.ts @@ -1,7 +1,6 @@ -import type { Collection, PayloadRequestWithData , Where } from 'payload/types' +import type { Collection, PayloadRequestWithData, Where } from 'payload' -import { countOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { countOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/create.ts b/packages/graphql/src/resolvers/collections/create.ts index 6999bb8f6c..86c11f1c52 100644 --- a/packages/graphql/src/resolvers/collections/create.ts +++ b/packages/graphql/src/resolvers/collections/create.ts @@ -1,9 +1,7 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' import type { MarkOptional } from 'ts-essentials' -import { createOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { createOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/delete.ts b/packages/graphql/src/resolvers/collections/delete.ts index c78f12dad4..343004cb39 100644 --- a/packages/graphql/src/resolvers/collections/delete.ts +++ b/packages/graphql/src/resolvers/collections/delete.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { deleteByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { deleteByIDOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/docAccess.ts b/packages/graphql/src/resolvers/collections/docAccess.ts index f4e6f41355..f5f7b95ecb 100644 --- a/packages/graphql/src/resolvers/collections/docAccess.ts +++ b/packages/graphql/src/resolvers/collections/docAccess.ts @@ -1,8 +1,11 @@ -import type { CollectionPermission, GlobalPermission } from 'payload/auth' -import type { Collection, PayloadRequestWithData } from 'payload/types' +import type { + Collection, + CollectionPermission, + GlobalPermission, + PayloadRequestWithData, +} from 'payload' -import { docAccessOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { docAccessOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/duplicate.ts b/packages/graphql/src/resolvers/collections/duplicate.ts index c714fdf519..9fd041d7b2 100644 --- a/packages/graphql/src/resolvers/collections/duplicate.ts +++ b/packages/graphql/src/resolvers/collections/duplicate.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { duplicateOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { duplicateOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/find.ts b/packages/graphql/src/resolvers/collections/find.ts index 60a82ff917..c25da5ac6b 100644 --- a/packages/graphql/src/resolvers/collections/find.ts +++ b/packages/graphql/src/resolvers/collections/find.ts @@ -1,8 +1,6 @@ -import type { PaginatedDocs } from 'payload/database' -import type { Collection, PayloadRequestWithData , Where } from 'payload/types' +import type { Collection, PaginatedDocs, PayloadRequestWithData, Where } from 'payload' -import { findOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/findByID.ts b/packages/graphql/src/resolvers/collections/findByID.ts index 0bbcf85a9c..a2623edaec 100644 --- a/packages/graphql/src/resolvers/collections/findByID.ts +++ b/packages/graphql/src/resolvers/collections/findByID.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { findByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findByIDOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/findVersionByID.ts b/packages/graphql/src/resolvers/collections/findVersionByID.ts index 14b8b1c354..85729327fe 100644 --- a/packages/graphql/src/resolvers/collections/findVersionByID.ts +++ b/packages/graphql/src/resolvers/collections/findVersionByID.ts @@ -1,8 +1,6 @@ -import type { Collection , PayloadRequestWithData, TypeWithID } from 'payload/types' -import type { TypeWithVersion } from 'payload/versions' +import type { Collection, PayloadRequestWithData, TypeWithID, TypeWithVersion } from 'payload' -import { findVersionByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionByIDOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/findVersions.ts b/packages/graphql/src/resolvers/collections/findVersions.ts index 6e379e5400..c4f256f969 100644 --- a/packages/graphql/src/resolvers/collections/findVersions.ts +++ b/packages/graphql/src/resolvers/collections/findVersions.ts @@ -1,8 +1,6 @@ -import type { PaginatedDocs } from 'payload/database' -import type { Collection, PayloadRequestWithData , Where } from 'payload/types' +import type { Collection, PaginatedDocs, PayloadRequestWithData, Where } from 'payload' -import { findVersionsOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionsOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/restoreVersion.ts b/packages/graphql/src/resolvers/collections/restoreVersion.ts index 882e5888e4..396fae0643 100644 --- a/packages/graphql/src/resolvers/collections/restoreVersion.ts +++ b/packages/graphql/src/resolvers/collections/restoreVersion.ts @@ -1,7 +1,6 @@ -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, PayloadRequestWithData } from 'payload' -import { restoreVersionOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, restoreVersionOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/collections/update.ts b/packages/graphql/src/resolvers/collections/update.ts index d8efc320ae..e8b2203044 100644 --- a/packages/graphql/src/resolvers/collections/update.ts +++ b/packages/graphql/src/resolvers/collections/update.ts @@ -1,8 +1,6 @@ -import type { GeneratedTypes } from 'payload' -import type { Collection , PayloadRequestWithData } from 'payload/types' +import type { Collection, GeneratedTypes, PayloadRequestWithData } from 'payload' -import { updateByIDOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, updateByIDOperation } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/docAccess.ts b/packages/graphql/src/resolvers/globals/docAccess.ts index 1a36d15050..bbccdd5c7c 100644 --- a/packages/graphql/src/resolvers/globals/docAccess.ts +++ b/packages/graphql/src/resolvers/globals/docAccess.ts @@ -1,8 +1,11 @@ -import type { CollectionPermission, GlobalPermission } from 'payload/auth' -import type { PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { + CollectionPermission, + GlobalPermission, + PayloadRequestWithData, + SanitizedGlobalConfig, +} from 'payload' -import { docAccessOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { docAccessOperationGlobal, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/findOne.ts b/packages/graphql/src/resolvers/globals/findOne.ts index c5d499e4fa..b8bd357fda 100644 --- a/packages/graphql/src/resolvers/globals/findOne.ts +++ b/packages/graphql/src/resolvers/globals/findOne.ts @@ -1,7 +1,6 @@ -import type { Document, SanitizedGlobalConfig } from 'payload/types' +import type { Document, SanitizedGlobalConfig } from 'payload' -import { findOneOperation } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findOneOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/findVersionByID.ts b/packages/graphql/src/resolvers/globals/findVersionByID.ts index be6a072e14..57717768d8 100644 --- a/packages/graphql/src/resolvers/globals/findVersionByID.ts +++ b/packages/graphql/src/resolvers/globals/findVersionByID.ts @@ -1,7 +1,6 @@ -import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload' -import { findVersionByIDOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionByIDOperationGlobal, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/findVersions.ts b/packages/graphql/src/resolvers/globals/findVersions.ts index 38ef27d9be..824646aae2 100644 --- a/packages/graphql/src/resolvers/globals/findVersions.ts +++ b/packages/graphql/src/resolvers/globals/findVersions.ts @@ -1,7 +1,6 @@ -import type { Document, PayloadRequestWithData, SanitizedGlobalConfig, Where } from 'payload/types' +import type { Document, PayloadRequestWithData, SanitizedGlobalConfig, Where } from 'payload' -import { findVersionsOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { findVersionsOperationGlobal, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/restoreVersion.ts b/packages/graphql/src/resolvers/globals/restoreVersion.ts index f8eb61dcee..fb289d50f8 100644 --- a/packages/graphql/src/resolvers/globals/restoreVersion.ts +++ b/packages/graphql/src/resolvers/globals/restoreVersion.ts @@ -1,7 +1,6 @@ -import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { Document, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload' -import { restoreVersionOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, restoreVersionOperationGlobal } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/globals/update.ts b/packages/graphql/src/resolvers/globals/update.ts index 3b574af920..bb4ef65058 100644 --- a/packages/graphql/src/resolvers/globals/update.ts +++ b/packages/graphql/src/resolvers/globals/update.ts @@ -1,9 +1,7 @@ -import type { GeneratedTypes } from 'payload' -import type { PayloadRequestWithData, SanitizedGlobalConfig } from 'payload/types' +import type { GeneratedTypes, PayloadRequestWithData, SanitizedGlobalConfig } from 'payload' import type { DeepPartial } from 'ts-essentials' -import { updateOperationGlobal } from 'payload/operations' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty, updateOperationGlobal } from 'payload' import type { Context } from '../types.js' diff --git a/packages/graphql/src/resolvers/types.ts b/packages/graphql/src/resolvers/types.ts index 53d0fcabea..8309193bf0 100644 --- a/packages/graphql/src/resolvers/types.ts +++ b/packages/graphql/src/resolvers/types.ts @@ -1,4 +1,4 @@ -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' export type Context = { headers: { diff --git a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts index ac0168026a..5b5ee0e8da 100644 --- a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts +++ b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts @@ -1,4 +1,4 @@ -import type { SanitizedLocalizationConfig } from 'payload/config' +import type { SanitizedLocalizationConfig } from 'payload' import { GraphQLEnumType } from 'graphql' diff --git a/packages/graphql/src/schema/buildLocaleInputType.ts b/packages/graphql/src/schema/buildLocaleInputType.ts index 7be6bdff93..73d414e04b 100644 --- a/packages/graphql/src/schema/buildLocaleInputType.ts +++ b/packages/graphql/src/schema/buildLocaleInputType.ts @@ -1,5 +1,5 @@ import type { GraphQLScalarType } from 'graphql' -import type { SanitizedLocalizationConfig } from 'payload/config' +import type { SanitizedLocalizationConfig } from 'payload' import { GraphQLEnumType } from 'graphql' diff --git a/packages/graphql/src/schema/buildMutationInputType.ts b/packages/graphql/src/schema/buildMutationInputType.ts index 2e249f59d9..1260b6883c 100644 --- a/packages/graphql/src/schema/buildMutationInputType.ts +++ b/packages/graphql/src/schema/buildMutationInputType.ts @@ -1,5 +1,4 @@ import type { GraphQLInputFieldConfig, GraphQLScalarType, GraphQLType } from 'graphql' -import type { GraphQLInfo } from 'payload/config' import type { ArrayField, BlockField, @@ -9,6 +8,7 @@ import type { DateField, EmailField, Field, + GraphQLInfo, GroupField, JSONField, NumberField, @@ -24,7 +24,7 @@ import type { TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import { GraphQLBoolean, @@ -36,8 +36,8 @@ import { GraphQLNonNull, GraphQLString, } from 'graphql' -import { fieldAffectsData, optionIsObject, tabHasName } from 'payload/types' -import { flattenTopLevelFields , toWords } from 'payload/utilities' +import { flattenTopLevelFields, toWords } from 'payload' +import { fieldAffectsData, optionIsObject, tabHasName } from 'payload/shared' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' import combineParentName from '../utilities/combineParentName.js' diff --git a/packages/graphql/src/schema/buildObjectType.ts b/packages/graphql/src/schema/buildObjectType.ts index 8464a03526..a718e8c741 100644 --- a/packages/graphql/src/schema/buildObjectType.ts +++ b/packages/graphql/src/schema/buildObjectType.ts @@ -2,7 +2,6 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable no-restricted-syntax */ import type { GraphQLFieldConfig, GraphQLType } from 'graphql' -import type { GraphQLInfo } from 'payload/config' import type { ArrayField, BlockField, @@ -12,6 +11,7 @@ import type { DateField, EmailField, Field, + GraphQLInfo, GroupField, JSONField, NumberField, @@ -27,7 +27,7 @@ import type { TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import { GraphQLBoolean, @@ -41,9 +41,8 @@ import { GraphQLUnionType, } from 'graphql' import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars' -import { MissingEditorProp } from 'payload/errors' -import { tabHasName } from 'payload/types' -import { createDataloaderCacheKey, toWords } from 'payload/utilities' +import { MissingEditorProp, createDataloaderCacheKey, toWords } from 'payload' +import { tabHasName } from 'payload/shared' import type { Context } from '../resolvers/types.js' diff --git a/packages/graphql/src/schema/buildPoliciesType.ts b/packages/graphql/src/schema/buildPoliciesType.ts index 14a2c8c396..921045ccec 100644 --- a/packages/graphql/src/schema/buildPoliciesType.ts +++ b/packages/graphql/src/schema/buildPoliciesType.ts @@ -5,10 +5,10 @@ import type { SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig, -} from 'payload/types' +} from 'payload' import { GraphQLBoolean, GraphQLNonNull, GraphQLObjectType } from 'graphql' -import { toWords } from 'payload/utilities' +import { toWords } from 'payload' import { GraphQLJSONObject } from '../packages/graphql-type-json/index.js' import formatName from '../utilities/formatName.js' diff --git a/packages/graphql/src/schema/buildWhereInputType.ts b/packages/graphql/src/schema/buildWhereInputType.ts index aacc5170e9..9a14337fd0 100644 --- a/packages/graphql/src/schema/buildWhereInputType.ts +++ b/packages/graphql/src/schema/buildWhereInputType.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ -import type { Field, FieldAffectingData } from 'payload/types' +import type { Field, FieldAffectingData } from 'payload' import { GraphQLInputObjectType, GraphQLList } from 'graphql' -import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from 'payload/types' -import { flattenTopLevelFields } from 'payload/utilities' +import { flattenTopLevelFields } from 'payload' +import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from 'payload/shared' import formatName from '../utilities/formatName.js' import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' diff --git a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts index 0650f37995..69b0f3da5d 100644 --- a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts +++ b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts @@ -18,7 +18,7 @@ import type { TextField, TextareaField, UploadField, -} from 'payload/types' +} from 'payload' import { GraphQLEnumType, GraphQLInputObjectType } from 'graphql' diff --git a/packages/graphql/src/schema/initCollections.ts b/packages/graphql/src/schema/initCollections.ts index 33e057d8c3..caf47d093c 100644 --- a/packages/graphql/src/schema/initCollections.ts +++ b/packages/graphql/src/schema/initCollections.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -import type { GraphQLInfo } from 'payload/config' -import type { Collection, Field, SanitizedCollectionConfig, SanitizedConfig } from 'payload/types' +import type { GraphQLInfo } from 'payload' +import type { Collection, Field, SanitizedCollectionConfig, SanitizedConfig } from 'payload' import { GraphQLBoolean, @@ -9,9 +9,8 @@ import { GraphQLObjectType, GraphQLString, } from 'graphql' -import { fieldAffectsData } from 'payload/types' -import { flattenTopLevelFields, formatNames, toWords } from 'payload/utilities' -import { buildVersionCollectionFields } from 'payload/versions' +import { buildVersionCollectionFields, flattenTopLevelFields, formatNames, toWords } from 'payload' +import { fieldAffectsData } from 'payload/shared' import type { ObjectTypeConfig } from './buildObjectType.js' diff --git a/packages/graphql/src/schema/initGlobals.ts b/packages/graphql/src/schema/initGlobals.ts index 6f8875ef90..37dc6c567b 100644 --- a/packages/graphql/src/schema/initGlobals.ts +++ b/packages/graphql/src/schema/initGlobals.ts @@ -3,11 +3,9 @@ import { GraphQLBoolean, GraphQLInt, GraphQLNonNull, GraphQLString } from 'graph import pluralize from 'pluralize' const { singular } = pluralize -import type { GraphQLInfo } from 'payload/config' -import type { Field, SanitizedConfig, SanitizedGlobalConfig } from 'payload/types' +import type { Field, GraphQLInfo, SanitizedConfig, SanitizedGlobalConfig } from 'payload' -import { toWords } from 'payload/utilities' -import { buildVersionGlobalFields } from 'payload/versions' +import { buildVersionGlobalFields, toWords } from 'payload' import { docAccessResolver } from '../resolvers/globals/docAccess.js' import findOneResolver from '../resolvers/globals/findOne.js' diff --git a/packages/graphql/src/schema/isFieldNullable.ts b/packages/graphql/src/schema/isFieldNullable.ts index 2d6f15fe3c..f85d64e7b6 100644 --- a/packages/graphql/src/schema/isFieldNullable.ts +++ b/packages/graphql/src/schema/isFieldNullable.ts @@ -1,6 +1,6 @@ -import type { FieldAffectingData } from 'payload/types' +import type { FieldAffectingData } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean => { const hasReadAccessControl = field.access && field.access.read diff --git a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts index 3051efb9bb..aa0d21076d 100644 --- a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts +++ b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts @@ -1,6 +1,6 @@ -import type { FieldWithSubFields, TabsField } from 'payload/types' +import type { FieldWithSubFields, TabsField } from 'payload' -import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types' +import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/shared' import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' diff --git a/packages/graphql/src/schema/withNullableType.ts b/packages/graphql/src/schema/withNullableType.ts index a71628f79f..84f4a21d8d 100644 --- a/packages/graphql/src/schema/withNullableType.ts +++ b/packages/graphql/src/schema/withNullableType.ts @@ -1,5 +1,5 @@ import type { GraphQLType } from 'graphql' -import type { FieldAffectingData } from 'payload/types' +import type { FieldAffectingData } from 'payload' import { GraphQLNonNull } from 'graphql' diff --git a/packages/graphql/src/schema/withOperators.ts b/packages/graphql/src/schema/withOperators.ts index be1767d378..8e0d153d54 100644 --- a/packages/graphql/src/schema/withOperators.ts +++ b/packages/graphql/src/schema/withOperators.ts @@ -1,5 +1,5 @@ import type { GraphQLType } from 'graphql' -import type { FieldAffectingData, NumberField, RadioField, SelectField } from 'payload/types' +import type { FieldAffectingData, NumberField, RadioField, SelectField } from 'payload' import { GraphQLBoolean, @@ -11,7 +11,7 @@ import { GraphQLString, } from 'graphql' import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars' -import { optionIsObject } from 'payload/types' +import { optionIsObject } from 'payload/shared' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' import combineParentName from '../utilities/combineParentName.js' diff --git a/packages/graphql/src/utilities/formatOptions.ts b/packages/graphql/src/utilities/formatOptions.ts index 82eaffd762..2b137289b5 100644 --- a/packages/graphql/src/utilities/formatOptions.ts +++ b/packages/graphql/src/utilities/formatOptions.ts @@ -1,4 +1,4 @@ -import type { RadioField, SelectField } from 'payload/types' +import type { RadioField, SelectField } from 'payload' import formatName from './formatName.js' diff --git a/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts b/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts index c317a7e415..77458dcc30 100644 --- a/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts +++ b/packages/graphql/src/utilities/groupOrTabHasRequiredSubfield.ts @@ -1,6 +1,6 @@ -import type { Field, Tab } from 'payload/types' +import type { Field, Tab } from 'payload' -import { fieldAffectsData } from 'payload/types' +import { fieldAffectsData } from 'payload/shared' export const groupOrTabHasRequiredSubfield = (entity: Field | Tab): boolean => { if ('type' in entity && entity.type === 'group') { diff --git a/packages/graphql/src/utilities/wrapCustomResolver.ts b/packages/graphql/src/utilities/wrapCustomResolver.ts index 4f02ba4a8b..6e44734fbc 100644 --- a/packages/graphql/src/utilities/wrapCustomResolver.ts +++ b/packages/graphql/src/utilities/wrapCustomResolver.ts @@ -1,8 +1,8 @@ import type { ObjMap } from 'graphql/jsutils/ObjMap.js' import type { GraphQLFieldConfig, GraphQLFieldResolver } from 'graphql/type/definition.js' -import type { PayloadRequestWithData } from 'payload/types' +import type { PayloadRequestWithData } from 'payload' -import { isolateObjectProperty } from 'payload/utilities' +import { isolateObjectProperty } from 'payload' type PayloadContext = { req: PayloadRequestWithData } diff --git a/packages/graphql/tsconfig.json b/packages/graphql/tsconfig.json index b9f266b7ee..7da6b51b77 100644 --- a/packages/graphql/tsconfig.json +++ b/packages/graphql/tsconfig.json @@ -5,7 +5,7 @@ "noEmit": false /* Do not emit outputs. */, "emitDeclarationOnly": true, "outDir": "./dist" /* Specify an output folder for all emitted files. */, - "rootDir": "./src" /* Specify the root folder within your source files. */, + "rootDir": "./src" /* Specify the root folder within your source files. */ }, "exclude": [ "dist", diff --git a/packages/live-preview-react/package.json b/packages/live-preview-react/package.json index 9c9c990055..d9de4dc0d8 100644 --- a/packages/live-preview-react/package.json +++ b/packages/live-preview-react/package.json @@ -23,8 +23,8 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm copyfiles && pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/", diff --git a/packages/live-preview-vue/package.json b/packages/live-preview-vue/package.json index fe6763a96e..6228857ae0 100644 --- a/packages/live-preview-vue/package.json +++ b/packages/live-preview-vue/package.json @@ -23,8 +23,8 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm copyfiles && pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/", diff --git a/packages/live-preview/package.json b/packages/live-preview/package.json index eaaf7448b6..9fbbc85037 100644 --- a/packages/live-preview/package.json +++ b/packages/live-preview/package.json @@ -23,8 +23,8 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "pnpm copyfiles && pnpm build:types && pnpm build:swc", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "clean": "rimraf {dist,*.tsbuildinfo}", "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/", diff --git a/packages/live-preview/src/mergeData.ts b/packages/live-preview/src/mergeData.ts index e1cf642747..a40a2e2d11 100644 --- a/packages/live-preview/src/mergeData.ts +++ b/packages/live-preview/src/mergeData.ts @@ -1,5 +1,5 @@ -import type { PaginatedDocs } from 'payload/database' -import type { fieldSchemaToJSON } from 'payload/utilities' +import type { PaginatedDocs } from 'payload' +import type { fieldSchemaToJSON } from 'payload/shared' import type { PopulationsByCollection, UpdatedDocument } from './types.js' diff --git a/packages/live-preview/src/traverseFields.ts b/packages/live-preview/src/traverseFields.ts index 096901ae3c..fa7b722c1b 100644 --- a/packages/live-preview/src/traverseFields.ts +++ b/packages/live-preview/src/traverseFields.ts @@ -1,4 +1,4 @@ -import type { fieldSchemaToJSON } from 'payload/utilities' +import type { fieldSchemaToJSON } from 'payload/shared' import type { PopulationsByCollection, UpdatedDocument } from './types.js' diff --git a/packages/next/package.json b/packages/next/package.json index 1323abfb41..7fd6184d8e 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -30,9 +30,9 @@ "dist" ], "scripts": { - "build": "pnpm copyfiles && pnpm build:swc && pnpm build:cjs && pnpm build:types && pnpm build:webpack && rm dist/prod/index.js", - "build:cjs": "swc ./src/withPayload.js -o ./dist/cjs/withPayload.cjs --config-file .swcrc-cjs", - "build:swc": "swc ./src -d ./dist --config-file .swcrc", + "build": "rm -rf dist && rm -rf tsconfig.tsbuildinfo && pnpm copyfiles && pnpm build:types && pnpm build:swc && pnpm build:cjs && pnpm build:webpack", + "build:cjs": "swc ./src/withPayload.js -o ./dist/cjs/withPayload.cjs --config-file .swcrc-cjs --strip-leading-paths", + "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths", "build:types": "tsc --emitDeclarationOnly --outDir dist", "build:webpack": "webpack --config webpack.config.js", "clean": "rimraf {dist,*.tsbuildinfo}", diff --git a/packages/next/src/config.ts b/packages/next/src/config.ts index e27fdc9694..b091e2b604 100644 --- a/packages/next/src/config.ts +++ b/packages/next/src/config.ts @@ -1,3 +1,3 @@ -import type { SanitizedConfig } from 'payload/config' +import type { SanitizedConfig } from 'payload' export default {} as Promise diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx b/packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx similarity index 84% rename from packages/ui/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/ShouldRenderTabs.tsx index 9df2e3f258..19abd43531 100644 --- a/packages/ui/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 '../../../providers/DocumentInfo/index.js' +import { useDocumentInfo } from '@payloadcms/ui/client' export const ShouldRenderTabs: React.FC<{ children: React.ReactNode diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx b/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx similarity index 93% rename from packages/ui/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx index 2b5b558252..a9d7a5f219 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx @@ -1,12 +1,11 @@ 'use client' -import type { SanitizedConfig } from 'payload/types' +import type { SanitizedConfig } from 'payload' +import { useSearchParams } from '@payloadcms/ui/client' import LinkImport from 'next/link.js' import { useParams, usePathname } from 'next/navigation.js' import React from 'react' -import { useSearchParams } from '../../../../providers/SearchParams/index.js' - const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default export const DocumentTabLink: React.FC<{ diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.scss b/packages/next/src/elements/DocumentHeader/Tabs/Tab/index.scss similarity index 100% rename from packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.scss rename to packages/next/src/elements/DocumentHeader/Tabs/Tab/index.scss diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/Tab/index.tsx similarity index 99% rename from packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/Tab/index.tsx index aba6ace78d..46b48e442a 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/Tab/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/Tab/index.tsx @@ -1,4 +1,4 @@ -import type { DocumentTabConfig, DocumentTabProps } from 'payload/types' +import type { DocumentTabConfig, DocumentTabProps } from 'payload' import React, { Fragment } from 'react' diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/getCustomViews.ts b/packages/next/src/elements/DocumentHeader/Tabs/getCustomViews.ts similarity index 90% rename from packages/ui/src/elements/DocumentHeader/Tabs/getCustomViews.ts rename to packages/next/src/elements/DocumentHeader/Tabs/getCustomViews.ts index 7e837c2052..e791169649 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/getCustomViews.ts +++ b/packages/next/src/elements/DocumentHeader/Tabs/getCustomViews.ts @@ -1,5 +1,4 @@ -import type { EditViewConfig } from 'payload/config' -import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload/types' +import type { EditViewConfig, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload' import { documentViewKeys } from './tabs/index.js' diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/getViewConfig.ts b/packages/next/src/elements/DocumentHeader/Tabs/getViewConfig.ts similarity index 86% rename from packages/ui/src/elements/DocumentHeader/Tabs/getViewConfig.ts rename to packages/next/src/elements/DocumentHeader/Tabs/getViewConfig.ts index db781cc31b..1b12d6342c 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/getViewConfig.ts +++ b/packages/next/src/elements/DocumentHeader/Tabs/getViewConfig.ts @@ -1,5 +1,4 @@ -import type { EditViewConfig } from 'payload/config' -import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload/types' +import type { EditViewConfig, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload' export const getViewConfig = (args: { collectionConfig: SanitizedCollectionConfig diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/index.scss b/packages/next/src/elements/DocumentHeader/Tabs/index.scss similarity index 100% rename from packages/ui/src/elements/DocumentHeader/Tabs/index.scss rename to packages/next/src/elements/DocumentHeader/Tabs/index.scss diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/index.tsx similarity index 96% rename from packages/ui/src/elements/DocumentHeader/Tabs/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/index.tsx index 4ad8e03199..2d40465f9a 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/index.tsx @@ -1,12 +1,12 @@ import type { I18n } from '@payloadcms/translations' -import type { Permissions } from 'payload/auth' import type { + Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig, -} from 'payload/types' +} from 'payload' -import { isPlainObject } from 'payload/utilities' +import { isPlainObject } from 'payload' import React from 'react' import { ShouldRenderTabs } from './ShouldRenderTabs.js' diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx similarity index 90% rename from packages/ui/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx index ec0e3baefb..1810e5a256 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/tabs/VersionsPill/index.tsx @@ -1,7 +1,7 @@ 'use client' +import { useDocumentInfo } from '@payloadcms/ui/client' import React, { Fragment } from 'react' -import { useDocumentInfo } from '../../../../../providers/DocumentInfo/index.js' import { baseClass } from '../../Tab/index.js' export const VersionsPill: React.FC = () => { diff --git a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/index.tsx b/packages/next/src/elements/DocumentHeader/Tabs/tabs/index.tsx similarity index 97% rename from packages/ui/src/elements/DocumentHeader/Tabs/tabs/index.tsx rename to packages/next/src/elements/DocumentHeader/Tabs/tabs/index.tsx index 2b01af9a10..913945ad59 100644 --- a/packages/ui/src/elements/DocumentHeader/Tabs/tabs/index.tsx +++ b/packages/next/src/elements/DocumentHeader/Tabs/tabs/index.tsx @@ -1,4 +1,4 @@ -import type { DocumentTabConfig } from 'payload/types' +import type { DocumentTabConfig } from 'payload' import { VersionsPill } from './VersionsPill/index.js' diff --git a/packages/ui/src/elements/DocumentHeader/index.scss b/packages/next/src/elements/DocumentHeader/index.scss similarity index 100% rename from packages/ui/src/elements/DocumentHeader/index.scss rename to packages/next/src/elements/DocumentHeader/index.scss diff --git a/packages/ui/src/elements/DocumentHeader/index.tsx b/packages/next/src/elements/DocumentHeader/index.tsx similarity index 87% rename from packages/ui/src/elements/DocumentHeader/index.tsx rename to packages/next/src/elements/DocumentHeader/index.tsx index 10fda0cef7..496c1db8b4 100644 --- a/packages/ui/src/elements/DocumentHeader/index.tsx +++ b/packages/next/src/elements/DocumentHeader/index.tsx @@ -1,15 +1,14 @@ import type { I18n } from '@payloadcms/translations' -import type { Permissions } from 'payload/auth' import type { + Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig, -} from 'payload/types' +} from 'payload' +import { Gutter, RenderTitle } from '@payloadcms/ui/client' import React, { Fragment } from 'react' -import { Gutter } from '../Gutter/index.js' -import { RenderTitle } from '../RenderTitle/index.js' import { DocumentTabs } from './Tabs/index.js' import './index.scss' diff --git a/packages/next/src/elements/LeaveWithoutSaving/index.tsx b/packages/next/src/elements/LeaveWithoutSaving/index.tsx index 8956fd42db..b96f5448c4 100644 --- a/packages/next/src/elements/LeaveWithoutSaving/index.tsx +++ b/packages/next/src/elements/LeaveWithoutSaving/index.tsx @@ -1,9 +1,12 @@ 'use client' -import { Button } from '@payloadcms/ui/elements/Button' -import { Modal, useModal } from '@payloadcms/ui/elements/Modal' -import { useFormModified } from '@payloadcms/ui/forms/Form' -import { useAuth } from '@payloadcms/ui/providers/Auth' -import { useTranslation } from '@payloadcms/ui/providers/Translation' +import { + Button, + Modal, + useAuth, + useFormModified, + useModal, + useTranslation, +} from '@payloadcms/ui/client' import React, { useCallback, useEffect } from 'react' import './index.scss' diff --git a/packages/next/src/elements/Logo/index.tsx b/packages/next/src/elements/Logo/index.tsx new file mode 100644 index 0000000000..b14688c002 --- /dev/null +++ b/packages/next/src/elements/Logo/index.tsx @@ -0,0 +1,34 @@ +import type { ServerProps } from 'payload' + +import { PayloadLogo, RenderCustomComponent } from '@payloadcms/ui/shared' +import React from 'react' + +export const Logo: React.FC = (props) => { + const { i18n, locale, params, payload, permissions, searchParams, user } = props + + const { + admin: { + components: { + graphics: { Logo: CustomLogo } = { + Logo: undefined, + }, + } = {}, + } = {}, + } = payload.config + + return ( + + ) +} diff --git a/packages/ui/src/elements/Nav/NavHamburger/index.tsx b/packages/next/src/elements/Nav/NavHamburger/index.tsx similarity index 81% rename from packages/ui/src/elements/Nav/NavHamburger/index.tsx rename to packages/next/src/elements/Nav/NavHamburger/index.tsx index 441a09463c..e0f60d8f54 100644 --- a/packages/ui/src/elements/Nav/NavHamburger/index.tsx +++ b/packages/next/src/elements/Nav/NavHamburger/index.tsx @@ -1,9 +1,7 @@ 'use client' +import { Hamburger, useNav } from '@payloadcms/ui/client' import React from 'react' -import { Hamburger } from '../../Hamburger/index.js' -import { useNav } from '../context.js' - export const NavHamburger: React.FC<{ baseClass?: string }> = ({ baseClass }) => { diff --git a/packages/ui/src/elements/Nav/NavWrapper/index.scss b/packages/next/src/elements/Nav/NavWrapper/index.scss similarity index 100% rename from packages/ui/src/elements/Nav/NavWrapper/index.scss rename to packages/next/src/elements/Nav/NavWrapper/index.scss diff --git a/packages/ui/src/elements/Nav/NavWrapper/index.tsx b/packages/next/src/elements/Nav/NavWrapper/index.tsx similarity index 90% rename from packages/ui/src/elements/Nav/NavWrapper/index.tsx rename to packages/next/src/elements/Nav/NavWrapper/index.tsx index 995a3985a5..fca1a5959a 100644 --- a/packages/ui/src/elements/Nav/NavWrapper/index.tsx +++ b/packages/next/src/elements/Nav/NavWrapper/index.tsx @@ -1,7 +1,7 @@ 'use client' +import { useNav } from '@payloadcms/ui/client' import React from 'react' -import { useNav } from '../context.js' import './index.scss' export const NavWrapper: React.FC<{ diff --git a/packages/ui/src/elements/Nav/index.client.tsx b/packages/next/src/elements/Nav/index.client.tsx similarity index 81% rename from packages/ui/src/elements/Nav/index.client.tsx rename to packages/next/src/elements/Nav/index.client.tsx index dbfe58562d..7a4879ebf5 100644 --- a/packages/ui/src/elements/Nav/index.client.tsx +++ b/packages/next/src/elements/Nav/index.client.tsx @@ -1,20 +1,21 @@ 'use client' +import type { EntityToGroup } from '@payloadcms/ui/utilities/groupNavItems' + import { getTranslation } from '@payloadcms/translations' +import { + ChevronIcon, + NavGroup, + useAuth, + useConfig, + useEntityVisibility, + useNav, + useTranslation, +} from '@payloadcms/ui/client' +import { EntityType, groupNavItems } from '@payloadcms/ui/shared' import LinkWithDefault from 'next/link.js' import React, { Fragment } from 'react' -import type { EntityToGroup } from '../../utilities/groupNavItems.js' - -import { Chevron } from '../../icons/Chevron/index.js' -import { useAuth } from '../../providers/Auth/index.js' -import { useConfig } from '../../providers/Config/index.js' -import { useEntityVisibility } from '../../providers/EntityVisibility/index.js' -import { useTranslation } from '../../providers/Translation/index.js' -import { EntityType, groupNavItems } from '../../utilities/groupNavItems.js' -import { NavGroup } from '../NavGroup/index.js' -import { useNav } from './context.js' - const baseClass = 'nav' export const DefaultNavClient: React.FC = () => { @@ -93,7 +94,7 @@ export const DefaultNavClient: React.FC = () => { tabIndex={!navOpen ? -1 : undefined} > - + {entityLabel} diff --git a/packages/ui/src/elements/Nav/index.scss b/packages/next/src/elements/Nav/index.scss similarity index 100% rename from packages/ui/src/elements/Nav/index.scss rename to packages/next/src/elements/Nav/index.scss diff --git a/packages/ui/src/elements/Nav/index.tsx b/packages/next/src/elements/Nav/index.tsx similarity index 92% rename from packages/ui/src/elements/Nav/index.tsx rename to packages/next/src/elements/Nav/index.tsx index d51e49b871..7ead54cc9f 100644 --- a/packages/ui/src/elements/Nav/index.tsx +++ b/packages/next/src/elements/Nav/index.tsx @@ -1,15 +1,16 @@ -import type { ServerProps } from 'payload/config' +import type { ServerProps } from 'payload' +import { Logout } from '@payloadcms/ui/client' import React from 'react' -import { Logout } from '../Logout/index.js' import { NavHamburger } from './NavHamburger/index.js' import { NavWrapper } from './NavWrapper/index.js' import './index.scss' const baseClass = 'nav' -import { WithServerSideProps } from '../WithServerSideProps/index.js' +import { WithServerSideProps } from '@payloadcms/ui/shared' + import { DefaultNavClient } from './index.client.js' export type NavProps = ServerProps @@ -67,10 +68,8 @@ export const DefaultNav: React.FC = (props) => {