spacedrive changes

Cargo.toml

@@ -6,7 +6,7 @@ members = [
   "tests/*/*",
   "crates/*",
   "crates/sdk/example/*",
-  "prisma-cli"
+  "prisma-cli",
 ]
 exclude = ["examples/tauri"]
 resolver = "2"
@@ -27,7 +27,11 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
 convert_case = "0.6.0"
-rspc = { version = "=1.0.0-rc.5" }
 
-specta = { version = "=2.0.0-rc.1" }
-tauri-specta = { git = "https://github.com/oscartbeaumont/tauri-specta", branch = "v2" }
+tauri-specta = { version = "2.0.0-rc.9" }
+# As this is SD's fork this is okay.
+# We will always lock the version within Spacedrive.
+rspc = "*"
+
+# We don't lock version cause PCR only depends on `derive(Type)` so it should be fine.
+specta = "^2.0.0-rc"

crates/cli/Cargo.toml

@@ -29,7 +29,10 @@ proc-macro2 = "1.0.39"
 http = "0.2.6"
 directories = "4.0.1"
 flate2 = "1.0.23"
-reqwest = { version = "0.11.10", features = ["blocking"] }
+reqwest = { version = "0.11.10", features = [
+    "blocking",
+    "native-tls-vendored",
+] }
 regex = "1.5.5"
 thiserror = "1.0.37"
 

crates/generator-macros/Cargo.toml

@@ -6,11 +6,14 @@ edition = "2021"
 [lib]
 proc-macro = true
 
+[features]
+specta = []
+
 [dependencies]
 prisma-client-rust-generator-shared = { path = "../generator-shared" }
 convert_case.workspace = true
 proc-macro2 = "1.0.39"
 quote = "1.0.18"
 syn = "1.0.91"
 
-specta = { workspace = true, optional = true }
+# specta = { workspace = true, optional = true }

crates/generator/Cargo.toml

@@ -29,7 +29,10 @@ proc-macro2 = "1.0.39"
 http = "0.2.6"
 directories = "4.0.1"
 flate2 = "1.0.23"
-reqwest = { version = "0.11.10", features = ["blocking"] }
+reqwest = { version = "0.11.10", features = [
+    "blocking",
+    "native-tls-vendored",
+] }
 regex = "1.5.5"
 thiserror = "1.0.37"
 

crates/generator/src/composite_types/data.rs

@@ -19,7 +19,7 @@ pub fn struct_definition(ty: CompositeTypeWalker) -> TokenStream {
 
         quote! {
             #[derive(::prisma_client_rust::specta::Type)]
-            #[specta(rename = #ty_name_pascal_str, crate = "prisma_client_rust::specta")]
+            #[specta(rename = #ty_name_pascal_str, crate = prisma_client_rust::specta)]
         }
     });
 

crates/generator/src/enums.rs

@@ -36,7 +36,7 @@ pub fn generate(args: &GenerateArgs) -> TokenStream {
 
             quote! {
                 #[derive(::prisma_client_rust::specta::Type)]
-                #[specta(rename = #model_name_pascal_str, crate = "prisma_client_rust::specta")]
+                #[specta(rename = #model_name_pascal_str, crate = prisma_client_rust::specta)]
             }
         });
 

crates/generator/src/models/data.rs

@@ -160,7 +160,7 @@ pub fn r#struct(model: ModelWalker) -> TokenStream {
 
         quote! {
             #[derive(::prisma_client_rust::specta::Type)]
-            #[specta(rename = #model_name_pascal_str, crate = "prisma_client_rust::specta")]
+            #[specta(rename = #model_name_pascal_str, crate = prisma_client_rust::specta)]
         }
     });