diff --git a/.nvmrc b/.nvmrc index 3516580b..2a393af5 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.17.0 +20.18.0 diff --git a/package.json b/package.json index 980cef2d..718c097f 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,9 @@ "@noble/ed25519": "^2.1.0", "@noble/hashes": "^1.5.0", "@radix-ui/react-tabs": "^1.1.1", - "awilix": "^11.0.0", + "awilix": "^12.0.3", "class-variance-authority": "^0.7.0", - "crypto-browserify": "^3.12.0", + "crypto-browserify": "^3.12.1", "date-fns": "^4.1.0", "framer-motion": "^11.7.0", "http-message-signatures": "^1.0.4", @@ -39,23 +39,22 @@ "loglevel": "^1.9.2", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-hook-form": "^7.53.0", "react-router-dom": "^6.26.2", "safe-buffer": "5.2.1", "tailwind-merge": "^2.5.2", "webextension-polyfill": "^0.12.0" }, "devDependencies": { - "@jgoz/esbuild-plugin-typecheck": "^4.0.1", + "@jgoz/esbuild-plugin-typecheck": "^4.0.2", "@playwright/test": "^1.47.2", "@tailwindcss/forms": "^0.5.9", "@testing-library/jest-dom": "^6.5.0", "@testing-library/react": "^16.0.1", - "@types/archiver": "^6.0.2", - "@types/chrome": "^0.0.272", + "@types/archiver": "^6.0.3", + "@types/chrome": "^0.0.280", "@types/github-script": "github:actions/github-script", - "@types/jest": "^29.5.13", - "@types/node": "^20.16.9", + "@types/jest": "^29.5.14", + "@types/node": "^20.17.6", "@types/react": "^18.3.9", "@types/react-dom": "^18.3.0", "@types/react-router-dom": "^5.3.3", @@ -93,7 +92,7 @@ "pnpm": "^9.12.3", "npm": "pnpm", "yarn": "pnpm", - "node": "^20.17.0" + "node": "^20.18.0" }, "pnpm": { "overrides": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 37bc5dbe..3c583602 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,14 +28,14 @@ importers: specifier: ^1.1.1 version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) awilix: - specifier: ^11.0.0 - version: 11.0.0 + specifier: ^12.0.3 + version: 12.0.3 class-variance-authority: specifier: ^0.7.0 version: 0.7.0 crypto-browserify: - specifier: ^3.12.0 - version: 3.12.0 + specifier: ^3.12.1 + version: 3.12.1 date-fns: specifier: ^4.1.0 version: 4.1.0 @@ -60,9 +60,6 @@ importers: react-dom: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) - react-hook-form: - specifier: ^7.53.0 - version: 7.53.0(react@18.3.1) react-router-dom: specifier: ^6.26.2 version: 6.26.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -77,14 +74,14 @@ importers: version: 0.12.0 devDependencies: '@jgoz/esbuild-plugin-typecheck': - specifier: ^4.0.1 - version: 4.0.1(esbuild@0.24.0)(typescript@5.6.3) + specifier: ^4.0.2 + version: 4.0.2(esbuild@0.24.0)(typescript@5.6.3) '@playwright/test': specifier: ^1.47.2 version: 1.47.2 '@tailwindcss/forms': specifier: ^0.5.9 - version: 0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3))) + version: 0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3))) '@testing-library/jest-dom': specifier: ^6.5.0 version: 6.5.0 @@ -92,20 +89,20 @@ importers: specifier: ^16.0.1 version: 16.0.1(@testing-library/dom@10.1.0)(@types/react-dom@18.3.0)(@types/react@18.3.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/archiver': - specifier: ^6.0.2 - version: 6.0.2 + specifier: ^6.0.3 + version: 6.0.3 '@types/chrome': - specifier: ^0.0.272 - version: 0.0.272 + specifier: ^0.0.280 + version: 0.0.280 '@types/github-script': specifier: github:actions/github-script version: github-script@https://codeload.github.com/actions/github-script/tar.gz/4020e461acd7a80762cdfff123a1fde368246fa4 '@types/jest': - specifier: ^29.5.13 - version: 29.5.13 + specifier: ^29.5.14 + version: 29.5.14 '@types/node': - specifier: ^20.16.9 - version: 20.16.9 + specifier: ^20.17.6 + version: 20.17.6 '@types/react': specifier: ^18.3.9 version: 18.3.9 @@ -153,7 +150,7 @@ importers: version: 8.1.2 eslint-plugin-jest: specifier: ^28.8.3 - version: 28.8.3(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)))(typescript@5.6.3) + version: 28.8.3(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)))(typescript@5.6.3) eslint-plugin-jsx-a11y: specifier: ^6.10.2 version: 6.10.2(eslint@8.57.1) @@ -168,10 +165,10 @@ importers: version: 4.6.2(eslint@8.57.1) jest: specifier: ^29.7.0 - version: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + version: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) jest-chrome: specifier: ^0.8.0 - version: 0.8.0(jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3))) + version: 0.8.0(jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3))) jest-environment-jsdom: specifier: ^29.7.0 version: 29.7.0 @@ -192,10 +189,10 @@ importers: version: 1.8.1 tailwindcss: specifier: ^3.4.13 - version: 3.4.13(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + version: 3.4.13(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.24.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)))(typescript@5.6.3) + version: 29.2.5(@babel/core@7.24.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)))(typescript@5.6.3) tsx: specifier: ^4.19.1 version: 4.19.1 @@ -827,11 +824,11 @@ packages: resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - '@jgoz/esbuild-plugin-typecheck@4.0.1': - resolution: {integrity: sha512-0gATXkXWzKIZpC8hvZfHW4/cdwVyGaeO154/iVeOXWcxoAPnESJ9cgvTtl+QXiR4K/QMeeu2Ptcr472L7paMlQ==} + '@jgoz/esbuild-plugin-typecheck@4.0.2': + resolution: {integrity: sha512-EI0b2xLA+12YauKdXZ8wbdn3cKaKPBsh20S4Y0DyPENhhUALKYX6InuDMBD+9EKDHhcTqpCBkQVutFyx6l4RJA==} peerDependencies: - '@jgoz/esbuild-plugin-livereload': '>=2.1.1' - esbuild: 0.17.x || 0.18.x || 0.19.x || 0.20.x || 0.21.x || 0.22.x || 0.23.x + '@jgoz/esbuild-plugin-livereload': '>=2.1.2' + esbuild: 0.17.x || 0.18.x || 0.19.x || 0.20.x || 0.21.x || 0.22.x || 0.23.x || 0.24.x typescript: '>= 3.5' peerDependenciesMeta: '@jgoz/esbuild-plugin-livereload': @@ -1256,8 +1253,8 @@ packages: '@tsconfig/node16@1.0.4': resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} - '@types/archiver@6.0.2': - resolution: {integrity: sha512-KmROQqbQzKGuaAbmK+ZcytkJ51+YqDa7NmbXjmtC5YBLSyQYo21YaUnQ3HbaPFKL1ooo6RQ6OPYPIDyxfpDDXw==} + '@types/archiver@6.0.3': + resolution: {integrity: sha512-a6wUll6k3zX6qs5KlxIggs1P1JcYJaTCx2gnlr+f0S1yd2DoaEwoIK10HmBaLnZwWneBz+JBm0dwcZu0zECBcQ==} '@types/aria-query@5.0.4': resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==} @@ -1277,8 +1274,8 @@ packages: '@types/chrome@0.0.114': resolution: {integrity: sha512-i7qRr74IrxHtbnrZSKUuP5Uvd5EOKwlwJq/yp7+yTPihOXnPhNQO4Z5bqb1XTnrjdbUKEJicaVVbhcgtRijmLA==} - '@types/chrome@0.0.272': - resolution: {integrity: sha512-9cxDmmgyhXV8gsZvlRjqaDizNjIjbV0spsR0fIEaQUoHtbl9D8VkTOLyONgiBKK+guR38x5eMO3E3avUYOXwcQ==} + '@types/chrome@0.0.280': + resolution: {integrity: sha512-AotSmZrL9bcZDDmSI1D9dE7PGbhOur5L0cKxXd7IqbVizQWCY4gcvupPUVsQ4FfDj3V2tt/iOpomT9EY0s+w1g==} '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} @@ -1307,8 +1304,8 @@ packages: '@types/istanbul-reports@3.0.4': resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==} - '@types/jest@29.5.13': - resolution: {integrity: sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==} + '@types/jest@29.5.14': + resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==} '@types/jsdom@20.0.1': resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==} @@ -1319,8 +1316,8 @@ packages: '@types/less@3.0.6': resolution: {integrity: sha512-PecSzorDGdabF57OBeQO/xFbAkYWo88g4Xvnsx7LRwqLC17I7OoKtA3bQB9uXkY6UkMWCOsA8HSVpaoitscdXw==} - '@types/node@20.16.9': - resolution: {integrity: sha512-rkvIVJxsOfBejxK7I0FO5sa2WxFmJCzoDwcd88+fq/CUfynNywTo/1/T6hyFz22CyztsnLS9nVlHOnTI36RH5w==} + '@types/node@20.17.6': + resolution: {integrity: sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==} '@types/prop-types@15.7.11': resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} @@ -1613,8 +1610,8 @@ packages: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} - awilix@11.0.0: - resolution: {integrity: sha512-lnEm2TZu1OUWO1twi/3JrjSYu3RYjiOMiMQgfpwXj6uG4NSDtPSAWwTvqbpV7B8iWsXiC8GoMBKg1YsrUxPJhg==} + awilix@12.0.3: + resolution: {integrity: sha512-UBFALNvqVOj4V4s6yPW9JYTwg3Bih4w9kQRoD/J/z0iskMBRiCUkakmgPmSHRzjxEcJac7FiQhSpvD5JvSoLew==} engines: {node: '>=16.3.0'} axe-core@4.10.0: @@ -1889,8 +1886,9 @@ packages: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} - crypto-browserify@3.12.0: - resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==} + crypto-browserify@3.12.1: + resolution: {integrity: sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==} + engines: {node: '>= 0.10'} css.escape@1.5.1: resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==} @@ -3600,12 +3598,6 @@ packages: peerDependencies: react: ^18.3.1 - react-hook-form@7.53.0: - resolution: {integrity: sha512-M1n3HhqCww6S2hxLxciEXy2oISPnAzxY7gvwVPrtlczTM/1dDadXgUxDpHMrMTblDOcm/AXtXxHwZ3jpg1mqKQ==} - engines: {node: '>=18.0.0'} - peerDependencies: - react: ^16.8.0 || ^17 || ^18 || ^19 - react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -4771,27 +4763,27 @@ snapshots: '@jest/console@29.7.0': dependencies: '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 slash: 3.0.0 - '@jest/core@29.7.0(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3))': + '@jest/core@29.7.0(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3))': dependencies: '@jest/console': 29.7.0 '@jest/reporters': 29.7.0 '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.9.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + jest-config: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -4816,7 +4808,7 @@ snapshots: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 jest-mock: 29.7.0 '@jest/expect-utils@29.7.0': @@ -4834,7 +4826,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 20.16.9 + '@types/node': 20.17.6 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -4856,7 +4848,7 @@ snapshots: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.24 - '@types/node': 20.16.9 + '@types/node': 20.17.6 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -4926,11 +4918,11 @@ snapshots: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 20.16.9 + '@types/node': 20.17.6 '@types/yargs': 17.0.32 chalk: 4.1.2 - '@jgoz/esbuild-plugin-typecheck@4.0.1(esbuild@0.24.0)(typescript@5.6.3)': + '@jgoz/esbuild-plugin-typecheck@4.0.2(esbuild@0.24.0)(typescript@5.6.3)': dependencies: esbuild: 0.24.0 typescript: 5.6.3 @@ -5253,10 +5245,10 @@ snapshots: dependencies: '@sinonjs/commons': 3.0.1 - '@tailwindcss/forms@0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)))': + '@tailwindcss/forms@0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)))': dependencies: mini-svg-data-uri: 1.4.4 - tailwindcss: 3.4.13(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + tailwindcss: 3.4.13(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) '@testing-library/dom@10.1.0': dependencies: @@ -5303,7 +5295,7 @@ snapshots: '@tsconfig/node16@1.0.4': optional: true - '@types/archiver@6.0.2': + '@types/archiver@6.0.3': dependencies: '@types/readdir-glob': 1.1.5 @@ -5335,7 +5327,7 @@ snapshots: '@types/filesystem': 0.0.35 '@types/har-format': 1.2.15 - '@types/chrome@0.0.272': + '@types/chrome@0.0.280': dependencies: '@types/filesystem': 0.0.35 '@types/har-format': 1.2.15 @@ -5350,7 +5342,7 @@ snapshots: '@types/graceful-fs@4.1.9': dependencies: - '@types/node': 20.16.9 + '@types/node': 20.17.6 '@types/har-format@1.2.15': {} @@ -5366,14 +5358,14 @@ snapshots: dependencies: '@types/istanbul-lib-report': 3.0.3 - '@types/jest@29.5.13': + '@types/jest@29.5.14': dependencies: expect: 29.7.0 pretty-format: 29.7.0 '@types/jsdom@20.0.1': dependencies: - '@types/node': 20.16.9 + '@types/node': 20.17.6 '@types/tough-cookie': 4.0.5 parse5: 7.1.2 @@ -5381,7 +5373,7 @@ snapshots: '@types/less@3.0.6': {} - '@types/node@20.16.9': + '@types/node@20.17.6': dependencies: undici-types: 6.19.8 @@ -5409,7 +5401,7 @@ snapshots: '@types/readdir-glob@1.1.5': dependencies: - '@types/node': 20.16.9 + '@types/node': 20.17.6 '@types/sass@1.45.0': dependencies: @@ -5419,7 +5411,7 @@ snapshots: '@types/stylus@0.48.42': dependencies: - '@types/node': 20.16.9 + '@types/node': 20.17.6 '@types/tough-cookie@4.0.5': {} @@ -5746,7 +5738,7 @@ snapshots: dependencies: possible-typed-array-names: 1.0.0 - awilix@11.0.0: + awilix@12.0.3: dependencies: camel-case: 4.1.2 fast-glob: 3.3.2 @@ -6064,13 +6056,13 @@ snapshots: safe-buffer: 5.2.1 sha.js: 2.4.11 - create-jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)): + create-jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)): dependencies: '@jest/types': 29.6.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + jest-config: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -6088,7 +6080,7 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - crypto-browserify@3.12.0: + crypto-browserify@3.12.1: dependencies: browserify-cipher: 1.0.1 browserify-sign: 4.2.3 @@ -6096,6 +6088,7 @@ snapshots: create-hash: 1.2.0 create-hmac: 1.1.7 diffie-hellman: 5.0.3 + hash-base: 3.0.4 inherits: 2.0.4 pbkdf2: 3.1.2 public-encrypt: 4.0.3 @@ -6493,13 +6486,13 @@ snapshots: dependencies: htmlparser2: 9.1.0 - eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)))(typescript@5.6.3): + eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)))(typescript@5.6.3): dependencies: '@typescript-eslint/utils': 8.5.0(eslint@8.57.1)(typescript@5.6.3) eslint: 8.57.1 optionalDependencies: '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3) - jest: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + jest: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) transitivePeerDependencies: - supports-color - typescript @@ -6807,7 +6800,7 @@ snapshots: '@octokit/core': 5.2.0 '@octokit/plugin-request-log': 4.0.1(@octokit/core@5.2.0) '@octokit/plugin-retry': 6.0.1(@octokit/core@5.2.0) - '@types/node': 20.16.9 + '@types/node': 20.17.6 glob-parent@5.1.2: dependencies: @@ -7186,10 +7179,10 @@ snapshots: jest-util: 29.7.0 p-limit: 3.1.0 - jest-chrome@0.8.0(jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3))): + jest-chrome@0.8.0(jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3))): dependencies: '@types/chrome': 0.0.114 - jest: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + jest: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) jest-circus@29.7.0: dependencies: @@ -7197,7 +7190,7 @@ snapshots: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -7217,16 +7210,16 @@ snapshots: - babel-plugin-macros - supports-color - jest-cli@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)): + jest-cli@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)): dependencies: - '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + create-jest: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + jest-config: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -7236,7 +7229,7 @@ snapshots: - supports-color - ts-node - jest-config@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)): + jest-config@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)): dependencies: '@babel/core': 7.24.0 '@jest/test-sequencer': 29.7.0 @@ -7261,8 +7254,8 @@ snapshots: slash: 3.0.0 strip-json-comments: 3.1.1 optionalDependencies: - '@types/node': 20.16.9 - ts-node: 10.9.2(@types/node@20.16.9)(typescript@5.6.3) + '@types/node': 20.17.6 + ts-node: 10.9.2(@types/node@20.17.6)(typescript@5.6.3) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -7292,7 +7285,7 @@ snapshots: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 '@types/jsdom': 20.0.1 - '@types/node': 20.16.9 + '@types/node': 20.17.6 jest-mock: 29.7.0 jest-util: 29.7.0 jsdom: 20.0.3 @@ -7306,7 +7299,7 @@ snapshots: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -7316,7 +7309,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.9 - '@types/node': 20.16.9 + '@types/node': 20.17.6 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -7355,7 +7348,7 @@ snapshots: jest-mock@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 jest-util: 29.7.0 jest-pnp-resolver@1.2.3(jest-resolve@29.7.0): @@ -7390,7 +7383,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -7418,7 +7411,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 @@ -7466,7 +7459,7 @@ snapshots: jest-util@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -7485,7 +7478,7 @@ snapshots: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.16.9 + '@types/node': 20.17.6 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -7494,17 +7487,17 @@ snapshots: jest-worker@29.7.0: dependencies: - '@types/node': 20.16.9 + '@types/node': 20.17.6 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 - jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)): + jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)): dependencies: - '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + jest-cli: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -8016,13 +8009,13 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.4.47 - postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)): + postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)): dependencies: lilconfig: 3.1.1 yaml: 2.4.0 optionalDependencies: postcss: 8.4.47 - ts-node: 10.9.2(@types/node@20.16.9)(typescript@5.6.3) + ts-node: 10.9.2(@types/node@20.17.6)(typescript@5.6.3) postcss-modules-extract-imports@3.1.0(postcss@8.4.47): dependencies: @@ -8148,10 +8141,6 @@ snapshots: react: 18.3.1 scheduler: 0.23.2 - react-hook-form@7.53.0(react@18.3.1): - dependencies: - react: 18.3.1 - react-is@16.13.1: {} react-is@17.0.2: {} @@ -8528,7 +8517,7 @@ snapshots: tailwind-merge@2.5.2: {} - tailwindcss@3.4.13(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)): + tailwindcss@3.4.13(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -8547,7 +8536,7 @@ snapshots: postcss: 8.4.47 postcss-import: 15.1.0(postcss@8.4.47) postcss-js: 4.0.1(postcss@8.4.47) - postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) postcss-nested: 6.0.1(postcss@8.4.47) postcss-selector-parser: 6.0.15 resolve: 1.22.8 @@ -8614,12 +8603,12 @@ snapshots: ts-interface-checker@0.1.13: {} - ts-jest@29.2.5(@babel/core@7.24.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)))(typescript@5.6.3): + ts-jest@29.2.5(@babel/core@7.24.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)))(typescript@5.6.3): dependencies: bs-logger: 0.2.6 ejs: 3.1.10 fast-json-stable-stringify: 2.1.0 - jest: 29.7.0(@types/node@20.16.9)(ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3)) + jest: 29.7.0(@types/node@20.17.6)(ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3)) jest-util: 29.7.0 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -8636,14 +8625,14 @@ snapshots: ts-log@2.2.5: {} - ts-node@10.9.2(@types/node@20.16.9)(typescript@5.6.3): + ts-node@10.9.2(@types/node@20.17.6)(typescript@5.6.3): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.9 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.16.9 + '@types/node': 20.17.6 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 diff --git a/src/background/container.ts b/src/background/container.ts index 5c3e89c8..9e79f3c5 100644 --- a/src/background/container.ts +++ b/src/background/container.ts @@ -1,4 +1,9 @@ -import { asClass, asValue, createContainer, InjectionMode } from 'awilix'; +import { + asClass, + asValue, + createContainer, + InjectionMode, +} from 'awilix/browser'; import browser, { type Browser } from 'webextension-polyfill'; import { OpenPaymentsService, diff --git a/src/content/container.ts b/src/content/container.ts index c5eaf2d8..39e7495c 100644 --- a/src/content/container.ts +++ b/src/content/container.ts @@ -1,4 +1,9 @@ -import { asClass, asValue, createContainer, InjectionMode } from 'awilix'; +import { + asClass, + asValue, + createContainer, + InjectionMode, +} from 'awilix/browser'; import browser, { type Browser } from 'webextension-polyfill'; import { createLogger, Logger } from '@/shared/logger'; import { ContentScript } from './services/contentScript'; diff --git a/src/popup/components/ErrorKeyRevoked.tsx b/src/popup/components/ErrorKeyRevoked.tsx index 954c6162..cd7a5e30 100644 --- a/src/popup/components/ErrorKeyRevoked.tsx +++ b/src/popup/components/ErrorKeyRevoked.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import { useForm } from 'react-hook-form'; import { AnimatePresence, m } from 'framer-motion'; import { WarningSign } from '@/popup/components/Icons'; import { Button } from '@/popup/components/ui/Button'; @@ -129,26 +128,29 @@ const ReconnectScreen = ({ reconnectWallet, onReconnect, }: ReconnectScreenProps) => { + type Errors = Record<'root', null | { message: string }>; + const t = useTranslation(); - const { - handleSubmit, - formState: { errors, isSubmitting }, - clearErrors, - setError, - } = useForm({ criteriaMode: 'firstError', mode: 'onSubmit' }); + + const [isSubmitting, setIsSubmitting] = React.useState(false); + const [errors, setErrors] = React.useState({ + root: null, + }); const requestReconnect = async () => { - clearErrors(); + setErrors({ root: null }); try { + setIsSubmitting(true); const res = await reconnectWallet(); if (res.success) { onReconnect?.(); } else { - setError('root', { message: res.message }); + setErrors({ root: { message: res.message } }); } } catch (error) { - setError('root', { message: error.message }); + setErrors({ root: { message: error.message } }); } + setIsSubmitting(false); }; return ( @@ -157,7 +159,10 @@ const ReconnectScreen = ({ animate={{ opacity: 1 }} exit={{ opacity: 0 }} className="flex flex-col items-stretch gap-4" - onSubmit={handleSubmit(requestReconnect)} + onSubmit={(ev) => { + ev.preventDefault(); + requestReconnect(); + }} >