From ff488351e4e1ccf64b06d2d9cbe5ee3631d5d902 Mon Sep 17 00:00:00 2001 From: Vladimir Stoilov Date: Fri, 17 May 2024 10:41:01 +0300 Subject: [PATCH] [desktop] switch to json5 for tauri config --- desktop/tauri/src-tauri/Cargo.toml | 2 +- .../src-tauri/gen/schemas/windows-schema.json | 14 ++++++++++++++ .../{tauri.conf.json => tauri.conf.json5} | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) rename desktop/tauri/src-tauri/{tauri.conf.json => tauri.conf.json5} (95%) diff --git a/desktop/tauri/src-tauri/Cargo.toml b/desktop/tauri/src-tauri/Cargo.toml index 83bcda14..cfe0010a 100644 --- a/desktop/tauri/src-tauri/Cargo.toml +++ b/desktop/tauri/src-tauri/Cargo.toml @@ -16,7 +16,7 @@ tauri-build = { version = "2.0.0-beta.13", features = [] } [dependencies] # Tauri -tauri = { version = "2.0.0-beta.16", features = ["tray-icon", "image-png"] } +tauri = { version = "2.0.0-beta.16", features = ["tray-icon", "image-png", "config-json5"] } tauri-plugin-shell = "2.0.0-beta" tauri-plugin-dialog = "2.0.0-beta" tauri-plugin-clipboard-manager = "2.0.0-beta" diff --git a/desktop/tauri/src-tauri/gen/schemas/windows-schema.json b/desktop/tauri/src-tauri/gen/schemas/windows-schema.json index 594dade7..40ff6ec9 100644 --- a/desktop/tauri/src-tauri/gen/schemas/windows-schema.json +++ b/desktop/tauri/src-tauri/gen/schemas/windows-schema.json @@ -1693,6 +1693,13 @@ "window:allow-current-monitor" ] }, + { + "description": "window:allow-cursor-position -> Enables the cursor_position command without any pre-configured scope.", + "type": "string", + "enum": [ + "window:allow-cursor-position" + ] + }, { "description": "window:allow-destroy -> Enables the destroy command without any pre-configured scope.", "type": "string", @@ -2120,6 +2127,13 @@ "window:deny-current-monitor" ] }, + { + "description": "window:deny-cursor-position -> Denies the cursor_position command without any pre-configured scope.", + "type": "string", + "enum": [ + "window:deny-cursor-position" + ] + }, { "description": "window:deny-destroy -> Denies the destroy command without any pre-configured scope.", "type": "string", diff --git a/desktop/tauri/src-tauri/tauri.conf.json b/desktop/tauri/src-tauri/tauri.conf.json5 similarity index 95% rename from desktop/tauri/src-tauri/tauri.conf.json rename to desktop/tauri/src-tauri/tauri.conf.json5 index 1338970a..9266eb96 100644 --- a/desktop/tauri/src-tauri/tauri.conf.json +++ b/desktop/tauri/src-tauri/tauri.conf.json5 @@ -35,7 +35,7 @@ }, "productName": "Portmaster", "version": "0.1.0", - "identifier": "io.safing.portmaster", + "identifier": "io.safing.portmaster", // this is added as a property to the shortcut on windows (ApplicationUserModelID). Used for notifications. "app": { "withGlobalTauri": true, "security": {