Skip to content

Commit

Permalink
fix: breaking bug with solid-js/router
Browse files Browse the repository at this point in the history
- solid-js/router v0.7.0 is not compatible with solid-js v1.7.3

BREAKING CHANGE
  • Loading branch information
ZanzyTHEbar committed Apr 28, 2023
1 parent a70651b commit 84bafca
Show file tree
Hide file tree
Showing 7 changed files with 1,149 additions and 6,438 deletions.
2 changes: 1 addition & 1 deletion GUI/ETVR/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@solid-primitives/i18n": "^1.1.2",
"@solid-primitives/map": "^0.3.1",
"@solidjs/meta": "^0.28.0",
"@solidjs/router": "^0.7.0",
"@solidjs/router": "^0.8.2",
"@stitches/core": "^1.2.8",
"@tailwindcss/typography": "^0.5.8",
"babel-preset-solid": "^1.7.3",
Expand Down
2 changes: 1 addition & 1 deletion GUI/ETVR/src-tauri/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[env]
# RUST_BACKTRACE = 1 # Enable backtraces
RUST_LOG = "debug" # Set to "debug" for more verbose output, debug, info, warn, error
RUST_LOG = "info" # Set to "debug" for more verbose output, debug, info, warn, error
14 changes: 7 additions & 7 deletions GUI/ETVR/src-tauri/Cargo.lock

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

34 changes: 33 additions & 1 deletion GUI/ETVR/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,39 @@ features = ["derive"]

[dependencies.tauri]
version = "1.1.1"
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"]
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",
]

[dependencies.tauri-plugin-window-state]
git = "https://github.com/tauri-apps/plugins-workspace"
Expand Down
15 changes: 10 additions & 5 deletions GUI/ETVR/src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,16 @@ fn main() {
.plugin(tauri_plugin_upload::init())
// save window position and size between sessions
.plugin(tauri_plugin_window_state::Builder::default().build())
.plugin(tauri_plugin_log::Builder::default().targets([
tauri_plugin_log::LogTarget::LogDir,
tauri_plugin_log::LogTarget::Stdout,
tauri_plugin_log::LogTarget::Webview,
]).build())
// log to file, stdout and webview console support
.plugin(
tauri_plugin_log::Builder::default()
.targets([
tauri_plugin_log::LogTarget::LogDir,
tauri_plugin_log::LogTarget::Stdout,
tauri_plugin_log::LogTarget::Webview,
])
.build(),
)
.setup(|app| {
let window = app
.get_window("main")
Expand Down
Loading

0 comments on commit 84bafca

Please sign in to comment.