all crates under crates dir

mobusoperandi · Nov 1, 2024 · ee4a0bb · ee4a0bb
1 parent 7f7a129
commit ee4a0bb
Show file tree

Hide file tree

Showing 85 changed files with 42 additions and 31 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,9 @@
-[dependencies]
-anyhow = {version = "1.0.66", features = ["backtrace"]}
-camino = "1.1.4"
-chrono = {version = "0.4.19", features = ["serde"]}
-clap = {version = "4.1.4", features = ["derive"]}
-console-subscriber = {version = "0.1.8", optional = true}
-futures = "0.3.28"
-indexmap = "1.9.2"
-once_cell = "1.16.0"
-serde = {version = "1.0.138", features = ["derive"]}
-serde_json = "1.0.82"
-ssg-parent = {version = "0.0.0", path = "ssg-parent"}
-thiserror = "1.0.40"
-# TODO less features
-tokio = {version = "1.21.0", features = ["full"]}
-url = "2.3.1"
-
-[features]
-tokio_console = ["dep:console-subscriber"]
-
-[package]
-name = "cli"
-version = "0.0.0"
-edition = "2021"
-
 [workspace]
-members = ["builder"]
+resolver = "2"
+members = ["crates/*"]
+default-members = ["crates/cli"]
+
+[workspace.dependencies]
+reactive.path = "crates/reactive"
+ssg-child.path = "crates/ssg-child"
+ssg-parent.path = "crates/ssg-parent"
diff --git a/builder/Cargo.toml → crates/builder/Cargo.toml b/builder/Cargo.toml → crates/builder/Cargo.toml
@@ -23,13 +23,13 @@ schema = "0.1.0"
 serde = {version = "1.0.138", features = ["derive"]}
 serde_json = "1.0.82"
 serde_yaml = "0.9.11"
-ssg-child = {version = "0.0.0", path = "../ssg-child"}
 strum = {version = "0.24.1", features = ["derive"]}
 syn = {version = "2.0.5", features = ["full"]}
 thiserror = "1.0.40"
 # TODO less features
 tokio = {version = "1.21.0", features = ["full"]}
 url = "2.3.1"
+ssg-child.workspace = true
 
 [features]
 tokio_console = ["dep:console-subscriber"]

diff --git a/builder/src/components.rs → crates/builder/src/components.rs b/builder/src/components.rs → crates/builder/src/components.rs
diff --git a/builder/src/components/add_page.rs → crates/builder/src/components/add_page.rs b/builder/src/components/add_page.rs → crates/builder/src/components/add_page.rs
diff --git a/builder/src/components/calendar.rs → crates/builder/src/components/calendar.rs b/builder/src/components/calendar.rs → crates/builder/src/components/calendar.rs
diff --git a/builder/src/components/calendar/snippet.js → ...uilder/src/components/calendar/snippet.js b/builder/src/components/calendar/snippet.js → ...uilder/src/components/calendar/snippet.js
diff --git a/builder/src/components/home_page.rs → crates/builder/src/components/home_page.rs b/builder/src/components/home_page.rs → crates/builder/src/components/home_page.rs
diff --git a/builder/src/components/mob_page.rs → crates/builder/src/components/mob_page.rs b/builder/src/components/mob_page.rs → crates/builder/src/components/mob_page.rs
diff --git a/builder/src/components/mob_page/status.rs → ...builder/src/components/mob_page/status.rs b/builder/src/components/mob_page/status.rs → ...builder/src/components/mob_page/status.rs
diff --git a/builder/src/components/page_base.rs → crates/builder/src/components/page_base.rs b/builder/src/components/page_base.rs → crates/builder/src/components/page_base.rs
diff --git a/builder/src/components/redirect_page.rs → ...s/builder/src/components/redirect_page.rs b/builder/src/components/redirect_page.rs → ...s/builder/src/components/redirect_page.rs
diff --git a/builder/src/components/schema.rs → crates/builder/src/components/schema.rs b/builder/src/components/schema.rs → crates/builder/src/components/schema.rs
diff --git a/builder/src/components/schema/ident.rs → ...es/builder/src/components/schema/ident.rs b/builder/src/components/schema/ident.rs → ...es/builder/src/components/schema/ident.rs
diff --git a/builder/src/components/schema/node.rs → crates/builder/src/components/schema/node.rs b/builder/src/components/schema/node.rs → crates/builder/src/components/schema/node.rs
diff --git a/builder/src/components/schema/type_.rs → ...es/builder/src/components/schema/type_.rs b/builder/src/components/schema/type_.rs → ...es/builder/src/components/schema/type_.rs
diff --git a/.../components/schema/type_/documentation.rs → .../components/schema/type_/documentation.rs b/.../components/schema/type_/documentation.rs → .../components/schema/type_/documentation.rs
diff --git a/builder/src/components/schema/type_/enum_.rs → ...lder/src/components/schema/type_/enum_.rs b/builder/src/components/schema/type_/enum_.rs → ...lder/src/components/schema/type_/enum_.rs
diff --git a/.../components/schema/type_/enum_/variant.rs → .../components/schema/type_/enum_/variant.rs b/.../components/schema/type_/enum_/variant.rs → .../components/schema/type_/enum_/variant.rs
diff --git a/...nents/schema/type_/enum_/variant/ident.rs → ...nents/schema/type_/enum_/variant/ident.rs b/...nents/schema/type_/enum_/variant/ident.rs → ...nents/schema/type_/enum_/variant/ident.rs
diff --git a/builder/src/components/schema/type_/field.rs → ...lder/src/components/schema/type_/field.rs b/builder/src/components/schema/type_/field.rs → ...lder/src/components/schema/type_/field.rs
diff --git a/...rc/components/schema/type_/field/ident.rs → ...rc/components/schema/type_/field/ident.rs b/...rc/components/schema/type_/field/ident.rs → ...rc/components/schema/type_/field/ident.rs
diff --git a/builder/src/components/schema/type_/ident.rs → ...lder/src/components/schema/type_/ident.rs b/builder/src/components/schema/type_/ident.rs → ...lder/src/components/schema/type_/ident.rs
diff --git a/builder/src/components/schema/type_/link.rs → ...ilder/src/components/schema/type_/link.rs b/builder/src/components/schema/type_/link.rs → ...ilder/src/components/schema/type_/link.rs
diff --git a/...er/src/components/schema/type_/mapping.rs → ...er/src/components/schema/type_/mapping.rs b/...er/src/components/schema/type_/mapping.rs → ...er/src/components/schema/type_/mapping.rs
diff --git a/...rc/components/schema/type_/mapping/key.rs → ...rc/components/schema/type_/mapping/key.rs b/...rc/components/schema/type_/mapping/key.rs → ...rc/components/schema/type_/mapping/key.rs
diff --git a/builder/src/constants.rs → crates/builder/src/constants.rs b/builder/src/constants.rs → crates/builder/src/constants.rs
@@ -9,7 +9,7 @@ pub(crate) const DESCRIPTION: &str = "A mob programming community";
 pub(crate) const MOBS_DIR: &str = "mobs";
 
 pub(crate) static MOBS_PATH: Lazy<Utf8PathBuf> = Lazy::new(|| {
-    [env!("CARGO_MANIFEST_DIR"), "..", MOBS_DIR]
+    [env!("CARGO_MANIFEST_DIR"), "..", "..", MOBS_DIR]
         .iter()
         .collect()
 });

diff --git a/builder/src/expected_files.rs → crates/builder/src/expected_files.rs b/builder/src/expected_files.rs → crates/builder/src/expected_files.rs
diff --git a/builder/src/file_specs.rs → crates/builder/src/file_specs.rs b/builder/src/file_specs.rs → crates/builder/src/file_specs.rs
diff --git a/builder/src/fonts.rs → crates/builder/src/fonts.rs b/builder/src/fonts.rs → crates/builder/src/fonts.rs
diff --git a/builder/src/google_font.rs → crates/builder/src/google_font.rs b/builder/src/google_font.rs → crates/builder/src/google_font.rs
diff --git a/builder/src/graphic_file_specs.rs → crates/builder/src/graphic_file_specs.rs b/builder/src/graphic_file_specs.rs → crates/builder/src/graphic_file_specs.rs
diff --git a/builder/src/html.rs → crates/builder/src/html.rs b/builder/src/html.rs → crates/builder/src/html.rs
diff --git a/builder/src/main.rs → crates/builder/src/main.rs b/builder/src/main.rs → crates/builder/src/main.rs
diff --git a/builder/src/markdown.rs → crates/builder/src/markdown.rs b/builder/src/markdown.rs → crates/builder/src/markdown.rs
diff --git a/builder/src/mob.rs → crates/builder/src/mob.rs b/builder/src/mob.rs → crates/builder/src/mob.rs
diff --git a/builder/src/mob/file.rs → crates/builder/src/mob/file.rs b/builder/src/mob/file.rs → crates/builder/src/mob/file.rs
diff --git a/...er/src/mob/file/yaml_recurring_session.rs → ...er/src/mob/file/yaml_recurring_session.rs b/...er/src/mob/file/yaml_recurring_session.rs → ...er/src/mob/file/yaml_recurring_session.rs
diff --git a/builder/src/mob/id.rs → crates/builder/src/mob/id.rs b/builder/src/mob/id.rs → crates/builder/src/mob/id.rs
diff --git a/builder/src/mob/link.rs → crates/builder/src/mob/link.rs b/builder/src/mob/link.rs → crates/builder/src/mob/link.rs
diff --git a/builder/src/mob/participant.rs → crates/builder/src/mob/participant.rs b/builder/src/mob/participant.rs → crates/builder/src/mob/participant.rs
diff --git a/builder/src/mob/participant/person.rs → crates/builder/src/mob/participant/person.rs b/builder/src/mob/participant/person.rs → crates/builder/src/mob/participant/person.rs
diff --git a/builder/src/mob/recurring_session.rs → crates/builder/src/mob/recurring_session.rs b/builder/src/mob/recurring_session.rs → crates/builder/src/mob/recurring_session.rs
diff --git a/builder/src/mob/status.rs → crates/builder/src/mob/status.rs b/builder/src/mob/status.rs → crates/builder/src/mob/status.rs
diff --git a/builder/src/mob/status/legend.rs → crates/builder/src/mob/status/legend.rs b/builder/src/mob/status/legend.rs → crates/builder/src/mob/status/legend.rs
diff --git a/builder/src/mob/subtitle.rs → crates/builder/src/mob/subtitle.rs b/builder/src/mob/subtitle.rs → crates/builder/src/mob/subtitle.rs
diff --git a/builder/src/mob/title.rs → crates/builder/src/mob/title.rs b/builder/src/mob/title.rs → crates/builder/src/mob/title.rs
diff --git a/builder/src/pages.rs → crates/builder/src/pages.rs b/builder/src/pages.rs → crates/builder/src/pages.rs
diff --git a/builder/src/pages/add.rs → crates/builder/src/pages/add.rs b/builder/src/pages/add.rs → crates/builder/src/pages/add.rs
diff --git a/builder/src/pages/index.rs → crates/builder/src/pages/index.rs b/builder/src/pages/index.rs → crates/builder/src/pages/index.rs
diff --git a/builder/src/relative_path.rs → crates/builder/src/relative_path.rs b/builder/src/relative_path.rs → crates/builder/src/relative_path.rs
diff --git a/builder/src/style.rs → crates/builder/src/style.rs b/builder/src/style.rs → crates/builder/src/style.rs
diff --git a/builder/src/syn_helpers.rs → crates/builder/src/syn_helpers.rs b/builder/src/syn_helpers.rs → crates/builder/src/syn_helpers.rs
diff --git a/builder/src/tailwind.rs → crates/builder/src/tailwind.rs b/builder/src/tailwind.rs → crates/builder/src/tailwind.rs
diff --git a/builder/src/url.rs → crates/builder/src/url.rs b/builder/src/url.rs → crates/builder/src/url.rs
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -0,0 +1,24 @@
+[dependencies]
+anyhow = {version = "1.0.66", features = ["backtrace"]}
+camino = "1.1.4"
+chrono = {version = "0.4.19", features = ["serde"]}
+clap = {version = "4.1.4", features = ["derive"]}
+console-subscriber = {version = "0.1.8", optional = true}
+futures = "0.3.28"
+indexmap = "1.9.2"
+once_cell = "1.16.0"
+serde = {version = "1.0.138", features = ["derive"]}
+serde_json = "1.0.82"
+thiserror = "1.0.40"
+# TODO less features
+tokio = {version = "1.21.0", features = ["full"]}
+url = "2.3.1"
+ssg-parent.workspace = true
+
+[features]
+tokio_console = ["dep:console-subscriber"]
+
+[package]
+name = "cli"
+version = "0.0.0"
+edition = "2021"
diff --git a/src/input.css → crates/cli/src/input.css b/src/input.css → crates/cli/src/input.css
diff --git a/src/main.rs → crates/cli/src/main.rs b/src/main.rs → crates/cli/src/main.rs
@@ -8,7 +8,7 @@ use once_cell::sync::Lazy;
 use ssg_parent::Parent;
 
 pub static OUTPUT_DIR: Lazy<Utf8PathBuf> =
-    Lazy::new(|| Utf8PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(".vercel/output/static"));
+    Lazy::new(|| Utf8PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../.vercel/output/static"));
 
 #[derive(Debug, Parser)]
 struct Cli {

diff --git a/src/tailwind.rs → crates/cli/src/tailwind.rs b/src/tailwind.rs → crates/cli/src/tailwind.rs
diff --git a/reactive/Cargo.toml → crates/reactive/Cargo.toml b/reactive/Cargo.toml → crates/reactive/Cargo.toml
diff --git a/reactive/src/driver.rs → crates/reactive/src/driver.rs b/reactive/src/driver.rs → crates/reactive/src/driver.rs
diff --git a/reactive/src/driver/child_process_killer.rs → ...active/src/driver/child_process_killer.rs b/reactive/src/driver/child_process_killer.rs → ...active/src/driver/child_process_killer.rs
diff --git a/reactive/src/driver/command.rs → crates/reactive/src/driver/command.rs b/reactive/src/driver/command.rs → crates/reactive/src/driver/command.rs
diff --git a/reactive/src/driver/notify.rs → crates/reactive/src/driver/notify.rs b/reactive/src/driver/notify.rs → crates/reactive/src/driver/notify.rs
diff --git a/reactive/src/driver/open_that.rs → crates/reactive/src/driver/open_that.rs b/reactive/src/driver/open_that.rs → crates/reactive/src/driver/open_that.rs
diff --git a/reactive/src/driver/println.rs → crates/reactive/src/driver/println.rs b/reactive/src/driver/println.rs → crates/reactive/src/driver/println.rs
diff --git a/reactive/src/lib.rs → crates/reactive/src/lib.rs b/reactive/src/lib.rs → crates/reactive/src/lib.rs
diff --git a/ssg-child/Cargo.toml → crates/ssg-child/Cargo.toml b/ssg-child/Cargo.toml → crates/ssg-child/Cargo.toml
diff --git a/ssg-child/src/disk_caching_http_client.rs → ...ssg-child/src/disk_caching_http_client.rs b/ssg-child/src/disk_caching_http_client.rs → ...ssg-child/src/disk_caching_http_client.rs
diff --git a/ssg-child/src/file_error.rs → crates/ssg-child/src/file_error.rs b/ssg-child/src/file_error.rs → crates/ssg-child/src/file_error.rs
diff --git a/ssg-child/src/file_spec.rs → crates/ssg-child/src/file_spec.rs b/ssg-child/src/file_spec.rs → crates/ssg-child/src/file_spec.rs
diff --git a/ssg-child/src/file_success.rs → crates/ssg-child/src/file_success.rs b/ssg-child/src/file_success.rs → crates/ssg-child/src/file_success.rs
diff --git a/ssg-child/src/final_error.rs → crates/ssg-child/src/final_error.rs b/ssg-child/src/final_error.rs → crates/ssg-child/src/final_error.rs
diff --git a/ssg-child/src/final_error/duplicates.rs → ...s/ssg-child/src/final_error/duplicates.rs b/ssg-child/src/final_error/duplicates.rs → ...s/ssg-child/src/final_error/duplicates.rs
diff --git a/ssg-child/src/final_error/failed_files.rs → ...ssg-child/src/final_error/failed_files.rs b/ssg-child/src/final_error/failed_files.rs → ...ssg-child/src/final_error/failed_files.rs
diff --git a/ssg-child/src/final_error/missing_files.rs → ...sg-child/src/final_error/missing_files.rs b/ssg-child/src/final_error/missing_files.rs → ...sg-child/src/final_error/missing_files.rs
diff --git a/.../src/final_error/processed_files_count.rs → .../src/final_error/processed_files_count.rs b/.../src/final_error/processed_files_count.rs → .../src/final_error/processed_files_count.rs
diff --git a/ssg-child/src/generation_task.rs → crates/ssg-child/src/generation_task.rs b/ssg-child/src/generation_task.rs → crates/ssg-child/src/generation_task.rs
diff --git a/ssg-child/src/lib.rs → crates/ssg-child/src/lib.rs b/ssg-child/src/lib.rs → crates/ssg-child/src/lib.rs
diff --git a/ssg-child/src/sources.rs → crates/ssg-child/src/sources.rs b/ssg-child/src/sources.rs → crates/ssg-child/src/sources.rs
diff --git a/ssg-child/src/sources/bytes.rs → crates/ssg-child/src/sources/bytes.rs b/ssg-child/src/sources/bytes.rs → crates/ssg-child/src/sources/bytes.rs
diff --git a/ssg-child/src/sources/google_font.rs → crates/ssg-child/src/sources/google_font.rs b/ssg-child/src/sources/google_font.rs → crates/ssg-child/src/sources/google_font.rs
diff --git a/ssg-child/src/sources/http.rs → crates/ssg-child/src/sources/http.rs b/ssg-child/src/sources/http.rs → crates/ssg-child/src/sources/http.rs
diff --git a/ssg-child/src/sources/static_byte_slice.rs → ...sg-child/src/sources/static_byte_slice.rs b/ssg-child/src/sources/static_byte_slice.rs → ...sg-child/src/sources/static_byte_slice.rs
diff --git a/ssg-parent/Cargo.toml → crates/ssg-parent/Cargo.toml b/ssg-parent/Cargo.toml → crates/ssg-parent/Cargo.toml
@@ -8,12 +8,12 @@ live-server = "0.6.0"
 once_cell = "1.17.1"
 open = "4.1.0"
 portpicker = "0.1.1"
-reactive = {version = "0.1.0", path = "../reactive"}
 reqwest = {version = "0.11.11", default-features = false, features = ["rustls-tls"]}
 thiserror = "1.0.38"
 # TODO less features
 tokio = {version = "1.21.0", features = ["fs", "tokio-macros", "full"]}
 url = "2.3.1"
+reactive.workspace = true
 
 [package]
 name = "ssg-parent"

diff --git a/ssg-parent/src/lib.rs → crates/ssg-parent/src/lib.rs b/ssg-parent/src/lib.rs → crates/ssg-parent/src/lib.rs
@@ -1,5 +1,6 @@
 #![warn(clippy::all, clippy::pedantic)]
 
+use camino::Utf8PathBuf;
 use colored::Colorize;
 use futures::{
     channel::mpsc,
@@ -129,7 +130,11 @@ impl Parent {
             reactive::driver::open_that::StaticOpenThatDriver::new(url.to_string());
         let (eprintln_driver, ()) = reactive::driver::println::EprintlnDriver::new();
         let (notify_driver, notify) =
-            match reactive::driver::notify::FsChangeDriver::new(BUILDER_CRATE_NAME) {
+            match reactive::driver::notify::FsChangeDriver::new(Utf8PathBuf::from_iter([
+                env!("CARGO_MANIFEST_DIR"),
+                "..",
+                BUILDER_CRATE_NAME,
+            ])) {
                 Ok(val) => val,
                 Err(e) => return e.into(),
             };