Upgrade to Astro 6 (#273)

* Migrate content collections

* Format code

* Fix content collections

Author: nojaf

bun.lockb

@@ -12,7 +12,7 @@
     "lint": "bunx --bun prettier . --check"
   },
   "dependencies": {
-    "@astrojs/react": "3.6.2",
+    "@astrojs/react": "4.0.0",
     "@iconify-json/bi": "^1.2.1",
     "@iconify-json/cil": "^1.2.1",
     "@iconify-json/fluent": "^1.2.7",
@@ -28,26 +28,27 @@
     "@iconify-json/uiw": "^1.2.1",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "4.16.13",
-    "astro-icon": "1.1.2",
-    "astro-purgecss": "4.8.0",
+    "astro": "5.0.4",
+    "astro-icon": "1.1.4",
+    "astro-purgecss": "5.0.0",
     "autoprefixer": "^10.4.20",
     "date-fns": "^4.1.0",
     "mermaid": "11.4.0",
     "postcss-nested": "^7.0.2",
-    "purgecss": "^6.0.0",
+    "purgecss": "^7.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sharp": "^0.33.5",
     "styled-components": "^6.1.13"
   },
   "devDependencies": {
     "@mermaid-js/mermaid-cli": "11.4.0",
-    "prettier": "3.3.3",
+    "prettier": "3.4.2",
     "prettier-plugin-astro": "0.14.1",
-    "vite-plugin-fable": "^0.0.31"
+    "vite-plugin-fable": "^0.0.32"
   },
   "trustedDependencies": [
+    "astro",
     "sharp",
     "vite-plugin-fable"
   ]

package.json

@@ -1,7 +1,10 @@
-// 1. Import utilities from `astro:content`
+// 1. Import utilities from `astro:content`
 import { z, defineCollection } from "astro:content";
+import { glob } from "astro/loaders";
+
 // 2. Define your collection(s)
 const testimonialCollection = defineCollection({
+  loader: glob({ pattern: "*.md", base: "./src/testimonials" }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
@@ -13,6 +16,7 @@ const testimonialCollection = defineCollection({
 });
 
 const sessionCollection = defineCollection({
+  loader: glob({ pattern: "*.md", base: "./src/sessions" }),
   schema: ({ image }) => {
     return z.object({
       title: z.string(),
@@ -32,6 +36,7 @@ const sessionCollection = defineCollection({
 });
 
 const blogCollection = defineCollection({
+  loader: glob({ pattern: "*.md", base: "./src/blog" }),
   schema: ({ image }) => {
     return z.object({
       title: z.string(),

src/content/blog/BobKonf2024.md renamed to src/blog/BobKonf2024.md

@@ -1,5 +1,5 @@
 ---
-import { getCollection } from "astro:content";
+import { getCollection, render } from "astro:content";
 import PageLayout from "../../layouts/PageLayout.astro";
 
 export async function getStaticPaths() {
@@ -9,14 +9,14 @@ export async function getStaticPaths() {
     const prevTestimonial = testimonialsEntries.at(
       (index - 1) % testimonialsEntries.length,
     );
-    const prevLink = prevTestimonial && prevTestimonial.slug;
+    const prevLink = prevTestimonial && prevTestimonial.id;
     const nextTestimonial = testimonialsEntries.at(
       (index + 1) % testimonialsEntries.length,
     );
-    const nextLink = nextTestimonial && nextTestimonial.slug;
+    const nextLink = nextTestimonial && nextTestimonial.id;
 
     return {
-      params: { slug: entry.slug },
+      params: { id: entry.id },
       props: {
         entry,
         prevLink,
@@ -28,7 +28,7 @@ export async function getStaticPaths() {
 }
 
 const { entry, prevLink, nextLink, color } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 const { title, author, profilePicture } = entry.data;
 const pageTitle = `Testimonial of ${title}`;
 const mainTitle = pageTitle;