chore: astro 5 & other deps

maxpou · maxpou · commit 165b32f078a3 · 2026-04-13T19:15:37.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,26 +28,26 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/check": "^0.9.6",
-    "@astrojs/mdx": "^4.3.0",
-    "@astrojs/preact": "^4.1.0",
-    "@astrojs/rss": "^4.0.0",
-    "@astrojs/sitemap": "^3.6.0",
-    "@notionhq/client": "^5.6.0",
+    "@astrojs/check": "^0.9.8",
+    "@astrojs/mdx": "^5.0.3",
+    "@astrojs/preact": "^5.1.0",
+    "@astrojs/rss": "^4.0.18",
+    "@astrojs/sitemap": "^3.7.2",
+    "@notionhq/client": "^5.15.0",
     "@tailwindcss/typography": "^0.5.19",
-    "@tailwindcss/vite": "^4.1.17",
+    "@tailwindcss/vite": "^4.2.2",
     "@types/jsonld": "^1.5.15",
-    "@vercel/og": "^0.6.4",
-    "astro": "^5.16.0",
-    "astro-expressive-code": "^0.41.4",
+    "@vercel/og": "^0.11.1",
+    "astro": "^6.1.1",
+    "astro-expressive-code": "^0.41.7",
     "notion-to-md": "^3.1.9",
-    "preact": "^10.25.1",
-    "tailwindcss": "^4.1.17",
-    "typescript": "^5.9.0"
+    "preact": "^10.29.0",
+    "tailwindcss": "^4.2.2",
+    "typescript": "^5.9.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.10",
-    "prettier": "^3.7.4",
+    "@biomejs/biome": "2.4.9",
+    "prettier": "^3.8.1",
     "tsx": "^4.19.2"
   }
 }
diff --git a/src/components/BlogCard.astro b/src/components/BlogCard.astro
@@ -16,7 +16,7 @@ const { post, firstBigger = true, showDate = true } = Astro.props
 
 <a
   title={post.data.title}
-  href={`/blog/${post.slug}/`}
+  href={`/blog/${post.id}/`}
   class:list={[
     'ease flex flex-col rounded-lg bg-white transition duration-300 dark:bg-gray-500',
     'hover:translate-y-0.5 shadow-md  hover:shadow-xl',
diff --git a/src/components/ProjectCard.astro b/src/components/ProjectCard.astro
@@ -1,5 +1,5 @@
 ---
-import { Image } from 'astro:assets'  
+import { Image } from 'astro:assets'
 import GithubIcon from './icons/Github'
 
 interface Props {
diff --git a/src/components/RecipeCard.astro b/src/components/RecipeCard.astro
@@ -11,7 +11,7 @@ const { recipe } = Astro.props
 
 <a
   title={recipe.data.title}
-  href={`/recipes/${recipe.slug}/`}
+  href={`/recipes/${recipe.id}/`}
   class="ease flex flex-col rounded-lg bg-white transition duration-300 dark:bg-gray-500
     hover:translate-y-0.5 shadow-md hover:shadow-xl group"
 >
diff --git a/src/content.config.ts b/src/content.config.ts
@@ -1,12 +1,19 @@
-import { defineCollection, z } from 'astro:content'
+import { defineCollection } from 'astro:content'
+import { glob } from 'astro/loaders'
+import { z } from 'zod'
 
 const blog = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: '**/*.{md,mdx}',
+    base: './src/content/blog',
+    generateId: ({ entry }) =>
+      entry.replace(/\/index\.(md|mdx)$/, '').replace(/\.(md|mdx)$/, ''),
+  }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
       description: z.string().optional(),
-      date: z.coerce.date(), // Transform string to Date object
+      date: z.coerce.date(),
       cover: image(),
       language: z.string().optional(),
       modified: z.coerce.date().optional(),
@@ -26,7 +33,14 @@ const blog = defineCollection({
 })
 
 const pages = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: '**/*.{md,mdx}',
+    base: './src/content/pages',
+    generateId: ({ entry, data }) => {
+      if (data.slug && typeof data.slug === 'string') return data.slug
+      return entry.replace(/\/index\.(md|mdx)$/, '').replace(/\.(md|mdx)$/, '')
+    },
+  }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
@@ -37,11 +51,16 @@ const pages = defineCollection({
 })
 
 const recipes = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: '**/*.{md,mdx}',
+    base: './src/content/recipes',
+    generateId: ({ entry }) =>
+      entry.replace(/\/index\.(md|mdx)$/, '').replace(/\.(md|mdx)$/, ''),
+  }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
-      date: z.coerce.date(), // Transform string to Date object
+      date: z.coerce.date(),
       cover: image(),
       description: z.string().optional(),
     }),
diff --git a/src/content/pages/speaking/MyTalks.tsx b/src/content/pages/speaking/MyTalks.tsx
@@ -68,4 +68,4 @@ function Presentations(): JSX.Element {
   )
 }
 
-export { Talks, TrainingsAndWorkshops, Presentations }
+export { Presentations, Talks, TrainingsAndWorkshops }
diff --git a/src/layouts/BlogPost.astro b/src/layouts/BlogPost.astro
@@ -29,7 +29,7 @@ function formatBlogTranslation(
   )
 }
 
-const { data, slug } = Astro.props
+const { data, id: slug } = Astro.props
 const {
   title,
   description,
diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro
@@ -6,7 +6,7 @@ import PageTitle from '../components/PageTitle.astro'
 
 type Props = CollectionEntry<'pages'> | CollectionEntry<'recipes'>
 
-const { data, slug } = Astro.props
+const { data, id: slug } = Astro.props
 const { title, cover, description } = data
 ---
 
diff --git a/src/pages/[...slug].astro b/src/pages/[...slug].astro
@@ -1,19 +1,19 @@
 ---
-import { type CollectionEntry, getCollection } from 'astro:content'
+import { type CollectionEntry, getCollection, render } from 'astro:content'
 import Prose from '../components/Prose.astro'
 import Page from '../layouts/Page.astro'
 
 export async function getStaticPaths() {
   const pages = await getCollection('pages')
   return pages.map(page => ({
-    params: { slug: page.slug },
+    params: { slug: page.id },
     props: page,
   }))
 }
 type Props = CollectionEntry<'pages'>
 
 const page = Astro.props
-const { Content } = await page.render()
+const { Content } = await render(page)
 ---
 
 <Page {...page}>
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
@@ -1,5 +1,5 @@
 ---
-import { getCollection } from 'astro:content'
+import { getCollection, render } from 'astro:content'
 import type { InferGetStaticPropsType } from 'astro'
 import AboutAuthor from '../../components/AboutAuthor.astro'
 import BlogCard from '../../components/BlogCard.astro'
@@ -11,14 +11,14 @@ export async function getStaticPaths() {
   const posts = await getCollection('blog')
   const featuredPosts = posts.filter(post => post.data.featured)
   return posts.map(post => ({
-    params: { slug: post.slug },
+    params: { slug: post.id },
     props: { post, featuredPosts },
   }))
 }
 type Props = InferGetStaticPropsType<typeof getStaticPaths>
 
 const { post, featuredPosts } = Astro.props
-const { Content } = await post.render()
+const { Content } = await render(post)
 ---
 
 <BlogPost {...post}>
@@ -35,7 +35,7 @@ const { Content } = await post.render()
       {
         featuredPosts
           .sort(() => 0.5 - Math.random()) // shuffle
-          .filter(post => post.slug !== Astro.params.slug) // remove current post
+          .filter(post => post.id !== Astro.params.slug) // remove current post
           .slice(0, 2)
           .map(post => <BlogCard post={post} firstBigger={false} showDate={false} />)
       }
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
@@ -44,7 +44,7 @@ const blogStructuredData: JsonLdDocument = {
     headline: post.data.title,
     description: post.data.description,
     datePublished: post.data.date.toISOString(),
-    url: `${SITE_URL}/blog/${post.slug}`,
+    url: `${SITE_URL}/blog/${post.id}`,
   })),
 }
 ---
diff --git a/src/pages/og/[...slug].png.ts b/src/pages/og/[...slug].png.ts
@@ -1,11 +1,11 @@
-import type { ImageFunction, z } from 'astro:content'
 import { getCollection } from 'astro:content'
 import fs from 'node:fs'
 import path from 'node:path'
 import { ImageResponse } from '@vercel/og'
+import type { ImageMetadata } from 'astro'
 import type { ReactNode } from 'preact/compat'
 
-type AstroImage = z.infer<ReturnType<ImageFunction>>
+type AstroImage = ImageMetadata
 
 interface Props {
   params: { slug: string }
@@ -120,10 +120,10 @@ export async function getStaticPaths() {
   const allPages = await getCollection('pages')
   const allRecipes = await getCollection('recipes')
   const indexPage = allPages
-    .filter(page => page.slug === 'speaking')
+    .filter(page => page.id === 'speaking')
     .map(page => {
       return {
-        slug: 'home',
+        id: 'home',
         data: {
           title: 'Maxence Poutord',
           cover: page.data.cover,
@@ -134,7 +134,7 @@ export async function getStaticPaths() {
   return [indexPage, ...allBlogPosts, ...allPages, ...allRecipes].map(page => {
     return {
       params: {
-        slug: page.slug,
+        slug: page.id,
       },
       props: {
         title: page.data.title,
diff --git a/src/pages/recipes/[...slug].astro b/src/pages/recipes/[...slug].astro
@@ -1,12 +1,12 @@
 ---
-import { type CollectionEntry, getCollection } from 'astro:content'
+import { type CollectionEntry, getCollection, render } from 'astro:content'
 import Prose from '../../components/Prose.astro'
 import Page from '../../layouts/Page.astro'
 
 export async function getStaticPaths() {
   const recipes = await getCollection('recipes')
   return recipes.map(recipe => ({
-    params: { slug: recipe.slug },
+    params: { slug: recipe.id },
     props: recipe,
   }))
 }
@@ -19,7 +19,7 @@ const recipe = {
     description: `${Astro.props.data.title}, a cooking recipe by Maxence Poutord`,
   },
 }
-const { Content } = await recipe.render()
+const { Content } = await render(recipe)
 ---
 
 <Page {...recipe}>
diff --git a/src/pages/rss.xml.js b/src/pages/rss.xml.js
@@ -11,7 +11,7 @@ export async function GET(context) {
     items: posts.map(post => ({
       ...post.data,
       pubDate: post.data.date,
-      link: `/blog/${post.slug}/`,
+      link: `/blog/${post.id}/`,
     })),
   })
 }
diff --git a/src/styles/global.css b/src/styles/global.css
@@ -30,8 +30,8 @@
   --gray-dark: 34, 41, 57;
   --gray-gradient: rgba(var(--gray-light), 50%), #fff;
   --box-shadow:
-    0 2px 6px rgba(var(--gray), 25%), 0 8px 24px rgba(var(--gray), 33%), 0 16px
-    32px rgba(var(--gray), 33%);
+    0 2px 6px rgba(var(--gray), 25%), 0 8px 24px rgba(var(--gray), 33%),
+    0 16px 32px rgba(var(--gray), 33%);
 }
 
 body {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ const { recipe } = Astro.props`
`11`	`11`
`12`	`12`	`<a`
`13`	`13`	`title={recipe.data.title}`
`14`		- href={`/recipes/${recipe.slug}/`}
	`14`	+ href={`/recipes/${recipe.id}/`}
`15`	`15`	`class="ease flex flex-col rounded-lg bg-white transition duration-300 dark:bg-gray-500`
`16`	`16`	`hover:translate-y-0.5 shadow-md hover:shadow-xl group"`
`17`	`17`	`>`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,4 @@ function Presentations(): JSX.Element {`
`68`	`68`	`)`
`69`	`69`	`}`
`70`	`70`
`71`		`-export { Talks, TrainingsAndWorkshops, Presentations }`
	`71`	`+export { Presentations, Talks, TrainingsAndWorkshops }`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function formatBlogTranslation(`
`29`	`29`	`)`
`30`	`30`	`}`
`31`	`31`
`32`		`-const { data, slug } = Astro.props`
	`32`	`+const { data, id: slug } = Astro.props`
`33`	`33`	`const {`
`34`	`34`	`title,`
`35`	`35`	`description,`