From 8a875acdd24b14b3af0b7b57299492069085ed5e Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Mon, 31 Jul 2023 17:59:36 -0700
Subject: [PATCH] Adjust versions, add authors, move server macro to top level

---
 Cargo.toml                                    |  4 ++--
 packages/cli/Cargo.toml                       |  3 ++-
 packages/fullstack/Cargo.toml                 |  6 ++---
 packages/fullstack/server-macro/Cargo.toml    | 16 -------------
 packages/liveview/Cargo.toml                  |  1 +
 packages/server-macro/Cargo.toml              | 23 +++++++++++++++++++
 .../{fullstack => }/server-macro/src/lib.rs   |  0
 7 files changed, 31 insertions(+), 22 deletions(-)
 delete mode 100644 packages/fullstack/server-macro/Cargo.toml
 create mode 100644 packages/server-macro/Cargo.toml
 rename packages/{fullstack => }/server-macro/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 93a556b6d..622beb6d1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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",
@@ -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"
diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml
index 2241c07a1..f5c39d552 100644
--- a/packages/cli/Cargo.toml
+++ b/packages/cli/Cargo.toml
@@ -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
@@ -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"
diff --git a/packages/fullstack/Cargo.toml b/packages/fullstack/Cargo.toml
index 37feec9ee..f1c06e95a 100644
--- a/packages/fullstack/Cargo.toml
+++ b/packages/fullstack/Cargo.toml
@@ -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"
@@ -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 }
diff --git a/packages/fullstack/server-macro/Cargo.toml b/packages/fullstack/server-macro/Cargo.toml
deleted file mode 100644
index 3dae2a403..000000000
--- a/packages/fullstack/server-macro/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "dioxus_server_macro"
-version = "0.1.0"
-edition = "2021"
-
-# 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"
-server_fn_macro = { git = "https://github.com/leptos-rs/leptos", rev = "6b90e1babd425c9a324181c86e3fd1b942c9b10f" }
-syn = { version = "2", features = ["full"] }
-convert_case = "0.6.0"
-
-[lib]
-proc-macro = true
diff --git a/packages/liveview/Cargo.toml b/packages/liveview/Cargo.toml
index 268a23a4d..09aeb12a1 100644
--- a/packages/liveview/Cargo.toml
+++ b/packages/liveview/Cargo.toml
@@ -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]
diff --git a/packages/server-macro/Cargo.toml b/packages/server-macro/Cargo.toml
new file mode 100644
index 000000000..ac65d5316
--- /dev/null
+++ b/packages/server-macro/Cargo.toml
@@ -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
diff --git a/packages/fullstack/server-macro/src/lib.rs b/packages/server-macro/src/lib.rs
similarity index 100%
rename from packages/fullstack/server-macro/src/lib.rs
rename to packages/server-macro/src/lib.rs