Bump crate versions, fix any publish errors

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "packages/dioxus",
     "packages/core",
@@ -47,34 +48,37 @@ members = [
 ]
 exclude = ["examples/mobile_demo"]
 
+[workspace.package]
+version = "0.4.0"
+
 # dependencies that are shared across packages
 [workspace.dependencies]
-dioxus = { path = "packages/dioxus" }
-dioxus-core = { path = "packages/core" }
-dioxus-core-macro = { path = "packages/core-macro" }
-dioxus-router = { path = "packages/router" }
-dioxus-router-macro = { path = "packages/router-macro" }
-dioxus-html = { path = "packages/html" }
-dioxus-hooks = { path = "packages/hooks" }
-dioxus-web = { path = "packages/web" }
-dioxus-ssr = { path = "packages/ssr" }
-dioxus-desktop = { path = "packages/desktop" }
-dioxus-mobile = { path = "packages/mobile" }
-dioxus-interpreter-js = { path = "packages/interpreter" }
-fermi = { path = "packages/fermi" }
-dioxus-liveview = { path = "packages/liveview" }
-dioxus-autofmt = { path = "packages/autofmt" }
-dioxus-check = { path = "packages/check" }
-dioxus-rsx = { path = "packages/rsx" }
-dioxus-tui = { path = "packages/dioxus-tui" }
-rink = { path = "packages/rink" }
-dioxus-native-core = { path = "packages/native-core" }
-dioxus-native-core-macro = { path = "packages/native-core-macro" }
-rsx-rosetta = { path = "packages/rsx-rosetta" }
+dioxus = { path = "packages/dioxus", version = "0.4.0" }
+dioxus-core = { path = "packages/core", version = "0.4.0" }
+dioxus-core-macro = { path = "packages/core-macro", version = "0.4.0"  }
+dioxus-router = { path = "packages/router", version = "0.4.0"  }
+dioxus-router-macro = { path = "packages/router-macro", version = "0.4.0" }
+dioxus-html = { path = "packages/html", version = "0.4.0"  }
+dioxus-hooks = { path = "packages/hooks", version = "0.4.0" }
+dioxus-web = { path = "packages/web", version = "0.4.0"  }
+dioxus-ssr = { path = "packages/ssr", version = "0.4.0"  }
+dioxus-desktop = { path = "packages/desktop", version = "0.4.0"  }
+dioxus-mobile = { path = "packages/mobile", version = "0.4.0"  }
+dioxus-interpreter-js = { path = "packages/interpreter", version = "0.4.0" }
+fermi = { path = "packages/fermi", version = "0.4.0"  }
+dioxus-liveview = { path = "packages/liveview", version = "0.4.0"  }
+dioxus-autofmt = { path = "packages/autofmt", version = "0.4.0"  }
+dioxus-check = { path = "packages/check", version = "0.4.0"  }
+dioxus-rsx = { path = "packages/rsx", version = "0.4.0"  }
+dioxus-tui = { path = "packages/dioxus-tui", version = "0.4.0"  }
+plasmo = { path = "packages/rink", version = "0.4.0" }
+dioxus-native-core = { path = "packages/native-core", version = "0.4.0" }
+dioxus-native-core-macro = { path = "packages/native-core-macro", version = "0.4.0" }
+rsx-rosetta = { path = "packages/rsx-rosetta", version = "0.4.0" }
 dioxus-signals = { path = "packages/signals" }
-dioxus-hot-reload = { path = "packages/hot-reload" }
-dioxus-fullstack = { path = "packages/fullstack" }
-dioxus_server_macro = { path = "packages/server-macro" }
+dioxus-hot-reload = { path = "packages/hot-reload", version = "0.4.0" }
+dioxus-fullstack = { path = "packages/fullstack", version = "0.4.0"  }
+dioxus_server_macro = { path = "packages/server-macro", version = "0.4.0" }
 log = "0.4.19"
 tokio = "1.28"
 slab = "0.4.2"

examples/PWA-example/Cargo.toml

@@ -8,8 +8,8 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus = { path = "../../packages/dioxus", version = "^0.3.0"}
-dioxus-web = { path = "../../packages/web", version = "^0.3.0"}
+dioxus = { path = "../../packages/dioxus", version = "*" }
+dioxus-web = { path = "../../packages/web", version = "*" }
 
 log = "0.4.6"
 

packages/autofmt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-autofmt"
-version = "0.3.0"
+version = { workspace = true }
 edition = "2021"
 authors = ["Jonathan Kelley"]
 description = "Autofomatter for Dioxus RSX"

packages/check/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-check"
-version = "0.1.0"
+version = { workspace = true }
 edition = "2021"
 authors = ["Dioxus Labs"]
 description = "Checks Dioxus RSX files for issues"

packages/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-cli"
-version = "0.3.1"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2021"
 description = "CLI tool for developing, testing, and publishing Dioxus apps"

packages/core-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-core-macro"
-version = "0.3.0"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2021"
 description = "Core macro for Dioxus Virtual DOM"

packages/core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-core"
-version = "0.4.0"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "Core functionality for Dioxus - a concurrent renderer-agnostic Virtual DOM for interactive user experiences"

packages/desktop/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-desktop"
-version = "0.3.0"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "WebView renderer for Dioxus"

packages/dioxus-tui/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-tui"
-version = "0.2.2"
+version = { workspace = true }
 authors = ["Jonathan Kelley, Evan Almloff"]
 edition = "2021"
 description = "TUI-based renderer for Dioxus"
@@ -16,7 +16,7 @@ dioxus-html = { workspace = true }
 dioxus-native-core = { workspace = true, features = ["dioxus"] }
 dioxus-native-core-macro = { workspace = true }
 dioxus-hot-reload = { workspace = true, optional = true }
-rink = { workspace = true }
+plasmo = { workspace = true }
 
 crossterm = "0.26.0"
 tokio = { workspace = true, features = ["full"] }

packages/dioxus-tui/src/element.rs

@@ -11,7 +11,7 @@ use dioxus_html::{
 };
 
 use dioxus_native_core::NodeId;
-use rink::query::{ElementRef, Query};
+use plasmo::query::{ElementRef, Query};
 
 pub(crate) fn find_mount_events(mutations: &Mutations) -> Vec<ElementId> {
     let mut mount_events = Vec::new();

packages/dioxus-tui/src/lib.rs

@@ -12,8 +12,8 @@ use dioxus_native_core::dioxus::{DioxusState, NodeImmutableDioxusExt};
 use dioxus_native_core::prelude::*;
 
 use element::{create_mounted_events, find_mount_events};
-pub use rink::{query::Query, Config, RenderingMode, Size, TuiContext};
-use rink::{render, Driver};
+pub use plasmo::{query::Query, Config, RenderingMode, Size, TuiContext};
+use plasmo::{render, Driver};
 
 pub fn launch(app: Component<()>) {
     launch_cfg(app, Config::default())
@@ -116,7 +116,7 @@ impl Driver for DioxusRenderer {
         rdom: &Arc<RwLock<RealDom>>,
         id: NodeId,
         event: &str,
-        value: Rc<rink::EventData>,
+        value: Rc<plasmo::EventData>,
         bubbles: bool,
     ) {
         let id = { rdom.read().unwrap().get(id).unwrap().mounted_id() };

packages/dioxus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus"
-version = "0.3.2"
+version = { workspace = true }
 authors = ["Jonathan Kelley", "Dioxus Labs", "ealmloff"]
 edition = "2021"
 description = "Portable, performant, and ergonomic framework for building cross-platform user interfaces in Rust"

packages/extension/Cargo.toml

@@ -2,6 +2,7 @@
 name = "dioxus-ext"
 version = "0.1.0"
 edition = "2021"
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

packages/fermi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fermi"
-version = "0.3.0"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "Global state management for Dioxus"

packages/fullstack/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "dioxus-fullstack"
 authors = ["Jonathan Kelley, Evan Almloff"]
-version = "0.3.0"
+version = { workspace = true }
 edition = "2021"
 description = "Fullstack Dioxus Utilities"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com"
-keywords = ["dom", "ui", "gui", "react", "ssr", "fullstack"]
+keywords = ["ui", "gui", "react", "ssr", "fullstack"]
 
 [dependencies]
 # server functions

packages/hooks/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-hooks"
-version = "0.3.1"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "Basic useful hooks for Dioxus."
@@ -18,8 +18,8 @@ dioxus-core = { workspace = true }
 futures-channel = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
-debug-cell = { git = "https://github.com/Niedzwiedzw/debug-cell", rev = "3352a1f8aff19f56f5e3b2018200a3338fd43d2e" } # waiting for the merge / official DioxusLabs fork
-slab.workspace = true
+slab = { workspace = true }
+dioxus-debug-cell = "0.1.1"
 
 [dev-dependencies]
 futures-util = { workspace = true, default-features = false }

packages/hooks/src/use_shared_state.rs

@@ -3,7 +3,7 @@ use dioxus_core::{ScopeId, ScopeState};
 use std::{collections::HashSet, rc::Rc, sync::Arc};
 
 #[cfg(debug_assertions)]
-pub use debug_cell::{
+pub use dioxus_debug_cell::{
     error::{BorrowError, BorrowMutError},
     Ref, RefCell, RefMut,
 };

packages/hot-reload/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dioxus-hot-reload"
 authors = ["Jonathan Kelley", "Evan Almloff"]
-version = "0.1.1"
+version = { workspace = true }
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"

packages/html/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-html"
-version = "0.3.1"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "HTML Element pack for Dioxus - a concurrent renderer-agnostic Virtual DOM for interactive user experiences"

packages/interpreter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-interpreter-js"
-version = "0.4.0"
+version = { workspace = true }
 edition = "2018"
 authors = ["Jonathan Kelley"]
 description = "JS Intepreter for Dioxus - a concurrent renderer-agnostic Virtual DOM for interactive user experiences"

packages/liveview/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-liveview"
-version = "0.3.1"
+version = { workspace = true }
 edition = "2021"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com/docs/0.3/guide/en/getting_started/liveview.html"

packages/mobile/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-mobile"
-version = "0.3.0"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "Mobile-compatible renderer for Dioxus"

packages/native-core-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-native-core-macro"
-version = "0.3.0"
+version = { workspace = true }
 edition = "2021"
 description = "Build natively rendered apps with Dioxus"
 license = "MIT OR Apache-2.0"

packages/native-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-native-core"
-version = "0.2.0"
+version = { workspace = true }
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"

packages/rink/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "rink"
-version = "0.2.2"
+name = "plasmo"
+version = { workspace = true }
 authors = ["Jonathan Kelley, Evan Almloff"]
 edition = "2021"
 description = "TUI-based renderer for Dioxus"
@@ -33,4 +33,4 @@ criterion = "0.3.5"
 
 [features]
 default = []
-parallel = ["shipyard/parallel"]
+parallel = ["shipyard/parallel"]

packages/rink/examples/counter_button.rs

@@ -4,7 +4,7 @@ use dioxus_native_core::{
     real_dom::{NodeImmutable, NodeTypeMut},
     NodeId,
 };
-use rink::{render, Config, Driver, EventData};
+use plasmo::{render, Config, Driver, EventData};
 use std::rc::Rc;
 use std::sync::{Arc, RwLock};
 

packages/rink/examples/grid.rs

@@ -4,7 +4,7 @@ use dioxus_native_core::{
     real_dom::{NodeImmutable, NodeTypeMut},
     NodeId,
 };
-use rink::{render, Config, Driver, EventData};
+use plasmo::{render, Config, Driver, EventData};
 use rustc_hash::FxHashSet;
 use std::rc::Rc;
 use std::sync::{Arc, RwLock};

packages/rink/examples/widgets.rs

@@ -3,7 +3,7 @@ use dioxus_native_core::{
     real_dom::{NodeImmutable, NodeTypeMut},
     NodeId,
 };
-use rink::{render, Config, Driver, EventData};
+use plasmo::{render, Config, Driver, EventData};
 use std::rc::Rc;
 use std::sync::{Arc, RwLock};
 

packages/router-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-router-macro"
-version = "0.3.0"
+version = { workspace = true }
 authors = ["Evan Almloff"]
 edition = "2021"
 description = "Macro for Dioxus Router"

packages/router/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dioxus-router"
 authors = ["Jonathan Kelley", "Evan Almloff"]
-version = "0.3.0"
+version = { workspace = true }
 edition = "2018"
 description = "Cross-platform router for Dioxus apps"
 license = "MIT OR Apache-2.0"
@@ -55,7 +55,7 @@ dioxus-desktop = { path = "../desktop" }
 
 [target.'cfg(target_family = "wasm")'.dev-dependencies]
 console_error_panic_hook = "0.1.7"
-dioxus-router = { workspace = true, features = ["web"] }
+dioxus-router = { path = ".", features = ["web"] }
 dioxus-web = { workspace = true }
 gloo = "0.8.0"
 wasm-bindgen-test = "0.3.33"

packages/rsx-rosetta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsx-rosetta"
-version = "0.3.0"
+version = { workspace = true }
 edition = "2021"
 authors = ["Jonathan Kelley"]
 description = "Autofomatter for Dioxus RSX"

packages/rsx/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-rsx"
-version = "0.0.3"
+version = { workspace = true }
 authors = ["Jonathan Kelley", "Evan Almloff"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

packages/server-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus_server_macro"
-version = "0.3.0"
+version = { workspace = true }
 edition = "2021"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com/docs/0.4/guide/en/getting_started/fullstack.html"

packages/ssr/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-ssr"
-version = "0.3.0"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "Dioxus render-to-string"

packages/web/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-web"
-version = "0.3.2"
+version = { workspace = true }
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "Web renderer for Dioxus using websys"
@@ -74,4 +74,4 @@ dioxus-ssr = { workspace = true}
 wasm-logger = "0.2.0"
 gloo-timers = "0.2.3"
 gloo-dialogs = "0.1.1"
-dioxus-web = { workspace = true, features = ["hydrate"] }
+dioxus-web = { path = ".", features = ["hydrate"] }