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

tauri: migrating to V2 #585

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fixes for tauri v2 (#666)
misc changes i find while testing.

tauri changed the platform() function in v2, it's no longer async so we
dont need to await. this lets us remove it from the onMount function and
use it in the top level script. the platform() function also returns
"windows", "macos", or "linux" now in lieu of "win32" and "darwin". this
allowed me to simplify the logic in mods.ts.

added /gen folder to the gitignore

did a full pass through with cargo clippy to adhere to rust best practices
trippjoe authored Jan 15, 2025
commit 556b2a6fc103686ee05a90557f63afb8adcaa647
1 change: 1 addition & 0 deletions src-tauri/.gitignore
Original file line number Diff line number Diff line change
@@ -4,3 +4,4 @@
WixTools
data/
bin
/gen
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ license = "ISC"
repository = "https://github.com/open-goal/launcher"
default-run = "opengoal-launcher"
edition = "2021"
rust-version = "1.61"
rust-version = "1.64"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

15 changes: 0 additions & 15 deletions src-tauri/capabilities/desktop.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
{
"identifier": "migrated",
"description": "permissions that were migrated from v1",
"local": true,
"identifier": "desktop-capability",
"platforms": [
"macOS",
"windows",
"linux"
],
"windows": [
"main", "splashscreen"
"main",
"splashscreen"
],
"permissions": [
"updater:default",
"global-shortcut:default",
"fs:default",
"fs:allow-appdata-write-recursive",
"fs:allow-resource-read-recursive",
"shell:default",
"dialog:default",
"http:default",
"clipboard-manager:default",
"os:default",
"core:default",
"fs:allow-read-file",
"fs:allow-write-file",
"fs:allow-read-dir",
"fs:allow-copy-file",
"fs:allow-mkdir",
"fs:allow-remove",
"fs:allow-remove",
"fs:allow-rename",
"fs:allow-exists",
{
"identifier": "fs:scope",
"allow": [
"$APP/",
"$APP/iso/*",
"$APP/*",
"$APP/**/*",
"$RESOURCE/**/*"
]
},
"process:default",
"notification:default",
"os:allow-hostname",
"core:window:allow-create",
"core:window:allow-center",
"core:window:allow-request-user-attention",
@@ -58,40 +56,14 @@
"core:window:allow-set-cursor-position",
"core:window:allow-set-ignore-cursor-events",
"core:window:allow-start-dragging",
"core:webview:allow-print",
"shell:allow-execute",
"shell:allow-open",
"dialog:allow-open",
"dialog:allow-save",
"dialog:allow-message",
"dialog:allow-ask",
"dialog:allow-confirm",
"http:default",
"notification:default",
"core:app:allow-app-show",
"core:app:allow-app-hide",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text",
"global-shortcut:allow-is-registered",
"global-shortcut:allow-register",
"global-shortcut:allow-register-all",
"global-shortcut:allow-unregister",
"global-shortcut:allow-unregister-all",
"os:allow-platform",
"os:allow-version",
"os:allow-os-type",
"os:allow-family",
"os:allow-arch",
"os:allow-exe-extension",
"os:allow-locale",
"os:allow-hostname",
"process:allow-restart",
"process:allow-exit",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text",
"core:app:allow-app-show",
"core:app:allow-app-hide",
"fs:default",
"shell:default",
"dialog:default",
"http:default",
"clipboard-manager:default",
"os:default"
"global-shortcut:allow-unregister-all"
]
}
1 change: 0 additions & 1 deletion src-tauri/gen/schemas/acl-manifests.json

This file was deleted.

1 change: 0 additions & 1 deletion src-tauri/gen/schemas/capabilities.json

This file was deleted.

Loading