From 8e4f77a63baa84f24937c654a618b49497dc8614 Mon Sep 17 00:00:00 2001 From: iCrawl Date: Tue, 23 Aug 2022 07:55:41 +0200 Subject: [PATCH] build: use module --- .../{.lintstagedrc.js => .lintstagedrc.cjs} | 0 .../{.prettierrc.js => .prettierrc.cjs} | 0 packages/website/next.config.js | 2 +- packages/website/package.json | 11 +------- .../website/src/components/DocContainer.tsx | 2 +- .../website/src/components/SidebarLayout.tsx | 4 +-- .../website/src/components/tsdoc/TSDoc.tsx | 2 +- packages/website/src/pages/404.tsx | 28 +++++++++++-------- packages/website/src/pages/docs/[...slug].tsx | 13 +++------ 9 files changed, 27 insertions(+), 35 deletions(-) rename packages/website/{.lintstagedrc.js => .lintstagedrc.cjs} (100%) rename packages/website/{.prettierrc.js => .prettierrc.cjs} (100%) diff --git a/packages/website/.lintstagedrc.js b/packages/website/.lintstagedrc.cjs similarity index 100% rename from packages/website/.lintstagedrc.js rename to packages/website/.lintstagedrc.cjs diff --git a/packages/website/.prettierrc.js b/packages/website/.prettierrc.cjs similarity index 100% rename from packages/website/.prettierrc.js rename to packages/website/.prettierrc.cjs diff --git a/packages/website/next.config.js b/packages/website/next.config.js index 9709d3ec2..83828df53 100644 --- a/packages/website/next.config.js +++ b/packages/website/next.config.js @@ -1,7 +1,7 @@ /** * @type {import('next').NextConfig} */ -module.exports = { +export default { reactStrictMode: true, swcMinify: true, eslint: { diff --git a/packages/website/package.json b/packages/website/package.json index 8e7c73374..8318a9aa6 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -16,16 +16,7 @@ "lint": "prettier --check . && TIMING=1 eslint src --ext mjs,js,ts,tsx", "format": "prettier --write . && TIMING=1 eslint src --ext mjs,js,ts,tsx --fix" }, - "main": "./dist/index.js", - "module": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "directories": { - "lib": "src", - "test": "__tests__" - }, - "files": [ - "dist" - ], + "type": "module", "contributors": [ "Crawl " ], diff --git a/packages/website/src/components/DocContainer.tsx b/packages/website/src/components/DocContainer.tsx index 22dea006d..6e71ebffb 100644 --- a/packages/website/src/components/DocContainer.tsx +++ b/packages/website/src/components/DocContainer.tsx @@ -12,7 +12,7 @@ import { VscSymbolParameter, } from 'react-icons/vsc'; import { PrismAsyncLight as SyntaxHighlighter } from 'react-syntax-highlighter'; -import { vscDarkPlus } from 'react-syntax-highlighter/dist/cjs/styles/prism'; +import vscDarkPlus from 'react-syntax-highlighter/dist/cjs/styles/prism'; import { HyperlinkedText } from './HyperlinkedText'; import { Section } from './Section'; import { TableOfContentItems } from './TableOfContentItems'; diff --git a/packages/website/src/components/SidebarLayout.tsx b/packages/website/src/components/SidebarLayout.tsx index aea3beadd..86e225378 100644 --- a/packages/website/src/components/SidebarLayout.tsx +++ b/packages/website/src/components/SidebarLayout.tsx @@ -243,8 +243,8 @@ export function SidebarLayout({ - - {router.isReady ? {breadcrumbs} : null} + + {breadcrumbs} diff --git a/packages/website/src/components/tsdoc/TSDoc.tsx b/packages/website/src/components/tsdoc/TSDoc.tsx index c644754c5..d6da7aab7 100644 --- a/packages/website/src/components/tsdoc/TSDoc.tsx +++ b/packages/website/src/components/tsdoc/TSDoc.tsx @@ -3,7 +3,7 @@ import { DocNodeKind, StandardTags } from '@microsoft/tsdoc'; import Link from 'next/link'; import { Fragment, ReactNode } from 'react'; import { PrismAsyncLight as SyntaxHighlighter } from 'react-syntax-highlighter'; -import { vscDarkPlus } from 'react-syntax-highlighter/dist/cjs/styles/prism'; +import vscDarkPlus from 'react-syntax-highlighter/dist/cjs/styles/prism'; import { BlockComment } from './BlockComment'; import type { DocBlockJSON } from '~/DocModel/comment/CommentBlock'; import type { AnyDocNodeJSON } from '~/DocModel/comment/CommentNode'; diff --git a/packages/website/src/pages/404.tsx b/packages/website/src/pages/404.tsx index 68f3f41ba..16cbc0657 100644 --- a/packages/website/src/pages/404.tsx +++ b/packages/website/src/pages/404.tsx @@ -1,4 +1,5 @@ import { Container, Title, Group, Button, Box, createStyles } from '@mantine/core'; +import Head from 'next/head'; import Link from 'next/link'; const useStyles = createStyles((theme) => ({ @@ -20,16 +21,21 @@ export default function FourOhFourPage() { const { classes } = useStyles(); return ( - - 404 - Not found. - - - - - - + <> + + discord.js | 404 + + + 404 + Not found. + + + + + + + ); } diff --git a/packages/website/src/pages/docs/[...slug].tsx b/packages/website/src/pages/docs/[...slug].tsx index 5dde87adf..f0ff76ee7 100644 --- a/packages/website/src/pages/docs/[...slug].tsx +++ b/packages/website/src/pages/docs/[...slug].tsx @@ -1,5 +1,6 @@ import { readFile } from 'node:fs/promises'; import { join } from 'node:path'; +import { cwd } from 'node:process'; import { Affix, Box, Button, LoadingOverlay, Transition } from '@mantine/core'; import { useMediaQuery, useWindowScroll } from '@mantine/hooks'; import { ApiFunction, ApiItemKind, type ApiPackage } from '@microsoft/api-extractor-model'; @@ -43,10 +44,7 @@ export const getStaticPaths: GetStaticPaths = async () => { let data: any[] = []; let versions: string[] = []; if (process.env.NEXT_PUBLIC_LOCAL_DEV) { - const res = await readFile( - join(__dirname, '..', '..', '..', '..', '..', packageName, 'docs', 'docs.api.json'), - 'utf-8', - ); + const res = await readFile(join(cwd(), '..', packageName, 'docs', 'docs.api.json'), 'utf-8'); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment data = JSON.parse(res); } else { @@ -130,7 +128,7 @@ export const getStaticProps: GetStaticProps = async ({ params }) => { const [memberName, overloadIndex] = member?.split(':') ?? []; try { - const readme = await readFile(join(__dirname, '..', '..', '..', '..', '..', packageName, 'README.md'), 'utf-8'); + const readme = await readFile(join(cwd(), '..', packageName, 'README.md'), 'utf-8'); const mdxSource = await serialize(readme, { mdxOptions: { @@ -143,10 +141,7 @@ export const getStaticProps: GetStaticProps = async ({ params }) => { let data; if (process.env.NEXT_PUBLIC_LOCAL_DEV) { - const res = await readFile( - join(__dirname, '..', '..', '..', '..', '..', packageName, 'docs', 'docs.api.json'), - 'utf-8', - ); + const res = await readFile(join(cwd(), '..', packageName, 'docs', 'docs.api.json'), 'utf-8'); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment data = JSON.parse(res); } else {