fix: sort by semver only in blog

Author: himself65

apps/site/components/withBlogCrossLinks.tsx

@@ -1,10 +1,16 @@
 import type { FC } from 'react';
+import semver from 'semver';
 
 import { getClientContext } from '#site/client-context';
 import CrossLink from '#site/components/Common/CrossLink';
 import getBlogData from '#site/next-data/blogData';
 import type { BlogCategory } from '#site/types';
 
+const extractVersionFromTitle = (title: string): string | null => {
+  const match = title.match(/v(\d+\.\d+\.\d+)/);
+  return match ? match[1] : null;
+};
+
 const WithBlogCrossLinks: FC = () => {
   const { pathname } = getClientContext();
 
@@ -18,13 +24,30 @@ const WithBlogCrossLinks: FC = () => {
 
   const { posts } = getBlogData(category);
 
-  const currentItem = posts.findIndex(
+  // Sort posts by semver for release category
+  const sortedPosts =
+    category === 'release'
+      ? [...posts].sort((a, b) => {
+          const versionA = extractVersionFromTitle(a.title);
+          const versionB = extractVersionFromTitle(b.title);
+
+          if (versionA && versionB) {
+            // Sort by semver in descending order (newest first)
+            return semver.rcompare(versionA, versionB);
+          }
+
+          // Fallback to date sorting if version extraction fails
+          return b.date.getTime() - a.date.getTime();
+        })
+      : posts;
+
+  const currentItem = sortedPosts.findIndex(
     ({ slug }) => slug === `/blog/${category}/${postname}`
   );
 
   const [previousCrossLink, nextCrossLink] = [
-    posts[currentItem - 1],
-    posts[currentItem + 1],
+    sortedPosts[currentItem - 1],
+    sortedPosts[currentItem + 1],
   ];
 
   return (

apps/site/next-data/providers/blogData.ts

@@ -1,5 +1,4 @@
 import { cache } from 'react';
-import semver from 'semver';
 
 import { BLOG_POSTS_PER_PAGE } from '#site/next.constants.mjs';
 import { blogData } from '#site/next.json.mjs';
@@ -9,27 +8,11 @@ const blogPosts = cache(() =>
   blogData.posts.map(post => ({ ...post, date: new Date(post.date) }))
 );
 
-const extractVersionFromTitle = (title: string): string | null => {
-  const versionMatch = title.match(/v?(\d+\.\d+\.\d+(-[\w.-]+)?(\+[\w.-]+)?)/);
-  return versionMatch && semver.valid(versionMatch[0]) ? versionMatch[0] : null;
-};
-
 export const provideBlogPosts = cache(
   (category: BlogCategory): BlogPostsRSC => {
     const categoryPosts = blogPosts()
       .filter(post => post.categories.includes(category))
-      .sort((a, b) => {
-        if (category === 'release') {
-          const versionA = extractVersionFromTitle(a.title);
-          const versionB = extractVersionFromTitle(b.title);
-
-          if (versionA && versionB) {
-            return semver.rcompare(versionA, versionB);
-          }
-        }
-
-        return b.date.getTime() - a.date.getTime();
-      });
+      .sort((a, b) => b.date.getTime() - a.date.getTime());
 
     // Total amount of possible pages given the amount of blog posts
     const total = categoryPosts.length / BLOG_POSTS_PER_PAGE;