github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 159 Packages Projects Releases Wiki Activity

Update tauri 2 (#858)

Browse Source
This commit is contained in:
Uriel
2023-11-03 09:48:52 -03:00
committed by GitHub
parent 1fb32e8458
commit 4ebd863580
8 changed files with 2650 additions and 1653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1033
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
Cargo.toml
View File

@@ -15,8 +15,3 @@ repository = "https://github.com/SlimeVR/SlimeVR-Server"
[profile.release]
lto = "thin"
strip = "debuginfo" # Only affects Unix binaries with DWARF
[patch.crates-io]
tauri = { git = "https://github.com/imurx/tauri", branch = "ipc-backport" }
tauri-runtime = { git = "https://github.com/imurx/tauri", branch = "ipc-backport" }
tauri-build = { git = "https://github.com/imurx/tauri", branch = "ipc-backport" }

10
flake.nix
View File

@@ -48,8 +48,9 @@
# https://devenv.sh/reference/options/
packages =
[
]
(with pkgs; [
cacert
])
++ lib.optionals pkgs.stdenv.isLinux (with pkgs; [
appimagekit
atk
@@ -59,6 +60,7 @@
dprint
gdk-pixbuf
glib.out
glib-networking
gobject-introspection
gtk3
harfbuzz
@@ -96,6 +98,10 @@
languages.rust.enable = true;
env = {
GIO_EXTRA_MODULES = "${pkgs.glib-networking}/lib/gio/modules:${pkgs.dconf.lib}/lib/gio/modules";
};
enterShell = with pkgs; ''
'';
};

16
gui/package.json
View File

@@ -8,13 +8,13 @@
"@fontsource/poppins": "^4.5.8",
"@formatjs/intl-localematcher": "^0.2.32",
"@react-three/fiber": "^8.10.0",
"@tauri-apps/api": "^2.0.0-alpha.5",
"@tauri-apps/plugin-app": "github:tauri-apps/tauri-plugin-app#v2",
"@tauri-apps/plugin-dialog": "github:tauri-apps/tauri-plugin-dialog#v2",
"@tauri-apps/plugin-fs": "github:tauri-apps/tauri-plugin-fs#v2",
"@tauri-apps/plugin-os": "github:tauri-apps/tauri-plugin-os#v2",
"@tauri-apps/plugin-shell": "github:tauri-apps/tauri-plugin-shell#v2",
"@tauri-apps/plugin-window": "github:tauri-apps/tauri-plugin-window#v2",
"@tauri-apps/api": "^2.0.0-alpha",
"@tauri-apps/plugin-app": "^2.0.0-alpha",
"@tauri-apps/plugin-dialog": "^2.0.0-alpha",
"@tauri-apps/plugin-fs": "^2.0.0-alpha",
"@tauri-apps/plugin-os": "^2.0.0-alpha",
"@tauri-apps/plugin-shell": "^2.0.0-alpha",
"@tauri-apps/plugin-window": "^2.0.0-alpha",
"@vitejs/plugin-react": "^3.0.0",
"browser-fs-access": "^0.34.1",
"browserslist": "^4.18.1",
@@ -74,7 +74,7 @@
"devDependencies": {
"@dword-design/eslint-plugin-import-alias": "^4.0.8",
"@tailwindcss/forms": "^0.5.3",
"@tauri-apps/cli": "^2.0.0-alpha.10",
"@tauri-apps/cli": "^2.0.0-alpha",
"@types/file-saver": "^2.0.5",
"@types/react": "18.0.25",
"@types/react-dom": "^18.0.5",

18
gui/src-tauri/Cargo.toml
View File

@@ -21,22 +21,20 @@ default = ["custom-protocol"]
custom-protocol = ["tauri/custom-protocol"]
[build-dependencies]
tauri-build = { version = "2.0.0-alpha.6", features = [] }
tauri-build = { version = "2.0.0-alpha", features = [] }
cfg_aliases = "0.1"
shadow-rs = "0.23"
[dependencies]
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { version = "2.0.0-alpha.10", features = ["devtools"] }
tauri-runtime = "0.13.0-alpha.6"
tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", rev = "4ab90f048eab2918344f97dc8e04413a404e392d" }
tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", rev = "4ab90f048eab2918344f97dc8e04413a404e392d" }
tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", rev = "4ab90f048eab2918344f97dc8e04413a404e392d" }
tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", rev = "4ab90f048eab2918344f97dc8e04413a404e392d" }
tauri-plugin-window = { git = "https://github.com/tauri-apps/plugins-workspace", rev = "4ab90f048eab2918344f97dc8e04413a404e392d", features = [
"devtools",
] }
tauri = { version = "2.0.0-alpha", features = ["devtools"] }
tauri-runtime = "1.0.0-alpha"
tauri-plugin-dialog = "2.0.0-alpha"
tauri-plugin-fs = "2.0.0-alpha"
tauri-plugin-os = "2.0.0-alpha"
tauri-plugin-shell = "2.0.0-alpha"
tauri-plugin-window = { version = "2.0.0-alpha", features = ["devtools"] }
flexi_logger = "0.25"
log-panics = { version = "2", features = ["with-backtrace"] }
log = "0.4"

12
gui/src-tauri/src/main.rs
View File

@@ -81,12 +81,10 @@ fn main() -> Result<()> {
});
#[cfg(not(target_os = "macos"))]
let path = dirs_next::data_dir()
.ok_or(Error::UnknownPath)
.map(|dir| {
dir.join(&tauri_context.config().tauri.bundle.identifier)
.join("logs")
});
let path = dirs_next::data_dir().ok_or(Error::UnknownPath).map(|dir| {
dir.join(&tauri_context.config().tauri.bundle.identifier)
.join("logs")
});
Logger::try_with_env_or_str("info")?
.log_to_file(
@@ -205,7 +203,7 @@ fn main() -> Result<()> {
app.manage(Mutex::new(window_state));
if let Some((java_bin, p)) = server_info {
let app_handle = app.app_handle();
let app_handle = app.app_handle().clone();
tauri::async_runtime::spawn(async move {
use tauri_plugin_shell::{process::CommandEvent, ShellExt};

2
gui/src/components/tracker/TrackerSettings.tsx
View File

@@ -399,7 +399,7 @@ export function TrackerSettingsPage() {
type="text"
name="trackerName"
control={control}
autocomplete="false"
autocomplete="on"
rules={undefined}
label="Tracker name"
></Input>

3207
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff