From 2b4d3206f7999144fcbc1bb1b549a17815c3769e Mon Sep 17 00:00:00 2001 From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com> Date: Tue, 13 Jun 2023 16:31:43 -0600 Subject: [PATCH 1/5] =?UTF-8?q?Cleanup!=20=F0=9F=A4=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.mjs | 14 +++---- package.json | 6 +-- pnpm-lock.yaml | 82 ++++++++++++++++++++--------------------- src/pages/room/[id].tsx | 12 ------ 4 files changed, 50 insertions(+), 64 deletions(-) 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 ( <> From 32d38ceaa7ca67353b54b429b0d05153ef59dd04 Mon Sep 17 00:00:00 2001 From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:51:55 -0600 Subject: [PATCH 2/5] Million?! --- next.config.mjs | 3 +- package.json | 1 + pnpm-lock.yaml | 66 +++++++++++++++++++++++++---------- src/components/RoomList.tsx | 5 +-- src/pages/dashboard/index.tsx | 5 +-- src/pages/index.tsx | 5 +-- src/pages/room/[id].tsx | 5 +-- 7 files changed, 63 insertions(+), 27 deletions(-) diff --git a/next.config.mjs b/next.config.mjs index 3d019e6..ba6123f 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,5 +1,6 @@ // @ts-check import withPWA from "next-pwa"; +import million from "million/compiler"; !process.env.SKIP_ENV_VALIDATION && (await import("./src/env.mjs")); @@ -27,4 +28,4 @@ const config = { const nextConfig = withPWA({ dest: "public", })(config); -export default nextConfig; +export default million.next(nextConfig); diff --git a/package.json b/package.json index a5435d6..69e3358 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "ably": "^1.2.40", "autoprefixer": "^10.4.14", "json2csv": "6.0.0-alpha.2", + "million": "2.4.6-beta.2", "next": "^13.4.5", "next-auth": "^4.22.1", "postcss": "^8.4.24", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b49529b..7a35c18 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,6 +38,9 @@ dependencies: json2csv: specifier: 6.0.0-alpha.2 version: 6.0.0-alpha.2 + million: + specifier: 2.4.6-beta.2 + version: 2.4.6-beta.2 next: specifier: ^13.4.5 version: 13.4.5(@babel/core@7.22.5)(react-dom@18.2.0)(react@18.2.0) @@ -366,7 +369,6 @@ packages: /@babel/helper-plugin-utils@7.22.5: resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} - dev: true /@babel/helper-remap-async-to-generator@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==} @@ -591,6 +593,16 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.5): + resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + dev: false + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: @@ -665,6 +677,16 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true + /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.5): + resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + dev: false + /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==} engines: {node: '>=6.9.0'} @@ -2200,7 +2222,6 @@ packages: resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} engines: {node: '>=0.4.0'} hasBin: true - dev: true /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} @@ -2256,7 +2277,6 @@ packages: dependencies: normalize-path: 3.0.0 picomatch: 2.3.1 - dev: true /arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} @@ -2475,7 +2495,6 @@ packages: /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} - dev: true /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} @@ -2516,7 +2535,6 @@ packages: engines: {node: '>=8'} dependencies: fill-range: 7.0.1 - dev: true /browserslist@4.21.8: resolution: {integrity: sha512-j+7xYe+v+q2Id9qbBeCI8WX5NmZSRe8es1+0xntD/+gaWXznP8tFEkv5IgSaHf5dS1YwVMbX/4W6m937mj+wQw==} @@ -2624,7 +2642,6 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.2 - dev: true /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -3501,7 +3518,6 @@ packages: engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 - dev: true /find-cache-dir@3.3.2: resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==} @@ -3591,7 +3607,6 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true - dev: true optional: true /function-bind@1.1.1: @@ -3664,7 +3679,6 @@ packages: engines: {node: '>= 6'} dependencies: is-glob: 4.0.3 - dev: true /glob-parent@6.0.2: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} @@ -3979,7 +3993,6 @@ packages: engines: {node: '>=8'} dependencies: binary-extensions: 2.2.0 - dev: true /is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} @@ -4031,14 +4044,12 @@ packages: /is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} - dev: true /is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} dependencies: is-extglob: 2.1.1 - dev: true /is-inside-container@1.0.0: resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==} @@ -4067,7 +4078,6 @@ packages: /is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - dev: true /is-obj@1.0.1: resolution: {integrity: sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==} @@ -4479,6 +4489,18 @@ packages: picomatch: 2.3.1 dev: true + /million@2.4.6-beta.2: + resolution: {integrity: sha512-UTUIfDZLBx1WG+nsBjeJGPPH0rR4b3yGPe4iZ2GOGpwUbrp0UjxRZeEQSFsaYctn9PPTId2Huowb9kQ5BQcj/A==} + dependencies: + '@babel/core': 7.22.5 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.5) + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.5) + '@babel/types': 7.22.5 + unplugin: 1.3.1 + transitivePeerDependencies: + - supports-color + dev: false + /mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} @@ -4678,7 +4700,6 @@ packages: /normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - dev: true /normalize-range@0.1.2: resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} @@ -4935,7 +4956,6 @@ packages: /picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - dev: true /pify@2.3.0: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} @@ -5235,7 +5255,6 @@ packages: engines: {node: '>=8.10.0'} dependencies: picomatch: 2.3.1 - dev: true /redicache-ts@0.1.1: resolution: {integrity: sha512-z6edrqsRlayBhI91eA8/N+AGJeFAdU+tvnmP3LzAyQ5pqXEM9Ww1+bHTKd0pWRRcZMWKLaaAHx9SOWj/IEfpuw==} @@ -5887,7 +5906,6 @@ packages: engines: {node: '>=8.0'} dependencies: is-number: 7.0.0 - dev: true /to-utf8@0.0.1: resolution: {integrity: sha512-zks18/TWT1iHO3v0vFp5qLKOG27m67ycq/Y7a7cTiRuUNlc4gf3HGnkRgMv0NyhnfTamtkYBJl+YeD1/j07gBQ==} @@ -6010,6 +6028,15 @@ packages: engines: {node: '>= 10.0.0'} dev: true + /unplugin@1.3.1: + resolution: {integrity: sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw==} + dependencies: + acorn: 8.8.2 + chokidar: 3.5.3 + webpack-sources: 3.2.3 + webpack-virtual-modules: 0.5.0 + dev: false + /untildify@4.0.0: resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} engines: {node: '>=8'} @@ -6073,7 +6100,10 @@ packages: /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - dev: true + + /webpack-virtual-modules@0.5.0: + resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==} + dev: false /webpack@5.86.0: resolution: {integrity: sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==} diff --git a/src/components/RoomList.tsx b/src/components/RoomList.tsx index 5f0e80e..cdc4854 100644 --- a/src/components/RoomList.tsx +++ b/src/components/RoomList.tsx @@ -6,8 +6,9 @@ import { IoEnterOutline, IoTrashBinOutline } from "react-icons/io5"; import { configureAbly, useChannel } from "@ably-labs/react-hooks"; import { env } from "~/env.mjs"; import { useState } from "react"; +import { block } from "million/react"; -const RoomList: React.FC = () => { +const RoomList: React.FC = block(() => { const { data: sessionData } = useSession(); configureAbly({ @@ -142,6 +143,6 @@ const RoomList: React.FC = () => { )} ); -}; +}); export default RoomList; diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index 8f0b0e3..acd0df5 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -8,6 +8,7 @@ import { useEffect, useState } from "react"; import Link from "next/link"; import { FaShieldAlt } from "react-icons/fa"; import { getServerAuthSession } from "~/server/auth"; +import { block } from "million/react"; export const getServerSideProps: GetServerSideProps = async (ctx) => { const session = await getServerAuthSession(ctx); @@ -44,7 +45,7 @@ const Home: NextPage = () => { export default Home; -const HomePageBody: React.FC = () => { +const HomePageBody: React.FC = block(() => { const { data: sessionData } = useSession(); const [joinRoomTextBox, setJoinRoomTextBox] = useState(""); const [tabIndex, setTabIndex] = useState(); @@ -110,4 +111,4 @@ const HomePageBody: React.FC = () => { {tabIndex === 1 && } ); -}; +}); diff --git a/src/pages/index.tsx b/src/pages/index.tsx index a80bc44..a95a52c 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,5 +1,6 @@ import { type NextPage } from "next"; import Head from "next/head"; +import { block } from "million/react"; const Home: NextPage = () => { return ( @@ -17,7 +18,7 @@ const Home: NextPage = () => { export default Home; -const HomePageBody: React.FC = () => { +const HomePageBody: React.FC = block(() => { return ( <>

@@ -56,4 +57,4 @@ const HomePageBody: React.FC = () => { ); -}; +}); diff --git a/src/pages/room/[id].tsx b/src/pages/room/[id].tsx index 0cbf87e..cdc8278 100644 --- a/src/pages/room/[id].tsx +++ b/src/pages/room/[id].tsx @@ -27,6 +27,7 @@ import { FaShieldAlt } from "react-icons/fa"; import { RiVipCrownFill } from "react-icons/ri"; import Link from "next/link"; import { downloadCSV } from "~/utils/helpers"; +import { block } from "million/react"; export const getServerSideProps: GetServerSideProps = async (ctx) => { const session = await getServerAuthSession(ctx); @@ -63,7 +64,7 @@ const Room: NextPage = () => { export default Room; -const RoomBody: React.FC = () => { +const RoomBody: React.FC = block(() => { const { data: sessionData } = useSession(); const { query } = useRouter(); const roomId = z.string().parse(query.id); @@ -487,4 +488,4 @@ const RoomBody: React.FC = () => { ); } -}; +}); From 158603c9f56259b2555a5c2db7230e38a8d34bd6 Mon Sep 17 00:00:00 2001 From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:59:20 -0600 Subject: [PATCH 3/5] Revert "Million?!" This reverts commit 32d38ceaa7ca67353b54b429b0d05153ef59dd04. --- next.config.mjs | 3 +- package.json | 1 - pnpm-lock.yaml | 66 ++++++++++------------------------- src/components/RoomList.tsx | 5 ++- src/pages/dashboard/index.tsx | 5 ++- src/pages/index.tsx | 5 ++- src/pages/room/[id].tsx | 5 ++- 7 files changed, 27 insertions(+), 63 deletions(-) diff --git a/next.config.mjs b/next.config.mjs index ba6123f..3d019e6 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,6 +1,5 @@ // @ts-check import withPWA from "next-pwa"; -import million from "million/compiler"; !process.env.SKIP_ENV_VALIDATION && (await import("./src/env.mjs")); @@ -28,4 +27,4 @@ const config = { const nextConfig = withPWA({ dest: "public", })(config); -export default million.next(nextConfig); +export default nextConfig; diff --git a/package.json b/package.json index 69e3358..a5435d6 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "ably": "^1.2.40", "autoprefixer": "^10.4.14", "json2csv": "6.0.0-alpha.2", - "million": "2.4.6-beta.2", "next": "^13.4.5", "next-auth": "^4.22.1", "postcss": "^8.4.24", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7a35c18..b49529b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,9 +38,6 @@ dependencies: json2csv: specifier: 6.0.0-alpha.2 version: 6.0.0-alpha.2 - million: - specifier: 2.4.6-beta.2 - version: 2.4.6-beta.2 next: specifier: ^13.4.5 version: 13.4.5(@babel/core@7.22.5)(react-dom@18.2.0)(react@18.2.0) @@ -369,6 +366,7 @@ packages: /@babel/helper-plugin-utils@7.22.5: resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} + dev: true /@babel/helper-remap-async-to-generator@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==} @@ -593,16 +591,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.5): - resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.5 - '@babel/helper-plugin-utils': 7.22.5 - dev: false - /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: @@ -677,16 +665,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.5): - resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.5 - '@babel/helper-plugin-utils': 7.22.5 - dev: false - /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.22.5): resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==} engines: {node: '>=6.9.0'} @@ -2222,6 +2200,7 @@ packages: resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} engines: {node: '>=0.4.0'} hasBin: true + dev: true /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} @@ -2277,6 +2256,7 @@ packages: dependencies: normalize-path: 3.0.0 picomatch: 2.3.1 + dev: true /arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} @@ -2495,6 +2475,7 @@ packages: /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} + dev: true /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} @@ -2535,6 +2516,7 @@ packages: engines: {node: '>=8'} dependencies: fill-range: 7.0.1 + dev: true /browserslist@4.21.8: resolution: {integrity: sha512-j+7xYe+v+q2Id9qbBeCI8WX5NmZSRe8es1+0xntD/+gaWXznP8tFEkv5IgSaHf5dS1YwVMbX/4W6m937mj+wQw==} @@ -2642,6 +2624,7 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.2 + dev: true /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -3518,6 +3501,7 @@ packages: engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 + dev: true /find-cache-dir@3.3.2: resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==} @@ -3607,6 +3591,7 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true + dev: true optional: true /function-bind@1.1.1: @@ -3679,6 +3664,7 @@ packages: engines: {node: '>= 6'} dependencies: is-glob: 4.0.3 + dev: true /glob-parent@6.0.2: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} @@ -3993,6 +3979,7 @@ packages: engines: {node: '>=8'} dependencies: binary-extensions: 2.2.0 + dev: true /is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} @@ -4044,12 +4031,14 @@ packages: /is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} + dev: true /is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} dependencies: is-extglob: 2.1.1 + dev: true /is-inside-container@1.0.0: resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==} @@ -4078,6 +4067,7 @@ packages: /is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} + dev: true /is-obj@1.0.1: resolution: {integrity: sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==} @@ -4489,18 +4479,6 @@ packages: picomatch: 2.3.1 dev: true - /million@2.4.6-beta.2: - resolution: {integrity: sha512-UTUIfDZLBx1WG+nsBjeJGPPH0rR4b3yGPe4iZ2GOGpwUbrp0UjxRZeEQSFsaYctn9PPTId2Huowb9kQ5BQcj/A==} - dependencies: - '@babel/core': 7.22.5 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.5) - '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.5) - '@babel/types': 7.22.5 - unplugin: 1.3.1 - transitivePeerDependencies: - - supports-color - dev: false - /mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} @@ -4700,6 +4678,7 @@ packages: /normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} + dev: true /normalize-range@0.1.2: resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} @@ -4956,6 +4935,7 @@ packages: /picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} + dev: true /pify@2.3.0: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} @@ -5255,6 +5235,7 @@ packages: engines: {node: '>=8.10.0'} dependencies: picomatch: 2.3.1 + dev: true /redicache-ts@0.1.1: resolution: {integrity: sha512-z6edrqsRlayBhI91eA8/N+AGJeFAdU+tvnmP3LzAyQ5pqXEM9Ww1+bHTKd0pWRRcZMWKLaaAHx9SOWj/IEfpuw==} @@ -5906,6 +5887,7 @@ packages: engines: {node: '>=8.0'} dependencies: is-number: 7.0.0 + dev: true /to-utf8@0.0.1: resolution: {integrity: sha512-zks18/TWT1iHO3v0vFp5qLKOG27m67ycq/Y7a7cTiRuUNlc4gf3HGnkRgMv0NyhnfTamtkYBJl+YeD1/j07gBQ==} @@ -6028,15 +6010,6 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin@1.3.1: - resolution: {integrity: sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw==} - dependencies: - acorn: 8.8.2 - chokidar: 3.5.3 - webpack-sources: 3.2.3 - webpack-virtual-modules: 0.5.0 - dev: false - /untildify@4.0.0: resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} engines: {node: '>=8'} @@ -6100,10 +6073,7 @@ packages: /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - - /webpack-virtual-modules@0.5.0: - resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==} - dev: false + dev: true /webpack@5.86.0: resolution: {integrity: sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==} diff --git a/src/components/RoomList.tsx b/src/components/RoomList.tsx index cdc4854..5f0e80e 100644 --- a/src/components/RoomList.tsx +++ b/src/components/RoomList.tsx @@ -6,9 +6,8 @@ import { IoEnterOutline, IoTrashBinOutline } from "react-icons/io5"; import { configureAbly, useChannel } from "@ably-labs/react-hooks"; import { env } from "~/env.mjs"; import { useState } from "react"; -import { block } from "million/react"; -const RoomList: React.FC = block(() => { +const RoomList: React.FC = () => { const { data: sessionData } = useSession(); configureAbly({ @@ -143,6 +142,6 @@ const RoomList: React.FC = block(() => { )} ); -}); +}; export default RoomList; diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index acd0df5..8f0b0e3 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -8,7 +8,6 @@ import { useEffect, useState } from "react"; import Link from "next/link"; import { FaShieldAlt } from "react-icons/fa"; import { getServerAuthSession } from "~/server/auth"; -import { block } from "million/react"; export const getServerSideProps: GetServerSideProps = async (ctx) => { const session = await getServerAuthSession(ctx); @@ -45,7 +44,7 @@ const Home: NextPage = () => { export default Home; -const HomePageBody: React.FC = block(() => { +const HomePageBody: React.FC = () => { const { data: sessionData } = useSession(); const [joinRoomTextBox, setJoinRoomTextBox] = useState(""); const [tabIndex, setTabIndex] = useState(); @@ -111,4 +110,4 @@ const HomePageBody: React.FC = block(() => { {tabIndex === 1 && } ); -}); +}; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index a95a52c..a80bc44 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,6 +1,5 @@ import { type NextPage } from "next"; import Head from "next/head"; -import { block } from "million/react"; const Home: NextPage = () => { return ( @@ -18,7 +17,7 @@ const Home: NextPage = () => { export default Home; -const HomePageBody: React.FC = block(() => { +const HomePageBody: React.FC = () => { return ( <>

@@ -57,4 +56,4 @@ const HomePageBody: React.FC = block(() => { ); -}); +}; diff --git a/src/pages/room/[id].tsx b/src/pages/room/[id].tsx index cdc8278..0cbf87e 100644 --- a/src/pages/room/[id].tsx +++ b/src/pages/room/[id].tsx @@ -27,7 +27,6 @@ import { FaShieldAlt } from "react-icons/fa"; import { RiVipCrownFill } from "react-icons/ri"; import Link from "next/link"; import { downloadCSV } from "~/utils/helpers"; -import { block } from "million/react"; export const getServerSideProps: GetServerSideProps = async (ctx) => { const session = await getServerAuthSession(ctx); @@ -64,7 +63,7 @@ const Room: NextPage = () => { export default Room; -const RoomBody: React.FC = block(() => { +const RoomBody: React.FC = () => { const { data: sessionData } = useSession(); const { query } = useRouter(); const roomId = z.string().parse(query.id); @@ -488,4 +487,4 @@ const RoomBody: React.FC = block(() => { ); } -}); +}; From fbef7f810ae8eecc6e84ada19e77fb3dacc36c8f Mon Sep 17 00:00:00 2001 From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com> Date: Wed, 14 Jun 2023 17:20:00 -0600 Subject: [PATCH 4/5] Move TTL to environment vars... ezpz --- .env.example | 1 + src/env.mjs | 2 ++ src/server/api/routers/room.ts | 4 ++-- src/server/api/routers/user.ts | 4 ++-- src/server/api/routers/vote.ts | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 60f403a..2c1dd75 100644 --- a/.env.example +++ b/.env.example @@ -3,6 +3,7 @@ DATABASE_URL="" # Redis REDIS_URL="" +REDIS_TTL="" #Next Auth Core NEXTAUTH_SECRET="" diff --git a/src/env.mjs b/src/env.mjs index b66cd65..fef156c 100644 --- a/src/env.mjs +++ b/src/env.mjs @@ -7,6 +7,7 @@ import { z } from "zod"; const server = z.object({ DATABASE_URL: z.string().url(), REDIS_URL: z.string().url(), + REDIS_TTL: z.string(), NODE_ENV: z.enum(["development", "test", "production"]), NEXTAUTH_SECRET: process.env.NODE_ENV === "production" @@ -65,6 +66,7 @@ const client = z.object({ const processEnv = { DATABASE_URL: process.env.DATABASE_URL, REDIS_URL: process.env.REDIS_URL, + REDIS_TTL: process.env.REDIS_TTL, NODE_ENV: process.env.NODE_ENV, NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET, NEXTAUTH_URL: process.env.NEXTAUTH_URL, diff --git a/src/server/api/routers/room.ts b/src/server/api/routers/room.ts index 05c049c..87efb7f 100644 --- a/src/server/api/routers/room.ts +++ b/src/server/api/routers/room.ts @@ -108,7 +108,7 @@ export const roomRouter = createTRPCRouter({ env.APP_ENV, `kv_roomlist_${ctx.session.user.id}`, JSON.stringify(roomList), - 69 + Number(env.REDIS_TTL) ); return roomList; @@ -132,7 +132,7 @@ export const roomRouter = createTRPCRouter({ env.APP_ENV, `kv_roomcount_admin`, roomsCount, - 69 + Number(env.REDIS_TTL) ); return roomsCount; diff --git a/src/server/api/routers/user.ts b/src/server/api/routers/user.ts index 1e2fd86..2eb1628 100644 --- a/src/server/api/routers/user.ts +++ b/src/server/api/routers/user.ts @@ -34,7 +34,7 @@ export const userRouter = createTRPCRouter({ env.APP_ENV, `kv_usercount_admin`, usersCount, - 69 + Number(env.REDIS_TTL) ); return usersCount; @@ -109,7 +109,7 @@ export const userRouter = createTRPCRouter({ env.APP_ENV, `kv_userlist_admin`, JSON.stringify(users), - 69 + Number(env.REDIS_TTL) ); return users; diff --git a/src/server/api/routers/vote.ts b/src/server/api/routers/vote.ts index 5f71e39..82504a5 100644 --- a/src/server/api/routers/vote.ts +++ b/src/server/api/routers/vote.ts @@ -31,7 +31,7 @@ export const voteRouter = createTRPCRouter({ env.APP_ENV, `kv_votecount_admin`, votesCount, - 69 + Number(env.REDIS_TTL) ); return votesCount; @@ -81,7 +81,7 @@ export const voteRouter = createTRPCRouter({ env.APP_ENV, `kv_votes_${input.roomId}`, JSON.stringify(votesByRoomId), - 69 + Number(Number(env.REDIS_TTL)) ); return votesByRoomId; From 2dcf40f1183faa57515439872ead59cd352f2dd8 Mon Sep 17 00:00:00 2001 From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com> Date: Thu, 15 Jun 2023 00:06:50 -0600 Subject: [PATCH 5/5] Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5435d6..92b5087 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sprintpadawan", - "version": "1.1.7", + "version": "1.1.8", "description": "Plan. Sprint. Repeat.", "private": true, "scripts": {