1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-22 09:00:10 +00:00

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).
This commit is contained in:
Harvey Tindall 2024-08-28 15:55:30 +01:00
parent 399ce3b044
commit 418f3c4566
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 2 additions and 3 deletions

View File

@ -142,7 +142,6 @@ $(TYPESCRIPT_TARGET): $(TYPESCRIPT_FULLSRC) ts/tsconfig.json
scripts/dark-variant.sh tempts/modules scripts/dark-variant.sh tempts/modules
$(info compiling typescript) $(info compiling typescript)
$(foreach tempsrc,$(TYPESCRIPT_TEMPSRC),$(ESBUILD) --target=es6 --bundle $(tempsrc) $(SOURCEMAP) --outfile=$(patsubst %.ts,%.js,$(subst tempts/,./$(DATA)/web/js/,$(tempsrc))) $(MINIFY);) $(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) $(COPYTS)
SWAGGER_SRC = $(wildcard api*.go) $(wildcard *auth.go) views.go SWAGGER_SRC = $(wildcard api*.go) $(wildcard *auth.go) views.go

View File

@ -1,7 +1,7 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<link inline rel="stylesheet" type="text/css" href="bundle.css"> <link inline rel="stylesheet" type="text/css" href="web/css/v3bundle.css">
{{ template "header.html" . }} {{ template "header.html" . }}
<title>Crash report</title> <title>Crash report</title>
</head> </head>
@ -40,6 +40,6 @@
</section> </section>
</div> </div>
</div> </div>
<script inline src="crash.js"></script> <script inline src="web/js/crash.js"></script>
</body> </body>
</html> </html>