From 5ac2892e342921baf261e6208d2c20801d4b0f35 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 27 Sep 2025 22:36:26 +0300 Subject: [PATCH] chore(website): fix typecheck issues --- apps/desktop/tsconfig.json | 2 +- apps/website/.gitignore | 3 +++ apps/website/src/components/Button.tsx | 2 +- apps/website/src/components/Card.tsx | 4 ++-- apps/website/src/components/DownloadButton.tsx | 4 ++-- apps/website/src/components/Footer.tsx | 6 +++--- apps/website/src/components/Header.tsx | 8 ++++---- apps/website/src/download-helper.ts | 6 +++--- apps/website/src/index.tsx | 2 +- apps/website/src/pages/GetStarted/get-started.tsx | 12 ++++++------ apps/website/src/pages/Home/index.tsx | 14 +++++++------- apps/website/src/pages/SupportUs/SupportUs.tsx | 8 ++++---- apps/website/src/pages/_404.tsx | 4 ++-- apps/website/tsconfig.json | 8 +++----- tsconfig.json | 3 +++ 15 files changed, 45 insertions(+), 41 deletions(-) diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index 5f1b2ca98..95e7236ba 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "files": [], - "include": [], + "include": [], "references": [ { "path": "../server" diff --git a/apps/website/.gitignore b/apps/website/.gitignore index a547bf36d..938af23d8 100644 --- a/apps/website/.gitignore +++ b/apps/website/.gitignore @@ -22,3 +22,6 @@ dist-ssr *.njsproj *.sln *.sw? + +*.d.ts +*.map \ No newline at end of file diff --git a/apps/website/src/components/Button.tsx b/apps/website/src/components/Button.tsx index 1ac4c8fe0..729346e58 100644 --- a/apps/website/src/components/Button.tsx +++ b/apps/website/src/components/Button.tsx @@ -1,5 +1,5 @@ import { ComponentChildren } from "preact"; -import Icon from "./Icon"; +import Icon from "./Icon.js"; import "./Button.css"; interface LinkProps { diff --git a/apps/website/src/components/Card.tsx b/apps/website/src/components/Card.tsx index e684d18f5..49c357132 100644 --- a/apps/website/src/components/Card.tsx +++ b/apps/website/src/components/Card.tsx @@ -1,6 +1,6 @@ import { ComponentChildren, HTMLAttributes } from "preact"; -import { Link } from "./Button"; -import Icon from "./Icon"; +import { Link } from "./Button.js"; +import Icon from "./Icon.js"; interface CardProps extends Omit, "title"> { title: ComponentChildren; diff --git a/apps/website/src/components/DownloadButton.tsx b/apps/website/src/components/DownloadButton.tsx index da5786879..e5b6ca306 100644 --- a/apps/website/src/components/DownloadButton.tsx +++ b/apps/website/src/components/DownloadButton.tsx @@ -1,6 +1,6 @@ -import { getRecommendedDownload } from "../download-helper"; +import { getRecommendedDownload } from "../download-helper.js"; import "./DownloadButton.css"; -import Button from "./Button"; +import Button from "./Button.js"; import downloadIcon from "../assets/boxicons/bx-arrow-in-down-square-half.svg?raw"; import packageJson from "../../../../package.json" with { type: "json" }; diff --git a/apps/website/src/components/Footer.tsx b/apps/website/src/components/Footer.tsx index 989c7a566..3f00191d2 100644 --- a/apps/website/src/components/Footer.tsx +++ b/apps/website/src/components/Footer.tsx @@ -1,10 +1,10 @@ import "./Footer.css"; -import Icon from "./Icon"; +import Icon from "./Icon.js"; import githubIcon from "../assets/boxicons/bx-github.svg?raw"; import githubDiscussionsIcon from "../assets/boxicons/bx-discussion.svg?raw"; import matrixIcon from "../assets/boxicons/bx-message-dots.svg?raw"; import redditIcon from "../assets/boxicons/bx-reddit.svg?raw"; -import { Link } from "./Button"; +import { Link } from "./Button.js"; export default function Footer() { return ( @@ -55,7 +55,7 @@ export function SocialButtons({ className, withText }: { className?: string, wit ) } -function SocialButton({ name, iconSvg, url, withText }: { name: string, iconSvg: string, url: string, withText: boolean }) { +function SocialButton({ name, iconSvg, url, withText }: { name: string, iconSvg: string, url: string, withText?: boolean }) { return ( , document.getElementById('app')); + hydrate(, document.getElementById('app')!); } export async function prerender(data) { diff --git a/apps/website/src/pages/GetStarted/get-started.tsx b/apps/website/src/pages/GetStarted/get-started.tsx index 8ef1fca2b..bce0ac373 100644 --- a/apps/website/src/pages/GetStarted/get-started.tsx +++ b/apps/website/src/pages/GetStarted/get-started.tsx @@ -1,10 +1,10 @@ import { useState } from "preact/hooks"; -import Card from "../../components/Card"; -import Section from "../../components/Section"; -import { App, Architecture, buildDownloadUrl, downloadMatrix, DownloadMatrixEntry, getArchitecture, Platform } from "../../download-helper"; -import { usePageTitle } from "../../hooks"; -import Button, { Link } from "../../components/Button"; -import Icon from "../../components/Icon"; +import Card from "../../components/Card.js"; +import Section from "../../components/Section.js"; +import { App, Architecture, buildDownloadUrl, downloadMatrix, DownloadMatrixEntry, getArchitecture, Platform } from "../../download-helper.js"; +import { usePageTitle } from "../../hooks.js"; +import Button, { Link } from "../../components/Button.js"; +import Icon from "../../components/Icon.js"; import helpIcon from "../../assets/boxicons/bx-help-circle.svg?raw"; import "./get-started.css"; import packageJson from "../../../../../package.json" with { type: "json" }; diff --git a/apps/website/src/pages/Home/index.tsx b/apps/website/src/pages/Home/index.tsx index 4bfb19df1..47c933a5d 100644 --- a/apps/website/src/pages/Home/index.tsx +++ b/apps/website/src/pages/Home/index.tsx @@ -1,10 +1,10 @@ import { ComponentChildren } from 'preact'; -import Card from '../../components/Card'; -import Section from '../../components/Section'; -import DownloadButton from '../../components/DownloadButton'; +import Card from '../../components/Card.js'; +import Section from '../../components/Section.js'; +import DownloadButton from '../../components/DownloadButton.js'; import "./index.css"; -import { useColorScheme, usePageTitle } from '../../hooks'; -import Button, { Link } from '../../components/Button'; +import { useColorScheme, usePageTitle } from '../../hooks.js'; +import Button, { Link } from '../../components/Button.js'; import gitHubIcon from "../../assets/boxicons/bx-github.svg?raw"; import dockerIcon from "../../assets/boxicons/bx-docker.svg?raw"; import noteStructureIcon from "../../assets/boxicons/bx-folder.svg?raw"; @@ -29,7 +29,7 @@ import calendarIcon from "../../assets/boxicons/bx-calendar.svg?raw"; import tableIcon from "../../assets/boxicons/bx-table.svg?raw"; import boardIcon from "../../assets/boxicons/bx-columns-3.svg?raw"; import geomapIcon from "../../assets/boxicons/bx-map.svg?raw"; -import { getPlatform } from '../../download-helper'; +import { getPlatform } from '../../download-helper.js'; import { useState } from 'preact/hooks'; export function Home() { @@ -51,7 +51,7 @@ export function Home() { function HeroSection() { const platform = getPlatform(); - let screenshotUrl: string; + let screenshotUrl: string | null = null; const colorScheme = useColorScheme(); switch (platform) { diff --git a/apps/website/src/pages/SupportUs/SupportUs.tsx b/apps/website/src/pages/SupportUs/SupportUs.tsx index 79e4f3ee3..d7f8d77e2 100644 --- a/apps/website/src/pages/SupportUs/SupportUs.tsx +++ b/apps/website/src/pages/SupportUs/SupportUs.tsx @@ -1,11 +1,11 @@ -import Section from "../../components/Section"; +import Section from "../../components/Section.js"; import "./SupportUs.css"; import githubIcon from "../../assets/boxicons/bx-github.svg?raw"; import paypalIcon from "../../assets/boxicons/bx-paypal.svg?raw"; import buyMeACoffeeIcon from "../../assets/boxicons/bx-buy-me-a-coffee.svg?raw"; -import Button, { Link } from "../../components/Button"; -import Card from "../../components/Card"; -import { usePageTitle } from "../../hooks"; +import Button, { Link } from "../../components/Button.js"; +import Card from "../../components/Card.js"; +import { usePageTitle } from "../../hooks.js"; export default function Donate() { usePageTitle("Support us"); diff --git a/apps/website/src/pages/_404.tsx b/apps/website/src/pages/_404.tsx index df2ca7458..07d936437 100644 --- a/apps/website/src/pages/_404.tsx +++ b/apps/website/src/pages/_404.tsx @@ -1,5 +1,5 @@ -import Section from "../components/Section"; -import { usePageTitle } from "../hooks"; +import Section from "../components/Section.js"; +import { usePageTitle } from "../hooks.js"; import "./_404.css"; export function NotFound() { diff --git a/apps/website/tsconfig.json b/apps/website/tsconfig.json index 12bb30b41..5b02bdf11 100644 --- a/apps/website/tsconfig.json +++ b/apps/website/tsconfig.json @@ -1,12 +1,9 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "target": "ES2020", "module": "ESNext", "moduleResolution": "bundler", - "noEmit": true, - "allowJs": true, - "checkJs": true, - /* Preact Config */ "jsx": "react-jsx", "jsxImportSource": "preact", @@ -16,5 +13,6 @@ "react-dom": ["./node_modules/preact/compat/"] } }, - "include": ["node_modules/vite/client.d.ts", "**/*"] + "include": ["node_modules/vite/client.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/tsconfig.json b/tsconfig.json index db83e7978..f2e5a0b65 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,6 +21,9 @@ { "path": "./apps/desktop" }, + { + "path": "./apps/website" + }, { "path": "./apps/dump-db" },