From a2c3f52ab47cc823b788901a76bf1edf23dbe856 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Sat, 21 Mar 2026 05:38:42 +0000 Subject: [PATCH] Fix embedded static files on production builds --- default.nix | 24 +- html/fileserver.go | 147 - html/response.go | 27 - html/template/sync/layout/authenticated.html | 2 +- rmo/routes.go | 3 +- scss/style.scss | 2 +- start-nidus-sync.sh | 10 +- static/static.go | 180 +- .../bootstrap.bundle.min.js | 0 .../bootstrap.bundle.min.js.map | 1 + static/vendor/js/bootstrap.min.js | 2892 ----------------- sync/routes.go | 4 +- 12 files changed, 209 insertions(+), 3083 deletions(-) delete mode 100644 html/fileserver.go rename static/vendor/{js => bootstrap-5.3.8}/bootstrap.bundle.min.js (100%) create mode 100644 static/vendor/bootstrap-5.3.8/bootstrap.bundle.min.js.map delete mode 100644 static/vendor/js/bootstrap.min.js diff --git a/default.nix b/default.nix index bab0f510..386c5ec7 100644 --- a/default.nix +++ b/default.nix @@ -21,15 +21,20 @@ pkgs.buildGoModule rec { preBuild = '' # Compile SCSS SASS_SRC_DIR="./scss" -CSS_OUTPUT_DIR="./static/gen/css/" +CSS_OUTPUT_DIR="./static/gen/css" mkdir -p "$CSS_OUTPUT_DIR" -echo "Compiling $SASS_SRC_DIR/style.scss to $CSS_OUTPUT_DIR/bootstrap.css..." -sass --style=compressed --trace "$SASS_SRC_DIR/style.scss":"$CSS_OUTPUT_DIR/bootstrap.css" +echo "Compiling $SASS_SRC_DIR/style.scss to $CSS_OUTPUT_DIR/style.css..." +sass --style=compressed --trace "$SASS_SRC_DIR/style.scss":"$CSS_OUTPUT_DIR/style.css" + +# Generate hash and rename style +STYLE_HASH=$(sha256sum "$CSS_OUTPUT_DIR/style.css" | cut -c1-12) +mv "$CSS_OUTPUT_DIR/style.css" "$CSS_OUTPUT_DIR/style.$STYLE_HASH.css" +echo "Generated CSS style with hash: $STYLE_HASH" # Bundle TypeScript -JS_OUTPUT_DIR="./static/gen/js/" +JS_OUTPUT_DIR="./static/gen/js" mkdir -p "$JS_OUTPUT_DIR" echo "Bundling TypeScript..." @@ -38,15 +43,16 @@ esbuild ts/main.ts --bundle --minify --outfile="$JS_OUTPUT_DIR/bundle.js" # Generate hash and rename bundle BUNDLE_HASH=$(sha256sum "$JS_OUTPUT_DIR/bundle.js" | cut -c1-12) mv "$JS_OUTPUT_DIR/bundle.js" "$JS_OUTPUT_DIR/bundle.$BUNDLE_HASH.js" +echo "Generated JS bundle with hash: $BUNDLE_HASH" # Generate gen.go with bundle path -cat > gen.go < static/gen.go < - +