Software-Mac/spacedrive
Software-Mac/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive synced 2024-07-04 12:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some stuff (#794)

Browse source 
* Update Tauri

* fix

* fix the entire damn app
2 times in two weeks lol
This commit is contained in:
Oscar Beaumont 2023-05-06 00:08:00 +08:00 committed by GitHub
parent f250e4c49d
commit 0d9c1b8329
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 4606 additions and 4242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

621
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -45,5 +45,5 @@ if-watch = { git = "https://github.com/oscartbeaumont/if-watch", rev = "410e8e1d
mdns-sd = { git = "https://github.com/oscartbeaumont/mdns-sd", rev = "45515a98e9e408c102871abaa5a9bff3bee0cbe8" } # TODO: Do upstream PR
rspc = { git = "https://github.com/oscartbeaumont/rspc", rev = "a2d5effcce9e1c8ac8e38551d0f36a6d69b9cd3a" }
rspc = { git = "https://github.com/oscartbeaumont/rspc", rev = "7c57d4ec21f72d96fb5fea4bdb015afa02137990" }
httpz = { git = "https://github.com/oscartbeaumont/httpz", rev = "a5185f2ed2fdefeb2f582dce38a692a1bf76d1d6" }

4
apps/desktop/package.json
View file

@ -15,8 +15,8 @@
"lint": "eslint src --cache"
},
"dependencies": {
"@rspc/client": "=0.0.0-main-a312a505",
"@rspc/tauri": "=0.0.0-main-a312a505",
"@rspc/client": "=0.0.0-main-4caedb14",
"@rspc/tauri": "=0.0.0-main-4caedb14",
"@sd/client": "workspace:*",
"@sd/interface": "workspace:*",
"@sd/ui": "workspace:*",

4
apps/desktop/src-tauri/Cargo.toml
View file

@ -9,7 +9,7 @@ default-run = "spacedrive"
edition = "2021"
[dependencies]
tauri = { version = "1.2.4", features = ["api-all", "linux-protocol-headers", "macos-private-api", "updater"] }
tauri = { version = "1.3.0", features = ["api-all", "linux-protocol-headers", "macos-private-api", "updater"] }
rspc = { workspace = true, features = ["tauri"] }
httpz = { workspace = true, features = ["axum", "tauri"] } # TODO: The `axum` feature should be only enabled on Linux but this currently can't be done: https://github.com/rust-lang/cargo/issues/1197
sd-core = { path = "../../../core", features = ["ffmpeg", "location-watcher"] }
@ -32,7 +32,7 @@ rand = "0.8.5"
sd-desktop-macos.path = "../crates/macos"
[build-dependencies]
tauri-build = { version = "1.1.1", features = [] }
tauri-build = { version = "1.3.0", features = [] }
[features]
default = ["custom-protocol"]

4
apps/mobile/package.json
View file

@ -24,8 +24,8 @@
"@react-navigation/drawer": "^6.6.2",
"@react-navigation/native": "^6.1.6",
"@react-navigation/stack": "^6.3.16",
"@rspc/client": "=0.0.0-main-a312a505",
"@rspc/react": "=0.0.0-main-a312a505",
"@rspc/client": "=0.0.0-main-4caedb14",
"@rspc/react": "=0.0.0-main-4caedb14",
"@sd/assets": "workspace:*",
"@sd/client": "workspace:*",
"@shopify/flash-list": "1.4.2",

2
apps/web/package.json
View file

@ -11,7 +11,7 @@
},
"dependencies": {
"@fontsource/inter": "^4.5.13",
"@rspc/client": "=0.0.0-main-a312a505",
"@rspc/client": "=0.0.0-main-4caedb14",
"@sd/client": "workspace:*",
"@sd/interface": "workspace:*",
"@tanstack/react-query": "^4.12.0",

4
packages/client/package.json
View file

@ -14,8 +14,8 @@
"build": "tsc"
},
"dependencies": {
"@rspc/client": "=0.0.0-main-a312a505",
"@rspc/react": "=0.0.0-main-a312a505",
"@rspc/client": "=0.0.0-main-4caedb14",
"@rspc/react": "=0.0.0-main-4caedb14",
"@sd/config": "workspace:*",
"@tanstack/react-query": "^4.12.0",
"@zxcvbn-ts/core": "^2.1.0",

4
packages/client/src/rspc.tsx
View file

@ -96,9 +96,9 @@ export function useInvalidateQuery() {
useBridgeSubscription(['invalidation.listen'], {
onData: (ops) => {
for (const op of ops) {
const key = [op.key];
let key = [op.key];
if (op.arg !== null) {
key.concat(op.arg);
key = key.concat(op.arg);
}
if (op.result !== null) {

8203
pnpm-lock.yaml
View file

File diff suppressed because it is too large Load diff