From 7b486a59a715338a49ed7a6a399fae4a4d7e0e75 Mon Sep 17 00:00:00 2001
From: Pauline <git@ethanlibs.co>
Date: Thu, 25 Jul 2024 11:23:27 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20bump=20deps=20and=20finis?=
 =?UTF-8?q?h=20backport?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.toml                | 71 ++++++++++++++++++++++++++++-----------
 apps/desktop/package.json |  1 +
 pnpm-lock.yaml            |  5 +++
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 36ec9a2e..2128c7b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,21 +56,6 @@ tauri-specta = { version = "=2.0.0-rc.11", features = [
 # rspc-tauri2 is updated on the main branch
 rspc-tauri2 = { version = "=0.0.1" }
 
-# prisma-client-rust* is updated on the main branch
-prisma-client-rust = { version = "=0.6.8", features = [
-  "migrations",
-  "specta",
-  "sqlite",
-  "sqlite-create-many",
-], default-features = false }
-prisma-client-rust-cli = { version = "=0.6.8", features = [
-  "migrations",
-  "specta",
-  "sqlite",
-  "sqlite-create-many",
-], default-features = false }
-prisma-client-rust-sdk = { version = "=0.6.8", features = [ "sqlite" ], default-features = false }
-
 # interpulse is updated on the main branch
 interpulse = { version = "=1.0.0", features = [ "specta" ] }
 
@@ -139,7 +124,8 @@ open = { version = "5.1" }
 discord-rich-presence = { version = "0.2" }
 winreg = { version = "0.52" }
 paste = { version = "1.0" }
-sha1_smol = { version = "1.0.0", features = [ "std" ] }
+dashmap = { version = "6.0", features = [ "serde" ] }
+sha1_smol = { version = "1.0", features = [ "std" ] }
 sha2 = { version = "0.10" }
 bytes = { version = "1.6" }
 lazy_static = { version = "1.4" }
@@ -154,6 +140,33 @@ whoami = { version = "1.5" }
 cocoa = { version = "0.25" }
 objc = { version = "0.2" }
 
+webbrowser = { version = "1.0" }
+url = { version = "2.5.2" }
+
+[workspace.dependencies.prisma-client-rust]
+git = "https://github.com/brendonovich/prisma-client-rust"
+rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab"
+features = [
+  "migrations",
+  "specta",
+  "sqlite",
+  "sqlite-create-many",
+  "rspc"
+]
+default-features = false
+
+[workspace.dependencies.prisma-client-rust-cli]
+git = "https://github.com/brendonovich/prisma-client-rust"
+rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab"
+features = [
+  "migrations",
+  "specta",
+  "sqlite",
+  "sqlite-create-many",
+  "rspc"
+]
+default-features = false
+
 [patch.crates-io]
 specta = { git = "https://github.com/oscartbeaumont/specta", rev = "fadef54000e131008ff6e9dd7efe2ba36479c077" }
 rspc = { git = "https://github.com/oscartbeaumont/rspc", rev = "9f26d6400affdb501837cb023678268ad72feb9b" }
@@ -161,18 +174,29 @@ tauri-specta = { git = "https://github.com/oscartbeaumont/tauri-specta", rev = "
 rspc-tauri2 = { git = "https://github.com/specta-rs/tauri2", rev = "6b9419566e2a826fb2a62538c7647f4524ab0fea" }
 interpulse = { git = "https://github.com/pulseflow/workers", rev = "4d247c78545703200435a4a063c3f77fd644370f" }
 
-prisma-client-rust = { git = "https://github.com/brendonovich/prisma-client-rust", rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab" }
-prisma-client-rust-cli = { git = "https://github.com/brendonovich/prisma-client-rust", rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab" }
-prisma-client-rust-sdk = { git = "https://github.com/brendonovich/prisma-client-rust", rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab" }
-
 [profile.dev]
 # add debug symbols/logic and optimize for reduced build time (parallel)
 debug = true
+# opt-level = 0
+# strip = "none"
+# incremental = true
+# split-debuginfo = "unpacked"
 lto = false
 codegen-units = 256
 rpath = false
 panic = "unwind"
 
+# add debug symbols/logic and optimize for reduced build time (parallel)
+[profile.dev-debug]
+inherits = "dev"
+split-debuginfo = "none"
+opt-level = 0
+debug = "full"
+strip = "none"
+lto = "off"
+codegen-units = 256
+incremental = true
+
 # Set the settings for build scripts and proc-macros.
 [profile.dev.build-override]
 opt-level = 3
@@ -182,6 +206,13 @@ opt-level = 3
 opt-level = 3
 incremental = false
 
+# sets the default for dependencies, except workspace members.
+[profile.dev-debug.package."*"]
+inherits = "dev"
+opt-level = 3
+debug = "full"
+incremental = false
+
 # optimize for speed and reduce size for release
 [profile.release]
 panic = "abort" # strip panic cleanup logic
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index fcc5fb28..9d975501 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -19,6 +19,7 @@
 		"@iconify-json/logos": "^1.1.43",
 		"@leeoniya/ufuzzy": "^1.0.14",
 		"@onelauncher/client": "workspace:*",
+		"@onelauncher/distribution": "workspace:*",
 		"@rspc/client": "^0.2.3",
 		"@rspc/solid-query": "^0.2.3",
 		"@rspc/tauri": "^0.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 87002b5c..a4ce73af 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,6 +56,9 @@ importers:
       '@onelauncher/client':
         specifier: workspace:*
         version: link:../../packages/client
+      '@onelauncher/distribution':
+        specifier: workspace:*
+        version: link:../../packages/distribution
       '@rspc/client':
         specifier: ^0.2.3
         version: 0.2.3
@@ -172,6 +175,8 @@ importers:
         specifier: ^3.23.8
         version: 3.23.8
 
+  packages/distribution: {}
+
   packages/scripts:
     dependencies:
       '@flowr/utils':