From f77b75b8d521118a5b42788f5ee753165719db44 Mon Sep 17 00:00:00 2001 From: reya <123083837+reyamir@users.noreply.github.com> Date: Tue, 6 Aug 2024 11:16:44 +0700 Subject: [PATCH] chore: upgrade to tauri v2 rc --- package.json | 24 +- pnpm-lock.yaml | 382 ++++++++++++++-------------- src-tauri/Cargo.lock | 320 ++++++++++++----------- src-tauri/Cargo.toml | 31 ++- src-tauri/capabilities/default.json | 30 +-- src-tauri/src/main.rs | 71 +++--- src/commands.ts | 140 +++++----- src/components/user/provider.tsx | 12 +- 8 files changed, 506 insertions(+), 504 deletions(-) diff --git a/package.json b/package.json index e6fd0f8..33b5a71 100644 --- a/package.json +++ b/package.json @@ -16,15 +16,15 @@ "@radix-ui/react-progress": "^1.1.0", "@radix-ui/react-scroll-area": "^1.1.0", "@tanstack/react-query": "^5.51.21", - "@tanstack/react-router": "^1.46.3", + "@tanstack/react-router": "^1.46.6", "@tauri-apps/api": "2.0.0-beta.15", "@tauri-apps/plugin-clipboard-manager": "2.1.0-beta.5", - "@tauri-apps/plugin-dialog": "2.0.0-beta.7", - "@tauri-apps/plugin-fs": "2.0.0-beta.7", - "@tauri-apps/plugin-os": "2.0.0-beta.7", - "@tauri-apps/plugin-process": "2.0.0-beta.7", - "@tauri-apps/plugin-shell": "2.0.0-beta.8", - "@tauri-apps/plugin-updater": "2.0.0-beta.7", + "@tauri-apps/plugin-dialog": "2.0.0-rc.0", + "@tauri-apps/plugin-fs": "2.0.0-rc.0", + "@tauri-apps/plugin-os": "2.0.0-rc.0", + "@tauri-apps/plugin-process": "2.0.0-rc.0", + "@tauri-apps/plugin-shell": "2.0.0-rc.0", + "@tauri-apps/plugin-updater": "2.0.0-rc.0", "dayjs": "^1.11.12", "lru-cache": "^11.0.0", "minidenticons": "^4.2.1", @@ -36,15 +36,15 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "@tanstack/router-plugin": "^1.45.13", - "@tauri-apps/cli": "2.0.0-beta.22", - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc", + "@tanstack/router-plugin": "^1.46.6", + "@tauri-apps/cli": "2.0.0-rc.1", + "@types/react": "npm:types-react@19.0.0-rc.1", + "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1", "@vitejs/plugin-react": "^4.3.1", "autoprefixer": "^10.4.20", "babel-plugin-react-compiler": "0.0.0-experimental-696af53-20240625", "clsx": "^2.1.1", - "postcss": "^8.4.40", + "postcss": "^8.4.41", "tailwind-gradient-mask-image": "^1.2.0", "tailwind-merge": "^2.4.0", "tailwindcss": "^3.4.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 39d021f..3b7f3df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: ^5.51.21 version: 5.51.21(react@19.0.0-rc-d025ddd3-20240722) '@tanstack/react-router': - specifier: ^1.46.3 - version: 1.46.3(react-dom@19.0.0-rc-d025ddd3-20240722(react@19.0.0-rc-d025ddd3-20240722))(react@19.0.0-rc-d025ddd3-20240722) + specifier: ^1.46.6 + version: 1.46.6(react-dom@19.0.0-rc-d025ddd3-20240722(react@19.0.0-rc-d025ddd3-20240722))(react@19.0.0-rc-d025ddd3-20240722) '@tauri-apps/api': specifier: 2.0.0-beta.15 version: 2.0.0-beta.15 @@ -36,23 +36,23 @@ importers: specifier: 2.1.0-beta.5 version: 2.1.0-beta.5 '@tauri-apps/plugin-dialog': - specifier: 2.0.0-beta.7 - version: 2.0.0-beta.7 + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0 '@tauri-apps/plugin-fs': - specifier: 2.0.0-beta.7 - version: 2.0.0-beta.7 + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0 '@tauri-apps/plugin-os': - specifier: 2.0.0-beta.7 - version: 2.0.0-beta.7 + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0 '@tauri-apps/plugin-process': - specifier: 2.0.0-beta.7 - version: 2.0.0-beta.7 + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0 '@tauri-apps/plugin-shell': - specifier: 2.0.0-beta.8 - version: 2.0.0-beta.8 + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0 '@tauri-apps/plugin-updater': - specifier: 2.0.0-beta.7 - version: 2.0.0-beta.7 + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0 dayjs: specifier: ^1.11.12 version: 1.11.12 @@ -82,23 +82,23 @@ importers: specifier: 1.8.3 version: 1.8.3 '@tanstack/router-plugin': - specifier: ^1.45.13 - version: 1.45.13(vite@5.3.5) + specifier: ^1.46.6 + version: 1.46.6(vite@5.3.5) '@tauri-apps/cli': - specifier: 2.0.0-beta.22 - version: 2.0.0-beta.22 + specifier: 2.0.0-rc.1 + version: 2.0.0-rc.1 '@types/react': - specifier: npm:types-react@rc + specifier: npm:types-react@19.0.0-rc.1 version: types-react@19.0.0-rc.1 '@types/react-dom': - specifier: npm:types-react-dom@rc + specifier: npm:types-react-dom@19.0.0-rc.1 version: types-react-dom@19.0.0-rc.1 '@vitejs/plugin-react': specifier: ^4.3.1 version: 4.3.1(vite@5.3.5) autoprefixer: specifier: ^10.4.20 - version: 10.4.20(postcss@8.4.40) + version: 10.4.20(postcss@8.4.41) babel-plugin-react-compiler: specifier: 0.0.0-experimental-696af53-20240625 version: 0.0.0-experimental-696af53-20240625 @@ -106,8 +106,8 @@ importers: specifier: ^2.1.1 version: 2.1.1 postcss: - specifier: ^8.4.40 - version: 8.4.40 + specifier: ^8.4.41 + version: 8.4.41 tailwind-gradient-mask-image: specifier: ^1.2.0 version: 1.2.0 @@ -709,83 +709,83 @@ packages: '@types/react': optional: true - '@rollup/rollup-android-arm-eabi@4.19.2': - resolution: {integrity: sha512-OHflWINKtoCFSpm/WmuQaWW4jeX+3Qt3XQDepkkiFTsoxFc5BpF3Z5aDxFZgBqRjO6ATP5+b1iilp4kGIZVWlA==} + '@rollup/rollup-android-arm-eabi@4.20.0': + resolution: {integrity: sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.19.2': - resolution: {integrity: sha512-k0OC/b14rNzMLDOE6QMBCjDRm3fQOHAL8Ldc9bxEWvMo4Ty9RY6rWmGetNTWhPo+/+FNd1lsQYRd0/1OSix36A==} + '@rollup/rollup-android-arm64@4.20.0': + resolution: {integrity: sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.19.2': - resolution: {integrity: sha512-IIARRgWCNWMTeQH+kr/gFTHJccKzwEaI0YSvtqkEBPj7AshElFq89TyreKNFAGh5frLfDCbodnq+Ye3dqGKPBw==} + '@rollup/rollup-darwin-arm64@4.20.0': + resolution: {integrity: sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.19.2': - resolution: {integrity: sha512-52udDMFDv54BTAdnw+KXNF45QCvcJOcYGl3vQkp4vARyrcdI/cXH8VXTEv/8QWfd6Fru8QQuw1b2uNersXOL0g==} + '@rollup/rollup-darwin-x64@4.20.0': + resolution: {integrity: sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==} cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.19.2': - resolution: {integrity: sha512-r+SI2t8srMPYZeoa1w0o/AfoVt9akI1ihgazGYPQGRilVAkuzMGiTtexNZkrPkQsyFrvqq/ni8f3zOnHw4hUbA==} + '@rollup/rollup-linux-arm-gnueabihf@4.20.0': + resolution: {integrity: sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.19.2': - resolution: {integrity: sha512-+tYiL4QVjtI3KliKBGtUU7yhw0GMcJJuB9mLTCEauHEsqfk49gtUBXGtGP3h1LW8MbaTY6rSFIQV1XOBps1gBA==} + '@rollup/rollup-linux-arm-musleabihf@4.20.0': + resolution: {integrity: sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.19.2': - resolution: {integrity: sha512-OR5DcvZiYN75mXDNQQxlQPTv4D+uNCUsmSCSY2FolLf9W5I4DSoJyg7z9Ea3TjKfhPSGgMJiey1aWvlWuBzMtg==} + '@rollup/rollup-linux-arm64-gnu@4.20.0': + resolution: {integrity: sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.19.2': - resolution: {integrity: sha512-Hw3jSfWdUSauEYFBSFIte6I8m6jOj+3vifLg8EU3lreWulAUpch4JBjDMtlKosrBzkr0kwKgL9iCfjA8L3geoA==} + '@rollup/rollup-linux-arm64-musl@4.20.0': + resolution: {integrity: sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.19.2': - resolution: {integrity: sha512-rhjvoPBhBwVnJRq/+hi2Q3EMiVF538/o9dBuj9TVLclo9DuONqt5xfWSaE6MYiFKpo/lFPJ/iSI72rYWw5Hc7w==} + '@rollup/rollup-linux-powerpc64le-gnu@4.20.0': + resolution: {integrity: sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.19.2': - resolution: {integrity: sha512-EAz6vjPwHHs2qOCnpQkw4xs14XJq84I81sDRGPEjKPFVPBw7fwvtwhVjcZR6SLydCv8zNK8YGFblKWd/vRmP8g==} + '@rollup/rollup-linux-riscv64-gnu@4.20.0': + resolution: {integrity: sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.19.2': - resolution: {integrity: sha512-IJSUX1xb8k/zN9j2I7B5Re6B0NNJDJ1+soezjNojhT8DEVeDNptq2jgycCOpRhyGj0+xBn7Cq+PK7Q+nd2hxLA==} + '@rollup/rollup-linux-s390x-gnu@4.20.0': + resolution: {integrity: sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.19.2': - resolution: {integrity: sha512-OgaToJ8jSxTpgGkZSkwKE+JQGihdcaqnyHEFOSAU45utQ+yLruE1dkonB2SDI8t375wOKgNn8pQvaWY9kPzxDQ==} + '@rollup/rollup-linux-x64-gnu@4.20.0': + resolution: {integrity: sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.19.2': - resolution: {integrity: sha512-5V3mPpWkB066XZZBgSd1lwozBk7tmOkKtquyCJ6T4LN3mzKENXyBwWNQn8d0Ci81hvlBw5RoFgleVpL6aScLYg==} + '@rollup/rollup-linux-x64-musl@4.20.0': + resolution: {integrity: sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.19.2': - resolution: {integrity: sha512-ayVstadfLeeXI9zUPiKRVT8qF55hm7hKa+0N1V6Vj+OTNFfKSoUxyZvzVvgtBxqSb5URQ8sK6fhwxr9/MLmxdA==} + '@rollup/rollup-win32-arm64-msvc@4.20.0': + resolution: {integrity: sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.19.2': - resolution: {integrity: sha512-Mda7iG4fOLHNsPqjWSjANvNZYoW034yxgrndof0DwCy0D3FvTjeNo+HGE6oGWgvcLZNLlcp0hLEFcRs+UGsMLg==} + '@rollup/rollup-win32-ia32-msvc@4.20.0': + resolution: {integrity: sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.19.2': - resolution: {integrity: sha512-DPi0ubYhSow/00YqmG1jWm3qt1F8aXziHc/UNy8bo9cpCacqhuWu+iSq/fp2SyEQK7iYTZ60fBU9cat3MXTjIQ==} + '@rollup/rollup-win32-x64-msvc@4.20.0': + resolution: {integrity: sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==} cpu: [x64] os: [win32] @@ -810,8 +810,8 @@ packages: peerDependencies: react: ^18.0.0 - '@tanstack/react-router@1.46.3': - resolution: {integrity: sha512-NVu/bQofLJIPQyq7W2drhi5veiDK1TwCvKIVCO3zBkkA4X7N2Bq6EqIbocwsN6wmHHmfKs7ovsSfz2dKQ4T0gg==} + '@tanstack/react-router@1.46.6': + resolution: {integrity: sha512-rCRLsHsT+zEQBvKwAqvSEHUOq4ceShETGbXTXvrS/zm4PGl0+1oBWbm/C8hnCbQJ9MWEH+4Ip0nslNjvAAbgcA==} engines: {node: '>=12'} peerDependencies: react: '>=18' @@ -827,8 +827,8 @@ packages: resolution: {integrity: sha512-5B756YXpZO0/yr7ahsxXoBOCpqroLx/D3l6X9qPlZaP0FVHVmTR6ZKGRX6zzuAxns/VO+sxnQso4AYLdDyZ9GA==} engines: {node: '>=12'} - '@tanstack/router-plugin@1.45.13': - resolution: {integrity: sha512-7IWdtIDC5jjhD6IZ5c/s11xNwvKDom/p6ZOO78FxeeA0FIaSx+3AQD7/iVhzfiRfepqGmecLn9a1KfNTFGQI/A==} + '@tanstack/router-plugin@1.46.6': + resolution: {integrity: sha512-zbQc7tjwbpzyKVXNU45AJJJovFkNcay5CtiFvJuRTX0kQUqY8VtiDX2ZCt/5X0Rp+DSwS75/ceZTVowog1xtkg==} engines: {node: '>=12'} peerDependencies: '@rsbuild/core': '>=0.7.9' @@ -849,91 +849,95 @@ packages: resolution: {integrity: sha512-H9w6iISmR+NvH4XuyCZB4zDN10tf9RFt6i/9JHEjaRhAowdAaJ+oiXq/3kedizNClHMtbTQ5j0oqDVPkZDAI8g==} engines: {node: '>= 18.18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - '@tauri-apps/cli-darwin-arm64@2.0.0-beta.22': - resolution: {integrity: sha512-Ofhythvg1Ks2IM87WUYNtgFzm21aU1Zn+8QP81lJy9Y7ZGMxP8FYfqeHz6GIWKI+CYf6I77HA8LHkT9pyE5PYg==} + '@tauri-apps/api@2.0.0-rc.0': + resolution: {integrity: sha512-v454Qs3REHc3Za59U+/eSmBsdmF+3NE5+76+lFDaitVqN4ZglDHENDaMARYKGJVZuxiSkzyqG0SeG7lLQjVkPA==} + engines: {node: '>= 18.18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} + + '@tauri-apps/cli-darwin-arm64@2.0.0-rc.1': + resolution: {integrity: sha512-dJxyAi4P9fOkklBZXuwUVnHgdM/20fgM4zYdfejQfju5+q9GUqnMbrrIUqlJbQGf8EnrIdSWnieO8wU8GOwT0g==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.0.0-beta.22': - resolution: {integrity: sha512-/lWIixo7WgmMUqcxlPT7Ojlkl6qbVlNDwUZ+9DtTpoWnaaBxv/YpSe1k62vDWEC7l0apFY+Fz7cRONN2wglFyQ==} + '@tauri-apps/cli-darwin-x64@2.0.0-rc.1': + resolution: {integrity: sha512-dwrqLzNIFk8a1Vf2YI8axHm7uvLfo4M4TSWCw2ZkgeSGWWK6Y6CYVZbBEjOEGIOf+GFAa9rVOSZRuMwpiufNng==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.22': - resolution: {integrity: sha512-9nJCSStoxu4BKaKVJhu/uBJ8IsIofwAdsX0TWFxqo0obaZbeQSEpPhVsCy+uk3u/28dF+qyUtMCYawO2Uljnag==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.1': + resolution: {integrity: sha512-jvMF4UNc3Jr/xHnw+4NNsWfk8WrcFrQVImAtKlCev9QepqfBmDh+FgXTvfysoBCSxEBS626TvYms3OhI0LOO4A==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.22': - resolution: {integrity: sha512-TF9q9zHFBx9LaG2fJJC+BcpIokOmX1UIniBapndvx3dJmdDiK4F6w2QYKDkrBQVzDzcIducmdo2zNBv17O9tFQ==} + '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.1': + resolution: {integrity: sha512-TGmadGW8BjTq864AYrv/u+vTnAodnOuzv1VCUOV23O8st35GZG6V47jwNsSjQjhrcO1XzmJiRAtrcVKuTZ/xUA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.22': - resolution: {integrity: sha512-ak/RdmaV7sATQmNOxlpHVlbKlrdquH7WH8nOv82X+iK+1HgAOGGqLqBUMzzhkGqo9SHQ9zJ6A2yOo7Z6TJXMmQ==} + '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.1': + resolution: {integrity: sha512-+SJsRTW0PvvD7awEn+tIPJ3s12s6RpKXdOib2mztoKocasrGRfz+EFZuXc42Iwk3xROsrQkiw2UAmcNLkW5NwA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.22': - resolution: {integrity: sha512-9t+jQeMqBdXz51ikTh1PQFG/gs9PBzXmtMcIzUxE0juvH/ynjw0Vf+yZbNmwqVS9g7cj8XiBXoc6/N41SZE2cA==} + '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.1': + resolution: {integrity: sha512-vjPrj2btS97IOp6cU42IrkI49SQZDSg8TPqwOwFqyQeAotCT1i0F38pLZWe1gLyPUowO8XdaaBdwYg6IRDKcZg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.0.0-beta.22': - resolution: {integrity: sha512-PemcztfHG3HAuuo7HcnhfDrtN9NT7kueyNg8ipxJNPMa+s4K7kfieViyEiMW5pTr2F5WG/UuBSNcuwY+DVCcPA==} + '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.1': + resolution: {integrity: sha512-MrE68/u6rMrkM1uM/DR1MNnMXiYebhSPGqqxshJ12SmFdk3yQ/Z73Wzvk8xv78eOExh4lTtEXI22YwaBCf9AEg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.22': - resolution: {integrity: sha512-EgKoG/jGEtTzhOp7ISjMdQsfd8IOG/5yZhO9Z4L/u7oB9mprKAJohYs24+ZxJtq2bOz4f/ZIysZ19nbkpxUzrg==} + '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.1': + resolution: {integrity: sha512-SLulbiUjg8BGf/zX+U1PGjB+JpsN2nLRGuW07BYwSDW3s3mp2aagLuOwaTaOPBrDzfIMRYq8KT54A4jfRjEZlg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.22': - resolution: {integrity: sha512-67OrM2m4FB3KujPbjd/i+9lqcLDO3/ixqL1GMc3BoHhcjF+7QY08OxqWeitdsP/8ihnMIIdir2xEjNUKc6Zelw==} + '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.1': + resolution: {integrity: sha512-rz85riTjcWdZlgTku6HcBx625Otdc0/NwDjRXgdXakL1ybw7E+G5YlLZNcQX25u17RKUAWX/2/VZ1pSz945Ovw==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.22': - resolution: {integrity: sha512-BsO5xMUxliTZTImXnOC73sKT2U9VUeqR8AtklSObBcAg5LaZKpYOdF2pZzU6rIMAZwzROTAT1hYsr4r/nx2UZg==} + '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.1': + resolution: {integrity: sha512-aRO70dDbn4w3CbALMG+b7g460xmbSTuUiGmRh0r/MNVeoZk/YbqluBUyhXdWGxJb8OVubw/4RlczKYcPmJceMw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.0.0-beta.22': - resolution: {integrity: sha512-OAuiDdSRKxNmr/dseQKKMoZZxIhQ6aAxmXJctGYJxCnkd62tQ8xeq87roVXGNS5Qkuv7WpySAyR0ntiMjvNLUA==} + '@tauri-apps/cli@2.0.0-rc.1': + resolution: {integrity: sha512-9AzVrUMdb6EZ/Lwtdqt03XqqG6d/3gTJPOw2E9zmCHprJWEwqEp4JIVHYYfrqkkZyKclD3m5ggXwfYwclcYLdw==} engines: {node: '>= 10'} hasBin: true '@tauri-apps/plugin-clipboard-manager@2.1.0-beta.5': resolution: {integrity: sha512-7YQEXRHXn5dIr/YcE7RtkoAhc6XwpqI7Qz0I3FcHn5vMbVvQ5OxKnGqEa8ZGRud6R3G9pNdnEKglLXLgUXK8tA==} - '@tauri-apps/plugin-dialog@2.0.0-beta.7': - resolution: {integrity: sha512-myywwpsKbquDDzl5zaOmmLLv5O8EJ/GgHDAoVSPwO97R4iWzkDvj3HFF91tNh7i25Tu/bP6jYPAdZA1NCRxxtg==} + '@tauri-apps/plugin-dialog@2.0.0-rc.0': + resolution: {integrity: sha512-DPOXYe8SQ6Radk/67EOdaomlxL7oF99JO/ZUaPp1IBEs3Wro7lhlz63CfdKIBfKIZTLJLzP1R7/EiPL/GTA3Bg==} - '@tauri-apps/plugin-fs@2.0.0-beta.7': - resolution: {integrity: sha512-hsZyhzvy+xtRfbrKI2rmU1ZfmgbSs7Zu/6a12MFlJKVzqXmUwJvggcjYdm1cEFdLbnOOsszENXbwMnkzmxtirA==} + '@tauri-apps/plugin-fs@2.0.0-rc.0': + resolution: {integrity: sha512-74VCXEZlzTJ+Jv1V3KrV0qIHhSePpE/ljsF78rcEuvSfyTxLtt/Sb5CIUmVhFlKTRFOH9dX50T4dTZ3qFLyRnA==} - '@tauri-apps/plugin-os@2.0.0-beta.7': - resolution: {integrity: sha512-CHo09ecxUU0NFkAqctXeQzdaXw02EXulqcaZnbjrBfRJ2ulmGq7zaUCsHihfcqWcdnmNwmP9Wh/gyznMc1JF9Q==} + '@tauri-apps/plugin-os@2.0.0-rc.0': + resolution: {integrity: sha512-OWAl8mooKnGykSD4iog8WRqcnOSx0gGmTJBlEExHdFeIuOHg0Ezvd+WiVLhT9LBg7go3ibNWRWpe/ZG7YEp4Vw==} - '@tauri-apps/plugin-process@2.0.0-beta.7': - resolution: {integrity: sha512-iK4HYnzeyqAZE5HAKd0mDI7ekYXUqA9azjA9AgL4LscOEHma1XGEP0DlcHn+RrXIvVbI4LwCol9DSNNoIrB0+w==} + '@tauri-apps/plugin-process@2.0.0-rc.0': + resolution: {integrity: sha512-Z12D/kmQzG1vCVf+jLXPhPDUA0pEjFrsg4p0uwO2sotVLM9287IuTM+aIz9cuAYOxFLKcsnDG7amSCL9IfA1gw==} - '@tauri-apps/plugin-shell@2.0.0-beta.8': - resolution: {integrity: sha512-rFXI6MvsCdSGbuKbDu/NaOePREb9YTVTdeugHdvvljnKWW3dvmThBb2h/8Hxj+Z7Cd8MUoRxPeJWUZbPbJ2Imw==} + '@tauri-apps/plugin-shell@2.0.0-rc.0': + resolution: {integrity: sha512-bhUcQcrqZoK8H1DFXapr5r1Z75oh6Kd5Tltz97XpZFLREEqp+KhN2Fvyh8r/fKAyenYsTYUIsDsyGdjdueuF9g==} - '@tauri-apps/plugin-updater@2.0.0-beta.7': - resolution: {integrity: sha512-wnIVPPMuD33Wf8Q1CyvAQLAT2sVH0sefTNrYF5ITqzUxzeH54MaiVIu+e8/zBaRFcuBpJv7exljLlrcNW47ybQ==} + '@tauri-apps/plugin-updater@2.0.0-rc.0': + resolution: {integrity: sha512-EKajf/sBpFif0cwXhTo3BmNvTZ2t2DDLRyhA8FFKugZNoOeqU97bHhPT5DIqMUPRE1tyDk9o7sXm8dKf7oz+EA==} '@types/babel__core@7.20.5': resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} @@ -1056,8 +1060,8 @@ packages: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} - caniuse-lite@1.0.30001646: - resolution: {integrity: sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==} + caniuse-lite@1.0.30001649: + resolution: {integrity: sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ==} chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -1423,8 +1427,8 @@ packages: postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - postcss@8.4.40: - resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==} + postcss@8.4.41: + resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} engines: {node: ^10 || ^12 || >=14} prettier@3.3.3: @@ -1500,8 +1504,8 @@ packages: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rollup@4.19.2: - resolution: {integrity: sha512-6/jgnN1svF9PjNYJ4ya3l+cqutg49vOZ4rVgsDKxdl+5gpGPnByFXWGyfH9YGx9i3nfBwSu1Iyu6vGwFFA0BdQ==} + rollup@4.20.0: + resolution: {integrity: sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -2269,52 +2273,52 @@ snapshots: optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@rollup/rollup-android-arm-eabi@4.19.2': + '@rollup/rollup-android-arm-eabi@4.20.0': optional: true - '@rollup/rollup-android-arm64@4.19.2': + '@rollup/rollup-android-arm64@4.20.0': optional: true - '@rollup/rollup-darwin-arm64@4.19.2': + '@rollup/rollup-darwin-arm64@4.20.0': optional: true - '@rollup/rollup-darwin-x64@4.19.2': + '@rollup/rollup-darwin-x64@4.20.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.19.2': + '@rollup/rollup-linux-arm-gnueabihf@4.20.0': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.19.2': + '@rollup/rollup-linux-arm-musleabihf@4.20.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.19.2': + '@rollup/rollup-linux-arm64-gnu@4.20.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.19.2': + '@rollup/rollup-linux-arm64-musl@4.20.0': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.19.2': + '@rollup/rollup-linux-powerpc64le-gnu@4.20.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.19.2': + '@rollup/rollup-linux-riscv64-gnu@4.20.0': optional: true - '@rollup/rollup-linux-s390x-gnu@4.19.2': + '@rollup/rollup-linux-s390x-gnu@4.20.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.19.2': + '@rollup/rollup-linux-x64-gnu@4.20.0': optional: true - '@rollup/rollup-linux-x64-musl@4.19.2': + '@rollup/rollup-linux-x64-musl@4.20.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.19.2': + '@rollup/rollup-win32-arm64-msvc@4.20.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.19.2': + '@rollup/rollup-win32-ia32-msvc@4.20.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.19.2': + '@rollup/rollup-win32-x64-msvc@4.20.0': optional: true '@scure/base@1.1.1': {} @@ -2339,7 +2343,7 @@ snapshots: '@tanstack/query-core': 5.51.21 react: 19.0.0-rc-d025ddd3-20240722 - '@tanstack/react-router@1.46.3(react-dom@19.0.0-rc-d025ddd3-20240722(react@19.0.0-rc-d025ddd3-20240722))(react@19.0.0-rc-d025ddd3-20240722)': + '@tanstack/react-router@1.46.6(react-dom@19.0.0-rc-d025ddd3-20240722(react@19.0.0-rc-d025ddd3-20240722))(react@19.0.0-rc-d025ddd3-20240722)': dependencies: '@tanstack/history': 1.45.3 '@tanstack/react-store': 0.5.5(react-dom@19.0.0-rc-d025ddd3-20240722(react@19.0.0-rc-d025ddd3-20240722))(react@19.0.0-rc-d025ddd3-20240722) @@ -2360,7 +2364,7 @@ snapshots: prettier: 3.3.3 zod: 3.23.8 - '@tanstack/router-plugin@1.45.13(vite@5.3.5)': + '@tanstack/router-plugin@1.46.6(vite@5.3.5)': dependencies: '@babel/core': 7.25.2 '@babel/generator': 7.25.0 @@ -2388,76 +2392,78 @@ snapshots: '@tauri-apps/api@2.0.0-beta.15': {} - '@tauri-apps/cli-darwin-arm64@2.0.0-beta.22': + '@tauri-apps/api@2.0.0-rc.0': {} + + '@tauri-apps/cli-darwin-arm64@2.0.0-rc.1': optional: true - '@tauri-apps/cli-darwin-x64@2.0.0-beta.22': + '@tauri-apps/cli-darwin-x64@2.0.0-rc.1': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.22': + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.1': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.22': + '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.1': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.22': + '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.1': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.22': + '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.1': optional: true - '@tauri-apps/cli-linux-x64-musl@2.0.0-beta.22': + '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.1': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.22': + '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.1': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.22': + '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.1': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.22': + '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.1': optional: true - '@tauri-apps/cli@2.0.0-beta.22': + '@tauri-apps/cli@2.0.0-rc.1': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-beta.22 - '@tauri-apps/cli-darwin-x64': 2.0.0-beta.22 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-beta.22 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-beta.22 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-beta.22 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-beta.22 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-beta.22 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-beta.22 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-beta.22 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-beta.22 + '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.1 + '@tauri-apps/cli-darwin-x64': 2.0.0-rc.1 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.1 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.1 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.1 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.1 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.1 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.1 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.1 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.1 '@tauri-apps/plugin-clipboard-manager@2.1.0-beta.5': dependencies: '@tauri-apps/api': 2.0.0-beta.15 - '@tauri-apps/plugin-dialog@2.0.0-beta.7': + '@tauri-apps/plugin-dialog@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.15 + '@tauri-apps/api': 2.0.0-rc.0 - '@tauri-apps/plugin-fs@2.0.0-beta.7': + '@tauri-apps/plugin-fs@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.15 + '@tauri-apps/api': 2.0.0-rc.0 - '@tauri-apps/plugin-os@2.0.0-beta.7': + '@tauri-apps/plugin-os@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.15 + '@tauri-apps/api': 2.0.0-rc.0 - '@tauri-apps/plugin-process@2.0.0-beta.7': + '@tauri-apps/plugin-process@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.15 + '@tauri-apps/api': 2.0.0-rc.0 - '@tauri-apps/plugin-shell@2.0.0-beta.8': + '@tauri-apps/plugin-shell@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.15 + '@tauri-apps/api': 2.0.0-rc.0 - '@tauri-apps/plugin-updater@2.0.0-beta.7': + '@tauri-apps/plugin-updater@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.15 + '@tauri-apps/api': 2.0.0-rc.0 '@types/babel__core@7.20.5': dependencies: @@ -2548,14 +2554,14 @@ snapshots: dependencies: tslib: 2.6.3 - autoprefixer@10.4.20(postcss@8.4.40): + autoprefixer@10.4.20(postcss@8.4.41): dependencies: browserslist: 4.23.3 - caniuse-lite: 1.0.30001646 + caniuse-lite: 1.0.30001649 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.1 - postcss: 8.4.40 + postcss: 8.4.41 postcss-value-parser: 4.2.0 babel-dead-code-elimination@1.0.6: @@ -2591,14 +2597,14 @@ snapshots: browserslist@4.23.3: dependencies: - caniuse-lite: 1.0.30001646 + caniuse-lite: 1.0.30001649 electron-to-chromium: 1.5.4 node-releases: 2.0.18 update-browserslist-db: 1.1.0(browserslist@4.23.3) camelcase-css@2.0.1: {} - caniuse-lite@1.0.30001646: {} + caniuse-lite@1.0.30001649: {} chalk@2.4.2: dependencies: @@ -2889,28 +2895,28 @@ snapshots: pirates@4.0.6: {} - postcss-import@15.1.0(postcss@8.4.40): + postcss-import@15.1.0(postcss@8.4.41): dependencies: - postcss: 8.4.40 + postcss: 8.4.41 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.8 - postcss-js@4.0.1(postcss@8.4.40): + postcss-js@4.0.1(postcss@8.4.41): dependencies: camelcase-css: 2.0.1 - postcss: 8.4.40 + postcss: 8.4.41 - postcss-load-config@4.0.2(postcss@8.4.40): + postcss-load-config@4.0.2(postcss@8.4.41): dependencies: lilconfig: 3.1.2 yaml: 2.5.0 optionalDependencies: - postcss: 8.4.40 + postcss: 8.4.41 - postcss-nested@6.2.0(postcss@8.4.40): + postcss-nested@6.2.0(postcss@8.4.41): dependencies: - postcss: 8.4.40 + postcss: 8.4.41 postcss-selector-parser: 6.1.1 postcss-selector-parser@6.1.1: @@ -2920,7 +2926,7 @@ snapshots: postcss-value-parser@4.2.0: {} - postcss@8.4.40: + postcss@8.4.41: dependencies: nanoid: 3.3.7 picocolors: 1.0.1 @@ -2992,26 +2998,26 @@ snapshots: reusify@1.0.4: {} - rollup@4.19.2: + rollup@4.20.0: dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.19.2 - '@rollup/rollup-android-arm64': 4.19.2 - '@rollup/rollup-darwin-arm64': 4.19.2 - '@rollup/rollup-darwin-x64': 4.19.2 - '@rollup/rollup-linux-arm-gnueabihf': 4.19.2 - '@rollup/rollup-linux-arm-musleabihf': 4.19.2 - '@rollup/rollup-linux-arm64-gnu': 4.19.2 - '@rollup/rollup-linux-arm64-musl': 4.19.2 - '@rollup/rollup-linux-powerpc64le-gnu': 4.19.2 - '@rollup/rollup-linux-riscv64-gnu': 4.19.2 - '@rollup/rollup-linux-s390x-gnu': 4.19.2 - '@rollup/rollup-linux-x64-gnu': 4.19.2 - '@rollup/rollup-linux-x64-musl': 4.19.2 - '@rollup/rollup-win32-arm64-msvc': 4.19.2 - '@rollup/rollup-win32-ia32-msvc': 4.19.2 - '@rollup/rollup-win32-x64-msvc': 4.19.2 + '@rollup/rollup-android-arm-eabi': 4.20.0 + '@rollup/rollup-android-arm64': 4.20.0 + '@rollup/rollup-darwin-arm64': 4.20.0 + '@rollup/rollup-darwin-x64': 4.20.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.20.0 + '@rollup/rollup-linux-arm-musleabihf': 4.20.0 + '@rollup/rollup-linux-arm64-gnu': 4.20.0 + '@rollup/rollup-linux-arm64-musl': 4.20.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.20.0 + '@rollup/rollup-linux-riscv64-gnu': 4.20.0 + '@rollup/rollup-linux-s390x-gnu': 4.20.0 + '@rollup/rollup-linux-x64-gnu': 4.20.0 + '@rollup/rollup-linux-x64-musl': 4.20.0 + '@rollup/rollup-win32-arm64-msvc': 4.20.0 + '@rollup/rollup-win32-ia32-msvc': 4.20.0 + '@rollup/rollup-win32-x64-msvc': 4.20.0 fsevents: 2.3.3 run-parallel@1.2.0: @@ -3094,11 +3100,11 @@ snapshots: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.0.1 - postcss: 8.4.40 - postcss-import: 15.1.0(postcss@8.4.40) - postcss-js: 4.0.1(postcss@8.4.40) - postcss-load-config: 4.0.2(postcss@8.4.40) - postcss-nested: 6.2.0(postcss@8.4.40) + postcss: 8.4.41 + postcss-import: 15.1.0(postcss@8.4.41) + postcss-js: 4.0.1(postcss@8.4.41) + postcss-load-config: 4.0.2(postcss@8.4.41) + postcss-nested: 6.2.0(postcss@8.4.41) postcss-selector-parser: 6.1.1 resolve: 1.22.8 sucrase: 3.35.0 @@ -3198,8 +3204,8 @@ snapshots: vite@5.3.5: dependencies: esbuild: 0.21.5 - postcss: 8.4.40 - rollup: 4.19.2 + postcss: 8.4.41 + rollup: 4.20.0 optionalDependencies: fsevents: 2.3.3 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 510e7ca..70af9ec 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -331,31 +331,22 @@ dependencies = [ [[package]] name = "async-wsocket" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3445f8f330db8e5f3be7912f170f32e43fec90d995c71ced1ec3b8394b4a873c" +checksum = "c787e6b21b2117e859562d1f0de1b16319840f87089a68c7d4f4e05984f0c9d2" dependencies = [ "async-utility", + "futures", "futures-util", + "js-sys", "thiserror", "tokio", "tokio-rustls", "tokio-socks", "tokio-tungstenite", "url", - "wasm-ws", - "webpki-roots", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -608,7 +599,7 @@ dependencies = [ [[package]] name = "border" version = "0.1.0" -source = "git+https://github.com/ahkohd/tauri-toolkit?branch=v2#4ca90fd2a56565af26aeb5d0518d2e85d80a35b0" +source = "git+https://github.com/ahkohd/tauri-toolkit?branch=v2#216e552bc344bb4c202121581f023a1787bd9247" dependencies = [ "cocoa", "color", @@ -647,9 +638,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" [[package]] name = "byteorder" @@ -665,9 +656,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ "serde", ] @@ -750,9 +741,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" [[package]] name = "cesu8" @@ -883,9 +874,10 @@ dependencies = [ [[package]] name = "color" version = "0.1.0" -source = "git+https://github.com/ahkohd/tauri-toolkit?branch=v2#4ca90fd2a56565af26aeb5d0518d2e85d80a35b0" +source = "git+https://github.com/ahkohd/tauri-toolkit?branch=v2#216e552bc344bb4c202121581f023a1787bd9247" dependencies = [ "cocoa", + "objc", "tauri", ] @@ -943,6 +935,7 @@ dependencies = [ "serde", "serde_json", "specta", + "specta-typescript", "tauri", "tauri-build", "tauri-plugin-clipboard-manager", @@ -1354,9 +1347,9 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" @@ -1569,9 +1562,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -2093,7 +2086,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -2475,21 +2468,15 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown 0.14.5", "serde", ] -[[package]] -name = "indoc" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" - [[package]] name = "infer" version = "0.15.0" @@ -2663,9 +2650,9 @@ dependencies = [ [[package]] name = "keyring" -version = "3.0.4" +version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c118b1bc529b034aad851808f41f49a69a337d10e112039e7f342e5fd514635b" +checksum = "0c163ef0b9da5ccf44ae4d7c9d24fb1a8750aa1969d484865fc1eedc44b26c09" dependencies = [ "byteorder", "dbus-secret-service", @@ -2856,9 +2843,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown 0.14.5", ] @@ -3068,7 +3055,7 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "nostr" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "aes", "base64 0.21.7", @@ -3097,7 +3084,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "async-trait", "flatbuffers", @@ -3111,7 +3098,7 @@ dependencies = [ [[package]] name = "nostr-relay-pool" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "async-utility", "async-wsocket", @@ -3126,7 +3113,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "async-utility", "atomic-destructor", @@ -3146,7 +3133,7 @@ dependencies = [ [[package]] name = "nostr-signer" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "async-utility", "nostr", @@ -3159,7 +3146,7 @@ dependencies = [ [[package]] name = "nostr-sqlite" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "async-trait", "nostr", @@ -3173,7 +3160,7 @@ dependencies = [ [[package]] name = "nostr-zapper" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "async-trait", "nostr", @@ -3293,7 +3280,7 @@ dependencies = [ [[package]] name = "nwc" version = "0.33.0" -source = "git+https://github.com/rust-nostr/nostr#52b4f439c55033a871f2d00aa916160bcd35f6ff" +source = "git+https://github.com/rust-nostr/nostr#881e3027829a40e5c4ae62f8f5090aa786f75bd8" dependencies = [ "async-utility", "nostr", @@ -3503,12 +3490,12 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" +checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3610,16 +3597,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version", -] - [[package]] name = "phf" version = "0.8.0" @@ -3810,7 +3787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.2.6", + "indexmap 2.3.0", "quick-xml", "serde", "time", @@ -3863,9 +3840,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "precomputed-hash" @@ -3984,9 +3964,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", @@ -3994,6 +3974,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", + "socket2", "thiserror", "tokio", "tracing", @@ -4001,9 +3982,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand 0.8.5", @@ -4025,6 +4006,7 @@ dependencies = [ "libc", "once_cell", "socket2", + "tracing", "windows-sys 0.52.0", ] @@ -4181,9 +4163,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -4338,9 +4320,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" @@ -4380,9 +4362,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -4577,12 +4559,6 @@ dependencies = [ "serde", ] -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.204" @@ -4627,12 +4603,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "itoa 1.0.11", + "memchr", "ryu", "serde", ] @@ -4679,7 +4656,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_derive", "serde_json", @@ -4764,12 +4741,12 @@ dependencies = [ [[package]] name = "shared_child" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4869,27 +4846,46 @@ dependencies = [ [[package]] name = "specta" -version = "2.0.0-rc.12" +version = "2.0.0-rc.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3624a07cbde326fdf1ec37cbd39d06a224660fa0199b7db7316f2349583df981" +checksum = "4ccbb212565d2dc177bc15ecb7b039d66c4490da892436a4eee5b394d620c9bc" dependencies = [ - "once_cell", "paste", - "serde", "specta-macros", "thiserror", ] [[package]] name = "specta-macros" -version = "2.0.0-rc.10" +version = "2.0.0-rc.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33e9678ae36993fcbfc46aa29568ef10d32fd54428808759c6a450998c43ec" +checksum = "68999d29816965eb9e5201f60aec02a76512139811661a7e8e653abc810b8f72" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", +] + +[[package]] +name = "specta-serde" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12260cbb21abb2e83a0375b1521867910e3aed8a7afa782206150ce552cd2e5a" +dependencies = [ + "specta", + "thiserror", +] + +[[package]] +name = "specta-typescript" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4472229365ceb6395487e3a60d921ad8e21f9ad06eaecc396f098902c9adc" +dependencies = [ + "specta", + "specta-serde", + "thiserror", ] [[package]] @@ -5112,15 +5108,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.15" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-beta.24" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab508aad4ae86e23865e294b20a7bb89bd7afea523897b7478329b841d4295" +checksum = "255e746089a370802ec4eb896dccc6f27c1dd2a203c1dc484fd996db954e2300" dependencies = [ "anyhow", "bytes", @@ -5170,9 +5166,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498f587026501e4bbc5d6273b63f8956b03c37b3d3b2027f9c756fcd468e9c62" +checksum = "85ceb8d082c3b17b4b2eb134a39363a22c696ddba473d6e5c0ab1caadad4cfca" dependencies = [ "anyhow", "cargo_toml", @@ -5192,9 +5188,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bbc731067e319ef60601bf5716d1e706ee9ae28e38c0587f7165c7d6824cdf" +checksum = "2407c7d37a491b16e530445c9611d91091cae198eea2ed424913b740215605f2" dependencies = [ "base64 0.22.1", "brotli", @@ -5219,9 +5215,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b4a44346577ccde75a24c62405a4c3b4f7a3a76614ee6cf1ed14a0b756795c" +checksum = "d210893b693be00f569b4f54456803debe104b7675f368205f2b6e94bac09b34" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5233,9 +5229,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abe0b85472516d1033ba251ac81b9f18f02725aadcaad697c8b727e6505a6ad" +checksum = "b352e4478af27bd7c76724bb426ebb32fc51baafb2186afabed4e706dc9e39d4" dependencies = [ "anyhow", "glob", @@ -5250,9 +5246,9 @@ dependencies = [ [[package]] name = "tauri-plugin-clipboard-manager" -version = "2.1.0-beta.6" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47675aca1e08a481aea642212f82d8ad980bc3ea7ea1350e5d78395aa28f4faf" +checksum = "76a26868f7e05a09673e4172d23acb82cd48911cca092f0e8d06179a69e5024c" dependencies = [ "arboard", "image 0.24.9", @@ -5266,9 +5262,9 @@ dependencies = [ [[package]] name = "tauri-plugin-decorum" -version = "0.1.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413d2c0123553c93dde37556fc86c96cbb10c1eeae5694b38d2f88d553b2fc93" +checksum = "8a073ba2f7dcceaf9b371e2358f4370ffa2924726431f822d5e43d977aa4d9f6" dependencies = [ "anyhow", "cocoa", @@ -5282,9 +5278,9 @@ dependencies = [ [[package]] name = "tauri-plugin-devtools" -version = "2.0.0-beta.5" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4ca4c8378668c832386b990259663ba0bfc60d4fce9d3714e43d3d99da9b56" +checksum = "1f7333811c0b81f32e980d34894effc92454f464409fb97a7e566294b7ebddd0" dependencies = [ "async-stream", "bytes", @@ -5309,9 +5305,9 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0-beta.11" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8860dd73c96969eb14813f9f04d8665f2853342670456fb6619d637137ef0d09" +checksum = "6c538457a755a75b8bb1594ed40d1512f8f6386251d3fcde492f8f46768ec85b" dependencies = [ "dunce", "log", @@ -5327,9 +5323,9 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0-beta.11" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461853268fe115ca19ee21e5986d505944f0b826048fe1bd726d74753fdf1df6" +checksum = "5df6b25b1f2b7b61565e66c4dbee9eb39e5635d2a763206e380e07cc3f601a67" dependencies = [ "anyhow", "glob", @@ -5346,9 +5342,9 @@ dependencies = [ [[package]] name = "tauri-plugin-os" -version = "2.0.0-beta.8" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a0466f11f45fd3f640a17b5ba5e34c62912c9b391141c818155125ae9f0917" +checksum = "6b54cfeb26356822d3be3db4282041b03552f573a694b6b28aded7d95c62a039" dependencies = [ "gethostname", "log", @@ -5364,9 +5360,9 @@ dependencies = [ [[package]] name = "tauri-plugin-prevent-default" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ff4be3c049bac253390c06f26c805a74b58722f8be97f99550213036df949" +checksum = "23ee986aa5872bfa37762e06d86e60325f721d602a436165f4be34a16ff8ae3e" dependencies = [ "bitflags 2.6.0", "itertools 0.13.0", @@ -5379,9 +5375,9 @@ dependencies = [ [[package]] name = "tauri-plugin-process" -version = "2.0.0-beta.8" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96007dd73e62441c7695c864831e600c382f2bf831defa84e8f9aa642f1a19c0" +checksum = "96d3663df0cd3e96feb37d46aad5d499d2edfcca5c62548ad34f1684e0019168" dependencies = [ "tauri", "tauri-plugin", @@ -5389,9 +5385,9 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" -version = "2.0.0-beta.9" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9fa8c4e3d9ec343f6c3eb081672045566128a6c48ff6f6eeea85251ff38d3f" +checksum = "9209f6c32caec61e156a5616f7d80ba7683ca4a0a5641cbe5d3086ab371aaab2" dependencies = [ "encoding_rs", "log", @@ -5410,9 +5406,9 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.0-beta.11" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd8bad59390a1da0efb4fe82d6c697747925dd8f8cd841d74d21325d4dd36c7" +checksum = "5b5f10ba18d2fc65e16bdf053b7beccb621dcf880c52d2ab08bdeb2d685e3e14" dependencies = [ "base64 0.22.1", "dirs", @@ -5439,9 +5435,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.20" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe978df03966febbebc608931dc2cf26ef94df70855a18b05f07134cf474de09" +checksum = "6624fdf383ccafc9e8ad9205fe6e5c976b318efcd6b3662dde658c74e4254792" dependencies = [ "dpi", "gtk", @@ -5458,9 +5454,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.20" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e4d568f61095f507b3fc4254dfbfff3b20de2a1d66167ffca3f6d90b14db8f" +checksum = "9fd1a785c4281f8231b091593393b40cb3a800810c407b1ffed52de27ff1640a" dependencies = [ "cocoa", "gtk", @@ -5483,14 +5479,15 @@ dependencies = [ [[package]] name = "tauri-specta" -version = "2.0.0-rc.11" -source = "git+https://github.com/reyamir/tauri-specta?branch=feat/tauri-v2#c5373f178c1676582c3ed833e3589bc7d7872253" +version = "2.0.0-rc.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5146a4f94911b69b6086a0a700e8748b96cc18220b0504d5085dc0f856d2bec7" dependencies = [ "heck 0.5.0", - "indoc", "serde", "serde_json", "specta", + "specta-typescript", "tauri", "tauri-specta-macros", "thiserror", @@ -5498,8 +5495,9 @@ dependencies = [ [[package]] name = "tauri-specta-macros" -version = "2.0.0-rc.5" -source = "git+https://github.com/reyamir/tauri-specta?branch=feat/tauri-v2#c5373f178c1676582c3ed833e3589bc7d7872253" +version = "2.0.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0e8c565ad3dda541e954e9e8fbbca9d43283d1050aec78daac07a92b64f733" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5509,9 +5507,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20e51856f343c503892749b27d34042e6ca83a0369a12de3c5552d9874d04e8" +checksum = "6f435eeaae1e69cf93cf19da0f727989eed2e5eb6fc63a8d21432f59dd3ac4ac" dependencies = [ "brotli", "cargo_metadata", @@ -5554,12 +5552,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", "windows-sys 0.52.0", ] @@ -5809,7 +5808,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_spanned", "toml_datetime", @@ -5822,7 +5821,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_spanned", "toml_datetime", @@ -6348,23 +6347,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasm-ws" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c5806d1b06b4f3d90d015e23364dc5d3af412ee64abba6dde8fdc01637e33" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "pharos", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "web-sys" version = "0.3.69" @@ -6488,11 +6470,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6631,6 +6613,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -7010,6 +7001,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -7032,15 +7024,15 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" -version = "2.1.5" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b895748a3ebcb69b9d38dcfdf21760859a4b0d0b0015277640c2ef4c69640e6f" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" dependencies = [ "arbitrary", "crc32fast", "crossbeam-utils", "displaydoc", - "indexmap 2.2.6", + "indexmap 2.3.0", "memchr", "thiserror", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 7eae105..be504da 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -8,30 +8,28 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0.0-beta", features = [] } +tauri-build = { version = "2.0.0-rc", features = [] } [dependencies] nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [ "sqlite", ] } -tauri = { version = "2.0.0-beta", features = [ +tauri = { version = "2.0.0-rc", features = [ "tray-icon", "macos-private-api", "protocol-asset", ] } -tauri-specta = { git = "https://github.com/reyamir/tauri-specta", branch = "feat/tauri-v2", features = [ - "typescript", -] } -tauri-plugin-devtools = "2.0.0-beta" -tauri-plugin-prevent-default = "0.2" -tauri-plugin-os = "2.0.0-beta" -tauri-plugin-clipboard-manager = "2.1.0-beta" -tauri-plugin-dialog = "2.0.0-beta" -tauri-plugin-shell = "2.0.0-beta" -tauri-plugin-updater = "2.0.0-beta" -tauri-plugin-process = "2.0.0-beta" -tauri-plugin-fs = "2.0.0-beta" -tauri-plugin-decorum = "0.1.5" +tauri-specta = { version = "2.0.0-rc.15", features = ["derive", "typescript"] } +tauri-plugin-devtools = "2.0.0-rc" +tauri-plugin-prevent-default = "0.3" +tauri-plugin-os = "2.0.0-rc" +tauri-plugin-clipboard-manager = "2.0.0-rc" +tauri-plugin-dialog = "2.0.0-rc" +tauri-plugin-shell = "2.0.0-rc" +tauri-plugin-updater = "2.0.0-rc" +tauri-plugin-process = "2.0.0-rc" +tauri-plugin-fs = "2.0.0-rc" +tauri-plugin-decorum = "1.0.0" serde = { version = "1", features = ["derive"] } serde_json = "1" keyring = { version = "3", features = [ @@ -42,7 +40,8 @@ keyring = { version = "3", features = [ keyring-search = "1.2.0" itertools = "0.13.0" futures = "0.3.30" -specta = "^2.0.0-rc.12" +specta = "^2.0.0-rc.20" +specta-typescript = "0.0.7" [target.'cfg(target_os = "macos")'.dependencies] border = { git = "https://github.com/ahkohd/tauri-toolkit", branch = "v2" } diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index 444e06c..3992c0a 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -6,26 +6,26 @@ "main" ], "permissions": [ - "path:default", - "event:default", - "window:default", - "app:default", - "image:default", - "resources:default", - "menu:default", - "tray:default", + "core:path:default", + "core:event:default", + "core:window:default", + "core:app:default", + "core:image:default", + "core:resources:default", + "core:menu:default", + "core:tray:default", "shell:allow-open", "dialog:default", "dialog:allow-open", "dialog:allow-ask", "dialog:allow-message", - "window:allow-close", - "window:allow-center", - "window:allow-minimize", - "window:allow-maximize", - "window:allow-set-size", - "window:allow-set-focus", - "window:allow-start-dragging", + "core:window:allow-close", + "core:window:allow-center", + "core:window:allow-minimize", + "core:window:allow-maximize", + "core:window:allow-set-size", + "core:window:allow-set-focus", + "core:window:allow-start-dragging", "decorum:allow-show-snap-overlay", "prevent-default:default", "updater:default", diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index c8d530e..d1eb4c8 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -4,6 +4,7 @@ #[cfg(target_os = "macos")] use border::WebviewWindowExt as WebviewWindowExtAlt; use nostr_sdk::prelude::*; +use specta_typescript::Typescript; use std::{ collections::HashMap, fs, @@ -14,6 +15,7 @@ use std::{ use tauri::{async_runtime::Mutex, Manager}; #[cfg(not(target_os = "linux"))] use tauri_plugin_decorum::WebviewWindowExt; +use tauri_specta::{collect_commands, Builder}; use commands::{account::*, chat::*, relay::*}; @@ -25,40 +27,43 @@ pub struct Nostr { } fn main() { - let invoke_handler = { - let builder = tauri_specta::ts::builder().commands(tauri_specta::collect_commands![ - get_bootstrap_relays, - set_bootstrap_relays, - get_inbox_relays, - set_inbox_relays, - connect_inbox_relays, - disconnect_inbox_relays, - login, - delete_account, - create_account, - import_key, - connect_account, - get_accounts, - get_metadata, - get_contact_list, - get_chats, - get_chat_messages, - send_message, - ]); - - #[cfg(debug_assertions)] - let builder = builder.path("../src/commands.ts"); - - builder.build().unwrap() - }; + let builder = Builder::::new().commands(collect_commands![ + get_bootstrap_relays, + set_bootstrap_relays, + get_inbox_relays, + set_inbox_relays, + connect_inbox_relays, + disconnect_inbox_relays, + login, + delete_account, + create_account, + import_key, + connect_account, + get_accounts, + get_metadata, + get_contact_list, + get_chats, + get_chat_messages, + send_message, + ]); #[cfg(debug_assertions)] - let builder = tauri::Builder::default().plugin(tauri_plugin_devtools::init()); - #[cfg(not(debug_assertions))] - let builder = tauri::Builder::default(); - builder - .setup(|app| { + .export(Typescript::default(), "../src/commands.ts") + .expect("Failed to export typescript bindings"); + + #[cfg(debug_assertions)] + let tauri_builder = tauri::Builder::default().plugin(tauri_plugin_devtools::init()); + + #[cfg(not(debug_assertions))] + let tauri_builder = tauri::Builder::default(); + + tauri_builder + .invoke_handler(builder.invoke_handler()) + .setup(move |app| { + // This is also required if you want to use events + builder.mount_events(app); + let handle = app.handle(); let main_window = app.get_webview_window("main").unwrap(); @@ -79,9 +84,6 @@ fn main() { let win_ = main_window.clone(); #[cfg(target_os = "macos")] main_window.on_window_event(move |event| { - if let tauri::WindowEvent::Resized(_) = event { - win_.set_traffic_lights_inset(12.0, 18.0).unwrap(); - } if let tauri::WindowEvent::ThemeChanged(_) = event { win_.set_traffic_lights_inset(12.0, 18.0).unwrap(); } @@ -158,7 +160,6 @@ fn main() { .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_decorum::init()) .plugin(tauri_plugin_shell::init()) - .invoke_handler(invoke_handler) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/src/commands.ts b/src/commands.ts index 79c3956..a15b9f1 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -1,11 +1,12 @@ - // This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually. +// This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually. - /** user-defined commands **/ +/** user-defined commands **/ - export const commands = { + +export const commands = { async getBootstrapRelays() : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("get_bootstrap_relays") }; } catch (e) { if(e instanceof Error) throw e; @@ -13,7 +14,7 @@ try { } }, async setBootstrapRelays(relays: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("set_bootstrap_relays", { relays }) }; } catch (e) { if(e instanceof Error) throw e; @@ -21,7 +22,7 @@ try { } }, async getInboxRelays(userId: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("get_inbox_relays", { userId }) }; } catch (e) { if(e instanceof Error) throw e; @@ -29,7 +30,7 @@ try { } }, async setInboxRelays(relays: string[]) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("set_inbox_relays", { relays }) }; } catch (e) { if(e instanceof Error) throw e; @@ -37,7 +38,7 @@ try { } }, async connectInboxRelays(userId: string, ignoreCache: boolean) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("connect_inbox_relays", { userId, ignoreCache }) }; } catch (e) { if(e instanceof Error) throw e; @@ -45,7 +46,7 @@ try { } }, async disconnectInboxRelays(userId: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("disconnect_inbox_relays", { userId }) }; } catch (e) { if(e instanceof Error) throw e; @@ -53,7 +54,7 @@ try { } }, async login(account: string, password: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("login", { account, password }) }; } catch (e) { if(e instanceof Error) throw e; @@ -61,7 +62,7 @@ try { } }, async deleteAccount(id: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("delete_account", { id }) }; } catch (e) { if(e instanceof Error) throw e; @@ -69,7 +70,7 @@ try { } }, async createAccount(name: string, about: string, picture: string, password: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("create_account", { name, about, picture, password }) }; } catch (e) { if(e instanceof Error) throw e; @@ -77,7 +78,7 @@ try { } }, async importKey(key: string, password: string | null) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("import_key", { key, password }) }; } catch (e) { if(e instanceof Error) throw e; @@ -85,7 +86,7 @@ try { } }, async connectAccount(uri: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("connect_account", { uri }) }; } catch (e) { if(e instanceof Error) throw e; @@ -93,18 +94,18 @@ try { } }, async getAccounts() : Promise { -return await TAURI_INVOKE("get_accounts"); + return await TAURI_INVOKE("get_accounts"); }, -async getMetadata(id: string) : Promise> { -try { - return { status: "ok", data: await TAURI_INVOKE("get_metadata", { id }) }; +async getMetadata(userId: string) : Promise> { + try { + return { status: "ok", data: await TAURI_INVOKE("get_metadata", { userId }) }; } catch (e) { if(e instanceof Error) throw e; else return { status: "error", error: e as any }; } }, async getContactList() : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("get_contact_list") }; } catch (e) { if(e instanceof Error) throw e; @@ -112,7 +113,7 @@ try { } }, async getChats() : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("get_chats") }; } catch (e) { if(e instanceof Error) throw e; @@ -120,7 +121,7 @@ try { } }, async getChatMessages(id: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("get_chat_messages", { id }) }; } catch (e) { if(e instanceof Error) throw e; @@ -128,7 +129,7 @@ try { } }, async sendMessage(to: string, message: string) : Promise> { -try { + try { return { status: "ok", data: await TAURI_INVOKE("send_message", { to, message }) }; } catch (e) { if(e instanceof Error) throw e; @@ -137,13 +138,13 @@ try { } } - /** user-defined events **/ +/** user-defined events **/ - /** user-defined statics **/ +/** user-defined constants **/ + - /** user-defined types **/ @@ -151,59 +152,60 @@ try { /** tauri-specta globals **/ - import { invoke as TAURI_INVOKE } from "@tauri-apps/api/core"; +import { + invoke as TAURI_INVOKE, + Channel as TAURI_CHANNEL, +} from "@tauri-apps/api/core"; import * as TAURI_API_EVENT from "@tauri-apps/api/event"; import { type WebviewWindow as __WebviewWindow__ } from "@tauri-apps/api/webviewWindow"; type __EventObj__ = { - listen: ( - cb: TAURI_API_EVENT.EventCallback - ) => ReturnType>; - once: ( - cb: TAURI_API_EVENT.EventCallback - ) => ReturnType>; - emit: T extends null - ? (payload?: T) => ReturnType - : (payload: T) => ReturnType; + listen: ( + cb: TAURI_API_EVENT.EventCallback, + ) => ReturnType>; + once: ( + cb: TAURI_API_EVENT.EventCallback, + ) => ReturnType>; + emit: T extends null + ? (payload?: T) => ReturnType + : (payload: T) => ReturnType; }; export type Result = - | { status: "ok"; data: T } - | { status: "error"; error: E }; + | { status: "ok"; data: T } + | { status: "error"; error: E }; function __makeEvents__>( - mappings: Record + mappings: Record, ) { - return new Proxy( - {} as unknown as { - [K in keyof T]: __EventObj__ & { - (handle: __WebviewWindow__): __EventObj__; - }; - }, - { - get: (_, event) => { - const name = mappings[event as keyof T]; + return new Proxy( + {} as unknown as { + [K in keyof T]: __EventObj__ & { + (handle: __WebviewWindow__): __EventObj__; + }; + }, + { + get: (_, event) => { + const name = mappings[event as keyof T]; - return new Proxy((() => {}) as any, { - apply: (_, __, [window]: [__WebviewWindow__]) => ({ - listen: (arg: any) => window.listen(name, arg), - once: (arg: any) => window.once(name, arg), - emit: (arg: any) => window.emit(name, arg), - }), - get: (_, command: keyof __EventObj__) => { - switch (command) { - case "listen": - return (arg: any) => TAURI_API_EVENT.listen(name, arg); - case "once": - return (arg: any) => TAURI_API_EVENT.once(name, arg); - case "emit": - return (arg: any) => TAURI_API_EVENT.emit(name, arg); - } - }, - }); - }, - } - ); + return new Proxy((() => {}) as any, { + apply: (_, __, [window]: [__WebviewWindow__]) => ({ + listen: (arg: any) => window.listen(name, arg), + once: (arg: any) => window.once(name, arg), + emit: (arg: any) => window.emit(name, arg), + }), + get: (_, command: keyof __EventObj__) => { + switch (command) { + case "listen": + return (arg: any) => TAURI_API_EVENT.listen(name, arg); + case "once": + return (arg: any) => TAURI_API_EVENT.once(name, arg); + case "emit": + return (arg: any) => TAURI_API_EVENT.emit(name, arg); + } + }, + }); + }, + }, + ); } - - \ No newline at end of file diff --git a/src/components/user/provider.tsx b/src/components/user/provider.tsx index c655ecd..c81c5d5 100644 --- a/src/components/user/provider.tsx +++ b/src/components/user/provider.tsx @@ -1,5 +1,5 @@ +import { commands } from "@/commands"; import { useQuery } from "@tanstack/react-query"; -import { invoke } from "@tauri-apps/api/core"; import { type ReactNode, createContext, useContext } from "react"; type Metadata = { @@ -42,11 +42,13 @@ export function UserProvider({ .replace("nostr:", "") .replace(/[^\w\s]/gi, ""); - const query: string = await invoke("get_metadata", { - id: normalizePubkey, - }); + const res = await commands.getMetadata(normalizePubkey); - return JSON.parse(query) as Metadata; + if (res.status === "ok") { + return JSON.parse(res.data) as Metadata; + } else { + throw new Error(res.error); + } } catch (e) { throw new Error(String(e)); }