Upgrade to RR 7.9.6 (#218)

Author: brophdawg11

app/actions/color-scheme/components.tsx

@@ -1,6 +1,5 @@
 import { useLayoutEffect, useMemo } from "react";
-import { useNavigation, useRouteLoaderData } from "react-router";
-import type { loader as rootLoader } from "../../root";
+import { useNavigation, unstable_useRoute as useRoute } from "react-router";
 import type { ColorScheme } from "./server";
 
 export function getColorScheme(formData: FormData): ColorScheme | null {
@@ -18,14 +17,12 @@ export function getColorScheme(formData: FormData): ColorScheme | null {
 }
 
 export function useColorScheme(): ColorScheme {
-  let rootLoaderData = useRouteLoaderData<typeof rootLoader>("root");
-  if (!rootLoaderData) {
-    throw new Error("useColorScheme must be used within a root loader");
-  }
+  let rootRoute = useRoute("root");
+  let colorScheme = rootRoute.loaderData?.colorScheme ?? "system";
 
   let { formData } = useNavigation();
   let optimisticColorScheme = formData ? getColorScheme(formData) : null;
-  return optimisticColorScheme || rootLoaderData.colorScheme;
+  return optimisticColorScheme || colorScheme;
 }
 
 export function ColorSchemeScript() {

app/actions/color-scheme/server.ts

@@ -7,10 +7,12 @@ let cookie = createCookie("color-scheme", {
   sameSite: "lax",
 });
 
-export async function parseColorScheme(request: Request) {
+export async function parseColorScheme(request: Request): Promise<ColorScheme> {
   const header = request.headers.get("Cookie");
   const vals = await cookie.parse(header);
-  return vals ? vals.colorScheme : "system";
+  return ["dark", "light", "system"].includes(vals?.colorScheme)
+    ? vals.colorScheme
+    : "system";
 }
 
 export function serializeColorScheme(colorScheme: ColorScheme) {

app/hooks/use-docs-layout.ts

@@ -17,8 +17,8 @@
   "dependencies": {
     "@docsearch/css": "^3.8.3",
     "@docsearch/react": "^3.8.3",
-    "@react-router/express": "^7.9.2",
-    "@react-router/node": "^7.9.2",
+    "@react-router/express": "7.9.6",
+    "@react-router/node": "7.9.6",
     "cheerio": "^1.0.0-rc.12",
     "clsx": "^2.1.1",
     "compression": "^1.7.5",
@@ -42,7 +42,7 @@
     "parse-numeric-range": "^1.3.0",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
-    "react-router": "^7.9.2",
+    "react-router": "7.9.6",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
     "rehype-stringify": "^10.0.1",
@@ -58,7 +58,7 @@
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
-    "@react-router/dev": "^7.9.2",
+    "@react-router/dev": "7.9.6",
     "@testing-library/jest-dom": "^6.8.0",
     "@types/express": "^5.0.3",
     "@types/follow-redirects": "^1.14.4",