Remove web_sys references

Author: philip-peterson

packages/yew-router/src/route.rs

@@ -9,9 +9,7 @@ use std::{
 };
 
 /// Any state that can be used in the router agent must meet the criteria of this trait.
-#[cfg(all(feature = "service", feature = "web_sys"))]
 pub trait RouteState: Serialize + DeserializeOwned + Debug + Clone + Default + 'static {}
-#[cfg(all(feature = "service", feature = "web_sys"))]
 impl<T> RouteState for T where T: Serialize + DeserializeOwned + Debug + Clone + Default + 'static {}
 
 /// The representation of a route, segmented into different sections for easy access.

packages/yew/Cargo.toml

@@ -121,7 +121,7 @@ rmp-serde = "0.15.0"
 bincode = "1"
 
 [features]
-default = ["services", "agent", "web_sys"]
+default = ["web_sys", "services", "agent"]
 web_sys = [
   "console_error_panic_hook",
   "gloo",

packages/yew/src/agent/worker/mod.rs

@@ -71,7 +71,6 @@ where
     worker.post_message_vec(msg);
 }
 
-#[cfg(feature = "web_sys")]
 fn worker_new(name_of_resource: &str, is_module: bool) -> Worker {
     let origin = utils::origin().unwrap();
     let script_url = format!("{}/{}", origin, name_of_resource);
@@ -105,19 +104,16 @@ fn worker_new(name_of_resource: &str, is_module: bool) -> Worker {
     }
 }
 
-#[cfg(feature = "web_sys")]
 fn worker_self() -> DedicatedWorkerGlobalScope {
     JsValue::from(js_sys::global()).into()
 }
 
-#[cfg(feature = "web_sys")]
 trait WorkerExt {
     fn set_onmessage_closure(&self, handler: impl 'static + Fn(Vec<u8>));
 
     fn post_message_vec(&self, data: Vec<u8>);
 }
 
-#[cfg(feature = "web_sys")]
 macro_rules! worker_ext_impl {
     ($($type:ident),+) => {$(
         impl WorkerExt for $type {
@@ -139,7 +135,6 @@ macro_rules! worker_ext_impl {
     )+};
 }
 
-#[cfg(feature = "web_sys")]
 worker_ext_impl! {
     Worker, DedicatedWorkerGlobalScope
 }

packages/yew/src/lib.rs

@@ -277,7 +277,6 @@ pub mod agent;
 #[cfg(feature = "services")]
 pub mod services;
 
-#[cfg(feature = "web_sys")]
 pub use web_sys;
 
 /// The module that contains all events available in the framework.

packages/yew/src/services/fetch.rs

@@ -21,7 +21,6 @@ mod tests {
     use crate::callback::{test_util::CallbackFuture, Callback};
     use crate::format::{Json, Nothing};
     use crate::utils;
-    #[cfg(feature = "web_sys")]
     use ::web_sys::ReferrerPolicy;
     use serde::Deserialize;
     use ssri::Integrity;

packages/yew/src/services/resize.rs

@@ -33,7 +33,6 @@ impl WindowDimensions {
     pub fn get_dimensions(window: &Window) -> Self {
         let width = window.inner_width();
         let height = window.inner_height();
-        #[cfg(feature = "web_sys")]
         let (width, height) = {
             (
                 width.unwrap().as_f64().unwrap() as _,

packages/yew/src/services/websocket.rs

@@ -34,12 +34,10 @@ pub enum WebSocketError {
 pub struct WebSocketTask {
     ws: WebSocket,
     notification: Callback<WebSocketStatus>,
-    #[cfg(feature = "web_sys")]
     #[allow(dead_code)]
     listeners: [EventListener; 4],
 }
 
-#[cfg(feature = "web_sys")]
 impl WebSocketTask {
     fn new(
         ws: WebSocket,
@@ -159,15 +157,11 @@ impl WebSocketService {
             EventListener::new(&ws, "close", listener_close),
             EventListener::new(&ws, "error", listener_error),
         ];
-        Ok(ConnectCommon(
-            ws,
-            #[cfg(feature = "web_sys")]
-            listeners,
-        ))
+        Ok(ConnectCommon(ws, listeners))
     }
 }
 
-struct ConnectCommon(WebSocket, #[cfg(feature = "web_sys")] [EventListener; 3]);
+struct ConnectCommon(WebSocket, [EventListener; 3]);
 
 fn process_binary<OUT: 'static>(event: &MessageEvent, callback: &Callback<OUT>)
 where
@@ -308,7 +302,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "web_sys")]
     async fn test_invalid_url_error() {
         let url = "syntactically-invalid";
         let cb_future = CallbackFuture::<Json<Result<Message, anyhow::Error>>>::default();

packages/yew/src/utils.rs

@@ -35,7 +35,6 @@ pub fn host() -> Result<String, Error> {
 pub fn origin() -> Result<String, Error> {
     let location = window().location();
 
-    #[cfg(feature = "web_sys")]
     let origin = location.origin().map_err(|e| {
         anyhow!(e
             .as_string()

packages/yew/src/virtual_dom/mod.rs

@@ -353,7 +353,6 @@ pub(crate) trait VDiff {
     ) -> NodeRef;
 }
 
-#[cfg(feature = "web_sys")]
 fn insert_node(node: &Node, parent: &Element, next_sibling: Option<Node>) {
     match next_sibling {
         Some(next_sibling) => parent
@@ -510,7 +509,7 @@ mod layout_tests {
     }
 }
 
-#[cfg(all(test, feature = "web_sys", feature = "wasm_bench"))]
+#[cfg(all(test, feature = "wasm_bench"))]
 mod benchmarks {
     use super::{Attributes, PositionalAttr};
     use std::borrow::Cow;

packages/yew/src/virtual_dom/vcomp.rs

@@ -554,7 +554,7 @@ mod tests {
     }
 }
 
-#[cfg(all(test, feature = "web_sys"))]
+#[cfg(test)]
 mod layout_tests {
     extern crate self as yew;