commit 8e2c0f58d924e187ec3efb86364eabca9c5d0b8e parent 84c135fd3a9a77126f1f4a0db5b7b5bc454ce774 Author: triesap <tyson@radroots.org> Date: Tue, 26 May 2026 19:34:41 +0000 build: move app crate directories Diffstat:
78 files changed, 89 insertions(+), 90 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml @@ -1,14 +1,14 @@ [workspace] members = [ - "crates/shared/core", - "crates/shared/i18n", + "crates/runtime", + "crates/i18n", "crates/shared/models", - "crates/shared/remote_signer", - "crates/shared/sqlite", - "crates/shared/state", - "crates/shared/sync", - "crates/shared/ui", - "crates/launchers/desktop", + "crates/signer", + "crates/store", + "crates/state", + "crates/sync", + "crates/ui", + "crates/desktop", ] resolver = "2" @@ -42,13 +42,13 @@ radroots_runtime_paths = { path = "../lib/crates/runtime_paths" } radroots_secret_vault = { path = "../lib/crates/secret_vault", default-features = false, features = ["std"] } radroots_sdk = { path = "../lib/crates/sdk", features = ["relay-client", "signing"] } radroots_sql_core = { path = "../lib/crates/sql_core", features = ["native"] } -radroots_app_core = { path = "crates/shared/core", version = "0.1.0" } -radroots_app_i18n = { path = "crates/shared/i18n", version = "0.1.0" } +radroots_app_core = { path = "crates/runtime", version = "0.1.0" } +radroots_app_i18n = { path = "crates/i18n", version = "0.1.0" } radroots_app_models = { path = "crates/shared/models", version = "0.1.0" } -radroots_app_sqlite = { path = "crates/shared/sqlite", version = "0.1.0" } -radroots_app_state = { path = "crates/shared/state", version = "0.1.0" } -radroots_app_sync = { path = "crates/shared/sync", version = "0.1.0" } -radroots_app_ui = { path = "crates/shared/ui", version = "0.1.0" } +radroots_app_sqlite = { path = "crates/store", version = "0.1.0" } +radroots_app_state = { path = "crates/state", version = "0.1.0" } +radroots_app_sync = { path = "crates/sync", version = "0.1.0" } +radroots_app_ui = { path = "crates/ui", version = "0.1.0" } rusqlite = { version = "0.39", features = ["bundled"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/crates/desktop/Cargo.toml b/crates/desktop/Cargo.toml @@ -0,0 +1,44 @@ +[package] +name = "radroots_app" +version.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +license.workspace = true +publish = false + +[dependencies] +chrono.workspace = true +futures-util.workspace = true +gpui.workspace = true +gpui-component.workspace = true +gpui-component-assets.workspace = true +radroots_core.workspace = true +radroots_identity.workspace = true +radroots_nostr.workspace = true +radroots_nostr_accounts.workspace = true +radroots_protected_store.workspace = true +radroots_secret_vault.workspace = true +radroots_sdk.workspace = true +radroots_app_core.workspace = true +radroots_app_i18n.workspace = true +radroots_app_models.workspace = true +radroots_app_remote_signer = { path = "../signer" } +radroots_app_sqlite.workspace = true +radroots_app_state.workspace = true +radroots_app_sync.workspace = true +radroots_app_ui.workspace = true +radroots_local_events.workspace = true +radroots_sql_core.workspace = true +serde_json.workspace = true +thiserror.workspace = true +tokio.workspace = true +tokio-tungstenite.workspace = true +tracing.workspace = true +uuid.workspace = true + +[dev-dependencies] +tracing-subscriber.workspace = true + +[lints] +workspace = true diff --git a/crates/launchers/desktop/src/accounts.rs b/crates/desktop/src/accounts.rs diff --git a/crates/launchers/desktop/src/app.rs b/crates/desktop/src/app.rs diff --git a/crates/launchers/desktop/src/lib.rs b/crates/desktop/src/lib.rs diff --git a/crates/launchers/desktop/src/main.rs b/crates/desktop/src/main.rs diff --git a/crates/launchers/desktop/src/menus.rs b/crates/desktop/src/menus.rs diff --git a/crates/launchers/desktop/src/pack_day_host_handoff.rs b/crates/desktop/src/pack_day_host_handoff.rs diff --git a/crates/launchers/desktop/src/pack_day_print.rs b/crates/desktop/src/pack_day_print.rs diff --git a/crates/launchers/desktop/src/remote_signer.rs b/crates/desktop/src/remote_signer.rs diff --git a/crates/launchers/desktop/src/runtime.rs b/crates/desktop/src/runtime.rs diff --git a/crates/launchers/desktop/src/source_guards.rs b/crates/desktop/src/source_guards.rs diff --git a/crates/launchers/desktop/src/window.rs b/crates/desktop/src/window.rs diff --git a/crates/shared/i18n/Cargo.toml b/crates/i18n/Cargo.toml diff --git a/crates/i18n/build.rs b/crates/i18n/build.rs @@ -0,0 +1,31 @@ +use std::env; +use std::path::{Path, PathBuf}; + +use mf2_i18n::build::{NativeModuleBuildOptions, build_native_module}; + +fn main() { + let manifest_dir = + PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("cargo manifest dir should exist")); + let app_root = manifest_dir + .parent() + .and_then(Path::parent) + .expect("app root should be discoverable from i18n crate"); + let config_path = app_root.join("i18n").join("mf2_i18n.toml"); + let out_dir = PathBuf::from(env::var("OUT_DIR").expect("out dir should exist")); + + let build_output = build_native_module(&NativeModuleBuildOptions::new( + &config_path, + &out_dir, + "app_i18n", + )) + .unwrap_or_else(|error| { + panic!( + "failed to build app i18n native module from {}: {error}", + config_path.display() + ) + }); + + for path in build_output.rerun_if_changed_paths() { + println!("cargo:rerun-if-changed={}", path.display()); + } +} diff --git a/crates/shared/i18n/src/keys.rs b/crates/i18n/src/keys.rs diff --git a/crates/shared/i18n/src/lib.rs b/crates/i18n/src/lib.rs diff --git a/crates/launchers/desktop/Cargo.toml b/crates/launchers/desktop/Cargo.toml @@ -1,44 +0,0 @@ -[package] -name = "radroots_app" -version.workspace = true -edition.workspace = true -authors.workspace = true -rust-version.workspace = true -license.workspace = true -publish = false - -[dependencies] -chrono.workspace = true -futures-util.workspace = true -gpui.workspace = true -gpui-component.workspace = true -gpui-component-assets.workspace = true -radroots_core.workspace = true -radroots_identity.workspace = true -radroots_nostr.workspace = true -radroots_nostr_accounts.workspace = true -radroots_protected_store.workspace = true -radroots_secret_vault.workspace = true -radroots_sdk.workspace = true -radroots_app_core.workspace = true -radroots_app_i18n.workspace = true -radroots_app_models.workspace = true -radroots_app_remote_signer = { path = "../../shared/remote_signer" } -radroots_app_sqlite.workspace = true -radroots_app_state.workspace = true -radroots_app_sync.workspace = true -radroots_app_ui.workspace = true -radroots_local_events.workspace = true -radroots_sql_core.workspace = true -serde_json.workspace = true -thiserror.workspace = true -tokio.workspace = true -tokio-tungstenite.workspace = true -tracing.workspace = true -uuid.workspace = true - -[dev-dependencies] -tracing-subscriber.workspace = true - -[lints] -workspace = true diff --git a/crates/shared/core/Cargo.toml b/crates/runtime/Cargo.toml diff --git a/crates/shared/core/src/lib.rs b/crates/runtime/src/lib.rs diff --git a/crates/shared/core/src/logging.rs b/crates/runtime/src/logging.rs diff --git a/crates/shared/core/src/pack_day_export.rs b/crates/runtime/src/pack_day_export.rs diff --git a/crates/shared/core/src/paths.rs b/crates/runtime/src/paths.rs diff --git a/crates/shared/core/src/runtime.rs b/crates/runtime/src/runtime.rs diff --git a/crates/shared/core/src/startup.rs b/crates/runtime/src/startup.rs diff --git a/crates/shared/i18n/build.rs b/crates/shared/i18n/build.rs @@ -1,32 +0,0 @@ -use std::env; -use std::path::{Path, PathBuf}; - -use mf2_i18n::build::{NativeModuleBuildOptions, build_native_module}; - -fn main() { - let manifest_dir = - PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("cargo manifest dir should exist")); - let app_root = manifest_dir - .parent() - .and_then(Path::parent) - .and_then(Path::parent) - .expect("app root should be discoverable from shared i18n crate"); - let config_path = app_root.join("i18n").join("mf2_i18n.toml"); - let out_dir = PathBuf::from(env::var("OUT_DIR").expect("out dir should exist")); - - let build_output = build_native_module(&NativeModuleBuildOptions::new( - &config_path, - &out_dir, - "app_i18n", - )) - .unwrap_or_else(|error| { - panic!( - "failed to build app i18n native module from {}: {error}", - config_path.display() - ) - }); - - for path in build_output.rerun_if_changed_paths() { - println!("cargo:rerun-if-changed={}", path.display()); - } -} diff --git a/crates/shared/remote_signer/Cargo.toml b/crates/signer/Cargo.toml diff --git a/crates/shared/remote_signer/src/error.rs b/crates/signer/src/error.rs diff --git a/crates/shared/remote_signer/src/input.rs b/crates/signer/src/input.rs diff --git a/crates/shared/remote_signer/src/lib.rs b/crates/signer/src/lib.rs diff --git a/crates/shared/remote_signer/src/protocol.rs b/crates/signer/src/protocol.rs diff --git a/crates/shared/remote_signer/src/session.rs b/crates/signer/src/session.rs diff --git a/crates/shared/state/Cargo.toml b/crates/state/Cargo.toml diff --git a/crates/shared/state/src/lib.rs b/crates/state/src/lib.rs diff --git a/crates/shared/sqlite/Cargo.toml b/crates/store/Cargo.toml diff --git a/crates/shared/sqlite/migrations/0001_init.sql b/crates/store/migrations/0001_init.sql diff --git a/crates/shared/sqlite/migrations/0002_activity_journal.sql b/crates/store/migrations/0002_activity_journal.sql diff --git a/crates/shared/sqlite/migrations/0003_account_surface_activation.sql b/crates/store/migrations/0003_account_surface_activation.sql diff --git a/crates/shared/sqlite/migrations/0004_account_farm_setup.sql b/crates/store/migrations/0004_account_farm_setup.sql diff --git a/crates/shared/sqlite/migrations/0005_products_workflow.sql b/crates/store/migrations/0005_products_workflow.sql diff --git a/crates/shared/sqlite/migrations/0006_farm_rules_workspace.sql b/crates/store/migrations/0006_farm_rules_workspace.sql diff --git a/crates/shared/sqlite/migrations/0007_activity_farm_settings_section.sql b/crates/store/migrations/0007_activity_farm_settings_section.sql diff --git a/crates/shared/sqlite/migrations/0008_orders_and_pack_day.sql b/crates/store/migrations/0008_orders_and_pack_day.sql diff --git a/crates/shared/sqlite/migrations/0009_buyer_marketplace.sql b/crates/store/migrations/0009_buyer_marketplace.sql diff --git a/crates/shared/sqlite/migrations/0010_sync_contract_alignment.sql b/crates/store/migrations/0010_sync_contract_alignment.sql diff --git a/crates/shared/sqlite/migrations/0011_reminders_and_recovery.sql b/crates/store/migrations/0011_reminders_and_recovery.sql diff --git a/crates/shared/sqlite/migrations/0012_local_interop_imports.sql b/crates/store/migrations/0012_local_interop_imports.sql diff --git a/crates/shared/sqlite/migrations/0013_local_interop_projection_cursor.sql b/crates/store/migrations/0013_local_interop_projection_cursor.sql diff --git a/crates/shared/sqlite/migrations/0014_buyer_order_coordination.sql b/crates/store/migrations/0014_buyer_order_coordination.sql diff --git a/crates/shared/sqlite/migrations/0015_buyer_order_listing_identity.sql b/crates/store/migrations/0015_buyer_order_listing_identity.sql diff --git a/crates/shared/sqlite/migrations/0016_deterministic_outbox.sql b/crates/store/migrations/0016_deterministic_outbox.sql diff --git a/crates/shared/sqlite/migrations/0017_product_category.sql b/crates/store/migrations/0017_product_category.sql diff --git a/crates/shared/sqlite/migrations/0018_listing_relay_provenance.sql b/crates/store/migrations/0018_listing_relay_provenance.sql diff --git a/crates/shared/sqlite/migrations/0019_relay_ingest_freshness.sql b/crates/store/migrations/0019_relay_ingest_freshness.sql diff --git a/crates/shared/sqlite/migrations/0020_declined_order_status.sql b/crates/store/migrations/0020_declined_order_status.sql diff --git a/crates/shared/sqlite/migrations/0021_local_interop_signed_event_evidence.sql b/crates/store/migrations/0021_local_interop_signed_event_evidence.sql diff --git a/crates/shared/sqlite/src/activation.rs b/crates/store/src/activation.rs diff --git a/crates/shared/sqlite/src/activity.rs b/crates/store/src/activity.rs diff --git a/crates/shared/sqlite/src/buyer.rs b/crates/store/src/buyer.rs diff --git a/crates/shared/sqlite/src/error.rs b/crates/store/src/error.rs diff --git a/crates/shared/sqlite/src/farm_rules.rs b/crates/store/src/farm_rules.rs diff --git a/crates/shared/sqlite/src/farm_setup.rs b/crates/store/src/farm_setup.rs diff --git a/crates/shared/sqlite/src/lib.rs b/crates/store/src/lib.rs diff --git a/crates/shared/sqlite/src/local_interop.rs b/crates/store/src/local_interop.rs diff --git a/crates/shared/sqlite/src/migrations.rs b/crates/store/src/migrations.rs diff --git a/crates/shared/sqlite/src/orders.rs b/crates/store/src/orders.rs diff --git a/crates/shared/sqlite/src/products.rs b/crates/store/src/products.rs diff --git a/crates/shared/sqlite/src/reminders.rs b/crates/store/src/reminders.rs diff --git a/crates/shared/sqlite/src/sync.rs b/crates/store/src/sync.rs diff --git a/crates/shared/sqlite/src/today.rs b/crates/store/src/today.rs diff --git a/crates/shared/sync/Cargo.toml b/crates/sync/Cargo.toml diff --git a/crates/shared/sync/src/lib.rs b/crates/sync/src/lib.rs diff --git a/crates/shared/sync/src/publish.rs b/crates/sync/src/publish.rs diff --git a/crates/shared/ui/Cargo.toml b/crates/ui/Cargo.toml diff --git a/crates/shared/ui/src/lib.rs b/crates/ui/src/lib.rs diff --git a/crates/shared/ui/src/primitives.rs b/crates/ui/src/primitives.rs diff --git a/crates/shared/ui/src/text.rs b/crates/ui/src/text.rs diff --git a/crates/shared/ui/src/theme.rs b/crates/ui/src/theme.rs