Merge branch 'main' into gg/loading-indicator

app/lib/gh-docs/docs.ts

@@ -92,7 +92,7 @@ global.docCache ??= new LRUCache<string, Doc>({
 
 async function fetchDoc(key: string): Promise<Doc> {
   let [repo, ref, slug] = key.split(":");
-  let filename = `docs/${slug}.md`;
+  let filename = `${slug}.md`;
   let md = await getRepoContent(repo, ref, filename);
   if (md === null) {
     throw Error(`Could not find ${filename} in ${repo}@${ref}`);

app/routes/$.tsx

@@ -55,7 +55,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   try {
     let ref = "main";
     let lang = "en";
-    let doc = await getRepoDoc(ref, params["*"]!);
+    let doc = await getRepoDoc(ref, `docs/${params["*"]}`);
     if (!doc) throw null;
     // FIXME: This results in two fetches, as the loader for the docs page will
     // repeat the request cycle. This isn't a problem if the doc is in the LRU

app/routes/docs.$lang.$ref.$.tsx

@@ -30,7 +30,10 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   let pageUrl = url.protocol + "//" + url.host + url.pathname;
   invariant(params.ref, "expected `ref` params");
   try {
-    let doc = await getRepoDoc(params.ref, params["*"] || "index");
+    let slug = params["*"]?.endsWith("/changelog")
+      ? "CHANGELOG"
+      : `docs/${params["*"] || "index"}`;
+    let doc = await getRepoDoc(params.ref, slug);
     if (!doc) throw null;
     return json(
       { doc, pageUrl },

app/routes/docs.$lang.ts

@@ -0,0 +1,5 @@
+import { redirect, type LoaderFunctionArgs } from "@remix-run/node";
+export async function loader({ params }: LoaderFunctionArgs) {
+  const { lang, ref } = params;
+  return !ref ? redirect(`/docs/${lang}/main`) : null;
+}

app/styles/docsearch.css

@@ -48,3 +48,7 @@
 
   @apply grid h-5 w-3.5 place-items-center rounded bg-white px-1 text-xs text-gray-600 dark:bg-gray-600 dark:text-gray-200;
 }
+
+.DocSearch-Container {
+  cursor: auto;
+}