diff --git a/package.json b/package.json index 52a7f18..02c0558 100644 --- a/package.json +++ b/package.json @@ -10,17 +10,17 @@ "postinstall": "nuxt prepare" }, "dependencies": { - "@tauri-apps/api": "^2.0.0-beta.15", - "@tauri-apps/cli": "^2.0.0-beta.22", - "@tauri-apps/plugin-autostart": "^2.0.0-beta.7", - "@tauri-apps/plugin-clipboard-manager": "^2.1.0-beta.5", - "@tauri-apps/plugin-os": "^2.0.0-beta.7", - "@tauri-apps/plugin-sql": "^2.0.0-beta.7", - "nuxt": "^3.12.3", + "@tauri-apps/api": "^2.0.0-rc.0", + "@tauri-apps/cli": "^2.0.0-rc.1", + "@tauri-apps/plugin-autostart": "^2.0.0-rc.0", + "@tauri-apps/plugin-clipboard-manager": "^2.0.0-rc.0", + "@tauri-apps/plugin-os": "^2.0.0-rc.0", + "@tauri-apps/plugin-sql": "^2.0.0-rc.0", + "nuxt": "^3.12.4", "nuxt-build-cache": "^0.1.1", - "overlayscrollbars": "^2.9.2", + "overlayscrollbars": "^2.10.0", "overlayscrollbars-vue": "^0.5.9", "sass": "^1.77.8", - "vue": "latest" + "vue": "3.4.35" } } diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 5403412..be04e27 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -24,7 +24,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -154,7 +153,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.1", + "event-listener", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -197,7 +196,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] @@ -215,7 +214,7 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.1", + "event-listener", "futures-lite", "rustix", "tracing", @@ -1267,12 +1266,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "event-listener" version = "5.3.1" @@ -1290,7 +1283,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.1", + "event-listener", "pin-project-lite", ] @@ -1906,9 +1899,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -1918,9 +1911,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -2273,6 +2263,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.8" @@ -2476,9 +2475,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -3538,7 +3537,7 @@ dependencies = [ [[package]] name = "qopy" -version = "0.1.0" +version = "0.1.1" dependencies = [ "arboard", "base64 0.22.1", @@ -3731,7 +3730,7 @@ dependencies = [ "built", "cfg-if", "interpolate_name", - "itertools", + "itertools 0.12.1", "libc", "libfuzzer-sys", "log", @@ -4434,6 +4433,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -4525,9 +4527,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "27144619c6e5802f1380337a209d2ac1c431002dd74c6e60aebff3c506dc4f0c" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4538,23 +4540,23 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" dependencies = [ - "ahash", "atoi", "byteorder", "bytes", "crc", "crossbeam-queue", "either", - "event-listener 2.5.3", + "event-listener", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", "indexmap 2.2.6", @@ -4579,26 +4581,26 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "a23217eb7d86c584b8cbe0337b9eacf12ab76fe7673c513141ec42565698bb88" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "1a099220ae541c5db479c6424bdf1b200987934033c2584f79a0e1693601e776" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -4610,7 +4612,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.68", "tempfile", "tokio", "url", @@ -4618,12 +4620,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "5afe4c38a9b417b6a9a5eeffe7235d0a106716495536e7727d1c7f4b1ff3eba6" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "bytes", @@ -4661,12 +4663,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "b1dbb157e65f10dbe01f729339c06d239120221c9ad9fa0ba8408c4cc18ecf21" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "crc", @@ -4700,9 +4702,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" dependencies = [ "atoi", "flume", @@ -4715,11 +4717,11 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "time", "tracing", "url", - "urlencoding", ] [[package]] @@ -4786,6 +4788,28 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + [[package]] name = "subtle" version = "2.6.1" @@ -4943,9 +4967,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-beta.24" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab508aad4ae86e23865e294b20a7bb89bd7afea523897b7478329b841d4295" +checksum = "255e746089a370802ec4eb896dccc6f27c1dd2a203c1dc484fd996db954e2300" dependencies = [ "anyhow", "bytes", @@ -4993,9 +5017,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498f587026501e4bbc5d6273b63f8956b03c37b3d3b2027f9c756fcd468e9c62" +checksum = "85ceb8d082c3b17b4b2eb134a39363a22c696ddba473d6e5c0ab1caadad4cfca" dependencies = [ "anyhow", "cargo_toml", @@ -5015,9 +5039,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bbc731067e319ef60601bf5716d1e706ee9ae28e38c0587f7165c7d6824cdf" +checksum = "2407c7d37a491b16e530445c9611d91091cae198eea2ed424913b740215605f2" dependencies = [ "base64 0.22.1", "brotli", @@ -5042,9 +5066,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b4a44346577ccde75a24c62405a4c3b4f7a3a76614ee6cf1ed14a0b756795c" +checksum = "d210893b693be00f569b4f54456803debe104b7675f368205f2b6e94bac09b34" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5056,9 +5080,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abe0b85472516d1033ba251ac81b9f18f02725aadcaad697c8b727e6505a6ad" +checksum = "b352e4478af27bd7c76724bb426ebb32fc51baafb2186afabed4e706dc9e39d4" dependencies = [ "anyhow", "glob", @@ -5073,9 +5097,9 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" -version = "2.0.0-beta.8" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae4e9ba5b114e01b710256d174d85fc0ec0a8a32d666c7154a27d31b8b1ba88" +checksum = "25958a42daab7aaff4faff15cbaffd5505873a0654e6382c74fca1729a791898" dependencies = [ "auto-launch", "log", @@ -5088,9 +5112,9 @@ dependencies = [ [[package]] name = "tauri-plugin-clipboard-manager" -version = "2.1.0-beta.5" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d111ff331a3ef150a02eab7d7e8350bb7f92495ee272d6f22179b2e03feb66" +checksum = "76a26868f7e05a09673e4172d23acb82cd48911cca092f0e8d06179a69e5024c" dependencies = [ "arboard", "image 0.24.9", @@ -5104,9 +5128,9 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0-beta.11" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8860dd73c96969eb14813f9f04d8665f2853342670456fb6619d637137ef0d09" +checksum = "6c538457a755a75b8bb1594ed40d1512f8f6386251d3fcde492f8f46768ec85b" dependencies = [ "dunce", "log", @@ -5122,9 +5146,9 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0-beta.11" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461853268fe115ca19ee21e5986d505944f0b826048fe1bd726d74753fdf1df6" +checksum = "5df6b25b1f2b7b61565e66c4dbee9eb39e5635d2a763206e380e07cc3f601a67" dependencies = [ "anyhow", "glob", @@ -5141,9 +5165,9 @@ dependencies = [ [[package]] name = "tauri-plugin-os" -version = "2.0.0-beta.7" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2946635d31de19ed4191f1c556da20d1257f4667a1bac03852d9bb4be9fa8ffa" +checksum = "6b54cfeb26356822d3be3db4282041b03552f573a694b6b28aded7d95c62a039" dependencies = [ "gethostname", "log", @@ -5159,19 +5183,24 @@ dependencies = [ [[package]] name = "tauri-plugin-prevent-default" -version = "0.1.12" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38be0ac8fcc5fa03422409fc506015b01dc29cc8a3a72572c68d41e6f10f4491" +checksum = "23ee986aa5872bfa37762e06d86e60325f721d602a436165f4be34a16ff8ae3e" dependencies = [ "bitflags 2.6.0", + "itertools 0.13.0", + "serde", + "strum", "tauri", + "tauri-plugin", + "thiserror", ] [[package]] name = "tauri-plugin-sql" -version = "2.0.0-beta.8" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dfe5762d3970f5691632556cf2328a81e197666b3a34f74220e082379117e4d" +checksum = "7650c34e46756c3b5ad5986ebfa846b81ebea1ed88648a5438b2f56e33d918bf" dependencies = [ "futures-core", "indexmap 2.2.6", @@ -5188,9 +5217,9 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.0-beta.10" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853251ca049fb9cf5ca30cca0bde248acd250679c18268d5d454bd0e54b7123d" +checksum = "5b5f10ba18d2fc65e16bdf053b7beccb621dcf880c52d2ab08bdeb2d685e3e14" dependencies = [ "base64 0.22.1", "dirs 5.0.1", @@ -5217,9 +5246,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.20" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe978df03966febbebc608931dc2cf26ef94df70855a18b05f07134cf474de09" +checksum = "6624fdf383ccafc9e8ad9205fe6e5c976b318efcd6b3662dde658c74e4254792" dependencies = [ "dpi", "gtk", @@ -5236,9 +5265,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.20" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e4d568f61095f507b3fc4254dfbfff3b20de2a1d66167ffca3f6d90b14db8f" +checksum = "9fd1a785c4281f8231b091593393b40cb3a800810c407b1ffed52de27ff1640a" dependencies = [ "cocoa 0.25.0", "gtk", @@ -5260,9 +5289,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20e51856f343c503892749b27d34042e6ca83a0369a12de3c5552d9874d04e8" +checksum = "6f435eeaae1e69cf93cf19da0f727989eed2e5eb6fc63a8d21432f59dd3ac4ac" dependencies = [ "brotli", "cargo_metadata", @@ -5790,12 +5819,6 @@ dependencies = [ "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "urlpattern" version = "0.2.0" @@ -6580,7 +6603,7 @@ dependencies = [ "async-trait", "derivative", "enumflags2", - "event-listener 5.3.1", + "event-listener", "futures-core", "futures-sink", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f3177fc..e35c894 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,24 +1,24 @@ [package] name = "qopy" -version = "0.1.0" +version = "0.1.1" description = "Qopy" authors = ["pandadev"] edition = "2021" rust-version = "1.70" [build-dependencies] -tauri-build = { version = "2.0.0-beta.18", features = [] } +tauri-build = { version = "2.0.0-rc.0", features = [] } [dependencies] -tauri = { version = "2.0.0-beta.23", features = ["tray-icon", "image-png"] } -tauri-plugin-sql = {version = "2.0.0-beta.8", features = ["sqlite"] } -tauri-plugin-clipboard-manager = "2.1.0-beta.5" -tauri-plugin-autostart = "2.0.0-beta.8" -tauri-plugin-os = "2.0.0-beta.7" -tauri-plugin-updater = "2.0.0-beta.10" -tauri-plugin-dialog = "2.0.0-beta.11" -tauri-plugin-prevent-default = "0.1" -sqlx = { version = "0.7.4", features = ["runtime-tokio-native-tls", "sqlite"] } +tauri = { version = "2.0.0-rc.0", features = ["tray-icon", "image-png"] } +tauri-plugin-sql = {version = "2.0.0-rc.0", features = ["sqlite"] } +tauri-plugin-clipboard-manager = "2.0.0-rc.0" +tauri-plugin-autostart = "2.0.0-rc.0" +tauri-plugin-os = "2.0.0-rc.0" +tauri-plugin-updater = "2.0.0-rc.0" +tauri-plugin-dialog = "2.0.0-rc.0" +tauri-plugin-prevent-default = "0.3.0" +sqlx = { version = "0.8.0", features = ["runtime-tokio-native-tls", "sqlite"] } serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.0", features = ["full"] } serde_json = "1.0" @@ -32,3 +32,6 @@ url = "2.5.2" regex = "1" sha2 = "0.10.6" lazy_static = "1.4.0" + +[features] +custom-protocol = ["tauri/custom-protocol"] diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index de6cdec..c3b116b 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -6,15 +6,15 @@ "main" ], "permissions": [ - "path:default", - "event:default", - "window:default", - "webview:default", - "app:default", - "resources:default", - "image:default", - "menu:default", - "tray:default", + "core:path:default", + "core:event:default", + "core:window:default", + "core:webview:default", + "core:app:default", + "core:resources:default", + "core:image:default", + "core:menu:default", + "core:tray:default", "sql:allow-load", "sql:allow-select", "sql:allow-execute", @@ -22,13 +22,13 @@ "autostart:allow-disable", "autostart:allow-is-enabled", "os:allow-os-type", - "app:allow-app-hide", - "app:allow-app-show", - "window:allow-hide", - "window:allow-show", - "window:allow-set-focus", - "window:allow-is-focused", - "window:allow-is-visible", + "core:app:allow-app-hide", + "core:app:allow-app-show", + "core:window:allow-hide", + "core:window:allow-show", + "core:window:allow-set-focus", + "core:window:allow-is-focused", + "core:window:allow-is-visible", "clipboard-manager:allow-write-text", "clipboard-manager:allow-write-image" ]