diff --git a/apps/desktop/package.json b/apps/desktop/package.json index f3104d4d..20c18191 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,6 +1,6 @@ { "name": "@trixty/desktop", - "version": "1.1.6", + "version": "1.1.7", "private": true, "scripts": { "dev": "next dev", diff --git a/apps/desktop/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock index 34cbb131..97aef460 100644 --- a/apps/desktop/src-tauri/Cargo.lock +++ b/apps/desktop/src-tauri/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "TrixtyIDE" -version = "1.1.5" +version = "0.0.0" dependencies = [ "dirs 5.0.1", "grep-regex", diff --git a/apps/desktop/src-tauri/src/discord_rpc.rs b/apps/desktop/src-tauri/src/discord_rpc.rs index bc408314..437d6193 100644 --- a/apps/desktop/src-tauri/src/discord_rpc.rs +++ b/apps/desktop/src-tauri/src/discord_rpc.rs @@ -1,16 +1,10 @@ -use serde::{Deserialize, Serialize}; -use serde_json::{json, Value}; +#[cfg(unix)] +use std::{env, path::PathBuf}; use log::{error, info, warn}; -#[cfg(unix)] -use std::env; -#[cfg(unix)] -use std::path::PathBuf; +use serde::{Deserialize, Serialize}; +use serde_json::{json, Value}; use tauri::{AppHandle, Emitter}; -#[cfg(unix)] -use std::env; -#[cfg(unix)] -use std::path::PathBuf; use tokio::io::{AsyncReadExt, AsyncWriteExt}; #[cfg(unix)] use tokio::net::UnixStream; diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json index 52902ec4..696e295f 100644 --- a/apps/desktop/src-tauri/tauri.conf.json +++ b/apps/desktop/src-tauri/tauri.conf.json @@ -43,7 +43,7 @@ ], "withGlobalTauri": false, "security": { - "csp": "default-src 'self'; img-src 'self' data: asset: https://asset.localhost https://raw.githubusercontent.com; script-src 'self' blob:; style-src 'self' 'unsafe-inline'; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost; font-src 'self' data:; frame-src *; worker-src 'self' blob:;" + "csp": "default-src 'self'; img-src 'self' data: asset: https://asset.localhost https://raw.githubusercontent.com https://*.sentry.io; script-src 'self' blob: https://cdn.jsdelivr.net; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost https://*.sentry.io https://o4505655594844160.ingest.us.sentry.io; font-src 'self' data: https://cdn.jsdelivr.net; frame-src *; worker-src 'self' blob:;" } }, "plugins": { diff --git a/package.json b/package.json index f8a5c59a..7ff37c03 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "build": "turbo run build", "desktop": "pnpm --filter @trixty/desktop tauri", "version:sync": "node scripts/sync-version.mjs" + }, "devDependencies": { "turbo": "^2"