diff --git a/eslint.config.js b/eslint.config.js
index 572459c81d..3dce0962bf 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -884,7 +884,7 @@ copy(
         1,
         { path: 'never', types: 'never', lib: 'never' }
       ],
-      '@typescript-eslint/unbound-method': 0,
+      '@typescript-eslint/unbound-method': 0, // replaced by vitest/unbound-method
       '@typescript-eslint/unified-signatures': 0,
       '@typescript-eslint/use-unknown-in-catch-callback-variable': 1
     }
@@ -1013,6 +1013,7 @@ copy(
       'vitest/require-test-timeout': 0,
       'vitest/require-to-throw-message': 1,
       'vitest/require-top-level-describe': 0,
+      'vitest/unbound-method': 0,
       'vitest/valid-describe-callback': 1,
       'vitest/valid-expect': [1, { alwaysAwait: true }],
       'vitest/valid-expect-in-promise': 1,
diff --git a/package.json b/package.json
index 9aee7c1155..158e8b6b37 100644
--- a/package.json
+++ b/package.json
@@ -57,9 +57,9 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^6.0.1",
-    "@vitest/browser-playwright": "^4.1.0",
-    "@vitest/coverage-istanbul": "^4.1.0",
-    "@vitest/eslint-plugin": "^1.6.12",
+    "@vitest/browser-playwright": "^4.1.2",
+    "@vitest/coverage-istanbul": "^4.1.2",
+    "@vitest/eslint-plugin": "^1.6.13",
     "clsx": "^2.1.1",
     "ecij": "^0.4.1",
     "eslint": "^10.0.3",
@@ -75,10 +75,10 @@
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "tsdown": "^0.21.7",
-    "typescript": "~6.0.1-rc",
+    "typescript": "~6.0.2",
     "typescript-eslint": "^8.57.0",
-    "vite": "^8.0.0",
-    "vitest": "^4.1.0",
+    "vite": "^8.0.3",
+    "vitest": "^4.1.2",
     "vitest-browser-react": "^2.1.0"
   },
   "peerDependencies": {
diff --git a/src/globals.d.ts b/src/globals.d.ts
index ee06893ccf..b8e33ced84 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -5,5 +5,5 @@ declare module 'react' {
   }
 }
 
-// somehow required to make types work
+// required to make types work
 export {};
diff --git a/test/globals.d.ts b/test/globals.d.ts
index ca127afd20..73ff9c63b1 100644
--- a/test/globals.d.ts
+++ b/test/globals.d.ts
@@ -13,5 +13,5 @@ declare module 'vitest/browser' {
   }
 }
 
-// somehow required to make types work
+// required to make types work
 export {};
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 413281e904..444fec02db 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -12,7 +12,6 @@
     "noImplicitReturns": true,
     "noUnusedLocals": true,
     "outDir": "./.cache/ts",
-    "strictNullChecks": true, // TODO: remove once `typescript-eslint` supports TS 6
     "target": "esnext",
     "verbatimModuleSyntax": true
   }
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 0a8d0b1547..03cb7253c7 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -5,6 +5,6 @@
     "skipLibCheck": true,
     "types": ["vitest/globals"]
   },
-  "include": ["test/**/*"],
+  "include": ["src/css.d.ts", "test/**/*"],
   "references": [{ "path": "tsconfig.src.json" }]
 }
diff --git a/website/router.tsx b/website/router.tsx
index ad95476652..d61fa5c8c7 100644
--- a/website/router.tsx
+++ b/website/router.tsx
@@ -15,7 +15,7 @@ export const router = createRouter({
 });
 
 // Register the router instance for type safety
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router-core' {
   interface Register {
     router: typeof router;
   }