diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3b244224a..f2e112e4f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -94,6 +94,7 @@ updates:
       tanstack-router:
         patterns:
           - "@tanstack/react-router"
+          - "@tanstack/react-router-*"
           - "@tanstack/router-*"
       tanstack-query:
         patterns:
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 89f9c06b3..6c2368ef1 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -43,8 +43,8 @@
         "@storybook/react-vite": "^8.6.4",
         "@storybook/test": "^8.5.5",
         "@tanstack/react-query-devtools": "^5.67.3",
-        "@tanstack/router-devtools": "^1.114.17",
-        "@tanstack/router-vite-plugin": "^1.114.17",
+        "@tanstack/react-router-devtools": "^1.114.17",
+        "@tanstack/router-plugin": "^1.114.17",
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/react": "^16.2.0",
         "@testing-library/user-event": "^14.6.1",
@@ -5466,36 +5466,6 @@
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@tanstack/router-devtools": {
-      "version": "1.114.17",
-      "resolved": "https://registry.npmjs.org/@tanstack/router-devtools/-/router-devtools-1.114.17.tgz",
-      "integrity": "sha512-mRvatu8YTcaa459GV85NonuT52v/NVsGjQktsX1HSan+tn2f5j/A0JUQwinvk3/YFil6LLpT/D+OwMQgpW8rPw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/react-router-devtools": "^1.114.17",
-        "clsx": "^2.1.1",
-        "goober": "^2.1.16"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "@tanstack/react-router": "^1.114.17",
-        "csstype": "^3.0.10",
-        "react": ">=18.0.0 || >=19.0.0",
-        "react-dom": ">=18.0.0 || >=19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "csstype": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@tanstack/router-devtools-core": {
       "version": "1.114.17",
       "resolved": "https://registry.npmjs.org/@tanstack/router-devtools-core/-/router-devtools-core-1.114.17.tgz",
@@ -5644,23 +5614,6 @@
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@tanstack/router-vite-plugin": {
-      "version": "1.114.17",
-      "resolved": "https://registry.npmjs.org/@tanstack/router-vite-plugin/-/router-vite-plugin-1.114.17.tgz",
-      "integrity": "sha512-R981mC81iwbaeNE3nAsxDYoMjVLmkO0fwkStHxUnZQ+AYAGx3KFeTZ6nr3FL6V668S9sHEoymXmMWJZ62VYumw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/router-plugin": "^1.114.17"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      }
-    },
     "node_modules/@tanstack/store": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/@tanstack/store/-/store-0.7.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 2e6deabce..c2e241fc7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -53,8 +53,8 @@
     "@storybook/react-vite": "^8.6.4",
     "@storybook/test": "^8.5.5",
     "@tanstack/react-query-devtools": "^5.67.3",
-    "@tanstack/router-devtools": "^1.114.17",
-    "@tanstack/router-vite-plugin": "^1.114.17",
+    "@tanstack/react-router-devtools": "^1.114.17",
+    "@tanstack/router-plugin": "^1.114.17",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
     "@testing-library/user-event": "^14.6.1",
diff --git a/frontend/src/routes/__root.tsx b/frontend/src/routes/__root.tsx
index a4ab23b30..a4a58506e 100644
--- a/frontend/src/routes/__root.tsx
+++ b/frontend/src/routes/__root.tsx
@@ -11,7 +11,7 @@ import {
   Outlet,
   createRootRouteWithContext,
 } from "@tanstack/react-router";
-import { TanStackRouterDevtools } from "@tanstack/router-devtools";
+import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
 import GenericError from "../components/GenericError";
 import Layout, { query } from "../components/Layout";
 import NotFound from "../components/NotFound";
diff --git a/frontend/tsconfig.node.json b/frontend/tsconfig.node.json
index 053992522..5aa949a51 100644
--- a/frontend/tsconfig.node.json
+++ b/frontend/tsconfig.node.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "composite": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
+    "module": "node16",
+    "moduleResolution": "node16",
     "allowSyntheticDefaultImports": true,
     "allowJs": true,
     "resolveJsonModule": true
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 548cc1a88..c250dbf92 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -8,7 +8,7 @@ import { readFile, writeFile } from "node:fs/promises";
 import { resolve } from "node:path";
 
 import { codecovVitePlugin } from "@codecov/vite-plugin";
-import { TanStackRouterVite as tanStackRouter } from "@tanstack/router-vite-plugin";
+import { TanStackRouterVite as tanStackRouter } from "@tanstack/router-plugin/vite";
 import react from "@vitejs/plugin-react";
 import browserslistToEsbuild from "browserslist-to-esbuild";
 import type { Manifest, PluginOption } from "vite";