diff --git a/next.config.mjs b/next.config.mjs index 6b2de71..3d019e6 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -15,14 +15,12 @@ const config = { domains: ["avatars.githubusercontent.com", "lh3.googleusercontent.com"], }, webpack: (config, { dev, isServer }) => { - if (!dev && !isServer) { - Object.assign(config.resolve.alias, { - "react/jsx-runtime.js": "preact/compat/jsx-runtime", - react: "preact/compat", - "react-dom/test-utils": "preact/test-utils", - "react-dom": "preact/compat", - }); - } + Object.assign(config.resolve.alias, { + "react/jsx-runtime.js": "preact/compat/jsx-runtime", + react: "preact/compat", + "react-dom/test-utils": "preact/test-utils", + "react-dom": "preact/compat", + }); return config; }, }; diff --git a/package.json b/package.json index dc72b13..a5435d6 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@ably-labs/react-hooks": "^2.1.1", "@auth/prisma-adapter": "^1.0.0", "@prisma/client": "4.15.0", - "@tanstack/react-query": "^4.29.12", + "@tanstack/react-query": "^4.29.13", "@trpc/client": "10.30.0", "@trpc/next": "10.30.0", "@trpc/react-query": "10.30.0", @@ -38,10 +38,10 @@ "zod": "^3.21.4" }, "devDependencies": { - "@types/eslint": "^8.40.1", + "@types/eslint": "^8.40.2", "@types/json2csv": "^5.0.3", "@types/next-pwa": "^5.6.4", - "@types/node": "^20.3.0", + "@types/node": "^20.3.1", "@types/react": "^18.2.12", "@types/react-dom": "^18.2.5", "@typescript-eslint/eslint-plugin": "^5.59.11", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a4f6ac..b49529b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,17 +15,17 @@ dependencies: specifier: 4.15.0 version: 4.15.0(prisma@4.15.0) '@tanstack/react-query': - specifier: ^4.29.12 - version: 4.29.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^4.29.13 + version: 4.29.13(react-dom@18.2.0)(react@18.2.0) '@trpc/client': specifier: 10.30.0 version: 10.30.0(@trpc/server@10.30.0) '@trpc/next': specifier: 10.30.0 - version: 10.30.0(@tanstack/react-query@4.29.12)(@trpc/client@10.30.0)(@trpc/react-query@10.30.0)(@trpc/server@10.30.0)(next@13.4.5)(react-dom@18.2.0)(react@18.2.0) + version: 10.30.0(@tanstack/react-query@4.29.13)(@trpc/client@10.30.0)(@trpc/react-query@10.30.0)(@trpc/server@10.30.0)(next@13.4.5)(react-dom@18.2.0)(react@18.2.0) '@trpc/react-query': specifier: 10.30.0 - version: 10.30.0(@tanstack/react-query@4.29.12)(@trpc/client@10.30.0)(@trpc/server@10.30.0)(react-dom@18.2.0)(react@18.2.0) + version: 10.30.0(@tanstack/react-query@4.29.13)(@trpc/client@10.30.0)(@trpc/server@10.30.0)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': specifier: 10.30.0 version: 10.30.0 @@ -77,8 +77,8 @@ dependencies: devDependencies: '@types/eslint': - specifier: ^8.40.1 - version: 8.40.1 + specifier: ^8.40.2 + version: 8.40.2 '@types/json2csv': specifier: ^5.0.3 version: 5.0.3 @@ -86,8 +86,8 @@ devDependencies: specifier: ^5.6.4 version: 5.6.4(@babel/core@7.22.5)(react-dom@18.2.0)(react@18.2.0) '@types/node': - specifier: ^20.3.0 - version: 20.3.0 + specifier: ^20.3.1 + version: 20.3.1 '@types/react': specifier: ^18.2.12 version: 18.2.12 @@ -1724,8 +1724,8 @@ packages: resolution: {integrity: sha512-8C+hF6SFAb/TlFZyS9FItgNwrw4PMa7YeX+KQYe2ZAiEz6uzg6yIr+QBzPkUwZ/L0bXvGd1sufTm3wotoz+GwQ==} dev: false - /@tanstack/react-query@4.29.12(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-zhcN6+zF6cxprxhTHQajHGlvxgK8npnp9uLe9yaWhGc6sYcPWXzyO4raL4HomUzQOPzu3jLvkriJQ7BOrDM8vA==} + /@tanstack/react-query@4.29.13(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-qF8SHosMU6SzxWa7Ivxp3Q07zXvH+8PBDAlH8CR9ywfT3Y7uOK3jclfwMLzqgoGgDnYCarY2Ra+qDV0+xm19JQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -1750,7 +1750,7 @@ packages: '@trpc/server': 10.30.0 dev: false - /@trpc/next@10.30.0(@tanstack/react-query@4.29.12)(@trpc/client@10.30.0)(@trpc/react-query@10.30.0)(@trpc/server@10.30.0)(next@13.4.5)(react-dom@18.2.0)(react@18.2.0): + /@trpc/next@10.30.0(@tanstack/react-query@4.29.13)(@trpc/client@10.30.0)(@trpc/react-query@10.30.0)(@trpc/server@10.30.0)(next@13.4.5)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-DhvEadQe5E6yFXkAS394OvCe7MKAnuK45Ni86Hg7B6Sq5nCX5aFm7YeNdJKxfuxaXzXuvK0XD2YGJFsf9+0j0Q==} peerDependencies: '@tanstack/react-query': ^4.18.0 @@ -1761,9 +1761,9 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@tanstack/react-query': 4.29.12(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 4.29.13(react-dom@18.2.0)(react@18.2.0) '@trpc/client': 10.30.0(@trpc/server@10.30.0) - '@trpc/react-query': 10.30.0(@tanstack/react-query@4.29.12)(@trpc/client@10.30.0)(@trpc/server@10.30.0)(react-dom@18.2.0)(react@18.2.0) + '@trpc/react-query': 10.30.0(@tanstack/react-query@4.29.13)(@trpc/client@10.30.0)(@trpc/server@10.30.0)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': 10.30.0 next: 13.4.5(@babel/core@7.22.5)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -1771,7 +1771,7 @@ packages: react-ssr-prepass: 1.5.0(react@18.2.0) dev: false - /@trpc/react-query@10.30.0(@tanstack/react-query@4.29.12)(@trpc/client@10.30.0)(@trpc/server@10.30.0)(react-dom@18.2.0)(react@18.2.0): + /@trpc/react-query@10.30.0(@tanstack/react-query@4.29.13)(@trpc/client@10.30.0)(@trpc/server@10.30.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-bJnCEsuBv/xqnT76Ur8PI3VYjfCE1MYJ6LafT9nL25Pvfq480r0MFEIF0nQ7AWDZ8hZEDE8UZuicGG1ITpyxkQ==} peerDependencies: '@tanstack/react-query': ^4.18.0 @@ -1780,7 +1780,7 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@tanstack/react-query': 4.29.12(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 4.29.13(react-dom@18.2.0)(react@18.2.0) '@trpc/client': 10.30.0(@trpc/server@10.30.0) '@trpc/server': 10.30.0 react: 18.2.0 @@ -1796,19 +1796,19 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 20.3.0 + '@types/node': 20.3.1 '@types/responselike': 1.0.0 dev: false /@types/eslint-scope@3.7.4: resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==} dependencies: - '@types/eslint': 8.40.1 + '@types/eslint': 8.40.2 '@types/estree': 1.0.1 dev: true - /@types/eslint@8.40.1: - resolution: {integrity: sha512-vRb792M4mF1FBT+eoLecmkpLXwxsBHvWWRGJjzbYANBM6DtiJc6yETyv4rqDA6QNjF1pkj1U7LMA6dGb3VYlHw==} + /@types/eslint@8.40.2: + resolution: {integrity: sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==} dependencies: '@types/estree': 1.0.1 '@types/json-schema': 7.0.12 @@ -1826,7 +1826,7 @@ packages: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.3.0 + '@types/node': 20.3.1 dev: true /@types/http-cache-semantics@4.0.1: @@ -1840,7 +1840,7 @@ packages: /@types/json2csv@5.0.3: resolution: {integrity: sha512-ZJEv6SzhPhgpBpxZU4n/TZekbZqI4EcyXXRwms1lAITG2kIAtj85PfNYafUOY1zy8bWs5ujaub0GU4copaA0sw==} dependencies: - '@types/node': 20.3.0 + '@types/node': 20.3.1 dev: true /@types/json5@0.0.29: @@ -1850,7 +1850,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.3.0 + '@types/node': 20.3.1 dev: false /@types/minimatch@5.1.2: @@ -1875,8 +1875,8 @@ packages: - supports-color dev: true - /@types/node@20.3.0: - resolution: {integrity: sha512-cumHmIAf6On83X7yP+LrsEyUOf/YlociZelmpRYaGFydoaPdxdt80MAbu6vWerQT2COCp2nPvHdsbD7tHn/YlQ==} + /@types/node@20.3.1: + resolution: {integrity: sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==} /@types/prop-types@15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} @@ -1899,13 +1899,13 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.3.0 + '@types/node': 20.3.1 dev: true /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 20.3.0 + '@types/node': 20.3.1 dev: false /@types/scheduler@0.16.3: @@ -2266,8 +2266,8 @@ packages: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} dev: true - /aria-query@5.2.0: - resolution: {integrity: sha512-WkRzi93hMI7J6SwwGaHPm/l4vvO1qy3skvo+YCXJQfcMPmiUtm6i6fq/+1PwBX3zfsD2Cb8HvfrmwT3ZhtFbzg==} + /aria-query@5.2.1: + resolution: {integrity: sha512-7uFg4b+lETFgdaJyETnILsXgnnzVnkHcgRbwbPwevm5x/LmUlt3MjczMRe1zg824iBgXZNRPTBftNYyRSKLp2g==} dependencies: dequal: 2.0.3 dev: true @@ -2394,8 +2394,8 @@ packages: - debug dev: false - /axobject-query@3.2.0: - resolution: {integrity: sha512-dmvtzLwp99XJEy28R6DRyoefaG24MKP+STcU/eSsDDioP3ZvnU8iY5c9JDjZ0WSMGEAcJTE/VggF2uCju7Rx5Q==} + /axobject-query@3.2.1: + resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==} dependencies: dequal: 2.0.3 dev: true @@ -2524,7 +2524,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001502 - electron-to-chromium: 1.4.428 + electron-to-chromium: 1.4.430 node-releases: 2.0.12 update-browserslist-db: 1.0.11(browserslist@4.21.8) @@ -3000,8 +3000,8 @@ packages: jake: 10.8.7 dev: true - /electron-to-chromium@1.4.428: - resolution: {integrity: sha512-L7uUknyY286of0AYC8CKfgWstD0Smk2DvHDi9F0GWQhSH90Bzi7iDrmCbZKz75tYJxeGSAc7TYeKpmbjMDoh1w==} + /electron-to-chromium@1.4.430: + resolution: {integrity: sha512-FytjTbGwz///F+ToZ5XSeXbbSaXalsVRXsz2mHityI5gfxft7ieW3HqFLkU5V1aIrY42aflICqbmFoDxW10etg==} /emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} @@ -3018,8 +3018,8 @@ packages: once: 1.4.0 dev: false - /enhanced-resolve@5.14.1: - resolution: {integrity: sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==} + /enhanced-resolve@5.15.0: + resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==} engines: {node: '>=10.13.0'} dependencies: graceful-fs: 4.2.11 @@ -3155,7 +3155,7 @@ packages: eslint-plugin-import: '*' dependencies: debug: 4.3.4 - enhanced-resolve: 5.14.1 + enhanced-resolve: 5.15.0 eslint: 8.42.0 eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.59.11)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.42.0) eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.11)(eslint-import-resolver-typescript@3.5.5)(eslint@8.42.0) @@ -3241,12 +3241,12 @@ packages: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 dependencies: '@babel/runtime': 7.22.5 - aria-query: 5.2.0 + aria-query: 5.2.1 array-includes: 3.1.6 array.prototype.flatmap: 1.3.1 ast-types-flow: 0.0.7 axe-core: 4.7.2 - axobject-query: 3.2.0 + axobject-query: 3.2.1 damerau-levenshtein: 1.0.8 emoji-regex: 9.2.2 eslint: 8.42.0 @@ -4194,7 +4194,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.3.0 + '@types/node': 20.3.1 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -4203,7 +4203,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.3.0 + '@types/node': 20.3.1 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -6094,7 +6094,7 @@ packages: acorn-import-assertions: 1.9.0(acorn@8.8.2) browserslist: 4.21.8 chrome-trace-event: 1.0.3 - enhanced-resolve: 5.14.1 + enhanced-resolve: 5.15.0 es-module-lexer: 1.3.0 eslint-scope: 5.1.1 events: 3.3.0 diff --git a/src/pages/room/[id].tsx b/src/pages/room/[id].tsx index c081df7..0cbf87e 100644 --- a/src/pages/room/[id].tsx +++ b/src/pages/room/[id].tsx @@ -47,18 +47,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { }; }; -// interface ExtendedVote extends Vote { -// value: string; -// room: typeof Room; -// id: string; -// createdAt: Date; -// userId: string; -// owner: { -// name: string | null; -// }; -// roomId: string; -// } - const Room: NextPage = () => { return ( <>