Run npm install as part of build.rs too

.github/workflows/test.yml

@@ -21,9 +21,6 @@ jobs:
           rustup toolchain install ${{ matrix.rust_version }}
       - uses: actions/checkout@v4
       - run: rustup override set ${{ matrix.rust_version }}
-      - name: npm install (librqbit/webui)
-        working-directory: crates/librqbit/webui
-        run: npm install
       - name: cargo check
         run: cargo check
   test:
@@ -32,8 +29,5 @@ jobs:
       - uses: actions/checkout@v4
       - run: rustup toolchain install stable --profile minimal
       - uses: Swatinem/rust-cache@v2
-      - name: npm install (librqbit/webui)
-        working-directory: crates/librqbit/webui
-        run: npm install
       - name: Run tests
         run: cargo test

crates/librqbit/build.rs

@@ -9,17 +9,30 @@ fn main() {
 
         println!("cargo:rerun-if-changed={}", webui_src_dir.to_str().unwrap());
 
-        // Run "npm run build" in the webui directory
+        // Run "npm install && npm run build" in the webui directory
-        let output = Command::new("npm")
+        for (cmd, args) in [
-            .arg("run")
+            ("npm", ["install"].as_slice()),
-            .arg("build")
+            ("npm", ["run", "build"].as_slice()),
+        ] {
+            // Run "npm install" in the webui directory
+            let output = Command::new(cmd)
+                .args(args)
                 .current_dir(webui_dir)
                 .output()
-            .expect("Failed to execute npm run build");
+                .unwrap_or_else(|_| {
+                    panic!(
+                        "Failed to execute {} {} in {:?}",
+                        cmd,
+                        args.join(" "),
+                        webui_dir
+                    )
+                });
 
             if !output.status.success() {
                 panic!(
-                "npm run build failed with output: {}",
+                    "{} {} failed with output: {}",
+                    cmd,
+                    args.join(" "),
                     String::from_utf8_lossy(&output.stderr)
                 );
             }
@@ -28,3 +41,4 @@ fn main() {
             println!("{}", String::from_utf8_lossy(&output.stdout));
         }
     }
+}