WIP #689

.gitignore

@@ -4,3 +4,4 @@ trace-*.json
 **/.temp
 .DS_Store
 .cargo
+server/assets_tmp

.vscode/settings.json

@@ -24,7 +24,7 @@
   "eslint.packageManager": "pnpm",
   "eslint.quiet": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
+    "source.fixAll.eslint": "explicit"
   },
   "jest.enableInlineErrorMessages": true,
   "jest.showCoverageOnLoad": true,

server/Cargo.toml

@@ -17,6 +17,7 @@ path = "src/bin.rs"
 [build-dependencies]
 static-files = "0.2"
 walkdir = "2"
+dircpy = "0.3.15"
 
 [dependencies]
 actix = ">= 0.12, < 0.14"

server/build.rs

@@ -2,9 +2,10 @@ use std::time::SystemTime;
 
 use static_files::resource_dir;
 
-const JS_DIST: &str = "../browser/data-browser/dist";
+const JS_DIST_SOURCE: &str = "../browser/data-browser/dist";
 const SRC_BROWSER: &str = "../browser/data-browser/src";
 const BROWSER_ROOT: &str = "../browser/";
+const JS_DIST_TMP: &str = "./assets_tmp";
 
 macro_rules! p {
     ($($tokens: tt)*) => {
@@ -16,20 +17,26 @@ fn main() -> std::io::Result<()> {
     println!("cargo:rerun-if-changed={}", BROWSER_ROOT);
 
     if should_build() {
-        build_js()
+        build_js();
+        // copy files to server folder
+        dircpy::copy_dir(JS_DIST_SOURCE, JS_DIST_TMP)?;
     }
 
-    resource_dir(JS_DIST)
+    resource_dir(JS_DIST_TMP)
         .build()
-        .unwrap_or_else(|_| panic!("failed to open data browser assets from {}", JS_DIST));
+        .unwrap_or_else(|e| panic!("failed to open data browser assets from {JS_DIST_TMP}. {e}"));
 
     Ok(())
 }
 
-/// Check if any JS files were modified since the last build
 fn should_build() -> bool {
-    if let Ok(index_html) = std::fs::metadata(format!("{}/index.html", JS_DIST)) {
-        let dist_time = index_html
+    if !std::path::Path::new(BROWSER_ROOT).exists() {
+        p!("Could not find browser folder, assuming this is a `cargo publish` run. Skipping JS build.");
+        return false;
+    }
+    // Check if any JS files were modified since the last build
+    if let Ok(tmp_dist_index_html) = std::fs::metadata(format!("{}/index.html", JS_DIST_TMP)) {
+        let dist_time = tmp_dist_index_html
             .modified()
             .unwrap()
             .duration_since(SystemTime::UNIX_EPOCH)