Move blitz, blitz-core into its own sub packages

DioxusLabs · Mar 15, 2024 · 45b44a0 · 45b44a0
1 parent 9b1b67d
commit 45b44a0
Show file tree

Hide file tree

Showing 33 changed files with 34 additions and 29 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,2 @@
-[package]
-name = "blitz"
-version = "0.1.0"
-edition = "2021"
-authors = ["Jonathan Kelley <jkelleyrtp@gmail.com>", "Evan Almloff"]
-description = "Native WGPU based renderer for Dioxus"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/DioxusLabs/blitz"
-
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-dioxus = { git = "https://github.com/DioxusLabs/dioxus/" }
-dioxus-native-core = { git = "https://github.com/DioxusLabs/dioxus/", features = ["dioxus"] }
-dioxus-html = { git = "https://github.com/DioxusLabs/dioxus/" }
-dioxus-hot-reload = { git = "https://github.com/DioxusLabs/dioxus/" }
-blitz-core = { path = "./blitz-core" }
-tokio = { version = "1.26.0", features = ["full"] }
-keyboard-types = "0.7.0"
-
-[features]
-default = ["hot-reload"]
-hot-reload = []
-
 [workspace]
-members = ["blitz-core"]
+members = ["packages/blitz", "packages/blitz-core"]
diff --git a/blitz-core/.gitignore → packages/blitz-core/.gitignore b/blitz-core/.gitignore → packages/blitz-core/.gitignore
diff --git a/blitz-core/Cargo.toml → packages/blitz-core/Cargo.toml b/blitz-core/Cargo.toml → packages/blitz-core/Cargo.toml
@@ -9,9 +9,10 @@ repository = "https://github.com/DioxusLabs/blitz"
 
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-dioxus-native-core = { git = "https://github.com/DioxusLabs/dioxus/", features = ["layout-attributes"] }
+dioxus-native-core = { git = "https://github.com/DioxusLabs/dioxus/", features = [
+    "layout-attributes",
+] }
 dioxus-native-core-macro = { git = "https://github.com/DioxusLabs/dioxus/" }
 dioxus-html = { git = "https://github.com/DioxusLabs/dioxus/" }
 taffy = "0.3.12"
@@ -28,7 +29,10 @@ serde_json = "1.0.91"
 serde = { version = "1.0.152", features = ["derive"] }
 keyboard-types = "0.7.0"
 rustc-hash = "1.1.0"
-shipyard = {  version = "0.6.2", features = ["proc", "std"], default-features = false }
+shipyard = { version = "0.6.2", features = [
+    "proc",
+    "std",
+], default-features = false }
 once_cell = "1.17.1"
 image = "0.24.5"
 quadtree_rs = "0.1.2"

diff --git a/blitz-core/README.md → packages/blitz-core/README.md b/blitz-core/README.md → packages/blitz-core/README.md
diff --git a/blitz-core/examples/counter.rs → packages/blitz-core/examples/counter.rs b/blitz-core/examples/counter.rs → packages/blitz-core/examples/counter.rs
diff --git a/blitz-core/examples/grid.rs → packages/blitz-core/examples/grid.rs b/blitz-core/examples/grid.rs → packages/blitz-core/examples/grid.rs
diff --git a/blitz-core/src/application.rs → packages/blitz-core/src/application.rs b/blitz-core/src/application.rs → packages/blitz-core/src/application.rs
diff --git a/blitz-core/src/events.rs → packages/blitz-core/src/events.rs b/blitz-core/src/events.rs → packages/blitz-core/src/events.rs
diff --git a/blitz-core/src/focus.rs → packages/blitz-core/src/focus.rs b/blitz-core/src/focus.rs → packages/blitz-core/src/focus.rs
diff --git a/blitz-core/src/image/mod.rs → packages/blitz-core/src/image/mod.rs b/blitz-core/src/image/mod.rs → packages/blitz-core/src/image/mod.rs
diff --git a/blitz-core/src/layout.rs → packages/blitz-core/src/layout.rs b/blitz-core/src/layout.rs → packages/blitz-core/src/layout.rs
diff --git a/blitz-core/src/lib.rs → packages/blitz-core/src/lib.rs b/blitz-core/src/lib.rs → packages/blitz-core/src/lib.rs
diff --git a/blitz-core/src/mouse.rs → packages/blitz-core/src/mouse.rs b/blitz-core/src/mouse.rs → packages/blitz-core/src/mouse.rs
diff --git a/blitz-core/src/prevent_default.rs → packages/blitz-core/src/prevent_default.rs b/blitz-core/src/prevent_default.rs → packages/blitz-core/src/prevent_default.rs
diff --git a/blitz-core/src/render.rs → packages/blitz-core/src/render.rs b/blitz-core/src/render.rs → packages/blitz-core/src/render.rs
diff --git a/blitz-core/src/style/background/gradient.rs → ...itz-core/src/style/background/gradient.rs b/blitz-core/src/style/background/gradient.rs → ...itz-core/src/style/background/gradient.rs
diff --git a/...e/src/style/background/linear_gradient.rs → ...e/src/style/background/linear_gradient.rs b/...e/src/style/background/linear_gradient.rs → ...e/src/style/background/linear_gradient.rs
diff --git a/blitz-core/src/style/background/mod.rs → ...es/blitz-core/src/style/background/mod.rs b/blitz-core/src/style/background/mod.rs → ...es/blitz-core/src/style/background/mod.rs
diff --git a/...e/src/style/background/radial_gradient.rs → ...e/src/style/background/radial_gradient.rs b/...e/src/style/background/radial_gradient.rs → ...e/src/style/background/radial_gradient.rs
diff --git a/blitz-core/src/style/border.rs → packages/blitz-core/src/style/border.rs b/blitz-core/src/style/border.rs → packages/blitz-core/src/style/border.rs
diff --git a/blitz-core/src/style/foreground.rs → packages/blitz-core/src/style/foreground.rs b/blitz-core/src/style/foreground.rs → packages/blitz-core/src/style/foreground.rs
diff --git a/blitz-core/src/style/mod.rs → packages/blitz-core/src/style/mod.rs b/blitz-core/src/style/mod.rs → packages/blitz-core/src/style/mod.rs
diff --git a/blitz-core/src/text/Roboto-Regular.ttf → ...es/blitz-core/src/text/Roboto-Regular.ttf b/blitz-core/src/text/Roboto-Regular.ttf → ...es/blitz-core/src/text/Roboto-Regular.ttf
diff --git a/blitz-core/src/text/mod.rs → packages/blitz-core/src/text/mod.rs b/blitz-core/src/text/mod.rs → packages/blitz-core/src/text/mod.rs
diff --git a/blitz-core/src/util.rs → packages/blitz-core/src/util.rs b/blitz-core/src/util.rs → packages/blitz-core/src/util.rs
diff --git a/packages/blitz/Cargo.toml b/packages/blitz/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "blitz"
+version = "0.1.0"
+edition = "2021"
+authors = ["Jonathan Kelley <jkelleyrtp@gmail.com>", "Evan Almloff"]
+description = "Native WGPU based renderer for Dioxus"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/DioxusLabs/blitz"
+
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+dioxus = { git = "https://github.com/DioxusLabs/dioxus/" }
+dioxus-native-core = { git = "https://github.com/DioxusLabs/dioxus/", features = [
+    "dioxus",
+] }
+dioxus-html = { git = "https://github.com/DioxusLabs/dioxus/" }
+dioxus-hot-reload = { git = "https://github.com/DioxusLabs/dioxus/" }
+blitz-core = { path = "../blitz-core" }
+tokio = { version = "1.26.0", features = ["full"] }
+keyboard-types = "0.7.0"
+
+[features]
+default = ["hot-reload"]
+hot-reload = []
diff --git a/examples/buttons.rs → packages/blitz/examples/buttons.rs b/examples/buttons.rs → packages/blitz/examples/buttons.rs
diff --git a/examples/css_grid_buttons.rs → packages/blitz/examples/css_grid_buttons.rs b/examples/css_grid_buttons.rs → packages/blitz/examples/css_grid_buttons.rs
diff --git a/examples/gradient.rs → packages/blitz/examples/gradient.rs b/examples/gradient.rs → packages/blitz/examples/gradient.rs
diff --git a/examples/image.rs → packages/blitz/examples/image.rs b/examples/image.rs → packages/blitz/examples/image.rs
diff --git a/examples/list.rs → packages/blitz/examples/list.rs b/examples/list.rs → packages/blitz/examples/list.rs
diff --git a/examples/test.rs → packages/blitz/examples/test.rs b/examples/test.rs → packages/blitz/examples/test.rs
diff --git a/src/lib.rs → packages/blitz/src/lib.rs b/src/lib.rs → packages/blitz/src/lib.rs