From 59667f2977a7cda72b83912cdfeb67f813285531 Mon Sep 17 00:00:00 2001 From: Ren Amamiya <123083837+reyamir@users.noreply.github.com> Date: Mon, 17 Apr 2023 15:23:05 +0700 Subject: [PATCH] moved prisma-rust-client-cli to outside main app --- src-tauri/.cargo/config.toml | 2 +- src-tauri/Cargo.lock | 8 +++++++- src-tauri/Cargo.toml | 4 +++- src-tauri/prisma-cli/Cargo.toml | 9 +++++++++ src-tauri/{src/bin/prisma.rs => prisma-cli/src/main.rs} | 0 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 src-tauri/prisma-cli/Cargo.toml rename src-tauri/{src/bin/prisma.rs => prisma-cli/src/main.rs} (100%) diff --git a/src-tauri/.cargo/config.toml b/src-tauri/.cargo/config.toml index 97680697..2090db11 100644 --- a/src-tauri/.cargo/config.toml +++ b/src-tauri/.cargo/config.toml @@ -1,2 +1,2 @@ [alias] -prisma = "run --bin prisma --" +prisma = "run -p prisma-cli --" diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index dcd40d7b..825615f4 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2398,7 +2398,6 @@ dependencies = [ "cocoa", "objc", "prisma-client-rust", - "prisma-client-rust-cli", "serde", "serde_json", "specta", @@ -3406,6 +3405,13 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "prisma-cli" +version = "0.1.0" +dependencies = [ + "prisma-client-rust-cli", +] + [[package]] name = "prisma-client-rust" version = "0.6.7" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index fed9ca79..72d401a9 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,3 +1,6 @@ +[workspace] +members = ["prisma-cli"] + [package] name = "lume" version = "0.2.5" @@ -18,7 +21,6 @@ serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.2", features = ["clipboard-read-text", "clipboard-write-text", "http-request", "os-all", "shell-open", "system-tray", "window-close", "window-start-dragging"] } prisma-client-rust = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.6.7", default-features = false, features = ["sqlite", "migrations", "mocking", "specta"] } -prisma-client-rust-cli = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.6.7", default-features = false, features = ["sqlite", "migrations", "mocking", "specta"] } specta = "1.0.0" tauri-specta = { version = "1.0.0", features = ["typescript"] } tokio = { version = "1.26.0", features = ["macros"] } diff --git a/src-tauri/prisma-cli/Cargo.toml b/src-tauri/prisma-cli/Cargo.toml new file mode 100644 index 00000000..0098b0c8 --- /dev/null +++ b/src-tauri/prisma-cli/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "prisma-cli" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +prisma-client-rust-cli = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.6.7", default-features = false, features = ["sqlite", "migrations", "mocking", "specta"] } diff --git a/src-tauri/src/bin/prisma.rs b/src-tauri/prisma-cli/src/main.rs similarity index 100% rename from src-tauri/src/bin/prisma.rs rename to src-tauri/prisma-cli/src/main.rs