From 418f3c4566abe66f3d8f5aaeea8ae230054b1058 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Wed, 28 Aug 2024 15:55:30 +0100 Subject: [PATCH] build: fix crash css/js inlining when re-doing makefile, I removed the part where CSS is written to bundle.css, then later moved to v3bundle.css. To solve, crash.html now just directly requests web/css/v3bundle.css (and web/js/crash.js, removing the `mv` line in the makefile too). --- Makefile | 1 - html/crash.html | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6f96c19..6657649 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,6 @@ $(TYPESCRIPT_TARGET): $(TYPESCRIPT_FULLSRC) ts/tsconfig.json scripts/dark-variant.sh tempts/modules $(info compiling typescript) $(foreach tempsrc,$(TYPESCRIPT_TEMPSRC),$(ESBUILD) --target=es6 --bundle $(tempsrc) $(SOURCEMAP) --outfile=$(patsubst %.ts,%.js,$(subst tempts/,./$(DATA)/web/js/,$(tempsrc))) $(MINIFY);) - mv $(DATA)/web/js/crash.js $(DATA)/ $(COPYTS) SWAGGER_SRC = $(wildcard api*.go) $(wildcard *auth.go) views.go diff --git a/html/crash.html b/html/crash.html index 42871b2..44e4b43 100644 --- a/html/crash.html +++ b/html/crash.html @@ -1,7 +1,7 @@ - + {{ template "header.html" . }} Crash report @@ -40,6 +40,6 @@ - +