Fix cargo publish #689

Author: joepio

.earthlyignore

@@ -8,4 +8,5 @@ Earthfile
 */Earthfile
 */node_modules
 node_modules
+*/assets_tmp
 .earthlyignore

Cargo.lock

@@ -25,8 +25,6 @@ Get the binaries from the [releases page](https://github.com/atomicdata-dev/atom
 ## 3. Install using cargo
 
 ```sh
-# Make sure pnpm is installed and available in path! https://pnpm.io/
-pnpm --version
 # Install from source using cargo, and add it to your path
 # If things go wrong, check out `Troubleshooting compiling from source:` below
 cargo install atomic-server --locked

docs/src/atomicserver/installation.md

@@ -9,6 +9,7 @@ name = "atomic-server"
 readme = "./README.md"
 repository = "https://github.com/atomicdata-dev/atomic-server"
 version = "0.36.1"
+include = ["src/**/*", "Cargo.toml", "assets_tmp", "build.rs"]
 
 [[bin]]
 name = "atomic-server"

server/Cargo.toml

@@ -1,7 +1,5 @@
 use std::time::SystemTime;
 
-use static_files::resource_dir;
-
 const JS_DIST_SOURCE: &str = "../browser/data-browser/dist";
 const SRC_BROWSER: &str = "../browser/data-browser/src";
 const BROWSER_ROOT: &str = "../browser/";
@@ -18,11 +16,16 @@ fn main() -> std::io::Result<()> {
 
     if should_build() {
         build_js();
-        // copy files to server folder
         dircpy::copy_dir(JS_DIST_SOURCE, JS_DIST_TMP)?;
     }
 
-    resource_dir(JS_DIST_TMP)
+    if !std::path::Path::new(JS_DIST_TMP).exists() {
+        p!("Could not find JS_DIST_TMP folder, copying JS_DIST_SOURCE");
+        dircpy::copy_dir(JS_DIST_SOURCE, JS_DIST_TMP)?;
+    }
+
+    // Makes the static files available for compilation
+    static_files::resource_dir(JS_DIST_TMP)
         .build()
         .unwrap_or_else(|e| panic!("failed to open data browser assets from {JS_DIST_TMP}. {e}"));
 
@@ -72,9 +75,12 @@ fn should_build() -> bool {
 
         p!("No changes in JS source files, skipping JS build.");
         false
-    } else {
-        p!("No JS dist folder found, building...");
+    } else if std::path::Path::new(SRC_BROWSER).exists() {
+        p!("No JS dist folder found, but did find source folder, building...");
         true
+    } else {
+        p!("Could not find index.html in JS_DIST_TMP, assuming this is a `cargo publish` run. Skipping JS build.");
+        false
     }
 }
 

server/build.rs

@@ -10,7 +10,7 @@ pub async fn single_page(
     appstate: actix_web::web::Data<AppState>,
     path: actix_web::web::Path<String>,
 ) -> AtomicServerResult<HttpResponse> {
-    let template = include_str!("../../../browser/data-browser/dist/index.html");
+    let template = include_str!("../../assets_tmp/index.html");
     let subject = format!("{}/{}", appstate.store.get_server_url(), path);
     let meta_tags: MetaTags = if let Ok(resource) =
         appstate