Merge navigation updates into comic delivery and preserve both renderers

apps/docs/scripts/auth-cli.ts

@@ -187,18 +187,17 @@ async function main() {
   assert.ok(searchIndex.some((doc: { slug: string; searchText: string }) => doc.slug === "source-studies/pretext/measurement-cache" && doc.searchText.includes("getSegmentMetrics")));
   for (const doc of searchIndex as { slug: string; sourceSlug: string }[]) {
     assert.ok(!doc.slug.split("/").some((part) => /^\d+-/.test(part)), doc.slug);
-    const legacy = await request(`/docs/${doc.sourceSlug}?from=legacy`, { headers });
+    const legacy = await request(`/docs/${doc.sourceSlug}`, { headers });
     assert.equal(legacy.status, 308, doc.sourceSlug);
-    const destination = new URL(legacy.headers.get("location")!, base);
-    assert.equal(destination.pathname, `/docs/${doc.slug}`);
-    assert.equal(destination.searchParams.get("from"), "legacy");
-    assert.ok(legacy.headers.get("cache-control")?.includes("no-store"));
+    assert.equal(new URL(legacy.headers.get("location")!, base).pathname, `/docs/${doc.slug}`);
   }
   let home = "";
   let purpose = "";
   for (const route of routes) {
     const response = await request(route, { headers });
-    assert.equal(response.status, 200, route);
+    const alias = (searchIndex as { sourceSlug: string }[]).some((doc) => route === `/docs/${doc.sourceSlug}`);
+    assert.equal(response.status, alias ? 308 : 200, route);
+    if (alias) continue;
     const html = await response.text();
     if (route === "/") home = html;
     if (route === "/docs/endor/endor-purpose-draft") purpose = html;

apps/docs/src/pages/docs/[...slug].tsx

@@ -25,14 +25,16 @@ import { headingsFor } from "@/lib/navigation";
 
 type Props = { doc: Doc; docs: DocLink[] };
 export const getStaticPaths: GetStaticPaths = async () => ({
-  paths: (await listDocs()).map(({ slug }) => ({ params: { slug: slug.split("/") } })),
+  paths: (await listDocs()).flatMap(({ slug, sourceSlug }) => [...new Set([slug, sourceSlug])].map((value) => ({ params: { slug: value.split("/") } }))),
   fallback: false,
 });
 export const getStaticProps: GetStaticProps<Props> = async ({ params }) => {
   const slug = Array.isArray(params?.slug) ? params.slug.join("/") : params?.slug;
   if (typeof slug !== "string") return { notFound: true };
   const docs = await listDocs();
-  if (!docs.some((d) => d.slug === slug)) return { notFound: true };
+  const match = docs.find((d) => d.slug === slug || d.sourceSlug === slug);
+  if (!match) return { notFound: true };
+  if (slug !== match.slug) return { redirect: { destination: `/docs/${match.slug}`, permanent: true } };
   return { props: { doc: await readDoc(slug), docs } };
 };
 function textOf(value: ReactNode): string {

apps/docs/src/proxy.ts

@@ -1,10 +1,5 @@
 import { NextResponse, type NextRequest } from "next/server";
 import { authConfig, SESSION_COOKIE, validSession } from "./lib/auth";
-import catalog from "../../../content/catalog.json";
-
-const legacyRoutes = new Map(Object.entries(catalog.documents).map(([source, metadata]) => [
-  `/docs/${source}`, `/docs/${metadata.slug}`,
-]));
 
 export function proxy(request: NextRequest) {
   const path = request.nextUrl.pathname;
@@ -54,13 +49,6 @@ export function proxy(request: NextRequest) {
         );
       }
     }
-    // Keep legacy URLs behind authentication and out of static generation.
-    const destination = legacyRoutes.get(path);
-    if (destination && ["GET", "HEAD"].includes(request.method)) {
-      const target = request.nextUrl.clone();
-      target.pathname = destination;
-      return NextResponse.redirect(target, { status: 308, headers });
-    }
     return NextResponse.next({ headers });
   }
   if (path.startsWith("/api/") || !["GET", "HEAD"].includes(request.method)) {