Merge branch 'ep2025' into update-beginners-day-landing

Author: egeakman

.github/workflows/preview.yml

@@ -54,6 +54,12 @@ jobs:
           BRANCH: "${{ env.GITHUB_BRANCH_NAME }}"
         run: make preview
 
+      - name: Get safe branch and export to env
+        env:
+          BRANCH: ${{ env.GITHUB_BRANCH_NAME }}
+        run: |
+          echo "SAFE_BRANCH=$(make safe_branch)" >> $GITHUB_ENV
+
       - name: Update PR Comment
         uses: actions/github-script@v7
         if: github.event_name == 'pull_request'
@@ -80,8 +86,8 @@ jobs:
               }
             });
 
-            const branch_name = process.env.GITHUB_BRANCH_NAME;
-            const url = "https://" + branch_name + "." + process.env.PREVIEW_HOSTNAME;
+            const safe_branch = process.env.SAFE_BRANCH;
+            const url = "https://" + safe_branch + "." + process.env.PREVIEW_HOSTNAME;
             const timestamp = new Date().toISOString();
             const header = "\n|Key|Value|\n|---|---|\n"
             const body = preview_identifier + header + "|url|" + url + "|\n|last update|" + timestamp + "|";

Makefile

@@ -18,7 +18,7 @@ export GIT_VERSION ?= $(shell git rev-parse --short HEAD)
 # Auto-detect and sanitize current git branch
 BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 # Replace "/" and other non-alphanumeric characters with "-"
-SAFE_BRANCH := $(shell echo "$(BRANCH)" | sed 's/[^A-Za-z0-9-]/-/g')
+SAFE_BRANCH := $(shell echo "$(BRANCH)" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g')
 FORCE_DEPLOY ?= false
 SITE_URL ?= "https://$(SAFE_BRANCH).ep-preview.click"
 
@@ -44,6 +44,7 @@ check:
 
 build:
 	pnpm run astro build --mode $(MODE)
+	pnpm pagefind
 
 preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
 preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)

astro.config.mjs

@@ -6,8 +6,8 @@ import remarkToc from "remark-toc";
 import rehypeSlug from "rehype-slug";
 import rehypeAutolinkHeadings from "rehype-autolink-headings";
 import metaTags from "astro-meta-tags";
-import pagefind from "astro-pagefind";
 import deleteUnusedImages from "astro-delete-unused-images";
+import serviceWorker from "astrojs-service-worker";
 import { execSync } from "node:child_process";
 import svelte from "@astrojs/svelte";
 import compress from "astro-compress";
@@ -116,9 +116,11 @@ export default defineConfig({
     mdx(),
     sitemap(),
     metaTags(),
-    pagefind(),
     deleteUnusedImages(),
     svelte(),
+    serviceWorker({
+      workbox: { inlineWorkboxRuntime: true },
+    }),
     compress({
       HTML: false,
       CSS: false,
@@ -134,4 +136,8 @@ export default defineConfig({
     remotePatterns: [{ protocol: "https" }],
     domains: ["programme.europython.eu", "placehold.co"],
   },
+  prefetch: {
+    prefetchAll: true,
+    defaultStrategy: "load",
+  },
 });

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
-    "build": "astro check && astro build && pnpm pagefind --site dist",
+    "build": "astro check && astro build && pnpm pagefind",
     "preview": "astro preview",
     "astro": "astro",
     "format": "prettier --write --plugin=prettier-plugin-astro ."
@@ -20,13 +20,14 @@
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@nanostores/persistent": "^1.0.0",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "^4.1.7",
+    "@tailwindcss/vite": "^4.1.8",
     "astro": "^5.8.0",
     "astro-compress": "^2.3.8",
     "astro-delete-unused-images": "^1.0.3",
     "astro-meta-tags": "^0.3.2",
     "astro-pagefind": "^1.8.3",
     "astro-preload": "^1.1.2",
+    "astrojs-service-worker": "^2.0.0",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
@@ -39,8 +40,8 @@
     "rehype-slug": "^6.0.0",
     "remark-toc": "^9.0.0",
     "sharp": "^0.34.2",
-    "svelte": "^5.30.2",
-    "tailwindcss": "^4.1.7",
+    "svelte": "^5.33.12",
+    "tailwindcss": "^4.1.8",
     "typescript": "^5.8.3"
   },
   "devDependencies": {

pagefind.yml

@@ -1,2 +1,3 @@
 site: dist
 glob: "**/*.{html}"
+root_selector: "main"