From 053e26c2c2aafda01915771def56e41e13686741 Mon Sep 17 00:00:00 2001 From: Guillem Cordoba Date: Tue, 10 May 2022 15:04:48 +0200 Subject: [PATCH] Downgrade tauri --- Cargo.lock | 486 ++++++++++++++------ crates/holochain_manager/Cargo.toml | 2 +- crates/holochain_web_app_manager/Cargo.toml | 2 +- crates/lair_keystore_manager/Cargo.toml | 2 +- package-lock.json | 172 +++---- package.json | 4 +- src-tauri/Cargo.toml | 4 +- 7 files changed, 441 insertions(+), 231 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f181ba4..6d6c3c63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -162,6 +162,18 @@ dependencies = [ "syn", ] +[[package]] +name = "async-broadcast" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bbd92a9bd0e9c1298118ecf8a2f825e86b12c3ec9e411573e34aaf3a0c03cdd" +dependencies = [ + "easy-parallel", + "event-listener", + "futures-core", + "parking_lot 0.11.2", +] + [[package]] name = "async-channel" version = "1.6.1" @@ -353,8 +365,8 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "system-deps 6.0.2", ] @@ -677,7 +689,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ - "glib-sys", + "glib-sys 0.15.10", "libc", "system-deps 6.0.2", ] @@ -724,6 +736,15 @@ dependencies = [ "uuid 0.8.2", ] +[[package]] +name = "cfg-expr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" +dependencies = [ + "smallvec 1.8.0", +] + [[package]] name = "cfg-expr" version = "0.9.1" @@ -1270,17 +1291,6 @@ dependencies = [ "lock_api 0.4.7", ] -[[package]] -name = "dbus" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - [[package]] name = "deflate" version = "0.7.20" @@ -1491,6 +1501,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" +[[package]] +name = "easy-parallel" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" + [[package]] name = "either" version = "1.6.1" @@ -1524,6 +1540,27 @@ dependencies = [ "syn", ] +[[package]] +name = "enumflags2" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "env_logger" version = "0.9.0" @@ -1917,9 +1954,9 @@ version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "system-deps 6.0.2", ] @@ -1932,9 +1969,9 @@ checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "pango-sys", "pkg-config", @@ -1948,7 +1985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" dependencies = [ "gdk-sys", - "glib-sys", + "glib-sys 0.15.10", "libc", "system-deps 6.0.2", "x11", @@ -2044,21 +2081,34 @@ dependencies = [ "futures-channel", "futures-core", "futures-io", - "gio-sys", + "gio-sys 0.15.10", "glib", "libc", "once_cell", "thiserror", ] +[[package]] +name = "gio-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" +dependencies = [ + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "system-deps 3.2.0", + "winapi", +] + [[package]] name = "gio-sys" version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "system-deps 6.0.2", "winapi", @@ -2076,8 +2126,8 @@ dependencies = [ "futures-executor", "futures-task", "glib-macros", - "glib-sys", - "gobject-sys", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "once_cell", "smallvec 1.8.0", @@ -2099,6 +2149,16 @@ dependencies = [ "syn", ] +[[package]] +name = "glib-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" +dependencies = [ + "libc", + "system-deps 3.2.0", +] + [[package]] name = "glib-sys" version = "0.15.10" @@ -2140,13 +2200,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gobject-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" +dependencies = [ + "glib-sys 0.14.0", + "libc", + "system-deps 3.2.0", +] + [[package]] name = "gobject-sys" version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ - "glib-sys", + "glib-sys 0.15.10", "libc", "system-deps 6.0.2", ] @@ -2212,9 +2283,9 @@ dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "pango-sys", "system-deps 6.0.2", @@ -2326,6 +2397,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "holo_hash" version = "0.0.20" @@ -3671,8 +3748,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "system-deps 5.0.0", ] @@ -4208,43 +4285,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libappindicator" -version = "0.7.0" +name = "libayatana-appindicator" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b29fab3280d59f3d06725f75da9ef9a1b001b2c748b1abfebd1c966c61d7de" +checksum = "0379d22a323947cb27b4dbe3b14fc1dcde07c9e9c3eca52ddf97ca0819c28cc4" dependencies = [ "glib", "gtk", "gtk-sys", - "libappindicator-sys", "log", ] -[[package]] -name = "libappindicator-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bdcb8c5cfc11febe2ff3f18386d6cb7d29f464cbaf6b286985c3f1a501d74f" -dependencies = [ - "gtk-sys", - "pkg-config", -] - [[package]] name = "libc" version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" -[[package]] -name = "libdbus-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" -dependencies = [ - "pkg-config", -] - [[package]] name = "libloading" version = "0.7.3" @@ -4845,6 +4902,19 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +[[package]] +name = "nix" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + [[package]] name = "nix" version = "0.24.1" @@ -4909,9 +4979,12 @@ version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a995a3d2834cefa389218e7a35156e8ce544bc95f836900da01ee0b26a07e9d4" dependencies = [ - "dbus", "mac-notification-sys", + "serde", "winrt-notification", + "zbus", + "zvariant", + "zvariant_derive", ] [[package]] @@ -5243,6 +5316,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-stream" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1" +dependencies = [ + "futures-core", + "pin-project-lite", +] + [[package]] name = "os_info" version = "3.3.0" @@ -5314,8 +5397,8 @@ version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "system-deps 6.0.2", ] @@ -6310,7 +6393,7 @@ dependencies = [ "mach", "mach_o_sys", "memmap", - "nix", + "nix 0.24.1", "object 0.27.1", "proc-maps", "read-process-memory", @@ -6371,8 +6454,8 @@ checksum = "92e3107b2e81967df7c0617e978dc656795583a73ad0ddbf645ce60109caf8c2" dependencies = [ "block", "dispatch", - "glib-sys", - "gobject-sys", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "gtk-sys", "js-sys", "lazy_static", @@ -6919,6 +7002,21 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + [[package]] name = "sha2" version = "0.10.2" @@ -7053,30 +7151,16 @@ dependencies = [ "tokio", ] -[[package]] -name = "soup2" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eda64fb9a59670c3dca9edc9459a010ca1f8fb134eac5ea7edece453f90cc7b" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - [[package]] name = "soup2-sys" -version = "0.2.0" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +checksum = "9f056675eda9a7417163e5f742bb119e8e1d385edd2ada8f7031a7230a3ec10a" dependencies = [ "bitflags", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.14.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "libc", "system-deps 5.0.0", ] @@ -7113,6 +7197,12 @@ dependencies = [ "loom", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "str_stack" version = "0.1.0" @@ -7204,6 +7294,12 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" +[[package]] +name = "strum" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" + [[package]] name = "strum" version = "0.22.0" @@ -7225,6 +7321,18 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "strum_macros" version = "0.22.0" @@ -7307,6 +7415,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "system-deps" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" +dependencies = [ + "anyhow", + "cfg-expr 0.8.1", + "heck 0.3.3", + "itertools 0.10.3", + "pkg-config", + "strum 0.21.0", + "strum_macros 0.21.1", + "thiserror", + "toml", + "version-compare 0.0.11", +] + [[package]] name = "system-deps" version = "5.0.0" @@ -7353,11 +7479,11 @@ dependencies = [ "gdkx11-sys", "gio", "glib", - "glib-sys", + "glib-sys 0.15.10", "gtk", "instant", "lazy_static", - "libappindicator", + "libayatana-appindicator", "libc", "log", "ndk", @@ -7400,14 +7526,15 @@ dependencies = [ [[package]] name = "tauri" -version = "1.0.0-rc.9" -source = "git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2#901d44a478b8819be3a80113efebf4ba615a67f2" +version = "1.0.0-rc.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02810d2b8363a7ceefb7cd54004297a9a7f70b8601325df4d8315ff377dacb2f" dependencies = [ "anyhow", "attohttpc", "bincode", - "cocoa", "dirs-next", + "either", "embed_plist", "flate2", "futures", @@ -7419,7 +7546,6 @@ dependencies = [ "http", "ignore", "notify-rust", - "objc", "once_cell", "open", "os_info", @@ -7440,35 +7566,33 @@ dependencies = [ "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 1.0.0-rc.6 (git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2)", + "tauri-utils", "tempfile", "thiserror", "tokio", "url", "uuid 1.0.0", - "webkit2gtk", - "webview2-com", "windows 0.30.0", ] [[package]] name = "tauri-build" -version = "1.0.0-rc.8" +version = "1.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f85528e1a51b1d79761f56a0af8fb639ffa282e6bb01b012cdd552673e45be6" +checksum = "663df13be3461ceab6b8f7ed9e2a1a09d1ec649cd51d59e265094d7009c22d39" dependencies = [ "anyhow", "cargo_toml", - "semver 1.0.9", "serde_json", - "tauri-utils 1.0.0-rc.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils", "winres", ] [[package]] name = "tauri-codegen" version = "1.0.0-rc.6" -source = "git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2#901d44a478b8819be3a80113efebf4ba615a67f2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b6273cb4ba4210d48cba182415dd8ed2f23b29f9f89801f77a09fcbb6a6d92b" dependencies = [ "base64", "brotli", @@ -7480,7 +7604,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "tauri-utils 1.0.0-rc.6 (git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2)", + "tauri-utils", "thiserror", "uuid 1.0.0", "walkdir", @@ -7489,20 +7613,22 @@ dependencies = [ [[package]] name = "tauri-macros" version = "1.0.0-rc.6" -source = "git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2#901d44a478b8819be3a80113efebf4ba615a67f2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07d91657771bb36eca42d86afc80aa05e10f6b7328f8f40630e52c10ae84ddf3" dependencies = [ "heck 0.4.0", "proc-macro2", "quote", "syn", "tauri-codegen", - "tauri-utils 1.0.0-rc.6 (git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2)", + "tauri-utils", ] [[package]] name = "tauri-runtime" -version = "0.5.0" -source = "git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2#901d44a478b8819be3a80113efebf4ba615a67f2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27653d24a0d7e2c8e04838e975acbf7a5628746d8d60a916d33a9ccf8a06c4ea" dependencies = [ "gtk", "http", @@ -7510,7 +7636,7 @@ dependencies = [ "infer", "serde", "serde_json", - "tauri-utils 1.0.0-rc.6 (git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2)", + "tauri-utils", "thiserror", "uuid 1.0.0", "webview2-com", @@ -7519,17 +7645,15 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.5.0" -source = "git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2#901d44a478b8819be3a80113efebf4ba615a67f2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d9b0922c27ea8a1430a2bbf666fe7789645dffb9d317f8d2dfca1a5dff2271" dependencies = [ - "cocoa", "gtk", - "percent-encoding", "rand 0.8.5", "tauri-runtime", - "tauri-utils 1.0.0-rc.6 (git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2)", + "tauri-utils", "uuid 1.0.0", - "webkit2gtk", "webview2-com", "windows 0.30.0", "wry", @@ -7541,6 +7665,7 @@ version = "1.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2d8266063ac4d696560d4ff4e695c3c238d8d96ef1120d1eab9ba7482f59a3" dependencies = [ + "brotli", "ctor", "glob", "heck 0.4.0", @@ -7560,25 +7685,13 @@ dependencies = [ ] [[package]] -name = "tauri-utils" -version = "1.0.0-rc.6" -source = "git+https://github.com/guillemcordoba/tauri?rev=901d44a478b8819be3a80113efebf4ba615a67f2#901d44a478b8819be3a80113efebf4ba615a67f2" +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" dependencies = [ - "brotli", - "ctor", - "heck 0.4.0", - "html5ever", - "json-patch", - "kuchiki", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", + "rand 0.4.6", + "remove_dir_all", ] [[package]] @@ -8025,6 +8138,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +[[package]] +name = "uds_windows" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "486992108df0fe0160680af1941fe856c521be931d5a5ecccefe0de86dc47e4a" +dependencies = [ + "tempdir", + "winapi", +] + [[package]] name = "unicode-bidi" version = "0.3.8" @@ -8317,49 +8440,48 @@ dependencies = [ [[package]] name = "webkit2gtk" -version = "0.18.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29952969fb5e10fe834a52eb29ad0814ccdfd8387159b0933edf1344a1c9cdcc" +checksum = "2cbd39499e917de9dad36eb11c09f665eb984d432638ae7971feed98eb96df88" dependencies = [ "bitflags", "cairo-rs", "gdk", "gdk-sys", "gio", - "gio-sys", + "gio-sys 0.15.10", "glib", - "glib-sys", - "gobject-sys", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "gtk", "gtk-sys", "javascriptcore-rs", "libc", "once_cell", - "soup2", "webkit2gtk-sys", ] [[package]] name = "webkit2gtk-sys" -version = "0.18.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +checksum = "ddcce6f1e0fc7715d651dba29875741509f5fc12f4e2976907272a74405f2b01" dependencies = [ "atk-sys", "bitflags", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "gtk-sys", "javascriptcore-rs-sys", "libc", "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.0.2", + "system-deps 5.0.0", ] [[package]] @@ -8716,9 +8838,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.16.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886e33c3b72bcbfb26eec9e77b88fcec5e4e781b7bd3d71dc4c35acfa3014dc1" +checksum = "20b69cff9f50bab10b42e51bac9c2cf695484059f1b19e911754477ae703ef42" dependencies = [ "block", "cocoa", @@ -8834,6 +8956,68 @@ dependencies = [ "time 0.3.9", ] +[[package]] +name = "zbus" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53819092b9db813b2c6168b097b4b13ad284d81c9f2b0165a0a1b190e505a1f3" +dependencies = [ + "async-broadcast", + "async-channel", + "async-executor", + "async-io", + "async-lock", + "async-recursion", + "async-task", + "async-trait", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "lazy_static", + "nix 0.23.1", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "uds_windows", + "winapi", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7174ebe6722c280d6d132d694bb5664ce50a788cb70eeb518e7fc1ca095a114" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "regex", + "syn", +] + +[[package]] +name = "zbus_names" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + [[package]] name = "zeroize" version = "1.3.0" @@ -8868,3 +9052,29 @@ dependencies = [ "thiserror", "time 0.1.43", ] + +[[package]] +name = "zvariant" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e18ba99d71e03af262953f476071607da0c44e225236cf9b5b9f7f11f1d0b6b0" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9042892ebdca35261951a83d17bcbfd4d3d528cb3bde828498a9b306b50d05c0" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] diff --git a/crates/holochain_manager/Cargo.toml b/crates/holochain_manager/Cargo.toml index 54f7a2dd..faab134f 100644 --- a/crates/holochain_manager/Cargo.toml +++ b/crates/holochain_manager/Cargo.toml @@ -33,6 +33,6 @@ portpicker = "0.1.1" serde = {version = "1", features = ["derive"]} serde-enum-str = "0.2" serde_yaml = "0.8" -tauri = {git = "https://github.com/guillemcordoba/tauri", rev ="901d44a478b8819be3a80113efebf4ba615a67f2", features = ["api-all", "gtk-tray", "system-tray"] } +tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"]} thiserror = "1.0.30" url2 = "0.0.6" diff --git a/crates/holochain_web_app_manager/Cargo.toml b/crates/holochain_web_app_manager/Cargo.toml index aba98e8f..80e97594 100644 --- a/crates/holochain_web_app_manager/Cargo.toml +++ b/crates/holochain_web_app_manager/Cargo.toml @@ -15,7 +15,7 @@ log = "0.4.14" portpicker = "0.1.1" serde = {version = "1", features = ["derive"]} serde_yaml = "0.8" -tauri = {git = "https://github.com/guillemcordoba/tauri", rev ="901d44a478b8819be3a80113efebf4ba615a67f2", features = ["api-all", "gtk-tray", "system-tray"] } +tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"]} thiserror = "1.0.30" url2 = "0.0.6" zip = "0.5.0" diff --git a/crates/lair_keystore_manager/Cargo.toml b/crates/lair_keystore_manager/Cargo.toml index 81cd9fa3..2eef4d51 100644 --- a/crates/lair_keystore_manager/Cargo.toml +++ b/crates/lair_keystore_manager/Cargo.toml @@ -12,6 +12,6 @@ async-trait = "0.1.52" log = "0.4.14" serde = {version = "1", features = ["derive"]} serde-enum-str = "0.2" -tauri = {git = "https://github.com/guillemcordoba/tauri", rev ="901d44a478b8819be3a80113efebf4ba615a67f2", features = ["api-all", "gtk-tray", "system-tray"] } +tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"]} thiserror = "1.0.30" url2 = "0.0.6" diff --git a/package-lock.json b/package-lock.json index f673751e..af007853 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@material/mwc-textarea": "^0.25.1", "@material/mwc-textfield": "^0.25.1", "@msgpack/msgpack": "^2.7.1", - "@tauri-apps/api": "1.0.0-rc.5", + "@tauri-apps/api": "1.0.0-rc.4", "@webcomponents/scoped-custom-element-registry": "^0.0.5", "array-flat-polyfill": "^1.0.1", "blob-polyfill": "^5.0.20210201", @@ -31,7 +31,7 @@ "vuex": "^4.0.0-0" }, "devDependencies": { - "@tauri-apps/cli": "1.0.0-rc.10", + "@tauri-apps/cli": "1.0.0-rc.9", "@types/jest": "^24.0.19", "@types/lodash-es": "^4.17.6", "@typescript-eslint/eslint-plugin": "^4.18.0", @@ -5248,9 +5248,9 @@ "dev": true }, "node_modules/@tauri-apps/api": { - "version": "1.0.0-rc.5", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.0-rc.5.tgz", - "integrity": "sha512-IiQg7pLByl/W3KRx9Whn1EWh9ZrBojkl9FAgCRJ4//e58var1WmNPHA92YC0i0DLSIF0JLLp0EQKRHJa+aaqlQ==", + "version": "1.0.0-rc.4", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.0-rc.4.tgz", + "integrity": "sha512-1HaUsx8+TzFHDoQ+Mmd6RWaMsPyZlurQHgACDt+il5e/ui6pDkumVXaS92SnY5XOcS4gBC0BkgjVfkWgcm/Oww==", "dependencies": { "type-fest": "2.12.2" }, @@ -5276,9 +5276,9 @@ } }, "node_modules/@tauri-apps/cli": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.0-rc.10.tgz", - "integrity": "sha512-njDei3F3mlnotnujUF0jWteZC39RCm6JNAxZpzTFvWKFI/650DoA9hHTMa6onbazVgmOWdrbMHYWU/xBC/jUTw==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.0-rc.9.tgz", + "integrity": "sha512-j+HZ65wdfFrMwisYeQpdZnldONevBPHjAo9v9Impf0irUU2UR5nwyvyArHTaWCvNeqEs+YV4XXHsfm2xVpnaug==", "dev": true, "bin": { "tauri": "tauri.js" @@ -5291,21 +5291,21 @@ "url": "https://opencollective.com/tauri" }, "optionalDependencies": { - "@tauri-apps/cli-darwin-arm64": "1.0.0-rc.10", - "@tauri-apps/cli-darwin-x64": "1.0.0-rc.10", - "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.0-rc.10", - "@tauri-apps/cli-linux-arm64-gnu": "1.0.0-rc.10", - "@tauri-apps/cli-linux-arm64-musl": "1.0.0-rc.10", - "@tauri-apps/cli-linux-x64-gnu": "1.0.0-rc.10", - "@tauri-apps/cli-linux-x64-musl": "1.0.0-rc.10", - "@tauri-apps/cli-win32-ia32-msvc": "1.0.0-rc.10", - "@tauri-apps/cli-win32-x64-msvc": "1.0.0-rc.10" + "@tauri-apps/cli-darwin-arm64": "1.0.0-rc.9", + "@tauri-apps/cli-darwin-x64": "1.0.0-rc.9", + "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.0-rc.9", + "@tauri-apps/cli-linux-arm64-gnu": "1.0.0-rc.9", + "@tauri-apps/cli-linux-arm64-musl": "1.0.0-rc.9", + "@tauri-apps/cli-linux-x64-gnu": "1.0.0-rc.9", + "@tauri-apps/cli-linux-x64-musl": "1.0.0-rc.9", + "@tauri-apps/cli-win32-ia32-msvc": "1.0.0-rc.9", + "@tauri-apps/cli-win32-x64-msvc": "1.0.0-rc.9" } }, "node_modules/@tauri-apps/cli-darwin-arm64": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.10.tgz", - "integrity": "sha512-KwnAAsR+H/U9NPF2P3UvZ0orfh/e8ng639GCvQoN/7b/EYzkLXYWGFd1sddTSSu8BM4OvIVXK1B86pn1xFohyg==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.9.tgz", + "integrity": "sha512-cpcSRyVOh3n5GsCdKtVQpLJ36yx7h+KY868l7KhPnM5EL1cQbFwYzD/VHlzFvfrpS19YvPBB/AHln4rll5iWvw==", "cpu": [ "arm64" ], @@ -5319,9 +5319,9 @@ } }, "node_modules/@tauri-apps/cli-darwin-x64": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.10.tgz", - "integrity": "sha512-xIH+UnZPofpx4n3aphu2SD45uPXtX3rlsI5aO0ANsDWN/esuAAwRnh+JR+NlmJXPKwy1BNz9pewczE5JO5BdqA==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.9.tgz", + "integrity": "sha512-ku8QpMNrfqyCk2adLdVB+zzaCb7T0/RgVvaqEZqK54WW4blUxkeKHbKqZ/SKRdxTkghHbgJIoBtlk1A5GUbAwg==", "cpu": [ "x64" ], @@ -5335,9 +5335,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.10.tgz", - "integrity": "sha512-j0cVDcP7MPyOh8mC6pTiOnsGgxMc4GFlQGBUvriRkWFCrUbZPbq1Pxt/eTcroVGsT/ItCXvnYd9jEQ+e50LI3A==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.9.tgz", + "integrity": "sha512-Qlwm4eWo0uCeL3kmowfaLghPehYTYvnM4fH6cRZndzs6/abqsFdghmEmhP5mn34/RAnHXAUANItqlgk6L7C4iw==", "cpu": [ "arm" ], @@ -5351,9 +5351,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-gnu": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.10.tgz", - "integrity": "sha512-usdftJI/Jx0Z6TK8YJaHp2BtcNlvHeIUOnh3SmThbbYzDSFDqEW2E/McbxEhJJ13FPLVMLiIZYPpH26gE3vQxw==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.9.tgz", + "integrity": "sha512-Rr4S902dYjRnDCu141f5Cz3JxwKxX/ax7LiMhSifQu5o2wSiezmZ20VRHBwW1UuZxvGV+hxTuZVnfD6NKQdWdA==", "cpu": [ "arm64" ], @@ -5367,9 +5367,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-musl": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.10.tgz", - "integrity": "sha512-zsOhkc477mbe5wSkNuLv+D6RmQvDiaV8rHTaur+B/pxk9F0SrCYoO0Slf6x08bIiSkjyL/gN0PxnOBbEBA0u4A==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.9.tgz", + "integrity": "sha512-MxqjspY2aS/nxtvBMT8TExZfDWDEsUvQRHHY/2KoBYpqpzucW6WXRGmeOvS1GeA3vnub2/Kq5i32jGRDT1tvrA==", "cpu": [ "arm64" ], @@ -5383,9 +5383,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-gnu": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.10.tgz", - "integrity": "sha512-ongWuhXieKwW+xaYPshw/59xYbZVH6JNw+KRb/054VFnfZe/ZDYbN86mCJIlegOq9WAkdc0XSm1EEDx3i9FYCg==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.9.tgz", + "integrity": "sha512-LD7KnJuH1mYFwQfcALPttBnaSG6pgO87Z6nY3xXJjo+A4ttPHcmIBaNdXCTjAmib/umD0nD8k95Hw9iJFYTuiA==", "cpu": [ "x64" ], @@ -5399,9 +5399,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-musl": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.10.tgz", - "integrity": "sha512-3AXJEdhFlX/erLBXmBkRG+oWfFLMMaJALSnxvzerteSNWiaEzTngy9Mo1yeAT51FhvJ+dbYQv0BWvPPFRYzpTQ==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.9.tgz", + "integrity": "sha512-ifocAxBYhk7qrO5x1mizxx/yABvkmyia0kw9eXUn7d5a30HoBcl/A9t+w+7c4B/n/D+gxEMSr6CPaIZv7KnTog==", "cpu": [ "x64" ], @@ -5415,9 +5415,9 @@ } }, "node_modules/@tauri-apps/cli-win32-ia32-msvc": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.10.tgz", - "integrity": "sha512-2SvSk9z51AfCsbch2fvX4GNo3s0b8TO/Kd9B6rDIZ7TUxwnGShJNup2+KGvBovKqFAPmgyrSbgyEMKhKc1B4iA==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.9.tgz", + "integrity": "sha512-ClDYF4CstoccPMVkIHyvy1jzlWXIYZX2mjKB6z18MdJ0O7Je8TC115K30lqXtSdPuKX35xWDcWU2b/gllcUUzA==", "cpu": [ "ia32" ], @@ -5431,9 +5431,9 @@ } }, "node_modules/@tauri-apps/cli-win32-x64-msvc": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.10.tgz", - "integrity": "sha512-mijSjeQGBGh6rvpkrqsSiTB4vwGprAXoDCmnIxliZ1Md4GgLMh8jzIug1UKAUmmIW1nOaQ9C9xu4wQXyoRqWHg==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.9.tgz", + "integrity": "sha512-hJjnpl864OhpIp2lTMTW4ad2Aia5/Tbf7k8GJILzUY/XkBhZjNIgZORa8bDcnZRCTU+RDgMFc+AoKtDIircjnA==", "cpu": [ "x64" ], @@ -32831,9 +32831,9 @@ "dev": true }, "@tauri-apps/api": { - "version": "1.0.0-rc.5", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.0-rc.5.tgz", - "integrity": "sha512-IiQg7pLByl/W3KRx9Whn1EWh9ZrBojkl9FAgCRJ4//e58var1WmNPHA92YC0i0DLSIF0JLLp0EQKRHJa+aaqlQ==", + "version": "1.0.0-rc.4", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.0-rc.4.tgz", + "integrity": "sha512-1HaUsx8+TzFHDoQ+Mmd6RWaMsPyZlurQHgACDt+il5e/ui6pDkumVXaS92SnY5XOcS4gBC0BkgjVfkWgcm/Oww==", "requires": { "type-fest": "2.12.2" }, @@ -32846,82 +32846,82 @@ } }, "@tauri-apps/cli": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.0-rc.10.tgz", - "integrity": "sha512-njDei3F3mlnotnujUF0jWteZC39RCm6JNAxZpzTFvWKFI/650DoA9hHTMa6onbazVgmOWdrbMHYWU/xBC/jUTw==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.0-rc.9.tgz", + "integrity": "sha512-j+HZ65wdfFrMwisYeQpdZnldONevBPHjAo9v9Impf0irUU2UR5nwyvyArHTaWCvNeqEs+YV4XXHsfm2xVpnaug==", "dev": true, "requires": { - "@tauri-apps/cli-darwin-arm64": "1.0.0-rc.10", - "@tauri-apps/cli-darwin-x64": "1.0.0-rc.10", - "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.0-rc.10", - "@tauri-apps/cli-linux-arm64-gnu": "1.0.0-rc.10", - "@tauri-apps/cli-linux-arm64-musl": "1.0.0-rc.10", - "@tauri-apps/cli-linux-x64-gnu": "1.0.0-rc.10", - "@tauri-apps/cli-linux-x64-musl": "1.0.0-rc.10", - "@tauri-apps/cli-win32-ia32-msvc": "1.0.0-rc.10", - "@tauri-apps/cli-win32-x64-msvc": "1.0.0-rc.10" + "@tauri-apps/cli-darwin-arm64": "1.0.0-rc.9", + "@tauri-apps/cli-darwin-x64": "1.0.0-rc.9", + "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.0-rc.9", + "@tauri-apps/cli-linux-arm64-gnu": "1.0.0-rc.9", + "@tauri-apps/cli-linux-arm64-musl": "1.0.0-rc.9", + "@tauri-apps/cli-linux-x64-gnu": "1.0.0-rc.9", + "@tauri-apps/cli-linux-x64-musl": "1.0.0-rc.9", + "@tauri-apps/cli-win32-ia32-msvc": "1.0.0-rc.9", + "@tauri-apps/cli-win32-x64-msvc": "1.0.0-rc.9" } }, "@tauri-apps/cli-darwin-arm64": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.10.tgz", - "integrity": "sha512-KwnAAsR+H/U9NPF2P3UvZ0orfh/e8ng639GCvQoN/7b/EYzkLXYWGFd1sddTSSu8BM4OvIVXK1B86pn1xFohyg==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.9.tgz", + "integrity": "sha512-cpcSRyVOh3n5GsCdKtVQpLJ36yx7h+KY868l7KhPnM5EL1cQbFwYzD/VHlzFvfrpS19YvPBB/AHln4rll5iWvw==", "dev": true, "optional": true }, "@tauri-apps/cli-darwin-x64": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.10.tgz", - "integrity": "sha512-xIH+UnZPofpx4n3aphu2SD45uPXtX3rlsI5aO0ANsDWN/esuAAwRnh+JR+NlmJXPKwy1BNz9pewczE5JO5BdqA==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.9.tgz", + "integrity": "sha512-ku8QpMNrfqyCk2adLdVB+zzaCb7T0/RgVvaqEZqK54WW4blUxkeKHbKqZ/SKRdxTkghHbgJIoBtlk1A5GUbAwg==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.10.tgz", - "integrity": "sha512-j0cVDcP7MPyOh8mC6pTiOnsGgxMc4GFlQGBUvriRkWFCrUbZPbq1Pxt/eTcroVGsT/ItCXvnYd9jEQ+e50LI3A==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.9.tgz", + "integrity": "sha512-Qlwm4eWo0uCeL3kmowfaLghPehYTYvnM4fH6cRZndzs6/abqsFdghmEmhP5mn34/RAnHXAUANItqlgk6L7C4iw==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-arm64-gnu": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.10.tgz", - "integrity": "sha512-usdftJI/Jx0Z6TK8YJaHp2BtcNlvHeIUOnh3SmThbbYzDSFDqEW2E/McbxEhJJ13FPLVMLiIZYPpH26gE3vQxw==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.9.tgz", + "integrity": "sha512-Rr4S902dYjRnDCu141f5Cz3JxwKxX/ax7LiMhSifQu5o2wSiezmZ20VRHBwW1UuZxvGV+hxTuZVnfD6NKQdWdA==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-arm64-musl": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.10.tgz", - "integrity": "sha512-zsOhkc477mbe5wSkNuLv+D6RmQvDiaV8rHTaur+B/pxk9F0SrCYoO0Slf6x08bIiSkjyL/gN0PxnOBbEBA0u4A==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.9.tgz", + "integrity": "sha512-MxqjspY2aS/nxtvBMT8TExZfDWDEsUvQRHHY/2KoBYpqpzucW6WXRGmeOvS1GeA3vnub2/Kq5i32jGRDT1tvrA==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-x64-gnu": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.10.tgz", - "integrity": "sha512-ongWuhXieKwW+xaYPshw/59xYbZVH6JNw+KRb/054VFnfZe/ZDYbN86mCJIlegOq9WAkdc0XSm1EEDx3i9FYCg==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.9.tgz", + "integrity": "sha512-LD7KnJuH1mYFwQfcALPttBnaSG6pgO87Z6nY3xXJjo+A4ttPHcmIBaNdXCTjAmib/umD0nD8k95Hw9iJFYTuiA==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-x64-musl": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.10.tgz", - "integrity": "sha512-3AXJEdhFlX/erLBXmBkRG+oWfFLMMaJALSnxvzerteSNWiaEzTngy9Mo1yeAT51FhvJ+dbYQv0BWvPPFRYzpTQ==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.9.tgz", + "integrity": "sha512-ifocAxBYhk7qrO5x1mizxx/yABvkmyia0kw9eXUn7d5a30HoBcl/A9t+w+7c4B/n/D+gxEMSr6CPaIZv7KnTog==", "dev": true, "optional": true }, "@tauri-apps/cli-win32-ia32-msvc": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.10.tgz", - "integrity": "sha512-2SvSk9z51AfCsbch2fvX4GNo3s0b8TO/Kd9B6rDIZ7TUxwnGShJNup2+KGvBovKqFAPmgyrSbgyEMKhKc1B4iA==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.9.tgz", + "integrity": "sha512-ClDYF4CstoccPMVkIHyvy1jzlWXIYZX2mjKB6z18MdJ0O7Je8TC115K30lqXtSdPuKX35xWDcWU2b/gllcUUzA==", "dev": true, "optional": true }, "@tauri-apps/cli-win32-x64-msvc": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.10.tgz", - "integrity": "sha512-mijSjeQGBGh6rvpkrqsSiTB4vwGprAXoDCmnIxliZ1Md4GgLMh8jzIug1UKAUmmIW1nOaQ9C9xu4wQXyoRqWHg==", + "version": "1.0.0-rc.9", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.9.tgz", + "integrity": "sha512-hJjnpl864OhpIp2lTMTW4ad2Aia5/Tbf7k8GJILzUY/XkBhZjNIgZORa8bDcnZRCTU+RDgMFc+AoKtDIircjnA==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index 848e48b5..c2798094 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@material/mwc-textarea": "^0.25.1", "@material/mwc-textfield": "^0.25.1", "@msgpack/msgpack": "^2.7.1", - "@tauri-apps/api": "1.0.0-rc.5", + "@tauri-apps/api": "1.0.0-rc.4", "@webcomponents/scoped-custom-element-registry": "^0.0.5", "array-flat-polyfill": "^1.0.1", "blob-polyfill": "^5.0.20210201", @@ -35,7 +35,7 @@ "vuex": "^4.0.0-0" }, "devDependencies": { - "@tauri-apps/cli": "1.0.0-rc.10", + "@tauri-apps/cli": "1.0.0-rc.9", "@types/jest": "^24.0.19", "@types/lodash-es": "^4.17.6", "@typescript-eslint/eslint-plugin": "^4.18.0", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 55bcca4d..17f62b95 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -12,7 +12,7 @@ version = "0.4.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = {version = "=1.0.0-rc.8", features = [] } +tauri-build = {version = "=1.0.0-rc.6", features = [] } [dependencies] holochain_manager = {path = "../crates/holochain_manager"} @@ -35,7 +35,7 @@ serde = {version = "1", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.8" sysinfo = "0.23.5" -tauri = {git = "https://github.com/guillemcordoba/tauri", rev ="901d44a478b8819be3a80113efebf4ba615a67f2", features = ["api-all", "gtk-tray", "system-tray"] } +tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"] } thiserror = "1.0.30" url = "2.2.2" url2 = "0.0.6"