tester

Author: LadyBluenotes

src/routes/$libraryId/$version.docs.$.tsx

@@ -26,6 +26,19 @@ export const Route = createFileRoute('/$libraryId/$version/docs/$')({
     const branch = getBranch(library, version)
     const docsRoot = library.docsRoot || 'docs'
 
+    const redirectPath = await resolveDocsRedirect({
+      repo: library.repo,
+      branch,
+      docsRoot,
+      docsPaths: docsPath ? [docsPath] : [],
+    })
+
+    if (redirectPath !== null) {
+      throw redirect({
+        href: `/${libraryId}/${version}/docs${redirectPath ? `/${redirectPath}` : ''}`,
+      })
+    }
+
     try {
       return await loadDocs({
         repo: library.repo,
@@ -38,19 +51,6 @@ export const Route = createFileRoute('/$libraryId/$version/docs/$')({
         (error && typeof error === 'object' && 'isNotFound' in error)
 
       if (isNotFoundError) {
-        const redirectPath = await resolveDocsRedirect({
-          repo: library.repo,
-          branch,
-          docsRoot,
-          docsPaths: docsPath ? [docsPath] : [],
-        })
-
-        if (redirectPath !== null) {
-          throw redirect({
-            href: `/${libraryId}/${version}/docs${redirectPath ? `/${redirectPath}` : ''}`,
-          })
-        }
-
         throw notFound()
       }
 

src/routes/$libraryId/$version.docs.framework.$framework.$.tsx

@@ -24,6 +24,21 @@ export const Route = createFileRoute(
     const branch = getBranch(library, version)
     const docsRoot = library.docsRoot || 'docs'
 
+    const redirectPath = await resolveDocsRedirect({
+      repo: library.repo,
+      branch,
+      docsRoot,
+      docsPaths: docsPath
+        ? [`framework/${framework}/${docsPath}`, `${framework}/${docsPath}`]
+        : [],
+    })
+
+    if (redirectPath !== null) {
+      throw redirect({
+        href: `/${libraryId}/${version}/docs${redirectPath ? `/${redirectPath}` : ''}`,
+      })
+    }
+
     try {
       return await loadDocs({
         repo: library.repo,
@@ -39,21 +54,6 @@ export const Route = createFileRoute(
         (error && typeof error === 'object' && 'isNotFound' in error)
 
       if (isNotFoundError) {
-        const redirectPath = await resolveDocsRedirect({
-          repo: library.repo,
-          branch,
-          docsRoot,
-          docsPaths: docsPath
-            ? [`framework/${framework}/${docsPath}`, `${framework}/${docsPath}`]
-            : [],
-        })
-
-        if (redirectPath !== null) {
-          throw redirect({
-            href: `/${libraryId}/${version}/docs${redirectPath ? `/${redirectPath}` : ''}`,
-          })
-        }
-
         throw redirect({
           to: '/$libraryId/$version/docs/framework/$framework',
           params: { libraryId, version, framework },

src/utils/docs.ts

@@ -132,7 +132,9 @@ export async function resolveDocsRedirect(opts: {
   docsRoot: string
   docsPaths: Array<string>
 }) {
-  const manifest = await getDocsRedirectManifest(opts)
+  const manifest = await fetchDocsRedirectManifest({
+    data: opts,
+  })
 
   for (const docsPath of opts.docsPaths) {
     const normalizedDocsPath = normalizeDocsRedirectPath(docsPath)
@@ -213,6 +215,25 @@ async function getDocsRedirectManifest(opts: {
   })
 }
 
+const fetchDocsRedirectManifest = createServerFn({
+  method: 'GET',
+})
+  .inputValidator(
+    v.object({
+      repo: v.string(),
+      branch: v.string(),
+      docsRoot: v.string(),
+      docsPaths: v.array(v.string()),
+    }),
+  )
+  .handler(async ({ data }) => {
+    return getDocsRedirectManifest({
+      repo: data.repo,
+      branch: data.branch,
+      docsRoot: data.docsRoot,
+    })
+  })
+
 function flattenDocsNodes(nodes: Array<DocsTreeNode>): Array<DocsTreeNode> {
   return nodes.flatMap((node) => [
     node,