Skip to content

Commit

Permalink
Adjust versions, add authors, move server macro to top level
Browse files Browse the repository at this point in the history
  • Loading branch information
jkelleyrtp committed Aug 1, 2023
1 parent 09cce6b commit 8a875ac
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ members = [
"packages/signals",
"packages/hot-reload",
"packages/fullstack",
"packages/fullstack/server-macro",
"packages/server-macro",
"packages/fullstack/examples/axum-hello-world",
"packages/fullstack/examples/axum-router",
"packages/fullstack/examples/axum-desktop",
Expand Down Expand Up @@ -74,7 +74,7 @@ rsx-rosetta = { path = "packages/rsx-rosetta" }
dioxus-signals = { path = "packages/signals" }
dioxus-hot-reload = { path = "packages/hot-reload" }
dioxus-fullstack = { path = "packages/fullstack" }
dioxus_server_macro = { path = "packages/fullstack/server-macro" }
dioxus_server_macro = { path = "packages/server-macro" }
log = "0.4.19"
tokio = "1.28"
slab = "0.4.2"
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ edition = "2021"
description = "CLI tool for developing, testing, and publishing Dioxus apps"
repository = "https://github.com/DioxusLabs/dioxus/"
license = "MIT OR Apache-2.0"
keywords = ["react", "gui", "cli", "dioxus", "wasm"]

[dependencies]
# cli core
Expand All @@ -24,7 +25,7 @@ fs_extra = "1.2.0"
cargo_toml = "0.11.4"
futures = "0.3.21"
notify = { version = "5.0.0-pre.16", features = ["serde"] }
html_parser.workspace = true
html_parser = { workspace = true }
binary-install = "0.0.2"
convert_case = "0.5.0"
cargo_metadata = "0.15.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/fullstack/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "dioxus-fullstack"
authors = ["Jonathan Kelley, Evan Almloff"]
version = "0.1.0"
version = "0.3.0"
edition = "2021"
description = "Fullstack Dioxus Utilities"
license = "MIT OR Apache-2.0"
Expand All @@ -11,8 +11,8 @@ keywords = ["dom", "ui", "gui", "react", "ssr", "fullstack"]

[dependencies]
# server functions
server_fn = { git = "https://github.com/leptos-rs/leptos", rev = "6b90e1babd425c9a324181c86e3fd1b942c9b10f", default-features = false }
dioxus_server_macro = { path = "server-macro" }
server_fn = { version = "0.4.6", default-features = false }
dioxus_server_macro = { workspace = true }

# warp
warp = { version = "0.3.5", features = ["compression-gzip"], optional = true }
Expand Down
16 changes: 0 additions & 16 deletions packages/fullstack/server-macro/Cargo.toml

This file was deleted.

1 change: 1 addition & 0 deletions packages/liveview/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ repository = "https://github.com/DioxusLabs/dioxus/"
homepage = "https://dioxuslabs.com/docs/0.3/guide/en/getting_started/liveview.html"
keywords = ["dom", "ui", "gui", "react", "liveview"]
description = "Build server-side apps with Dioxus"
authors = ["Jonathan Kelley", "Evan Almloff"]
license = "MIT OR Apache-2.0"

[dependencies]
Expand Down
23 changes: 23 additions & 0 deletions packages/server-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[package]
name = "dioxus_server_macro"
version = "0.3.0"
edition = "2021"
repository = "https://github.com/DioxusLabs/dioxus/"
homepage = "https://dioxuslabs.com/docs/0.4/guide/en/getting_started/fullstack.html"
keywords = ["dom", "ui", "gui", "react", "liveview"]
authors = ["Jonathan Kelley", "Evan Almloff"]
license = "MIT OR Apache-2.0"
description = "Server function macros for Dioxus"


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
proc-macro2 = "^1.0.63"
quote = "^1.0.26"
syn = { version = "2", features = ["full"] }
convert_case = "^0.6.0"
server_fn_macro = "^0.4.6"

[lib]
proc-macro = true
File renamed without changes.

0 comments on commit 8a875ac

Please sign in to comment.