Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix tauri desktop plugin workspace source (#4695)

Sean Ayea8169dcca877
diff --git a/js/app/tauri/Cargo.lock b/js/app/tauri/Cargo.lock
index 0e9699efb2..f05564fea8 100644
--- a/js/app/tauri/Cargo.lock
+++ b/js/app/tauri/Cargo.lock
@@ -5475,7 +5475,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-fs"
version = "2.5.1"
-source = "git+https://github.com/seanaye/plugins-workspace?rev=65794e6229a3e109c14d81d678d86c7802ada304#65794e6229a3e109c14d81d678d86c7802ada304"
+source = "git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca"
dependencies = [
"anyhow",
"dunce",
@@ -5512,7 +5512,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-http"
version = "2.5.9"
-source = "git+https://github.com/seanaye/plugins-workspace?rev=65794e6229a3e109c14d81d678d86c7802ada304#65794e6229a3e109c14d81d678d86c7802ada304"
+source = "git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca"
dependencies = [
"bytes",
"cookie_store",
@@ -5695,7 +5695,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-websocket"
version = "2.4.2"
-source = "git+https://github.com/seanaye/plugins-workspace?rev=65794e6229a3e109c14d81d678d86c7802ada304#65794e6229a3e109c14d81d678d86c7802ada304"
+source = "git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca"
dependencies = [
"futures-util",
"http",
diff --git a/js/app/tauri/src-tauri/Cargo.lock b/js/app/tauri/src-tauri/Cargo.lock
index 2c3977c3e6..ce3861e1d7 100644
--- a/js/app/tauri/src-tauri/Cargo.lock
+++ b/js/app/tauri/src-tauri/Cargo.lock
@@ -4491,7 +4491,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-fs"
version = "2.4.2"
-source = "git+https://github.com/seanaye/plugins-workspace?branch=seanaye/feat/websocket-cookies#41a10c2912be75a4a17307295f42e08aeae17989"
+source = "git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca"
dependencies = [
"anyhow",
"dunce",
@@ -4512,7 +4512,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-http"
version = "2.5.2"
-source = "git+https://github.com/seanaye/plugins-workspace?branch=seanaye/feat/websocket-cookies#41a10c2912be75a4a17307295f42e08aeae17989"
+source = "git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca"
dependencies = [
"bytes",
"cookie_store",
@@ -4656,7 +4656,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-websocket"
version = "2.4.0"
-source = "git+https://github.com/seanaye/plugins-workspace?branch=seanaye/feat/websocket-cookies#41a10c2912be75a4a17307295f42e08aeae17989"
+source = "git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca"
dependencies = [
"futures-util",
"http",
diff --git a/js/app/tauri/src-tauri/Cargo.toml b/js/app/tauri/src-tauri/Cargo.toml
index e705722aa2..63d0db1fa8 100644
--- a/js/app/tauri/src-tauri/Cargo.toml
+++ b/js/app/tauri/src-tauri/Cargo.toml
@@ -44,13 +44,13 @@ tokio-util = { version = "0.7", features = ["io"] }
# seanaye/feat/ws-replay-buffer; keep both plugin revs identical, and keep the
# TauriMessage/ReplayEnvelope types in packages/websocket/platform/tauri-websocket.ts
# in sync when bumping
-tauri-plugin-http = { git = "https://github.com/macro-inc/plugins-workspace", rev = "a1351a7c8c9f4dfe9699badd940cfc5afdb68e36", features = [
+tauri-plugin-http = { git = "https://github.com/macro-inc/plugins-workspace", rev = "06474e4c446600627cf37a11f0c22c27bcf764ca", features = [
"unsafe-headers",
] }
tauri-plugin-log = { version = "2", features = ["tracing"] }
tauri-plugin-opener = "2"
tauri-plugin-safe-area-insets = "0.1.0"
-tauri-plugin-websocket = { git = "https://github.com/macro-inc/plugins-workspace", rev = "a1351a7c8c9f4dfe9699badd940cfc5afdb68e36" }
+tauri-plugin-websocket = { git = "https://github.com/macro-inc/plugins-workspace", rev = "06474e4c446600627cf37a11f0c22c27bcf764ca" }
thiserror = "2.0.14"
tokio = { version = "1.47.1", features = ["full"] }
tracing = { workspace = true }
diff --git a/nix/tauri-desktop.nix b/nix/tauri-desktop.nix
index f1a6aac38e..a976b2d003 100644
--- a/nix/tauri-desktop.nix
+++ b/nix/tauri-desktop.nix
@@ -103,10 +103,8 @@
outputHashes = {
"git+https://github.com/macro-inc/tauri-plugins?rev=26537c8a46bb8424f9cf4021d08aa76aa7cd66ef#26537c8a46bb8424f9cf4021d08aa76aa7cd66ef" =
"sha256-v0Pn8kiRXaczNrFNjXct7yZUQ50qP68l8ivQDumu7Hw=";
- "git+https://github.com/seanaye/plugins-workspace?branch=seanaye%2Ffeat%2Fwebsocket-cookies#c23e1d7b24391a79b5bcfc3df535452c17f1f01c" =
- "sha256-cxxQLB9q/Ajh0YkyyZ0AuLt9Syeq+g7LcSqNr05SDXo=";
- "git+https://github.com/seanaye/plugins-workspace?branch=seanaye/feat/websocket-cookies#c23e1d7b24391a79b5bcfc3df535452c17f1f01c" =
- "sha256-cxxQLB9q/Ajh0YkyyZ0AuLt9Syeq+g7LcSqNr05SDXo=";
+ "git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca" =
+ "sha256-ngH5sltERe8DlP/zjsin9jmlGOZFeABk8SxJ5AnZG18=";
"git+https://github.com/seanaye/tauri?rev=95a7521b#95a7521b8c565cfba568319ddd8ba79c9ce244e2" =
"sha256-5HamTWAZPtUSWOfP3TgtiqFJvunlPXy9/C0TLHQpXlU=";
"git+https://github.com/voxelbee/tauri-plugin-virtual-keyboard?branch=main#70e8e8325b5ff7d681ef5f3b996ac083d4fc5a01" =