From 8a39c14921a6c8bb1117e10d2ee1070cfc7a3eb4 Mon Sep 17 00:00:00 2001
From: iCrawl <buechler.noel@outlook.com>
Date: Wed, 30 Nov 2022 04:26:40 +0100
Subject: [PATCH] fix: generate correct paths after moving catch-all

---
 .../packages/[package]/[...slug]/page.tsx     | 27 +++++++------------
 apps/website/src/app/page.tsx                 |  1 +
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/apps/website/src/app/docs/packages/[package]/[...slug]/page.tsx b/apps/website/src/app/docs/packages/[package]/[...slug]/page.tsx
index 520e744d6..5a45a8b90 100644
--- a/apps/website/src/app/docs/packages/[package]/[...slug]/page.tsx
+++ b/apps/website/src/app/docs/packages/[package]/[...slug]/page.tsx
@@ -44,12 +44,8 @@ import { DESCRIPTION, PACKAGES } from '~/util/constants';
 import { findMember, findMemberByKey } from '~/util/model.server';
 import { tryResolveDescription } from '~/util/summary';
 
-export async function generateStaticParams({ params }: { params: { package: string } }) {
-	const packageName = params.package;
-
-	if (!packageName) {
-		return [{ slug: [] }];
-	}
+export async function generateStaticParams({ params }: { params?: { package: string } }) {
+	const packageName = params?.package ?? 'builders';
 
 	try {
 		let data: any[] = [];
@@ -73,22 +69,17 @@ export async function generateStaticParams({ params }: { params: { package: stri
 			const pkgs = models.map((model) => findPackage(model, packageName)) as ApiPackage[];
 
 			return [
-				...versions.map((version) => ({ slug: ['packages', packageName, version] })),
+				...versions.map((version) => ({ slug: [version] })),
 				...pkgs.flatMap((pkg, idx) =>
 					getMembers(pkg, versions[idx] ?? 'main').map((member) => {
 						if (member.kind === ApiItemKind.Function && member.overloadIndex && member.overloadIndex > 1) {
 							return {
-								slug: [
-									'packages',
-									packageName,
-									versions[idx] ?? 'main',
-									`${member.name}:${member.overloadIndex}:${member.kind}`,
-								],
+								slug: [versions[idx] ?? 'main', `${member.name}:${member.overloadIndex}:${member.kind}`],
 							};
 						}
 
 						return {
-							slug: ['packages', packageName, versions[idx] ?? 'main', `${member.name}:${member.kind}`],
+							slug: [versions[idx] ?? 'main', `${member.name}:${member.kind}`],
 						};
 					}),
 				),
@@ -99,19 +90,19 @@ export async function generateStaticParams({ params }: { params: { package: stri
 		const pkg = findPackage(model, packageName)!;
 
 		return [
-			{ slug: ['packages', packageName, 'main'] },
+			{ slug: ['main'] },
 			...getMembers(pkg, 'main').map((member) => {
 				if (member.kind === ApiItemKind.Function && member.overloadIndex && member.overloadIndex > 1) {
 					return {
-						slug: ['packages', packageName, 'main', `${member.name}:${member.overloadIndex}:${member.kind}`],
+						slug: ['main', `${member.name}:${member.overloadIndex}:${member.kind}`],
 					};
 				}
 
-				return { slug: ['packages', packageName, 'main', `${member.name}:${member.kind}`] };
+				return { slug: ['main', `${member.name}:${member.kind}`] };
 			}),
 		];
 	} catch {
-		return [{ slug: [] }];
+		return [{ slug: ['main'] }];
 	}
 }
 
diff --git a/apps/website/src/app/page.tsx b/apps/website/src/app/page.tsx
index f5893452c..5a9f34ab5 100644
--- a/apps/website/src/app/page.tsx
+++ b/apps/website/src/app/page.tsx
@@ -23,6 +23,7 @@ export default function Page() {
 						<Link
 							className="bg-blurple focus:ring-width-2 flex h-11 transform-gpu cursor-pointer select-none appearance-none flex-row place-items-center rounded border-0 px-6 text-base font-semibold leading-none text-white no-underline outline-0 focus:ring focus:ring-white active:translate-y-px"
 							href="/docs"
+							prefetch={false}
 						>
 							Docs
 						</Link>