diff --git a/bun.lock b/bun.lock index affded075..0712faaa0 100644 --- a/bun.lock +++ b/bun.lock @@ -156,6 +156,7 @@ "react-promise-suspense": "^0.3.4", "three": "^0.180.0", "three-stdlib": "^2.36.0", + "typescript": "^5.9.3", "urlon": "^3.1.0", "varuna": "workspace:*", "vite": "^7.1.9", @@ -2543,6 +2544,8 @@ "@blitzkit/scripts/dotenv": ["dotenv@17.2.3", "", {}, "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w=="], + "@blitzkit/website/typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], + "@blitzkit/website/vite": ["vite@7.1.9", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg=="], "@discordjs/rest/@discordjs/collection": ["@discordjs/collection@2.1.1", "", {}, "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg=="], diff --git a/package.json b/package.json index 475045f76..105f95573 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,6 @@ "version": "1.29.0", "license": "BlitzKit License", "private": true, - "type": "module", - "workspaces": [ - "packages/*" - ], "scripts": { "build:assets": "cd packages/scripts && bun run build:assets", "build:averages": "bun --filter=@blitzkit/scripts run build:averages", @@ -40,5 +36,9 @@ "build:reviews": "cd packages/scripts && bun build:reviews", "build:ids": "cd packages/scripts && bun build:ids", "prunestrings": "cd packages/scripts && bun prunestrings" - } + }, + "type": "module", + "workspaces": [ + "packages/*" + ] } diff --git a/packages/website/package.json b/packages/website/package.json index c1428c077..bc6f67e1d 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -41,6 +41,7 @@ "react-promise-suspense": "^0.3.4", "three": "^0.180.0", "three-stdlib": "^2.36.0", + "typescript": "^5.9.3", "urlon": "^3.1.0", "varuna": "workspace:*", "vite": "^7.1.9" diff --git a/packages/website/src/components/Navbar.astro b/packages/website/src/components/Navbar.astro index 69ebb1b8a..b67d5d10a 100644 --- a/packages/website/src/components/Navbar.astro +++ b/packages/website/src/components/Navbar.astro @@ -15,6 +15,7 @@ import { NavbarAccount } from "./NavbarAccount"; export interface Props { integrated?: boolean; + locale: string; } const { integrated = false } = Astro.props; diff --git a/packages/website/src/layouts/BaseLayout.astro b/packages/website/src/layouts/BaseLayout.astro index af41aff6c..4fce031c1 100644 --- a/packages/website/src/layouts/BaseLayout.astro +++ b/packages/website/src/layouts/BaseLayout.astro @@ -39,7 +39,7 @@ const { noFooter, noNavbar, integrated, locale } = Astro.props; - + diff --git a/packages/website/src/pages/[...locale]/tools/embed/index.astro b/packages/website/src/pages/[...locale]/tools/embed/index.astro index 3564c4fa8..8096fbdd8 100644 --- a/packages/website/src/pages/[...locale]/tools/embed/index.astro +++ b/packages/website/src/pages/[...locale]/tools/embed/index.astro @@ -6,4 +6,4 @@ export { getStaticPaths } from "../../index.astro"; const { locale } = Astro.props; --- - + diff --git a/packages/website/src/types/global.d.ts b/packages/website/src/types/global.d.ts deleted file mode 100644 index 25a557f67..000000000 --- a/packages/website/src/types/global.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare global { - interface Window { - MyNamespace: any; - } -} diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index db4d5dcac..3e5cbbcee 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -1,8 +1,4 @@ { "extends": ["../../tsconfig.json", "astro/tsconfigs/base"], - "compilerOptions": { - "jsx": "react-jsx", - "jsxImportSource": "react", - "types": ["vite/client"] - } + "compilerOptions": { "jsx": "react-jsx" } } diff --git a/tsconfig.json b/tsconfig.json index ac82e445a..a0ea97ce1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,6 @@ "skipLibCheck": true, "noEmit": true, "resolveJsonModule": true, - "jsx": "preserve", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "incremental": true,