Merge pull request #38 from lambda-curry/LC-177-migrate-react-router

LC-177: Migrate LambdaCurry/forms to latest React Router and React version

Author: jaruesink

.gitignore

@@ -179,4 +179,7 @@ dist
 .turbo
 *storybook.log
 
-storybook-static
+storybook-static
+
+# React Router v7
+.react-router/

apps/docs/package.json

@@ -20,8 +20,7 @@
     "storybook": "^8.4.7"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.15.1",
-    "@remix-run/testing": "^2.15.1",
+    "@react-router/dev": "^7.0.0",
     "@storybook/test-runner": "^0.20.1",
     "@storybook/testing-library": "^0.2.2",
     "@types/react": "^19.0.0",
@@ -30,6 +29,8 @@
     "autoprefixer": "^10.4.20",
     "postcss": "^8.4.49",
     "react": "^19.0.0",
+    "react-router": "^7.0.0",
+    "react-router-dom": "^7.0.0",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
     "vite": "^5.4.11",

apps/docs/src/lib/storybook/remix-stub.tsx

@@ -1,5 +1,5 @@
-import type { ActionFunction, LinksFunction, LoaderFunction, MetaFunction } from '@remix-run/node';
-import { createRemixStub } from '@remix-run/testing';
+import type { ActionFunction, LinksFunction, LoaderFunction, MetaFunction } from 'react-router';
+import { createRemixStub } from '@react-router/testing';
 import type { Decorator } from '@storybook/react';
 import type { ComponentType } from 'react';
 import type { IndexRouteObject, NonIndexRouteObject } from 'react-router-dom';

apps/docs/src/remix-hook-form/checkbox.stories.tsx

@@ -1,8 +1,8 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Checkbox } from '@lambdacurry/forms/remix-hook-form/checkbox';
 import { Button } from '@lambdacurry/forms/ui/button';
-import type { ActionFunctionArgs } from '@remix-run/node';
-import { useFetcher } from '@remix-run/react';
+import type { ActionFunctionArgs } from 'react-router';
+import { useFetcher } from 'react-router-dom';
 import type { Meta, StoryContext, StoryObj } from '@storybook/react';
 import { expect, userEvent } from '@storybook/test';
 import type {} from '@testing-library/dom';

packages/components/app/routes.ts

@@ -0,0 +1,4 @@
+import { type RouteConfig } from "@react-router/dev/routes";
+import { flatRoutes } from "@react-router/fs-routes";
+
+export default flatRoutes() satisfies RouteConfig;

packages/components/package.json

@@ -35,7 +35,7 @@
     "type-check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "react": "^18.0.0",
+    "react": "^19.0.0",
     "remix-hook-form": "5.1.1"
   },
   "dependencies": {
@@ -53,9 +53,7 @@
     "@radix-ui/react-slot": "^1.1.1",
     "@radix-ui/react-switch": "^1.1.2",
     "@radix-ui/react-tooltip": "^1.1.6",
-    "@remix-run/node": "^2.15.1",
-    "@remix-run/react": "^2.15.1",
-    "@remix-run/serve": "^2.15.1",
+    "@react-router/node": "^7.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
@@ -64,15 +62,16 @@
     "next-themes": "^0.4.4",
     "react-day-picker": "9.4.4",
     "react-hook-form": "^7.53.1",
+    "react-router": "^7.0.0",
+    "react-router-dom": "^7.0.0",
     "remix-hook-form": "5.1.1",
     "sonner": "^1.7.1",
     "tailwind-merge": "^2.5.5",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.15.1",
-    "@remix-run/testing": "^2.15.1",
+    "@react-router/dev": "^7.0.0",
     "@types/glob": "^8.1.0",
     "@types/react": "^19.0.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",

packages/components/react-router.config.ts

@@ -0,0 +1,5 @@
+import type { Config } from "@react-router/dev/config";
+
+export default {
+  ssr: true,
+} satisfies Config;

packages/components/tsconfig.json

@@ -14,8 +14,10 @@
     "jsx": "react-jsx",
     "strict": true,
     "esModuleInterop": true,
-    "moduleResolution": "bundler"
+    "moduleResolution": "bundler",
+    "types": ["@react-router/node", "vite/client"],
+    "rootDirs": [".", "./.react-router/types"]
   },
-  "include": ["src"],
+  "include": ["src", ".react-router/types/**/*"],
   "exclude": ["**/*.stories.tsx", "**/*.test.tsx", "node_modules", "dist"]
 }

packages/components/vite.config.ts

@@ -53,9 +53,9 @@ export default defineConfig({
         '@radix-ui/react-slot',
         '@radix-ui/react-switch',
         '@radix-ui/react-tooltip',
-        '@remix-run/node',
-        '@remix-run/react',
-        '@remix-run/serve',
+        'react-router',
+        'react-router-dom',
+        '@react-router/node',
         'class-variance-authority',
         'clsx',
         'date-fns',

tsconfig.json

@@ -20,7 +20,8 @@
     "module": "ESNext",
     "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "jsx": "react-jsx",
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["@react-router/node", "vite/client"]
   },
   "exclude": ["node_modules"]
 }