From 9ccc372c7e03a7c8cb3a88621d52417033edc126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20W=C3=BCstenberg?= <markus@maragu.dk>
Date: Wed, 5 Feb 2025 11:30:09 +0100
Subject: [PATCH 1/2] Upgrade to TailwindCSS v4

See https://tailwindcss.com/docs/upgrade-guide
---
 Makefile           |  4 ++--
 html/common.go     |  2 +-
 html/home.go       |  2 +-
 tailwind.config.js | 21 ---------------------
 tailwind.css       |  5 ++---
 5 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 tailwind.config.js

diff --git a/Makefile b/Makefile
index 3a5e1d7..53649d7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,8 @@ start: build-css
 tailwindcss:
 	curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-$(TAILWINDCSS_OS_ARCH)
 	mv tailwindcss-$(TAILWINDCSS_OS_ARCH) tailwindcss
-	chmod +x tailwindcss
-	mkdir -p node_modules/tailwindcss/lib && ln -s tailwindcss node_modules/tailwindcss/lib/cli.js
+	chmod a+x tailwindcss
+	mkdir -p node_modules/tailwindcss/lib && ln -sf tailwindcss node_modules/tailwindcss/lib/cli.js
 	echo '{"devDependencies": {"tailwindcss": "latest"}}' >package.json
 
 .PHONY: test
diff --git a/html/common.go b/html/common.go
index 518efc7..2ebc92a 100644
--- a/html/common.go
+++ b/html/common.go
@@ -57,7 +57,7 @@ func page(props PageProps, children ...Node) Node {
 
 // header bar with logo and navigation.
 func header() Node {
-	return Div(Class("bg-indigo-600 text-white shadow"),
+	return Div(Class("bg-indigo-600 text-white shadow-sm"),
 		container(true, false,
 			Div(Class("h-16 flex items-center justify-between"),
 				A(Href("/"), Class("inline-flex items-center text-xl font-semibold"),
diff --git a/html/home.go b/html/home.go
index a4905c3..097bc1f 100644
--- a/html/home.go
+++ b/html/home.go
@@ -25,7 +25,7 @@ func HomePage(props PageProps, things []model.Thing, now time.Time) Node {
 			H2(Text("Try HTMX")),
 
 			Button(
-				Class("rounded-md bg-indigo-600 px-2.5 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"),
+				Class("rounded-md bg-indigo-600 px-2.5 py-1.5 text-sm font-semibold text-white shadow-xs hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"),
 				Text("Get things with HTMX"), hx.Get("/"), hx.Target("#things")),
 
 			Div(ID("things"),
diff --git a/tailwind.config.js b/tailwind.config.js
deleted file mode 100644
index b8e65c9..0000000
--- a/tailwind.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const colors = require('tailwindcss/colors')
-const defaultTheme = require('tailwindcss/defaultTheme')
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: [
-    "./html/**/*.go",
-  ],
-  theme: {
-    extend: {
-      fontFamily: {
-        mono: [...defaultTheme.fontFamily.mono],
-        sans: [...defaultTheme.fontFamily.sans],
-        serif: [...defaultTheme.fontFamily.serif],
-      },
-    }
-  },
-  plugins: [
-    require('@tailwindcss/typography'),
-  ],
-}
diff --git a/tailwind.css b/tailwind.css
index b5c61c9..3571db7 100644
--- a/tailwind.css
+++ b/tailwind.css
@@ -1,3 +1,2 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+@plugin "@tailwindcss/typography";

From 4eddcb894716082852c905a40d27c5742afacffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20W=C3=BCstenberg?= <markus@maragu.dk>
Date: Wed, 5 Feb 2025 11:32:19 +0100
Subject: [PATCH 2/2] fix Dockerfile

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2bf73f3..ce5bb65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,12 +7,11 @@ RUN set -x && apt-get update && \
 # The URL uses x64 instead of amd64
 ARG BUILDARCH
 RUN ARCH=$( [ "${BUILDARCH}" = "amd64" ] && echo "x64" || echo "arm64" ) && \
-    curl -sfLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-${ARCH}
+  curl -sfLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-${ARCH}
 RUN mv tailwindcss-linux-* tailwindcss
 RUN chmod a+x tailwindcss
 
 COPY tailwind.css ./
-COPY tailwind.config.js ./
 
 COPY html ./html/