Merge remote-tracking branch 'origin/master' into jk/rsx-refactor

This commit is contained in:
Evan Almloff committed 2022-05-27 17:56:50 -05:00
commit f9713b2fe9
83 files changed
+6905 -2326

No files matched your search

+24 -14
View File
@@ -1,6 +1,6 @@
[package]
name = "dioxus"
version = "0.2.3"
version = "0.2.4"
authors = ["Jonathan Kelley"]
edition = "2021"
description = "Core functionality for Dioxus - a concurrent renderer-agnostic Virtual DOM for interactive user experiences"
@@ -12,23 +12,30 @@ keywords = ["dom", "ui", "gui", "react", "wasm"]
rust-version = "1.56.0"
[dependencies]
dioxus-core = { path = "./packages/core", version = "^0.2.0" }
dioxus-html = { path = "./packages/html", version = "^0.2.0", optional = true }
dioxus-core-macro = { path = "./packages/core-macro", version = "^0.2.0", optional = true }
dioxus-hooks = { path = "./packages/hooks", version = "^0.2.0", optional = true }
fermi = { path = "./packages/fermi", version = "^0.2.0", optional = true }
dioxus-core = { path = "./packages/core", version = "^0.2.1" }
dioxus-html = { path = "./packages/html", version = "^0.2.1", optional = true }
dioxus-core-macro = { path = "./packages/core-macro", version = "^0.2.1", optional = true }
dioxus-hooks = { path = "./packages/hooks", version = "^0.2.1", optional = true }
fermi = { path = "./packages/fermi", version = "^0.2.1", optional = true }
dioxus-web = { path = "./packages/web", version = "^0.2.0", optional = true }
dioxus-desktop = { path = "./packages/desktop", version = "^0.2.2", optional = true }
dioxus-ssr = { path = "./packages/ssr", version = "^0.2.0", optional = true }
dioxus-web = { path = "./packages/web", version = "^0.2.1", optional = true }
dioxus-desktop = { path = "./packages/desktop", version = "^0.2.3", optional = true }
dioxus-ssr = { path = "./packages/ssr", version = "^0.2.1", optional = true }
dioxus-router = { path = "./packages/router", version = "^0.2.1", optional = true }
dioxus-interpreter-js = { path = "./packages/interpreter", version = "^0.2.0", optional = true }
dioxus-tui = { path = "./packages/tui", version = "^0.2.0", optional = true }
dioxus-router = { path = "./packages/router", version = "^0.2.3", optional = true }
dioxus-interpreter-js = { path = "./packages/interpreter", version = "^0.2.1", optional = true }
dioxus-tui = { path = "./packages/tui", version = "^0.2.2", optional = true }
dioxus-liveview = { path = "./packages/liveview", optional = true }
dioxus-rsx = { path = "./packages/rsx", optional = true }
dioxus-rsx-interperter = { path = "./packages/rsx_interperter", optional = true }
dioxus-liveview = { path = "./packages/liveview", version = "^0.1.0", optional = true }
dioxus-native-core = { path = "./packages/native-core", version = "^0.2.0", optional = true }
dioxus-native-core-macro = { path = "./packages/native-core-macro", version = "^0.2.0", optional = true }
# dioxus-mobile = { path = "./packages/mobile", version = "^0.2.0", optional = true }
# dioxus-rsx = { path = "./packages/rsx", optional = true }
# macro = ["dioxus-core-macro", "dioxus-rsx"]
[features]
default = ["macro", "hooks", "html"]
@@ -39,11 +46,12 @@ html = ["dioxus-html"]
ssr = ["dioxus-ssr"]
web = ["dioxus-web", "dioxus-router/web"]
desktop = ["dioxus-desktop"]
ayatana = ["dioxus-desktop/ayatana"]
router = ["dioxus-router"]
tui = ["dioxus-tui"]
liveview = ["dioxus-liveview"]
hot_reload = ["dioxus-core-macro/hot_reload", "dioxus-rsx-interperter"]
native-core = ["dioxus-native-core", "dioxus-native-core-macro"]
[workspace]
members = [
@@ -61,6 +69,8 @@ members = [
"packages/liveview",
"packages/rsx",
"packages/rsx_interperter",
"packages/native-core",
"packages/native-core-macro",
]
[dev-dependencies]