Skip to content

Commit 930c2b6

Browse files
GitButler WIP Commit
1 parent 40f9872 commit 930c2b6

File tree

5 files changed

+74
-52
lines changed

5 files changed

+74
-52
lines changed

Cargo.lock

Lines changed: 69 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/gitbutler-tauri/Cargo.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,18 @@ gitbutler-diff.workspace = true
6767
gitbutler-operating-modes.workspace = true
6868
gitbutler-edit-mode.workspace = true
6969
open = "5"
70-
regex = "1.10"
71-
arc-swap = "1"
72-
73-
[target.'cfg(unix)'.dependencies]
74-
nix = { version = "0.29", features = ["fs"] }
7570

7671
[dependencies.tauri]
7772
version = "1.7.0"
7873
features = [
79-
"shell-execute",
8074
"http-all",
8175
"os-all",
8276
"dialog-open",
8377
"fs-read-file",
8478
"path-all",
8579
"process-relaunch",
8680
"protocol-asset",
81+
"shell-open",
8782
"window-maximize",
8883
"window-start-dragging",
8984
"window-unmaximize",

crates/gitbutler-tauri/tauri.conf.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,7 @@
1616
"scope": ["$APPCACHE/archives/*", "$RESOURCE/_up_/scripts/*"]
1717
},
1818
"shell": {
19-
"open": false,
20-
"execute": true,
21-
"scope": [
22-
{
23-
"name": "xdg-open",
24-
"cmd": "xdg-open",
25-
"args": true
26-
}
27-
]
19+
"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
2820
},
2921
"dialog": {
3022
"open": true

crates/gitbutler-tauri/tauri.conf.nightly.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,9 @@
88
"tauri": {
99
"allowlist": {
1010
"shell": {
11-
"open": false,
12-
"execute": true,
13-
"scope": [
14-
{
15-
"name": "xdg-open",
16-
"cmd": "xdg-open",
17-
"args": true
18-
}
19-
]
11+
"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
2012
}
21-
},
13+
},
2214
"bundle": {
2315
"identifier": "com.gitbutler.app.nightly",
2416
"icon": [

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dev:ui": "pnpm --filter @gitbutler/ui storybook",
1212
"dev:web": "turbo run --filter @gitbutler/web dev --no-daemon",
1313
"dev:desktop": "pnpm tauri dev",
14-
"dev:internal-tauri": "turbo watch --filter @gitbutler/desktop dev",
14+
"dev:internal-tauri": "turbo run --filter @gitbutler/desktop dev",
1515
"test": "turbo run test --no-daemon",
1616
"test:watch": "pnpm --filter @gitbutler/desktop run test:watch",
1717
"test:e2e": "pnpm --filter @gitbutler/desktop run test:e2e",

0 commit comments

Comments
 (0)