diff --git a/package.json b/package.json index aa9d57a3..2b140213 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,18 @@ "@tanstack/react-query-devtools": "^4.32.0", "@tanstack/react-virtual": "3.0.0-beta.54", "@tauri-apps/api": "2.0.0-alpha.5", + "@tauri-apps/plugin-app": "github:tauri-apps/tauri-plugin-app#v2", + "@tauri-apps/plugin-autostart": "github:tauri-apps/tauri-plugin-autostart#v2", + "@tauri-apps/plugin-clipboard-manager": "github:tauri-apps/tauri-plugin-clipboard-manager#v2", + "@tauri-apps/plugin-dialog": "github:tauri-apps/tauri-plugin-dialog#v2", + "@tauri-apps/plugin-fs": "github:tauri-apps/tauri-plugin-fs#v2", + "@tauri-apps/plugin-http": "github:tauri-apps/tauri-plugin-http#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-sql": "github:tauri-apps/tauri-plugin-sql#v2", + "@tauri-apps/plugin-stronghold": "github:tauri-apps/tauri-plugin-stronghold#v2", + "@tauri-apps/plugin-upload": "github:tauri-apps/tauri-plugin-upload#v2", "@tiptap/extension-image": "^2.0.4", "@tiptap/extension-mention": "^2.0.4", "@tiptap/extension-placeholder": "^2.0.4", @@ -56,10 +68,6 @@ "react-virtuoso": "^4.4.2", "remark-gfm": "^3.0.1", "tailwind-merge": "^1.14.0", - "tauri-plugin-autostart-api": "github:tauri-apps/tauri-plugin-autostart#v1", - "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql", - "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.3.9" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 237b8969..0007751f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,42 @@ dependencies: '@tauri-apps/api': specifier: 2.0.0-alpha.5 version: 2.0.0-alpha.5 + '@tauri-apps/plugin-app': + specifier: github:tauri-apps/tauri-plugin-app#v2 + version: github.com/tauri-apps/tauri-plugin-app/dbfef70e44dc82156e79301742b656fd797a1473 + '@tauri-apps/plugin-autostart': + specifier: github:tauri-apps/tauri-plugin-autostart#v2 + version: github.com/tauri-apps/tauri-plugin-autostart/33968b8b0aae857f045aeb17741bcff27440f6d3 + '@tauri-apps/plugin-clipboard-manager': + specifier: github:tauri-apps/tauri-plugin-clipboard-manager#v2 + version: github.com/tauri-apps/tauri-plugin-clipboard-manager/549ca993a47ae7aafff635d99fc3e6dc124b9181 + '@tauri-apps/plugin-dialog': + specifier: github:tauri-apps/tauri-plugin-dialog#v2 + version: github.com/tauri-apps/tauri-plugin-dialog/80325934b699f02bea9abe4fe1311dfba793a2bb + '@tauri-apps/plugin-fs': + specifier: github:tauri-apps/tauri-plugin-fs#v2 + version: github.com/tauri-apps/tauri-plugin-fs/60e8dec66d2582cc39ebdd7b7101e9c96c23e52a + '@tauri-apps/plugin-http': + specifier: github:tauri-apps/tauri-plugin-http#v2 + version: github.com/tauri-apps/tauri-plugin-http/b23c48592e1b6f1924feb273e1754944063e4ee8 + '@tauri-apps/plugin-notification': + specifier: github:tauri-apps/tauri-plugin-notification#v2 + version: github.com/tauri-apps/tauri-plugin-notification/6d8c193765f7fcf97429c0106bc5699d41870cef + '@tauri-apps/plugin-os': + specifier: github:tauri-apps/tauri-plugin-os#v2 + version: github.com/tauri-apps/tauri-plugin-os/d235fbf70c53812c501f1d86a6b8c790bdf6bc8b + '@tauri-apps/plugin-process': + specifier: github:tauri-apps/tauri-plugin-process#v2 + version: github.com/tauri-apps/tauri-plugin-process/ed3f8f78ddecc72c926239f5a10ec6ce1b8c353e + '@tauri-apps/plugin-sql': + specifier: github:tauri-apps/tauri-plugin-sql#v2 + version: github.com/tauri-apps/tauri-plugin-sql/0591e9f63e0f86be79c209f4bcb564ccce4bd05c + '@tauri-apps/plugin-stronghold': + specifier: github:tauri-apps/tauri-plugin-stronghold#v2 + version: github.com/tauri-apps/tauri-plugin-stronghold/a87861766f3520b5fc1ea1f34665d814bbee9b06 + '@tauri-apps/plugin-upload': + specifier: github:tauri-apps/tauri-plugin-upload#v2 + version: github.com/tauri-apps/tauri-plugin-upload/3c17e7170f54aa3bad3ee4c534f423ace2b06552 '@tiptap/extension-image': specifier: ^2.0.4 version: 2.0.4(@tiptap/core@2.0.4) @@ -118,18 +154,6 @@ dependencies: tailwind-merge: specifier: ^1.14.0 version: 1.14.0 - tauri-plugin-autostart-api: - specifier: github:tauri-apps/tauri-plugin-autostart#v1 - version: github.com/tauri-apps/tauri-plugin-autostart/0e474395d4990587ad5c1db25ed23220fe11764f - tauri-plugin-sql-api: - specifier: github:tauri-apps/tauri-plugin-sql - version: github.com/tauri-apps/tauri-plugin-sql/b8fd19dac907cc8c3d78681cd4803a326b8b861e - tauri-plugin-stronghold-api: - specifier: github:tauri-apps/tauri-plugin-stronghold#v1 - version: github.com/tauri-apps/tauri-plugin-stronghold/2c9e7820b4b8a6a14d9445fa338e94fdac4d9e43 - 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 @@ -1940,11 +1964,6 @@ packages: resolution: {integrity: sha512-jtkwqdP2rY2iCCDVAFuaNBH3fiEi29aTn2RhtIoky8DTTiCdc48plpHHreLwmv1PICJ4AJUUESaq3xa8fZH8+g==} dev: false - /@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.5: resolution: {integrity: sha512-OqysC4c819itGxic50RoDMrmd+ofX+MMNkXKeRS0BV2rkKqrnuV17o3TrQXFI1xs/kXRmmPC+3Y42P9Y5uNvRg==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} @@ -3962,7 +3981,7 @@ packages: engines: {node: '>=14'} dependencies: cross-spawn: 7.0.3 - signal-exit: 4.0.2 + signal-exit: 4.0.3 dev: false /formdata-polyfill@4.0.10: @@ -6687,8 +6706,8 @@ packages: /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - /signal-exit@4.0.2: - resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==} + /signal-exit@4.0.3: + resolution: {integrity: sha512-U97H1k7QQ8OQJ18ryc5lSI16ouK1a43nSNRkXz16OMcc5dTVz5TlQxgf2NbX+cF0luukRuy3/womPZqfpIucbw==} engines: {node: '>=14'} dev: false @@ -7614,34 +7633,98 @@ packages: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: false - github.com/tauri-apps/tauri-plugin-autostart/0e474395d4990587ad5c1db25ed23220fe11764f: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-autostart/tar.gz/0e474395d4990587ad5c1db25ed23220fe11764f} - name: tauri-plugin-autostart-api - version: 0.0.0 + github.com/tauri-apps/tauri-plugin-app/dbfef70e44dc82156e79301742b656fd797a1473: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-app/tar.gz/dbfef70e44dc82156e79301742b656fd797a1473} + name: '@tauri-apps/plugin-app' + version: 2.0.0-alpha.0 dependencies: - '@tauri-apps/api': 1.4.0 + '@tauri-apps/api': 2.0.0-alpha.5 dev: false - 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 + github.com/tauri-apps/tauri-plugin-autostart/33968b8b0aae857f045aeb17741bcff27440f6d3: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-autostart/tar.gz/33968b8b0aae857f045aeb17741bcff27440f6d3} + name: '@tauri-apps/plugin-autostart' + version: 2.0.0-alpha.0 dependencies: - '@tauri-apps/api': 1.4.0 + '@tauri-apps/api': 2.0.0-alpha.5 dev: false - github.com/tauri-apps/tauri-plugin-stronghold/2c9e7820b4b8a6a14d9445fa338e94fdac4d9e43: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-stronghold/tar.gz/2c9e7820b4b8a6a14d9445fa338e94fdac4d9e43} - name: tauri-plugin-stronghold-api - version: 0.0.0 + github.com/tauri-apps/tauri-plugin-clipboard-manager/549ca993a47ae7aafff635d99fc3e6dc124b9181: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-clipboard-manager/tar.gz/549ca993a47ae7aafff635d99fc3e6dc124b9181} + name: '@tauri-apps/plugin-clipboard-manager' + version: 2.0.0-alpha.0 dependencies: - '@tauri-apps/api': 1.4.0 + '@tauri-apps/api': 2.0.0-alpha.5 dev: false - 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 + github.com/tauri-apps/tauri-plugin-dialog/80325934b699f02bea9abe4fe1311dfba793a2bb: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-dialog/tar.gz/80325934b699f02bea9abe4fe1311dfba793a2bb} + name: '@tauri-apps/plugin-dialog' + version: 2.0.0-alpha.0 dependencies: - '@tauri-apps/api': 1.4.0 + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-fs/60e8dec66d2582cc39ebdd7b7101e9c96c23e52a: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-fs/tar.gz/60e8dec66d2582cc39ebdd7b7101e9c96c23e52a} + name: '@tauri-apps/plugin-fs' + version: 2.0.0-alpha.0 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-http/b23c48592e1b6f1924feb273e1754944063e4ee8: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-http/tar.gz/b23c48592e1b6f1924feb273e1754944063e4ee8} + name: '@tauri-apps/plugin-http' + version: 2.0.0-alpha.0 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-notification/6d8c193765f7fcf97429c0106bc5699d41870cef: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-notification/tar.gz/6d8c193765f7fcf97429c0106bc5699d41870cef} + name: '@tauri-apps/plugin-notification' + version: 2.0.0-alpha.0 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-os/d235fbf70c53812c501f1d86a6b8c790bdf6bc8b: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-os/tar.gz/d235fbf70c53812c501f1d86a6b8c790bdf6bc8b} + name: '@tauri-apps/plugin-os' + version: 2.0.0-alpha.0 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-process/ed3f8f78ddecc72c926239f5a10ec6ce1b8c353e: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-process/tar.gz/ed3f8f78ddecc72c926239f5a10ec6ce1b8c353e} + name: '@tauri-apps/plugin-process' + version: 2.0.0-alpha.0 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-sql/0591e9f63e0f86be79c209f4bcb564ccce4bd05c: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-sql/tar.gz/0591e9f63e0f86be79c209f4bcb564ccce4bd05c} + name: '@tauri-apps/plugin-sql' + version: 2.0.0-alpha.0 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-stronghold/a87861766f3520b5fc1ea1f34665d814bbee9b06: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-stronghold/tar.gz/a87861766f3520b5fc1ea1f34665d814bbee9b06} + name: '@tauri-apps/plugin-stronghold' + version: 2.0.0-alpha.1 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 + dev: false + + github.com/tauri-apps/tauri-plugin-upload/3c17e7170f54aa3bad3ee4c534f423ace2b06552: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-upload/tar.gz/3c17e7170f54aa3bad3ee4c534f423ace2b06552} + name: '@tauri-apps/plugin-upload' + version: 2.0.0-alpha.0 + dependencies: + '@tauri-apps/api': 2.0.0-alpha.5 dev: false diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 699750a0..bfa43dcd 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -175,6 +175,26 @@ version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +[[package]] +name = "arboard" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +dependencies = [ + "clipboard-win", + "core-graphics", + "image", + "log", + "objc", + "objc-foundation", + "objc_id", + "once_cell", + "parking_lot", + "thiserror", + "winapi", + "x11rb", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -516,6 +536,16 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -1696,6 +1726,26 @@ 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.1", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -1822,6 +1872,19 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "globset" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + [[package]] name = "gobject-sys" version = "0.16.3" @@ -2110,6 +2173,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.6" @@ -2121,6 +2201,8 @@ dependencies = [ "color_quant", "num-rational", "num-traits", + "png", + "tiff", ] [[package]] @@ -2307,6 +2389,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +[[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" @@ -2349,12 +2437,46 @@ 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" @@ -2449,10 +2571,19 @@ dependencies = [ "sqlx-cli", "tauri", "tauri-build", + "tauri-plugin-app", "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-single-instance", "tauri-plugin-sql", "tauri-plugin-stronghold", + "tauri-plugin-updater", "tauri-plugin-upload", ] @@ -2462,6 +2593,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" +[[package]] +name = "mac-notification-sys" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abc434554ad0e640d772f7f262aa28e61d485212533d3673abe5f3d1729bd42a" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -2554,6 +2698,12 @@ 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" @@ -2672,6 +2822,19 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "notify-rust" +version = "4.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2782,6 +2945,17 @@ dependencies = [ "objc_exception", ] +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2831,6 +3005,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + [[package]] name = "overload" version = "0.1.1" @@ -3088,7 +3273,7 @@ dependencies = [ "base64 0.21.2", "indexmap 1.9.3", "line-wrap", - "quick-xml", + "quick-xml 0.29.0", "serde", "time", ] @@ -3215,6 +3400,15 @@ dependencies = [ "rustyline", ] +[[package]] +name = "quick-xml" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +dependencies = [ + "memchr", +] + [[package]] name = "quick-xml" version = "0.29.0" @@ -3485,6 +3679,31 @@ dependencies = [ "winreg 0.10.1", ] +[[package]] +name = "rfd" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f" +dependencies = [ + "async-io", + "block", + "dispatch", + "futures-util", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.44.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -4399,6 +4618,16 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sys-locale" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "system-deps" version = "6.1.1" @@ -4425,6 +4654,7 @@ dependencies = [ "core-foundation", "core-graphics", "crossbeam-channel", + "dirs-next", "dispatch", "gdk", "gdk-pixbuf", @@ -4439,6 +4669,7 @@ dependencies = [ "instant", "jni", "lazy_static", + "libappindicator", "libc", "log", "ndk", @@ -4470,6 +4701,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "tar" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.10" @@ -4583,6 +4825,14 @@ dependencies = [ "tauri-utils", ] +[[package]] +name = "tauri-plugin-app" +version = "2.0.0-alpha.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "tauri", +] + [[package]] name = "tauri-plugin-autostart" version = "2.0.0-alpha.0" @@ -4596,6 +4846,110 @@ dependencies = [ "thiserror", ] +[[package]] +name = "tauri-plugin-clipboard-manager" +version = "2.0.0-alpha.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "arboard", + "log", + "serde", + "serde_json", + "tauri", + "tauri-build", + "thiserror", +] + +[[package]] +name = "tauri-plugin-dialog" +version = "2.0.0-alpha.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "glib", + "log", + "raw-window-handle", + "rfd", + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-fs", + "thiserror", +] + +[[package]] +name = "tauri-plugin-fs" +version = "2.0.0-alpha.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "anyhow", + "glob", + "serde", + "tauri", + "thiserror", + "uuid", +] + +[[package]] +name = "tauri-plugin-http" +version = "2.0.0-alpha.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "bytes", + "glob", + "http", + "rand 0.8.5", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "tauri", + "tauri-plugin-fs", + "thiserror", +] + +[[package]] +name = "tauri-plugin-notification" +version = "2.0.0-alpha.1" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "log", + "notify-rust", + "rand 0.8.5", + "serde", + "serde_json", + "serde_repr", + "tauri", + "tauri-build", + "thiserror", + "time", + "url", +] + +[[package]] +name = "tauri-plugin-os" +version = "2.0.0-alpha.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +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.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "tauri", +] + [[package]] name = "tauri-plugin-single-instance" version = "2.0.0-alpha.0" @@ -4642,6 +4996,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tauri-plugin-updater" +version = "2.0.0-alpha.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#6f01bc11ab5be762d6cbe0ca924f15cdde47ce0d" +dependencies = [ + "base64 0.21.2", + "dirs-next", + "flate2", + "futures-util", + "http", + "ignore", + "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.0" @@ -4740,6 +5121,16 @@ dependencies = [ "toml", ] +[[package]] +name = "tauri-winrt-notification" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +dependencies = [ + "quick-xml 0.23.1", + "windows 0.39.0", +] + [[package]] name = "tempfile" version = "3.7.0" @@ -4800,6 +5191,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "tiff" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + [[package]] name = "time" version = "0.3.23" @@ -5379,6 +5781,12 @@ dependencies = [ "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" @@ -5410,6 +5818,15 @@ 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" @@ -5429,6 +5846,19 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + [[package]] name = "windows" version = "0.44.0" @@ -5559,6 +5989,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -5577,6 +6013,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -5595,6 +6037,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -5613,6 +6061,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.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -5643,6 +6097,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.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -5743,6 +6203,28 @@ 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" @@ -5754,6 +6236,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + [[package]] name = "xdg-home" version = "1.0.0" @@ -5850,6 +6341,17 @@ dependencies = [ "syn 2.0.27", ] +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + [[package]] name = "zvariant" version = "3.15.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d88e1602..534ed670 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -16,11 +16,20 @@ tauri-build = { version = "2.0.0-alpha.6", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "2.0.0-alpha.10" } +tauri = { version = "2.0.0-alpha.10", features = ["system-tray"] } tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-notification = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-app = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } sqlx-cli = { version = "0.7.0", default-features = false, features = [ "sqlite", ] } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index da734335..2606d7c4 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -25,29 +25,6 @@ struct Payload { fn main() { tauri::Builder::default() - .setup(|app| { - #[cfg(target_os = "macos")] - let main_window = app.get_window("main").unwrap(); - - #[cfg(target_os = "macos")] - main_window.position_traffic_lights(13.0, 17.0); // set inset for traffic lights (macos) - - Ok(()) - }) - .on_window_event(|e| { - #[cfg(target_os = "macos")] - let apply_offset = || { - let win = e.window(); - // keep inset for traffic lights when window resize (macos) - win.position_traffic_lights(13.0, 17.0); - }; - #[cfg(target_os = "macos")] - match e.event() { - WindowEvent::Resized(..) => apply_offset(), - WindowEvent::ThemeChanged(..) => apply_offset(), - _ => {} - } - }) .plugin( tauri_plugin_sql::Builder::default() .add_migrations( @@ -156,7 +133,39 @@ 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()) + .setup(|app| { + #[cfg(target_os = "macos")] + let main_window = app.get_window("main").unwrap(); + + #[cfg(target_os = "macos")] + main_window.position_traffic_lights(13.0, 17.0); // set inset for traffic lights (macos) + + Ok(()) + }) + .on_window_event(|e| { + #[cfg(target_os = "macos")] + let apply_offset = || { + let win = e.window(); + // keep inset for traffic lights when window resize (macos) + win.position_traffic_lights(13.0, 17.0); + }; + #[cfg(target_os = "macos")] + match e.event() { + WindowEvent::Resized(..) => apply_offset(), + WindowEvent::ThemeChanged(..) => apply_offset(), + _ => {} + } + }) .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 0a1f9b1a..a9b2dd38 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "build": { - "beforeDevCommand": "pnpm dev", "beforeBuildCommand": "pnpm build", + "beforeDevCommand": "pnpm dev", "devPath": "http://localhost:3000", "distDir": "../dist", "withGlobalTauri": true @@ -10,14 +10,45 @@ "productName": "Lume", "version": "1.1.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": { "bundle": { "active": true, - "category": "SocialNetworking", - "copyright": "", "appimage": { "bundleMediaFramework": true }, + "category": "SocialNetworking", + "copyright": "", "deb": { "depends": [] }, @@ -41,44 +72,40 @@ "resources": [], "shortDescription": "", "targets": "all", - "windows": { - "certificateThumbprint": null, - "digestAlgorithm": "sha256", - "timestampUrl": "" - }, "updater": { "active": true, - "endpoints": [ - "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}", - "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}" - ], "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU4RjAzODFBREQ4MkM3RTEKUldUaHg0TGRHamp3NkI5bnhoOEVjanlHWFNzQ2Q3NDhubFFLUmJpSHJ1L2FqNnB3alF1Y2R3U3gK", "windows": { "installMode": "passive" } }, + "windows": { + "certificateThumbprint": null, + "digestAlgorithm": "sha256", + "timestampUrl": "" + } }, "security": { "csp": "upgrade-insecure-requests" }, "systemTray": { - "iconPath": "icons/icon.png", - "iconAsTemplate": true + "iconAsTemplate": true, + "iconPath": "icons/icon.png" }, "windows": [ { - "title": "Lume", - "theme": "Dark", - "titleBarStyle": "Overlay", - "hiddenTitle": true, - "transparent": false, "fullscreen": false, - "resizable": true, - "width": 1080, "height": 800, + "hiddenTitle": true, + "minHeight": 720, "minWidth": 1080, - "minHeight": 720 + "resizable": true, + "theme": "Dark", + "title": "Lume", + "titleBarStyle": "Overlay", + "transparent": false, + "width": 1080 } ] } -} +} \ No newline at end of file diff --git a/src/app.tsx b/src/app.tsx index 0c32dfed..997d6c97 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -38,6 +38,7 @@ const router = createBrowserRouter([ { path: '/', element: ( + // @ts-expect-error, todo @@ -78,6 +79,7 @@ const router = createBrowserRouter([ { path: '/app', element: ( + // @ts-expect-error, todo @@ -94,6 +96,7 @@ const router = createBrowserRouter([ { path: '/settings', element: ( + // @ts-expect-error, todo diff --git a/src/app/auth/create/step-1.tsx b/src/app/auth/create/step-1.tsx index 20a99dc9..d59b2538 100644 --- a/src/app/auth/create/step-1.tsx +++ b/src/app/auth/create/step-1.tsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { BaseDirectory, writeTextFile } from '@tauri-apps/api/fs'; +import { BaseDirectory, writeTextFile } from '@tauri-apps/plugin-fs'; import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools'; import { useMemo, useState } from 'react'; import { useNavigate } from 'react-router-dom'; diff --git a/src/app/auth/create/step-4.tsx b/src/app/auth/create/step-4.tsx index 21356b8a..75d01cc5 100644 --- a/src/app/auth/create/step-4.tsx +++ b/src/app/auth/create/step-4.tsx @@ -1,4 +1,4 @@ -import { Body, fetch } from '@tauri-apps/api/http'; +import { Body, fetch } from '@tauri-apps/plugin-http'; import { useState } from 'react'; import { useNavigate } from 'react-router-dom'; diff --git a/src/app/channel/components/metadata.tsx b/src/app/channel/components/metadata.tsx index 16fd591a..ba770cbf 100644 --- a/src/app/channel/components/metadata.tsx +++ b/src/app/channel/components/metadata.tsx @@ -12,7 +12,7 @@ export function ChannelMetadata({ id }: { id: string }) { const noteID = id ? nip19.noteEncode(id) : null; const copyNoteID = async () => { - const { writeText } = await import('@tauri-apps/api/clipboard'); + const { writeText } = await import('@tauri-apps/plugin-clipboard-manager'); if (noteID) { await writeText(noteID); } diff --git a/src/app/settings/components/autoStart.tsx b/src/app/settings/components/autoStart.tsx index da370111..eab74df0 100644 --- a/src/app/settings/components/autoStart.tsx +++ b/src/app/settings/components/autoStart.tsx @@ -1,7 +1,7 @@ import { Switch } from '@headlessui/react'; +import { disable, enable, isEnabled } from '@tauri-apps/plugin-autostart'; import { useEffect, useState } from 'react'; import { twMerge } from 'tailwind-merge'; -import { disable, enable, isEnabled } from 'tauri-plugin-autostart-api'; import { getSetting, updateSetting } from '@libs/storage'; diff --git a/src/app/settings/components/version.tsx b/src/app/settings/components/version.tsx index ee0c0a20..dfc7e98c 100644 --- a/src/app/settings/components/version.tsx +++ b/src/app/settings/components/version.tsx @@ -1,4 +1,4 @@ -import { getVersion } from '@tauri-apps/api/app'; +import { getVersion } from '@tauri-apps/plugin-app'; import { RefreshIcon } from '@shared/icons'; diff --git a/src/libs/openGraph.tsx b/src/libs/openGraph.tsx index 528db73e..14c3b6e5 100644 --- a/src/libs/openGraph.tsx +++ b/src/libs/openGraph.tsx @@ -1,4 +1,4 @@ -import { FetchOptions, ResponseType, fetch } from '@tauri-apps/api/http'; +import { FetchOptions, ResponseType, fetch } from '@tauri-apps/plugin-http'; import * as cheerio from 'cheerio'; import { OPENGRAPH } from '@stores/constants'; diff --git a/src/libs/storage.tsx b/src/libs/storage.tsx index 69dd8dab..51e6157f 100644 --- a/src/libs/storage.tsx +++ b/src/libs/storage.tsx @@ -1,5 +1,5 @@ +import Database from '@tauri-apps/plugin-sql'; import destr from 'destr'; -import Database from 'tauri-plugin-sql-api'; import { parser } from '@utils/parser'; import { getParentID } from '@utils/transform'; diff --git a/src/shared/authLayout.tsx b/src/shared/authLayout.tsx index b217de1b..6af60868 100644 --- a/src/shared/authLayout.tsx +++ b/src/shared/authLayout.tsx @@ -1,4 +1,4 @@ -import { platform } from '@tauri-apps/api/os'; +import { platform } from '@tauri-apps/plugin-os'; import { Outlet, useNavigate } from 'react-router-dom'; import { ArrowLeftIcon, ArrowRightIcon } from '@shared/icons'; @@ -29,7 +29,7 @@ export function AuthLayout() { >