From c0c9026da650bdad2a12fdf688a947dcd1b25b2b Mon Sep 17 00:00:00 2001 From: Dan Ribbens Date: Wed, 6 Mar 2024 12:25:43 -0500 Subject: [PATCH 01/21] chore(release): v3.0.0-alpha.21 [skip ci] --- package.json | 2 +- packages/db-mongodb/package.json | 2 +- packages/db-postgres/package.json | 2 +- packages/graphql/package.json | 2 +- packages/next/package.json | 2 +- packages/payload/package.json | 2 +- packages/plugin-cloud-storage/package.json | 2 +- packages/plugin-cloud/package.json | 2 +- packages/plugin-seo/package.json | 2 +- packages/richtext-lexical/package.json | 2 +- packages/richtext-slate/package.json | 2 +- packages/translations/package.json | 2 +- packages/ui/package.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 4d8ee9457..df92f7025 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "payload-monorepo", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "private": true, "type": "module", "workspaces:": [ diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index 6630d5548..20d2e3d79 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/db-mongodb", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "description": "The officially supported MongoDB database adapter for Payload - Update 2", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json index 1e1d86c72..a2b67a762 100644 --- a/packages/db-postgres/package.json +++ b/packages/db-postgres/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/db-postgres", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "description": "The officially supported Postgres database adapter for Payload", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/graphql/package.json b/packages/graphql/package.json index d1235aa8d..59b50ec82 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/graphql", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "main": "./src/index.ts", "types": "./src/index.d.ts", "type": "module", diff --git a/packages/next/package.json b/packages/next/package.json index 74e0b4f06..cf1df62e9 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/next", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "main": "./src/index.ts", "types": "./src/index.d.ts", "type": "module", diff --git a/packages/payload/package.json b/packages/payload/package.json index e457528ec..20b3dceb0 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -1,6 +1,6 @@ { "name": "payload", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "description": "Node, React and MongoDB Headless CMS and Application Framework", "license": "MIT", "main": "./dist/index.js", diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json index d0fda865a..90620253c 100644 --- a/packages/plugin-cloud-storage/package.json +++ b/packages/plugin-cloud-storage/package.json @@ -1,7 +1,7 @@ { "name": "@payloadcms/plugin-cloud-storage", "description": "The official cloud storage plugin for Payload CMS", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "main": "dist/index.js", "types": "dist/index.d.ts", "type": "module", diff --git a/packages/plugin-cloud/package.json b/packages/plugin-cloud/package.json index de16bcf2d..7f27e889d 100644 --- a/packages/plugin-cloud/package.json +++ b/packages/plugin-cloud/package.json @@ -1,7 +1,7 @@ { "name": "@payloadcms/plugin-cloud", "description": "The official Payload Cloud plugin", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "main": "dist/index.js", "types": "dist/index.d.ts", "license": "MIT", diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json index 5be9d9361..c89cd58ab 100644 --- a/packages/plugin-seo/package.json +++ b/packages/plugin-seo/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/plugin-seo", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "homepage:": "https://payloadcms.com", "repository": "git@github.com:payloadcms/plugin-seo.git", "description": "SEO plugin for Payload", diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json index 8288cce00..e3c76b6d3 100644 --- a/packages/richtext-lexical/package.json +++ b/packages/richtext-lexical/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/richtext-lexical", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "description": "The officially supported Lexical richtext adapter for Payload", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json index 50ee5be30..29283ec69 100644 --- a/packages/richtext-slate/package.json +++ b/packages/richtext-slate/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/richtext-slate", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "description": "The officially supported Slate richtext adapter for Payload", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/translations/package.json b/packages/translations/package.json index cbd67107b..6d290a747 100644 --- a/packages/translations/package.json +++ b/packages/translations/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/translations", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "main": "./dist/exports/index.ts", "types": "./dist/types.d.ts", "type": "module", diff --git a/packages/ui/package.json b/packages/ui/package.json index 36d200f31..e64d179bb 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/ui", - "version": "3.0.0-alpha.20", + "version": "3.0.0-alpha.21", "main": "./src/index.ts", "types": "./dist/index.d.ts", "type": "module", From 410fddbf7f1cea127979118780b627d24b21619f Mon Sep 17 00:00:00 2001 From: Dan Ribbens Date: Wed, 6 Mar 2024 12:46:13 -0500 Subject: [PATCH 02/21] chore(release): v3.0.0-alpha.22 [skip ci] --- package.json | 2 +- packages/db-mongodb/package.json | 2 +- packages/db-postgres/package.json | 2 +- packages/graphql/package.json | 2 +- packages/next/package.json | 2 +- packages/payload/package.json | 2 +- packages/plugin-cloud-storage/package.json | 2 +- packages/plugin-cloud/package.json | 2 +- packages/plugin-seo/package.json | 2 +- packages/richtext-lexical/package.json | 2 +- packages/richtext-slate/package.json | 2 +- packages/translations/package.json | 2 +- packages/ui/package.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index df92f7025..8497b691a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "payload-monorepo", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "private": true, "type": "module", "workspaces:": [ diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index 20d2e3d79..d5fc57ba8 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/db-mongodb", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "description": "The officially supported MongoDB database adapter for Payload - Update 2", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json index a2b67a762..b75a591a0 100644 --- a/packages/db-postgres/package.json +++ b/packages/db-postgres/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/db-postgres", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "description": "The officially supported Postgres database adapter for Payload", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/graphql/package.json b/packages/graphql/package.json index 59b50ec82..0f1401bfd 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/graphql", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "main": "./src/index.ts", "types": "./src/index.d.ts", "type": "module", diff --git a/packages/next/package.json b/packages/next/package.json index cf1df62e9..7e2753e6e 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/next", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "main": "./src/index.ts", "types": "./src/index.d.ts", "type": "module", diff --git a/packages/payload/package.json b/packages/payload/package.json index 20b3dceb0..dbc1370b2 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -1,6 +1,6 @@ { "name": "payload", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "description": "Node, React and MongoDB Headless CMS and Application Framework", "license": "MIT", "main": "./dist/index.js", diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json index 90620253c..2b23e61f1 100644 --- a/packages/plugin-cloud-storage/package.json +++ b/packages/plugin-cloud-storage/package.json @@ -1,7 +1,7 @@ { "name": "@payloadcms/plugin-cloud-storage", "description": "The official cloud storage plugin for Payload CMS", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "main": "dist/index.js", "types": "dist/index.d.ts", "type": "module", diff --git a/packages/plugin-cloud/package.json b/packages/plugin-cloud/package.json index 7f27e889d..c412f922a 100644 --- a/packages/plugin-cloud/package.json +++ b/packages/plugin-cloud/package.json @@ -1,7 +1,7 @@ { "name": "@payloadcms/plugin-cloud", "description": "The official Payload Cloud plugin", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "main": "dist/index.js", "types": "dist/index.d.ts", "license": "MIT", diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json index c89cd58ab..a98f7e74f 100644 --- a/packages/plugin-seo/package.json +++ b/packages/plugin-seo/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/plugin-seo", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "homepage:": "https://payloadcms.com", "repository": "git@github.com:payloadcms/plugin-seo.git", "description": "SEO plugin for Payload", diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json index e3c76b6d3..373b58368 100644 --- a/packages/richtext-lexical/package.json +++ b/packages/richtext-lexical/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/richtext-lexical", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "description": "The officially supported Lexical richtext adapter for Payload", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json index 29283ec69..c62f04d95 100644 --- a/packages/richtext-slate/package.json +++ b/packages/richtext-slate/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/richtext-slate", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "description": "The officially supported Slate richtext adapter for Payload", "repository": "https://github.com/payloadcms/payload", "license": "MIT", diff --git a/packages/translations/package.json b/packages/translations/package.json index 6d290a747..8b5ca6ff4 100644 --- a/packages/translations/package.json +++ b/packages/translations/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/translations", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "main": "./dist/exports/index.ts", "types": "./dist/types.d.ts", "type": "module", diff --git a/packages/ui/package.json b/packages/ui/package.json index e64d179bb..3dad29831 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@payloadcms/ui", - "version": "3.0.0-alpha.21", + "version": "3.0.0-alpha.22", "main": "./src/index.ts", "types": "./dist/index.d.ts", "type": "module", From b70bf81d6c9a338a1e22e494fe7b16fd78bd5a6e Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Wed, 6 Mar 2024 12:48:15 -0500 Subject: [PATCH 03/21] chore: fix all eslint configs to work with esm --- .eslintrc.js => .eslintrc.cjs | 0 .../next-app/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../payload/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../next-app/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../payload/{.eslintrc.js => .eslintrc.cjs} | 0 .../email/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../payload/{.eslintrc.js => .eslintrc.cjs} | 0 .../next-app/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../payload/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../next-app/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../payload/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../payload/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 packages/next/{.eslintrc.js => .eslintrc.cjs} | 0 .../payload/{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 2 +- .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../{.eslintrc.js => .eslintrc.cjs} | 0 .../.eslintrc.cjs} | 0 .../.eslintrc.cjs} | 0 .../.eslintrc.cjs} | 1 - packages/ui/.eslintrc.cjs | 36 +++++++++++++++++++ .../ecommerce/{.eslintrc.js => .eslintrc.cjs} | 0 .../website/{.eslintrc.js => .eslintrc.cjs} | 0 test/{.eslintrc.js => .eslintrc.cjs} | 0 43 files changed, 37 insertions(+), 2 deletions(-) rename .eslintrc.js => .eslintrc.cjs (100%) rename examples/auth/next-app/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/auth/next-pages/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/auth/payload/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/custom-server/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/draft-preview/next-app/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/draft-preview/next-pages/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/draft-preview/payload/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/email/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/form-builder/next-pages/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/form-builder/payload/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/live-preview/next-app/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/live-preview/next-pages/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/live-preview/payload/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/multi-tenant/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/nested-docs/next-app/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/nested-docs/next-pages/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/nested-docs/payload/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/redirects/next-pages/{.eslintrc.js => .eslintrc.cjs} (100%) rename examples/redirects/payload/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/create-payload-app/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/db-mongodb/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/db-postgres/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/live-preview-react/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/live-preview/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/next/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/payload/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-cloud-storage/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-cloud/{.eslintrc.js => .eslintrc.cjs} (97%) rename packages/plugin-form-builder/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-nested-docs/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-redirects/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-search/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-sentry/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-seo/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/plugin-stripe/{.eslintrc.js => .eslintrc.cjs} (100%) rename packages/{ui/.eslintrc.js => richtext-lexical/.eslintrc.cjs} (100%) rename packages/{richtext-lexical/.eslintrc.js => richtext-slate/.eslintrc.cjs} (100%) rename packages/{richtext-slate/.eslintrc.js => translations/.eslintrc.cjs} (96%) create mode 100644 packages/ui/.eslintrc.cjs rename templates/ecommerce/{.eslintrc.js => .eslintrc.cjs} (100%) rename templates/website/{.eslintrc.js => .eslintrc.cjs} (100%) rename test/{.eslintrc.js => .eslintrc.cjs} (100%) diff --git a/.eslintrc.js b/.eslintrc.cjs similarity index 100% rename from .eslintrc.js rename to .eslintrc.cjs diff --git a/examples/auth/next-app/.eslintrc.js b/examples/auth/next-app/.eslintrc.cjs similarity index 100% rename from examples/auth/next-app/.eslintrc.js rename to examples/auth/next-app/.eslintrc.cjs diff --git a/examples/auth/next-pages/.eslintrc.js b/examples/auth/next-pages/.eslintrc.cjs similarity index 100% rename from examples/auth/next-pages/.eslintrc.js rename to examples/auth/next-pages/.eslintrc.cjs diff --git a/examples/auth/payload/.eslintrc.js b/examples/auth/payload/.eslintrc.cjs similarity index 100% rename from examples/auth/payload/.eslintrc.js rename to examples/auth/payload/.eslintrc.cjs diff --git a/examples/custom-server/.eslintrc.js b/examples/custom-server/.eslintrc.cjs similarity index 100% rename from examples/custom-server/.eslintrc.js rename to examples/custom-server/.eslintrc.cjs diff --git a/examples/draft-preview/next-app/.eslintrc.js b/examples/draft-preview/next-app/.eslintrc.cjs similarity index 100% rename from examples/draft-preview/next-app/.eslintrc.js rename to examples/draft-preview/next-app/.eslintrc.cjs diff --git a/examples/draft-preview/next-pages/.eslintrc.js b/examples/draft-preview/next-pages/.eslintrc.cjs similarity index 100% rename from examples/draft-preview/next-pages/.eslintrc.js rename to examples/draft-preview/next-pages/.eslintrc.cjs diff --git a/examples/draft-preview/payload/.eslintrc.js b/examples/draft-preview/payload/.eslintrc.cjs similarity index 100% rename from examples/draft-preview/payload/.eslintrc.js rename to examples/draft-preview/payload/.eslintrc.cjs diff --git a/examples/email/.eslintrc.js b/examples/email/.eslintrc.cjs similarity index 100% rename from examples/email/.eslintrc.js rename to examples/email/.eslintrc.cjs diff --git a/examples/form-builder/next-pages/.eslintrc.js b/examples/form-builder/next-pages/.eslintrc.cjs similarity index 100% rename from examples/form-builder/next-pages/.eslintrc.js rename to examples/form-builder/next-pages/.eslintrc.cjs diff --git a/examples/form-builder/payload/.eslintrc.js b/examples/form-builder/payload/.eslintrc.cjs similarity index 100% rename from examples/form-builder/payload/.eslintrc.js rename to examples/form-builder/payload/.eslintrc.cjs diff --git a/examples/live-preview/next-app/.eslintrc.js b/examples/live-preview/next-app/.eslintrc.cjs similarity index 100% rename from examples/live-preview/next-app/.eslintrc.js rename to examples/live-preview/next-app/.eslintrc.cjs diff --git a/examples/live-preview/next-pages/.eslintrc.js b/examples/live-preview/next-pages/.eslintrc.cjs similarity index 100% rename from examples/live-preview/next-pages/.eslintrc.js rename to examples/live-preview/next-pages/.eslintrc.cjs diff --git a/examples/live-preview/payload/.eslintrc.js b/examples/live-preview/payload/.eslintrc.cjs similarity index 100% rename from examples/live-preview/payload/.eslintrc.js rename to examples/live-preview/payload/.eslintrc.cjs diff --git a/examples/multi-tenant/.eslintrc.js b/examples/multi-tenant/.eslintrc.cjs similarity index 100% rename from examples/multi-tenant/.eslintrc.js rename to examples/multi-tenant/.eslintrc.cjs diff --git a/examples/nested-docs/next-app/.eslintrc.js b/examples/nested-docs/next-app/.eslintrc.cjs similarity index 100% rename from examples/nested-docs/next-app/.eslintrc.js rename to examples/nested-docs/next-app/.eslintrc.cjs diff --git a/examples/nested-docs/next-pages/.eslintrc.js b/examples/nested-docs/next-pages/.eslintrc.cjs similarity index 100% rename from examples/nested-docs/next-pages/.eslintrc.js rename to examples/nested-docs/next-pages/.eslintrc.cjs diff --git a/examples/nested-docs/payload/.eslintrc.js b/examples/nested-docs/payload/.eslintrc.cjs similarity index 100% rename from examples/nested-docs/payload/.eslintrc.js rename to examples/nested-docs/payload/.eslintrc.cjs diff --git a/examples/redirects/next-pages/.eslintrc.js b/examples/redirects/next-pages/.eslintrc.cjs similarity index 100% rename from examples/redirects/next-pages/.eslintrc.js rename to examples/redirects/next-pages/.eslintrc.cjs diff --git a/examples/redirects/payload/.eslintrc.js b/examples/redirects/payload/.eslintrc.cjs similarity index 100% rename from examples/redirects/payload/.eslintrc.js rename to examples/redirects/payload/.eslintrc.cjs diff --git a/packages/create-payload-app/.eslintrc.js b/packages/create-payload-app/.eslintrc.cjs similarity index 100% rename from packages/create-payload-app/.eslintrc.js rename to packages/create-payload-app/.eslintrc.cjs diff --git a/packages/db-mongodb/.eslintrc.js b/packages/db-mongodb/.eslintrc.cjs similarity index 100% rename from packages/db-mongodb/.eslintrc.js rename to packages/db-mongodb/.eslintrc.cjs diff --git a/packages/db-postgres/.eslintrc.js b/packages/db-postgres/.eslintrc.cjs similarity index 100% rename from packages/db-postgres/.eslintrc.js rename to packages/db-postgres/.eslintrc.cjs diff --git a/packages/live-preview-react/.eslintrc.js b/packages/live-preview-react/.eslintrc.cjs similarity index 100% rename from packages/live-preview-react/.eslintrc.js rename to packages/live-preview-react/.eslintrc.cjs diff --git a/packages/live-preview/.eslintrc.js b/packages/live-preview/.eslintrc.cjs similarity index 100% rename from packages/live-preview/.eslintrc.js rename to packages/live-preview/.eslintrc.cjs diff --git a/packages/next/.eslintrc.js b/packages/next/.eslintrc.cjs similarity index 100% rename from packages/next/.eslintrc.js rename to packages/next/.eslintrc.cjs diff --git a/packages/payload/.eslintrc.js b/packages/payload/.eslintrc.cjs similarity index 100% rename from packages/payload/.eslintrc.js rename to packages/payload/.eslintrc.cjs diff --git a/packages/plugin-cloud-storage/.eslintrc.js b/packages/plugin-cloud-storage/.eslintrc.cjs similarity index 100% rename from packages/plugin-cloud-storage/.eslintrc.js rename to packages/plugin-cloud-storage/.eslintrc.cjs diff --git a/packages/plugin-cloud/.eslintrc.js b/packages/plugin-cloud/.eslintrc.cjs similarity index 97% rename from packages/plugin-cloud/.eslintrc.js rename to packages/plugin-cloud/.eslintrc.cjs index fb310f7a7..ba056e9d3 100644 --- a/packages/plugin-cloud/.eslintrc.js +++ b/packages/plugin-cloud/.eslintrc.cjs @@ -1,4 +1,4 @@ -/** @type {import('prettier').Config} */ + module.exports = { extends: ['@payloadcms'], overrides: [ diff --git a/packages/plugin-form-builder/.eslintrc.js b/packages/plugin-form-builder/.eslintrc.cjs similarity index 100% rename from packages/plugin-form-builder/.eslintrc.js rename to packages/plugin-form-builder/.eslintrc.cjs diff --git a/packages/plugin-nested-docs/.eslintrc.js b/packages/plugin-nested-docs/.eslintrc.cjs similarity index 100% rename from packages/plugin-nested-docs/.eslintrc.js rename to packages/plugin-nested-docs/.eslintrc.cjs diff --git a/packages/plugin-redirects/.eslintrc.js b/packages/plugin-redirects/.eslintrc.cjs similarity index 100% rename from packages/plugin-redirects/.eslintrc.js rename to packages/plugin-redirects/.eslintrc.cjs diff --git a/packages/plugin-search/.eslintrc.js b/packages/plugin-search/.eslintrc.cjs similarity index 100% rename from packages/plugin-search/.eslintrc.js rename to packages/plugin-search/.eslintrc.cjs diff --git a/packages/plugin-sentry/.eslintrc.js b/packages/plugin-sentry/.eslintrc.cjs similarity index 100% rename from packages/plugin-sentry/.eslintrc.js rename to packages/plugin-sentry/.eslintrc.cjs diff --git a/packages/plugin-seo/.eslintrc.js b/packages/plugin-seo/.eslintrc.cjs similarity index 100% rename from packages/plugin-seo/.eslintrc.js rename to packages/plugin-seo/.eslintrc.cjs diff --git a/packages/plugin-stripe/.eslintrc.js b/packages/plugin-stripe/.eslintrc.cjs similarity index 100% rename from packages/plugin-stripe/.eslintrc.js rename to packages/plugin-stripe/.eslintrc.cjs diff --git a/packages/ui/.eslintrc.js b/packages/richtext-lexical/.eslintrc.cjs similarity index 100% rename from packages/ui/.eslintrc.js rename to packages/richtext-lexical/.eslintrc.cjs diff --git a/packages/richtext-lexical/.eslintrc.js b/packages/richtext-slate/.eslintrc.cjs similarity index 100% rename from packages/richtext-lexical/.eslintrc.js rename to packages/richtext-slate/.eslintrc.cjs diff --git a/packages/richtext-slate/.eslintrc.js b/packages/translations/.eslintrc.cjs similarity index 96% rename from packages/richtext-slate/.eslintrc.js rename to packages/translations/.eslintrc.cjs index c1b1716e7..3097f2cd3 100644 --- a/packages/richtext-slate/.eslintrc.js +++ b/packages/translations/.eslintrc.cjs @@ -1,4 +1,3 @@ -/** @type {import('prettier').Config} */ module.exports = { extends: ['@payloadcms'], overrides: [ diff --git a/packages/ui/.eslintrc.cjs b/packages/ui/.eslintrc.cjs new file mode 100644 index 000000000..3097f2cd3 --- /dev/null +++ b/packages/ui/.eslintrc.cjs @@ -0,0 +1,36 @@ +module.exports = { + extends: ['@payloadcms'], + overrides: [ + { + extends: ['plugin:@typescript-eslint/disable-type-checked'], + files: ['*.js', '*.cjs', '*.json', '*.md', '*.yml', '*.yaml'], + }, + { + files: ['package.json', 'tsconfig.json'], + rules: { + 'perfectionist/sort-array-includes': 'off', + 'perfectionist/sort-astro-attributes': 'off', + 'perfectionist/sort-classes': 'off', + 'perfectionist/sort-enums': 'off', + 'perfectionist/sort-exports': 'off', + 'perfectionist/sort-imports': 'off', + 'perfectionist/sort-interfaces': 'off', + 'perfectionist/sort-jsx-props': 'off', + 'perfectionist/sort-keys': 'off', + 'perfectionist/sort-maps': 'off', + 'perfectionist/sort-named-exports': 'off', + 'perfectionist/sort-named-imports': 'off', + 'perfectionist/sort-object-types': 'off', + 'perfectionist/sort-objects': 'off', + 'perfectionist/sort-svelte-attributes': 'off', + 'perfectionist/sort-union-types': 'off', + 'perfectionist/sort-vue-attributes': 'off', + }, + }, + ], + parserOptions: { + project: ['./tsconfig.json'], + tsconfigRootDir: __dirname, + }, + root: true, +} diff --git a/templates/ecommerce/.eslintrc.js b/templates/ecommerce/.eslintrc.cjs similarity index 100% rename from templates/ecommerce/.eslintrc.js rename to templates/ecommerce/.eslintrc.cjs diff --git a/templates/website/.eslintrc.js b/templates/website/.eslintrc.cjs similarity index 100% rename from templates/website/.eslintrc.js rename to templates/website/.eslintrc.cjs diff --git a/test/.eslintrc.js b/test/.eslintrc.cjs similarity index 100% rename from test/.eslintrc.js rename to test/.eslintrc.cjs From e9abe63b47ee1ecb381d9c860d50e0e3d3cf2df7 Mon Sep 17 00:00:00 2001 From: Jacob Fletcher Date: Wed, 6 Mar 2024 12:57:37 -0500 Subject: [PATCH 04/21] fix(next): 404 handling --- .../admin/[[...segments]]/not-found.tsx | 17 ++ packages/next/src/utilities/initPage.ts | 10 +- .../src/views/Document/getMetaBySegment.tsx | 9 +- packages/next/src/views/Document/index.tsx | 48 +++--- .../next/src/views/NotFound/index.client.tsx | 45 +++++ packages/next/src/views/NotFound/index.tsx | 74 ++++----- packages/next/src/views/NotFound/meta.ts | 9 + packages/next/src/views/Root/index.tsx | 154 +++++++----------- packages/next/src/views/Root/meta.ts | 5 + 9 files changed, 209 insertions(+), 162 deletions(-) create mode 100644 app/(payload)/admin/[[...segments]]/not-found.tsx create mode 100644 packages/next/src/views/NotFound/index.client.tsx create mode 100644 packages/next/src/views/NotFound/meta.ts diff --git a/app/(payload)/admin/[[...segments]]/not-found.tsx b/app/(payload)/admin/[[...segments]]/not-found.tsx new file mode 100644 index 000000000..0879419bc --- /dev/null +++ b/app/(payload)/admin/[[...segments]]/not-found.tsx @@ -0,0 +1,17 @@ +/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */ +import config from '@payload-config' +/* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */ +import { NotFoundView } from '@payloadcms/next/views/NotFound/index' + +type Args = { + params: { + segments: string[] + } + searchParams: { + [key: string]: string | string[] + } +} + +const NotFound = ({ params, searchParams }: Args) => NotFoundView({ config, params, searchParams }) + +export default NotFound diff --git a/packages/next/src/utilities/initPage.ts b/packages/next/src/utilities/initPage.ts index 24b79707d..4a7392578 100644 --- a/packages/next/src/utilities/initPage.ts +++ b/packages/next/src/utilities/initPage.ts @@ -10,7 +10,7 @@ import { initI18n } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/client' import { findLocaleFromCode } from '@payloadcms/ui' import { headers as getHeaders } from 'next/headers' -import { redirect } from 'next/navigation' +import { notFound, redirect } from 'next/navigation' import { createLocalReq } from 'payload/utilities' import qs from 'qs' @@ -88,10 +88,18 @@ export const initPage = async ({ if (collectionSlug) { collectionConfig = collections.find((collection) => collection.slug === collectionSlug) + + if (!collectionConfig) { + notFound() + } } if (globalSlug) { globalConfig = globals.find((global) => global.slug === globalSlug) + + if (!globalConfig) { + notFound() + } } return { diff --git a/packages/next/src/views/Document/getMetaBySegment.tsx b/packages/next/src/views/Document/getMetaBySegment.tsx index f48418c5c..02e4d17af 100644 --- a/packages/next/src/views/Document/getMetaBySegment.tsx +++ b/packages/next/src/views/Document/getMetaBySegment.tsx @@ -2,13 +2,13 @@ import type { Metadata } from 'next' import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload/types' import { getNextI18n } from '../../utilities/getNextI18n' -import { meta } from '../../utilities/meta' import { generateMetadata as apiMeta } from '../API/meta' import { generateMetadata as editMeta } from '../Edit/meta' import { generateMetadata as livePreviewMeta } from '../LivePreview/meta' import { generateMetadata as versionMeta } from '../Version/meta' import { generateMetadata as versionsMeta } from '../Versions/meta' import { GenerateViewMetadata } from '../Root' +import { generateNotFoundMeta } from '../NotFound/meta' export type GenerateEditViewMetadata = ( args: Parameters[0] & { @@ -102,10 +102,5 @@ export const getMetaBySegment: GenerateEditViewMetadata = async ({ }) } - return meta({ - config, - description: '', - keywords: '', - title: '', - }) + return generateNotFoundMeta({ i18n }) } diff --git a/packages/next/src/views/Document/index.tsx b/packages/next/src/views/Document/index.tsx index d7d4335a3..4552617da 100644 --- a/packages/next/src/views/Document/index.tsx +++ b/packages/next/src/views/Document/index.tsx @@ -18,7 +18,6 @@ import { buildStateFromSchema, formatFields, } from '@payloadcms/ui' -import { notFound } from 'next/navigation' import queryString from 'qs' import React, { Fragment } from 'react' @@ -27,6 +26,7 @@ import type { GenerateEditViewMetadata } from './getMetaBySegment' import { getMetaBySegment } from './getMetaBySegment' import { getViewsFromConfig } from './getViewsFromConfig' +import { NotFoundClient } from '../NotFound/index.client' export const generateMetadata: GenerateEditViewMetadata = async (args) => getMetaBySegment(args) @@ -97,20 +97,24 @@ export const Document: React.FC = async ({ DefaultView = collectionViews?.DefaultView if (!CustomView && !DefaultView) { - return notFound() + return } - try { - data = await payload.findByID({ - id, - collection: collectionSlug, - depth: 0, - locale: locale.code, - user, - }) - } catch (error) {} // eslint-disable-line no-empty - if (id) { + try { + data = await payload.findByID({ + id, + collection: collectionSlug, + depth: 0, + locale: locale.code, + user, + }) + } catch (error) {} // eslint-disable-line no-empty + + if (!data) { + return + } + preferencesKey = `collection-${collectionSlug}-${id}` } } @@ -137,15 +141,21 @@ export const Document: React.FC = async ({ DefaultView = globalViews?.DefaultView if (!CustomView && !DefaultView) { - return notFound() + return } - data = await payload.findGlobal({ - slug: globalSlug, - depth: 0, - locale: locale.code, - user, - }) + try { + data = await payload.findGlobal({ + slug: globalSlug, + depth: 0, + locale: locale.code, + user, + }) + } catch (error) {} // eslint-disable-line no-empty + + if (!data) { + return + } preferencesKey = `global-${globalSlug}` } diff --git a/packages/next/src/views/NotFound/index.client.tsx b/packages/next/src/views/NotFound/index.client.tsx new file mode 100644 index 000000000..0714b65e3 --- /dev/null +++ b/packages/next/src/views/NotFound/index.client.tsx @@ -0,0 +1,45 @@ +'use client' +import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui' +import Link from 'next/link' +import React, { useEffect } from 'react' + +import './index.scss' + +const baseClass = 'not-found' + +export const NotFoundClient: React.FC<{ + marginTop?: 'large' +}> = (props) => { + const { marginTop = 'large' } = props + + const { setStepNav } = useStepNav() + const { t } = useTranslation() + + const { + routes: { admin }, + } = useConfig() + + useEffect(() => { + setStepNav([ + { + label: t('general:notFound'), + }, + ]) + }, [setStepNav, t]) + + return ( +
+ +

{t('general:nothingFound')}

+

{t('general:sorryNotFound')}

+ + +
+ ) +} diff --git a/packages/next/src/views/NotFound/index.tsx b/packages/next/src/views/NotFound/index.tsx index 37b0ec5d1..64b9951d0 100644 --- a/packages/next/src/views/NotFound/index.tsx +++ b/packages/next/src/views/NotFound/index.tsx @@ -1,53 +1,39 @@ -'use client' -import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui' -import Link from 'next/link' import React from 'react' -// import Meta from '../../utilities/Meta' -import './index.scss' +import { NotFoundClient } from './index.client' +import { DefaultTemplate } from '@payloadcms/ui' +import { SanitizedConfig } from 'payload/types' +import { initPage } from '../../utilities/initPage' -const baseClass = 'not-found' +export const NotFoundView = async ({ + config: configPromise, + params, + searchParams, +}: { + config: Promise + params: { + [key: string]: string | string[] + } + searchParams: { + [key: string]: string | string[] + } +}) => { + const config = await configPromise -const NotFound: React.FC<{ - marginTop?: 'large' -}> = (props) => { - const { marginTop } = props - - const { setStepNav } = useStepNav() - const { t } = useTranslation() - - const { - routes: { admin }, - } = useConfig() - - // useEffect(() => { - // setStepNav([ - // { - // label: t('general:notFound'), - // }, - // ]) - // }, [setStepNav, t]) + const initPageResult = await initPage({ + config, + searchParams, + route: '', + }) return ( -
- {/* */} - -

{t('general:nothingFound')}

-

{t('general:sorryNotFound')}

- - -
+ + ) } - -export default NotFound diff --git a/packages/next/src/views/NotFound/meta.ts b/packages/next/src/views/NotFound/meta.ts new file mode 100644 index 000000000..defe84b70 --- /dev/null +++ b/packages/next/src/views/NotFound/meta.ts @@ -0,0 +1,9 @@ +import { I18n } from '@payloadcms/translations' + +export const generateNotFoundMeta = ({ i18n }: { i18n: I18n }) => { + return { + description: i18n.t('general:pageNotFound'), + keywords: `404 ${i18n.t('general:notFound')}`, + title: i18n.t('general:notFound'), + } +} diff --git a/packages/next/src/views/Root/index.tsx b/packages/next/src/views/Root/index.tsx index 2f4d8c425..924cc9ba0 100644 --- a/packages/next/src/views/Root/index.tsx +++ b/packages/next/src/views/Root/index.tsx @@ -3,7 +3,7 @@ import type { Metadata } from 'next' import type { InitPageResult, SanitizedConfig } from 'payload/types' import { DefaultTemplate, MinimalTemplate } from '@payloadcms/ui' -import { redirect } from 'next/navigation' +import { notFound, redirect } from 'next/navigation' import React from 'react' import { initPage } from '../../utilities/initPage' @@ -21,16 +21,6 @@ import { Verify, verifyBaseClass } from '../Verify' export { generatePageMetadata } from './meta' -type Args = { - config: Promise - params: { - [key: string]: string | string[] - } - searchParams: { - [key: string]: string | string[] - } -} - export type GenerateViewMetadata = (args: { config: SanitizedConfig i18n: I18n @@ -59,7 +49,19 @@ const oneSegmentViews = { unauthorized: Unauthorized, } -export const RootPage = async ({ config: configPromise, params, searchParams }: Args) => { +export const RootPage = async ({ + config: configPromise, + params, + searchParams, +}: { + config: Promise + params: { + [key: string]: string | string[] + } + searchParams: { + [key: string]: string | string[] + } +}) => { const config = await configPromise const { @@ -69,7 +71,6 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: let ViewToRender: React.FC let templateClassName - let initPageResult: InitPageResult let templateType: 'default' | 'minimal' = 'default' let route = adminRoute @@ -85,6 +86,12 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: const isGlobal = segmentOne === 'globals' const isCollection = segmentOne === 'collections' + let initPageOptions: Parameters[0] = { + config, + searchParams, + route, + } + // TODO: handle custom routes switch (segments.length) { @@ -92,12 +99,7 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: ViewToRender = Dashboard templateClassName = 'dashboard' templateType = 'default' - initPageResult = await initPage({ - config, - redirectUnauthenticatedUser: true, - route, - searchParams, - }) + initPageOptions.redirectUnauthenticatedUser = true break } case 1: { @@ -108,18 +110,12 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: // --> /logout // --> /logout-inactivity // --> /unauthorized - initPageResult = await initPage({ config, route, searchParams }) ViewToRender = oneSegmentViews[segmentOne] templateClassName = baseClasses[segmentOne] templateType = 'minimal' } else if (segmentOne === 'account') { // --> /account - initPageResult = await initPage({ - config, - redirectUnauthenticatedUser: true, - route, - searchParams, - }) + initPageOptions.redirectUnauthenticatedUser = true ViewToRender = Account templateClassName = 'account' templateType = 'default' @@ -129,30 +125,19 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: case 2: { if (segmentOne === 'reset') { // --> /reset/:token - initPageResult = await initPage({ config, route, searchParams }) ViewToRender = ResetPassword templateClassName = baseClasses[segmentTwo] templateType = 'minimal' } if (isCollection) { // --> /collections/:collectionSlug - initPageResult = await initPage({ - config, - redirectUnauthenticatedUser: true, - route, - searchParams, - }) + initPageOptions.redirectUnauthenticatedUser = true ViewToRender = ListView templateClassName = `${segmentTwo}-list` templateType = 'default' } else if (isGlobal) { // --> /globals/:globalSlug - initPageResult = await initPage({ - config, - redirectUnauthenticatedUser: true, - route, - searchParams, - }) + initPageOptions.redirectUnauthenticatedUser = true ViewToRender = DocumentView templateClassName = 'global-edit' templateType = 'default' @@ -162,7 +147,6 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: default: if (segmentTwo === 'verify') { // --> /:collectionSlug/verify/:token - initPageResult = await initPage({ config, route, searchParams }) ViewToRender = Verify templateClassName = 'verify' templateType = 'minimal' @@ -173,12 +157,7 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: // --> /collections/:collectionSlug/:id/versions // --> /collections/:collectionSlug/:id/versions/:versionId // --> /collections/:collectionSlug/:id/api - initPageResult = await initPage({ - config, - redirectUnauthenticatedUser: true, - route, - searchParams, - }) + initPageOptions.redirectUnauthenticatedUser = true ViewToRender = DocumentView templateClassName = `collection-default-edit` templateType = 'default' @@ -188,12 +167,7 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: // --> /globals/:globalSlug/preview // --> /globals/:globalSlug/versions/:versionId // --> /globals/:globalSlug/api - initPageResult = await initPage({ - config, - redirectUnauthenticatedUser: true, - route, - searchParams, - }) + initPageOptions.redirectUnauthenticatedUser = true ViewToRender = DocumentView templateClassName = `global-edit` templateType = 'default' @@ -201,51 +175,49 @@ export const RootPage = async ({ config: configPromise, params, searchParams }: break } - const dbHasUser = await initPageResult.req.payload.db - .findOne({ - collection: userSlug, - req: initPageResult.req, - }) - ?.then((doc) => !!doc) + let dbHasUser = false - const createFirstUserRoute = `${adminRoute}/create-first-user` - - if (!dbHasUser && route !== createFirstUserRoute) { - redirect(createFirstUserRoute) + if (!ViewToRender) { + notFound() } - if (dbHasUser && route === createFirstUserRoute) { - redirect(adminRoute) - } + const initPageResult = await initPage(initPageOptions) if (initPageResult) { - if (templateType === 'minimal') { - return ( - - - - ) - } else { - return ( - - - - ) + dbHasUser = await initPageResult?.req.payload.db + .findOne({ + collection: userSlug, + req: initPageResult?.req, + }) + ?.then((doc) => !!doc) + + const createFirstUserRoute = `${adminRoute}/create-first-user` + + if (!dbHasUser && route !== createFirstUserRoute) { + redirect(createFirstUserRoute) + } + + if (dbHasUser && route === createFirstUserRoute) { + redirect(adminRoute) } } - return null + if (templateType === 'minimal') { + return ( + + + + ) + } else { + return ( + + + + ) + } } diff --git a/packages/next/src/views/Root/meta.ts b/packages/next/src/views/Root/meta.ts index ba486d4f0..82ab81080 100644 --- a/packages/next/src/views/Root/meta.ts +++ b/packages/next/src/views/Root/meta.ts @@ -11,6 +11,7 @@ import { Metadata } from 'next' import { generateDocumentMetadata } from '../Document/meta' import { getNextI18n } from '../../utilities/getNextI18n' import { SanitizedConfig } from 'payload/types' +import { generateNotFoundMeta } from '../NotFound/meta' const oneSegmentMeta = { 'create-first-user': generateCreateFirstUserMetadata, @@ -131,5 +132,9 @@ export const generatePageMetadata = async ({ config: configPromise, params }: Ar } } + if (!meta) { + meta = generateNotFoundMeta({ i18n }) + } + return meta } From ee6512567e250ac6182c291aee30a468c3ef1b3f Mon Sep 17 00:00:00 2001 From: Jacob Fletcher Date: Wed, 6 Mar 2024 13:27:46 -0500 Subject: [PATCH 05/21] fix(next): not found meta --- packages/next/src/views/Document/getMetaBySegment.tsx | 2 +- packages/next/src/views/NotFound/meta.ts | 9 ++++++--- packages/next/src/views/Root/meta.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/next/src/views/Document/getMetaBySegment.tsx b/packages/next/src/views/Document/getMetaBySegment.tsx index 02e4d17af..a87f13908 100644 --- a/packages/next/src/views/Document/getMetaBySegment.tsx +++ b/packages/next/src/views/Document/getMetaBySegment.tsx @@ -102,5 +102,5 @@ export const getMetaBySegment: GenerateEditViewMetadata = async ({ }) } - return generateNotFoundMeta({ i18n }) + return generateNotFoundMeta({ config, i18n }) } diff --git a/packages/next/src/views/NotFound/meta.ts b/packages/next/src/views/NotFound/meta.ts index defe84b70..5e38b4e39 100644 --- a/packages/next/src/views/NotFound/meta.ts +++ b/packages/next/src/views/NotFound/meta.ts @@ -1,9 +1,12 @@ import { I18n } from '@payloadcms/translations' +import { meta } from '../../utilities/meta' +import { SanitizedConfig } from 'payload/types' -export const generateNotFoundMeta = ({ i18n }: { i18n: I18n }) => { - return { +export const generateNotFoundMeta = ({ config, i18n }: { config: SanitizedConfig; i18n: I18n }) => { + return meta({ + config, description: i18n.t('general:pageNotFound'), keywords: `404 ${i18n.t('general:notFound')}`, title: i18n.t('general:notFound'), - } + }) } diff --git a/packages/next/src/views/Root/meta.ts b/packages/next/src/views/Root/meta.ts index 82ab81080..37f27d24e 100644 --- a/packages/next/src/views/Root/meta.ts +++ b/packages/next/src/views/Root/meta.ts @@ -133,7 +133,7 @@ export const generatePageMetadata = async ({ config: configPromise, params }: Ar } if (!meta) { - meta = generateNotFoundMeta({ i18n }) + meta = await generateNotFoundMeta({ config, i18n }) } return meta From bc7a69044b59c06533f10da058630b1028ff0dfe Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Wed, 6 Mar 2024 13:30:13 -0500 Subject: [PATCH 06/21] chore: add proper eslint types --- .../eslint-config-payload/eslint-config/configs/jest/index.js | 1 + .../eslint-config/configs/jest/rules/jest-dom.js | 1 + .../eslint-config/configs/jest/rules/jest.js | 1 + .../eslint-config-payload/eslint-config/configs/react/index.js | 1 + .../eslint-config/configs/react/rules/react-a11y.js | 2 ++ .../eslint-config/configs/react/rules/react.js | 1 + packages/eslint-config-payload/eslint-config/index.js | 1 + packages/eslint-config-payload/index.js | 1 + 8 files changed, 9 insertions(+) diff --git a/packages/eslint-config-payload/eslint-config/configs/jest/index.js b/packages/eslint-config-payload/eslint-config/configs/jest/index.js index 6c2adcc5a..ff5221063 100644 --- a/packages/eslint-config-payload/eslint-config/configs/jest/index.js +++ b/packages/eslint-config-payload/eslint-config/configs/jest/index.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ module.exports = { env: { jest: true, diff --git a/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest-dom.js b/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest-dom.js index 0850050e3..b206ee0bc 100644 --- a/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest-dom.js +++ b/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest-dom.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ module.exports = { rules: { 'jest-dom/prefer-checked': 'error', diff --git a/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest.js b/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest.js index 04db26a14..153f4f511 100644 --- a/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest.js +++ b/packages/eslint-config-payload/eslint-config/configs/jest/rules/jest.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ module.exports = { rules: { 'jest/consistent-test-it': ['error', { fn: 'it' }], diff --git a/packages/eslint-config-payload/eslint-config/configs/react/index.js b/packages/eslint-config-payload/eslint-config/configs/react/index.js index 9dca50e92..ffbca53b1 100644 --- a/packages/eslint-config-payload/eslint-config/configs/react/index.js +++ b/packages/eslint-config-payload/eslint-config/configs/react/index.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ module.exports = { env: { browser: true, diff --git a/packages/eslint-config-payload/eslint-config/configs/react/rules/react-a11y.js b/packages/eslint-config-payload/eslint-config/configs/react/rules/react-a11y.js index 26902b19a..0302f9e35 100644 --- a/packages/eslint-config-payload/eslint-config/configs/react/rules/react-a11y.js +++ b/packages/eslint-config-payload/eslint-config/configs/react/rules/react-a11y.js @@ -1,3 +1,5 @@ +/** @type {import('eslint').Linter.Config} */ + // Sourced from https://github.com/airbnb/javascript/blob/master/packages/eslint-config-airbnb/rules/react-a11y.js module.exports = { diff --git a/packages/eslint-config-payload/eslint-config/configs/react/rules/react.js b/packages/eslint-config-payload/eslint-config/configs/react/rules/react.js index 331248d3b..41e5259a6 100644 --- a/packages/eslint-config-payload/eslint-config/configs/react/rules/react.js +++ b/packages/eslint-config-payload/eslint-config/configs/react/rules/react.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ module.exports = { rules: { // View link below for react rules documentation diff --git a/packages/eslint-config-payload/eslint-config/index.js b/packages/eslint-config-payload/eslint-config/index.js index 15714906b..da685285a 100644 --- a/packages/eslint-config-payload/eslint-config/index.js +++ b/packages/eslint-config-payload/eslint-config/index.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ module.exports = { env: { es6: true, diff --git a/packages/eslint-config-payload/index.js b/packages/eslint-config-payload/index.js index c616e631f..5badd428b 100644 --- a/packages/eslint-config-payload/index.js +++ b/packages/eslint-config-payload/index.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ module.exports = { root: true, extends: ['./eslint-config/index.js'], From 3090e7c163ef579a1f27178d07ef3e678a5834a0 Mon Sep 17 00:00:00 2001 From: Kendell Joseph Date: Wed, 6 Mar 2024 13:55:05 -0500 Subject: [PATCH 07/21] chore: updates db-mongodb imports for ESM --- packages/db-mongodb/src/connect.ts | 2 +- packages/db-mongodb/src/create.ts | 6 +-- packages/db-mongodb/src/createGlobal.ts | 6 +-- .../db-mongodb/src/createGlobalVersion.ts | 4 +- packages/db-mongodb/src/createVersion.ts | 4 +- packages/db-mongodb/src/deleteMany.ts | 4 +- packages/db-mongodb/src/deleteOne.ts | 6 +-- packages/db-mongodb/src/deleteVersions.ts | 4 +- packages/db-mongodb/src/destroy.ts | 2 +- packages/db-mongodb/src/find.ts | 8 +-- packages/db-mongodb/src/findGlobal.ts | 6 +-- packages/db-mongodb/src/findGlobalVersions.ts | 8 +-- packages/db-mongodb/src/findOne.ts | 6 +-- packages/db-mongodb/src/findVersions.ts | 8 +-- packages/db-mongodb/src/index.ts | 54 +++++++++---------- packages/db-mongodb/src/init.ts | 12 ++--- packages/db-mongodb/src/migrateFresh.ts | 2 +- .../src/models/buildCollectionSchema.ts | 4 +- .../db-mongodb/src/models/buildGlobalModel.ts | 6 +-- packages/db-mongodb/src/queries/buildQuery.ts | 2 +- .../src/queries/buildSearchParams.ts | 6 +-- .../db-mongodb/src/queries/buildSortParam.ts | 2 +- .../queries/getLocalizedSortProperty.spec.ts | 2 +- .../db-mongodb/src/queries/parseParams.ts | 4 +- packages/db-mongodb/src/queryDrafts.ts | 8 +-- .../src/transactions/beginTransaction.ts | 2 +- packages/db-mongodb/src/types.ts | 2 +- packages/db-mongodb/src/updateGlobal.ts | 6 +-- .../db-mongodb/src/updateGlobalVersion.ts | 4 +- packages/db-mongodb/src/updateOne.ts | 8 +-- packages/db-mongodb/src/updateVersion.ts | 4 +- packages/db-mongodb/src/withSession.ts | 2 +- 32 files changed, 102 insertions(+), 102 deletions(-) diff --git a/packages/db-mongodb/src/connect.ts b/packages/db-mongodb/src/connect.ts index a35f73a73..c40075fdb 100644 --- a/packages/db-mongodb/src/connect.ts +++ b/packages/db-mongodb/src/connect.ts @@ -4,7 +4,7 @@ import type { Connect } from 'payload/database' import mongoose from 'mongoose' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' export const connect: Connect = async function connect( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/create.ts b/packages/db-mongodb/src/create.ts index 775caa07f..310892ee5 100644 --- a/packages/db-mongodb/src/create.ts +++ b/packages/db-mongodb/src/create.ts @@ -1,10 +1,10 @@ import type { Create } from 'payload/database' import type { Document, PayloadRequest } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import handleError from './utilities/handleError' -import { withSession } from './withSession' +import handleError from './utilities/handleError.js' +import { withSession } from './withSession.js' export const create: Create = async function create( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/createGlobal.ts b/packages/db-mongodb/src/createGlobal.ts index 828e369fd..5048e9443 100644 --- a/packages/db-mongodb/src/createGlobal.ts +++ b/packages/db-mongodb/src/createGlobal.ts @@ -1,10 +1,10 @@ import type { CreateGlobal } from 'payload/database' import type { PayloadRequest } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const createGlobal: CreateGlobal = async function createGlobal( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/createGlobalVersion.ts b/packages/db-mongodb/src/createGlobalVersion.ts index 718ae918e..623ef7285 100644 --- a/packages/db-mongodb/src/createGlobalVersion.ts +++ b/packages/db-mongodb/src/createGlobalVersion.ts @@ -2,9 +2,9 @@ import type { CreateGlobalVersion } from 'payload/database' import type { PayloadRequest } from 'payload/types' import type { Document } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { withSession } from './withSession' +import { withSession } from './withSession.js' export const createGlobalVersion: CreateGlobalVersion = async function createGlobalVersion( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/createVersion.ts b/packages/db-mongodb/src/createVersion.ts index e26caf829..47343f3ba 100644 --- a/packages/db-mongodb/src/createVersion.ts +++ b/packages/db-mongodb/src/createVersion.ts @@ -2,9 +2,9 @@ import type { CreateVersion } from 'payload/database' import type { PayloadRequest } from 'payload/types' import type { Document } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { withSession } from './withSession' +import { withSession } from './withSession.js' export const createVersion: CreateVersion = async function createVersion( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/deleteMany.ts b/packages/db-mongodb/src/deleteMany.ts index 5d4104f65..697db8059 100644 --- a/packages/db-mongodb/src/deleteMany.ts +++ b/packages/db-mongodb/src/deleteMany.ts @@ -1,9 +1,9 @@ import type { DeleteMany } from 'payload/database' import type { PayloadRequest } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { withSession } from './withSession' +import { withSession } from './withSession.js' export const deleteMany: DeleteMany = async function deleteMany( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/deleteOne.ts b/packages/db-mongodb/src/deleteOne.ts index 3bb4d8879..3af18fbbc 100644 --- a/packages/db-mongodb/src/deleteOne.ts +++ b/packages/db-mongodb/src/deleteOne.ts @@ -2,10 +2,10 @@ import type { DeleteOne } from 'payload/database' import type { PayloadRequest } from 'payload/types' import type { Document } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const deleteOne: DeleteOne = async function deleteOne( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/deleteVersions.ts b/packages/db-mongodb/src/deleteVersions.ts index 0f906139e..deb2b41df 100644 --- a/packages/db-mongodb/src/deleteVersions.ts +++ b/packages/db-mongodb/src/deleteVersions.ts @@ -1,9 +1,9 @@ import type { DeleteVersions } from 'payload/database' import type { PayloadRequest } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { withSession } from './withSession' +import { withSession } from './withSession.js' export const deleteVersions: DeleteVersions = async function deleteVersions( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/destroy.ts b/packages/db-mongodb/src/destroy.ts index e37fbe34e..f51600ea4 100644 --- a/packages/db-mongodb/src/destroy.ts +++ b/packages/db-mongodb/src/destroy.ts @@ -2,7 +2,7 @@ import type { Destroy } from 'payload/database' import mongoose from 'mongoose' -import type { MongooseAdapter } from './index' +import type { MongooseAdapter } from './index.d.ts' export const destroy: Destroy = async function destroy(this: MongooseAdapter) { if (this.mongoMemoryServer) { diff --git a/packages/db-mongodb/src/find.ts b/packages/db-mongodb/src/find.ts index a3dcac136..70889c4dd 100644 --- a/packages/db-mongodb/src/find.ts +++ b/packages/db-mongodb/src/find.ts @@ -4,11 +4,11 @@ import type { PayloadRequest } from 'payload/types' import { flattenWhereToOperators } from 'payload/database' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { buildSortParam } from './queries/buildSortParam' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import { buildSortParam } from './queries/buildSortParam.js' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const find: Find = async function find( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/findGlobal.ts b/packages/db-mongodb/src/findGlobal.ts index 4519c8e34..054edf0b1 100644 --- a/packages/db-mongodb/src/findGlobal.ts +++ b/packages/db-mongodb/src/findGlobal.ts @@ -3,10 +3,10 @@ import type { PayloadRequest } from 'payload/types' import { combineQueries } from 'payload/database' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const findGlobal: FindGlobal = async function findGlobal( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/findGlobalVersions.ts b/packages/db-mongodb/src/findGlobalVersions.ts index ac8e99767..90c604486 100644 --- a/packages/db-mongodb/src/findGlobalVersions.ts +++ b/packages/db-mongodb/src/findGlobalVersions.ts @@ -5,11 +5,11 @@ import type { PayloadRequest } from 'payload/types' import { flattenWhereToOperators } from 'payload/database' import { buildVersionGlobalFields } from 'payload/versions' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { buildSortParam } from './queries/buildSortParam' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import { buildSortParam } from './queries/buildSortParam.js' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/findOne.ts b/packages/db-mongodb/src/findOne.ts index 7d8f9bbe2..40db95889 100644 --- a/packages/db-mongodb/src/findOne.ts +++ b/packages/db-mongodb/src/findOne.ts @@ -3,10 +3,10 @@ import type { FindOne } from 'payload/database' import type { PayloadRequest } from 'payload/types' import type { Document } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const findOne: FindOne = async function findOne( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/findVersions.ts b/packages/db-mongodb/src/findVersions.ts index 20636c0e5..23240b149 100644 --- a/packages/db-mongodb/src/findVersions.ts +++ b/packages/db-mongodb/src/findVersions.ts @@ -4,11 +4,11 @@ import type { PayloadRequest } from 'payload/types' import { flattenWhereToOperators } from 'payload/database' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { buildSortParam } from './queries/buildSortParam' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import { buildSortParam } from './queries/buildSortParam.js' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const findVersions: FindVersions = async function findVersions( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/index.ts b/packages/db-mongodb/src/index.ts index 220965c1b..4d27e739c 100644 --- a/packages/db-mongodb/src/index.ts +++ b/packages/db-mongodb/src/index.ts @@ -8,35 +8,35 @@ import mongoose from 'mongoose' import path from 'path' import { createDatabaseAdapter } from 'payload/database' -import type { CollectionModel, GlobalModel } from './types' +import type { CollectionModel, GlobalModel } from './types.d.ts' -import { connect } from './connect' -import { create } from './create' -import { createGlobal } from './createGlobal' -import { createGlobalVersion } from './createGlobalVersion' -import { createMigration } from './createMigration' -import { createVersion } from './createVersion' -import { deleteMany } from './deleteMany' -import { deleteOne } from './deleteOne' -import { deleteVersions } from './deleteVersions' -import { destroy } from './destroy' -import { find } from './find' -import { findGlobal } from './findGlobal' -import { findGlobalVersions } from './findGlobalVersions' -import { findOne } from './findOne' -import { findVersions } from './findVersions' -import { init } from './init' -import { migrateFresh } from './migrateFresh' -import { queryDrafts } from './queryDrafts' -import { beginTransaction } from './transactions/beginTransaction' -import { commitTransaction } from './transactions/commitTransaction' -import { rollbackTransaction } from './transactions/rollbackTransaction' -import { updateGlobal } from './updateGlobal' -import { updateGlobalVersion } from './updateGlobalVersion' -import { updateOne } from './updateOne' -import { updateVersion } from './updateVersion' +import { connect } from './connect.js' +import { create } from './create.js' +import { createGlobal } from './createGlobal.js' +import { createGlobalVersion } from './createGlobalVersion.js' +import { createMigration } from './createMigration.js' +import { createVersion } from './createVersion.js' +import { deleteMany } from './deleteMany.js' +import { deleteOne } from './deleteOne.js' +import { deleteVersions } from './deleteVersions.js' +import { destroy } from './destroy.js' +import { find } from './find.js' +import { findGlobal } from './findGlobal.js' +import { findGlobalVersions } from './findGlobalVersions.js' +import { findOne } from './findOne.js' +import { findVersions } from './findVersions.js' +import { init } from './init.js' +import { migrateFresh } from './migrateFresh.js' +import { queryDrafts } from './queryDrafts.js' +import { beginTransaction } from './transactions/beginTransaction.js' +import { commitTransaction } from './transactions/commitTransaction.js' +import { rollbackTransaction } from './transactions/rollbackTransaction.js' +import { updateGlobal } from './updateGlobal.js' +import { updateGlobalVersion } from './updateGlobalVersion.js' +import { updateOne } from './updateOne.js' +import { updateVersion } from './updateVersion.js' -export type { MigrateDownArgs, MigrateUpArgs } from './types' +export type { MigrateDownArgs, MigrateUpArgs } from './types.d.ts' import type { DatabaseAdapterObj } from 'payload/database' export interface Args { diff --git a/packages/db-mongodb/src/init.ts b/packages/db-mongodb/src/init.ts index fb9ec80b2..c6acc4cbb 100644 --- a/packages/db-mongodb/src/init.ts +++ b/packages/db-mongodb/src/init.ts @@ -11,13 +11,13 @@ import { getVersionsModelName, } from 'payload/versions' -import type { MongooseAdapter } from '.' -import type { CollectionModel } from './types' +import type { MongooseAdapter } from './index.d.ts' +import type { CollectionModel } from './types.d.ts' -import buildCollectionSchema from './models/buildCollectionSchema' -import { buildGlobalModel } from './models/buildGlobalModel' -import buildSchema from './models/buildSchema' -import getBuildQueryPlugin from './queries/buildQuery' +import buildCollectionSchema from './models/buildCollectionSchema.js' +import { buildGlobalModel } from './models/buildGlobalModel.js' +import buildSchema from './models/buildSchema.js' +import getBuildQueryPlugin from './queries/buildQuery.js' export const init: Init = function init(this: MongooseAdapter) { this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => { diff --git a/packages/db-mongodb/src/migrateFresh.ts b/packages/db-mongodb/src/migrateFresh.ts index b49dc40f2..1e98b3532 100644 --- a/packages/db-mongodb/src/migrateFresh.ts +++ b/packages/db-mongodb/src/migrateFresh.ts @@ -8,7 +8,7 @@ import { } from 'payload/database' import prompts from 'prompts' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' /** * Drop the current database and run all migrate up functions diff --git a/packages/db-mongodb/src/models/buildCollectionSchema.ts b/packages/db-mongodb/src/models/buildCollectionSchema.ts index 44c95c8bc..4f1d1a24e 100644 --- a/packages/db-mongodb/src/models/buildCollectionSchema.ts +++ b/packages/db-mongodb/src/models/buildCollectionSchema.ts @@ -4,8 +4,8 @@ import type { SanitizedCollectionConfig } from 'payload/types' import paginate from 'mongoose-paginate-v2' -import getBuildQueryPlugin from '../queries/buildQuery' -import buildSchema from './buildSchema' +import getBuildQueryPlugin from '../queries/buildQuery.js' +import buildSchema from './buildSchema.js' const buildCollectionSchema = ( collection: SanitizedCollectionConfig, diff --git a/packages/db-mongodb/src/models/buildGlobalModel.ts b/packages/db-mongodb/src/models/buildGlobalModel.ts index e3c6f8e0d..d5e7ed2f4 100644 --- a/packages/db-mongodb/src/models/buildGlobalModel.ts +++ b/packages/db-mongodb/src/models/buildGlobalModel.ts @@ -2,10 +2,10 @@ import type { SanitizedConfig } from 'payload/config' import mongoose from 'mongoose' -import type { GlobalModel } from '../types' +import type { GlobalModel } from '../types.d.ts' -import getBuildQueryPlugin from '../queries/buildQuery' -import buildSchema from './buildSchema' +import getBuildQueryPlugin from '../queries/buildQuery.js' +import buildSchema from './buildSchema.js' export const buildGlobalModel = (config: SanitizedConfig): GlobalModel | null => { if (config.globals && config.globals.length > 0) { diff --git a/packages/db-mongodb/src/queries/buildQuery.ts b/packages/db-mongodb/src/queries/buildQuery.ts index f250d5f88..822abd048 100644 --- a/packages/db-mongodb/src/queries/buildQuery.ts +++ b/packages/db-mongodb/src/queries/buildQuery.ts @@ -3,7 +3,7 @@ import type { Field, Where } from 'payload/types' import { QueryError } from 'payload/errors' -import { parseParams } from './parseParams' +import { parseParams } from './parseParams.js' type GetBuildQueryPluginArgs = { collectionSlug?: string diff --git a/packages/db-mongodb/src/queries/buildSearchParams.ts b/packages/db-mongodb/src/queries/buildSearchParams.ts index d79fc23d7..6553e2efa 100644 --- a/packages/db-mongodb/src/queries/buildSearchParams.ts +++ b/packages/db-mongodb/src/queries/buildSearchParams.ts @@ -9,10 +9,10 @@ import { getLocalizedPaths } from 'payload/database' import { fieldAffectsData } from 'payload/types' import { validOperators } from 'payload/types' -import type { MongooseAdapter } from '..' +import type { MongooseAdapter } from '../index.d.ts' -import { operatorMap } from './operatorMap' -import { sanitizeQueryValue } from './sanitizeQueryValue' +import { operatorMap } from './operatorMap.js' +import { sanitizeQueryValue } from './sanitizeQueryValue.js' type SearchParam = { path?: string diff --git a/packages/db-mongodb/src/queries/buildSortParam.ts b/packages/db-mongodb/src/queries/buildSortParam.ts index eeed37905..2503e659f 100644 --- a/packages/db-mongodb/src/queries/buildSortParam.ts +++ b/packages/db-mongodb/src/queries/buildSortParam.ts @@ -2,7 +2,7 @@ import type { PaginateOptions } from 'mongoose' import type { SanitizedConfig } from 'payload/config' import type { Field } from 'payload/types' -import { getLocalizedSortProperty } from './getLocalizedSortProperty' +import { getLocalizedSortProperty } from './getLocalizedSortProperty.js' type Args = { config: SanitizedConfig diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts index 92c311b5d..55310ca3a 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts +++ b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts @@ -1,6 +1,6 @@ import { sanitizeConfig } from 'payload/config' import { Config } from 'payload/config' -import { getLocalizedSortProperty } from './getLocalizedSortProperty' +import { getLocalizedSortProperty } from './getLocalizedSortProperty.js' const config = { localization: { diff --git a/packages/db-mongodb/src/queries/parseParams.ts b/packages/db-mongodb/src/queries/parseParams.ts index d65edb568..5901e98bd 100644 --- a/packages/db-mongodb/src/queries/parseParams.ts +++ b/packages/db-mongodb/src/queries/parseParams.ts @@ -9,8 +9,8 @@ import deepmerge from 'deepmerge' import { validOperators } from 'payload/types' import { combineMerge } from 'payload/utilities' -import { buildAndOrConditions } from './buildAndOrConditions' -import { buildSearchParam } from './buildSearchParams' +import { buildAndOrConditions } from './buildAndOrConditions.js' +import { buildSearchParam } from './buildSearchParams.js' export async function parseParams({ collectionSlug, diff --git a/packages/db-mongodb/src/queryDrafts.ts b/packages/db-mongodb/src/queryDrafts.ts index b77e5b97d..55e8cc9f1 100644 --- a/packages/db-mongodb/src/queryDrafts.ts +++ b/packages/db-mongodb/src/queryDrafts.ts @@ -4,11 +4,11 @@ import type { PayloadRequest } from 'payload/types' import { combineQueries, flattenWhereToOperators } from 'payload/database' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { buildSortParam } from './queries/buildSortParam' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import { buildSortParam } from './queries/buildSortParam.js' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const queryDrafts: QueryDrafts = async function queryDrafts( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/transactions/beginTransaction.ts b/packages/db-mongodb/src/transactions/beginTransaction.ts index 9f33de461..f5a996d2b 100644 --- a/packages/db-mongodb/src/transactions/beginTransaction.ts +++ b/packages/db-mongodb/src/transactions/beginTransaction.ts @@ -4,7 +4,7 @@ import type { BeginTransaction } from 'payload/database' import { APIError } from 'payload/errors' import { v4 as uuid } from 'uuid' -import type { MongooseAdapter } from '../index' +import type { MongooseAdapter } from '../index.d.ts' export const beginTransaction: BeginTransaction = async function beginTransaction( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/types.ts b/packages/db-mongodb/src/types.ts index 211b67260..51953142c 100644 --- a/packages/db-mongodb/src/types.ts +++ b/packages/db-mongodb/src/types.ts @@ -25,7 +25,7 @@ import type { UploadField, } from 'payload/types' -import type { BuildQueryArgs } from './queries/buildQuery' +import type { BuildQueryArgs } from './queries/buildQuery.d.ts' export interface CollectionModel extends Model, PaginateModel { /** buildQuery is used to transform payload's where operator into what can be used by mongoose (e.g. id => _id) */ diff --git a/packages/db-mongodb/src/updateGlobal.ts b/packages/db-mongodb/src/updateGlobal.ts index f26af9152..78939d167 100644 --- a/packages/db-mongodb/src/updateGlobal.ts +++ b/packages/db-mongodb/src/updateGlobal.ts @@ -1,10 +1,10 @@ import type { UpdateGlobal } from 'payload/database' import type { PayloadRequest } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const updateGlobal: UpdateGlobal = async function updateGlobal( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/updateGlobalVersion.ts b/packages/db-mongodb/src/updateGlobalVersion.ts index bf5f5a901..765d7c9bf 100644 --- a/packages/db-mongodb/src/updateGlobalVersion.ts +++ b/packages/db-mongodb/src/updateGlobalVersion.ts @@ -1,9 +1,9 @@ import type { UpdateGlobalVersionArgs } from 'payload/database' import type { PayloadRequest, TypeWithID } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { withSession } from './withSession' +import { withSession } from './withSession.js' export async function updateGlobalVersion( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/updateOne.ts b/packages/db-mongodb/src/updateOne.ts index 5577bea20..98411e519 100644 --- a/packages/db-mongodb/src/updateOne.ts +++ b/packages/db-mongodb/src/updateOne.ts @@ -1,11 +1,11 @@ import type { UpdateOne } from 'payload/database' import type { PayloadRequest } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import handleError from './utilities/handleError' -import sanitizeInternalFields from './utilities/sanitizeInternalFields' -import { withSession } from './withSession' +import handleError from './utilities/handleError.js' +import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { withSession } from './withSession.js' export const updateOne: UpdateOne = async function updateOne( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/updateVersion.ts b/packages/db-mongodb/src/updateVersion.ts index a4d0cc3d5..07aa32cb7 100644 --- a/packages/db-mongodb/src/updateVersion.ts +++ b/packages/db-mongodb/src/updateVersion.ts @@ -1,9 +1,9 @@ import type { UpdateVersion } from 'payload/database' import type { PayloadRequest } from 'payload/types' -import type { MongooseAdapter } from '.' +import type { MongooseAdapter } from './index.d.ts' -import { withSession } from './withSession' +import { withSession } from './withSession.js' export const updateVersion: UpdateVersion = async function updateVersion( this: MongooseAdapter, diff --git a/packages/db-mongodb/src/withSession.ts b/packages/db-mongodb/src/withSession.ts index d7aff267f..470a1b769 100644 --- a/packages/db-mongodb/src/withSession.ts +++ b/packages/db-mongodb/src/withSession.ts @@ -1,6 +1,6 @@ import type { ClientSession } from 'mongoose' -import type { MongooseAdapter } from './index' +import type { MongooseAdapter } from './index.d.ts' /** * returns the session belonging to the transaction of the req.session if exists From bff045fff294e22a82f628e27e821daa742c1147 Mon Sep 17 00:00:00 2001 From: Kendell Joseph Date: Wed, 6 Mar 2024 14:17:46 -0500 Subject: [PATCH 08/21] chore: updates db-postgres imports for ESM --- .../src/queries/buildAndOrConditions.ts | 2 +- packages/db-postgres/src/connect.ts | 2 +- packages/db-postgres/src/create.ts | 4 +- packages/db-postgres/src/createGlobal.ts | 4 +- .../db-postgres/src/createGlobalVersion.ts | 4 +- packages/db-postgres/src/createMigration.ts | 2 +- packages/db-postgres/src/createVersion.ts | 4 +- packages/db-postgres/src/deleteMany.ts | 4 +- packages/db-postgres/src/deleteOne.ts | 8 +-- packages/db-postgres/src/deleteVersions.ts | 4 +- packages/db-postgres/src/destroy.ts | 2 +- packages/db-postgres/src/find.ts | 4 +- .../db-postgres/src/find/buildFindManyArgs.ts | 4 +- packages/db-postgres/src/find/findMany.ts | 12 ++-- .../db-postgres/src/find/traverseFields.ts | 4 +- packages/db-postgres/src/findGlobal.ts | 4 +- .../db-postgres/src/findGlobalVersions.ts | 4 +- packages/db-postgres/src/findOne.ts | 4 +- packages/db-postgres/src/findVersions.ts | 4 +- packages/db-postgres/src/index.ts | 64 +++++++++---------- packages/db-postgres/src/init.ts | 4 +- packages/db-postgres/src/migrate.ts | 8 +-- packages/db-postgres/src/migrateDown.ts | 6 +- packages/db-postgres/src/migrateFresh.ts | 4 +- packages/db-postgres/src/migrateRefresh.ts | 6 +- packages/db-postgres/src/migrateReset.ts | 4 +- packages/db-postgres/src/migrateStatus.ts | 4 +- .../src/queries/buildAndOrConditions.ts | 6 +- .../db-postgres/src/queries/buildQuery.ts | 6 +- .../convertPathToJSONTraversal.ts | 2 +- .../src/queries/createJSONQuery/index.ts | 4 +- .../src/queries/getTableColumnFromPath.ts | 4 +- .../db-postgres/src/queries/parseParams.ts | 16 ++--- .../src/queries/sanitizeQueryValue.ts | 2 +- packages/db-postgres/src/queryDrafts.ts | 2 +- packages/db-postgres/src/schema/build.ts | 8 +-- .../db-postgres/src/schema/createIndex.ts | 2 +- .../src/schema/parentIDColumnMap.ts | 2 +- .../db-postgres/src/schema/setColumnID.ts | 2 +- .../db-postgres/src/schema/traverseFields.ts | 14 ++-- .../validateExistingBlockIsIdentical.ts | 2 +- .../src/transactions/beginTransaction.ts | 2 +- .../db-postgres/src/transform/read/index.ts | 6 +- .../src/transform/read/traverseFields.ts | 8 +-- .../db-postgres/src/transform/write/array.ts | 8 +-- .../db-postgres/src/transform/write/blocks.ts | 6 +- .../db-postgres/src/transform/write/index.ts | 6 +- .../src/transform/write/selects.ts | 2 +- .../src/transform/write/traverseFields.ts | 18 +++--- packages/db-postgres/src/update.ts | 10 +-- packages/db-postgres/src/updateGlobal.ts | 4 +- .../db-postgres/src/updateGlobalVersion.ts | 6 +- packages/db-postgres/src/updateVersion.ts | 6 +- .../src/upsertRow/deleteExistingArrayRows.ts | 2 +- .../src/upsertRow/deleteExistingRowsByPath.ts | 2 +- packages/db-postgres/src/upsertRow/index.ts | 16 ++--- .../db-postgres/src/upsertRow/insertArrays.ts | 4 +- packages/db-postgres/src/upsertRow/types.ts | 2 +- .../src/utilities/createMigrationTable.ts | 2 +- .../src/utilities/migrationTableExists.ts | 2 +- 60 files changed, 182 insertions(+), 182 deletions(-) diff --git a/packages/db-mongodb/src/queries/buildAndOrConditions.ts b/packages/db-mongodb/src/queries/buildAndOrConditions.ts index 340f6ad3c..207b760e9 100644 --- a/packages/db-mongodb/src/queries/buildAndOrConditions.ts +++ b/packages/db-mongodb/src/queries/buildAndOrConditions.ts @@ -1,7 +1,7 @@ import type { Payload } from 'payload' import type { Field, Where } from 'payload/types' -import { parseParams } from './parseParams' +import { parseParams } from './parseParams.js' export async function buildAndOrConditions({ collectionSlug, diff --git a/packages/db-postgres/src/connect.ts b/packages/db-postgres/src/connect.ts index 5800a2c38..48ee3c54a 100644 --- a/packages/db-postgres/src/connect.ts +++ b/packages/db-postgres/src/connect.ts @@ -7,7 +7,7 @@ import { numeric, timestamp, varchar } from 'drizzle-orm/pg-core' import { Pool } from 'pg' import prompts from 'prompts' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' const connectWithReconnect = async function ({ adapter, diff --git a/packages/db-postgres/src/create.ts b/packages/db-postgres/src/create.ts index 334fc51bc..f2d882cab 100644 --- a/packages/db-postgres/src/create.ts +++ b/packages/db-postgres/src/create.ts @@ -2,9 +2,9 @@ import type { Create } from 'payload/database' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { upsertRow } from './upsertRow' +import { upsertRow } from './upsertRow/index.js' export const create: Create = async function create( this: PostgresAdapter, diff --git a/packages/db-postgres/src/createGlobal.ts b/packages/db-postgres/src/createGlobal.ts index e60f7911f..4b0207d68 100644 --- a/packages/db-postgres/src/createGlobal.ts +++ b/packages/db-postgres/src/createGlobal.ts @@ -3,9 +3,9 @@ import type { PayloadRequest, TypeWithID } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { upsertRow } from './upsertRow' +import { upsertRow } from './upsertRow/index.js' export async function createGlobal( this: PostgresAdapter, diff --git a/packages/db-postgres/src/createGlobalVersion.ts b/packages/db-postgres/src/createGlobalVersion.ts index 000a3c54a..17552435b 100644 --- a/packages/db-postgres/src/createGlobalVersion.ts +++ b/packages/db-postgres/src/createGlobalVersion.ts @@ -6,9 +6,9 @@ import { sql } from 'drizzle-orm' import { buildVersionGlobalFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { upsertRow } from './upsertRow' +import { upsertRow } from './upsertRow/index.js' export async function createGlobalVersion( this: PostgresAdapter, diff --git a/packages/db-postgres/src/createMigration.ts b/packages/db-postgres/src/createMigration.ts index 8e75d6278..554cfaf1b 100644 --- a/packages/db-postgres/src/createMigration.ts +++ b/packages/db-postgres/src/createMigration.ts @@ -5,7 +5,7 @@ import type { CreateMigration } from 'payload/database' import fs from 'fs' import prompts from 'prompts' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' const migrationTemplate = ( upSQL?: string, diff --git a/packages/db-postgres/src/createVersion.ts b/packages/db-postgres/src/createVersion.ts index 2ccda8a60..e9ffc14b4 100644 --- a/packages/db-postgres/src/createVersion.ts +++ b/packages/db-postgres/src/createVersion.ts @@ -5,9 +5,9 @@ import { sql } from 'drizzle-orm' import { buildVersionCollectionFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { upsertRow } from './upsertRow' +import { upsertRow } from './upsertRow/index.js' export async function createVersion( this: PostgresAdapter, diff --git a/packages/db-postgres/src/deleteMany.ts b/packages/db-postgres/src/deleteMany.ts index 75621a847..806fa1737 100644 --- a/packages/db-postgres/src/deleteMany.ts +++ b/packages/db-postgres/src/deleteMany.ts @@ -4,9 +4,9 @@ import type { PayloadRequest } from 'payload/types' import { inArray } from 'drizzle-orm' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export const deleteMany: DeleteMany = async function deleteMany( this: PostgresAdapter, diff --git a/packages/db-postgres/src/deleteOne.ts b/packages/db-postgres/src/deleteOne.ts index fd0dc5673..aa7897323 100644 --- a/packages/db-postgres/src/deleteOne.ts +++ b/packages/db-postgres/src/deleteOne.ts @@ -3,11 +3,11 @@ import type { PayloadRequest } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { buildFindManyArgs } from './find/buildFindManyArgs' -import buildQuery from './queries/buildQuery' -import { transform } from './transform/read' +import { buildFindManyArgs } from './find/buildFindManyArgs.js' +import buildQuery from './queries/buildQuery.js' +import { transform } from './transform/read/index.js' export const deleteOne: DeleteOne = async function deleteOne( this: PostgresAdapter, diff --git a/packages/db-postgres/src/deleteVersions.ts b/packages/db-postgres/src/deleteVersions.ts index 5200ca5f9..2fd3f716c 100644 --- a/packages/db-postgres/src/deleteVersions.ts +++ b/packages/db-postgres/src/deleteVersions.ts @@ -5,9 +5,9 @@ import { inArray } from 'drizzle-orm' import { buildVersionCollectionFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export const deleteVersions: DeleteVersions = async function deleteVersion( this: PostgresAdapter, diff --git a/packages/db-postgres/src/destroy.ts b/packages/db-postgres/src/destroy.ts index 5fb245da8..d9e2faf7f 100644 --- a/packages/db-postgres/src/destroy.ts +++ b/packages/db-postgres/src/destroy.ts @@ -1,6 +1,6 @@ import type { Destroy } from 'payload/database' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' export const destroy: Destroy = async function destroy(this: PostgresAdapter) { // TODO: this hangs test suite for some reason diff --git a/packages/db-postgres/src/find.ts b/packages/db-postgres/src/find.ts index 959e78e24..ae3804b0e 100644 --- a/packages/db-postgres/src/find.ts +++ b/packages/db-postgres/src/find.ts @@ -3,9 +3,9 @@ import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export const find: Find = async function find( this: PostgresAdapter, diff --git a/packages/db-postgres/src/find/buildFindManyArgs.ts b/packages/db-postgres/src/find/buildFindManyArgs.ts index 1390d3ab7..bc448d2ea 100644 --- a/packages/db-postgres/src/find/buildFindManyArgs.ts +++ b/packages/db-postgres/src/find/buildFindManyArgs.ts @@ -1,9 +1,9 @@ import type { DBQueryConfig } from 'drizzle-orm' import type { Field } from 'payload/types' -import type { PostgresAdapter } from '../types' +import type { PostgresAdapter } from '../types.d.ts' -import { traverseFields } from './traverseFields' +import { traverseFields } from './traverseFields.js' type BuildFindQueryArgs = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/find/findMany.ts b/packages/db-postgres/src/find/findMany.ts index caf10cb22..0990cf762 100644 --- a/packages/db-postgres/src/find/findMany.ts +++ b/packages/db-postgres/src/find/findMany.ts @@ -3,13 +3,13 @@ import type { Field, PayloadRequest, TypeWithID } from 'payload/types' import { inArray, sql } from 'drizzle-orm' -import type { PostgresAdapter } from '../types' -import type { ChainedMethods } from './chainMethods' +import type { PostgresAdapter } from '../types.d.ts' +import type { ChainedMethods } from './chainMethods.d.ts' -import buildQuery from '../queries/buildQuery' -import { transform } from '../transform/read' -import { buildFindManyArgs } from './buildFindManyArgs' -import { chainMethods } from './chainMethods' +import buildQuery from '../queries/buildQuery.js' +import { transform } from '../transform/read/index.js' +import { buildFindManyArgs } from './buildFindManyArgs.js' +import { chainMethods } from './chainMethods.js' type Args = Omit & { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/find/traverseFields.ts b/packages/db-postgres/src/find/traverseFields.ts index 42a20b7a7..4ee576df5 100644 --- a/packages/db-postgres/src/find/traverseFields.ts +++ b/packages/db-postgres/src/find/traverseFields.ts @@ -4,8 +4,8 @@ import type { Field } from 'payload/types' import { fieldAffectsData, tabHasName } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from '../types' -import type { Result } from './buildFindManyArgs' +import type { PostgresAdapter } from '../types.d.ts' +import type { Result } from './buildFindManyArgs.d.ts' type TraverseFieldArgs = { _locales: Record diff --git a/packages/db-postgres/src/findGlobal.ts b/packages/db-postgres/src/findGlobal.ts index dc5213efe..6e7f64245 100644 --- a/packages/db-postgres/src/findGlobal.ts +++ b/packages/db-postgres/src/findGlobal.ts @@ -2,9 +2,9 @@ import type { FindGlobal } from 'payload/database' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export const findGlobal: FindGlobal = async function findGlobal( this: PostgresAdapter, diff --git a/packages/db-postgres/src/findGlobalVersions.ts b/packages/db-postgres/src/findGlobalVersions.ts index f0ad0a72c..135f13ab7 100644 --- a/packages/db-postgres/src/findGlobalVersions.ts +++ b/packages/db-postgres/src/findGlobalVersions.ts @@ -4,9 +4,9 @@ import type { PayloadRequest, SanitizedGlobalConfig } from 'payload/types' import { buildVersionGlobalFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions( this: PostgresAdapter, diff --git a/packages/db-postgres/src/findOne.ts b/packages/db-postgres/src/findOne.ts index cb1ae7621..552d201b4 100644 --- a/packages/db-postgres/src/findOne.ts +++ b/packages/db-postgres/src/findOne.ts @@ -3,9 +3,9 @@ import type { PayloadRequest, SanitizedCollectionConfig, TypeWithID } from 'payl import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export async function findOne( this: PostgresAdapter, diff --git a/packages/db-postgres/src/findVersions.ts b/packages/db-postgres/src/findVersions.ts index 02178a11e..4f489ab1d 100644 --- a/packages/db-postgres/src/findVersions.ts +++ b/packages/db-postgres/src/findVersions.ts @@ -4,9 +4,9 @@ import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types' import { buildVersionCollectionFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export const findVersions: FindVersions = async function findVersions( this: PostgresAdapter, diff --git a/packages/db-postgres/src/index.ts b/packages/db-postgres/src/index.ts index 048c747c1..f682c2b1d 100644 --- a/packages/db-postgres/src/index.ts +++ b/packages/db-postgres/src/index.ts @@ -5,40 +5,40 @@ import fs from 'fs' import path from 'path' import { createDatabaseAdapter } from 'payload/database' -import type { Args, PostgresAdapter } from './types' +import type { Args, PostgresAdapter } from './types.d.ts' -import { connect } from './connect' -import { create } from './create' -import { createGlobal } from './createGlobal' -import { createGlobalVersion } from './createGlobalVersion' -import { createMigration } from './createMigration' -import { createVersion } from './createVersion' -import { deleteMany } from './deleteMany' -import { deleteOne } from './deleteOne' -import { deleteVersions } from './deleteVersions' -import { destroy } from './destroy' -import { find } from './find' -import { findGlobal } from './findGlobal' -import { findGlobalVersions } from './findGlobalVersions' -import { findOne } from './findOne' -import { findVersions } from './findVersions' -import { init } from './init' -import { migrate } from './migrate' -import { migrateDown } from './migrateDown' -import { migrateFresh } from './migrateFresh' -import { migrateRefresh } from './migrateRefresh' -import { migrateReset } from './migrateReset' -import { migrateStatus } from './migrateStatus' -import { queryDrafts } from './queryDrafts' -import { beginTransaction } from './transactions/beginTransaction' -import { commitTransaction } from './transactions/commitTransaction' -import { rollbackTransaction } from './transactions/rollbackTransaction' -import { updateOne } from './update' -import { updateGlobal } from './updateGlobal' -import { updateGlobalVersion } from './updateGlobalVersion' -import { updateVersion } from './updateVersion' +import { connect } from './connect.js' +import { create } from './create.js' +import { createGlobal } from './createGlobal.js' +import { createGlobalVersion } from './createGlobalVersion.js' +import { createMigration } from './createMigration.js' +import { createVersion } from './createVersion.js' +import { deleteMany } from './deleteMany.js' +import { deleteOne } from './deleteOne.js' +import { deleteVersions } from './deleteVersions.js' +import { destroy } from './destroy.js' +import { find } from './find.js' +import { findGlobal } from './findGlobal.js' +import { findGlobalVersions } from './findGlobalVersions.js' +import { findOne } from './findOne.js' +import { findVersions } from './findVersions.js' +import { init } from './init.js' +import { migrate } from './migrate.js' +import { migrateDown } from './migrateDown.js' +import { migrateFresh } from './migrateFresh.js' +import { migrateRefresh } from './migrateRefresh.js' +import { migrateReset } from './migrateReset.js' +import { migrateStatus } from './migrateStatus.js' +import { queryDrafts } from './queryDrafts.js' +import { beginTransaction } from './transactions/beginTransaction.js' +import { commitTransaction } from './transactions/commitTransaction.js' +import { rollbackTransaction } from './transactions/rollbackTransaction.js' +import { updateOne } from './update.js' +import { updateGlobal } from './updateGlobal.js' +import { updateGlobalVersion } from './updateGlobalVersion.js' +import { updateVersion } from './updateVersion.js' -export type { MigrateDownArgs, MigrateUpArgs } from './types' +export type { MigrateDownArgs, MigrateUpArgs } from './types.d.ts' export function postgresAdapter(args: Args): DatabaseAdapterObj { function adapter({ payload }: { payload: Payload }) { diff --git a/packages/db-postgres/src/init.ts b/packages/db-postgres/src/init.ts index 8d82fee08..341b74e60 100644 --- a/packages/db-postgres/src/init.ts +++ b/packages/db-postgres/src/init.ts @@ -6,9 +6,9 @@ import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core' import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { buildTable } from './schema/build' +import { buildTable } from './schema/build.js' export const init: Init = async function init(this: PostgresAdapter) { if (this.schemaName) { diff --git a/packages/db-postgres/src/migrate.ts b/packages/db-postgres/src/migrate.ts index 759b2e3c6..64f5e9c25 100644 --- a/packages/db-postgres/src/migrate.ts +++ b/packages/db-postgres/src/migrate.ts @@ -11,11 +11,11 @@ import { } from 'payload/database' import prompts from 'prompts' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { createMigrationTable } from './utilities/createMigrationTable' -import { migrationTableExists } from './utilities/migrationTableExists' -import { parseError } from './utilities/parseError' +import { createMigrationTable } from './utilities/createMigrationTable.js' +import { migrationTableExists } from './utilities/migrationTableExists.js' +import { parseError } from './utilities/parseError.js' export async function migrate(this: PostgresAdapter): Promise { const { payload } = this diff --git a/packages/db-postgres/src/migrateDown.ts b/packages/db-postgres/src/migrateDown.ts index 75d8d817c..25ad062e1 100644 --- a/packages/db-postgres/src/migrateDown.ts +++ b/packages/db-postgres/src/migrateDown.ts @@ -9,10 +9,10 @@ import { readMigrationFiles, } from 'payload/database' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { migrationTableExists } from './utilities/migrationTableExists' -import { parseError } from './utilities/parseError' +import { migrationTableExists } from './utilities/migrationTableExists.js' +import { parseError } from './utilities/parseError.js' export async function migrateDown(this: PostgresAdapter): Promise { const { payload } = this diff --git a/packages/db-postgres/src/migrateFresh.ts b/packages/db-postgres/src/migrateFresh.ts index 77fc7a847..7aaf48af6 100644 --- a/packages/db-postgres/src/migrateFresh.ts +++ b/packages/db-postgres/src/migrateFresh.ts @@ -9,9 +9,9 @@ import { } from 'payload/database' import prompts from 'prompts' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { parseError } from './utilities/parseError' +import { parseError } from './utilities/parseError.js' /** * Drop the current database and run all migrate up functions diff --git a/packages/db-postgres/src/migrateRefresh.ts b/packages/db-postgres/src/migrateRefresh.ts index 2942fcbeb..203d7ce9f 100644 --- a/packages/db-postgres/src/migrateRefresh.ts +++ b/packages/db-postgres/src/migrateRefresh.ts @@ -9,10 +9,10 @@ import { readMigrationFiles, } from 'payload/database' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { migrationTableExists } from './utilities/migrationTableExists' -import { parseError } from './utilities/parseError' +import { migrationTableExists } from './utilities/migrationTableExists.js' +import { parseError } from './utilities/parseError.js' /** * Run all migration down functions before running up diff --git a/packages/db-postgres/src/migrateReset.ts b/packages/db-postgres/src/migrateReset.ts index a5bbdff00..c46a25218 100644 --- a/packages/db-postgres/src/migrateReset.ts +++ b/packages/db-postgres/src/migrateReset.ts @@ -9,9 +9,9 @@ import { readMigrationFiles, } from 'payload/database' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { migrationTableExists } from './utilities/migrationTableExists' +import { migrationTableExists } from './utilities/migrationTableExists.js' /** * Run all migrate down functions diff --git a/packages/db-postgres/src/migrateStatus.ts b/packages/db-postgres/src/migrateStatus.ts index b12b480f4..5f63c0239 100644 --- a/packages/db-postgres/src/migrateStatus.ts +++ b/packages/db-postgres/src/migrateStatus.ts @@ -1,9 +1,9 @@ import { Table } from 'console-table-printer' import { getMigrations, readMigrationFiles } from 'payload/database' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { migrationTableExists } from './utilities/migrationTableExists' +import { migrationTableExists } from './utilities/migrationTableExists.js' export async function migrateStatus(this: PostgresAdapter): Promise { const { payload } = this diff --git a/packages/db-postgres/src/queries/buildAndOrConditions.ts b/packages/db-postgres/src/queries/buildAndOrConditions.ts index e757d2a8f..2df547b5c 100644 --- a/packages/db-postgres/src/queries/buildAndOrConditions.ts +++ b/packages/db-postgres/src/queries/buildAndOrConditions.ts @@ -1,10 +1,10 @@ import type { SQL } from 'drizzle-orm' import type { Field, Where } from 'payload/types' -import type { GenericColumn, PostgresAdapter } from '../types' -import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery' +import type { GenericColumn, PostgresAdapter } from '../types.d.ts' +import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.d.ts' -import { parseParams } from './parseParams' +import { parseParams } from './parseParams.js' export async function buildAndOrConditions({ adapter, diff --git a/packages/db-postgres/src/queries/buildQuery.ts b/packages/db-postgres/src/queries/buildQuery.ts index 1d483335d..3edd86db4 100644 --- a/packages/db-postgres/src/queries/buildQuery.ts +++ b/packages/db-postgres/src/queries/buildQuery.ts @@ -4,10 +4,10 @@ import type { Field, Where } from 'payload/types' import { asc, desc } from 'drizzle-orm' -import type { GenericColumn, GenericTable, PostgresAdapter } from '../types' +import type { GenericColumn, GenericTable, PostgresAdapter } from '../types.d.ts' -import { getTableColumnFromPath } from './getTableColumnFromPath' -import { parseParams } from './parseParams' +import { getTableColumnFromPath } from './getTableColumnFromPath.js' +import { parseParams } from './parseParams.js' export type BuildQueryJoins = Record diff --git a/packages/db-postgres/src/queries/createJSONQuery/convertPathToJSONTraversal.ts b/packages/db-postgres/src/queries/createJSONQuery/convertPathToJSONTraversal.ts index b6c78d033..0aa171e0a 100644 --- a/packages/db-postgres/src/queries/createJSONQuery/convertPathToJSONTraversal.ts +++ b/packages/db-postgres/src/queries/createJSONQuery/convertPathToJSONTraversal.ts @@ -1,4 +1,4 @@ -import { formatJSONPathSegment } from './formatJSONPathSegment' +import { formatJSONPathSegment } from './formatJSONPathSegment.js' export const convertPathToJSONTraversal = (incomingSegments: string[]) => { const segments = [...incomingSegments] diff --git a/packages/db-postgres/src/queries/createJSONQuery/index.ts b/packages/db-postgres/src/queries/createJSONQuery/index.ts index 0c6868dc6..17637d3cc 100644 --- a/packages/db-postgres/src/queries/createJSONQuery/index.ts +++ b/packages/db-postgres/src/queries/createJSONQuery/index.ts @@ -1,5 +1,5 @@ -import { convertPathToJSONTraversal } from './convertPathToJSONTraversal' -import { formatJSONPathSegment } from './formatJSONPathSegment' +import { convertPathToJSONTraversal } from './convertPathToJSONTraversal.js' +import { formatJSONPathSegment } from './formatJSONPathSegment.js' const operatorMap = { contains: '~*', diff --git a/packages/db-postgres/src/queries/getTableColumnFromPath.ts b/packages/db-postgres/src/queries/getTableColumnFromPath.ts index eb86ac206..4f3e75272 100644 --- a/packages/db-postgres/src/queries/getTableColumnFromPath.ts +++ b/packages/db-postgres/src/queries/getTableColumnFromPath.ts @@ -11,8 +11,8 @@ import { flattenTopLevelFields } from 'payload/utilities' import toSnakeCase from 'to-snake-case' import { v4 as uuid } from 'uuid' -import type { GenericColumn, GenericTable, PostgresAdapter } from '../types' -import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery' +import type { GenericColumn, GenericTable, PostgresAdapter } from '../types.d.ts' +import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.d.ts' type Constraint = { columnName: string diff --git a/packages/db-postgres/src/queries/parseParams.ts b/packages/db-postgres/src/queries/parseParams.ts index 8b202ab44..7fdb7d02f 100644 --- a/packages/db-postgres/src/queries/parseParams.ts +++ b/packages/db-postgres/src/queries/parseParams.ts @@ -6,15 +6,15 @@ import { and, ilike, isNotNull, isNull, ne, notInArray, or, sql } from 'drizzle- import { QueryError } from 'payload/errors' import { validOperators } from 'payload/types' -import type { GenericColumn, PostgresAdapter } from '../types' -import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery' +import type { GenericColumn, PostgresAdapter } from '../types.d.ts' +import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.d.ts' -import { buildAndOrConditions } from './buildAndOrConditions' -import { createJSONQuery } from './createJSONQuery' -import { convertPathToJSONTraversal } from './createJSONQuery/convertPathToJSONTraversal' -import { getTableColumnFromPath } from './getTableColumnFromPath' -import { operatorMap } from './operatorMap' -import { sanitizeQueryValue } from './sanitizeQueryValue' +import { buildAndOrConditions } from './buildAndOrConditions.js' +import { createJSONQuery } from './createJSONQuery/index.js' +import { convertPathToJSONTraversal } from './createJSONQuery/convertPathToJSONTraversal.js' +import { getTableColumnFromPath } from './getTableColumnFromPath.js' +import { operatorMap } from './operatorMap.js' +import { sanitizeQueryValue } from './sanitizeQueryValue.js' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/queries/sanitizeQueryValue.ts b/packages/db-postgres/src/queries/sanitizeQueryValue.ts index 56d8fc3ad..21b7ccb23 100644 --- a/packages/db-postgres/src/queries/sanitizeQueryValue.ts +++ b/packages/db-postgres/src/queries/sanitizeQueryValue.ts @@ -2,7 +2,7 @@ import { APIError } from 'payload/errors' import { type Field, type TabAsField, fieldAffectsData } from 'payload/types' import { createArrayFromCommaDelineated } from 'payload/utilities' -import type { PostgresAdapter } from '../types' +import type { PostgresAdapter } from '../types.d.ts' type SanitizeQueryValueArgs = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/queryDrafts.ts b/packages/db-postgres/src/queryDrafts.ts index 886306710..ee6ddb0e8 100644 --- a/packages/db-postgres/src/queryDrafts.ts +++ b/packages/db-postgres/src/queryDrafts.ts @@ -4,7 +4,7 @@ import { type QueryDrafts, combineQueries } from 'payload/database' import { buildVersionCollectionFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import { findMany } from './find/findMany' +import { findMany } from './find/findMany.js' export const queryDrafts: QueryDrafts = async function queryDrafts({ collection, diff --git a/packages/db-postgres/src/schema/build.ts b/packages/db-postgres/src/schema/build.ts index 218f65d31..e09d4058c 100644 --- a/packages/db-postgres/src/schema/build.ts +++ b/packages/db-postgres/src/schema/build.ts @@ -13,11 +13,11 @@ import { index, integer, numeric, serial, timestamp, unique, varchar } from 'dri import { fieldAffectsData } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { GenericColumns, GenericTable, IDType, PostgresAdapter } from '../types' +import type { GenericColumns, GenericTable, IDType, PostgresAdapter } from '../types.d.ts' -import { parentIDColumnMap } from './parentIDColumnMap' -import { setColumnID } from './setColumnID' -import { traverseFields } from './traverseFields' +import { parentIDColumnMap } from './parentIDColumnMap.js' +import { setColumnID } from './setColumnID.js' +import { traverseFields } from './traverseFields.js' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/schema/createIndex.ts b/packages/db-postgres/src/schema/createIndex.ts index 635f35299..79208c06f 100644 --- a/packages/db-postgres/src/schema/createIndex.ts +++ b/packages/db-postgres/src/schema/createIndex.ts @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ import { index, uniqueIndex } from 'drizzle-orm/pg-core' -import type { GenericColumn } from '../types' +import type { GenericColumn } from '../types.d.ts' type CreateIndexArgs = { columnName: string diff --git a/packages/db-postgres/src/schema/parentIDColumnMap.ts b/packages/db-postgres/src/schema/parentIDColumnMap.ts index a82cb98f8..0292952da 100644 --- a/packages/db-postgres/src/schema/parentIDColumnMap.ts +++ b/packages/db-postgres/src/schema/parentIDColumnMap.ts @@ -1,6 +1,6 @@ import { integer, numeric, uuid, varchar } from 'drizzle-orm/pg-core' -import type { IDType } from '../types' +import type { IDType } from '../types.d.ts' export const parentIDColumnMap: Record< IDType, diff --git a/packages/db-postgres/src/schema/setColumnID.ts b/packages/db-postgres/src/schema/setColumnID.ts index 74e6bc4c8..5f43f83cd 100644 --- a/packages/db-postgres/src/schema/setColumnID.ts +++ b/packages/db-postgres/src/schema/setColumnID.ts @@ -4,7 +4,7 @@ import { numeric, serial, uuid, varchar } from 'drizzle-orm/pg-core' import { type Field, fieldAffectsData } from 'payload/types' import { flattenTopLevelFields } from 'payload/utilities' -import type { IDType, PostgresAdapter } from '../types' +import type { IDType, PostgresAdapter } from '../types.d.ts' type Args = { adapter: PostgresAdapter; columns: Record; fields: Field[] } export const setColumnID = ({ adapter, columns, fields }: Args): IDType => { diff --git a/packages/db-postgres/src/schema/traverseFields.ts b/packages/db-postgres/src/schema/traverseFields.ts index 632a82083..689ecd0b9 100644 --- a/packages/db-postgres/src/schema/traverseFields.ts +++ b/packages/db-postgres/src/schema/traverseFields.ts @@ -22,14 +22,14 @@ import { InvalidConfiguration } from 'payload/errors' import { fieldAffectsData, optionIsObject } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { GenericColumns, IDType, PostgresAdapter } from '../types' +import type { GenericColumns, IDType, PostgresAdapter } from '../types.d.ts' -import { hasLocalesTable } from '../utilities/hasLocalesTable' -import { buildTable } from './build' -import { createIndex } from './createIndex' -import { idToUUID } from './idToUUID' -import { parentIDColumnMap } from './parentIDColumnMap' -import { validateExistingBlockIsIdentical } from './validateExistingBlockIsIdentical' +import { hasLocalesTable } from '../utilities/hasLocalesTable.js' +import { buildTable } from './build.js' +import { createIndex } from './createIndex.js' +import { idToUUID } from './idToUUID.js' +import { parentIDColumnMap } from './parentIDColumnMap.js' +import { validateExistingBlockIsIdentical } from './validateExistingBlockIsIdentical.js' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts b/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts index 432c85f81..6c7e6e118 100644 --- a/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts +++ b/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts @@ -3,7 +3,7 @@ import type { Block, Field } from 'payload/types' import { InvalidConfiguration } from 'payload/errors' import { fieldAffectsData, fieldHasSubFields, tabHasName } from 'payload/types' -import type { GenericTable } from '../types' +import type { GenericTable } from '../types.d.ts' type Args = { block: Block diff --git a/packages/db-postgres/src/transactions/beginTransaction.ts b/packages/db-postgres/src/transactions/beginTransaction.ts index 027788917..aa2855ac9 100644 --- a/packages/db-postgres/src/transactions/beginTransaction.ts +++ b/packages/db-postgres/src/transactions/beginTransaction.ts @@ -2,7 +2,7 @@ import type { BeginTransaction } from 'payload/database' import { v4 as uuid } from 'uuid' -import type { DrizzleTransaction, PostgresAdapter } from '../types' +import type { DrizzleTransaction, PostgresAdapter } from '../types.d.ts' export const beginTransaction: BeginTransaction = async function beginTransaction( this: PostgresAdapter, diff --git a/packages/db-postgres/src/transform/read/index.ts b/packages/db-postgres/src/transform/read/index.ts index 57a44acad..69a0a8c47 100644 --- a/packages/db-postgres/src/transform/read/index.ts +++ b/packages/db-postgres/src/transform/read/index.ts @@ -2,9 +2,9 @@ import type { SanitizedConfig } from 'payload/config' import type { Field, TypeWithID } from 'payload/types' -import { createBlocksMap } from '../../utilities/createBlocksMap' -import { createPathMap } from '../../utilities/createRelationshipMap' -import { traverseFields } from './traverseFields' +import { createBlocksMap } from '../../utilities/createBlocksMap.js' +import { createPathMap } from '../../utilities/createRelationshipMap.js' +import { traverseFields } from './traverseFields.js' type TransformArgs = { config: SanitizedConfig diff --git a/packages/db-postgres/src/transform/read/traverseFields.ts b/packages/db-postgres/src/transform/read/traverseFields.ts index b113e52a2..b6c9e9d9e 100644 --- a/packages/db-postgres/src/transform/read/traverseFields.ts +++ b/packages/db-postgres/src/transform/read/traverseFields.ts @@ -4,11 +4,11 @@ import type { Field, TabAsField } from 'payload/types' import { fieldAffectsData } from 'payload/types' -import type { BlocksMap } from '../../utilities/createBlocksMap' +import type { BlocksMap } from '../../utilities/createBlocksMap.d.ts' -import { transformHasManyNumber } from './hasManyNumber' -import { transformHasManyText } from './hasManyText' -import { transformRelationship } from './relationship' +import { transformHasManyNumber } from './hasManyNumber.js' +import { transformHasManyText } from './hasManyText.js' +import { transformRelationship } from './relationship.js' type TraverseFieldsArgs = { /** diff --git a/packages/db-postgres/src/transform/write/array.ts b/packages/db-postgres/src/transform/write/array.ts index fd64ad1ce..45cb2f703 100644 --- a/packages/db-postgres/src/transform/write/array.ts +++ b/packages/db-postgres/src/transform/write/array.ts @@ -1,11 +1,11 @@ /* eslint-disable no-param-reassign */ import type { ArrayField } from 'payload/types' -import type { PostgresAdapter } from '../../types' -import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types' +import type { PostgresAdapter } from '../../types.d.ts' +import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types.d.ts' -import { isArrayOfRows } from '../../utilities/isArrayOfRows' -import { traverseFields } from './traverseFields' +import { isArrayOfRows } from '../../utilities/isArrayOfRows.js' +import { traverseFields } from './traverseFields.js' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/transform/write/blocks.ts b/packages/db-postgres/src/transform/write/blocks.ts index dc80d0365..dff1e6131 100644 --- a/packages/db-postgres/src/transform/write/blocks.ts +++ b/packages/db-postgres/src/transform/write/blocks.ts @@ -3,10 +3,10 @@ import type { BlockField } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from '../../types' -import type { BlockRowToInsert, RelationshipToDelete } from './types' +import type { PostgresAdapter } from '../../types.d.ts' +import type { BlockRowToInsert, RelationshipToDelete } from './types.d.ts' -import { traverseFields } from './traverseFields' +import { traverseFields } from './traverseFields.js' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/transform/write/index.ts b/packages/db-postgres/src/transform/write/index.ts index 607bfaf03..657552f1f 100644 --- a/packages/db-postgres/src/transform/write/index.ts +++ b/packages/db-postgres/src/transform/write/index.ts @@ -1,10 +1,10 @@ /* eslint-disable no-param-reassign */ import type { Field } from 'payload/types' -import type { PostgresAdapter } from '../../types' -import type { RowToInsert } from './types' +import type { PostgresAdapter } from '../../types.d.ts' +import type { RowToInsert } from './types.d.ts' -import { traverseFields } from './traverseFields' +import { traverseFields } from './traverseFields.js' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/transform/write/selects.ts b/packages/db-postgres/src/transform/write/selects.ts index 404fbd349..bd7c81808 100644 --- a/packages/db-postgres/src/transform/write/selects.ts +++ b/packages/db-postgres/src/transform/write/selects.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import { isArrayOfRows } from '../../utilities/isArrayOfRows' +import { isArrayOfRows } from '../../utilities/isArrayOfRows.js' type Args = { data: unknown diff --git a/packages/db-postgres/src/transform/write/traverseFields.ts b/packages/db-postgres/src/transform/write/traverseFields.ts index 0a3b57fa7..0a7c09e19 100644 --- a/packages/db-postgres/src/transform/write/traverseFields.ts +++ b/packages/db-postgres/src/transform/write/traverseFields.ts @@ -4,16 +4,16 @@ import type { Field } from 'payload/types' import { fieldAffectsData } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from '../../types' -import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types' +import type { PostgresAdapter } from '../../types.d.ts' +import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types.d.ts' -import { isArrayOfRows } from '../../utilities/isArrayOfRows' -import { transformArray } from './array' -import { transformBlocks } from './blocks' -import { transformNumbers } from './numbers' -import { transformRelationship } from './relationships' -import { transformSelects } from './selects' -import { transformTexts } from './texts' +import { isArrayOfRows } from '../../utilities/isArrayOfRows.js' +import { transformArray } from './array.js' +import { transformBlocks } from './blocks.js' +import { transformNumbers } from './numbers.js' +import { transformRelationship } from './relationships.js' +import { transformSelects } from './selects.js' +import { transformTexts } from './texts.js' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/update.ts b/packages/db-postgres/src/update.ts index 197684b6c..52cda9afd 100644 --- a/packages/db-postgres/src/update.ts +++ b/packages/db-postgres/src/update.ts @@ -2,11 +2,11 @@ import type { UpdateOne } from 'payload/database' import toSnakeCase from 'to-snake-case' -import type { ChainedMethods } from './find/chainMethods' -import { chainMethods } from './find/chainMethods' -import type { PostgresAdapter } from './types' -import buildQuery from './queries/buildQuery' -import { upsertRow } from './upsertRow' +import type { ChainedMethods } from './find/chainMethods.d.ts' +import type { PostgresAdapter } from './types.d.ts' +import { chainMethods } from './find/chainMethods.js' +import buildQuery from './queries/buildQuery.js' +import { upsertRow } from './upsertRow/index.js' export const updateOne: UpdateOne = async function updateOne( this: PostgresAdapter, diff --git a/packages/db-postgres/src/updateGlobal.ts b/packages/db-postgres/src/updateGlobal.ts index e9c3f805e..596aa232b 100644 --- a/packages/db-postgres/src/updateGlobal.ts +++ b/packages/db-postgres/src/updateGlobal.ts @@ -3,9 +3,9 @@ import type { PayloadRequest, TypeWithID } from 'payload/types' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import { upsertRow } from './upsertRow' +import { upsertRow } from './upsertRow/index.js' export async function updateGlobal( this: PostgresAdapter, diff --git a/packages/db-postgres/src/updateGlobalVersion.ts b/packages/db-postgres/src/updateGlobalVersion.ts index 9aaaddf59..2b54ad119 100644 --- a/packages/db-postgres/src/updateGlobalVersion.ts +++ b/packages/db-postgres/src/updateGlobalVersion.ts @@ -4,10 +4,10 @@ import type { PayloadRequest, SanitizedGlobalConfig, TypeWithID } from 'payload/ import { buildVersionGlobalFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import buildQuery from './queries/buildQuery' -import { upsertRow } from './upsertRow' +import buildQuery from './queries/buildQuery.js' +import { upsertRow } from './upsertRow/index.js' export async function updateGlobalVersion( this: PostgresAdapter, diff --git a/packages/db-postgres/src/updateVersion.ts b/packages/db-postgres/src/updateVersion.ts index f367c1675..3e8f9bb66 100644 --- a/packages/db-postgres/src/updateVersion.ts +++ b/packages/db-postgres/src/updateVersion.ts @@ -4,10 +4,10 @@ import type { PayloadRequest, SanitizedCollectionConfig, TypeWithID } from 'payl import { buildVersionCollectionFields } from 'payload/versions' import toSnakeCase from 'to-snake-case' -import type { PostgresAdapter } from './types' +import type { PostgresAdapter } from './types.d.ts' -import buildQuery from './queries/buildQuery' -import { upsertRow } from './upsertRow' +import buildQuery from './queries/buildQuery.js' +import { upsertRow } from './upsertRow/index.js' export async function updateVersion( this: PostgresAdapter, diff --git a/packages/db-postgres/src/upsertRow/deleteExistingArrayRows.ts b/packages/db-postgres/src/upsertRow/deleteExistingArrayRows.ts index 523952604..d20edd177 100644 --- a/packages/db-postgres/src/upsertRow/deleteExistingArrayRows.ts +++ b/packages/db-postgres/src/upsertRow/deleteExistingArrayRows.ts @@ -1,6 +1,6 @@ import { and, eq } from 'drizzle-orm' -import type { DrizzleDB, PostgresAdapter } from '../types' +import type { DrizzleDB, PostgresAdapter } from '../types.d.ts' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts b/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts index 4c39ebf91..9d7ae1cba 100644 --- a/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts +++ b/packages/db-postgres/src/upsertRow/deleteExistingRowsByPath.ts @@ -1,6 +1,6 @@ import { and, eq, inArray } from 'drizzle-orm' -import type { DrizzleDB, PostgresAdapter } from '../types' +import type { DrizzleDB, PostgresAdapter } from '../types.d.ts' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/upsertRow/index.ts b/packages/db-postgres/src/upsertRow/index.ts index c70825409..ff1f38b44 100644 --- a/packages/db-postgres/src/upsertRow/index.ts +++ b/packages/db-postgres/src/upsertRow/index.ts @@ -4,15 +4,15 @@ import type { TypeWithID } from 'payload/types' import { eq } from 'drizzle-orm' import { ValidationError } from 'payload/errors' -import type { BlockRowToInsert } from '../transform/write/types' -import type { Args } from './types' +import type { BlockRowToInsert } from '../transform/write/types.d.ts' +import type { Args } from './types.d.ts' -import { buildFindManyArgs } from '../find/buildFindManyArgs' -import { transform } from '../transform/read' -import { transformForWrite } from '../transform/write' -import { deleteExistingArrayRows } from './deleteExistingArrayRows' -import { deleteExistingRowsByPath } from './deleteExistingRowsByPath' -import { insertArrays } from './insertArrays' +import { buildFindManyArgs } from '../find/buildFindManyArgs.js' +import { transform } from '../transform/read/index.js' +import { transformForWrite } from '../transform/write/index.js' +import { deleteExistingArrayRows } from './deleteExistingArrayRows.js' +import { deleteExistingRowsByPath } from './deleteExistingRowsByPath.js' +import { insertArrays } from './insertArrays.js' export const upsertRow = async ({ id, diff --git a/packages/db-postgres/src/upsertRow/insertArrays.ts b/packages/db-postgres/src/upsertRow/insertArrays.ts index e77a50e40..fba1115f8 100644 --- a/packages/db-postgres/src/upsertRow/insertArrays.ts +++ b/packages/db-postgres/src/upsertRow/insertArrays.ts @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -import type { ArrayRowToInsert } from '../transform/write/types' -import type { DrizzleDB, PostgresAdapter } from '../types' +import type { ArrayRowToInsert } from '../transform/write/types.d.ts' +import type { DrizzleDB, PostgresAdapter } from '../types.d.ts' type Args = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/upsertRow/types.ts b/packages/db-postgres/src/upsertRow/types.ts index 6ed53e8d5..5f521c9cd 100644 --- a/packages/db-postgres/src/upsertRow/types.ts +++ b/packages/db-postgres/src/upsertRow/types.ts @@ -1,7 +1,7 @@ import type { SQL } from 'drizzle-orm' import type { Field, PayloadRequest } from 'payload/types' -import type { DrizzleDB, GenericColumn, PostgresAdapter } from '../types' +import type { DrizzleDB, GenericColumn, PostgresAdapter } from '../types.d.ts' type BaseArgs = { adapter: PostgresAdapter diff --git a/packages/db-postgres/src/utilities/createMigrationTable.ts b/packages/db-postgres/src/utilities/createMigrationTable.ts index 5b056aa8d..ff0ebc504 100644 --- a/packages/db-postgres/src/utilities/createMigrationTable.ts +++ b/packages/db-postgres/src/utilities/createMigrationTable.ts @@ -1,6 +1,6 @@ import { sql } from 'drizzle-orm' -import type { PostgresAdapter } from '../types' +import type { PostgresAdapter } from '../types.d.ts' export const createMigrationTable = async (adapter: PostgresAdapter): Promise => { const prependSchema = adapter.schemaName ? `"${adapter.schemaName}".` : '' diff --git a/packages/db-postgres/src/utilities/migrationTableExists.ts b/packages/db-postgres/src/utilities/migrationTableExists.ts index 39ea2ba5e..33abd7003 100644 --- a/packages/db-postgres/src/utilities/migrationTableExists.ts +++ b/packages/db-postgres/src/utilities/migrationTableExists.ts @@ -1,6 +1,6 @@ import { sql } from 'drizzle-orm' -import type { DrizzleDB } from '../types' +import type { DrizzleDB } from '../types.d.ts' export const migrationTableExists = async (db: DrizzleDB): Promise => { const queryRes = await db.execute(sql`SELECT to_regclass('public.payload_migrations');`) From 4159fae8c9fe435226be22a61ae42af23806e7eb Mon Sep 17 00:00:00 2001 From: Tylan Davis Date: Wed, 6 Mar 2024 14:22:49 -0500 Subject: [PATCH 09/21] chore: updates translations imports for ESM --- packages/translations/src/utilities/getTranslation.ts | 2 +- packages/translations/src/utilities/init.ts | 4 ++-- packages/translations/writeTranslationFiles.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/translations/src/utilities/getTranslation.ts b/packages/translations/src/utilities/getTranslation.ts index 3af4a2669..8f754a6af 100644 --- a/packages/translations/src/utilities/getTranslation.ts +++ b/packages/translations/src/utilities/getTranslation.ts @@ -1,5 +1,5 @@ import type { JSX } from 'react' -import { I18n } from '../types' +import { I18n } from '../types.js' export const getTranslation = ( label: JSX.Element | Record | string, diff --git a/packages/translations/src/utilities/init.ts b/packages/translations/src/utilities/init.ts index f9b10e10b..e27fcc571 100644 --- a/packages/translations/src/utilities/init.ts +++ b/packages/translations/src/utilities/init.ts @@ -1,5 +1,5 @@ -import { Translations, InitTFunction, InitI18n, I18n } from '../types' -import { deepMerge } from './deepMerge' +import { Translations, InitTFunction, InitI18n, I18n } from '../types.js' +import { deepMerge } from './deepMerge.js' /** * @function getTranslationString diff --git a/packages/translations/writeTranslationFiles.ts b/packages/translations/writeTranslationFiles.ts index d679e7026..2e4bc869d 100644 --- a/packages/translations/writeTranslationFiles.ts +++ b/packages/translations/writeTranslationFiles.ts @@ -1,8 +1,8 @@ import * as fs from 'fs' import * as path from 'path' import { fileURLToPath } from 'url' -import { ensureDirectoryExists } from './src/utilities/ensureDirExists' -import { copyFile } from './src/utilities/copyFile' +import { ensureDirectoryExists } from './src/utilities/ensureDirExists.js' +import { copyFile } from './src/utilities/copyFile.js' const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) From 829d19dfc2ca549766f13b8c501547cd943411bb Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Wed, 6 Mar 2024 14:26:50 -0500 Subject: [PATCH 10/21] chore(richtext-lexical): migrate imports to esm --- packages/richtext-lexical/src/cell/index.tsx | 14 +- .../src/exports/components.ts | 10 +- packages/richtext-lexical/src/field/Field.tsx | 4 +- .../field/features/align/feature.client.tsx | 14 +- .../field/features/align/feature.server.ts | 4 +- ...oatingSelectToolbarAlignDropdownSection.ts | 4 +- .../features/blockquote/feature.client.tsx | 12 +- .../features/blockquote/feature.server.ts | 10 +- .../blocks/component/BlockContent.tsx | 6 +- .../field/features/blocks/component/index.tsx | 10 +- .../field/features/blocks/drawer/index.tsx | 10 +- .../field/features/blocks/feature.client.tsx | 14 +- .../field/features/blocks/feature.server.ts | 12 +- .../features/blocks/nodes/BlocksNode.tsx | 2 +- .../field/features/blocks/plugin/commands.ts | 2 +- .../field/features/blocks/plugin/index.tsx | 8 +- .../features/blocks/populationPromise.ts | 8 +- .../src/field/features/blocks/validate.ts | 6 +- .../index.ts | 2 +- .../index.ts | 4 +- .../html/converter/converters/linebreak.ts | 2 +- .../html/converter/converters/paragraph.ts | 4 +- .../html/converter/converters/text.ts | 4 +- .../html/converter/defaultConverters.ts | 8 +- .../converters/html/converter/index.ts | 2 +- .../converters/html/feature.server.ts | 5 +- .../features/converters/html/field/index.ts | 12 +- .../field/features/createClientComponent.tsx | 4 +- .../debug/testrecorder/feature.client.tsx | 6 +- .../debug/testrecorder/feature.server.ts | 4 +- .../debug/testrecorder/plugin/index.tsx | 2 +- .../debug/treeview/feature.client.tsx | 6 +- .../features/debug/treeview/feature.server.ts | 4 +- .../features/format/bold/feature.client.tsx | 10 +- .../features/format/bold/feature.server.ts | 6 +- .../common/floatingSelectToolbarSection.ts | 2 +- .../format/inlinecode/feature.client.tsx | 10 +- .../format/inlinecode/feature.server.ts | 6 +- .../features/format/italic/feature.client.tsx | 10 +- .../features/format/italic/feature.server.ts | 6 +- .../format/strikethrough/feature.client.tsx | 10 +- .../format/strikethrough/feature.server.ts | 6 +- .../format/subscript/feature.client.tsx | 8 +- .../format/subscript/feature.server.ts | 4 +- .../format/superscript/feature.client.tsx | 8 +- .../format/superscript/feature.server.ts | 4 +- .../format/underline/feature.client.tsx | 8 +- .../format/underline/feature.server.ts | 4 +- .../field/features/heading/feature.client.tsx | 24 +-- .../field/features/heading/feature.server.ts | 10 +- .../features/heading/markdownTransformer.ts | 2 +- .../field/features/indent/feature.client.tsx | 10 +- .../field/features/indent/feature.server.ts | 4 +- .../floatingSelectToolbarIndentSection.ts | 2 +- .../field/features/link/drawer/baseFields.ts | 2 +- .../src/field/features/link/drawer/index.tsx | 4 +- .../src/field/features/link/drawer/types.ts | 2 +- .../field/features/link/feature.client.tsx | 28 +-- .../src/field/features/link/feature.server.ts | 20 +- .../field/features/link/nodes/AutoLinkNode.ts | 4 +- .../src/field/features/link/nodes/LinkNode.ts | 4 +- .../features/link/plugins/autoLink/index.tsx | 8 +- .../floatingLinkEditor/LinkEditor/commands.ts | 2 +- .../floatingLinkEditor/LinkEditor/index.tsx | 20 +- .../link/plugins/floatingLinkEditor/index.tsx | 2 +- .../link/plugins/floatingLinkEditor/types.ts | 2 +- .../plugins/floatingLinkEditor/utilities.ts | 2 +- .../features/link/plugins/link/index.tsx | 8 +- .../field/features/link/populationPromise.ts | 10 +- .../lists/checklist/feature.client.tsx | 16 +- .../lists/checklist/feature.server.ts | 8 +- .../lists/checklist/markdownTransformers.ts | 2 +- .../src/field/features/lists/htmlConverter.ts | 4 +- .../lists/orderedlist/feature.client.tsx | 14 +- .../lists/orderedlist/feature.server.ts | 8 +- .../lists/orderedlist/markdownTransformer.ts | 2 +- .../lists/unorderedlist/feature.client.tsx | 14 +- .../lists/unorderedlist/feature.server.ts | 8 +- .../unorderedlist/markdownTransformer.ts | 2 +- .../converter/converters/heading/client.ts | 4 +- .../converter/converters/heading/converter.ts | 4 +- .../converter/converters/heading/index.ts | 6 +- .../converter/converters/link/client.ts | 4 +- .../converter/converters/link/converter.ts | 7 +- .../converter/converters/link/index.ts | 6 +- .../converter/converters/list/client.ts | 4 +- .../converter/converters/list/converter.ts | 4 +- .../converter/converters/list/index.ts | 6 +- .../converter/converters/listItem/client.ts | 4 +- .../converters/listItem/converter.ts | 4 +- .../converter/converters/listItem/index.ts | 6 +- .../converter/converters/quote/client.ts | 4 +- .../converter/converters/quote/converter.ts | 4 +- .../converter/converters/quote/index.ts | 6 +- .../converter/converters/unknown/client.ts | 4 +- .../converter/converters/unknown/converter.ts | 6 +- .../converter/converters/unknown/index.ts | 6 +- .../converter/converters/upload/client.ts | 4 +- .../converter/converters/upload/converter.ts | 5 +- .../converter/converters/upload/index.ts | 6 +- .../converter/defaultConverters.ts | 16 +- .../lexicalPluginToLexical/converter/index.ts | 2 +- .../lexicalPluginToLexical/feature.client.tsx | 10 +- .../lexicalPluginToLexical/feature.server.ts | 10 +- .../nodes/unknownConvertedNode/Component.tsx | 2 +- .../nodes/unknownConvertedNode/index.tsx | 2 +- .../converter/converters/blockquote/client.ts | 4 +- .../converters/blockquote/converter.ts | 4 +- .../converter/converters/blockquote/index.ts | 6 +- .../converter/converters/heading/client.ts | 4 +- .../converter/converters/heading/converter.ts | 4 +- .../converter/converters/heading/index.ts | 6 +- .../converter/converters/indent/client.ts | 4 +- .../converter/converters/indent/converter.ts | 4 +- .../converter/converters/indent/index.ts | 6 +- .../converter/converters/link/client.ts | 4 +- .../converter/converters/link/converter.ts | 6 +- .../converter/converters/link/index.ts | 6 +- .../converter/converters/listItem/client.ts | 4 +- .../converters/listItem/converter.ts | 4 +- .../converter/converters/listItem/index.ts | 6 +- .../converters/orderedList/client.ts | 4 +- .../converters/orderedList/converter.ts | 4 +- .../converter/converters/orderedList/index.ts | 6 +- .../converters/relationship/client.ts | 4 +- .../converters/relationship/converter.ts | 4 +- .../converters/relationship/index.ts | 6 +- .../converter/converters/unknown/index.ts | 6 +- .../converters/unorderedList/client.ts | 4 +- .../converters/unorderedList/converter.ts | 4 +- .../converters/unorderedList/index.ts | 6 +- .../converter/converters/upload/client.ts | 4 +- .../converter/converters/upload/converter.ts | 4 +- .../converter/converters/upload/index.ts | 6 +- .../converter/defaultConverters.ts | 22 +- .../slateToLexical/converter/index.ts | 4 +- .../slateToLexical/feature.client.tsx | 10 +- .../slateToLexical/feature.server.ts | 10 +- .../nodes/unknownConvertedNode/Component.tsx | 2 +- .../features/paragraph/feature.client.tsx | 10 +- .../features/paragraph/feature.server.ts | 4 +- .../features/relationship/drawer/index.tsx | 8 +- .../features/relationship/feature.client.tsx | 16 +- .../features/relationship/feature.server.ts | 8 +- .../relationship/nodes/RelationshipNode.tsx | 2 +- .../components/RelationshipComponent.tsx | 6 +- .../features/relationship/plugins/index.tsx | 8 +- .../relationship/populationPromise.ts | 6 +- .../src/field/features/types.ts | 10 +- .../component/ExtraFieldsDrawer/index.tsx | 6 +- .../field/features/upload/component/index.tsx | 14 +- .../field/features/upload/drawer/index.tsx | 8 +- .../field/features/upload/feature.client.tsx | 14 +- .../field/features/upload/feature.server.ts | 14 +- .../features/upload/nodes/UploadNode.tsx | 2 +- .../field/features/upload/plugin/index.tsx | 6 +- .../features/upload/populationPromise.ts | 11 +- .../src/field/features/upload/validate.ts | 6 +- packages/richtext-lexical/src/field/index.tsx | 14 +- .../src/field/lexical/EditorPlugin.tsx | 2 +- .../src/field/lexical/LexicalEditor.tsx | 16 +- .../src/field/lexical/LexicalProvider.tsx | 8 +- .../config/client/EditorConfigProvider.tsx | 3 +- .../field/lexical/config/client/default.ts | 2 +- .../src/field/lexical/config/client/loader.ts | 4 +- .../field/lexical/config/client/sanitize.ts | 4 +- .../field/lexical/config/server/default.ts | 44 ++-- .../src/field/lexical/config/server/loader.ts | 4 +- .../field/lexical/config/server/sanitize.ts | 6 +- .../src/field/lexical/config/types.ts | 2 +- .../src/field/lexical/nodes/index.ts | 2 +- .../ToolbarButton/index.tsx | 2 +- .../ToolbarDropdown/DropDown.tsx | 2 +- .../ToolbarDropdown/index.tsx | 4 +- .../plugins/FloatingSelectToolbar/index.tsx | 12 +- .../plugins/MarkdownShortcut/index.tsx | 2 +- .../LexicalMenu.tsx | 5 +- .../LexicalTypeaheadMenuPlugin/index.tsx | 8 +- .../field/lexical/plugins/SlashMenu/index.tsx | 8 +- .../plugins/SlashMenu/useMenuTriggerMatch.ts | 2 +- .../handles/AddBlockHandlePlugin/index.tsx | 16 +- .../getNodeCloseToPoint.ts | 10 +- .../highlightElemOriginalPosition.ts | 2 +- .../handles/DraggableBlockPlugin/index.tsx | 16 +- .../DraggableBlockPlugin/setTargetLine.ts | 6 +- .../src/field/lexical/utils/environment.ts | 2 +- .../src/field/lexical/utils/rect.ts | 2 +- .../richtext-lexical/src/generateSchemaMap.ts | 2 +- packages/richtext-lexical/src/index.ts | 193 +++++++++--------- .../richtext-lexical/src/populate/populate.ts | 2 +- .../src/populate/recurseNestedFields.ts | 2 +- .../populate/richTextRelationshipPromise.ts | 4 +- packages/richtext-lexical/src/types.ts | 2 +- .../src/useLexicalFeature.tsx | 2 +- .../richtext-lexical/src/validate/index.ts | 7 +- 195 files changed, 739 insertions(+), 741 deletions(-) diff --git a/packages/richtext-lexical/src/cell/index.tsx b/packages/richtext-lexical/src/cell/index.tsx index 2ad561706..0b963e6a3 100644 --- a/packages/richtext-lexical/src/cell/index.tsx +++ b/packages/richtext-lexical/src/cell/index.tsx @@ -8,14 +8,14 @@ import { useClientFunctions } from '@payloadcms/ui/providers' import { $getRoot } from 'lexical' import React, { useEffect, useState } from 'react' -import type { FeatureProviderClient } from '../field/features/types' -import type { SanitizedClientEditorConfig } from '../field/lexical/config/types' -import type { GeneratedFeatureProviderComponent } from '../types' +import type { FeatureProviderClient } from '../field/features/types.js' +import type { SanitizedClientEditorConfig } from '../field/lexical/config/types.js' +import type { GeneratedFeatureProviderComponent } from '../types.js' -import { defaultEditorLexicalConfig } from '../field/lexical/config/client/default' -import { loadClientFeatures } from '../field/lexical/config/client/loader' -import { sanitizeClientEditorConfig } from '../field/lexical/config/client/sanitize' -import { getEnabledNodes } from '../field/lexical/nodes' +import { defaultEditorLexicalConfig } from '../field/lexical/config/client/default.js' +import { loadClientFeatures } from '../field/lexical/config/client/loader.js' +import { sanitizeClientEditorConfig } from '../field/lexical/config/client/sanitize.js' +import { getEnabledNodes } from '../field/lexical/nodes/index.js' export const RichTextCell: React.FC<{ lexicalEditorConfig: LexicalEditorConfig diff --git a/packages/richtext-lexical/src/exports/components.ts b/packages/richtext-lexical/src/exports/components.ts index edea4e0ef..eb51fcf14 100644 --- a/packages/richtext-lexical/src/exports/components.ts +++ b/packages/richtext-lexical/src/exports/components.ts @@ -1,6 +1,6 @@ -export { RichTextCell } from '../cell' -export { RichTextField } from '../field' +export { RichTextCell } from '../cell/index.js' +export { RichTextField } from '../field/index.js' -export { defaultEditorLexicalConfig } from '../field/lexical/config/client/default' -export { ToolbarButton } from '../field/lexical/plugins/FloatingSelectToolbar/ToolbarButton' -export { ToolbarDropdown } from '../field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/index' +export { defaultEditorLexicalConfig } from '../field/lexical/config/client/default.js' +export { ToolbarButton } from '../field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.js' +export { ToolbarDropdown } from '../field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/index.js' diff --git a/packages/richtext-lexical/src/field/Field.tsx b/packages/richtext-lexical/src/field/Field.tsx index dcd42996b..caa39f02c 100644 --- a/packages/richtext-lexical/src/field/Field.tsx +++ b/packages/richtext-lexical/src/field/Field.tsx @@ -5,10 +5,10 @@ import { type FormFieldBase, useField } from '@payloadcms/ui' import React, { useCallback } from 'react' import { ErrorBoundary } from 'react-error-boundary' -import type { SanitizedClientEditorConfig } from './lexical/config/types' +import type { SanitizedClientEditorConfig } from './lexical/config/types.js' import './index.scss' -import { LexicalProvider } from './lexical/LexicalProvider' +import { LexicalProvider } from './lexical/LexicalProvider.js' const baseClass = 'rich-text-lexical' diff --git a/packages/richtext-lexical/src/field/features/align/feature.client.tsx b/packages/richtext-lexical/src/field/features/align/feature.client.tsx index b9541586d..03861eb8e 100644 --- a/packages/richtext-lexical/src/field/features/align/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/align/feature.client.tsx @@ -2,14 +2,14 @@ import { FORMAT_ELEMENT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../types' +import type { FeatureProviderProviderClient } from '../types.js' -import { AlignCenterIcon } from '../../lexical/ui/icons/AlignCenter' -import { AlignJustifyIcon } from '../../lexical/ui/icons/AlignJustify' -import { AlignLeftIcon } from '../../lexical/ui/icons/AlignLeft' -import { AlignRightIcon } from '../../lexical/ui/icons/AlignRight' -import { createClientComponent } from '../createClientComponent' -import { AlignDropdownSectionWithEntries } from './floatingSelectToolbarAlignDropdownSection' +import { AlignCenterIcon } from '../../lexical/ui/icons/AlignCenter/index.js' +import { AlignJustifyIcon } from '../../lexical/ui/icons/AlignJustify/index.js' +import { AlignLeftIcon } from '../../lexical/ui/icons/AlignLeft/index.js' +import { AlignRightIcon } from '../../lexical/ui/icons/AlignRight/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { AlignDropdownSectionWithEntries } from './floatingSelectToolbarAlignDropdownSection.js' const AlignFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/align/feature.server.ts b/packages/richtext-lexical/src/field/features/align/feature.server.ts index 26fdc95c7..cf59cdfa0 100644 --- a/packages/richtext-lexical/src/field/features/align/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/align/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../types' +import type { FeatureProviderProviderServer } from '../types.js' -import { AlignFeatureClientComponent } from './feature.client' +import { AlignFeatureClientComponent } from './feature.client.js' export const AlignFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/align/floatingSelectToolbarAlignDropdownSection.ts b/packages/richtext-lexical/src/field/features/align/floatingSelectToolbarAlignDropdownSection.ts index 2b2972b58..5944c5c88 100644 --- a/packages/richtext-lexical/src/field/features/align/floatingSelectToolbarAlignDropdownSection.ts +++ b/packages/richtext-lexical/src/field/features/align/floatingSelectToolbarAlignDropdownSection.ts @@ -1,9 +1,9 @@ import type { FloatingToolbarSection, FloatingToolbarSectionEntry, -} from '../../lexical/plugins/FloatingSelectToolbar/types' +} from '../../lexical/plugins/FloatingSelectToolbar/types.js' -import { AlignLeftIcon } from '../../lexical/ui/icons/AlignLeft' +import { AlignLeftIcon } from '../../lexical/ui/icons/AlignLeft/index.js' export const AlignDropdownSectionWithEntries = ( entries: FloatingToolbarSectionEntry[], diff --git a/packages/richtext-lexical/src/field/features/blockquote/feature.client.tsx b/packages/richtext-lexical/src/field/features/blockquote/feature.client.tsx index 5de1b2016..95a67878a 100644 --- a/packages/richtext-lexical/src/field/features/blockquote/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/blockquote/feature.client.tsx @@ -4,13 +4,13 @@ import { $createQuoteNode, QuoteNode } from '@lexical/rich-text' import { $setBlocksType } from '@lexical/selection' import { $getSelection } from 'lexical' -import type { FeatureProviderProviderClient } from '../types' +import type { FeatureProviderProviderClient } from '../types.js' -import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { BlockquoteIcon } from '../../lexical/ui/icons/Blockquote' -import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection' -import { createClientComponent } from '../createClientComponent' -import { MarkdownTransformer } from './markdownTransformer' +import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { BlockquoteIcon } from '../../lexical/ui/icons/Blockquote/index.js' +import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { MarkdownTransformer } from './markdownTransformer.js' const BlockQuoteFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/blockquote/feature.server.ts b/packages/richtext-lexical/src/field/features/blockquote/feature.server.ts index 5a7fb66d2..e3b3aa05d 100644 --- a/packages/richtext-lexical/src/field/features/blockquote/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/blockquote/feature.server.ts @@ -1,11 +1,11 @@ import { QuoteNode, type SerializedQuoteNode } from '@lexical/rich-text' -import type { HTMLConverter } from '../converters/html/converter/types' -import type { FeatureProviderProviderServer } from '../types' +import type { HTMLConverter } from '../converters/html/converter/types.js' +import type { FeatureProviderProviderServer } from '../types.js' -import { convertLexicalNodesToHTML } from '../converters/html/converter' -import { BlockQuoteFeatureClientComponent } from './feature.client' -import { MarkdownTransformer } from './markdownTransformer' +import { convertLexicalNodesToHTML } from '../converters/html/converter/index.js' +import { BlockQuoteFeatureClientComponent } from './feature.client.js' +import { MarkdownTransformer } from './markdownTransformer.js' export const BlockQuoteFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx b/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx index 0a1e96a99..e49c63ea5 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx @@ -1,4 +1,3 @@ -import type { SanitizedClientEditorConfig } from '@payloadcms/richtext-lexical' import type { FieldMap, FormFieldBase } from '@payloadcms/ui' import type { ReducedBlock } from '@payloadcms/ui/types' import type { FormState } from 'payload/types' @@ -21,9 +20,10 @@ import isDeepEqual from 'deep-equal' import { $getNodeByKey } from 'lexical' import React, { useCallback } from 'react' -import type { BlockFields, BlockNode } from '../nodes/BlocksNode' +import type { SanitizedClientEditorConfig } from '../../../lexical/config/types.js' +import type { BlockFields, BlockNode } from '../nodes/BlocksNode.js' -import { FormSavePlugin } from './FormSavePlugin' +import { FormSavePlugin } from './FormSavePlugin.js' type Props = { baseClass: string diff --git a/packages/richtext-lexical/src/field/features/blocks/component/index.tsx b/packages/richtext-lexical/src/field/features/blocks/component/index.tsx index f036cafaf..d15f42a81 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/index.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/component/index.tsx @@ -11,7 +11,7 @@ import { } from '@payloadcms/ui' import React, { useCallback, useEffect, useMemo, useState } from 'react' -import { type BlockFields } from '../nodes/BlocksNode' +import { type BlockFields } from '../nodes/BlocksNode.js' const baseClass = 'lexical-block' import type { ReducedBlock } from '@payloadcms/ui/types' @@ -19,11 +19,11 @@ import type { FormState } from 'payload/types' import { v4 as uuid } from 'uuid' -import type { ClientComponentProps } from '../../types' -import type { BlocksFeatureClientProps } from '../feature.client' +import type { ClientComponentProps } from '../../types.js' +import type { BlocksFeatureClientProps } from '../feature.client.js' -import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider' -import { BlockContent } from './BlockContent' +import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider.js' +import { BlockContent } from './BlockContent.js' import './index.scss' type Props = { diff --git a/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx b/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx index b53b92a24..0af6ca06a 100644 --- a/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx @@ -11,12 +11,12 @@ import { } from 'lexical' import React, { useCallback, useEffect, useState } from 'react' -import type { ClientComponentProps } from '../../types' -import type { BlocksFeatureClientProps } from '../feature.client' +import type { ClientComponentProps } from '../../types.js' +import type { BlocksFeatureClientProps } from '../feature.client.js' -import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider' -import { $createBlockNode } from '../nodes/BlocksNode' -import { INSERT_BLOCK_COMMAND } from '../plugin/commands' +import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider.js' +import { $createBlockNode } from '../nodes/BlocksNode.js' +import { INSERT_BLOCK_COMMAND } from '../plugin/commands.js' const baseClass = 'lexical-blocks-drawer' export const INSERT_BLOCK_WITH_DRAWER_COMMAND: LexicalCommand<{ diff --git a/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx b/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx index 988a2a0f3..0e0f24628 100644 --- a/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/feature.client.tsx @@ -4,14 +4,14 @@ import type { ReducedBlock } from '@payloadcms/ui/types' import { getTranslation } from '@payloadcms/translations' -import type { FeatureProviderProviderClient } from '../types' +import type { FeatureProviderProviderClient } from '../types.js' -import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { BlockIcon } from '../../lexical/ui/icons/Block' -import { createClientComponent } from '../createClientComponent' -import { BlockNode } from './nodes/BlocksNode' -import { BlocksPlugin } from './plugin' -import { INSERT_BLOCK_COMMAND } from './plugin/commands' +import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { BlockIcon } from '../../lexical/ui/icons/Block/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { BlockNode } from './nodes/BlocksNode.js' +import { INSERT_BLOCK_COMMAND } from './plugin/commands.js' +import { BlocksPlugin } from './plugin/index.js' export type BlocksFeatureClientProps = { reducedBlocks: ReducedBlock[] diff --git a/packages/richtext-lexical/src/field/features/blocks/feature.server.ts b/packages/richtext-lexical/src/field/features/blocks/feature.server.ts index bdfb7aa86..c4e2ff66f 100644 --- a/packages/richtext-lexical/src/field/features/blocks/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/blocks/feature.server.ts @@ -3,13 +3,13 @@ import type { Block, BlockField, Field } from 'payload/types' import { baseBlockFields, sanitizeFields } from 'payload/config' import { fieldsToJSONSchema, formatLabels } from 'payload/utilities' -import type { FeatureProviderProviderServer } from '../types' -import type { BlocksFeatureClientProps } from './feature.client' +import type { FeatureProviderProviderServer } from '../types.js' +import type { BlocksFeatureClientProps } from './feature.client.js' -import { BlocksFeatureClientComponent } from './feature.client' -import { BlockNode } from './nodes/BlocksNode' -import { blockPopulationPromiseHOC } from './populationPromise' -import { blockValidationHOC } from './validate' +import { BlocksFeatureClientComponent } from './feature.client.js' +import { BlockNode } from './nodes/BlocksNode.js' +import { blockPopulationPromiseHOC } from './populationPromise.js' +import { blockValidationHOC } from './validate.js' export type BlocksFeatureProps = { blocks: Block[] diff --git a/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx b/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx index 59d1aa7e1..d87740292 100644 --- a/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx @@ -23,7 +23,7 @@ export type BlockFields = { } const BlockComponent = React.lazy(() => - import('../component').then((module) => ({ + import('../component/index.js').then((module) => ({ default: module.BlockComponent, })), ) diff --git a/packages/richtext-lexical/src/field/features/blocks/plugin/commands.ts b/packages/richtext-lexical/src/field/features/blocks/plugin/commands.ts index b4dbe0342..0f0c98cb4 100644 --- a/packages/richtext-lexical/src/field/features/blocks/plugin/commands.ts +++ b/packages/richtext-lexical/src/field/features/blocks/plugin/commands.ts @@ -2,7 +2,7 @@ import type { LexicalCommand } from 'lexical' import { createCommand } from 'lexical' -import type { InsertBlockPayload } from './index' +import type { InsertBlockPayload } from './index.js' export const INSERT_BLOCK_COMMAND: LexicalCommand = createCommand('INSERT_BLOCK_COMMAND') diff --git a/packages/richtext-lexical/src/field/features/blocks/plugin/index.tsx b/packages/richtext-lexical/src/field/features/blocks/plugin/index.tsx index 343da1e1a..b346f0444 100644 --- a/packages/richtext-lexical/src/field/features/blocks/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/plugin/index.tsx @@ -10,11 +10,11 @@ import { } from 'lexical' import React, { useEffect } from 'react' -import type { BlockFields } from '../nodes/BlocksNode' +import type { BlockFields } from '../nodes/BlocksNode.js' -import { BlocksDrawerComponent } from '../drawer' -import { $createBlockNode, BlockNode } from '../nodes/BlocksNode' -import { INSERT_BLOCK_COMMAND } from './commands' +import { BlocksDrawerComponent } from '../drawer/index.js' +import { $createBlockNode, BlockNode } from '../nodes/BlocksNode.js' +import { INSERT_BLOCK_COMMAND } from './commands.js' export type InsertBlockPayload = Exclude diff --git a/packages/richtext-lexical/src/field/features/blocks/populationPromise.ts b/packages/richtext-lexical/src/field/features/blocks/populationPromise.ts index 4065c1263..ba631ebc6 100644 --- a/packages/richtext-lexical/src/field/features/blocks/populationPromise.ts +++ b/packages/richtext-lexical/src/field/features/blocks/populationPromise.ts @@ -2,11 +2,11 @@ import type { Block } from 'payload/types' import { sanitizeFields } from 'payload/config' -import type { PopulationPromise } from '../types' -import type { BlocksFeatureProps } from './feature.server' -import type { SerializedBlockNode } from './nodes/BlocksNode' +import type { PopulationPromise } from '../types.js' +import type { BlocksFeatureProps } from './feature.server.js' +import type { SerializedBlockNode } from './nodes/BlocksNode.js' -import { recurseNestedFields } from '../../../populate/recurseNestedFields' +import { recurseNestedFields } from '../../../populate/recurseNestedFields.js' export const blockPopulationPromiseHOC = ( props: BlocksFeatureProps, diff --git a/packages/richtext-lexical/src/field/features/blocks/validate.ts b/packages/richtext-lexical/src/field/features/blocks/validate.ts index 2cf2bbdc5..549665e80 100644 --- a/packages/richtext-lexical/src/field/features/blocks/validate.ts +++ b/packages/richtext-lexical/src/field/features/blocks/validate.ts @@ -1,10 +1,10 @@ -import type { BlocksFeatureProps } from '@payloadcms/richtext-lexical' import type { Block } from 'payload/types' import { sanitizeFields } from 'payload/config' -import type { NodeValidation } from '../types' -import type { SerializedBlockNode } from './nodes/BlocksNode' +import type { NodeValidation } from '../types.js' +import type { BlocksFeatureProps } from './feature.server.js' +import type { SerializedBlockNode } from './nodes/BlocksNode.js' export const blockValidationHOC = ( props: BlocksFeatureProps, diff --git a/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarFeaturesButtonsSection/index.ts b/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarFeaturesButtonsSection/index.ts index 94e2f688f..977fb6b05 100644 --- a/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarFeaturesButtonsSection/index.ts +++ b/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarFeaturesButtonsSection/index.ts @@ -1,7 +1,7 @@ import type { FloatingToolbarSection, FloatingToolbarSectionEntry, -} from '../../../lexical/plugins/FloatingSelectToolbar/types' +} from '../../../lexical/plugins/FloatingSelectToolbar/types.js' export const FeaturesSectionWithEntries = ( entries: FloatingToolbarSectionEntry[], diff --git a/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarTextDropdownSection/index.ts b/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarTextDropdownSection/index.ts index fa5b4dd3a..e55f20e7c 100644 --- a/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarTextDropdownSection/index.ts +++ b/packages/richtext-lexical/src/field/features/common/floatingSelectToolbarTextDropdownSection/index.ts @@ -1,9 +1,9 @@ import type { FloatingToolbarSection, FloatingToolbarSectionEntry, -} from '../../../lexical/plugins/FloatingSelectToolbar/types' +} from '../../../lexical/plugins/FloatingSelectToolbar/types.js' -import { TextIcon } from '../../../lexical/ui/icons/Text' +import { TextIcon } from '../../../lexical/ui/icons/Text/index.js' export const TextDropdownSectionWithEntries = ( entries: FloatingToolbarSectionEntry[], diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/linebreak.ts b/packages/richtext-lexical/src/field/features/converters/html/converter/converters/linebreak.ts index f6baea52d..15b67fe55 100644 --- a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/linebreak.ts +++ b/packages/richtext-lexical/src/field/features/converters/html/converter/converters/linebreak.ts @@ -1,6 +1,6 @@ import type { SerializedParagraphNode } from 'lexical' -import type { HTMLConverter } from '../types' +import type { HTMLConverter } from '../types.js' export const LinebreakHTMLConverter: HTMLConverter = { converter() { diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/paragraph.ts b/packages/richtext-lexical/src/field/features/converters/html/converter/converters/paragraph.ts index 5335e0725..73e54da45 100644 --- a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/paragraph.ts +++ b/packages/richtext-lexical/src/field/features/converters/html/converter/converters/paragraph.ts @@ -1,8 +1,8 @@ import type { SerializedParagraphNode } from 'lexical' -import type { HTMLConverter } from '../types' +import type { HTMLConverter } from '../types.js' -import { convertLexicalNodesToHTML } from '../index' +import { convertLexicalNodesToHTML } from '../index.js' export const ParagraphHTMLConverter: HTMLConverter = { async converter({ converters, node, parent, payload }) { diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/text.ts b/packages/richtext-lexical/src/field/features/converters/html/converter/converters/text.ts index 91d2010ce..7b8edbaea 100644 --- a/packages/richtext-lexical/src/field/features/converters/html/converter/converters/text.ts +++ b/packages/richtext-lexical/src/field/features/converters/html/converter/converters/text.ts @@ -1,8 +1,8 @@ import type { SerializedTextNode } from 'lexical' -import type { HTMLConverter } from '../types' +import type { HTMLConverter } from '../types.js' -import { NodeFormat } from '../../../../../lexical/utils/nodeFormat' +import { NodeFormat } from '../../../../../lexical/utils/nodeFormat.js' export const TextHTMLConverter: HTMLConverter = { converter({ node }) { diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/defaultConverters.ts b/packages/richtext-lexical/src/field/features/converters/html/converter/defaultConverters.ts index 221a42dcb..848d895a4 100644 --- a/packages/richtext-lexical/src/field/features/converters/html/converter/defaultConverters.ts +++ b/packages/richtext-lexical/src/field/features/converters/html/converter/defaultConverters.ts @@ -1,8 +1,8 @@ -import type { HTMLConverter } from './types' +import type { HTMLConverter } from './types.js' -import { LinebreakHTMLConverter } from './converters/linebreak' -import { ParagraphHTMLConverter } from './converters/paragraph' -import { TextHTMLConverter } from './converters/text' +import { LinebreakHTMLConverter } from './converters/linebreak.js' +import { ParagraphHTMLConverter } from './converters/paragraph.js' +import { TextHTMLConverter } from './converters/text.js' export const defaultHTMLConverters: HTMLConverter[] = [ ParagraphHTMLConverter, diff --git a/packages/richtext-lexical/src/field/features/converters/html/converter/index.ts b/packages/richtext-lexical/src/field/features/converters/html/converter/index.ts index b70d7ba00..d239cc4a2 100644 --- a/packages/richtext-lexical/src/field/features/converters/html/converter/index.ts +++ b/packages/richtext-lexical/src/field/features/converters/html/converter/index.ts @@ -1,7 +1,7 @@ import type { SerializedEditorState, SerializedLexicalNode } from 'lexical' import type { Payload } from 'payload' -import type { HTMLConverter, SerializedLexicalNodeWithParent } from './types' +import type { HTMLConverter, SerializedLexicalNodeWithParent } from './types.js' export async function convertLexicalToHTML({ converters, diff --git a/packages/richtext-lexical/src/field/features/converters/html/feature.server.ts b/packages/richtext-lexical/src/field/features/converters/html/feature.server.ts index c046df06a..856f91187 100644 --- a/packages/richtext-lexical/src/field/features/converters/html/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/converters/html/feature.server.ts @@ -1,6 +1,5 @@ -import type { HTMLConverter } from '@payloadcms/richtext-lexical' - -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' +import type { HTMLConverter } from './converter/types.js' export type HTMLConverterFeatureProps = { converters?: diff --git a/packages/richtext-lexical/src/field/features/converters/html/field/index.ts b/packages/richtext-lexical/src/field/features/converters/html/field/index.ts index 56f82e5d3..b672ae7a6 100644 --- a/packages/richtext-lexical/src/field/features/converters/html/field/index.ts +++ b/packages/richtext-lexical/src/field/features/converters/html/field/index.ts @@ -1,13 +1,13 @@ import type { SerializedEditorState } from 'lexical' import type { Field, RichTextField, TextField } from 'payload/types' -import type { LexicalRichTextAdapter, SanitizedServerEditorConfig } from '../../../../../index' -import type { AdapterProps } from '../../../../../types' -import type { HTMLConverter } from '../converter/types' -import type { HTMLConverterFeatureProps } from '../feature.server' +import type { LexicalRichTextAdapter, SanitizedServerEditorConfig } from '../../../../../index.js' +import type { AdapterProps } from '../../../../../types.js' +import type { HTMLConverter } from '../converter/types.js' +import type { HTMLConverterFeatureProps } from '../feature.server.js' -import { convertLexicalToHTML } from '../converter' -import { defaultHTMLConverters } from '../converter/defaultConverters' +import { defaultHTMLConverters } from '../converter/defaultConverters.js' +import { convertLexicalToHTML } from '../converter/index.js' type Props = { name: string diff --git a/packages/richtext-lexical/src/field/features/createClientComponent.tsx b/packages/richtext-lexical/src/field/features/createClientComponent.tsx index 9a07fcb0a..77b4fc96c 100644 --- a/packages/richtext-lexical/src/field/features/createClientComponent.tsx +++ b/packages/richtext-lexical/src/field/features/createClientComponent.tsx @@ -1,8 +1,8 @@ 'use client' -import type { FeatureProviderProviderClient, ServerFeature } from './types' +import type { FeatureProviderProviderClient, ServerFeature } from './types.js' -import { useLexicalFeature } from '../../useLexicalFeature' +import { useLexicalFeature } from '../../useLexicalFeature.js' /** * Utility function to create a client component for the client feature diff --git a/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.client.tsx b/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.client.tsx index 1566e16e9..46e3796e8 100644 --- a/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.client.tsx @@ -1,8 +1,8 @@ 'use client' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { createClientComponent } from '../../createClientComponent' -import { TestRecorderPlugin } from './plugin' +import { createClientComponent } from '../../createClientComponent.js' +import { TestRecorderPlugin } from './plugin/index.js' const TestRecorderFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.server.ts b/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.server.ts index a3fa4af84..566069b33 100644 --- a/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/debug/testrecorder/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { TestRecorderFeatureClientComponent } from './feature.client' +import { TestRecorderFeatureClientComponent } from './feature.client.js' export const TestRecorderFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx b/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx index c900d405e..ba2ea3555 100644 --- a/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx @@ -6,7 +6,7 @@ import { $createParagraphNode, $createTextNode, $getRoot } from 'lexical' import * as React from 'react' import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react' -import { IS_APPLE } from '../../../../lexical/utils/environment' +import { IS_APPLE } from '../../../../lexical/utils/environment.js' import './index.scss' const copy = (text: null | string) => { diff --git a/packages/richtext-lexical/src/field/features/debug/treeview/feature.client.tsx b/packages/richtext-lexical/src/field/features/debug/treeview/feature.client.tsx index 4e3e72849..a27583e16 100644 --- a/packages/richtext-lexical/src/field/features/debug/treeview/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/debug/treeview/feature.client.tsx @@ -1,8 +1,8 @@ 'use client' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { createClientComponent } from '../../createClientComponent' -import { TreeViewPlugin } from './plugin' +import { createClientComponent } from '../../createClientComponent.js' +import { TreeViewPlugin } from './plugin/index.js' const TreeViewFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/debug/treeview/feature.server.ts b/packages/richtext-lexical/src/field/features/debug/treeview/feature.server.ts index 9a9c7c537..b0c6bed27 100644 --- a/packages/richtext-lexical/src/field/features/debug/treeview/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/debug/treeview/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { TreeViewFeatureClientComponent } from './feature.client' +import { TreeViewFeatureClientComponent } from './feature.client.js' export const TreeViewFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/bold/feature.client.tsx b/packages/richtext-lexical/src/field/features/format/bold/feature.client.tsx index 79182a49b..163d21ca2 100644 --- a/packages/richtext-lexical/src/field/features/format/bold/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/format/bold/feature.client.tsx @@ -1,17 +1,17 @@ 'use client' import { $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { BoldIcon } from '../../../lexical/ui/icons/Bold' -import { createClientComponent } from '../../createClientComponent' -import { SectionWithEntries } from '../common/floatingSelectToolbarSection' +import { BoldIcon } from '../../../lexical/ui/icons/Bold/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { SectionWithEntries } from '../common/floatingSelectToolbarSection.js' import { BOLD_ITALIC_STAR, BOLD_ITALIC_UNDERSCORE, BOLD_STAR, BOLD_UNDERSCORE, -} from './markdownTransformers' +} from './markdownTransformers.js' const BoldFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/bold/feature.server.ts b/packages/richtext-lexical/src/field/features/format/bold/feature.server.ts index bf0357c6d..77337c5c3 100644 --- a/packages/richtext-lexical/src/field/features/format/bold/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/format/bold/feature.server.ts @@ -1,12 +1,12 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { BoldFeatureClientComponent } from './feature.client' +import { BoldFeatureClientComponent } from './feature.client.js' import { BOLD_ITALIC_STAR, BOLD_ITALIC_UNDERSCORE, BOLD_STAR, BOLD_UNDERSCORE, -} from './markdownTransformers' +} from './markdownTransformers.js' export const BoldFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/common/floatingSelectToolbarSection.ts b/packages/richtext-lexical/src/field/features/format/common/floatingSelectToolbarSection.ts index 08601bc29..d6eed43f6 100644 --- a/packages/richtext-lexical/src/field/features/format/common/floatingSelectToolbarSection.ts +++ b/packages/richtext-lexical/src/field/features/format/common/floatingSelectToolbarSection.ts @@ -1,7 +1,7 @@ import type { FloatingToolbarSection, FloatingToolbarSectionEntry, -} from '../../../lexical/plugins/FloatingSelectToolbar/types' +} from '../../../lexical/plugins/FloatingSelectToolbar/types.js' export const SectionWithEntries = ( entries: FloatingToolbarSectionEntry[], diff --git a/packages/richtext-lexical/src/field/features/format/inlinecode/feature.client.tsx b/packages/richtext-lexical/src/field/features/format/inlinecode/feature.client.tsx index 92efc2aff..2cc6afb2f 100644 --- a/packages/richtext-lexical/src/field/features/format/inlinecode/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/format/inlinecode/feature.client.tsx @@ -2,12 +2,12 @@ import { $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { CodeIcon } from '../../../lexical/ui/icons/Code' -import { createClientComponent } from '../../createClientComponent' -import { SectionWithEntries } from '../common/floatingSelectToolbarSection' -import { INLINE_CODE } from './markdownTransformers' +import { CodeIcon } from '../../../lexical/ui/icons/Code/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { SectionWithEntries } from '../common/floatingSelectToolbarSection.js' +import { INLINE_CODE } from './markdownTransformers.js' const InlineCodeFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/inlinecode/feature.server.ts b/packages/richtext-lexical/src/field/features/format/inlinecode/feature.server.ts index 3f0eabb1a..b1ca2b1ee 100644 --- a/packages/richtext-lexical/src/field/features/format/inlinecode/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/format/inlinecode/feature.server.ts @@ -1,7 +1,7 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { InlineCodeFeatureClientComponent } from './feature.client' -import { INLINE_CODE } from './markdownTransformers' +import { InlineCodeFeatureClientComponent } from './feature.client.js' +import { INLINE_CODE } from './markdownTransformers.js' export const InlineCodeFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/italic/feature.client.tsx b/packages/richtext-lexical/src/field/features/format/italic/feature.client.tsx index 1c874f18f..92c575f39 100644 --- a/packages/richtext-lexical/src/field/features/format/italic/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/format/italic/feature.client.tsx @@ -2,12 +2,12 @@ import { $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { ItalicIcon } from '../../../lexical/ui/icons/Italic' -import { createClientComponent } from '../../createClientComponent' -import { SectionWithEntries } from '../common/floatingSelectToolbarSection' -import { ITALIC_STAR, ITALIC_UNDERSCORE } from './markdownTransformers' +import { ItalicIcon } from '../../../lexical/ui/icons/Italic/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { SectionWithEntries } from '../common/floatingSelectToolbarSection.js' +import { ITALIC_STAR, ITALIC_UNDERSCORE } from './markdownTransformers.js' const ItalicFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/italic/feature.server.ts b/packages/richtext-lexical/src/field/features/format/italic/feature.server.ts index db69135e4..8c32151a2 100644 --- a/packages/richtext-lexical/src/field/features/format/italic/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/format/italic/feature.server.ts @@ -1,7 +1,7 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { ItalicFeatureClientComponent } from './feature.client' -import { ITALIC_STAR, ITALIC_UNDERSCORE } from './markdownTransformers' +import { ItalicFeatureClientComponent } from './feature.client.js' +import { ITALIC_STAR, ITALIC_UNDERSCORE } from './markdownTransformers.js' export const ItalicFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/strikethrough/feature.client.tsx b/packages/richtext-lexical/src/field/features/format/strikethrough/feature.client.tsx index 79cc2782c..4fae03769 100644 --- a/packages/richtext-lexical/src/field/features/format/strikethrough/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/format/strikethrough/feature.client.tsx @@ -2,12 +2,12 @@ import { $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { StrikethroughIcon } from '../../../lexical/ui/icons/Strikethrough' -import { createClientComponent } from '../../createClientComponent' -import { SectionWithEntries } from '../common/floatingSelectToolbarSection' -import { STRIKETHROUGH } from './markdownTransformers' +import { StrikethroughIcon } from '../../../lexical/ui/icons/Strikethrough/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { SectionWithEntries } from '../common/floatingSelectToolbarSection.js' +import { STRIKETHROUGH } from './markdownTransformers.js' const StrikethroughFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/strikethrough/feature.server.ts b/packages/richtext-lexical/src/field/features/format/strikethrough/feature.server.ts index 5f98bdbbe..ef65e05e7 100644 --- a/packages/richtext-lexical/src/field/features/format/strikethrough/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/format/strikethrough/feature.server.ts @@ -1,7 +1,7 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { StrikethroughFeatureClientComponent } from './feature.client' -import { STRIKETHROUGH } from './markdownTransformers' +import { StrikethroughFeatureClientComponent } from './feature.client.js' +import { STRIKETHROUGH } from './markdownTransformers.js' export const StrikethroughFeature: FeatureProviderProviderServer = ( props, diff --git a/packages/richtext-lexical/src/field/features/format/subscript/feature.client.tsx b/packages/richtext-lexical/src/field/features/format/subscript/feature.client.tsx index 4c1904b0a..055bd0200 100644 --- a/packages/richtext-lexical/src/field/features/format/subscript/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/format/subscript/feature.client.tsx @@ -2,11 +2,11 @@ import { $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { SubscriptIcon } from '../../../lexical/ui/icons/Subscript' -import { createClientComponent } from '../../createClientComponent' -import { SectionWithEntries } from '../common/floatingSelectToolbarSection' +import { SubscriptIcon } from '../../../lexical/ui/icons/Subscript/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { SectionWithEntries } from '../common/floatingSelectToolbarSection.js' const SubscriptFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/subscript/feature.server.ts b/packages/richtext-lexical/src/field/features/format/subscript/feature.server.ts index a02f058d3..2484782a7 100644 --- a/packages/richtext-lexical/src/field/features/format/subscript/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/format/subscript/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { SubscriptFeatureClientComponent } from './feature.client' +import { SubscriptFeatureClientComponent } from './feature.client.js' export const SubscriptFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/superscript/feature.client.tsx b/packages/richtext-lexical/src/field/features/format/superscript/feature.client.tsx index e59f48771..0288ccae9 100644 --- a/packages/richtext-lexical/src/field/features/format/superscript/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/format/superscript/feature.client.tsx @@ -2,11 +2,11 @@ import { $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { SuperscriptIcon } from '../../../lexical/ui/icons/Superscript' -import { createClientComponent } from '../../createClientComponent' -import { SectionWithEntries } from '../common/floatingSelectToolbarSection' +import { SuperscriptIcon } from '../../../lexical/ui/icons/Superscript/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { SectionWithEntries } from '../common/floatingSelectToolbarSection.js' const SuperscriptFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/superscript/feature.server.ts b/packages/richtext-lexical/src/field/features/format/superscript/feature.server.ts index 080b91a5d..02509efc3 100644 --- a/packages/richtext-lexical/src/field/features/format/superscript/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/format/superscript/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { SuperscriptFeatureClientComponent } from './feature.client' +import { SuperscriptFeatureClientComponent } from './feature.client.js' export const SuperscriptFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/underline/feature.client.tsx b/packages/richtext-lexical/src/field/features/format/underline/feature.client.tsx index e26bf06ba..d30e3abc3 100644 --- a/packages/richtext-lexical/src/field/features/format/underline/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/format/underline/feature.client.tsx @@ -2,11 +2,11 @@ import { $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { UnderlineIcon } from '../../../lexical/ui/icons/Underline' -import { createClientComponent } from '../../createClientComponent' -import { SectionWithEntries } from '../common/floatingSelectToolbarSection' +import { UnderlineIcon } from '../../../lexical/ui/icons/Underline/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { SectionWithEntries } from '../common/floatingSelectToolbarSection.js' const UnderlineFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/format/underline/feature.server.ts b/packages/richtext-lexical/src/field/features/format/underline/feature.server.ts index 4f9fc087c..b06a501bc 100644 --- a/packages/richtext-lexical/src/field/features/format/underline/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/format/underline/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { UnderlineFeatureClientComponent } from './feature.client' +import { UnderlineFeatureClientComponent } from './feature.client.js' export const UnderlineFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/heading/feature.client.tsx b/packages/richtext-lexical/src/field/features/heading/feature.client.tsx index a910bc9ab..8c13a5e6a 100644 --- a/packages/richtext-lexical/src/field/features/heading/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/heading/feature.client.tsx @@ -7,19 +7,19 @@ import { $createHeadingNode } from '@lexical/rich-text' import { $setBlocksType } from '@lexical/selection' import { $getSelection } from 'lexical' -import type { FeatureProviderProviderClient } from '../types' -import type { HeadingFeatureProps } from './feature.server' +import type { FeatureProviderProviderClient } from '../types.js' +import type { HeadingFeatureProps } from './feature.server.js' -import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { H1Icon } from '../../lexical/ui/icons/H1' -import { H2Icon } from '../../lexical/ui/icons/H2' -import { H3Icon } from '../../lexical/ui/icons/H3' -import { H4Icon } from '../../lexical/ui/icons/H4' -import { H5Icon } from '../../lexical/ui/icons/H5' -import { H6Icon } from '../../lexical/ui/icons/H6' -import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection' -import { createClientComponent } from '../createClientComponent' -import { MarkdownTransformer } from './markdownTransformer' +import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { H1Icon } from '../../lexical/ui/icons/H1/index.js' +import { H2Icon } from '../../lexical/ui/icons/H2/index.js' +import { H3Icon } from '../../lexical/ui/icons/H3/index.js' +import { H4Icon } from '../../lexical/ui/icons/H4/index.js' +import { H5Icon } from '../../lexical/ui/icons/H5/index.js' +import { H6Icon } from '../../lexical/ui/icons/H6/index.js' +import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { MarkdownTransformer } from './markdownTransformer.js' const setHeading = (headingSize: HeadingTagType) => { const selection = $getSelection() diff --git a/packages/richtext-lexical/src/field/features/heading/feature.server.ts b/packages/richtext-lexical/src/field/features/heading/feature.server.ts index 544d3ebf8..a04b7ae09 100644 --- a/packages/richtext-lexical/src/field/features/heading/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/heading/feature.server.ts @@ -2,12 +2,12 @@ import type { HeadingTagType } from '@lexical/rich-text' import { HeadingNode, type SerializedHeadingNode } from '@lexical/rich-text' -import type { HTMLConverter } from '../converters/html/converter/types' -import type { FeatureProviderProviderServer } from '../types' +import type { HTMLConverter } from '../converters/html/converter/types.js' +import type { FeatureProviderProviderServer } from '../types.js' -import { convertLexicalNodesToHTML } from '../converters/html/converter' -import { HeadingFeatureClientComponent } from './feature.client' -import { MarkdownTransformer } from './markdownTransformer' +import { convertLexicalNodesToHTML } from '../converters/html/converter/index.js' +import { HeadingFeatureClientComponent } from './feature.client.js' +import { MarkdownTransformer } from './markdownTransformer.js' export type HeadingFeatureProps = { enabledHeadingSizes?: HeadingTagType[] diff --git a/packages/richtext-lexical/src/field/features/heading/markdownTransformer.ts b/packages/richtext-lexical/src/field/features/heading/markdownTransformer.ts index 115b6b38f..9ae14e78c 100644 --- a/packages/richtext-lexical/src/field/features/heading/markdownTransformer.ts +++ b/packages/richtext-lexical/src/field/features/heading/markdownTransformer.ts @@ -3,7 +3,7 @@ import type { HeadingTagType } from '@lexical/rich-text' import { $createHeadingNode, $isHeadingNode, HeadingNode } from '@lexical/rich-text' -import { createBlockNode } from '../../lexical/utils/markdown/createBlockNode' +import { createBlockNode } from '../../lexical/utils/markdown/createBlockNode.js' export const MarkdownTransformer: (enabledHeadingSizes: HeadingTagType[]) => ElementTransformer = ( enabledHeadingSizes, diff --git a/packages/richtext-lexical/src/field/features/indent/feature.client.tsx b/packages/richtext-lexical/src/field/features/indent/feature.client.tsx index 7b39d2166..aa25bb0fc 100644 --- a/packages/richtext-lexical/src/field/features/indent/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/indent/feature.client.tsx @@ -2,12 +2,12 @@ import { INDENT_CONTENT_COMMAND, OUTDENT_CONTENT_COMMAND } from 'lexical' -import type { FeatureProviderProviderClient } from '../types' +import type { FeatureProviderProviderClient } from '../types.js' -import { IndentDecreaseIcon } from '../../lexical/ui/icons/IndentDecrease' -import { IndentIncreaseIcon } from '../../lexical/ui/icons/IndentIncrease' -import { createClientComponent } from '../createClientComponent' -import { IndentSectionWithEntries } from './floatingSelectToolbarIndentSection' +import { IndentDecreaseIcon } from '../../lexical/ui/icons/IndentDecrease/index.js' +import { IndentIncreaseIcon } from '../../lexical/ui/icons/IndentIncrease/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { IndentSectionWithEntries } from './floatingSelectToolbarIndentSection.js' const IndentFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/indent/feature.server.ts b/packages/richtext-lexical/src/field/features/indent/feature.server.ts index 0e57f288a..6c025a0a8 100644 --- a/packages/richtext-lexical/src/field/features/indent/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/indent/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../types' +import type { FeatureProviderProviderServer } from '../types.js' -import { IndentFeatureClientComponent } from './feature.client' +import { IndentFeatureClientComponent } from './feature.client.js' export const IndentFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/indent/floatingSelectToolbarIndentSection.ts b/packages/richtext-lexical/src/field/features/indent/floatingSelectToolbarIndentSection.ts index 49648413e..4750ec284 100644 --- a/packages/richtext-lexical/src/field/features/indent/floatingSelectToolbarIndentSection.ts +++ b/packages/richtext-lexical/src/field/features/indent/floatingSelectToolbarIndentSection.ts @@ -1,7 +1,7 @@ import type { FloatingToolbarSection, FloatingToolbarSectionEntry, -} from '../../lexical/plugins/FloatingSelectToolbar/types' +} from '../../lexical/plugins/FloatingSelectToolbar/types.js' export const IndentSectionWithEntries = ( entries: FloatingToolbarSectionEntry[], diff --git a/packages/richtext-lexical/src/field/features/link/drawer/baseFields.ts b/packages/richtext-lexical/src/field/features/link/drawer/baseFields.ts index 1115b4e41..2d2a10929 100644 --- a/packages/richtext-lexical/src/field/features/link/drawer/baseFields.ts +++ b/packages/richtext-lexical/src/field/features/link/drawer/baseFields.ts @@ -4,7 +4,7 @@ import type { Field, RadioField, TextField } from 'payload/types' import { extractTranslations } from 'payload/utilities' -import { validateUrl } from '../../../lexical/utils/url' +import { validateUrl } from '../../../lexical/utils/url.js' const translations = extractTranslations([ 'fields:textToDisplay', diff --git a/packages/richtext-lexical/src/field/features/link/drawer/index.tsx b/packages/richtext-lexical/src/field/features/link/drawer/index.tsx index 840e6c1f9..e7818e822 100644 --- a/packages/richtext-lexical/src/field/features/link/drawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/drawer/index.tsx @@ -16,9 +16,9 @@ import { useFieldPath } from '@payloadcms/ui' import React, { useCallback, useEffect, useState } from 'react' import { v4 as uuid } from 'uuid' -import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider' +import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider.js' import './index.scss' -import { type Props } from './types' +import { type Props } from './types.js' const baseClass = 'lexical-link-edit-drawer' diff --git a/packages/richtext-lexical/src/field/features/link/drawer/types.ts b/packages/richtext-lexical/src/field/features/link/drawer/types.ts index 5060ffe7f..027345762 100644 --- a/packages/richtext-lexical/src/field/features/link/drawer/types.ts +++ b/packages/richtext-lexical/src/field/features/link/drawer/types.ts @@ -1,6 +1,6 @@ import type { FormState } from 'payload/types' -import type { LinkPayload } from '../plugins/floatingLinkEditor/types' +import type { LinkPayload } from '../plugins/floatingLinkEditor/types.js' export interface Props { drawerSlug: string diff --git a/packages/richtext-lexical/src/field/features/link/feature.client.tsx b/packages/richtext-lexical/src/field/features/link/feature.client.tsx index 220c6d062..afc874f58 100644 --- a/packages/richtext-lexical/src/field/features/link/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/link/feature.client.tsx @@ -3,21 +3,21 @@ import { $findMatchingParent } from '@lexical/utils' import { $getSelection, $isRangeSelection } from 'lexical' -import type { FeatureProviderProviderClient } from '../types' -import type { ExclusiveLinkCollectionsProps } from './feature.server' -import type { LinkFields } from './nodes/types' +import type { FeatureProviderProviderClient } from '../types.js' +import type { ExclusiveLinkCollectionsProps } from './feature.server.js' +import type { LinkFields } from './nodes/types.js' -import { LinkIcon } from '../../lexical/ui/icons/Link' -import { getSelectedNode } from '../../lexical/utils/getSelectedNode' -import { FeaturesSectionWithEntries } from '../common/floatingSelectToolbarFeaturesButtonsSection' -import { createClientComponent } from '../createClientComponent' -import { AutoLinkNode } from './nodes/AutoLinkNode' -import { $isLinkNode, LinkNode, TOGGLE_LINK_COMMAND } from './nodes/LinkNode' -import { AutoLinkPlugin } from './plugins/autoLink' -import { ClickableLinkPlugin } from './plugins/clickableLink' -import { FloatingLinkEditorPlugin } from './plugins/floatingLinkEditor' -import { TOGGLE_LINK_WITH_MODAL_COMMAND } from './plugins/floatingLinkEditor/LinkEditor/commands' -import { LinkPlugin } from './plugins/link' +import { LinkIcon } from '../../lexical/ui/icons/Link/index.js' +import { getSelectedNode } from '../../lexical/utils/getSelectedNode.js' +import { FeaturesSectionWithEntries } from '../common/floatingSelectToolbarFeaturesButtonsSection/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { AutoLinkNode } from './nodes/AutoLinkNode.js' +import { $isLinkNode, LinkNode, TOGGLE_LINK_COMMAND } from './nodes/LinkNode.js' +import { AutoLinkPlugin } from './plugins/autoLink/index.js' +import { ClickableLinkPlugin } from './plugins/clickableLink/index.js' +import { TOGGLE_LINK_WITH_MODAL_COMMAND } from './plugins/floatingLinkEditor/LinkEditor/commands.js' +import { FloatingLinkEditorPlugin } from './plugins/floatingLinkEditor/index.js' +import { LinkPlugin } from './plugins/link/index.js' export type ClientProps = ExclusiveLinkCollectionsProps diff --git a/packages/richtext-lexical/src/field/features/link/feature.server.ts b/packages/richtext-lexical/src/field/features/link/feature.server.ts index 5f6781cf5..893f35fc3 100644 --- a/packages/richtext-lexical/src/field/features/link/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/link/feature.server.ts @@ -5,17 +5,17 @@ import type { Field } from 'payload/types' import { initI18n } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/client' -import type { HTMLConverter } from '../converters/html/converter/types' -import type { FeatureProviderProviderServer } from '../types' -import type { ClientProps } from './feature.client' -import type { SerializedAutoLinkNode, SerializedLinkNode } from './nodes/types' +import type { HTMLConverter } from '../converters/html/converter/types.js' +import type { FeatureProviderProviderServer } from '../types.js' +import type { ClientProps } from './feature.client.js' +import type { SerializedAutoLinkNode, SerializedLinkNode } from './nodes/types.js' -import { convertLexicalNodesToHTML } from '../converters/html/converter' -import { LinkFeatureClientComponent } from './feature.client' -import { AutoLinkNode } from './nodes/AutoLinkNode' -import { LinkNode } from './nodes/LinkNode' -import { transformExtraFields } from './plugins/floatingLinkEditor/utilities' -import { linkPopulationPromiseHOC } from './populationPromise' +import { convertLexicalNodesToHTML } from '../converters/html/converter/index.js' +import { LinkFeatureClientComponent } from './feature.client.js' +import { AutoLinkNode } from './nodes/AutoLinkNode.js' +import { LinkNode } from './nodes/LinkNode.js' +import { transformExtraFields } from './plugins/floatingLinkEditor/utilities.js' +import { linkPopulationPromiseHOC } from './populationPromise.js' export type ExclusiveLinkCollectionsProps = | { diff --git a/packages/richtext-lexical/src/field/features/link/nodes/AutoLinkNode.ts b/packages/richtext-lexical/src/field/features/link/nodes/AutoLinkNode.ts index da222e139..b0228c80c 100644 --- a/packages/richtext-lexical/src/field/features/link/nodes/AutoLinkNode.ts +++ b/packages/richtext-lexical/src/field/features/link/nodes/AutoLinkNode.ts @@ -6,9 +6,9 @@ import { type RangeSelection, } from 'lexical' -import type { LinkFields, SerializedAutoLinkNode } from './types' +import type { LinkFields, SerializedAutoLinkNode } from './types.js' -import { LinkNode } from './LinkNode' +import { LinkNode } from './LinkNode.js' // Custom node type to override `canInsertTextAfter` that will // allow typing within the link diff --git a/packages/richtext-lexical/src/field/features/link/nodes/LinkNode.ts b/packages/richtext-lexical/src/field/features/link/nodes/LinkNode.ts index 9a19aa66a..40271bb54 100644 --- a/packages/richtext-lexical/src/field/features/link/nodes/LinkNode.ts +++ b/packages/richtext-lexical/src/field/features/link/nodes/LinkNode.ts @@ -18,8 +18,8 @@ import { createCommand, } from 'lexical' -import type { LinkPayload } from '../plugins/floatingLinkEditor/types' -import type { LinkFields, SerializedLinkNode } from './types' +import type { LinkPayload } from '../plugins/floatingLinkEditor/types.js' +import type { LinkFields, SerializedLinkNode } from './types.js' const SUPPORTED_URL_PROTOCOLS = new Set(['http:', 'https:', 'mailto:', 'sms:', 'tel:']) diff --git a/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx index 8602d24d0..a4ea60e7a 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx @@ -15,11 +15,11 @@ import { } from 'lexical' import { useEffect } from 'react' -import type { LinkFields } from '../../nodes/types' +import type { LinkFields } from '../../nodes/types.js' -import { invariant } from '../../../../lexical/utils/invariant' -import { $createAutoLinkNode, $isAutoLinkNode, AutoLinkNode } from '../../nodes/AutoLinkNode' -import { $isLinkNode } from '../../nodes/LinkNode' +import { invariant } from '../../../../lexical/utils/invariant.js' +import { $createAutoLinkNode, $isAutoLinkNode, AutoLinkNode } from '../../nodes/AutoLinkNode.js' +import { $isLinkNode } from '../../nodes/LinkNode.js' type ChangeHandler = (url: null | string, prevUrl: null | string) => void diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/commands.ts b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/commands.ts index ec6c41c7f..37209622d 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/commands.ts +++ b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/commands.ts @@ -2,7 +2,7 @@ import type { LexicalCommand } from 'lexical' import { createCommand } from 'lexical' -import type { LinkPayload } from '../types' +import type { LinkPayload } from '../types.js' export const TOGGLE_LINK_WITH_MODAL_COMMAND: LexicalCommand = createCommand( 'TOGGLE_LINK_WITH_MODAL_COMMAND', diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx index 2b7fcad45..2adb7a41d 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx @@ -17,17 +17,17 @@ import { } from 'lexical' import React, { useCallback, useEffect, useRef, useState } from 'react' -import type { LinkNode } from '../../../nodes/LinkNode' -import type { LinkPayload } from '../types' +import type { LinkNode } from '../../../nodes/LinkNode.js' +import type { LinkPayload } from '../types.js' -import { useEditorConfigContext } from '../../../../../lexical/config/client/EditorConfigProvider' -import { getSelectedNode } from '../../../../../lexical/utils/getSelectedNode' -import { setFloatingElemPositionForLinkEditor } from '../../../../../lexical/utils/setFloatingElemPositionForLinkEditor' -import { LinkDrawer } from '../../../drawer' -import { $isAutoLinkNode } from '../../../nodes/AutoLinkNode' -import { $createLinkNode } from '../../../nodes/LinkNode' -import { $isLinkNode, TOGGLE_LINK_COMMAND } from '../../../nodes/LinkNode' -import { TOGGLE_LINK_WITH_MODAL_COMMAND } from './commands' +import { useEditorConfigContext } from '../../../../../lexical/config/client/EditorConfigProvider.js' +import { getSelectedNode } from '../../../../../lexical/utils/getSelectedNode.js' +import { setFloatingElemPositionForLinkEditor } from '../../../../../lexical/utils/setFloatingElemPositionForLinkEditor.js' +import { LinkDrawer } from '../../../drawer/index.js' +import { $isAutoLinkNode } from '../../../nodes/AutoLinkNode.js' +import { $createLinkNode } from '../../../nodes/LinkNode.js' +import { $isLinkNode, TOGGLE_LINK_COMMAND } from '../../../nodes/LinkNode.js' +import { TOGGLE_LINK_WITH_MODAL_COMMAND } from './commands.js' export function LinkEditor({ anchorElem }: { anchorElem: HTMLElement }): React.ReactNode { const [editor] = useLexicalComposerContext() diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.tsx index b752d87ab..db3899443 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/index.tsx @@ -2,7 +2,7 @@ import * as React from 'react' import { createPortal } from 'react-dom' -import { LinkEditor } from './LinkEditor' +import { LinkEditor } from './LinkEditor/index.js' import './index.scss' export const FloatingLinkEditorPlugin: React.FC<{ diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/types.ts b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/types.ts index 458bab09e..2c9d2a3be 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/types.ts +++ b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/types.ts @@ -1,4 +1,4 @@ -import type { LinkFields } from '../../nodes/types' +import type { LinkFields } from '../../nodes/types.js' /** * The payload of a link node diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/utilities.ts b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/utilities.ts index ab80b35c7..f10426527 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/utilities.ts +++ b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/utilities.ts @@ -2,7 +2,7 @@ import type { I18n } from '@payloadcms/translations' import type { SanitizedConfig } from 'payload/config' import type { Field, GroupField } from 'payload/types' -import { getBaseFields } from '../../drawer/baseFields' +import { getBaseFields } from '../../drawer/baseFields.js' /** * This function is run to enrich the basefields which every link has with potential, custom user-added fields. diff --git a/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx index abda938f5..8e75c6549 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx @@ -10,11 +10,11 @@ import { } from 'lexical' import { useEffect } from 'react' -import type { LinkFields } from '../../nodes/types' -import type { LinkPayload } from '../floatingLinkEditor/types' +import type { LinkFields } from '../../nodes/types.js' +import type { LinkPayload } from '../floatingLinkEditor/types.js' -import { validateUrl } from '../../../../lexical/utils/url' -import { LinkNode, TOGGLE_LINK_COMMAND, toggleLink } from '../../nodes/LinkNode' +import { validateUrl } from '../../../../lexical/utils/url.js' +import { LinkNode, TOGGLE_LINK_COMMAND, toggleLink } from '../../nodes/LinkNode.js' export function LinkPlugin(): null { const [editor] = useLexicalComposerContext() diff --git a/packages/richtext-lexical/src/field/features/link/populationPromise.ts b/packages/richtext-lexical/src/field/features/link/populationPromise.ts index 06fdcfa80..fef43c7e3 100644 --- a/packages/richtext-lexical/src/field/features/link/populationPromise.ts +++ b/packages/richtext-lexical/src/field/features/link/populationPromise.ts @@ -1,9 +1,9 @@ -import type { PopulationPromise } from '../types' -import type { LinkFeatureServerProps } from './feature.server' -import type { SerializedLinkNode } from './nodes/types' +import type { PopulationPromise } from '../types.js' +import type { LinkFeatureServerProps } from './feature.server.js' +import type { SerializedLinkNode } from './nodes/types.js' -import { populate } from '../../../populate/populate' -import { recurseNestedFields } from '../../../populate/recurseNestedFields' +import { populate } from '../../../populate/populate.js' +import { recurseNestedFields } from '../../../populate/recurseNestedFields.js' export const linkPopulationPromiseHOC = ( props: LinkFeatureServerProps, diff --git a/packages/richtext-lexical/src/field/features/lists/checklist/feature.client.tsx b/packages/richtext-lexical/src/field/features/lists/checklist/feature.client.tsx index 719654e2a..aeb6291b6 100644 --- a/packages/richtext-lexical/src/field/features/lists/checklist/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/lists/checklist/feature.client.tsx @@ -1,15 +1,15 @@ 'use client' import { INSERT_CHECK_LIST_COMMAND, ListItemNode, ListNode } from '@lexical/list' -import type { ClientFeature, FeatureProviderProviderClient } from '../../types' +import type { ClientFeature, FeatureProviderProviderClient } from '../../types.js' -import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { ChecklistIcon } from '../../../lexical/ui/icons/Checklist' -import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection' -import { createClientComponent } from '../../createClientComponent' -import { LexicalListPlugin } from '../plugin' -import { CHECK_LIST } from './markdownTransformers' -import { LexicalCheckListPlugin } from './plugin' +import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { ChecklistIcon } from '../../../lexical/ui/icons/Checklist/index.js' +import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { LexicalListPlugin } from '../plugin/index.js' +import { CHECK_LIST } from './markdownTransformers.js' +import { LexicalCheckListPlugin } from './plugin/index.js' const CheckListFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/lists/checklist/feature.server.ts b/packages/richtext-lexical/src/field/features/lists/checklist/feature.server.ts index d0063cd80..45e8fe4aa 100644 --- a/packages/richtext-lexical/src/field/features/lists/checklist/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/lists/checklist/feature.server.ts @@ -1,10 +1,10 @@ import { ListItemNode, ListNode } from '@lexical/list' -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter' -import { CheckListFeatureClientComponent } from './feature.client' -import { CHECK_LIST } from './markdownTransformers' +import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter.js' +import { CheckListFeatureClientComponent } from './feature.client.js' +import { CHECK_LIST } from './markdownTransformers.js' export const CheckListFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/lists/checklist/markdownTransformers.ts b/packages/richtext-lexical/src/field/features/lists/checklist/markdownTransformers.ts index 2dede1ade..5c40b9f60 100644 --- a/packages/richtext-lexical/src/field/features/lists/checklist/markdownTransformers.ts +++ b/packages/richtext-lexical/src/field/features/lists/checklist/markdownTransformers.ts @@ -2,7 +2,7 @@ import type { ElementTransformer } from '@lexical/markdown' import { $isListNode, ListItemNode, ListNode } from '@lexical/list' -import { listExport, listReplace } from '../common/markdown' +import { listExport, listReplace } from '../common/markdown.js' export const CHECK_LIST: ElementTransformer = { type: 'element', diff --git a/packages/richtext-lexical/src/field/features/lists/htmlConverter.ts b/packages/richtext-lexical/src/field/features/lists/htmlConverter.ts index 1c4703452..c3495bc59 100644 --- a/packages/richtext-lexical/src/field/features/lists/htmlConverter.ts +++ b/packages/richtext-lexical/src/field/features/lists/htmlConverter.ts @@ -2,9 +2,9 @@ import type { SerializedListItemNode, SerializedListNode } from '@lexical/list' import { ListItemNode, ListNode } from '@lexical/list' -import type { HTMLConverter } from '../converters/html/converter/types' +import type { HTMLConverter } from '../converters/html/converter/types.js' -import { convertLexicalNodesToHTML } from '../converters/html/converter' +import { convertLexicalNodesToHTML } from '../converters/html/converter/index.js' export const ListHTMLConverter: HTMLConverter = { converter: async ({ converters, node, parent, payload }) => { diff --git a/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.client.tsx b/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.client.tsx index 3aa1ee0be..0b6e4c83f 100644 --- a/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.client.tsx @@ -2,14 +2,14 @@ import { INSERT_ORDERED_LIST_COMMAND, ListItemNode, ListNode } from '@lexical/list' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { OrderedListIcon } from '../../../lexical/ui/icons/OrderedList' -import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection' -import { createClientComponent } from '../../createClientComponent' -import { LexicalListPlugin } from '../plugin' -import { ORDERED_LIST } from './markdownTransformer' +import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { OrderedListIcon } from '../../../lexical/ui/icons/OrderedList/index.js' +import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { LexicalListPlugin } from '../plugin/index.js' +import { ORDERED_LIST } from './markdownTransformer.js' const OrderedListFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.server.ts b/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.server.ts index 428bad126..773013a37 100644 --- a/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/lists/orderedlist/feature.server.ts @@ -1,10 +1,10 @@ import { ListItemNode, ListNode } from '@lexical/list' -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter' -import { OrderedListFeatureClientComponent } from './feature.client' -import { ORDERED_LIST } from './markdownTransformer' +import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter.js' +import { OrderedListFeatureClientComponent } from './feature.client.js' +import { ORDERED_LIST } from './markdownTransformer.js' export const OrderedListFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/lists/orderedlist/markdownTransformer.ts b/packages/richtext-lexical/src/field/features/lists/orderedlist/markdownTransformer.ts index 4205ff230..5b7a26dde 100644 --- a/packages/richtext-lexical/src/field/features/lists/orderedlist/markdownTransformer.ts +++ b/packages/richtext-lexical/src/field/features/lists/orderedlist/markdownTransformer.ts @@ -2,7 +2,7 @@ import type { ElementTransformer } from '@lexical/markdown' import { $isListNode, ListItemNode, ListNode } from '@lexical/list' -import { listExport, listReplace } from '../common/markdown' +import { listExport, listReplace } from '../common/markdown.js' export const ORDERED_LIST: ElementTransformer = { type: 'element', diff --git a/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.client.tsx b/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.client.tsx index 0293fe691..ad02749f0 100644 --- a/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.client.tsx @@ -2,14 +2,14 @@ import { INSERT_UNORDERED_LIST_COMMAND, ListItemNode, ListNode } from '@lexical/list' -import type { FeatureProviderProviderClient } from '../../types' +import type { FeatureProviderProviderClient } from '../../types.js' -import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { UnorderedListIcon } from '../../../lexical/ui/icons/UnorderedList' -import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection' -import { createClientComponent } from '../../createClientComponent' -import { LexicalListPlugin } from '../plugin' -import { UNORDERED_LIST } from './markdownTransformer' +import { SlashMenuOption } from '../../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { UnorderedListIcon } from '../../../lexical/ui/icons/UnorderedList/index.js' +import { TextDropdownSectionWithEntries } from '../../common/floatingSelectToolbarTextDropdownSection/index.js' +import { createClientComponent } from '../../createClientComponent.js' +import { LexicalListPlugin } from '../plugin/index.js' +import { UNORDERED_LIST } from './markdownTransformer.js' const UnorderedListFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.server.ts b/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.server.ts index c80a59d55..ca3c27588 100644 --- a/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/lists/unorderedlist/feature.server.ts @@ -1,10 +1,10 @@ import { ListItemNode, ListNode } from '@lexical/list' -import type { FeatureProviderProviderServer } from '../../types' +import type { FeatureProviderProviderServer } from '../../types.js' -import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter' -import { UnorderedListFeatureClientComponent } from './feature.client' -import { UNORDERED_LIST } from './markdownTransformer' +import { ListHTMLConverter, ListItemHTMLConverter } from '../htmlConverter.js' +import { UnorderedListFeatureClientComponent } from './feature.client.js' +import { UNORDERED_LIST } from './markdownTransformer.js' export const UnorderedListFeature: FeatureProviderProviderServer = ( props, diff --git a/packages/richtext-lexical/src/field/features/lists/unorderedlist/markdownTransformer.ts b/packages/richtext-lexical/src/field/features/lists/unorderedlist/markdownTransformer.ts index ca51588c4..6c3563e4e 100644 --- a/packages/richtext-lexical/src/field/features/lists/unorderedlist/markdownTransformer.ts +++ b/packages/richtext-lexical/src/field/features/lists/unorderedlist/markdownTransformer.ts @@ -2,7 +2,7 @@ import type { ElementTransformer } from '@lexical/markdown' import { $isListNode, ListItemNode, ListNode } from '@lexical/list' -import { listExport, listReplace } from '../common/markdown' +import { listExport, listReplace } from '../common/markdown.js' export const UNORDERED_LIST: ElementTransformer = { type: 'element', diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/client.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/client.ts index 39aaa7759..41003670f 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _HeadingConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _HeadingConverter } from './converter.js' export const HeadingConverterClient = createFeaturePropComponent(_HeadingConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/converter.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/converter.ts index 21de0ad49..36dce9f3f 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/converter.ts @@ -1,8 +1,8 @@ import type { SerializedHeadingNode } from '@lexical/rich-text' -import type { LexicalPluginNodeConverter } from '../../types' +import type { LexicalPluginNodeConverter } from '../../types.js' -import { convertLexicalPluginNodesToLexical } from '../../index' +import { convertLexicalPluginNodesToLexical } from '../../index.js' export const _HeadingConverter: LexicalPluginNodeConverter = { converter({ converters, lexicalPluginNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/index.ts index 55d0a1fb2..947821322 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/heading/index.ts @@ -1,7 +1,7 @@ -import type { LexicalPluginNodeConverterProvider } from '../../types' +import type { LexicalPluginNodeConverterProvider } from '../../types.js' -import { HeadingConverterClient } from './client' -import { _HeadingConverter } from './converter' +import { HeadingConverterClient } from './client.js' +import { _HeadingConverter } from './converter.js' export const HeadingConverter: LexicalPluginNodeConverterProvider = { ClientComponent: HeadingConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/client.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/client.ts index ee5ed6d86..13e884ca5 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/client.ts @@ -1,5 +1,5 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _LinkConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _LinkConverter } from './converter.js' export const LinkConverterClient = createFeaturePropComponent(_LinkConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/converter.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/converter.ts index 8cdbf6bb2..302da9282 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/converter.ts @@ -1,10 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { SerializedLinkNode } from '@payloadcms/richtext-lexical' +import type { SerializedLinkNode } from '../../../../../link/nodes/types.js' +import type { LexicalPluginNodeConverter } from '../../types.js' -import type { LexicalPluginNodeConverter } from '../../types' - -import { convertLexicalPluginNodesToLexical } from '../../index' +import { convertLexicalPluginNodesToLexical } from '../../index.js' export const _LinkConverter: LexicalPluginNodeConverter = { converter({ converters, lexicalPluginNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/index.ts index c65809a24..684eb9c02 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/link/index.ts @@ -1,7 +1,7 @@ -import type { LexicalPluginNodeConverterProvider } from '../../types' +import type { LexicalPluginNodeConverterProvider } from '../../types.js' -import { LinkConverterClient } from './client' -import { _LinkConverter } from './converter' +import { LinkConverterClient } from './client.js' +import { _LinkConverter } from './converter.js' export const LinkConverter: LexicalPluginNodeConverterProvider = { ClientComponent: LinkConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/client.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/client.ts index b1ed8ba85..6813d037a 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _ListConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _ListConverter } from './converter.js' export const ListConverterClient = createFeaturePropComponent(_ListConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/converter.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/converter.ts index b219b881a..82c0a0e80 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/converter.ts @@ -2,9 +2,9 @@ import type { SerializedListNode } from '@lexical/list' -import type { LexicalPluginNodeConverter } from '../../types' +import type { LexicalPluginNodeConverter } from '../../types.js' -import { convertLexicalPluginNodesToLexical } from '../../index' +import { convertLexicalPluginNodesToLexical } from '../../index.js' export const _ListConverter: LexicalPluginNodeConverter = { converter({ converters, lexicalPluginNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/index.ts index f2d5d1cf3..23a9ee03c 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/list/index.ts @@ -1,7 +1,7 @@ -import type { LexicalPluginNodeConverterProvider } from '../../types' +import type { LexicalPluginNodeConverterProvider } from '../../types.js' -import { ListConverterClient } from './client' -import { _ListConverter } from './converter' +import { ListConverterClient } from './client.js' +import { _ListConverter } from './converter.js' export const ListConverter: LexicalPluginNodeConverterProvider = { ClientComponent: ListConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/client.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/client.ts index fb7f5b8b9..32b7f906d 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/client.ts @@ -1,5 +1,5 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _ListItemConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _ListItemConverter } from './converter.js' export const ListItemConverterClient = createFeaturePropComponent(_ListItemConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/converter.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/converter.ts index 672789293..76ccb1241 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/converter.ts @@ -1,8 +1,8 @@ import type { SerializedListItemNode } from '@lexical/list' -import type { LexicalPluginNodeConverter } from '../../types' +import type { LexicalPluginNodeConverter } from '../../types.js' -import { convertLexicalPluginNodesToLexical } from '../../index' +import { convertLexicalPluginNodesToLexical } from '../../index.js' export const _ListItemConverter: LexicalPluginNodeConverter = { converter({ childIndex, converters, lexicalPluginNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/index.ts index 5768610c9..84f3bdb27 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/listItem/index.ts @@ -1,7 +1,7 @@ -import type { LexicalPluginNodeConverterProvider } from '../../types' +import type { LexicalPluginNodeConverterProvider } from '../../types.js' -import { ListItemConverterClient } from './client' -import { _ListItemConverter } from './converter' +import { ListItemConverterClient } from './client.js' +import { _ListItemConverter } from './converter.js' export const ListItemConverter: LexicalPluginNodeConverterProvider = { ClientComponent: ListItemConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/client.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/client.ts index 24745ab20..053f28585 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _QuoteConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _QuoteConverter } from './converter.js' export const QuoteConverterClient = createFeaturePropComponent(_QuoteConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/converter.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/converter.ts index 32665a2e2..a061e4de6 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/converter.ts @@ -1,8 +1,8 @@ import type { SerializedQuoteNode } from '@lexical/rich-text' -import type { LexicalPluginNodeConverter } from '../../types' +import type { LexicalPluginNodeConverter } from '../../types.js' -import { convertLexicalPluginNodesToLexical } from '../../index' +import { convertLexicalPluginNodesToLexical } from '../../index.js' export const _QuoteConverter: LexicalPluginNodeConverter = { converter({ converters, lexicalPluginNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/index.ts index e78741524..6aeee4f1f 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/quote/index.ts @@ -1,7 +1,7 @@ -import type { LexicalPluginNodeConverterProvider } from '../../types' +import type { LexicalPluginNodeConverterProvider } from '../../types.js' -import { QuoteConverterClient } from './client' -import { _QuoteConverter } from './converter' +import { QuoteConverterClient } from './client.js' +import { _QuoteConverter } from './converter.js' export const QuoteConverter: LexicalPluginNodeConverterProvider = { ClientComponent: QuoteConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/client.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/client.ts index c220cc0f7..d3a4a4820 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/client.ts @@ -1,5 +1,5 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _UnknownConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _UnknownConverter } from './converter.js' export const UnknownConverterClient = createFeaturePropComponent(_UnknownConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/converter.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/converter.ts index 0bd15ab9e..b2b6bb4c4 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/converter.ts @@ -1,7 +1,7 @@ -import type { SerializedUnknownConvertedNode } from '../../../nodes/unknownConvertedNode' -import type { LexicalPluginNodeConverter } from '../../types' +import type { SerializedUnknownConvertedNode } from '../../../nodes/unknownConvertedNode/index.js' +import type { LexicalPluginNodeConverter } from '../../types.js' -import { convertLexicalPluginNodesToLexical } from '../../index' +import { convertLexicalPluginNodesToLexical } from '../../index.js' export const _UnknownConverter: LexicalPluginNodeConverter = { converter({ converters, lexicalPluginNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/index.ts index 910b40fbd..da52e0569 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/unknown/index.ts @@ -1,7 +1,7 @@ -import type { LexicalPluginNodeConverterProvider } from '../../types' +import type { LexicalPluginNodeConverterProvider } from '../../types.js' -import { UnknownConverterClient } from './client' -import { _UnknownConverter } from './converter' +import { UnknownConverterClient } from './client.js' +import { _UnknownConverter } from './converter.js' export const UnknownConverter: LexicalPluginNodeConverterProvider = { ClientComponent: UnknownConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/client.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/client.ts index 245dd85ec..fb5b1440d 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _UploadConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _UploadConverter } from './converter.js' export const UploadConverterClient = createFeaturePropComponent(_UploadConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/converter.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/converter.ts index a3095b5d8..280450894 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/converter.ts @@ -1,8 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { SerializedUploadNode } from '@payloadcms/richtext-lexical' - -import type { LexicalPluginNodeConverter } from '../../types' +import type { SerializedUploadNode } from '../../../../../upload/nodes/UploadNode.js' +import type { LexicalPluginNodeConverter } from '../../types.js' export const _UploadConverter: LexicalPluginNodeConverter = { converter({ lexicalPluginNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/index.ts index 4a3134ada..8e38c195a 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/converters/upload/index.ts @@ -1,7 +1,7 @@ -import type { LexicalPluginNodeConverterProvider } from '../../types' +import type { LexicalPluginNodeConverterProvider } from '../../types.js' -import { UploadConverterClient } from './client' -import { _UploadConverter } from './converter' +import { UploadConverterClient } from './client.js' +import { _UploadConverter } from './converter.js' export const UploadConverter: LexicalPluginNodeConverterProvider = { ClientComponent: UploadConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/defaultConverters.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/defaultConverters.ts index 9977d9c83..223a4f106 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/defaultConverters.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/defaultConverters.ts @@ -1,12 +1,12 @@ -import type { LexicalPluginNodeConverterProvider } from './types' +import type { LexicalPluginNodeConverterProvider } from './types.js' -import { HeadingConverter } from './converters/heading' -import { LinkConverter } from './converters/link' -import { ListConverter } from './converters/list' -import { ListItemConverter } from './converters/listItem' -import { QuoteConverter } from './converters/quote' -import { UnknownConverter } from './converters/unknown' -import { UploadConverter } from './converters/upload' +import { HeadingConverter } from './converters/heading/index.js' +import { LinkConverter } from './converters/link/index.js' +import { ListConverter } from './converters/list/index.js' +import { ListItemConverter } from './converters/listItem/index.js' +import { QuoteConverter } from './converters/quote/index.js' +import { UnknownConverter } from './converters/unknown/index.js' +import { UploadConverter } from './converters/upload/index.js' export const defaultConverters: LexicalPluginNodeConverterProvider[] = [ HeadingConverter, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/index.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/index.ts index 5ca5677f1..613fe101e 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/converter/index.ts @@ -5,7 +5,7 @@ import type { SerializedTextNode, } from 'lexical' -import type { LexicalPluginNodeConverter, PayloadPluginLexicalData } from './types' +import type { LexicalPluginNodeConverter, PayloadPluginLexicalData } from './types.js' export function convertLexicalPluginToLexical({ converters, diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.client.tsx b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.client.tsx index bac357535..b9039b86d 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.client.tsx @@ -1,11 +1,11 @@ 'use client' -import type { FeatureProviderProviderClient } from '../../types' -import type { LexicalPluginNodeConverter, PayloadPluginLexicalData } from './converter/types' +import type { FeatureProviderProviderClient } from '../../types.js' +import type { LexicalPluginNodeConverter, PayloadPluginLexicalData } from './converter/types.js' -import { createClientComponent } from '../../createClientComponent' -import { convertLexicalPluginToLexical } from './converter' -import { UnknownConvertedNode } from './nodes/unknownConvertedNode' +import { createClientComponent } from '../../createClientComponent.js' +import { convertLexicalPluginToLexical } from './converter/index.js' +import { UnknownConvertedNode } from './nodes/unknownConvertedNode/index.js' const LexicalPluginToLexicalFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.server.ts b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.server.ts index b7b2adb1e..e0bd0fc77 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/feature.server.ts @@ -1,11 +1,11 @@ import type React from 'react' -import type { FeatureProviderProviderServer } from '../../types' -import type { LexicalPluginNodeConverterProvider } from './converter/types' +import type { FeatureProviderProviderServer } from '../../types.js' +import type { LexicalPluginNodeConverterProvider } from './converter/types.js' -import { defaultConverters } from './converter/defaultConverters' -import { LexicalPluginToLexicalFeatureClientComponent } from './feature.client' -import { UnknownConvertedNode } from './nodes/unknownConvertedNode' +import { defaultConverters } from './converter/defaultConverters.js' +import { LexicalPluginToLexicalFeatureClientComponent } from './feature.client.js' +import { UnknownConvertedNode } from './nodes/unknownConvertedNode/index.js' export type LexicalPluginToLexicalFeatureProps = { converters?: diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/Component.tsx b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/Component.tsx index 37212f75d..f3b3ca9cd 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/Component.tsx +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/Component.tsx @@ -1,6 +1,6 @@ import React from 'react' -import type { UnknownConvertedNodeData } from './index' +import type { UnknownConvertedNodeData } from './index.js' import './index.scss' diff --git a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/index.tsx b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/index.tsx index 1117ee42e..e2bbdfdf1 100644 --- a/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/index.tsx +++ b/packages/richtext-lexical/src/field/features/migrations/lexicalPluginToLexical/nodes/unknownConvertedNode/index.tsx @@ -17,7 +17,7 @@ export type SerializedUnknownConvertedNode = Spread< > const Component = React.lazy(() => - import('./Component').then((module) => ({ + import('./Component.js').then((module) => ({ default: module.UnknownConvertedNodeComponent, })), ) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/client.ts index 35f8baa83..d5727089b 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateBlockquoteConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateBlockquoteConverter } from './converter.js' export const BlockQuoteConverterClient = createFeaturePropComponent(_SlateBlockquoteConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/converter.ts index 9166a10be..29049ae8e 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/converter.ts @@ -1,8 +1,8 @@ import type { SerializedQuoteNode } from '@lexical/rich-text' -import type { SlateNodeConverter } from '../../types' +import type { SlateNodeConverter } from '../../types.js' -import { convertSlateNodesToLexical } from '../..' +import { convertSlateNodesToLexical } from '../../index.js' export const _SlateBlockquoteConverter: SlateNodeConverter = { converter({ converters, slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/index.ts index 1dd41f0cf..1ea5e2f46 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/blockquote/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { BlockQuoteConverterClient } from './client' -import { _SlateBlockquoteConverter } from './converter' +import { BlockQuoteConverterClient } from './client.js' +import { _SlateBlockquoteConverter } from './converter.js' export const SlateBlockquoteConverter: SlateNodeConverterProvider = { ClientComponent: BlockQuoteConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/client.ts index 98f37f029..5f4d7cbfc 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/client.ts @@ -1,5 +1,5 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateHeadingConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateHeadingConverter } from './converter.js' export const HeadingConverterClient = createFeaturePropComponent(_SlateHeadingConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/converter.ts index 94ce756e6..4144c7b8b 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/converter.ts @@ -1,8 +1,8 @@ import type { SerializedHeadingNode } from '@lexical/rich-text' -import type { SlateNodeConverter } from '../../types' +import type { SlateNodeConverter } from '../../types.js' -import { convertSlateNodesToLexical } from '../..' +import { convertSlateNodesToLexical } from '../../index.js' export const _SlateHeadingConverter: SlateNodeConverter = { converter({ converters, slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/index.ts index 1881deecb..e8de9db0e 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/heading/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { HeadingConverterClient } from './client' -import { _SlateHeadingConverter } from './converter' +import { HeadingConverterClient } from './client.js' +import { _SlateHeadingConverter } from './converter.js' export const SlateHeadingConverter: SlateNodeConverterProvider = { ClientComponent: HeadingConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/client.ts index dad6c3b2e..3bb4419e5 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateIndentConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateIndentConverter } from './converter.js' export const IndentConverterClient = createFeaturePropComponent(_SlateIndentConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/converter.ts index 6f5004110..2f752f1a3 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/converter.ts @@ -1,8 +1,8 @@ import type { SerializedLexicalNode, SerializedParagraphNode } from 'lexical' -import type { SlateNodeConverter } from '../../types' +import type { SlateNodeConverter } from '../../types.js' -import { convertSlateNodesToLexical } from '../..' +import { convertSlateNodesToLexical } from '../../index.js' export const _SlateIndentConverter: SlateNodeConverter = { converter({ converters, slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/index.ts index 5dccb8b2a..a97dfb797 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/indent/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { IndentConverterClient } from './client' -import { _SlateIndentConverter } from './converter' +import { IndentConverterClient } from './client.js' +import { _SlateIndentConverter } from './converter.js' export const SlateIndentConverter: SlateNodeConverterProvider = { ClientComponent: IndentConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/client.ts index 91e3515eb..0371be805 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateLinkConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateLinkConverter } from './converter.js' export const LinkConverterClient = createFeaturePropComponent(_SlateLinkConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/converter.ts index 99eb4043b..8124d9ad1 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/converter.ts @@ -1,7 +1,7 @@ -import type { SerializedLinkNode } from '../../../../../link/nodes/types' -import type { SlateNodeConverter } from '../../types' +import type { SerializedLinkNode } from '../../../../../link/nodes/types.js' +import type { SlateNodeConverter } from '../../types.js' -import { convertSlateNodesToLexical } from '../..' +import { convertSlateNodesToLexical } from '../../index.js' export const _SlateLinkConverter: SlateNodeConverter = { converter({ converters, slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/index.ts index 2736638a2..8fe09b8ae 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/link/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { LinkConverterClient } from './client' -import { _SlateLinkConverter } from './converter' +import { LinkConverterClient } from './client.js' +import { _SlateLinkConverter } from './converter.js' export const SlateLinkConverter: SlateNodeConverterProvider = { ClientComponent: LinkConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/client.ts index 36c9f2ba5..0cb534608 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateListItemConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateListItemConverter } from './converter.js' export const ListItemConverterClient = createFeaturePropComponent(_SlateListItemConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/converter.ts index 40b4b44ac..948bd76cf 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/converter.ts @@ -1,8 +1,8 @@ import type { SerializedListItemNode } from '@lexical/list' -import type { SlateNodeConverter } from '../../types' +import type { SlateNodeConverter } from '../../types.js' -import { convertSlateNodesToLexical } from '../..' +import { convertSlateNodesToLexical } from '../../index.js' export const _SlateListItemConverter: SlateNodeConverter = { converter({ childIndex, converters, slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/index.ts index 12b446f16..4c5d990f8 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/listItem/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { ListItemConverterClient } from './client' -import { _SlateListItemConverter } from './converter' +import { ListItemConverterClient } from './client.js' +import { _SlateListItemConverter } from './converter.js' export const SlateListItemConverter: SlateNodeConverterProvider = { ClientComponent: ListItemConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/client.ts index f0a9613d9..938b4a35c 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateOrderedListConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateOrderedListConverter } from './converter.js' export const OrderedListConverterClient = createFeaturePropComponent(_SlateOrderedListConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/converter.ts index 57a8f695d..e6d89559f 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/converter.ts @@ -1,8 +1,8 @@ import type { SerializedListNode } from '@lexical/list' -import type { SlateNodeConverter } from '../../types' +import type { SlateNodeConverter } from '../../types.js' -import { convertSlateNodesToLexical } from '../..' +import { convertSlateNodesToLexical } from '../../index.js' export const _SlateOrderedListConverter: SlateNodeConverter = { converter({ converters, slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/index.ts index 10c0bf4fa..d19c2f8ed 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/orderedList/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { OrderedListConverterClient } from './client' -import { _SlateOrderedListConverter } from './converter' +import { OrderedListConverterClient } from './client.js' +import { _SlateOrderedListConverter } from './converter.js' export const SlateOrderedListConverter: SlateNodeConverterProvider = { ClientComponent: OrderedListConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/client.ts index 9ff754565..8c0b6c135 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateRelationshipConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateRelationshipConverter } from './converter.js' export const RelationshipConverterClient = createFeaturePropComponent(_SlateRelationshipConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/converter.ts index 4c662e166..90d4eed9f 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/converter.ts @@ -1,5 +1,5 @@ -import type { SerializedRelationshipNode } from '../../../../../relationship/nodes/RelationshipNode' -import type { SlateNodeConverter } from '../../types' +import type { SerializedRelationshipNode } from '../../../../../relationship/nodes/RelationshipNode.js' +import type { SlateNodeConverter } from '../../types.js' export const _SlateRelationshipConverter: SlateNodeConverter = { converter({ slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/index.ts index efad39059..b7695485f 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/relationship/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { RelationshipConverterClient } from './client' -import { _SlateRelationshipConverter } from './converter' +import { RelationshipConverterClient } from './client.js' +import { _SlateRelationshipConverter } from './converter.js' export const SlateRelationshipConverter: SlateNodeConverterProvider = { ClientComponent: RelationshipConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unknown/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unknown/index.ts index 9282825e9..4bd99ddef 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unknown/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unknown/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { UnknownConverterClient } from './client' -import { _SlateUnknownConverter } from './converter' +import { UnknownConverterClient } from './client.js' +import { _SlateUnknownConverter } from './converter.js' export const SlateUnknownConverter: SlateNodeConverterProvider = { ClientComponent: UnknownConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/client.ts index 9db90af0b..fc5952383 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateUnorderedListConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateUnorderedListConverter } from './converter.js' export const UnorderedListConverterClient = createFeaturePropComponent(_SlateUnorderedListConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/converter.ts index fb041f98f..d119585b6 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/converter.ts @@ -1,8 +1,8 @@ import type { SerializedListNode } from '@lexical/list' -import type { SlateNodeConverter } from '../../types' +import type { SlateNodeConverter } from '../../types.js' -import { convertSlateNodesToLexical } from '../..' +import { convertSlateNodesToLexical } from '../../index.js' export const _SlateUnorderedListConverter: SlateNodeConverter = { converter({ converters, slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/index.ts index 6cd10db76..e817c1ce2 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/unorderedList/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { UnorderedListConverterClient } from './client' -import { _SlateUnorderedListConverter } from './converter' +import { UnorderedListConverterClient } from './client.js' +import { _SlateUnorderedListConverter } from './converter.js' export const SlateUnorderedListConverter: SlateNodeConverterProvider = { ClientComponent: UnorderedListConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/client.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/client.ts index 7f7fcff73..793fd126c 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/client.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/client.ts @@ -1,6 +1,6 @@ 'use client' -import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent' -import { _SlateUploadConverter } from './converter' +import { createFeaturePropComponent } from '../../../../../createFeaturePropComponent.js' +import { _SlateUploadConverter } from './converter.js' export const UploadConverterClient = createFeaturePropComponent(_SlateUploadConverter) diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/converter.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/converter.ts index 7fe402c3e..e1e9e2ab8 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/converter.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/converter.ts @@ -1,5 +1,5 @@ -import type { SerializedUploadNode } from '../../../../../upload/nodes/UploadNode' -import type { SlateNodeConverter } from '../../types' +import type { SerializedUploadNode } from '../../../../../upload/nodes/UploadNode.js' +import type { SlateNodeConverter } from '../../types.js' export const _SlateUploadConverter: SlateNodeConverter = { converter({ slateNode }) { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/index.ts index 7c5d5a71a..149797dab 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/converters/upload/index.ts @@ -1,7 +1,7 @@ -import type { SlateNodeConverterProvider } from '../../types' +import type { SlateNodeConverterProvider } from '../../types.js' -import { UploadConverterClient } from './client' -import { _SlateUploadConverter } from './converter' +import { UploadConverterClient } from './client.js' +import { _SlateUploadConverter } from './converter.js' export const SlateUploadConverter: SlateNodeConverterProvider = { ClientComponent: UploadConverterClient, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/defaultConverters.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/defaultConverters.ts index 98f87d403..28a8d52a6 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/defaultConverters.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/defaultConverters.ts @@ -1,15 +1,15 @@ -import type { SlateNodeConverterProvider } from './types' +import type { SlateNodeConverterProvider } from './types.js' -import { SlateBlockquoteConverter } from './converters/blockquote' -import { SlateHeadingConverter } from './converters/heading' -import { SlateIndentConverter } from './converters/indent' -import { SlateLinkConverter } from './converters/link' -import { SlateListItemConverter } from './converters/listItem' -import { SlateOrderedListConverter } from './converters/orderedList' -import { SlateRelationshipConverter } from './converters/relationship' -import { SlateUnknownConverter } from './converters/unknown' -import { SlateUnorderedListConverter } from './converters/unorderedList' -import { SlateUploadConverter } from './converters/upload' +import { SlateBlockquoteConverter } from './converters/blockquote/index.js' +import { SlateHeadingConverter } from './converters/heading/index.js' +import { SlateIndentConverter } from './converters/indent/index.js' +import { SlateLinkConverter } from './converters/link/index.js' +import { SlateListItemConverter } from './converters/listItem/index.js' +import { SlateOrderedListConverter } from './converters/orderedList/index.js' +import { SlateRelationshipConverter } from './converters/relationship/index.js' +import { SlateUnknownConverter } from './converters/unknown/index.js' +import { SlateUnorderedListConverter } from './converters/unorderedList/index.js' +import { SlateUploadConverter } from './converters/upload/index.js' export const defaultSlateConverters: SlateNodeConverterProvider[] = [ SlateBlockquoteConverter, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/index.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/index.ts index 6b79b2418..c913826c5 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/index.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/converter/index.ts @@ -5,9 +5,9 @@ import type { SerializedTextNode, } from 'lexical' -import type { SlateNode, SlateNodeConverter } from './types' +import type { SlateNode, SlateNodeConverter } from './types.js' -import { NodeFormat } from '../../../../lexical/utils/nodeFormat' +import { NodeFormat } from '../../../../lexical/utils/nodeFormat.js' export function convertSlateToLexical({ converters, diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.client.tsx b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.client.tsx index 2a92031f5..e2099ac9d 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.client.tsx @@ -1,11 +1,11 @@ 'use client' -import type { FeatureProviderProviderClient } from '../../types' -import type { SlateNodeConverter } from './converter/types' +import type { FeatureProviderProviderClient } from '../../types.js' +import type { SlateNodeConverter } from './converter/types.js' -import { createClientComponent } from '../../createClientComponent' -import { convertSlateToLexical } from './converter' -import { UnknownConvertedNode } from './nodes/unknownConvertedNode' +import { createClientComponent } from '../../createClientComponent.js' +import { convertSlateToLexical } from './converter/index.js' +import { UnknownConvertedNode } from './nodes/unknownConvertedNode/index.js' const SlateToLexicalFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.server.ts b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.server.ts index ee0de870e..e27b6e3c3 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/feature.server.ts @@ -1,11 +1,11 @@ import type React from 'react' -import type { FeatureProviderProviderServer } from '../../types' -import type { SlateNodeConverterProvider } from './converter/types' +import type { FeatureProviderProviderServer } from '../../types.js' +import type { SlateNodeConverterProvider } from './converter/types.js' -import { defaultSlateConverters } from './converter/defaultConverters' -import { SlateToLexicalFeatureClientComponent } from './feature.client' -import { UnknownConvertedNode } from './nodes/unknownConvertedNode' +import { defaultSlateConverters } from './converter/defaultConverters.js' +import { SlateToLexicalFeatureClientComponent } from './feature.client.js' +import { UnknownConvertedNode } from './nodes/unknownConvertedNode/index.js' export type SlateToLexicalFeatureProps = { converters?: diff --git a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/nodes/unknownConvertedNode/Component.tsx b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/nodes/unknownConvertedNode/Component.tsx index db957ed11..1c69b0e56 100644 --- a/packages/richtext-lexical/src/field/features/migrations/slateToLexical/nodes/unknownConvertedNode/Component.tsx +++ b/packages/richtext-lexical/src/field/features/migrations/slateToLexical/nodes/unknownConvertedNode/Component.tsx @@ -1,6 +1,6 @@ import React from 'react' -import type { UnknownConvertedNodeData } from './index' +import type { UnknownConvertedNodeData } from './index.js' import './index.scss' diff --git a/packages/richtext-lexical/src/field/features/paragraph/feature.client.tsx b/packages/richtext-lexical/src/field/features/paragraph/feature.client.tsx index 1de74a928..8e3f0ccc0 100644 --- a/packages/richtext-lexical/src/field/features/paragraph/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/paragraph/feature.client.tsx @@ -3,12 +3,12 @@ import { $setBlocksType } from '@lexical/selection' import { $createParagraphNode, $getSelection } from 'lexical' -import type { FeatureProviderProviderClient } from '../types' +import type { FeatureProviderProviderClient } from '../types.js' -import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { TextIcon } from '../../lexical/ui/icons/Text' -import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection' -import { createClientComponent } from '../createClientComponent' +import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { TextIcon } from '../../lexical/ui/icons/Text/index.js' +import { TextDropdownSectionWithEntries } from '../common/floatingSelectToolbarTextDropdownSection/index.js' +import { createClientComponent } from '../createClientComponent.js' const ParagraphFeatureClient: FeatureProviderProviderClient = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/paragraph/feature.server.ts b/packages/richtext-lexical/src/field/features/paragraph/feature.server.ts index f0723aa30..7e0b3dee5 100644 --- a/packages/richtext-lexical/src/field/features/paragraph/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/paragraph/feature.server.ts @@ -1,6 +1,6 @@ -import type { FeatureProviderProviderServer } from '../types' +import type { FeatureProviderProviderServer } from '../types.js' -import { ParagraphFeatureClientComponent } from './feature.client' +import { ParagraphFeatureClientComponent } from './feature.client.js' export const ParagraphFeature: FeatureProviderProviderServer = (props) => { return { diff --git a/packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx b/packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx index 087440eb8..da9d629ea 100644 --- a/packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/drawer/index.tsx @@ -4,10 +4,10 @@ import { useListDrawer } from '@payloadcms/ui' import { $getNodeByKey, COMMAND_PRIORITY_EDITOR, type LexicalEditor } from 'lexical' import React, { useCallback, useEffect, useState } from 'react' -import { $createRelationshipNode } from '../nodes/RelationshipNode' -import { INSERT_RELATIONSHIP_COMMAND } from '../plugins' -import { EnabledRelationshipsCondition } from '../utils/EnabledRelationshipsCondition' -import { INSERT_RELATIONSHIP_WITH_DRAWER_COMMAND } from './commands' +import { $createRelationshipNode } from '../nodes/RelationshipNode.js' +import { INSERT_RELATIONSHIP_COMMAND } from '../plugins/index.js' +import { EnabledRelationshipsCondition } from '../utils/EnabledRelationshipsCondition.js' +import { INSERT_RELATIONSHIP_WITH_DRAWER_COMMAND } from './commands.js' const insertRelationship = ({ id, diff --git a/packages/richtext-lexical/src/field/features/relationship/feature.client.tsx b/packages/richtext-lexical/src/field/features/relationship/feature.client.tsx index cb8fdfacf..82003bfac 100644 --- a/packages/richtext-lexical/src/field/features/relationship/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/feature.client.tsx @@ -2,15 +2,15 @@ import { withMergedProps } from '@payloadcms/ui' -import type { FeatureProviderProviderClient } from '../types' -import type { RelationshipFeatureProps } from './feature.server' +import type { FeatureProviderProviderClient } from '../types.js' +import type { RelationshipFeatureProps } from './feature.server.js' -import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { RelationshipIcon } from '../../lexical/ui/icons/Relationship' -import { createClientComponent } from '../createClientComponent' -import { INSERT_RELATIONSHIP_WITH_DRAWER_COMMAND } from './drawer/commands' -import { RelationshipNode } from './nodes/RelationshipNode' -import { RelationshipPlugin } from './plugins' +import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { RelationshipIcon } from '../../lexical/ui/icons/Relationship/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { INSERT_RELATIONSHIP_WITH_DRAWER_COMMAND } from './drawer/commands.js' +import { RelationshipNode } from './nodes/RelationshipNode.js' +import { RelationshipPlugin } from './plugins/index.js' const RelationshipFeatureClient: FeatureProviderProviderClient = ( props, diff --git a/packages/richtext-lexical/src/field/features/relationship/feature.server.ts b/packages/richtext-lexical/src/field/features/relationship/feature.server.ts index 1c3f06596..49e1f6d08 100644 --- a/packages/richtext-lexical/src/field/features/relationship/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/relationship/feature.server.ts @@ -1,8 +1,8 @@ -import type { FeatureProviderProviderServer } from '../types' +import type { FeatureProviderProviderServer } from '../types.js' -import { RelationshipFeatureClientComponent } from './feature.client' -import { RelationshipNode } from './nodes/RelationshipNode' -import { relationshipPopulationPromise } from './populationPromise' +import { RelationshipFeatureClientComponent } from './feature.client.js' +import { RelationshipNode } from './nodes/RelationshipNode.js' +import { relationshipPopulationPromise } from './populationPromise.js' export type RelationshipFeatureProps = | { diff --git a/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx b/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx index 01cce5f2c..5d104319f 100644 --- a/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx @@ -17,7 +17,7 @@ import { import * as React from 'react' const RelationshipComponent = React.lazy(() => - import('./components/RelationshipComponent').then((module) => ({ + import('./components/RelationshipComponent.js').then((module) => ({ default: module.RelationshipComponent, })), ) diff --git a/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx b/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx index 6b04af37b..6d4e1142a 100644 --- a/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx @@ -6,10 +6,10 @@ import { Button, useConfig, useDocumentDrawer, usePayloadAPI, useTranslation } f import { $getNodeByKey, type ElementFormatType } from 'lexical' import React, { useCallback, useReducer, useState } from 'react' -import type { RelationshipData } from '../RelationshipNode' +import type { RelationshipData } from '../RelationshipNode.js' -import { useEditorConfigContext } from '../../../../lexical/config/client/EditorConfigProvider' -import { INSERT_RELATIONSHIP_WITH_DRAWER_COMMAND } from '../../drawer/commands' +import { useEditorConfigContext } from '../../../../lexical/config/client/EditorConfigProvider.js' +import { INSERT_RELATIONSHIP_WITH_DRAWER_COMMAND } from '../../drawer/commands.js' import './index.scss' const baseClass = 'lexical-relationship' diff --git a/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx b/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx index 12e862239..acbe7743f 100644 --- a/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx @@ -14,11 +14,11 @@ import { import { useEffect } from 'react' import React from 'react' -import type { RelationshipFeatureProps } from '../feature.server' -import type { RelationshipData } from '../nodes/RelationshipNode' +import type { RelationshipFeatureProps } from '../feature.server.js' +import type { RelationshipData } from '../nodes/RelationshipNode.js' -import { RelationshipDrawer } from '../drawer' -import { $createRelationshipNode, RelationshipNode } from '../nodes/RelationshipNode' +import { RelationshipDrawer } from '../drawer/index.js' +import { $createRelationshipNode, RelationshipNode } from '../nodes/RelationshipNode.js' export const INSERT_RELATIONSHIP_COMMAND: LexicalCommand = createCommand( 'INSERT_RELATIONSHIP_COMMAND', diff --git a/packages/richtext-lexical/src/field/features/relationship/populationPromise.ts b/packages/richtext-lexical/src/field/features/relationship/populationPromise.ts index 28df7df1b..54ed8685a 100644 --- a/packages/richtext-lexical/src/field/features/relationship/populationPromise.ts +++ b/packages/richtext-lexical/src/field/features/relationship/populationPromise.ts @@ -1,7 +1,7 @@ -import type { PopulationPromise } from '../types' -import type { SerializedRelationshipNode } from './nodes/RelationshipNode' +import type { PopulationPromise } from '../types.js' +import type { SerializedRelationshipNode } from './nodes/RelationshipNode.js' -import { populate } from '../../../populate/populate' +import { populate } from '../../../populate/populate.js' export const relationshipPopulationPromise: PopulationPromise = ({ currentDepth, diff --git a/packages/richtext-lexical/src/field/features/types.ts b/packages/richtext-lexical/src/field/features/types.ts index 848e8a057..d197bae7d 100644 --- a/packages/richtext-lexical/src/field/features/types.ts +++ b/packages/richtext-lexical/src/field/features/types.ts @@ -8,11 +8,11 @@ import type { SanitizedConfig } from 'payload/config' import type { Field, PayloadRequest, RichTextField, ValidateOptions } from 'payload/types' import type React from 'react' -import type { AdapterProps } from '../../types' -import type { ClientEditorConfig, ServerEditorConfig } from '../lexical/config/types' -import type { FloatingToolbarSection } from '../lexical/plugins/FloatingSelectToolbar/types' -import type { SlashMenuGroup } from '../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import type { HTMLConverter } from './converters/html/converter/types' +import type { AdapterProps } from '../../types.js' +import type { ClientEditorConfig, ServerEditorConfig } from '../lexical/config/types.js' +import type { FloatingToolbarSection } from '../lexical/plugins/FloatingSelectToolbar/types.js' +import type { SlashMenuGroup } from '../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import type { HTMLConverter } from './converters/html/converter/types.js' export type PopulationPromise = ({ context, diff --git a/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx b/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx index 1666f94a5..156e6cc92 100644 --- a/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx @@ -22,10 +22,10 @@ import { deepCopyObject } from 'payload/utilities' import React, { useCallback, useEffect, useState } from 'react' import { v4 as uuid } from 'uuid' -import type { ElementProps } from '..' -import type { UploadData, UploadNode } from '../../nodes/UploadNode' +import type { UploadData, UploadNode } from '../../nodes/UploadNode.js' +import type { ElementProps } from '../index.js' -import { useEditorConfigContext } from '../../../../lexical/config/client/EditorConfigProvider' +import { useEditorConfigContext } from '../../../../lexical/config/client/EditorConfigProvider.js' /** * This handles the extra fields, e.g. captions or alt text, which are diff --git a/packages/richtext-lexical/src/field/features/upload/component/index.tsx b/packages/richtext-lexical/src/field/features/upload/component/index.tsx index 4c54795d5..d6da87a29 100644 --- a/packages/richtext-lexical/src/field/features/upload/component/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/component/index.tsx @@ -18,14 +18,14 @@ import { import { $getNodeByKey } from 'lexical' import React, { useCallback, useReducer, useState } from 'react' -import type { ClientComponentProps } from '../../types' -import type { UploadFeaturePropsClient } from '../feature.client' -import type { UploadData } from '../nodes/UploadNode' +import type { ClientComponentProps } from '../../types.js' +import type { UploadFeaturePropsClient } from '../feature.client.js' +import type { UploadData } from '../nodes/UploadNode.js' -import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider' -import { EnabledRelationshipsCondition } from '../../relationship/utils/EnabledRelationshipsCondition' -import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from '../drawer/commands' -import { ExtraFieldsUploadDrawer } from './ExtraFieldsDrawer' +import { useEditorConfigContext } from '../../../lexical/config/client/EditorConfigProvider.js' +import { EnabledRelationshipsCondition } from '../../relationship/utils/EnabledRelationshipsCondition.js' +import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from '../drawer/commands.js' +import { ExtraFieldsUploadDrawer } from './ExtraFieldsDrawer/index.js' import './index.scss' const baseClass = 'lexical-upload' diff --git a/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx b/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx index 62afaf9a0..fdc98a60e 100644 --- a/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx @@ -4,10 +4,10 @@ import { useListDrawer } from '@payloadcms/ui' import { $getNodeByKey, COMMAND_PRIORITY_EDITOR, type LexicalEditor } from 'lexical' import React, { useCallback, useEffect, useState } from 'react' -import { EnabledRelationshipsCondition } from '../../relationship/utils/EnabledRelationshipsCondition' -import { $createUploadNode } from '../nodes/UploadNode' -import { INSERT_UPLOAD_COMMAND } from '../plugin' -import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from './commands' +import { EnabledRelationshipsCondition } from '../../relationship/utils/EnabledRelationshipsCondition.js' +import { $createUploadNode } from '../nodes/UploadNode.js' +import { INSERT_UPLOAD_COMMAND } from '../plugin/index.js' +import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from './commands.js' const baseClass = 'lexical-upload-drawer' diff --git a/packages/richtext-lexical/src/field/features/upload/feature.client.tsx b/packages/richtext-lexical/src/field/features/upload/feature.client.tsx index 68ca40168..032a95e2d 100644 --- a/packages/richtext-lexical/src/field/features/upload/feature.client.tsx +++ b/packages/richtext-lexical/src/field/features/upload/feature.client.tsx @@ -1,13 +1,13 @@ 'use client' -import type { FeatureProviderProviderClient } from '../types' +import type { FeatureProviderProviderClient } from '../types.js' -import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -import { UploadIcon } from '../../lexical/ui/icons/Upload' -import { createClientComponent } from '../createClientComponent' -import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from './drawer/commands' -import { UploadNode } from './nodes/UploadNode' -import { UploadPlugin } from './plugin' +import { SlashMenuOption } from '../../lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +import { UploadIcon } from '../../lexical/ui/icons/Upload/index.js' +import { createClientComponent } from '../createClientComponent.js' +import { INSERT_UPLOAD_WITH_DRAWER_COMMAND } from './drawer/commands.js' +import { UploadNode } from './nodes/UploadNode.js' +import { UploadPlugin } from './plugin/index.js' export type UploadFeaturePropsClient = { collections: { diff --git a/packages/richtext-lexical/src/field/features/upload/feature.server.ts b/packages/richtext-lexical/src/field/features/upload/feature.server.ts index 619c28bf8..787db7479 100644 --- a/packages/richtext-lexical/src/field/features/upload/feature.server.ts +++ b/packages/richtext-lexical/src/field/features/upload/feature.server.ts @@ -1,13 +1,13 @@ import type { Field, Payload } from 'payload/types' -import type { HTMLConverter } from '../converters/html/converter/types' -import type { FeatureProviderProviderServer } from '../types' -import type { UploadFeaturePropsClient } from './feature.client' +import type { HTMLConverter } from '../converters/html/converter/types.js' +import type { FeatureProviderProviderServer } from '../types.js' +import type { UploadFeaturePropsClient } from './feature.client.js' -import { UploadFeatureClientComponent } from './feature.client' -import { type SerializedUploadNode, UploadNode } from './nodes/UploadNode' -import { uploadPopulationPromiseHOC } from './populationPromise' -import { uploadValidation } from './validate' +import { UploadFeatureClientComponent } from './feature.client.js' +import { type SerializedUploadNode, UploadNode } from './nodes/UploadNode.js' +import { uploadPopulationPromiseHOC } from './populationPromise.js' +import { uploadValidation } from './validate.js' export type UploadFeatureProps = { collections: { diff --git a/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx b/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx index aa33c18ae..3521a10dc 100644 --- a/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx +++ b/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx @@ -12,7 +12,7 @@ import { } from 'lexical' import * as React from 'react' -const RawUploadComponent = React.lazy(async () => await import('../component')) +const RawUploadComponent = React.lazy(async () => await import('../component/index.js')) export type RawUploadPayload = { fields: { diff --git a/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx b/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx index 0c45d57e8..8d3329f70 100644 --- a/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx @@ -13,10 +13,10 @@ import { } from 'lexical' import React, { useEffect } from 'react' -import type { RawUploadPayload } from '../nodes/UploadNode' +import type { RawUploadPayload } from '../nodes/UploadNode.js' -import { UploadDrawer } from '../drawer' -import { $createUploadNode, UploadNode } from '../nodes/UploadNode' +import { UploadDrawer } from '../drawer/index.js' +import { $createUploadNode, UploadNode } from '../nodes/UploadNode.js' export type InsertUploadPayload = Readonly diff --git a/packages/richtext-lexical/src/field/features/upload/populationPromise.ts b/packages/richtext-lexical/src/field/features/upload/populationPromise.ts index 90332ab59..16cb3cfe1 100644 --- a/packages/richtext-lexical/src/field/features/upload/populationPromise.ts +++ b/packages/richtext-lexical/src/field/features/upload/populationPromise.ts @@ -1,10 +1,9 @@ -import type { UploadFeatureProps } from '@payloadcms/richtext-lexical' +import type { PopulationPromise } from '../types.js' +import type { UploadFeatureProps } from './feature.server.js' +import type { SerializedUploadNode } from './nodes/UploadNode.js' -import type { PopulationPromise } from '../types' -import type { SerializedUploadNode } from './nodes/UploadNode' - -import { populate } from '../../../populate/populate' -import { recurseNestedFields } from '../../../populate/recurseNestedFields' +import { populate } from '../../../populate/populate.js' +import { recurseNestedFields } from '../../../populate/recurseNestedFields.js' export const uploadPopulationPromiseHOC = ( props?: UploadFeatureProps, diff --git a/packages/richtext-lexical/src/field/features/upload/validate.ts b/packages/richtext-lexical/src/field/features/upload/validate.ts index 5b83c4cc1..1672ec6de 100644 --- a/packages/richtext-lexical/src/field/features/upload/validate.ts +++ b/packages/richtext-lexical/src/field/features/upload/validate.ts @@ -1,10 +1,10 @@ import { fieldAffectsData } from 'payload/types' import { getIDType, isValidID } from 'payload/utilities' -import type { NodeValidation } from '../types' -import type { SerializedUploadNode } from './nodes/UploadNode' +import type { NodeValidation } from '../types.js' +import type { SerializedUploadNode } from './nodes/UploadNode.js' -import { CAN_USE_DOM } from '../../lexical/utils/canUseDOM' +import { CAN_USE_DOM } from '../../lexical/utils/canUseDOM.js' export const uploadValidation = (): NodeValidation => { const uploadValidation: NodeValidation = ({ diff --git a/packages/richtext-lexical/src/field/index.tsx b/packages/richtext-lexical/src/field/index.tsx index a1e738581..fed20f848 100644 --- a/packages/richtext-lexical/src/field/index.tsx +++ b/packages/richtext-lexical/src/field/index.tsx @@ -6,15 +6,15 @@ import { useFieldPath } from '@payloadcms/ui/forms' import { useClientFunctions } from '@payloadcms/ui/providers' import React, { Suspense, lazy, useEffect, useState } from 'react' -import type { GeneratedFeatureProviderComponent } from '../types' -import type { FeatureProviderClient } from './features/types' -import type { SanitizedClientEditorConfig } from './lexical/config/types' +import type { GeneratedFeatureProviderComponent } from '../types.js' +import type { FeatureProviderClient } from './features/types.js' +import type { SanitizedClientEditorConfig } from './lexical/config/types.js' -import { defaultEditorLexicalConfig } from './lexical/config/client/default' -import { loadClientFeatures } from './lexical/config/client/loader' -import { sanitizeClientEditorConfig } from './lexical/config/client/sanitize' +import { defaultEditorLexicalConfig } from './lexical/config/client/default.js' +import { loadClientFeatures } from './lexical/config/client/loader.js' +import { sanitizeClientEditorConfig } from './lexical/config/client/sanitize.js' -const RichTextEditor = lazy(() => import('./Field')) +const RichTextEditor = lazy(() => import('./Field.js')) export const RichTextField: React.FC< FormFieldBase & { diff --git a/packages/richtext-lexical/src/field/lexical/EditorPlugin.tsx b/packages/richtext-lexical/src/field/lexical/EditorPlugin.tsx index df5a11721..bbd880310 100644 --- a/packages/richtext-lexical/src/field/lexical/EditorPlugin.tsx +++ b/packages/richtext-lexical/src/field/lexical/EditorPlugin.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import type { SanitizedPlugin } from '../features/types' +import type { SanitizedPlugin } from '../features/types.js' export const EditorPlugin: React.FC<{ anchorElem?: HTMLDivElement diff --git a/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx b/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx index 61d2787c3..38399745a 100644 --- a/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx +++ b/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx @@ -8,16 +8,16 @@ import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin import * as React from 'react' import { useEffect, useState } from 'react' -import type { LexicalProviderProps } from './LexicalProvider' +import type { LexicalProviderProps } from './LexicalProvider.js' -import { EditorPlugin } from './EditorPlugin' +import { EditorPlugin } from './EditorPlugin.js' import './LexicalEditor.scss' -import { FloatingSelectToolbarPlugin } from './plugins/FloatingSelectToolbar' -import { MarkdownShortcutPlugin } from './plugins/MarkdownShortcut' -import { SlashMenuPlugin } from './plugins/SlashMenu' -import { AddBlockHandlePlugin } from './plugins/handles/AddBlockHandlePlugin' -import { DraggableBlockPlugin } from './plugins/handles/DraggableBlockPlugin' -import { LexicalContentEditable } from './ui/ContentEditable' +import { FloatingSelectToolbarPlugin } from './plugins/FloatingSelectToolbar/index.js' +import { MarkdownShortcutPlugin } from './plugins/MarkdownShortcut/index.js' +import { SlashMenuPlugin } from './plugins/SlashMenu/index.js' +import { AddBlockHandlePlugin } from './plugins/handles/AddBlockHandlePlugin/index.js' +import { DraggableBlockPlugin } from './plugins/handles/DraggableBlockPlugin/index.js' +import { LexicalContentEditable } from './ui/ContentEditable.js' export const LexicalEditor: React.FC> = ( props, diff --git a/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx b/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx index e70c51cf9..17c055bf4 100644 --- a/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx +++ b/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx @@ -7,11 +7,11 @@ import type { LexicalEditor } from 'lexical' import { LexicalComposer } from '@lexical/react/LexicalComposer' import * as React from 'react' -import type { SanitizedClientEditorConfig } from './config/types' +import type { SanitizedClientEditorConfig } from './config/types.js' -import { LexicalEditor as LexicalEditorComponent } from './LexicalEditor' -import { EditorConfigProvider } from './config/client/EditorConfigProvider' -import { getEnabledNodes } from './nodes' +import { LexicalEditor as LexicalEditorComponent } from './LexicalEditor.js' +import { EditorConfigProvider } from './config/client/EditorConfigProvider.js' +import { getEnabledNodes } from './nodes/index.js' export type LexicalProviderProps = { editorConfig: SanitizedClientEditorConfig diff --git a/packages/richtext-lexical/src/field/lexical/config/client/EditorConfigProvider.tsx b/packages/richtext-lexical/src/field/lexical/config/client/EditorConfigProvider.tsx index 044dca187..c4c92a8a9 100644 --- a/packages/richtext-lexical/src/field/lexical/config/client/EditorConfigProvider.tsx +++ b/packages/richtext-lexical/src/field/lexical/config/client/EditorConfigProvider.tsx @@ -4,8 +4,7 @@ import type { FormFieldBase } from '@payloadcms/ui' import * as React from 'react' import { createContext, useContext, useEffect, useMemo, useState } from 'react' -import type { FieldProps } from '../../../../types' -import type { SanitizedClientEditorConfig } from '../types' +import type { SanitizedClientEditorConfig } from '../types.js' // Should always produce a 20 character pseudo-random string function generateQuickGuid(): string { diff --git a/packages/richtext-lexical/src/field/lexical/config/client/default.ts b/packages/richtext-lexical/src/field/lexical/config/client/default.ts index 5e54ce822..772c6be55 100644 --- a/packages/richtext-lexical/src/field/lexical/config/client/default.ts +++ b/packages/richtext-lexical/src/field/lexical/config/client/default.ts @@ -1,7 +1,7 @@ 'use client' import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' -import { LexicalEditorTheme } from '../../theme/EditorTheme' +import { LexicalEditorTheme } from '../../theme/EditorTheme.js' export const defaultEditorLexicalConfig: LexicalEditorConfig = { namespace: 'lexical', diff --git a/packages/richtext-lexical/src/field/lexical/config/client/loader.ts b/packages/richtext-lexical/src/field/lexical/config/client/loader.ts index 885020551..a58c81f2a 100644 --- a/packages/richtext-lexical/src/field/lexical/config/client/loader.ts +++ b/packages/richtext-lexical/src/field/lexical/config/client/loader.ts @@ -1,11 +1,11 @@ 'use client' import type { - ClientEditorConfig, ClientFeatureProviderMap, FeatureProviderClient, ResolvedClientFeatureMap, -} from '@payloadcms/richtext-lexical' +} from '../../../features/types.js' +import type { ClientEditorConfig } from '../types.js' /** * This function expects client functions to ALREADY be ordered & dependencies checked on the server diff --git a/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts b/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts index 06d00a1de..894ff0bc9 100644 --- a/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts +++ b/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts @@ -2,8 +2,8 @@ import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' -import type { ResolvedClientFeatureMap, SanitizedClientFeatures } from '../../../features/types' -import type { SanitizedClientEditorConfig } from '../types' +import type { ResolvedClientFeatureMap, SanitizedClientFeatures } from '../../../features/types.js' +import type { SanitizedClientEditorConfig } from '../types.js' export const sanitizeClientFeatures = ( features: ResolvedClientFeatureMap, diff --git a/packages/richtext-lexical/src/field/lexical/config/server/default.ts b/packages/richtext-lexical/src/field/lexical/config/server/default.ts index 4d0631f70..327a8a11d 100644 --- a/packages/richtext-lexical/src/field/lexical/config/server/default.ts +++ b/packages/richtext-lexical/src/field/lexical/config/server/default.ts @@ -1,28 +1,28 @@ import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' -import type { FeatureProviderServer } from '../../../features/types' -import type { SanitizedServerEditorConfig, ServerEditorConfig } from '../types' +import type { FeatureProviderServer } from '../../../features/types.js' +import type { SanitizedServerEditorConfig, ServerEditorConfig } from '../types.js' -import { AlignFeature } from '../../../features/align/feature.server' -import { BlockQuoteFeature } from '../../../features/blockquote/feature.server' -import { BoldFeature } from '../../../features/format/bold/feature.server' -import { InlineCodeFeature } from '../../../features/format/inlinecode/feature.server' -import { ItalicFeature } from '../../../features/format/italic/feature.server' -import { StrikethroughFeature } from '../../../features/format/strikethrough/feature.server' -import { SubscriptFeature } from '../../../features/format/subscript/feature.server' -import { SuperscriptFeature } from '../../../features/format/superscript/feature.server' -import { UnderlineFeature } from '../../../features/format/underline/feature.server' -import { HeadingFeature } from '../../../features/heading/feature.server' -import { IndentFeature } from '../../../features/indent/feature.server' -import { LinkFeature } from '../../../features/link/feature.server' -import { CheckListFeature } from '../../../features/lists/checklist/feature.server' -import { OrderedListFeature } from '../../../features/lists/orderedlist/feature.server' -import { UnorderedListFeature } from '../../../features/lists/unorderedlist/feature.server' -import { ParagraphFeature } from '../../../features/paragraph/feature.server' -import { RelationshipFeature } from '../../../features/relationship/feature.server' -import { UploadFeature } from '../../../features/upload/feature.server' -import { LexicalEditorTheme } from '../../theme/EditorTheme' -import { sanitizeServerEditorConfig } from './sanitize' +import { AlignFeature } from '../../../features/align/feature.server.js' +import { BlockQuoteFeature } from '../../../features/blockquote/feature.server.js' +import { BoldFeature } from '../../../features/format/bold/feature.server.js' +import { InlineCodeFeature } from '../../../features/format/inlinecode/feature.server.js' +import { ItalicFeature } from '../../../features/format/italic/feature.server.js' +import { StrikethroughFeature } from '../../../features/format/strikethrough/feature.server.js' +import { SubscriptFeature } from '../../../features/format/subscript/feature.server.js' +import { SuperscriptFeature } from '../../../features/format/superscript/feature.server.js' +import { UnderlineFeature } from '../../../features/format/underline/feature.server.js' +import { HeadingFeature } from '../../../features/heading/feature.server.js' +import { IndentFeature } from '../../../features/indent/feature.server.js' +import { LinkFeature } from '../../../features/link/feature.server.js' +import { CheckListFeature } from '../../../features/lists/checklist/feature.server.js' +import { OrderedListFeature } from '../../../features/lists/orderedlist/feature.server.js' +import { UnorderedListFeature } from '../../../features/lists/unorderedlist/feature.server.js' +import { ParagraphFeature } from '../../../features/paragraph/feature.server.js' +import { RelationshipFeature } from '../../../features/relationship/feature.server.js' +import { UploadFeature } from '../../../features/upload/feature.server.js' +import { LexicalEditorTheme } from '../../theme/EditorTheme.js' +import { sanitizeServerEditorConfig } from './sanitize.js' export const defaultEditorLexicalConfig: LexicalEditorConfig = { namespace: 'lexical', diff --git a/packages/richtext-lexical/src/field/lexical/config/server/loader.ts b/packages/richtext-lexical/src/field/lexical/config/server/loader.ts index 4ff19a0e5..84a3c0543 100644 --- a/packages/richtext-lexical/src/field/lexical/config/server/loader.ts +++ b/packages/richtext-lexical/src/field/lexical/config/server/loader.ts @@ -2,8 +2,8 @@ import type { FeatureProviderServer, ResolvedServerFeatureMap, ServerFeatureProviderMap, -} from '../../../features/types' -import type { ServerEditorConfig } from '../types' +} from '../../../features/types.js' +import type { ServerEditorConfig } from '../types.js' type DependencyGraph = { [key: string]: { diff --git a/packages/richtext-lexical/src/field/lexical/config/server/sanitize.ts b/packages/richtext-lexical/src/field/lexical/config/server/sanitize.ts index 1fa22b0e8..9c0cf28af 100644 --- a/packages/richtext-lexical/src/field/lexical/config/server/sanitize.ts +++ b/packages/richtext-lexical/src/field/lexical/config/server/sanitize.ts @@ -1,7 +1,7 @@ -import type { ResolvedServerFeatureMap, SanitizedServerFeatures } from '../../../features/types' -import type { SanitizedServerEditorConfig, ServerEditorConfig } from '../types' +import type { ResolvedServerFeatureMap, SanitizedServerFeatures } from '../../../features/types.js' +import type { SanitizedServerEditorConfig, ServerEditorConfig } from '../types.js' -import { loadFeatures } from './loader' +import { loadFeatures } from './loader.js' export const sanitizeServerFeatures = ( features: ResolvedServerFeatureMap, diff --git a/packages/richtext-lexical/src/field/lexical/config/types.ts b/packages/richtext-lexical/src/field/lexical/config/types.ts index dc29bb59b..3b9cab757 100644 --- a/packages/richtext-lexical/src/field/lexical/config/types.ts +++ b/packages/richtext-lexical/src/field/lexical/config/types.ts @@ -7,7 +7,7 @@ import type { ResolvedServerFeatureMap, SanitizedClientFeatures, SanitizedServerFeatures, -} from '../../features/types' +} from '../../features/types.js' export type ServerEditorConfig = { features: FeatureProviderServer[] diff --git a/packages/richtext-lexical/src/field/lexical/nodes/index.ts b/packages/richtext-lexical/src/field/lexical/nodes/index.ts index 4503cb883..e2b53799b 100644 --- a/packages/richtext-lexical/src/field/lexical/nodes/index.ts +++ b/packages/richtext-lexical/src/field/lexical/nodes/index.ts @@ -1,7 +1,7 @@ import type { Klass, LexicalNode } from 'lexical' import type { LexicalNodeReplacement } from 'lexical' -import type { SanitizedClientEditorConfig, SanitizedServerEditorConfig } from '../config/types' +import type { SanitizedClientEditorConfig, SanitizedServerEditorConfig } from '../config/types.js' export function getEnabledNodes({ editorConfig, diff --git a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx index e6ffd0814..6c1fc7233 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx @@ -4,7 +4,7 @@ import { mergeRegister } from '@lexical/utils' import { $getSelection } from 'lexical' import React, { useCallback, useEffect, useState } from 'react' -import type { FloatingToolbarSectionEntry } from '../types' +import type { FloatingToolbarSectionEntry } from '../types.js' import './index.scss' diff --git a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/DropDown.tsx b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/DropDown.tsx index 976f8d5cf..cbff63dd6 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/DropDown.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/DropDown.tsx @@ -6,7 +6,7 @@ import { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } fro import React from 'react' import { createPortal } from 'react-dom' -import type { FloatingToolbarSectionEntry } from '../types' +import type { FloatingToolbarSectionEntry } from '../types.js' const baseClass = 'floating-select-toolbar-popup__dropdown-item' diff --git a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/index.tsx index bf87ccdec..29618bf43 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarDropdown/index.tsx @@ -5,9 +5,9 @@ const baseClass = 'floating-select-toolbar-popup__dropdown' import type { LexicalEditor } from 'lexical' -import type { FloatingToolbarSectionEntry } from '../types' +import type { FloatingToolbarSectionEntry } from '../types.js' -import { DropDown, DropDownItem } from './DropDown' +import { DropDown, DropDownItem } from './DropDown.js' import './index.scss' export const ToolbarEntry = ({ diff --git a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/index.tsx index 8da44111a..cda02031a 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/index.tsx @@ -14,13 +14,13 @@ import { useCallback, useEffect, useRef, useState } from 'react' import * as React from 'react' import { createPortal } from 'react-dom' -import type { FloatingToolbarSection, FloatingToolbarSectionEntry } from './types' +import type { FloatingToolbarSection, FloatingToolbarSectionEntry } from './types.js' -import { useEditorConfigContext } from '../../config/client/EditorConfigProvider' -import { getDOMRangeRect } from '../../utils/getDOMRangeRect' -import { setFloatingElemPosition } from '../../utils/setFloatingElemPosition' -import { ToolbarButton } from './ToolbarButton' -import { ToolbarDropdown } from './ToolbarDropdown' +import { useEditorConfigContext } from '../../config/client/EditorConfigProvider.js' +import { getDOMRangeRect } from '../../utils/getDOMRangeRect.js' +import { setFloatingElemPosition } from '../../utils/setFloatingElemPosition.js' +import { ToolbarButton } from './ToolbarButton/index.js' +import { ToolbarDropdown } from './ToolbarDropdown/index.js' import './index.scss' function ButtonSectionEntry({ diff --git a/packages/richtext-lexical/src/field/lexical/plugins/MarkdownShortcut/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/MarkdownShortcut/index.tsx index 5eaf4fffa..ad9022aad 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/MarkdownShortcut/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/MarkdownShortcut/index.tsx @@ -2,7 +2,7 @@ import { MarkdownShortcutPlugin as LexicalMarkdownShortcutPlugin } from '@lexical/react/LexicalMarkdownShortcutPlugin' import * as React from 'react' -import { useEditorConfigContext } from '../../config/client/EditorConfigProvider' +import { useEditorConfigContext } from '../../config/client/EditorConfigProvider.js' export const MarkdownShortcutPlugin: React.FC = () => { const { editorConfig } = useEditorConfigContext() diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx index ad44b3d75..a1d59fb16 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx @@ -17,9 +17,8 @@ import { } from 'lexical' import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' -import type { MenuTextMatch } from '../useMenuTriggerMatch' -import type { SlashMenuOption } from './types' -import type { SlashMenuGroup } from './types' +import type { MenuTextMatch } from '../useMenuTriggerMatch.js' +import type { SlashMenuGroup, SlashMenuOption } from './types.js' export type MenuResolution = { getRect: () => DOMRect diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx index 6ce2e84b4..47969d23e 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx @@ -19,11 +19,11 @@ import { import { useCallback, useEffect, useState } from 'react' import * as React from 'react' -import type { MenuTextMatch, TriggerFn } from '../useMenuTriggerMatch' -import type { MenuRenderFn, MenuResolution } from './LexicalMenu' -import type { SlashMenuGroup, SlashMenuOption } from './types' +import type { MenuTextMatch, TriggerFn } from '../useMenuTriggerMatch.js' +import type { MenuRenderFn, MenuResolution } from './LexicalMenu.js' +import type { SlashMenuGroup, SlashMenuOption } from './types.js' -import { LexicalMenu, useMenuAnchorRef } from './LexicalMenu' +import { LexicalMenu, useMenuAnchorRef } from './LexicalMenu.js' export const PUNCTUATION = '\\.,\\+\\*\\?\\$\\@\\|#{}\\(\\)\\^\\-\\[\\]\\\\/!%\'"~=<>_:;' diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx index 33d256b4b..8f6b2c9fc 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/index.tsx @@ -7,12 +7,12 @@ import { useCallback, useMemo, useState } from 'react' import * as React from 'react' import * as ReactDOM from 'react-dom' -import type { SlashMenuGroup, SlashMenuOption } from './LexicalTypeaheadMenuPlugin/types' +import type { SlashMenuGroup, SlashMenuOption } from './LexicalTypeaheadMenuPlugin/types.js' -import { useEditorConfigContext } from '../../config/client/EditorConfigProvider' -import { LexicalTypeaheadMenuPlugin } from './LexicalTypeaheadMenuPlugin' +import { useEditorConfigContext } from '../../config/client/EditorConfigProvider.js' +import { LexicalTypeaheadMenuPlugin } from './LexicalTypeaheadMenuPlugin/index.js' import './index.scss' -import { useMenuTriggerMatch } from './useMenuTriggerMatch' +import { useMenuTriggerMatch } from './useMenuTriggerMatch.js' const baseClass = 'slash-menu-popup' diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/useMenuTriggerMatch.ts b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/useMenuTriggerMatch.ts index cce9ee7fe..9f65d0824 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/useMenuTriggerMatch.ts +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/useMenuTriggerMatch.ts @@ -2,7 +2,7 @@ import type { LexicalEditor } from 'lexical' import { useCallback } from 'react' -import { PUNCTUATION } from './LexicalTypeaheadMenuPlugin' +import { PUNCTUATION } from './LexicalTypeaheadMenuPlugin/index.js' export type TriggerFn = ({ editor, diff --git a/packages/richtext-lexical/src/field/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx index effbce55a..d52777652 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx @@ -8,14 +8,14 @@ import * as React from 'react' import { useCallback, useEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' -import { isHTMLElement } from '../../../utils/guard' -import { Point } from '../../../utils/point' -import { Rect } from '../../../utils/rect' -import { ENABLE_SLASH_MENU_COMMAND } from '../../SlashMenu/LexicalTypeaheadMenuPlugin' -import { getCollapsedMargins } from '../utils/getCollapsedMargins' -import { getTopLevelNodeKeys } from '../utils/getTopLevelNodeKeys' -import { isOnHandleElement } from '../utils/isOnHandleElement' -import { setHandlePosition } from '../utils/setHandlePosition' +import { isHTMLElement } from '../../../utils/guard.js' +import { Point } from '../../../utils/point.js' +import { Rect } from '../../../utils/rect.js' +import { ENABLE_SLASH_MENU_COMMAND } from '../../SlashMenu/LexicalTypeaheadMenuPlugin/index.js' +import { getCollapsedMargins } from '../utils/getCollapsedMargins.js' +import { getTopLevelNodeKeys } from '../utils/getTopLevelNodeKeys.js' +import { isOnHandleElement } from '../utils/isOnHandleElement.js' +import { setHandlePosition } from '../utils/setHandlePosition.js' import './index.scss' const SPACE = -24 diff --git a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/getNodeCloseToPoint.ts b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/getNodeCloseToPoint.ts index a37e4e5e4..b625e1b64 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/getNodeCloseToPoint.ts +++ b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/getNodeCloseToPoint.ts @@ -2,11 +2,11 @@ import type { LexicalEditor, LexicalNode } from 'lexical' import { $getNodeByKey } from 'lexical' -import { Point } from '../../../utils/point' -import { Rect } from '../../../utils/rect' -import { getCollapsedMargins } from '../utils/getCollapsedMargins' -import { getTopLevelNodeKeys } from '../utils/getTopLevelNodeKeys' -import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform' +import { Point } from '../../../utils/point.js' +import { Rect } from '../../../utils/rect.js' +import { getCollapsedMargins } from '../utils/getCollapsedMargins.js' +import { getTopLevelNodeKeys } from '../utils/getTopLevelNodeKeys.js' +import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform.js' // Directions const Downward = 1 diff --git a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/highlightElemOriginalPosition.ts b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/highlightElemOriginalPosition.ts index 1a5819cc7..bb878a6e3 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/highlightElemOriginalPosition.ts +++ b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/highlightElemOriginalPosition.ts @@ -1,6 +1,6 @@ import type React from 'react' -import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform' +import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform.js' export function highlightElemOriginalPosition( debugHighlightRef: React.RefObject, diff --git a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/index.tsx index 63814a687..8dbce7a49 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/index.tsx @@ -9,15 +9,15 @@ import * as React from 'react' import { useCallback, useEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' -import { isHTMLElement } from '../../../utils/guard' -import { Point } from '../../../utils/point' -import { getTopLevelNodeKeys } from '../utils/getTopLevelNodeKeys' -import { isOnHandleElement } from '../utils/isOnHandleElement' -import { setHandlePosition } from '../utils/setHandlePosition' -import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform' -import { getNodeCloseToPoint } from './getNodeCloseToPoint' +import { isHTMLElement } from '../../../utils/guard.js' +import { Point } from '../../../utils/point.js' +import { getTopLevelNodeKeys } from '../utils/getTopLevelNodeKeys.js' +import { isOnHandleElement } from '../utils/isOnHandleElement.js' +import { setHandlePosition } from '../utils/setHandlePosition.js' +import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform.js' +import { getNodeCloseToPoint } from './getNodeCloseToPoint.js' import './index.scss' -import { setTargetLine } from './setTargetLine' +import { setTargetLine } from './setTargetLine.js' const SPACE = -24 const DRAGGABLE_BLOCK_MENU_CLASSNAME = 'draggable-block-menu' diff --git a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/setTargetLine.ts b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/setTargetLine.ts index 34a4cb7d2..d60e28087 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/setTargetLine.ts +++ b/packages/richtext-lexical/src/field/lexical/plugins/handles/DraggableBlockPlugin/setTargetLine.ts @@ -1,6 +1,6 @@ -import { getCollapsedMargins } from '../utils/getCollapsedMargins' -import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform' -import { highlightElemOriginalPosition } from './highlightElemOriginalPosition' +import { getCollapsedMargins } from '../utils/getCollapsedMargins.js' +import { getBoundingClientRectWithoutTransform } from './getBoundingRectWithoutTransform.js' +import { highlightElemOriginalPosition } from './highlightElemOriginalPosition.js' const TARGET_LINE_HALF_HEIGHT = 25 const TEXT_BOX_HORIZONTAL_PADDING = -24 const DEBUG = false diff --git a/packages/richtext-lexical/src/field/lexical/utils/environment.ts b/packages/richtext-lexical/src/field/lexical/utils/environment.ts index a3da0aef9..375ff3067 100644 --- a/packages/richtext-lexical/src/field/lexical/utils/environment.ts +++ b/packages/richtext-lexical/src/field/lexical/utils/environment.ts @@ -1,4 +1,4 @@ -import { CAN_USE_DOM } from './canUseDOM' +import { CAN_USE_DOM } from './canUseDOM.js' declare global { interface Document { diff --git a/packages/richtext-lexical/src/field/lexical/utils/rect.ts b/packages/richtext-lexical/src/field/lexical/utils/rect.ts index 8e3f1208c..9cc1aff55 100644 --- a/packages/richtext-lexical/src/field/lexical/utils/rect.ts +++ b/packages/richtext-lexical/src/field/lexical/utils/rect.ts @@ -1,4 +1,4 @@ -import { type Point, isPoint } from './point' +import { type Point, isPoint } from './point.js' interface ContainsPointReturn { reason: { diff --git a/packages/richtext-lexical/src/generateSchemaMap.ts b/packages/richtext-lexical/src/generateSchemaMap.ts index 85355007e..86f57a51b 100644 --- a/packages/richtext-lexical/src/generateSchemaMap.ts +++ b/packages/richtext-lexical/src/generateSchemaMap.ts @@ -2,7 +2,7 @@ import type { RichTextAdapter } from 'payload/types' import { sanitizeFields } from 'payload/config' -import type { ResolvedServerFeatureMap } from './field/features/types' +import type { ResolvedServerFeatureMap } from './field/features/types.js' export const getGenerateSchemaMap = (args: { resolvedFeatureMap: ResolvedServerFeatureMap }): RichTextAdapter['generateSchemaMap'] => diff --git a/packages/richtext-lexical/src/index.ts b/packages/richtext-lexical/src/index.ts index 17370d972..089afb98a 100644 --- a/packages/richtext-lexical/src/index.ts +++ b/packages/richtext-lexical/src/index.ts @@ -5,22 +5,22 @@ import type { RichTextAdapter } from 'payload/types' import { withNullableJSONSchemaType } from 'payload/utilities' -import type { FeatureProviderServer, ResolvedServerFeatureMap } from './field/features/types' -import type { SanitizedServerEditorConfig } from './field/lexical/config/types' -import type { AdapterProps } from './types' +import type { FeatureProviderServer, ResolvedServerFeatureMap } from './field/features/types.js' +import type { SanitizedServerEditorConfig } from './field/lexical/config/types.js' +import type { AdapterProps } from './types.js' import { defaultEditorConfig, defaultEditorFeatures, defaultSanitizedServerEditorConfig, -} from './field/lexical/config/server/default' -import { loadFeatures } from './field/lexical/config/server/loader' -import { sanitizeServerFeatures } from './field/lexical/config/server/sanitize' -import { cloneDeep } from './field/lexical/utils/cloneDeep' -import { getGenerateComponentMap } from './generateComponentMap' -import { getGenerateSchemaMap } from './generateSchemaMap' -import { richTextRelationshipPromise } from './populate/richTextRelationshipPromise' -import { richTextValidateHOC } from './validate' +} from './field/lexical/config/server/default.js' +import { loadFeatures } from './field/lexical/config/server/loader.js' +import { sanitizeServerFeatures } from './field/lexical/config/server/sanitize.js' +import { cloneDeep } from './field/lexical/utils/cloneDeep.js' +import { getGenerateComponentMap } from './generateComponentMap.js' +import { getGenerateSchemaMap } from './generateSchemaMap.js' +import { richTextRelationshipPromise } from './populate/richTextRelationshipPromise.js' +import { richTextValidateHOC } from './validate/index.js' export type LexicalEditorProps = { features?: @@ -231,101 +231,101 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte } } -export { AlignFeature } from './field/features/align/feature.server' -export { BlockQuoteFeature } from './field/features/blockquote/feature.server' -export { BlocksFeature, type BlocksFeatureProps } from './field/features/blocks/feature.server' +export { AlignFeature } from './field/features/align/feature.server.js' +export { BlockQuoteFeature } from './field/features/blockquote/feature.server.js' +export { BlocksFeature, type BlocksFeatureProps } from './field/features/blocks/feature.server.js' export { $createBlockNode, $isBlockNode, type BlockFields, BlockNode, type SerializedBlockNode, -} from './field/features/blocks/nodes/BlocksNode' +} from './field/features/blocks/nodes/BlocksNode.js' -export { TextDropdownSectionWithEntries } from './field/features/common/floatingSelectToolbarTextDropdownSection' +export { TextDropdownSectionWithEntries } from './field/features/common/floatingSelectToolbarTextDropdownSection/index.js' +export { LinebreakHTMLConverter } from './field/features/converters/html/converter/converters/linebreak.js' +export { ParagraphHTMLConverter } from './field/features/converters/html/converter/converters/paragraph.js' + +export { TextHTMLConverter } from './field/features/converters/html/converter/converters/text.js' +export { defaultHTMLConverters } from './field/features/converters/html/converter/defaultConverters.js' export { convertLexicalNodesToHTML, convertLexicalToHTML, -} from './field/features/converters/html/converter' -export { LinebreakHTMLConverter } from './field/features/converters/html/converter/converters/linebreak' - -export { ParagraphHTMLConverter } from './field/features/converters/html/converter/converters/paragraph' -export { TextHTMLConverter } from './field/features/converters/html/converter/converters/text' -export { defaultHTMLConverters } from './field/features/converters/html/converter/defaultConverters' -export type { HTMLConverter } from './field/features/converters/html/converter/types' +} from './field/features/converters/html/converter/index.js' +export type { HTMLConverter } from './field/features/converters/html/converter/types.js' export { HTMLConverterFeature, type HTMLConverterFeatureProps, -} from './field/features/converters/html/feature.server' -export { consolidateHTMLConverters } from './field/features/converters/html/field' -export { lexicalHTML } from './field/features/converters/html/field' -export { createClientComponent } from './field/features/createClientComponent' -export { TestRecorderFeature } from './field/features/debug/testrecorder/feature.server' -export { TreeViewFeature } from './field/features/debug/treeview/feature.server' -export { BoldFeature } from './field/features/format/bold/feature.server' -export { SectionWithEntries as FormatSectionWithEntries } from './field/features/format/common/floatingSelectToolbarSection' -export { InlineCodeFeature } from './field/features/format/inlinecode/feature.server' -export { ItalicFeature } from './field/features/format/italic/feature.server' -export { StrikethroughFeature } from './field/features/format/strikethrough/feature.server' -export { SubscriptFeature } from './field/features/format/subscript/feature.server' -export { SuperscriptFeature } from './field/features/format/superscript/feature.server' -export { UnderlineFeature } from './field/features/format/underline/feature.server' +} from './field/features/converters/html/feature.server.js' +export { consolidateHTMLConverters } from './field/features/converters/html/field/index.js' +export { lexicalHTML } from './field/features/converters/html/field/index.js' +export { createClientComponent } from './field/features/createClientComponent.js' +export { TestRecorderFeature } from './field/features/debug/testrecorder/feature.server.js' +export { TreeViewFeature } from './field/features/debug/treeview/feature.server.js' +export { BoldFeature } from './field/features/format/bold/feature.server.js' +export { SectionWithEntries as FormatSectionWithEntries } from './field/features/format/common/floatingSelectToolbarSection.js' +export { InlineCodeFeature } from './field/features/format/inlinecode/feature.server.js' +export { ItalicFeature } from './field/features/format/italic/feature.server.js' +export { StrikethroughFeature } from './field/features/format/strikethrough/feature.server.js' +export { SubscriptFeature } from './field/features/format/subscript/feature.server.js' +export { SuperscriptFeature } from './field/features/format/superscript/feature.server.js' +export { UnderlineFeature } from './field/features/format/underline/feature.server.js' -export { HeadingFeature } from './field/features/heading/feature.server' -export { IndentFeature } from './field/features/indent/feature.server' +export { HeadingFeature } from './field/features/heading/feature.server.js' +export { IndentFeature } from './field/features/indent/feature.server.js' -export { LinkFeature, type LinkFeatureServerProps } from './field/features/link/feature.server' +export { LinkFeature, type LinkFeatureServerProps } from './field/features/link/feature.server.js' export { $createAutoLinkNode, $isAutoLinkNode, AutoLinkNode, -} from './field/features/link/nodes/AutoLinkNode' +} from './field/features/link/nodes/AutoLinkNode.js' export { $createLinkNode, $isLinkNode, LinkNode, TOGGLE_LINK_COMMAND, -} from './field/features/link/nodes/LinkNode' +} from './field/features/link/nodes/LinkNode.js' export type { LinkFields, SerializedAutoLinkNode, SerializedLinkNode, -} from './field/features/link/nodes/types' -export { CheckListFeature } from './field/features/lists/checklist/feature.server' -export { OrderedListFeature } from './field/features/lists/orderedlist/feature.server' -export { UnorderedListFeature } from './field/features/lists/unorderedlist/feature.server' -export { LexicalPluginToLexicalFeature } from './field/features/migrations/lexicalPluginToLexical/feature.server' -export { SlateBlockquoteConverter } from './field/features/migrations/slateToLexical/converter/converters/blockquote' -export { SlateHeadingConverter } from './field/features/migrations/slateToLexical/converter/converters/heading' -export { SlateIndentConverter } from './field/features/migrations/slateToLexical/converter/converters/indent' -export { SlateLinkConverter } from './field/features/migrations/slateToLexical/converter/converters/link' -export { SlateListItemConverter } from './field/features/migrations/slateToLexical/converter/converters/listItem' -export { SlateOrderedListConverter } from './field/features/migrations/slateToLexical/converter/converters/orderedList' -export { SlateRelationshipConverter } from './field/features/migrations/slateToLexical/converter/converters/relationship' -export { SlateUnknownConverter } from './field/features/migrations/slateToLexical/converter/converters/unknown' -export { SlateUnorderedListConverter } from './field/features/migrations/slateToLexical/converter/converters/unorderedList' +} from './field/features/link/nodes/types.js' +export { CheckListFeature } from './field/features/lists/checklist/feature.server.js' +export { OrderedListFeature } from './field/features/lists/orderedlist/feature.server.js' +export { UnorderedListFeature } from './field/features/lists/unorderedlist/feature.server.js' +export { LexicalPluginToLexicalFeature } from './field/features/migrations/lexicalPluginToLexical/feature.server.js' +export { SlateBlockquoteConverter } from './field/features/migrations/slateToLexical/converter/converters/blockquote/index.js' +export { SlateHeadingConverter } from './field/features/migrations/slateToLexical/converter/converters/heading/index.js' +export { SlateIndentConverter } from './field/features/migrations/slateToLexical/converter/converters/indent/index.js' +export { SlateLinkConverter } from './field/features/migrations/slateToLexical/converter/converters/link/index.js' +export { SlateListItemConverter } from './field/features/migrations/slateToLexical/converter/converters/listItem/index.js' +export { SlateOrderedListConverter } from './field/features/migrations/slateToLexical/converter/converters/orderedList/index.js' +export { SlateRelationshipConverter } from './field/features/migrations/slateToLexical/converter/converters/relationship/index.js' +export { SlateUnknownConverter } from './field/features/migrations/slateToLexical/converter/converters/unknown/index.js' +export { SlateUnorderedListConverter } from './field/features/migrations/slateToLexical/converter/converters/unorderedList/index.js' -export { SlateUploadConverter } from './field/features/migrations/slateToLexical/converter/converters/upload' -export { defaultSlateConverters } from './field/features/migrations/slateToLexical/converter/defaultConverters' +export { SlateUploadConverter } from './field/features/migrations/slateToLexical/converter/converters/upload/index.js' +export { defaultSlateConverters } from './field/features/migrations/slateToLexical/converter/defaultConverters.js' export { convertSlateNodesToLexical, convertSlateToLexical, -} from './field/features/migrations/slateToLexical/converter/index' +} from './field/features/migrations/slateToLexical/converter/index.js' export type { SlateNode, SlateNodeConverter, -} from './field/features/migrations/slateToLexical/converter/types' -export { SlateToLexicalFeature } from './field/features/migrations/slateToLexical/feature.server' -export { ParagraphFeature } from './field/features/paragraph/feature.server' -export { RelationshipFeature } from './field/features/relationship/feature.server' +} from './field/features/migrations/slateToLexical/converter/types.js' +export { SlateToLexicalFeature } from './field/features/migrations/slateToLexical/feature.server.js' +export { ParagraphFeature } from './field/features/paragraph/feature.server.js' +export { RelationshipFeature } from './field/features/relationship/feature.server.js' export { $createRelationshipNode, $isRelationshipNode, type RelationshipData, RelationshipNode, type SerializedRelationshipNode, -} from './field/features/relationship/nodes/RelationshipNode' +} from './field/features/relationship/nodes/RelationshipNode.js' export type { ClientFeature, ClientFeatureProviderMap, @@ -344,12 +344,12 @@ export type { SanitizedServerFeatures, ServerFeature, ServerFeatureProviderMap, -} from './field/features/types' -export { UploadFeature } from './field/features/upload/feature.server' +} from './field/features/types.js' +export { UploadFeature } from './field/features/upload/feature.server.js' -export type { UploadFeatureProps } from './field/features/upload/feature.server' +export type { UploadFeatureProps } from './field/features/upload/feature.server.js' -export type { RawUploadPayload } from './field/features/upload/nodes/UploadNode' +export type { RawUploadPayload } from './field/features/upload/nodes/UploadNode.js' export { $createUploadNode, @@ -357,54 +357,57 @@ export { type SerializedUploadNode, type UploadData, UploadNode, -} from './field/features/upload/nodes/UploadNode' +} from './field/features/upload/nodes/UploadNode.js' export { EditorConfigProvider, useEditorConfigContext, -} from './field/lexical/config/client/EditorConfigProvider' +} from './field/lexical/config/client/EditorConfigProvider.js' export { sanitizeClientEditorConfig, sanitizeClientFeatures, -} from './field/lexical/config/client/sanitize' +} from './field/lexical/config/client/sanitize.js' export { defaultEditorConfig, defaultEditorFeatures, defaultEditorLexicalConfig, defaultSanitizedServerEditorConfig, -} from './field/lexical/config/server/default' -export { loadFeatures, sortFeaturesForOptimalLoading } from './field/lexical/config/server/loader' +} from './field/lexical/config/server/default.js' +export { + loadFeatures, + sortFeaturesForOptimalLoading, +} from './field/lexical/config/server/loader.js' export { sanitizeServerEditorConfig, sanitizeServerFeatures, -} from './field/lexical/config/server/sanitize' +} from './field/lexical/config/server/sanitize.js' export type { ClientEditorConfig, SanitizedClientEditorConfig, SanitizedServerEditorConfig, ServerEditorConfig, -} from './field/lexical/config/types' -export { getEnabledNodes } from './field/lexical/nodes' +} from './field/lexical/config/types.js' +export { getEnabledNodes } from './field/lexical/nodes/index.js' export { type FloatingToolbarSection, type FloatingToolbarSectionEntry, -} from './field/lexical/plugins/FloatingSelectToolbar/types' -export { ENABLE_SLASH_MENU_COMMAND } from './field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index' +} from './field/lexical/plugins/FloatingSelectToolbar/types.js' +export { ENABLE_SLASH_MENU_COMMAND } from './field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.js' export type { AdapterProps } export { SlashMenuGroup, SlashMenuOption, -} from './field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types' -export { CAN_USE_DOM } from './field/lexical/utils/canUseDOM' -export { cloneDeep } from './field/lexical/utils/cloneDeep' -export { getDOMRangeRect } from './field/lexical/utils/getDOMRangeRect' -export { getSelectedNode } from './field/lexical/utils/getSelectedNode' -export { isHTMLElement } from './field/lexical/utils/guard' -export { invariant } from './field/lexical/utils/invariant' -export { joinClasses } from './field/lexical/utils/joinClasses' -export { createBlockNode } from './field/lexical/utils/markdown/createBlockNode' +} from './field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/types.js' +export { CAN_USE_DOM } from './field/lexical/utils/canUseDOM.js' +export { cloneDeep } from './field/lexical/utils/cloneDeep.js' +export { getDOMRangeRect } from './field/lexical/utils/getDOMRangeRect.js' +export { getSelectedNode } from './field/lexical/utils/getSelectedNode.js' +export { isHTMLElement } from './field/lexical/utils/guard.js' +export { invariant } from './field/lexical/utils/invariant.js' +export { joinClasses } from './field/lexical/utils/joinClasses.js' +export { createBlockNode } from './field/lexical/utils/markdown/createBlockNode.js' export { DETAIL_TYPE_TO_DETAIL, DOUBLE_LINE_BREAK, @@ -418,16 +421,16 @@ export { TEXT_MODE_TO_TYPE, TEXT_TYPE_TO_FORMAT, TEXT_TYPE_TO_MODE, -} from './field/lexical/utils/nodeFormat' -export { Point, isPoint } from './field/lexical/utils/point' -export { Rect } from './field/lexical/utils/rect' -export { setFloatingElemPosition } from './field/lexical/utils/setFloatingElemPosition' -export { setFloatingElemPositionForLinkEditor } from './field/lexical/utils/setFloatingElemPositionForLinkEditor' +} from './field/lexical/utils/nodeFormat.js' +export { Point, isPoint } from './field/lexical/utils/point.js' +export { Rect } from './field/lexical/utils/rect.js' +export { setFloatingElemPosition } from './field/lexical/utils/setFloatingElemPosition.js' +export { setFloatingElemPositionForLinkEditor } from './field/lexical/utils/setFloatingElemPositionForLinkEditor.js' export { addSwipeDownListener, addSwipeLeftListener, addSwipeRightListener, addSwipeUpListener, -} from './field/lexical/utils/swipe' -export { sanitizeUrl, validateUrl } from './field/lexical/utils/url' -export { defaultRichTextValue } from './populate/defaultValue' +} from './field/lexical/utils/swipe.js' +export { sanitizeUrl, validateUrl } from './field/lexical/utils/url.js' +export { defaultRichTextValue } from './populate/defaultValue.js' diff --git a/packages/richtext-lexical/src/populate/populate.ts b/packages/richtext-lexical/src/populate/populate.ts index 5c0ab42bd..96bc83694 100644 --- a/packages/richtext-lexical/src/populate/populate.ts +++ b/packages/richtext-lexical/src/populate/populate.ts @@ -2,7 +2,7 @@ import type { SerializedEditorState } from 'lexical' import type { PayloadRequest } from 'payload/types' import type { Collection, Field, RichTextField } from 'payload/types' -import type { AdapterProps } from '../types' +import type { AdapterProps } from '../types.js' type Arguments = { currentDepth?: number diff --git a/packages/richtext-lexical/src/populate/recurseNestedFields.ts b/packages/richtext-lexical/src/populate/recurseNestedFields.ts index 964630e89..f1b626bfb 100644 --- a/packages/richtext-lexical/src/populate/recurseNestedFields.ts +++ b/packages/richtext-lexical/src/populate/recurseNestedFields.ts @@ -3,7 +3,7 @@ import type { Field, PayloadRequest } from 'payload/types' import { afterReadTraverseFields } from 'payload/utilities' -import type { PopulationPromise } from '../field/features/types' +import type { PopulationPromise } from '../field/features/types.js' type NestedRichTextFieldsArgs = { context: RequestContext diff --git a/packages/richtext-lexical/src/populate/richTextRelationshipPromise.ts b/packages/richtext-lexical/src/populate/richTextRelationshipPromise.ts index caf219863..b16ede8de 100644 --- a/packages/richtext-lexical/src/populate/richTextRelationshipPromise.ts +++ b/packages/richtext-lexical/src/populate/richTextRelationshipPromise.ts @@ -1,8 +1,8 @@ import type { SerializedEditorState, SerializedLexicalNode } from 'lexical' import type { PayloadRequest, RichTextAdapter, RichTextField } from 'payload/types' -import type { PopulationPromise } from '../field/features/types' -import type { AdapterProps } from '../types' +import type { PopulationPromise } from '../field/features/types.js' +import type { AdapterProps } from '../types.js' export type Args = Parameters< RichTextAdapter['populationPromise'] diff --git a/packages/richtext-lexical/src/types.ts b/packages/richtext-lexical/src/types.ts index f6d93e02e..e18996c7b 100644 --- a/packages/richtext-lexical/src/types.ts +++ b/packages/richtext-lexical/src/types.ts @@ -4,7 +4,7 @@ import type { FieldTypes } from 'payload/config' import type { RichTextFieldProps } from 'payload/types' import type React from 'react' -import type { SanitizedServerEditorConfig } from './field/lexical/config/types' +import type { SanitizedServerEditorConfig } from './field/lexical/config/types.js' export type FieldProps = RichTextFieldProps & { fieldTypes: FieldTypes diff --git a/packages/richtext-lexical/src/useLexicalFeature.tsx b/packages/richtext-lexical/src/useLexicalFeature.tsx index d946bda95..be8c02c50 100644 --- a/packages/richtext-lexical/src/useLexicalFeature.tsx +++ b/packages/richtext-lexical/src/useLexicalFeature.tsx @@ -2,7 +2,7 @@ import { useFieldPath } from '@payloadcms/ui/forms' import { useAddClientFunction } from '@payloadcms/ui/providers' -import type { FeatureProviderClient } from './field/features/types' +import type { FeatureProviderClient } from './field/features/types.js' export const useLexicalFeature = ( featureKey: string, diff --git a/packages/richtext-lexical/src/validate/index.ts b/packages/richtext-lexical/src/validate/index.ts index 213259eb2..ac8187d80 100644 --- a/packages/richtext-lexical/src/validate/index.ts +++ b/packages/richtext-lexical/src/validate/index.ts @@ -1,9 +1,10 @@ -import type { SanitizedServerEditorConfig } from '@payloadcms/richtext-lexical' import type { SerializedEditorState } from 'lexical' import type { RichTextField, Validate } from 'payload/types' -import { defaultRichTextValue, defaultRichTextValueV2 } from '../populate/defaultValue' -import { validateNodes } from './validateNodes' +import type { SanitizedServerEditorConfig } from '../field/lexical/config/types.js' + +import { defaultRichTextValue, defaultRichTextValueV2 } from '../populate/defaultValue.js' +import { validateNodes } from './validateNodes.js' export const richTextValidateHOC = ({ editorConfig, From 66dcb1020a82bc0aaad84e7efa56b99dea8835a9 Mon Sep 17 00:00:00 2001 From: Dan Ribbens Date: Wed, 6 Mar 2024 14:37:00 -0500 Subject: [PATCH 11/21] chore: import extensions added in uploads and utilities --- .../src/uploads/deleteAssociatedFiles.ts | 12 ++++----- .../src/uploads/docWithFilenameExists.ts | 2 +- .../payload/src/uploads/generateFileData.ts | 26 +++++++++---------- packages/payload/src/uploads/getBaseFields.ts | 12 ++++----- .../payload/src/uploads/getExternalFile.ts | 6 ++--- packages/payload/src/uploads/getFileByPath.ts | 2 +- packages/payload/src/uploads/getImageSize.ts | 4 +-- .../payload/src/uploads/getSafeFilename.ts | 6 ++--- packages/payload/src/uploads/imageResizer.ts | 16 +++++------- .../payload/src/uploads/mimeTypeValidator.ts | 2 +- packages/payload/src/uploads/types.ts | 2 +- .../payload/src/uploads/unlinkTempFiles.ts | 8 +++--- packages/payload/src/uploads/uploadFiles.ts | 10 +++---- .../utilities/checkDuplicateCollections.ts | 4 +-- .../src/utilities/commitTransaction.ts | 2 +- .../src/utilities/configToJSONSchema.spec.ts | 6 ++--- .../src/utilities/configToJSONSchema.ts | 14 +++++----- .../payload/src/utilities/createLocalReq.ts | 10 +++---- .../src/utilities/fieldSchemaToJSON.ts | 4 +-- .../src/utilities/flattenTopLevelFields.ts | 8 ++++-- .../src/utilities/getEntityPolicies.ts | 14 +++++----- packages/payload/src/utilities/getIDType.ts | 4 +-- .../payload/src/utilities/initTransaction.ts | 2 +- .../payload/src/utilities/isEntityHidden.ts | 4 +-- .../payload/src/utilities/killTransaction.ts | 2 +- .../payload/src/utilities/parseCookies.ts | 2 +- packages/payload/src/utilities/pinoPretty.ts | 0 .../utilities/telemetry/events/adminInit.ts | 8 +++--- .../utilities/telemetry/events/serverInit.ts | 4 +-- .../payload/src/utilities/telemetry/index.ts | 8 +++--- 30 files changed, 103 insertions(+), 101 deletions(-) delete mode 100644 packages/payload/src/utilities/pinoPretty.ts diff --git a/packages/payload/src/uploads/deleteAssociatedFiles.ts b/packages/payload/src/uploads/deleteAssociatedFiles.ts index 82ac7970f..251af3cfb 100644 --- a/packages/payload/src/uploads/deleteAssociatedFiles.ts +++ b/packages/payload/src/uploads/deleteAssociatedFiles.ts @@ -1,12 +1,12 @@ import fs from 'fs' -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { SanitizedConfig } from '../config/types' -import type { PayloadRequest } from '../exports/types' -import type { FileData, FileToSave } from './types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { SanitizedConfig } from '../config/types.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' +import type { FileData, FileToSave } from './types.d.ts' -import { ErrorDeletingFile } from '../errors' -import fileExists from './fileExists' +import { ErrorDeletingFile } from '../errors/index.js' +import fileExists from './fileExists.js' type Args = { collectionConfig: SanitizedCollectionConfig diff --git a/packages/payload/src/uploads/docWithFilenameExists.ts b/packages/payload/src/uploads/docWithFilenameExists.ts index 118d37590..1c29fa77e 100644 --- a/packages/payload/src/uploads/docWithFilenameExists.ts +++ b/packages/payload/src/uploads/docWithFilenameExists.ts @@ -1,4 +1,4 @@ -import type { PayloadRequest } from '../types' +import type { PayloadRequest } from '../types/index.d.ts' type Args = { collectionSlug: string diff --git a/packages/payload/src/uploads/generateFileData.ts b/packages/payload/src/uploads/generateFileData.ts index ae0c4b685..8927a57f2 100644 --- a/packages/payload/src/uploads/generateFileData.ts +++ b/packages/payload/src/uploads/generateFileData.ts @@ -5,20 +5,20 @@ import fs from 'fs' import mkdirp from 'mkdirp' import sanitize from 'sanitize-filename' -import type { Collection } from '../collections/config/types' -import type { SanitizedConfig } from '../config/types' -import type { PayloadRequest } from '../types' -import type { FileData, FileToSave, ProbedImageSize } from './types' +import type { Collection } from '../collections/config/types.d.ts' +import type { SanitizedConfig } from '../config/types.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' +import type { FileData, FileToSave, ProbedImageSize } from './types.d.ts' -import { FileUploadError, MissingFile } from '../errors' -import canResizeImage from './canResizeImage' -import cropImage from './cropImage' -import { getExternalFile } from './getExternalFile' -import getFileByPath from './getFileByPath' -import getImageSize from './getImageSize' -import getSafeFileName from './getSafeFilename' -import resizeAndTransformImageSizes from './imageResizer' -import isImage from './isImage' +import { FileUploadError, MissingFile } from '../errors/index.js' +import canResizeImage from './canResizeImage.js' +import cropImage from './cropImage.js' +import { getExternalFile } from './getExternalFile.js' +import getFileByPath from './getFileByPath.js' +import getImageSize from './getImageSize.js' +import getSafeFileName from './getSafeFilename.js' +import resizeAndTransformImageSizes from './imageResizer.js' +import isImage from './isImage.js' type Args = { collection: Collection diff --git a/packages/payload/src/uploads/getBaseFields.ts b/packages/payload/src/uploads/getBaseFields.ts index 1da5c0615..35a5c3876 100644 --- a/packages/payload/src/uploads/getBaseFields.ts +++ b/packages/payload/src/uploads/getBaseFields.ts @@ -1,10 +1,10 @@ -import type { CollectionConfig } from '../collections/config/types' -import type { Config } from '../config/types' -import type { Field } from '../fields/config/types' -import type { UploadConfig } from './types' +import type { CollectionConfig } from '../collections/config/types.d.ts' +import type { Config } from '../config/types.d.ts' +import type { Field } from '../fields/config/types.d.ts' +import type { UploadConfig } from './types.d.ts' -import { extractTranslations } from '../translations/extractTranslations' -import { mimeTypeValidator } from './mimeTypeValidator' +import { extractTranslations } from '../translations/extractTranslations.js' +import { mimeTypeValidator } from './mimeTypeValidator.js' const labels = extractTranslations([ 'upload:width', diff --git a/packages/payload/src/uploads/getExternalFile.ts b/packages/payload/src/uploads/getExternalFile.ts index 9e5625223..495667c90 100644 --- a/packages/payload/src/uploads/getExternalFile.ts +++ b/packages/payload/src/uploads/getExternalFile.ts @@ -1,7 +1,7 @@ -import type { PayloadRequest } from '../exports/types' -import type { File, FileData } from './types' +import type { PayloadRequest } from '../types/index.ts' +import type { File, FileData } from './types.d.ts' -import { APIError } from '../errors' +import { APIError } from '../errors/index.js' type Args = { data: FileData diff --git a/packages/payload/src/uploads/getFileByPath.ts b/packages/payload/src/uploads/getFileByPath.ts index 8e7aacc2b..f6520afff 100644 --- a/packages/payload/src/uploads/getFileByPath.ts +++ b/packages/payload/src/uploads/getFileByPath.ts @@ -2,7 +2,7 @@ import { fromFile } from 'file-type' import fs from 'fs' import path from 'path' -import type { CustomPayloadRequest } from '../exports/types' +import type { CustomPayloadRequest } from '../types/index.d.ts' const mimeTypeEstimate = { svg: 'image/svg+xml', diff --git a/packages/payload/src/uploads/getImageSize.ts b/packages/payload/src/uploads/getImageSize.ts index 59ebb39f5..75f8db52a 100644 --- a/packages/payload/src/uploads/getImageSize.ts +++ b/packages/payload/src/uploads/getImageSize.ts @@ -1,8 +1,8 @@ import fs from 'fs' import probeImageSize from 'probe-image-size' -import type { PayloadRequest } from '../exports/types' -import type { ProbedImageSize } from './types' +import type { PayloadRequest } from '../types/index.d.ts' +import type { ProbedImageSize } from './types.d.ts' export default async function (file: PayloadRequest['file']): Promise { if (file.tempFilePath) { diff --git a/packages/payload/src/uploads/getSafeFilename.ts b/packages/payload/src/uploads/getSafeFilename.ts index ec20b9c5d..f912c0c38 100644 --- a/packages/payload/src/uploads/getSafeFilename.ts +++ b/packages/payload/src/uploads/getSafeFilename.ts @@ -1,9 +1,9 @@ import sanitize from 'sanitize-filename' -import type { PayloadRequest } from '../types' +import type { PayloadRequest } from '../types/index.d.ts' -import docWithFilenameExists from './docWithFilenameExists' -import fileExists from './fileExists' +import docWithFilenameExists from './docWithFilenameExists.js' +import fileExists from './fileExists.js' const incrementName = (name: string) => { const extension = name.split('.').pop() diff --git a/packages/payload/src/uploads/imageResizer.ts b/packages/payload/src/uploads/imageResizer.ts index de8ba2c55..e0257f59b 100644 --- a/packages/payload/src/uploads/imageResizer.ts +++ b/packages/payload/src/uploads/imageResizer.ts @@ -1,18 +1,16 @@ -import type { OutputInfo, default as Sharp } from 'sharp' -import type sharp from 'sharp' +import type { OutputInfo } from 'sharp' import { fromBuffer } from 'file-type' import fs from 'fs' import sanitize from 'sanitize-filename' -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { SharpDependency } from '../exports/config' -import type { UploadEdits } from '../exports/types' -import type { CustomPayloadRequest, PayloadRequest } from '../types' -import type { FileSize, FileSizes, FileToSave, ImageSize, ProbedImageSize } from './types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { SharpDependency } from '../config/types.d.ts' +import type { CustomPayloadRequest, PayloadRequest, UploadEdits } from '../types/index.d.ts' +import type { FileSize, FileSizes, FileToSave, ImageSize, ProbedImageSize } from './types.d.ts' -import { isNumber } from '../utilities/isNumber' -import fileExists from './fileExists' +import { isNumber } from '../utilities/isNumber.js' +import fileExists from './fileExists.js' type ResizeArgs = { config: SanitizedCollectionConfig diff --git a/packages/payload/src/uploads/mimeTypeValidator.ts b/packages/payload/src/uploads/mimeTypeValidator.ts index 6108ba8d5..4d4f76e47 100644 --- a/packages/payload/src/uploads/mimeTypeValidator.ts +++ b/packages/payload/src/uploads/mimeTypeValidator.ts @@ -1,4 +1,4 @@ -import type { Validate } from '../fields/config/types' +import type { Validate } from '../fields/config/types.d.ts' export const mimeTypeValidator = (mimeTypes: string[]): Validate => diff --git a/packages/payload/src/uploads/types.ts b/packages/payload/src/uploads/types.ts index 065799c3c..2af2ea265 100644 --- a/packages/payload/src/uploads/types.ts +++ b/packages/payload/src/uploads/types.ts @@ -1,7 +1,7 @@ import type express from 'express' -import type { PayloadRequest } from 'payload/types' import type serveStatic from 'serve-static' import type { ResizeOptions, Sharp } from 'sharp' +import type { PayloadRequest } from '../types/index.d.ts' export type FileSize = { filename: null | string diff --git a/packages/payload/src/uploads/unlinkTempFiles.ts b/packages/payload/src/uploads/unlinkTempFiles.ts index 6139bd6ea..5731b79b6 100644 --- a/packages/payload/src/uploads/unlinkTempFiles.ts +++ b/packages/payload/src/uploads/unlinkTempFiles.ts @@ -1,11 +1,11 @@ import fs from 'fs' import { promisify } from 'util' -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { SanitizedConfig } from '../config/types' -import type { PayloadRequest } from '../types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { SanitizedConfig } from '../config/types.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' -import { mapAsync } from '../utilities/mapAsync' +import { mapAsync } from '../utilities/mapAsync.js' const unlinkFile = promisify(fs.unlink) diff --git a/packages/payload/src/uploads/uploadFiles.ts b/packages/payload/src/uploads/uploadFiles.ts index 769033672..a4a77a707 100644 --- a/packages/payload/src/uploads/uploadFiles.ts +++ b/packages/payload/src/uploads/uploadFiles.ts @@ -1,9 +1,9 @@ -import type { Payload } from '..' -import type { PayloadRequest } from '../exports/types' -import type { FileToSave } from './types' +import type { Payload } from '../index.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' +import type { FileToSave } from './types.d.ts' -import { FileUploadError } from '../errors' -import saveBufferToFile from './saveBufferToFile' +import { FileUploadError } from '../errors/index.js' +import saveBufferToFile from './saveBufferToFile.js' export const uploadFiles = async ( payload: Payload, diff --git a/packages/payload/src/utilities/checkDuplicateCollections.ts b/packages/payload/src/utilities/checkDuplicateCollections.ts index 1a8a945c4..781c8e082 100644 --- a/packages/payload/src/utilities/checkDuplicateCollections.ts +++ b/packages/payload/src/utilities/checkDuplicateCollections.ts @@ -1,6 +1,6 @@ -import type { SanitizedCollectionConfig } from '../collections/config/types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' -import { DuplicateCollection } from '../errors' +import { DuplicateCollection } from '../errors/DuplicateCollection.js' const getDuplicates = (arr: string[]) => arr.filter((item, index) => arr.indexOf(item) !== index) diff --git a/packages/payload/src/utilities/commitTransaction.ts b/packages/payload/src/utilities/commitTransaction.ts index 98fdca976..8243b625d 100644 --- a/packages/payload/src/utilities/commitTransaction.ts +++ b/packages/payload/src/utilities/commitTransaction.ts @@ -1,4 +1,4 @@ -import type { PayloadRequest } from '../types' +import type { PayloadRequest } from '../types/index.d.ts' /** * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req diff --git a/packages/payload/src/utilities/configToJSONSchema.spec.ts b/packages/payload/src/utilities/configToJSONSchema.spec.ts index dced6eafc..5721244a0 100644 --- a/packages/payload/src/utilities/configToJSONSchema.spec.ts +++ b/packages/payload/src/utilities/configToJSONSchema.spec.ts @@ -1,7 +1,7 @@ -import type { Config } from '../config/types' +import type { Config } from '../config/types.d.ts' -import { sanitizeConfig } from '../config/sanitize' -import { configToJSONSchema } from './configToJSONSchema' +import { sanitizeConfig } from '../config/sanitize.js' +import { configToJSONSchema } from './configToJSONSchema.js' describe('configToJSONSchema', () => { it('should handle optional arrays with required fields', () => { diff --git a/packages/payload/src/utilities/configToJSONSchema.ts b/packages/payload/src/utilities/configToJSONSchema.ts index 82ef0bd8a..cd2b7f02d 100644 --- a/packages/payload/src/utilities/configToJSONSchema.ts +++ b/packages/payload/src/utilities/configToJSONSchema.ts @@ -2,14 +2,14 @@ import type { JSONSchema4, JSONSchema4TypeName } from 'json-schema' import { singular } from 'pluralize' -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { SanitizedConfig } from '../exports/config' -import type { Field, FieldAffectingData, Option } from '../fields/config/types' -import type { SanitizedGlobalConfig } from '../globals/config/types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { SanitizedConfig } from '../config/types.d.ts' +import type { Field, FieldAffectingData, Option } from '../fields/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts' -import { fieldAffectsData, tabHasName } from '../fields/config/types' -import { deepCopyObject } from './deepCopyObject' -import { toWords } from './formatLabels' +import { fieldAffectsData, tabHasName } from '../fields/config/types.js' +import { deepCopyObject } from './deepCopyObject.js' +import { toWords } from './formatLabels.js' const fieldIsRequired = (field: Field) => { const isConditional = Boolean(field?.admin && field?.admin?.condition) diff --git a/packages/payload/src/utilities/createLocalReq.ts b/packages/payload/src/utilities/createLocalReq.ts index 7637e56ac..074dbb648 100644 --- a/packages/payload/src/utilities/createLocalReq.ts +++ b/packages/payload/src/utilities/createLocalReq.ts @@ -1,9 +1,9 @@ -import type { Payload, RequestContext } from '..' -import type { User } from '../auth' -import type { PayloadRequest } from '../exports/types' +import type { Payload, RequestContext } from '../index.d.ts' +import type { User } from '../auth/types.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' -import { getDataLoader } from '../collections/dataloader' -import { getLocalI18n } from '../translations/getLocalI18n' +import { getDataLoader } from '../collections/dataloader.js' +import { getLocalI18n } from '../translations/getLocalI18n.js' function getRequestContext( req: PayloadRequest = { context: null } as PayloadRequest, diff --git a/packages/payload/src/utilities/fieldSchemaToJSON.ts b/packages/payload/src/utilities/fieldSchemaToJSON.ts index 2c496ac32..8e4a6f506 100644 --- a/packages/payload/src/utilities/fieldSchemaToJSON.ts +++ b/packages/payload/src/utilities/fieldSchemaToJSON.ts @@ -1,5 +1,5 @@ -import type { FieldTypes } from '../exports/config' -import type { Field } from '../fields/config/types' +import type { FieldTypes } from '../exports/config.d.ts' +import type { Field } from '../fields/config/types.d.ts' export type FieldSchemaJSON = { blocks?: FieldSchemaJSON // TODO: conditionally add based on `type` diff --git a/packages/payload/src/utilities/flattenTopLevelFields.ts b/packages/payload/src/utilities/flattenTopLevelFields.ts index f80aefe30..5b2e94013 100644 --- a/packages/payload/src/utilities/flattenTopLevelFields.ts +++ b/packages/payload/src/utilities/flattenTopLevelFields.ts @@ -1,11 +1,15 @@ -import type { Field, FieldAffectingData, FieldPresentationalOnly } from '../fields/config/types' +import type { + Field, + FieldAffectingData, + FieldPresentationalOnly, +} from '../fields/config/types.d.ts' import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly, tabHasName, -} from '../fields/config/types' +} from '../fields/config/types.js' /** * Flattens a collection's fields into a single array of fields, as long diff --git a/packages/payload/src/utilities/getEntityPolicies.ts b/packages/payload/src/utilities/getEntityPolicies.ts index 1cb2a6cf1..0ae587a72 100644 --- a/packages/payload/src/utilities/getEntityPolicies.ts +++ b/packages/payload/src/utilities/getEntityPolicies.ts @@ -1,11 +1,11 @@ -import type { CollectionPermission, GlobalPermission, User } from '../auth/types' -import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types' -import type { Access } from '../config/types' -import type { FieldAccess } from '../fields/config/types' -import type { SanitizedGlobalConfig } from '../globals/config/types' -import type { AllOperations, Document, PayloadRequest, Where } from '../types' +import type { CollectionPermission, GlobalPermission } from '../auth/types.d.ts' +import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.d.ts' +import type { Access } from '../config/types.d.ts' +import type { FieldAccess } from '../fields/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts' +import type { AllOperations, Document, PayloadRequest, Where } from '../types/index.d.ts' -import { tabHasName } from '../fields/config/types' +import { tabHasName } from '../fields/config/types.js' type Args = { entity: SanitizedCollectionConfig | SanitizedGlobalConfig diff --git a/packages/payload/src/utilities/getIDType.ts b/packages/payload/src/utilities/getIDType.ts index af9f0791c..27ed05a24 100644 --- a/packages/payload/src/utilities/getIDType.ts +++ b/packages/payload/src/utilities/getIDType.ts @@ -1,5 +1,5 @@ -import type { BaseDatabaseAdapter } from '../database/types' -import type { Field } from '../fields/config/types' +import type { BaseDatabaseAdapter } from '../database/types.d.ts' +import type { Field } from '../fields/config/types.d.ts' export const getIDType = ( idField: Field | null, diff --git a/packages/payload/src/utilities/initTransaction.ts b/packages/payload/src/utilities/initTransaction.ts index 4ad735663..99ed552d9 100644 --- a/packages/payload/src/utilities/initTransaction.ts +++ b/packages/payload/src/utilities/initTransaction.ts @@ -1,4 +1,4 @@ -import type { PayloadRequest } from '../types' +import type { PayloadRequest } from '../types/index.d.ts' /** * Starts a new transaction using the db adapter with a random id and then assigns it to the req.transaction diff --git a/packages/payload/src/utilities/isEntityHidden.ts b/packages/payload/src/utilities/isEntityHidden.ts index 79a251da1..25a7792cb 100644 --- a/packages/payload/src/utilities/isEntityHidden.ts +++ b/packages/payload/src/utilities/isEntityHidden.ts @@ -1,7 +1,7 @@ import type { User } from 'payload/auth' -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { SanitizedGlobalConfig } from '../globals/config/types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts' export const isEntityHidden = ({ hidden, diff --git a/packages/payload/src/utilities/killTransaction.ts b/packages/payload/src/utilities/killTransaction.ts index 30b47ea3d..8f7eb6a7b 100644 --- a/packages/payload/src/utilities/killTransaction.ts +++ b/packages/payload/src/utilities/killTransaction.ts @@ -1,4 +1,4 @@ -import type { PayloadRequest } from '../types' +import type { PayloadRequest } from '../types/index.d.ts' /** * Rollback the transaction from the req using the db adapter and removes it from the req diff --git a/packages/payload/src/utilities/parseCookies.ts b/packages/payload/src/utilities/parseCookies.ts index f907efb81..7a1aee5c3 100644 --- a/packages/payload/src/utilities/parseCookies.ts +++ b/packages/payload/src/utilities/parseCookies.ts @@ -1,4 +1,4 @@ -import { APIError } from '../errors' +import APIError from '../errors/APIError.js' export const parseCookies = (headers: Request['headers']): Map => { const list = new Map() diff --git a/packages/payload/src/utilities/pinoPretty.ts b/packages/payload/src/utilities/pinoPretty.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/payload/src/utilities/telemetry/events/adminInit.ts b/packages/payload/src/utilities/telemetry/events/adminInit.ts index 2b129a1da..1a6efb744 100644 --- a/packages/payload/src/utilities/telemetry/events/adminInit.ts +++ b/packages/payload/src/utilities/telemetry/events/adminInit.ts @@ -1,8 +1,8 @@ -import type { Payload } from '../../..' -import type { User } from '../../../auth' +import type { Payload } from '../../../index.d.ts' +import type { User } from '../../../auth/types.d.ts' -import { sendEvent } from '..' -import { oneWayHash } from '../oneWayHash' +import { sendEvent } from '../index.js' +import { oneWayHash } from '../oneWayHash.js' export type AdminInitEvent = { domainID?: string diff --git a/packages/payload/src/utilities/telemetry/events/serverInit.ts b/packages/payload/src/utilities/telemetry/events/serverInit.ts index e4f365329..249b4fc7f 100644 --- a/packages/payload/src/utilities/telemetry/events/serverInit.ts +++ b/packages/payload/src/utilities/telemetry/events/serverInit.ts @@ -1,6 +1,6 @@ -import type { Payload } from '../../../types' +import type { Payload } from '../../../index.d.ts' -import { sendEvent } from '..' +import { sendEvent } from '../index.js' export type ServerInitEvent = { type: 'server-init' diff --git a/packages/payload/src/utilities/telemetry/index.ts b/packages/payload/src/utilities/telemetry/index.ts index b4abca761..f959e75fe 100644 --- a/packages/payload/src/utilities/telemetry/index.ts +++ b/packages/payload/src/utilities/telemetry/index.ts @@ -4,11 +4,11 @@ import { randomBytes } from 'crypto' import findUp from 'find-up' import fs from 'fs' -import type { Payload } from '../../types' -import type { AdminInitEvent } from './events/adminInit' -import type { ServerInitEvent } from './events/serverInit' +import type { Payload } from '../../types/index.d.ts' +import type { AdminInitEvent } from './events/adminInit.js' +import type { ServerInitEvent } from './events/serverInit.js' -import { oneWayHash } from './oneWayHash' +import { oneWayHash } from './oneWayHash.js' export type BaseEvent = { envID: string From 137952af73583af3d005548d90b09c7713a7a049 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Wed, 6 Mar 2024 14:46:10 -0500 Subject: [PATCH 12/21] chore(richtext-lexical): migrate remaining stuff to esm --- packages/richtext-lexical/src/cell/index.tsx | 2 +- .../field/features/blocks/component/BlockContent.tsx | 2 +- .../src/field/features/blocks/drawer/index.tsx | 2 +- .../src/field/features/blocks/nodes/BlocksNode.tsx | 4 ++-- .../features/debug/testrecorder/plugin/index.tsx | 2 +- .../field/features/debug/treeview/plugin/index.tsx | 4 ++-- .../field/features/link/plugins/autoLink/index.tsx | 2 +- .../plugins/floatingLinkEditor/LinkEditor/index.tsx | 2 +- .../src/field/features/link/plugins/link/index.tsx | 2 +- .../field/features/lists/checklist/plugin/index.tsx | 2 +- .../src/field/features/lists/plugin/index.tsx | 2 +- .../features/relationship/nodes/RelationshipNode.tsx | 2 +- .../nodes/components/RelationshipComponent.tsx | 4 ++-- .../field/features/relationship/plugins/index.tsx | 2 +- .../upload/component/ExtraFieldsDrawer/index.tsx | 2 +- .../src/field/features/upload/component/index.tsx | 4 ++-- .../src/field/features/upload/drawer/index.tsx | 2 +- .../src/field/features/upload/nodes/UploadNode.tsx | 4 ++-- .../src/field/features/upload/plugin/index.tsx | 2 +- packages/richtext-lexical/src/field/index.tsx | 2 +- .../src/field/lexical/LexicalEditor.tsx | 12 ++++++------ .../src/field/lexical/LexicalProvider.tsx | 4 ++-- .../src/field/lexical/config/client/default.ts | 2 +- .../src/field/lexical/config/client/sanitize.ts | 2 +- .../src/field/lexical/config/server/default.ts | 2 +- .../src/field/lexical/config/types.ts | 2 +- .../FloatingSelectToolbar/ToolbarButton/index.tsx | 2 +- .../LexicalTypeaheadMenuPlugin/LexicalMenu.tsx | 2 +- .../SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx | 2 +- .../src/field/lexical/ui/ContentEditable.tsx | 2 +- .../src/field/lexical/utils/nodeFormat.ts | 2 +- packages/richtext-lexical/src/index.ts | 2 +- 32 files changed, 43 insertions(+), 43 deletions(-) diff --git a/packages/richtext-lexical/src/cell/index.tsx b/packages/richtext-lexical/src/cell/index.tsx index 0b963e6a3..2f78ff50b 100644 --- a/packages/richtext-lexical/src/cell/index.tsx +++ b/packages/richtext-lexical/src/cell/index.tsx @@ -1,5 +1,5 @@ 'use client' -import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' +import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor.js' import { createHeadlessEditor } from '@lexical/headless' import { useTableCell } from '@payloadcms/ui/elements' diff --git a/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx b/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx index e49c63ea5..bef16296d 100644 --- a/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/component/BlockContent.tsx @@ -3,7 +3,7 @@ import type { ReducedBlock } from '@payloadcms/ui/types' import type { FormState } from 'payload/types' import type { Data } from 'payload/types' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { getTranslation } from '@payloadcms/translations' import { RenderFields } from '@payloadcms/ui' import { diff --git a/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx b/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx index 0af6ca06a..67b8e06d4 100644 --- a/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx @@ -1,6 +1,6 @@ 'use client' import { useModal } from '@faceless-ui/modal' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { BlocksDrawer, formatDrawerSlug, useEditDepth, useTranslation } from '@payloadcms/ui' import { $getNodeByKey, diff --git a/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx b/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx index d87740292..67bf79571 100644 --- a/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx +++ b/packages/richtext-lexical/src/field/features/blocks/nodes/BlocksNode.tsx @@ -1,4 +1,4 @@ -import type { SerializedDecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode' +import type { SerializedDecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode.js' import type { DOMConversionMap, DOMExportOutput, @@ -10,7 +10,7 @@ import type { Spread, } from 'lexical' -import { DecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode' +import { DecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode.js' import ObjectID from 'bson-objectid' import React from 'react' diff --git a/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx b/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx index ba2ea3555..aab60b796 100644 --- a/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/debug/testrecorder/plugin/index.tsx @@ -1,7 +1,7 @@ 'use client' import type { BaseSelection, LexicalEditor } from 'lexical' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { $createParagraphNode, $createTextNode, $getRoot } from 'lexical' import * as React from 'react' import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react' diff --git a/packages/richtext-lexical/src/field/features/debug/treeview/plugin/index.tsx b/packages/richtext-lexical/src/field/features/debug/treeview/plugin/index.tsx index bea3da1f2..8ad08261d 100644 --- a/packages/richtext-lexical/src/field/features/debug/treeview/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/debug/treeview/plugin/index.tsx @@ -1,6 +1,6 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' -import { TreeView } from '@lexical/react/LexicalTreeView' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' +import { TreeView } from '@lexical/react/LexicalTreeView.js' import * as React from 'react' import './index.scss' diff --git a/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx index a4ea60e7a..0f95a633e 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/plugins/autoLink/index.tsx @@ -1,7 +1,7 @@ 'use client' import type { ElementNode, LexicalEditor, LexicalNode } from 'lexical' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { mergeRegister } from '@lexical/utils' import { $createTextNode, diff --git a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx index 2adb7a41d..0bcc473e7 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx @@ -3,7 +3,7 @@ import type { FormState } from 'payload/types' import type { Data } from 'payload/types' import { useModal } from '@faceless-ui/modal' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { $findMatchingParent, mergeRegister } from '@lexical/utils' import { getTranslation } from '@payloadcms/translations' import { formatDrawerSlug, useConfig, useEditDepth, useTranslation } from '@payloadcms/ui' diff --git a/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx b/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx index 8e75c6549..fb2262a1c 100644 --- a/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx +++ b/packages/richtext-lexical/src/field/features/link/plugins/link/index.tsx @@ -1,5 +1,5 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { mergeRegister } from '@lexical/utils' import { $getSelection, diff --git a/packages/richtext-lexical/src/field/features/lists/checklist/plugin/index.tsx b/packages/richtext-lexical/src/field/features/lists/checklist/plugin/index.tsx index 478e4d818..5b10eb34b 100644 --- a/packages/richtext-lexical/src/field/features/lists/checklist/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/lists/checklist/plugin/index.tsx @@ -1,5 +1,5 @@ 'use client' -import { CheckListPlugin } from '@lexical/react/LexicalCheckListPlugin' +import { CheckListPlugin } from '@lexical/react/LexicalCheckListPlugin.js' import React from 'react' export function LexicalCheckListPlugin() { diff --git a/packages/richtext-lexical/src/field/features/lists/plugin/index.tsx b/packages/richtext-lexical/src/field/features/lists/plugin/index.tsx index 5908ecd52..5dfbcabbd 100644 --- a/packages/richtext-lexical/src/field/features/lists/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/lists/plugin/index.tsx @@ -1,5 +1,5 @@ 'use client' -import { ListPlugin } from '@lexical/react/LexicalListPlugin' +import { ListPlugin } from '@lexical/react/LexicalListPlugin.js' import React from 'react' export function LexicalListPlugin() { diff --git a/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx b/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx index 5d104319f..4158751f8 100644 --- a/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/nodes/RelationshipNode.tsx @@ -13,7 +13,7 @@ import type { import { DecoratorBlockNode, type SerializedDecoratorBlockNode, -} from '@lexical/react/LexicalDecoratorBlockNode' +} from '@lexical/react/LexicalDecoratorBlockNode.js' import * as React from 'react' const RelationshipComponent = React.lazy(() => diff --git a/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx b/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx index 6d4e1142a..bf61df982 100644 --- a/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/nodes/components/RelationshipComponent.tsx @@ -1,6 +1,6 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' -import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' +import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection.js' import { getTranslation } from '@payloadcms/translations' import { Button, useConfig, useDocumentDrawer, usePayloadAPI, useTranslation } from '@payloadcms/ui' import { $getNodeByKey, type ElementFormatType } from 'lexical' diff --git a/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx b/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx index acbe7743f..7a60936a6 100644 --- a/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx +++ b/packages/richtext-lexical/src/field/features/relationship/plugins/index.tsx @@ -1,5 +1,5 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { $insertNodeToNearestRoot } from '@lexical/utils' import { useConfig } from '@payloadcms/ui' import { diff --git a/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx b/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx index 156e6cc92..94d9ad218 100644 --- a/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx @@ -2,7 +2,7 @@ import type { FormState, SanitizedCollectionConfig } from 'payload/types' import { useModal } from '@faceless-ui/modal' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { getTranslation } from '@payloadcms/translations' import { Drawer, diff --git a/packages/richtext-lexical/src/field/features/upload/component/index.tsx b/packages/richtext-lexical/src/field/features/upload/component/index.tsx index d6da87a29..d4af399c4 100644 --- a/packages/richtext-lexical/src/field/features/upload/component/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/component/index.tsx @@ -1,8 +1,8 @@ 'use client' import type { SanitizedCollectionConfig } from 'payload/types' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' -import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' +import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection.js' import { getTranslation } from '@payloadcms/translations' import { Button, diff --git a/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx b/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx index fdc98a60e..6beea4371 100644 --- a/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/drawer/index.tsx @@ -1,5 +1,5 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { useListDrawer } from '@payloadcms/ui' import { $getNodeByKey, COMMAND_PRIORITY_EDITOR, type LexicalEditor } from 'lexical' import React, { useCallback, useEffect, useState } from 'react' diff --git a/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx b/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx index 3521a10dc..978cb769c 100644 --- a/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx +++ b/packages/richtext-lexical/src/field/features/upload/nodes/UploadNode.tsx @@ -1,7 +1,7 @@ -import type { SerializedDecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode' +import type { SerializedDecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode.js' import type { ElementFormatType, NodeKey } from 'lexical' -import { DecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode' +import { DecoratorBlockNode } from '@lexical/react/LexicalDecoratorBlockNode.js' import { $applyNodeReplacement, type DOMConversionMap, diff --git a/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx b/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx index 8d3329f70..506bec6f1 100644 --- a/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx +++ b/packages/richtext-lexical/src/field/features/upload/plugin/index.tsx @@ -1,5 +1,5 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { $insertNodeToNearestRoot, mergeRegister } from '@lexical/utils' import { useConfig } from '@payloadcms/ui' import { diff --git a/packages/richtext-lexical/src/field/index.tsx b/packages/richtext-lexical/src/field/index.tsx index fed20f848..204cc0aac 100644 --- a/packages/richtext-lexical/src/field/index.tsx +++ b/packages/richtext-lexical/src/field/index.tsx @@ -1,5 +1,5 @@ 'use client' -import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' +import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor.js' import { type FormFieldBase, ShimmerEffect } from '@payloadcms/ui' import { useFieldPath } from '@payloadcms/ui/forms' diff --git a/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx b/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx index 38399745a..241b2abd1 100644 --- a/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx +++ b/packages/richtext-lexical/src/field/lexical/LexicalEditor.tsx @@ -1,10 +1,10 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' -import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary' -import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin' -import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin' -import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin' -import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' +import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary.js' +import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin.js' +import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin.js' +import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin.js' +import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin.js' import * as React from 'react' import { useEffect, useState } from 'react' diff --git a/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx b/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx index 17c055bf4..a81fa2ff6 100644 --- a/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx +++ b/packages/richtext-lexical/src/field/lexical/LexicalProvider.tsx @@ -1,10 +1,10 @@ 'use client' -import type { InitialConfigType } from '@lexical/react/LexicalComposer' +import type { InitialConfigType } from '@lexical/react/LexicalComposer.js' import type { FormFieldBase } from '@payloadcms/ui' import type { EditorState, SerializedEditorState } from 'lexical' import type { LexicalEditor } from 'lexical' -import { LexicalComposer } from '@lexical/react/LexicalComposer' +import { LexicalComposer } from '@lexical/react/LexicalComposerContext.js' import * as React from 'react' import type { SanitizedClientEditorConfig } from './config/types.js' diff --git a/packages/richtext-lexical/src/field/lexical/config/client/default.ts b/packages/richtext-lexical/src/field/lexical/config/client/default.ts index 772c6be55..105c77e45 100644 --- a/packages/richtext-lexical/src/field/lexical/config/client/default.ts +++ b/packages/richtext-lexical/src/field/lexical/config/client/default.ts @@ -1,5 +1,5 @@ 'use client' -import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' +import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor.js' import { LexicalEditorTheme } from '../../theme/EditorTheme.js' diff --git a/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts b/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts index 894ff0bc9..b9d3afad4 100644 --- a/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts +++ b/packages/richtext-lexical/src/field/lexical/config/client/sanitize.ts @@ -1,6 +1,6 @@ 'use client' -import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' +import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor.js' import type { ResolvedClientFeatureMap, SanitizedClientFeatures } from '../../../features/types.js' import type { SanitizedClientEditorConfig } from '../types.js' diff --git a/packages/richtext-lexical/src/field/lexical/config/server/default.ts b/packages/richtext-lexical/src/field/lexical/config/server/default.ts index 327a8a11d..688a25400 100644 --- a/packages/richtext-lexical/src/field/lexical/config/server/default.ts +++ b/packages/richtext-lexical/src/field/lexical/config/server/default.ts @@ -1,4 +1,4 @@ -import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' +import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor.js' import type { FeatureProviderServer } from '../../../features/types.js' import type { SanitizedServerEditorConfig, ServerEditorConfig } from '../types.js' diff --git a/packages/richtext-lexical/src/field/lexical/config/types.ts b/packages/richtext-lexical/src/field/lexical/config/types.ts index 3b9cab757..068251eb3 100644 --- a/packages/richtext-lexical/src/field/lexical/config/types.ts +++ b/packages/richtext-lexical/src/field/lexical/config/types.ts @@ -1,4 +1,4 @@ -import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' +import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor.js' import type { FeatureProviderClient, diff --git a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx index 6c1fc7233..ec1ce22d8 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/FloatingSelectToolbar/ToolbarButton/index.tsx @@ -1,5 +1,5 @@ 'use client' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { mergeRegister } from '@lexical/utils' import { $getSelection } from 'lexical' import React, { useCallback, useEffect, useState } from 'react' diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx index a1d59fb16..d2419c62f 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/LexicalMenu.tsx @@ -2,7 +2,7 @@ import type { LexicalCommand, LexicalEditor, TextNode } from 'lexical' import type { MutableRefObject, ReactPortal } from 'react' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { mergeRegister } from '@lexical/utils' import { $getSelection, diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx index 47969d23e..8754888fc 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx @@ -7,7 +7,7 @@ import type { TextNode, } from 'lexical' -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js' import { mergeRegister } from '@lexical/utils' import { $getSelection, diff --git a/packages/richtext-lexical/src/field/lexical/ui/ContentEditable.tsx b/packages/richtext-lexical/src/field/lexical/ui/ContentEditable.tsx index 898839e82..5ab64ac1b 100644 --- a/packages/richtext-lexical/src/field/lexical/ui/ContentEditable.tsx +++ b/packages/richtext-lexical/src/field/lexical/ui/ContentEditable.tsx @@ -1,4 +1,4 @@ -import { ContentEditable } from '@lexical/react/LexicalContentEditable' +import { ContentEditable } from '@lexical/react/LexicalContentEditable.js' import * as React from 'react' import './ContentEditable.scss' diff --git a/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts b/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts index a5592a9d1..3b08f5e93 100644 --- a/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts +++ b/packages/richtext-lexical/src/field/lexical/utils/nodeFormat.ts @@ -4,7 +4,7 @@ //This copy-and-pasted from lexical here: https://github.com/facebook/lexical/blob/c2ceee223f46543d12c574e62155e619f9a18a5d/packages/lexical/src/LexicalConstants.ts import type { ElementFormatType, TextFormatType } from 'lexical' -import type { TextDetailType, TextModeType } from 'lexical/nodes/LexicalTextNode' +import type { TextDetailType, TextModeType } from 'lexical/nodes/LexicalTextNode.js' // DOM export const NodeFormat = { diff --git a/packages/richtext-lexical/src/index.ts b/packages/richtext-lexical/src/index.ts index 089afb98a..2b5df7127 100644 --- a/packages/richtext-lexical/src/index.ts +++ b/packages/richtext-lexical/src/index.ts @@ -1,6 +1,6 @@ import type { JSONSchema4 } from 'json-schema' import type { SerializedEditorState } from 'lexical' -import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor' +import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor.js' import type { RichTextAdapter } from 'payload/types' import { withNullableJSONSchemaType } from 'payload/utilities' From 9674f4e7397677afba552c7970a5616d79090994 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Mar 2024 14:30:23 -0500 Subject: [PATCH 13/21] chore: esm-ify payload --- packages/payload/src/admin/RichText.ts | 8 +- packages/payload/src/admin/elements/Cell.ts | 4 +- packages/payload/src/admin/elements/Tab.ts | 6 +- packages/payload/src/admin/forms/Form.ts | 2 +- packages/payload/src/admin/forms/RowLabel.ts | 2 +- packages/payload/src/admin/types.ts | 38 ++++----- packages/payload/src/admin/views/types.ts | 8 +- .../src/auth/baseFields/accountLock.ts | 6 +- .../payload/src/auth/baseFields/apiKey.ts | 4 +- packages/payload/src/auth/baseFields/auth.ts | 6 +- .../src/auth/baseFields/verification.ts | 8 +- packages/payload/src/auth/cookies.ts | 12 +-- packages/payload/src/auth/defaultAccess.ts | 2 +- packages/payload/src/auth/defaultUser.ts | 6 +- packages/payload/src/auth/executeAccess.ts | 6 +- packages/payload/src/auth/extractJWT.ts | 4 +- packages/payload/src/auth/getAccessResults.ts | 10 +-- .../payload/src/auth/getAuthenticatedUser.ts | 2 +- packages/payload/src/auth/getFieldsToSign.ts | 8 +- packages/payload/src/auth/index.ts | 6 +- .../payload/src/auth/operations/access.ts | 14 ++-- .../src/auth/operations/forgotPassword.ts | 14 ++-- packages/payload/src/auth/operations/init.ts | 2 +- .../auth/operations/local/forgotPassword.ts | 12 +-- .../src/auth/operations/local/index.ts | 10 +-- .../src/auth/operations/local/login.ts | 14 ++-- .../auth/operations/local/resetPassword.ts | 14 ++-- .../src/auth/operations/local/unlock.ts | 12 +-- .../src/auth/operations/local/verifyEmail.ts | 12 +-- packages/payload/src/auth/operations/login.ts | 32 ++++---- .../payload/src/auth/operations/logout.ts | 6 +- packages/payload/src/auth/operations/me.ts | 6 +- .../payload/src/auth/operations/refresh.ts | 18 ++--- .../src/auth/operations/registerFirstUser.ts | 16 ++-- .../src/auth/operations/resetPassword.ts | 18 ++--- .../payload/src/auth/operations/unlock.ts | 16 ++-- .../src/auth/operations/verifyEmail.ts | 12 +-- .../payload/src/auth/sendVerificationEmail.ts | 10 +-- .../payload/src/auth/strategies/apiKey.ts | 6 +- packages/payload/src/auth/strategies/jwt.ts | 4 +- .../src/auth/strategies/local/authenticate.ts | 2 +- .../local/generatePasswordSaltHash.ts | 2 +- .../local/incrementLoginAttempts.ts | 6 +- .../src/auth/strategies/local/register.ts | 10 +-- .../strategies/local/resetLoginAttempts.ts | 6 +- packages/payload/src/auth/types.ts | 4 +- packages/payload/src/bin/generateTypes.ts | 8 +- packages/payload/src/bin/index.ts | 10 +-- packages/payload/src/bin/migrate.ts | 6 +- .../payload/src/bundlers/mocks/db-mongodb.js | 0 .../payload/src/bundlers/mocks/db-postgres.js | 1 - packages/payload/src/bundlers/mocks/dotENV.js | 3 - .../payload/src/bundlers/mocks/emptyModule.js | 1 - .../payload/src/bundlers/mocks/fileMock.js | 1 - packages/payload/src/bundlers/types.ts | 9 --- .../payload/src/collections/config/build.ts | 2 +- .../src/collections/config/defaults.ts | 2 +- .../src/collections/config/sanitize.ts | 30 +++---- .../payload/src/collections/config/schema.ts | 4 +- .../payload/src/collections/config/types.ts | 21 ++--- .../payload/src/collections/dataloader.ts | 10 +-- .../src/collections/operations/create.ts | 41 +++++----- .../src/collections/operations/delete.ts | 33 ++++---- .../src/collections/operations/deleteByID.ts | 31 ++++---- .../src/collections/operations/docAccess.ts | 17 ++-- .../src/collections/operations/find.ts | 31 ++++---- .../src/collections/operations/findByID.ts | 24 +++--- .../collections/operations/findVersionByID.ts | 20 ++--- .../collections/operations/findVersions.ts | 27 ++++--- .../collections/operations/local/create.ts | 17 ++-- .../collections/operations/local/delete.ts | 18 ++--- .../src/collections/operations/local/find.ts | 13 ++-- .../collections/operations/local/findByID.ts | 12 ++- .../operations/local/findVersionByID.ts | 13 ++-- .../operations/local/findVersions.ts | 15 ++-- .../src/collections/operations/local/index.ts | 18 ++--- .../operations/local/restoreVersion.ts | 11 ++- .../collections/operations/local/update.ts | 19 +++-- .../collections/operations/restoreVersion.ts | 26 +++---- .../src/collections/operations/update.ts | 49 ++++++------ .../src/collections/operations/updateByID.ts | 46 +++++------ .../src/collections/operations/utils.ts | 28 ++++--- packages/payload/src/config/build.ts | 4 +- .../payload/src/config/createClientConfig.ts | 4 +- packages/payload/src/config/defaults.ts | 2 +- packages/payload/src/config/load.ts | 6 +- packages/payload/src/config/sanitize.ts | 18 ++--- packages/payload/src/config/schema.ts | 4 +- .../src/config/shared/adminViewSchema.ts | 2 +- packages/payload/src/config/types.ts | 20 ++--- packages/payload/src/config/validate.ts | 16 ++-- .../payload/src/database/combineQueries.ts | 4 +- .../src/database/createDatabaseAdapter.ts | 14 ++-- .../src/database/flattenWhereToOperators.ts | 2 +- .../payload/src/database/getLocalizedPaths.ts | 10 +-- .../database/migrations/createMigration.ts | 4 +- .../src/database/migrations/getMigrations.ts | 4 +- .../src/database/migrations/migrate.ts | 14 ++-- .../src/database/migrations/migrateDown.ts | 14 ++-- .../src/database/migrations/migrateRefresh.ts | 14 ++-- .../src/database/migrations/migrateReset.ts | 14 ++-- .../src/database/migrations/migrateStatus.ts | 6 +- .../migrations/migrationsCollection.ts | 2 +- .../database/migrations/readMigrationFiles.ts | 4 +- .../src/database/queryValidation/types.ts | 4 +- .../queryValidation/validateQueryPaths.ts | 20 ++--- .../queryValidation/validateSearchParams.ts | 22 +++--- packages/payload/src/database/types.ts | 9 +-- packages/payload/src/email/build.ts | 10 +-- packages/payload/src/email/defaults.ts | 2 +- packages/payload/src/email/mockHandler.ts | 6 +- .../payload/src/errors/AuthenticationError.ts | 2 +- .../payload/src/errors/DuplicateCollection.ts | 2 +- .../payload/src/errors/DuplicateFieldName.ts | 2 +- .../payload/src/errors/DuplicateGlobal.ts | 4 +- .../payload/src/errors/ErrorDeletingFile.ts | 2 +- .../payload/src/errors/FileUploadError.ts | 2 +- packages/payload/src/errors/Forbidden.ts | 2 +- .../src/errors/InvalidConfiguration.ts | 2 +- .../payload/src/errors/InvalidFieldName.ts | 2 +- .../src/errors/InvalidFieldRelationship.ts | 4 +- packages/payload/src/errors/InvalidSchema.ts | 2 +- packages/payload/src/errors/LockedAuth.ts | 2 +- .../src/errors/MissingCollectionLabel.ts | 2 +- .../src/errors/MissingFieldInputOptions.ts | 4 +- .../payload/src/errors/MissingFieldType.ts | 6 +- packages/payload/src/errors/MissingFile.ts | 2 +- packages/payload/src/errors/NotFound.ts | 2 +- packages/payload/src/errors/QueryError.ts | 2 +- .../payload/src/errors/TimestampsRequired.ts | 4 +- .../payload/src/errors/UnathorizedError.ts | 2 +- .../payload/src/errors/ValidationError.ts | 6 +- packages/payload/src/errors/index.ts | 38 ++++----- packages/payload/src/errors/types.ts | 2 +- packages/payload/src/exports/auth.ts | 10 +-- packages/payload/src/exports/config.ts | 20 ++--- packages/payload/src/exports/database.ts | 44 +++++------ packages/payload/src/exports/errors.ts | 2 +- packages/payload/src/exports/fields/index.ts | 4 +- .../payload/src/exports/fields/validations.ts | 2 +- packages/payload/src/exports/operations.ts | 56 ++++++------- packages/payload/src/exports/types.ts | 22 +++--- packages/payload/src/exports/utilities.ts | 54 ++++++------- packages/payload/src/exports/versions.ts | 18 ++--- .../src/express/middleware/errorHandler.ts | 0 .../payload/src/express/middleware/index.ts | 0 .../src/fields/baseFields/baseBlockFields.ts | 6 +- .../src/fields/baseFields/baseIDField.ts | 4 +- .../src/fields/config/sanitize.spec.ts | 4 +- .../payload/src/fields/config/sanitize.ts | 20 ++--- packages/payload/src/fields/config/schema.ts | 50 ++++++------ packages/payload/src/fields/config/types.ts | 11 ++- .../payload/src/fields/getDefaultValue.ts | 2 +- .../src/fields/hooks/afterChange/index.ts | 10 +-- .../src/fields/hooks/afterChange/promise.ts | 12 +-- .../hooks/afterChange/traverseFields.ts | 10 +-- .../src/fields/hooks/afterRead/index.ts | 10 +-- .../src/fields/hooks/afterRead/promise.ts | 20 +++-- .../relationshipPopulationPromise.ts | 6 +- .../fields/hooks/afterRead/traverseFields.ts | 10 +-- .../src/fields/hooks/beforeChange/index.ts | 13 ++-- .../src/fields/hooks/beforeChange/promise.ts | 15 ++-- .../hooks/beforeChange/traverseFields.ts | 11 ++- .../src/fields/hooks/beforeValidate/index.ts | 10 +-- .../fields/hooks/beforeValidate/promise.ts | 18 ++--- .../hooks/beforeValidate/traverseFields.ts | 10 +-- .../payload/src/fields/mergeBaseFields.ts | 4 +- .../payload/src/fields/validations.spec.ts | 4 +- packages/payload/src/fields/validations.ts | 12 +-- packages/payload/src/globals/config/build.ts | 0 .../payload/src/globals/config/sanitize.ts | 20 ++--- packages/payload/src/globals/config/schema.ts | 6 +- packages/payload/src/globals/config/types.ts | 14 ++-- .../globals/graphql/resolvers/docAccess.ts | 0 .../src/globals/operations/docAccess.ts | 17 ++-- .../payload/src/globals/operations/findOne.ts | 19 +++-- .../src/globals/operations/findVersionByID.ts | 22 +++--- .../src/globals/operations/findVersions.ts | 27 ++++--- .../src/globals/operations/local/findOne.ts | 16 ++-- .../operations/local/findVersionByID.ts | 16 ++-- .../globals/operations/local/findVersions.ts | 18 ++--- .../src/globals/operations/local/index.ts | 10 +-- .../operations/local/restoreVersion.ts | 14 ++-- .../src/globals/operations/local/update.ts | 14 ++-- .../src/globals/operations/restoreVersion.ts | 20 ++--- .../payload/src/globals/operations/update.ts | 27 ++++--- packages/payload/src/index.ts | 78 +++++++++---------- .../src/preferences/deleteUserPreferences.ts | 6 +- .../src/preferences/operations/delete.ts | 13 ++-- .../src/preferences/operations/findOne.ts | 6 +- .../src/preferences/operations/update.ts | 8 +- .../src/preferences/preferencesCollection.ts | 10 +-- .../src/preferences/requestHandlers/delete.ts | 4 +- .../preferences/requestHandlers/findOne.ts | 4 +- .../src/preferences/requestHandlers/update.ts | 4 +- packages/payload/src/preferences/types.ts | 4 +- .../payload/src/translations/getLocalI18n.ts | 2 +- packages/payload/src/types/index.ts | 10 +-- packages/payload/src/versions/baseFields.ts | 6 +- .../src/versions/buildCollectionFields.ts | 4 +- .../payload/src/versions/buildGlobalFields.ts | 14 ++-- .../src/versions/deleteCollectionVersions.ts | 6 +- .../drafts/appendVersionToQueryKey.ts | 2 +- .../drafts/replaceWithDraftIfAvailable.ts | 20 ++--- .../src/versions/enforceMaxVersions.ts | 7 +- .../versions/getLatestCollectionVersion.ts | 10 +-- .../src/versions/getLatestGlobalVersion.ts | 10 +-- packages/payload/src/versions/saveVersion.ts | 14 ++-- 208 files changed, 1178 insertions(+), 1224 deletions(-) delete mode 100644 packages/payload/src/bundlers/mocks/db-mongodb.js delete mode 100644 packages/payload/src/bundlers/mocks/db-postgres.js delete mode 100644 packages/payload/src/bundlers/mocks/dotENV.js delete mode 100644 packages/payload/src/bundlers/mocks/emptyModule.js delete mode 100644 packages/payload/src/bundlers/mocks/fileMock.js delete mode 100644 packages/payload/src/bundlers/types.ts delete mode 100644 packages/payload/src/express/middleware/errorHandler.ts delete mode 100644 packages/payload/src/express/middleware/index.ts delete mode 100644 packages/payload/src/globals/config/build.ts delete mode 100644 packages/payload/src/globals/graphql/resolvers/docAccess.ts diff --git a/packages/payload/src/admin/RichText.ts b/packages/payload/src/admin/RichText.ts index ce520ca38..266c64bf9 100644 --- a/packages/payload/src/admin/RichText.ts +++ b/packages/payload/src/admin/RichText.ts @@ -1,9 +1,9 @@ import type { JSONSchema4 } from 'json-schema' -import type { SanitizedConfig } from '../config/types' -import type { Field, RichTextField, Validate } from '../fields/config/types' -import type { PayloadRequest, RequestContext } from '../types' -import type { CellComponentProps } from './elements/Cell' +import type { SanitizedConfig } from '../config/types.d.ts' +import type { Field, RichTextField, Validate } from '../fields/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../types/index.d.ts' +import type { CellComponentProps } from './elements/Cell.d.ts' export type RichTextFieldProps< Value extends object, diff --git a/packages/payload/src/admin/elements/Cell.ts b/packages/payload/src/admin/elements/Cell.ts index f3cb8f097..25a438523 100644 --- a/packages/payload/src/admin/elements/Cell.ts +++ b/packages/payload/src/admin/elements/Cell.ts @@ -1,4 +1,4 @@ -import type { SanitizedCollectionConfig } from '../../collections/config/types' +import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts' import type { BlockField, DateField, @@ -7,7 +7,7 @@ import type { Labels, RelationshipField, SelectField, -} from '../../fields/config/types' +} from '../../fields/config/types.d.ts' export type CellProps = { /** diff --git a/packages/payload/src/admin/elements/Tab.ts b/packages/payload/src/admin/elements/Tab.ts index 4d954f669..a25d18ab1 100644 --- a/packages/payload/src/admin/elements/Tab.ts +++ b/packages/payload/src/admin/elements/Tab.ts @@ -1,8 +1,8 @@ import type { I18n } from '@payloadcms/translations' -import type { SanitizedCollectionConfig } from '../../collections/config/types' -import type { SanitizedConfig } from '../../config/types' -import type { SanitizedGlobalConfig } from '../../globals/config/types' +import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts' +import type { SanitizedConfig } from '../../config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts' export type DocumentTabProps = { apiURL?: string diff --git a/packages/payload/src/admin/forms/Form.ts b/packages/payload/src/admin/forms/Form.ts index cf1e199e1..6f19b66c1 100644 --- a/packages/payload/src/admin/forms/Form.ts +++ b/packages/payload/src/admin/forms/Form.ts @@ -1,4 +1,4 @@ -import type { ClientValidate, Field } from '../../fields/config/types' +import type { ClientValidate, Field } from '../../fields/config/types.d.ts' export type Data = { [key: string]: any diff --git a/packages/payload/src/admin/forms/RowLabel.ts b/packages/payload/src/admin/forms/RowLabel.ts index 24b52f729..0f03d4782 100644 --- a/packages/payload/src/admin/forms/RowLabel.ts +++ b/packages/payload/src/admin/forms/RowLabel.ts @@ -1,4 +1,4 @@ -import type { Data } from './Form' +import type { Data } from './Form.d.ts' export type RowLabelArgs = { data: Data diff --git a/packages/payload/src/admin/types.ts b/packages/payload/src/admin/types.ts index ebe0a33c2..a0198b58f 100644 --- a/packages/payload/src/admin/types.ts +++ b/packages/payload/src/admin/types.ts @@ -1,34 +1,34 @@ -export type { RichTextAdapter, RichTextFieldProps } from './RichText' -export type { CellComponentProps, CellProps } from './elements/Cell' -export type { ConditionalDateProps } from './elements/DatePicker' -export type { DayPickerProps, SharedProps, TimePickerProps } from './elements/DatePicker' -export type { DefaultPreviewButtonProps } from './elements/PreviewButton' -export type { CustomPreviewButtonProps } from './elements/PreviewButton' -export type { DefaultPublishButtonProps } from './elements/PublishButton' -export type { CustomPublishButtonProps } from './elements/PublishButton' -export type { DefaultSaveButtonProps } from './elements/SaveButton' -export type { CustomSaveButtonProps } from './elements/SaveButton' -export type { DefaultSaveDraftButtonProps } from './elements/SaveDraftButton' -export type { CustomSaveDraftButtonProps } from './elements/SaveDraftButton' +export type { RichTextAdapter, RichTextFieldProps } from './RichText.d.ts' +export type { CellComponentProps, CellProps } from './elements/Cell.d.ts' +export type { ConditionalDateProps } from './elements/DatePicker.d.ts' +export type { DayPickerProps, SharedProps, TimePickerProps } from './elements/DatePicker.d.ts' +export type { DefaultPreviewButtonProps } from './elements/PreviewButton.d.ts' +export type { CustomPreviewButtonProps } from './elements/PreviewButton.d.ts' +export type { DefaultPublishButtonProps } from './elements/PublishButton.d.ts' +export type { CustomPublishButtonProps } from './elements/PublishButton.d.ts' +export type { DefaultSaveButtonProps } from './elements/SaveButton.d.ts' +export type { CustomSaveButtonProps } from './elements/SaveButton.d.ts' +export type { DefaultSaveDraftButtonProps } from './elements/SaveDraftButton.d.ts' +export type { CustomSaveDraftButtonProps } from './elements/SaveDraftButton.d.ts' export type { DocumentTab, DocumentTabComponent, DocumentTabCondition, DocumentTabConfig, DocumentTabProps, -} from './elements/Tab' -export type { ErrorProps } from './forms/Error' +} from './elements/Tab.d.ts' +export type { ErrorProps } from './forms/Error.d.ts' export type { Description, DescriptionComponent, DescriptionFunction, -} from './forms/FieldDescription' -export type { Data, FormField, FormState, Row } from './forms/Form' -export type { LabelProps } from './forms/Label' -export type { RowLabel, RowLabelComponent } from './forms/RowLabel' +} from './forms/FieldDescription.d.ts' +export type { Data, FormField, FormState, Row } from './forms/Form.d.ts' +export type { LabelProps } from './forms/Label.d.ts' +export type { RowLabel, RowLabelComponent } from './forms/RowLabel.d.ts' export type { AdminViewComponent, EditViewProps, InitPageResult, ServerSideEditViewProps, -} from './views/types' +} from './views/types.d.ts' diff --git a/packages/payload/src/admin/views/types.ts b/packages/payload/src/admin/views/types.ts index 9ab059cc0..7658cb961 100644 --- a/packages/payload/src/admin/views/types.ts +++ b/packages/payload/src/admin/views/types.ts @@ -1,9 +1,9 @@ import type { Translations } from '@payloadcms/translations' -import type { Permissions, User } from '../../auth' -import type { SanitizedCollectionConfig } from '../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../globals/config/types' -import type { PayloadRequest } from '../../types' +import type { Permissions, User } from '../../auth/index.js' +import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' export type AdminViewConfig = { Component: AdminViewComponent diff --git a/packages/payload/src/auth/baseFields/accountLock.ts b/packages/payload/src/auth/baseFields/accountLock.ts index 4af850f88..756d37ca7 100644 --- a/packages/payload/src/auth/baseFields/accountLock.ts +++ b/packages/payload/src/auth/baseFields/accountLock.ts @@ -1,15 +1,15 @@ -import type { Field } from '../../fields/config/types' +import type { Field } from '../../fields/config/types.d.ts' export default [ { name: 'loginAttempts', + type: 'number', defaultValue: 0, hidden: true, - type: 'number', }, { name: 'lockUntil', - hidden: true, type: 'date', + hidden: true, }, ] as Field[] diff --git a/packages/payload/src/auth/baseFields/apiKey.ts b/packages/payload/src/auth/baseFields/apiKey.ts index 7e525e9ff..7d973e9b6 100644 --- a/packages/payload/src/auth/baseFields/apiKey.ts +++ b/packages/payload/src/auth/baseFields/apiKey.ts @@ -1,8 +1,8 @@ import crypto from 'crypto' -import type { Field, FieldHook } from '../../fields/config/types' +import type { Field, FieldHook } from '../../fields/config/types.d.ts' -import { extractTranslations } from '../../translations/extractTranslations' +import { extractTranslations } from '../../translations/extractTranslations.js' const labels = extractTranslations(['authentication:enableAPIKey', 'authentication:apiKey']) diff --git a/packages/payload/src/auth/baseFields/auth.ts b/packages/payload/src/auth/baseFields/auth.ts index b3425880d..66a511d74 100644 --- a/packages/payload/src/auth/baseFields/auth.ts +++ b/packages/payload/src/auth/baseFields/auth.ts @@ -1,7 +1,7 @@ -import type { Field } from '../../fields/config/types' +import type { Field } from '../../fields/config/types.d.ts' -import { email } from '../../fields/validations' -import { extractTranslations } from '../../translations/extractTranslations' +import { email } from '../../fields/validations.js' +import { extractTranslations } from '../../translations/extractTranslations.js' const labels = extractTranslations(['general:email']) diff --git a/packages/payload/src/auth/baseFields/verification.ts b/packages/payload/src/auth/baseFields/verification.ts index afebb4d11..795010d53 100644 --- a/packages/payload/src/auth/baseFields/verification.ts +++ b/packages/payload/src/auth/baseFields/verification.ts @@ -1,6 +1,6 @@ -import type { Field, FieldHook } from '../../fields/config/types' +import type { Field, FieldHook } from '../../fields/config/types.d.ts' -import { extractTranslations } from '../../translations/extractTranslations' +import { extractTranslations } from '../../translations/extractTranslations.js' const labels = extractTranslations(['authentication:verified']) @@ -22,6 +22,7 @@ const autoRemoveVerificationToken: FieldHook = ({ data, operation, originalDoc, export default [ { name: '_verified', + type: 'checkbox', access: { create: ({ req: { user } }) => Boolean(user), read: ({ req: { user } }) => Boolean(user), @@ -33,14 +34,13 @@ export default [ }, }, label: labels['authentication:verified'], - type: 'checkbox', }, { name: '_verificationToken', + type: 'text', hidden: true, hooks: { beforeChange: [autoRemoveVerificationToken], }, - type: 'text', }, ] as Field[] diff --git a/packages/payload/src/auth/cookies.ts b/packages/payload/src/auth/cookies.ts index cf70c6e0b..867cc3248 100644 --- a/packages/payload/src/auth/cookies.ts +++ b/packages/payload/src/auth/cookies.ts @@ -1,5 +1,5 @@ -import type { Payload } from '..' -import type { SanitizedCollectionConfig } from './../collections/config/types' +import type { Payload } from '../index.d.ts' +import type { SanitizedCollectionConfig } from './../collections/config/types.d.ts' type CookieOptions = { domain?: string expires?: Date @@ -84,8 +84,8 @@ export const generatePayloadCookie = ({ typeof collectionConfig.auth.cookies.sameSite === 'string' ? collectionConfig.auth.cookies.sameSite : collectionConfig.auth.cookies.sameSite - ? 'Strict' - : undefined + ? 'Strict' + : undefined return generateCookie({ name: `${payload.config.cookiePrefix}-token`, @@ -107,8 +107,8 @@ export const generateExpiredPayloadCookie = ({ typeof collectionConfig.auth.cookies.sameSite === 'string' ? collectionConfig.auth.cookies.sameSite : collectionConfig.auth.cookies.sameSite - ? 'Strict' - : undefined + ? 'Strict' + : undefined const expires = new Date(Date.now() - 1000) diff --git a/packages/payload/src/auth/defaultAccess.ts b/packages/payload/src/auth/defaultAccess.ts index 408dbe553..a4e9a9d94 100644 --- a/packages/payload/src/auth/defaultAccess.ts +++ b/packages/payload/src/auth/defaultAccess.ts @@ -1,3 +1,3 @@ -import type { PayloadRequest } from '../types' +import type { PayloadRequest } from '../types/index.d.ts' export default ({ req: { user } }: { req: PayloadRequest }): boolean => Boolean(user) diff --git a/packages/payload/src/auth/defaultUser.ts b/packages/payload/src/auth/defaultUser.ts index 3b95f6eb3..1836711c9 100644 --- a/packages/payload/src/auth/defaultUser.ts +++ b/packages/payload/src/auth/defaultUser.ts @@ -1,10 +1,11 @@ -import type { CollectionConfig } from '../collections/config/types' +import type { CollectionConfig } from '../collections/config/types.d.ts' -import { extractTranslations } from '../translations/extractTranslations' +import { extractTranslations } from '../translations/extractTranslations.js' const labels = extractTranslations(['general:user', 'general:users']) export const defaultUserCollection: CollectionConfig = { + slug: 'users', admin: { useAsTitle: 'email', }, @@ -16,5 +17,4 @@ export const defaultUserCollection: CollectionConfig = { plural: labels['general:users'], singular: labels['general:user'], }, - slug: 'users', } diff --git a/packages/payload/src/auth/executeAccess.ts b/packages/payload/src/auth/executeAccess.ts index 0b26f2ff6..439c61644 100644 --- a/packages/payload/src/auth/executeAccess.ts +++ b/packages/payload/src/auth/executeAccess.ts @@ -1,7 +1,7 @@ -import type { Access, AccessResult } from '../config/types' -import type { PayloadRequest } from '../exports/types' +import type { Access, AccessResult } from '../config/types.d.ts' +import type { PayloadRequest } from '../exports/types.d.ts' -import { Forbidden } from '../errors' +import { Forbidden } from '../errors/index.js' type OperationArgs = { data?: any diff --git a/packages/payload/src/auth/extractJWT.ts b/packages/payload/src/auth/extractJWT.ts index 4abe15472..87edf4175 100644 --- a/packages/payload/src/auth/extractJWT.ts +++ b/packages/payload/src/auth/extractJWT.ts @@ -1,6 +1,6 @@ -import type { AuthStrategyFunctionArgs } from '.' +import type { AuthStrategyFunctionArgs } from './index.d.ts' -import { parseCookies } from '../utilities/parseCookies' +import { parseCookies } from '../utilities/parseCookies.js' export const extractJWT = ( args: Pick, diff --git a/packages/payload/src/auth/getAccessResults.ts b/packages/payload/src/auth/getAccessResults.ts index 2d75b30ae..e76c5c7ce 100644 --- a/packages/payload/src/auth/getAccessResults.ts +++ b/packages/payload/src/auth/getAccessResults.ts @@ -1,7 +1,7 @@ -import type { AllOperations, PayloadRequest } from '../types' -import type { Permissions } from './types' +import type { AllOperations, PayloadRequest } from '../types/index.d.ts' +import type { Permissions } from './types.d.ts' -import { getEntityPolicies } from '../utilities/getEntityPolicies' +import { getEntityPolicies } from '../utilities/getEntityPolicies.js' type GetAccessResultsArgs = { req: PayloadRequest @@ -44,10 +44,10 @@ export async function getAccessResults({ req }: GetAccessResultsArgs): Promise

diff --git a/packages/payload/src/auth/index.ts b/packages/payload/src/auth/index.ts index 70a2024b2..6b6bbec0d 100644 --- a/packages/payload/src/auth/index.ts +++ b/packages/payload/src/auth/index.ts @@ -1,4 +1,4 @@ -export * from './types' +export * from './types.js' -export { extractJWT } from './extractJWT' -export * from './cookies' +export { extractJWT } from './extractJWT.js' +export * from './cookies.js' diff --git a/packages/payload/src/auth/operations/access.ts b/packages/payload/src/auth/operations/access.ts index 17b95a098..15ab2a8eb 100644 --- a/packages/payload/src/auth/operations/access.ts +++ b/packages/payload/src/auth/operations/access.ts @@ -1,11 +1,11 @@ -import type { PayloadRequest } from '../../types' -import type { Permissions } from '../types' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { Permissions } from '../types.d.ts' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { adminInit as adminInitTelemetry } from '../../utilities/telemetry/events/adminInit' -import { getAccessResults } from '../getAccessResults' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { adminInit as adminInitTelemetry } from '../../utilities/telemetry/events/adminInit.js' +import { getAccessResults } from '../getAccessResults.js' type Arguments = { req: PayloadRequest diff --git a/packages/payload/src/auth/operations/forgotPassword.ts b/packages/payload/src/auth/operations/forgotPassword.ts index 51ab8e905..1651a4725 100644 --- a/packages/payload/src/auth/operations/forgotPassword.ts +++ b/packages/payload/src/auth/operations/forgotPassword.ts @@ -1,14 +1,14 @@ import crypto from 'crypto' import { URL } from 'url' -import type { Collection } from '../../collections/config/types' -import type { PayloadRequest } from '../../types' +import type { Collection } from '../../collections/config/types.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' -import { buildAfterOperation } from '../../collections/operations/utils' -import { APIError } from '../../errors' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' +import { buildAfterOperation } from '../../collections/operations/utils.js' +import { APIError } from '../../errors/index.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' export type Arguments = { collection: Collection diff --git a/packages/payload/src/auth/operations/init.ts b/packages/payload/src/auth/operations/init.ts index 24989db74..e3949544f 100644 --- a/packages/payload/src/auth/operations/init.ts +++ b/packages/payload/src/auth/operations/init.ts @@ -1,4 +1,4 @@ -import type { PayloadRequest } from '../../types' +import type { PayloadRequest } from '../../types/index.d.ts' export const initOperation = async (args: { collection: string diff --git a/packages/payload/src/auth/operations/local/forgotPassword.ts b/packages/payload/src/auth/operations/local/forgotPassword.ts index be6961aff..ec23168fe 100644 --- a/packages/payload/src/auth/operations/local/forgotPassword.ts +++ b/packages/payload/src/auth/operations/local/forgotPassword.ts @@ -1,10 +1,10 @@ -import type { GeneratedTypes, Payload, RequestContext } from '../../..' -import type { PayloadRequest } from '../../../types' -import type { Result } from '../forgotPassword' +import type { GeneratedTypes, Payload, RequestContext } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' +import type { Result } from '../forgotPassword.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { forgotPasswordOperation } from '../forgotPassword' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { forgotPasswordOperation } from '../forgotPassword.js' export type Options = { collection: T diff --git a/packages/payload/src/auth/operations/local/index.ts b/packages/payload/src/auth/operations/local/index.ts index b5137a5f4..0170fef47 100644 --- a/packages/payload/src/auth/operations/local/index.ts +++ b/packages/payload/src/auth/operations/local/index.ts @@ -1,8 +1,8 @@ -import forgotPassword from './forgotPassword' -import login from './login' -import resetPassword from './resetPassword' -import unlock from './unlock' -import verifyEmail from './verifyEmail' +import forgotPassword from './forgotPassword.js' +import login from './login.js' +import resetPassword from './resetPassword.js' +import unlock from './unlock.js' +import verifyEmail from './verifyEmail.js' export default { forgotPassword, diff --git a/packages/payload/src/auth/operations/local/login.ts b/packages/payload/src/auth/operations/local/login.ts index 6adda48a0..336e41d65 100644 --- a/packages/payload/src/auth/operations/local/login.ts +++ b/packages/payload/src/auth/operations/local/login.ts @@ -1,11 +1,11 @@ -import type { Payload, RequestContext } from '../../..' -import type { GeneratedTypes } from '../../../index' -import type { PayloadRequest } from '../../../types' -import type { Result } from '../login' +import type { Payload, RequestContext } from '../../../index.d.ts' +import type { GeneratedTypes } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' +import type { Result } from '../login.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { loginOperation } from '../login' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { loginOperation } from '../login.js' export type Options = { collection: TSlug diff --git a/packages/payload/src/auth/operations/local/resetPassword.ts b/packages/payload/src/auth/operations/local/resetPassword.ts index 793b7890e..5dc0dbc73 100644 --- a/packages/payload/src/auth/operations/local/resetPassword.ts +++ b/packages/payload/src/auth/operations/local/resetPassword.ts @@ -1,11 +1,11 @@ -import type { Payload, RequestContext } from '../../..' -import type { GeneratedTypes } from '../../../' -import type { PayloadRequest } from '../../../types' -import type { Result } from '../resetPassword' +import type { Payload, RequestContext } from '../../../index.d.ts' +import type { GeneratedTypes } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' +import type { Result } from '../resetPassword.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { resetPasswordOperation } from '../resetPassword' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { resetPasswordOperation } from '../resetPassword.js' export type Options = { collection: T diff --git a/packages/payload/src/auth/operations/local/unlock.ts b/packages/payload/src/auth/operations/local/unlock.ts index a07046ebc..44aed75bf 100644 --- a/packages/payload/src/auth/operations/local/unlock.ts +++ b/packages/payload/src/auth/operations/local/unlock.ts @@ -1,10 +1,10 @@ -import type { Payload, RequestContext } from '../../..' -import type { GeneratedTypes } from '../../../' -import type { PayloadRequest } from '../../../types' +import type { Payload, RequestContext } from '../../../index.d.ts' +import type { GeneratedTypes } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { unlockOperation } from '../unlock' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { unlockOperation } from '../unlock.js' export type Options = { collection: T diff --git a/packages/payload/src/auth/operations/local/verifyEmail.ts b/packages/payload/src/auth/operations/local/verifyEmail.ts index a4b2b29d2..dc211f22c 100644 --- a/packages/payload/src/auth/operations/local/verifyEmail.ts +++ b/packages/payload/src/auth/operations/local/verifyEmail.ts @@ -1,10 +1,10 @@ -import type { Payload, RequestContext } from '../../..' -import type { GeneratedTypes } from '../../../' -import type { PayloadRequest } from '../../../types' +import type { Payload, RequestContext } from '../../../index.d.ts' +import type { GeneratedTypes } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { verifyEmailOperation } from '../verifyEmail' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { verifyEmailOperation } from '../verifyEmail.js' export type Options = { collection: T diff --git a/packages/payload/src/auth/operations/login.ts b/packages/payload/src/auth/operations/login.ts index 57f0d90e5..c37931bb4 100644 --- a/packages/payload/src/auth/operations/login.ts +++ b/packages/payload/src/auth/operations/login.ts @@ -1,22 +1,22 @@ import jwt from 'jsonwebtoken' -import type { GeneratedTypes } from '../../' -import type { Collection } from '../../collections/config/types' -import type { PayloadRequest } from '../../types' -import type { User } from '../types' +import type { Collection } from '../../collections/config/types.d.ts' +import type { GeneratedTypes } from '../../index.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { User } from '../types.d.ts' -import { buildAfterOperation } from '../../collections/operations/utils' -import { AuthenticationError, LockedAuth } from '../../errors' -import { afterRead } from '../../fields/hooks/afterRead' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import sanitizeInternalFields from '../../utilities/sanitizeInternalFields' -import { getFieldsToSign } from '../getFieldsToSign' -import isLocked from '../isLocked' -import { authenticateLocalStrategy } from '../strategies/local/authenticate' -import { incrementLoginAttempts } from '../strategies/local/incrementLoginAttempts' -import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts' +import { buildAfterOperation } from '../../collections/operations/utils.js' +import { AuthenticationError, LockedAuth } from '../../errors/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js' +import { getFieldsToSign } from '../getFieldsToSign.js' +import isLocked from '../isLocked.js' +import { authenticateLocalStrategy } from '../strategies/local/authenticate.js' +import { incrementLoginAttempts } from '../strategies/local/incrementLoginAttempts.js' +import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts.js' export type Result = { exp?: number diff --git a/packages/payload/src/auth/operations/logout.ts b/packages/payload/src/auth/operations/logout.ts index 462d6a8e7..770107667 100644 --- a/packages/payload/src/auth/operations/logout.ts +++ b/packages/payload/src/auth/operations/logout.ts @@ -1,9 +1,9 @@ import httpStatus from 'http-status' -import type { Collection } from '../../collections/config/types' -import type { PayloadRequest } from '../../types' +import type { Collection } from '../../collections/config/types.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' -import { APIError } from '../../errors' +import { APIError } from '../../errors/index.js' export type Arguments = { collection: Collection diff --git a/packages/payload/src/auth/operations/me.ts b/packages/payload/src/auth/operations/me.ts index 91159e518..394bd301c 100644 --- a/packages/payload/src/auth/operations/me.ts +++ b/packages/payload/src/auth/operations/me.ts @@ -1,8 +1,8 @@ import jwt from 'jsonwebtoken' -import type { Collection } from '../../collections/config/types' -import type { PayloadRequest } from '../../types' -import type { User } from '../types' +import type { Collection } from '../../collections/config/types.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { User } from '../types.d.ts' export type Result = { collection?: string diff --git a/packages/payload/src/auth/operations/refresh.ts b/packages/payload/src/auth/operations/refresh.ts index 235907805..e91533d90 100644 --- a/packages/payload/src/auth/operations/refresh.ts +++ b/packages/payload/src/auth/operations/refresh.ts @@ -1,16 +1,16 @@ import jwt from 'jsonwebtoken' import url from 'url' -import type { BeforeOperationHook, Collection } from '../../collections/config/types' -import type { PayloadRequest } from '../../types' -import type { Document } from '../../types' +import type { BeforeOperationHook, Collection } from '../../collections/config/types.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { Document } from '../../types/index.d.ts' -import { buildAfterOperation } from '../../collections/operations/utils' -import { Forbidden } from '../../errors' -import { getFieldsToSign } from '../getFieldsToSign' -import { initTransaction } from '../../utilities/initTransaction' -import { commitTransaction } from '../../utilities/commitTransaction' -import { killTransaction } from '../../utilities/killTransaction' +import { buildAfterOperation } from '../../collections/operations/utils.js' +import { Forbidden } from '../../errors/index.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getFieldsToSign } from '../getFieldsToSign.js' export type Result = { exp: number diff --git a/packages/payload/src/auth/operations/registerFirstUser.ts b/packages/payload/src/auth/operations/registerFirstUser.ts index c8c8a7ce2..814cf4e75 100644 --- a/packages/payload/src/auth/operations/registerFirstUser.ts +++ b/packages/payload/src/auth/operations/registerFirstUser.ts @@ -1,13 +1,13 @@ import type { MarkOptional } from 'ts-essentials' -import type { GeneratedTypes } from '../../' -import type { Collection } from '../../collections/config/types' -import type { PayloadRequest } from '../../types' +import type { Collection } from '../../collections/config/types.d.ts' +import type { GeneratedTypes } from '../../index.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' -import { Forbidden } from '../../errors' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' +import { Forbidden } from '../../errors/index.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' export type Arguments = { collection: Collection @@ -31,8 +31,8 @@ export const registerFirstUserOperation = async diff --git a/packages/payload/src/auth/strategies/jwt.ts b/packages/payload/src/auth/strategies/jwt.ts index cc0a4adc5..6d6d4e2dd 100644 --- a/packages/payload/src/auth/strategies/jwt.ts +++ b/packages/payload/src/auth/strategies/jwt.ts @@ -1,8 +1,8 @@ import jwt from 'jsonwebtoken' -import type { AuthStrategyFunction, User } from '..' +import type { AuthStrategyFunction, User } from '../index.d.ts' -import { extractJWT } from '../extractJWT' +import { extractJWT } from '../extractJWT.js' type JWTToken = { collection: string diff --git a/packages/payload/src/auth/strategies/local/authenticate.ts b/packages/payload/src/auth/strategies/local/authenticate.ts index 350bd2ec4..25d951f14 100644 --- a/packages/payload/src/auth/strategies/local/authenticate.ts +++ b/packages/payload/src/auth/strategies/local/authenticate.ts @@ -1,7 +1,7 @@ import crypto from 'crypto' import scmp from 'scmp' -import type { TypeWithID } from '../../../collections/config/types' +import type { TypeWithID } from '../../../collections/config/types.d.ts' type Doc = TypeWithID & Record diff --git a/packages/payload/src/auth/strategies/local/generatePasswordSaltHash.ts b/packages/payload/src/auth/strategies/local/generatePasswordSaltHash.ts index 579832a6c..967d97d7b 100644 --- a/packages/payload/src/auth/strategies/local/generatePasswordSaltHash.ts +++ b/packages/payload/src/auth/strategies/local/generatePasswordSaltHash.ts @@ -1,6 +1,6 @@ import crypto from 'crypto' -import { ValidationError } from '../../../errors' +import { ValidationError } from '../../../errors/index.js' const defaultPasswordValidator = (password: string): string | true => { if (!password) return 'No password was given' diff --git a/packages/payload/src/auth/strategies/local/incrementLoginAttempts.ts b/packages/payload/src/auth/strategies/local/incrementLoginAttempts.ts index c142dde7d..2be1557c6 100644 --- a/packages/payload/src/auth/strategies/local/incrementLoginAttempts.ts +++ b/packages/payload/src/auth/strategies/local/incrementLoginAttempts.ts @@ -1,6 +1,6 @@ -import type { Payload } from '../../..' -import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types' -import type { PayloadRequest } from '../../../types' +import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types.d.ts' +import type { Payload } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' type Args = { collection: SanitizedCollectionConfig diff --git a/packages/payload/src/auth/strategies/local/register.ts b/packages/payload/src/auth/strategies/local/register.ts index 9689294b0..9fd3ba5a0 100644 --- a/packages/payload/src/auth/strategies/local/register.ts +++ b/packages/payload/src/auth/strategies/local/register.ts @@ -1,9 +1,9 @@ -import type { Payload } from '../../..' -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { PayloadRequest } from '../../../types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { Payload } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' -import { ValidationError } from '../../../errors' -import { generatePasswordSaltHash } from './generatePasswordSaltHash' +import { ValidationError } from '../../../errors/index.js' +import { generatePasswordSaltHash } from './generatePasswordSaltHash.js' type Args = { collection: SanitizedCollectionConfig diff --git a/packages/payload/src/auth/strategies/local/resetLoginAttempts.ts b/packages/payload/src/auth/strategies/local/resetLoginAttempts.ts index 5d55626e8..cff6cff0c 100644 --- a/packages/payload/src/auth/strategies/local/resetLoginAttempts.ts +++ b/packages/payload/src/auth/strategies/local/resetLoginAttempts.ts @@ -1,6 +1,6 @@ -import type { Payload } from '../../..' -import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types' -import type { PayloadRequest } from '../../../types' +import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types.d.ts' +import type { Payload } from '../../../index.d.ts' +import type { PayloadRequest } from '../../../types/index.d.ts' type Args = { collection: SanitizedCollectionConfig diff --git a/packages/payload/src/auth/types.ts b/packages/payload/src/auth/types.ts index 952062565..5b094fe72 100644 --- a/packages/payload/src/auth/types.ts +++ b/packages/payload/src/auth/types.ts @@ -1,7 +1,7 @@ import type { DeepRequired } from 'ts-essentials' -import type { Payload } from '../' -import type { PayloadRequest, Where } from '../types' +import type { Payload } from '../index.d.ts' +import type { PayloadRequest, Where } from '../types/index.d.ts' export type Permission = { permission: boolean diff --git a/packages/payload/src/bin/generateTypes.ts b/packages/payload/src/bin/generateTypes.ts index d495f98c5..d1c4c5f00 100644 --- a/packages/payload/src/bin/generateTypes.ts +++ b/packages/payload/src/bin/generateTypes.ts @@ -2,11 +2,11 @@ import fs from 'fs' import { compile } from 'json-schema-to-typescript' -import type { SanitizedConfig } from '../config/types' +import type { SanitizedConfig } from '../config/types.d.ts' -import loadConfig from '../config/load' -import { configToJSONSchema } from '../utilities/configToJSONSchema' -import Logger from '../utilities/logger' +import loadConfig from '../config/load.js' +import { configToJSONSchema } from '../utilities/configToJSONSchema.js' +import Logger from '../utilities/logger.js' export function generateTypes(config: SanitizedConfig): void { const logger = Logger() diff --git a/packages/payload/src/bin/index.ts b/packages/payload/src/bin/index.ts index 8cebf521b..e10991634 100755 --- a/packages/payload/src/bin/index.ts +++ b/packages/payload/src/bin/index.ts @@ -1,11 +1,11 @@ import minimist from 'minimist' -import type { BinScript } from '../config/types' +import type { BinScript } from '../config/types.d.ts' -import loadConfig from '../config/load' -import { generateTypes } from './generateTypes' -import { loadEnv } from './loadEnv' -import { migrate } from './migrate' +import loadConfig from '../config/load.js' +import { generateTypes } from './generateTypes.js' +import { loadEnv } from './loadEnv.js' +import { migrate } from './migrate.js' loadEnv() diff --git a/packages/payload/src/bin/migrate.ts b/packages/payload/src/bin/migrate.ts index d3a2d8e75..c01fda969 100644 --- a/packages/payload/src/bin/migrate.ts +++ b/packages/payload/src/bin/migrate.ts @@ -2,9 +2,9 @@ import type { ParsedArgs } from 'minimist' import minimist from 'minimist' -import payload from '..' -import loadConfig from '../config/load' -import { prettySyncLoggerDestination } from '../utilities/logger' +import loadConfig from '../config/load.js' +import payload from '../index.js' +import { prettySyncLoggerDestination } from '../utilities/logger.js' /** * The default logger's options did not allow for forcing sync logging diff --git a/packages/payload/src/bundlers/mocks/db-mongodb.js b/packages/payload/src/bundlers/mocks/db-mongodb.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/payload/src/bundlers/mocks/db-postgres.js b/packages/payload/src/bundlers/mocks/db-postgres.js deleted file mode 100644 index 9773c71ba..000000000 --- a/packages/payload/src/bundlers/mocks/db-postgres.js +++ /dev/null @@ -1 +0,0 @@ -export const postgresAdapter = () => ({}) diff --git a/packages/payload/src/bundlers/mocks/dotENV.js b/packages/payload/src/bundlers/mocks/dotENV.js deleted file mode 100644 index 9ddda98f1..000000000 --- a/packages/payload/src/bundlers/mocks/dotENV.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - config: () => null, -} diff --git a/packages/payload/src/bundlers/mocks/emptyModule.js b/packages/payload/src/bundlers/mocks/emptyModule.js deleted file mode 100644 index ead516c97..000000000 --- a/packages/payload/src/bundlers/mocks/emptyModule.js +++ /dev/null @@ -1 +0,0 @@ -export default () => {} diff --git a/packages/payload/src/bundlers/mocks/fileMock.js b/packages/payload/src/bundlers/mocks/fileMock.js deleted file mode 100644 index e25c9a3dc..000000000 --- a/packages/payload/src/bundlers/mocks/fileMock.js +++ /dev/null @@ -1 +0,0 @@ -export default 'file-stub' diff --git a/packages/payload/src/bundlers/types.ts b/packages/payload/src/bundlers/types.ts deleted file mode 100644 index 4d3befc06..000000000 --- a/packages/payload/src/bundlers/types.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { PayloadHandler, SanitizedConfig } from 'payload/config' - -import type { Payload } from '../types' - -export interface PayloadBundler { - build: (payloadConfig: SanitizedConfig) => Promise // used in `payload build` - dev: (payload: Payload) => Promise // this would be a typical Express middleware handler - serve: (payload: Payload) => Promise // serve built files in production -} diff --git a/packages/payload/src/collections/config/build.ts b/packages/payload/src/collections/config/build.ts index 5e0aea323..abadfa14d 100644 --- a/packages/payload/src/collections/config/build.ts +++ b/packages/payload/src/collections/config/build.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from './types' +import type { CollectionConfig } from './types.d.ts' const buildCollection = (collection: CollectionConfig): CollectionConfig => collection diff --git a/packages/payload/src/collections/config/defaults.ts b/packages/payload/src/collections/config/defaults.ts index 166186041..696e14476 100644 --- a/packages/payload/src/collections/config/defaults.ts +++ b/packages/payload/src/collections/config/defaults.ts @@ -1,4 +1,4 @@ -import defaultAccess from '../../auth/defaultAccess' +import defaultAccess from '../../auth/defaultAccess.js' export const defaults = { access: { diff --git a/packages/payload/src/collections/config/sanitize.ts b/packages/payload/src/collections/config/sanitize.ts index 1a63b145f..4d6ef7625 100644 --- a/packages/payload/src/collections/config/sanitize.ts +++ b/packages/payload/src/collections/config/sanitize.ts @@ -1,22 +1,22 @@ import merge from 'deepmerge' import { isPlainObject } from 'is-plain-object' -import type { Config } from '../../config/types' -import type { CollectionConfig, SanitizedCollectionConfig } from './types' +import type { Config } from '../../config/types.d.ts' +import type { CollectionConfig, SanitizedCollectionConfig } from './types.d.ts' -import baseAccountLockFields from '../../auth/baseFields/accountLock' -import baseAPIKeyFields from '../../auth/baseFields/apiKey' -import baseAuthFields from '../../auth/baseFields/auth' -import baseVerificationFields from '../../auth/baseFields/verification' -import TimestampsRequired from '../../errors/TimestampsRequired' -import { sanitizeFields } from '../../fields/config/sanitize' -import { fieldAffectsData } from '../../fields/config/types' -import mergeBaseFields from '../../fields/mergeBaseFields' -import { extractTranslations } from '../../translations/extractTranslations' -import getBaseUploadFields from '../../uploads/getBaseFields' -import { formatLabels } from '../../utilities/formatLabels' -import baseVersionFields from '../../versions/baseFields' -import { authDefaults, defaults } from './defaults' +import baseAccountLockFields from '../../auth/baseFields/accountLock.js' +import baseAPIKeyFields from '../../auth/baseFields/apiKey.js' +import baseAuthFields from '../../auth/baseFields/auth.js' +import baseVerificationFields from '../../auth/baseFields/verification.js' +import TimestampsRequired from '../../errors/TimestampsRequired.js' +import { sanitizeFields } from '../../fields/config/sanitize.js' +import { fieldAffectsData } from '../../fields/config/types.js' +import mergeBaseFields from '../../fields/mergeBaseFields.js' +import { extractTranslations } from '../../translations/extractTranslations.js' +import getBaseUploadFields from '../../uploads/getBaseFields.js' +import { formatLabels } from '../../utilities/formatLabels.js' +import baseVersionFields from '../../versions/baseFields.js' +import { authDefaults, defaults } from './defaults.js' const translations = extractTranslations(['general:createdAt', 'general:updatedAt']) diff --git a/packages/payload/src/collections/config/schema.ts b/packages/payload/src/collections/config/schema.ts index c225fee51..00d97825d 100644 --- a/packages/payload/src/collections/config/schema.ts +++ b/packages/payload/src/collections/config/schema.ts @@ -1,11 +1,11 @@ import joi from 'joi' -import { endpointsSchema } from '../../config/schema' +import { endpointsSchema } from '../../config/schema.js' import { componentSchema, customViewSchema, livePreviewSchema, -} from '../../config/shared/componentSchema' +} from '../../config/shared/componentSchema.js' const strategyBaseSchema = joi.object().keys({ logout: joi.boolean(), diff --git a/packages/payload/src/collections/config/types.ts b/packages/payload/src/collections/config/types.ts index bbc5989b2..0c40addd4 100644 --- a/packages/payload/src/collections/config/types.ts +++ b/packages/payload/src/collections/config/types.ts @@ -1,14 +1,13 @@ import type { GraphQLInputObjectType, GraphQLNonNull, GraphQLObjectType } from 'graphql' import type { DeepRequired } from 'ts-essentials' -import type { GeneratedTypes } from '../../' import type { CustomPreviewButtonProps, CustomPublishButtonProps, CustomSaveButtonProps, CustomSaveDraftButtonProps, -} from '../../admin/types' -import type { Auth, IncomingAuthType, User } from '../../auth/types' +} from '../../admin/types.d.ts' +import type { Auth, IncomingAuthType, User } from '../../auth/types.d.ts' import type { Access, EditViewComponent, @@ -17,12 +16,16 @@ import type { EntityDescription, GeneratePreviewURL, LivePreviewConfig, -} from '../../config/types' -import type { Field } from '../../fields/config/types' -import type { PayloadRequest, RequestContext } from '../../types' -import type { SanitizedUploadConfig, UploadConfig } from '../../uploads/types' -import type { IncomingCollectionVersions, SanitizedCollectionVersions } from '../../versions/types' -import type { AfterOperationArg, AfterOperationMap } from '../operations/utils' +} from '../../config/types.d.ts' +import type { Field } from '../../fields/config/types.d.ts' +import type { GeneratedTypes } from '../../index.d.ts' +import type { PayloadRequest, RequestContext } from '../../types/index.d.ts' +import type { SanitizedUploadConfig, UploadConfig } from '../../uploads/types.d.ts' +import type { + IncomingCollectionVersions, + SanitizedCollectionVersions, +} from '../../versions/types.d.ts' +import type { AfterOperationArg, AfterOperationMap } from '../operations/utils.d.ts' export type HookOperationType = | 'autosave' diff --git a/packages/payload/src/collections/dataloader.ts b/packages/payload/src/collections/dataloader.ts index 6987018fa..223452d71 100644 --- a/packages/payload/src/collections/dataloader.ts +++ b/packages/payload/src/collections/dataloader.ts @@ -2,12 +2,12 @@ import type { BatchLoadFn } from 'dataloader' import DataLoader from 'dataloader' -import type { PayloadRequest } from '../types' -import type { TypeWithID } from './config/types' +import type { PayloadRequest } from '../types/index.d.ts' +import type { TypeWithID } from './config/types.d.ts' -import { fieldAffectsData } from '../fields/config/types' -import { getIDType } from '../utilities/getIDType' -import { isValidID } from '../utilities/isValidID' +import { fieldAffectsData } from '../fields/config/types.js' +import { getIDType } from '../utilities/getIDType.js' +import { isValidID } from '../utilities/isValidID.js' // Payload uses `dataloader` to solve the classic GraphQL N+1 problem. diff --git a/packages/payload/src/collections/operations/create.ts b/packages/payload/src/collections/operations/create.ts index 3e39dc925..9be1f4800 100644 --- a/packages/payload/src/collections/operations/create.ts +++ b/packages/payload/src/collections/operations/create.ts @@ -2,33 +2,32 @@ import type { MarkOptional } from 'ts-essentials' import crypto from 'crypto' -import type { GeneratedTypes } from '../../' -import type { PayloadRequest } from '../../types' -import type { Document } from '../../types' +import type { GeneratedTypes } from '../../index.d.ts' +import type { Document, PayloadRequest } from '../../types/index.d.ts' import type { AfterChangeHook, BeforeOperationHook, BeforeValidateHook, Collection, -} from '../config/types' +} from '../config/types.d.ts' -import executeAccess from '../../auth/executeAccess' -import sendVerificationEmail from '../../auth/sendVerificationEmail' -import { registerLocalStrategy } from '../../auth/strategies/local/register' -import { afterChange } from '../../fields/hooks/afterChange' -import { afterRead } from '../../fields/hooks/afterRead' -import { beforeChange } from '../../fields/hooks/beforeChange' -import { beforeValidate } from '../../fields/hooks/beforeValidate' -import { generateFileData } from '../../uploads/generateFileData' -import { unlinkTempFiles } from '../../uploads/unlinkTempFiles' -import { uploadFiles } from '../../uploads/uploadFiles' -import { commitTransaction } from '../../utilities/commitTransaction' -import flattenFields from '../../utilities/flattenTopLevelFields' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import sanitizeInternalFields from '../../utilities/sanitizeInternalFields' -import { saveVersion } from '../../versions/saveVersion' -import { buildAfterOperation } from './utils' +import executeAccess from '../../auth/executeAccess.js' +import sendVerificationEmail from '../../auth/sendVerificationEmail.js' +import { registerLocalStrategy } from '../../auth/strategies/local/register.js' +import { afterChange } from '../../fields/hooks/afterChange/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { beforeChange } from '../../fields/hooks/beforeChange/index.js' +import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js' +import { generateFileData } from '../../uploads/generateFileData.js' +import { unlinkTempFiles } from '../../uploads/unlinkTempFiles.js' +import { uploadFiles } from '../../uploads/uploadFiles.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import flattenFields from '../../utilities/flattenTopLevelFields.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js' +import { saveVersion } from '../../versions/saveVersion.js' +import { buildAfterOperation } from './utils.js' export type CreateUpdateType = { [field: number | string | symbol]: unknown } diff --git a/packages/payload/src/collections/operations/delete.ts b/packages/payload/src/collections/operations/delete.ts index 41152f798..686406a94 100644 --- a/packages/payload/src/collections/operations/delete.ts +++ b/packages/payload/src/collections/operations/delete.ts @@ -1,23 +1,22 @@ import httpStatus from 'http-status' -import type { GeneratedTypes } from '../../' -import type { AccessResult } from '../../config/types' -import type { PayloadRequest } from '../../types' -import type { Where } from '../../types' -import type { BeforeOperationHook, Collection } from '../config/types' +import type { AccessResult } from '../../config/types.d.ts' +import type { GeneratedTypes } from '../../index.d.ts' +import type { PayloadRequest, Where } from '../../types/index.d.ts' +import type { BeforeOperationHook, Collection } from '../config/types.d.ts' -import executeAccess from '../../auth/executeAccess' -import { combineQueries } from '../../database/combineQueries' -import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths' -import { APIError } from '../../errors' -import { afterRead } from '../../fields/hooks/afterRead' -import { deleteUserPreferences } from '../../preferences/deleteUserPreferences' -import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions' -import { buildAfterOperation } from './utils' +import executeAccess from '../../auth/executeAccess.js' +import { combineQueries } from '../../database/combineQueries.js' +import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js' +import { APIError } from '../../errors/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { deleteUserPreferences } from '../../preferences/deleteUserPreferences.js' +import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions.js' +import { buildAfterOperation } from './utils.js' export type Arguments = { collection: Collection diff --git a/packages/payload/src/collections/operations/deleteByID.ts b/packages/payload/src/collections/operations/deleteByID.ts index eeda75648..1e73ff8ab 100644 --- a/packages/payload/src/collections/operations/deleteByID.ts +++ b/packages/payload/src/collections/operations/deleteByID.ts @@ -1,20 +1,19 @@ -import type { GeneratedTypes } from '../../' -import type { PayloadRequest } from '../../types' -import type { Document } from '../../types' -import type { BeforeOperationHook, Collection } from '../config/types' +import type { GeneratedTypes } from '../../index.d.ts' +import type { Document, PayloadRequest } from '../../types/index.d.ts' +import type { BeforeOperationHook, Collection } from '../config/types.d.ts' -import executeAccess from '../../auth/executeAccess' -import { hasWhereAccessResult } from '../../auth/types' -import { combineQueries } from '../../database/combineQueries' -import { Forbidden, NotFound } from '../../errors' -import { afterRead } from '../../fields/hooks/afterRead' -import { deleteUserPreferences } from '../../preferences/deleteUserPreferences' -import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions' -import { buildAfterOperation } from './utils' +import executeAccess from '../../auth/executeAccess.js' +import { hasWhereAccessResult } from '../../auth/types.js' +import { combineQueries } from '../../database/combineQueries.js' +import { Forbidden, NotFound } from '../../errors/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { deleteUserPreferences } from '../../preferences/deleteUserPreferences.js' +import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions.js' +import { buildAfterOperation } from './utils.js' export type Arguments = { collection: Collection diff --git a/packages/payload/src/collections/operations/docAccess.ts b/packages/payload/src/collections/operations/docAccess.ts index ad653e0b4..e5de4efa7 100644 --- a/packages/payload/src/collections/operations/docAccess.ts +++ b/packages/payload/src/collections/operations/docAccess.ts @@ -1,12 +1,11 @@ -import type { CollectionPermission } from '../../auth' -import type { PayloadRequest } from '../../types' -import type { AllOperations } from '../../types' -import type { Collection } from '../config/types' +import type { CollectionPermission } from '../../auth/index.d.ts' +import type { AllOperations, PayloadRequest } from '../../types/index.d.ts' +import type { Collection } from '../config/types.d.ts' -import { commitTransaction } from '../../utilities/commitTransaction' -import { getEntityPolicies } from '../../utilities/getEntityPolicies' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { getEntityPolicies } from '../../utilities/getEntityPolicies.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' const allOperations: AllOperations[] = ['create', 'read', 'update', 'delete'] @@ -42,10 +41,10 @@ export async function docAccessOperation(args: Arguments): Promise = { collection: TSlug diff --git a/packages/payload/src/collections/operations/local/delete.ts b/packages/payload/src/collections/operations/local/delete.ts index c59258fcd..2c89a46f6 100644 --- a/packages/payload/src/collections/operations/local/delete.ts +++ b/packages/payload/src/collections/operations/local/delete.ts @@ -1,13 +1,13 @@ -import type { Payload } from '../../..' -import type { GeneratedTypes } from '../../../' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Document, Where } from '../../../types' -import type { BulkOperationResult } from '../../config/types' +import type { Payload } from '../../../index.d.ts' +import type { GeneratedTypes } from '../../../index.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Document, Where } from '../../../types/index.d.ts' +import type { BulkOperationResult } from '../../config/types.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { deleteOperation } from '../delete' -import { deleteByIDOperation } from '../deleteByID' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { deleteOperation } from '../delete.js' +import { deleteByIDOperation } from '../deleteByID.js' export type BaseOptions = { collection: T diff --git a/packages/payload/src/collections/operations/local/find.ts b/packages/payload/src/collections/operations/local/find.ts index 4eacdb913..c12530a3b 100644 --- a/packages/payload/src/collections/operations/local/find.ts +++ b/packages/payload/src/collections/operations/local/find.ts @@ -1,11 +1,10 @@ -import type { GeneratedTypes, Payload } from '../../../' -import type { PaginatedDocs } from '../../../database/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Document, Where } from '../../../types' +import type { PaginatedDocs } from '../../../database/types.d.ts' +import type { GeneratedTypes, Payload } from '../../../index.d.ts' +import type { Document, PayloadRequest, RequestContext, Where } from '../../../types/index.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { findOperation } from '../find' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { findOperation } from '../find.js' export type Options = { collection: T diff --git a/packages/payload/src/collections/operations/local/findByID.ts b/packages/payload/src/collections/operations/local/findByID.ts index 687cd7b0e..8314cbd3d 100644 --- a/packages/payload/src/collections/operations/local/findByID.ts +++ b/packages/payload/src/collections/operations/local/findByID.ts @@ -1,11 +1,9 @@ -import type { GeneratedTypes } from '../../../' -import type { Payload } from '../../../' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Document } from '../../../types' +import type { GeneratedTypes, Payload } from '../../../index.d.ts' +import type { Document, PayloadRequest, RequestContext } from '../../../types/index.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { findByIDOperation } from '../findByID' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { findByIDOperation } from '../findByID.js' export type Options = { collection: T diff --git a/packages/payload/src/collections/operations/local/findVersionByID.ts b/packages/payload/src/collections/operations/local/findVersionByID.ts index 1ec7dcdab..7afdfe6c9 100644 --- a/packages/payload/src/collections/operations/local/findVersionByID.ts +++ b/packages/payload/src/collections/operations/local/findVersionByID.ts @@ -1,11 +1,10 @@ -import type { GeneratedTypes, Payload } from '../../../' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Document } from '../../../types' -import type { TypeWithVersion } from '../../../versions/types' +import type { GeneratedTypes, Payload } from '../../../index.d.ts' +import type { Document, PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { TypeWithVersion } from '../../../versions/types.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { findVersionByIDOperation } from '../findVersionByID' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { findVersionByIDOperation } from '../findVersionByID.js' export type Options = { collection: T diff --git a/packages/payload/src/collections/operations/local/findVersions.ts b/packages/payload/src/collections/operations/local/findVersions.ts index 5ae820686..1b2af840f 100644 --- a/packages/payload/src/collections/operations/local/findVersions.ts +++ b/packages/payload/src/collections/operations/local/findVersions.ts @@ -1,12 +1,11 @@ -import type { GeneratedTypes, Payload } from '../../../' -import type { PaginatedDocs } from '../../../database/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Document, Where } from '../../../types' -import type { TypeWithVersion } from '../../../versions/types' +import type { PaginatedDocs } from '../../../database/types.d.ts' +import type { GeneratedTypes, Payload } from '../../../index.d.ts' +import type { Document, PayloadRequest, RequestContext, Where } from '../../../types/index.d.ts' +import type { TypeWithVersion } from '../../../versions/types.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { findVersionsOperation } from '../findVersions' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { findVersionsOperation } from '../findVersions.js' export type Options = { collection: T diff --git a/packages/payload/src/collections/operations/local/index.ts b/packages/payload/src/collections/operations/local/index.ts index ee3117a55..57a056d89 100644 --- a/packages/payload/src/collections/operations/local/index.ts +++ b/packages/payload/src/collections/operations/local/index.ts @@ -1,12 +1,12 @@ -import auth from '../../../auth/operations/local' -import create from './create' -import deleteLocal from './delete' -import find from './find' -import findByID from './findByID' -import findVersionByID from './findVersionByID' -import findVersions from './findVersions' -import restoreVersion from './restoreVersion' -import update from './update' +import auth from '../../../auth/operations/local/index.js' +import create from './create.js' +import deleteLocal from './delete.js' +import find from './find.js' +import findByID from './findByID.js' +import findVersionByID from './findVersionByID.js' +import findVersions from './findVersions.js' +import restoreVersion from './restoreVersion.js' +import update from './update.js' export default { auth, diff --git a/packages/payload/src/collections/operations/local/restoreVersion.ts b/packages/payload/src/collections/operations/local/restoreVersion.ts index d6e959df0..03a3fb6fa 100644 --- a/packages/payload/src/collections/operations/local/restoreVersion.ts +++ b/packages/payload/src/collections/operations/local/restoreVersion.ts @@ -1,10 +1,9 @@ -import type { GeneratedTypes, Payload } from '../../../' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Document } from '../../../types' +import type { GeneratedTypes, Payload } from '../../../index.d.ts' +import type { Document, PayloadRequest, RequestContext } from '../../../types/index.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { restoreVersionOperation } from '../restoreVersion' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { restoreVersionOperation } from '../restoreVersion.js' export type Options = { collection: T diff --git a/packages/payload/src/collections/operations/local/update.ts b/packages/payload/src/collections/operations/local/update.ts index 896f4106a..1d3628593 100644 --- a/packages/payload/src/collections/operations/local/update.ts +++ b/packages/payload/src/collections/operations/local/update.ts @@ -1,16 +1,15 @@ import type { DeepPartial } from 'ts-essentials' -import type { GeneratedTypes, Payload } from '../../../' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Document, Where } from '../../../types' -import type { File } from '../../../uploads/types' -import type { BulkOperationResult } from '../../config/types' +import type { GeneratedTypes, Payload } from '../../../index.d.ts' +import type { Document, PayloadRequest, RequestContext, Where } from '../../../types/index.d.ts' +import type { File } from '../../../uploads/types.d.ts' +import type { BulkOperationResult } from '../../config/types.d.ts' -import { APIError } from '../../../errors' -import getFileByPath from '../../../uploads/getFileByPath' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { updateOperation } from '../update' -import { updateByIDOperation } from '../updateByID' +import { APIError } from '../../../errors/index.js' +import getFileByPath from '../../../uploads/getFileByPath.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { updateOperation } from '../update.js' +import { updateByIDOperation } from '../updateByID.js' export type BaseOptions = { autosave?: boolean diff --git a/packages/payload/src/collections/operations/restoreVersion.ts b/packages/payload/src/collections/operations/restoreVersion.ts index 2b001e9cb..2aad93dac 100644 --- a/packages/payload/src/collections/operations/restoreVersion.ts +++ b/packages/payload/src/collections/operations/restoreVersion.ts @@ -1,20 +1,20 @@ /* eslint-disable no-underscore-dangle */ import httpStatus from 'http-status' -import type { FindOneArgs } from '../../database/types' -import type { PayloadRequest } from '../../types' -import type { Collection, TypeWithID } from '../config/types' +import type { FindOneArgs } from '../../database/types.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { Collection, TypeWithID } from '../config/types.d.ts' -import executeAccess from '../../auth/executeAccess' -import { hasWhereAccessResult } from '../../auth/types' -import { combineQueries } from '../../database/combineQueries' -import { APIError, Forbidden, NotFound } from '../../errors' -import { afterChange } from '../../fields/hooks/afterChange' -import { afterRead } from '../../fields/hooks/afterRead' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion' +import executeAccess from '../../auth/executeAccess.js' +import { hasWhereAccessResult } from '../../auth/types.js' +import { combineQueries } from '../../database/combineQueries.js' +import { APIError, Forbidden, NotFound } from '../../errors/index.js' +import { afterChange } from '../../fields/hooks/afterChange/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion.js' export type Arguments = { collection: Collection diff --git a/packages/payload/src/collections/operations/update.ts b/packages/payload/src/collections/operations/update.ts index 7b39d3009..39a3a3616 100644 --- a/packages/payload/src/collections/operations/update.ts +++ b/packages/payload/src/collections/operations/update.ts @@ -2,32 +2,31 @@ import type { DeepPartial } from 'ts-essentials' import httpStatus from 'http-status' -import type { GeneratedTypes } from '../../' -import type { AccessResult } from '../../config/types' -import type { PayloadRequest } from '../../types' -import type { Where } from '../../types' -import type { BulkOperationResult, Collection } from '../config/types' -import type { CreateUpdateType } from './create' +import type { AccessResult } from '../../config/types.d.ts' +import type { GeneratedTypes } from '../../index.d.ts' +import type { PayloadRequest, Where } from '../../types/index.d.ts' +import type { BulkOperationResult, Collection } from '../config/types.d.ts' +import type { CreateUpdateType } from './create.d.ts' -import executeAccess from '../../auth/executeAccess' -import { combineQueries } from '../../database/combineQueries' -import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths' -import { APIError } from '../../errors' -import { afterChange } from '../../fields/hooks/afterChange' -import { afterRead } from '../../fields/hooks/afterRead' -import { beforeChange } from '../../fields/hooks/beforeChange' -import { beforeValidate } from '../../fields/hooks/beforeValidate' -import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' -import { generateFileData } from '../../uploads/generateFileData' -import { unlinkTempFiles } from '../../uploads/unlinkTempFiles' -import { uploadFiles } from '../../uploads/uploadFiles' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { buildVersionCollectionFields } from '../../versions/buildCollectionFields' -import { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey' -import { saveVersion } from '../../versions/saveVersion' -import { buildAfterOperation } from './utils' +import executeAccess from '../../auth/executeAccess.js' +import { combineQueries } from '../../database/combineQueries.js' +import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js' +import { APIError } from '../../errors/index.js' +import { afterChange } from '../../fields/hooks/afterChange/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { beforeChange } from '../../fields/hooks/beforeChange/index.js' +import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js' +import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js' +import { generateFileData } from '../../uploads/generateFileData.js' +import { unlinkTempFiles } from '../../uploads/unlinkTempFiles.js' +import { uploadFiles } from '../../uploads/uploadFiles.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { buildVersionCollectionFields } from '../../versions/buildCollectionFields.js' +import { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey.js' +import { saveVersion } from '../../versions/saveVersion.js' +import { buildAfterOperation } from './utils.js' export type Arguments = { collection: Collection diff --git a/packages/payload/src/collections/operations/updateByID.ts b/packages/payload/src/collections/operations/updateByID.ts index ea1af5fd6..7ddff4b39 100644 --- a/packages/payload/src/collections/operations/updateByID.ts +++ b/packages/payload/src/collections/operations/updateByID.ts @@ -2,30 +2,30 @@ import type { DeepPartial } from 'ts-essentials' import httpStatus from 'http-status' -import type { FindOneArgs } from '../../database/types' -import type { GeneratedTypes } from '../../index' -import type { PayloadRequest } from '../../types' -import type { Collection } from '../config/types' +import type { FindOneArgs } from '../../database/types.d.ts' +import type { GeneratedTypes } from '../../index.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { Collection } from '../config/types.d.ts' -import executeAccess from '../../auth/executeAccess' -import { generatePasswordSaltHash } from '../../auth/strategies/local/generatePasswordSaltHash' -import { hasWhereAccessResult } from '../../auth/types' -import { combineQueries } from '../../database/combineQueries' -import { APIError, Forbidden, NotFound } from '../../errors' -import { afterChange } from '../../fields/hooks/afterChange' -import { afterRead } from '../../fields/hooks/afterRead' -import { beforeChange } from '../../fields/hooks/beforeChange' -import { beforeValidate } from '../../fields/hooks/beforeValidate' -import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' -import { generateFileData } from '../../uploads/generateFileData' -import { unlinkTempFiles } from '../../uploads/unlinkTempFiles' -import { uploadFiles } from '../../uploads/uploadFiles' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion' -import { saveVersion } from '../../versions/saveVersion' -import { buildAfterOperation } from './utils' +import executeAccess from '../../auth/executeAccess.js' +import { generatePasswordSaltHash } from '../../auth/strategies/local/generatePasswordSaltHash.js' +import { hasWhereAccessResult } from '../../auth/types.js' +import { combineQueries } from '../../database/combineQueries.js' +import { APIError, Forbidden, NotFound } from '../../errors/index.js' +import { afterChange } from '../../fields/hooks/afterChange/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { beforeChange } from '../../fields/hooks/beforeChange/index.js' +import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js' +import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js' +import { generateFileData } from '../../uploads/generateFileData.js' +import { unlinkTempFiles } from '../../uploads/unlinkTempFiles.js' +import { uploadFiles } from '../../uploads/uploadFiles.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion.js' +import { saveVersion } from '../../versions/saveVersion.js' +import { buildAfterOperation } from './utils.js' export type Arguments = { autosave?: boolean diff --git a/packages/payload/src/collections/operations/utils.ts b/packages/payload/src/collections/operations/utils.ts index 3e433ea89..76137b828 100644 --- a/packages/payload/src/collections/operations/utils.ts +++ b/packages/payload/src/collections/operations/utils.ts @@ -1,15 +1,19 @@ -import type { forgotPasswordOperation } from '../../auth/operations/forgotPassword' -import type { loginOperation } from '../../auth/operations/login' -import type { refreshOperation } from '../../auth/operations/refresh' -import type { PayloadRequest } from '../../exports/types' -import type { AfterOperationHook, SanitizedCollectionConfig, TypeWithID } from '../config/types' -import type { createOperation } from './create' -import type { deleteOperation } from './delete' -import type { deleteByIDOperation } from './deleteByID' -import type { findOperation } from './find' -import type { findByIDOperation } from './findByID' -import type { updateOperation } from './update' -import type { updateByIDOperation } from './updateByID' +import type { forgotPasswordOperation } from '../../auth/operations/forgotPassword.d.ts' +import type { loginOperation } from '../../auth/operations/login.d.ts' +import type { refreshOperation } from '../../auth/operations/refresh.d.ts' +import type { PayloadRequest } from '../../exports/types.d.ts' +import type { + AfterOperationHook, + SanitizedCollectionConfig, + TypeWithID, +} from '../config/types.d.ts' +import type { createOperation } from './create.d.ts' +import type { deleteOperation } from './delete.d.ts' +import type { deleteByIDOperation } from './deleteByID.d.ts' +import type { findOperation } from './find.d.ts' +import type { findByIDOperation } from './findByID.d.ts' +import type { updateOperation } from './update.d.ts' +import type { updateByIDOperation } from './updateByID.d.ts' export type AfterOperationMap = { create: typeof createOperation // todo: pass correct generic diff --git a/packages/payload/src/config/build.ts b/packages/payload/src/config/build.ts index d45ddd336..0106caa48 100644 --- a/packages/payload/src/config/build.ts +++ b/packages/payload/src/config/build.ts @@ -1,8 +1,8 @@ /* eslint-disable no-use-before-define */ /* eslint-disable no-nested-ternary */ -import type { Config, SanitizedConfig } from './types' +import type { Config, SanitizedConfig } from './types.d.ts' -import { sanitizeConfig } from './sanitize' +import { sanitizeConfig } from './sanitize.js' /** * @description Builds and validates Payload configuration diff --git a/packages/payload/src/config/createClientConfig.ts b/packages/payload/src/config/createClientConfig.ts index d50117146..427f07b10 100644 --- a/packages/payload/src/config/createClientConfig.ts +++ b/packages/payload/src/config/createClientConfig.ts @@ -1,5 +1,5 @@ -import type { Field } from '../fields/config/types' -import type { ClientConfig, SanitizedConfig } from './types' +import type { Field } from '../fields/config/types.d.ts' +import type { ClientConfig, SanitizedConfig } from './types.d.ts' export const sanitizeField = (f) => { const field = { ...f } diff --git a/packages/payload/src/config/defaults.ts b/packages/payload/src/config/defaults.ts index 2ccb41012..48ed912a3 100644 --- a/packages/payload/src/config/defaults.ts +++ b/packages/payload/src/config/defaults.ts @@ -1,6 +1,6 @@ import path from 'path' -import type { Config } from './types' +import type { Config } from './types.d.ts' export const defaults: Omit = { admin: { diff --git a/packages/payload/src/config/load.ts b/packages/payload/src/config/load.ts index cb307b334..77ae5d84e 100644 --- a/packages/payload/src/config/load.ts +++ b/packages/payload/src/config/load.ts @@ -1,10 +1,10 @@ /* eslint-disable import/no-dynamic-require */ /* eslint-disable global-require */ -import type { SanitizedConfig } from './types' +import type { SanitizedConfig } from './types.d.ts' -import { clientFiles } from './clientFiles' -import findConfig from './find' +import { clientFiles } from './clientFiles.js' +import findConfig from './find.js' const loadConfig = async (): Promise => { const configPath = findConfig() diff --git a/packages/payload/src/config/sanitize.ts b/packages/payload/src/config/sanitize.ts index 3d5278a06..c272c3ba4 100644 --- a/packages/payload/src/config/sanitize.ts +++ b/packages/payload/src/config/sanitize.ts @@ -7,16 +7,16 @@ import type { LocalizationConfigWithLabels, LocalizationConfigWithNoLabels, SanitizedConfig, -} from './types' +} from './types.d.ts' -import { defaultUserCollection } from '../auth/defaultUser' -import sanitizeCollection from '../collections/config/sanitize' -import { migrationsCollection } from '../database/migrations/migrationsCollection' -import { InvalidConfiguration } from '../errors' -import sanitizeGlobals from '../globals/config/sanitize' -import getPreferencesCollection from '../preferences/preferencesCollection' -import checkDuplicateCollections from '../utilities/checkDuplicateCollections' -import { defaults } from './defaults' +import { defaultUserCollection } from '../auth/defaultUser.js' +import sanitizeCollection from '../collections/config/sanitize.js' +import { migrationsCollection } from '../database/migrations/migrationsCollection.js' +import { InvalidConfiguration } from '../errors/index.js' +import sanitizeGlobals from '../globals/config/sanitize.js' +import getPreferencesCollection from '../preferences/preferencesCollection.js' +import checkDuplicateCollections from '../utilities/checkDuplicateCollections.js' +import { defaults } from './defaults.js' const sanitizeAdminConfig = (configToSanitize: Config): Partial => { const sanitizedConfig = { ...configToSanitize } diff --git a/packages/payload/src/config/schema.ts b/packages/payload/src/config/schema.ts index 2ed972a83..8745e325b 100644 --- a/packages/payload/src/config/schema.ts +++ b/packages/payload/src/config/schema.ts @@ -1,7 +1,7 @@ import joi from 'joi' -import { adminViewSchema } from './shared/adminViewSchema' -import { componentSchema, livePreviewSchema } from './shared/componentSchema' +import { adminViewSchema } from './shared/adminViewSchema.js' +import { componentSchema, livePreviewSchema } from './shared/componentSchema.js' const component = joi.alternatives().try(joi.object().unknown(), joi.func()) diff --git a/packages/payload/src/config/shared/adminViewSchema.ts b/packages/payload/src/config/shared/adminViewSchema.ts index a38205bb1..f255c8205 100644 --- a/packages/payload/src/config/shared/adminViewSchema.ts +++ b/packages/payload/src/config/shared/adminViewSchema.ts @@ -1,6 +1,6 @@ import joi from 'joi' -import { componentSchema } from './componentSchema' +import { componentSchema } from './componentSchema.js' export const adminViewSchema = joi.array().items( joi.object().keys({ diff --git a/packages/payload/src/config/types.ts b/packages/payload/src/config/types.ts index e550463bd..3a4289577 100644 --- a/packages/payload/src/config/types.ts +++ b/packages/payload/src/config/types.ts @@ -8,21 +8,21 @@ import type React from 'react' import type { default as sharp } from 'sharp' import type { DeepRequired } from 'ts-essentials' -import type { Payload } from '..' -import type { DocumentTab, RichTextAdapter } from '../admin/types' -import type { AdminView, ServerSideEditViewProps } from '../admin/views/types' -import type { User } from '../auth/types' +import type { DocumentTab, RichTextAdapter } from '../admin/types.d.ts' +import type { AdminView, ServerSideEditViewProps } from '../admin/views/types.d.ts' +import type { User } from '../auth/types.d.ts' import type { AfterErrorHook, Collection, CollectionConfig, SanitizedCollectionConfig, -} from '../collections/config/types' -import type { DatabaseAdapterResult } from '../database/types' -import type { ClientConfigField } from '../fields/config/types' -import type { GlobalConfig, Globals, SanitizedGlobalConfig } from '../globals/config/types' -import type { PayloadRequest, Where } from '../types' -import type { PayloadLogger } from '../utilities/logger' +} from '../collections/config/types.d.ts' +import type { DatabaseAdapterResult } from '../database/types.d.ts' +import type { ClientConfigField } from '../fields/config/types.d.ts' +import type { GlobalConfig, Globals, SanitizedGlobalConfig } from '../globals/config/types.d.ts' +import type { Payload } from '../index.d.ts' +import type { PayloadRequest, Where } from '../types/index.d.ts' +import type { PayloadLogger } from '../utilities/logger.d.ts' export type BinScriptConfig = { key: string diff --git a/packages/payload/src/config/validate.ts b/packages/payload/src/config/validate.ts index ab7a4a796..65735e245 100644 --- a/packages/payload/src/config/validate.ts +++ b/packages/payload/src/config/validate.ts @@ -1,15 +1,15 @@ import type { ValidationResult } from 'joi' import type { Logger } from 'pino' -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { SanitizedGlobalConfig } from '../globals/config/types' -import type { SanitizedConfig } from './types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts' +import type { SanitizedConfig } from './types.d.ts' -import collectionSchema from '../collections/config/schema' -import fieldSchema, { idField } from '../fields/config/schema' -import { fieldAffectsData } from '../fields/config/types' -import globalSchema from '../globals/config/schema' -import schema from './schema' +import collectionSchema from '../collections/config/schema.js' +import fieldSchema, { idField } from '../fields/config/schema.js' +import { fieldAffectsData } from '../fields/config/types.js' +import globalSchema from '../globals/config/schema.js' +import schema from './schema.js' const validateFields = ( context: string, diff --git a/packages/payload/src/database/combineQueries.ts b/packages/payload/src/database/combineQueries.ts index 35d4584bc..96cd37977 100644 --- a/packages/payload/src/database/combineQueries.ts +++ b/packages/payload/src/database/combineQueries.ts @@ -1,6 +1,6 @@ -import type { Where } from '../types' +import type { Where } from '../types/index.d.ts' -import { hasWhereAccessResult } from '../auth' +import { hasWhereAccessResult } from '../auth/index.js' export const combineQueries = (where: Where, access: Where | boolean): Where => { if (!where && !access) return {} diff --git a/packages/payload/src/database/createDatabaseAdapter.ts b/packages/payload/src/database/createDatabaseAdapter.ts index ad08b199a..3fe05f9bb 100644 --- a/packages/payload/src/database/createDatabaseAdapter.ts +++ b/packages/payload/src/database/createDatabaseAdapter.ts @@ -6,14 +6,14 @@ import type { BeginTransaction, CommitTransaction, RollbackTransaction, -} from './types' +} from './types.d.ts' -import { createMigration } from './migrations/createMigration' -import { migrate } from './migrations/migrate' -import { migrateDown } from './migrations/migrateDown' -import { migrateRefresh } from './migrations/migrateRefresh' -import { migrateReset } from './migrations/migrateReset' -import { migrateStatus } from './migrations/migrateStatus' +import { createMigration } from './migrations/createMigration.js' +import { migrate } from './migrations/migrate.js' +import { migrateDown } from './migrations/migrateDown.js' +import { migrateRefresh } from './migrations/migrateRefresh.js' +import { migrateReset } from './migrations/migrateReset.js' +import { migrateStatus } from './migrations/migrateStatus.js' const beginTransaction: BeginTransaction = async () => null const rollbackTransaction: RollbackTransaction = async () => null diff --git a/packages/payload/src/database/flattenWhereToOperators.ts b/packages/payload/src/database/flattenWhereToOperators.ts index fd80f7e4a..7d60e9217 100644 --- a/packages/payload/src/database/flattenWhereToOperators.ts +++ b/packages/payload/src/database/flattenWhereToOperators.ts @@ -1,4 +1,4 @@ -import type { Where, WhereField } from '../types' +import type { Where, WhereField } from '../types/index.d.ts' // Take a where query and flatten it to all top-level operators const flattenWhereToOperators = (query: Where): WhereField[] => diff --git a/packages/payload/src/database/getLocalizedPaths.ts b/packages/payload/src/database/getLocalizedPaths.ts index d3c51ae8b..23642e920 100644 --- a/packages/payload/src/database/getLocalizedPaths.ts +++ b/packages/payload/src/database/getLocalizedPaths.ts @@ -1,9 +1,9 @@ -import type { Payload } from '..' -import type { Field } from '../fields/config/types' -import type { PathToQuery } from './queryValidation/types' +import type { Field } from '../fields/config/types.d.ts' +import type { Payload } from '../index.d.ts' +import type { PathToQuery } from './queryValidation/types.d.ts' -import { fieldAffectsData } from '../fields/config/types' -import flattenFields from '../utilities/flattenTopLevelFields' +import { fieldAffectsData } from '../fields/config/types.js' +import flattenFields from '../utilities/flattenTopLevelFields.js' export async function getLocalizedPaths({ collectionSlug, diff --git a/packages/payload/src/database/migrations/createMigration.ts b/packages/payload/src/database/migrations/createMigration.ts index 081546cd5..6c3e91379 100644 --- a/packages/payload/src/database/migrations/createMigration.ts +++ b/packages/payload/src/database/migrations/createMigration.ts @@ -1,9 +1,9 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ import fs from 'fs' -import type { CreateMigration } from '../types' +import type { CreateMigration } from '../types.d.ts' -import { migrationTemplate } from './migrationTemplate' +import { migrationTemplate } from './migrationTemplate.js' export const createMigration: CreateMigration = async function createMigration({ migrationName, diff --git a/packages/payload/src/database/migrations/getMigrations.ts b/packages/payload/src/database/migrations/getMigrations.ts index 16e787c8c..0a5afb73a 100644 --- a/packages/payload/src/database/migrations/getMigrations.ts +++ b/packages/payload/src/database/migrations/getMigrations.ts @@ -1,5 +1,5 @@ -import type { Payload } from '../..' -import type { MigrationData } from '../types' +import type { Payload } from '../../index.d.ts' +import type { MigrationData } from '../types.d.ts' /** * Gets all existing migrations from the database, excluding the dev migration diff --git a/packages/payload/src/database/migrations/migrate.ts b/packages/payload/src/database/migrations/migrate.ts index 87094c78d..aba2c8e4c 100644 --- a/packages/payload/src/database/migrations/migrate.ts +++ b/packages/payload/src/database/migrations/migrate.ts @@ -1,12 +1,12 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { PayloadRequest } from '../../types' -import type { BaseDatabaseAdapter } from '../types' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { BaseDatabaseAdapter } from '../types.d.ts' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { getMigrations } from './getMigrations' -import { readMigrationFiles } from './readMigrationFiles' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getMigrations } from './getMigrations.js' +import { readMigrationFiles } from './readMigrationFiles.js' export async function migrate(this: BaseDatabaseAdapter): Promise { const { payload } = this diff --git a/packages/payload/src/database/migrations/migrateDown.ts b/packages/payload/src/database/migrations/migrateDown.ts index 7b48229fb..cc6e01f91 100644 --- a/packages/payload/src/database/migrations/migrateDown.ts +++ b/packages/payload/src/database/migrations/migrateDown.ts @@ -1,12 +1,12 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { PayloadRequest } from '../../types' -import type { BaseDatabaseAdapter } from '../types' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { BaseDatabaseAdapter } from '../types.d.ts' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { getMigrations } from './getMigrations' -import { readMigrationFiles } from './readMigrationFiles' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getMigrations } from './getMigrations.js' +import { readMigrationFiles } from './readMigrationFiles.js' export async function migrateDown(this: BaseDatabaseAdapter): Promise { const { payload } = this diff --git a/packages/payload/src/database/migrations/migrateRefresh.ts b/packages/payload/src/database/migrations/migrateRefresh.ts index 0a71cf11b..86d53109e 100644 --- a/packages/payload/src/database/migrations/migrateRefresh.ts +++ b/packages/payload/src/database/migrations/migrateRefresh.ts @@ -1,12 +1,12 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { PayloadRequest } from '../../types' -import type { BaseDatabaseAdapter } from '../types' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { BaseDatabaseAdapter } from '../types.d.ts' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { getMigrations } from './getMigrations' -import { readMigrationFiles } from './readMigrationFiles' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getMigrations } from './getMigrations.js' +import { readMigrationFiles } from './readMigrationFiles.js' /** * Run all migration down functions before running up diff --git a/packages/payload/src/database/migrations/migrateReset.ts b/packages/payload/src/database/migrations/migrateReset.ts index 2e40fba4c..ede14a5ec 100644 --- a/packages/payload/src/database/migrations/migrateReset.ts +++ b/packages/payload/src/database/migrations/migrateReset.ts @@ -1,12 +1,12 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ -import type { PayloadRequest } from '../../types' -import type { BaseDatabaseAdapter } from '../types' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { BaseDatabaseAdapter } from '../types.d.ts' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { getMigrations } from './getMigrations' -import { readMigrationFiles } from './readMigrationFiles' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getMigrations } from './getMigrations.js' +import { readMigrationFiles } from './readMigrationFiles.js' export async function migrateReset(this: BaseDatabaseAdapter): Promise { const { payload } = this diff --git a/packages/payload/src/database/migrations/migrateStatus.ts b/packages/payload/src/database/migrations/migrateStatus.ts index 58e9848de..9da81a181 100644 --- a/packages/payload/src/database/migrations/migrateStatus.ts +++ b/packages/payload/src/database/migrations/migrateStatus.ts @@ -1,9 +1,9 @@ import { Table } from 'console-table-printer' -import type { BaseDatabaseAdapter } from '../types' +import type { BaseDatabaseAdapter } from '../types.d.ts' -import { getMigrations } from './getMigrations' -import { readMigrationFiles } from './readMigrationFiles' +import { getMigrations } from './getMigrations.js' +import { readMigrationFiles } from './readMigrationFiles.js' export async function migrateStatus(this: BaseDatabaseAdapter): Promise { const { payload } = this diff --git a/packages/payload/src/database/migrations/migrationsCollection.ts b/packages/payload/src/database/migrations/migrationsCollection.ts index 6202618c1..d0d8b1d8a 100644 --- a/packages/payload/src/database/migrations/migrationsCollection.ts +++ b/packages/payload/src/database/migrations/migrationsCollection.ts @@ -1,4 +1,4 @@ -import type { CollectionConfig } from '../../collections/config/types' +import type { CollectionConfig } from '../../collections/config/types.d.ts' export const migrationsCollection: CollectionConfig = { slug: 'payload-migrations', diff --git a/packages/payload/src/database/migrations/readMigrationFiles.ts b/packages/payload/src/database/migrations/readMigrationFiles.ts index f41acb161..1897a60b0 100644 --- a/packages/payload/src/database/migrations/readMigrationFiles.ts +++ b/packages/payload/src/database/migrations/readMigrationFiles.ts @@ -1,8 +1,8 @@ import fs from 'fs' import path from 'path' -import type { Payload } from '../../' -import type { Migration } from '../types' +import type { Payload } from '../../index.d.ts' +import type { Migration } from '../types.d.ts' /** * Read the migration files from disk diff --git a/packages/payload/src/database/queryValidation/types.ts b/packages/payload/src/database/queryValidation/types.ts index 3fa21a86e..8bef3ce47 100644 --- a/packages/payload/src/database/queryValidation/types.ts +++ b/packages/payload/src/database/queryValidation/types.ts @@ -1,5 +1,5 @@ -import type { CollectionPermission, GlobalPermission } from '../../auth' -import type { Field, FieldAffectingData, TabAsField, UIField } from '../../fields/config/types' +import type { CollectionPermission, GlobalPermission } from '../../auth/index.d.ts' +import type { Field, FieldAffectingData, TabAsField, UIField } from '../../fields/config/types.d.ts' export type EntityPolicies = { collections?: { diff --git a/packages/payload/src/database/queryValidation/validateQueryPaths.ts b/packages/payload/src/database/queryValidation/validateQueryPaths.ts index 85e777b74..a962a79c8 100644 --- a/packages/payload/src/database/queryValidation/validateQueryPaths.ts +++ b/packages/payload/src/database/queryValidation/validateQueryPaths.ts @@ -1,16 +1,16 @@ /* eslint-disable no-restricted-syntax */ -import type { SanitizedCollectionConfig } from '../../collections/config/types' -import type { Field, FieldAffectingData } from '../../fields/config/types' -import type { SanitizedGlobalConfig } from '../../globals/config/types' +import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts' +import type { Field, FieldAffectingData } from '../../fields/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts' /* eslint-disable no-await-in-loop */ -import type { Operator, PayloadRequest, Where, WhereField } from '../../types' -import type { EntityPolicies } from './types' +import type { Operator, PayloadRequest, Where, WhereField } from '../../types/index.d.ts' +import type { EntityPolicies } from './types.d.ts' -import QueryError from '../../errors/QueryError' -import { validOperators } from '../../types/constants' -import { deepCopyObject } from '../../utilities/deepCopyObject' -import flattenFields from '../../utilities/flattenTopLevelFields' -import { validateSearchParam } from './validateSearchParams' +import QueryError from '../../errors/QueryError.js' +import { validOperators } from '../../types/constants.js' +import { deepCopyObject } from '../../utilities/deepCopyObject.js' +import flattenFields from '../../utilities/flattenTopLevelFields.js' +import { validateSearchParam } from './validateSearchParams.js' type Args = { errors?: { path: string }[] diff --git a/packages/payload/src/database/queryValidation/validateSearchParams.ts b/packages/payload/src/database/queryValidation/validateSearchParams.ts index e079145b8..a5f6b9f80 100644 --- a/packages/payload/src/database/queryValidation/validateSearchParams.ts +++ b/packages/payload/src/database/queryValidation/validateSearchParams.ts @@ -1,13 +1,13 @@ -import type { SanitizedCollectionConfig } from '../../collections/config/types' -import type { Field } from '../../fields/config/types' -import type { SanitizedGlobalConfig } from '../../globals/config/types' -import type { PayloadRequest } from '../../types' -import type { EntityPolicies, PathToQuery } from './types' +import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts' +import type { Field } from '../../fields/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { EntityPolicies, PathToQuery } from './types.d.ts' -import { fieldAffectsData } from '../../fields/config/types' -import { getEntityPolicies } from '../../utilities/getEntityPolicies' -import { getLocalizedPaths } from '../getLocalizedPaths' -import { validateQueryPaths } from './validateQueryPaths' +import { fieldAffectsData } from '../../fields/config/types.js' +import { getEntityPolicies } from '../../utilities/getEntityPolicies.js' +import { getLocalizedPaths } from '../getLocalizedPaths.js' +import { validateQueryPaths } from './validateQueryPaths.js' type Args = { collectionConfig?: SanitizedCollectionConfig @@ -55,10 +55,10 @@ export async function validateSearchParam({ // eslint-disable-next-line no-param-reassign policies.globals[slug] = await getEntityPolicies({ + type: 'global', entity: globalConfig, operations: ['read'], req, - type: 'global', }) } @@ -86,10 +86,10 @@ export async function validateSearchParam({ if (!policies.collections[collectionSlug]) { // eslint-disable-next-line no-param-reassign policies.collections[collectionSlug] = await getEntityPolicies({ + type: 'collection', entity: req.payload.collections[collectionSlug].config, operations: ['read'], req, - type: 'collection', }) } diff --git a/packages/payload/src/database/types.ts b/packages/payload/src/database/types.ts index 7a1e68021..94a367458 100644 --- a/packages/payload/src/database/types.ts +++ b/packages/payload/src/database/types.ts @@ -1,8 +1,7 @@ -import type { TypeWithID } from '../collections/config/types' -import type { TypeWithID as GlobalsTypeWithID } from '../globals/config/types' -import type { Payload } from '../types' -import type { Document, PayloadRequest, Where } from '../types' -import type { TypeWithVersion } from '../versions/types' +import type { TypeWithID } from '../collections/config/types.d.ts' +import type { TypeWithID as GlobalsTypeWithID } from '../globals/config/types.d.ts' +import type { Document, Payload, PayloadRequest, Where } from '../types/index.d.ts' +import type { TypeWithVersion } from '../versions/types.d.ts' export type { TypeWithVersion } diff --git a/packages/payload/src/email/build.ts b/packages/payload/src/email/build.ts index 263ca210d..553351d75 100644 --- a/packages/payload/src/email/build.ts +++ b/packages/payload/src/email/build.ts @@ -3,12 +3,12 @@ import type { Logger } from 'pino' import nodemailer from 'nodemailer' -import type { EmailOptions, EmailTransport } from '../config/types' -import type { BuildEmailResult, MockEmailHandler } from './types' +import type { EmailOptions, EmailTransport } from '../config/types.d.ts' +import type { BuildEmailResult, MockEmailHandler } from './types.d.ts' -import { hasTransport, hasTransportOptions } from '../config/types' -import { InvalidConfiguration } from '../errors' -import mockHandler from './mockHandler' +import { hasTransport, hasTransportOptions } from '../config/types.js' +import { InvalidConfiguration } from '../errors/index.js' +import mockHandler from './mockHandler.js' async function handleTransport( transport: Transporter, diff --git a/packages/payload/src/email/defaults.ts b/packages/payload/src/email/defaults.ts index 3a54cb5cf..7a61acb0e 100644 --- a/packages/payload/src/email/defaults.ts +++ b/packages/payload/src/email/defaults.ts @@ -1,4 +1,4 @@ -import type { EmailOptions } from '../config/types' +import type { EmailOptions } from '../config/types.d.ts' export const defaults: EmailOptions = { fromAddress: 'info@payloadcms.com', diff --git a/packages/payload/src/email/mockHandler.ts b/packages/payload/src/email/mockHandler.ts index 8b34af55e..dab81d906 100644 --- a/packages/payload/src/email/mockHandler.ts +++ b/packages/payload/src/email/mockHandler.ts @@ -1,9 +1,9 @@ import nodemailer from 'nodemailer' -import type { EmailOptions } from '../config/types' -import type { MockEmailHandler } from './types' +import type { EmailOptions } from '../config/types.d.ts' +import type { MockEmailHandler } from './types.d.ts' -import { defaults as emailDefaults } from './defaults' +import { defaults as emailDefaults } from './defaults.js' const mockEmailHandler = async (emailConfig: EmailOptions): Promise => { const testAccount = await nodemailer.createTestAccount() diff --git a/packages/payload/src/errors/AuthenticationError.ts b/packages/payload/src/errors/AuthenticationError.ts index b4db9a58a..06daf39dd 100644 --- a/packages/payload/src/errors/AuthenticationError.ts +++ b/packages/payload/src/errors/AuthenticationError.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class AuthenticationError extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/DuplicateCollection.ts b/packages/payload/src/errors/DuplicateCollection.ts index bdf919c45..dd425d442 100644 --- a/packages/payload/src/errors/DuplicateCollection.ts +++ b/packages/payload/src/errors/DuplicateCollection.ts @@ -1,4 +1,4 @@ -import APIError from './APIError' +import APIError from './APIError.js' class DuplicateCollection extends APIError { constructor(propertyName: string, duplicates: string[]) { diff --git a/packages/payload/src/errors/DuplicateFieldName.ts b/packages/payload/src/errors/DuplicateFieldName.ts index b71d93abf..66d288be6 100644 --- a/packages/payload/src/errors/DuplicateFieldName.ts +++ b/packages/payload/src/errors/DuplicateFieldName.ts @@ -1,4 +1,4 @@ -import APIError from './APIError' +import APIError from './APIError.js' class DuplicateFieldName extends APIError { constructor(fieldName: string) { diff --git a/packages/payload/src/errors/DuplicateGlobal.ts b/packages/payload/src/errors/DuplicateGlobal.ts index cd9187a54..3bc240e02 100644 --- a/packages/payload/src/errors/DuplicateGlobal.ts +++ b/packages/payload/src/errors/DuplicateGlobal.ts @@ -1,6 +1,6 @@ -import type { GlobalConfig } from '../globals/config/types' +import type { GlobalConfig } from '../globals/config/types.d.ts' -import APIError from './APIError' +import APIError from './APIError.js' class DuplicateGlobal extends APIError { constructor(config: GlobalConfig) { diff --git a/packages/payload/src/errors/ErrorDeletingFile.ts b/packages/payload/src/errors/ErrorDeletingFile.ts index 6368b0254..99bb991ce 100644 --- a/packages/payload/src/errors/ErrorDeletingFile.ts +++ b/packages/payload/src/errors/ErrorDeletingFile.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class ErrorDeletingFile extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/FileUploadError.ts b/packages/payload/src/errors/FileUploadError.ts index 9e2495472..ba2ec88be 100644 --- a/packages/payload/src/errors/FileUploadError.ts +++ b/packages/payload/src/errors/FileUploadError.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class FileUploadError extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/Forbidden.ts b/packages/payload/src/errors/Forbidden.ts index 9e8ca09fa..b27024fe9 100644 --- a/packages/payload/src/errors/Forbidden.ts +++ b/packages/payload/src/errors/Forbidden.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class Forbidden extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/InvalidConfiguration.ts b/packages/payload/src/errors/InvalidConfiguration.ts index ac3339c69..04c95468b 100644 --- a/packages/payload/src/errors/InvalidConfiguration.ts +++ b/packages/payload/src/errors/InvalidConfiguration.ts @@ -1,6 +1,6 @@ import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class InvalidConfiguration extends APIError { constructor(message: string) { diff --git a/packages/payload/src/errors/InvalidFieldName.ts b/packages/payload/src/errors/InvalidFieldName.ts index 50071e572..48ae7b904 100644 --- a/packages/payload/src/errors/InvalidFieldName.ts +++ b/packages/payload/src/errors/InvalidFieldName.ts @@ -1,6 +1,6 @@ import type { FieldAffectingData } from '../fields/config/types' -import APIError from './APIError' +import APIError from './APIError.js' class InvalidFieldName extends APIError { constructor(field: FieldAffectingData, fieldName: string) { diff --git a/packages/payload/src/errors/InvalidFieldRelationship.ts b/packages/payload/src/errors/InvalidFieldRelationship.ts index e95da8be6..fd28677da 100644 --- a/packages/payload/src/errors/InvalidFieldRelationship.ts +++ b/packages/payload/src/errors/InvalidFieldRelationship.ts @@ -1,6 +1,6 @@ -import type { RelationshipField, UploadField } from '../fields/config/types' +import type { RelationshipField, UploadField } from '../fields/config/types.d.ts' -import APIError from './APIError' +import APIError from './APIError.js' class InvalidFieldRelationship extends APIError { constructor(field: RelationshipField | UploadField, relationship: string) { diff --git a/packages/payload/src/errors/InvalidSchema.ts b/packages/payload/src/errors/InvalidSchema.ts index 3ee9b1c72..528e219ed 100644 --- a/packages/payload/src/errors/InvalidSchema.ts +++ b/packages/payload/src/errors/InvalidSchema.ts @@ -1,6 +1,6 @@ import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class InvalidSchema extends APIError { constructor(message: string, results: any) { diff --git a/packages/payload/src/errors/LockedAuth.ts b/packages/payload/src/errors/LockedAuth.ts index 443ba3a18..cbdfc0639 100644 --- a/packages/payload/src/errors/LockedAuth.ts +++ b/packages/payload/src/errors/LockedAuth.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class LockedAuth extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/MissingCollectionLabel.ts b/packages/payload/src/errors/MissingCollectionLabel.ts index 19e867ceb..05cd262a0 100644 --- a/packages/payload/src/errors/MissingCollectionLabel.ts +++ b/packages/payload/src/errors/MissingCollectionLabel.ts @@ -1,4 +1,4 @@ -import APIError from './APIError' +import APIError from './APIError.js' class MissingCollectionLabel extends APIError { constructor() { diff --git a/packages/payload/src/errors/MissingFieldInputOptions.ts b/packages/payload/src/errors/MissingFieldInputOptions.ts index b4313c167..b06699103 100644 --- a/packages/payload/src/errors/MissingFieldInputOptions.ts +++ b/packages/payload/src/errors/MissingFieldInputOptions.ts @@ -1,6 +1,6 @@ -import type { RadioField, SelectField } from '../fields/config/types' +import type { RadioField, SelectField } from '../fields/config/types.d.ts' -import APIError from './APIError' +import APIError from './APIError.js' class MissingFieldInputOptions extends APIError { constructor(field: RadioField | SelectField) { diff --git a/packages/payload/src/errors/MissingFieldType.ts b/packages/payload/src/errors/MissingFieldType.ts index 45138bc35..24001831e 100644 --- a/packages/payload/src/errors/MissingFieldType.ts +++ b/packages/payload/src/errors/MissingFieldType.ts @@ -1,7 +1,7 @@ -import type { Field } from '../fields/config/types' +import type { Field } from '../fields/config/types.d.ts' -import { fieldAffectsData } from '../fields/config/types' -import APIError from './APIError' +import { fieldAffectsData } from '../fields/config/types.js' +import APIError from './APIError.js' class MissingFieldType extends APIError { constructor(field: Field) { diff --git a/packages/payload/src/errors/MissingFile.ts b/packages/payload/src/errors/MissingFile.ts index b10cc5e3b..c5b0fc422 100644 --- a/packages/payload/src/errors/MissingFile.ts +++ b/packages/payload/src/errors/MissingFile.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class MissingFile extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/NotFound.ts b/packages/payload/src/errors/NotFound.ts index d384a1c49..df54dd9b9 100644 --- a/packages/payload/src/errors/NotFound.ts +++ b/packages/payload/src/errors/NotFound.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class NotFound extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/QueryError.ts b/packages/payload/src/errors/QueryError.ts index 84a40688e..d7cddcfa7 100644 --- a/packages/payload/src/errors/QueryError.ts +++ b/packages/payload/src/errors/QueryError.ts @@ -1,6 +1,6 @@ import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class QueryError extends APIError<{ path: string }[]> { constructor(results: { path: string }[]) { diff --git a/packages/payload/src/errors/TimestampsRequired.ts b/packages/payload/src/errors/TimestampsRequired.ts index 27dfa8a6f..07d0adedf 100644 --- a/packages/payload/src/errors/TimestampsRequired.ts +++ b/packages/payload/src/errors/TimestampsRequired.ts @@ -1,6 +1,6 @@ -import type { CollectionConfig } from '../collections/config/types' +import type { CollectionConfig } from '../collections/config/types.d.ts' -import APIError from './APIError' +import APIError from './APIError.js' class TimestampsRequired extends APIError { constructor(collection: CollectionConfig) { diff --git a/packages/payload/src/errors/UnathorizedError.ts b/packages/payload/src/errors/UnathorizedError.ts index 16adc9e11..02c862a2b 100644 --- a/packages/payload/src/errors/UnathorizedError.ts +++ b/packages/payload/src/errors/UnathorizedError.ts @@ -3,7 +3,7 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class UnauthorizedError extends APIError { constructor(t?: TFunction) { diff --git a/packages/payload/src/errors/ValidationError.ts b/packages/payload/src/errors/ValidationError.ts index dcd84d659..30d33c45e 100644 --- a/packages/payload/src/errors/ValidationError.ts +++ b/packages/payload/src/errors/ValidationError.ts @@ -3,15 +3,15 @@ import type { TFunction } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' import httpStatus from 'http-status' -import APIError from './APIError' +import APIError from './APIError.js' class ValidationError extends APIError<{ field: string; message: string }[]> { constructor(results: { field: string; message: string }[], t?: TFunction) { const message = t ? t('error:followingFieldsInvalid', { count: results.length }) : results.length === 1 - ? translations.en.error.followingFieldsInvalid_one - : translations.en.error.followingFieldsInvalid_other + ? translations.en.error.followingFieldsInvalid_one + : translations.en.error.followingFieldsInvalid_other super(`${message} ${results.map((f) => f.field).join(', ')}`, httpStatus.BAD_REQUEST, results) } diff --git a/packages/payload/src/errors/index.ts b/packages/payload/src/errors/index.ts index 57f91ca2e..7001b3e88 100644 --- a/packages/payload/src/errors/index.ts +++ b/packages/payload/src/errors/index.ts @@ -1,19 +1,19 @@ -export { default as APIError } from './APIError' -export { default as AuthenticationError } from './AuthenticationError' -export { default as DuplicateCollection } from './DuplicateCollection' -export { default as DuplicateFieldName } from './DuplicateFieldName' -export { default as DuplicateGlobal } from './DuplicateGlobal' -export { default as ErrorDeletingFile } from './ErrorDeletingFile' -export { default as FileUploadError } from './FileUploadError' -export { default as Forbidden } from './Forbidden' -export { default as InvalidConfiguration } from './InvalidConfiguration' -export { default as InvalidFieldName } from './InvalidFieldName' -export { default as InvalidFieldRelationship } from './InvalidFieldRelationship' -export { default as LockedAuth } from './LockedAuth' -export { default as MissingCollectionLabel } from './MissingCollectionLabel' -export { default as MissingFieldInputOptions } from './MissingFieldInputOptions' -export { default as MissingFieldType } from './MissingFieldType' -export { default as MissingFile } from './MissingFile' -export { default as NotFound } from './NotFound' -export { default as QueryError } from './QueryError' -export { default as ValidationError } from './ValidationError' +export { default as APIError } from './APIError.js' +export { default as AuthenticationError } from './AuthenticationError.js' +export { default as DuplicateCollection } from './DuplicateCollection.js' +export { default as DuplicateFieldName } from './DuplicateFieldName.js' +export { default as DuplicateGlobal } from './DuplicateGlobal.js' +export { default as ErrorDeletingFile } from './ErrorDeletingFile.js' +export { default as FileUploadError } from './FileUploadError.js' +export { default as Forbidden } from './Forbidden.js' +export { default as InvalidConfiguration } from './InvalidConfiguration.js' +export { default as InvalidFieldName } from './InvalidFieldName.js' +export { default as InvalidFieldRelationship } from './InvalidFieldRelationship.js' +export { default as LockedAuth } from './LockedAuth.js' +export { default as MissingCollectionLabel } from './MissingCollectionLabel.js' +export { default as MissingFieldInputOptions } from './MissingFieldInputOptions.js' +export { default as MissingFieldType } from './MissingFieldType.js' +export { default as MissingFile } from './MissingFile.js' +export { default as NotFound } from './NotFound.js' +export { default as QueryError } from './QueryError.js' +export { default as ValidationError } from './ValidationError.js' diff --git a/packages/payload/src/errors/types.ts b/packages/payload/src/errors/types.ts index 19d4970a4..fcb9204cb 100644 --- a/packages/payload/src/errors/types.ts +++ b/packages/payload/src/errors/types.ts @@ -1 +1 @@ -export * from '.' +export * from './index.js' diff --git a/packages/payload/src/exports/auth.ts b/packages/payload/src/exports/auth.ts index 98928adb2..2d5f19f5f 100644 --- a/packages/payload/src/exports/auth.ts +++ b/packages/payload/src/exports/auth.ts @@ -1,7 +1,7 @@ -export * from '../auth' -export { default as executeAccess } from '../auth/executeAccess' -export { getAccessResults } from '../auth/getAccessResults' -export { getAuthenticatedUser } from '../auth/getAuthenticatedUser' +export * from '../auth/index.js' +export { default as executeAccess } from '../auth/executeAccess.js' +export { getAccessResults } from '../auth/getAccessResults.js' +export { getAuthenticatedUser } from '../auth/getAuthenticatedUser.js' export type { AuthStrategyFunction, @@ -14,4 +14,4 @@ export type { Permissions, User, VerifyConfig, -} from '../auth/types' +} from '../auth/types.d.ts' diff --git a/packages/payload/src/exports/config.ts b/packages/payload/src/exports/config.ts index 1c45b73f1..2109876d4 100644 --- a/packages/payload/src/exports/config.ts +++ b/packages/payload/src/exports/config.ts @@ -1,11 +1,11 @@ -export { buildConfig } from '../config/build' -export * from '../config/types' +export { buildConfig } from '../config/build.js' +export * from '../config/types.js' -export type { FieldTypes } from '../admin/forms/FieldTypes' -export { defaults as collectionDefaults } from '../collections/config/defaults' -export { createClientConfig } from '../config/createClientConfig' -export { defaults } from '../config/defaults' -export { sanitizeConfig } from '../config/sanitize' -export { baseBlockFields } from '../fields/baseFields/baseBlockFields' -export { baseIDField } from '../fields/baseFields/baseIDField' -export { sanitizeFields } from '../fields/config/sanitize' +export type { FieldTypes } from '../admin/forms/FieldTypes.js' +export { defaults as collectionDefaults } from '../collections/config/defaults.js' +export { createClientConfig } from '../config/createClientConfig.js' +export { defaults } from '../config/defaults.js' +export { sanitizeConfig } from '../config/sanitize.js' +export { baseBlockFields } from '../fields/baseFields/baseBlockFields.js' +export { baseIDField } from '../fields/baseFields/baseIDField.js' +export { sanitizeFields } from '../fields/config/sanitize.js' diff --git a/packages/payload/src/exports/database.ts b/packages/payload/src/exports/database.ts index e208e7892..9f11cc634 100644 --- a/packages/payload/src/exports/database.ts +++ b/packages/payload/src/exports/database.ts @@ -47,44 +47,44 @@ export type { UpdateOneArgs, UpdateVersion, UpdateVersionArgs, -} from '../database/types' +} from '../database/types.d.ts' -export * from '../database/queryValidation/types' +export * from '../database/queryValidation/types.js' -export { combineQueries } from '../database/combineQueries' +export { combineQueries } from '../database/combineQueries.js' -export { createDatabaseAdapter } from '../database/createDatabaseAdapter' +export { createDatabaseAdapter } from '../database/createDatabaseAdapter.js' -export { default as flattenWhereToOperators } from '../database/flattenWhereToOperators' +export { default as flattenWhereToOperators } from '../database/flattenWhereToOperators.js' -export { getLocalizedPaths } from '../database/getLocalizedPaths' +export { getLocalizedPaths } from '../database/getLocalizedPaths.js' -export { createMigration } from '../database/migrations/createMigration' +export { createMigration } from '../database/migrations/createMigration.js' -export { getMigrations } from '../database/migrations/getMigrations' +export { getMigrations } from '../database/migrations/getMigrations.js' -export { migrate } from '../database/migrations/migrate' +export { migrate } from '../database/migrations/migrate.js' -export { migrateDown } from '../database/migrations/migrateDown' +export { migrateDown } from '../database/migrations/migrateDown.js' -export { migrateRefresh } from '../database/migrations/migrateRefresh' +export { migrateRefresh } from '../database/migrations/migrateRefresh.js' -export { migrateReset } from '../database/migrations/migrateReset' +export { migrateReset } from '../database/migrations/migrateReset.js' -export { migrateStatus } from '../database/migrations/migrateStatus' +export { migrateStatus } from '../database/migrations/migrateStatus.js' -export { migrationTemplate } from '../database/migrations/migrationTemplate' +export { migrationTemplate } from '../database/migrations/migrationTemplate.js' -export { migrationsCollection } from '../database/migrations/migrationsCollection' +export { migrationsCollection } from '../database/migrations/migrationsCollection.js' -export { readMigrationFiles } from '../database/migrations/readMigrationFiles' +export { readMigrationFiles } from '../database/migrations/readMigrationFiles.js' -export type { EntityPolicies, PathToQuery } from '../database/queryValidation/types' +export type { EntityPolicies, PathToQuery } from '../database/queryValidation/types.d.ts' -export { validateQueryPaths } from '../database/queryValidation/validateQueryPaths' +export { validateQueryPaths } from '../database/queryValidation/validateQueryPaths.js' -export { validateSearchParam } from '../database/queryValidation/validateSearchParams' +export { validateSearchParam } from '../database/queryValidation/validateSearchParams.js' -export { commitTransaction } from '../utilities/commitTransaction' -export { initTransaction } from '../utilities/initTransaction' -export { killTransaction } from '../utilities/killTransaction' +export { commitTransaction } from '../utilities/commitTransaction.js' +export { initTransaction } from '../utilities/initTransaction.js' +export { killTransaction } from '../utilities/killTransaction.js' diff --git a/packages/payload/src/exports/errors.ts b/packages/payload/src/exports/errors.ts index bb7be7971..fdb33ac93 100644 --- a/packages/payload/src/exports/errors.ts +++ b/packages/payload/src/exports/errors.ts @@ -17,4 +17,4 @@ export { NotFound, QueryError, ValidationError, -} from '../errors' +} from '../errors/index.js' diff --git a/packages/payload/src/exports/fields/index.ts b/packages/payload/src/exports/fields/index.ts index 8530596c5..c962d6b13 100644 --- a/packages/payload/src/exports/fields/index.ts +++ b/packages/payload/src/exports/fields/index.ts @@ -1,2 +1,2 @@ -export { default as getDefaultValue } from '../../fields/getDefaultValue' -export { default as sortableFieldTypes } from '../../fields/sortableFieldTypes' +export { default as getDefaultValue } from '../../fields/getDefaultValue.js' +export { default as sortableFieldTypes } from '../../fields/sortableFieldTypes.js' diff --git a/packages/payload/src/exports/fields/validations.ts b/packages/payload/src/exports/fields/validations.ts index 8ae034b33..ce5621f41 100644 --- a/packages/payload/src/exports/fields/validations.ts +++ b/packages/payload/src/exports/fields/validations.ts @@ -1 +1 @@ -export * from '../../fields/validations' +export * from '../../fields/validations.js' diff --git a/packages/payload/src/exports/operations.ts b/packages/payload/src/exports/operations.ts index 5d901122e..abd875509 100644 --- a/packages/payload/src/exports/operations.ts +++ b/packages/payload/src/exports/operations.ts @@ -1,30 +1,30 @@ -export { accessOperation } from '../auth/operations/access' -export { forgotPasswordOperation } from '../auth/operations/forgotPassword' -export { initOperation } from '../auth/operations/init' -export { loginOperation } from '../auth/operations/login' -export { logoutOperation } from '../auth/operations/logout' -export { meOperation } from '../auth/operations/me' -export { refreshOperation } from '../auth/operations/refresh' -export { registerFirstUserOperation } from '../auth/operations/registerFirstUser' -export { resetPasswordOperation } from '../auth/operations/resetPassword' -export { unlockOperation } from '../auth/operations/unlock' -export { verifyEmailOperation } from '../auth/operations/verifyEmail' +export { accessOperation } from '../auth/operations/access.js' +export { forgotPasswordOperation } from '../auth/operations/forgotPassword.js' +export { initOperation } from '../auth/operations/init.js' +export { loginOperation } from '../auth/operations/login.js' +export { logoutOperation } from '../auth/operations/logout.js' +export { meOperation } from '../auth/operations/me.js' +export { refreshOperation } from '../auth/operations/refresh.js' +export { registerFirstUserOperation } from '../auth/operations/registerFirstUser.js' +export { resetPasswordOperation } from '../auth/operations/resetPassword.js' +export { unlockOperation } from '../auth/operations/unlock.js' +export { verifyEmailOperation } from '../auth/operations/verifyEmail.js' -export { createOperation } from '../collections/operations/create' -export { deleteOperation } from '../collections/operations/delete' -export { deleteByIDOperation } from '../collections/operations/deleteByID' -export { docAccessOperation } from '../collections/operations/docAccess' -export { findOperation } from '../collections/operations/find' -export { findByIDOperation } from '../collections/operations/findByID' -export { findVersionByIDOperation } from '../collections/operations/findVersionByID' -export { findVersionsOperation } from '../collections/operations/findVersions' -export { restoreVersionOperation } from '../collections/operations/restoreVersion' -export { updateOperation } from '../collections/operations/update' -export { updateByIDOperation } from '../collections/operations/updateByID' +export { createOperation } from '../collections/operations/create.js' +export { deleteOperation } from '../collections/operations/delete.js' +export { deleteByIDOperation } from '../collections/operations/deleteByID.js' +export { docAccessOperation } from '../collections/operations/docAccess.js' +export { findOperation } from '../collections/operations/find.js' +export { findByIDOperation } from '../collections/operations/findByID.js' +export { findVersionByIDOperation } from '../collections/operations/findVersionByID.js' +export { findVersionsOperation } from '../collections/operations/findVersions.js' +export { restoreVersionOperation } from '../collections/operations/restoreVersion.js' +export { updateOperation } from '../collections/operations/update.js' +export { updateByIDOperation } from '../collections/operations/updateByID.js' -export { docAccessOperation as docAccessOperationGlobal } from '../globals/operations/docAccess' -export { findOneOperation } from '../globals/operations/findOne' -export { findVersionByIDOperation as findVersionByIDOperationGlobal } from '../globals/operations/findVersionByID' -export { findVersionsOperation as findVersionsOperationGlobal } from '../globals/operations/findVersions' -export { restoreVersionOperation as restoreVersionOperationGlobal } from '../globals/operations/restoreVersion' -export { updateOperation as updateOperationGlobal } from '../globals/operations/update' +export { docAccessOperation as docAccessOperationGlobal } from '../globals/operations/docAccess.js' +export { findOneOperation } from '../globals/operations/findOne.js' +export { findVersionByIDOperation as findVersionByIDOperationGlobal } from '../globals/operations/findVersionByID.js' +export { findVersionsOperation as findVersionsOperationGlobal } from '../globals/operations/findVersions.js' +export { restoreVersionOperation as restoreVersionOperationGlobal } from '../globals/operations/restoreVersion.js' +export { updateOperation as updateOperationGlobal } from '../globals/operations/update.js' diff --git a/packages/payload/src/exports/types.ts b/packages/payload/src/exports/types.ts index 3d954df04..22f62c84d 100644 --- a/packages/payload/src/exports/types.ts +++ b/packages/payload/src/exports/types.ts @@ -1,8 +1,8 @@ -export * from './../types' -export type * from '../admin/types' -export type * from '../uploads/types' +export * from './../types/index.js' +export type * from '../admin/types.d.ts' +export type * from '../uploads/types.d.ts' -export type { DocumentPermissions } from '../auth' +export type { DocumentPermissions } from '../auth/index.d.ts' export type { AfterChangeHook as CollectionAfterChangeHook, @@ -24,9 +24,9 @@ export type { SanitizedCollectionConfig, TypeWithID, TypeWithTimestamps, -} from './../collections/config/types' +} from './../collections/config/types.d.ts' -export type { Access, AccessArgs, ClientConfig, SanitizedConfig } from './../config/types' +export type { Access, AccessArgs, ClientConfig, SanitizedConfig } from './../config/types.d.ts' export type { ArrayField, @@ -83,7 +83,7 @@ export type { Validate, ValidateOptions, ValueWithRelation, -} from './../fields/config/types' +} from './../fields/config/types.d.ts' export { fieldAffectsData, @@ -100,7 +100,7 @@ export { optionsAreObjects, tabHasName, valueIsValueWithRelation, -} from './../fields/config/types' +} from './../fields/config/types.js' export type { AfterChangeHook as GlobalAfterChangeHook, @@ -110,8 +110,8 @@ export type { BeforeValidateHook as GlobalBeforeValidateHook, GlobalConfig, SanitizedGlobalConfig, -} from './../globals/config/types' +} from './../globals/config/types.d.ts' -export type { DocumentPreferences } from './../preferences/types' +export type { DocumentPreferences } from './../preferences/types.d.ts' -export { validOperators } from './../types/constants' +export { validOperators } from './../types/constants.js' diff --git a/packages/payload/src/exports/utilities.ts b/packages/payload/src/exports/utilities.ts index 9db918c08..64d546add 100644 --- a/packages/payload/src/exports/utilities.ts +++ b/packages/payload/src/exports/utilities.ts @@ -1,42 +1,42 @@ -export { getDataLoader } from '../collections/dataloader' -export { default as getDefaultValue } from '../fields/getDefaultValue' -export { promise as afterReadPromise } from '../fields/hooks/afterRead/promise' -export { traverseFields as afterReadTraverseFields } from '../fields/hooks/afterRead/traverseFields' -export { extractTranslations } from '../translations/extractTranslations' +export { getDataLoader } from '../collections/dataloader.js' +export { default as getDefaultValue } from '../fields/getDefaultValue.js' +export { promise as afterReadPromise } from '../fields/hooks/afterRead/promise.js' +export { traverseFields as afterReadTraverseFields } from '../fields/hooks/afterRead/traverseFields.js' +export { extractTranslations } from '../translations/extractTranslations.js' -export { formatFilesize } from '../uploads/formatFilesize' +export { formatFilesize } from '../uploads/formatFilesize.js' -export { default as isImage } from '../uploads/isImage' -export { combineMerge } from '../utilities/combineMerge' +export { default as isImage } from '../uploads/isImage.js' +export { combineMerge } from '../utilities/combineMerge.js' export { configToJSONSchema, entityToJSONSchema, fieldsToJSONSchema, withNullableJSONSchemaType, -} from '../utilities/configToJSONSchema' -export { createArrayFromCommaDelineated } from '../utilities/createArrayFromCommaDelineated' -export { createLocalReq } from '../utilities/createLocalReq' -export { deepCopyObject } from '../utilities/deepCopyObject' -export { deepMerge } from '../utilities/deepMerge' -export { fieldSchemaToJSON } from '../utilities/fieldSchemaToJSON' +} from '../utilities/configToJSONSchema.js' +export { createArrayFromCommaDelineated } from '../utilities/createArrayFromCommaDelineated.js' +export { createLocalReq } from '../utilities/createLocalReq.js' +export { deepCopyObject } from '../utilities/deepCopyObject.js' +export { deepMerge } from '../utilities/deepMerge.js' +export { fieldSchemaToJSON } from '../utilities/fieldSchemaToJSON.js' -export { default as flattenTopLevelFields } from '../utilities/flattenTopLevelFields' -export { formatLabels, formatNames, toWords } from '../utilities/formatLabels' +export { default as flattenTopLevelFields } from '../utilities/flattenTopLevelFields.js' +export { formatLabels, formatNames, toWords } from '../utilities/formatLabels.js' -export { getIDType } from '../utilities/getIDType' +export { getIDType } from '../utilities/getIDType.js' -export { getObjectDotNotation } from '../utilities/getObjectDotNotation' -export { default as getUniqueListBy } from '../utilities/getUniqueListBy' -export { isEntityHidden } from '../utilities/isEntityHidden' -export { isNumber } from '../utilities/isNumber' -export { isValidID } from '../utilities/isValidID' +export { getObjectDotNotation } from '../utilities/getObjectDotNotation.js' +export { default as getUniqueListBy } from '../utilities/getUniqueListBy.js' +export { isEntityHidden } from '../utilities/isEntityHidden.js' +export { isNumber } from '../utilities/isNumber.js' +export { isValidID } from '../utilities/isValidID.js' -export { default as isolateObjectProperty } from '../utilities/isolateObjectProperty' +export { default as isolateObjectProperty } from '../utilities/isolateObjectProperty.js' -export { setsAreEqual } from '../utilities/setsAreEqual' +export { setsAreEqual } from '../utilities/setsAreEqual.js' -export { default as toKebabCase } from '../utilities/toKebabCase' -export { default as wait } from '../utilities/wait' +export { default as toKebabCase } from '../utilities/toKebabCase.js' +export { default as wait } from '../utilities/wait.js' -export { default as wordBoundariesRegex } from '../utilities/wordBoundariesRegex' +export { default as wordBoundariesRegex } from '../utilities/wordBoundariesRegex.js' diff --git a/packages/payload/src/exports/versions.ts b/packages/payload/src/exports/versions.ts index 429af3d9b..3be4682d7 100644 --- a/packages/payload/src/exports/versions.ts +++ b/packages/payload/src/exports/versions.ts @@ -1,9 +1,9 @@ -export { buildVersionCollectionFields } from '../versions/buildCollectionFields' -export { buildVersionGlobalFields } from '../versions/buildGlobalFields' -export { deleteCollectionVersions } from '../versions/deleteCollectionVersions' -export { enforceMaxVersions } from '../versions/enforceMaxVersions' -export { getLatestCollectionVersion } from '../versions/getLatestCollectionVersion' -export { getLatestGlobalVersion } from '../versions/getLatestGlobalVersion' -export { getVersionsModelName } from '../versions/getVersionsModelName' -export { saveVersion } from '../versions/saveVersion' -export type { TypeWithVersion } from '../versions/types' +export { buildVersionCollectionFields } from '../versions/buildCollectionFields.js' +export { buildVersionGlobalFields } from '../versions/buildGlobalFields.js' +export { deleteCollectionVersions } from '../versions/deleteCollectionVersions.js' +export { enforceMaxVersions } from '../versions/enforceMaxVersions.js' +export { getLatestCollectionVersion } from '../versions/getLatestCollectionVersion.js' +export { getLatestGlobalVersion } from '../versions/getLatestGlobalVersion.js' +export { getVersionsModelName } from '../versions/getVersionsModelName.js' +export { saveVersion } from '../versions/saveVersion.js' +export type { TypeWithVersion } from '../versions/types.d.ts' diff --git a/packages/payload/src/express/middleware/errorHandler.ts b/packages/payload/src/express/middleware/errorHandler.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/payload/src/express/middleware/index.ts b/packages/payload/src/express/middleware/index.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/payload/src/fields/baseFields/baseBlockFields.ts b/packages/payload/src/fields/baseFields/baseBlockFields.ts index 06e7a83f9..45820d857 100644 --- a/packages/payload/src/fields/baseFields/baseBlockFields.ts +++ b/packages/payload/src/fields/baseFields/baseBlockFields.ts @@ -1,16 +1,16 @@ -import type { Field } from '../config/types' +import type { Field } from '../config/types.d.ts' -import { baseIDField } from './baseIDField' +import { baseIDField } from './baseIDField.js' export const baseBlockFields: Field[] = [ baseIDField, { name: 'blockName', + type: 'text', admin: { disabled: true, }, label: 'Block Name', required: false, - type: 'text', }, ] diff --git a/packages/payload/src/fields/baseFields/baseIDField.ts b/packages/payload/src/fields/baseFields/baseIDField.ts index 7121ca4d3..9d7c34048 100644 --- a/packages/payload/src/fields/baseFields/baseIDField.ts +++ b/packages/payload/src/fields/baseFields/baseIDField.ts @@ -1,12 +1,13 @@ import ObjectId from 'bson-objectid' -import type { Field, FieldHook } from '../config/types' +import type { Field, FieldHook } from '../config/types.d.ts' const generateID: FieldHook = ({ operation, value }) => (operation !== 'create' ? value : false) || new ObjectId().toHexString() export const baseIDField: Field = { name: 'id', + type: 'text', admin: { disabled: true, }, @@ -14,5 +15,4 @@ export const baseIDField: Field = { beforeChange: [generateID], }, label: 'ID', - type: 'text', } diff --git a/packages/payload/src/fields/config/sanitize.spec.ts b/packages/payload/src/fields/config/sanitize.spec.ts index ec4eec9b6..debc67ca9 100644 --- a/packages/payload/src/fields/config/sanitize.spec.ts +++ b/packages/payload/src/fields/config/sanitize.spec.ts @@ -10,11 +10,11 @@ import type { import { Config } from '../../config/types' import { InvalidFieldName, InvalidFieldRelationship, MissingFieldType } from '../../errors' import { sanitizeFields } from './sanitize' -import { DatabaseAdapter } from '../..' +import type { BaseDatabaseAdapter } from '../../database/types.d.ts' const dummyConfig: Config = { collections: [], - db: () => ({}) as DatabaseAdapter, + db: () => ({}) as BaseDatabaseAdapter, } describe('sanitizeFields', () => { diff --git a/packages/payload/src/fields/config/sanitize.ts b/packages/payload/src/fields/config/sanitize.ts index 01e2f65c0..25f1fd14e 100644 --- a/packages/payload/src/fields/config/sanitize.ts +++ b/packages/payload/src/fields/config/sanitize.ts @@ -1,17 +1,17 @@ -import type { Config } from '../../config/types' -import type { Field } from './types' +import type { Config } from '../../config/types.d.ts' +import type { Field } from './types.d.ts' import { DuplicateFieldName, InvalidFieldName, InvalidFieldRelationship, MissingFieldType, -} from '../../errors' -import { formatLabels, toWords } from '../../utilities/formatLabels' -import { baseBlockFields } from '../baseFields/baseBlockFields' -import { baseIDField } from '../baseFields/baseIDField' -import validations from '../validations' -import { fieldAffectsData, tabHasName } from './types' +} from '../../errors/index.js' +import { formatLabels, toWords } from '../../utilities/formatLabels.js' +import { baseBlockFields } from '../baseFields/baseBlockFields.js' +import { baseIDField } from '../baseFields/baseIDField.js' +import validations from '../validations.js' +import { fieldAffectsData, tabHasName } from './types.js' type Args = { config: Config @@ -112,7 +112,7 @@ export const sanitizeFields = ({ if (fieldAffectsData(field)) { if (existingFieldNames.has(field.name)) { throw new DuplicateFieldName(field.name) - } else if (!['id', 'blockName'].includes(field.name)) { + } else if (!['blockName', 'id'].includes(field.name)) { existingFieldNames.add(field.name) } @@ -171,9 +171,9 @@ export const sanitizeFields = ({ unsanitizedBlock.fields = sanitizeFields({ config, + existingFieldNames: new Set(), fields: block.fields, validRelationships, - existingFieldNames: new Set(), }) return unsanitizedBlock diff --git a/packages/payload/src/fields/config/schema.ts b/packages/payload/src/fields/config/schema.ts index 298fbcf59..eb9fb837e 100644 --- a/packages/payload/src/fields/config/schema.ts +++ b/packages/payload/src/fields/config/schema.ts @@ -1,6 +1,6 @@ import joi from 'joi' -import { componentSchema } from '../../config/shared/componentSchema' +import { componentSchema } from '../../config/shared/componentSchema.js' export const baseAdminComponentFields = joi .object() @@ -62,13 +62,14 @@ export const baseField = joi export const idField = baseField.keys({ name: joi.string().valid('id'), + type: joi.string().valid('text', 'number'), localized: joi.invalid(true), required: joi.not(false, 0).default(true), - type: joi.string().valid('text', 'number'), }) export const text = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('text').required(), admin: baseAdminFields.keys({ autoComplete: joi.string(), components: baseAdminComponentFields.keys({ @@ -88,11 +89,11 @@ export const text = baseField.keys({ maxRows: joi.number().when('hasMany', { is: joi.not(true), then: joi.forbidden() }), minLength: joi.number(), minRows: joi.number().when('hasMany', { is: joi.not(true), then: joi.forbidden() }), - type: joi.string().valid('text').required(), }) export const number = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('number').required(), admin: baseAdminFields.keys({ autoComplete: joi.string(), components: baseAdminComponentFields.keys({ @@ -116,11 +117,11 @@ export const number = baseField.keys({ maxRows: joi.number().when('hasMany', { is: joi.not(true), then: joi.forbidden() }), min: joi.number(), minRows: joi.number().when('hasMany', { is: joi.not(true), then: joi.forbidden() }), - type: joi.string().valid('number').required(), }) export const textarea = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('textarea').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -135,11 +136,11 @@ export const textarea = baseField.keys({ defaultValue: joi.alternatives().try(joi.string(), joi.func()), maxLength: joi.number(), minLength: joi.number(), - type: joi.string().valid('textarea').required(), }) export const email = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('email').required(), admin: baseAdminFields.keys({ autoComplete: joi.string(), components: baseAdminComponentFields.keys({ @@ -153,11 +154,11 @@ export const email = baseField.keys({ defaultValue: joi.alternatives().try(joi.string(), joi.func()), maxLength: joi.number(), minLength: joi.number(), - type: joi.string().valid('email').required(), }) export const code = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('code').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -167,11 +168,11 @@ export const code = baseField.keys({ language: joi.string(), }), defaultValue: joi.alternatives().try(joi.string(), joi.func()), - type: joi.string().valid('code').required(), }) export const json = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('json').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -180,11 +181,11 @@ export const json = baseField.keys({ editorOptions: joi.object().unknown(), // Editor['options'] @monaco-editor/react }), defaultValue: joi.alternatives().try(joi.array(), joi.object()), - type: joi.string().valid('json').required(), }) export const select = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('select').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -212,11 +213,11 @@ export const select = baseField.keys({ ), ) .required(), - type: joi.string().valid('select').required(), }) export const radio = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('radio').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -241,20 +242,19 @@ export const radio = baseField.keys({ ), ) .required(), - type: joi.string().valid('radio').required(), }) export const row = baseField.keys({ + type: joi.string().valid('row').required(), admin: baseAdminFields.default(), fields: joi.array().items(joi.link('#field')), - type: joi.string().valid('row').required(), }) export const collapsible = baseField.keys({ + type: joi.string().valid('collapsible').required(), admin: baseAdminFields.default(), fields: joi.array().items(joi.link('#field')), label: joi.alternatives().try(joi.string(), componentSchema), - type: joi.string().valid('collapsible').required(), }) const tab = baseField.keys({ @@ -271,28 +271,29 @@ const tab = baseField.keys({ }) export const tabs = baseField.keys({ + type: joi.string().valid('tabs').required(), admin: baseAdminFields.keys({ description: joi.forbidden(), }), fields: joi.forbidden(), localized: joi.forbidden(), tabs: joi.array().items(tab).required(), - type: joi.string().valid('tabs').required(), }) export const group = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('group').required(), admin: baseAdminFields.keys({ hideGutter: joi.boolean().default(true), }), defaultValue: joi.alternatives().try(joi.object(), joi.func()), fields: joi.array().items(joi.link('#field')), interfaceName: joi.string(), - type: joi.string().valid('group').required(), }) export const array = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('array').required(), admin: baseAdminFields .keys({ components: baseAdminComponentFields @@ -315,11 +316,11 @@ export const array = baseField.keys({ }), maxRows: joi.number(), minRows: joi.number(), - type: joi.string().valid('array').required(), }) export const upload = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('upload').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -330,11 +331,11 @@ export const upload = baseField.keys({ filterOptions: joi.alternatives().try(joi.object(), joi.func()), maxDepth: joi.number(), relationTo: joi.string().required(), - type: joi.string().valid('upload').required(), }) export const checkbox = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('checkbox').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -344,11 +345,11 @@ export const checkbox = baseField.keys({ }), }), defaultValue: joi.alternatives().try(joi.boolean(), joi.func()), - type: joi.string().valid('checkbox').required(), }) export const point = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('point').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -358,11 +359,11 @@ export const point = baseField.keys({ }), }), defaultValue: joi.alternatives().try(joi.array().items(joi.number()).max(2).min(2), joi.func()), - type: joi.string().valid('point').required(), }) export const relationship = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('relationship').required(), admin: baseAdminFields.keys({ allowCreate: joi.boolean().default(true), components: baseAdminComponentFields.keys({ @@ -391,15 +392,17 @@ export const relationship = baseField.keys({ .warning('deprecated', { message: 'Use minRows instead.' }), minRows: joi.number().when('hasMany', { is: joi.not(true), then: joi.forbidden() }), relationTo: joi.alternatives().try(joi.string().required(), joi.array().items(joi.string())), - type: joi.string().valid('relationship').required(), }) export const blocks = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('blocks').required(), blocks: joi .array() .items( joi.object({ + slug: joi.string().required(), + custom: joi.object().pattern(joi.string(), joi.any()), fields: joi.array().items(joi.link('#field')), graphQL: joi.object().keys({ singularName: joi.string(), @@ -415,8 +418,6 @@ export const blocks = baseField.keys({ .alternatives() .try(joi.string(), joi.object().pattern(joi.string(), [joi.string()])), }), - slug: joi.string().required(), - custom: joi.object().pattern(joi.string(), joi.any()), }), ) .required(), @@ -431,11 +432,11 @@ export const blocks = baseField.keys({ }), maxRows: joi.number(), minRows: joi.number(), - type: joi.string().valid('blocks').required(), }) export const richText = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('richText').required(), admin: baseAdminFields.default(), defaultValue: joi.alternatives().try(joi.array().items(joi.object()), joi.func(), joi.object()), editor: joi @@ -451,11 +452,11 @@ export const richText = baseField.keys({ validate: joi.func().required(), }) .unknown(), - type: joi.string().valid('richText').required(), }) export const date = baseField.keys({ name: joi.string().required(), + type: joi.string().valid('date').required(), admin: baseAdminFields.keys({ components: baseAdminComponentFields.keys({ Error: componentSchema, @@ -478,11 +479,11 @@ export const date = baseField.keys({ placeholder: joi.string(), }), defaultValue: joi.alternatives().try(joi.string(), joi.func()), - type: joi.string().valid('date').required(), }) export const ui = joi.object().keys({ name: joi.string().required(), + type: joi.string().valid('ui').required(), admin: joi .object() .keys({ @@ -500,7 +501,6 @@ export const ui = joi.object().keys({ .default(), custom: joi.object().pattern(joi.string(), joi.any()), label: joi.alternatives().try(joi.string(), joi.object().pattern(joi.string(), [joi.string()])), - type: joi.string().valid('ui').required(), }) const fieldSchema = joi diff --git a/packages/payload/src/fields/config/types.ts b/packages/payload/src/fields/config/types.ts index 7d5892b63..b9cfc4f2f 100644 --- a/packages/payload/src/fields/config/types.ts +++ b/packages/payload/src/fields/config/types.ts @@ -13,12 +13,11 @@ import type { LabelProps, RichTextAdapter, RowLabel, -} from '../../admin/types' -import type { User } from '../../auth' -import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../types' -import type { Operation, Where } from '../../types' +} from '../../admin/types.d.ts' +import type { User } from '../../auth/index.d.ts' +import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts' +import type { Operation, PayloadRequest, RequestContext, Where } from '../../types/index.d.ts' export type FieldHookArgs = { /** The collection which the field belongs to. If the field belongs to a global, this will be null. */ diff --git a/packages/payload/src/fields/getDefaultValue.ts b/packages/payload/src/fields/getDefaultValue.ts index b8ed4672f..da0ab5ca5 100644 --- a/packages/payload/src/fields/getDefaultValue.ts +++ b/packages/payload/src/fields/getDefaultValue.ts @@ -1,4 +1,4 @@ -import type { User } from '../auth' +import type { User } from '../auth/index.js' type Args = { defaultValue: unknown diff --git a/packages/payload/src/fields/hooks/afterChange/index.ts b/packages/payload/src/fields/hooks/afterChange/index.ts index 407c2b1e4..c135e20f0 100644 --- a/packages/payload/src/fields/hooks/afterChange/index.ts +++ b/packages/payload/src/fields/hooks/afterChange/index.ts @@ -1,9 +1,9 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' -import { deepCopyObject } from '../../../utilities/deepCopyObject' -import { traverseFields } from './traverseFields' +import { deepCopyObject } from '../../../utilities/deepCopyObject.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/afterChange/promise.ts b/packages/payload/src/fields/hooks/afterChange/promise.ts index f04f26dc8..94430933d 100644 --- a/packages/payload/src/fields/hooks/afterChange/promise.ts +++ b/packages/payload/src/fields/hooks/afterChange/promise.ts @@ -1,11 +1,11 @@ /* eslint-disable no-param-reassign */ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { fieldAffectsData, tabHasName } from '../../config/types' -import { traverseFields } from './traverseFields' +import { fieldAffectsData, tabHasName } from '../../config/types.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/afterChange/traverseFields.ts b/packages/payload/src/fields/hooks/afterChange/traverseFields.ts index b0cb8df52..511a1f25e 100644 --- a/packages/payload/src/fields/hooks/afterChange/traverseFields.ts +++ b/packages/payload/src/fields/hooks/afterChange/traverseFields.ts @@ -1,9 +1,9 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { promise } from './promise' +import { promise } from './promise.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/afterRead/index.ts b/packages/payload/src/fields/hooks/afterRead/index.ts index 9c4e33f55..44672e16e 100644 --- a/packages/payload/src/fields/hooks/afterRead/index.ts +++ b/packages/payload/src/fields/hooks/afterRead/index.ts @@ -1,9 +1,9 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' -import { deepCopyObject } from '../../../utilities/deepCopyObject' -import { traverseFields } from './traverseFields' +import { deepCopyObject } from '../../../utilities/deepCopyObject.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/afterRead/promise.ts b/packages/payload/src/fields/hooks/afterRead/promise.ts index 00589b6a6..6eb056a60 100644 --- a/packages/payload/src/fields/hooks/afterRead/promise.ts +++ b/packages/payload/src/fields/hooks/afterRead/promise.ts @@ -1,14 +1,14 @@ /* eslint-disable no-param-reassign */ -import type { RichTextAdapter } from '../../../admin/types' -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { RichTextAdapter } from '../../../admin/types.d.ts' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { fieldAffectsData, tabHasName } from '../../config/types' -import getValueWithDefault from '../../getDefaultValue' -import { relationshipPopulationPromise } from './relationshipPopulationPromise' -import { traverseFields } from './traverseFields' +import { fieldAffectsData, tabHasName } from '../../config/types.js' +import getValueWithDefault from '../../getDefaultValue.js' +import { relationshipPopulationPromise } from './relationshipPopulationPromise.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null @@ -150,8 +150,6 @@ export const promise = async ({ flattenLocales, overrideAccess, populationPromises, - // TODO: JARROD `req` differs here - // @ts-ignore-next-line req, showHiddenFields, siblingDoc, diff --git a/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts b/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts index 7db24ffc4..689b2bbc9 100644 --- a/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts +++ b/packages/payload/src/fields/hooks/afterRead/relationshipPopulationPromise.ts @@ -1,7 +1,7 @@ -import type { PayloadRequest } from '../../../types' -import type { RelationshipField, UploadField } from '../../config/types' +import type { PayloadRequest } from '../../../types/index.d.ts' +import type { RelationshipField, UploadField } from '../../config/types.d.ts' -import { fieldHasMaxDepth, fieldSupportsMany } from '../../config/types' +import { fieldHasMaxDepth, fieldSupportsMany } from '../../config/types.js' type PopulateArgs = { currentDepth: number diff --git a/packages/payload/src/fields/hooks/afterRead/traverseFields.ts b/packages/payload/src/fields/hooks/afterRead/traverseFields.ts index 441068a0b..7b370b0ac 100644 --- a/packages/payload/src/fields/hooks/afterRead/traverseFields.ts +++ b/packages/payload/src/fields/hooks/afterRead/traverseFields.ts @@ -1,9 +1,9 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { promise } from './promise' +import { promise } from './promise.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/beforeChange/index.ts b/packages/payload/src/fields/hooks/beforeChange/index.ts index cca3d75a1..c8addd1c4 100644 --- a/packages/payload/src/fields/hooks/beforeChange/index.ts +++ b/packages/payload/src/fields/hooks/beforeChange/index.ts @@ -1,11 +1,10 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Operation } from '../../../types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { Operation, PayloadRequest, RequestContext } from '../../../types/index.d.ts' -import { ValidationError } from '../../../errors' -import { deepCopyObject } from '../../../utilities/deepCopyObject' -import { traverseFields } from './traverseFields' +import { ValidationError } from '../../../errors/index.js' +import { deepCopyObject } from '../../../utilities/deepCopyObject.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/beforeChange/promise.ts b/packages/payload/src/fields/hooks/beforeChange/promise.ts index f3f39ad21..b5174a1f5 100644 --- a/packages/payload/src/fields/hooks/beforeChange/promise.ts +++ b/packages/payload/src/fields/hooks/beforeChange/promise.ts @@ -1,14 +1,13 @@ import merge from 'deepmerge' -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Operation } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { Operation, PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { fieldAffectsData, tabHasName } from '../../config/types' -import { getExistingRowDoc } from './getExistingRowDoc' -import { traverseFields } from './traverseFields' +import { fieldAffectsData, tabHasName } from '../../config/types.js' +import { getExistingRowDoc } from './getExistingRowDoc.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts b/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts index 0f73ee97f..2e30f7ccf 100644 --- a/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts +++ b/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts @@ -1,10 +1,9 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Operation } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { Operation, PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { promise } from './promise' +import { promise } from './promise.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/beforeValidate/index.ts b/packages/payload/src/fields/hooks/beforeValidate/index.ts index a237142e4..42ce939cc 100644 --- a/packages/payload/src/fields/hooks/beforeValidate/index.ts +++ b/packages/payload/src/fields/hooks/beforeValidate/index.ts @@ -1,9 +1,9 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' -import { deepCopyObject } from '../../../utilities/deepCopyObject' -import { traverseFields } from './traverseFields' +import { deepCopyObject } from '../../../utilities/deepCopyObject.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/beforeValidate/promise.ts b/packages/payload/src/fields/hooks/beforeValidate/promise.ts index 1b36ad0fa..46c595512 100644 --- a/packages/payload/src/fields/hooks/beforeValidate/promise.ts +++ b/packages/payload/src/fields/hooks/beforeValidate/promise.ts @@ -1,14 +1,14 @@ /* eslint-disable no-param-reassign */ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { fieldAffectsData, tabHasName, valueIsValueWithRelation } from '../../config/types' -import getValueWithDefault from '../../getDefaultValue' -import { cloneDataFromOriginalDoc } from '../beforeChange/cloneDataFromOriginalDoc' -import { getExistingRowDoc } from '../beforeChange/getExistingRowDoc' -import { traverseFields } from './traverseFields' +import { fieldAffectsData, tabHasName, valueIsValueWithRelation } from '../../config/types.js' +import getValueWithDefault from '../../getDefaultValue.js' +import { cloneDataFromOriginalDoc } from '../beforeChange/cloneDataFromOriginalDoc.js' +import { getExistingRowDoc } from '../beforeChange/getExistingRowDoc.js' +import { traverseFields } from './traverseFields.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts b/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts index 7e0bb7fbe..fdb6f5bb6 100644 --- a/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts +++ b/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts @@ -1,9 +1,9 @@ -import type { SanitizedCollectionConfig } from '../../../collections/config/types' -import type { SanitizedGlobalConfig } from '../../../globals/config/types' -import type { PayloadRequest, RequestContext } from '../../../types' -import type { Field, TabAsField } from '../../config/types' +import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../../../globals/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts' +import type { Field, TabAsField } from '../../config/types.d.ts' -import { promise } from './promise' +import { promise } from './promise.js' type Args = { collection: SanitizedCollectionConfig | null diff --git a/packages/payload/src/fields/mergeBaseFields.ts b/packages/payload/src/fields/mergeBaseFields.ts index e9e2aa218..1fb2bf552 100644 --- a/packages/payload/src/fields/mergeBaseFields.ts +++ b/packages/payload/src/fields/mergeBaseFields.ts @@ -1,8 +1,8 @@ import merge from 'deepmerge' -import type { Field, FieldWithSubFields } from './config/types' +import type { Field, FieldWithSubFields } from './config/types.d.ts' -import { fieldAffectsData, fieldHasSubFields } from './config/types' +import { fieldAffectsData, fieldHasSubFields } from './config/types.js' const mergeBaseFields = (fields: Field[], baseFields: Field[]): Field[] => { const mergedFields = [...(fields || [])] diff --git a/packages/payload/src/fields/validations.spec.ts b/packages/payload/src/fields/validations.spec.ts index 263d4419b..0fed9ac8c 100644 --- a/packages/payload/src/fields/validations.spec.ts +++ b/packages/payload/src/fields/validations.spec.ts @@ -1,6 +1,6 @@ -import type { ValidateOptions } from './config/types' +import type { ValidateOptions } from './config/types.d.ts' -import { number, password, point, relationship, select, text, textarea } from './validations' +import { number, password, point, relationship, select, text, textarea } from './validations.js' const t = jest.fn((string) => string) diff --git a/packages/payload/src/fields/validations.ts b/packages/payload/src/fields/validations.ts index b384cbda6..88be77ec9 100644 --- a/packages/payload/src/fields/validations.ts +++ b/packages/payload/src/fields/validations.ts @@ -1,4 +1,4 @@ -import type { RichTextAdapter, Where } from '../exports/types' +import type { RichTextAdapter, Where } from '../exports/types.d.ts' import type { ArrayField, BlockField, @@ -18,12 +18,12 @@ import type { TextareaField, UploadField, Validate, -} from './config/types' +} from './config/types.d.ts' -import { getIDType } from '../utilities/getIDType' -import { isNumber } from '../utilities/isNumber' -import { isValidID } from '../utilities/isValidID' -import { fieldAffectsData } from './config/types' +import { getIDType } from '../utilities/getIDType.js' +import { isNumber } from '../utilities/isNumber.js' +import { isValidID } from '../utilities/isValidID.js' +import { fieldAffectsData } from './config/types.js' export const text: Validate = ( value, diff --git a/packages/payload/src/globals/config/build.ts b/packages/payload/src/globals/config/build.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/payload/src/globals/config/sanitize.ts b/packages/payload/src/globals/config/sanitize.ts index 129102d6c..67adcb69e 100644 --- a/packages/payload/src/globals/config/sanitize.ts +++ b/packages/payload/src/globals/config/sanitize.ts @@ -1,14 +1,14 @@ import { translations } from '@payloadcms/translations/api' -import type { Config } from '../../config/types' -import type { SanitizedGlobalConfig } from './types' +import type { Config } from '../../config/types.d.ts' +import type { SanitizedGlobalConfig } from './types.d.ts' -import defaultAccess from '../../auth/defaultAccess' -import { sanitizeFields } from '../../fields/config/sanitize' -import { fieldAffectsData } from '../../fields/config/types' -import mergeBaseFields from '../../fields/mergeBaseFields' -import { toWords } from '../../utilities/formatLabels' -import baseVersionFields from '../../versions/baseFields' +import defaultAccess from '../../auth/defaultAccess.js' +import { sanitizeFields } from '../../fields/config/sanitize.js' +import { fieldAffectsData } from '../../fields/config/types.js' +import mergeBaseFields from '../../fields/mergeBaseFields.js' +import { toWords } from '../../utilities/formatLabels.js' +import baseVersionFields from '../../versions/baseFields.js' const sanitizeGlobals = (config: Config): SanitizedGlobalConfig[] => { const { collections, globals } = config @@ -73,23 +73,23 @@ const sanitizeGlobals = (config: Config): SanitizedGlobalConfig[] => { if (!hasUpdatedAt) { sanitizedGlobal.fields.push({ name: 'updatedAt', + type: 'date', admin: { disableBulkEdit: true, hidden: true, }, label: translations['general:updatedAt'], - type: 'date', }) } if (!hasCreatedAt) { sanitizedGlobal.fields.push({ name: 'createdAt', + type: 'date', admin: { disableBulkEdit: true, hidden: true, }, label: translations['general:createdAt'], - type: 'date', }) } diff --git a/packages/payload/src/globals/config/schema.ts b/packages/payload/src/globals/config/schema.ts index 4754b0b4e..c661cefd1 100644 --- a/packages/payload/src/globals/config/schema.ts +++ b/packages/payload/src/globals/config/schema.ts @@ -1,15 +1,16 @@ import joi from 'joi' -import { endpointsSchema } from '../../config/schema' +import { endpointsSchema } from '../../config/schema.js' import { componentSchema, customViewSchema, livePreviewSchema, -} from '../../config/shared/componentSchema' +} from '../../config/shared/componentSchema.js' const globalSchema = joi .object() .keys({ + slug: joi.string().required(), access: joi.object({ read: joi.func(), readVersions: joi.func(), @@ -64,7 +65,6 @@ const globalSchema = joi beforeValidate: joi.array().items(joi.func()), }), label: joi.alternatives().try(joi.string(), joi.object().pattern(joi.string(), [joi.string()])), - slug: joi.string().required(), typescript: joi.object().keys({ interface: joi.string(), }), diff --git a/packages/payload/src/globals/config/types.ts b/packages/payload/src/globals/config/types.ts index 59a40b866..7b6b1c3ef 100644 --- a/packages/payload/src/globals/config/types.ts +++ b/packages/payload/src/globals/config/types.ts @@ -6,8 +6,8 @@ import type { CustomPublishButtonProps, CustomSaveButtonProps, CustomSaveDraftButtonProps, -} from '../../admin/types' -import type { User } from '../../auth/types' +} from '../../admin/types.d.ts' +import type { User } from '../../auth/types.d.ts' import type { Access, EditViewComponent, @@ -16,11 +16,11 @@ import type { EntityDescription, GeneratePreviewURL, LivePreviewConfig, -} from '../../config/types' -import type { Field } from '../../fields/config/types' -import type { PayloadRequest, RequestContext } from '../../types' -import type { Where } from '../../types' -import type { IncomingGlobalVersions, SanitizedGlobalVersions } from '../../versions/types' +} from '../../config/types.d.ts' +import type { Field } from '../../fields/config/types.d.ts' +import type { PayloadRequest, RequestContext } from '../../types/index.d.ts' +import type { Where } from '../../types/index.d.ts' +import type { IncomingGlobalVersions, SanitizedGlobalVersions } from '../../versions/types.d.ts' export type TypeWithID = { id: number | string diff --git a/packages/payload/src/globals/graphql/resolvers/docAccess.ts b/packages/payload/src/globals/graphql/resolvers/docAccess.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/payload/src/globals/operations/docAccess.ts b/packages/payload/src/globals/operations/docAccess.ts index 7bd64b6f2..9a8c92179 100644 --- a/packages/payload/src/globals/operations/docAccess.ts +++ b/packages/payload/src/globals/operations/docAccess.ts @@ -1,12 +1,11 @@ -import type { GlobalPermission } from '../../auth' -import type { PayloadRequest } from '../../types' -import type { AllOperations } from '../../types' -import type { SanitizedGlobalConfig } from '../config/types' +import type { GlobalPermission } from '../../auth/index.d.ts' +import type { AllOperations, PayloadRequest } from '../../types/index.d.ts' +import type { SanitizedGlobalConfig } from '../config/types.d.ts' -import { commitTransaction } from '../../utilities/commitTransaction' -import { getEntityPolicies } from '../../utilities/getEntityPolicies' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { getEntityPolicies } from '../../utilities/getEntityPolicies.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' type Arguments = { globalConfig: SanitizedGlobalConfig @@ -25,10 +24,10 @@ export const docAccessOperation = async (args: Arguments): Promise = { context?: RequestContext @@ -25,11 +23,11 @@ export default async function findOneLocal, ): Promise { const { + slug: globalSlug, depth, draft = false, overrideAccess = true, showHiddenFields, - slug: globalSlug, } = options const globalConfig = payload.globals.config.find((config) => config.slug === globalSlug) @@ -39,12 +37,12 @@ export default async function findOneLocal = { context?: RequestContext @@ -28,11 +26,11 @@ export default async function findVersionByIDLocal> { const { id, + slug: globalSlug, depth, disableErrors = false, overrideAccess = true, showHiddenFields, - slug: globalSlug, } = options const globalConfig = payload.globals.config.find((config) => config.slug === globalSlug) diff --git a/packages/payload/src/globals/operations/local/findVersions.ts b/packages/payload/src/globals/operations/local/findVersions.ts index 0566cb35a..28f6e6e5d 100644 --- a/packages/payload/src/globals/operations/local/findVersions.ts +++ b/packages/payload/src/globals/operations/local/findVersions.ts @@ -1,13 +1,11 @@ -import type { Payload, RequestContext } from '../../..' -import type { GeneratedTypes } from '../../../' -import type { PaginatedDocs } from '../../../database/types' -import type { PayloadRequest } from '../../../types' -import type { Document, Where } from '../../../types' -import type { TypeWithVersion } from '../../../versions/types' +import type { PaginatedDocs } from '../../../database/types.d.ts' +import type { GeneratedTypes, Payload, RequestContext } from '../../../index.d.ts' +import type { Document, PayloadRequest, Where } from '../../../types/index.d.ts' +import type { TypeWithVersion } from '../../../versions/types.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { findVersionsOperation } from '../findVersions' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { findVersionsOperation } from '../findVersions.js' export type Options = { context?: RequestContext @@ -30,12 +28,12 @@ export default async function findVersionsLocal, ): Promise>> { const { + slug: globalSlug, depth, limit, overrideAccess = true, page, showHiddenFields, - slug: globalSlug, sort, where, } = options diff --git a/packages/payload/src/globals/operations/local/index.ts b/packages/payload/src/globals/operations/local/index.ts index f800bb66e..20f113b98 100644 --- a/packages/payload/src/globals/operations/local/index.ts +++ b/packages/payload/src/globals/operations/local/index.ts @@ -1,8 +1,8 @@ -import findOne from './findOne' -import findVersionByID from './findVersionByID' -import findVersions from './findVersions' -import restoreVersion from './restoreVersion' -import update from './update' +import findOne from './findOne.js' +import findVersionByID from './findVersionByID.js' +import findVersions from './findVersions.js' +import restoreVersion from './restoreVersion.js' +import update from './update.js' export default { findOne, diff --git a/packages/payload/src/globals/operations/local/restoreVersion.ts b/packages/payload/src/globals/operations/local/restoreVersion.ts index 0c0879be1..3cfbd8777 100644 --- a/packages/payload/src/globals/operations/local/restoreVersion.ts +++ b/packages/payload/src/globals/operations/local/restoreVersion.ts @@ -1,11 +1,9 @@ -import type { Payload, RequestContext } from '../../..' -import type { GeneratedTypes } from '../../../' -import type { PayloadRequest } from '../../../types' -import type { Document } from '../../../types' +import type { GeneratedTypes, Payload, RequestContext } from '../../../index.d.ts' +import type { Document, PayloadRequest } from '../../../types/index.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { restoreVersionOperation } from '../restoreVersion' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { restoreVersionOperation } from '../restoreVersion.js' export type Options = { context?: RequestContext @@ -24,7 +22,7 @@ export default async function restoreVersionLocal, ): Promise { - const { id, depth, overrideAccess = true, showHiddenFields, slug: globalSlug } = options + const { id, slug: globalSlug, depth, overrideAccess = true, showHiddenFields } = options const globalConfig = payload.globals.config.find((config) => config.slug === globalSlug) diff --git a/packages/payload/src/globals/operations/local/update.ts b/packages/payload/src/globals/operations/local/update.ts index a67d3f258..caa0a0868 100644 --- a/packages/payload/src/globals/operations/local/update.ts +++ b/packages/payload/src/globals/operations/local/update.ts @@ -1,13 +1,11 @@ import type { DeepPartial } from 'ts-essentials' -import type { Payload, RequestContext } from '../../..' -import type { GeneratedTypes } from '../../../' -import type { PayloadRequest } from '../../../types' -import type { Document } from '../../../types' +import type { GeneratedTypes, Payload, RequestContext } from '../../../index.d.ts' +import type { Document, PayloadRequest } from '../../../types/index.d.ts' -import { APIError } from '../../../errors' -import { createLocalReq } from '../../../utilities/createLocalReq' -import { updateOperation } from '../update' +import { APIError } from '../../../errors/index.js' +import { createLocalReq } from '../../../utilities/createLocalReq.js' +import { updateOperation } from '../update.js' export type Options = { context?: RequestContext @@ -27,7 +25,7 @@ export default async function updateLocal, ): Promise { - const { data, depth, draft, overrideAccess = true, showHiddenFields, slug: globalSlug } = options + const { slug: globalSlug, data, depth, draft, overrideAccess = true, showHiddenFields } = options const globalConfig = payload.globals.config.find((config) => config.slug === globalSlug) diff --git a/packages/payload/src/globals/operations/restoreVersion.ts b/packages/payload/src/globals/operations/restoreVersion.ts index 6c76ff4ac..9980252e6 100644 --- a/packages/payload/src/globals/operations/restoreVersion.ts +++ b/packages/payload/src/globals/operations/restoreVersion.ts @@ -1,14 +1,14 @@ -import type { PayloadRequest } from '../../types' -import type { TypeWithVersion } from '../../versions/types' -import type { SanitizedGlobalConfig } from '../config/types' +import type { PayloadRequest } from '../../types/index.d.ts' +import type { TypeWithVersion } from '../../versions/types.d.ts' +import type { SanitizedGlobalConfig } from '../config/types.d.ts' -import executeAccess from '../../auth/executeAccess' -import { NotFound } from '../../errors' -import { afterChange } from '../../fields/hooks/afterChange' -import { afterRead } from '../../fields/hooks/afterRead' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' +import executeAccess from '../../auth/executeAccess.js' +import { NotFound } from '../../errors/index.js' +import { afterChange } from '../../fields/hooks/afterChange/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' export type Arguments = { depth?: number diff --git a/packages/payload/src/globals/operations/update.ts b/packages/payload/src/globals/operations/update.ts index 5a7987bc7..0a5d60032 100644 --- a/packages/payload/src/globals/operations/update.ts +++ b/packages/payload/src/globals/operations/update.ts @@ -1,20 +1,19 @@ import type { DeepPartial } from 'ts-essentials' -import type { GeneratedTypes } from '../../' -import type { PayloadRequest } from '../../types' -import type { Where } from '../../types' -import type { SanitizedGlobalConfig } from '../config/types' +import type { GeneratedTypes } from '../../index.d.ts' +import type { PayloadRequest, Where } from '../../types/index.d.ts' +import type { SanitizedGlobalConfig } from '../config/types.d.ts' -import executeAccess from '../../auth/executeAccess' -import { afterChange } from '../../fields/hooks/afterChange' -import { afterRead } from '../../fields/hooks/afterRead' -import { beforeChange } from '../../fields/hooks/beforeChange' -import { beforeValidate } from '../../fields/hooks/beforeValidate' -import { commitTransaction } from '../../utilities/commitTransaction' -import { initTransaction } from '../../utilities/initTransaction' -import { killTransaction } from '../../utilities/killTransaction' -import { getLatestGlobalVersion } from '../../versions/getLatestGlobalVersion' -import { saveVersion } from '../../versions/saveVersion' +import executeAccess from '../../auth/executeAccess.js' +import { afterChange } from '../../fields/hooks/afterChange/index.js' +import { afterRead } from '../../fields/hooks/afterRead/index.js' +import { beforeChange } from '../../fields/hooks/beforeChange/index.js' +import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js' +import { commitTransaction } from '../../utilities/commitTransaction.js' +import { initTransaction } from '../../utilities/initTransaction.js' +import { killTransaction } from '../../utilities/killTransaction.js' +import { getLatestGlobalVersion } from '../../versions/getLatestGlobalVersion.js' +import { saveVersion } from '../../versions/saveVersion.js' type Args = { autosave?: boolean diff --git a/packages/payload/src/index.ts b/packages/payload/src/index.ts index 054880168..07b7cbc89 100644 --- a/packages/payload/src/index.ts +++ b/packages/payload/src/index.ts @@ -5,54 +5,54 @@ import type pino from 'pino' import crypto from 'crypto' -import type { AuthStrategy } from './auth' -import type { Result as ForgotPasswordResult } from './auth/operations/forgotPassword' -import type { Options as ForgotPasswordOptions } from './auth/operations/local/forgotPassword' -import type { Options as LoginOptions } from './auth/operations/local/login' -import type { Options as ResetPasswordOptions } from './auth/operations/local/resetPassword' -import type { Options as UnlockOptions } from './auth/operations/local/unlock' -import type { Options as VerifyEmailOptions } from './auth/operations/local/verifyEmail' -import type { Result as LoginResult } from './auth/operations/login' -import type { Result as ResetPasswordResult } from './auth/operations/resetPassword' -import type { BulkOperationResult, Collection, TypeWithID } from './collections/config/types' -import type { Options as CreateOptions } from './collections/operations/local/create' +import type { Result as ForgotPasswordResult } from './auth/operations/forgotPassword.js' +import type { Options as ForgotPasswordOptions } from './auth/operations/local/forgotPassword.js' +import type { Options as LoginOptions } from './auth/operations/local/login.js' +import type { Options as ResetPasswordOptions } from './auth/operations/local/resetPassword.js' +import type { Options as UnlockOptions } from './auth/operations/local/unlock.js' +import type { Options as VerifyEmailOptions } from './auth/operations/local/verifyEmail.js' +import type { Result as LoginResult } from './auth/operations/login.js' +import type { Result as ResetPasswordResult } from './auth/operations/resetPassword.js' +import type { AuthStrategy } from './auth/types.js' +import type { BulkOperationResult, Collection, TypeWithID } from './collections/config/types.js' +import type { Options as CreateOptions } from './collections/operations/local/create.js' import type { ByIDOptions as DeleteByIDOptions, ManyOptions as DeleteManyOptions, Options as DeleteOptions, -} from './collections/operations/local/delete' -import type { Options as FindOptions } from './collections/operations/local/find' -import type { Options as FindByIDOptions } from './collections/operations/local/findByID' -import type { Options as FindVersionByIDOptions } from './collections/operations/local/findVersionByID' -import type { Options as FindVersionsOptions } from './collections/operations/local/findVersions' -import type { Options as RestoreVersionOptions } from './collections/operations/local/restoreVersion' +} from './collections/operations/local/delete.js' +import type { Options as FindOptions } from './collections/operations/local/find.js' +import type { Options as FindByIDOptions } from './collections/operations/local/findByID.js' +import type { Options as FindVersionByIDOptions } from './collections/operations/local/findVersionByID.js' +import type { Options as FindVersionsOptions } from './collections/operations/local/findVersions.js' +import type { Options as RestoreVersionOptions } from './collections/operations/local/restoreVersion.js' import type { ByIDOptions as UpdateByIDOptions, ManyOptions as UpdateManyOptions, Options as UpdateOptions, -} from './collections/operations/local/update' -import type { EmailOptions, InitOptions, SanitizedConfig } from './config/types' -import type { BaseDatabaseAdapter, PaginatedDocs } from './database/types' -import type { BuildEmailResult } from './email/types' -import type { TypeWithID as GlobalTypeWithID, Globals } from './globals/config/types' -import type { Options as FindGlobalOptions } from './globals/operations/local/findOne' -import type { Options as FindGlobalVersionByIDOptions } from './globals/operations/local/findVersionByID' -import type { Options as FindGlobalVersionsOptions } from './globals/operations/local/findVersions' -import type { Options as RestoreGlobalVersionOptions } from './globals/operations/local/restoreVersion' -import type { Options as UpdateGlobalOptions } from './globals/operations/local/update' -import type { TypeWithVersion } from './versions/types' +} from './collections/operations/local/update.js' +import type { EmailOptions, InitOptions, SanitizedConfig } from './config/types.js' +import type { BaseDatabaseAdapter, PaginatedDocs } from './database/types.js' +import type { BuildEmailResult } from './email/types.js' +import type { TypeWithID as GlobalTypeWithID, Globals } from './globals/config/types.js' +import type { Options as FindGlobalOptions } from './globals/operations/local/findOne.js' +import type { Options as FindGlobalVersionByIDOptions } from './globals/operations/local/findVersionByID.js' +import type { Options as FindGlobalVersionsOptions } from './globals/operations/local/findVersions.js' +import type { Options as RestoreGlobalVersionOptions } from './globals/operations/local/restoreVersion.js' +import type { Options as UpdateGlobalOptions } from './globals/operations/local/update.js' +import type { TypeWithVersion } from './versions/types.js' -import { decrypt, encrypt } from './auth/crypto' -import { APIKeyAuthentication } from './auth/strategies/apiKey' -import { JWTAuthentication } from './auth/strategies/jwt' -import localOperations from './collections/operations/local' -import validate from './config/validate' -import buildEmail from './email/build' -import { defaults as emailDefaults } from './email/defaults' -import sendEmail from './email/sendEmail' -import localGlobalOperations from './globals/operations/local' -import Logger from './utilities/logger' -import { serverInit as serverInitTelemetry } from './utilities/telemetry/events/serverInit' +import { decrypt, encrypt } from './auth/crypto.js' +import { APIKeyAuthentication } from './auth/strategies/apiKey.js' +import { JWTAuthentication } from './auth/strategies/jwt.js' +import localOperations from './collections/operations/local/index.js' +import validate from './config/validate.js' +import buildEmail from './email/build.js' +import { defaults as emailDefaults } from './email/defaults.js' +import sendEmail from './email/sendEmail.js' +import localGlobalOperations from './globals/operations/local/index.js' +import Logger from './utilities/logger.js' +import { serverInit as serverInitTelemetry } from './utilities/telemetry/events/serverInit.js' /** * @description Payload diff --git a/packages/payload/src/preferences/deleteUserPreferences.ts b/packages/payload/src/preferences/deleteUserPreferences.ts index 12587e932..9a1aac47f 100644 --- a/packages/payload/src/preferences/deleteUserPreferences.ts +++ b/packages/payload/src/preferences/deleteUserPreferences.ts @@ -1,6 +1,6 @@ -import type { Payload } from '..' -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { PayloadRequest } from '../types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { Payload } from '../index.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' type Args = { collectionConfig: SanitizedCollectionConfig diff --git a/packages/payload/src/preferences/operations/delete.ts b/packages/payload/src/preferences/operations/delete.ts index 6aa3764e7..68426f38a 100644 --- a/packages/payload/src/preferences/operations/delete.ts +++ b/packages/payload/src/preferences/operations/delete.ts @@ -1,10 +1,10 @@ -import type { Document, Where } from '../../types' -import type { PreferenceRequest } from '../types' +import type { Document, Where } from '../../types/index.d.ts' +import type { PreferenceRequest } from '../types.d.ts' -import defaultAccess from '../../auth/defaultAccess' -import executeAccess from '../../auth/executeAccess' -import NotFound from '../../errors/NotFound' -import UnauthorizedError from '../../errors/UnathorizedError' +import defaultAccess from '../../auth/defaultAccess.js' +import executeAccess from '../../auth/executeAccess.js' +import NotFound from '../../errors/NotFound.js' +import UnauthorizedError from '../../errors/UnathorizedError.js' async function deleteOperation(args: PreferenceRequest): Promise { const { @@ -38,7 +38,6 @@ async function deleteOperation(args: PreferenceRequest): Promise { where, }) - // @ts-expect-error // TODO: fix later if (result.docs.length === 1) { return result.docs[0] } diff --git a/packages/payload/src/preferences/operations/findOne.ts b/packages/payload/src/preferences/operations/findOne.ts index 2ae09ee06..ecdf980a7 100644 --- a/packages/payload/src/preferences/operations/findOne.ts +++ b/packages/payload/src/preferences/operations/findOne.ts @@ -1,6 +1,6 @@ -import type { GeneratedTypes } from '../../' -import type { Where } from '../../types' -import type { PreferenceRequest } from '../types' +import type { GeneratedTypes } from '../../index.d.ts' +import type { Where } from '../../types/index.d.ts' +import type { PreferenceRequest } from '../types.d.ts' async function findOne( args: PreferenceRequest, diff --git a/packages/payload/src/preferences/operations/update.ts b/packages/payload/src/preferences/operations/update.ts index 22d887181..278e665a1 100644 --- a/packages/payload/src/preferences/operations/update.ts +++ b/packages/payload/src/preferences/operations/update.ts @@ -1,8 +1,8 @@ -import type { PreferenceUpdateRequest } from '../types' +import type { PreferenceUpdateRequest } from '../types.d.ts' -import defaultAccess from '../../auth/defaultAccess' -import executeAccess from '../../auth/executeAccess' -import UnauthorizedError from '../../errors/UnathorizedError' +import defaultAccess from '../../auth/defaultAccess.js' +import executeAccess from '../../auth/executeAccess.js' +import UnauthorizedError from '../../errors/UnathorizedError.js' async function update(args: PreferenceUpdateRequest) { const { diff --git a/packages/payload/src/preferences/preferencesCollection.ts b/packages/payload/src/preferences/preferencesCollection.ts index 635af89fd..d6ac62a71 100644 --- a/packages/payload/src/preferences/preferencesCollection.ts +++ b/packages/payload/src/preferences/preferencesCollection.ts @@ -1,9 +1,9 @@ -import type { CollectionConfig } from '../collections/config/types' -import type { Access, Config } from '../config/types' +import type { CollectionConfig } from '../collections/config/types.d.ts' +import type { Access, Config } from '../config/types.d.ts' -import { deleteHandler } from './requestHandlers/delete' -import { findByIDHandler } from './requestHandlers/findOne' -import { updateHandler } from './requestHandlers/update' +import { deleteHandler } from './requestHandlers/delete.js' +import { findByIDHandler } from './requestHandlers/findOne.js' +import { updateHandler } from './requestHandlers/update.js' const preferenceAccess: Access = ({ req }) => ({ 'user.value': { diff --git a/packages/payload/src/preferences/requestHandlers/delete.ts b/packages/payload/src/preferences/requestHandlers/delete.ts index afaa8612a..987c62d4b 100644 --- a/packages/payload/src/preferences/requestHandlers/delete.ts +++ b/packages/payload/src/preferences/requestHandlers/delete.ts @@ -1,8 +1,8 @@ import httpStatus from 'http-status' -import type { PayloadHandler } from '../../exports/config' +import type { PayloadHandler } from '../../exports/config.d.ts' -import deleteOperation from '../operations/delete' +import deleteOperation from '../operations/delete.js' export const deleteHandler: PayloadHandler = async (req): Promise => { const result = await deleteOperation({ diff --git a/packages/payload/src/preferences/requestHandlers/findOne.ts b/packages/payload/src/preferences/requestHandlers/findOne.ts index 2ba7147a9..9e8b7c9d3 100644 --- a/packages/payload/src/preferences/requestHandlers/findOne.ts +++ b/packages/payload/src/preferences/requestHandlers/findOne.ts @@ -1,8 +1,8 @@ import httpStatus from 'http-status' -import type { PayloadHandler } from '../../exports/config' +import type { PayloadHandler } from '../../exports/config.d.ts' -import findOne from '../operations/findOne' +import findOne from '../operations/findOne.js' export const findByIDHandler: PayloadHandler = async (req): Promise => { const result = await findOne({ diff --git a/packages/payload/src/preferences/requestHandlers/update.ts b/packages/payload/src/preferences/requestHandlers/update.ts index c20a17b8b..830731c0b 100644 --- a/packages/payload/src/preferences/requestHandlers/update.ts +++ b/packages/payload/src/preferences/requestHandlers/update.ts @@ -1,8 +1,8 @@ import httpStatus from 'http-status' -import type { PayloadHandler } from '../../exports/config' +import type { PayloadHandler } from '../../exports/config.d.ts' -import update from '../operations/update' +import update from '../operations/update.js' export const updateHandler: PayloadHandler = async (req) => { const payloadRequest = req diff --git a/packages/payload/src/preferences/types.ts b/packages/payload/src/preferences/types.ts index 65113649f..3a88b5f5f 100644 --- a/packages/payload/src/preferences/types.ts +++ b/packages/payload/src/preferences/types.ts @@ -1,5 +1,5 @@ -import type { User } from '../auth' -import type { PayloadRequest } from '../types' +import type { User } from '../auth/index.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' export type PreferenceRequest = { key: string diff --git a/packages/payload/src/translations/getLocalI18n.ts b/packages/payload/src/translations/getLocalI18n.ts index a4fcf882d..337bae292 100644 --- a/packages/payload/src/translations/getLocalI18n.ts +++ b/packages/payload/src/translations/getLocalI18n.ts @@ -1,7 +1,7 @@ import { initI18n } from '@payloadcms/translations' import { translations } from '@payloadcms/translations/api' -import type { SanitizedConfig } from '../exports/types' +import type { SanitizedConfig } from '../exports/types.d.ts' export const getLocalI18n = async ({ config, diff --git a/packages/payload/src/types/index.ts b/packages/payload/src/types/index.ts index ec00f9cb3..b8b84e4f8 100644 --- a/packages/payload/src/types/index.ts +++ b/packages/payload/src/types/index.ts @@ -1,11 +1,11 @@ import type { I18n, TFunction } from '@payloadcms/translations' import type DataLoader from 'dataloader' -import type payload from '../' -import type { User } from '../auth/types' -import type { TypeWithID, TypeWithTimestamps } from '../collections/config/types' -import type { validOperators } from './constants' -export type { Payload as Payload } from '../' +import type { User } from '../auth/types.d.ts' +import type { TypeWithID, TypeWithTimestamps } from '../collections/config/types.d.ts' +import type payload from '../index.d.ts' +import type { validOperators } from './constants.d.ts' +export type { Payload as Payload } from '../index.d.ts' export type UploadEdits = { crop?: { diff --git a/packages/payload/src/versions/baseFields.ts b/packages/payload/src/versions/baseFields.ts index 418f78ca6..b57a13b7e 100644 --- a/packages/payload/src/versions/baseFields.ts +++ b/packages/payload/src/versions/baseFields.ts @@ -1,6 +1,6 @@ -import type { Field } from '../fields/config/types' +import type { Field } from '../fields/config/types.d.ts' -import { extractTranslations } from '../translations/extractTranslations' +import { extractTranslations } from '../translations/extractTranslations.js' const labels = extractTranslations(['version:draft', 'version:published', 'version:status']) @@ -18,6 +18,7 @@ export const statuses = [ const baseVersionFields: Field[] = [ { name: '_status', + type: 'select', admin: { components: { Field: () => null, @@ -27,7 +28,6 @@ const baseVersionFields: Field[] = [ defaultValue: 'draft', label: labels['version:status'], options: statuses, - type: 'select', }, ] diff --git a/packages/payload/src/versions/buildCollectionFields.ts b/packages/payload/src/versions/buildCollectionFields.ts index e9b879d78..b41e429c5 100644 --- a/packages/payload/src/versions/buildCollectionFields.ts +++ b/packages/payload/src/versions/buildCollectionFields.ts @@ -1,5 +1,5 @@ -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { Field } from '../fields/config/types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { Field } from '../fields/config/types.d.ts' export const buildVersionCollectionFields = (collection: SanitizedCollectionConfig): Field[] => { const fields: Field[] = [ diff --git a/packages/payload/src/versions/buildGlobalFields.ts b/packages/payload/src/versions/buildGlobalFields.ts index 230eb14ba..bb54a40e3 100644 --- a/packages/payload/src/versions/buildGlobalFields.ts +++ b/packages/payload/src/versions/buildGlobalFields.ts @@ -1,45 +1,45 @@ -import type { Field } from '../fields/config/types' -import type { SanitizedGlobalConfig } from '../globals/config/types' +import type { Field } from '../fields/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts' export const buildVersionGlobalFields = (global: SanitizedGlobalConfig): Field[] => { const fields: Field[] = [ { name: 'version', - fields: global.fields, type: 'group', + fields: global.fields, }, { name: 'createdAt', + type: 'date', admin: { disabled: true, }, - type: 'date', }, { name: 'updatedAt', + type: 'date', admin: { disabled: true, }, - type: 'date', }, ] if (global?.versions?.drafts) { fields.push({ name: 'latest', + type: 'checkbox', admin: { disabled: true, }, index: true, - type: 'checkbox', }) } if (global?.versions?.drafts && global?.versions?.drafts?.autosave) { fields.push({ name: 'autosave', - index: true, type: 'checkbox', + index: true, }) } diff --git a/packages/payload/src/versions/deleteCollectionVersions.ts b/packages/payload/src/versions/deleteCollectionVersions.ts index 1ae5cffe7..fa87265c1 100644 --- a/packages/payload/src/versions/deleteCollectionVersions.ts +++ b/packages/payload/src/versions/deleteCollectionVersions.ts @@ -1,5 +1,5 @@ -import type { Payload } from '..' -import type { PayloadRequest } from '../types' +import type { Payload } from '../index.d.ts' +import type { PayloadRequest } from '../types/index.d.ts' type Args = { id?: number | string @@ -8,7 +8,7 @@ type Args = { slug: string } -export const deleteCollectionVersions = async ({ id, payload, req, slug }: Args): Promise => { +export const deleteCollectionVersions = async ({ id, slug, payload, req }: Args): Promise => { try { await payload.db.deleteVersions({ collection: slug, diff --git a/packages/payload/src/versions/drafts/appendVersionToQueryKey.ts b/packages/payload/src/versions/drafts/appendVersionToQueryKey.ts index cf572e80c..755be88ac 100644 --- a/packages/payload/src/versions/drafts/appendVersionToQueryKey.ts +++ b/packages/payload/src/versions/drafts/appendVersionToQueryKey.ts @@ -1,4 +1,4 @@ -import type { Where } from '../../types' +import type { Where } from '../../types/index.d.ts' export const appendVersionToQueryKey = (query: Where): Where => { return Object.entries(query).reduce((res, [key, val]) => { diff --git a/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts b/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts index 8bdb78480..4eb45bd72 100644 --- a/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts +++ b/packages/payload/src/versions/drafts/replaceWithDraftIfAvailable.ts @@ -1,14 +1,14 @@ -import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types' -import type { AccessResult } from '../../config/types' -import type { FindGlobalVersionsArgs, FindVersionsArgs } from '../../database/types' -import type { SanitizedGlobalConfig } from '../../globals/config/types' -import type { PayloadRequest, Where } from '../../types' +import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.d.ts' +import type { AccessResult } from '../../config/types.d.ts' +import type { FindGlobalVersionsArgs, FindVersionsArgs } from '../../database/types.d.ts' +import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts' +import type { PayloadRequest, Where } from '../../types/index.d.ts' -import { hasWhereAccessResult } from '../../auth' -import { combineQueries } from '../../database/combineQueries' -import { docHasTimestamps } from '../../types' -import sanitizeInternalFields from '../../utilities/sanitizeInternalFields' -import { appendVersionToQueryKey } from './appendVersionToQueryKey' +import { hasWhereAccessResult } from '../../auth/index.js' +import { combineQueries } from '../../database/combineQueries.js' +import { docHasTimestamps } from '../../types/index.js' +import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js' +import { appendVersionToQueryKey } from './appendVersionToQueryKey.js' type Arguments = { accessResult: AccessResult diff --git a/packages/payload/src/versions/enforceMaxVersions.ts b/packages/payload/src/versions/enforceMaxVersions.ts index 9f9cd29ff..56297501c 100644 --- a/packages/payload/src/versions/enforceMaxVersions.ts +++ b/packages/payload/src/versions/enforceMaxVersions.ts @@ -1,7 +1,6 @@ -import type { SanitizedCollectionConfig } from '../collections/config/types' -import type { SanitizedGlobalConfig } from '../globals/config/types' -import type { Payload, PayloadRequest } from '../types' -import type { Where } from '../types' +import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' +import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts' +import type { Payload, PayloadRequest, Where } from '../types/index.d.ts' type Args = { collection?: SanitizedCollectionConfig diff --git a/packages/payload/src/versions/getLatestCollectionVersion.ts b/packages/payload/src/versions/getLatestCollectionVersion.ts index 6b73a4908..b5ba98b83 100644 --- a/packages/payload/src/versions/getLatestCollectionVersion.ts +++ b/packages/payload/src/versions/getLatestCollectionVersion.ts @@ -1,9 +1,9 @@ -import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types' -import type { FindOneArgs } from '../database/types' -import type { Payload, PayloadRequest } from '../types' -import type { TypeWithVersion } from './types' +import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.d.ts' +import type { FindOneArgs } from '../database/types.d.ts' +import type { Payload, PayloadRequest } from '../types/index.d.ts' +import type { TypeWithVersion } from './types.d.ts' -import { docHasTimestamps } from '../types' +import { docHasTimestamps } from '../types/index.js' type Args = { config: SanitizedCollectionConfig diff --git a/packages/payload/src/versions/getLatestGlobalVersion.ts b/packages/payload/src/versions/getLatestGlobalVersion.ts index 0084e2b99..e0cd80caf 100644 --- a/packages/payload/src/versions/getLatestGlobalVersion.ts +++ b/packages/payload/src/versions/getLatestGlobalVersion.ts @@ -1,7 +1,7 @@ -import type { SanitizedGlobalConfig } from '../globals/config/types' -import type { Document, Payload, PayloadRequest, Where } from '../types' +import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts' +import type { Document, Payload, PayloadRequest, Where } from '../types/index.d.ts' -import { docHasTimestamps } from '../types' +import { docHasTimestamps } from '../types/index.js' type Args = { config: SanitizedGlobalConfig @@ -13,11 +13,11 @@ type Args = { } export const getLatestGlobalVersion = async ({ + slug, config, locale, payload, req, - slug, where, }: Args): Promise<{ global: Document; globalExists: boolean }> => { let latestVersion @@ -36,9 +36,9 @@ export const getLatestGlobalVersion = async ({ } const global = await payload.db.findGlobal({ + slug, locale, req, - slug, where, }) const globalExists = Boolean(global) diff --git a/packages/payload/src/versions/saveVersion.ts b/packages/payload/src/versions/saveVersion.ts index da8e06cb5..1c52c0238 100644 --- a/packages/payload/src/versions/saveVersion.ts +++ b/packages/payload/src/versions/saveVersion.ts @@ -1,11 +1,11 @@ -import type { Payload } from '..' -import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types' -import type { SanitizedGlobalConfig } from '../globals/config/types' -import type { PayloadRequest } from '../types' +import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js' +import type { SanitizedGlobalConfig } from '../globals/config/types.js' +import type { Payload } from '../index.js' +import type { PayloadRequest } from '../types/index.js' -import { deepCopyObject } from '../utilities/deepCopyObject' -import sanitizeInternalFields from '../utilities/sanitizeInternalFields' -import { enforceMaxVersions } from './enforceMaxVersions' +import { deepCopyObject } from '../utilities/deepCopyObject.js' +import sanitizeInternalFields from '../utilities/sanitizeInternalFields.js' +import { enforceMaxVersions } from './enforceMaxVersions.js' type Args = { autosave?: boolean From 8c2cbce4a47895e674fa7f02204f51f065ba4de1 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Mar 2024 14:47:53 -0500 Subject: [PATCH 14/21] chore: esm --- .../payload/src/errors/InvalidFieldName.ts | 2 +- .../src/preferences/operations/delete.ts | 1 + .../utilities/checkDuplicateCollections.ts | 2 +- .../src/_generatedFiles_/api/index.ts | 60 +++++++++---------- .../src/_generatedFiles_/client/index.ts | 60 +++++++++---------- packages/translations/src/all/index.ts | 60 +++++++++---------- packages/translations/src/exports/index.ts | 6 +- packages/translations/tsconfig.json | 5 +- 8 files changed, 100 insertions(+), 96 deletions(-) diff --git a/packages/payload/src/errors/InvalidFieldName.ts b/packages/payload/src/errors/InvalidFieldName.ts index 48ae7b904..98692dcce 100644 --- a/packages/payload/src/errors/InvalidFieldName.ts +++ b/packages/payload/src/errors/InvalidFieldName.ts @@ -1,4 +1,4 @@ -import type { FieldAffectingData } from '../fields/config/types' +import type { FieldAffectingData } from '../fields/config/types.d.ts' import APIError from './APIError.js' diff --git a/packages/payload/src/preferences/operations/delete.ts b/packages/payload/src/preferences/operations/delete.ts index 68426f38a..4d6146ccd 100644 --- a/packages/payload/src/preferences/operations/delete.ts +++ b/packages/payload/src/preferences/operations/delete.ts @@ -38,6 +38,7 @@ async function deleteOperation(args: PreferenceRequest): Promise { where, }) + // @ts-expect-error // TODO: fix later if (result.docs.length === 1) { return result.docs[0] } diff --git a/packages/payload/src/utilities/checkDuplicateCollections.ts b/packages/payload/src/utilities/checkDuplicateCollections.ts index 781c8e082..939005f59 100644 --- a/packages/payload/src/utilities/checkDuplicateCollections.ts +++ b/packages/payload/src/utilities/checkDuplicateCollections.ts @@ -1,6 +1,6 @@ import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts' -import { DuplicateCollection } from '../errors/DuplicateCollection.js' +import DuplicateCollection from '../errors/DuplicateCollection.js' const getDuplicates = (arr: string[]) => arr.filter((item, index) => arr.indexOf(item) !== index) diff --git a/packages/translations/src/_generatedFiles_/api/index.ts b/packages/translations/src/_generatedFiles_/api/index.ts index 771913489..7ab7ae98b 100644 --- a/packages/translations/src/_generatedFiles_/api/index.ts +++ b/packages/translations/src/_generatedFiles_/api/index.ts @@ -1,33 +1,33 @@ -import ar from './ar.json' -import az from './az.json' -import bg from './bg.json' -import cs from './cs.json' -import de from './de.json' -import en from './en.json' -import es from './es.json' -import fa from './fa.json' -import fr from './fr.json' -import hr from './hr.json' -import hu from './hu.json' -import it from './it.json' -import ja from './ja.json' -import ko from './ko.json' -import my from './my.json' -import nb from './nb.json' -import nl from './nl.json' -import pl from './pl.json' -import pt from './pt.json' -import ro from './ro.json' -import rs from './rs.json' -import rsLatin from './rs-latin.json' -import ru from './ru.json' -import sv from './sv.json' -import th from './th.json' -import tr from './tr.json' -import ua from './ua.json' -import vi from './vi.json' -import zh from './zh.json' -import zhTw from './zh-tw.json' +import ar from './ar.json' assert { type: 'json' } +import az from './az.json' assert { type: 'json' } +import bg from './bg.json' assert { type: 'json' } +import cs from './cs.json' assert { type: 'json' } +import de from './de.json' assert { type: 'json' } +import en from './en.json' assert { type: 'json' } +import es from './es.json' assert { type: 'json' } +import fa from './fa.json' assert { type: 'json' } +import fr from './fr.json' assert { type: 'json' } +import hr from './hr.json' assert { type: 'json' } +import hu from './hu.json' assert { type: 'json' } +import it from './it.json' assert { type: 'json' } +import ja from './ja.json' assert { type: 'json' } +import ko from './ko.json' assert { type: 'json' } +import my from './my.json' assert { type: 'json' } +import nb from './nb.json' assert { type: 'json' } +import nl from './nl.json' assert { type: 'json' } +import pl from './pl.json' assert { type: 'json' } +import pt from './pt.json' assert { type: 'json' } +import ro from './ro.json' assert { type: 'json' } +import rs from './rs.json' assert { type: 'json' } +import rsLatin from './rs-latin.json' assert { type: 'json' } +import ru from './ru.json' assert { type: 'json' } +import sv from './sv.json' assert { type: 'json' } +import th from './th.json' assert { type: 'json' } +import tr from './tr.json' assert { type: 'json' } +import ua from './ua.json' assert { type: 'json' } +import vi from './vi.json' assert { type: 'json' } +import zh from './zh.json' assert { type: 'json' } +import zhTw from './zh-tw.json' assert { type: 'json' } export const translations = { ar, diff --git a/packages/translations/src/_generatedFiles_/client/index.ts b/packages/translations/src/_generatedFiles_/client/index.ts index 771913489..7ab7ae98b 100644 --- a/packages/translations/src/_generatedFiles_/client/index.ts +++ b/packages/translations/src/_generatedFiles_/client/index.ts @@ -1,33 +1,33 @@ -import ar from './ar.json' -import az from './az.json' -import bg from './bg.json' -import cs from './cs.json' -import de from './de.json' -import en from './en.json' -import es from './es.json' -import fa from './fa.json' -import fr from './fr.json' -import hr from './hr.json' -import hu from './hu.json' -import it from './it.json' -import ja from './ja.json' -import ko from './ko.json' -import my from './my.json' -import nb from './nb.json' -import nl from './nl.json' -import pl from './pl.json' -import pt from './pt.json' -import ro from './ro.json' -import rs from './rs.json' -import rsLatin from './rs-latin.json' -import ru from './ru.json' -import sv from './sv.json' -import th from './th.json' -import tr from './tr.json' -import ua from './ua.json' -import vi from './vi.json' -import zh from './zh.json' -import zhTw from './zh-tw.json' +import ar from './ar.json' assert { type: 'json' } +import az from './az.json' assert { type: 'json' } +import bg from './bg.json' assert { type: 'json' } +import cs from './cs.json' assert { type: 'json' } +import de from './de.json' assert { type: 'json' } +import en from './en.json' assert { type: 'json' } +import es from './es.json' assert { type: 'json' } +import fa from './fa.json' assert { type: 'json' } +import fr from './fr.json' assert { type: 'json' } +import hr from './hr.json' assert { type: 'json' } +import hu from './hu.json' assert { type: 'json' } +import it from './it.json' assert { type: 'json' } +import ja from './ja.json' assert { type: 'json' } +import ko from './ko.json' assert { type: 'json' } +import my from './my.json' assert { type: 'json' } +import nb from './nb.json' assert { type: 'json' } +import nl from './nl.json' assert { type: 'json' } +import pl from './pl.json' assert { type: 'json' } +import pt from './pt.json' assert { type: 'json' } +import ro from './ro.json' assert { type: 'json' } +import rs from './rs.json' assert { type: 'json' } +import rsLatin from './rs-latin.json' assert { type: 'json' } +import ru from './ru.json' assert { type: 'json' } +import sv from './sv.json' assert { type: 'json' } +import th from './th.json' assert { type: 'json' } +import tr from './tr.json' assert { type: 'json' } +import ua from './ua.json' assert { type: 'json' } +import vi from './vi.json' assert { type: 'json' } +import zh from './zh.json' assert { type: 'json' } +import zhTw from './zh-tw.json' assert { type: 'json' } export const translations = { ar, diff --git a/packages/translations/src/all/index.ts b/packages/translations/src/all/index.ts index 771913489..7ab7ae98b 100644 --- a/packages/translations/src/all/index.ts +++ b/packages/translations/src/all/index.ts @@ -1,33 +1,33 @@ -import ar from './ar.json' -import az from './az.json' -import bg from './bg.json' -import cs from './cs.json' -import de from './de.json' -import en from './en.json' -import es from './es.json' -import fa from './fa.json' -import fr from './fr.json' -import hr from './hr.json' -import hu from './hu.json' -import it from './it.json' -import ja from './ja.json' -import ko from './ko.json' -import my from './my.json' -import nb from './nb.json' -import nl from './nl.json' -import pl from './pl.json' -import pt from './pt.json' -import ro from './ro.json' -import rs from './rs.json' -import rsLatin from './rs-latin.json' -import ru from './ru.json' -import sv from './sv.json' -import th from './th.json' -import tr from './tr.json' -import ua from './ua.json' -import vi from './vi.json' -import zh from './zh.json' -import zhTw from './zh-tw.json' +import ar from './ar.json' assert { type: 'json' } +import az from './az.json' assert { type: 'json' } +import bg from './bg.json' assert { type: 'json' } +import cs from './cs.json' assert { type: 'json' } +import de from './de.json' assert { type: 'json' } +import en from './en.json' assert { type: 'json' } +import es from './es.json' assert { type: 'json' } +import fa from './fa.json' assert { type: 'json' } +import fr from './fr.json' assert { type: 'json' } +import hr from './hr.json' assert { type: 'json' } +import hu from './hu.json' assert { type: 'json' } +import it from './it.json' assert { type: 'json' } +import ja from './ja.json' assert { type: 'json' } +import ko from './ko.json' assert { type: 'json' } +import my from './my.json' assert { type: 'json' } +import nb from './nb.json' assert { type: 'json' } +import nl from './nl.json' assert { type: 'json' } +import pl from './pl.json' assert { type: 'json' } +import pt from './pt.json' assert { type: 'json' } +import ro from './ro.json' assert { type: 'json' } +import rs from './rs.json' assert { type: 'json' } +import rsLatin from './rs-latin.json' assert { type: 'json' } +import ru from './ru.json' assert { type: 'json' } +import sv from './sv.json' assert { type: 'json' } +import th from './th.json' assert { type: 'json' } +import tr from './tr.json' assert { type: 'json' } +import ua from './ua.json' assert { type: 'json' } +import vi from './vi.json' assert { type: 'json' } +import zh from './zh.json' assert { type: 'json' } +import zhTw from './zh-tw.json' assert { type: 'json' } export const translations = { ar, diff --git a/packages/translations/src/exports/index.ts b/packages/translations/src/exports/index.ts index 3388dcdc5..a122fbdb2 100644 --- a/packages/translations/src/exports/index.ts +++ b/packages/translations/src/exports/index.ts @@ -1,3 +1,3 @@ -export { initI18n, t, matchLanguage } from '../utilities/init' -export { getTranslation } from '../utilities/getTranslation' -export type * from '../types' +export { getTranslation } from '../utilities/getTranslation.js' +export { initI18n, matchLanguage, t } from '../utilities/init.js' +export type * from '../types.d.ts' diff --git a/packages/translations/tsconfig.json b/packages/translations/tsconfig.json index 62c5f4283..622a742ee 100644 --- a/packages/translations/tsconfig.json +++ b/packages/translations/tsconfig.json @@ -1,11 +1,14 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { "composite": true, // Make sure typescript knows that this module depends on their references "esModuleInterop": true, "resolveJsonModule": true, "outDir": "./dist" /* Specify an output folder for all emitted files. */, "rootDir": "./src", - "lib": ["dom", "dom.iterable", "esnext"] + "lib": ["dom", "dom.iterable", "esnext"], + "noEmit": false /* Do not emit outputs. */, + "emitDeclarationOnly": true }, "include": ["src/**/*.ts", "src/**/*.json"], "exclude": ["src/all"] From bea15771b9af76dec1b8cc23245d0bb0d96b5b50 Mon Sep 17 00:00:00 2001 From: Dan Ribbens Date: Wed, 6 Mar 2024 14:48:46 -0500 Subject: [PATCH 15/21] chore: fix utilities imported function calls --- packages/payload/src/utilities/isValidID.ts | 4 ++-- packages/payload/src/utilities/logger.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/payload/src/utilities/isValidID.ts b/packages/payload/src/utilities/isValidID.ts index d85542f55..f250f443a 100644 --- a/packages/payload/src/utilities/isValidID.ts +++ b/packages/payload/src/utilities/isValidID.ts @@ -6,7 +6,7 @@ export const isValidID = ( ): boolean => { if (type === 'text' && value) { if (['object', 'string'].includes(typeof value)) { - const isObjectID = ObjectId.isValid(value as string) + const isObjectID = ObjectId.default.isValid(value as string) return typeof value === 'string' || isObjectID } return false @@ -15,6 +15,6 @@ export const isValidID = ( if (typeof value === 'number' && !Number.isNaN(value)) return true if (type === 'ObjectID') { - return ObjectId.isValid(String(value)) + return ObjectId.default.isValid(String(value)) } } diff --git a/packages/payload/src/utilities/logger.ts b/packages/payload/src/utilities/logger.ts index 2c5c3b378..09970a0d8 100644 --- a/packages/payload/src/utilities/logger.ts +++ b/packages/payload/src/utilities/logger.ts @@ -1,5 +1,5 @@ -import pino from 'pino' -import prettifier from 'pino-pretty' +import { pino } from 'pino' +import { PinoPretty } from 'pino-pretty' export type PayloadLogger = pino.Logger @@ -16,7 +16,7 @@ export const defaultLoggerOptions: pino.LoggerOptions = { }, } -export const prettySyncLoggerDestination = prettifier({ +export const prettySyncLoggerDestination = PinoPretty({ ...prettyOptions, destination: 1, // stdout sync: true, From be09dd41faab38000b17069d25e7b39ee09dad01 Mon Sep 17 00:00:00 2001 From: Tylan Davis Date: Wed, 6 Mar 2024 14:53:02 -0500 Subject: [PATCH 16/21] chore: updates graphql imports for ESM --- packages/graphql/src/index.ts | 14 +++--- packages/graphql/src/resolvers/auth/access.ts | 4 +- .../src/resolvers/auth/forgotPassword.ts | 2 +- packages/graphql/src/resolvers/auth/init.ts | 2 +- packages/graphql/src/resolvers/auth/login.ts | 2 +- packages/graphql/src/resolvers/auth/logout.ts | 2 +- packages/graphql/src/resolvers/auth/me.ts | 2 +- .../graphql/src/resolvers/auth/refresh.ts | 2 +- .../src/resolvers/auth/resetPassword.ts | 2 +- packages/graphql/src/resolvers/auth/unlock.ts | 2 +- .../graphql/src/resolvers/auth/verifyEmail.ts | 2 +- .../src/resolvers/collections/create.ts | 2 +- .../src/resolvers/collections/delete.ts | 2 +- .../src/resolvers/collections/docAccess.ts | 2 +- .../graphql/src/resolvers/collections/find.ts | 2 +- .../src/resolvers/collections/findByID.ts | 2 +- .../resolvers/collections/findVersionByID.ts | 2 +- .../src/resolvers/collections/findVersions.ts | 2 +- .../resolvers/collections/restoreVersion.ts | 2 +- .../src/resolvers/collections/update.ts | 2 +- .../src/resolvers/globals/docAccess.ts | 2 +- .../graphql/src/resolvers/globals/findOne.ts | 2 +- .../src/resolvers/globals/findVersionByID.ts | 2 +- .../src/resolvers/globals/findVersions.ts | 2 +- .../graphql/src/resolvers/globals/index.ts | 10 ++-- .../src/resolvers/globals/restoreVersion.ts | 2 +- .../graphql/src/resolvers/globals/update.ts | 2 +- .../schema/buildFallbackLocaleInputType.ts | 2 +- .../src/schema/buildLocaleInputType.ts | 2 +- .../src/schema/buildMutationInputType.ts | 8 +-- .../graphql/src/schema/buildObjectType.ts | 14 +++--- .../graphql/src/schema/buildPoliciesType.ts | 2 +- .../graphql/src/schema/buildWhereInputType.ts | 6 +-- .../src/schema/fieldToWhereInputSchemaMap.ts | 8 +-- .../graphql/src/schema/initCollections.ts | 50 +++++++++---------- packages/graphql/src/schema/initGlobals.ts | 24 ++++----- .../src/schema/recursivelyBuildNestedPaths.ts | 2 +- packages/graphql/src/schema/withOperators.ts | 6 +-- .../src/utilities/combineParentName.ts | 2 +- .../graphql/src/utilities/formatOptions.ts | 2 +- .../src/utilities/isolateTransactionID.ts | 0 41 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 packages/graphql/src/utilities/isolateTransactionID.ts diff --git a/packages/graphql/src/index.ts b/packages/graphql/src/index.ts index 4e44da6ed..3891d316c 100644 --- a/packages/graphql/src/index.ts +++ b/packages/graphql/src/index.ts @@ -10,13 +10,13 @@ import { import type { GraphQLInfo } from 'payload/config' import type { SanitizedConfig } from 'payload/types' -import accessResolver from './resolvers/auth/access' -import initCollections from './schema/initCollections' -import initGlobals from './schema/initGlobals' -import buildFallbackLocaleInputType from './schema/buildFallbackLocaleInputType' -import buildLocaleInputType from './schema/buildLocaleInputType' -import buildPoliciesType from './schema/buildPoliciesType' -import { wrapCustomFields } from './utilities/wrapCustomResolver' +import accessResolver from './resolvers/auth/access.js' +import initCollections from './schema/initCollections.js' +import initGlobals from './schema/initGlobals.js' +import buildFallbackLocaleInputType from './schema/buildFallbackLocaleInputType.js' +import buildLocaleInputType from './schema/buildLocaleInputType.js' +import buildPoliciesType from './schema/buildPoliciesType.js' +import { wrapCustomFields } from './utilities/wrapCustomResolver.js' export async function configToSchema(config: SanitizedConfig): Promise<{ schema: GraphQL.GraphQLSchema diff --git a/packages/graphql/src/resolvers/auth/access.ts b/packages/graphql/src/resolvers/auth/access.ts index 491e8ad3a..624a1be9b 100644 --- a/packages/graphql/src/resolvers/auth/access.ts +++ b/packages/graphql/src/resolvers/auth/access.ts @@ -1,8 +1,8 @@ import { accessOperation } from 'payload/operations' import type { SanitizedConfig } from 'payload/types' -import formatName from '../../utilities/formatName' -import { Context } from '../types' +import formatName from '../../utilities/formatName.js' +import { Context } from '../types.js' import { isolateObjectProperty } from 'payload/utilities' const formatConfigNames = (results, configs) => { const formattedResults = { ...results } diff --git a/packages/graphql/src/resolvers/auth/forgotPassword.ts b/packages/graphql/src/resolvers/auth/forgotPassword.ts index d37494563..5c13247fb 100644 --- a/packages/graphql/src/resolvers/auth/forgotPassword.ts +++ b/packages/graphql/src/resolvers/auth/forgotPassword.ts @@ -2,7 +2,7 @@ import { forgotPasswordOperation } from 'payload/operations' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function forgotPasswordResolver(collection: Collection): any { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/init.ts b/packages/graphql/src/resolvers/auth/init.ts index 4886d3e2f..89516fc3d 100644 --- a/packages/graphql/src/resolvers/auth/init.ts +++ b/packages/graphql/src/resolvers/auth/init.ts @@ -1,6 +1,6 @@ import { initOperation } from 'payload/operations' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function initResolver(collection: string) { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/login.ts b/packages/graphql/src/resolvers/auth/login.ts index d71600975..ef97c82b7 100644 --- a/packages/graphql/src/resolvers/auth/login.ts +++ b/packages/graphql/src/resolvers/auth/login.ts @@ -3,7 +3,7 @@ import { generatePayloadCookie } from 'payload/auth' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function loginResolver(collection: Collection) { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/logout.ts b/packages/graphql/src/resolvers/auth/logout.ts index 6a48b3847..d4d69abd1 100644 --- a/packages/graphql/src/resolvers/auth/logout.ts +++ b/packages/graphql/src/resolvers/auth/logout.ts @@ -3,7 +3,7 @@ import { generateExpiredPayloadCookie } from 'payload/auth' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function logoutResolver(collection: Collection): any { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/me.ts b/packages/graphql/src/resolvers/auth/me.ts index 5a1725b36..219110329 100644 --- a/packages/graphql/src/resolvers/auth/me.ts +++ b/packages/graphql/src/resolvers/auth/me.ts @@ -2,7 +2,7 @@ import { meOperation } from 'payload/operations' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function meResolver(collection: Collection): any { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/refresh.ts b/packages/graphql/src/resolvers/auth/refresh.ts index 461936822..37a92d015 100644 --- a/packages/graphql/src/resolvers/auth/refresh.ts +++ b/packages/graphql/src/resolvers/auth/refresh.ts @@ -3,7 +3,7 @@ import { generatePayloadCookie, extractJWT } from 'payload/auth' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function refreshResolver(collection: Collection) { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/resetPassword.ts b/packages/graphql/src/resolvers/auth/resetPassword.ts index d1e77f868..dcbafcbd2 100644 --- a/packages/graphql/src/resolvers/auth/resetPassword.ts +++ b/packages/graphql/src/resolvers/auth/resetPassword.ts @@ -3,7 +3,7 @@ import { generatePayloadCookie } from 'payload/auth' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function resetPasswordResolver(collection: Collection) { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/unlock.ts b/packages/graphql/src/resolvers/auth/unlock.ts index 199a4b21e..0053b205a 100644 --- a/packages/graphql/src/resolvers/auth/unlock.ts +++ b/packages/graphql/src/resolvers/auth/unlock.ts @@ -2,7 +2,7 @@ import { unlockOperation } from 'payload/operations' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function unlockResolver(collection: Collection) { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/auth/verifyEmail.ts b/packages/graphql/src/resolvers/auth/verifyEmail.ts index fd899a062..17b7b0465 100644 --- a/packages/graphql/src/resolvers/auth/verifyEmail.ts +++ b/packages/graphql/src/resolvers/auth/verifyEmail.ts @@ -2,7 +2,7 @@ import { verifyEmailOperation } from 'payload/operations' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' function verifyEmailResolver(collection: Collection) { async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/collections/create.ts b/packages/graphql/src/resolvers/collections/create.ts index 1c7adf455..d0011bd16 100644 --- a/packages/graphql/src/resolvers/collections/create.ts +++ b/packages/graphql/src/resolvers/collections/create.ts @@ -5,7 +5,7 @@ import type { PayloadRequest } from 'payload/types' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/delete.ts b/packages/graphql/src/resolvers/collections/delete.ts index 058c564fc..74c29bf96 100644 --- a/packages/graphql/src/resolvers/collections/delete.ts +++ b/packages/graphql/src/resolvers/collections/delete.ts @@ -4,7 +4,7 @@ import type { PayloadRequest } from 'payload/types' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/docAccess.ts b/packages/graphql/src/resolvers/collections/docAccess.ts index 56edba3fd..cebcb91f4 100644 --- a/packages/graphql/src/resolvers/collections/docAccess.ts +++ b/packages/graphql/src/resolvers/collections/docAccess.ts @@ -3,7 +3,7 @@ import type { Collection, PayloadRequest } from 'payload/types' import type { CollectionPermission, GlobalPermission } from 'payload/auth' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/find.ts b/packages/graphql/src/resolvers/collections/find.ts index adb91f82b..c4d972b72 100644 --- a/packages/graphql/src/resolvers/collections/find.ts +++ b/packages/graphql/src/resolvers/collections/find.ts @@ -4,7 +4,7 @@ import type { PayloadRequest, Where } from 'payload/types' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/findByID.ts b/packages/graphql/src/resolvers/collections/findByID.ts index 31b873916..e2d193c77 100644 --- a/packages/graphql/src/resolvers/collections/findByID.ts +++ b/packages/graphql/src/resolvers/collections/findByID.ts @@ -4,7 +4,7 @@ import type { PayloadRequest } from 'payload/types' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/findVersionByID.ts b/packages/graphql/src/resolvers/collections/findVersionByID.ts index 9dd431e4e..4e78d086a 100644 --- a/packages/graphql/src/resolvers/collections/findVersionByID.ts +++ b/packages/graphql/src/resolvers/collections/findVersionByID.ts @@ -4,7 +4,7 @@ import type { TypeWithVersion } from 'payload/versions' import type { Collection, TypeWithID } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/findVersions.ts b/packages/graphql/src/resolvers/collections/findVersions.ts index 2e554d75e..ba0584b04 100644 --- a/packages/graphql/src/resolvers/collections/findVersions.ts +++ b/packages/graphql/src/resolvers/collections/findVersions.ts @@ -4,7 +4,7 @@ import type { PaginatedDocs } from 'payload/database' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/restoreVersion.ts b/packages/graphql/src/resolvers/collections/restoreVersion.ts index 70ca29d9d..eb9986e34 100644 --- a/packages/graphql/src/resolvers/collections/restoreVersion.ts +++ b/packages/graphql/src/resolvers/collections/restoreVersion.ts @@ -3,7 +3,7 @@ import type { PayloadRequest } from 'payload/types' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/collections/update.ts b/packages/graphql/src/resolvers/collections/update.ts index 7c7df0dd5..7ba9f183f 100644 --- a/packages/graphql/src/resolvers/collections/update.ts +++ b/packages/graphql/src/resolvers/collections/update.ts @@ -4,7 +4,7 @@ import type { PayloadRequest } from 'payload/types' import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/globals/docAccess.ts b/packages/graphql/src/resolvers/globals/docAccess.ts index 1d033e8ab..57ff48ca2 100644 --- a/packages/graphql/src/resolvers/globals/docAccess.ts +++ b/packages/graphql/src/resolvers/globals/docAccess.ts @@ -3,7 +3,7 @@ import type { PayloadRequest, SanitizedGlobalConfig } from 'payload/types' import type { CollectionPermission, GlobalPermission } from 'payload/auth' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/globals/findOne.ts b/packages/graphql/src/resolvers/globals/findOne.ts index 72bebd1b5..e324d362b 100644 --- a/packages/graphql/src/resolvers/globals/findOne.ts +++ b/packages/graphql/src/resolvers/globals/findOne.ts @@ -2,7 +2,7 @@ import { findOneOperation } from 'payload/operations' import type { Document, SanitizedGlobalConfig } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export default function findOneResolver(globalConfig: SanitizedGlobalConfig): Document { return async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/globals/findVersionByID.ts b/packages/graphql/src/resolvers/globals/findVersionByID.ts index 4300f50fe..d03f09e3a 100644 --- a/packages/graphql/src/resolvers/globals/findVersionByID.ts +++ b/packages/graphql/src/resolvers/globals/findVersionByID.ts @@ -2,7 +2,7 @@ import { findVersionByIDOperationGlobal } from 'payload/operations' import type { Document, PayloadRequest, SanitizedGlobalConfig } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/globals/findVersions.ts b/packages/graphql/src/resolvers/globals/findVersions.ts index d10e5de35..5b25cfc80 100644 --- a/packages/graphql/src/resolvers/globals/findVersions.ts +++ b/packages/graphql/src/resolvers/globals/findVersions.ts @@ -2,7 +2,7 @@ import { findVersionsOperationGlobal } from 'payload/operations' import type { Document, PayloadRequest, SanitizedGlobalConfig, Where } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' export type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/globals/index.ts b/packages/graphql/src/resolvers/globals/index.ts index d73559b12..06a1258c4 100644 --- a/packages/graphql/src/resolvers/globals/index.ts +++ b/packages/graphql/src/resolvers/globals/index.ts @@ -1,7 +1,7 @@ -import findOne from './findOne' -import findVersionByID from './findVersionByID' -import findVersions from './findVersions' -import restoreVersion from './restoreVersion' -import update from './update' +import findOne from './findOne.js' +import findVersionByID from './findVersionByID.js' +import findVersions from './findVersions.js' +import restoreVersion from './restoreVersion.js' +import update from './update.js' export { findOne, findVersionByID, findVersions, restoreVersion, update } diff --git a/packages/graphql/src/resolvers/globals/restoreVersion.ts b/packages/graphql/src/resolvers/globals/restoreVersion.ts index 4abf6ba60..d825866c6 100644 --- a/packages/graphql/src/resolvers/globals/restoreVersion.ts +++ b/packages/graphql/src/resolvers/globals/restoreVersion.ts @@ -2,7 +2,7 @@ import { restoreVersionOperationGlobal } from 'payload/operations' import type { Document, PayloadRequest, SanitizedGlobalConfig } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' type Resolver = ( _: unknown, diff --git a/packages/graphql/src/resolvers/globals/update.ts b/packages/graphql/src/resolvers/globals/update.ts index c35f852f2..aa588e39a 100644 --- a/packages/graphql/src/resolvers/globals/update.ts +++ b/packages/graphql/src/resolvers/globals/update.ts @@ -4,7 +4,7 @@ import type { GeneratedTypes } from 'payload' import type { PayloadRequest, SanitizedGlobalConfig } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' -import { Context } from '../types' +import type { Context } from '../types.d.ts' type Resolver = ( _: unknown, diff --git a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts index b0294a7ff..ab7695b1d 100644 --- a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts +++ b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts @@ -2,7 +2,7 @@ import { GraphQLEnumType } from 'graphql' import type { SanitizedLocalizationConfig } from 'payload/config' -import formatName from '../utilities/formatName' +import formatName from '../utilities/formatName.js' const buildFallbackLocaleInputType = ( localization: SanitizedLocalizationConfig, diff --git a/packages/graphql/src/schema/buildLocaleInputType.ts b/packages/graphql/src/schema/buildLocaleInputType.ts index fd83df6d3..b799ee666 100644 --- a/packages/graphql/src/schema/buildLocaleInputType.ts +++ b/packages/graphql/src/schema/buildLocaleInputType.ts @@ -4,7 +4,7 @@ import { GraphQLEnumType } from 'graphql' import type { SanitizedLocalizationConfig } from 'payload/config' -import formatName from '../utilities/formatName' +import formatName from '../utilities/formatName.js' const buildLocaleInputType = ( localization: SanitizedLocalizationConfig, diff --git a/packages/graphql/src/schema/buildMutationInputType.ts b/packages/graphql/src/schema/buildMutationInputType.ts index 054c04f97..a47ce5770 100644 --- a/packages/graphql/src/schema/buildMutationInputType.ts +++ b/packages/graphql/src/schema/buildMutationInputType.ts @@ -42,10 +42,10 @@ import type { import { fieldAffectsData, optionIsObject, tabHasName } from 'payload/types' import { toWords } from 'payload/utilities' -import { groupOrTabHasRequiredSubfield } from '../utilities/groupOrTabHasRequiredSubfield' -import combineParentName from '../utilities/combineParentName' -import formatName from '../utilities/formatName' -import withNullableType from './withNullableType' +import { groupOrTabHasRequiredSubfield } from '../utilities/groupOrTabHasRequiredSubfield.js' +import combineParentName from '../utilities/combineParentName.js' +import formatName from '../utilities/formatName.js' +import withNullableType from './withNullableType.js' import { flattenTopLevelFields } from 'payload/utilities' const idFieldTypes = { diff --git a/packages/graphql/src/schema/buildObjectType.ts b/packages/graphql/src/schema/buildObjectType.ts index b90323e14..d19d78a9c 100644 --- a/packages/graphql/src/schema/buildObjectType.ts +++ b/packages/graphql/src/schema/buildObjectType.ts @@ -47,13 +47,13 @@ import type { import { tabHasName } from 'payload/types' import { toWords } from 'payload/utilities' -import combineParentName from '../utilities/combineParentName' -import formatName from '../utilities/formatName' -import formatOptions from '../utilities/formatOptions' -import buildWhereInputType from './buildWhereInputType' -import isFieldNullable from './isFieldNullable' -import withNullableType from './withNullableType' -import { Context } from '../resolvers/types' +import combineParentName from '../utilities/combineParentName.js' +import formatName from '../utilities/formatName.js' +import formatOptions from '../utilities/formatOptions.js' +import buildWhereInputType from './buildWhereInputType.js' +import isFieldNullable from './isFieldNullable.js' +import withNullableType from './withNullableType.js' +import { Context } from '../resolvers/types.js' type LocaleInputType = { fallbackLocale: { diff --git a/packages/graphql/src/schema/buildPoliciesType.ts b/packages/graphql/src/schema/buildPoliciesType.ts index 8eed20271..770114b70 100644 --- a/packages/graphql/src/schema/buildPoliciesType.ts +++ b/packages/graphql/src/schema/buildPoliciesType.ts @@ -10,7 +10,7 @@ import type { } from 'payload/types' import { toWords } from 'payload/utilities' -import formatName from '../utilities/formatName' +import formatName from '../utilities/formatName.js' type OperationType = 'create' | 'delete' | 'read' | 'readVersions' | 'unlock' | 'update' diff --git a/packages/graphql/src/schema/buildWhereInputType.ts b/packages/graphql/src/schema/buildWhereInputType.ts index 97b500504..782f7e537 100644 --- a/packages/graphql/src/schema/buildWhereInputType.ts +++ b/packages/graphql/src/schema/buildWhereInputType.ts @@ -5,9 +5,9 @@ import { GraphQLInputObjectType, GraphQLList } from 'graphql' import type { Field, FieldAffectingData } from 'payload/types' import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from 'payload/types' -import formatName from '../utilities/formatName' -import fieldToSchemaMap from './fieldToWhereInputSchemaMap' -import { withOperators } from './withOperators' +import formatName from '../utilities/formatName.js' +import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' +import { withOperators } from './withOperators.js' import { flattenTopLevelFields } from 'payload/utilities' type Args = { diff --git a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts index 835dd6fa5..7e46752f6 100644 --- a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts +++ b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts @@ -23,10 +23,10 @@ import type { UploadField, } from 'payload/types' -import combineParentName from '../utilities/combineParentName' -import formatName from '../utilities/formatName' -import recursivelyBuildNestedPaths from './recursivelyBuildNestedPaths' -import { withOperators } from './withOperators' +import combineParentName from '../utilities/combineParentName.js' +import formatName from '../utilities/formatName.js' +import recursivelyBuildNestedPaths from './recursivelyBuildNestedPaths.js' +import { withOperators } from './withOperators.js' type Args = { nestedFieldName?: string diff --git a/packages/graphql/src/schema/initCollections.ts b/packages/graphql/src/schema/initCollections.ts index dc022d8ab..fb8ec5bdb 100644 --- a/packages/graphql/src/schema/initCollections.ts +++ b/packages/graphql/src/schema/initCollections.ts @@ -13,31 +13,31 @@ import { buildVersionCollectionFields } from 'payload/versions' import type { GraphQLInfo } from 'payload/config' import type { Field, Collection, SanitizedCollectionConfig, SanitizedConfig } from 'payload/types' -import type { ObjectTypeConfig } from './buildObjectType' -import forgotPassword from '../resolvers/auth/forgotPassword' -import init from '../resolvers/auth/init' -import login from '../resolvers/auth/login' -import logout from '../resolvers/auth/logout' -import me from '../resolvers/auth/me' -import refresh from '../resolvers/auth/refresh' -import resetPassword from '../resolvers/auth/resetPassword' -import unlock from '../resolvers/auth/unlock' -import verifyEmail from '../resolvers/auth/verifyEmail' -import { buildMutationInputType, getCollectionIDType } from './buildMutationInputType' -import buildObjectType from './buildObjectType' -import buildPaginatedListType from './buildPaginatedListType' -import { buildPolicyType } from './buildPoliciesType' -import buildWhereInputType from './buildWhereInputType' -import formatName from '../utilities/formatName' -import createResolver from '../resolvers/collections/create' -import getDeleteResolver from '../resolvers/collections/delete' -import { docAccessResolver } from '../resolvers/collections/docAccess' -import findResolver from '../resolvers/collections/find' -import findByIDResolver from '../resolvers/collections/findByID' -import findVersionByIDResolver from '../resolvers/collections/findVersionByID' -import findVersionsResolver from '../resolvers/collections/findVersions' -import restoreVersionResolver from '../resolvers/collections/restoreVersion' -import updateResolver from '../resolvers/collections/update' +import type { ObjectTypeConfig } from './buildObjectType.js' +import forgotPassword from '../resolvers/auth/forgotPassword.js' +import init from '../resolvers/auth/init.js' +import login from '../resolvers/auth/login.js' +import logout from '../resolvers/auth/logout.js' +import me from '../resolvers/auth/me.js' +import refresh from '../resolvers/auth/refresh.js' +import resetPassword from '../resolvers/auth/resetPassword.js' +import unlock from '../resolvers/auth/unlock.js' +import verifyEmail from '../resolvers/auth/verifyEmail.js' +import { buildMutationInputType, getCollectionIDType } from './buildMutationInputType.js' +import buildObjectType from './buildObjectType.js' +import buildPaginatedListType from './buildPaginatedListType.js' +import { buildPolicyType } from './buildPoliciesType.js' +import buildWhereInputType from './buildWhereInputType.js' +import formatName from '../utilities/formatName.js' +import createResolver from '../resolvers/collections/create.js' +import getDeleteResolver from '../resolvers/collections/delete.js' +import { docAccessResolver } from '../resolvers/collections/docAccess.js' +import findResolver from '../resolvers/collections/find.js' +import findByIDResolver from '../resolvers/collections/findByID.js' +import findVersionByIDResolver from '../resolvers/collections/findVersionByID.js' +import findVersionsResolver from '../resolvers/collections/findVersions.js' +import restoreVersionResolver from '../resolvers/collections/restoreVersion.js' +import updateResolver from '../resolvers/collections/update.js' type InitCollectionsGraphQLArgs = { config: SanitizedConfig diff --git a/packages/graphql/src/schema/initGlobals.ts b/packages/graphql/src/schema/initGlobals.ts index 6b781d1b9..3f5fd5291 100644 --- a/packages/graphql/src/schema/initGlobals.ts +++ b/packages/graphql/src/schema/initGlobals.ts @@ -7,18 +7,18 @@ import { buildVersionGlobalFields } from 'payload/versions' import type { GraphQLInfo } from 'payload/config' import type { Field, SanitizedConfig, SanitizedGlobalConfig } from 'payload/types' -import { buildMutationInputType } from './buildMutationInputType' -import buildObjectType from './buildObjectType' -import buildPaginatedListType from './buildPaginatedListType' -import { buildPolicyType } from './buildPoliciesType' -import buildWhereInputType from './buildWhereInputType' -import formatName from '../utilities/formatName' -import { docAccessResolver } from '../resolvers/globals/docAccess' -import findOneResolver from '../resolvers/globals/findOne' -import findVersionByIDResolver from '../resolvers/globals/findVersionByID' -import findVersionsResolver from '../resolvers/globals/findVersions' -import restoreVersionResolver from '../resolvers/globals/restoreVersion' -import updateResolver from '../resolvers/globals/update' +import { buildMutationInputType } from './buildMutationInputType.js' +import buildObjectType from './buildObjectType.js' +import buildPaginatedListType from './buildPaginatedListType.js' +import { buildPolicyType } from './buildPoliciesType.js' +import buildWhereInputType from './buildWhereInputType.js' +import formatName from '../utilities/formatName.js' +import { docAccessResolver } from '../resolvers/globals/docAccess.js' +import findOneResolver from '../resolvers/globals/findOne.js' +import findVersionByIDResolver from '../resolvers/globals/findVersionByID.js' +import findVersionsResolver from '../resolvers/globals/findVersions.js' +import restoreVersionResolver from '../resolvers/globals/restoreVersion.js' +import updateResolver from '../resolvers/globals/update.js' type InitGlobalsGraphQLArgs = { config: SanitizedConfig diff --git a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts index a5eb406ae..28704c7e8 100644 --- a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts +++ b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts @@ -1,7 +1,7 @@ import type { FieldWithSubFields, TabsField } from 'payload/types' import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types' -import fieldToSchemaMap from './fieldToWhereInputSchemaMap' +import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' type Args = { field: FieldWithSubFields | TabsField diff --git a/packages/graphql/src/schema/withOperators.ts b/packages/graphql/src/schema/withOperators.ts index da199200d..1ee9f473b 100644 --- a/packages/graphql/src/schema/withOperators.ts +++ b/packages/graphql/src/schema/withOperators.ts @@ -15,9 +15,9 @@ import { GraphQLJSON } from 'graphql-type-json' import type { FieldAffectingData, NumberField, RadioField, SelectField } from 'payload/types' import { optionIsObject } from 'payload/types' -import combineParentName from '../utilities/combineParentName' -import formatName from '../utilities/formatName' -import operators from './operators' +import combineParentName from '../utilities/combineParentName.js' +import formatName from '../utilities/formatName.js' +import operators from './operators.js' type staticTypes = | 'checkbox' diff --git a/packages/graphql/src/utilities/combineParentName.ts b/packages/graphql/src/utilities/combineParentName.ts index 34f3f21f9..18f8e68cb 100644 --- a/packages/graphql/src/utilities/combineParentName.ts +++ b/packages/graphql/src/utilities/combineParentName.ts @@ -1,4 +1,4 @@ -import formatName from './formatName' +import formatName from './formatName.js' const combineParentName = (parent: string, name: string): string => formatName(`${parent ? `${parent}_` : ''}${name}`) diff --git a/packages/graphql/src/utilities/formatOptions.ts b/packages/graphql/src/utilities/formatOptions.ts index 8cfcab972..82eaffd76 100644 --- a/packages/graphql/src/utilities/formatOptions.ts +++ b/packages/graphql/src/utilities/formatOptions.ts @@ -1,6 +1,6 @@ import type { RadioField, SelectField } from 'payload/types' -import formatName from './formatName' +import formatName from './formatName.js' const formatOptions = (field: RadioField | SelectField) => { return field.options.reduce((values, option) => { diff --git a/packages/graphql/src/utilities/isolateTransactionID.ts b/packages/graphql/src/utilities/isolateTransactionID.ts deleted file mode 100644 index e69de29bb..000000000 From f33bb0d73fbb8d38f7a5c511f48b1c5c1f22ed59 Mon Sep 17 00:00:00 2001 From: Tylan Davis Date: Wed, 6 Mar 2024 14:53:54 -0500 Subject: [PATCH 17/21] chore: updates live-preview imports for ESM --- packages/live-preview/src/handleMessage.ts | 2 +- packages/live-preview/src/index.ts | 10 +++++----- packages/live-preview/src/mergeData.ts | 4 ++-- packages/live-preview/src/subscribe.ts | 2 +- packages/live-preview/src/traverseFields.ts | 4 ++-- packages/live-preview/src/traverseRichText.ts | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/live-preview/src/handleMessage.ts b/packages/live-preview/src/handleMessage.ts index 75ea6b7c5..8911bb103 100644 --- a/packages/live-preview/src/handleMessage.ts +++ b/packages/live-preview/src/handleMessage.ts @@ -1,4 +1,4 @@ -import { mergeData } from '.' +import { mergeData } from './mergeData.js' // For performance reasons, `fieldSchemaJSON` will only be sent once on the initial message // We need to cache this value so that it can be used across subsequent messages diff --git a/packages/live-preview/src/index.ts b/packages/live-preview/src/index.ts index ebfa97673..77707a23f 100644 --- a/packages/live-preview/src/index.ts +++ b/packages/live-preview/src/index.ts @@ -1,5 +1,5 @@ -export { handleMessage } from './handleMessage' -export { mergeData } from './mergeData' -export { ready } from './ready' -export { subscribe } from './subscribe' -export { unsubscribe } from './unsubscribe' +export { handleMessage } from './handleMessage.js' +export { mergeData } from './mergeData.js' +export { ready } from './ready.js' +export { subscribe } from './subscribe.js' +export { unsubscribe } from './unsubscribe.js' diff --git a/packages/live-preview/src/mergeData.ts b/packages/live-preview/src/mergeData.ts index 5c2e91db1..3a0debc81 100644 --- a/packages/live-preview/src/mergeData.ts +++ b/packages/live-preview/src/mergeData.ts @@ -1,9 +1,9 @@ import type { PaginatedDocs } from 'payload/database' import type { fieldSchemaToJSON } from 'payload/utilities' -import type { PopulationsByCollection, UpdatedDocument } from './types' +import type { PopulationsByCollection, UpdatedDocument } from './types.d.ts' -import { traverseFields } from './traverseFields' +import { traverseFields } from './traverseFields.js' const defaultRequestHandler = ({ apiPath, endpoint, serverURL }) => { const url = `${serverURL}${apiPath}/${endpoint}` diff --git a/packages/live-preview/src/subscribe.ts b/packages/live-preview/src/subscribe.ts index a40220a5e..b1586de62 100644 --- a/packages/live-preview/src/subscribe.ts +++ b/packages/live-preview/src/subscribe.ts @@ -1,4 +1,4 @@ -import { handleMessage } from '.' +import { handleMessage } from './handleMessage.js' export const subscribe = (args: { apiRoute?: string diff --git a/packages/live-preview/src/traverseFields.ts b/packages/live-preview/src/traverseFields.ts index fbedc6f49..cc9d9556c 100644 --- a/packages/live-preview/src/traverseFields.ts +++ b/packages/live-preview/src/traverseFields.ts @@ -1,8 +1,8 @@ import type { fieldSchemaToJSON } from 'payload/utilities' -import type { PopulationsByCollection, UpdatedDocument } from './types' +import type { PopulationsByCollection, UpdatedDocument } from './types.d.ts' -import { traverseRichText } from './traverseRichText' +import { traverseRichText } from './traverseRichText.js' export const traverseFields = (args: { externallyUpdatedRelationship?: UpdatedDocument diff --git a/packages/live-preview/src/traverseRichText.ts b/packages/live-preview/src/traverseRichText.ts index e73e026d5..60ca1c01f 100644 --- a/packages/live-preview/src/traverseRichText.ts +++ b/packages/live-preview/src/traverseRichText.ts @@ -1,4 +1,4 @@ -import type { PopulationsByCollection, UpdatedDocument } from './types' +import type { PopulationsByCollection, UpdatedDocument } from './types.d.ts' export const traverseRichText = ({ externallyUpdatedRelationship, From dff80d8276bdce796e54b8e1f72bd9e81d71579a Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Wed, 6 Mar 2024 14:56:02 -0500 Subject: [PATCH 18/21] chore(richtext-lexical): fixes --- .../plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx | 2 +- packages/richtext-lexical/src/generateComponentMap.tsx | 4 ++-- packages/richtext-lexical/src/validate/validateNodes.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx index 8754888fc..569e622c6 100644 --- a/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx +++ b/packages/richtext-lexical/src/field/lexical/plugins/SlashMenu/LexicalTypeaheadMenuPlugin/index.tsx @@ -123,7 +123,7 @@ export function getScrollParent( return document.body } -export { useDynamicPositioning } from './LexicalMenu' +export { useDynamicPositioning } from './LexicalMenu.js' export type TypeaheadMenuPluginProps = { anchorClassName?: string diff --git a/packages/richtext-lexical/src/generateComponentMap.tsx b/packages/richtext-lexical/src/generateComponentMap.tsx index 08d59a9f1..37cd9e523 100644 --- a/packages/richtext-lexical/src/generateComponentMap.tsx +++ b/packages/richtext-lexical/src/generateComponentMap.tsx @@ -4,8 +4,8 @@ import { mapFields } from '@payloadcms/ui/utilities' import { sanitizeFields } from 'payload/config' import React from 'react' -import type { ResolvedServerFeatureMap } from './field/features/types' -import type { GeneratedFeatureProviderComponent } from './types' +import type { ResolvedServerFeatureMap } from './field/features/types.js' +import type { GeneratedFeatureProviderComponent } from './types.js' export const getGenerateComponentMap = (args: { diff --git a/packages/richtext-lexical/src/validate/validateNodes.ts b/packages/richtext-lexical/src/validate/validateNodes.ts index 0e6b357a4..c4b34b2d4 100644 --- a/packages/richtext-lexical/src/validate/validateNodes.ts +++ b/packages/richtext-lexical/src/validate/validateNodes.ts @@ -1,7 +1,7 @@ import type { SerializedEditorState, SerializedLexicalNode } from 'lexical' import type { RichTextField, ValidateOptions } from 'payload/types' -import type { NodeValidation } from '../field/features/types' +import type { NodeValidation } from '../field/features/types.js' export async function validateNodes({ nodeValidations, From 304cf9d797a901646df0369b3479d3887eb3510a Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Mar 2024 14:49:57 -0500 Subject: [PATCH 19/21] chore: proper tsconfig --- tsconfig.json | 85 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 20 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 4dcc51dc9..3d881240e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,11 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "jsx": "preserve", - "lib": ["dom", "dom.iterable", "esnext"], + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], "noEmit": true, "outDir": "./dist", "resolveJsonModule": true, @@ -18,7 +22,11 @@ "skipLibCheck": true, "sourceMap": true, "strict": false, - "types": ["jest", "node", "@types/jest"], + "types": [ + "jest", + "node", + "@types/jest" + ], "incremental": true, "isolatedModules": true, "plugins": [ @@ -27,28 +35,65 @@ } ], "paths": { - "payload": ["./packages/payload/src"], - "payload/*": ["./packages/payload/src/exports/*"], - "@payloadcms/db-mongodb": ["./packages/db-mongodb/src"], - "@payloadcms/richtext-lexical": ["./packages/richtext-lexical/src"], - "@payloadcms/plugin-cloud": ["./packages/plugin-cloud/src"], - "@payloadcms/plugin-cloud-storage": ["./packages/plugin-cloud-storage/src"], - "@payloadcms/ui": ["./packages/ui/src/exports/index.ts"], - "@payloadcms/ui/*": ["./packages/ui/src/exports/*"], - "@payloadcms/ui/scss": ["./packages/ui/src/scss/styles.scss"], - "@payloadcms/ui/scss/app.scss": ["./packages/ui/src/scss/app.scss"], - "@payloadcms/translations": ["./packages/translations/src/exports/index.ts"], + "payload": [ + "./packages/payload/src" + ], + "payload/*": [ + "./packages/payload/src/exports/*" + ], + "@payloadcms/db-mongodb": [ + "./packages/db-mongodb/src" + ], + "@payloadcms/richtext-lexical": [ + "./packages/richtext-lexical/src" + ], + "@payloadcms/plugin-cloud": [ + "./packages/plugin-cloud/src" + ], + "@payloadcms/plugin-cloud-storage": [ + "./packages/plugin-cloud-storage/src" + ], + "@payloadcms/ui": [ + "./packages/ui/src/exports/index.ts" + ], + "@payloadcms/ui/*": [ + "./packages/ui/src/exports/*" + ], + "@payloadcms/ui/scss": [ + "./packages/ui/src/scss/styles.scss" + ], + "@payloadcms/ui/scss/app.scss": [ + "./packages/ui/src/scss/app.scss" + ], + "@payloadcms/translations": [ + "./packages/translations/src/exports/index.ts" + ], "@payloadcms/translations/client": [ "./packages/translations/src/_generatedFiles_/client/index.ts" ], - "@payloadcms/translations/api": ["./packages/translations/src/_generatedFiles_/api/index.ts"], - "@payloadcms/next/*": ["./packages/next/src/*"], - "@payloadcms/next": ["./packages/next/src/exports/*"], - "@payloadcms/graphql": ["./packages/graphql/src"], - "@payload-config": ["./test/_community/config.ts"] + "@payloadcms/translations/api": [ + "./packages/translations/src/_generatedFiles_/api/index.ts" + ], + "@payloadcms/next/*": [ + "./packages/next/src/*" + ], + "@payloadcms/next": [ + "./packages/next/src/exports/*" + ], + "@payloadcms/graphql": [ + "./packages/graphql/src" + ], + "@payload-config": [ + "./test/_community/config.ts" + ] } }, - "exclude": ["dist", "build", "temp", "node_modules"], + "exclude": [ + "dist", + "build", + "temp", + "node_modules" + ], "composite": true, "references": [ { @@ -116,4 +161,4 @@ "app/**/*.tsx", "scripts/**/*.ts" ] -} +} \ No newline at end of file From b2219d879f99e356748b2ae78233fd98f1098d47 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Mar 2024 14:52:07 -0500 Subject: [PATCH 20/21] chore: fixes package compat --- packages/payload/src/fields/baseFields/baseIDField.ts | 2 +- packages/payload/src/utilities/telemetry/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/payload/src/fields/baseFields/baseIDField.ts b/packages/payload/src/fields/baseFields/baseIDField.ts index 9d7c34048..b56ff9428 100644 --- a/packages/payload/src/fields/baseFields/baseIDField.ts +++ b/packages/payload/src/fields/baseFields/baseIDField.ts @@ -3,7 +3,7 @@ import ObjectId from 'bson-objectid' import type { Field, FieldHook } from '../config/types.d.ts' const generateID: FieldHook = ({ operation, value }) => - (operation !== 'create' ? value : false) || new ObjectId().toHexString() + (operation !== 'create' ? value : false) || new ObjectId.default().toHexString() export const baseIDField: Field = { name: 'id', diff --git a/packages/payload/src/utilities/telemetry/index.ts b/packages/payload/src/utilities/telemetry/index.ts index f959e75fe..0017ee242 100644 --- a/packages/payload/src/utilities/telemetry/index.ts +++ b/packages/payload/src/utilities/telemetry/index.ts @@ -61,7 +61,7 @@ export const sendEvent = async ({ event, payload }: Args): Promise => { * generated from random data and completely anonymous. */ const getEnvID = (): string => { - const conf = new Conf() + const conf = new Conf.default() const ENV_ID = 'envID' const val = conf.get(ENV_ID) From 0c032d69eecd3e2cea1397184ed1af99a91d9325 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Mar 2024 15:00:33 -0500 Subject: [PATCH 21/21] chore: ui and next now build w/ bundler specification --- packages/db-mongodb/src/queries/buildSearchParams.ts | 4 +++- packages/graphql/src/resolvers/auth/login.ts | 2 +- packages/graphql/src/resolvers/auth/refresh.ts | 2 +- packages/graphql/src/resolvers/auth/resetPassword.ts | 2 +- packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts | 2 +- packages/graphql/src/utilities/wrapCustomResolver.ts | 4 ++-- packages/next/tsconfig.json | 3 +++ packages/ui/tsconfig.json | 3 +++ 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/db-mongodb/src/queries/buildSearchParams.ts b/packages/db-mongodb/src/queries/buildSearchParams.ts index 6553e2efa..9443d7fad 100644 --- a/packages/db-mongodb/src/queries/buildSearchParams.ts +++ b/packages/db-mongodb/src/queries/buildSearchParams.ts @@ -204,7 +204,9 @@ export async function buildSearchParam({ if (typeof formattedValue === 'string') { if (mongoose.Types.ObjectId.isValid(formattedValue)) { - result.value.$or.push({ [path]: { [operatorKey]: new ObjectId(formattedValue) } }) + result.value.$or.push({ + [path]: { [operatorKey]: new ObjectId.default(formattedValue) }, + }) } else { ;(Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]).forEach( (relationTo) => { diff --git a/packages/graphql/src/resolvers/auth/login.ts b/packages/graphql/src/resolvers/auth/login.ts index ef97c82b7..490f9729f 100644 --- a/packages/graphql/src/resolvers/auth/login.ts +++ b/packages/graphql/src/resolvers/auth/login.ts @@ -5,7 +5,7 @@ import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' import type { Context } from '../types.d.ts' -function loginResolver(collection: Collection) { +function loginResolver(collection: Collection): any { async function resolver(_, args, context: Context) { const options = { collection, diff --git a/packages/graphql/src/resolvers/auth/refresh.ts b/packages/graphql/src/resolvers/auth/refresh.ts index 37a92d015..0f14c5228 100644 --- a/packages/graphql/src/resolvers/auth/refresh.ts +++ b/packages/graphql/src/resolvers/auth/refresh.ts @@ -5,7 +5,7 @@ import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' import type { Context } from '../types.d.ts' -function refreshResolver(collection: Collection) { +function refreshResolver(collection: Collection): any { async function resolver(_, args, context: Context) { let token diff --git a/packages/graphql/src/resolvers/auth/resetPassword.ts b/packages/graphql/src/resolvers/auth/resetPassword.ts index dcbafcbd2..fd1c018a2 100644 --- a/packages/graphql/src/resolvers/auth/resetPassword.ts +++ b/packages/graphql/src/resolvers/auth/resetPassword.ts @@ -5,7 +5,7 @@ import type { Collection } from 'payload/types' import { isolateObjectProperty } from 'payload/utilities' import type { Context } from '../types.d.ts' -function resetPasswordResolver(collection: Collection) { +function resetPasswordResolver(collection: Collection): any { async function resolver(_, args, context: Context) { if (args.locale) context.req.locale = args.locale if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale diff --git a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts index 7e46752f6..99d95af0c 100644 --- a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts +++ b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts @@ -96,7 +96,7 @@ const fieldToSchemaMap = ({ nestedFieldName, parentName }: Args): any => ({ ), }), }, - value: { type: GraphQLJSON }, + value: { type: GraphQLJSON.default }, }, }), } diff --git a/packages/graphql/src/utilities/wrapCustomResolver.ts b/packages/graphql/src/utilities/wrapCustomResolver.ts index 2d5883009..93a915d41 100644 --- a/packages/graphql/src/utilities/wrapCustomResolver.ts +++ b/packages/graphql/src/utilities/wrapCustomResolver.ts @@ -1,5 +1,5 @@ -import type { ObjMap } from 'graphql/jsutils/ObjMap' -import type { GraphQLFieldConfig, GraphQLFieldResolver } from 'graphql/type/definition' +import type { ObjMap } from 'graphql/jsutils/ObjMap.js' +import type { GraphQLFieldConfig, GraphQLFieldResolver } from 'graphql/type/definition.js' import type { PayloadRequest } from 'payload/types' diff --git a/packages/next/tsconfig.json b/packages/next/tsconfig.json index 04e09bb65..2e3855ae1 100644 --- a/packages/next/tsconfig.json +++ b/packages/next/tsconfig.json @@ -8,6 +8,9 @@ "rootDir": "./src" /* Specify the root folder within your source files. */, "allowImportingTsExtensions": true, "sourceMap": true, + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "Bundler", "paths": { "@payloadcms/ui": ["../ui/src/exports/index.ts"], "@payloadcms/ui/*": ["../ui/src/exports/*"], diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index 726a01c8e..c667f8b1c 100644 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -4,6 +4,9 @@ "composite": true, // Make sure typescript knows that this module depends on their references "noEmit": false /* Do not emit outputs. */, "emitDeclarationOnly": true, + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "Bundler", "esModuleInterop": true, "outDir": "./dist" /* Specify an output folder for all emitted files. */, "rootDir": "./src" /* Specify the root folder within your source files. */