From 05363f61b558085d1150288d21a74f702fff3d6b Mon Sep 17 00:00:00 2001 From: James Date: Thu, 7 Mar 2024 19:00:06 -0500 Subject: [PATCH] chore: bumps deps --- README.md | 6 ++-- package.json | 14 ++++---- payload.config.ts | 16 ++++++--- yarn.lock | 82 +++++++++++++++++++++++------------------------ 4 files changed, 63 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 75b43ae..b7e5d1c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repo showcases a demo of Payload 3.0 running completely within Next.js. > [!IMPORTANT] > It's extremely important to note that as of now, this demo contains ALPHA software and you are 100% guaranteed to run into bugs / weird stuff. -> +> > We're actively working toward a beta release, and then a full stable release as fast as we possibly can. ### Highlights @@ -63,7 +63,9 @@ You'll see that Payload requires a few files to be present in your `/app` folder You'll see in the Next.js config that we have a `withPayload` function installed. This function is required for Payload to operate, and it ensures compatibility with packages that Payload needs such as `drizzle-kit`, `sharp`, `pino`, and `mongodb`. ---- +**Using a TypeScript alias to point to your Payload config** + +In the `tsconfig.json` within this repo, you'll see that we have `paths` set up to point `@payload-config` to the Payload config, which is located in the root. You can put your config wherever you want. By default, the `page.tsx` files and `route.ts` files within the `/app` folder use this alias. In the future, we might make it optional to use `paths` - and by default, we might just hard-code relative path imports to the config. We would like to hear your feedback on this part. What do you prefer? Use `paths` or just use relative imports? --- diff --git a/package.json b/package.json index cdccaba..b17049f 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,14 @@ "lint": "next lint" }, "dependencies": { - "@payloadcms/db-mongodb": "3.0.0-alpha.32", - "@payloadcms/db-postgres": "^3.0.0-alpha.32", - "@payloadcms/next": "3.0.0-alpha.32", - "@payloadcms/richtext-lexical": "3.0.0-alpha.32", - "@payloadcms/richtext-slate": "3.0.0-alpha.32", - "@payloadcms/ui": "3.0.0-alpha.32", + "@payloadcms/db-mongodb": "3.0.0-alpha.33", + "@payloadcms/db-postgres": "^3.0.0-alpha.33", + "@payloadcms/next": "3.0.0-alpha.33", + "@payloadcms/richtext-lexical": "3.0.0-alpha.33", + "@payloadcms/richtext-slate": "3.0.0-alpha.33", + "@payloadcms/ui": "3.0.0-alpha.33", "next": "^14.2.0-canary.7", - "payload": "3.0.0-alpha.32", + "payload": "3.0.0-alpha.33", "react": "^18", "react-dom": "^18", "sharp": "0.32.6" diff --git a/payload.config.ts b/payload.config.ts index 65c50d8..6f57d61 100644 --- a/payload.config.ts +++ b/payload.config.ts @@ -1,8 +1,8 @@ import path from "path"; // import { postgresAdapter } from '@payloadcms/db-postgres' -// import { lexicalEditor } from '@payloadcms/richtext-lexical' -import { slateEditor } from '@payloadcms/richtext-slate' -import { mongooseAdapter } from "@payloadcms/db-mongodb"; // database-adapter-import +import { lexicalEditor } from '@payloadcms/richtext-lexical' +// import { slateEditor } from '@payloadcms/richtext-slate' +import { mongooseAdapter } from "@payloadcms/db-mongodb"; import { buildConfig } from "payload/config"; import sharp from 'sharp' import { fileURLToPath } from "url"; @@ -11,8 +11,8 @@ const filename = fileURLToPath(import.meta.url) const dirname = path.dirname(filename) export default buildConfig({ - // editor: lexicalEditor({}), - editor: slateEditor({}), + editor: lexicalEditor({}), + // editor: slateEditor({}), collections: [ { slug: 'pages', @@ -69,5 +69,11 @@ export default buildConfig({ }) } }, + // Sharp is now an optional dependency - + // if you want to resize images, crop, set focal point, etc. + // make sure to install it and pass it to the config. + + // This is temporary - we may make an adapter pattern + // for this before reaching 3.0 stable sharp, }); diff --git a/yarn.lock b/yarn.lock index e27ee29..cfe6626 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1403,10 +1403,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@payloadcms/db-mongodb@3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/db-mongodb/-/db-mongodb-3.0.0-alpha.32.tgz#61aada23a6f2cf93473bc9afb958e49c72166e3f" - integrity sha512-07BXsafjigqotkOwNohntsgiYK+5KI3qtP5UJFeOFFWg6MNSmSPiu0fHZupgzSabYCmu7xQ4RKlRsoHcPoepGw== +"@payloadcms/db-mongodb@3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/db-mongodb/-/db-mongodb-3.0.0-alpha.33.tgz#5422082385f5007e62380829a41f49576285a597" + integrity sha512-mmjmk5vVPgTPqj2H8vDsPzjUEwtisr/67dpXGJVRIRApnr5TwPITViapbFPpBBtg8OVq8x73qNogTwcFnYeeVQ== dependencies: bson-objectid "2.0.4" deepmerge "4.3.1" @@ -1418,10 +1418,10 @@ prompts "2.4.2" uuid "9.0.0" -"@payloadcms/db-postgres@^3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/db-postgres/-/db-postgres-3.0.0-alpha.32.tgz#e7e29b6cd9119dc5f4eb27f7dd98890a84019eda" - integrity sha512-Uv2IzIn2F0gQ32TtdzgniTDXg3DB05ohe3WJY/7fNIEobEHqvn8Nlk7KWaR3k/1y/ihiEPF+LYfa/3CWOruf1A== +"@payloadcms/db-postgres@^3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/db-postgres/-/db-postgres-3.0.0-alpha.33.tgz#b6e1b80aed8c4d041f4c008977f9b043c6aef182" + integrity sha512-ZJZdr1ACs2bJYcYPr71DBk8fyfYGJyroyqXLye4v4ZvcgOQescwfFyHbRns1JFh7AcyU6cm+OcGYgzgORRP/2Q== dependencies: "@libsql/client" "^0.5.2" console-table-printer "2.11.2" @@ -1432,10 +1432,10 @@ to-snake-case "1.0.0" uuid "9.0.0" -"@payloadcms/graphql@3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/graphql/-/graphql-3.0.0-alpha.32.tgz#9ed36b4a6e04430acc0b29307ae7ec9425678b95" - integrity sha512-joTC9NYokaSKng0YUWQk2ei5eg1dmyzCwNsEvY6vlBCDeBgm8g0wYcF1kp+40e43044+QXeSeVXvoOXP/AVhLA== +"@payloadcms/graphql@3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/graphql/-/graphql-3.0.0-alpha.33.tgz#3693abdca5624a4a26a00c5df66f8ffa15bc3007" + integrity sha512-AUtpEJme9qxMwZAL97X6mc1YXFUaQh8OEVoKchwVDpmeOUeyCIGWQgOZFImk5ruuaHh4Bn/5Y+h9gfRM4a8wcw== dependencies: graphql "16.8.1" graphql-http "^1.22.0" @@ -1445,15 +1445,15 @@ graphql-type-json "0.3.2" pluralize "8.0.0" -"@payloadcms/next@3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/next/-/next-3.0.0-alpha.32.tgz#7fcfc5158505dad0df029c1b9f5f39739ec3c6f4" - integrity sha512-U62No+Y0EKqewqPnUOczKI+Y2VSrZy7UbVunvzMGdpj/aCNRHL0hATVtY0DEsas26OF0WL/H+vfwON9mtHs6+g== +"@payloadcms/next@3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/next/-/next-3.0.0-alpha.33.tgz#7a49cf85a6064b1811a3c034503c5985ccfbe55c" + integrity sha512-ZlBZybfuNw+pqFV1feOqYZhza8W6QbN+UMLK7wQ8TYeNoIlhyral2OUTuACuYEPPhG4jqLLCUGTyhWNkE5tIIw== dependencies: "@dnd-kit/core" "6.0.8" - "@payloadcms/graphql" "3.0.0-alpha.32" - "@payloadcms/translations" "3.0.0-alpha.32" - "@payloadcms/ui" "3.0.0-alpha.32" + "@payloadcms/graphql" "3.0.0-alpha.33" + "@payloadcms/translations" "3.0.0-alpha.33" + "@payloadcms/ui" "3.0.0-alpha.33" "@types/busboy" "^1.5.3" busboy "^1.6.0" deep-equal "2.2.2" @@ -1467,10 +1467,10 @@ sass "^1.71.1" ws "^8.16.0" -"@payloadcms/richtext-lexical@3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/richtext-lexical/-/richtext-lexical-3.0.0-alpha.32.tgz#838606facf2a75982d449871f0ffdb3830363890" - integrity sha512-scdCWZ4a/gGFqz0ck+5ICNvyZwPIwBLCcN7Vr8JM4Gu4sADkz6l4tEAcdTLJ1/77wCryjEhXkMlUNDRgieyjUQ== +"@payloadcms/richtext-lexical@3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/richtext-lexical/-/richtext-lexical-3.0.0-alpha.33.tgz#27ce174a3b7fd2a3ee8355e29bcc95a45b585af5" + integrity sha512-JnYmkcCQGQiuebmanSm2I9gznyoqKR56Rgv3wkwjeD8tXYjD+QO+TgS9zTKugkzOrYowRZNtb+tJtREJJwek3w== dependencies: "@faceless-ui/modal" "2.0.2" "@lexical/headless" "0.13.1" @@ -1493,10 +1493,10 @@ react-error-boundary "4.0.12" ts-essentials "7.0.3" -"@payloadcms/richtext-slate@3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/richtext-slate/-/richtext-slate-3.0.0-alpha.32.tgz#ab192d36daad617d6f43a27d7dd47cf68278125d" - integrity sha512-z0pHwY8GVEpEW7CmBRn2FP2S5xSxkqqCxkldz1JGZurmM2I8yHjhcb+8BPHa7+DP5kV3+m1SFBWUvcQWHBLA5Q== +"@payloadcms/richtext-slate@3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/richtext-slate/-/richtext-slate-3.0.0-alpha.33.tgz#55b13a55f6be4c619d50101283a393052f580dda" + integrity sha512-EF6YyvcgQl40F0Y9fax9haFQo1QtSmtAPv8bj3UCTgl0urZREoqr1neFe+7Q2cP24c+7HSEDRUteAjARXgJ+6Q== dependencies: "@faceless-ui/modal" "2.0.2" is-hotkey "0.2.0" @@ -1506,15 +1506,15 @@ slate-hyperscript "0.81.3" slate-react "0.92.0" -"@payloadcms/translations@3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/translations/-/translations-3.0.0-alpha.32.tgz#d23b92fffb7153d4984de213cde5279e85406cd7" - integrity sha512-Up1/aPejLTQJuRcdBdwS0CtQKLyT7Alg5J9tTyU8ynSItsNZo2lhnuNsSUcFWBPVSIGtTycBb8HLf1FwBNN9Qg== +"@payloadcms/translations@3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/translations/-/translations-3.0.0-alpha.33.tgz#5472314978a071ff05fef45a9e4dd8d6e226f3fb" + integrity sha512-0yaS1n5/snUhRimjpPx8UX49UPUWa42fGvHBFDJE66Nh8lqgFa1LoT4C4hy628v/8+EGS/6/5UOAjW9BgLVuOA== -"@payloadcms/ui@3.0.0-alpha.32": - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/@payloadcms/ui/-/ui-3.0.0-alpha.32.tgz#0fac7bb9a7e35de8dd39b83a45e3eecfdd3d0ff1" - integrity sha512-g8XSGont8tvT9cAn8ay3ZP4bYhcluRizGU/mr6FIIOP9o+jCll7hcbgr940SVkGkF+CYxLOWR8ZjL7w+X4nWCA== +"@payloadcms/ui@3.0.0-alpha.33": + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/@payloadcms/ui/-/ui-3.0.0-alpha.33.tgz#9e02ec5362172a27021ceb6ca3a063cc134a2d85" + integrity sha512-1pOUegrX7t4uBIFXao59oGM3H0IlZTAfIfGaXiEwpgFzFCD6tcdV2m+aRVkoaZ0yjnauiKGranlGlTPANv80RQ== dependencies: "@dnd-kit/core" "6.0.8" "@dnd-kit/sortable" "7.0.2" @@ -1522,7 +1522,7 @@ "@faceless-ui/scroll-info" "1.3.0" "@faceless-ui/window-info" "2.1.2" "@monaco-editor/react" "4.5.1" - "@payloadcms/translations" "3.0.0-alpha.32" + "@payloadcms/translations" "3.0.0-alpha.33" body-scroll-lock "4.0.0-beta.0" bson-objectid "2.0.4" date-fns "2.30.0" @@ -5160,12 +5160,12 @@ path-type@^4.0.0: resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -payload@3.0.0-alpha.32: - version "3.0.0-alpha.32" - resolved "https://registry.npmjs.org/payload/-/payload-3.0.0-alpha.32.tgz#6211f02d8673249586dd7cc9fbc44916c7109acb" - integrity sha512-xIcDkuCtDKhn7lrkjsdHlWy+ALYdbYoyJs8Rqgl7BUVTkK9iI6QIWhzdx0xMQUGoCnxIBJO0LpfrCJWagZEwyw== +payload@3.0.0-alpha.33: + version "3.0.0-alpha.33" + resolved "https://registry.npmjs.org/payload/-/payload-3.0.0-alpha.33.tgz#c4647657be34918d7d748e264a9c9279edd45c24" + integrity sha512-8KF7kor5DuKjX/9XNy+g364639dbIbHTnxp0451ywMazLgElUOpc54ec3OQajyTBtbR1iq7q8iuSqWCvL+utUw== dependencies: - "@payloadcms/translations" "3.0.0-alpha.32" + "@payloadcms/translations" "3.0.0-alpha.33" bson-objectid "2.0.4" conf "10.2.0" console-table-printer "2.11.2"