Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-14 02:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly configure middleware

Browse Source
This commit is contained in:
iCrawl
2022-07-23 04:13:16 +02:00
parent 90cbd2bbd5
commit 5f667c0c82
6 changed files with 94 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/website/src/middleware.ts
View File

@@ -2,9 +2,9 @@ import { NextResponse } from 'next/server';
import type { NextRequest } from 'next/server';
export default function middleware(request: NextRequest) {
const packages = ['builders', 'collection', 'proxy', 'rest', 'voice'];
if (packages.some((pkg) => request.nextUrl.pathname.includes(pkg))) {
return NextResponse.redirect(new URL('/docs/packages/collection/Collection', request.url));
}
return NextResponse.next();
return NextResponse.rewrite(new URL('/docs/main/packages/builders', request.url));
}
export const config = {
matcher: ['/docs', '/docs/:branch', '/docs/:branch/packages'],
};

2
packages/website/src/pages/_app.tsx
View File

@@ -1,6 +1,6 @@
import type { AppProps } from 'next/app';
import '@unocss/reset/normalize.css';
import 'uno.css';
import '../styles/unocss.css';
import '../styles/main.css';
export default function MyApp({ Component, pageProps }: AppProps) {

64
packages/website/src/pages/docs/[...slug].tsx
View File

@@ -27,17 +27,21 @@ export const getStaticPaths: GetStaticPaths = async () => {
return { params: { slug: ['main', 'packages', packageName] } };
}
const res = await fetch(`https://docs.discordjs.dev/docs/${packageName}/main.api.json`);
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const data = await res.json();
try {
const res = await fetch(`https://docs.discordjs.dev/docs/${packageName}/main.api.json`);
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const data = await res.json();
const model = createApiModel(data);
const pkg = findPackage(model, packageName);
const model = createApiModel(data);
const pkg = findPackage(model, packageName);
return [
{ params: { slug: ['main', 'packages', packageName] } },
...getMembers(pkg!).map((member) => ({ params: { slug: ['main', 'packages', packageName, member.name] } })),
];
return [
{ params: { slug: ['main', 'packages', packageName] } },
...getMembers(pkg!).map((member) => ({ params: { slug: ['main', 'packages', packageName, member.name] } })),
];
} catch {
return { params: { slug: ['', '', '', ''] } };
}
}),
)
).flat();
@@ -51,22 +55,30 @@ export const getStaticPaths: GetStaticPaths = async () => {
export const getStaticProps: GetStaticProps = async ({ params }) => {
const [branchName = 'main', , packageName = 'builders', memberName] = params!.slug as string[];
const res = await fetch(`https://docs.discordjs.dev/docs/${packageName}/${branchName}.api.json`);
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const data = await res.json();
try {
const res = await fetch(`https://docs.discordjs.dev/docs/${packageName}/${branchName}.api.json`);
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const data = await res.json();
const model = createApiModel(data);
const pkg = findPackage(model, packageName);
const model = createApiModel(data);
const pkg = findPackage(model, packageName);
return {
props: {
packageName,
data: {
members: pkg ? getMembers(pkg) : [],
member: memberName ? findMember(model, packageName, memberName)?.toJSON() ?? null : null,
return {
props: {
packageName,
data: {
members: pkg ? getMembers(pkg) : [],
member: memberName ? findMember(model, packageName, memberName)?.toJSON() ?? null : null,
},
},
},
};
};
} catch {
return {
props: {
error: 'FetchError',
},
};
}
};
const member = (props: any) => {
@@ -89,8 +101,12 @@ const member = (props: any) => {
}
};
export default function Slug(props: Partial<ItemListProps & { data: { member: ReturnType<typeof findMember> } }>) {
return (
export default function Slug(
props: Partial<ItemListProps & { error?: string; data: { member: ReturnType<typeof findMember> } }>,
) {
return props.error ? (
<div className="flex max-w-full h-full bg-white dark:bg-dark">{props.error}</div>
) : (
<div className="flex flex-col lg:flex-row overflow-hidden max-w-full h-full bg-white dark:bg-dark">
<div className="w-full lg:min-w-1/4 lg:max-w-1/4">
{props.packageName && props.data ? <ItemSidebar packageName={props.packageName} data={props.data} /> : null}