Merge pull request #311 from openscript/astro5-contentlayer

Astro5 contentlayer

Author: openscript

src/components/NoteListEntry.astro

@@ -4,13 +4,14 @@ import { getContentEntryPath } from "../utils/i18n";
 import type { GitInfoFrontmatter } from "../remark/remark-git-info";
 import DateTime from "./DateTime.astro";
 import { getEntry } from "astro:content";
+import { render } from "astro:content";
 
 type Props = {
   note: CollectionEntry<"notes">;
 };
 
 const { note } = Astro.props;
-const { remarkPluginFrontmatter } = await note.render();
+const { remarkPluginFrontmatter } = await render(note);
 const gitInfo: GitInfoFrontmatter["git"] = remarkPluginFrontmatter.git;
 ---
 
@@ -23,7 +24,7 @@ const gitInfo: GitInfoFrontmatter["git"] = remarkPluginFrontmatter.git;
   }
 </style>
 
-<a href={getContentEntryPath(await getEntry("notes", note.slug))}>
+<a href={getContentEntryPath(await getEntry("notes", note.id))}>
   <span class="note-title">{note.data.title}</span>
   {
     gitInfo.lastCommit && (

src/components/PostCard.astro

@@ -4,14 +4,14 @@ import { getContentEntryPath } from "../utils/i18n";
 import { Image } from "astro:assets";
 import DateTime from "./DateTime.astro";
 import DerivedCover from "./DerivedCover.astro";
-import { getEntry } from "astro:content";
+import { getEntry, render } from "astro:content";
 
 type Props = {
   post: CollectionEntry<"blog">;
 };
 
 const { post } = Astro.props;
-const { remarkPluginFrontmatter } = await post.render();
+const { remarkPluginFrontmatter } = await render(post);
 ---
 
 <style>
@@ -36,7 +36,7 @@ const { remarkPluginFrontmatter } = await post.render();
 </style>
 
 <div>
-  <a href={getContentEntryPath(await getEntry("blog", post.slug))}>
+  <a href={getContentEntryPath(await getEntry("blog", post.id))}>
     {
       post.data.cover ? (
         <Image

src/content/config.ts renamed to src/content.config.ts

@@ -1,5 +1,6 @@
 import { defineCollection, z } from "astro:content";
-import { localeSlugs, type Locale } from "../configuration";
+import { localeSlugs, type Locale } from "./configuration";
+import { glob } from "astro/loaders";
 
 const localized = <T extends z.ZodTypeAny>(schema: T) =>
   z.object(
@@ -13,7 +14,7 @@ const localized = <T extends z.ZodTypeAny>(schema: T) =>
   );
 
 const blogCollection = defineCollection({
-  type: "content",
+  loader: glob({ pattern: "**/[^_]*.{md,mdx}", base: "./src/content/blog", generateId: ({entry}) => entry }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
@@ -29,13 +30,13 @@ const blogCollection = defineCollection({
     }),
 });
 const notesCollection = defineCollection({
-  type: "content",
+  loader: glob({ pattern: "**/[^_]*.{md,mdx}", base: "./src/content/notes", generateId: ({entry}) => entry }),
   schema: z.object({
     title: z.string(),
   }),
 });
 const galleryCollection = defineCollection({
-  type: "data",
+  loader: glob({ pattern: "**/[^_]*.yml", base: "./src/content/gallery"}),
   schema: ({ image }) =>
     z.object({
       title: localized(z.string()),
@@ -49,8 +50,8 @@ const galleryCollection = defineCollection({
       ),
     }),
 });
-const projectCollection = defineCollection({
-  type: "content",
+const projectsCollection = defineCollection({
+  loader: glob({ pattern: "**/[^_]*.{md,mdx}", base: "./src/content/projects"}),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
@@ -68,14 +69,14 @@ const projectCollection = defineCollection({
     }),
 });
 const pagesCollection = defineCollection({
-  type: "content",
+  loader: glob({ pattern: "**/[^_]*.{md,mdx}", base: "./src/content/pages"}),
   schema: z.object({
     path: z.string(),
     title: z.string(),
   }),
 });
 const navigationCollection = defineCollection({
-  type: "data",
+  loader: glob({ pattern: "**/[^_]*.yml", base: "./src/content/navigation"}),
   schema: ({ image }) =>
     localized(
       z.array(
@@ -88,15 +89,15 @@ const navigationCollection = defineCollection({
     ),
 });
 const sectionsCollection = defineCollection({
-  type: "content",
+  loader: glob({ pattern: "**/[^_]*.{md,mdx}", base: "./src/content/sections"}),
   schema: z.object({}),
 })
 
 export const collections = {
   blog: blogCollection,
   notes: notesCollection,
   gallery: galleryCollection,
-  projects: projectCollection,
+  projects: projectsCollection,
   pages: pagesCollection,
   navigation: navigationCollection,
   sections: sectionsCollection,

src/pages/[...locale]/[...pages].astro

@@ -3,13 +3,14 @@ import type { InferGetStaticPropsType } from "astro";
 import { entryPaths } from "../_paths";
 import DefaultLayout from "../../layouts/DefaultLayout.astro";
 import Meta from "../../layouts/groups/Meta.astro";
+import { render } from "astro:content";
 
 export const getStaticPaths = entryPaths("pages");
 
 type Props = InferGetStaticPropsType<typeof getStaticPaths>;
 const page = Astro.props as Props;
 
-const { Content } = await page.render();
+const { Content } = await render(page);
 ---
 
 <DefaultLayout translations={page.translations}>

src/pages/[...locale]/[blog]/[...slug].astro

@@ -12,13 +12,14 @@ import slug from "limax";
 import Comments from "../../../components/Comments.astro";
 import Meta from "../../../layouts/groups/Meta.astro";
 import { getCollectionSlug, getLocaleSlug } from "../../../utils/slugs";
+import { render } from "astro:content";
 
 export const getStaticPaths = entryPaths("blog", "slug");
 
 type Props = InferGetStaticPropsType<typeof getStaticPaths>;
 
-const { translations, render, data } = Astro.props as Props;
-const { Content, headings, remarkPluginFrontmatter } = await render();
+const { translations, data } = Astro.props as Props;
+const { Content, headings, remarkPluginFrontmatter } = await render(Astro.props);
 const git: GitInfoFrontmatter["git"] = remarkPluginFrontmatter.git;
 const locale = getLocaleFromUrl(Astro.url);
 const t = useTranslations(locale);

src/pages/[...locale]/[notes]/[...note].astro

@@ -4,13 +4,14 @@ import DefaultLayout from "../../../layouts/DefaultLayout.astro";
 import { entryPaths } from "../../_paths";
 import PageWithAside from "../../../layouts/pages/PageWithAside.astro";
 import Meta from "../../../layouts/groups/Meta.astro";
+import { render } from "astro:content";
 
 export const getStaticPaths = entryPaths("notes", "note");
 
 type Props = InferGetStaticPropsType<typeof getStaticPaths>;
 const page = Astro.props as Props;
 
-const { Content, headings } = await page.render();
+const { Content, headings } = await render(page);
 ---
 
 <DefaultLayout translations={page.translations}>

src/pages/[...locale]/index.astro

@@ -4,15 +4,16 @@ import DefaultLayout from "../../layouts/DefaultLayout.astro";
 import { indexPaths } from "../_paths";
 import { getEntry } from "astro:content";
 import LatestBlogsSection from "../../layouts/sections/LatestBlogsSection.astro";
+import { render } from "astro:content";
 
 export const getStaticPaths = indexPaths();
 
 type Props = InferGetStaticPropsType<typeof getStaticPaths>;
 
 const { translations, locale } = Astro.props as Props;
-const { Content: IntroSection } = await (
+const { Content: IntroSection } = await render(
   await getEntry("sections", `${locale}/intro`)!
-).render();
+);
 ---
 
 <style>

src/pages/rss[...locale].xml.ts

@@ -34,7 +34,7 @@ export const GET: APIRoute<Props, Params> = async (context) => {
       blogs.map(async (blog) => ({
         title: blog.data.title,
         pubDate: blog.data.publishedAt,
-        link: getContentEntryPath(await getEntry("blog", blog.slug)),
+        link: getContentEntryPath(await getEntry("blog", blog.id)),
       })),
     ),
     customData: `<language>${C.LOCALES[locale]}</language>`,