Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to Tauri v2 beta #29

Merged
merged 6 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ out
build
dist
target
gen

# Misc
.DS_Store
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ bar:

window_rules:
# Ignore the bar window.
- command: "ignore"
match_process_name: "/Zebar/"
- command: 'ignore'
match_process_name: '/Zebar/'
```

## 🌟 Intro to Zebar
Expand Down
7 changes: 3 additions & 4 deletions packages/client-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
"prepublishOnly": "npm run build"
},
"dependencies": {
"@tauri-apps/api": "2.0.0-alpha.13",
"@tauri-apps/plugin-dialog": "2.0.0-alpha.5",
"@tauri-apps/plugin-shell": "2.0.0-alpha.3",
"@tauri-apps/plugin-window": "2.0.0-alpha.1",
"@tauri-apps/api": "2.0.0-beta.3",
"@tauri-apps/plugin-dialog": "2.0.0-beta.1",
"@tauri-apps/plugin-shell": "2.0.0-beta.1",
"glazewm": "1.1.2",
"luxon": "3.4.4",
"sass": "1.70.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/client-api/src/init-window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export async function initWindowAsync(): Promise<WindowContext> {

await messageDialog((err as Error)?.message ?? 'Unknown reason.', {
title: 'Failed to initialize window!',
type: 'error',
kind: 'error',
});

// Error during window initialization is unrecoverable, so we close
Expand Down
Loading
Loading