diff --git a/Cargo.lock b/Cargo.lock
index b516f31..1fdb18f 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 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -163,7 +163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [
"anstyle",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -231,16 +231,6 @@ 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"
@@ -266,18 +256,6 @@ 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"
@@ -346,18 +324,7 @@ dependencies = [
"futures-lite",
"rustix",
"signal-hook",
- "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",
+ "windows-sys",
]
[[package]]
@@ -886,24 +853,8 @@ dependencies = [
"block",
"cocoa-foundation",
"core-foundation",
- "core-graphics 0.22.3",
- "foreign-types 0.3.2",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics 0.23.1",
- "foreign-types 0.5.0",
+ "core-graphics",
+ "foreign-types",
"libc",
"objc",
]
@@ -918,7 +869,7 @@ dependencies = [
"block",
"core-foundation",
"core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
"libc",
"objc",
]
@@ -1001,20 +952,7 @@ dependencies = [
"bitflags",
"core-foundation",
"core-graphics-types",
- "foreign-types 0.3.2",
- "libc",
-]
-
-[[package]]
-name = "core-graphics"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.5.0",
+ "foreign-types",
"libc",
]
@@ -1083,7 +1021,7 @@ dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
- "memoffset 0.9.0",
+ "memoffset",
"scopeguard",
]
@@ -1273,18 +1211,7 @@ dependencies = [
"netlink-sys",
"once_cell",
"system-configuration",
- "windows",
-]
-
-[[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",
+ "windows 0.48.0",
]
[[package]]
@@ -1462,27 +1389,6 @@ 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"
@@ -1504,7 +1410,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -1587,7 +1493,7 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
- "memoffset 0.9.0",
+ "memoffset",
"rustc_version",
]
@@ -1626,28 +1532,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
+ "foreign-types-shared",
]
[[package]]
@@ -1656,12 +1541,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
[[package]]
name = "form_urlencoded"
version = "1.2.0"
@@ -1899,7 +1778,7 @@ dependencies = [
"libc",
"log",
"rustversion",
- "windows",
+ "windows 0.48.0",
]
[[package]]
@@ -2245,9 +2124,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "html5ever"
-version = "0.26.0"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
+checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
dependencies = [
"log",
"mac",
@@ -2351,7 +2230,7 @@ dependencies = [
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows",
+ "windows 0.48.0",
]
[[package]]
@@ -2460,7 +2339,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi 0.3.1",
"libc",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -2478,7 +2357,7 @@ dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -2504,9 +2383,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "javascriptcore-rs"
-version = "1.0.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cfcc681b896b083864a4a3c3b3ea196f14ff66b8641a68fde209c6d84434056"
+checksum = "110b9902c80c12bf113c432d0b71c7a94490b294a8234f326fd0abca2fac0b00"
dependencies = [
"bitflags",
"glib",
@@ -2515,9 +2394,9 @@ dependencies = [
[[package]]
name = "javascriptcore-rs-sys"
-version = "1.0.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0983ba5b3ab9a0c0918de02c42dc71f795d6de08092f88a98ce9fdfdee4ba91"
+checksum = "98a216519a52cd941a733a0ad3f1023cfdb1cd47f3955e8e863ed56f558f916c"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -2527,18 +2406,16 @@ dependencies = [
[[package]]
name = "jni"
-version = "0.21.1"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
dependencies = [
"cesu8",
- "cfg-if",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
- "windows-sys 0.45.0",
]
[[package]]
@@ -2587,25 +2464,13 @@ dependencies = [
]
[[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 = "kuchikiki"
-version = "0.8.2"
+name = "kuchiki"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
+checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
dependencies = [
"cssparser",
"html5ever",
- "indexmap",
"matches",
"selectors",
]
@@ -2637,30 +2502,6 @@ 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"
@@ -2796,13 +2637,13 @@ dependencies = [
[[package]]
name = "markup5ever"
-version = "0.11.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
+checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
dependencies = [
"log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
+ "phf 0.8.0",
+ "phf_codegen",
"string_cache",
"string_cache_codegen",
"tendril",
@@ -2835,15 +2676,6 @@ 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"
@@ -2893,26 +2725,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "muda"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7de0cd2fdb9ef32781658513eab9080a22b3a9775955019daaf1f54bd37753a"
-dependencies = [
- "cocoa 0.25.0",
- "crossbeam-channel",
- "gdk",
- "gdk-pixbuf",
- "gtk",
- "keyboard-types",
- "objc",
- "once_cell",
- "png",
- "thiserror",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -2962,15 +2775,14 @@ dependencies = [
[[package]]
name = "ndk"
-version = "0.7.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
dependencies = [
"bitflags",
"jni-sys",
"ndk-sys",
"num_enum",
- "raw-window-handle",
"thiserror",
]
@@ -2982,9 +2794,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-sys"
-version = "0.4.1+23.1.7779620"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
dependencies = [
"jni-sys",
]
@@ -3054,8 +2866,11 @@ dependencies = [
"serde",
"serde_json",
"tauri",
- "tauri-build",
+ "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-plugin-window",
+ "tauri-utils 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -3210,19 +3025,6 @@ 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"
@@ -3382,7 +3184,7 @@ checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
"bitflags",
"cfg-if",
- "foreign-types 0.3.2",
+ "foreign-types",
"libc",
"once_cell",
"openssl-macros",
@@ -3437,16 +3239,6 @@ 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"
@@ -3508,7 +3300,7 @@ dependencies = [
name = "p2p-net"
version = "0.1.0"
dependencies = [
- "async-broadcast 0.4.1",
+ "async-broadcast",
"async-std",
"async-trait",
"base64-url",
@@ -3708,16 +3500,6 @@ dependencies = [
"phf_shared 0.8.0",
]
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
[[package]]
name = "phf_generator"
version = "0.8.0"
@@ -3868,7 +3650,7 @@ dependencies = [
"libc",
"log",
"pin-project-lite",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -4346,7 +4128,7 @@ dependencies = [
"io-lifetimes",
"libc",
"linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -4406,7 +4188,7 @@ version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -4457,7 +4239,7 @@ dependencies = [
"log",
"matches",
"phf 0.8.0",
- "phf_codegen 0.8.0",
+ "phf_codegen",
"precomputed-hash",
"servo_arc",
"smallvec",
@@ -4469,6 +4251,9 @@ name = "semver"
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+dependencies = [
+ "serde",
+]
[[package]]
name = "send_wrapper"
@@ -4800,19 +4585,13 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "state"
-version = "0.6.0"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
+checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
dependencies = [
"loom",
]
-[[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"
@@ -4944,16 +4723,16 @@ dependencies = [
[[package]]
name = "tao"
-version = "0.22.2"
+version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f76221bce9db3af6b2b9cca4e92d8ea46c4cc88d785bc4b1a5cbcaab06f0b56"
+checksum = "746ae5d0ca57ae275a792f109f6e992e0b41a443abdf3f5c6eff179ef5b3443a"
dependencies = [
"bitflags",
"cairo-rs",
"cc",
- "cocoa 0.24.1",
+ "cocoa",
"core-foundation",
- "core-graphics 0.22.3",
+ "core-graphics",
"crossbeam-channel",
"dispatch",
"gdk",
@@ -4983,12 +4762,10 @@ dependencies = [
"serde",
"tao-macros",
"unicode-segmentation",
- "url",
"uuid 1.3.4",
- "windows",
+ "windows 0.44.0",
"windows-implement",
"x11-dl",
- "zbus",
]
[[package]]
@@ -5010,13 +4787,12 @@ checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac"
[[package]]
name = "tauri"
-version = "2.0.0-alpha.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad0a5c32ce9e3e9862fb8cd433abf63e65ffea9b80dcc44d3d991e6794ea9a6"
+version = "2.0.0-alpha.10"
+source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5"
dependencies = [
"anyhow",
"bytes",
- "cocoa 0.25.0",
+ "cocoa",
"dirs-next",
"embed_plist",
"futures-util",
@@ -5028,60 +4804,101 @@ 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",
- "tauri-macros",
+ "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-runtime",
"tauri-runtime-wry",
- "tauri-utils",
+ "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)",
+ "tempfile",
"thiserror",
"tokio",
- "tray-icon",
"url",
"uuid 1.3.4",
"webkit2gtk",
"webview2-com",
- "windows",
+ "windows 0.44.0",
]
[[package]]
name = "tauri-build"
-version = "2.0.0-alpha.8"
+version = "2.0.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc47d3c84f4aeac397cd956267f3b8060c5a2dba78288a5ccf9a8b7a8c1e7025"
+checksum = "a52990870fd043f1d3bd6719ae713ef2e0c50431334d7249f6ae8509d1b8c326"
dependencies = [
"anyhow",
"cargo_toml",
"heck",
"json-patch",
- "plist",
"semver",
"serde",
"serde_json",
"swift-rs",
- "tauri-utils",
+ "tauri-utils 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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"
+dependencies = [
+ "anyhow",
+ "cargo_toml",
+ "heck",
+ "json-patch",
+ "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-winres",
"walkdir",
]
[[package]]
name = "tauri-codegen"
-version = "2.0.0-alpha.7"
+version = "2.0.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f98a67c7ef3cb3c25de91fe1fa16cc3681997f6ec99da0a7496d6feae2ea91e"
+checksum = "5c1f1611ab0896f2693163ba4e8f3e39c02a1b70cdca4314286b5e365a5e08c6"
+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 (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",
@@ -5095,7 +4912,7 @@ dependencies = [
"serde",
"serde_json",
"sha2 0.10.7",
- "tauri-utils",
+ "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)",
"thiserror",
"time 0.3.23",
"url",
@@ -5105,23 +4922,35 @@ dependencies = [
[[package]]
name = "tauri-macros"
-version = "2.0.0-alpha.7"
+version = "2.0.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b01cb5f945c71e040c5d191c32598565ae26cc266a9d5d4f7dd2dc324c5cfdd0"
+checksum = "22752425c6dd6f3a058f376db7371f1d5bac250e340d40ba6c97ecf7182eef29"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 1.0.109",
- "tauri-codegen",
- "tauri-utils",
+ "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)",
]
[[package]]
name = "tauri-plugin-window"
-version = "2.0.0-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06f3c1d40ae1a1b2b837e7f9b8db80aa2ee8c4594f63d729d2abd69f0741225a"
+version = "2.0.0-alpha.0"
+source = "git+https://git.nextgraph.org/NextGraph/plugins-workspace.git?branch=window-alpha.0-nextgraph#5e7c7c89feadcba1bde874320fd2856583abed0f"
dependencies = [
"serde",
"tauri",
@@ -5130,9 +4959,8 @@ dependencies = [
[[package]]
name = "tauri-runtime"
-version = "1.0.0-alpha.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5ba2ea1c0b7a2c3e53259edc3c78527e9f40fa7b45f73c52ab5165e42f9d18a"
+version = "0.13.0-alpha.6"
+source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5"
dependencies = [
"gtk",
"http",
@@ -5142,39 +4970,66 @@ dependencies = [
"raw-window-handle",
"serde",
"serde_json",
- "tauri-utils",
+ "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)",
"thiserror",
"url",
"uuid 1.3.4",
- "windows",
+ "windows 0.44.0",
]
[[package]]
name = "tauri-runtime-wry"
-version = "1.0.0-alpha.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "095d8a6cb312211bd0ed6b51f078be2e5bba4e3244b5fdbe39fce2ebfc0d7a15"
+version = "0.13.0-alpha.6"
+source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5"
dependencies = [
- "cocoa 0.24.1",
+ "cocoa",
"gtk",
"jni",
"percent-encoding",
"rand 0.8.5",
"raw-window-handle",
"tauri-runtime",
- "tauri-utils",
+ "tauri-utils 2.0.0-alpha.6 (git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph)",
"uuid 1.3.4",
"webkit2gtk",
"webview2-com",
- "windows",
+ "windows 0.44.0",
"wry",
]
[[package]]
name = "tauri-utils"
-version = "2.0.0-alpha.7"
+version = "2.0.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06bcd7c6f67fd6371dcc22da7d7f26ec12c4eae26ad7bc54943bb9f35b5db302"
+checksum = "2e2812e0cdfffb892c654555b2f1b8c84a035b4c56eb1646cb3eb5a9d8164d8e"
+dependencies = [
+ "brotli",
+ "ctor",
+ "dunce",
+ "glob",
+ "heck",
+ "html5ever",
+ "infer",
+ "json-patch",
+ "kuchiki",
+ "memchr",
+ "phf 0.10.1",
+ "proc-macro2",
+ "quote",
+ "semver",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "thiserror",
+ "url",
+ "walkdir",
+ "windows 0.44.0",
+]
+
+[[package]]
+name = "tauri-utils"
+version = "2.0.0-alpha.6"
+source = "git+https://git.nextgraph.org/NextGraph/tauri.git?branch=alpha.10-nextgraph#b7a959a49b9ce1a46657ba4a373bce224ec7d2c5"
dependencies = [
"brotli",
"ctor",
@@ -5184,7 +5039,7 @@ dependencies = [
"html5ever",
"infer",
"json-patch",
- "kuchikiki",
+ "kuchiki",
"memchr",
"phf 0.10.1",
"proc-macro2",
@@ -5196,7 +5051,7 @@ dependencies = [
"thiserror",
"url",
"walkdir",
- "windows",
+ "windows 0.44.0",
]
[[package]]
@@ -5220,7 +5075,7 @@ dependencies = [
"fastrand",
"redox_syscall 0.3.5",
"rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -5365,7 +5220,7 @@ dependencies = [
"signal-hook-registry",
"socket2",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -5529,25 +5384,6 @@ dependencies = [
"tracing-log",
]
-[[package]]
-name = "tray-icon"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b164327e17101c78ba3dfdf879b977027ef1bd7855668ac30063de21fc02447"
-dependencies = [
- "cocoa 0.25.0",
- "core-graphics 0.23.1",
- "crossbeam-channel",
- "dirs-next",
- "libappindicator",
- "muda",
- "objc",
- "once_cell",
- "png",
- "thiserror",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "treediff"
version = "4.0.2"
@@ -5606,16 +5442,6 @@ 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"
@@ -5982,9 +5808,9 @@ dependencies = [
[[package]]
name = "webkit2gtk"
-version = "1.1.0"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ba4cce9085e0fb02575cfd45c328740dde78253cba516b1e8be2ca0f57bd8bf"
+checksum = "d8eea819afe15eb8dcdff4f19d8bfda540bae84d874c10e6f4b8faf2d6704bd1"
dependencies = [
"bitflags",
"cairo-rs",
@@ -6006,9 +5832,9 @@ dependencies = [
[[package]]
name = "webkit2gtk-sys"
-version = "1.1.0"
+version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4489eb24e8cf0a3d0555fd3a8f7adec2a5ece34c1e7b7c9a62da7822fd40a59"
+checksum = "d0ac7a95ddd3fdfcaf83d8e513b4b1ad101b95b413b6aa6662ed95f284fc3d5b"
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -6026,39 +5852,38 @@ dependencies = [
[[package]]
name = "webview2-com"
-version = "0.25.0"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad"
+checksum = "11296e5daf3a653b79bf47d66c380e4143d5b9c975818871179a3bda79499562"
dependencies = [
"webview2-com-macros",
"webview2-com-sys",
- "windows",
+ "windows 0.44.0",
"windows-implement",
- "windows-interface",
]
[[package]]
name = "webview2-com-macros"
-version = "0.7.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc"
+checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 1.0.109",
]
[[package]]
name = "webview2-com-sys"
-version = "0.25.0"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d39576804304cf9ead192467ef47f7859a1a12fec3bd459d5ba34b8cd65ed5"
+checksum = "cde542bed28058a5b028d459689ee57f1d06685bb6c266da3b91b1be6703952f"
dependencies = [
"regex",
"serde",
"serde_json",
"thiserror",
- "windows",
+ "windows 0.44.0",
"windows-bindgen",
"windows-metadata",
]
@@ -6102,20 +5927,29 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.48.0"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
dependencies = [
"windows-implement",
"windows-interface",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
"windows-targets 0.48.0",
]
[[package]]
name = "windows-bindgen"
-version = "0.48.0"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe21a77bc54b7312dbd66f041605e098990c98be48cd52967b85b5e60e75ae6"
+checksum = "222204ecf46521382a4d88b4a1bbefca9f8855697b4ab7d20803901425e061a3"
dependencies = [
"windows-metadata",
"windows-tokens",
@@ -6123,9 +5957,9 @@ dependencies = [
[[package]]
name = "windows-implement"
-version = "0.48.0"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
+checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6"
dependencies = [
"proc-macro2",
"quote",
@@ -6134,9 +5968,9 @@ dependencies = [
[[package]]
name = "windows-interface"
-version = "0.48.0"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
+checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f"
dependencies = [
"proc-macro2",
"quote",
@@ -6145,18 +5979,9 @@ dependencies = [
[[package]]
name = "windows-metadata"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0e5f0e2cc372bb6addbfff9a8add712155cd743df9c15f6ab000f31432d"
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
+checksum = "ee78911e3f4ce32c1ad9d3c7b0bd95389662ad8d8f1a3155688fed70bd96e2b6"
[[package]]
name = "windows-sys"
@@ -6199,9 +6024,9 @@ dependencies = [
[[package]]
name = "windows-tokens"
-version = "0.48.0"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34c9a3b28cb41db7385546f7f9a8179348dffc89923dde66857b1ba5312f6b4"
+checksum = "fa4251900975a0d10841c5d4bde79c56681543367ef811f3fabb8d1803b0959b"
[[package]]
name = "windows_aarch64_gnullvm"
@@ -6317,14 +6142,14 @@ dependencies = [
[[package]]
name = "wry"
-version = "0.31.1"
+version = "0.28.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bf838a5430184dfe0b1f568af7998a455c0df75a1df300a3894e0f181e7408"
+checksum = "7d15f9f827d537cefe6d047be3930f5d89b238dfb85e08ba6a319153217635aa"
dependencies = [
- "base64 0.21.2",
+ "base64 0.13.1",
"block",
- "cocoa 0.24.1",
- "core-graphics 0.22.3",
+ "cocoa",
+ "core-graphics",
"crossbeam-channel",
"dunce",
"gdk",
@@ -6334,7 +6159,7 @@ dependencies = [
"html5ever",
"http",
"javascriptcore-rs",
- "kuchikiki",
+ "kuchiki",
"libc",
"log",
"objc",
@@ -6350,7 +6175,7 @@ dependencies = [
"webkit2gtk",
"webkit2gtk-sys",
"webview2-com",
- "windows",
+ "windows 0.44.0",
"windows-implement",
]
@@ -6417,16 +6242,6 @@ 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"
@@ -6452,72 +6267,6 @@ 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"
@@ -6546,41 +6295,3 @@ 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/README.md b/ng-app/README.md
index 7378e5a..59f24ba 100644
--- a/ng-app/README.md
+++ b/ng-app/README.md
@@ -15,7 +15,7 @@ cd ../ng-app
```
```
-cargo install tauri-cli --version "^2.0.0-alpha"
+cargo install tauri-cli --version "=2.0.0-alpha.10" --frozen
npm install -g pnpm
pnpm install
```
@@ -59,11 +59,11 @@ to run the dev env :
```
## on macos
-cargo tauri dev
+cargo tauri dev --no-watch
## on linux
-cargo tauri dev --target x86_64-unknown-linux-gnu
+cargo tauri dev --no-watch --target x86_64-unknown-linux-gnu
## on win
-cargo tauri dev --target x86_64-pc-windows-msvc
+cargo tauri dev --no-watch --target x86_64-pc-windows-msvc
```
to build the production app installer :
diff --git a/ng-app/package.json b/ng-app/package.json
index 06b3900..31b3ca8 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.6",
- "@tauri-apps/plugin-window": "2.0.0-alpha.1",
+ "@tauri-apps/api": "2.0.0-alpha.5",
+ "@tauri-apps/plugin-window": "2.0.0-alpha.0",
"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 cdfcefb..c58bb69 100644
--- a/ng-app/src-tauri/Cargo.toml
+++ b/ng-app/src-tauri/Cargo.toml
@@ -14,17 +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.5", features = [] }
+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 = { version = "2.0.0-alpha.11", features = [] }
+tauri = { git = "https://git.nextgraph.org/NextGraph/tauri.git", branch="alpha.10-nextgraph", features = [] }
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 = "2.0.0-alpha.1"
+tauri-plugin-window = { git = "https://git.nextgraph.org/NextGraph/plugins-workspace.git", branch="window-alpha.0-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 6997d0e..ae6be53 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.Window.getByLabel("main");
+ let main = window_api.WebviewWindow.getByLabel("main");
unsub_main_close = await main.onCloseRequested(async (event) => {
console.log("onCloseRequested main");
await event_api.emit("close_all", {});
- let registration = window_api.Window.getByLabel("registration");
+ let registration = window_api.WebviewWindow.getByLabel("registration");
if (registration) {
await registration.close();
}
- let viewer = window_api.Window.getByLabel("viewer");
+ let viewer = window_api.WebviewWindow.getByLabel("viewer");
if (viewer) {
await viewer.close();
}
diff --git a/ng-app/src/routes/WalletCreate.svelte b/ng-app/src/routes/WalletCreate.svelte
index 874be49..2bf253a 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.Window.getByLabel("registration");
+ let reg_popup = window_api.WebviewWindow.getByLabel("registration");
await reg_popup.close();
registration_success = bsp_name;
invitation = await ng.decode_invitation(event.payload.invite);
@@ -334,11 +334,12 @@
if (event.payload) registration_error = event.payload.error;
else intro = true;
unsub_register();
- let reg_popup = window_api.Window.getByLabel("registration");
+ let reg_popup = window_api.WebviewWindow.getByLabel("registration");
await reg_popup.close();
});
await tick();
- let reg_popup = window_api.Window.getByLabel("registration");
+ await new Promise((resolve) => setTimeout(resolve, 1000));
+ let reg_popup = window_api.WebviewWindow.getByLabel("registration");
unsub_register_close = await reg_popup.onCloseRequested(async (event) => {
console.log("onCloseRequested");
intro = true;
diff --git a/ngaccount/src/main.rs b/ngaccount/src/main.rs
index db72065..3dc43d7 100644
--- a/ngaccount/src/main.rs
+++ b/ngaccount/src/main.rs
@@ -262,14 +262,14 @@ async fn main() -> anyhow::Result<()> {
#[cfg(debug_assertions)]
"default-src 'self' data:; connect-src ipc: https://ipc.localhost 'self' http://192.168.192.2:3031",
#[cfg(not(debug_assertions))]
- "default-src 'self' data: 'unsafe-inline'; connect-src ipc: https://ipc.localhost 'self'",
+ "default-src 'self' data:; connect-src ipc: https://ipc.localhost 'self'",
),
);
let static_files = warp::get()
.and(warp_embed::embed(&Static))
- .with(warp::reply::with::headers(headers))
+ //.with(warp::reply::with::headers(headers))
.boxed();
let mut cors = warp::cors()
diff --git a/ngaccount/web/index.html b/ngaccount/web/index.html
index 842be0a..a05053c 100644
--- a/ngaccount/web/index.html
+++ b/ngaccount/web/index.html
@@ -56,12 +56,6 @@
-