fix: import shuffling

SpikeHD · Nov 26, 2024 · 0078d3f · 0078d3f
1 parent 0d3d91c
commit 0078d3f
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 117 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -42,7 +42,7 @@ window-vibrancy = { version = "0.5.0", optional = true }
 
 reqwest = { version = "0.12", features = ["blocking"] }
 phf = "0.11.2"
-sysinfo = "0.30"
+sysinfo = "0.32"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 device_query = { version = "2.1.0", optional = true }
 regex = "1.11"
@@ -57,7 +57,7 @@ tauri-plugin-notification = "2.0"
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 webkit2gtk = { version = "2.0", features = ["v2_4"] }
-wgpu = { version = "22", default-features = false }
+wgpu = { version = "23.0", default-features = false }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2 = "0.5.2"

diff --git a/src-tauri/injection/global.d.ts b/src-tauri/injection/global.d.ts
@@ -28,7 +28,8 @@ declare global {
 
     nativeFetch: typeof fetch
     __DORION_CONFIG__: Record<string, any>
-    __DORION_INITIALIZED__: boolean
+    __DORION_INIT__: boolean
+    __DORION_REAL_INIT__: boolean
     Dorion: any
     shelter: any
     nativeOpen: Window['open']

diff --git a/src-tauri/injection/preinject.ts b/src-tauri/injection/preinject.ts
@@ -23,9 +23,6 @@ window.Dorion = {
 }
 
 ;(async () => {
-  if (window.__DORION_INITIALIZED__) return
-  window.__DORION_INITIALIZED__ = true
-
   // if we are in an iframe we don't really need to load anything, else we bork whatever is inside
   if (window.self !== window.top) {
     // fixes activities