diff --git a/package.json b/package.json index d22befa3..d9216801 100644 --- a/package.json +++ b/package.json @@ -29,22 +29,7 @@ "@radix-ui/react-tooltip": "^1.0.6", "@tanstack/react-query": "^4.33.0", "@tanstack/react-virtual": "3.0.0-beta.54", - "@tauri-apps/api": "2.0.0-alpha.6", - "@tauri-apps/cli": "2.0.0-alpha.11", - "@tauri-apps/plugin-app": "github:tauri-apps/tauri-plugin-app#v2", - "@tauri-apps/plugin-autostart": "github:tauri-apps/tauri-plugin-autostart#v2", - "@tauri-apps/plugin-clipboard-manager": "github:tauri-apps/tauri-plugin-clipboard-manager#v2", - "@tauri-apps/plugin-dialog": "github:tauri-apps/tauri-plugin-dialog#v2", - "@tauri-apps/plugin-fs": "github:tauri-apps/tauri-plugin-fs#v2", - "@tauri-apps/plugin-notification": "github:tauri-apps/tauri-plugin-notification#v2", - "@tauri-apps/plugin-os": "github:tauri-apps/tauri-plugin-os#v2", - "@tauri-apps/plugin-process": "github:tauri-apps/tauri-plugin-process#v2", - "@tauri-apps/plugin-shell": "github:tauri-apps/tauri-plugin-shell#v2", - "@tauri-apps/plugin-sql": "github:tauri-apps/tauri-plugin-sql#v2", - "@tauri-apps/plugin-store": "github:tauri-apps/tauri-plugin-store#v2", - "@tauri-apps/plugin-stronghold": "github:tauri-apps/tauri-plugin-stronghold#v2", - "@tauri-apps/plugin-upload": "github:tauri-apps/tauri-plugin-upload#v2", - "@tauri-apps/plugin-window": "github:tauri-apps/tauri-plugin-window#v2", + "@tauri-apps/api": "^1.4.0", "@tiptap/extension-image": "^2.1.7", "@tiptap/extension-mention": "^2.1.7", "@tiptap/extension-placeholder": "^2.1.7", @@ -60,7 +45,7 @@ "light-bolt11-decoder": "^3.0.0", "lru-cache": "^10.0.1", "minidenticons": "^4.2.0", - "nostr-fetch": "^0.12.2", + "nostr-fetch": "^0.13.0", "nostr-tools": "^1.14.2", "qrcode.react": "^3.1.0", "react": "^18.2.0", @@ -73,19 +58,24 @@ "react-textarea-autosize": "^8.5.3", "react-virtuoso": "^4.5.0", "remark-gfm": "^3.0.1", + "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql#v1", + "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1", + "tauri-plugin-stronghold-api": "github:tauri-apps/tauri-plugin-stronghold#v1", + "tauri-plugin-upload-api": "github:tauri-apps/tauri-plugin-upload#v1", "tippy.js": "^6.3.7", "zustand": "^4.4.1" }, "devDependencies": { "@tailwindcss/typography": "^0.5.9", + "@tauri-apps/cli": "^1.4.0", "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/html-to-text": "^9.0.1", - "@types/node": "^20.5.6", + "@types/node": "^20.5.8", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", "@types/youtube-player": "^5.5.7", - "@typescript-eslint/eslint-plugin": "^6.4.1", - "@typescript-eslint/parser": "^6.4.1", + "@typescript-eslint/eslint-plugin": "^6.5.0", + "@typescript-eslint/parser": "^6.5.0", "@vitejs/plugin-react-swc": "^3.3.2", "autoprefixer": "^10.4.15", "clsx": "^2.0.0", @@ -99,9 +89,9 @@ "eslint-plugin-simple-import-sort": "^10.0.0", "husky": "^8.0.3", "lint-staged": "^14.0.1", - "postcss": "^8.4.28", - "prettier": "^3.0.2", - "prettier-plugin-tailwindcss": "^0.5.3", + "postcss": "^8.4.29", + "prettier": "^3.0.3", + "prettier-plugin-tailwindcss": "^0.5.4", "prop-types": "^15.8.1", "tailwind-merge": "^1.14.0", "tailwindcss": "^3.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a3c6c20..33f3d750 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,7 +9,7 @@ dependencies: version: 0.8.23(typescript@5.2.2) '@nostr-fetch/adapter-ndk': specifier: ^0.12.2 - version: 0.12.2(@nostr-dev-kit/ndk@0.8.23)(nostr-fetch@0.12.2) + version: 0.12.2(@nostr-dev-kit/ndk@0.8.23)(nostr-fetch@0.13.0) '@radix-ui/react-alert-dialog': specifier: ^1.0.4 version: 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0) @@ -35,53 +35,8 @@ dependencies: specifier: 3.0.0-beta.54 version: 3.0.0-beta.54(react@18.2.0) '@tauri-apps/api': - specifier: 2.0.0-alpha.6 - version: 2.0.0-alpha.6 - '@tauri-apps/cli': - specifier: 2.0.0-alpha.11 - version: 2.0.0-alpha.11 - '@tauri-apps/plugin-app': - specifier: github:tauri-apps/tauri-plugin-app#v2 - version: github.com/tauri-apps/tauri-plugin-app/1efde5f3e693927a529408f414238ad40b06c9a2 - '@tauri-apps/plugin-autostart': - specifier: github:tauri-apps/tauri-plugin-autostart#v2 - version: github.com/tauri-apps/tauri-plugin-autostart/50d57bf6dcac4c32e6f5a73f1b6d90001b68c6f7 - '@tauri-apps/plugin-clipboard-manager': - specifier: github:tauri-apps/tauri-plugin-clipboard-manager#v2 - version: github.com/tauri-apps/tauri-plugin-clipboard-manager/f5314980a4b60362bca6b9d2a3a40a637c021d3c - '@tauri-apps/plugin-dialog': - specifier: github:tauri-apps/tauri-plugin-dialog#v2 - version: github.com/tauri-apps/tauri-plugin-dialog/eece20be9c1dc257e268f5d63654af56cf4fb474 - '@tauri-apps/plugin-fs': - specifier: github:tauri-apps/tauri-plugin-fs#v2 - version: github.com/tauri-apps/tauri-plugin-fs/c90fd8bcad3be92f34a0642d67ab1a6ad9f73dee - '@tauri-apps/plugin-notification': - specifier: github:tauri-apps/tauri-plugin-notification#v2 - version: github.com/tauri-apps/tauri-plugin-notification/66c0779854575ec7860eadcd98673c39627e81a6 - '@tauri-apps/plugin-os': - specifier: github:tauri-apps/tauri-plugin-os#v2 - version: github.com/tauri-apps/tauri-plugin-os/97469d43edd41c32aa1c0eea38d1c19d14e38f47 - '@tauri-apps/plugin-process': - specifier: github:tauri-apps/tauri-plugin-process#v2 - version: github.com/tauri-apps/tauri-plugin-process/7a04374b86dbc0691a7223bbdbec6b0b3d8cd3af - '@tauri-apps/plugin-shell': - specifier: github:tauri-apps/tauri-plugin-shell#v2 - version: github.com/tauri-apps/tauri-plugin-shell/c8bb6d545043434cdb5784ace171c509f8b20586 - '@tauri-apps/plugin-sql': - specifier: github:tauri-apps/tauri-plugin-sql#v2 - version: github.com/tauri-apps/tauri-plugin-sql/592d8ba3640cfb3a3214fcec21b0355d3a6951ec - '@tauri-apps/plugin-store': - specifier: github:tauri-apps/tauri-plugin-store#v2 - version: github.com/tauri-apps/tauri-plugin-store/22ed4246f7be1413852c5ab9907a773be08ad8a8 - '@tauri-apps/plugin-stronghold': - specifier: github:tauri-apps/tauri-plugin-stronghold#v2 - version: github.com/tauri-apps/tauri-plugin-stronghold/33dc99be377c7bc6b7cf4d4d1fdce28340379f63 - '@tauri-apps/plugin-upload': - specifier: github:tauri-apps/tauri-plugin-upload#v2 - version: github.com/tauri-apps/tauri-plugin-upload/c48327c9601b0097f104ddef120a1999d5b944db - '@tauri-apps/plugin-window': - specifier: github:tauri-apps/tauri-plugin-window#v2 - version: github.com/tauri-apps/tauri-plugin-window/09c9732d0c98c13ee8aeb51de61f7eef3eb33a4b + specifier: ^1.4.0 + version: 1.4.0 '@tiptap/extension-image': specifier: ^2.1.7 version: 2.1.7(@tiptap/core@2.1.7) @@ -128,8 +83,8 @@ dependencies: specifier: ^4.2.0 version: 4.2.0 nostr-fetch: - specifier: ^0.12.2 - version: 0.12.2 + specifier: ^0.13.0 + version: 0.13.0 nostr-tools: specifier: ^1.14.2 version: 1.14.2 @@ -166,6 +121,18 @@ dependencies: remark-gfm: specifier: ^3.0.1 version: 3.0.1 + tauri-plugin-sql-api: + specifier: github:tauri-apps/tauri-plugin-sql#v1 + version: github.com/tauri-apps/tauri-plugin-sql/b8fd19dac907cc8c3d78681cd4803a326b8b861e + tauri-plugin-store-api: + specifier: github:tauri-apps/tauri-plugin-store#v1 + version: github.com/tauri-apps/tauri-plugin-store/a65ce9bfb168a9a3cd7ed4102b9f22770cc3abfa + tauri-plugin-stronghold-api: + specifier: github:tauri-apps/tauri-plugin-stronghold#v1 + version: github.com/tauri-apps/tauri-plugin-stronghold/877f308097f98b59a6cad87adda0f75a65398e00 + tauri-plugin-upload-api: + specifier: github:tauri-apps/tauri-plugin-upload#v1 + version: github.com/tauri-apps/tauri-plugin-upload/b53ebc6c2e716d95fd94b64d3b4b87cd57ae4feb tippy.js: specifier: ^6.3.7 version: 6.3.7 @@ -177,15 +144,18 @@ devDependencies: '@tailwindcss/typography': specifier: ^0.5.9 version: 0.5.9(tailwindcss@3.3.3) + '@tauri-apps/cli': + specifier: ^1.4.0 + version: 1.4.0 '@trivago/prettier-plugin-sort-imports': specifier: ^4.2.0 - version: 4.2.0(prettier@3.0.2) + version: 4.2.0(prettier@3.0.3) '@types/html-to-text': specifier: ^9.0.1 version: 9.0.1 '@types/node': - specifier: ^20.5.6 - version: 20.5.6 + specifier: ^20.5.8 + version: 20.5.8 '@types/react': specifier: ^18.2.21 version: 18.2.21 @@ -196,17 +166,17 @@ devDependencies: specifier: ^5.5.7 version: 5.5.7 '@typescript-eslint/eslint-plugin': - specifier: ^6.4.1 - version: 6.4.1(@typescript-eslint/parser@6.4.1)(eslint@8.48.0)(typescript@5.2.2) + specifier: ^6.5.0 + version: 6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)(typescript@5.2.2) '@typescript-eslint/parser': - specifier: ^6.4.1 - version: 6.4.1(eslint@8.48.0)(typescript@5.2.2) + specifier: ^6.5.0 + version: 6.5.0(eslint@8.48.0)(typescript@5.2.2) '@vitejs/plugin-react-swc': specifier: ^3.3.2 version: 3.3.2(vite@4.4.9) autoprefixer: specifier: ^10.4.15 - version: 10.4.15(postcss@8.4.28) + version: 10.4.15(postcss@8.4.29) clsx: specifier: ^2.0.0 version: 2.0.0 @@ -241,14 +211,14 @@ devDependencies: specifier: ^14.0.1 version: 14.0.1 postcss: - specifier: ^8.4.28 - version: 8.4.28 + specifier: ^8.4.29 + version: 8.4.29 prettier: - specifier: ^3.0.2 - version: 3.0.2 + specifier: ^3.0.3 + version: 3.0.3 prettier-plugin-tailwindcss: - specifier: ^0.5.3 - version: 0.5.3(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.2) + specifier: ^0.5.4 + version: 0.5.4(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.3) prop-types: specifier: ^15.8.1 version: 15.8.1 @@ -263,7 +233,7 @@ devDependencies: version: 5.2.2 vite: specifier: ^4.4.9 - version: 4.4.9(@types/node@20.5.6) + version: 4.4.9(@types/node@20.5.8) vite-tsconfig-paths: specifier: ^4.2.0 version: 4.2.0(typescript@5.2.2)(vite@4.4.9) @@ -279,11 +249,11 @@ packages: engines: {node: '>=10'} dev: true - /@babel/code-frame@7.22.10: - resolution: {integrity: sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==} + /@babel/code-frame@7.22.13: + resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.22.10 + '@babel/highlight': 7.22.13 chalk: 2.4.2 /@babel/generator@7.17.7: @@ -331,16 +301,16 @@ packages: resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} engines: {node: '>=6.9.0'} - /@babel/highlight@7.22.10: - resolution: {integrity: sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==} + /@babel/highlight@7.22.13: + resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-validator-identifier': 7.22.5 chalk: 2.4.2 js-tokens: 4.0.0 - /@babel/parser@7.22.11: - resolution: {integrity: sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==} + /@babel/parser@7.22.14: + resolution: {integrity: sha512-1KucTHgOvaw/LzCVrEOAyXkr9rQlp0A1HiHRYnSUE9dmb8PvPW7o5sscg+5169r54n3vGlbx6GevTE/Iw/P3AQ==} engines: {node: '>=6.0.0'} hasBin: true dependencies: @@ -357,8 +327,8 @@ packages: resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.22.10 - '@babel/parser': 7.22.11 + '@babel/code-frame': 7.22.13 + '@babel/parser': 7.22.14 '@babel/types': 7.22.11 dev: true @@ -366,13 +336,13 @@ packages: resolution: {integrity: sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.22.10 + '@babel/code-frame': 7.22.13 '@babel/generator': 7.17.7 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-function-name': 7.22.5 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.22.11 + '@babel/parser': 7.22.14 '@babel/types': 7.17.0 debug: 4.3.4 globals: 11.12.0 @@ -851,8 +821,8 @@ packages: '@floating-ui/utils': 0.1.1 dev: false - /@floating-ui/react-dom@2.0.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==} + /@floating-ui/react-dom@2.0.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' @@ -866,8 +836,8 @@ packages: resolution: {integrity: sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==} dev: false - /@humanwhocodes/config-array@0.11.10: - resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==} + /@humanwhocodes/config-array@0.11.11: + resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==} engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 @@ -973,7 +943,7 @@ packages: dependencies: '@noble/hashes': 1.3.2 '@noble/secp256k1': 2.0.0 - '@scure/base': 1.1.2 + '@scure/base': 1.1.3 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@5.2.2) '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.2.2) debug: 4.3.4 @@ -996,7 +966,7 @@ packages: - typescript dev: false - /@nostr-fetch/adapter-ndk@0.12.2(@nostr-dev-kit/ndk@0.8.23)(nostr-fetch@0.12.2): + /@nostr-fetch/adapter-ndk@0.12.2(@nostr-dev-kit/ndk@0.8.23)(nostr-fetch@0.13.0): resolution: {integrity: sha512-+7EVuxS5DDZvNo6qbfFp7xRHwIyjyi36hYkiQFDjbQ4gX5LKo9RIPB1P+1XGkOSDFshypTbovZCaFunscJ/zhQ==} peerDependencies: '@nostr-dev-kit/ndk': ^0.7.5 @@ -1004,7 +974,7 @@ packages: dependencies: '@nostr-dev-kit/ndk': 0.8.23(typescript@5.2.2) '@nostr-fetch/kernel': 0.12.2 - nostr-fetch: 0.12.2 + nostr-fetch: 0.13.0 dev: false /@nostr-fetch/kernel@0.12.2: @@ -1014,6 +984,13 @@ packages: '@noble/hashes': 1.3.2 dev: false + /@nostr-fetch/kernel@0.13.0: + resolution: {integrity: sha512-KoF6pCezZvGP9ZQo23Ib4UDwJRd08xqVeVTQ44Z/b+gxBBrZCR0lnwOPS6KYBvdOfduynQEryNt5if5ZLxpRlg==} + dependencies: + '@noble/curves': 1.2.0 + '@noble/hashes': 1.3.2 + dev: false + /@popperjs/core@2.11.8: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false @@ -1390,7 +1367,7 @@ packages: optional: true dependencies: '@babel/runtime': 7.22.11 - '@floating-ui/react-dom': 2.0.1(react-dom@18.2.0)(react@18.2.0) + '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.21)(react@18.2.0) '@radix-ui/react-context': 1.0.1(@types/react@18.2.21)(react@18.2.0) @@ -1698,8 +1675,8 @@ packages: resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==} dev: false - /@scure/base@1.1.2: - resolution: {integrity: sha512-sSCrnIdaUZQHhBxZThMuk7Wm1TWzMD3uJNdGgx3JS23xSqevu0tAOsg8k66nL3R2NwQe65AI9GgqpPOgZys/eA==} + /@scure/base@1.1.3: + resolution: {integrity: sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==} dev: false /@scure/bip32@1.3.1: @@ -1728,8 +1705,8 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: false - /@swc/core-darwin-arm64@1.3.80: - resolution: {integrity: sha512-rhoFTcQMUGfO7IkfOnopPSF6O0/aVJ58B7KueIKbvrMe6YvSfFj9QfObELFjYCcrJZTvUWBhig0QrsfPIiUphA==} + /@swc/core-darwin-arm64@1.3.82: + resolution: {integrity: sha512-JfsyDW34gVKD3uE0OUpUqYvAD3yseEaicnFP6pB292THtLJb0IKBBnK50vV/RzEJtc1bR3g1kNfxo2PeurZTrA==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] @@ -1737,8 +1714,8 @@ packages: dev: true optional: true - /@swc/core-darwin-x64@1.3.80: - resolution: {integrity: sha512-0dOLedFpVXe+ugkKHXsqSxMKqvQYfFtibWbrZ7j8wOaErzSGPr0VpyWvepNVb9s046725kPXSw+fsGhqZR8wrw==} + /@swc/core-darwin-x64@1.3.82: + resolution: {integrity: sha512-ogQWgNMq7qTpITjcP3dnzkFNj7bh6SwMr859GvtOTrE75H7L7jDWxESfH4f8foB/LGxBKiDNmxKhitCuAsZK4A==} engines: {node: '>=10'} cpu: [x64] os: [darwin] @@ -1746,8 +1723,8 @@ packages: dev: true optional: true - /@swc/core-linux-arm-gnueabihf@1.3.80: - resolution: {integrity: sha512-QIjwP3PtDeHBDkwF6+ZZqdUsqAhORbMpxrw2jq3mHe4lQrxBttSFTq018vlMRo2mFEorOvXdadzaD9m+NymPrw==} + /@swc/core-linux-arm-gnueabihf@1.3.82: + resolution: {integrity: sha512-7TMXG1lXlNhD0kUiEqs+YlGV4irAdBa2quuy+XI3oJf2fBK6dQfEq4xBy65B3khrorzQS3O0oDGQ+cmdpHExHA==} engines: {node: '>=10'} cpu: [arm] os: [linux] @@ -1755,8 +1732,8 @@ packages: dev: true optional: true - /@swc/core-linux-arm64-gnu@1.3.80: - resolution: {integrity: sha512-cg8WriIueab58ZwkzXmIACnjSzFLzOBwxlC9k65gPXMNgCjab2YbqEYvAbjBqneuqaao02gW6tad2uhjgYaExw==} + /@swc/core-linux-arm64-gnu@1.3.82: + resolution: {integrity: sha512-26JkOujbzcItPAmIbD5vHJxQVy5ihcSu3YHTKwope1h28sApZdtE7S3e2G3gsZRTIdsCQkXUtAQeqHxGWWR3pw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] @@ -1764,8 +1741,8 @@ packages: dev: true optional: true - /@swc/core-linux-arm64-musl@1.3.80: - resolution: {integrity: sha512-AhdCQ7QKx5mWrtpaOA1mFRiWWvuiiUtspvo0QSpspDetRKTND1rlf/3UB5+gp0kCeCNUTsVmJWU7fIA9ICZtXA==} + /@swc/core-linux-arm64-musl@1.3.82: + resolution: {integrity: sha512-8Izj9tuuMpoc3cqiPBRtwqpO1BZ/+sfZVsEhLxrbOFlcSb8LnKyMle1g3JMMUwI4EU75RGVIzZMn8A6GOKdJbA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] @@ -1773,8 +1750,8 @@ packages: dev: true optional: true - /@swc/core-linux-x64-gnu@1.3.80: - resolution: {integrity: sha512-+2e5oni1vOrLIjM5Q2/GIzK/uS2YEtuJqnjPvCK8SciRJsSl8OgVsRvyCDbmKeZNtJ2Q+o/O2AQ2w1qpAJG6jg==} + /@swc/core-linux-x64-gnu@1.3.82: + resolution: {integrity: sha512-0GSrIBScQwTaPv46T2qB7XnDYxndRCpwH4HMjh6FN+I+lfPUhTSJKW8AonqrqT1TbpFIgvzQs7EnTsD7AnSCow==} engines: {node: '>=10'} cpu: [x64] os: [linux] @@ -1782,8 +1759,8 @@ packages: dev: true optional: true - /@swc/core-linux-x64-musl@1.3.80: - resolution: {integrity: sha512-8OK9IlI1zpWOm7vIp1iXmZSEzLAwFpqhsGSEhxPavpOx2m54kLFdPcw/Uv3n461f6TCtszIxkGq1kSqBUdfUBA==} + /@swc/core-linux-x64-musl@1.3.82: + resolution: {integrity: sha512-KJUnaaepDKNzrEbwz4jv0iC3/t9x0NSoe06fnkAlhh2+NFKWKKJhVCOBTrpds8n7eylBDIXUlK34XQafjVMUdg==} engines: {node: '>=10'} cpu: [x64] os: [linux] @@ -1791,8 +1768,8 @@ packages: dev: true optional: true - /@swc/core-win32-arm64-msvc@1.3.80: - resolution: {integrity: sha512-RKhatwiAGlffnF6z2Mm3Ddid0v3KB+uf5m/Gc7N9zO/EUAV0PnHRuYuZSGyqodHmGFC+mK8YrCooFCEmHL9n+w==} + /@swc/core-win32-arm64-msvc@1.3.82: + resolution: {integrity: sha512-TR3MHKhDYIyGyFcyl2d/p1ftceXcubAhX5wRSOdtOyr5+K/v3jbyCCqN7bbqO5o43wQVCwwR/drHleYyDZvg8Q==} engines: {node: '>=10'} cpu: [arm64] os: [win32] @@ -1800,8 +1777,8 @@ packages: dev: true optional: true - /@swc/core-win32-ia32-msvc@1.3.80: - resolution: {integrity: sha512-3jiiZzU/kaw7k4zUp1yMq1QiUe4wJVtCEXIhf+fKuBsIwm7rdvyK/+PIx5KHnZy4TGQnYczKBRhJA5nuBcrUCQ==} + /@swc/core-win32-ia32-msvc@1.3.82: + resolution: {integrity: sha512-ZX4HzVVt6hs84YUg70UvyBJnBOIspmQQM0iXSzBvOikk3zRoN7BnDwQH4GScvevCEBuou60+i4I6d5kHLOfh8Q==} engines: {node: '>=10'} cpu: [ia32] os: [win32] @@ -1809,8 +1786,8 @@ packages: dev: true optional: true - /@swc/core-win32-x64-msvc@1.3.80: - resolution: {integrity: sha512-2eZtIoIWQBWqykfms92Zd37lveYOBWQTZjdooBGlsLHtcoQLkNpf1NXmR6TKY0yy8q6Yl3OhPvY+izjmO08MSg==} + /@swc/core-win32-x64-msvc@1.3.82: + resolution: {integrity: sha512-4mJMnex21kbQoaHeAmHnVwQN9/XAfPszJ6n9HI7SVH+aAHnbBIR0M59/b50/CJMjTj5niUGk7EwQ3nhVNOG32g==} engines: {node: '>=10'} cpu: [x64] os: [win32] @@ -1818,8 +1795,8 @@ packages: dev: true optional: true - /@swc/core@1.3.80: - resolution: {integrity: sha512-yX2xV5I/lYswHHR+44TPvzBgq3/Y8N1YWpTQADYuvSiX3Jxyvemk5Jpx3rRtigYb8WBkWAAf2i5d5ZJ2M7hhgw==} + /@swc/core@1.3.82: + resolution: {integrity: sha512-jpC1a18HMH67018Ij2jh+hT7JBFu7ZKcQVfrZ8K6JuEY+kjXmbea07P9MbQUZbAe0FB+xi3CqEVCP73MebodJQ==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -1830,16 +1807,16 @@ packages: dependencies: '@swc/types': 0.1.4 optionalDependencies: - '@swc/core-darwin-arm64': 1.3.80 - '@swc/core-darwin-x64': 1.3.80 - '@swc/core-linux-arm-gnueabihf': 1.3.80 - '@swc/core-linux-arm64-gnu': 1.3.80 - '@swc/core-linux-arm64-musl': 1.3.80 - '@swc/core-linux-x64-gnu': 1.3.80 - '@swc/core-linux-x64-musl': 1.3.80 - '@swc/core-win32-arm64-msvc': 1.3.80 - '@swc/core-win32-ia32-msvc': 1.3.80 - '@swc/core-win32-x64-msvc': 1.3.80 + '@swc/core-darwin-arm64': 1.3.82 + '@swc/core-darwin-x64': 1.3.82 + '@swc/core-linux-arm-gnueabihf': 1.3.82 + '@swc/core-linux-arm64-gnu': 1.3.82 + '@swc/core-linux-arm64-musl': 1.3.82 + '@swc/core-linux-x64-gnu': 1.3.82 + '@swc/core-linux-x64-musl': 1.3.82 + '@swc/core-win32-arm64-msvc': 1.3.82 + '@swc/core-win32-ia32-msvc': 1.3.82 + '@swc/core-win32-x64-msvc': 1.3.82 dev: true /@swc/types@0.1.4: @@ -1893,117 +1870,117 @@ packages: resolution: {integrity: sha512-jtkwqdP2rY2iCCDVAFuaNBH3fiEi29aTn2RhtIoky8DTTiCdc48plpHHreLwmv1PICJ4AJUUESaq3xa8fZH8+g==} dev: false - /@tauri-apps/api@2.0.0-alpha.6: - resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==} + /@tauri-apps/api@1.4.0: + resolution: {integrity: sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.11: - resolution: {integrity: sha512-SXm5vCO/Rt5JoY9se35jA4zz8iqgA0bgbcM/qVOrTnd1DUFWUP9Tss0g+UExhqEcvUxo/QPfuwk8qVYDH3A7gg==} + /@tauri-apps/cli-darwin-arm64@1.4.0: + resolution: {integrity: sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-darwin-x64@2.0.0-alpha.11: - resolution: {integrity: sha512-usboHzRGITRcT4YM6CC7M11EpgO1pormVhOb2OzhkUmt7m0HTwKDswZL7YER5Kx82RaMqXmt8MKF5q14HZqzkg==} + /@tauri-apps/cli-darwin-x64@1.4.0: + resolution: {integrity: sha512-ov/F6Zr+dg9B0PtRu65stFo2G0ow2TUlneqYYrkj+vA3n+moWDHfVty0raDjMLQbQt3rv3uayFMXGPMgble9OA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.11: - resolution: {integrity: sha512-yAcJOpTnijxSmvxwkbRmHNBmFGo0UyA9qunboDaSppQQqlEozGMwQe6yASUpBdjzRaECbygoiiNez9dHOnQfOg==} + /@tauri-apps/cli-linux-arm-gnueabihf@1.4.0: + resolution: {integrity: sha512-zwjbiMncycXDV7doovymyKD7sCg53ouAmfgpUqEBOTY3vgBi9TwijyPhJOqoG5vUVWhouNBC08akGmE4dja15g==} engines: {node: '>= 10'} cpu: [arm] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.11: - resolution: {integrity: sha512-tPYRhxZjAKaBcpN5WerHO39PEru9Uql8milTgp+rD+uu5C0cqUTR524YoffuIox38zB4skq7y8sQCT+oivDLkQ==} + /@tauri-apps/cli-linux-arm64-gnu@1.4.0: + resolution: {integrity: sha512-5MCBcziqXC72mMXnkZU68mutXIR6zavDxopArE2gQtK841IlE06bIgtLi0kUUhlFJk2nhPRgiDgdLbrPlyt7fw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.11: - resolution: {integrity: sha512-E+FJ9nnaYcsmm88u8GZOmmiHG/3qG4guF/k7r7Y3v5N9I1NFyiEr8hg5WeHBNBZoepHSrtBRQ0Ov2Bq58hqOzg==} + /@tauri-apps/cli-linux-arm64-musl@1.4.0: + resolution: {integrity: sha512-7J3pRB6n6uNYgIfCeKt2Oz8J7oSaz2s8GGFRRH2HPxuTHrBNCinzVYm68UhVpJrL3bnGkU0ziVZLsW/iaOGfUg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.11: - resolution: {integrity: sha512-Rvy/r0HI2RmE+D+0EUAs5xlIa4zMxQ421PTrOY0WmyTHrjxx/M4TX3D4oJnZsKrLjQ3L8OFvV6A632BJnxpAuA==} + /@tauri-apps/cli-linux-x64-gnu@1.4.0: + resolution: {integrity: sha512-Zh5gfAJxOv5AVWxcwuueaQ2vIAhlg0d6nZui6nMyfIJ8dbf3aZQ5ZzP38sYow5h/fbvgL+3GSQxZRBIa3c2E1w==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.11: - resolution: {integrity: sha512-QT1TH+QieJKDT8YOyUKRIdcnMZgeH/vGdkzkmXbKaGURcYEjsh8qHelYzE+2oyWt8VBIJJXV7DcbNX6g4Q+fMA==} + /@tauri-apps/cli-linux-x64-musl@1.4.0: + resolution: {integrity: sha512-OLAYoICU3FaYiTdBsI+lQTKnDHeMmFMXIApN0M+xGiOkoIOQcV9CConMPjgmJQ867+NHRNgUGlvBEAh9CiJodQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.11: - resolution: {integrity: sha512-ggGRBzdND1lEYlZ31ujeYvVAKZh/vHjnx7Q5Gsi4Bu3e9pSt3sId0G5G2OXH7WyxftaDUzfsLfKknE3cQwX9rA==} + /@tauri-apps/cli-win32-arm64-msvc@1.4.0: + resolution: {integrity: sha512-gZ05GENFbI6CB5MlOUsLlU0kZ9UtHn9riYtSXKT6MYs8HSPRffPHaHSL0WxsJweWh9nR5Hgh/TUU8uW3sYCzCg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.11: - resolution: {integrity: sha512-P32D6CvyzVB+5pPDxcKSoIClGB0el5rzaDne8jVS/VR+IidYp1oCP5wAsF9h+ldEsdesAbsbtWaMKS36kxgA2g==} + /@tauri-apps/cli-win32-ia32-msvc@1.4.0: + resolution: {integrity: sha512-JsetT/lTx/Zq98eo8T5CiRyF1nKeX04RO8JlJrI3ZOYsZpp/A5RJvMd/szQ17iOzwiHdge+tx7k2jHysR6oBlQ==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.11: - resolution: {integrity: sha512-a3geg/sWR7+qfTuoQGFK13YlHlip47XYnMXtoaC+SAXJ7Pur+/m48PZgxYy5mwvI2ApNUTgkMO5ZwdeeK2sh5g==} + /@tauri-apps/cli-win32-x64-msvc@1.4.0: + resolution: {integrity: sha512-z8Olcnwp5aYhzqUAarFjqF+oELCjuYWnB2HAJHlfsYNfDCAORY5kct3Fklz8PSsubC3U2EugWn8n42DwnThurg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli@2.0.0-alpha.11: - resolution: {integrity: sha512-akkxK6lkPyo27F7+GHJuZTEUWwaX5yKRXrDhir+DAzEH4Gt/EZ+GsPFPgSV1EBQzDZGdMGpRovuftIky7m0TZw==} + /@tauri-apps/cli@1.4.0: + resolution: {integrity: sha512-VXYr2i2iVFl98etQSQsqLzXgX96bnWiNZd1YADgatqwy/qecbd6Kl5ZAPB5R4ynsgE8A1gU7Fbzh7dCEQYFfmA==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.11 - '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.11 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.11 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.11 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.11 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.11 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.11 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.11 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.11 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.11 - dev: false + '@tauri-apps/cli-darwin-arm64': 1.4.0 + '@tauri-apps/cli-darwin-x64': 1.4.0 + '@tauri-apps/cli-linux-arm-gnueabihf': 1.4.0 + '@tauri-apps/cli-linux-arm64-gnu': 1.4.0 + '@tauri-apps/cli-linux-arm64-musl': 1.4.0 + '@tauri-apps/cli-linux-x64-gnu': 1.4.0 + '@tauri-apps/cli-linux-x64-musl': 1.4.0 + '@tauri-apps/cli-win32-arm64-msvc': 1.4.0 + '@tauri-apps/cli-win32-ia32-msvc': 1.4.0 + '@tauri-apps/cli-win32-x64-msvc': 1.4.0 + dev: true /@tiptap/core@2.1.7(@tiptap/pm@2.1.7): resolution: {integrity: sha512-1pqTwlTnwTKQSNQmmTWhs2lwdvd+hFFNFZnrRAfvZhQZA6qPmPmKMNTcYmK38Tn4axKth6mhBamzTJgMZFI7ng==} @@ -2294,7 +2271,7 @@ packages: '@tiptap/pm': 2.1.7 dev: false - /@trivago/prettier-plugin-sort-imports@4.2.0(prettier@3.0.2): + /@trivago/prettier-plugin-sort-imports@4.2.0(prettier@3.0.3): resolution: {integrity: sha512-YBepjbt+ZNBVmN3ev1amQH3lWCmHyt5qTbLCp/syXJRu/Kw2koXh44qayB1gMRxcL/gV8egmjN5xWSrYyfUtyw==} peerDependencies: '@vue/compiler-sfc': 3.x @@ -2304,12 +2281,12 @@ packages: optional: true dependencies: '@babel/generator': 7.17.7 - '@babel/parser': 7.22.11 + '@babel/parser': 7.22.14 '@babel/traverse': 7.17.3 '@babel/types': 7.17.0 javascript-natural-sort: 0.7.1 lodash: 4.17.21 - prettier: 3.0.2 + prettier: 3.0.3 transitivePeerDependencies: - supports-color dev: true @@ -2338,7 +2315,7 @@ packages: /@types/hast@2.3.5: resolution: {integrity: sha512-SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 dev: false /@types/html-to-text@9.0.1: @@ -2355,7 +2332,7 @@ packages: /@types/mdast@3.0.12: resolution: {integrity: sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 dev: false /@types/minimist@1.2.2: @@ -2366,8 +2343,8 @@ packages: resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==} dev: false - /@types/node@20.5.6: - resolution: {integrity: sha512-Gi5wRGPbbyOTX+4Y2iULQ27oUPrefaB0PxGQJnfyWN3kvEDGM3mIB5M/gQLmitZf7A9FmLeaqxD3L1CXpm3VKQ==} + /@types/node@20.5.8: + resolution: {integrity: sha512-eajsR9aeljqNhK028VG0Wuw+OaY5LLxYmxeoXynIoE6jannr9/Ucd1LL0hSSoafk5LTYG+FfqsyGt81Q6Zkybw==} dev: true /@types/normalize-package-data@2.4.1: @@ -2400,15 +2377,15 @@ packages: /@types/scheduler@0.16.3: resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==} - /@types/semver@7.5.0: - resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==} + /@types/semver@7.5.1: + resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} /@types/throttle-debounce@2.1.0: resolution: {integrity: sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==} dev: false - /@types/unist@2.0.7: - resolution: {integrity: sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==} + /@types/unist@2.0.8: + resolution: {integrity: sha512-d0XxK3YTObnWVp6rZuev3c49+j4Lo8g4L1ZRm9z5L0xpoZycUPshHgczK5gsUMaZOstjVYYi09p5gYvUtfChYw==} dev: false /@types/youtube-player@5.5.7: @@ -2443,8 +2420,8 @@ packages: - supports-color dev: false - /@typescript-eslint/eslint-plugin@6.4.1(@typescript-eslint/parser@6.4.1)(eslint@8.48.0)(typescript@5.2.2): - resolution: {integrity: sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==} + /@typescript-eslint/eslint-plugin@6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)(typescript@5.2.2): + resolution: {integrity: sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha @@ -2455,11 +2432,11 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.8.0 - '@typescript-eslint/parser': 6.4.1(eslint@8.48.0)(typescript@5.2.2) - '@typescript-eslint/scope-manager': 6.4.1 - '@typescript-eslint/type-utils': 6.4.1(eslint@8.48.0)(typescript@5.2.2) - '@typescript-eslint/utils': 6.4.1(eslint@8.48.0)(typescript@5.2.2) - '@typescript-eslint/visitor-keys': 6.4.1 + '@typescript-eslint/parser': 6.5.0(eslint@8.48.0)(typescript@5.2.2) + '@typescript-eslint/scope-manager': 6.5.0 + '@typescript-eslint/type-utils': 6.5.0(eslint@8.48.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.5.0(eslint@8.48.0)(typescript@5.2.2) + '@typescript-eslint/visitor-keys': 6.5.0 debug: 4.3.4 eslint: 8.48.0 graphemer: 1.4.0 @@ -2492,8 +2469,8 @@ packages: - supports-color dev: false - /@typescript-eslint/parser@6.4.1(eslint@8.48.0)(typescript@5.2.2): - resolution: {integrity: sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==} + /@typescript-eslint/parser@6.5.0(eslint@8.48.0)(typescript@5.2.2): + resolution: {integrity: sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -2502,10 +2479,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 6.4.1 - '@typescript-eslint/types': 6.4.1 - '@typescript-eslint/typescript-estree': 6.4.1(typescript@5.2.2) - '@typescript-eslint/visitor-keys': 6.4.1 + '@typescript-eslint/scope-manager': 6.5.0 + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2) + '@typescript-eslint/visitor-keys': 6.5.0 debug: 4.3.4 eslint: 8.48.0 typescript: 5.2.2 @@ -2521,12 +2498,12 @@ packages: '@typescript-eslint/visitor-keys': 5.62.0 dev: false - /@typescript-eslint/scope-manager@6.4.1: - resolution: {integrity: sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==} + /@typescript-eslint/scope-manager@6.5.0: + resolution: {integrity: sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.4.1 - '@typescript-eslint/visitor-keys': 6.4.1 + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/visitor-keys': 6.5.0 dev: true /@typescript-eslint/type-utils@5.62.0(eslint@8.48.0)(typescript@5.2.2): @@ -2549,8 +2526,8 @@ packages: - supports-color dev: false - /@typescript-eslint/type-utils@6.4.1(eslint@8.48.0)(typescript@5.2.2): - resolution: {integrity: sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==} + /@typescript-eslint/type-utils@6.5.0(eslint@8.48.0)(typescript@5.2.2): + resolution: {integrity: sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -2559,8 +2536,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.4.1(typescript@5.2.2) - '@typescript-eslint/utils': 6.4.1(eslint@8.48.0)(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2) + '@typescript-eslint/utils': 6.5.0(eslint@8.48.0)(typescript@5.2.2) debug: 4.3.4 eslint: 8.48.0 ts-api-utils: 1.0.2(typescript@5.2.2) @@ -2574,8 +2551,8 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: false - /@typescript-eslint/types@6.4.1: - resolution: {integrity: sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==} + /@typescript-eslint/types@6.5.0: + resolution: {integrity: sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==} engines: {node: ^16.0.0 || >=18.0.0} dev: true @@ -2600,8 +2577,8 @@ packages: - supports-color dev: false - /@typescript-eslint/typescript-estree@6.4.1(typescript@5.2.2): - resolution: {integrity: sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==} + /@typescript-eslint/typescript-estree@6.5.0(typescript@5.2.2): + resolution: {integrity: sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' @@ -2609,8 +2586,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 6.4.1 - '@typescript-eslint/visitor-keys': 6.4.1 + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/visitor-keys': 6.5.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -2629,7 +2606,7 @@ packages: dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) '@types/json-schema': 7.0.12 - '@types/semver': 7.5.0 + '@types/semver': 7.5.1 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) @@ -2641,18 +2618,18 @@ packages: - typescript dev: false - /@typescript-eslint/utils@6.4.1(eslint@8.48.0)(typescript@5.2.2): - resolution: {integrity: sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==} + /@typescript-eslint/utils@6.5.0(eslint@8.48.0)(typescript@5.2.2): + resolution: {integrity: sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) '@types/json-schema': 7.0.12 - '@types/semver': 7.5.0 - '@typescript-eslint/scope-manager': 6.4.1 - '@typescript-eslint/types': 6.4.1 - '@typescript-eslint/typescript-estree': 6.4.1(typescript@5.2.2) + '@types/semver': 7.5.1 + '@typescript-eslint/scope-manager': 6.5.0 + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2) eslint: 8.48.0 semver: 7.5.4 transitivePeerDependencies: @@ -2668,11 +2645,11 @@ packages: eslint-visitor-keys: 3.4.3 dev: false - /@typescript-eslint/visitor-keys@6.4.1: - resolution: {integrity: sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==} + /@typescript-eslint/visitor-keys@6.5.0: + resolution: {integrity: sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.4.1 + '@typescript-eslint/types': 6.5.0 eslint-visitor-keys: 3.4.3 dev: true @@ -2681,8 +2658,8 @@ packages: peerDependencies: vite: ^4 dependencies: - '@swc/core': 1.3.80 - vite: 4.4.9(@types/node@20.5.6) + '@swc/core': 1.3.82 + vite: 4.4.9(@types/node@20.5.8) transitivePeerDependencies: - '@swc/helpers' dev: true @@ -2810,8 +2787,8 @@ packages: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - /array.prototype.findlastindex@1.2.2: - resolution: {integrity: sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==} + /array.prototype.findlastindex@1.2.3: + resolution: {integrity: sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -2875,7 +2852,7 @@ packages: has-symbols: 1.0.3 dev: true - /autoprefixer@10.4.15(postcss@8.4.28): + /autoprefixer@10.4.15(postcss@8.4.29): resolution: {integrity: sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==} engines: {node: ^10 || ^12 || >=14} hasBin: true @@ -2883,11 +2860,11 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.10 - caniuse-lite: 1.0.30001523 - fraction.js: 4.2.1 + caniuse-lite: 1.0.30001525 + fraction.js: 4.3.6 normalize-range: 0.1.2 picocolors: 1.0.0 - postcss: 8.4.28 + postcss: 8.4.29 postcss-value-parser: 4.2.0 dev: true @@ -2935,8 +2912,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001523 - electron-to-chromium: 1.4.503 + caniuse-lite: 1.0.30001525 + electron-to-chromium: 1.4.508 node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.10) dev: true @@ -2970,8 +2947,8 @@ packages: engines: {node: '>=6'} dev: false - /caniuse-lite@1.0.30001523: - resolution: {integrity: sha512-I5q5cisATTPZ1mc588Z//pj/Ox80ERYDfR71YnvY7raS/NOk8xXlZcB0sF7JdqaV//kOaa6aus7lRfpdnt1eBA==} + /caniuse-lite@1.0.30001525: + resolution: {integrity: sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==} dev: true /case-anything@2.1.13: @@ -3291,8 +3268,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: true - /electron-to-chromium@1.4.503: - resolution: {integrity: sha512-LF2IQit4B0VrUHFeQkWhZm97KuJSGF2WJqq1InpY+ECpFRkXd8yTIaTtJxsO0OKDmiBYwWqcrNaXOurn2T2wiA==} + /electron-to-chromium@1.4.508: + resolution: {integrity: sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg==} dev: true /emoji-regex@8.0.0: @@ -3335,7 +3312,7 @@ packages: call-bind: 1.0.2 es-set-tostringtag: 2.0.1 es-to-primitive: 1.2.1 - function.prototype.name: 1.1.5 + function.prototype.name: 1.1.6 get-intrinsic: 1.2.1 get-symbol-description: 1.0.0 globalthis: 1.0.3 @@ -3369,8 +3346,8 @@ packages: unbox-primitive: 1.0.2 which-typed-array: 1.1.11 - /es-iterator-helpers@1.0.13: - resolution: {integrity: sha512-LK3VGwzvaPWobO8xzXXGRUOGw8Dcjyfk62CsY/wfHN75CwsJPbuypOYJxK6g5RyEL8YDjIWcl6jgd8foO6mmrA==} + /es-iterator-helpers@1.0.14: + resolution: {integrity: sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw==} dependencies: asynciterator.prototype: 1.0.0 call-bind: 1.0.2 @@ -3384,7 +3361,7 @@ packages: has-proto: 1.0.1 has-symbols: 1.0.3 internal-slot: 1.0.5 - iterator.prototype: 1.1.0 + iterator.prototype: 1.1.1 safe-array-concat: 1.0.0 dev: true @@ -3574,7 +3551,7 @@ packages: dependencies: '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.2.2) array-includes: 3.1.6 - array.prototype.findlastindex: 1.2.2 + array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 debug: 3.2.7 @@ -3586,9 +3563,9 @@ packages: is-core-module: 2.13.0 is-glob: 4.0.3 minimatch: 3.1.2 - object.fromentries: 2.0.6 - object.groupby: 1.0.0 - object.values: 1.1.6 + object.fromentries: 2.0.7 + object.groupby: 1.0.1 + object.values: 1.1.7 semver: 6.3.1 tsconfig-paths: 3.14.2 transitivePeerDependencies: @@ -3617,8 +3594,8 @@ packages: jsx-ast-utils: 3.3.5 language-tags: 1.0.5 minimatch: 3.1.2 - object.entries: 1.1.6 - object.fromentries: 2.0.6 + object.entries: 1.1.7 + object.fromentries: 2.0.7 semver: 6.3.1 dev: true @@ -3632,19 +3609,19 @@ packages: array.prototype.flatmap: 1.3.1 array.prototype.tosorted: 1.1.1 doctrine: 2.1.0 - es-iterator-helpers: 1.0.13 + es-iterator-helpers: 1.0.14 eslint: 8.48.0 estraverse: 5.3.0 jsx-ast-utils: 3.3.5 minimatch: 3.1.2 - object.entries: 1.1.6 - object.fromentries: 2.0.6 - object.hasown: 1.1.2 - object.values: 1.1.6 + object.entries: 1.1.7 + object.fromentries: 2.0.7 + object.hasown: 1.1.3 + object.values: 1.1.7 prop-types: 15.8.1 resolve: 2.0.0-next.4 semver: 6.3.1 - string.prototype.matchall: 4.0.8 + string.prototype.matchall: 4.0.9 dev: true /eslint-plugin-simple-import-sort@10.0.0(eslint@8.48.0): @@ -3687,7 +3664,7 @@ packages: '@eslint-community/regexpp': 4.8.0 '@eslint/eslintrc': 2.1.2 '@eslint/js': 8.48.0 - '@humanwhocodes/config-array': 0.11.10 + '@humanwhocodes/config-array': 0.11.11 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 ajv: 6.12.6 @@ -3869,8 +3846,8 @@ packages: fetch-blob: 3.2.0 dev: false - /fraction.js@4.2.1: - resolution: {integrity: sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q==} + /fraction.js@4.3.6: + resolution: {integrity: sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==} dev: true /fs.realpath@1.0.0: @@ -3892,8 +3869,8 @@ packages: engines: {node: '>=14.16'} dev: false - /function.prototype.name@1.1.5: - resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==} + /function.prototype.name@1.1.6: + resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -4380,14 +4357,13 @@ packages: engines: {node: '>=0.10.0'} dev: false - /iterator.prototype@1.1.0: - resolution: {integrity: sha512-rjuhAk1AJ1fssphHD0IFV6TWL40CwRZ53FrztKx43yk2v6rguBYsY4Bj1VU4HmoMmKwZUlx7mfnhDf9cOp4YTw==} + /iterator.prototype@1.1.1: + resolution: {integrity: sha512-9E+nePc8C9cnQldmNl6bgpTY6zI4OPRZd97fhJ/iVZ1GifIUDVV5F6x1nEDqpe8KaMEZGT4xgrwKQDxXnjOIZQ==} dependencies: define-properties: 1.2.0 get-intrinsic: 1.2.1 has-symbols: 1.0.3 - has-tostringtag: 1.0.0 - reflect.getprototypeof: 1.0.3 + reflect.getprototypeof: 1.0.4 dev: true /javascript-natural-sort@0.7.1: @@ -4460,7 +4436,7 @@ packages: array-includes: 3.1.6 array.prototype.flat: 1.3.1 object.assign: 4.1.4 - object.values: 1.1.6 + object.values: 1.1.7 dev: true /keyv@4.5.3: @@ -4671,7 +4647,7 @@ packages: resolution: {integrity: sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==} dependencies: '@types/mdast': 3.0.12 - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 unist-util-visit: 4.1.2 dev: false @@ -4688,7 +4664,7 @@ packages: resolution: {integrity: sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==} dependencies: '@types/mdast': 3.0.12 - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 decode-named-character-reference: 1.0.2 mdast-util-to-string: 3.2.0 micromark: 3.2.0 @@ -4783,7 +4759,7 @@ packages: resolution: {integrity: sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==} dependencies: '@types/mdast': 3.0.12 - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 longest-streak: 3.1.0 mdast-util-phrasing: 3.0.1 mdast-util-to-string: 3.2.0 @@ -5218,10 +5194,10 @@ packages: engines: {node: '>=14.16'} dev: false - /nostr-fetch@0.12.2: - resolution: {integrity: sha512-0WH0LlaPcIvG5gOIwrGtzRwHpaZ+JQxH0XG7EjQcKpviePVmVKWK7UAGuzuWJj/V0iSqnDGOLSQ+HSEBjGVCEQ==} + /nostr-fetch@0.13.0: + resolution: {integrity: sha512-0lIBkDjF5W0OBtkoMPax6ArKlzMGQDfc6cSyZ+XFvAoY2TJEiUXkI7Piwf0TQBEvJtahHaZnaTaFD13T69mgmQ==} dependencies: - '@nostr-fetch/kernel': 0.12.2 + '@nostr-fetch/kernel': 0.13.0 dev: false /nostr-tools@1.14.2: @@ -5283,8 +5259,8 @@ packages: has-symbols: 1.0.3 object-keys: 1.1.1 - /object.entries@1.1.6: - resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==} + /object.entries@1.1.7: + resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -5292,16 +5268,16 @@ packages: es-abstract: 1.22.1 dev: true - /object.fromentries@2.0.6: - resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==} + /object.fromentries@2.0.7: + resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 define-properties: 1.2.0 es-abstract: 1.22.1 - /object.groupby@1.0.0: - resolution: {integrity: sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==} + /object.groupby@1.0.1: + resolution: {integrity: sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==} dependencies: call-bind: 1.0.2 define-properties: 1.2.0 @@ -5309,8 +5285,8 @@ packages: get-intrinsic: 1.2.1 dev: false - /object.hasown@1.1.2: - resolution: {integrity: sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==} + /object.hasown@1.1.3: + resolution: {integrity: sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==} dependencies: define-properties: 1.2.0 es-abstract: 1.22.1 @@ -5330,8 +5306,8 @@ packages: isobject: 3.0.1 dev: false - /object.values@1.1.6: - resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==} + /object.values@1.1.7: + resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -5421,7 +5397,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.22.10 + '@babel/code-frame': 7.22.13 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -5516,29 +5492,29 @@ packages: irregular-plurals: 3.5.0 dev: false - /postcss-import@15.1.0(postcss@8.4.28): + /postcss-import@15.1.0(postcss@8.4.29): resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==} engines: {node: '>=14.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.28 + postcss: 8.4.29 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.4 dev: true - /postcss-js@4.0.1(postcss@8.4.28): + /postcss-js@4.0.1(postcss@8.4.29): resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} engines: {node: ^12 || ^14 || >= 16} peerDependencies: postcss: ^8.4.21 dependencies: camelcase-css: 2.0.1 - postcss: 8.4.28 + postcss: 8.4.29 dev: true - /postcss-load-config@4.0.1(postcss@8.4.28): + /postcss-load-config@4.0.1(postcss@8.4.29): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -5551,17 +5527,17 @@ packages: optional: true dependencies: lilconfig: 2.1.0 - postcss: 8.4.28 - yaml: 2.3.1 + postcss: 8.4.29 + yaml: 2.3.2 dev: true - /postcss-nested@6.0.1(postcss@8.4.28): + /postcss-nested@6.0.1(postcss@8.4.29): resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.2.14 dependencies: - postcss: 8.4.28 + postcss: 8.4.29 postcss-selector-parser: 6.0.13 dev: true @@ -5585,8 +5561,8 @@ packages: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: true - /postcss@8.4.28: - resolution: {integrity: sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==} + /postcss@8.4.29: + resolution: {integrity: sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.6 @@ -5598,8 +5574,8 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - /prettier-plugin-tailwindcss@0.5.3(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.2): - resolution: {integrity: sha512-M5K80V21yM+CTm/FEFYRv9/9LyInYbCSXpIoPAKMm8zy89IOwdiA2e4JVbcO7tvRtAQWz32zdj7/WKcsmFyAVg==} + /prettier-plugin-tailwindcss@0.5.4(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.3): + resolution: {integrity: sha512-QZzzB1bID6qPsKHTeA9qPo1APmmxfFrA5DD3LQ+vbTmAnY40eJI7t9Q1ocqel2EKMWNPLJqdTDWZj1hKYgqSgg==} engines: {node: '>=14.21.3'} peerDependencies: '@ianvs/prettier-plugin-sort-imports': '*' @@ -5650,12 +5626,12 @@ packages: prettier-plugin-twig-melody: optional: true dependencies: - '@trivago/prettier-plugin-sort-imports': 4.2.0(prettier@3.0.2) - prettier: 3.0.2 + '@trivago/prettier-plugin-sort-imports': 4.2.0(prettier@3.0.3) + prettier: 3.0.3 dev: true - /prettier@3.0.2: - resolution: {integrity: sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==} + /prettier@3.0.3: + resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} engines: {node: '>=14'} hasBin: true dev: true @@ -5892,7 +5868,7 @@ packages: '@types/hast': 2.3.5 '@types/prop-types': 15.7.5 '@types/react': 18.2.21 - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 comma-separated-tokens: 2.0.3 hast-util-whitespace: 2.0.1 prop-types: 15.8.1 @@ -6079,8 +6055,8 @@ packages: strip-indent: 3.0.0 dev: false - /reflect.getprototypeof@1.0.3: - resolution: {integrity: sha512-TTAOZpkJ2YLxl7mVHWrNo3iDMEkYlva/kgFcXndqMgbo/AZUmmavEkdXV+hXtE4P8xdyEKRzalaFqZVuwIk/Nw==} + /reflect.getprototypeof@1.0.4: + resolution: {integrity: sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -6359,8 +6335,8 @@ packages: strip-ansi: 7.1.0 dev: true - /string.prototype.matchall@4.0.8: - resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==} + /string.prototype.matchall@4.0.9: + resolution: {integrity: sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA==} dependencies: call-bind: 1.0.2 define-properties: 1.2.0 @@ -6513,11 +6489,11 @@ packages: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.0.0 - postcss: 8.4.28 - postcss-import: 15.1.0(postcss@8.4.28) - postcss-js: 4.0.1(postcss@8.4.28) - postcss-load-config: 4.0.1(postcss@8.4.28) - postcss-nested: 6.0.1(postcss@8.4.28) + postcss: 8.4.29 + postcss-import: 15.1.0(postcss@8.4.29) + postcss-js: 4.0.1(postcss@8.4.29) + postcss-load-config: 4.0.1(postcss@8.4.29) + postcss-nested: 6.0.1(postcss@8.4.29) postcss-selector-parser: 6.0.13 resolve: 1.22.4 sucrase: 3.34.0 @@ -6749,7 +6725,7 @@ packages: /unified@10.1.2: resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 bail: 2.0.2 extend: 3.0.2 is-buffer: 2.0.5 @@ -6765,32 +6741,32 @@ packages: /unist-util-is@5.2.1: resolution: {integrity: sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 dev: false /unist-util-position@4.0.4: resolution: {integrity: sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 dev: false /unist-util-stringify-position@3.0.3: resolution: {integrity: sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 dev: false /unist-util-visit-parents@5.1.3: resolution: {integrity: sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 unist-util-is: 5.2.1 dev: false /unist-util-visit@4.1.2: resolution: {integrity: sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 unist-util-is: 5.2.1 unist-util-visit-parents: 5.1.3 dev: false @@ -6928,14 +6904,14 @@ packages: /vfile-message@3.1.4: resolution: {integrity: sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 unist-util-stringify-position: 3.0.3 dev: false /vfile@5.3.7: resolution: {integrity: sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==} dependencies: - '@types/unist': 2.0.7 + '@types/unist': 2.0.8 is-buffer: 2.0.5 unist-util-stringify-position: 3.0.3 vfile-message: 3.1.4 @@ -6952,13 +6928,13 @@ packages: debug: 4.3.4 globrex: 0.1.2 tsconfck: 2.1.2(typescript@5.2.2) - vite: 4.4.9(@types/node@20.5.6) + vite: 4.4.9(@types/node@20.5.8) transitivePeerDependencies: - supports-color - typescript dev: true - /vite@4.4.9(@types/node@20.5.6): + /vite@4.4.9(@types/node@20.5.8): resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -6986,9 +6962,9 @@ packages: terser: optional: true dependencies: - '@types/node': 20.5.6 + '@types/node': 20.5.8 esbuild: 0.18.20 - postcss: 8.4.28 + postcss: 8.4.29 rollup: 3.28.1 optionalDependencies: fsevents: 2.3.3 @@ -7016,7 +6992,7 @@ packages: resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==} engines: {node: '>= 0.4'} dependencies: - function.prototype.name: 1.1.5 + function.prototype.name: 1.1.6 has-tostringtag: 1.0.0 is-async-function: 2.0.0 is-date-object: 1.0.5 @@ -7083,6 +7059,11 @@ packages: engines: {node: '>= 14'} dev: true + /yaml@2.3.2: + resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} + engines: {node: '>= 14'} + dev: true + /yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} @@ -7116,114 +7097,34 @@ packages: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: false - github.com/tauri-apps/tauri-plugin-app/1efde5f3e693927a529408f414238ad40b06c9a2: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-app/tar.gz/1efde5f3e693927a529408f414238ad40b06c9a2} - name: '@tauri-apps/plugin-app' - version: 2.0.0-alpha.1 + github.com/tauri-apps/tauri-plugin-sql/b8fd19dac907cc8c3d78681cd4803a326b8b861e: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-sql/tar.gz/b8fd19dac907cc8c3d78681cd4803a326b8b861e} + name: tauri-plugin-sql-api + version: 0.0.0 dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 + '@tauri-apps/api': 1.4.0 dev: false - github.com/tauri-apps/tauri-plugin-autostart/50d57bf6dcac4c32e6f5a73f1b6d90001b68c6f7: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-autostart/tar.gz/50d57bf6dcac4c32e6f5a73f1b6d90001b68c6f7} - name: '@tauri-apps/plugin-autostart' - version: 2.0.0-alpha.1 + github.com/tauri-apps/tauri-plugin-store/a65ce9bfb168a9a3cd7ed4102b9f22770cc3abfa: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/a65ce9bfb168a9a3cd7ed4102b9f22770cc3abfa} + name: tauri-plugin-store-api + version: 0.0.0 dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 + '@tauri-apps/api': 1.4.0 dev: false - github.com/tauri-apps/tauri-plugin-clipboard-manager/f5314980a4b60362bca6b9d2a3a40a637c021d3c: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-clipboard-manager/tar.gz/f5314980a4b60362bca6b9d2a3a40a637c021d3c} - name: '@tauri-apps/plugin-clipboard-manager' - version: 2.0.0-alpha.1 + github.com/tauri-apps/tauri-plugin-stronghold/877f308097f98b59a6cad87adda0f75a65398e00: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-stronghold/tar.gz/877f308097f98b59a6cad87adda0f75a65398e00} + name: tauri-plugin-stronghold-api + version: 0.0.0 dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 + '@tauri-apps/api': 1.4.0 dev: false - github.com/tauri-apps/tauri-plugin-dialog/eece20be9c1dc257e268f5d63654af56cf4fb474: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-dialog/tar.gz/eece20be9c1dc257e268f5d63654af56cf4fb474} - name: '@tauri-apps/plugin-dialog' - version: 2.0.0-alpha.1 + github.com/tauri-apps/tauri-plugin-upload/b53ebc6c2e716d95fd94b64d3b4b87cd57ae4feb: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-upload/tar.gz/b53ebc6c2e716d95fd94b64d3b4b87cd57ae4feb} + name: tauri-plugin-upload-api + version: 0.0.0 dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-fs/c90fd8bcad3be92f34a0642d67ab1a6ad9f73dee: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-fs/tar.gz/c90fd8bcad3be92f34a0642d67ab1a6ad9f73dee} - name: '@tauri-apps/plugin-fs' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-notification/66c0779854575ec7860eadcd98673c39627e81a6: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-notification/tar.gz/66c0779854575ec7860eadcd98673c39627e81a6} - name: '@tauri-apps/plugin-notification' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-os/97469d43edd41c32aa1c0eea38d1c19d14e38f47: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-os/tar.gz/97469d43edd41c32aa1c0eea38d1c19d14e38f47} - name: '@tauri-apps/plugin-os' - version: 2.0.0-alpha.2 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-process/7a04374b86dbc0691a7223bbdbec6b0b3d8cd3af: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-process/tar.gz/7a04374b86dbc0691a7223bbdbec6b0b3d8cd3af} - name: '@tauri-apps/plugin-process' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-shell/c8bb6d545043434cdb5784ace171c509f8b20586: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-shell/tar.gz/c8bb6d545043434cdb5784ace171c509f8b20586} - name: '@tauri-apps/plugin-shell' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-sql/592d8ba3640cfb3a3214fcec21b0355d3a6951ec: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-sql/tar.gz/592d8ba3640cfb3a3214fcec21b0355d3a6951ec} - name: '@tauri-apps/plugin-sql' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-store/22ed4246f7be1413852c5ab9907a773be08ad8a8: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/22ed4246f7be1413852c5ab9907a773be08ad8a8} - name: '@tauri-apps/plugin-store' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-stronghold/33dc99be377c7bc6b7cf4d4d1fdce28340379f63: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-stronghold/tar.gz/33dc99be377c7bc6b7cf4d4d1fdce28340379f63} - name: '@tauri-apps/plugin-stronghold' - version: 2.0.0-alpha.2 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-upload/c48327c9601b0097f104ddef120a1999d5b944db: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-upload/tar.gz/c48327c9601b0097f104ddef120a1999d5b944db} - name: '@tauri-apps/plugin-upload' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - - github.com/tauri-apps/tauri-plugin-window/09c9732d0c98c13ee8aeb51de61f7eef3eb33a4b: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window/tar.gz/09c9732d0c98c13ee8aeb51de61f7eef3eb33a4b} - name: '@tauri-apps/plugin-window' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 + '@tauri-apps/api': 1.4.0 dev: false diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 828fa438..a48a5374 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -33,22 +33,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug", ] -[[package]] -name = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures", -] - [[package]] name = "aes-gcm" version = "0.9.4" @@ -56,8 +45,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ "aead", - "aes 0.7.5", - "cipher 0.3.0", + "aes", + "cipher", "ctr", "ghash", "subtle", @@ -88,9 +77,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -185,26 +174,6 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -[[package]] -name = "arboard" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" -dependencies = [ - "clipboard-win", - "core-graphics 0.22.3", - "image", - "log", - "objc", - "objc-foundation", - "objc_id", - "once_cell", - "parking_lot", - "thiserror", - "winapi", - "x11rb", -] - [[package]] name = "arrayref" version = "0.3.7" @@ -313,9 +282,9 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", @@ -341,9 +310,9 @@ dependencies = [ [[package]] name = "atk" -version = "0.16.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ "atk-sys", "bitflags 1.3.2", @@ -353,14 +322,14 @@ dependencies = [ [[package]] name = "atk-sys" -version = "0.16.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.1.1", ] [[package]] @@ -546,6 +515,16 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bstr" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -573,50 +552,28 @@ dependencies = [ "serde", ] -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cairo-rs" -version = "0.16.7" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" dependencies = [ "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.16.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 6.1.1", ] [[package]] @@ -657,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml", + "toml 0.7.6", ] [[package]] @@ -666,7 +623,6 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] @@ -687,6 +643,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + [[package]] name = "cfg-expr" version = "0.15.4" @@ -710,7 +675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "zeroize", ] @@ -723,22 +688,22 @@ checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -750,32 +715,21 @@ dependencies = [ "generic-array", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clap" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", @@ -785,11 +739,11 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.29", @@ -921,6 +875,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "convert_case" version = "0.4.0" @@ -1119,7 +1079,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -1170,12 +1130,6 @@ dependencies = [ "syn 2.0.29", ] -[[package]] -name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - [[package]] name = "der" version = "0.7.8" @@ -1346,7 +1300,7 @@ checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27" dependencies = [ "cc", "rustc_version", - "toml", + "toml 0.7.6", "vswhom", "winreg 0.51.0", ] @@ -1407,9 +1361,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1475,7 +1429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.9", + "rustix 0.38.11", "windows-sys 0.48.0", ] @@ -1725,9 +1679,9 @@ dependencies = [ [[package]] name = "gdk" -version = "0.16.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -1741,9 +1695,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.16.7" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" dependencies = [ "bitflags 1.3.2", "gdk-pixbuf-sys", @@ -1754,22 +1708,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.16.3" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.1.1", ] [[package]] name = "gdk-sys" -version = "0.16.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1779,33 +1733,33 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 6.1.1", ] [[package]] name = "gdkwayland-sys" -version = "0.16.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" dependencies = [ "gdk-sys", "glib-sys", "gobject-sys", "libc", "pkg-config", - "system-deps", + "system-deps 6.1.1", ] [[package]] name = "gdkx11-sys" -version = "0.16.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps", + "system-deps 6.1.1", "x11", ] @@ -1832,26 +1786,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - [[package]] name = "getrandom" version = "0.1.16" @@ -1894,50 +1828,45 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.16.7" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", - "futures-util", "gio-sys", "glib", "libc", "once_cell", - "pin-project-lite", - "smallvec", "thiserror", ] [[package]] name = "gio-sys" -version = "0.16.3" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.1.1", "winapi", ] [[package]] name = "glib" -version = "0.16.9" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", "futures-task", - "futures-util", - "gio-sys", "glib-macros", "glib-sys", "gobject-sys", @@ -1949,12 +1878,12 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.16.8" +version = "0.15.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", - "heck", + "heck 0.4.1", "proc-macro-crate", "proc-macro-error", "proc-macro2", @@ -1964,12 +1893,12 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.16.3" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps", + "system-deps 6.1.1", ] [[package]] @@ -1979,21 +1908,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "gobject-sys" -version = "0.16.3" +name = "globset" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 6.1.1", ] [[package]] name = "gtk" -version = "0.16.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" dependencies = [ "atk", "bitflags 1.3.2", @@ -2014,9 +1956,9 @@ dependencies = [ [[package]] name = "gtk-sys" -version = "0.16.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -2027,14 +1969,14 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps", + "system-deps 6.1.1", ] [[package]] name = "gtk3-macros" -version = "0.16.3" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" dependencies = [ "anyhow", "proc-macro-crate", @@ -2084,13 +2026,22 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ "hashbrown 0.14.0", ] +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "heck" version = "0.4.1" @@ -2141,9 +2092,9 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.26.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", @@ -2217,6 +2168,19 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "iana-time-zone" version = "0.1.57" @@ -2266,6 +2230,23 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + [[package]] name = "image" version = "0.24.7" @@ -2277,8 +2258,6 @@ dependencies = [ "color_quant", "num-rational", "num-traits", - "png", - "tiff", ] [[package]] @@ -2312,15 +2291,6 @@ dependencies = [ "cfb", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.12" @@ -2348,7 +2318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e04d492224bff6e97142f033d0a4383bcbc05918be1ff7b3abd2c1cc85205a2" dependencies = [ "aead", - "aes 0.7.5", + "aes", "aes-gcm", "autocfg", "blake2", @@ -2385,7 +2355,7 @@ dependencies = [ "bincode", "hkdf", "iota-crypto 0.15.3", - "rust-argon2", + "rust-argon2 1.0.0", "serde", "stronghold-derive", "stronghold-utils", @@ -2400,25 +2370,6 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2442,9 +2393,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "javascriptcore-rs" -version = "1.0.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfcc681b896b083864a4a3c3b3ea196f14ff66b8641a68fde209c6d84434056" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" dependencies = [ "bitflags 1.3.2", "glib", @@ -2453,30 +2404,28 @@ dependencies = [ [[package]] name = "javascriptcore-rs-sys" -version = "1.0.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0983ba5b3ab9a0c0918de02c42dc71f795d6de08092f88a98ce9fdfdee4ba91" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 5.0.0", ] [[package]] name = "jni" -version = "0.21.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ "cesu8", - "cfg-if", "combine", "jni-sys", "log", "thiserror", "walkdir", - "windows-sys 0.45.0", ] [[package]] @@ -2485,21 +2434,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" - [[package]] name = "js-sys" version = "0.3.64" @@ -2522,25 +2456,13 @@ dependencies = [ ] [[package]] -name = "keyboard-types" -version = "0.6.2" +name = "kuchiki" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" -dependencies = [ - "bitflags 1.3.2", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "kuchikiki" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ "cssparser", "html5ever", - "indexmap 1.9.3", "matches", "selectors", ] @@ -2554,46 +2476,12 @@ dependencies = [ "spin 0.5.2", ] -[[package]] -name = "libappindicator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] - [[package]] name = "libc" version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libm" version = "0.2.7" @@ -2679,29 +2567,20 @@ dependencies = [ name = "lume" version = "1.2.1" dependencies = [ - "rust-argon2", + "rust-argon2 1.0.0", "serde", "serde_json", "sqlx-cli", "tauri", - "tauri-build 2.0.0-alpha.8", - "tauri-plugin-app", + "tauri-build", "tauri-plugin-autostart", - "tauri-plugin-clipboard-manager", - "tauri-plugin-dialog", - "tauri-plugin-fs", - "tauri-plugin-http", - "tauri-plugin-notification", - "tauri-plugin-os", - "tauri-plugin-process", - "tauri-plugin-shell", "tauri-plugin-single-instance", "tauri-plugin-sql", "tauri-plugin-store", "tauri-plugin-stronghold", - "tauri-plugin-updater", "tauri-plugin-upload", - "tauri-plugin-window", + "window-shadows", + "window-vibrancy", ] [[package]] @@ -2734,13 +2613,13 @@ dependencies = [ [[package]] name = "markup5ever" -version = "0.11.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", - "phf 0.10.1", - "phf_codegen 0.10.0", + "phf 0.8.0", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", @@ -2772,9 +2651,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -2815,12 +2694,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "minisign-verify" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2843,35 +2716,33 @@ dependencies = [ ] [[package]] -name = "muda" -version = "0.8.5" +name = "native-tls" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28807bbe07d97a5bc148a79c730cb7a8dc373f354969e5b442c711adf61ccf" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ - "cocoa 0.25.0", - "crossbeam-channel", - "gdk", - "gdk-pixbuf", - "gtk", - "keyboard-types", - "objc", - "once_cell", - "png", - "thiserror", - "windows-sys 0.48.0", + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] name = "ndk" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", - "raw-window-handle", "thiserror", ] @@ -2883,9 +2754,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" dependencies = [ "jni-sys", ] @@ -2932,11 +2803,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abbbc55ad7b13aac85f9401c796dcda1b864e07fcad40ad47792eaa8932ea502" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags 2.4.0", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -3133,13 +3004,56 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "4.2.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ - "is-wsl", - "libc", "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", ] [[package]] @@ -3163,16 +3077,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "os_pipe" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "overload" version = "0.1.1" @@ -3181,12 +3085,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.16.5" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ "bitflags 1.3.2", - "gio", "glib", "libc", "once_cell", @@ -3195,14 +3098,14 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.3" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.1.1", ] [[package]] @@ -3234,17 +3137,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "paste" version = "1.0.14" @@ -3264,9 +3156,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.7", - "hmac", - "password-hash", - "sha2 0.10.7", ] [[package]] @@ -3316,16 +3205,6 @@ dependencies = [ "phf_shared 0.8.0", ] -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - [[package]] name = "phf_generator" version = "0.8.0" @@ -3845,10 +3724,12 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-tls", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -3856,6 +3737,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", + "tokio-native-tls", "tokio-util", "tower-service", "url", @@ -3868,18 +3750,17 @@ dependencies = [ [[package]] name = "rfd" -version = "0.11.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" dependencies = [ - "async-io", "block", "dispatch", - "futures-util", "glib-sys", "gobject-sys", "gtk-sys", "js-sys", + "lazy_static", "log", "objc", "objc-foundation", @@ -3888,7 +3769,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.44.0", + "windows 0.37.0", ] [[package]] @@ -3940,6 +3821,17 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "rust-argon2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e71971821b3ae0e769e4a4328dbcb517607b434db7697e9aba17203ec14e46a" +dependencies = [ + "base64 0.21.3", + "blake2b_simd", + "constant_time_eq 0.3.0", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -3971,9 +3863,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ "bitflags 2.4.0", "errno", @@ -3984,9 +3876,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "ring", "rustls-webpki", @@ -4063,6 +3955,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -4085,6 +3986,29 @@ dependencies = [ "untrusted", ] +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "selectors" version = "0.22.0" @@ -4098,7 +4022,7 @@ dependencies = [ "log", "matches", "phf 0.8.0", - "phf_codegen 0.8.0", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -4282,16 +4206,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "signal-hook" version = "0.3.17" @@ -4369,31 +4283,31 @@ dependencies = [ ] [[package]] -name = "soup3" -version = "0.3.2" +name = "soup2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82bc46048125fefd69d30b32b9d263d6556c9ffe82a7a7df181a86d912da5616" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ "bitflags 1.3.2", - "futures-channel", "gio", "glib", "libc", "once_cell", - "soup3-sys", + "soup2-sys", ] [[package]] -name = "soup3-sys" -version = "0.3.1" +name = "soup2-sys" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "014bbeb1c4cdb30739dc181e8d98b7908f124d9555843afa89b5570aaf4ec62b" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ + "bitflags 1.3.2", "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 5.0.0", ] [[package]] @@ -4536,7 +4450,7 @@ checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" dependencies = [ "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -4668,9 +4582,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state" -version = "0.6.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" dependencies = [ "loom", ] @@ -4793,17 +4707,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "swift-rs" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204" -dependencies = [ - "base64 0.21.3", - "serde", - "serde_json", -] - [[package]] name = "syn" version = "1.0.109" @@ -4828,11 +4731,28 @@ dependencies = [ [[package]] name = "sys-locale" -version = "0.3.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" dependencies = [ + "js-sys", "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", ] [[package]] @@ -4841,18 +4761,18 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "cfg-expr", - "heck", + "cfg-expr 0.15.4", + "heck 0.4.1", "pkg-config", - "toml", - "version-compare", + "toml 0.7.6", + "version-compare 0.1.1", ] [[package]] name = "tao" -version = "0.22.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f76221bce9db3af6b2b9cca4e92d8ea46c4cc88d785bc4b1a5cbcaab06f0b56" +checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -4889,12 +4809,10 @@ dependencies = [ "serde", "tao-macros", "unicode-segmentation", - "url", "uuid", - "windows 0.48.0", + "windows 0.39.0", "windows-implement", "x11-dl", - "zbus", ] [[package]] @@ -4927,95 +4845,79 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" -version = "2.0.0-alpha.11" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", "bytes", - "cocoa 0.25.0", + "cocoa 0.24.1", "dirs-next", "embed_plist", + "encoding_rs", + "flate2", "futures-util", "glib", "glob", "gtk", - "heck", + "heck 0.4.1", "http", - "jni", - "libc", - "log", - "mime", - "muda", + "ignore", + "notify-rust", "objc", "once_cell", + "open", + "os_info", "percent-encoding", "rand 0.8.5", "raw-window-handle", + "regex", "reqwest", + "rfd", + "semver", "serde", "serde_json", "serde_repr", "serialize-to-javascript", "state", - "swift-rs", - "tauri-build 2.0.0-alpha.7", + "sys-locale", + "tar", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.0.0-alpha.7 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph)", + "tauri-utils", + "tempfile", "thiserror", "tokio", - "tray-icon", "url", "uuid", "webkit2gtk", "webview2-com", - "windows 0.48.0", + "windows 0.39.0", ] [[package]] name = "tauri-build" -version = "2.0.0-alpha.7" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" -dependencies = [ - "anyhow", - "cargo_toml", - "heck", - "json-patch", - "plist", - "semver", - "serde", - "serde_json", - "swift-rs", - "tauri-utils 2.0.0-alpha.7 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph)", - "tauri-winres", - "walkdir", -] - -[[package]] -name = "tauri-build" -version = "2.0.0-alpha.8" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc47d3c84f4aeac397cd956267f3b8060c5a2dba78288a5ccf9a8b7a8c1e7025" +checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b" dependencies = [ "anyhow", "cargo_toml", - "heck", + "heck 0.4.1", "json-patch", - "plist", "semver", "serde", "serde_json", - "swift-rs", - "tauri-utils 2.0.0-alpha.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils", "tauri-winres", - "walkdir", ] [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.7" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" dependencies = [ "base64 0.21.3", "brotli", @@ -5025,43 +4927,36 @@ dependencies = [ "png", "proc-macro2", "quote", + "regex", "semver", "serde", "serde_json", "sha2 0.10.7", - "tauri-utils 2.0.0-alpha.7 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph)", + "tauri-utils", "thiserror", "time", - "url", "uuid", "walkdir", ] [[package]] name = "tauri-macros" -version = "2.0.0-alpha.7" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", "tauri-codegen", - "tauri-utils 2.0.0-alpha.7 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph)", -] - -[[package]] -name = "tauri-plugin-app" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "tauri", + "tauri-utils", ] [[package]] name = "tauri-plugin-autostart" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "auto-launch", "log", @@ -5071,130 +4966,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "tauri-plugin-clipboard-manager" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "arboard", - "log", - "serde", - "serde_json", - "tauri", - "tauri-build 2.0.0-alpha.8", - "thiserror", -] - -[[package]] -name = "tauri-plugin-dialog" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "glib", - "log", - "raw-window-handle", - "rfd", - "serde", - "serde_json", - "tauri", - "tauri-build 2.0.0-alpha.8", - "tauri-plugin-fs", - "thiserror", -] - -[[package]] -name = "tauri-plugin-fs" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "anyhow", - "glob", - "serde", - "tauri", - "thiserror", - "uuid", -] - -[[package]] -name = "tauri-plugin-http" -version = "2.0.0-alpha.2" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "data-url", - "glob", - "http", - "reqwest", - "serde", - "serde_json", - "tauri", - "tauri-plugin-fs", - "thiserror", - "url", -] - -[[package]] -name = "tauri-plugin-notification" -version = "2.0.0-alpha.2" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "log", - "notify-rust", - "rand 0.8.5", - "serde", - "serde_json", - "serde_repr", - "tauri", - "tauri-build 2.0.0-alpha.8", - "thiserror", - "time", - "url", -] - -[[package]] -name = "tauri-plugin-os" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "gethostname 0.4.3", - "log", - "os_info", - "serde", - "serde_json", - "serialize-to-javascript", - "sys-locale", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-plugin-process" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "tauri", -] - -[[package]] -name = "tauri-plugin-shell" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "encoding_rs", - "log", - "open", - "os_pipe", - "regex", - "serde", - "serde_json", - "shared_child", - "tauri", - "thiserror", -] - [[package]] name = "tauri-plugin-single-instance" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "log", "serde", @@ -5207,8 +4982,8 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "futures-core", "log", @@ -5223,8 +4998,8 @@ dependencies = [ [[package]] name = "tauri-plugin-store" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "log", "serde", @@ -5235,13 +5010,16 @@ dependencies = [ [[package]] name = "tauri-plugin-stronghold" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "hex", "iota-crypto 0.23.0", "iota_stronghold", "log", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "rust-argon2 2.0.0", "serde", "serde_json", "tauri", @@ -5249,35 +5027,10 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tauri-plugin-updater" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "base64 0.21.3", - "dirs-next", - "futures-util", - "http", - "minisign-verify", - "percent-encoding", - "reqwest", - "semver", - "serde", - "serde_json", - "tar", - "tauri", - "tempfile", - "thiserror", - "time", - "tokio", - "url", - "zip", -] - [[package]] name = "tauri-plugin-upload" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "futures-util", "log", @@ -5291,98 +5044,62 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tauri-plugin-window" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#ef1ce3f62a2811d30f15c4333afcddd57b3aca84" -dependencies = [ - "serde", - "tauri", - "thiserror", -] - [[package]] name = "tauri-runtime" -version = "1.0.0-alpha.0" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769" dependencies = [ "gtk", "http", "http-range", - "jni", "rand 0.8.5", "raw-window-handle", "serde", "serde_json", - "tauri-utils 2.0.0-alpha.7 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph)", + "tauri-utils", "thiserror", "url", "uuid", - "windows 0.48.0", + "webview2-com", + "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "1.0.0-alpha.0" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b" dependencies = [ "cocoa 0.24.1", "gtk", - "jni", "percent-encoding", "rand 0.8.5", "raw-window-handle", "tauri-runtime", - "tauri-utils 2.0.0-alpha.7 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph)", + "tauri-utils", "uuid", "webkit2gtk", "webview2-com", - "windows 0.48.0", + "windows 0.39.0", "wry", ] [[package]] name = "tauri-utils" -version = "2.0.0-alpha.7" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bcd7c6f67fd6371dcc22da7d7f26ec12c4eae26ad7bc54943bb9f35b5db302" -dependencies = [ - "ctor", - "dunce", - "glob", - "heck", - "html5ever", - "infer", - "json-patch", - "kuchikiki", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows 0.48.0", -] - -[[package]] -name = "tauri-utils" -version = "2.0.0-alpha.7" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" +checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84" dependencies = [ "brotli", "ctor", "dunce", "glob", - "heck", + "heck 0.4.1", "html5ever", "infer", "json-patch", - "kuchikiki", + "kuchiki", "memchr", "phf 0.10.1", "proc-macro2", @@ -5394,7 +5111,7 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows 0.48.0", + "windows 0.39.0", ] [[package]] @@ -5404,7 +5121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ "embed-resource", - "toml", + "toml 0.7.6", ] [[package]] @@ -5426,7 +5143,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.9", + "rustix 0.38.11", "windows-sys 0.48.0", ] @@ -5477,17 +5194,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" version = "0.3.28" @@ -5559,6 +5265,16 @@ dependencies = [ "syn 2.0.29", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.14" @@ -5584,6 +5300,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "toml" version = "0.7.6" @@ -5687,25 +5412,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "tray-icon" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b164327e17101c78ba3dfdf879b977027ef1bd7855668ac30063de21fc02447" -dependencies = [ - "cocoa 0.25.0", - "core-graphics 0.23.1", - "crossbeam-channel", - "dirs-next", - "libappindicator", - "muda", - "objc", - "once_cell", - "png", - "thiserror", - "windows-sys 0.48.0", -] - [[package]] name = "treediff" version = "4.0.2" @@ -5794,9 +5500,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -5837,6 +5543,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + [[package]] name = "version-compare" version = "0.1.1" @@ -5997,9 +5709,9 @@ dependencies = [ [[package]] name = "webkit2gtk" -version = "1.1.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba4cce9085e0fb02575cfd45c328740dde78253cba516b1e8be2ca0f57bd8bf" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -6015,18 +5727,20 @@ dependencies = [ "javascriptcore-rs", "libc", "once_cell", - "soup3", + "soup2", "webkit2gtk-sys", ] [[package]] name = "webkit2gtk-sys" -version = "1.1.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4489eb24e8cf0a3d0555fd3a8f7adec2a5ece34c1e7b7c9a62da7822fd40a59" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" dependencies = [ + "atk-sys", "bitflags 1.3.2", "cairo-sys-rs", + "gdk-pixbuf-sys", "gdk-sys", "gio-sys", "glib-sys", @@ -6034,9 +5748,10 @@ dependencies = [ "gtk-sys", "javascriptcore-rs-sys", "libc", + "pango-sys", "pkg-config", - "soup3-sys", - "system-deps", + "soup2-sys", + "system-deps 6.1.1", ] [[package]] @@ -6050,49 +5765,42 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.25.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.48.0", + "windows 0.39.0", "windows-implement", - "windows-interface", ] [[package]] name = "webview2-com-macros" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 1.0.109", ] [[package]] name = "webview2-com-sys" -version = "0.25.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d39576804304cf9ead192467ef47f7859a1a12fec3bd459d5ba34b8cd65ed5" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" dependencies = [ "regex", "serde", "serde_json", "thiserror", - "windows 0.48.0", + "windows 0.39.0", "windows-bindgen", "windows-metadata", ] -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - [[package]] name = "whoami" version = "1.4.1" @@ -6124,21 +5832,34 @@ dependencies = [ "winapi", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "window-shadows" +version = "0.2.1" +source = "git+https://github.com/tauri-apps/window-shadows?branch=dev#a9f5f1f7725609c71404539befca1f1a98095cd2" +dependencies = [ + "cocoa 0.25.0", + "objc", + "raw-window-handle", + "windows-sys 0.48.0", +] + +[[package]] +name = "window-vibrancy" +version = "0.4.0" +source = "git+https://github.com/tauri-apps/window-vibrancy?branch=dev#84b45368cb9aa8ce5107ae3d508092720226da22" +dependencies = [ + "cocoa 0.25.0", + "objc", + "raw-window-handle", + "windows-sys 0.48.0", +] + [[package]] name = "windows" version = "0.36.1" @@ -6152,12 +5873,26 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + [[package]] name = "windows" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" dependencies = [ + "windows-implement", "windows_aarch64_msvc 0.39.0", "windows_i686_gnu 0.39.0", "windows_i686_msvc 0.39.0", @@ -6165,31 +5900,20 @@ dependencies = [ "windows_x86_64_msvc 0.39.0", ] -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-implement", - "windows-interface", "windows-targets 0.48.5", ] [[package]] name = "windows-bindgen" -version = "0.48.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe21a77bc54b7312dbd66f041605e098990c98be48cd52967b85b5e60e75ae6" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" dependencies = [ "windows-metadata", "windows-tokens", @@ -6197,31 +5921,34 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "windows-interface" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" -dependencies = [ - "proc-macro2", - "quote", "syn 1.0.109", + "windows-tokens", ] [[package]] name = "windows-metadata" -version = "0.48.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0e5f0e2cc372bb6addbfff9a8add712155cd743df9c15f6ab000f31432d" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] [[package]] name = "windows-sys" @@ -6273,9 +6000,9 @@ dependencies = [ [[package]] name = "windows-tokens" -version = "0.48.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34c9a3b28cb41db7385546f7f9a8179348dffc89923dde66857b1ba5312f6b4" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows_aarch64_gnullvm" @@ -6295,6 +6022,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + [[package]] name = "windows_aarch64_msvc" version = "0.39.0" @@ -6319,6 +6052,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + [[package]] name = "windows_i686_gnu" version = "0.39.0" @@ -6343,6 +6082,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + [[package]] name = "windows_i686_msvc" version = "0.39.0" @@ -6367,6 +6112,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + [[package]] name = "windows_x86_64_gnu" version = "0.39.0" @@ -6403,6 +6154,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + [[package]] name = "windows_x86_64_msvc" version = "0.39.0" @@ -6461,11 +6218,11 @@ dependencies = [ [[package]] name = "wry" -version = "0.31.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bf838a5430184dfe0b1f568af7998a455c0df75a1df300a3894e0f181e7408" +checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" dependencies = [ - "base64 0.21.3", + "base64 0.13.1", "block", "cocoa 0.24.1", "core-graphics 0.22.3", @@ -6477,8 +6234,7 @@ dependencies = [ "gtk", "html5ever", "http", - "javascriptcore-rs", - "kuchikiki", + "kuchiki", "libc", "log", "objc", @@ -6487,14 +6243,14 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.7", - "soup3", + "soup2", "tao", "thiserror", "url", "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.48.0", + "windows 0.39.0", "windows-implement", ] @@ -6519,28 +6275,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" -dependencies = [ - "gethostname 0.2.3", - "nix 0.24.3", - "winapi", - "winapi-wsapoll", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix 0.24.3", -] - [[package]] name = "x25519-dalek" version = "1.1.1" @@ -6567,7 +6301,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "nix 0.26.3", + "nix 0.26.4", "winapi", ] @@ -6595,7 +6329,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.26.3", + "nix 0.26.4", "once_cell", "ordered-stream", "rand 0.8.5", @@ -6657,56 +6391,6 @@ dependencies = [ "syn 2.0.29", ] -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes 0.8.3", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "zvariant" version = "3.15.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 284e6a54..e1c3fb9d 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -11,40 +11,44 @@ rust-version = "1.71" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0.0-alpha.8", features = [] } +tauri-build = { version = "1.4.0", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { git = "https://git.nextgraph.org/NextGraph/tauri.git", branch = "alpha.11-nextgraph", features = [ - "protocol-asset", +tauri = { version = "1.4.0", features = [ + "window-start-dragging", + "path-all", + "http-all", + "clipboard-write-text", + "os-all", + "notification-all", + "clipboard-read-text", + "window-set-resizable", + "window-set-size", + "shell-open", + "fs-write-file", + "app-all", + "fs-remove-file", + "window-center", + "dialog-all", "macos-private-api", - "no-ipc-custom-protocol", ] } -tauri-plugin-single-instance = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-autostart = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-stronghold = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-upload = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-updater = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-dialog = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-http = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-fs = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-clipboard-manager = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-notification = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-app = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-process = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-os = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-window = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-store = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } -tauri-plugin-shell = { git = "https://github.com/luminous-devs/plugins-workspace", branch = "v2" } +tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy", branch = "dev" } +window-shadows = { git = "https://github.com/tauri-apps/window-shadows", branch = "dev" } sqlx-cli = { version = "0.7.0", default-features = false, features = [ "sqlite", ] } rust-argon2 = "1.0" [dependencies.tauri-plugin-sql] -git = "https://github.com/luminous-devs/plugins-workspace" -branch = "v2" +git = "hhttps://github.com/tauri-apps/plugins-workspace" +branch = "v1" features = ["sqlite"] [features] diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 82683977..0dacb1d4 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -6,6 +6,8 @@ use tauri::Manager; use tauri_plugin_autostart::MacosLauncher; use tauri_plugin_sql::{Migration, MigrationKind}; +use window_shadows::set_shadow; +use window_vibrancy::{apply_mica, apply_vibrancy, NSVisualEffectMaterial}; #[derive(Clone, serde::Serialize)] struct Payload { @@ -168,20 +170,25 @@ fn main() { .emit_all("single-instance", Payload { args: argv, cwd }) .unwrap(); })) - .plugin(tauri_plugin_updater::Builder::new().build()) .plugin(tauri_plugin_upload::init()) - .plugin(tauri_plugin_dialog::init()) - .plugin(tauri_plugin_http::init()) - .plugin(tauri_plugin_fs::init()) - .plugin(tauri_plugin_clipboard_manager::init()) - .plugin(tauri_plugin_notification::init()) - .plugin(tauri_plugin_app::init()) - .plugin(tauri_plugin_process::init()) - .plugin(tauri_plugin_os::init()) - .plugin(tauri_plugin_window::init()) .plugin(tauri_plugin_store::Builder::default().build()) - .plugin(tauri_plugin_shell::init()) .invoke_handler(tauri::generate_handler![close_splashscreen]) + .setup(|app| { + let window = app.get_window("main").unwrap(); + + #[cfg(target_os = "macos")] + apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None) + .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS"); + + #[cfg(target_os = "windows")] + apply_mica(&window, Some(true)) + .expect("Unsupported platform! 'apply_blur' is only supported on Windows"); + + // set native shadow + set_shadow(&window, true).expect("Unsupported platform!"); + + Ok(()) + }) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 879573ef..9b4eb01f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -10,38 +10,71 @@ "productName": "Lume", "version": "1.2.1" }, - "plugins": { - "fs": { - "scope": [ - "$APPDATA/*", - "$DATA/*", - "$LOCALDATA/*", - "$DESKTOP/*", - "$DOCUMENT/*", - "$DOWNLOAD/*", - "$HOME/*", - "$PICTURE/*", - "$PUBLIC/*", - "$VIDEO/*" - ] - }, - "http": { - "scope": [ - "http://**/", - "https://**/" - ] - }, - "shell": { - "open": true - }, - "updater": { - "endpoints": [ - "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}", - "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}" - ] - } - }, "tauri": { + "allowlist": { + "app": { + "all": true, + "show": true, + "hide": true + }, + "path": { + "all": true + }, + "dialog": { + "all": true, + "ask": true, + "confirm": true, + "message": true, + "open": true, + "save": true + }, + "fs": { + "all": false, + "removeFile": true, + "writeFile": true, + "scope": [ + "$APPDATA/*", + "$DATA/*", + "$LOCALDATA/*", + "$DESKTOP/*", + "$DOCUMENT/*", + "$DOWNLOAD/*", + "$HOME/*", + "$PICTURE/*", + "$PUBLIC/*", + "$VIDEO/*" + ] + }, + "http": { + "all": true, + "scope": [ + "http://**", + "https://**" + ] + }, + "shell": { + "all": false, + "open": true + }, + "os": { + "all": true + }, + "window": { + "all": false, + "center": true, + "setResizable": true, + "setSize": true, + "startDragging": true + }, + "clipboard": { + "all": false, + "writeText": true, + "readText": true + }, + "notification": { + "all": true + } + }, "bundle": { "active": true, "appimage": { @@ -79,18 +112,15 @@ "timestampUrl": "" } }, + "updater": { + "endpoints": [ + "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}", + "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}" + ] + }, "security": { "csp": { - "connect-src": "ipc: https://ipc.localhost", "content-security-policy": "upgrade-insecure-requests" - }, - "freezePrototype": false, - "assetProtocol": { - "enable": true, - "scope": { - "allow": ["$APPCONFIG/*.db", "$RESOURCE/**"], - "deny": ["$APPCONFIG/*.stronghold"] - } } }, "macOSPrivateApi": true diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 07d2084a..2abefcfb 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -27,11 +27,7 @@ "fullscreen": false, "hiddenTitle": true, "visible": false, - "fileDropEnabled": true, - "windowEffects": { - "effects": ["hudWindow"], - "state": "followsWindowActiveState" - } + "fileDropEnabled": true } ] } diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 9c0084d8..6a5172fc 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -24,11 +24,7 @@ "fullscreen": false, "hiddenTitle": true, "visible": false, - "fileDropEnabled": true, - "windowEffects": { - "effects": ["micaDark", "micaLight", "acrylic"], - "state": "followsWindowActiveState" - } + "fileDropEnabled": true } ] } diff --git a/src/app/auth/create/step-1.tsx b/src/app/auth/create/step-1.tsx index 53400b5a..65f9c45f 100644 --- a/src/app/auth/create/step-1.tsx +++ b/src/app/auth/create/step-1.tsx @@ -1,4 +1,4 @@ -import { BaseDirectory, writeTextFile } from '@tauri-apps/plugin-fs'; +import { BaseDirectory, writeTextFile } from '@tauri-apps/api/fs'; import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools'; import { useEffect, useMemo, useState } from 'react'; import { useNavigate } from 'react-router-dom'; diff --git a/src/app/auth/create/step-2.tsx b/src/app/auth/create/step-2.tsx index c543116f..96bd4225 100644 --- a/src/app/auth/create/step-2.tsx +++ b/src/app/auth/create/step-2.tsx @@ -1,8 +1,8 @@ import { appConfigDir } from '@tauri-apps/api/path'; -import { Stronghold } from '@tauri-apps/plugin-stronghold'; import { useEffect, useState } from 'react'; import { Resolver, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; +import { Stronghold } from 'tauri-plugin-stronghold-api'; import { useStorage } from '@libs/storage/provider'; diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx index c9d8e06c..c4ac2760 100644 --- a/src/app/auth/import/step-2.tsx +++ b/src/app/auth/import/step-2.tsx @@ -1,8 +1,8 @@ import { appConfigDir } from '@tauri-apps/api/path'; -import { Stronghold } from '@tauri-apps/plugin-stronghold'; import { useEffect, useState } from 'react'; import { Resolver, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; +import { Stronghold } from 'tauri-plugin-stronghold-api'; import { useStorage } from '@libs/storage/provider'; diff --git a/src/app/auth/migrate.tsx b/src/app/auth/migrate.tsx index 17378247..dd9b6c77 100644 --- a/src/app/auth/migrate.tsx +++ b/src/app/auth/migrate.tsx @@ -1,9 +1,9 @@ import { useQueryClient } from '@tanstack/react-query'; import { appConfigDir } from '@tauri-apps/api/path'; -import { Stronghold } from '@tauri-apps/plugin-stronghold'; import { useState } from 'react'; import { Resolver, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; +import { Stronghold } from 'tauri-plugin-stronghold-api'; import { useStorage } from '@libs/storage/provider'; diff --git a/src/app/auth/reset.tsx b/src/app/auth/reset.tsx index 00f9ed5b..e980a4f3 100644 --- a/src/app/auth/reset.tsx +++ b/src/app/auth/reset.tsx @@ -1,9 +1,9 @@ import { appConfigDir } from '@tauri-apps/api/path'; -import { Stronghold } from '@tauri-apps/plugin-stronghold'; import { getPublicKey, nip19 } from 'nostr-tools'; import { useState } from 'react'; import { Resolver, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; +import { Stronghold } from 'tauri-plugin-stronghold-api'; import { useStorage } from '@libs/storage/provider'; diff --git a/src/app/auth/unlock.tsx b/src/app/auth/unlock.tsx index dc415261..3f4cfd88 100644 --- a/src/app/auth/unlock.tsx +++ b/src/app/auth/unlock.tsx @@ -1,8 +1,8 @@ import { appConfigDir } from '@tauri-apps/api/path'; -import { Stronghold } from '@tauri-apps/plugin-stronghold'; import { useState } from 'react'; import { Resolver, useForm } from 'react-hook-form'; import { Link, useNavigate } from 'react-router-dom'; +import { Stronghold } from 'tauri-plugin-stronghold-api'; import { User } from '@app/auth/components/user'; diff --git a/src/app/auth/welcome.tsx b/src/app/auth/welcome.tsx index 0e744825..653a426d 100644 --- a/src/app/auth/welcome.tsx +++ b/src/app/auth/welcome.tsx @@ -1,4 +1,4 @@ -import { LogicalSize, getCurrent } from '@tauri-apps/plugin-window'; +import { LogicalSize, getCurrent } from '@tauri-apps/api/window'; import { useEffect } from 'react'; import { Link } from 'react-router-dom'; diff --git a/src/app/error.tsx b/src/app/error.tsx index 933749c4..53d3be69 100644 --- a/src/app/error.tsx +++ b/src/app/error.tsx @@ -19,8 +19,8 @@ export function ErrorScreen() { useEffect(() => { async function getInformation() { - const { platform, version } = await import('@tauri-apps/plugin-os'); - const { getVersion } = await import('@tauri-apps/plugin-app'); + const { platform, version } = await import('@tauri-apps/api/os'); + const { getVersion } = await import('@tauri-apps/api/app'); const platformName = await platform(); const osVersion = await version(); diff --git a/src/app/notes/article.tsx b/src/app/notes/article.tsx index 9a20abc6..0ae99d31 100644 --- a/src/app/notes/article.tsx +++ b/src/app/notes/article.tsx @@ -1,5 +1,5 @@ import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk'; -import { writeText } from '@tauri-apps/plugin-clipboard-manager'; +import { writeText } from '@tauri-apps/api/clipboard'; import { nip19 } from 'nostr-tools'; import { EventPointer } from 'nostr-tools/lib/nip19'; import { useRef, useState } from 'react'; diff --git a/src/app/notes/text.tsx b/src/app/notes/text.tsx index 93884486..4d5635a2 100644 --- a/src/app/notes/text.tsx +++ b/src/app/notes/text.tsx @@ -1,5 +1,5 @@ import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk'; -import { writeText } from '@tauri-apps/plugin-clipboard-manager'; +import { writeText } from '@tauri-apps/api/clipboard'; import { nip19 } from 'nostr-tools'; import { EventPointer } from 'nostr-tools/lib/nip19'; import { useRef, useState } from 'react'; diff --git a/src/app/settings/components/version.tsx b/src/app/settings/components/version.tsx index 3a6cddbd..ad15d1de 100644 --- a/src/app/settings/components/version.tsx +++ b/src/app/settings/components/version.tsx @@ -1,4 +1,4 @@ -import { getVersion } from '@tauri-apps/plugin-app'; +import { getVersion } from '@tauri-apps/api/app'; import { useEffect, useState } from 'react'; export function VersionSetting() { diff --git a/src/app/splash.tsx b/src/app/splash.tsx index 046f2e40..4a355139 100644 --- a/src/app/splash.tsx +++ b/src/app/splash.tsx @@ -1,5 +1,5 @@ +import { message } from '@tauri-apps/api/dialog'; import { invoke } from '@tauri-apps/api/tauri'; -import { message } from '@tauri-apps/plugin-dialog'; import { useEffect, useState } from 'react'; import { useNDK } from '@libs/ndk/provider'; @@ -11,7 +11,7 @@ import { useNostr } from '@utils/hooks/useNostr'; export function SplashScreen() { const { db } = useStorage(); - const { ndk, relayUrls } = useNDK(); + const { ndk } = useNDK(); const { fetchUserData, prefetchEvents } = useNostr(); const [isLoading, setIsLoading] = useState(true); @@ -68,9 +68,7 @@ export function SplashScreen() { {isLoading ? (

- {!ndk - ? 'Connecting to relay...' - : `Connected to ${relayUrls.length} relays`} + {!ndk ? 'Connecting to relay...' : 'Fetching events from the last login.'}

This may take a few seconds, please don't close app. diff --git a/src/libs/ndk/cache.ts b/src/libs/ndk/cache.ts index 3ef71031..beb5df39 100644 --- a/src/libs/ndk/cache.ts +++ b/src/libs/ndk/cache.ts @@ -1,6 +1,6 @@ import { NDKCacheAdapter } from '@nostr-dev-kit/ndk'; import { NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk'; -import { Store } from '@tauri-apps/plugin-store'; +import { Store } from 'tauri-plugin-store-api'; export default class TauriAdapter implements NDKCacheAdapter { public store: Store; diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts index da97b430..91930843 100644 --- a/src/libs/ndk/instance.ts +++ b/src/libs/ndk/instance.ts @@ -1,6 +1,6 @@ // inspire by: https://github.com/nostr-dev-kit/ndk-react/ import NDK from '@nostr-dev-kit/ndk'; -import { message } from '@tauri-apps/plugin-dialog'; +import { message } from '@tauri-apps/api/dialog'; import { useEffect, useMemo, useState } from 'react'; import TauriAdapter from '@libs/ndk/cache'; diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts index f364c539..2e08795d 100644 --- a/src/libs/storage/instance.ts +++ b/src/libs/storage/instance.ts @@ -1,7 +1,7 @@ import { NDKEvent } from '@nostr-dev-kit/ndk'; -import { BaseDirectory, removeFile } from '@tauri-apps/plugin-fs'; -import Database from '@tauri-apps/plugin-sql'; -import { Stronghold } from '@tauri-apps/plugin-stronghold'; +import { BaseDirectory, removeFile } from '@tauri-apps/api/fs'; +import Database from 'tauri-plugin-sql-api'; +import { Stronghold } from 'tauri-plugin-stronghold-api'; import { Account, DBEvent, Relays, Widget } from '@utils/types'; diff --git a/src/libs/storage/provider.tsx b/src/libs/storage/provider.tsx index 4e326e0b..8f034d68 100644 --- a/src/libs/storage/provider.tsx +++ b/src/libs/storage/provider.tsx @@ -1,6 +1,6 @@ -import { message } from '@tauri-apps/plugin-dialog'; -import Database from '@tauri-apps/plugin-sql'; +import { message } from '@tauri-apps/api/dialog'; import { PropsWithChildren, createContext, useContext, useEffect, useState } from 'react'; +import Database from 'tauri-plugin-sql-api'; import { LumeStorage } from '@libs/storage/instance'; diff --git a/src/shared/composer/composer.tsx b/src/shared/composer/composer.tsx index 7f791435..8e57356d 100644 --- a/src/shared/composer/composer.tsx +++ b/src/shared/composer/composer.tsx @@ -1,3 +1,4 @@ +import { message } from '@tauri-apps/api/dialog'; import Image from '@tiptap/extension-image'; import Mention from '@tiptap/extension-mention'; import Placeholder from '@tiptap/extension-placeholder'; @@ -9,24 +10,21 @@ import { useState } from 'react'; import { twMerge } from 'tailwind-merge'; import { Suggestion } from '@shared/composer'; -import { CancelIcon, LoaderIcon, PlusCircleIcon } from '@shared/icons'; +import { CancelIcon, LoaderIcon, MediaIcon, MentionIcon } from '@shared/icons'; import { MentionNote } from '@shared/notes'; import { useComposer } from '@stores/composer'; import { useNostr } from '@utils/hooks/useNostr'; -import { useImageUploader } from '@utils/hooks/useUploader'; import { sendNativeNotification } from '@utils/notification'; export function Composer() { - const { publish } = useNostr(); - - const [status, setStatus] = useState(null); + const [loading, setLoading] = useState(false); const [reply, clearReply] = useComposer((state) => [state.reply, state.clearReply]); - const expand = useComposer((state) => state.expand) - const upload = useImageUploader(); + const { publish, upload } = useNostr(); + const expand = useComposer((state) => state.expand); const editor = useEditor({ extensions: [ StarterKit.configure({ @@ -65,9 +63,9 @@ export function Composer() { }; const submit = async () => { - setStatus('loading'); - try { + setLoading(true); + // get plaintext content const html = editor.getHTML(); const serializedContent = convert(html, { @@ -108,18 +106,19 @@ export function Composer() { await publish({ content: serializedContent, kind: 1, tags }); // send native notifiation - await sendNativeNotification('Publish post successfully'); + await sendNativeNotification('Post has been published successfully.'); // update state - setStatus('done'); + setLoading(false); // reset editor editor.commands.clearContent(); + // reset reply if (reply.id) { clearReply(); } } catch { - setStatus(null); - console.log('failed to publish'); + setLoading(false); + await message('Publishing post failed.', { title: 'Lume', type: 'error' }); } }; @@ -136,7 +135,10 @@ export function Composer() { autoComplete="off" autoCorrect="off" autoCapitalize="off" - className={twMerge('scrollbar-hide markdown break-all max-h-[500px] overflow-y-auto outline-none pr-2', expand ? 'min-h-[500px]' : 'min-h-[120px]')} + className={twMerge( + 'scrollbar-hide markdown max-h-[500px] overflow-y-auto break-all pr-2 outline-none', + expand ? 'min-h-[500px]' : 'min-h-[120px]' + )} /> {reply.id && (

@@ -152,17 +154,31 @@ export function Composer() { )}
-
+
+
+ + +
-