Update dependency tailwindcss to v4

.gitea/workflows/release-image-gitea.yml

@@ -14,20 +14,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.REPOSITORY_HOST }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.REPOSITORY_TOKEN }}
-
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.REGISTRY_HOST }}
-          username: ${{ vars.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_SECRET }}
-
       - name: Create Kubeconfig
         run: |
           mkdir $HOME/.kube
@@ -41,43 +27,25 @@ jobs:
           driver-opts: |
             namespace=gitea
             qemu.install=true
-          buildkitd-config-inline: |
-            [registry."hub.docker"]
-              mirrors = ["harbor.alexlebens.net/proxy-hub.docker/"]
 
       - name: Available Platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
 
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.REPOSITORY_HOST }}
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.REPOSITORY_TOKEN }}
+
       - name: Extract Metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           tags: |
-            type=schedule
             type=ref,event=branch
             type=ref,event=tag
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-          images: |
-            ${{ vars.REPOSITORY_HOST }}/${{ gitea.repository }}
-            ${{ vars.REGISTRY_HOST }}/images/site-profile
-
-      - name: Build and Export to Docker
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          load: true
-          tags: ${{ env.TEST_TAG }}
-          file: ./Dockerfile
-          build-args: |
-            REGISTRY=hub.docker
-
-      - name: Test
-        run: |
-          docker run --rm ${{ env.TEST_TAG }}
+          images: ${{ vars.REPOSITORY_HOST }}/${{ gitea.repository }}
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -88,8 +56,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: ./Dockerfile
-          build-args: |
-            REGISTRY=hub.docker
 
       - name: Actions Ntfy
         run: |
@@ -97,5 +63,5 @@ jobs:
             -H "Authorization: Bearer ${{ secrets.NTFY_CRED }}" \
             -H "Title: Site-Profile Image Released to Gitea: ${{ steps.meta.outputs.tags }}" \
             -H "Content-Type: text/plain" \
-            -d 'Repo: ${{ gitea.repository }}\nCommit: ${{ gitea.sha }}\nRef: ${{ gitea.ref }}\nStatus: ${{ job.status}}' \
+            -d $'Repo: ${{ gitea.repository }}\nCommit: ${{ gitea.sha }}\nRef: ${{ gitea.ref }}\nStatus: ${{ job.status}}' \
             ${{ secrets.NTFY_URL }}

.gitea/workflows/release-image-harbor.yml

@@ -0,0 +1,67 @@
+name: release-image-harbor
+
+on:
+  push:
+    tags:
+      - 0.*
+
+  workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Create Kubeconfig
+        run: |
+          mkdir $HOME/.kube
+          echo "${{ secrets.KUBECONFIG_BUILDX }}" > $HOME/.kube/config
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: kubernetes
+          driver-opts: |
+            namespace=gitea
+            qemu.install=true
+
+      - name: Available Platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.REGISTRY_HOST }}
+          username: ${{ vars.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_SECRET }}
+
+      - name: Extract Metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          tags: |
+            type=ref,event=branch
+            type=ref,event=tag
+          images: ${{ vars.REGISTRY_HOST }}/images/site-profile
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          file: ./Dockerfile
+
+      - name: Actions Ntfy
+        run: |
+          curl \
+            -H "Authorization: Bearer ${{ secrets.NTFY_CRED }}" \
+            -H "Title: Site-Profile Image Released to Gitea: ${{ steps.meta.outputs.tags }}" \
+            -H "Content-Type: text/plain" \
+            -d $'Repo: ${{ gitea.repository }}\nCommit: ${{ gitea.sha }}\nRef: ${{ gitea.ref }}\nStatus: ${{ job.status}}' \
+            ${{ secrets.NTFY_URL }}

Dockerfile

@@ -1,8 +1,7 @@
-ARG REGISTRY
-FROM ${REGISTRY}/node:22.16.0-alpine3.22 AS base
+FROM node:22.16.0-alpine3.22 AS base
 
-LABEL version="0.8.5"
-LABEL description="Astro based personal website"
+LABEL version="0.7.0"
+LABEL description="Astro based website to use as a personal site"
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
@@ -13,15 +12,14 @@ WORKDIR /app
 COPY package.json pnpm-lock.yaml ./
 
 FROM base AS prod-deps
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --save form-data
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
 
 FROM prod-deps AS build-deps
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --save form-data
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 
 FROM build-deps AS build
 COPY . .
 RUN pnpm run build
-RUN pnpm prune --omit=dev
 
 FROM base AS runtime
 COPY --from=prod-deps /app/node_modules /app/node_modules
@@ -31,6 +29,5 @@ ENV HOST=0.0.0.0
 ENV SITE_URL=https://www.alexlebens.dev
 ENV DIRECTUS_URL=https://directus.alexlebens.dev
 ENV PORT=4321
-
 EXPOSE $PORT
 CMD node ./dist/server/entry.mjs

astro.config.mjs

@@ -1,9 +1,7 @@
 import { defineConfig } from 'astro/config';
-import tailwindcss from '@tailwindcss/vite';
+import tailwind from '@astrojs/tailwind';
 import react from '@astrojs/react';
 
-import node from '@astrojs/node';
-
 const getSiteURL = () => {
   if (process.env.SITE_URL) {
     return `https://${process.env.SITE_URL}`;
@@ -13,17 +11,5 @@ const getSiteURL = () => {
 
 export default defineConfig({
   site: getSiteURL(),
-  integrations: [tailwindcss(), react()],
-
-  plugins: {
-    "@tailwindcss/postcss": {},
-  },
-
-  vite: {
-    plugins: [tailwindcss()]
-  },
-
-  adapter: node({
-    mode: 'standalone'
-  })
-});
+  integrations: [tailwind(), react()],
+});

package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-profile",
   "type": "module",
-  "version": "0.8.5",
+  "version": "0.7.0",
   "private": true,
   "scripts": {
     "dev": "astro dev",
@@ -16,19 +16,17 @@
     "@astrojs/react": "^4.3.0",
     "@astrojs/rss": "^4.0.12",
     "@astrojs/sitemap": "^3.4.1",
+    "@astrojs/tailwind": "^6.0.2",
     "@directus/sdk": "^19.1.0",
-    "@tailwindcss/postcss": "^4.1.8",
-    "@tailwindcss/vite": "^4.1.8",
     "astro": "^5.9.1",
-    "form-data": "4.0.3",
     "framer-motion": "^12.16.0",
-    "postcss-preset-env": "^10.2.1",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-hotkeys-hook": "^5.1.0",
     "react-icons": "^5.5.0",
+    "reading-time": "^1.5.0",
     "sanitize-html": "^2.17.0",
-    "tailwindcss": "^4.1.8"
+    "tailwindcss": "^4.0.0"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.16",

postcss.config.mjs

@@ -1,7 +1,7 @@
 /** @type {import('postcss-load-config').Config} */
 const config = {
   plugins: {
-    "@tailwindcss/postcss": {},
+    tailwindcss: {},
     autoprefixer: {},
     'postcss-preset-env': {
       features: {

src/pages/blog/[...slug].astro

@@ -274,67 +274,67 @@ const { post, nextPost, prevPost } = Astro.props;
 
   /* Enhanced typography for blog content - Responsive adjustments */
   .prose {
-    @reference text-zinc-800 dark:text-zinc-200;
+    @apply text-zinc-800 dark:text-zinc-200;
   }
 
   .prose h1,
   .prose h2,
   .prose h3,
   .prose h4 {
-    @reference font-semibold text-zinc-900 dark:text-zinc-100;
+    @apply font-semibold text-zinc-900 dark:text-zinc-100;
   }
 
   .prose h1 {
-    @reference text-2xl sm:text-3xl md:text-4xl;
+    @apply text-2xl sm:text-3xl md:text-4xl;
   }
 
   .prose h2 {
-    @reference mb-3 mt-8 border-b border-zinc-200 pb-2 text-xl dark:border-zinc-800 sm:mb-4 sm:mt-12 sm:text-2xl;
+    @apply mb-3 mt-8 border-b border-zinc-200 pb-2 text-xl dark:border-zinc-800 sm:mb-4 sm:mt-12 sm:text-2xl;
   }
 
   .prose h3 {
-    @reference mb-2 mt-6 text-lg sm:mb-3 sm:mt-8 sm:text-xl;
+    @apply mb-2 mt-6 text-lg sm:mb-3 sm:mt-8 sm:text-xl;
   }
 
   .prose p {
-    @reference mb-4 text-sm leading-relaxed sm:mb-6 sm:text-base;
+    @apply mb-4 text-sm leading-relaxed sm:mb-6 sm:text-base;
   }
 
   .prose a {
-    @reference font-medium text-zinc-800 underline decoration-zinc-400 underline-offset-2 transition-colors hover:text-zinc-600 hover:decoration-zinc-600 dark:text-zinc-300 dark:decoration-zinc-600 dark:hover:text-zinc-100 dark:hover:decoration-zinc-400;
+    @apply font-medium text-zinc-800 underline decoration-zinc-400 underline-offset-2 transition-colors hover:text-zinc-600 hover:decoration-zinc-600 dark:text-zinc-300 dark:decoration-zinc-600 dark:hover:text-zinc-100 dark:hover:decoration-zinc-400;
   }
 
   .prose blockquote {
-    @reference my-4 border-l-4 border-zinc-300 pl-4 italic text-zinc-700 dark:border-zinc-700 dark:text-zinc-300 sm:my-6;
+    @apply my-4 border-l-4 border-zinc-300 pl-4 italic text-zinc-700 dark:border-zinc-700 dark:text-zinc-300 sm:my-6;
   }
 
   .prose code {
-    @reference rounded bg-zinc-100 px-1.5 py-0.5 text-sm font-medium text-zinc-800 dark:bg-zinc-800 dark:text-zinc-200;
+    @apply rounded bg-zinc-100 px-1.5 py-0.5 text-sm font-medium text-zinc-800 dark:bg-zinc-800 dark:text-zinc-200;
   }
 
   .prose pre {
-    @reference my-4 overflow-x-auto rounded-lg bg-[#1e293b] p-3 text-xs text-zinc-200 shadow-md dark:bg-[#1e293b] sm:my-6 sm:p-4 sm:text-sm !important;
+    @apply my-4 overflow-x-auto rounded-lg bg-[#1e293b] p-3 text-xs text-zinc-200 shadow-md dark:bg-[#1e293b] sm:my-6 sm:p-4 sm:text-sm !important;
   }
 
   .prose pre code {
-    @reference bg-transparent p-0 text-zinc-200 dark:text-zinc-200 !important;
+    @apply bg-transparent p-0 text-zinc-200 dark:text-zinc-200 !important;
   }
 
   .prose img {
-    @reference mx-auto my-6 h-auto max-w-full rounded-lg shadow-md sm:my-8;
+    @apply mx-auto my-6 h-auto max-w-full rounded-lg shadow-md sm:my-8;
   }
 
   .prose ul,
   .prose ol {
-    @reference my-4 pl-5 sm:my-6 sm:pl-6;
+    @apply my-4 pl-5 sm:my-6 sm:pl-6;
   }
 
   .prose li {
-    @reference mb-1 text-sm sm:mb-2 sm:text-base;
+    @apply mb-1 text-sm sm:mb-2 sm:text-base;
   }
 
   .prose hr {
-    @reference my-8 border-zinc-200 dark:border-zinc-800 sm:my-10;
+    @apply my-8 border-zinc-200 dark:border-zinc-800 sm:my-10;
   }
 
   /* Line clamp for truncating text */

src/styles/global.css

@@ -1,5 +1,7 @@
 /* Remove all the complex mobile menu styles and keep only what's necessary */
-@import "tailwindcss";
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
 
 @layer base {
   :root {
@@ -15,7 +17,7 @@
   }
 
   body {
-    @reference min-h-screen bg-white text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100;
+    @apply min-h-screen bg-white text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100;
     margin: 0;
     padding: 0;
     overflow-x: hidden;
@@ -41,7 +43,7 @@
   /* Better touch targets on mobile */
   button,
   a {
-    @reference min-h-[44px];
+    @apply min-h-[44px];
   }
 }