astro v5

Author: namachan10777

src/components/pages/bachelor/TeamCard.astro

@@ -40,13 +40,15 @@ const { team, href } = Astro.props;
                     facultyRef.collection,
                     facultyRef.id,
                   );
-                  return (
-                    <a href={`/~${facultyRef.id}`} class="faculty-name">
-                      {faculty.data.name
-                        ? faculty.data.name
-                        : faculty.data.eng_name}
-                    </a>
-                  );
+                  if (faculty) {
+                    return (
+                      <a href={`/~${facultyRef.id}`} class="faculty-name">
+                        {faculty.data.name
+                          ? faculty.data.name
+                          : faculty.data.eng_name}
+                      </a>
+                    );
+                  }
                 })}
               </div>
               <div class="capacity-n">

src/components/pages/members/MemberCard.astro

@@ -10,7 +10,10 @@ interface Props {
 }
 
 const props = Astro.props.faculty;
-const team = await getEntry("team", props.team.slug);
+const team = await getEntry("team", props.team.id);
+if (!team) {
+  throw new Error(`${props.team.id} not found`);
+}
 ---
 
 <section>

src/content/config.ts src/content.config.ts

@@ -1,3 +1,4 @@
+import { glob } from "astro/loaders";
 import {
   z,
   defineCollection,
@@ -318,27 +319,45 @@ export type CarouselPicture = z.infer<ReturnType<typeof carouselSchema>>;
 
 export const collections = {
   news: defineCollection({
-    type: "content",
     schema: newsSchema,
+    loader: glob({
+      base: "./content/news",
+      pattern: "**/*.mdx",
+    }),
   }),
   publication: defineCollection({
-    type: "data",
     schema: publicationSchema,
+    loader: glob({
+      base: "./content/publication",
+      pattern: "**/*.yml",
+    }),
   }),
   member: defineCollection({
-    type: "data",
     schema: memberSchema,
+    loader: glob({
+      base: "./content/member",
+      pattern: "**/*.yml",
+    }),
   }),
   alumni: defineCollection({
-    type: "data",
     schema: alumnusSchema,
+    loader: glob({
+      base: "./content/alumni",
+      pattern: "**/*.yml",
+    }),
   }),
   team: defineCollection({
-    type: "content",
     schema: teamSchema,
+    loader: glob({
+      base: "./content/team",
+      pattern: "**/*.mdx",
+    }),
   }),
   carousel: defineCollection({
-    type: "data",
     schema: carouselSchema,
+    loader: glob({
+      base: "./content/carousel",
+      pattern: "**/*.yml",
+    }),
   }),
 };

src/layouts/base/parts/header/sitemap.ts

@@ -37,7 +37,7 @@ export const bachelorPage: JustLinkIndex = {
 
 const teamPages = (await getCollection("team")).map((team) => ({
   title: team.data.name,
-  url: `/teams/${team.slug}`,
+  url: `/teams/${team.id}`,
   icon: team.data.icon,
 }));
 

src/pages/bachelor.astro

@@ -106,7 +106,7 @@ const generalSessionFormLink = "https://forms.gle/meqA8rHAmdPdb2Cd9";
     <Teams>
       {
         teams.map((team) => (
-          <TeamCard team={team.data} href={`/teams/${team.slug}`} />
+          <TeamCard team={team.data} href={`/teams/${team.id}`} />
         ))
       }
     </Teams>

src/pages/index.astro

@@ -80,7 +80,7 @@ const carouselPictures = (await getCollection("carousel"))
           <ListItem class="news-headline">
             <div>
               <span class="news-date">{news.data.date}</span>
-              <ExternalLink href={`/news/${news.slug}`}>
+              <ExternalLink href={`/news/${news.id}`}>
                 {news.data.title}
               </ExternalLink>
             </div>

src/pages/news/[year]/[slug].astro

@@ -4,11 +4,12 @@ import { getCollection, getEntry } from "astro:content";
 import Base from "@layouts/base/index.astro";
 import NoImageHeader from "@components/composite/header/NoImageHeader.astro";
 import ResponsiveWidth from "@components/layout/ResponsiveWidth.astro";
+import { render } from "astro:content";
 
 export const getStaticPaths = (async () => {
   const news = await getCollection("news");
   return news.map((news) => {
-    const matched = /(\d{4})\/(.+)/.exec(news.slug);
+    const matched = /(\d{4})\/(.+)/.exec(news.id);
     if (matched && matched[1] && matched[2]) {
       return {
         params: {
@@ -25,11 +26,11 @@ export const getStaticPaths = (async () => {
 const params = Astro.params;
 
 const news = await getEntry("news", `${params.year}/${params.slug}`);
-if (news === undefined) {
+if (!news) {
   throw new Error(`${params.year}/${params.slug} not found`);
 }
 
-const Body = await news.render();
+const Body = await render(news);
 ---
 
 <Base title={news.data.title} description={news.data.description}>

src/pages/news/index.astro

@@ -19,7 +19,7 @@ const news = (await getCollection("news")).sort(
         news.map((article) => (
           <li class="news-heading">
             <h2 class="title">
-              <ExternalLink href={`/news/${article.slug}`}>
+              <ExternalLink href={`/news/${article.id}`}>
                 {article.data.title}
               </ExternalLink>
             </h2>

src/pages/teams/[slug].astro

@@ -1,6 +1,6 @@
 ---
 import type { GetStaticPaths } from "astro";
-import { getCollection, getEntry } from "astro:content";
+import { getCollection, getEntry, render } from "astro:content";
 import Base from "@layouts/base/index.astro";
 import BlurImageHeader from "@components/composite/header/BlurImageHeader.astro";
 import ResponsiveWidth from "@components/layout/ResponsiveWidth.astro";
@@ -11,31 +11,35 @@ import H2 from "@components/composite/heading/h2.astro";
 import VSpace from "@components/layout/VSpace.astro";
 import RecentWorks from "@components/pages/teams/RecentWorks.astro";
 import { viewRank } from "@content";
+import type { CollectionEntry } from "astro:content";
 
 export const getStaticPaths = (async () => {
   return (await getCollection("team")).map((team) => ({
-    params: { slug: team.slug },
+    params: { slug: team.id },
   }));
 }) satisfies GetStaticPaths;
 
-const team = await getEntry("team", Astro.params.slug);
+const team = (await getEntry(
+  "team",
+  Astro.params.slug,
+)) as CollectionEntry<"team">;
 
-const Rendered = await team.render();
+const Rendered = await render(team);
 
 const faculties = await getCollection(
   "member",
   (member) =>
     (member.data.occupation === "Faculty" ||
       member.data.occupation === "Researcher") &&
-    member.data.team.slug === Astro.params.slug,
+    member.data.team.id === Astro.params.slug,
 );
 
 const students = await getCollection(
   "member",
   (member) =>
     (member.data.occupation === "Student" ||
       member.data.occupation === "Research Student") &&
-    member.data.team.slug === Astro.params.slug,
+    member.data.team.id === Astro.params.slug,
 );
 ---
 

tsconfig.json

@@ -7,7 +7,7 @@
       "@components/*": ["src/components/*"],
       "@layouts/*": ["src/layouts/*"],
       "@asset/*": ["src/asset/*"],
-      "@content": ["src/content/config.ts"]
+      "@content": ["src/content.config.ts"]
     }
   },
   "include": [