fix(os): use an internal object instead of window.__TAURI__, closes …

…#719 (#721) fix(os): use an internal object instead of ` window.__TAURI__`, closes #719
tauri-apps · Nov 14, 2023 · fc62ead · fc62ead
1 parent 251852c
commit fc62ead
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/.changes/os-reading-undefined.md b/.changes/os-reading-undefined.md
@@ -0,0 +1,7 @@
+---
+"os": "patch"
+"os-js": "patch"
+---
+
+Fix `Uncaught TypeError: Cannot read properties of undefined (reading 'os')`
+
diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
@@ -8,6 +8,7 @@ rust-version = { workspace = true }
 license = "Apache-2.0 OR MIT"
 
 [lib]
+name = "api_lib"
 crate-type = [ "staticlib", "cdylib", "rlib" ]
 
 [build-dependencies]

diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs
@@ -2,11 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-#![cfg_attr(
-    all(not(debug_assertions), target_os = "windows"),
-    windows_subsystem = "windows"
-)]
-
 mod cmd;
 #[cfg(desktop)]
 mod tray;

diff --git a/examples/api/src-tauri/src/main.rs b/examples/api/src-tauri/src/main.rs
@@ -6,6 +6,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
-    #[cfg(desktop)]
-    api::run();
+    api_lib::run();
 }
diff --git a/plugins/os/guest-js/index.ts b/plugins/os/guest-js/index.ts
@@ -13,8 +13,8 @@ import { invoke } from "@tauri-apps/api/primitives";
 /** @ignore */
 declare global {
   interface Window {
-    __TAURI__: {
-      os: { __eol: string };
+    __TAURI_OS_PLUGIN_INTERNALS__: {
+      eol: string;
     };
   }
 }
@@ -54,7 +54,7 @@ type Arch =
  * @since 2.0.0
  * */
 function eol() {
-  return window.__TAURI__.os.__eol;
+  return window.__TAURI_OS_PLUGIN_INTERNALS__.eol;
 }
 
 /**

diff --git a/plugins/os/src/api-iife.js b/plugins/os/src/api-iife.js
diff --git a/plugins/os/src/init.js b/plugins/os/src/init.js
@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-__RAW_global_os_api__;
-
 // eslint-disable-next-line
-window.__TAURI__.os.__eol = __TEMPLATE_eol__;
+Object.defineProperty(window, "__TAURI_OS_PLUGIN_INTERNALS__", {
+  value: {
+    eol: __TEMPLATE_eol__,
+  },
+});
+
+__RAW_global_os_api__;