Fix types for RouteData

Since remix-run/remix#5679 and remix v1.15.0, RouteData is no longer exported by Remix. The type is now provided by `@remix-run/router`.
lpsinger · May 11, 2023 · 20daf1d · 20daf1d
1 parent 0e1ae22
commit 20daf1d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
   ],
   "peerDependencies": {
     "@remix-run/react": "^1.10.0",
+    "@remix-run/router": "^1.0.0",
     "@remix-run/server-runtime": "^1.10.0",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "zod": "^3.19.1"
@@ -53,6 +54,7 @@
     "@jest/types": "^27.2.5",
     "@remix-run/node": "^1.10.0",
     "@remix-run/react": "^1.10.0",
+    "@remix-run/router": "^1.0.0",
     "@remix-run/server-runtime": "^1.10.0",
     "@testing-library/jest-dom": "^5.15.0",
     "@testing-library/react": "^12.1.2",

diff --git a/src/react/handle-conventions.ts b/src/react/handle-conventions.ts
@@ -1,7 +1,9 @@
-import { RouteData } from "@remix-run/react/dist/routeData";
+import type { RouterState } from "@remix-run/router";
 import type { AppData } from "@remix-run/server-runtime";
 import type { Location, Params } from "react-router-dom";
 
+type RouteData = RouterState["loaderData"];
+
 export type HandleConventionArguments<Data extends AppData = AppData> = {
   id: string;
   data: Data;