A full-featured CRM built with React, shadcn/ui, and Supabase.
fix react-router/react-router-dom
erwanMarmelabf417bd2a635a
diff --git a/src/components/atomic-crm/companies/CompanyShow.tsx b/src/components/atomic-crm/companies/CompanyShow.tsxindex c3fd107f..6e538223 100644--- a/src/components/atomic-crm/companies/CompanyShow.tsx+++ b/src/components/atomic-crm/companies/CompanyShow.tsx@@ -19,7 +19,7 @@ import {useLocation,useMatch,useNavigate,-} from "react-router-dom";+} from "react-router";import { useIsMobile } from "@/hooks/use-mobile";import { ActivityLog } from "../activity/ActivityLog";diff --git a/src/components/atomic-crm/login/StartPage.tsx b/src/components/atomic-crm/login/StartPage.tsxindex cd92ba3d..c7223d54 100644--- a/src/components/atomic-crm/login/StartPage.tsx+++ b/src/components/atomic-crm/login/StartPage.tsx@@ -1,6 +1,6 @@import { useQuery } from "@tanstack/react-query";import { useDataProvider } from "ra-core";-import { Navigate } from "react-router-dom";+import { Navigate } from "react-router";import type { CrmDataProvider } from "../providers/types";import { LoginSkeleton } from "./LoginSkeleton";diff --git a/src/components/supabase/oauth-consent-page.tsx b/src/components/supabase/oauth-consent-page.tsxindex 703174c4..779c56fa 100644--- a/src/components/supabase/oauth-consent-page.tsx+++ b/src/components/supabase/oauth-consent-page.tsx@@ -1,5 +1,5 @@import { useEffect, useState } from "react";-import { useNavigate, useSearchParams } from "react-router-dom";+import { useNavigate, useSearchParams } from "react-router";import { useAuthProvider, useTranslate } from "ra-core";import { Layout } from "@/components/supabase/layout";import { Button } from "@/components/ui/button";diff --git a/vite.config.ts b/vite.config.tsindex 99f1b6f4..7268129c 100644--- a/vite.config.ts+++ b/vite.config.ts@@ -67,6 +67,7 @@ export default defineConfig({},resolve: {preserveSymlinks: true,+ dedupe: ["react-router", "react-router-dom"],alias: {"@": path.resolve(__dirname, "./src"),},diff --git a/vite.demo.config.ts b/vite.demo.config.tsindex 1ddee3bc..41eec4ba 100644--- a/vite.demo.config.ts+++ b/vite.demo.config.ts@@ -47,6 +47,7 @@ export default defineConfig({},resolve: {preserveSymlinks: true,+ dedupe: ["react-router", "react-router-dom"],alias: {"@": path.resolve(__dirname, "./src"),},diff --git a/vitest.config.ts b/vitest.config.tsindex 056b7919..de7ac1c0 100644--- a/vitest.config.ts+++ b/vitest.config.ts@@ -22,6 +22,7 @@ export default defineConfig({},resolve: {preserveSymlinks: true,+ dedupe: ["react-router", "react-router-dom"],alias: {"@": path.resolve(__dirname, "./src"),},