rankrunners-cms 0.0.21 → 0.0.22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rankrunners-cms",
   "type": "module",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "peerDependencies": {
     "@puckeditor/core": "^0.21.1",
     "next": "^16.1.6",

package/src/tanstack/withCMS.tsx

@@ -22,10 +22,7 @@ import React from "react";
 import type { Config } from "@puckeditor/core";
 import type { CMSUserData } from "../editor/types";
 import { NotFound } from "./components/NotFound";
-import type {
-  CMSBlogConfig,
-  CMSConfig,
-} from "./seo/types";
+import type { CMSBlogConfig, CMSConfig } from "./seo/types";
 import type {
   PublicPostDTO,
   PublicPostSeoDetailsDTO,
@@ -42,7 +39,7 @@ const cmsSearchEntries = {
 
 interface BlogMatch {
   kind: "list" | "detail";
-  blog: CMSBlogConfig;
+  blogIndex: number;
   /** Slug of the post (only set when kind === "detail") */
   slug?: string;
 }
@@ -53,20 +50,20 @@ function matchBlogRoute(
 ): BlogMatch | null {
   if (!blogs) return null;
 
-  for (const blog of blogs) {
+  for (const [index, blog] of blogs.entries()) {
     const prefix = blog.prefix.replace(/^\/+|\/+$/g, "");
 
     // Detail: {prefix}/{slug}
     if (pathname.startsWith(`${prefix}/`)) {
       const slug = pathname.slice(prefix.length + 1);
       if (slug.length > 0) {
-        return { kind: "detail", blog, slug };
+        return { kind: "detail", blogIndex: index, slug };
       }
     }
 
     // List: exact match on prefix
     if (pathname === prefix) {
-      return { kind: "list", blog };
+      return { kind: "list", blogIndex: index };
     }
   }
 
@@ -159,6 +156,10 @@ export function withCMS<
       const blogMatch = matchBlogRoute(pathname, blogs);
 
       if (blogMatch) {
+        const blog = blogs?.[blogMatch.blogIndex];
+        if (!blog) {
+          throw notFound();
+        }
         if (blogMatch.kind === "detail" && blogMatch.slug) {
           // Fetch full post data by slug
           try {
@@ -168,7 +169,7 @@ export function withCMS<
               preview: deps.preview,
               blogMatch: {
                 kind: "detail" as const,
-                blog: blogMatch.blog,
+                blogIndex: blogMatch.blogIndex,
                 postData,
               },
             };
@@ -179,24 +180,14 @@ export function withCMS<
 
         if (blogMatch.kind === "list") {
           // Fetch post list (optionally filtered by category)
-          const posts = await getPublicPosts(
-            blogMatch.blog.category ?? undefined,
-          );
-
-          // Also try to load CMS page data for the list page itself
-          // (the user may have created a CMS page at the prefix path)
-          const pageData = await getPageContents(
-            pathname,
-            allPageData,
-            deps.preview,
-          );
+          const posts = await getPublicPosts(blog.category ?? undefined);
 
           return {
-            pageData,
+            pageData: null,
             preview: deps.preview,
             blogMatch: {
               kind: "list" as const,
-              blog: blogMatch.blog,
+              blogIndex: blogMatch.blogIndex,
               posts,
             },
           };
@@ -234,9 +225,9 @@ export function withCMS<
         }) as unknown as {
           pageData: CMSUserData<TComponents> | null;
           preview?: string;
-          blogMatch?: {
+          blogMatch: {
             kind: "list" | "detail";
-            blog: CMSBlogConfig;
+            blogIndex: number;
             posts?: PublicPostDTO[];
             postData?: PublicPostSeoDetailsDTO;
           } | null;
@@ -246,22 +237,18 @@ export function withCMS<
 
         // ---- Blog rendering ----
         if (blogMatch) {
+          const blog = blogs?.[blogMatch.blogIndex];
+
+          if (!blog) {
+            return <NotFound />;
+          }
+
           if (blogMatch.kind === "detail" && blogMatch.postData) {
-            return <>{blogMatch.blog.detailComponent(blogMatch.postData)}</>;
+            return blog.detailComponent(blogMatch.postData);
           }
 
           if (blogMatch.kind === "list" && blogMatch.posts) {
-            // If there's also a CMS page for the list prefix, render it
-            // above/around the blog list -- or just render the list component.
-            if (pageData && !preview) {
-              return (
-                <>
-                  <PageRendererSSR config={config} data={pageData} />
-                  {blogMatch.blog.listComponent(blogMatch.posts)}
-                </>
-              );
-            }
-            return <>{blogMatch.blog.listComponent(blogMatch.posts)}</>;
+            return blog.listComponent(blogMatch.posts);
           }
         }