From 9189e707166cc34a1f16705bc7654bab4e86373b Mon Sep 17 00:00:00 2001 From: Niko PLP Date: Mon, 21 Aug 2023 14:06:34 +0300 Subject: [PATCH] fix new IPC issue. deactivated with no-ipc-custom-protocol feature --- Cargo.lock | 719 +++++++++++++++++++------ ng-app/package.json | 4 +- ng-app/src-tauri/Cargo.toml | 12 +- ng-app/src/App.svelte | 6 +- ng-app/src/routes/WalletCreate.svelte | 7 +- ngaccount/web/package.json | 4 +- ngaccount/web/pnpm-lock.yaml | 23 +- ngaccount/web/src/routes/Create.svelte | 4 +- pnpm-lock.yaml | 23 +- 9 files changed, 597 insertions(+), 205 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fdb18f..4d6ab9b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,7 +153,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -163,7 +163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -231,6 +231,16 @@ dependencies = [ "parking_lot", ] +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + [[package]] name = "async-channel" version = "1.8.0" @@ -256,6 +266,18 @@ dependencies = [ "slab", ] +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + [[package]] name = "async-global-executor" version = "2.3.1" @@ -324,7 +346,18 @@ dependencies = [ "futures-lite", "rustix", "signal-hook", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", ] [[package]] @@ -853,8 +886,24 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.1", + "foreign-types 0.5.0", "libc", "objc", ] @@ -869,7 +918,7 @@ dependencies = [ "block", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -952,7 +1001,20 @@ dependencies = [ "bitflags", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", "libc", ] @@ -1021,7 +1083,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.9.0", "scopeguard", ] @@ -1214,6 +1276,17 @@ dependencies = [ "windows 0.48.0", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1389,6 +1462,27 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + [[package]] name = "env_logger" version = "0.10.0" @@ -1410,7 +1504,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1493,7 +1587,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset", + "memoffset 0.9.0", "rustc_version", ] @@ -1532,7 +1626,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", ] [[package]] @@ -1541,6 +1656,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -2130,7 +2251,21 @@ checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", - "markup5ever", + "markup5ever 0.10.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever 0.11.0", "proc-macro2", "quote", "syn 1.0.109", @@ -2339,7 +2474,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2357,7 +2492,7 @@ dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2383,9 +2518,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "javascriptcore-rs" -version = "0.17.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110b9902c80c12bf113c432d0b71c7a94490b294a8234f326fd0abca2fac0b00" +checksum = "4cfcc681b896b083864a4a3c3b3ea196f14ff66b8641a68fde209c6d84434056" dependencies = [ "bitflags", "glib", @@ -2394,9 +2529,9 @@ dependencies = [ [[package]] name = "javascriptcore-rs-sys" -version = "0.5.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a216519a52cd941a733a0ad3f1023cfdb1cd47f3955e8e863ed56f558f916c" +checksum = "b0983ba5b3ab9a0c0918de02c42dc71f795d6de08092f88a98ce9fdfdee4ba91" dependencies = [ "glib-sys", "gobject-sys", @@ -2406,16 +2541,18 @@ dependencies = [ [[package]] name = "jni" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", + "cfg-if", "combine", "jni-sys", "log", "thiserror", "walkdir", + "windows-sys 0.45.0", ] [[package]] @@ -2463,6 +2600,17 @@ dependencies = [ "treediff", ] +[[package]] +name = "keyboard-types" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" +dependencies = [ + "bitflags", + "serde", + "unicode-segmentation", +] + [[package]] name = "kuchiki" version = "0.8.1" @@ -2470,7 +2618,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ "cssparser", - "html5ever", + "html5ever 0.25.2", + "matches", + "selectors", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever 0.26.0", + "indexmap", "matches", "selectors", ] @@ -2502,6 +2663,30 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" +[[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.146" @@ -2643,7 +2828,21 @@ checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -2676,6 +2875,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.9.0" @@ -2725,7 +2933,26 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "muda" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28807bbe07d97a5bc148a79c730cb7a8dc373f354969e5b442c711adf61ccf" +dependencies = [ + "cocoa 0.25.0", + "crossbeam-channel", + "gdk", + "gdk-pixbuf", + "gtk", + "keyboard-types", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.48.0", ] [[package]] @@ -2775,14 +3002,15 @@ dependencies = [ [[package]] name = "ndk" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags", "jni-sys", "ndk-sys", "num_enum", + "raw-window-handle", "thiserror", ] @@ -2794,9 +3022,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.3.0" +version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" dependencies = [ "jni-sys", ] @@ -2866,11 +3094,8 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tauri-codegen 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tauri-macros 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-build 2.0.0-alpha.6", "tauri-plugin-window", - "tauri-utils 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3025,6 +3250,19 @@ dependencies = [ "warp-embed", ] +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset 0.7.1", + "static_assertions", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -3184,7 +3422,7 @@ checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -3239,6 +3477,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + [[package]] name = "overload" version = "0.1.1" @@ -3300,7 +3548,7 @@ dependencies = [ name = "p2p-net" version = "0.1.0" dependencies = [ - "async-broadcast", + "async-broadcast 0.4.1", "async-std", "async-trait", "base64-url", @@ -3500,6 +3748,16 @@ dependencies = [ "phf_shared 0.8.0", ] +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + [[package]] name = "phf_generator" version = "0.8.0" @@ -3650,7 +3908,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4128,7 +4386,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4188,7 +4446,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4239,7 +4497,7 @@ dependencies = [ "log", "matches", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec", @@ -4251,9 +4509,6 @@ name = "semver" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] [[package]] name = "send_wrapper" @@ -4585,13 +4840,19 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" dependencies = [ "loom", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "stores-lmdb" version = "0.1.0" @@ -4723,16 +4984,16 @@ dependencies = [ [[package]] name = "tao" -version = "0.19.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "746ae5d0ca57ae275a792f109f6e992e0b41a443abdf3f5c6eff179ef5b3443a" +checksum = "9f76221bce9db3af6b2b9cca4e92d8ea46c4cc88d785bc4b1a5cbcaab06f0b56" dependencies = [ "bitflags", "cairo-rs", "cc", - "cocoa", + "cocoa 0.24.1", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dispatch", "gdk", @@ -4762,10 +5023,12 @@ dependencies = [ "serde", "tao-macros", "unicode-segmentation", + "url", "uuid 1.3.4", - "windows 0.44.0", - "windows-implement", + "windows 0.48.0", + "windows-implement 0.48.0", "x11-dl", + "zbus", ] [[package]] @@ -4787,12 +5050,12 @@ checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "tauri" -version = "2.0.0-alpha.10" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5" +version = "2.0.0-alpha.11" +source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" dependencies = [ "anyhow", "bytes", - "cocoa", + "cocoa 0.25.0", "dirs-next", "embed_plist", "futures-util", @@ -4804,32 +5067,33 @@ dependencies = [ "jni", "libc", "log", + "mime", + "muda", "objc", "once_cell", "percent-encoding", "rand 0.8.5", "raw-window-handle", "reqwest", - "semver", "serde", "serde_json", "serde_repr", "serialize-to-javascript", "state", "swift-rs", - "tauri-build 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", - "tauri-macros 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", + "tauri-build 2.0.0-alpha.7", + "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", - "tempfile", + "tauri-utils 2.0.0-alpha.7", "thiserror", "tokio", + "tray-icon", "url", "uuid 1.3.4", "webkit2gtk", "webview2-com", - "windows 0.44.0", + "windows 0.48.0", ] [[package]] @@ -4846,34 +5110,34 @@ dependencies = [ "serde", "serde_json", "swift-rs", - "tauri-utils 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils 2.0.0-alpha.6", "tauri-winres", "walkdir", ] [[package]] name = "tauri-build" -version = "2.0.0-alpha.6" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5" +version = "2.0.0-alpha.7" +source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" dependencies = [ "anyhow", "cargo_toml", "heck", "json-patch", + "plist", "semver", "serde", "serde_json", "swift-rs", - "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", + "tauri-utils 2.0.0-alpha.7", "tauri-winres", "walkdir", ] [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1f1611ab0896f2693163ba4e8f3e39c02a1b70cdca4314286b5e365a5e08c6" +version = "2.0.0-alpha.7" +source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" dependencies = [ "base64 0.21.2", "brotli", @@ -4887,32 +5151,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.7", - "tauri-utils 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", - "time 0.3.23", - "url", - "uuid 1.3.4", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "2.0.0-alpha.6" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5" -dependencies = [ - "base64 0.21.2", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "sha2 0.10.7", - "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", + "tauri-utils 2.0.0-alpha.7", "thiserror", "time 0.3.23", "url", @@ -4922,35 +5161,21 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22752425c6dd6f3a058f376db7371f1d5bac250e340d40ba6c97ecf7182eef29" +version = "2.0.0-alpha.7" +source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" dependencies = [ "heck", "proc-macro2", "quote", "syn 1.0.109", - "tauri-codegen 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tauri-utils 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "tauri-macros" -version = "2.0.0-alpha.6" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", - "tauri-codegen 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", - "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", + "tauri-codegen", + "tauri-utils 2.0.0-alpha.7", ] [[package]] name = "tauri-plugin-window" -version = "2.0.0-alpha.0" -source = "git+https://git.nextgraph.org/NextGraph/plugins-workspace.git?branch=window-alpha.0-nextgraph#5e7c7c89feadcba1bde874320fd2856583abed0f" +version = "2.0.0-alpha.1" +source = "git+https://git.nextgraph.org/NextGraph/plugins-workspace.git?branch=window-alpha.1-nextgraph#0beae8162f66bcb8a1ec902738507f7ebe6b8a5e" dependencies = [ "serde", "tauri", @@ -4959,8 +5184,8 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.6" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5" +version = "1.0.0-alpha.0" +source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" dependencies = [ "gtk", "http", @@ -4970,30 +5195,30 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", + "tauri-utils 2.0.0-alpha.7", "thiserror", "url", "uuid 1.3.4", - "windows 0.44.0", + "windows 0.48.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.6" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5" +version = "1.0.0-alpha.0" +source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" dependencies = [ - "cocoa", + "cocoa 0.24.1", "gtk", "jni", "percent-encoding", "rand 0.8.5", "raw-window-handle", "tauri-runtime", - "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)", + "tauri-utils 2.0.0-alpha.7", "uuid 1.3.4", "webkit2gtk", "webview2-com", - "windows 0.44.0", + "windows 0.48.0", "wry", ] @@ -5003,12 +5228,11 @@ version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e2812e0cdfffb892c654555b2f1b8c84a035b4c56eb1646cb3eb5a9d8164d8e" dependencies = [ - "brotli", "ctor", "dunce", "glob", "heck", - "html5ever", + "html5ever 0.25.2", "infer", "json-patch", "kuchiki", @@ -5028,18 +5252,18 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.6" -source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5" +version = "2.0.0-alpha.7" +source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.11-nextgraph#61a93f463666b7d42e74acc6083cb2460b8c3e84" dependencies = [ "brotli", "ctor", "dunce", "glob", "heck", - "html5ever", + "html5ever 0.26.0", "infer", "json-patch", - "kuchiki", + "kuchikiki", "memchr", "phf 0.10.1", "proc-macro2", @@ -5051,7 +5275,7 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows 0.44.0", + "windows 0.48.0", ] [[package]] @@ -5075,7 +5299,7 @@ dependencies = [ "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5220,7 +5444,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5384,6 +5608,25 @@ dependencies = [ "tracing-log", ] +[[package]] +name = "tray-icon" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b164327e17101c78ba3dfdf879b977027ef1bd7855668ac30063de21fc02447" +dependencies = [ + "cocoa 0.25.0", + "core-graphics 0.23.1", + "crossbeam-channel", + "dirs-next", + "libappindicator", + "muda", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.48.0", +] + [[package]] name = "treediff" version = "4.0.2" @@ -5442,6 +5685,16 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + [[package]] name = "unicase" version = "2.6.0" @@ -5808,9 +6061,9 @@ dependencies = [ [[package]] name = "webkit2gtk" -version = "0.19.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8eea819afe15eb8dcdff4f19d8bfda540bae84d874c10e6f4b8faf2d6704bd1" +checksum = "3ba4cce9085e0fb02575cfd45c328740dde78253cba516b1e8be2ca0f57bd8bf" dependencies = [ "bitflags", "cairo-rs", @@ -5832,9 +6085,9 @@ dependencies = [ [[package]] name = "webkit2gtk-sys" -version = "0.19.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ac7a95ddd3fdfcaf83d8e513b4b1ad101b95b413b6aa6662ed95f284fc3d5b" +checksum = "f4489eb24e8cf0a3d0555fd3a8f7adec2a5ece34c1e7b7c9a62da7822fd40a59" dependencies = [ "bitflags", "cairo-sys-rs", @@ -5852,38 +6105,39 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.22.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11296e5daf3a653b79bf47d66c380e4143d5b9c975818871179a3bda79499562" +checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.44.0", - "windows-implement", + "windows 0.48.0", + "windows-implement 0.48.0", + "windows-interface 0.48.0", ] [[package]] name = "webview2-com-macros" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] name = "webview2-com-sys" -version = "0.22.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde542bed28058a5b028d459689ee57f1d06685bb6c266da3b91b1be6703952f" +checksum = "19d39576804304cf9ead192467ef47f7859a1a12fec3bd459d5ba34b8cd65ed5" dependencies = [ "regex", "serde", "serde_json", "thiserror", - "windows 0.44.0", + "windows 0.48.0", "windows-bindgen", "windows-metadata", ] @@ -5931,8 +6185,8 @@ version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.44.0", + "windows-interface 0.44.0", "windows-targets 0.42.2", ] @@ -5942,14 +6196,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ + "windows-implement 0.48.0", + "windows-interface 0.48.0", "windows-targets 0.48.0", ] [[package]] name = "windows-bindgen" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222204ecf46521382a4d88b4a1bbefca9f8855697b4ab7d20803901425e061a3" +checksum = "1fe21a77bc54b7312dbd66f041605e098990c98be48cd52967b85b5e60e75ae6" dependencies = [ "windows-metadata", "windows-tokens", @@ -5966,6 +6222,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "windows-interface" version = "0.44.0" @@ -5977,11 +6244,31 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "windows-metadata" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee78911e3f4ce32c1ad9d3c7b0bd95389662ad8d8f1a3155688fed70bd96e2b6" +checksum = "422ee0e5f0e2cc372bb6addbfff9a8add712155cd743df9c15f6ab000f31432d" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] [[package]] name = "windows-sys" @@ -6024,9 +6311,9 @@ dependencies = [ [[package]] name = "windows-tokens" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4251900975a0d10841c5d4bde79c56681543367ef811f3fabb8d1803b0959b" +checksum = "b34c9a3b28cb41db7385546f7f9a8179348dffc89923dde66857b1ba5312f6b4" [[package]] name = "windows_aarch64_gnullvm" @@ -6142,24 +6429,24 @@ dependencies = [ [[package]] name = "wry" -version = "0.28.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d15f9f827d537cefe6d047be3930f5d89b238dfb85e08ba6a319153217635aa" +checksum = "07bf838a5430184dfe0b1f568af7998a455c0df75a1df300a3894e0f181e7408" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", "block", - "cocoa", - "core-graphics", + "cocoa 0.24.1", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", "gio", "glib", "gtk", - "html5ever", + "html5ever 0.26.0", "http", "javascriptcore-rs", - "kuchiki", + "kuchikiki", "libc", "log", "objc", @@ -6175,8 +6462,8 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.44.0", - "windows-implement", + "windows 0.48.0", + "windows-implement 0.48.0", ] [[package]] @@ -6242,6 +6529,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + [[package]] name = "xorfilter-rs" version = "0.5.1" @@ -6267,6 +6564,72 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + [[package]] name = "zeroize" version = "1.6.0" @@ -6295,3 +6658,41 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/ng-app/package.json b/ng-app/package.json index 31b3ca8..06b3900 100644 --- a/ng-app/package.json +++ b/ng-app/package.json @@ -17,8 +17,8 @@ }, "dependencies": { "@popperjs/core": "^2.11.8", - "@tauri-apps/api": "2.0.0-alpha.5", - "@tauri-apps/plugin-window": "2.0.0-alpha.0", + "@tauri-apps/api": "2.0.0-alpha.6", + "@tauri-apps/plugin-window": "2.0.0-alpha.1", "async-proxy": "^0.4.1", "classnames": "^2.3.2", "flowbite": "^1.6.5", diff --git a/ng-app/src-tauri/Cargo.toml b/ng-app/src-tauri/Cargo.toml index c58bb69..18aeaed 100644 --- a/ng-app/src-tauri/Cargo.toml +++ b/ng-app/src-tauri/Cargo.toml @@ -14,20 +14,20 @@ crate-type = ["staticlib", "cdylib", "rlib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "=2.0.0-alpha.6", features = [] } -tauri-macros = { version = "=2.0.0-alpha.6" } -tauri-codegen = { version = "=2.0.0-alpha.6" } -tauri-utils = { version = "=2.0.0-alpha.6" } +tauri-build = { version = "2.0.0-alpha.6", features = [] } +# tauri-macros = { version = "=2.0.0-alpha.6" } +# tauri-codegen = { version = "=2.0.0-alpha.6" } +# tauri-utils = { version = "=2.0.0-alpha.6" } [dependencies] -tauri = { git = "https://git.nextgraph.org/NextGraph/tauri.git", branch="alpha.10-nextgraph", features = [] } +tauri = { git = "https://git.nextgraph.org/NextGraph/tauri.git", branch="alpha.11-nextgraph", features = ["no-ipc-custom-protocol"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" p2p-repo = { path = "../../p2p-repo" } p2p-net = { path = "../../p2p-net" } ng-wallet = { path = "../../ng-wallet" } async-std = { version = "1.12.0", features = ["attributes", "unstable"] } -tauri-plugin-window = { git = "https://git.nextgraph.org/NextGraph/plugins-workspace.git", branch="window-alpha.0-nextgraph" } +tauri-plugin-window = { git = "https://git.nextgraph.org/NextGraph/plugins-workspace.git", branch="window-alpha.1-nextgraph" } [features] # this feature is used for production builds or when `devPath` points to the filesystem diff --git a/ng-app/src/App.svelte b/ng-app/src/App.svelte index ae6be53..6997d0e 100644 --- a/ng-app/src/App.svelte +++ b/ng-app/src/App.svelte @@ -57,15 +57,15 @@ let window_api = await import("@tauri-apps/plugin-window"); let event_api = await import("@tauri-apps/api/event"); - let main = window_api.WebviewWindow.getByLabel("main"); + let main = window_api.Window.getByLabel("main"); unsub_main_close = await main.onCloseRequested(async (event) => { console.log("onCloseRequested main"); await event_api.emit("close_all", {}); - let registration = window_api.WebviewWindow.getByLabel("registration"); + let registration = window_api.Window.getByLabel("registration"); if (registration) { await registration.close(); } - let viewer = window_api.WebviewWindow.getByLabel("viewer"); + let viewer = window_api.Window.getByLabel("viewer"); if (viewer) { await viewer.close(); } diff --git a/ng-app/src/routes/WalletCreate.svelte b/ng-app/src/routes/WalletCreate.svelte index 2bf253a..5e41607 100644 --- a/ng-app/src/routes/WalletCreate.svelte +++ b/ng-app/src/routes/WalletCreate.svelte @@ -323,7 +323,7 @@ async (event) => { console.log("got accepted with payload", event.payload); unsub_register(); - let reg_popup = window_api.WebviewWindow.getByLabel("registration"); + let reg_popup = window_api.Window.getByLabel("registration"); await reg_popup.close(); registration_success = bsp_name; invitation = await ng.decode_invitation(event.payload.invite); @@ -334,15 +334,16 @@ if (event.payload) registration_error = event.payload.error; else intro = true; unsub_register(); - let reg_popup = window_api.WebviewWindow.getByLabel("registration"); + let reg_popup = window_api.Window.getByLabel("registration"); await reg_popup.close(); }); await tick(); await new Promise((resolve) => setTimeout(resolve, 1000)); - let reg_popup = window_api.WebviewWindow.getByLabel("registration"); + let reg_popup = window_api.Window.getByLabel("registration"); unsub_register_close = await reg_popup.onCloseRequested(async (event) => { console.log("onCloseRequested"); intro = true; + unsub_register_close = undefined; unsub_register(); }); } diff --git a/ngaccount/web/package.json b/ngaccount/web/package.json index ee0e942..e5a98a3 100644 --- a/ngaccount/web/package.json +++ b/ngaccount/web/package.json @@ -10,8 +10,8 @@ "preview": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.0-alpha.5", - "@tauri-apps/plugin-window": "2.0.0-alpha.0", + "@tauri-apps/api": "2.0.0-alpha.6", + "@tauri-apps/plugin-window": "2.0.0-alpha.1", "flowbite": "^1.6.5", "flowbite-svelte": "^0.37.1", "svelte-spa-router": "^3.3.0" diff --git a/ngaccount/web/pnpm-lock.yaml b/ngaccount/web/pnpm-lock.yaml index fcc1f14..8104865 100644 --- a/ngaccount/web/pnpm-lock.yaml +++ b/ngaccount/web/pnpm-lock.yaml @@ -2,8 +2,8 @@ lockfileVersion: 5.4 specifiers: '@sveltejs/vite-plugin-svelte': ^2.0.4 - '@tauri-apps/api': 2.0.0-alpha.5 - '@tauri-apps/plugin-window': 2.0.0-alpha.0 + '@tauri-apps/api': 2.0.0-alpha.6 + '@tauri-apps/plugin-window': 2.0.0-alpha.1 autoprefixer: ^10.4.14 cross-env: ^7.0.3 flowbite: ^1.6.5 @@ -18,8 +18,8 @@ specifiers: vite-plugin-svelte-svg: ^2.2.1 dependencies: - '@tauri-apps/api': 2.0.0-alpha.5 - '@tauri-apps/plugin-window': 2.0.0-alpha.0 + '@tauri-apps/api': 2.0.0-alpha.6 + '@tauri-apps/plugin-window': 2.0.0-alpha.1 flowbite: 1.6.6 flowbite-svelte: 0.37.5_svelte@3.59.1 svelte-spa-router: 3.3.0 @@ -336,20 +336,15 @@ packages: - supports-color dev: true - /@tauri-apps/api/2.0.0-alpha.4: - resolution: {integrity: sha512-gWe5fFHbwFM+dmdDPtlDvVDVtoMneGRM+S8mECevWhKpXYxId0yxznE56YGAvPSJXC3vgsXw16mOmkTnEVKnaw==} + /@tauri-apps/api/2.0.0-alpha.6: + resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/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'} - dev: false - - /@tauri-apps/plugin-window/2.0.0-alpha.0: - resolution: {integrity: sha512-ZXFXOu9m8QiDB8d8LFFgwcfxIAbr0bhzj06YvmZDB3isuVtlFP9EyU4D+zmumWEWvNN2XP7xgpn68ivOVhmNNQ==} + /@tauri-apps/plugin-window/2.0.0-alpha.1: + resolution: {integrity: sha512-dFOAgal/3Txz3SQ+LNQq0AK1EPC+acdaFlwPVB/6KXUZYmaFleIlzgxDVoJCQ+/xOhxvYrdQaFLefh0I/Kldbg==} dependencies: - '@tauri-apps/api': 2.0.0-alpha.4 + '@tauri-apps/api': 2.0.0-alpha.6 dev: false /@trysound/sax/0.2.0: diff --git a/ngaccount/web/src/routes/Create.svelte b/ngaccount/web/src/routes/Create.svelte index 7900fff..d9c194b 100644 --- a/ngaccount/web/src/routes/Create.svelte +++ b/ngaccount/web/src/routes/Create.svelte @@ -58,7 +58,7 @@ error = "Closing due to " + (result.error || "an error"); } let window_api = await import("@tauri-apps/plugin-window"); - let main = window_api.WebviewWindow.getByLabel("main"); + let main = window_api.Window.getByLabel("main"); if (main) { await main.emit("error", result); } else { @@ -79,7 +79,7 @@ // @ts-ignore if (window.__TAURI__) { let window_api = await import("@tauri-apps/plugin-window"); - let main = window_api.WebviewWindow.getByLabel("main"); + let main = window_api.Window.getByLabel("main"); if (main) { await main.emit("accepted", result); } else { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1639681..d748248 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,9 +9,9 @@ importers: specifiers: '@popperjs/core': ^2.11.8 '@sveltejs/vite-plugin-svelte': ^2.0.0 - '@tauri-apps/api': 2.0.0-alpha.5 + '@tauri-apps/api': 2.0.0-alpha.6 '@tauri-apps/cli': 2.0.0-alpha.11 - '@tauri-apps/plugin-window': 2.0.0-alpha.0 + '@tauri-apps/plugin-window': 2.0.0-alpha.1 '@tsconfig/svelte': ^3.0.0 '@types/node': ^18.7.10 async-proxy: ^0.4.1 @@ -39,8 +39,8 @@ importers: vite-plugin-wasm: ^3.2.2 dependencies: '@popperjs/core': 2.11.8 - '@tauri-apps/api': 2.0.0-alpha.5 - '@tauri-apps/plugin-window': 2.0.0-alpha.0 + '@tauri-apps/api': 2.0.0-alpha.6 + '@tauri-apps/plugin-window': 2.0.0-alpha.1 async-proxy: 0.4.1 classnames: 2.3.2 flowbite: 1.6.5 @@ -502,13 +502,8 @@ packages: '@swc/core-win32-x64-msvc': 1.3.62 dev: false - /@tauri-apps/api/2.0.0-alpha.4: - resolution: {integrity: sha512-gWe5fFHbwFM+dmdDPtlDvVDVtoMneGRM+S8mECevWhKpXYxId0yxznE56YGAvPSJXC3vgsXw16mOmkTnEVKnaw==} - 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==} + /@tauri-apps/api/2.0.0-alpha.6: + resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false @@ -619,10 +614,10 @@ packages: '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.11 dev: true - /@tauri-apps/plugin-window/2.0.0-alpha.0: - resolution: {integrity: sha512-ZXFXOu9m8QiDB8d8LFFgwcfxIAbr0bhzj06YvmZDB3isuVtlFP9EyU4D+zmumWEWvNN2XP7xgpn68ivOVhmNNQ==} + /@tauri-apps/plugin-window/2.0.0-alpha.1: + resolution: {integrity: sha512-dFOAgal/3Txz3SQ+LNQq0AK1EPC+acdaFlwPVB/6KXUZYmaFleIlzgxDVoJCQ+/xOhxvYrdQaFLefh0I/Kldbg==} dependencies: - '@tauri-apps/api': 2.0.0-alpha.4 + '@tauri-apps/api': 2.0.0-alpha.6 dev: false /@trysound/sax/0.2.0: