diff --git a/package.json b/package.json index 85d9bf92..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": "2.0.0-alpha.0", - "@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", @@ -73,11 +58,16 @@ "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.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c7109c6..33f3d750 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -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: 2.0.0-alpha.0 - version: 2.0.0-alpha.0 - '@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) @@ -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,6 +144,9 @@ 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.3) @@ -1900,128 +1870,117 @@ packages: resolution: {integrity: sha512-jtkwqdP2rY2iCCDVAFuaNBH3fiEi29aTn2RhtIoky8DTTiCdc48plpHHreLwmv1PICJ4AJUUESaq3xa8fZH8+g==} dev: false - /@tauri-apps/api@2.0.0-alpha.4: - resolution: {integrity: sha512-gWe5fFHbwFM+dmdDPtlDvVDVtoMneGRM+S8mECevWhKpXYxId0yxznE56YGAvPSJXC3vgsXw16mOmkTnEVKnaw==} + /@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/api@2.0.0-alpha.6: - resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==} - 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/plugin-dialog@2.0.0-alpha.0: - resolution: {integrity: sha512-dJ3LDrnvTW0y5Ff4rxY158DQaZG2P4zm0NgJQVU1tSZ/kBah7/X8PmHS8bFD7EOohh5vAol5dLqvPmdogBGajw==} - dependencies: - '@tauri-apps/api': 2.0.0-alpha.4 - 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==} @@ -7138,106 +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-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 + 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-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 b9cfaba6..d15d1714 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", @@ -185,25 +174,6 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -[[package]] -name = "arboard" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" -dependencies = [ - "clipboard-win", - "core-graphics 0.22.3", - "image", - "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot", - "thiserror", - "winapi", - "x11rb", -] - [[package]] name = "arrayref" version = "0.3.7" @@ -340,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", @@ -352,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]] @@ -545,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" @@ -572,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]] @@ -656,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml", + "toml 0.7.6", ] [[package]] @@ -665,7 +623,6 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] @@ -686,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" @@ -709,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", ] @@ -722,7 +688,7 @@ checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] @@ -749,16 +715,6 @@ 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.2" @@ -787,7 +743,7 @@ version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.29", @@ -820,24 +776,8 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.23.1", - "foreign-types 0.5.0", + "core-graphics", + "foreign-types", "libc", "objc", ] @@ -852,7 +792,7 @@ dependencies = [ "block", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", "objc", ] @@ -919,6 +859,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" @@ -950,20 +896,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "libc", ] @@ -1117,7 +1050,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -1168,12 +1101,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" @@ -1344,7 +1271,7 @@ checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27" dependencies = [ "cc", "rustc_version", - "toml", + "toml 0.7.6", "vswhom", "winreg 0.51.0", ] @@ -1542,28 +1469,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", + "foreign-types-shared", ] [[package]] @@ -1572,12 +1478,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - [[package]] name = "form_urlencoded" version = "1.2.0" @@ -1723,9 +1623,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", @@ -1739,9 +1639,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", @@ -1752,22 +1652,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", @@ -1777,33 +1677,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", ] @@ -1830,26 +1730,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" @@ -1892,50 +1772,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", @@ -1947,12 +1822,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", @@ -1962,12 +1837,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]] @@ -1977,21 +1852,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", @@ -2012,9 +1900,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", @@ -2025,14 +1913,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", @@ -2089,6 +1977,15 @@ 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" @@ -2139,9 +2036,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", @@ -2215,6 +2112,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" @@ -2264,6 +2174,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" @@ -2275,8 +2202,6 @@ dependencies = [ "color_quant", "num-rational", "num-traits", - "png", - "tiff", ] [[package]] @@ -2310,15 +2235,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" @@ -2346,7 +2262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e04d492224bff6e97142f033d0a4383bcbc05918be1ff7b3abd2c1cc85205a2" dependencies = [ "aead", - "aes 0.7.5", + "aes", "aes-gcm", "autocfg", "blake2", @@ -2383,7 +2299,7 @@ dependencies = [ "bincode", "hkdf", "iota-crypto 0.15.3", - "rust-argon2", + "rust-argon2 1.0.0", "serde", "stronghold-derive", "stronghold-utils", @@ -2398,25 +2314,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" @@ -2440,9 +2337,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", @@ -2451,30 +2348,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]] @@ -2483,21 +2378,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" @@ -2520,25 +2400,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", ] @@ -2552,46 +2420,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" @@ -2677,29 +2511,18 @@ 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", ] [[package]] @@ -2732,13 +2555,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", @@ -2813,12 +2636,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" @@ -2841,35 +2658,33 @@ dependencies = [ ] [[package]] -name = "muda" -version = "0.8.7" +name = "native-tls" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe753ec4d3e8137a1d3ecb1aee1192b8f7661fe1247641968f5bf5f2e6ebbe" +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", ] @@ -2881,9 +2696,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", ] @@ -3131,13 +2946,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", + "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]] @@ -3161,16 +3019,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" @@ -3179,12 +3027,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", @@ -3193,14 +3040,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]] @@ -3232,17 +3079,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" @@ -3262,9 +3098,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]] @@ -3314,16 +3147,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" @@ -3843,10 +3666,12 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-tls", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -3854,6 +3679,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", + "tokio-native-tls", "tokio-util", "tower-service", "url", @@ -3866,18 +3692,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", @@ -3886,7 +3711,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.44.0", + "windows 0.37.0", ] [[package]] @@ -3938,6 +3763,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" @@ -4061,6 +3897,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" @@ -4083,6 +3928,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" @@ -4096,7 +3964,7 @@ dependencies = [ "log", "matches", "phf 0.8.0", - "phf_codegen 0.8.0", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -4280,16 +4148,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" @@ -4367,31 +4225,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]] @@ -4534,7 +4392,7 @@ checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" dependencies = [ "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -4666,9 +4524,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", ] @@ -4791,17 +4649,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" @@ -4826,11 +4673,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]] @@ -4839,25 +4703,25 @@ 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", "cc", - "cocoa 0.24.1", + "cocoa", "core-foundation", - "core-graphics 0.22.3", + "core-graphics", "crossbeam-channel", "dispatch", "gdk", @@ -4887,12 +4751,10 @@ dependencies = [ "serde", "tao-macros", "unicode-segmentation", - "url", "uuid", - "windows 0.48.0", + "windows 0.39.0", "windows-implement", "x11-dl", - "zbus", ] [[package]] @@ -4925,95 +4787,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", "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", @@ -5023,43 +4869,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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "auto-launch", "log", @@ -5069,130 +4908,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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" -dependencies = [ - "tauri", -] - -[[package]] -name = "tauri-plugin-shell" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "log", "serde", @@ -5205,8 +4924,8 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#69a5c1370b027b3246435348a592e2f1a7b931f2" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "futures-core", "log", @@ -5221,8 +4940,8 @@ dependencies = [ [[package]] name = "tauri-plugin-store" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#69a5c1370b027b3246435348a592e2f1a7b931f2" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "log", "serde", @@ -5233,13 +4952,16 @@ dependencies = [ [[package]] name = "tauri-plugin-stronghold" -version = "2.0.0-alpha.1" -source = "git+https://github.com/luminous-devs/plugins-workspace?branch=v2#69a5c1370b027b3246435348a592e2f1a7b931f2" +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", @@ -5247,35 +4969,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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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#69a5c1370b027b3246435348a592e2f1a7b931f2" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "futures-util", "log", @@ -5289,98 +4986,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#69a5c1370b027b3246435348a592e2f1a7b931f2" -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", + "cocoa", "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", @@ -5392,7 +5053,7 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows 0.48.0", + "windows 0.39.0", ] [[package]] @@ -5402,7 +5063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ "embed-resource", - "toml", + "toml 0.7.6", ] [[package]] @@ -5475,17 +5136,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" @@ -5557,6 +5207,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" @@ -5582,6 +5242,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" @@ -5685,25 +5354,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" @@ -5835,6 +5485,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" @@ -5995,9 +5651,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", @@ -6013,18 +5669,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", @@ -6032,9 +5690,10 @@ dependencies = [ "gtk-sys", "javascriptcore-rs-sys", "libc", + "pango-sys", "pkg-config", - "soup3-sys", - "system-deps", + "soup2-sys", + "system-deps 6.1.1", ] [[package]] @@ -6048,49 +5707,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" @@ -6122,15 +5774,6 @@ 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" @@ -6150,12 +5793,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", @@ -6163,31 +5820,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", @@ -6195,31 +5841,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" @@ -6271,9 +5920,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" @@ -6293,6 +5942,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" @@ -6317,6 +5972,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" @@ -6341,6 +6002,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" @@ -6365,6 +6032,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" @@ -6401,6 +6074,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" @@ -6459,14 +6138,14 @@ 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", + "cocoa", + "core-graphics", "crossbeam-channel", "dunce", "gdk", @@ -6475,8 +6154,7 @@ dependencies = [ "gtk", "html5ever", "http", - "javascriptcore-rs", - "kuchikiki", + "kuchiki", "libc", "log", "objc", @@ -6485,14 +6163,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", ] @@ -6517,28 +6195,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" @@ -6655,56 +6311,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..2cd33150 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -11,40 +11,39 @@ 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" } 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..b7491cf6 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -168,19 +168,8 @@ 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]) .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..f0a103ea 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -10,38 +10,70 @@ "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": [ + "https://void.cat/*" + ] + }, + "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 +111,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 4fc9367d..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'; 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 3c7e6b5f..8e57356d 100644 --- a/src/shared/composer/composer.tsx +++ b/src/shared/composer/composer.tsx @@ -1,4 +1,4 @@ -import { message } from '@tauri-apps/plugin-dialog'; +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'; diff --git a/src/shared/logout.tsx b/src/shared/logout.tsx index 7a79393f..e59fc284 100644 --- a/src/shared/logout.tsx +++ b/src/shared/logout.tsx @@ -1,6 +1,5 @@ import * as Dialog from '@radix-ui/react-dialog'; import { useQueryClient } from '@tanstack/react-query'; -import { relaunch } from '@tauri-apps/plugin-process'; import { CancelIcon, LogoutIcon } from '@shared/icons'; @@ -12,8 +11,6 @@ export function Logout() { // await removeAll(); // reset react query queryClient.clear(); - // navigate - await relaunch(); }; return ( diff --git a/src/shared/notes/actions/more.tsx b/src/shared/notes/actions/more.tsx index ca7c1591..ae8cbb1b 100644 --- a/src/shared/notes/actions/more.tsx +++ b/src/shared/notes/actions/more.tsx @@ -1,6 +1,6 @@ import * as DropdownMenu from '@radix-ui/react-dropdown-menu'; import * as Tooltip from '@radix-ui/react-tooltip'; -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 { useState } from 'react'; diff --git a/src/shared/notes/preview/image.tsx b/src/shared/notes/preview/image.tsx index 38ee59d8..98f4aa0e 100644 --- a/src/shared/notes/preview/image.tsx +++ b/src/shared/notes/preview/image.tsx @@ -1,5 +1,5 @@ import { downloadDir } from '@tauri-apps/api/path'; -import { download } from '@tauri-apps/plugin-upload'; +import { download } from 'tauri-plugin-upload-api'; import { DownloadIcon } from '@shared/icons'; import { Image } from '@shared/image'; diff --git a/src/utils/checkActiveAccount.ts b/src/utils/checkActiveAccount.ts index 83c47bc9..f7ff0bbb 100644 --- a/src/utils/checkActiveAccount.ts +++ b/src/utils/checkActiveAccount.ts @@ -1,4 +1,4 @@ -import Database from '@tauri-apps/plugin-sql'; +import Database from 'tauri-plugin-sql-api'; import { Account } from '@utils/types'; diff --git a/src/utils/createBlobFromFile.ts b/src/utils/createBlobFromFile.ts index 1cfedb84..ada1bff3 100644 --- a/src/utils/createBlobFromFile.ts +++ b/src/utils/createBlobFromFile.ts @@ -1,4 +1,4 @@ -import { readBinaryFile } from '@tauri-apps/plugin-fs'; +import { readBinaryFile } from '@tauri-apps/api/fs'; export async function createBlobFromFile(path: string): Promise { const file = await readBinaryFile(path); diff --git a/src/utils/hooks/useNostr.ts b/src/utils/hooks/useNostr.ts index f6013726..52284652 100644 --- a/src/utils/hooks/useNostr.ts +++ b/src/utils/hooks/useNostr.ts @@ -8,7 +8,7 @@ import { NDKUser, } from '@nostr-dev-kit/ndk'; import { ndkAdapter } from '@nostr-fetch/adapter-ndk'; -import { message, open } from '@tauri-apps/plugin-dialog'; +import { message, open } from '@tauri-apps/api/dialog'; import { VoidApi } from '@void-cat/api'; import { LRUCache } from 'lru-cache'; import { NostrFetcher } from 'nostr-fetch'; @@ -362,7 +362,7 @@ export function useNostr() { error: 'Cancelled', }; } else { - filepath = selected.path; + filepath = selected; } } diff --git a/src/utils/hooks/useUploader.ts b/src/utils/hooks/useUploader.ts index e6250844..7ece1928 100644 --- a/src/utils/hooks/useUploader.ts +++ b/src/utils/hooks/useUploader.ts @@ -1,5 +1,5 @@ import { magnetDecode } from '@ctrl/magnet-link'; -import { open } from '@tauri-apps/plugin-dialog'; +import { open } from '@tauri-apps/api/dialog'; import { VoidApi } from '@void-cat/api'; import { createBlobFromFile } from '@utils/createBlobFromFile'; @@ -38,7 +38,7 @@ export function useImageUploader() { } else if (selected === null) { // user cancelled the selection } else { - filepath = selected.path; + filepath = selected; } } diff --git a/src/utils/notification.ts b/src/utils/notification.ts index 795783f4..5fb9f0a4 100644 --- a/src/utils/notification.ts +++ b/src/utils/notification.ts @@ -2,7 +2,7 @@ import { isPermissionGranted, requestPermission, sendNotification, -} from '@tauri-apps/plugin-notification'; +} from '@tauri-apps/api/notification'; export async function sendNativeNotification(content: string, title?: string) { let permissionGranted = await isPermissionGranted();