diff --git a/next.config.mjs b/next.config.mjs index 8d3f99c..7ec4bd8 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,4 +1,4 @@ -import { withPayload } from '@payloadcms/next' +import { withPayload } from '@payloadcms/next/withPayload' /** @type {import('next').NextConfig} */ const nextConfig = { diff --git a/package.json b/package.json index 69f5238..aefc89a 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,16 @@ "node": ">=18.19.0" }, "dependencies": { - "@payloadcms/db-mongodb": "3.0.0-beta.0", - "@payloadcms/db-postgres": "3.0.0-beta.0", - "@payloadcms/next": "3.0.0-beta.0", - "@payloadcms/richtext-lexical": "3.0.0-beta.0", - "@payloadcms/richtext-slate": "3.0.0-beta.0", - "@payloadcms/translations": "3.0.0-beta.0", - "@payloadcms/ui": "3.0.0-beta.0", + "@payloadcms/db-mongodb": "3.0.0-beta.2", + "@payloadcms/db-postgres": "3.0.0-beta.2", + "@payloadcms/next": "3.0.0-beta.2", + "@payloadcms/richtext-lexical": "3.0.0-beta.2", + "@payloadcms/richtext-slate": "3.0.0-beta.2", + "@payloadcms/translations": "3.0.0-beta.2", + "@payloadcms/ui": "3.0.0-beta.2", "cross-env": "^7.0.3", "next": "14.2.0-canary.23", - "payload": "3.0.0-beta.0", + "payload": "3.0.0-beta.2", "react": "^18.2.0", "react-dom": "^18.2.0", "sharp": "0.32.6" diff --git a/payload.config.ts b/payload.config.ts index fb250a2..6d826d0 100644 --- a/payload.config.ts +++ b/payload.config.ts @@ -1,6 +1,6 @@ import path from 'path' // import { postgresAdapter } from '@payloadcms/db-postgres' -import { en } from '@payloadcms/translations/languages/en' +import { en } from 'payload/i18n/en' import { AlignFeature, BlockQuoteFeature, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8fcca0b..d775c7c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,26 +6,26 @@ settings: dependencies: '@payloadcms/db-mongodb': - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0(payload@3.0.0-beta.0) + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2(payload@3.0.0-beta.2) '@payloadcms/db-postgres': - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0(@types/react@18.2.74)(payload@3.0.0-beta.0)(react@18.2.0) + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2(@types/react@18.2.74)(payload@3.0.0-beta.2)(react@18.2.0) '@payloadcms/next': - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0(@types/react@18.2.74)(http-status@1.6.2)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2(@types/react@18.2.74)(http-status@1.6.2)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) '@payloadcms/richtext-lexical': - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0(@lexical/clipboard@0.13.1)(@payloadcms/next@3.0.0-beta.0)(@payloadcms/translations@3.0.0-beta.0)(@payloadcms/ui@3.0.0-beta.0)(payload@3.0.0-beta.0)(typescript@5.4.4)(yjs@13.6.14) + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2(@lexical/clipboard@0.13.1)(@payloadcms/next@3.0.0-beta.2)(@payloadcms/translations@3.0.0-beta.2)(@payloadcms/ui@3.0.0-beta.2)(payload@3.0.0-beta.2)(typescript@5.4.4)(yjs@13.6.14) '@payloadcms/richtext-slate': - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0(@payloadcms/translations@3.0.0-beta.0)(@payloadcms/ui@3.0.0-beta.0)(payload@3.0.0-beta.0)(react-dom@18.2.0) + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2(@payloadcms/translations@3.0.0-beta.2)(@payloadcms/ui@3.0.0-beta.2)(payload@3.0.0-beta.2)(react-dom@18.2.0) '@payloadcms/translations': - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0 + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2 '@payloadcms/ui': - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -33,8 +33,8 @@ dependencies: specifier: 14.2.0-canary.23 version: 14.2.0-canary.23(react-dom@18.2.0)(react@18.2.0) payload: - specifier: 3.0.0-beta.0 - version: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + specifier: 3.0.0-beta.2 + version: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) react: specifier: ^18.2.0 version: 18.2.0 @@ -1903,10 +1903,10 @@ packages: fastq: 1.17.1 dev: true - /@payloadcms/db-mongodb@3.0.0-beta.0(payload@3.0.0-beta.0): - resolution: {integrity: sha512-6yDdT49mK7PRxaz7GW8vu2O6Kb9nYJCYgOAvT+w14R+muDeviut8MsfKTosZDoxVVvQ3dj17k/t5iJ9zrrmm7Q==} + /@payloadcms/db-mongodb@3.0.0-beta.2(payload@3.0.0-beta.2): + resolution: {integrity: sha512-ti1KGTvEEqw3Wu2ac0821ZUNPeL/KXVNOXiX9JG5qA/YPDNeW1MqqUqqYIbpCziLs6FYm++hUReZ9BylLcQDTg==} peerDependencies: - payload: 3.0.0-beta.0 + payload: 3.0.0-beta.2 dependencies: bson-objectid: 2.0.4 deepmerge: 4.3.1 @@ -1914,7 +1914,7 @@ packages: http-status: 1.6.2 mongoose: 6.12.3 mongoose-paginate-v2: 1.7.22 - payload: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + payload: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) prompts: 2.4.2 uuid: 9.0.0 transitivePeerDependencies: @@ -1922,16 +1922,16 @@ packages: - supports-color dev: false - /@payloadcms/db-postgres@3.0.0-beta.0(@types/react@18.2.74)(payload@3.0.0-beta.0)(react@18.2.0): - resolution: {integrity: sha512-sMe0qpRnyCl1LbZUtNWy5srT8CktPjkVSdGYknMjX/imga4ZlRxSyla79+34MlXxQtkP7L65fICHV451oUDfDA==} + /@payloadcms/db-postgres@3.0.0-beta.2(@types/react@18.2.74)(payload@3.0.0-beta.2)(react@18.2.0): + resolution: {integrity: sha512-DvkuUlSmIZqgd3WlbRiU80FIK6W6FEyshJj+gLKC0Ukt1GNrXujFu6n5NZhdY+lHEH+ix5fWsz/aoB1zYRXg4A==} peerDependencies: - payload: 3.0.0-beta.0 + payload: 3.0.0-beta.2 dependencies: '@libsql/client': 0.5.6 console-table-printer: 2.11.2 drizzle-kit: 0.20.14-1f2c838 drizzle-orm: 0.29.4(@libsql/client@0.5.6)(@types/react@18.2.74)(pg@8.11.3)(react@18.2.0) - payload: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + payload: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) pg: 8.11.3 prompts: 2.4.2 to-snake-case: 1.0.0 @@ -1964,10 +1964,10 @@ packages: - utf-8-validate dev: false - /@payloadcms/graphql@3.0.0-beta.0(payload@3.0.0-beta.0): - resolution: {integrity: sha512-hSvymeRkbvKcm7KrHI9+FXyMpkyCmWQB8HcsklqEgzClkldMDMccAPoRs2XIIcraX2yFHOPShuf3NjQItVNJtA==} + /@payloadcms/graphql@3.0.0-beta.2(payload@3.0.0-beta.2): + resolution: {integrity: sha512-5BjIrN2cJS04pPoeBRgeANcjfq0e4ESSSs3w8sY/m6wD4HOfRSf6GHGx8bmnVIsUpVh6Lo5aRJ9tcMrqEvxGCA==} peerDependencies: - payload: 3.0.0-beta.0 + payload: 3.0.0-beta.2 dependencies: graphql: 16.8.1 graphql-http: 1.22.0(graphql@16.8.1) @@ -1975,22 +1975,22 @@ packages: graphql-query-complexity: 0.12.0(graphql@16.8.1) graphql-scalars: 1.22.2(graphql@16.8.1) graphql-type-json: 0.3.2(graphql@16.8.1) - payload: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + payload: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) pluralize: 8.0.0 dev: false - /@payloadcms/next@3.0.0-beta.0(@types/react@18.2.74)(http-status@1.6.2)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0): - resolution: {integrity: sha512-xHdrYsIjx1xc6t6ZZAKvBXlLV5Y7jKRQOv1tR7L2BIgjZ0bA4hHIxLhMAnT8iUjoYyRtw0W+8VxfssEdeoDQfA==} + /@payloadcms/next@3.0.0-beta.2(@types/react@18.2.74)(http-status@1.6.2)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0): + resolution: {integrity: sha512-Dy1+qpnY2KZj7R7iioOlL6JyrR/TasyRWEpsBZnOgppGCsj56jKuZZMQKmYdCmdAJvzPC2X5l8z7HWcpRyNtRQ==} engines: {node: '>=18.17.0'} peerDependencies: http-status: 1.6.2 next: 14.2.0-canary.23 - payload: 3.0.0-beta.0 + payload: 3.0.0-beta.2 dependencies: '@dnd-kit/core': 6.0.8(react-dom@18.2.0)(react@18.2.0) - '@payloadcms/graphql': 3.0.0-beta.0(payload@3.0.0-beta.0) - '@payloadcms/translations': 3.0.0-beta.0 - '@payloadcms/ui': 3.0.0-beta.0(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) + '@payloadcms/graphql': 3.0.0-beta.2(payload@3.0.0-beta.2) + '@payloadcms/translations': 3.0.0-beta.2 + '@payloadcms/ui': 3.0.0-beta.2(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) '@types/busboy': 1.5.3 busboy: 1.6.0 deep-equal: 2.2.2 @@ -2000,7 +2000,7 @@ packages: http-status: 1.6.2 next: 14.2.0-canary.23(react-dom@18.2.0)(react@18.2.0) path-to-regexp: 6.2.1 - payload: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + payload: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) qs: 6.11.2 react-diff-viewer-continued: 3.2.6(react-dom@18.2.0)(react@18.2.0) react-toastify: 8.2.0(react-dom@18.2.0)(react@18.2.0) @@ -2017,14 +2017,14 @@ packages: - utf-8-validate dev: false - /@payloadcms/richtext-lexical@3.0.0-beta.0(@lexical/clipboard@0.13.1)(@payloadcms/next@3.0.0-beta.0)(@payloadcms/translations@3.0.0-beta.0)(@payloadcms/ui@3.0.0-beta.0)(payload@3.0.0-beta.0)(typescript@5.4.4)(yjs@13.6.14): - resolution: {integrity: sha512-imPeuxGG2PbpXRODx39tguv2ZztVfv1icXmEI+UdhI9ZYawrLTSQoWrr2hB4POrugrj3I0Mdkc7JUMDs7FnMBg==} + /@payloadcms/richtext-lexical@3.0.0-beta.2(@lexical/clipboard@0.13.1)(@payloadcms/next@3.0.0-beta.2)(@payloadcms/translations@3.0.0-beta.2)(@payloadcms/ui@3.0.0-beta.2)(payload@3.0.0-beta.2)(typescript@5.4.4)(yjs@13.6.14): + resolution: {integrity: sha512-KIkR0C226P0EuLUw1SKyqsBATCjVyMLcZ8huCwwUJAvBteRA5jR1qF+bZsysIRe7j61IoAJeVy0vB2hFXUT1QA==} engines: {node: '>=18.17.0'} peerDependencies: - '@payloadcms/next': 3.0.0-beta.0 - '@payloadcms/translations': 3.0.0-beta.0 - '@payloadcms/ui': 3.0.0-beta.0 - payload: 3.0.0-beta.0 + '@payloadcms/next': 3.0.0-beta.2 + '@payloadcms/translations': 3.0.0-beta.2 + '@payloadcms/ui': 3.0.0-beta.2 + payload: 3.0.0-beta.2 dependencies: '@faceless-ui/modal': 2.0.2(react-dom@18.2.0)(react@18.2.0) '@lexical/headless': 0.13.1(lexical@0.13.1) @@ -2036,16 +2036,16 @@ packages: '@lexical/rich-text': 0.13.1(@lexical/clipboard@0.13.1)(@lexical/selection@0.13.1)(@lexical/utils@0.13.1)(lexical@0.13.1) '@lexical/selection': 0.13.1(lexical@0.13.1) '@lexical/utils': 0.13.1(lexical@0.13.1) - '@payloadcms/next': 3.0.0-beta.0(@types/react@18.2.74)(http-status@1.6.2)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) - '@payloadcms/translations': 3.0.0-beta.0 - '@payloadcms/ui': 3.0.0-beta.0(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) + '@payloadcms/next': 3.0.0-beta.2(@types/react@18.2.74)(http-status@1.6.2)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) + '@payloadcms/translations': 3.0.0-beta.2 + '@payloadcms/ui': 3.0.0-beta.2(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) bson-objectid: 2.0.4 classnames: 2.5.1 deep-equal: 2.2.3 json-schema: 0.4.0 lexical: 0.13.1 lodash: 4.17.21 - payload: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + payload: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-error-boundary: 4.0.12(react@18.2.0) @@ -2056,19 +2056,19 @@ packages: - yjs dev: false - /@payloadcms/richtext-slate@3.0.0-beta.0(@payloadcms/translations@3.0.0-beta.0)(@payloadcms/ui@3.0.0-beta.0)(payload@3.0.0-beta.0)(react-dom@18.2.0): - resolution: {integrity: sha512-/PBumei+3OAdHln/I0M7ukyiTCx7ZcQ0rytrPtHirOTD/+E+9zL/6iMTxRkDwnCxZaijnnR2ng6mEp2CiR3Kcg==} + /@payloadcms/richtext-slate@3.0.0-beta.2(@payloadcms/translations@3.0.0-beta.2)(@payloadcms/ui@3.0.0-beta.2)(payload@3.0.0-beta.2)(react-dom@18.2.0): + resolution: {integrity: sha512-JH+HYCe6WayTrnZthlzx5PWav/p02VvDmbbbvagJ4w3q9VmRY6VITr978PrldN0ZscWEJqIBzd5+IY/DiObGvA==} engines: {node: '>=18.17.0'} peerDependencies: - '@payloadcms/translations': 3.0.0-beta.0 - '@payloadcms/ui': 3.0.0-beta.0 - payload: 3.0.0-beta.0 + '@payloadcms/translations': 3.0.0-beta.2 + '@payloadcms/ui': 3.0.0-beta.2 + payload: 3.0.0-beta.2 dependencies: '@faceless-ui/modal': 2.0.2(react-dom@18.2.0)(react@18.2.0) - '@payloadcms/translations': 3.0.0-beta.0 - '@payloadcms/ui': 3.0.0-beta.0(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) + '@payloadcms/translations': 3.0.0-beta.2 + '@payloadcms/ui': 3.0.0-beta.2(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0) is-hotkey: 0.2.0 - payload: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + payload: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) react: 18.2.0 slate: 0.91.4 slate-history: 0.86.0(slate@0.91.4) @@ -2078,16 +2078,16 @@ packages: - react-dom dev: false - /@payloadcms/translations@3.0.0-beta.0: - resolution: {integrity: sha512-5dZd3JzAoTvXMrTvs5BhVR/FL7wlR7yCx18DUjObXbU+p2wFMtQe1h8Y8JlKjNM964lcgfWuu2FkzwCC4XCq4w==} + /@payloadcms/translations@3.0.0-beta.2: + resolution: {integrity: sha512-E5SK9qVtNCIANOOxR9pAR/G039UYs5qnD5DRmQHd63w566730+Adrljsv4OzREMN/+b4Rm9ImMFdT+tRxxmxyg==} dev: false - /@payloadcms/ui@3.0.0-beta.0(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.0)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0): - resolution: {integrity: sha512-rxXG7cQneGP+QSrN4pk332AuIcAjnIFFIIgAfE/HuDJBEBTPDM8cBLzzCDtSqzHAoHb9h+41lkERUPJMo4bisA==} + /@payloadcms/ui@3.0.0-beta.2(@types/react@18.2.74)(monaco-editor@0.47.0)(next@14.2.0-canary.23)(payload@3.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.23.0): + resolution: {integrity: sha512-JMJ5HHfA1duc2oksgSOI+tsquI1Pi4mCxFhomecZFmWoHezad9qBNeYAajPnF0qjGt0j5Awhz/lK7jG/O4pI+Q==} engines: {node: '>=18.17.0'} peerDependencies: next: 14.2.0-canary.23 - payload: 3.0.0-beta.0 + payload: 3.0.0-beta.2 react: ^18.0.0 dependencies: '@dnd-kit/core': 6.0.8(react-dom@18.2.0)(react@18.2.0) @@ -2096,7 +2096,7 @@ packages: '@faceless-ui/scroll-info': 1.3.0(react-dom@18.2.0)(react@18.2.0) '@faceless-ui/window-info': 2.1.2(react-dom@18.2.0)(react@18.2.0) '@monaco-editor/react': 4.5.1(monaco-editor@0.47.0)(react-dom@18.2.0)(react@18.2.0) - '@payloadcms/translations': 3.0.0-beta.0 + '@payloadcms/translations': 3.0.0-beta.2 body-scroll-lock: 4.0.0-beta.0 bson-objectid: 2.0.4 date-fns: 3.3.1 @@ -2105,7 +2105,7 @@ packages: md5: 2.3.0 next: 14.2.0-canary.23(react-dom@18.2.0)(react@18.2.0) object-to-formdata: 4.5.1 - payload: 3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6) + payload: 3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6) qs: 6.11.2 react: 18.2.0 react-animate-height: 2.1.2(react-dom@18.2.0)(react@18.2.0) @@ -6020,12 +6020,12 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - /payload@3.0.0-beta.0(@swc/core@1.4.12)(@swc/types@0.1.6): - resolution: {integrity: sha512-E9F90N/I6VZxA4nWxUkMHE3v71DmpNFvILtI4mR0t3uDd8SRzEUckBpMWWvFqMCq3N9kCWQPj4AMlm+nb4PHpw==} + /payload@3.0.0-beta.2(@swc/core@1.4.12)(@swc/types@0.1.6): + resolution: {integrity: sha512-WqlR3D0gEVOlV8pdvKp+liq+QpPDRfZidVuzORmrAwtoOeA3lKW9yg0kY/j+uxUY14yhMA5PpkaGBM8rCpsNqQ==} engines: {node: '>=18.17.0'} hasBin: true dependencies: - '@payloadcms/translations': 3.0.0-beta.0 + '@payloadcms/translations': 3.0.0-beta.2 '@swc-node/core': 1.13.0(@swc/core@1.4.12)(@swc/types@0.1.6) '@swc-node/sourcemap-support': 0.5.0 '@types/probe-image-size': 7.2.4