Undo changes to iroh/

Author: matheus23

Cargo.lock

@@ -39,17 +39,22 @@ futures-lite = "2.5"
 futures-sink = "0.3"
 futures-util = "0.3"
 governor = "0.7.0"
+hickory-resolver = { version = "=0.25.0-alpha.4" }
 http = "1"
 http-body-util = "0.1.0"
 hyper = { version = "1", features = ["server", "client", "http1"] }
 hyper-util = "0.1.1"
+igd-next = { version = "0.15.1", features = ["aio_tokio"] }
 iroh-base = { version = "0.30.0", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
 iroh-relay = { version = "0.30", path = "../iroh-relay", default-features = false }
+netdev = "0.31.0"
+netwatch = { version = "0.2.0" }
 pin-project = "1"
 pkarr = { version = "2", default-features = false, features = [
     "async",
     "relay",
 ] }
+portmapper = { version = "0.3.0", default-features = false }
 quinn = { package = "iroh-quinn", version = "0.12.0" }
 quinn-proto = { package = "iroh-quinn-proto", version = "0.12.0" }
 quinn-udp = { package = "iroh-quinn-udp", version = "0.5.5" }
@@ -70,11 +75,18 @@ tokio = { version = "1", features = [
     "macros",
     "sync",
     "rt",
+    "net",
+    "fs",
+    "io-std",
+    "signal",
+    "process",
 ] }
 tokio-rustls = { version = "0.26", default-features = false, features = [
     "logging",
     "ring",
 ] }
+tokio-stream = { version = "0.1.15" }
+tokio-tungstenite = "0.21" # avoid duplicating this dependency as long as tokio-tungstenite-wasm isn't updated
 tokio-tungstenite-wasm = "0.3"
 tokio-util = { version = "0.7", features = ["io-util", "io", "codec", "rt"] }
 tracing = "0.1"
@@ -83,6 +95,7 @@ webpki = { package = "rustls-webpki", version = "0.102" }
 webpki-roots = "0.26"
 x509-parser = "0.16"
 z32 = "1.0.3"
+net-report = { package = "iroh-net-report", path = "../iroh-net-report", version = "0.30", default-features = false }
 
 # metrics
 iroh-metrics = { version = "0.30", default-features = false }
@@ -98,27 +111,6 @@ tracing-subscriber = { version = "0.3", features = [
 indicatif = { version = "0.17", features = ["tokio"], optional = true }
 parse-size = { version = "=1.0.0", optional = true } # pinned version to avoid bumping msrv to 1.81
 
-# non-wasm-in-browser dependencies
-[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
-hickory-resolver = { version = "=0.25.0-alpha.4" }
-igd-next = { version = "0.15.1", features = ["aio_tokio"] }
-netdev = { version = "0.31.0" }
-netwatch = { version = "0.2.0" }
-net-report = { package = "iroh-net-report", path = "../iroh-net-report", version = "0.30", default-features = false }
-portmapper = { version = "0.3.0", default-features = false }
-tokio-stream = { version = "0.1.15" }
-tokio = { version = "1", features = [
-    "io-util",
-    "macros",
-    "sync",
-    "rt",
-    "net",
-    "fs",
-    "io-std",
-    "signal",
-    "process",
-] }
-
 [dev-dependencies]
 axum = { version = "0.7" }
 clap = { version = "4", features = ["derive"] }
@@ -140,9 +132,6 @@ serde_json = "1"
 testresult = "0.4.0"
 iroh-relay = { path = "../iroh-relay", default-features = false, features = ["test-utils", "server"] }
 
-[build-dependencies]
-cfg_aliases = { version = "0.2" }
-
 [features]
 default = ["metrics", "discovery-pkarr-dht"]
 metrics = ["iroh-metrics/metrics", "iroh-relay/metrics", "net-report/metrics", "portmapper/metrics"]