diff --git a/Cargo.toml b/Cargo.toml index 17448643..f58ba8eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,27 +1,2 @@ -[package] -name = "blitz" -version = "0.1.0" -edition = "2021" -authors = ["Jonathan Kelley ", "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 b/packages/blitz-core/.gitignore similarity index 100% rename from blitz-core/.gitignore rename to packages/blitz-core/.gitignore diff --git a/blitz-core/Cargo.toml b/packages/blitz-core/Cargo.toml similarity index 88% rename from blitz-core/Cargo.toml rename to packages/blitz-core/Cargo.toml index 64318c29..b6c2d406 100644 --- a/blitz-core/Cargo.toml +++ b/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 b/packages/blitz-core/README.md similarity index 100% rename from blitz-core/README.md rename to packages/blitz-core/README.md diff --git a/blitz-core/examples/counter.rs b/packages/blitz-core/examples/counter.rs similarity index 100% rename from blitz-core/examples/counter.rs rename to packages/blitz-core/examples/counter.rs diff --git a/blitz-core/examples/grid.rs b/packages/blitz-core/examples/grid.rs similarity index 100% rename from blitz-core/examples/grid.rs rename to packages/blitz-core/examples/grid.rs diff --git a/blitz-core/src/application.rs b/packages/blitz-core/src/application.rs similarity index 100% rename from blitz-core/src/application.rs rename to packages/blitz-core/src/application.rs diff --git a/blitz-core/src/events.rs b/packages/blitz-core/src/events.rs similarity index 100% rename from blitz-core/src/events.rs rename to packages/blitz-core/src/events.rs diff --git a/blitz-core/src/focus.rs b/packages/blitz-core/src/focus.rs similarity index 100% rename from blitz-core/src/focus.rs rename to packages/blitz-core/src/focus.rs diff --git a/blitz-core/src/image/mod.rs b/packages/blitz-core/src/image/mod.rs similarity index 100% rename from blitz-core/src/image/mod.rs rename to packages/blitz-core/src/image/mod.rs diff --git a/blitz-core/src/layout.rs b/packages/blitz-core/src/layout.rs similarity index 100% rename from blitz-core/src/layout.rs rename to packages/blitz-core/src/layout.rs diff --git a/blitz-core/src/lib.rs b/packages/blitz-core/src/lib.rs similarity index 100% rename from blitz-core/src/lib.rs rename to packages/blitz-core/src/lib.rs diff --git a/blitz-core/src/mouse.rs b/packages/blitz-core/src/mouse.rs similarity index 100% rename from blitz-core/src/mouse.rs rename to packages/blitz-core/src/mouse.rs diff --git a/blitz-core/src/prevent_default.rs b/packages/blitz-core/src/prevent_default.rs similarity index 100% rename from blitz-core/src/prevent_default.rs rename to packages/blitz-core/src/prevent_default.rs diff --git a/blitz-core/src/render.rs b/packages/blitz-core/src/render.rs similarity index 100% rename from blitz-core/src/render.rs rename to packages/blitz-core/src/render.rs diff --git a/blitz-core/src/style/background/gradient.rs b/packages/blitz-core/src/style/background/gradient.rs similarity index 100% rename from blitz-core/src/style/background/gradient.rs rename to packages/blitz-core/src/style/background/gradient.rs diff --git a/blitz-core/src/style/background/linear_gradient.rs b/packages/blitz-core/src/style/background/linear_gradient.rs similarity index 100% rename from blitz-core/src/style/background/linear_gradient.rs rename to packages/blitz-core/src/style/background/linear_gradient.rs diff --git a/blitz-core/src/style/background/mod.rs b/packages/blitz-core/src/style/background/mod.rs similarity index 100% rename from blitz-core/src/style/background/mod.rs rename to packages/blitz-core/src/style/background/mod.rs diff --git a/blitz-core/src/style/background/radial_gradient.rs b/packages/blitz-core/src/style/background/radial_gradient.rs similarity index 100% rename from blitz-core/src/style/background/radial_gradient.rs rename to packages/blitz-core/src/style/background/radial_gradient.rs diff --git a/blitz-core/src/style/border.rs b/packages/blitz-core/src/style/border.rs similarity index 100% rename from blitz-core/src/style/border.rs rename to packages/blitz-core/src/style/border.rs diff --git a/blitz-core/src/style/foreground.rs b/packages/blitz-core/src/style/foreground.rs similarity index 100% rename from blitz-core/src/style/foreground.rs rename to packages/blitz-core/src/style/foreground.rs diff --git a/blitz-core/src/style/mod.rs b/packages/blitz-core/src/style/mod.rs similarity index 100% rename from blitz-core/src/style/mod.rs rename to packages/blitz-core/src/style/mod.rs diff --git a/blitz-core/src/text/Roboto-Regular.ttf b/packages/blitz-core/src/text/Roboto-Regular.ttf similarity index 100% rename from blitz-core/src/text/Roboto-Regular.ttf rename to packages/blitz-core/src/text/Roboto-Regular.ttf diff --git a/blitz-core/src/text/mod.rs b/packages/blitz-core/src/text/mod.rs similarity index 100% rename from blitz-core/src/text/mod.rs rename to packages/blitz-core/src/text/mod.rs diff --git a/blitz-core/src/util.rs b/packages/blitz-core/src/util.rs similarity index 100% rename from blitz-core/src/util.rs rename to packages/blitz-core/src/util.rs diff --git a/packages/blitz/Cargo.toml b/packages/blitz/Cargo.toml new file mode 100644 index 00000000..56a58765 --- /dev/null +++ b/packages/blitz/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "blitz" +version = "0.1.0" +edition = "2021" +authors = ["Jonathan Kelley ", "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 b/packages/blitz/examples/buttons.rs similarity index 100% rename from examples/buttons.rs rename to packages/blitz/examples/buttons.rs diff --git a/examples/css_grid_buttons.rs b/packages/blitz/examples/css_grid_buttons.rs similarity index 100% rename from examples/css_grid_buttons.rs rename to packages/blitz/examples/css_grid_buttons.rs diff --git a/examples/gradient.rs b/packages/blitz/examples/gradient.rs similarity index 100% rename from examples/gradient.rs rename to packages/blitz/examples/gradient.rs diff --git a/examples/image.rs b/packages/blitz/examples/image.rs similarity index 100% rename from examples/image.rs rename to packages/blitz/examples/image.rs diff --git a/examples/list.rs b/packages/blitz/examples/list.rs similarity index 100% rename from examples/list.rs rename to packages/blitz/examples/list.rs diff --git a/examples/test.rs b/packages/blitz/examples/test.rs similarity index 100% rename from examples/test.rs rename to packages/blitz/examples/test.rs diff --git a/src/lib.rs b/packages/blitz/src/lib.rs similarity index 100% rename from src/lib.rs rename to packages/blitz/src/lib.rs