Merge branch 'ep2025' into visa-form

Author: hypha

.github/workflows/build-deploy.yml

@@ -35,7 +35,7 @@ jobs:
         run: make build
 
       - name: Set up SSH key
-        uses: webfactory/[email protected].0
+        uses: webfactory/[email protected].1
         with:
           ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
 

.github/workflows/preview.yml

@@ -33,10 +33,10 @@ jobs:
         run: make install
 
       - name: Build the website
-        run: make build
+        run: make build PREVIEW=true
 
       - name: Set up SSH key
-        uses: webfactory/[email protected].0
+        uses: webfactory/[email protected].1
         with:
           ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
 
@@ -52,11 +52,11 @@ jobs:
         run: make preview BRANCH=$GITHUB_BRANCH_NAME
 
       - name: Update PR Comment
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: github.event_name == 'pull_request'
 
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.COMMENT_TOKEN }}
           script: |
             console.log("Hello world!");
             const pr_id = ${{ github.event.number }};

.github/workflows/rtd-preview.yml

@@ -0,0 +1,19 @@
+name: Read the Docs PR preview
+on:
+  pull_request_target:
+    types:
+      - opened
+
+permissions:
+  pull-requests: write
+
+jobs:
+  documentation-links:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: readthedocs/actions/preview@v1
+        with:
+          project-slug: "ep-website"
+          single-version: "true"
+          message-template: "🖼️ Preview available 🖼️ : {docs-pr-index-url}"

.readthedocs.yaml

@@ -0,0 +1,25 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version, and other tools you might need
+build:
+  os: ubuntu-24.04
+  tools:
+    # Specify the language and version your project requires,
+    # by uncommenting one of the following tools.
+    #
+    # python: "3.13"
+    # ruby: "3.3"
+    nodejs: "22"
+    # rust: "1.82"
+    # golang: "1.23"
+
+  commands:
+    - npm install -g pnpm@latest-10
+    - make install
+    - make build PREVIEW=true
+    - mkdir -p $READTHEDOCS_OUTPUT/html
+    - cd dist && cp -r * $READTHEDOCS_OUTPUT/html

Makefile

@@ -42,8 +42,7 @@ check:
 	pnpm run astro check
 
 build:
-	# TODO: update this to just `pnpm build` after resolving the astro-check warnings
-	pnpm run astro build
+	pnpm build
 	# NOTE: also let's find a better way to do this :D
 	find ./dist/_astro/ -iname '*.jpg' -delete
 

astro.config.mjs

@@ -8,6 +8,7 @@ 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";
 
 // https://astro.build/config
 export default defineConfig({
@@ -34,6 +35,16 @@ export default defineConfig({
     ],
   },
   site: "https://ep2025.europython.eu",
+  redirects: {
+    "/c-api-summit/": "/programme/c-api-summit/",
+    "/programme/cfp/": "/programme/cfp/",
+    "/planning/": "https://forms.gle/riw6CvML8ck94A4V9",
+    "/reviewers/": "https://forms.gle/4GTJjwZ1nHBGetM18",
+    "/rust-summit/": "/programme/rust-summit/",
+    "/sponsor/": "/sponsorship/sponsor/",
+    "/voting/": "/programme/voting/",
+    "/wasm-summit/": "/programme/wasm-summit/",
+  },
   integrations: [
     mdx(),
     sitemap(),
@@ -42,6 +53,7 @@ export default defineConfig({
       nesting: true,
     }),
     metaTags(),
+    pagefind(),
   ],
   output: "static",
 });

package.json

@@ -5,28 +5,30 @@
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
-    "build": "astro check && astro build",
+    "build": "astro check && astro build && pnpm pagefind --site dist",
     "preview": "astro preview",
     "astro": "astro",
     "format": "prettier --write --plugin=prettier-plugin-astro ."
   },
   "dependencies": {
     "@astro-community/astro-embed-youtube": "^0.5.6",
     "@astrojs/check": "^0.9.4",
-    "@astrojs/mdx": "^4.0.5",
-    "@astrojs/react": "^4.1.4",
-    "@astrojs/sitemap": "^3.2.1",
+    "@astrojs/mdx": "^4.2.1",
+    "@astrojs/react": "^4.2.1",
+    "@astrojs/sitemap": "^3.3.0",
     "@astrojs/tailwind": "^5.1.4",
     "@fontsource-variable/inter": "^5.1.1",
     "@tailwindcss/typography": "^0.5.16",
-    "@types/react": "^19.0.7",
-    "@types/react-dom": "^18.3.5",
+    "@types/react": "^19.0.12",
+    "@types/react-dom": "^19.0.4",
     "astro": "^5.1.6",
     "astro-meta-tags": "^0.3.1",
+    "astro-pagefind": "^1.8.1",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
     "hastscript": "^9.0.0",
+    "pagefind": "^1.3.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "rehype-autolink-headings": "^7.1.0",

pagefind.yml

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