Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
phenomen committed Nov 22, 2024
2 parents e065c8a + 0b88ec9 commit c919369
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 309 deletions.
46 changes: 12 additions & 34 deletions package-lock.json

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

6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flc",
"version": "6.3.0",
"version": "6.4.0",
"description": "Foundry Lightweight Client",
"type": "module",
"scripts": {
Expand All @@ -25,7 +25,6 @@
"@tauri-apps/plugin-dialog": "^2.0.1",
"@tauri-apps/plugin-global-shortcut": "^2.0.0",
"@tauri-apps/plugin-http": "^2.0.1",
"@tauri-apps/plugin-os": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.1",
"@tauri-apps/plugin-updater": "^2.0.0",
"@types/eslint": "^9.6.1",
Expand All @@ -39,10 +38,9 @@
"lucide-svelte": "^0.460.1",
"mode-watcher": "^0.5.0",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.3.0",
"prettier-plugin-svelte": "^3.3.1",
"svelte": "^5.2.7",
"svelte-check": "^4.0.9",
"svelte-sonner": "^0.3.28",
"tailwind-merge": "^2.5.4",
"tailwind-variants": "^0.3.0",
"tailwindcss": "^3.4.15",
Expand Down
51 changes: 1 addition & 50 deletions src-tauri/Cargo.lock

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

3 changes: 1 addition & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "flc"
version = "6.3.0"
version = "6.4.0"
description = "Foundry Lightweight Client"
authors = ["phenomen"]
license = "MIT"
Expand Down Expand Up @@ -35,7 +35,6 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri-plugin-dialog = "2"
tauri-plugin-http = "2"
tauri-plugin-os = "2"

[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-global-shortcut = "2"
Expand Down
38 changes: 18 additions & 20 deletions src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,34 @@
"linux"
],
"permissions": [
"core:default",
"core:window:default",
"core:webview:default",
"dialog:default",
"http:default",
"os:default",
"shell:default",
"shell:allow-open",
"shell:allow-spawn",
"shell:allow-kill",
"updater:default",
"updater:allow-check",
"updater:allow-download",
"updater:allow-install",
"updater:allow-download-and-install",
"global-shortcut:allow-register",
"core:app:allow-default-window-icon",
"core:app:allow-set-app-theme",
"core:default",
"core:webview:allow-create-webview-window",
"core:webview:allow-create-webview",
"core:webview:allow-set-webview-focus",
"core:webview:allow-set-webview-size",
"core:webview:allow-set-webview-zoom",
"core:webview:default",
"core:window:allow-close",
"core:window:allow-create",
"core:window:allow-is-fullscreen",
"core:window:allow-is-focused",
"core:window:allow-is-fullscreen",
"core:window:allow-set-focus",
"core:window:allow-set-fullscreen",
"core:window:default",
"dialog:default",
"global-shortcut:allow-register",
"global-shortcut:default",
"http:default",
"shell:allow-kill",
"shell:allow-open",
"shell:allow-spawn",
"shell:default",
"updater:allow-check",
"updater:allow-download-and-install",
"updater:allow-download",
"updater:allow-install",
"updater:default",
{
"identifier": "http:default",
"allow": [
Expand All @@ -61,7 +60,6 @@
}
],
"sidecar": false
},
"global-shortcut:default"
}
]
}
2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/capabilities.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"default":{"identifier":"default","description":"Capability for the main window","local":true,"windows":["main"],"permissions":["core:default","core:window:default","core:webview:default","dialog:default","http:default","os:default","shell:default","shell:allow-open","shell:allow-spawn","shell:allow-kill","updater:default","updater:allow-check","updater:allow-download","updater:allow-install","updater:allow-download-and-install","global-shortcut:allow-register","core:app:allow-default-window-icon","core:app:allow-set-app-theme","core:webview:allow-create-webview-window","core:webview:allow-create-webview","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-size","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-create","core:window:allow-is-fullscreen","core:window:allow-is-focused","core:window:allow-set-focus","core:window:allow-set-fullscreen",{"identifier":"http:default","allow":[{"url":"https://*:*"},{"url":"http://*:*"}]},{"identifier":"shell:allow-spawn","allow":[{"args":true,"cmd":"node","name":"node"}]},"global-shortcut:default"],"platforms":["macOS","windows","linux"]}}
{"default":{"identifier":"default","description":"Capability for the main window","local":true,"windows":["main"],"permissions":["core:app:allow-set-app-theme","core:default","core:webview:allow-create-webview-window","core:webview:allow-create-webview","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-size","core:webview:allow-set-webview-zoom","core:webview:default","core:window:allow-close","core:window:allow-create","core:window:allow-is-focused","core:window:allow-is-fullscreen","core:window:allow-set-focus","core:window:allow-set-fullscreen","core:window:default","dialog:default","global-shortcut:allow-register","global-shortcut:default","http:default","shell:allow-kill","shell:allow-open","shell:allow-spawn","shell:default","updater:allow-check","updater:allow-download-and-install","updater:allow-download","updater:allow-install","updater:default",{"identifier":"http:default","allow":[{"url":"https://*:*"},{"url":"http://*:*"}]},{"identifier":"shell:allow-spawn","allow":[{"args":true,"cmd":"node","name":"node"}]}],"platforms":["macOS","windows","linux"]}}
Loading

0 comments on commit c919369

Please sign in to comment.