From c99a41bcbde5858220027ca691609661e9300ec6 Mon Sep 17 00:00:00 2001
From: jeff <jeff@agnos.is>
Date: Sun, 3 Jan 2021 14:07:11 +0000
Subject: [PATCH] Run npm commands for building in build.rs

---
 build.rs     | 39 +++++++++++++++++++++++++++++++++++----
 package.json |  2 +-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/build.rs b/build.rs
index a870c79..1832669 100644
--- a/build.rs
+++ b/build.rs
@@ -1,8 +1,39 @@
+use std::process::Command;
+
+fn js_protos() {
+    let output = Command::new("npm")
+        .arg("run")
+        .arg("build:protobuf")
+        .output()
+        .unwrap();
+
+    if output.status.success() {
+        return;
+    } else {
+        let err = String::from_utf8(output.stderr).unwrap();
+        panic!("JS Protobuf build failure:\n {}", err);
+    }
+}
+
+fn webpack() {
+    let output = Command::new("npm")
+        .arg("run")
+        .arg("build:webpack")
+        .output()
+        .unwrap();
+
+    if output.status.success() {
+        return;
+    } else {
+        let err = String::from_utf8(output.stderr).unwrap();
+        panic!("Webpack build failure:\n {}", err);
+    }
+}
+
 fn main() {
-    //TODO
-    // - invoke npm install?
-    // - invoke protoc to build ts/js protos
-    // - invoke npm run webpack from ts directory
+    println!("cargo:rerun-if-changed=static/scripts/webpack.config.js");
+    js_protos();
+    webpack();
 
     let mut config = prost_build::Config::new();
     config.btree_map(&["."]);
diff --git a/package.json b/package.json
index cb314ec..a3bd54c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "webpack-dev": "cd static/scripts && webpack serve --watch --inline --port 8081 --host 0.0.0.0 --output-path=./build",
-        "build:protobuf": "mkdir -p static/scripts/_proto && protoc --plugin=protoc-gen-ts=./node_modules/.bin/protoc-gen-ts  -I ./proto --js_out=import_style=commonjs,binary:./static/scripts/ts/_proto --ts_out=service=grpc-web:./static/scripts/ts/_proto ./proto/*.proto",
+        "build:protobuf": "mkdir -p static/scripts/_proto && protoc --plugin=protoc-gen-ts=./node_modules/.bin/protoc-gen-ts  -I ./proto --js_out=import_style=commonjs,binary:./static/scripts/_proto --ts_out=service=grpc-web:./static/scripts/_proto ./proto/*.proto",
         "build:webpack": "cd static/scripts && webpack"
     },
     "repository": {