Merge branch 'ep2025' into ep2025-layout-v2

Author: nikoshell

.github/workflows/preview.yml

@@ -11,6 +11,7 @@ jobs:
     env:
       PREVIEW_HOSTNAME: ep-preview.click
       GITHUB_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+      GITHUB_COMMIT_HASH: ${{ github.event.pull_request.head.sha }}
 
     steps:
       - name: Checkout
@@ -33,15 +34,12 @@ jobs:
       - name: Install dependencies
         run: make install
 
-      - name: Get current branch name
-        run: |
-          BRANCH_NAME=$(make safe_branch BRANCH=$GITHUB_BRANCH_NAME)
-          echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_ENV
-
       - name: Build the website
-        run:
-          make build MODE=preview
-          SITE_URL="https://${BRANCH_NAME}.ep-preview.click"
+        env:
+          BRANCH: "${{ env.GITHUB_BRANCH_NAME }}"
+          GIT_VERSION: "${{ env.GITHUB_COMMIT_HASH }}"
+          MODE: "preview"
+        run: make build
 
       - name: Set up SSH key
         uses: webfactory/[email protected]
@@ -52,7 +50,9 @@ jobs:
         run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
 
       - name: Upload preview
-        run: make preview BRANCH=$GITHUB_BRANCH_NAME
+        env:
+          BRANCH: "${{ env.GITHUB_BRANCH_NAME }}"
+        run: make preview
 
       - name: Update PR Comment
         uses: actions/github-script@v7
@@ -80,7 +80,7 @@ jobs:
               }
             });
 
-            const branch_name = process.env.BRANCH_NAME;
+            const branch_name = process.env.GITHUB_BRANCH_NAME;
             const url = "https://" + branch_name + "." + process.env.PREVIEW_HOSTNAME;
             const timestamp = new Date().toISOString();
             const header = "\n|Key|Value|\n|---|---|\n"

astro.config.mjs

@@ -13,20 +13,31 @@ import deleteUnusedImages from "astro-delete-unused-images";
 import preload from "astro-preload";
 import { execSync } from "node:child_process";
 
-let gitVersion = "";
-try {
-  gitVersion = execSync("git rev-parse --short HEAD 2>&1 > /dev/null");
-} catch (e) {}
+let gitVersion = String(process.env.GIT_VERSION ?? "").slice(0, 7);
+
+if (!gitVersion) {
+  try {
+    gitVersion = execSync("git rev-parse --short HEAD", {
+      stdio: ["ignore", "pipe", "ignore"],
+    })
+      .toString()
+      .trim();
+  } catch {
+    gitVersion = "unknown";
+  }
+}
 
 // https://astro.build/config
 export default defineConfig({
   vite: {
     define: {
-      "import.meta.env.TIMESTAMP": new Date()
-        .toISOString()
-        .replace(/[-:T.Z]/g, "")
-        .slice(0, 14),
-      "import.meta.env.GIT_VERSION": new String(gitVersion),
+      __TIMESTAMP__: JSON.stringify(
+        new Date()
+          .toISOString()
+          .replace(/[-:T.Z]/g, "")
+          .slice(0, 14)
+      ),
+      __GIT_VERSION__: JSON.stringify(gitVersion),
     },
     resolve: {
       alias: {

package.json

@@ -13,15 +13,15 @@
   "dependencies": {
     "@astro-community/astro-embed-youtube": "^0.5.6",
     "@astrojs/check": "^0.9.4",
-    "@astrojs/mdx": "^4.2.5",
+    "@astrojs/mdx": "^4.2.6",
     "@astrojs/react": "^4.2.5",
     "@astrojs/sitemap": "^3.3.1",
     "@astrojs/tailwind": "^5.1.5",
     "@fontsource-variable/inter": "^5.2.5",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@tailwindcss/typography": "^0.5.16",
     "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.2",
+    "@types/react-dom": "^19.1.3",
     "astro": "^5.7.5",
     "astro-delete-unused-images": "^1.0.3",
     "astro-meta-tags": "^0.3.1",
@@ -47,7 +47,8 @@
     "@types/js-yaml": "^4.0.9",
     "prettier": "^3.5.3",
     "prettier-plugin-astro": "^0.14.1",
-    "tsx": "^4.19.3",
+    "tsx": "^4.19.4",
+    "puppeteer": "^24.7.2",
     "typescript": "^5.8.3"
   },
   "prettier": {