Skip to content

Commit 84bafca

Browse files
committed
fix: breaking bug with solid-js/router
- solid-js/router v0.7.0 is not compatible with solid-js v1.7.3 BREAKING CHANGE
1 parent a70651b commit 84bafca

File tree

7 files changed

+1149
-6438
lines changed

7 files changed

+1149
-6438
lines changed

GUI/ETVR/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@solid-primitives/i18n": "^1.1.2",
5757
"@solid-primitives/map": "^0.3.1",
5858
"@solidjs/meta": "^0.28.0",
59-
"@solidjs/router": "^0.7.0",
59+
"@solidjs/router": "^0.8.2",
6060
"@stitches/core": "^1.2.8",
6161
"@tailwindcss/typography": "^0.5.8",
6262
"babel-preset-solid": "^1.7.3",

GUI/ETVR/src-tauri/.cargo/config.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[env]
22
# RUST_BACKTRACE = 1 # Enable backtraces
3-
RUST_LOG = "debug" # Set to "debug" for more verbose output, debug, info, warn, error
3+
RUST_LOG = "info" # Set to "debug" for more verbose output, debug, info, warn, error

GUI/ETVR/src-tauri/Cargo.lock

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GUI/ETVR/src-tauri/Cargo.toml

+33-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,39 @@ features = ["derive"]
2727

2828
[dependencies.tauri]
2929
version = "1.1.1"
30-
features = ["process-exit", "protocol-asset", "fs-all", "shell-sidecar", "dialog-all", "http-all", "icon-ico", "notification-all", "os-all", "path-all", "process-relaunch", "shell-open", "system-tray", "window-center", "window-close", "window-create", "window-hide", "window-maximize", "window-minimize", "window-request-user-attention", "window-set-decorations", "window-set-focus", "window-set-fullscreen", "window-set-position", "window-set-resizable", "window-set-size", "window-set-title", "window-show", "window-start-dragging", "window-unmaximize", "window-unminimize"]
30+
features = [
31+
"process-exit",
32+
"protocol-asset",
33+
"fs-all",
34+
"shell-sidecar",
35+
"dialog-all",
36+
"http-all",
37+
"icon-ico",
38+
"notification-all",
39+
"os-all",
40+
"path-all",
41+
"process-relaunch",
42+
"shell-open",
43+
"system-tray",
44+
"window-center",
45+
"window-close",
46+
"window-create",
47+
"window-hide",
48+
"window-maximize",
49+
"window-minimize",
50+
"window-request-user-attention",
51+
"window-set-decorations",
52+
"window-set-focus",
53+
"window-set-fullscreen",
54+
"window-set-position",
55+
"window-set-resizable",
56+
"window-set-size",
57+
"window-set-title",
58+
"window-show",
59+
"window-start-dragging",
60+
"window-unmaximize",
61+
"window-unminimize",
62+
]
3163

3264
[dependencies.tauri-plugin-window-state]
3365
git = "https://github.com/tauri-apps/plugins-workspace"

GUI/ETVR/src-tauri/src/main.rs

+10-5
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,16 @@ fn main() {
9292
.plugin(tauri_plugin_upload::init())
9393
// save window position and size between sessions
9494
.plugin(tauri_plugin_window_state::Builder::default().build())
95-
.plugin(tauri_plugin_log::Builder::default().targets([
96-
tauri_plugin_log::LogTarget::LogDir,
97-
tauri_plugin_log::LogTarget::Stdout,
98-
tauri_plugin_log::LogTarget::Webview,
99-
]).build())
95+
// log to file, stdout and webview console support
96+
.plugin(
97+
tauri_plugin_log::Builder::default()
98+
.targets([
99+
tauri_plugin_log::LogTarget::LogDir,
100+
tauri_plugin_log::LogTarget::Stdout,
101+
tauri_plugin_log::LogTarget::Webview,
102+
])
103+
.build(),
104+
)
100105
.setup(|app| {
101106
let window = app
102107
.get_window("main")

0 commit comments

Comments
 (0)