From f866f0a990bf04f533a4a4f78b9036c018074c9a Mon Sep 17 00:00:00 2001 From: Wyatt Kirby Date: Tue, 26 Nov 2024 10:56:55 -0500 Subject: [PATCH] Fix type errors for linter --- src/components/Button.tsx | 7 +++---- src/lib/posts.ts | 4 ++-- src/lib/types.d.ts | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/Button.tsx b/src/components/Button.tsx index fa56c3d4..e0a54c11 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -10,18 +10,17 @@ type BaseButtonProps = { variant?: "primary" | "secondary" | "tertiary"; size?: "lg" | "sm"; disabled?: boolean; -} +}; type LinkButtonProps = BaseButtonProps & { href: string; onClick?: undefined; -} & HTMLProps; +} & Omit, "size">; type ButtonButtonProps = BaseButtonProps & { href?: undefined; onClick: React.MouseEventHandler; -} & HTMLProps; - +} & Omit, "size">; type ButtonProps = LinkButtonProps | ButtonButtonProps; diff --git a/src/lib/posts.ts b/src/lib/posts.ts index 32a370d2..b7f5ef7a 100644 --- a/src/lib/posts.ts +++ b/src/lib/posts.ts @@ -160,7 +160,7 @@ export async function getPostData({ `${year}-${month}-${day}-${slug}.md`, ); const fileContents = readFileSync(fullPath, "utf8"); - const { content, data, desc } = await parseMatter(fileContents); + const { content, data } = await parseMatter(fileContents); const contentHtml = processMarkdown(content); return { @@ -170,7 +170,7 @@ export async function getPostData({ query: { year, month, day, slug }, }, person: people[data.author] ?? null, - desc, + desc: data.desc, contentHtml, ...data, }; diff --git a/src/lib/types.d.ts b/src/lib/types.d.ts index 1773a2c7..c35754c2 100644 --- a/src/lib/types.d.ts +++ b/src/lib/types.d.ts @@ -25,12 +25,12 @@ export type FrontmatterData = { image?: string; credit?: string; author?: string; + desc?: string; }; export type PostFrontmatter = { content: string; data: FrontmatterData; - desc?: string; }; export type PostParams = {