🧱 Move types' declaration into a single crate.

celestia-island · Nov 16, 2024 · 0437304 · 0437304
1 parent 9c055f2
commit 0437304
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 3 deletions.
diff --git a/packages/theme/Cargo.toml b/packages/theme/Cargo.toml
@@ -10,6 +10,8 @@ publish = false
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
+hikari-types = { path = "../types" }
+
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 derive_more = { workspace = true }

diff --git a/packages/theme/src/lib.rs b/packages/theme/src/lib.rs
@@ -1,4 +1,4 @@
 pub mod components;
 pub mod context;
 pub mod prelude;
-pub mod types;
+pub use hikari_types as types;
diff --git a/packages/types/Cargo.toml b/packages/types/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+authors = ["langyo <[email protected]>"]
+name = "hikari-types"
+
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+derive_more = { workspace = true }
+once_cell = { workspace = true }
+
+serde = { workspace = true }
+serde_json = { workspace = true }
+strum = { workspace = true }
+base64 = { workspace = true }
+yuuka = { workspace = true }
+
+yew = { workspace = true }
+stylist = { workspace = true }
diff --git a/packages/theme/src/types/component.rs → packages/types/src/component.rs b/packages/theme/src/types/component.rs → packages/types/src/component.rs
diff --git a/packages/theme/src/types/layout.rs → packages/types/src/layout.rs b/packages/theme/src/types/layout.rs → packages/types/src/layout.rs
diff --git a/packages/theme/src/types/mod.rs → packages/types/src/lib.rs b/packages/theme/src/types/mod.rs → packages/types/src/lib.rs
diff --git a/packages/theme/src/types/palette.rs → packages/types/src/palette.rs b/packages/theme/src/types/palette.rs → packages/types/src/palette.rs
diff --git a/packages/theme/src/types/skin.rs → packages/types/src/skin.rs b/packages/theme/src/types/skin.rs → packages/types/src/skin.rs
diff --git a/packages/theme/src/types/transition.rs → packages/types/src/transition.rs b/packages/theme/src/types/transition.rs → packages/types/src/transition.rs
diff --git a/packages/theme/src/types/typography.rs → packages/types/src/typography.rs b/packages/theme/src/types/typography.rs → packages/types/src/typography.rs
diff --git a/website/Cargo.toml b/website/Cargo.toml
@@ -16,9 +16,10 @@ name = "build"
 name = "dev"
 
 [dependencies]
+hikari-boot = { path = "../packages/boot" }
 hikari-components = { path = "../packages/components" }
 hikari-theme = { path = "../packages/theme" }
-hikari-boot = { path = "../packages/boot" }
+hikari-types = { path = "../packages/types" }
 
 anyhow = { workspace = true }
 async-trait = { workspace = true }

diff --git a/website/src/pages/component.rs b/website/src/pages/component.rs
@@ -5,7 +5,7 @@ use wasm_bindgen::{throw_str, UnwrapThrowExt};
 use yew::prelude::*;
 
 use hikari_components::form::Button;
-use hikari_theme::{types::*, *};
+use hikari_types::*;
 
 use crate::{app::PageData, preload_data::PreloadDataContext};