From 0f6d9ee6b2c871742ae9f63e92665aa56991eb52 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Sat, 21 Sep 2024 10:40:30 +0200 Subject: Perform CSS minification --- Makefile | 22 +++++++++++++--------- src/http.go | 2 +- src/templates/base.html.tmpl | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index b937062..1dccc8e 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,16 @@ -templates = $(shell find src/templates -name '*.tmpl') -gofiles = $(shell find main.go src -name '*.go') +cssfiles := $(shell find static -name '*.css' -not -name '*.min.css') +cssfiles := $(cssfiles:.css=.min.css) +gofiles := $(shell find main.go src -name '*.go') +templates := $(shell find src/templates -name '*.tmpl') -exttmpl = $(wildcard cmd/exttmpl/*.go) -mfmt = $(wildcard cmd/mfmt/*.go) +exttmpl := $(wildcard cmd/exttmpl/*.go) +mfmt := $(wildcard cmd/mfmt/*.go) all: euro-cash.eu exttmpl mfmt -euro-cash.eu: $(templates) $(gofiles) +euro-cash.eu: $(cssfiles) $(templates) $(gofiles) go build -# Generating translations is rather slow; so don’t do that by default all-i18n: exttmpl go generate ./src find . -name out.gotext.json | mcp -b sed s/out/messages/ @@ -21,14 +22,17 @@ exttmpl: $(exttmpl) mfmt: $(mfmt) go build ./cmd/mfmt +%.min.css: %.css + lightningcss -m $< -o $@ + watch: ls euro-cash.eu | entr -r ./euro-cash.eu -no-email -port $${PORT:-8080} -# Build a release tarball for easy deployment -# TODO: Minify CSS release: all-i18n [ -n "$$GOOS" -a -n "$$GOARCH" ] - tar -cf euro-cash.eu-$$GOOS-$$GOARCH.tar.gz euro-cash.eu data/ static/ + find data static -type f \ + \( -not -name '*.css' -or -name '*.min.css' \) \ + -exec tar -cf euro-cash.eu-$$GOOS-$$GOARCH.tar.gz euro-cash.eu {} + clean: find . -type f \( \ diff --git a/src/http.go b/src/http.go index 395aefd..ca286de 100644 --- a/src/http.go +++ b/src/http.go @@ -27,7 +27,7 @@ func Run(port int) { mux.Handle("GET /designs/", fs) mux.Handle("GET /favicon.ico", fs) mux.Handle("GET /fonts/", fs) - mux.Handle("GET /style.css", fs) + mux.Handle("GET /style.min.css", fs) mux.Handle("GET /coins/mintages", chain( firstHandler, i18nHandler, diff --git a/src/templates/base.html.tmpl b/src/templates/base.html.tmpl index ee4dfec..2a33cc3 100644 --- a/src/templates/base.html.tmpl +++ b/src/templates/base.html.tmpl @@ -3,7 +3,7 @@ - + {{ .T "Euro Cash" }}