From a905555da491bed8866b633b376caf0a6daab1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Tue, 20 Jun 2023 15:35:44 +0200 Subject: [PATCH] chore: upgrade `next-auth` --- auth.ts | 18 ++++- next-auth.d.ts | 13 ---- package.json | 7 +- pnpm-lock.yaml | 195 ++++++------------------------------------------- tsconfig.json | 1 - 5 files changed, 42 insertions(+), 192 deletions(-) delete mode 100644 next-auth.d.ts diff --git a/auth.ts b/auth.ts index 5c7c1dd..5a2d66d 100644 --- a/auth.ts +++ b/auth.ts @@ -1,18 +1,28 @@ import NextAuth from 'next-auth' import GitHub from 'next-auth/providers/github' +declare module 'next-auth' { + /** + * Returned by `useSession`, `getSession` and received as a prop on the `SessionProvider` React Context + */ + interface Session { + user: { + /** The user's id. */ + id: string + } + } +} + export const { handlers: { GET, POST }, auth, CSRF_experimental - // @ts-ignore } = NextAuth({ - // @ts-ignore + // @ts-expect-error providers: [GitHub], callbacks: { - // @ts-ignore jwt: async ({ token, profile }) => { - if (profile?.id) { + if (profile) { token.id = profile.id token.image = profile.picture } diff --git a/next-auth.d.ts b/next-auth.d.ts deleted file mode 100644 index 918e14d..0000000 --- a/next-auth.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import NextAuth, { DefaultSession } from 'next-auth' - -declare module 'next-auth' { - /** - * Returned by `useSession`, `getSession` and received as a prop on the `SessionProvider` React Context - */ - interface Session { - user: { - /** The user's postal address. */ - id: string - } & DefaultSession['user'] - } -} diff --git a/package.json b/package.json index da0515d..adc2b70 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "focus-trap-react": "^10.1.1", "nanoid": "^4.0.2", "next": "13.4.7-canary.1", - "next-auth": "0.0.0-manual.4cd21ea5", + "next-auth": "0.0.0-manual.d211b087", "next-themes": "^0.2.1", "openai-edge": "^0.5.1", "react": "^18.2.0", @@ -69,7 +69,8 @@ }, "pnpm": { "overrides": { - "@auth/nextjs": "0.0.0-manual.223c6467" + "@auth/nextjs": "0.0.0-manual.de744368" } - } + }, + "packageManager": "pnpm@8.6.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48550b0..4204692 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,11 +1,11 @@ lockfileVersion: '6.1' settings: - autoInstallPeers: true + autoInstallPeers: false excludeLinksFromLockfile: false overrides: - '@auth/nextjs': 0.0.0-manual.223c6467 + '@auth/nextjs': 0.0.0-manual.de744368 dependencies: '@radix-ui/react-alert-dialog': @@ -46,7 +46,7 @@ dependencies: version: 0.5.7 ai: specifier: ^2.1.2 - version: 2.1.2(react@18.2.0)(svelte@3.59.1)(vue@3.3.4) + version: 2.1.2(react@18.2.0) body-scroll-lock: specifier: 4.0.0-beta.0 version: 4.0.0-beta.0 @@ -58,7 +58,7 @@ dependencies: version: 1.2.1 focus-trap-react: specifier: ^10.1.1 - version: 10.1.1(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) + version: 10.1.1(react-dom@18.2.0)(react@18.2.0) nanoid: specifier: ^4.0.2 version: 4.0.2 @@ -66,8 +66,8 @@ dependencies: specifier: 13.4.7-canary.1 version: 13.4.7-canary.1(react-dom@18.2.0)(react@18.2.0) next-auth: - specifier: 0.0.0-manual.4cd21ea5 - version: 0.0.0-manual.4cd21ea5(next@13.4.7-canary.1)(react-dom@18.2.0)(react@18.2.0) + specifier: 0.0.0-manual.d211b087 + version: 0.0.0-manual.d211b087(next@13.4.7-canary.1)(react-dom@18.2.0)(react@18.2.0) next-themes: specifier: ^0.2.1 version: 0.2.1(next@13.4.7-canary.1)(react-dom@18.2.0)(react@18.2.0) @@ -82,7 +82,7 @@ dependencies: version: 18.2.0(react@18.2.0) react-hot-toast: specifier: ^2.4.1 - version: 2.4.1(csstype@3.1.2)(react-dom@18.2.0)(react@18.2.0) + version: 2.4.1(react-dom@18.2.0)(react@18.2.0) react-intersection-observer: specifier: ^9.4.4 version: 9.4.4(react@18.2.0) @@ -184,10 +184,10 @@ packages: preact-render-to-string: 5.2.3(preact@10.11.3) dev: false - /@auth/nextjs@0.0.0-manual.223c6467(next@13.4.7-canary.1)(react@18.2.0): - resolution: {integrity: sha512-nO6TMZ67ysq5lwpffQofxVLlTDHBLYX2x6VNXCXqbOoapofAk1qKyJ57lelHQdgV3py6qqWej/bTa4fDL19IDw==} + /@auth/nextjs@0.0.0-manual.de744368(next@13.4.7-canary.1)(react@18.2.0): + resolution: {integrity: sha512-jLjKasLTKH5YLiK2i0NQWbsQS1pMveidyFT/ibwZ6c5UAcqDsC6ZGvvVxOaiAmiA6iFA1WMqNBVEcy+NhGgXVQ==} peerDependencies: - next: ^13.4.2 + next: ^13.4.6 react: ^18.2.0 dependencies: '@auth/core': 0.8.2 @@ -197,39 +197,12 @@ packages: - nodemailer dev: false - /@babel/helper-string-parser@7.22.5: - resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} - engines: {node: '>=6.9.0'} - dev: false - - /@babel/helper-validator-identifier@7.22.5: - resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} - engines: {node: '>=6.9.0'} - dev: false - - /@babel/parser@7.22.5: - resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.22.5 - dev: false - /@babel/runtime@7.21.5: resolution: {integrity: sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.13.11 - /@babel/types@7.22.5: - resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-string-parser': 7.22.5 - '@babel/helper-validator-identifier': 7.22.5 - to-fast-properties: 2.0.0 - dev: false - /@esbuild/android-arm@0.15.18: resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} engines: {node: '>=12'} @@ -351,6 +324,7 @@ packages: /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + dev: true /@jridgewell/trace-mapping@0.3.18: resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==} @@ -1387,89 +1361,6 @@ packages: yoga-wasm-web: 0.3.3 dev: false - /@vue/compiler-core@3.3.4: - resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} - dependencies: - '@babel/parser': 7.22.5 - '@vue/shared': 3.3.4 - estree-walker: 2.0.2 - source-map-js: 1.0.2 - dev: false - - /@vue/compiler-dom@3.3.4: - resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} - dependencies: - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 - dev: false - - /@vue/compiler-sfc@3.3.4: - resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==} - dependencies: - '@babel/parser': 7.22.5 - '@vue/compiler-core': 3.3.4 - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-ssr': 3.3.4 - '@vue/reactivity-transform': 3.3.4 - '@vue/shared': 3.3.4 - estree-walker: 2.0.2 - magic-string: 0.30.0 - postcss: 8.4.23 - source-map-js: 1.0.2 - dev: false - - /@vue/compiler-ssr@3.3.4: - resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==} - dependencies: - '@vue/compiler-dom': 3.3.4 - '@vue/shared': 3.3.4 - dev: false - - /@vue/reactivity-transform@3.3.4: - resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} - dependencies: - '@babel/parser': 7.22.5 - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 - estree-walker: 2.0.2 - magic-string: 0.30.0 - dev: false - - /@vue/reactivity@3.3.4: - resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} - dependencies: - '@vue/shared': 3.3.4 - dev: false - - /@vue/runtime-core@3.3.4: - resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==} - dependencies: - '@vue/reactivity': 3.3.4 - '@vue/shared': 3.3.4 - dev: false - - /@vue/runtime-dom@3.3.4: - resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==} - dependencies: - '@vue/runtime-core': 3.3.4 - '@vue/shared': 3.3.4 - csstype: 3.1.2 - dev: false - - /@vue/server-renderer@3.3.4(vue@3.3.4): - resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==} - peerDependencies: - vue: 3.3.4 - dependencies: - '@vue/compiler-ssr': 3.3.4 - '@vue/shared': 3.3.4 - vue: 3.3.4 - dev: false - - /@vue/shared@3.3.4: - resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} - dev: false - /acorn-jsx@5.3.2(acorn@8.8.2): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -1484,7 +1375,7 @@ packages: hasBin: true dev: true - /ai@2.1.2(react@18.2.0)(svelte@3.59.1)(vue@3.3.4): + /ai@2.1.2(react@18.2.0): resolution: {integrity: sha512-WhyGH95Pv/gpgVMQT5eCyKXJh7irozr+bmpJ94somfRYBcAN2U270ii/OOHzGLrPM3liTbBilGQL2Ds7/5sz9Q==} engines: {node: '>=14.6'} peerDependencies: @@ -1502,11 +1393,9 @@ packages: eventsource-parser: 1.0.0 nanoid: 3.3.6 react: 18.2.0 - sswr: 1.10.0(svelte@3.59.1) - svelte: 3.59.1 + sswr: 1.10.0 swr: 2.1.5(react@18.2.0) - swrv: 1.0.3(vue@3.3.4) - vue: 3.3.4 + swrv: 1.0.3 dev: false /ajv@6.12.6: @@ -2758,10 +2647,6 @@ packages: engines: {node: '>=4.0'} dev: true - /estree-walker@2.0.2: - resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} - dev: false - /esutils@2.0.3: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} @@ -2892,7 +2777,7 @@ packages: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: true - /focus-trap-react@10.1.1(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0): + /focus-trap-react@10.1.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-OtLeSIQPKFzMzbLHkGtfZYwGLMhTRHd3CDhfyd0DDx8tvXzlgpseClDiuiKoiIHZtdjsbXTfTmUuuLKaxrwSyQ==} peerDependencies: prop-types: ^15.8.1 @@ -2900,7 +2785,6 @@ packages: react-dom: '>=16.3.0' dependencies: focus-trap: 7.4.0 - prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) tabbable: 6.1.2 @@ -3086,12 +2970,10 @@ packages: slash: 4.0.0 dev: true - /goober@2.1.13(csstype@3.1.2): + /goober@2.1.13: resolution: {integrity: sha512-jFj3BQeleOoy7t93E9rZ2de+ScC4lQICLwiAQmKMg9F6roKGaLSHoCDYKkWlSafg138jejvq/mTdvmnwDQgqoQ==} peerDependencies: csstype: ^3.0.10 - dependencies: - csstype: 3.1.2 dev: false /gopd@1.0.1: @@ -3636,13 +3518,6 @@ packages: es5-ext: 0.10.62 dev: true - /magic-string@0.30.0: - resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: false - /markdown-table@3.0.3: resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==} dev: false @@ -4145,8 +4020,8 @@ packages: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true - /next-auth@0.0.0-manual.4cd21ea5(next@13.4.7-canary.1)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-qzsrs2xeopmIYUz1C+FbudBIoNI7xSTd1xWeECr/Qa4NFzbCt8Dr9tb2Yocpa5jnRpk0xN96HwsJqimOYVjtRg==} + /next-auth@0.0.0-manual.d211b087(next@13.4.7-canary.1)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-IXBcSAkfvRZeY/778LDmlrKcLYtKp0/IA4K0m0vMczEYRROdP9Tuy1N0CJ3tjLEcv8Af2+YVUfIs4qHKF68g5g==} peerDependencies: next: ^13.4.5 nodemailer: ^6.6.5 @@ -4157,7 +4032,7 @@ packages: optional: true dependencies: '@auth/core': 0.8.2 - '@auth/nextjs': 0.0.0-manual.223c6467(next@13.4.7-canary.1)(react@18.2.0) + '@auth/nextjs': 0.0.0-manual.de744368(next@13.4.7-canary.1)(react@18.2.0) next: 13.4.7-canary.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -4557,6 +4432,7 @@ packages: nanoid: 3.3.6 picocolors: 1.0.0 source-map-js: 1.0.2 + dev: true /preact-render-to-string@5.2.3(preact@10.11.3): resolution: {integrity: sha512-aPDxUn5o3GhWdtJtW0svRC2SS/l8D9MAgo2+AWml+BhDImb27ALf04Q2d+AHqUUOc6RdSXFIBVa2gxzgMKgtZA==} @@ -4632,14 +4508,14 @@ packages: scheduler: 0.23.0 dev: false - /react-hot-toast@2.4.1(csstype@3.1.2)(react-dom@18.2.0)(react@18.2.0): + /react-hot-toast@2.4.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==} engines: {node: '>=10'} peerDependencies: react: '>=16' react-dom: '>=16' dependencies: - goober: 2.1.13(csstype@3.1.2) + goober: 2.1.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: @@ -4994,12 +4870,11 @@ packages: resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==} dev: false - /sswr@1.10.0(svelte@3.59.1): + /sswr@1.10.0: resolution: {integrity: sha512-nLWAJSQy3h8t7rrbTXanRyVHuQPj4PwKIVGe4IMlxJFdhyaxnN/JGACnvQKGDeWiTGYIZIx/jRuUsPEF0867Pg==} peerDependencies: svelte: ^3.29.0 dependencies: - svelte: 3.59.1 swrev: 3.0.0 dev: false @@ -5133,11 +5008,6 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte@3.59.1: - resolution: {integrity: sha512-pKj8fEBmqf6mq3/NfrB9SLtcJcUvjYSWyePlfCqN9gujLB25RitWK8PvFzlwim6hD/We35KbPlRteuA6rnPGcQ==} - engines: {node: '>= 8'} - dev: false - /swr@2.1.5(react@18.2.0): resolution: {integrity: sha512-/OhfZMcEpuz77KavXST5q6XE9nrOBOVcBLWjMT+oAE/kQHyE3PASrevXCtQDZ8aamntOfFkbVJp7Il9tNBQWrw==} peerDependencies: @@ -5151,12 +5021,10 @@ packages: resolution: {integrity: sha512-QJuZiptdOmbDY45pECBRVEgnoBlOKjeT2MWVz04wKHpWX15hM3P7EjcIbHDg5yLoPCMQ7to3349MEE+l9QF5HA==} dev: false - /swrv@1.0.3(vue@3.3.4): + /swrv@1.0.3: resolution: {integrity: sha512-sl+eLEE+aPPjhP1E8gQ75q3RPRyw5Gd/kROnrTFo3+LkCeLskv7F+uAl5W97wgJkzitobL6FLsRPVm0DgIgN8A==} peerDependencies: vue: '>=3.2.26 < 4' - dependencies: - vue: 3.3.4 dev: false /synckit@0.8.5: @@ -5253,11 +5121,6 @@ packages: engines: {node: '>=12'} dev: true - /to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - dev: false - /to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -5532,16 +5395,6 @@ packages: vfile-message: 3.1.4 dev: false - /vue@3.3.4: - resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==} - dependencies: - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-sfc': 3.3.4 - '@vue/runtime-dom': 3.3.4 - '@vue/server-renderer': 3.3.4(vue@3.3.4) - '@vue/shared': 3.3.4 - dev: false - /watchpack@2.4.0: resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==} engines: {node: '>=10.13.0'} diff --git a/tsconfig.json b/tsconfig.json index 9f91b9b..9be1cf1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,7 +26,6 @@ }, "include": [ "next-env.d.ts", - "next-auth.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"