Add 'routing' and remove 'serde-json' and 'serde-wasm-bindgen' features

flosse · flosse · commit 5ba9b7210c47 · 2023-03-06T23:47:07.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@
 - [BREAKING] removed `md!` macro (use an external crate + `El::from_html`)
 - [BREAKING] removed `cookies()` function (use an external crate like [cookie](https://docs.rs/cookie/))
 - [BREAKING] removed `panic-hook` feature (use [`console_error_panic_hook`](https://docs.rs/console_error_panic_hook))
+- [BREAKING] removed `serde-json` and `serde-wasm-bindgen` features
+- [BREAKING] added `routing` feature
 
 ## v0.9.2
 
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -77,7 +77,6 @@ wasm-bindgen-futures = "0.4.34"
 
 # Optional dependencies
 serde = { version = "1.0.152", features = ['derive'], optional = true }
-serde_json = { version = "1.0.93", optional = true }
 serde-wasm-bindgen = { version = "0.4.5", optional = true }
 
 [dependencies.web-sys]
@@ -158,14 +157,11 @@ features = [
 ]
 
 [features]
-default = ["serde-json"]
-serde-json = ["dep:serde", "dep:serde_json", "wasm-bindgen/serde-serialize"]
-serde-wasm-bindgen = ["dep:serde", "dep:serde-wasm-bindgen"]
+default = []
+routing = ["dep:serde", "dep:serde-wasm-bindgen"]
 
 [build-dependencies]
 version_check = "0.9.4"
 
 [dev-dependencies]
-serde_json = "1.0.93"
-serde-wasm-bindgen = "0.4.5"
 wasm-bindgen-test = "0.3.34"
diff --git a/examples/auth/Cargo.toml b/examples/auth/Cargo.toml
@@ -11,5 +11,5 @@ crate-type = ["cdylib"]
 gloo-console = "0.2.3"
 gloo-net = "0.2.6"
 gloo-storage = "0.2.2"
-seed = {path = "../../"}
+seed = { path = "../../", features = ["routing"] }
 serde = "1.0.152"
diff --git a/examples/e2e_encryption/Cargo.lock b/examples/e2e_encryption/Cargo.lock
diff --git a/examples/pages/Cargo.toml b/examples/pages/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-seed = {path = "../../"}
+seed = { path = "../../", features = ["routing"] }
diff --git a/examples/pages_hash_routing/Cargo.toml b/examples/pages_hash_routing/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-seed = {path = "../../"}
+seed = { path = "../../", features = ["routing"] }
diff --git a/examples/pages_keep_state/Cargo.toml b/examples/pages_keep_state/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-seed = {path = "../../"}
+seed = { path = "../../", features = ["routing"] }
diff --git a/examples/server_integration/Cargo.lock b/examples/server_integration/Cargo.lock
diff --git a/examples/subscribe/Cargo.toml b/examples/subscribe/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-seed = {path = "../../"}
+seed = { path = "../../", features = ["routing"] }
 itertools = "0.10.5"
 futures = "0.3.26"
 gloo-console = "0.2.3"
diff --git a/examples/todomvc/Cargo.toml b/examples/todomvc/Cargo.toml
@@ -8,9 +8,10 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-seed = { path = "../../" }
-serde = "1.0.152"
+seed = { path = "../../", features = ["routing"] }
+serde = { version = "1.0.152", features = ["derive"] }
 uuid = { version = "1.3.0", features = ["serde", "v4"] }
 indexmap = { version = "1.9.2", features = ["serde-1"] }
 enclose = "1.1.8"
 gloo-storage = "0.2.2"
+serde_json = "1.0.94"
diff --git a/examples/unsaved_changes/Cargo.toml b/examples/unsaved_changes/Cargo.toml
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 [dependencies]
 gloo-console = "0.2.3"
 gloo-storage = "0.2.2"
-seed = {path = "../../"}
+seed = { path = "../../", features = ["routing"] }
diff --git a/examples/url/Cargo.toml b/examples/url/Cargo.toml
@@ -9,4 +9,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 gloo-console = "0.2.3"
-seed = {path = "../../"}
+seed = { path = "../../", features = ["routing"] }
diff --git a/src/app.rs b/src/app.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::module_name_repetitions)]
 
 use crate::browser::dom::virtual_dom_bridge;
-#[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+#[cfg(feature = "routing")]
 use crate::browser::service::routing;
 use crate::browser::{
     util::{self, window},
@@ -31,7 +31,7 @@ pub mod render_info;
 pub mod stream_manager;
 pub mod streams;
 pub mod sub_manager;
-#[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+#[cfg(feature = "routing")]
 pub mod subs;
 
 pub use cfg::AppCfg;
@@ -196,14 +196,14 @@ where
             &mut orders,
         );
         app.data.model.replace(Some(new_model));
-        #[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+        #[cfg(feature = "routing")]
         app.setup_routing(&mut orders);
         app.process_effect_queue(orders.effects);
         app.rerender_vdom();
         app
     }
 
-    #[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+    #[cfg(feature = "routing")]
     fn setup_routing(&self, orders: &mut impl Orders<Ms>) {
         use enclose::enc;
         routing::setup_popstate_listener(
diff --git a/src/app/orders.rs b/src/app/orders.rs
@@ -1,12 +1,13 @@
-#[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
-use super::subs;
 use super::{App, CmdHandle, RenderInfo, StreamHandle, SubHandle};
-#[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
-use crate::browser::Url;
 use crate::virtual_dom::IntoNodes;
 use futures::stream::Stream;
 use std::{any::Any, future::Future, rc::Rc};
 
+#[cfg(feature = "routing")]
+use super::subs;
+#[cfg(feature = "routing")]
+use crate::browser::Url;
+
 // @TODO: Add links to doc comment once https://github.com/rust-lang/rust/issues/43466 is resolved
 // or use nightly rustdoc. Applicable to the entire code base.
 
@@ -323,7 +324,7 @@ pub trait Orders<Ms: 'static> {
     /// Simulate `<a href="[url]">` element click.
     ///
     /// A thin wrapper for `orders.notify(subs::UrlRequested::new(url))`
-    #[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+    #[cfg(feature = "routing")]
     fn request_url(&mut self, url: Url) -> &mut Self {
         self.notify(subs::UrlRequested::new(url))
     }
diff --git a/src/browser.rs b/src/browser.rs
@@ -3,7 +3,7 @@ pub mod service;
 pub mod url;
 pub mod util;
 
-#[cfg(any(feature = "serde-wasm-bindgen", feature = "serde-json"))]
+#[cfg(feature = "routing")]
 mod json;
 
 pub use url::{Url, UrlSearch, DUMMY_BASE_URL};
diff --git a/src/browser/json.rs b/src/browser/json.rs
@@ -6,12 +6,7 @@ pub struct Error(JsValue);
 
 type Result<T> = std::result::Result<T, Error>;
 
-#[cfg(feature = "serde-wasm-bindgen")]
+#[cfg(feature = "routing")]
 mod swb;
-#[cfg(feature = "serde-wasm-bindgen")]
+#[cfg(feature = "routing")]
 pub use swb::*;
-
-#[cfg(all(not(feature = "serde-wasm-bindgen"), feature = "serde-json"))]
-mod serde_json;
-#[cfg(all(not(feature = "serde-wasm-bindgen"), feature = "serde-json"))]
-pub use self::serde_json::*;
diff --git a/src/browser/service.rs b/src/browser/service.rs
@@ -1,2 +1,2 @@
-#[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+#[cfg(feature = "routing")]
 pub(crate) mod routing;
diff --git a/src/browser/url.rs b/src/browser/url.rs
@@ -1,11 +1,12 @@
-#[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
-use crate::browser::json;
 use crate::browser::util;
-#[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
-use serde::{Deserialize, Serialize};
 use std::{borrow::Cow, collections::BTreeMap, fmt, str::FromStr};
 use wasm_bindgen::JsValue;
 
+#[cfg(feature = "routing")]
+use crate::browser::json;
+#[cfg(feature = "routing")]
+use serde::{Deserialize, Serialize};
+
 pub const DUMMY_BASE_URL: &str = "http://example.com";
 
 // ------ Url ------
@@ -19,10 +20,7 @@ pub const DUMMY_BASE_URL: &str = "http://example.com";
 ///
 /// (If the features above are problems for you, create an [issue](https://github.com/seed-rs/seed/issues/new))
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
-#[cfg_attr(
-    any(feature = "serde-json", feature = "serde-wasm-bindgen"),
-    derive(Serialize, Deserialize)
-)]
+#[cfg_attr(feature = "routing", derive(Serialize, Deserialize))]
 pub struct Url {
     next_path_part_index: usize,
     next_hash_path_part_index: usize,
@@ -45,7 +43,7 @@ impl Url {
     ///
     /// # References
     /// * [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/History_API)
-    #[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+    #[cfg(feature = "routing")]
     pub fn go_and_push(&self) {
         // We use data to evaluate the path instead of the path displayed in the url.
         let data: JsValue = json::to_js_value(self).expect("Problem serializing route data");
@@ -62,7 +60,7 @@ impl Url {
     /// # References
     /// * [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/History_API)
 
-    #[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+    #[cfg(feature = "routing")]
     pub fn go_and_replace(&self) {
         // We use data to evaluate the path instead of the path displayed in the url.
         let data: JsValue = json::to_js_value(self).expect("Problem serializing route data");
@@ -616,10 +614,7 @@ impl From<&web_sys::Url> for Url {
 
 #[allow(clippy::module_name_repetitions)]
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(
-    any(feature = "serde-json", feature = "serde-wasm-bindgen"),
-    derive(Serialize, Deserialize)
-)]
+#[cfg_attr(feature = "routing", derive(Serialize, Deserialize))]
 pub struct UrlSearch {
     search: BTreeMap<String, Vec<String>>,
     invalid_components: Vec<String>,
diff --git a/src/lib.rs b/src/lib.rs
@@ -169,7 +169,7 @@ pub fn set_timeout(handler: Box<dyn Fn()>, timeout: i32) {
 /// for element-creation macros, input event constructors, and the `History` struct.
 /// Expose the `wasm_bindgen` prelude.
 pub mod prelude {
-    #[cfg(any(feature = "serde-json", feature = "serde-wasm-bindgen"))]
+    #[cfg(feature = "routing")]
     pub use crate::app::subs;
     pub use crate::{
         app::{
diff --git a/tests/json.rs b/tests/json.rs
