fix: sitemap

Author: shinokada

src/routes/api/posts/+server.js

@@ -1,9 +1,9 @@
 // src/routes/api/posts/+server.ts
 import { json } from "@sveltejs/kit";
-import { fetchMarkdownPosts, fetchBuilders, fetchBlocksMarkdownPosts, fetchDashboardMarkdownPosts } from "../../utils";
+import { fetchMarkdownPosts, fetchBuilders, fetchBlocksMarkdownPosts, fetchDashboardPosts } from "../../utils";
 
 export const GET = async () => {
-  const [posts, blocks, builders, dashboard] = await Promise.all([fetchMarkdownPosts(), fetchBlocksMarkdownPosts(), fetchBuilders(), fetchDashboardMarkdownPosts()]);
+  const [posts, blocks, builders, dashboard] = await Promise.all([fetchMarkdownPosts(), fetchBlocksMarkdownPosts(), fetchBuilders(), fetchDashboardPosts()]);
 
   return json({
     posts,

src/routes/sitemap.xml/+server.ts

@@ -7,7 +7,7 @@ export const GET: RequestHandler = async () => {
   let docsSlugs;
   try {
     docsSlugs = await docs.getDocsSlugs();
-    console.log('Generated docs slugs:', docsSlugs );
+    // console.log('Generated docs slugs:', docsSlugs );
   } catch (err) {
     console.error('Could not load docs data for sitemap:', err);
     throw error(500, 'Could not load data for param values.');
@@ -20,9 +20,9 @@ export const GET: RequestHandler = async () => {
       '^/docs-examples.*',
       '^/docs/examples.*',
       '^/fonts.*',
-      '^/admin-dashboard.*',
       '^/testdir.*', 
       '^/layouts/component.*',
+      '^/admin-dashboard/.*/\\[.*\\].*', // Exclude any dynamic routes in admin-dashboard
     ],
     paramValues: {
       '/docs/pages/[slug]': docsSlugs['pages'] || [],
@@ -31,18 +31,13 @@ export const GET: RequestHandler = async () => {
       '/docs/typography/[slug]': docsSlugs['typography'] || [],
       '/docs/utilities/[slug]': docsSlugs['utilities'] || [],
       '/docs/extend/[slug]': docsSlugs['extend'] || [],
-      // '/docs/examples/[slug]': docsSlugs['examples'] || [],
       '/docs/plugins/[slug]': docsSlugs['plugins'] || [],
       '/icons/[slug]': docsSlugs['icons'] || [],
       '/illustrations/[slug]': docsSlugs['illustrations'] || [],
-
       '/blocks/application/[slug]': docsSlugs['blocks-application'] || [],
       '/blocks/marketing/[slug]': docsSlugs['blocks-marketing'] || [],
       '/blocks/publisher/[slug]': docsSlugs['blocks-publisher'] || [],
-      // '/builder': docsSlugs['builders'] || [],
-      // paramValues can be a 1D array of strings
-      // '/docs/': fetchMarkdownPosts(), // e.g. ['hello-world', 'another-post']
-      // '/blog/tag/[tag]': blogTags, // e.g. ['red', 'green', 'blue']
     },
+    additionalPaths: docsSlugs['dashboard']?.map(route => `/${route}`) || [],
   });
 };

src/routes/sitemap.xml/docs.ts

@@ -1,17 +1,13 @@
 // /src/routes/sitemap.xml/docs.ts
-import { fetchMarkdownPosts, fetchBuilders, fetchBlocksMarkdownPosts, fetchDashboardMarkdownPosts } from "../utils";
-
-// console.log('fetchBlocksMarkdownPosts', fetchBlocksMarkdownPosts());
+import { fetchMarkdownPosts, fetchBuilders, fetchBlocksMarkdownPosts, fetchDashboardPosts } from "../utils";
 
 export async function getDocsSlugs() {
   // Fetch your markdown posts
   const posts = await fetchMarkdownPosts();
   const builders = await fetchBuilders();
   const blocks = await fetchBlocksMarkdownPosts();
-  const dashboard = await fetchDashboardMarkdownPosts();
+  const dashboard = await fetchDashboardPosts();
 
-  // console.log('builders', builders);
-  // console.log('blocks', blocks);
   console.log('dashboard', dashboard);
 
   const slugsByCategory: Record<string, string[]> = {};
@@ -44,17 +40,13 @@ export async function getDocsSlugs() {
   }
 
   if (Array.isArray(dashboard)) {
-    slugsByCategory['dashboard'] = dashboard.map(item => item.path);
+    slugsByCategory['dashboard'] = dashboard.map(item => {
+      // item.path is the string path from the improved fetchDashboardPosts
+      const path = typeof item === 'string' ? item : item.path;
+      // Ensure path starts with admin-dashboard
+      return path.startsWith('admin-dashboard') ? path : `admin-dashboard/${path}`;
+    });
   }
 
   return slugsByCategory;
 }
-
-
-// Individual category functions (if you prefer separate calls)
-export async function getDocsPagesSlugs() {
-  const posts = await fetchMarkdownPosts();
-  return posts.pages?.map(item => 
-    item.path.startsWith('/') ? item.path.slice(1) : item.path
-  ) || [];
-}

src/routes/utils/index.ts

@@ -149,25 +149,50 @@ export const fetchBlocksMarkdownPosts = async () => {
   return Object.fromEntries(entries);
 };
 
-export const fetchDashboardMarkdownPosts = async () => {
-  const globs = {
-    dashboard: import.meta.glob("/src/routes/admin-dashboard/**/+page.svelte")
-  };
-
-  const allPaths = Object.keys(globs.dashboard)
-    .map((path) => ({
-      path: extractRouteName(path)
-    }))
-    .filter((item, index, self) => self.findIndex((i) => i.path === item.path) === index);
-
-  return allPaths;
-
-  // const entries = await Promise.all(
-  //   Object.entries(globs).map(async ([key, files]) => {
-  //     const resolved = await resolveMarkdownFiles(files);
-  //     return [key, resolved] as const;
-  //   })
-  // );
-
-  // return Object.fromEntries(entries);
+export const fetchDashboardPosts = async () => {
+  // Get all +page.svelte files
+  const pageGlobs = import.meta.glob("/src/routes/admin-dashboard/**/+page.svelte");
+  
+  // Get authentication .svelte files (these are not +page.svelte)
+  const authGlobs = import.meta.glob("/src/routes/admin-dashboard/authentication/*.svelte");
+  
+  // Extract routes from +page.svelte files
+  const pageRoutes = Object.keys(pageGlobs)
+    .map((path) => {
+      let route = path
+        .replace('/src/routes/admin-dashboard', '')
+        .replace('/+page.svelte', '')
+        .replace(/\/\([^)]+\)/g, '') // Remove route groups
+        .replace(/^\//, '')
+        .replace(/\/$/, '');
+
+      if (route === '') {
+        route = 'admin-dashboard';
+      } else {
+        route = `admin-dashboard/${route}`;
+      }
+      return route;
+    })
+    .filter((route) => !route.includes('[') && !route.includes(']')); // Filter out dynamic routes
+
+  // Extract routes from authentication .svelte files
+  const authRoutes = Object.keys(authGlobs)
+    .map((path) => {
+      const filename = path.split('/').pop()?.replace('.svelte', '') || '';
+      return `admin-dashboard/authentication/${filename}`;
+    });
+
+  // Add specific error routes that we know exist
+  const errorRoutes = [
+    'admin-dashboard/errors/400',
+    'admin-dashboard/errors/404', 
+    'admin-dashboard/errors/500'
+  ];
+
+  // Combine all routes and remove duplicates
+  const allRoutes = [...pageRoutes, ...authRoutes, ...errorRoutes]
+    .filter((route, index, self) => self.indexOf(route) === index)
+    .sort();
+
+  return allRoutes;
 };