From 716e8934c3fbc741febd89d5d77d4a6fa2ca336d Mon Sep 17 00:00:00 2001 From: Niko Date: Wed, 28 May 2025 11:22:59 +0200 Subject: [PATCH 1/3] Fix #1253 --- pagefind.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/pagefind.yml b/pagefind.yml index f8b526086..7de1cbd7f 100644 --- a/pagefind.yml +++ b/pagefind.yml @@ -1,2 +1,3 @@ site: dist glob: "**/*.{html}" +root_selector: "main" From 963a650131b5bc3fd7b08c0080fbbf1c83b2e469 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 29 May 2025 10:29:33 +0200 Subject: [PATCH 2/3] Fix pagefind config --- Makefile | 1 + astro.config.mjs | 2 -- package.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2d16e8e8f..69cff0ff1 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/astro.config.mjs b/astro.config.mjs index 095fac043..bde439617 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -6,7 +6,6 @@ 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 { execSync } from "node:child_process"; import svelte from "@astrojs/svelte"; @@ -116,7 +115,6 @@ export default defineConfig({ mdx(), sitemap(), metaTags(), - pagefind(), deleteUnusedImages(), svelte(), compress({ diff --git a/package.json b/package.json index 268927f81..d270ac541 100644 --- a/package.json +++ b/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 ." From 963e9639a1be562c29e0fb48cd8fce9255a446c9 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 29 May 2025 11:07:10 +0200 Subject: [PATCH 3/3] Fix undefined in search results --- src/layouts/ScheduleLayout.astro | 11 ++++++++--- src/pages/schedule.astro | 2 +- src/pages/schedule/day/[day].astro | 2 +- src/pages/schedule/talks.astro | 2 +- src/pages/schedule/tutorials.astro | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/layouts/ScheduleLayout.astro b/src/layouts/ScheduleLayout.astro index 189b43855..e2a3a6ae0 100644 --- a/src/layouts/ScheduleLayout.astro +++ b/src/layouts/ScheduleLayout.astro @@ -2,13 +2,16 @@ import Layout from "@layouts/Layout.astro"; import Section from "@ui/Section.astro"; import Note from "@ui/Note.astro"; +import Headline from "@ui/Headline.astro" +import { slugify } from '@utils/content'; export interface Props { title?: string; description: string; + headline: string; } -const { title, description } = Astro.props; +const { title, description, headline } = Astro.props; --- @@ -17,8 +20,10 @@ const { title, description } = Astro.props;
- This is an early version of the schedule and may still change. If you're planning travel around specific sessions, please keep that in mind. - Mark talks as favorites by opening their details and tapping the ❤️ icon. Your selections are saved locally and will only be visible on this device. + + + This is an early version of the schedule and may still change. If you're planning travel around specific sessions, please keep that in mind. + Mark talks as favorites by opening their details and tapping the ❤️ icon. Your selections are saved locally and will only be visible on this device.
diff --git a/src/pages/schedule.astro b/src/pages/schedule.astro index 1eab9062c..b74364452 100644 --- a/src/pages/schedule.astro +++ b/src/pages/schedule.astro @@ -19,7 +19,7 @@ const days = await getCollection("days"); --- - + { days.map((day) => ( diff --git a/src/pages/schedule/day/[day].astro b/src/pages/schedule/day/[day].astro index d0eac6358..055ccd7b8 100644 --- a/src/pages/schedule/day/[day].astro +++ b/src/pages/schedule/day/[day].astro @@ -22,6 +22,6 @@ if (!dayEntry) { const day: Day = dayEntry; --- - + diff --git a/src/pages/schedule/talks.astro b/src/pages/schedule/talks.astro index 802ea9bc9..78d725874 100644 --- a/src/pages/schedule/talks.astro +++ b/src/pages/schedule/talks.astro @@ -23,7 +23,7 @@ const days = await getCollection("days"); --- - + { days .filter((day) => { diff --git a/src/pages/schedule/tutorials.astro b/src/pages/schedule/tutorials.astro index db9acab6a..0be5d947d 100644 --- a/src/pages/schedule/tutorials.astro +++ b/src/pages/schedule/tutorials.astro @@ -23,7 +23,7 @@ const days = await getCollection("days"); --- - + { days .filter((day) => {