fix: Avoid to use web-sys when target os is WASI.

rustwasm · Nov 30, 2023 · a3fae2c · a3fae2c
1 parent 2676fe6
commit a3fae2c
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -143,15 +143,14 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: cargo-${{ runner.os }}-wasi-tests-${{ hashFiles('**/Cargo.toml') }}
+          key: cargo-${{ runner.os }}-history-wasi-tests-${{ hashFiles('**/Cargo.toml') }}
           restore-keys: |
-            cargo-${{ runner.os }}-wasi-tests-
-            cargo-${{ runner.os }}-
+            cargo-${{ runner.os }}-history-wasi-tests-
 
       - name: Build and run example history-wasi
         run: |
           cargo build -p example-${{ matrix.example }} --target wasm32-wasi
-          wasmtime target/wasm32-wasi/debug/example-${{ matrix.example }}.wasm
+          ~/.wasmtime/bin/wasmtime target/wasm32-wasi/debug/example-${{ matrix.example }}.wasm
 
   test-worker:
     name: Test gloo-worker

diff --git a/crates/history/Cargo.toml b/crates/history/Cargo.toml
@@ -12,15 +12,17 @@ categories = ["api-bindings", "history", "wasm"]
 rust-version = "1.64"
 
 [dependencies]
-wasm-bindgen = "0.2"
 gloo-utils = { version = "0.2.0", path = "../utils" }
 gloo-events = { version = "0.2.0", path = "../events" }
 serde = { version = "1", features = ["derive"] }
 serde-wasm-bindgen = "0.6.0"
 serde_urlencoded = { version = "0.7", optional = true }
 thiserror = { version = "1.0", optional = true }
 
-[dependencies.web-sys]
+[target.'cfg(not(target_os = "wasi"))'.dependencies]
+wasm-bindgen = "0.2"
+
+[target.'cfg(not(target_os = "wasi"))'.dependencies.web-sys]
 version = "0.3"
 features = ["History", "Window", "Location", "Url"]
 

diff --git a/crates/history/src/any.rs b/crates/history/src/any.rs
@@ -1,6 +1,8 @@
 use std::borrow::Cow;
 
+#[cfg(not(target_os = "wasi"))]
 use crate::browser::BrowserHistory;
+#[cfg(not(target_os = "wasi"))]
 use crate::hash::HashHistory;
 use crate::history::History;
 use crate::listener::HistoryListener;
@@ -13,8 +15,10 @@ use crate::{error::HistoryResult, query::ToQuery};
 #[derive(Clone, PartialEq, Debug)]
 pub enum AnyHistory {
     /// A Browser History.
+    #[cfg(not(target_os = "wasi"))]
     Browser(BrowserHistory),
     /// A Hash History
+    #[cfg(not(target_os = "wasi"))]
     Hash(HashHistory),
     /// A Memory History
     Memory(MemoryHistory),
@@ -23,31 +27,39 @@ pub enum AnyHistory {
 impl History for AnyHistory {
     fn len(&self) -> usize {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.len(),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.len(),
             Self::Memory(m) => m.len(),
         }
     }
 
     fn go(&self, delta: isize) {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.go(delta),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.go(delta),
             Self::Memory(m) => m.go(delta),
         }
     }
 
     fn push<'a>(&self, route: impl Into<Cow<'a, str>>) {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.push(route),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.push(route),
             Self::Memory(m) => m.push(route),
         }
     }
 
     fn replace<'a>(&self, route: impl Into<Cow<'a, str>>) {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.replace(route),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.replace(route),
             Self::Memory(m) => m.replace(route),
         }
@@ -58,7 +70,9 @@ impl History for AnyHistory {
         T: 'static,
     {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.push_with_state(route, state),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.push_with_state(route, state),
             Self::Memory(m) => m.push_with_state(route, state),
         }
@@ -69,7 +83,9 @@ impl History for AnyHistory {
         T: 'static,
     {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.replace_with_state(route, state),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.replace_with_state(route, state),
             Self::Memory(m) => m.replace_with_state(route, state),
         }
@@ -85,7 +101,9 @@ impl History for AnyHistory {
         Q: ToQuery,
     {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.push_with_query(route, query),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.push_with_query(route, query),
             Self::Memory(m) => m.push_with_query(route, query),
         }
@@ -100,7 +118,9 @@ impl History for AnyHistory {
         Q: ToQuery,
     {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.replace_with_query(route, query),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.replace_with_query(route, query),
             Self::Memory(m) => m.replace_with_query(route, query),
         }
@@ -118,7 +138,9 @@ impl History for AnyHistory {
         T: 'static,
     {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.push_with_query_and_state(route, query, state),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.push_with_query_and_state(route, query, state),
             Self::Memory(m) => m.push_with_query_and_state(route, query, state),
         }
@@ -136,7 +158,9 @@ impl History for AnyHistory {
         T: 'static,
     {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.replace_with_query_and_state(route, query, state),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.replace_with_query_and_state(route, query, state),
             Self::Memory(m) => m.replace_with_query_and_state(route, query, state),
         }
@@ -147,27 +171,33 @@ impl History for AnyHistory {
         CB: Fn() + 'static,
     {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.listen(callback),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.listen(callback),
             Self::Memory(m) => m.listen(callback),
         }
     }
 
     fn location(&self) -> Location {
         match self {
+            #[cfg(not(target_os = "wasi"))]
             Self::Browser(m) => m.location(),
+            #[cfg(not(target_os = "wasi"))]
             Self::Hash(m) => m.location(),
             Self::Memory(m) => m.location(),
         }
     }
 }
 
+#[cfg(not(target_os = "wasi"))]
 impl From<BrowserHistory> for AnyHistory {
     fn from(m: BrowserHistory) -> AnyHistory {
         AnyHistory::Browser(m)
     }
 }
 
+#[cfg(not(target_os = "wasi"))]
 impl From<HashHistory> for AnyHistory {
     fn from(m: HashHistory) -> AnyHistory {
         AnyHistory::Hash(m)

diff --git a/crates/history/src/lib.rs b/crates/history/src/lib.rs
@@ -4,9 +4,11 @@
 #![deny(missing_docs, missing_debug_implementations)]
 
 mod any;
+#[cfg(not(target_os = "wasi"))]
 mod browser;
 #[cfg(feature = "query")]
 mod error;
+#[cfg(not(target_os = "wasi"))]
 mod hash;
 mod history;
 mod listener;
@@ -18,7 +20,9 @@ mod state;
 mod utils;
 
 pub use any::AnyHistory;
+#[cfg(not(target_os = "wasi"))]
 pub use browser::BrowserHistory;
+#[cfg(not(target_os = "wasi"))]
 pub use hash::HashHistory;
 pub use memory::MemoryHistory;
 

diff --git a/crates/history/src/state.rs b/crates/history/src/state.rs
@@ -1,3 +1,5 @@
+#![cfg(not(target_os = "wasi"))]
+
 use std::any::Any;
 use std::collections::HashMap;
 use std::rc::Rc;