Fix conflicts

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   app:
-    image: node:18
+    image: node:20
     ports:
       - 4321:4321
     working_dir: /app

src/content/blog/how-to-integrate-giscus-comments.md

@@ -1,6 +1,7 @@
 ---
 author: FjellOverflow
 pubDatetime: 2024-07-25T11:11:53Z
+modDatetime: 2024-09-25T12:07:53Z
 title: How to integrate Giscus comments into AstroPaper
 slug: how-to-integrate-giscus-comments
 featured: true
@@ -189,10 +190,12 @@ Note that specifying a `theme` here will override the `lightTheme` and `darkThem
 To complete the process, add the new Comments component to `src/layouts/PostDetails.astro` (replacing the `script` tag from the previous step).
 
 ```diff
++ import Comments from "@components/Comments";
+
       <ShareLinks />
     </div>
 
-+    <Comments client:only />
++    <Comments client:only="react" />
 
   </main>
   <Footer />

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

@@ -3,10 +3,11 @@ import { SITE } from "@config";
 import Posts from "@layouts/Posts.astro";
 import type { GetStaticPaths } from "astro";
 import { getCollection } from "astro:content";
+import getSortedPosts from "@utils/getSortedPosts";
 
 export const getStaticPaths = (async ({ paginate }) => {
   const posts = await getCollection("blog", ({ data }) => !data.draft);
-  return paginate(posts, { pageSize: SITE.postPerPage });
+  return paginate(getSortedPosts(posts), { pageSize: SITE.postPerPage });
 }) satisfies GetStaticPaths;
 
 const { page } = Astro.props;

src/pages/posts/[page].astro

@@ -0,0 +1,16 @@
+---
+import { SITE } from "@config";
+import Posts from "@layouts/Posts.astro";
+import type { GetStaticPaths } from "astro";
+import { getCollection } from "astro:content";
+import getSortedPosts from "@utils/getSortedPosts";
+
+export const getStaticPaths = (async ({ paginate }) => {
+  const posts = await getCollection("blog", ({ data }) => !data.draft);
+  return paginate(getSortedPosts(posts), { pageSize: SITE.postPerPage });
+}) satisfies GetStaticPaths;
+
+const { page } = Astro.props;
+---
+
+<Posts {page} />