diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 2bb139a..659b953 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -4,7 +4,6 @@ module.exports = { "es2021": true }, "extends": [ - "prettier", "eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:solid/typescript", diff --git a/package.json b/package.json index cb9432d..7c827cf 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,12 @@ }, "type": "module", "devDependencies": { - "@types/node": "^18.16.4", + "@types/node": "^18.16.5", "@typescript-eslint/eslint-plugin": "^5.59.2", "@typescript-eslint/parser": "^5.59.2", "autoprefixer": "^10.4.14", "esbuild": "^0.14.54", - "eslint": "^8.39.0", + "eslint": "^8.40.0", "eslint-import-resolver-typescript": "2.7.1", "eslint-plugin-import": "2.27.5", "eslint-plugin-prettier": "4.2.1", @@ -31,7 +31,7 @@ "dependencies": { "@kobalte/core": "^0.8.2", "@kobalte/tailwindcss": "^0.5.0", - "@modular-forms/solid": "^0.13.1", + "@modular-forms/solid": "^0.13.2", "@mutinywallet/mutiny-wasm": "^0.2.8", "@mutinywallet/waila-wasm": "^0.1.5", "@solid-primitives/upload": "^0.0.111", @@ -41,12 +41,20 @@ "class-variance-authority": "^0.4.0", "nostr-tools": "^1.10.1", "qr-scanner": "^1.4.2", - "solid-js": "^1.7.4", + "solid-js": "^1.7.5", "solid-qr-code": "^0.0.8", "solid-start": "^0.2.26", "undici": "^5.22.0" }, "engines": { "node": ">=16.8" + }, + "prettier": { + "semi": false, + "singleQuote": false, + "trailingComma": "es5", + "printWidth": 80, + "tabWidth": 2, + "useTabs": false } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c94ddc1..846675e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,13 +3,13 @@ lockfileVersion: '6.0' dependencies: '@kobalte/core': specifier: ^0.8.2 - version: 0.8.2(solid-js@1.7.4) + version: 0.8.2(solid-js@1.7.5) '@kobalte/tailwindcss': specifier: ^0.5.0 version: 0.5.0(tailwindcss@3.3.2) '@modular-forms/solid': - specifier: ^0.13.1 - version: 0.13.1(solid-js@1.7.4) + specifier: ^0.13.2 + version: 0.13.2(solid-js@1.7.5) '@mutinywallet/mutiny-wasm': specifier: ^0.2.8 version: 0.2.8 @@ -18,16 +18,16 @@ dependencies: version: 0.1.5 '@solid-primitives/upload': specifier: ^0.0.111 - version: 0.0.111(solid-js@1.7.4) + version: 0.0.111(solid-js@1.7.5) '@solidjs/meta': specifier: ^0.28.4 - version: 0.28.4(solid-js@1.7.4) + version: 0.28.4(solid-js@1.7.5) '@solidjs/router': specifier: ^0.8.2 - version: 0.8.2(solid-js@1.7.4) + version: 0.8.2(solid-js@1.7.5) '@thisbeyond/solid-select': specifier: ^0.14.0 - version: 0.14.0(solid-js@1.7.4) + version: 0.14.0(solid-js@1.7.5) class-variance-authority: specifier: ^0.4.0 version: 0.4.0(typescript@4.9.5) @@ -38,28 +38,28 @@ dependencies: specifier: ^1.4.2 version: 1.4.2 solid-js: - specifier: ^1.7.4 - version: 1.7.4 + specifier: ^1.7.5 + version: 1.7.5 solid-qr-code: specifier: ^0.0.8 - version: 0.0.8(qr.js@0.0.0)(solid-js@1.7.4) + version: 0.0.8(qr.js@0.0.0)(solid-js@1.7.5) solid-start: specifier: ^0.2.26 - version: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.4)(solid-start-node@0.2.26)(vite@4.3.5) + version: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.5)(solid-start-node@0.2.26)(vite@4.3.5) undici: specifier: ^5.22.0 version: 5.22.0 devDependencies: '@types/node': - specifier: ^18.16.4 - version: 18.16.4 + specifier: ^18.16.5 + version: 18.16.5 '@typescript-eslint/eslint-plugin': specifier: ^5.59.2 - version: 5.59.2(@typescript-eslint/parser@5.59.2)(eslint@8.39.0)(typescript@4.9.5) + version: 5.59.2(@typescript-eslint/parser@5.59.2)(eslint@8.40.0)(typescript@4.9.5) '@typescript-eslint/parser': specifier: ^5.59.2 - version: 5.59.2(eslint@8.39.0)(typescript@4.9.5) + version: 5.59.2(eslint@8.40.0)(typescript@4.9.5) autoprefixer: specifier: ^10.4.14 version: 10.4.14(postcss@8.4.23) @@ -67,20 +67,20 @@ devDependencies: specifier: ^0.14.54 version: 0.14.54 eslint: - specifier: ^8.39.0 - version: 8.39.0 + specifier: ^8.40.0 + version: 8.40.0 eslint-import-resolver-typescript: specifier: 2.7.1 - version: 2.7.1(eslint-plugin-import@2.27.5)(eslint@8.39.0) + version: 2.7.1(eslint-plugin-import@2.27.5)(eslint@8.40.0) eslint-plugin-import: specifier: 2.27.5 - version: 2.27.5(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-typescript@2.7.1)(eslint@8.39.0) + version: 2.27.5(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-typescript@2.7.1)(eslint@8.40.0) eslint-plugin-prettier: specifier: 4.2.1 - version: 4.2.1(eslint@8.39.0)(prettier@2.8.8) + version: 4.2.1(eslint@8.40.0)(prettier@2.8.8) eslint-plugin-solid: specifier: 0.11.0 - version: 0.11.0(eslint@8.39.0)(typescript@4.9.5) + version: 0.11.0(eslint@8.40.0)(typescript@4.9.5) postcss: specifier: ^8.4.23 version: 8.4.23 @@ -95,7 +95,7 @@ devDependencies: version: 4.9.5 vite: specifier: ^4.3.5 - version: 4.3.5(@types/node@18.16.4) + version: 4.3.5(@types/node@18.16.5) vite-plugin-pwa: specifier: ^0.14.7 version: 0.14.7(vite@4.3.5)(workbox-build@6.5.4)(workbox-window@6.5.4) @@ -1161,7 +1161,7 @@ packages: babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.21.8) babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.21.8) babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.21.8) - core-js-compat: 3.30.1 + core-js-compat: 3.30.2 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -1420,14 +1420,14 @@ packages: requiresBuild: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.39.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.40.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.39.0 - eslint-visitor-keys: 3.4.0 + eslint: 8.40.0 + eslint-visitor-keys: 3.4.1 dev: true /@eslint-community/regexpp@4.5.1: @@ -1435,13 +1435,13 @@ packages: engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true - /@eslint/eslintrc@2.0.2: - resolution: {integrity: sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==} + /@eslint/eslintrc@2.0.3: + resolution: {integrity: sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4 - espree: 9.5.1 + espree: 9.5.2 globals: 13.20.0 ignore: 5.2.4 import-fresh: 3.3.0 @@ -1452,8 +1452,8 @@ packages: - supports-color dev: true - /@eslint/js@8.39.0: - resolution: {integrity: sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==} + /@eslint/js@8.40.0: + resolution: {integrity: sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -1547,7 +1547,7 @@ packages: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 - /@kobalte/core@0.8.2(solid-js@1.7.4): + /@kobalte/core@0.8.2(solid-js@1.7.5): resolution: {integrity: sha512-EoBYKpYa3+Csr5Zh7l3aY3yAg7fk1O3ZM9lGyD1mdQ1FutTuwTkyj8z1CvSSj1Klb+rBL+X1N662Occ8Bmsi2w==} peerDependencies: solid-js: ^1.6.15 @@ -1556,8 +1556,8 @@ packages: '@internationalized/date': 3.2.0 '@internationalized/number': 3.2.0 '@internationalized/string': 3.1.0 - '@kobalte/utils': 0.6.1(solid-js@1.7.4) - solid-js: 1.7.4 + '@kobalte/utils': 0.6.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false /@kobalte/tailwindcss@0.5.0(tailwindcss@3.3.2): @@ -1568,26 +1568,26 @@ packages: tailwindcss: 3.3.2 dev: false - /@kobalte/utils@0.6.1(solid-js@1.7.4): + /@kobalte/utils@0.6.1(solid-js@1.7.5): resolution: {integrity: sha512-YvBqe9t9j0iYFUHfKXSMLQKM3s5+nL72RvT9b75W+IOxUpSpN4rdaI8C2j97k3LsEt7qY4ktJdt8lPM1rr8JXw==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/event-listener': 2.2.10(solid-js@1.7.4) - '@solid-primitives/keyed': 1.2.0(solid-js@1.7.4) - '@solid-primitives/media': 2.1.6(solid-js@1.7.4) - '@solid-primitives/props': 3.1.4(solid-js@1.7.4) - '@solid-primitives/refs': 1.0.2(solid-js@1.7.4) - '@solid-primitives/utils': 5.5.2(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/event-listener': 2.2.11(solid-js@1.7.5) + '@solid-primitives/keyed': 1.2.0(solid-js@1.7.5) + '@solid-primitives/media': 2.2.1(solid-js@1.7.5) + '@solid-primitives/props': 3.1.5(solid-js@1.7.5) + '@solid-primitives/refs': 1.0.3(solid-js@1.7.5) + '@solid-primitives/utils': 5.5.2(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@modular-forms/solid@0.13.1(solid-js@1.7.4): - resolution: {integrity: sha512-4Rx7drZ3/bZK46lfGbIyExYfPcPnpEDXcA9xhrUaLoZNWuMvPLTt8ctN6SZaqM5xvkGuE5dElUltqORk9eHA9A==} + /@modular-forms/solid@0.13.2(solid-js@1.7.5): + resolution: {integrity: sha512-wiwJUxbwDp8F2FI0hTYoydNumVRZruIiyjV+w91++zA0QofASuMWe3fs4lETHpaiQK/jJsGXhys7BFqXUf9SDg==} peerDependencies: solid-js: ^1.3.1 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.5 dev: false /@mutinywallet/mutiny-wasm@0.2.8: @@ -1785,109 +1785,109 @@ packages: /@sideway/pinpoint@2.0.0: resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==} - /@solid-primitives/event-listener@2.2.10(solid-js@1.7.4): - resolution: {integrity: sha512-rWBCeF1NRAmLJtVo2wpY9vF3IAQ8VAxGnFDOUqROSdYhUfiCeM7Hw3PKkGCELwNQzZK1W1z+MjzB7fctpjX4Sg==} + /@solid-primitives/event-listener@2.2.11(solid-js@1.7.5): + resolution: {integrity: sha512-pX/offimvt8qtXxwk3kUB6R7igVhnXmSHosQ0ITBOPQvcyhB9Lfrb80zSM8Z0MUf6ZKWyt5n8lco+yK5v2+bIg==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.1.0(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/utils': 6.1.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@solid-primitives/keyed@1.2.0(solid-js@1.7.4): + /@solid-primitives/keyed@1.2.0(solid-js@1.7.5): resolution: {integrity: sha512-0DuTeJdxWjCTu73XnDZs24JzfXckBnpvCfQ6Mf/kTPKkMZJh7tjkBnZEk48ckrE9xmwat9stIdfrBmZctsepIw==} peerDependencies: solid-js: ^1.6.12 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.5 dev: false - /@solid-primitives/media@2.1.6(solid-js@1.7.4): - resolution: {integrity: sha512-7yixsXmhZfbsAxk/glmTFWcacXhudYsbc/9kbC7EbaE+Jnd6i0HZmmQEkV+s/rZ32e5sE9dAHvlhPtiLbQb7Jg==} + /@solid-primitives/media@2.2.1(solid-js@1.7.5): + resolution: {integrity: sha512-KhfGIGox8zJlKKMAzj/Up9wvsZ6qgiN1htBV/fe7FKvqr+jjhnPl+71DzmdmcrW1JY3cuE5bNWpSubc8TD7dJw==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/event-listener': 2.2.10(solid-js@1.7.4) - '@solid-primitives/rootless': 1.3.2(solid-js@1.7.4) - '@solid-primitives/static-store': 0.0.2(solid-js@1.7.4) - '@solid-primitives/utils': 6.1.0(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/event-listener': 2.2.11(solid-js@1.7.5) + '@solid-primitives/rootless': 1.4.0(solid-js@1.7.5) + '@solid-primitives/static-store': 0.0.3(solid-js@1.7.5) + '@solid-primitives/utils': 6.1.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@solid-primitives/props@3.1.4(solid-js@1.7.4): - resolution: {integrity: sha512-RiwOZXbqb3RMmkznyfI63gwAB/iVHPk8AWN55oIEBRkjzgpuqRXIzdbsSQVy23jMbkRs91tRtzxQ/g6eoWLnuQ==} + /@solid-primitives/props@3.1.5(solid-js@1.7.5): + resolution: {integrity: sha512-rnFjo3PgH2I4wJEGaMY+iKETfPntq9GMLbdX6bhllMocwF/CHILii4Hfgg41nhcGjJysuCSlA4WTq33ZD/9CFw==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.1.0(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/utils': 6.1.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@solid-primitives/refs@1.0.2(solid-js@1.7.4): - resolution: {integrity: sha512-qnqQRdYbsENlVx86QCfftRKGZ/9zUJMGK9U85xDRymocEyeUXxdxgq0FeyGhvgg4A25spJVwHmuZUGY0aMBBLA==} + /@solid-primitives/refs@1.0.3(solid-js@1.7.5): + resolution: {integrity: sha512-LjB/qUCyke5socrcUxPGBv2GlciOjpba7HC1EIz6gihSePdu+SF3w+p2WaV4pACJy8ELacJ2lNq4EbAK7sTkAg==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.1.0(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/utils': 6.1.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@solid-primitives/rootless@1.3.2(solid-js@1.7.4): - resolution: {integrity: sha512-R1rncXOUcB/i3PyvKhSWcsocPRe1n3HsMIO717RpWFd2knUF8+b0cGgRDEoneGaV/a5kq4cqH3csa66klxuM3A==} + /@solid-primitives/rootless@1.4.0(solid-js@1.7.5): + resolution: {integrity: sha512-hShkSvajBQKWI0g1oNKfLb3W5owQIhW1wBaMBgq/sAdUhWevyM+ldYab2bry5vnh7DxemLSCrtvFJWNTHCuJgQ==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.1.0(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/utils': 6.1.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@solid-primitives/static-store@0.0.2(solid-js@1.7.4): - resolution: {integrity: sha512-JR51MmoZbFWE7fmzm0NnfS4RuLHpzXpPqAb7RJu3fHDGHp+q7v4KylseULcailINzDIosHQXbpiDQlj2Lx9zbQ==} + /@solid-primitives/static-store@0.0.3(solid-js@1.7.5): + resolution: {integrity: sha512-OHwr9w8gb+IZGGEdmPL5Oet62p4c8Py3AaxxOopxv++SmGoed2niO8nORNbUk/riScvqzeDpOrAuQ//fYPm2tw==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.1.0(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/utils': 6.1.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@solid-primitives/upload@0.0.111(solid-js@1.7.4): + /@solid-primitives/upload@0.0.111(solid-js@1.7.5): resolution: {integrity: sha512-Bxe2W5oJu7kRurmxr+ftvOojKhy5JUM91md2nBcedwrq1EspqWggV2ZOHauGcn8hg86W8p9Y+N8dmv16QHNRxQ==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.1.0(solid-js@1.7.4) - solid-js: 1.7.4 + '@solid-primitives/utils': 6.1.1(solid-js@1.7.5) + solid-js: 1.7.5 dev: false - /@solid-primitives/utils@5.5.2(solid-js@1.7.4): + /@solid-primitives/utils@5.5.2(solid-js@1.7.5): resolution: {integrity: sha512-L52ig3eHKU6CqbPCKJIb4lweBuINHBOERcE1duApyKozEN8+zCqEKwD1Qo9ljKeEzJTBGWClxNpwEiNTUWTGvg==} peerDependencies: solid-js: ^1.6.12 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.5 dev: false - /@solid-primitives/utils@6.1.0(solid-js@1.7.4): - resolution: {integrity: sha512-uTikKFrq33UO+MnKt2WzZr9WYbQe5YX58ytGkL+29DL6o0pZs1wrICbd4ymzSm8azqzMcQqEQOL3HLWjuv9tLw==} + /@solid-primitives/utils@6.1.1(solid-js@1.7.5): + resolution: {integrity: sha512-wxxUdxja126jTROs9Ro8Z5ExbHs9rv2Tl744S3Qmzki/gTcTXW8D1TvTArQcjqkCvSw8OIQ2EO2NI8sR28Trxg==} peerDependencies: solid-js: ^1.6.12 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.5 dev: false - /@solidjs/meta@0.28.4(solid-js@1.7.4): + /@solidjs/meta@0.28.4(solid-js@1.7.5): resolution: {integrity: sha512-1USElsQuGVcJnmZ6CxPfUVmKvCsVdBQoGrUyMxLtFw36Ytt90dPs/qLyXLvPR/ZPD16/qauWqg6APEkbrDOLcA==} peerDependencies: solid-js: '>=1.4.0' dependencies: - solid-js: 1.7.4 + solid-js: 1.7.5 - /@solidjs/router@0.8.2(solid-js@1.7.4): + /@solidjs/router@0.8.2(solid-js@1.7.5): resolution: {integrity: sha512-gUKW+LZqxtX6y/Aw6JKyy4gQ9E7dLqp513oB9pSYJR1HM5c56Pf7eijzyXX+b3WuXig18Cxqah4tMtF0YGu80w==} peerDependencies: solid-js: ^1.5.3 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.5 /@surma/rollup-plugin-off-main-thread@2.2.3: resolution: {integrity: sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==} @@ -1904,12 +1904,12 @@ packages: tslib: 2.5.0 dev: false - /@thisbeyond/solid-select@0.14.0(solid-js@1.7.4): + /@thisbeyond/solid-select@0.14.0(solid-js@1.7.5): resolution: {integrity: sha512-ecq4U3Vnc/nJbU84ARuPg2scNuYt994ljF5AmBlzuZW87x43mWiGJ5hEWufIJJMpDT6CcnCIx/xbrdDkaDEHQw==} peerDependencies: solid-js: ^1.5 dependencies: - solid-js: 1.7.4 + solid-js: 1.7.5 dev: false /@types/babel__core@7.20.0: @@ -1955,8 +1955,8 @@ packages: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} dev: true - /@types/node@18.16.4: - resolution: {integrity: sha512-LUhvPmAKAbgm+p/K11IWszLZVoZDlMF4NRmqbhEzDz/CnCuehPkZXwZbBCKGJsgjnuVejotBwM7B3Scrq4EqDw==} + /@types/node@18.16.5: + resolution: {integrity: sha512-seOA34WMo9KB+UA78qaJoCO20RJzZGVXQ5Sh6FWu0g/hfT44nKXnej3/tCQl7FL97idFpBhisLYCTB50S0EirA==} /@types/offscreencanvas@2019.7.0: resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==} @@ -1965,7 +1965,7 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 18.16.4 + '@types/node': 18.16.5 dev: true /@types/resolve@1.20.2: @@ -1979,7 +1979,7 @@ packages: resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==} dev: true - /@typescript-eslint/eslint-plugin@5.59.2(@typescript-eslint/parser@5.59.2)(eslint@8.39.0)(typescript@4.9.5): + /@typescript-eslint/eslint-plugin@5.59.2(@typescript-eslint/parser@5.59.2)(eslint@8.40.0)(typescript@4.9.5): resolution: {integrity: sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1991,12 +1991,12 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.5.1 - '@typescript-eslint/parser': 5.59.2(eslint@8.39.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.59.2(eslint@8.40.0)(typescript@4.9.5) '@typescript-eslint/scope-manager': 5.59.2 - '@typescript-eslint/type-utils': 5.59.2(eslint@8.39.0)(typescript@4.9.5) - '@typescript-eslint/utils': 5.59.2(eslint@8.39.0)(typescript@4.9.5) + '@typescript-eslint/type-utils': 5.59.2(eslint@8.40.0)(typescript@4.9.5) + '@typescript-eslint/utils': 5.59.2(eslint@8.40.0)(typescript@4.9.5) debug: 4.3.4 - eslint: 8.39.0 + eslint: 8.40.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 natural-compare-lite: 1.4.0 @@ -2007,7 +2007,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@5.59.2(eslint@8.39.0)(typescript@4.9.5): + /@typescript-eslint/parser@5.59.2(eslint@8.40.0)(typescript@4.9.5): resolution: {integrity: sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2021,7 +2021,7 @@ packages: '@typescript-eslint/types': 5.59.2 '@typescript-eslint/typescript-estree': 5.59.2(typescript@4.9.5) debug: 4.3.4 - eslint: 8.39.0 + eslint: 8.40.0 typescript: 4.9.5 transitivePeerDependencies: - supports-color @@ -2035,7 +2035,7 @@ packages: '@typescript-eslint/visitor-keys': 5.59.2 dev: true - /@typescript-eslint/type-utils@5.59.2(eslint@8.39.0)(typescript@4.9.5): + /@typescript-eslint/type-utils@5.59.2(eslint@8.40.0)(typescript@4.9.5): resolution: {integrity: sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2046,9 +2046,9 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 5.59.2(typescript@4.9.5) - '@typescript-eslint/utils': 5.59.2(eslint@8.39.0)(typescript@4.9.5) + '@typescript-eslint/utils': 5.59.2(eslint@8.40.0)(typescript@4.9.5) debug: 4.3.4 - eslint: 8.39.0 + eslint: 8.40.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 transitivePeerDependencies: @@ -2081,19 +2081,19 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@5.59.2(eslint@8.39.0)(typescript@4.9.5): + /@typescript-eslint/utils@5.59.2(eslint@8.40.0)(typescript@4.9.5): resolution: {integrity: sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.40.0) '@types/json-schema': 7.0.11 '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.59.2 '@typescript-eslint/types': 5.59.2 '@typescript-eslint/typescript-estree': 5.59.2(typescript@4.9.5) - eslint: 8.39.0 + eslint: 8.40.0 eslint-scope: 5.1.1 semver: 7.5.0 transitivePeerDependencies: @@ -2106,7 +2106,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: '@typescript-eslint/types': 5.59.2 - eslint-visitor-keys: 3.4.0 + eslint-visitor-keys: 3.4.1 dev: true /accepts@1.3.8: @@ -2240,7 +2240,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.5 - caniuse-lite: 1.0.30001482 + caniuse-lite: 1.0.30001486 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -2291,7 +2291,7 @@ packages: dependencies: '@babel/core': 7.21.8 '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8) - core-js-compat: 3.30.1 + core-js-compat: 3.30.2 transitivePeerDependencies: - supports-color @@ -2342,8 +2342,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001482 - electron-to-chromium: 1.4.384 + caniuse-lite: 1.0.30001486 + electron-to-chromium: 1.4.385 node-releases: 2.0.10 update-browserslist-db: 1.0.11(browserslist@4.21.5) @@ -2380,8 +2380,8 @@ packages: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} - /caniuse-lite@1.0.30001482: - resolution: {integrity: sha512-F1ZInsg53cegyjroxLNW9DmrEQ1SuGRTO1QlpA0o2/6OpQ0gFeDRoq1yFmnr8Sakn9qwwt9DmbxHB6w167OSuQ==} + /caniuse-lite@1.0.30001486: + resolution: {integrity: sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==} /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -2501,8 +2501,8 @@ packages: /convert-source-map@1.9.0: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} - /core-js-compat@3.30.1: - resolution: {integrity: sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw==} + /core-js-compat@3.30.2: + resolution: {integrity: sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==} dependencies: browserslist: 4.21.5 @@ -2626,8 +2626,8 @@ packages: jake: 10.8.5 dev: true - /electron-to-chromium@1.4.384: - resolution: {integrity: sha512-I97q0MmRAAqj53+a8vZsDkEXBZki+ehYAOPzwtQzALip52aEp2+BJqHFtTlsfjoqVZYwPpHC8wM6MbsSZQ/Eqw==} + /electron-to-chromium@1.4.385: + resolution: {integrity: sha512-L9zlje9bIw0h+CwPQumiuVlfMcV4boxRjFIWDcLfFqTZNbkwOExBzfmswytHawObQX4OUhtNv8gIiB21kOurIg==} /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -2847,7 +2847,7 @@ packages: dev: true optional: true - /esbuild-plugin-solid@0.5.0(esbuild@0.17.18)(solid-js@1.7.4): + /esbuild-plugin-solid@0.5.0(esbuild@0.17.18)(solid-js@1.7.5): resolution: {integrity: sha512-ITK6n+0ayGFeDVUZWNMxX+vLsasEN1ILrg4pISsNOQ+mq4ljlJJiuXotInd+HE0MzwTcA9wExT1yzDE2hsqPsg==} peerDependencies: esbuild: '>=0.12' @@ -2857,7 +2857,7 @@ packages: '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) babel-preset-solid: 1.7.4(@babel/core@7.21.8) esbuild: 0.17.18 - solid-js: 1.7.4 + solid-js: 1.7.5 transitivePeerDependencies: - supports-color @@ -2981,7 +2981,7 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript@2.7.1(eslint-plugin-import@2.27.5)(eslint@8.39.0): + /eslint-import-resolver-typescript@2.7.1(eslint-plugin-import@2.27.5)(eslint@8.40.0): resolution: {integrity: sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==} engines: {node: '>=4'} peerDependencies: @@ -2989,8 +2989,8 @@ packages: eslint-plugin-import: '*' dependencies: debug: 4.3.4 - eslint: 8.39.0 - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-typescript@2.7.1)(eslint@8.39.0) + eslint: 8.40.0 + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-typescript@2.7.1)(eslint@8.40.0) glob: 7.2.3 is-glob: 4.0.3 resolve: 1.22.2 @@ -2999,7 +2999,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@2.7.1)(eslint@8.39.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@2.7.1)(eslint@8.40.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -3020,16 +3020,16 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.59.2(eslint@8.39.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.59.2(eslint@8.40.0)(typescript@4.9.5) debug: 3.2.7 - eslint: 8.39.0 + eslint: 8.40.0 eslint-import-resolver-node: 0.3.7 - eslint-import-resolver-typescript: 2.7.1(eslint-plugin-import@2.27.5)(eslint@8.39.0) + eslint-import-resolver-typescript: 2.7.1(eslint-plugin-import@2.27.5)(eslint@8.40.0) transitivePeerDependencies: - supports-color dev: true - /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-typescript@2.7.1)(eslint@8.39.0): + /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-typescript@2.7.1)(eslint@8.40.0): resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==} engines: {node: '>=4'} peerDependencies: @@ -3039,15 +3039,15 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.59.2(eslint@8.39.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.59.2(eslint@8.40.0)(typescript@4.9.5) array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 debug: 3.2.7 doctrine: 2.1.0 - eslint: 8.39.0 + eslint: 8.40.0 eslint-import-resolver-node: 0.3.7 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@2.7.1)(eslint@8.39.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.59.2)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@2.7.1)(eslint@8.40.0) has: 1.0.3 is-core-module: 2.12.0 is-glob: 4.0.3 @@ -3062,7 +3062,7 @@ packages: - supports-color dev: true - /eslint-plugin-prettier@4.2.1(eslint@8.39.0)(prettier@2.8.8): + /eslint-plugin-prettier@4.2.1(eslint@8.40.0)(prettier@2.8.8): resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3073,19 +3073,19 @@ packages: eslint-config-prettier: optional: true dependencies: - eslint: 8.39.0 + eslint: 8.40.0 prettier: 2.8.8 prettier-linter-helpers: 1.0.0 dev: true - /eslint-plugin-solid@0.11.0(eslint@8.39.0)(typescript@4.9.5): + /eslint-plugin-solid@0.11.0(eslint@8.40.0)(typescript@4.9.5): resolution: {integrity: sha512-3ve6IpEtl8nOvJnjaJACqlBmv449l6dMMhMczjQWvvLlRqkzLemgsJ9H+Isu8GLSBTNxDIm5oSKx/lO2j8vKbA==} engines: {node: '>=12.0.0'} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.59.2(eslint@8.39.0)(typescript@4.9.5) - eslint: 8.39.0 + '@typescript-eslint/utils': 5.59.2(eslint@8.40.0)(typescript@4.9.5) + eslint: 8.40.0 is-html: 2.0.0 jsx-ast-utils: 3.3.3 kebab-case: 1.0.2 @@ -3112,20 +3112,20 @@ packages: estraverse: 5.3.0 dev: true - /eslint-visitor-keys@3.4.0: - resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==} + /eslint-visitor-keys@3.4.1: + resolution: {integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.39.0: - resolution: {integrity: sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==} + /eslint@8.40.0: + resolution: {integrity: sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.40.0) '@eslint-community/regexpp': 4.5.1 - '@eslint/eslintrc': 2.0.2 - '@eslint/js': 8.39.0 + '@eslint/eslintrc': 2.0.3 + '@eslint/js': 8.40.0 '@humanwhocodes/config-array': 0.11.8 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -3136,8 +3136,8 @@ packages: doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.0 - eslint-visitor-keys: 3.4.0 - espree: 9.5.1 + eslint-visitor-keys: 3.4.1 + espree: 9.5.2 esquery: 1.5.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -3166,13 +3166,13 @@ packages: - supports-color dev: true - /espree@9.5.1: - resolution: {integrity: sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==} + /espree@9.5.2: + resolution: {integrity: sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: acorn: 8.8.2 acorn-jsx: 5.3.2(acorn@8.8.2) - eslint-visitor-keys: 3.4.0 + eslint-visitor-keys: 3.4.1 dev: true /esquery@1.5.0: @@ -3738,8 +3738,8 @@ packages: call-bind: 1.0.2 dev: true - /is-what@4.1.8: - resolution: {integrity: sha512-yq8gMao5upkPoGEU9LsB2P+K3Kt8Q3fQFCGyNCWOAnJAMzEXVV9drYb0TXr42TTliLLhKIBvulgAXgtLLnwzGA==} + /is-what@4.1.9: + resolution: {integrity: sha512-I3FU0rkVvwhgLLEs6iITwZ/JaLXe7tQcHyzupXky8jigt1vu4KM0UOqDr963j36JRvJ835EATVIm6MnGz/i1/g==} engines: {node: '>=12.13'} /is-wsl@2.2.0: @@ -3767,7 +3767,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.16.4 + '@types/node': 18.16.5 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -3929,11 +3929,11 @@ packages: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 - /merge-anything@5.1.5: - resolution: {integrity: sha512-9lquMsJxgaef2BXYUy8VnqHmuLYaEiGd7SULqOTuDFA9Lw6g6Hmdsblc6+yqshdJOQKkn9I106+3D5mnQMstvg==} + /merge-anything@5.1.6: + resolution: {integrity: sha512-0SIP3417t0sOL6/crPb6oC+ZNSMrjJeWkydlddgZVzsjQA86l8v3+f3WwvKanbsHxVF80QouJIdSh+Q249bu0g==} engines: {node: '>=12.13'} dependencies: - is-what: 4.1.8 + is-what: 4.1.9 /merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -4397,7 +4397,7 @@ packages: jest-worker: 26.6.2 rollup: 2.79.1 serialize-javascript: 4.0.0 - terser: 5.17.1 + terser: 5.17.2 dev: true /rollup-plugin-visualizer@5.9.0(rollup@3.21.5): @@ -4533,13 +4533,13 @@ packages: engines: {node: '>=8'} dev: true - /solid-js@1.7.4: - resolution: {integrity: sha512-hD/bzIpaa7DL/LGRRTLFvejQuxQaoXyH+DBgPputJW7zvFigCewQIoDvbwDR4VHTsa8VsMDPzV8BT0F9OqsS1Q==} + /solid-js@1.7.5: + resolution: {integrity: sha512-GfJ8na1e9FG1oAF5xC24BM+ATLym0sfH+ZblkbBFpueYdq3fWAoA5Ve+jGeIeLI7jmMGfa0rUaKruszNm2sH8w==} dependencies: csstype: 3.1.2 seroval: 0.5.1 - /solid-qr-code@0.0.8(qr.js@0.0.0)(solid-js@1.7.4): + /solid-qr-code@0.0.8(qr.js@0.0.0)(solid-js@1.7.5): resolution: {integrity: sha512-K7LC3IKvyRag6WW7/ijJl32pBmoC3EzZ7AuydyaAVKSmlwukJmqvrFkrxaA1bOWabYJhzP9qwLbjDVlCUP2BwQ==} engines: {node: '>=10', yarn: '>=1.22.5'} peerDependencies: @@ -4547,10 +4547,10 @@ packages: solid-js: ^1.4.8 dependencies: qr.js: 0.0.0 - solid-js: 1.7.4 + solid-js: 1.7.5 dev: false - /solid-refresh@0.5.2(solid-js@1.7.4): + /solid-refresh@0.5.2(solid-js@1.7.5): resolution: {integrity: sha512-I69HmFj0LsGRJ3n8CEMVjyQFgVtuM2bSjznu2hCnsY+i5oOxh8ioWj00nnHBv0UYD3WpE/Sq4Q3TNw2IKmKN7A==} peerDependencies: solid-js: ^1.3 @@ -4558,7 +4558,7 @@ packages: '@babel/generator': 7.21.5 '@babel/helper-module-imports': 7.21.4 '@babel/types': 7.21.5 - solid-js: 1.7.4 + solid-js: 1.7.5 /solid-start-node@0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.5): resolution: {integrity: sha512-8vciTGoQV+lIlCUSVHJPazlaoKDRfBowDkPeBr/EZdmtbcMOKoJYf/APPQWFspylF+nhzunMf0+zJP90VtMEYg==} @@ -4574,14 +4574,14 @@ packages: polka: 1.0.0-next.22 rollup: 3.21.5 sirv: 2.0.3 - solid-start: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.4)(solid-start-node@0.2.26)(vite@4.3.5) - terser: 5.17.1 + solid-start: 0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.5)(solid-start-node@0.2.26)(vite@4.3.5) + terser: 5.17.2 undici: 5.22.0 - vite: 4.3.5(@types/node@18.16.4) + vite: 4.3.5(@types/node@18.16.5) transitivePeerDependencies: - supports-color - /solid-start@0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.4)(solid-start-node@0.2.26)(vite@4.3.5): + /solid-start@0.2.26(@solidjs/meta@0.28.4)(@solidjs/router@0.8.2)(solid-js@1.7.5)(solid-start-node@0.2.26)(vite@4.3.5): resolution: {integrity: sha512-kne2HZlnSMzsirdnvNs1CsDqBl0L0uvKKt1t4de1CH7JIngyqoMcER97jTE0Ejr84KknANaKAdvJAzZcL7Ueng==} hasBin: true peerDependencies: @@ -4621,8 +4621,8 @@ packages: '@babel/preset-env': 7.21.5(@babel/core@7.21.8) '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) '@babel/template': 7.20.7 - '@solidjs/meta': 0.28.4(solid-js@1.7.4) - '@solidjs/router': 0.8.2(solid-js@1.7.4) + '@solidjs/meta': 0.28.4(solid-js@1.7.5) + '@solidjs/router': 0.8.2(solid-js@1.7.5) '@types/cookie': 0.5.1 chokidar: 3.5.3 compression: 1.7.4 @@ -4632,7 +4632,7 @@ packages: dotenv: 16.0.3 es-module-lexer: 1.2.1 esbuild: 0.17.18 - esbuild-plugin-solid: 0.5.0(esbuild@0.17.18)(solid-js@1.7.4) + esbuild-plugin-solid: 0.5.0(esbuild@0.17.18)(solid-js@1.7.5) fast-glob: 3.2.12 get-port: 6.1.2 parse-multipart-data: 1.5.0 @@ -4643,13 +4643,13 @@ packages: sade: 1.8.1 set-cookie-parser: 2.6.0 sirv: 2.0.3 - solid-js: 1.7.4 + solid-js: 1.7.5 solid-start-node: 0.2.26(solid-start@0.2.26)(undici@5.22.0)(vite@4.3.5) - terser: 5.17.1 + terser: 5.17.2 undici: 5.22.0 - vite: 4.3.5(@types/node@18.16.4) + vite: 4.3.5(@types/node@18.16.5) vite-plugin-inspect: 0.7.25(rollup@3.21.5)(vite@4.3.5) - vite-plugin-solid: 2.7.0(solid-js@1.7.4)(vite@4.3.5) + vite-plugin-solid: 2.7.0(solid-js@1.7.5)(vite@4.3.5) wait-on: 6.0.1(debug@4.3.4) transitivePeerDependencies: - supports-color @@ -4850,8 +4850,8 @@ packages: unique-string: 2.0.0 dev: true - /terser@5.17.1: - resolution: {integrity: sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==} + /terser@5.17.2: + resolution: {integrity: sha512-1D1aGbOF1Mnayq5PvfMc0amAR1y5Z1nrZaGCvI5xsdEfZEVte8okonk02OiaK5fw5hG1GWuuVsakOnpZW8y25A==} engines: {node: '>=10'} hasBin: true dependencies: @@ -5056,7 +5056,7 @@ packages: fs-extra: 11.1.1 picocolors: 1.0.0 sirv: 2.0.3 - vite: 4.3.5(@types/node@18.16.4) + vite: 4.3.5(@types/node@18.16.5) transitivePeerDependencies: - rollup - supports-color @@ -5073,14 +5073,14 @@ packages: fast-glob: 3.2.12 pretty-bytes: 6.1.0 rollup: 3.21.5 - vite: 4.3.5(@types/node@18.16.4) + vite: 4.3.5(@types/node@18.16.5) workbox-build: 6.5.4 workbox-window: 6.5.4 transitivePeerDependencies: - supports-color dev: true - /vite-plugin-solid@2.7.0(solid-js@1.7.4)(vite@4.3.5): + /vite-plugin-solid@2.7.0(solid-js@1.7.5)(vite@4.3.5): resolution: {integrity: sha512-avp/Jl5zOp/Itfo67xtDB2O61U7idviaIp4mLsjhCa13PjKNasz+IID0jYTyqUp9SFx6/PmBr6v4KgDppqompg==} peerDependencies: solid-js: ^1.7.2 @@ -5090,10 +5090,10 @@ packages: '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) '@types/babel__core': 7.20.0 babel-preset-solid: 1.7.4(@babel/core@7.21.8) - merge-anything: 5.1.5 - solid-js: 1.7.4 - solid-refresh: 0.5.2(solid-js@1.7.4) - vite: 4.3.5(@types/node@18.16.4) + merge-anything: 5.1.6 + solid-js: 1.7.5 + solid-refresh: 0.5.2(solid-js@1.7.5) + vite: 4.3.5(@types/node@18.16.5) vitefu: 0.2.4(vite@4.3.5) transitivePeerDependencies: - supports-color @@ -5103,10 +5103,10 @@ packages: peerDependencies: vite: ^2 || ^3 || ^4 dependencies: - vite: 4.3.5(@types/node@18.16.4) + vite: 4.3.5(@types/node@18.16.5) dev: true - /vite@4.3.5(@types/node@18.16.4): + /vite@4.3.5(@types/node@18.16.5): resolution: {integrity: sha512-0gEnL9wiRFxgz40o/i/eTBwm+NEbpUeTWhzKrZDSdKm6nplj+z4lKz8ANDgildxHm47Vg8EUia0aicKbawUVVA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -5131,7 +5131,7 @@ packages: terser: optional: true dependencies: - '@types/node': 18.16.4 + '@types/node': 18.16.5 esbuild: 0.17.18 postcss: 8.4.23 rollup: 3.21.5 @@ -5146,7 +5146,7 @@ packages: vite: optional: true dependencies: - vite: 4.3.5(@types/node@18.16.4) + vite: 4.3.5(@types/node@18.16.5) /wait-on@6.0.1(debug@4.3.4): resolution: {integrity: sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==} diff --git a/src/assets/icons/copy.svg b/src/assets/icons/copy.svg new file mode 100644 index 0000000..95475d3 --- /dev/null +++ b/src/assets/icons/copy.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/eye.svg b/src/assets/icons/eye.svg new file mode 100644 index 0000000..5045194 --- /dev/null +++ b/src/assets/icons/eye.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/pencil.svg b/src/assets/icons/pencil.svg new file mode 100644 index 0000000..b1f32b4 --- /dev/null +++ b/src/assets/icons/pencil.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/share.svg b/src/assets/icons/share.svg new file mode 100644 index 0000000..a672592 --- /dev/null +++ b/src/assets/icons/share.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx index 394afea..b843f56 100644 --- a/src/components/Activity.tsx +++ b/src/components/Activity.tsx @@ -223,7 +223,7 @@ export function CombinedActivity(props: { limit?: number }) { const txs = await state.node_manager?.list_onchain() as OnChainTx[]; const invoices = await state.node_manager?.list_invoices() as MutinyInvoice[]; - let activity: ActivityItem[] = []; + const activity: ActivityItem[] = []; txs.forEach((tx) => { activity.push({ type: "onchain", item: tx, time: tx.confirmation_time?.Confirmed?.time || Date.now() }) diff --git a/src/components/AmountCard.tsx b/src/components/AmountCard.tsx new file mode 100644 index 0000000..350b3fa --- /dev/null +++ b/src/components/AmountCard.tsx @@ -0,0 +1,91 @@ +import { Match, ParentComponent, Show, Switch, createMemo } from "solid-js"; +import { Card, VStack } from "~/components/layout"; +import { useMegaStore } from "~/state/megaStore"; +import { satsToUsd } from "~/utils/conversions"; +import { AmountEditable } from "./AmountEditable"; + +const noop = () => { + // do nothing +} + +const KeyValue: ParentComponent<{ key: string, gray?: boolean }> = (props) => { + return ( +
+
{props.key}
+
{props.children}
+
+ ) +} + +export const InlineAmount: ParentComponent<{ amount: string, sign?: string, fiat?: boolean }> = (props) => { + const prettyPrint = createMemo(() => { + const parsed = Number(props.amount); + if (isNaN(parsed)) { + return props.amount; + } else { + return parsed.toLocaleString(); + } + }) + + return (
{props.sign ? `${props.sign} ` : ""}{props.fiat ? "$" : ""}{prettyPrint()} {props.fiat ? "USD" : "SATS"}
) +} + +function USDShower(props: { amountSats: string, fee?: string }) { + const [state, _] = useMegaStore() + const amountInUsd = () => satsToUsd(state.price, add(props.amountSats, props.fee), true) + + return ( + + +
≈ {amountInUsd()} USD
+ + + ) + +} + +function add(a: string, b?: string) { + return Number(a || 0) + Number(b || 0) +} + +export function AmountCard(props: { amountSats: string, fee?: string, initialOpen?: boolean, isAmountEditable?: boolean, setAmountSats?: (amount: bigint) => void }) { + return ( + + + + +
+ + + }> + + + + + + +
+
+
+ + + + +
+ + +
+ + + }> + + + + +
+ + + + + ) +} \ No newline at end of file diff --git a/src/components/AmountEditable.tsx b/src/components/AmountEditable.tsx index 63bfb1a..8b6f00e 100644 --- a/src/components/AmountEditable.tsx +++ b/src/components/AmountEditable.tsx @@ -1,10 +1,11 @@ -import { For, Show, createMemo, createSignal } from 'solid-js'; +import { For, ParentComponent, Show, createMemo, createSignal } from 'solid-js'; import { Button } from '~/components/layout'; import { useMegaStore } from '~/state/megaStore'; import { satsToUsd } from '~/utils/conversions'; -import { Amount } from './Amount'; import { Dialog } from '@kobalte/core'; import close from "~/assets/icons/close.svg"; +import pencil from "~/assets/icons/pencil.svg"; +import { InlineAmount } from './AmountCard'; const CHARACTERS = ["1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "0", "DEL"]; @@ -25,8 +26,8 @@ function SingleDigitButton(props: { character: string, onClick: (c: string) => v ); } -export function AmountEditable(props: { initialAmountSats: string, setAmountSats: (s: bigint) => void }) { - const [isOpen, setIsOpen] = createSignal(false); +export const AmountEditable: ParentComponent<{ initialAmountSats: string, initialOpen: boolean, setAmountSats: (s: bigint) => void }> = (props) => { + const [isOpen, setIsOpen] = createSignal(props.initialOpen); const [displayAmount, setDisplayAmount] = createSignal(props.initialAmountSats || "0"); @@ -135,8 +136,13 @@ export function AmountEditable(props: { initialAmountSats: string, setAmountSats return ( - {/* */} diff --git a/src/components/BalanceBox.tsx b/src/components/BalanceBox.tsx index b0a2fd1..cae3044 100644 --- a/src/components/BalanceBox.tsx +++ b/src/components/BalanceBox.tsx @@ -1,5 +1,5 @@ -import { createResource, Show, Suspense } from "solid-js"; -import { ButtonLink, FancyCard } from "~/components/layout"; +import { Show, Suspense } from "solid-js"; +import { ButtonLink, FancyCard, Indicator } from "~/components/layout"; import { useMegaStore } from "~/state/megaStore"; import { Amount } from "./Amount"; @@ -10,12 +10,6 @@ function prettyPrintAmount(n?: number | bigint): string { return n.toLocaleString() } -function SyncingIndicator() { - return ( -
Syncing
- ) -} - export default function BalanceBox() { const [state, actions] = useMegaStore(); @@ -25,7 +19,7 @@ export default function BalanceBox() { - }> + Syncing}>
diff --git a/src/components/ContactEditor.tsx b/src/components/ContactEditor.tsx index aee945e..748fa80 100644 --- a/src/components/ContactEditor.tsx +++ b/src/components/ContactEditor.tsx @@ -1,5 +1,5 @@ import { Match, Switch, createSignal, createUniqueId } from 'solid-js'; -import { SmallHeader } from '~/components/layout'; +import { SmallHeader, TinyButton } from '~/components/layout'; import { Dialog } from '@kobalte/core'; import close from "~/assets/icons/close.svg"; import { SubmitHandler } from '@modular-forms/solid'; @@ -39,7 +39,7 @@ export function ContactEditor(props: { createContact: (contact: ContactItem) => - + setIsOpen(true)}>+ Add Contact diff --git a/src/components/ContactViewer.tsx b/src/components/ContactViewer.tsx index 993cc55..5b7cbe9 100644 --- a/src/components/ContactViewer.tsx +++ b/src/components/ContactViewer.tsx @@ -5,6 +5,7 @@ import close from "~/assets/icons/close.svg"; import { SubmitHandler } from '@modular-forms/solid'; import { ContactItem } from '~/state/contacts'; import { ContactForm } from './ContactForm'; +import { showToast } from './Toaster'; export function ContactViewer(props: { contact: ContactItem, gradient: string, saveContact: (contact: ContactItem) => void }) { const [isOpen, setIsOpen] = createSignal(false); @@ -58,7 +59,7 @@ export function ContactViewer(props: { contact: ContactItem, gradient: string, s
- +
diff --git a/src/components/ImportExport.tsx b/src/components/ImportExport.tsx index 6550e32..5b4d375 100644 --- a/src/components/ImportExport.tsx +++ b/src/components/ImportExport.tsx @@ -12,7 +12,7 @@ export function ImportExport() { const [state, _] = useMegaStore() async function handleSave() { - let json = await state.node_manager?.export_json() + const json = await state.node_manager?.export_json() downloadTextFile(json || "", "mutiny-state.json") } diff --git a/src/components/JsonModal.tsx b/src/components/JsonModal.tsx index 813a0ff..29ec256 100644 --- a/src/components/JsonModal.tsx +++ b/src/components/JsonModal.tsx @@ -5,7 +5,7 @@ import { useCopy } from "~/utils/useCopy"; const OVERLAY = "fixed inset-0 z-50 bg-black/50 backdrop-blur-sm" const DIALOG_POSITIONER = "fixed inset-0 z-50 flex items-center justify-center" -const DIALOG_CONTENT = "max-w-[600px] max-h-full p-4 bg-gray/50 backdrop-blur-md shadow-xl rounded-xl border border-white/10" +const DIALOG_CONTENT = "max-w-[600px] max-h-full mx-4 p-4 bg-neutral-900/50 backdrop-blur-md shadow-xl rounded-xl border border-white/10" export function JsonModal(props: { title: string, open: boolean, data?: unknown, setOpen: (open: boolean) => void, children?: JSX.Element }) { const json = createMemo(() => JSON.stringify(props.data, null, 2)); diff --git a/src/components/OnboardWarning.tsx b/src/components/OnboardWarning.tsx index 9a70c8d..a8b45ed 100644 --- a/src/components/OnboardWarning.tsx +++ b/src/components/OnboardWarning.tsx @@ -1,6 +1,7 @@ import { Show, createSignal, onMount } from "solid-js"; import { Button, ButtonLink, SmallHeader, VStack } from "./layout"; import { useMegaStore } from "~/state/megaStore"; +import { showToast } from "./Toaster"; export function OnboardWarning() { const [state, actions] = useMegaStore(); @@ -25,7 +26,7 @@ export function OnboardWarning() { Do you want to restore an existing Mutiny Wallet?

- +
diff --git a/src/components/ShareCard.tsx b/src/components/ShareCard.tsx new file mode 100644 index 0000000..8221f56 --- /dev/null +++ b/src/components/ShareCard.tsx @@ -0,0 +1,71 @@ +import { Card, VStack } from "~/components/layout"; +import { useCopy } from "~/utils/useCopy"; +import copyIcon from "~/assets/icons/copy.svg" +import shareIcon from "~/assets/icons/share.svg" +import eyeIcon from "~/assets/icons/eye.svg" +import { Show, createSignal } from "solid-js"; +import { JsonModal } from "./JsonModal"; + +const STYLE = "px-4 py-2 rounded-xl border-2 border-white flex gap-2 items-center font-semibold" + +function ShareButton(props: { receiveString: string }) { + async function share(receiveString: string) { + // If the browser doesn't support share we can just copy the address + if (!navigator.share) { + console.error("Share not supported") + } + const shareData: ShareData = { + title: "Mutiny Wallet", + text: receiveString, + } + try { + await navigator.share(shareData) + } catch (e) { + console.error(e) + } + } + + return ( + + ) +} + +export function StringShower(props: { text: string }) { + const [open, setOpen] = createSignal(false); + return ( + <> + +
+ 
{props.text}
+ +
+ + + ) +} + +export function ShareCard(props: { text?: string }) { + const [copy, copied] = useCopy({ copiedTimeout: 1000 }); + + function handleCopy() { + copy(props.text ?? "") + } + + return ( + + + + +
+ + + + +
+ + + ) + +} \ No newline at end of file diff --git a/src/components/TagEditor.tsx b/src/components/TagEditor.tsx index 9816a3f..09e01c7 100644 --- a/src/components/TagEditor.tsx +++ b/src/components/TagEditor.tsx @@ -1,22 +1,21 @@ import { Select, createOptions } from "@thisbeyond/solid-select"; import "~/styles/solid-select.css" -import { SmallHeader } from "./layout"; import { For, createUniqueId } from "solid-js"; import { ContactEditor } from "./ContactEditor"; import { ContactItem, TagItem, TextItem, addContact } from "~/state/contacts"; +import { TinyButton } from "./layout"; // take two arrays, subtract the second from the first, then return the first function subtract(a: T[], b: T[]) { const set = new Set(b); return a.filter(x => !set.has(x)); -}; +} const createValue = (name: string): TextItem => { return { id: createUniqueId(), name, kind: "text" }; }; -export function TagEditor(props: { title: string, values: TagItem[], setValues: (values: TagItem[]) => void, selectedValues: TagItem[], setSelectedValues: (values: TagItem[]) => void }) { - console.log(props.values); +export function TagEditor(props: { values: TagItem[], setValues: (values: TagItem[]) => void, selectedValues: TagItem[], setSelectedValues: (values: TagItem[]) => void, placeholder: string }) { const onChange = (selected: TagItem[]) => { props.setSelectedValues(selected); @@ -42,26 +41,23 @@ export function TagEditor(props: { title: string, values: TagItem[], setValues: return (
- {props.title} + {/* FIXME this is causing overflow scroll for now good reason */}