From b1f6bc829dcd7690a238c4d2365f2d83277e3e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Tue, 18 Apr 2023 14:02:11 -0700 Subject: [PATCH] fix(wasm): get node-maintainer working on wasm again --- crates/nassun/src/lib.rs | 3 +++ crates/node-maintainer/src/error.rs | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/crates/nassun/src/lib.rs b/crates/nassun/src/lib.rs index 0e504660..c8e3be45 100644 --- a/crates/nassun/src/lib.rs +++ b/crates/nassun/src/lib.rs @@ -6,7 +6,10 @@ pub use oro_package_spec::{GitHost, GitInfo, PackageSpec, VersionSpec}; pub mod client; pub mod entries; +#[cfg(not(target_arch = "wasm32"))] mod error; +#[cfg(target_arch = "wasm32")] +pub mod error; pub mod fetch; pub mod package; pub mod resolver; diff --git a/crates/node-maintainer/src/error.rs b/crates/node-maintainer/src/error.rs index 1e6963d9..82697b84 100644 --- a/crates/node-maintainer/src/error.rs +++ b/crates/node-maintainer/src/error.rs @@ -101,11 +101,18 @@ pub enum NodeMaintainerError { #[diagnostic(code(node_maintainer::io_error), url(docsrs))] IoError(#[from] std::io::Error), + #[cfg(not(target_arch = "wasm32"))] /// Generic error returned from Nassun. #[error(transparent)] #[diagnostic(transparent)] NassunError(#[from] nassun::NassunError), + #[cfg(target_arch = "wasm32")] + /// Generic error returned from Nassun. + #[error(transparent)] + #[diagnostic(transparent)] + NassunError(#[from] nassun::error::NassunError), + /// Generic serde_json error. #[error(transparent)] #[diagnostic(code(node_maintainer::serde_json_error), url(docsrs))]