Skip to content

Commit

Permalink
GitButler WIP Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
gitbutler-client committed Aug 29, 2024
1 parent 40f9872 commit 930c2b6
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 52 deletions.
95 changes: 69 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions crates/gitbutler-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,18 @@ gitbutler-diff.workspace = true
gitbutler-operating-modes.workspace = true
gitbutler-edit-mode.workspace = true
open = "5"
regex = "1.10"
arc-swap = "1"

[target.'cfg(unix)'.dependencies]
nix = { version = "0.29", features = ["fs"] }

[dependencies.tauri]
version = "1.7.0"
features = [
"shell-execute",
"http-all",
"os-all",
"dialog-open",
"fs-read-file",
"path-all",
"process-relaunch",
"protocol-asset",
"shell-open",
"window-maximize",
"window-start-dragging",
"window-unmaximize",
Expand Down
10 changes: 1 addition & 9 deletions crates/gitbutler-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,7 @@
"scope": ["$APPCACHE/archives/*", "$RESOURCE/_up_/scripts/*"]
},
"shell": {
"open": false,
"execute": true,
"scope": [
{
"name": "xdg-open",
"cmd": "xdg-open",
"args": true
}
]
"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
},
"dialog": {
"open": true
Expand Down
12 changes: 2 additions & 10 deletions crates/gitbutler-tauri/tauri.conf.nightly.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,9 @@
"tauri": {
"allowlist": {
"shell": {
"open": false,
"execute": true,
"scope": [
{
"name": "xdg-open",
"cmd": "xdg-open",
"args": true
}
]
"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
}
},
},
"bundle": {
"identifier": "com.gitbutler.app.nightly",
"icon": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dev:ui": "pnpm --filter @gitbutler/ui storybook",
"dev:web": "turbo run --filter @gitbutler/web dev --no-daemon",
"dev:desktop": "pnpm tauri dev",
"dev:internal-tauri": "turbo watch --filter @gitbutler/desktop dev",
"dev:internal-tauri": "turbo run --filter @gitbutler/desktop dev",
"test": "turbo run test --no-daemon",
"test:watch": "pnpm --filter @gitbutler/desktop run test:watch",
"test:e2e": "pnpm --filter @gitbutler/desktop run test:e2e",
Expand Down

0 comments on commit 930c2b6

Please sign in to comment.