Merge pull request #554 from moonbitlang/node_cmd

internal: use node.cmd for windows
moonbitlang · Jan 13, 2025 · b862bc9 · b862bc9
2 parents 8a8308c + 4e81079
commit b862bc9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/moonbuild/Cargo.toml b/crates/moonbuild/Cargo.toml
@@ -42,6 +42,7 @@ tempfile.workspace = true
 ctrlc.workspace = true
 dissimilar.workspace = true
 line-index.workspace = true
+which.workspace = true
 home.workspace = true
 tokio.workspace = true
 self-replace.workspace = true

diff --git a/crates/moonbuild/src/build.rs b/crates/moonbuild/src/build.rs
@@ -43,7 +43,12 @@ pub fn run_wat(path: &Path, args: &[String], verbose: bool) -> anyhow::Result<()
 }
 
 pub fn run_js(path: &Path, args: &[String], verbose: bool) -> anyhow::Result<()> {
-    run(Some("node"), path, args, verbose)
+    let node = if which::which("node.cmd").is_ok() {
+        Some("node.cmd")
+    } else {
+        Some("node")
+    };
+    run(node, path, args, verbose)
 }
 
 pub fn run_native(path: &Path, args: &[String], verbose: bool) -> anyhow::Result<()> {

diff --git a/crates/moonbuild/src/runtest.rs b/crates/moonbuild/src/runtest.rs
@@ -95,8 +95,13 @@ pub async fn run_js(
     file_test_info_map: &FileTestInfo,
     verbose: bool,
 ) -> anyhow::Result<Vec<Result<TestStatistics, TestFailedStatus>>> {
+    let node = if which::which("node.cmd").is_ok() {
+        Some("node.cmd")
+    } else {
+        Some("node")
+    };
     run(
-        Some("node"),
+        node,
         path,
         target_dir,
         &[serde_json_lenient::to_string(args).unwrap()],