From ec9e6e36ce72719dacd15710ed7e3e3ae7498913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kat=20March=C3=A1n?= <kzm@zkat.tech>
Date: Wed, 27 Sep 2023 11:36:42 -0700
Subject: [PATCH] fix(wasm): get things working on wasm again!

---
 Cargo.lock                               | 17 ++---------------
 Cargo.toml                               |  2 +-
 crates/node-maintainer/src/lib.rs        |  1 +
 crates/node-maintainer/src/maintainer.rs |  3 +++
 crates/node-maintainer/src/resolver.rs   |  3 ++-
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0595d375..3d1bd5f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2015,7 +2015,7 @@ dependencies = [
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wasm-streams 0.2.3",
+ "wasm-streams",
  "which",
 ]
 
@@ -2908,7 +2908,7 @@ dependencies = [
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wasm-streams 0.3.0",
+ "wasm-streams",
  "web-sys",
  "winreg 0.50.0",
 ]
@@ -4400,19 +4400,6 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
-[[package]]
-name = "wasm-streams"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-streams"
 version = "0.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index 746264fa..47b95dc9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -150,7 +150,7 @@ url = "2.3.1"
 walkdir = "2.3.2"
 wasm-bindgen = "0.2.84"
 wasm-bindgen-futures = "0.4.34"
-wasm-streams = "0.2.3"
+wasm-streams = "0.3.0"
 which = "4.0.2"
 wiremock = "0.5.17"
 reqwest-retry = "0.2.2"
diff --git a/crates/node-maintainer/src/lib.rs b/crates/node-maintainer/src/lib.rs
index db3536f9..0aa4d7c9 100644
--- a/crates/node-maintainer/src/lib.rs
+++ b/crates/node-maintainer/src/lib.rs
@@ -8,6 +8,7 @@ pub use nassun::{NassunError, NassunOpts};
 pub use error::*;
 pub use into_kdl::IntoKdl;
 pub use lockfile::*;
+#[cfg(not(target_arch = "wasm32"))]
 pub use maintainer::*;
 #[cfg(target_arch = "wasm32")]
 mod wasm;
diff --git a/crates/node-maintainer/src/maintainer.rs b/crates/node-maintainer/src/maintainer.rs
index 5d5d534f..8f4741e8 100644
--- a/crates/node-maintainer/src/maintainer.rs
+++ b/crates/node-maintainer/src/maintainer.rs
@@ -20,7 +20,10 @@ use crate::{IntoKdl, Lockfile};
 
 pub const DEFAULT_CONCURRENCY: usize = 50;
 pub const DEFAULT_SCRIPT_CONCURRENCY: usize = 6;
+
+#[cfg(not(target_arch = "wasm32"))]
 pub const META_FILE_NAME: &str = ".orogene-meta.kdl";
+#[cfg(not(target_arch = "wasm32"))]
 pub const STORE_DIR_NAME: &str = ".oro-store";
 
 pub type ProgressAdded = Arc<dyn Fn() + Send + Sync>;
diff --git a/crates/node-maintainer/src/resolver.rs b/crates/node-maintainer/src/resolver.rs
index 139ed34b..ae342c52 100644
--- a/crates/node-maintainer/src/resolver.rs
+++ b/crates/node-maintainer/src/resolver.rs
@@ -23,7 +23,8 @@ use crate::error::NodeMaintainerError;
 use crate::graph::{DepType, Edge, Graph, Node};
 #[cfg(not(target_arch = "wasm32"))]
 use crate::META_FILE_NAME;
-use crate::{Lockfile, LockfileNode, ProgressAdded, ProgressHandler};
+use crate::{Lockfile, LockfileNode};
+use crate::maintainer::{ProgressAdded, ProgressHandler};
 
 #[derive(Debug, Clone)]
 struct NodeDependency {