fix(wasm): get things working on wasm again!

orogene · Sep 27, 2023 · ec9e6e3 · ec9e6e3
1 parent b5d7c54
commit ec9e6e3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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 {