Merge pull request #303 from maxulysse/gix_legacy

Author: maxulysse

.github/dependabot.yml

@@ -5,10 +5,6 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: "typescript"
-        update-types:
-          - "version-update:semver-major"
     labels:
       - "dependencies"
       - "security"

src/content.config.ts

@@ -0,0 +1,51 @@
+import { defineCollection, z } from "astro:content";
+import { glob } from "astro/loaders";
+
+const blogCollection = defineCollection({
+  loader: glob({ pattern: "**/*.{md,mdx}", base: "./src/content/blog" }),
+  schema: z.object({
+    title: z.string(),
+    description: z.string().optional(),
+    date: z.coerce.date(),
+    author: z.string().optional().default("maxulysse"),
+    tags: z.array(z.string()).optional(),
+    image: z
+      .object({
+        path: z.string(),
+      })
+      .optional(),
+    draft: z.boolean().optional().default(false),
+  }),
+});
+
+const presentationsCollection = defineCollection({
+  loader: glob({
+    pattern: "**/*.{md,mdx}",
+    base: "./src/content/presentations",
+  }),
+  schema: z.object({
+    title: z.string(),
+    description: z.string().optional(),
+    date: z.coerce.date(),
+    author: z.string().optional().default("maxulysse"),
+    tags: z.array(z.string()).optional(),
+    image: z
+      .object({
+        path: z.string(),
+      })
+      .optional(),
+    duration: z.string().optional(),
+    location: z
+      .object({
+        city: z.string().optional(),
+        country: z.string().optional(),
+      })
+      .optional(),
+    redirects: z.array(z.string()).optional(),
+  }),
+});
+
+export const collections = {
+  blog: blogCollection,
+  presentations: presentationsCollection,
+};

src/content/config.ts

@@ -10,7 +10,7 @@ export async function getStaticPaths() {
     const paths = [];
 
     for (const presentation of presentations) {
-        const slug = normalizePath(presentation.slug);
+        const slug = normalizePath(presentation.id);
         const redirects = presentation.data.redirects || [];
 
         // Main path: /folder-name/
@@ -39,7 +39,7 @@ export async function getStaticPaths() {
 }
 
 const { presentation } = Astro.props;
-const slidesContent = presentation.body;
+const slidesContent = presentation.body || "";
 const pageTitle = presentation.data.title;
 ---
 

src/pages/[...slideslug].astro

@@ -1,11 +1,11 @@
 ---
-import { getCollection } from "astro:content";
+import { getCollection, render } from "astro:content";
 import PostLayout from "../../layouts/PostLayout.astro";
 
 export async function getStaticPaths() {
     const blogEntries = await getCollection("blog");
     return blogEntries.map((entry) => ({
-        params: { slug: entry.slug },
+        params: { slug: entry.id },
         props: { entry },
     }));
 }
@@ -16,7 +16,7 @@ interface Props {
 
 const { slug } = Astro.params;
 const allEntries = await getCollection("blog");
-const entry = allEntries.find((e) => e.slug === slug);
+const entry = allEntries.find((e) => e.id === slug);
 
 if (!entry) {
     return Astro.redirect("/");
@@ -32,7 +32,9 @@ const normalizeDate = (value: unknown) => {
 };
 
 const findSlideRedirect = async (postEntry: any) => {
-    const tags = (postEntry.data.tags || []).map((tag: string) => tag.toLowerCase());
+    const tags = (postEntry.data.tags || []).map((tag: string) =>
+        tag.toLowerCase(),
+    );
     if (!tags.includes("presentation")) return null;
 
     const presentations = await getCollection("presentations");
@@ -45,7 +47,7 @@ const findSlideRedirect = async (postEntry: any) => {
 
         if (slideDate === targetDate && slideTitle === targetTitle) {
             const redirects = presentation.data.redirects || [];
-            const redirect = redirects[0] || presentation.slug;
+            const redirect = redirects[0] || presentation.id;
             const normalized = redirect.replace(/^\/+/, "");
             return `/${normalized}/`;
         }
@@ -59,7 +61,7 @@ if (slideRedirect) {
     return Astro.redirect(slideRedirect, 302);
 }
 
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 
 <PostLayout

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

@@ -51,13 +51,14 @@ if (currentPage === 1) {
                         )}
                         <div class="card-body">
                             <h5 class="card-title">
-                                <a href={`/blog/${post.slug}/`}>
+                                <a href={`/blog/${post.id}/`}>
                                     {post.data.title}
                                 </a>
                             </h5>
                             <p class="card-text">
                                 {post.data.description ||
-                                    post.body.substring(0, 150)}
+                                    post.body?.substring(0, 150) ||
+                                    ""}
                             </p>
                         </div>
                         <div class="card-footer">

src/pages/blog/page/[page].astro

@@ -29,13 +29,14 @@ const totalPages = Math.ceil(sortedPosts.length / postsPerPage);
                         )}
                         <div class="card-body">
                             <h5 class="card-title">
-                                <a href={`/blog/${post.slug}/`}>
+                                <a href={`/blog/${post.id}/`}>
                                     {post.data.title}
                                 </a>
                             </h5>
                             <p class="card-text">
                                 {post.data.description ||
-                                    post.body.substring(0, 150)}
+                                    post.body?.substring(0, 150) ||
+                                    ""}
                             </p>
                         </div>
                         <div class="card-footer">