Update dependency typescript to v6

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Co-authored-by: Renovate Bot <renovate-bot@valverde.cloud>
Reviewed-on: #86

.gitea/workflows/build.yaml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.valverde.cloud/${{ gitea.repository }}

Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /app
 COPY ./ ./
 RUN bun install --frozen-lockfile && \
     bun lint:tsc && \
-    bun lint:biome && \
+    # bun lint:biome && \
     bun run build && \
     bun clean:cache && \
     bun clean:modules && \

package.json

@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "packageManager": "bun@1.2.22",
+  "packageManager": "bun@1.3.14",
   "private": true,
   "workspaces": ["./packages/*"],
   "scripts": {
@@ -12,12 +12,12 @@
     "clean:modules": "turbo clean:modules && rm -rf node_modules"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.2.4",
-    "@effect/language-service": "^0.60.0",
-    "@types/bun": "^1.2.23",
-    "npm-check-updates": "^19.0.0",
+    "@biomejs/biome": "^2.4.15",
+    "@effect/language-service": "^0.86.1",
+    "@types/bun": "^1.3.14",
+    "npm-check-updates": "^22.2.0",
     "npm-sort": "^0.0.4",
-    "turbo": "^2.5.6",
-    "typescript": "^5.9.2"
+    "turbo": "^2.9.14",
+    "typescript": "^6.0.0"
   }
 }

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@website/common",
-  "packageManager": "bun@1.2.22",
+  "packageManager": "bun@1.3.14",
   "private": true,
   "type": "module",
   "exports": {
@@ -14,7 +14,7 @@
     "clean:modules": "rm -rf node_modules"
   },
   "dependencies": {
-    "@effect/rpc": "^0.72.0",
-    "effect": "^3.17.13"
+    "@effect/rpc": "^0.75.1",
+    "effect": "^3.21.2"
   }
 }

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@website/server",
-  "packageManager": "bun@1.2.22",
+  "packageManager": "bun@1.3.14",
   "private": true,
   "type": "module",
   "scripts": {
@@ -15,24 +15,25 @@
     "clean:modules": "rm -rf node_modules"
   },
   "dependencies": {
-    "@effect/opentelemetry": "^0.59.0",
-    "@effect/platform": "^0.93.0",
-    "@effect/platform-bun": "^0.86.0",
-    "@effect/platform-node": "^0.103.0",
-    "@effect/rpc": "^0.72.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.208.0",
-    "@opentelemetry/sdk-metrics": "^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^2.1.0",
-    "@opentelemetry/sdk-trace-node": "^2.1.0",
-    "@opentelemetry/sdk-trace-web": "^2.1.0",
+    "@effect/opentelemetry": "^0.63.0",
+    "@effect/platform": "^0.96.1",
+    "@effect/platform-bun": "^0.89.0",
+    "@effect/platform-node": "^0.106.0",
+    "@effect/rpc": "^0.75.1",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.218.0",
+    "@opentelemetry/sdk-metrics": "^2.7.1",
+    "@opentelemetry/sdk-trace-base": "^2.7.1",
+    "@opentelemetry/sdk-trace-node": "^2.7.1",
+    "@opentelemetry/sdk-trace-web": "^2.7.1",
     "@website/common": "workspace:*",
-    "effect": "^3.17.13"
+    "@website/webapp": "workspace:*",
+    "effect": "^3.21.2"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "esbuild": "^0.27.0",
-    "rollup": "^4.52.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "esbuild": "^0.28.0",
+    "rollup": "^4.60.4",
     "rollup-plugin-esbuild": "^6.2.1",
-    "tsx": "^4.20.5"
+    "tsx": "^4.22.3"
   }
 }

packages/server/src/http.ts

@@ -23,7 +23,7 @@ const makeProductionWebappRoute = Effect.fnUntraced(function*(route: HttpRouter.
 
     return HttpRouter.all(route, Effect.gen(function*() {
         const req = yield* HttpServerRequest.HttpServerRequest
-        const source = path.join(dist, req.url)
+        const source = path.join(dist, decodeURI(new URL(req.url, "http://localhost").pathname))
         const exists = yield* fs.stat(source).pipe(
             Effect.andThen(stat => stat.type === "File"),
             Effect.catchAll(() => Effect.succeed(false)),
@@ -32,7 +32,7 @@ const makeProductionWebappRoute = Effect.fnUntraced(function*(route: HttpRouter.
         return yield* HttpServerResponse.setHeader(
             yield* HttpServerResponse.file(exists ? source : path.join(dist, "index.html")),
             "Cache-Control",
-            `public, max-age=${Duration.toSeconds("365 days")}, immutable`
+            `public, max-age=${Duration.toSeconds("365 days")}, immutable`,
         )
     }))
 })

packages/webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@website/webapp",
-  "packageManager": "bun@1.2.22",
+  "packageManager": "bun@1.3.14",
   "private": true,
   "type": "module",
   "module": "./stub.ts",
@@ -14,39 +14,39 @@
     "clean:modules": "rm -rf node_modules"
   },
   "dependencies": {
-    "@effect/platform": "^0.93.0",
-    "@effect/platform-browser": "^0.73.0",
-    "@effect/rpc": "^0.72.0",
+    "@effect/platform": "^0.96.1",
+    "@effect/platform-browser": "^0.76.0",
+    "@effect/rpc": "^0.75.1",
     "@fontsource/work-sans": "^5.2.8",
-    "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-tooltip": "^1.2.8",
-    "@tanstack/react-router": "^1.131.48",
+    "@tanstack/react-router": "^1.170.4",
     "@website/common": "workspace:*",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "effect": "^3.17.13",
-    "effect-fc": "^0.2.0",
-    "i18next": "^25.6.0",
-    "i18next-browser-languagedetector": "^8.2.0",
-    "lucide-react": "^0.556.0",
-    "react": "^19.1.1",
-    "react-dom": "^19.1.1",
-    "react-i18next": "^16.0.1",
-    "react-icons": "^5.5.0",
+    "effect": "^3.21.2",
+    "effect-fc": "^0.2.6",
+    "i18next": "^26.2.0",
+    "i18next-browser-languagedetector": "^8.2.1",
+    "lucide-react": "^1.16.0",
+    "react": "^19.2.6",
+    "react-dom": "^19.2.6",
+    "react-i18next": "^17.0.8",
+    "react-icons": "^5.6.0",
     "react-shadow": "^20.6.0",
-    "tailwind-merge": "^3.3.1",
-    "tailwindcss": "^4.1.13"
+    "tailwind-merge": "^3.6.0",
+    "tailwindcss": "^4.3.0"
   },
   "devDependencies": {
-    "@tailwindcss/vite": "^4.1.13",
-    "@tanstack/react-router-devtools": "^1.131.48",
-    "@tanstack/router-plugin": "^1.131.48",
-    "@types/react": "^19.1.13",
-    "@types/react-dom": "^19.1.9",
-    "@vitejs/plugin-react": "^5.0.2",
-    "globals": "^16.4.0",
-    "tw-animate-css": "^1.3.8",
-    "typescript-eslint": "^8.44.0",
-    "vite": "^7.1.5"
+    "@tailwindcss/vite": "^4.3.0",
+    "@tanstack/react-router-devtools": "^1.167.0",
+    "@tanstack/router-plugin": "^1.168.6",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "@vitejs/plugin-react": "^6.0.2",
+    "globals": "^17.6.0",
+    "tw-animate-css": "^1.4.0",
+    "typescript-eslint": "^8.59.4",
+    "vite": "^8.0.13"
   }
 }

packages/webapp/public/pazismemod/index.html

@@ -0,0 +1,104 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>pazisme mod</title>
+  <style>
+    @font-face {
+      font-family: "Coolvetica";
+      src: url("./coolvetica_rg.otf") format("opentype");
+      font-style: normal;
+      font-weight: 400;
+      font-display: swap;
+    }
+
+    * {
+      box-sizing: border-box;
+    }
+
+    html,
+    body {
+      margin: 0;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      background: #000;
+    }
+
+    body {
+      position: relative;
+      font-family: sans-serif;
+    }
+
+    .splash-image {
+      display: block;
+      width: 100%;
+      height: 100%;
+      object-fit: contain;
+    }
+
+    .title {
+      position: absolute;
+      left: 24px;
+      bottom: 48px;
+      margin: 0;
+      color: #fff;
+      font-family: "Coolvetica", sans-serif;
+      font-size: clamp(48px, 8vw, 92px);
+      line-height: 1;
+    }
+  </style>
+</head>
+<body>
+  <audio id="theme" src="./we_are_charlie_kirk.mp3" preload="auto" autoplay hidden></audio>
+  <img class="splash-image" src="./screen1.png" alt="Pazismemod screenshot">
+  <h1 class="title">pazisme mod</h1>
+  <script>
+    (function() {
+      var SONG_START_TIME = 46;
+      var audio = document.getElementById("theme");
+
+      if (!audio) {
+        return;
+      }
+
+      function syncStartTime() {
+        if (isFinite(audio.duration) && audio.duration > SONG_START_TIME) {
+          audio.currentTime = SONG_START_TIME;
+        }
+      }
+
+      function playFromOffset() {
+        syncStartTime();
+        var result = audio.play();
+        if (result && typeof result.catch === "function") {
+          result.catch(function() {
+            // Ignore autoplay failures in embedded browsers that require interaction.
+          });
+        }
+      }
+
+      window.GameDetails = function(
+        _servername,
+        _serverurl,
+        _mapname,
+        _maxplayers,
+        _steamid,
+        _gamemode,
+        volume
+      ) {
+        var parsedVolume = Number(volume);
+
+        if (!isNaN(parsedVolume) && isFinite(parsedVolume)) {
+          audio.volume = Math.min(1, Math.max(0, parsedVolume));
+        }
+      };
+
+      audio.addEventListener("loadedmetadata", syncStartTime);
+      audio.addEventListener("ended", playFromOffset);
+      playFromOffset();
+    })();
+  </script>
+</body>
+</html>

packages/webapp/src/routeTree.gen.ts

@@ -9,50 +9,73 @@
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
 import { Route as rootRouteImport } from './routes/__root'
-import { Route as IndexRouteImport } from './routes/index'
+import { Route as MainRouteImport } from './routes/_main'
+import { Route as MainIndexRouteImport } from './routes/_main.index'
 
-const IndexRoute = IndexRouteImport.update({
+const MainRoute = MainRouteImport.update({
+  id: '/_main',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const MainIndexRoute = MainIndexRouteImport.update({
   id: '/',
   path: '/',
-  getParentRoute: () => rootRouteImport,
+  getParentRoute: () => MainRoute,
 } as any)
 
 export interface FileRoutesByFullPath {
-  '/': typeof IndexRoute
+  '/': typeof MainIndexRoute
 }
 export interface FileRoutesByTo {
-  '/': typeof IndexRoute
+  '/': typeof MainIndexRoute
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
-  '/': typeof IndexRoute
+  '/_main': typeof MainRouteWithChildren
+  '/_main/': typeof MainIndexRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
   fullPaths: '/'
   fileRoutesByTo: FileRoutesByTo
   to: '/'
-  id: '__root__' | '/'
+  id: '__root__' | '/_main' | '/_main/'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
-  IndexRoute: typeof IndexRoute
+  MainRoute: typeof MainRouteWithChildren
 }
 
 declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
-    '/': {
-      id: '/'
+    '/_main': {
+      id: '/_main'
+      path: ''
+      fullPath: '/'
+      preLoaderRoute: typeof MainRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/_main/': {
+      id: '/_main/'
       path: '/'
       fullPath: '/'
-      preLoaderRoute: typeof IndexRouteImport
-      parentRoute: typeof rootRouteImport
+      preLoaderRoute: typeof MainIndexRouteImport
+      parentRoute: typeof MainRoute
     }
   }
 }
 
+interface MainRouteChildren {
+  MainIndexRoute: typeof MainIndexRoute
+}
+
+const MainRouteChildren: MainRouteChildren = {
+  MainIndexRoute: MainIndexRoute,
+}
+
+const MainRouteWithChildren = MainRoute._addFileChildren(MainRouteChildren)
+
 const rootRouteChildren: RootRouteChildren = {
-  IndexRoute: IndexRoute,
+  MainRoute: MainRouteWithChildren,
 }
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)

packages/webapp/src/routes/__root.tsx

@@ -1,12 +1,5 @@
 import { createRootRoute, Outlet } from "@tanstack/react-router"
 import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"
-import { useTranslation } from "react-i18next"
-import { DiGit } from "react-icons/di"
-import { FaCode } from "react-icons/fa"
-import root from "react-shadow"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent } from "@/components/ui/card"
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
 
 
 export const Route = createRootRoute({
@@ -14,86 +7,8 @@ export const Route = createRootRoute({
 })
 
 function RootComponent() {
-    const { t, i18n } = useTranslation()
-
     return <>
-        <div className="flex flex-row items-center justify-center gap-2 p-2">
-            <Button
-                variant={i18n.language !== "en" ? "default" : "noShadow"}
-                onClick={() => i18n.changeLanguage("en")}
-            >
-                🇬🇧 English
-            </Button>
-
-            <Button
-                variant={i18n.language !== "fr" ? "default" : "noShadow"}
-                onClick={() => i18n.changeLanguage("fr")}
-            >
-                🇫🇷 Français
-            </Button>
-        </div>
-
-        <div className="container mt-20 mr-auto ml-auto">
-            <div className="mr-auto ml-auto flex w-fit flex-row items-start justify-around gap-10">
-                <root.div>
-                    <link rel="stylesheet" href="/98.css/dist/98.css" />
-
-                    <div className="window" style={{ width: 300 }}>
-                        <div className="title-bar">
-                            <div className="title-bar-text">Julien Valverde</div>
-                        </div>
-                        <div className="window-body">
-                            <p>There's so much room for activities!</p>
-                        </div>
-                    </div>
-                </root.div>
-
-                <div>
-                    <h1>Ingénieur Full Stack &bull; Entrepreneur</h1>
-
-                    <p className="mt-2">
-                        I am passionate about integrating functionality and design in applications to create intuitive, user-friendly experiences.
-                    </p>
-
-                    <div className="flex w-fit flex-row items-center justify-center gap-2 mt-4">
-                        <TooltipProvider>
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <Button asChild>
-                                        <a href="https://git.valverde.cloud"><DiGit /> {t($ => $.gitRepos.title, { ns: "nav" })}</a>
-                                    </Button>
-                                </TooltipTrigger>
-
-                                <TooltipContent><p>{t($ => $.gitRepos.tooltip, { ns: "nav" })}</p></TooltipContent>
-                            </Tooltip>
-                        </TooltipProvider>
-
-                        <TooltipProvider>
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <Button asChild>
-                                        <a href="https://git.valverde.cloud/thilawyn/website"><FaCode /> {t($ => $.sourceCode.title, { ns: "nav" })}</a>
-                                    </Button>
-                                </TooltipTrigger>
-
-                                <TooltipContent><p>{t($ => $.sourceCode.tooltip, { ns: "nav" })}</p></TooltipContent>
-                            </Tooltip>
-                        </TooltipProvider>
-
-                        <Button>Resumé</Button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div className="mx-auto w-[750px] max-w-full px-5 pt-28 pb-10 text-foreground">
-            <Card>
-                <CardContent>
-                    <Outlet />
-                </CardContent>
-            </Card>
-        </div>
-
+        <Outlet />
         <TanStackRouterDevtools />
     </>
 }

packages/webapp/src/routes/_main.index.tsx

@@ -1,7 +1,7 @@
 import { createFileRoute } from "@tanstack/react-router"
 
 
-export const Route = createFileRoute("/")({
+export const Route = createFileRoute("/_main/")({
     component: RouteComponent,
 })
 

packages/webapp/src/routes/_main.tsx

@@ -0,0 +1,109 @@
+import { createFileRoute, Outlet } from "@tanstack/react-router"
+import { useTranslation } from "react-i18next"
+import { DiGit } from "react-icons/di"
+import { FaCode } from "react-icons/fa"
+import root from "react-shadow"
+import { Button } from "@/components/ui/button"
+import { Card, CardContent } from "@/components/ui/card"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
+
+
+export const Route = createFileRoute("/_main")({
+    component: WIPLayout,
+})
+
+function WIPLayout() {
+    return (
+        <div className="mx-auto w-[750px] max-w-full px-5 pt-28 pb-10 text-foreground">
+            <Card>
+                <CardContent>
+                    <Outlet />
+                </CardContent>
+            </Card>
+        </div>
+    )
+}
+
+// @ts-expect-error
+function SharedLayout() {
+    const { t, i18n } = useTranslation()
+
+    return <>
+        <div className="flex flex-row items-center justify-center gap-2 p-2">
+            <Button
+                variant={i18n.language !== "en" ? "default" : "noShadow"}
+                onClick={() => i18n.changeLanguage("en")}
+            >
+                🇬🇧 English
+            </Button>
+
+            <Button
+                variant={i18n.language !== "fr" ? "default" : "noShadow"}
+                onClick={() => i18n.changeLanguage("fr")}
+            >
+                🇫🇷 Français
+            </Button>
+        </div>
+
+        <div className="container mt-20 mr-auto ml-auto">
+            <div className="mr-auto ml-auto flex w-fit flex-row items-start justify-around gap-10">
+                <root.div>
+                    <link rel="stylesheet" href="/98.css/dist/98.css" />
+
+                    <div className="window" style={{ width: 300 }}>
+                        <div className="title-bar">
+                            <div className="title-bar-text">Julien Valverde</div>
+                        </div>
+                        <div className="window-body">
+                            <p>There's so much room for activities!</p>
+                        </div>
+                    </div>
+                </root.div>
+
+                <div>
+                    <h1>Ingénieur Full Stack &bull; Entrepreneur</h1>
+
+                    <p className="mt-2">
+                        I am passionate about integrating functionality and design in applications to create intuitive, user-friendly experiences.
+                    </p>
+
+                    <div className="mt-4 flex w-fit flex-row items-center justify-center gap-2">
+                        <TooltipProvider>
+                            <Tooltip>
+                                <TooltipTrigger asChild>
+                                    <Button asChild>
+                                        <a href="https://git.valverde.cloud"><DiGit /> {t($ => $.gitRepos.title, { ns: "nav" })}</a>
+                                    </Button>
+                                </TooltipTrigger>
+
+                                <TooltipContent><p>{t($ => $.gitRepos.tooltip, { ns: "nav" })}</p></TooltipContent>
+                            </Tooltip>
+                        </TooltipProvider>
+
+                        <TooltipProvider>
+                            <Tooltip>
+                                <TooltipTrigger asChild>
+                                    <Button asChild>
+                                        <a href="https://git.valverde.cloud/thilawyn/website"><FaCode /> {t($ => $.sourceCode.title, { ns: "nav" })}</a>
+                                    </Button>
+                                </TooltipTrigger>
+
+                                <TooltipContent><p>{t($ => $.sourceCode.tooltip, { ns: "nav" })}</p></TooltipContent>
+                            </Tooltip>
+                        </TooltipProvider>
+
+                        <Button>Resumé</Button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div className="mx-auto w-[750px] max-w-full px-5 pt-28 pb-10 text-foreground">
+            <Card>
+                <CardContent>
+                    <Outlet />
+                </CardContent>
+            </Card>
+        </div>
+    </>
+}