rankrunners-cms 0.0.18 → 0.0.19

package/README.md

@@ -571,25 +571,46 @@ Update the `server.ts` script, or add a Tanstack Start middleware to handle `[si
   // Build static routes with intelligent preloading
   const { routes } = await initializeStaticRoutes(CLIENT_DIRECTORY)
 
-  // Add sitemap routes
-  routes['/*'] = (req: Request) => {
-    const url = new URL(req.url)
-    const pathname = url.pathname
-
-    // Serve the sitemap if we are asking for it
-    if (pathname === 'robots.txt' || pathname.endsWith('.xml')) {
-      const sitemapFile = pathname.substring(1)
-      return downloadSitemapAsResponse(sitemapFile)
-    }
-
-    // Otherwise, pass to TanStack Start handler
-    try {
-      return handler.fetch(req)
-    } catch (error) {
-      log.error(`Server handler error: ${String(error)}`)
+  // Import sitemap handler dynamically to help Bun bundle it
+  const downloadSitemapAsResponse = (
+    await import('rankrunners-cms/src/api/client/sitemap')
+  ).downloadSitemapAsResponse
+
+  // Create Bun server
+  const server = Bun.serve({
+    port: SERVER_PORT,
+
+    routes: {
+      // Serve static assets, robots.txt, sitemaps (*.xml), and all other routes
+      ...routes,
+      '/*': (req: Request) => {
+        const url = new URL(req.url)
+        const pathname = url.pathname
+
+        // Check if it's a sitemap file (ends with .xml)
+        if (pathname === 'robots.txt' || pathname.endsWith('.xml')) {
+          const sitemapFile = pathname.substring(1) // Remove leading slash
+          return downloadSitemapAsResponse(sitemapFile)
+        }
+
+        // Otherwise, pass to TanStack Start handler
+        try {
+          return handler.fetch(req)
+        } catch (error) {
+          log.error(`Server handler error: ${String(error)}`)
+          return new Response('Internal Server Error', { status: 500 })
+        }
+      },
+    },
+
+    // Global error handler
+    error(error) {
+      log.error(
+        `Uncaught server error: ${error instanceof Error ? error.message : String(error)}`,
+      )
       return new Response('Internal Server Error', { status: 500 })
-    }
-  }
+    },
+  })
 ```
 
 ---

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "rankrunners-cms",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "peerDependencies": {
-    "@puckeditor/core": "^0.21.0",
+    "@puckeditor/core": "^0.21.1",
     "next": "^16.1.2",
     "@tanstack/router-core": "^1.150.0",
     "@tanstack/react-router": "^1.150.0",
@@ -29,15 +29,14 @@
     }
   },
   "devDependencies": {
-    "@types/react": "^19.2.8",
-    "bun-types": "^1.3.6",
+    "@types/react": "^19.2.11",
+    "bun-types": "^1.3.8",
     "typescript": "^5.9.3",
-    "@tanstack/router-core": "^1.150.0",
-    "@tanstack/react-router": "^1.150.0",
-    "next": "^16.1.3",
+    "@tanstack/router-core": "^1.158.0",
+    "@tanstack/react-router": "^1.158.0",
+    "next": "^16.1.6",
     "valibot": "^1.2.0",
-    "lucide-react": "^0.562.0",
-    "react": "^19.2.3"
+    "lucide-react": "^0.563.0"
   },
   "dependencies": {
     "classnames": "^2.5.1",

package/src/api/client/pages.ts

@@ -0,0 +1,57 @@
+import type { CMSUserData } from "../../editor";
+import { fetchWithCache } from "../../libs";
+import { CMS_BASE_URL, SITE_ID } from "../constants";
+
+export const getPageContents = async (
+  pathname: string,
+  allPageData: Record<string, CMSUserData<any>>,
+  previewToken?: string,
+) => {
+  // remove trailing (left and right) slashes
+  pathname = pathname.replace(/^\/+|\/+$/g, "");
+
+  try {
+    const res = await fetchWithCache(
+      `${CMS_BASE_URL}/public/seo/${SITE_ID}/pages/${pathname}`,
+      {
+        headers: {
+          "Content-Type": "application/json",
+        },
+      },
+    );
+
+    if (res.ok) {
+      const json = (await res.json()) as { content?: string };
+
+      if (json.content) {
+        const content = JSON.parse(json.content) as CMSUserData<any>;
+
+        if (content.root && content.content) {
+          return content;
+        }
+      }
+    }
+
+    const actualData = allPageData[pathname as keyof typeof allPageData];
+
+    if (actualData) {
+      // Starting new page from existing published data
+      return actualData as CMSUserData<any>;
+    }
+
+    // Starting new blank page
+  } catch (error) {
+    console.error("Error fetching page data:", error);
+  }
+
+  if (previewToken) {
+    // New blank page in preview mode
+    return {
+      content: [],
+      root: { props: { title: "New Page" } },
+      zones: {},
+    };
+  }
+
+  return null;
+};

package/src/editor/render/PageRendererContent.tsx

@@ -1,56 +1,7 @@
 import { useEffect, useState } from "react";
 import type { CMSUserData } from "../types";
 import { Render, type Config } from "@puckeditor/core";
-import { CMS_BASE_URL, SITE_ID } from "../../api";
-import { fetchWithCache } from "../../libs";
-
-const getPageContents = async (
-  pathname: string,
-  allPageData: Record<string, CMSUserData<any>>,
-) => {
-  // remove trailing (left and right) slashes
-  pathname = pathname.replace(/^\/+|\/+$/g, "");
-
-  try {
-    const res = await fetchWithCache(
-      `${CMS_BASE_URL}/public/seo/${SITE_ID}/pages/${pathname}`,
-      {
-        headers: {
-          "Content-Type": "application/json",
-        },
-      },
-    );
-
-    if (res.ok) {
-      const json = (await res.json()) as { content?: string };
-
-      if (json.content) {
-        const content = JSON.parse(json.content) as CMSUserData<any>;
-
-        if (content.root && content.content) {
-          return content;
-        }
-      }
-    }
-
-    const actualData = allPageData[pathname as keyof typeof allPageData];
-
-    if (actualData) {
-      // Starting new page from existing published data
-      return actualData as CMSUserData<any>;
-    }
-
-    // Starting new blank page
-  } catch (error) {
-    console.error("Error fetching page data:", error);
-  }
-
-  return {
-    content: [],
-    root: { props: { title: "New Page" } },
-    zones: {},
-  };
-};
+import { getPageContents } from "../../api/client/pages";
 
 export type PageRendererContentProps = {
   pathname: string;
@@ -82,4 +33,4 @@ export const PageRendererContent = ({
   }
 
   return <Render config={config} data={data} />;
-};
+};

package/src/editor/render/PageRendererSSR.tsx

@@ -0,0 +1,15 @@
+import { Render, type Config } from "@puckeditor/core";
+import type { CMSUserData } from "../types";
+
+export type PageRendererSSRProps = {
+  config: Config;
+  data: CMSUserData<any>;
+};
+
+/**
+ * SSR-compatible PageRenderer that receives pre-fetched data from the loader.
+ * Use this component with TanStack Router's loader for server-side rendering.
+ */
+export const PageRendererSSR = ({ config, data }: PageRendererSSRProps) => {
+  return <Render config={config} data={data} />;
+};

package/src/editor/render/Preview.tsx

@@ -126,7 +126,7 @@ export const BaseEditor =
               alert("Failed to upload changes to CMS");
             } else {
               alert(
-                "Changes uploaded successfully to CMS! The page will now reflect the changes."
+                "Changes uploaded successfully to CMS! The page will now reflect the changes.",
               );
             }
           } catch (error) {
@@ -141,9 +141,6 @@ export const BaseEditor =
         iframe={{
           enabled: true,
         }}
-        fieldTransforms={{
-          userField: ({ value }) => value, // Included to check types
-        }}
         overrides={{
           fieldTypes: {
             // Example of user field provided via overrides

package/src/tanstack/editor/Editor.tsx

@@ -1,9 +1,7 @@
-"use client";
-
-import { BaseEditor } from "../../editor/render/Preview";
-import { usePathnameTanstack, useSearchParamsTanstack } from "../hooks";
+import { BaseEditor } from '../../editor/render/Preview'
+import { usePathnameTanstack, useSearchParamsTanstack } from '../hooks'
 
 export const EditorTanstack = BaseEditor({
   usePathname: usePathnameTanstack,
   useSearchParams: useSearchParamsTanstack,
-});
+})

package/src/tanstack/editor/PageRenderer.tsx

@@ -9,6 +9,10 @@ export type PageRendererTanstackInitializerProps = {
   allPageData: Record<string, CMSUserData<any>>;
 };
 
+/**
+ * Use PageRendererTanstackSSR for SSR support instead.
+ * This component fetches data on the client side.
+ */
 export const PageRendererTanstack =
   ({ config, allPageData }: PageRendererTanstackInitializerProps) =>
   () => {