From dfe9504540c2da7a4714fee16d2bf477523b0f3c Mon Sep 17 00:00:00 2001
From: Brent Yi <yibrenth@gmail.com>
Date: Sat, 23 Mar 2024 01:36:01 -0700
Subject: [PATCH] (WIP) fixes for autobuild on Windows

---
 pyproject.toml                 |  2 +-
 src/viser/_client_autobuild.py | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2b43732d6..3ab29a7e3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ dependencies = [
     "numpy>=1.0.0",
     "msgpack>=1.0.7",
     "imageio>=2.0.0",
-    "pyliblzfse>=0.4.1",
+    "pyliblzfse>=0.4.1; platform_system!='Windows'",
     "scikit-image>=0.18.0",
     "scipy>=1.7.3",
     "tqdm>=4.0.0",
diff --git a/src/viser/_client_autobuild.py b/src/viser/_client_autobuild.py
index be0c1461a..414bdacf0 100644
--- a/src/viser/_client_autobuild.py
+++ b/src/viser/_client_autobuild.py
@@ -60,15 +60,20 @@ def ensure_client_is_built() -> None:
         node_exec_dir = _install_sandboxed_node()
         npx_path = node_exec_dir / "npx"
 
-        
+        import os
+        subprocess_env = os.environ.copy()
+        subprocess_env["NODE_VIRTUAL_ENV"] = str(node_exec_dir.parent)
+        subprocess_env["PATH"] = str(node_exec_dir) + ";" + subprocess_env["PATH"] 
         subprocess.run(
-            args=(
-                "bash -c '"
-                f"source {node_exec_dir / 'activate'};"
-                f"{npx_path} yarn install;"
-                f"{npx_path} yarn run build;"
-                "'"
-            ),
+            args=f"{npx_path} --yes yarn install",
+            env=subprocess_env,
+            cwd=client_dir,
+            shell=True,
+            check=False,
+        )
+        subprocess.run(
+            args=f"{npx_path} --yes yarn run build",
+            env=subprocess_env,
             cwd=client_dir,
             shell=True,
             check=False,
@@ -92,11 +97,6 @@ def _install_sandboxed_node() -> Path:
     subprocess.run(
         [sys.executable, "-m", "nodeenv", "--node=20.4.0", env_dir], check=False
     )
-    subprocess.run(
-        args=[node_exec_dir / "npm", "install", "yarn"],
-        input="y\n".encode(),
-        check=False,
-    )
     assert (node_exec_dir / "npx").exists()
     return node_exec_dir