@bobfrankston/msger 0.1.126 → 0.1.128

package/msger-native/build.rs

@@ -1,34 +1,7 @@
-use std::fs;
-use std::path::Path;
-
 fn main() {
-    // Read parent package.json
-    let package_json_path = Path::new("../package.json");
-    
-    if package_json_path.exists() {
-        let content = fs::read_to_string(package_json_path)
-            .expect("Failed to read package.json");
-        
-        // Parse JSON to extract version
-        if let Some(version_line) = content.lines().find(|line| line.contains("\"version\"")) {
-            // Extract version value (simple string parsing)
-            if let Some(start) = version_line.find('"') {
-                if let Some(colon) = version_line[start+1..].find(':') {
-                    let after_colon = &version_line[start+colon+2..];
-                    if let Some(quote_start) = after_colon.find('"') {
-                        if let Some(quote_end) = after_colon[quote_start+1..].find('"') {
-                            let version = &after_colon[quote_start+1..quote_start+1+quote_end];
-                            println!("cargo:rustc-env=NPM_VERSION={}", version);
-                            println!("cargo:rerun-if-changed=../package.json");
-                            println!("cargo:rerun-if-changed=src/template.html");
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    // Fallback to Cargo version if package.json not found
-    println!("cargo:rustc-env=NPM_VERSION={}", env!("CARGO_PKG_VERSION"));
+    // Version is now read at runtime from package.json, not embedded at build time
+    // Just set up rebuild triggers for template changes
+    println!("cargo:rerun-if-changed=src/template.html");
+    println!("cargo:rerun-if-changed=src/msger-api.js");
+    println!("cargo:rerun-if-changed=src/main.rs");
 }

package/msger-native/src/main.rs

@@ -164,7 +164,40 @@ struct MessageBoxResult {
 }
 
 fn default_title() -> String {
-    format!("msger {}", env!("NPM_VERSION"))
+    // Read version from package.json at runtime (not embedded at build time)
+    let version = get_package_version().unwrap_or_else(|| "unknown".to_string());
+    format!("msger {}", version)
+}
+
+fn get_package_version() -> Option<String> {
+    // Read ../package.json relative to executable
+    let exe_path = std::env::current_exe().ok()?;
+    let exe_dir = exe_path.parent()?;
+
+    // Try multiple possible locations for package.json
+    let possible_paths = vec![
+        exe_dir.join("../package.json"),           // Development: bin/../package.json
+        exe_dir.join("../../package.json"),        // Installed globally: lib/node_modules/@bobfrankston/msger/package.json
+        exe_dir.join("../../../package.json"),     // node_modules structure
+    ];
+
+    for path in possible_paths {
+        if let Ok(content) = std::fs::read_to_string(&path) {
+            // Simple JSON parsing - just extract version field
+            if let Some(version_line) = content.lines().find(|line| line.contains("\"version\"")) {
+                if let Some(start) = version_line.find("\":") {
+                    let after_colon = &version_line[start+2..].trim_start();
+                    if let Some(quote_start) = after_colon.find('"') {
+                        if let Some(quote_end) = after_colon[quote_start+1..].find('"') {
+                            return Some(after_colon[quote_start+1..quote_start+1+quote_end].to_string());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    None
 }
 
 fn default_width() -> i32 {
@@ -716,7 +749,7 @@ fn main() {
                 is_maximized,
                 is_fullscreen,
                 is_always_on_top,
-                env!("NPM_VERSION")
+                get_package_version().unwrap_or_else(|| "unknown".to_string())
             );
 
             // Show the info in an alert

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bobfrankston/msger",
-    "version": "0.1.126",
+    "version": "0.1.128",
     "description": "Fast, lightweight, cross-platform message box - Rust-powered alternative to msgview",
     "type": "module",
     "main": "./index.js",