Merge branch 'ep2025' into ep2025-unconference

Author: Arya-AD

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)

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({

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 ."

pagefind.yml

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

src/components/SponsorLogo.astro

@@ -28,7 +28,7 @@ const logo = sponsorLogos[sponsor.id];
     {
       website ? (
 
-        <a href={website} aria-label={`Link to ${title}`}
+        <a href={website} target="_blank" aria-label={`Link to ${title}`}
 >
           <Image
             src={logo}

src/components/schedule/session.astro

@@ -80,7 +80,7 @@ const hasFooter = true;
     codeId={session.code}
     title={session.title}
   />
-  <h2>
+  <h2 id=`session-${session.slug}`>
     {session.title}
   </h2>
 

src/components/sections/keynoters/keynoter.astro

@@ -1,6 +1,5 @@
 ---
 import type { ImageMetadata } from "astro";
-import { getCollection } from "astro:content";
 import { Image } from "astro:assets";
 import Person1 from "./placeholders/person-1.astro";
 import Person2 from "./placeholders/person-2.astro";
@@ -10,7 +9,7 @@ import Person5 from "./placeholders/person-5.astro";
 
 export interface Props {
   name: string;
-  slug: string;
+  url: string;
   tagline?: string | undefined;
   image?: ImageMetadata;
   placeholder?: boolean | undefined;
@@ -20,7 +19,7 @@ export interface Props {
 
 const {
   name,
-  slug,
+  url,
   tagline,
   image,
   placeholder,
@@ -31,9 +30,6 @@ const placeholders = [Person1, Person2, Person3, Person4, Person5];
 
 const Placeholder =
   placeholders[Math.floor(Math.random() * placeholders.length)];
-
-const entries = await getCollection("speakers");
-const isSpeaker = entries.some((entry) => entry.id === slug);
 ---
 
 <li class:list={["list-none rounded-2xl overflow-clip flex group", className]}>
@@ -61,10 +57,10 @@ const isSpeaker = entries.some((entry) => entry.id === slug);
           <p class="text-body-inverted">More keynoters coming soon</p>
         ) : (
           <>
-            {isSpeaker ? (
+            {url ? (
               <h2 class="text-[#17223A] font-bold">
                 <a
-                  href={`/speaker/${slug}`}
+                  href={url}
                   class="text-2xl font-bold hover:underline"
                 >
                   {name}

src/components/sections/keynoters/keynoters.astro

@@ -19,7 +19,7 @@ const placeholders = Math.max(0, 5 - keynoters.length);
         .map((keynoter, _index) => (
           <Keynoter
             name={keynoter.data.name}
-            slug={keynoter.slug}
+            url={keynoter.data.url || ""}
             tagline={keynoter.data.tagline}
             image={keynoter.data.image}
             placeholder={false}
@@ -36,7 +36,7 @@ const placeholders = Math.max(0, 5 - keynoters.length);
         .map((_, _index) => (
           <Keynoter
             name=""
-            slug=""
+            url=""
             tagline=""
             placeholder={true}
             class:list={["w-full sm:w-[calc(50%-1rem)] md:w-[calc(30%-1rem)]"]}

src/components/sponsors/sponsor-tier.astro

@@ -29,7 +29,7 @@ const { tier, top } = Astro.props;
       "grid ml-12 items-center justify-items-center",
       {
         "grid-cols-1 md:grid-cols-2 lg:grid-cols-3": !top,
-        "grid-cols-1 md:grid-cols-1": top,
+        "grid-cols-1 md:grid-cols-2": top,
       },
     ]}
   >

src/content/config.ts

@@ -30,6 +30,7 @@ const keynoters = defineCollection({
   schema: ({ image }) =>
     z.object({
       name: z.string(),
+      url: z.string().optional(),
       tagline: z.string().optional(),
       image: image(),
       order: z.number(),