Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore(frontend): upgrade react-router to v8 (#20930)

boojack33feef5fad20
diff --git a/frontend/package.json b/frontend/package.json
index c599294f6f..d5346ccc32 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -82,7 +82,7 @@
"react-i18next": "^17.0.0",
"react-markdown": "^10.1.0",
"react-resizable-panels": "^4.11.0",
- "react-router-dom": "^7.16.0",
+ "react-router": "^8.2.0",
"regenerator-runtime": "^0.14.1",
"rxjs": "^7.8.2",
"scroll-into-view-if-needed": "^3.1.0",
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index faf3cf8f9c..543e3a96d8 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -181,9 +181,9 @@ importers:
react-resizable-panels:
specifier: ^4.11.0
- react-router-dom:
- specifier: ^7.16.0
+ react-router:
+ specifier: ^8.2.0
regenerator-runtime:
specifier: ^0.14.1
version: 0.14.1
@@ -2434,9 +2434,8 @@ packages:
resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
- resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==}
- engines: {node: '>=18'}
+ resolution: {integrity: sha512-UaXxwISYJPTr9hwQxMFYZ7kNhSXboMXP+Z3TRX6f1/NyaGPfuNUZOWP1pUEb75B2HjfklIYLVRfWiFZJyC6Npg==}
resolution: {integrity: sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA==}
@@ -3685,19 +3684,12 @@ packages:
react: ^18.0.0 || ^19.0.0
react-dom: ^18.0.0 || ^19.0.0
- resolution: {integrity: sha512-KaZh+X/6UtEp28x51AUYZDMg9NGoz2ja3dNHa+ta/tk40vCzKhQ/RypCWBMLbmDr6//E24Vv5uPsrqXFozdkAg==}
- engines: {node: '>=20.0.0'}
+ resolution: {integrity: sha512-uP1LgGNHyilL1u+ZkecQk74DJOKOb6q4NLNYLRJcD/fjoogftNb5/Rj/07o/QBFsY/5MbAKPm1peTCQuVPv9cQ==}
+ engines: {node: '>=22.22.0'}
peerDependencies:
- react: '>=18'
- react-dom: '>=18'
-
- resolution: {integrity: sha512-GDLgg3i3uM0aeJO3Fm+TCS+sDQ7gu12T6x0qdTEzcwqEfleci7JwugVNIF3U//0FWKnJT7ptG+20B2jfDqnZAg==}
- engines: {node: '>=20.0.0'}
- peerDependencies:
- react: '>=18'
- react-dom: '>=18'
+ react: '>=19.2.7'
+ react-dom: '>=19.2.7'
peerDependenciesMeta:
react-dom:
optional: true
@@ -6472,7 +6464,7 @@ snapshots:
dependencies:
@@ -7936,17 +7928,10 @@ snapshots:
react: 19.2.7
react-dom: 19.2.7([email protected])
dependencies:
+ cookie-es: 3.1.1
react: 19.2.7
- react-dom: 19.2.7([email protected])
-
- dependencies:
- cookie: 1.1.1
- react: 19.2.7
- set-cookie-parser: 2.7.2
optionalDependencies:
react-dom: 19.2.7([email protected])
diff --git a/frontend/src/react/app/AppRoot.tsx b/frontend/src/react/app/AppRoot.tsx
index e5411d0e92..4bc23f977a 100644
--- a/frontend/src/react/app/AppRoot.tsx
+++ b/frontend/src/react/app/AppRoot.tsx
@@ -2,8 +2,8 @@ import {
createBrowserRouter,
type LoaderFunctionArgs,
matchRoutes,
- RouterProvider,
-} from "react-router-dom";
+} from "react-router";
+import { RouterProvider } from "react-router/dom";
import { rootGuard } from "@/react/router/guard";
import { setAppRouter, setRouteNameIndex } from "@/react/router/navigation";
import { buildRouteNameIndex, routes } from "@/react/router/routes";
diff --git a/frontend/src/react/app/AuthGate.test.tsx b/frontend/src/react/app/AuthGate.test.tsx
index f19ffa400e..6c7c193f69 100644
--- a/frontend/src/react/app/AuthGate.test.tsx
+++ b/frontend/src/react/app/AuthGate.test.tsx
@@ -60,7 +60,7 @@ vi.mock("react-i18next", () => ({
useTranslation: () => ({ t: (key: string) => key }),
}));
-vi.mock("react-router-dom", () => ({
+vi.mock("react-router", () => ({
useLocation: () => mocks.location,
useMatches: () => [{ handle: { name: mocks.routeName } }],
useNavigate: () => mocks.navigate,
diff --git a/frontend/src/react/app/AuthGate.tsx b/frontend/src/react/app/AuthGate.tsx
index 9a6cf30585..6c52243964 100644
--- a/frontend/src/react/app/AuthGate.tsx
+++ b/frontend/src/react/app/AuthGate.tsx
@@ -1,7 +1,7 @@
import { Loader2 } from "lucide-react";
import { type ReactNode, useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { useLocation, useMatches, useNavigate } from "react-router-dom";
+import { useLocation, useMatches, useNavigate } from "react-router";
import { InactiveRemindModal } from "@/react/components/auth/InactiveRemindModal";
import {
buildSigninRedirectQuery,
diff --git a/frontend/src/react/app/RootLayout.tsx b/frontend/src/react/app/RootLayout.tsx
index 816bef0afd..a94ca14740 100644
--- a/frontend/src/react/app/RootLayout.tsx
+++ b/frontend/src/react/app/RootLayout.tsx
@@ -1,6 +1,6 @@
import { useRef } from "react";
-import type { Location } from "react-router-dom";
-import { matchRoutes, Outlet, useBlocker } from "react-router-dom";
+import type { Location } from "react-router";
+import { matchRoutes, Outlet, useBlocker } from "react-router";
import { AuthGate } from "@/react/app/AuthGate";
import { SessionExpiredSurfaceGate } from "@/react/app/SessionExpiredSurfaceGate";
import { Toaster } from "@/react/components/ui/toaster";
diff --git a/frontend/src/react/app/RouteErrorPage.test.tsx b/frontend/src/react/app/RouteErrorPage.test.tsx
index 75ace2d0c1..68f8f5824f 100644
--- a/frontend/src/react/app/RouteErrorPage.test.tsx
+++ b/frontend/src/react/app/RouteErrorPage.test.tsx
@@ -1,6 +1,7 @@
import { act } from "react";
import { createRoot } from "react-dom/client";
-import { createMemoryRouter, Outlet, RouterProvider } from "react-router-dom";
+import { createMemoryRouter, Outlet } from "react-router";
+import { RouterProvider } from "react-router/dom";
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
import { RouteErrorPage } from "./RouteErrorPage";
diff --git a/frontend/src/react/app/RouteErrorPage.tsx b/frontend/src/react/app/RouteErrorPage.tsx
index 9d2e58c22d..1576642f49 100644
--- a/frontend/src/react/app/RouteErrorPage.tsx
+++ b/frontend/src/react/app/RouteErrorPage.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
-import { useRouteError } from "react-router-dom";
+import { useRouteError } from "react-router";
import { Button } from "@/react/components/ui/button";
import { cn } from "@/react/lib/utils";
diff --git a/frontend/src/react/app/layouts/BodyLayout.tsx b/frontend/src/react/app/layouts/BodyLayout.tsx
index c18cd1836b..1ab37b2a4d 100644
--- a/frontend/src/react/app/layouts/BodyLayout.tsx
+++ b/frontend/src/react/app/layouts/BodyLayout.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import { createPortal } from "react-dom";
-import { Outlet, useLocation, useMatches } from "react-router-dom";
+import { Outlet, useLocation, useMatches } from "react-router";
import { DashboardBodyShell } from "@/react/components/DashboardBodyShell";
import { DashboardSidebar } from "@/react/components/DashboardSidebar";
import { ProjectSidebar } from "@/react/components/ProjectSidebar";
diff --git a/frontend/src/react/app/layouts/DashboardLayout.tsx b/frontend/src/react/app/layouts/DashboardLayout.tsx
index be07d4e714..7f1c8f9b54 100644
--- a/frontend/src/react/app/layouts/DashboardLayout.tsx
+++ b/frontend/src/react/app/layouts/DashboardLayout.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { createPortal } from "react-dom";
-import { Outlet } from "react-router-dom";
+import { Outlet } from "react-router";
import { DashboardFrameShell } from "@/react/components/DashboardFrameShell";
import type { DashboardFrameShellTargets } from "@/react/dashboard-shell";
import { useEnsureWorkspaceCommonData } from "@/react/hooks/useEnsureWorkspaceCommonData";
diff --git a/frontend/src/react/app/layouts/SplashLayout.test.tsx b/frontend/src/react/app/layouts/SplashLayout.test.tsx
index 821d051ee9..9cc4ea6bc3 100644
--- a/frontend/src/react/app/layouts/SplashLayout.test.tsx
+++ b/frontend/src/react/app/layouts/SplashLayout.test.tsx
@@ -9,7 +9,7 @@ const storeState = vi.hoisted(() => ({
isTrialing: false,
}));
-vi.mock("react-router-dom", () => ({
+vi.mock("react-router", () => ({
Outlet: () => <div data-testid="auth-page" />,
useMatches: () => [{ handle: { name: AUTH_SIGNIN_MODULE } }],
}));
diff --git a/frontend/src/react/app/layouts/SplashLayout.tsx b/frontend/src/react/app/layouts/SplashLayout.tsx
index 68d47f299b..c23f8aa297 100644
--- a/frontend/src/react/app/layouts/SplashLayout.tsx
+++ b/frontend/src/react/app/layouts/SplashLayout.tsx
@@ -1,5 +1,5 @@
import { useState } from "react";
-import { Outlet, useMatches } from "react-router-dom";
+import { Outlet, useMatches } from "react-router";
import signinImage from "@/assets/illustration/signin.webp";
import signupImage from "@/assets/illustration/signup.webp";
import { AUTH_SIGNUP_MODULE } from "@/react/router/handles";
diff --git a/frontend/src/react/hooks/useURLSearchParam.test.tsx b/frontend/src/react/hooks/useURLSearchParam.test.tsx
index ed5332e33f..996500be5f 100644
--- a/frontend/src/react/hooks/useURLSearchParam.test.tsx
+++ b/frontend/src/react/hooks/useURLSearchParam.test.tsx
@@ -1,6 +1,6 @@
import { act, renderHook } from "@testing-library/react";
import type { ReactNode } from "react";
-import { MemoryRouter, useLocation, useNavigate } from "react-router-dom";
+import { MemoryRouter, useLocation, useNavigate } from "react-router";
import { describe, expect, test } from "vitest";
import {
createAdvancedSearchParser,
diff --git a/frontend/src/react/hooks/useURLSearchParam.ts b/frontend/src/react/hooks/useURLSearchParam.ts
index 7c9c6c4aaa..0a2bae1bd2 100644
--- a/frontend/src/react/hooks/useURLSearchParam.ts
+++ b/frontend/src/react/hooks/useURLSearchParam.ts
@@ -5,7 +5,7 @@ import {
useMemo,
useRef,
} from "react";
-import { useSearchParams } from "react-router-dom";
+import { useSearchParams } from "react-router";
import {
buildSearchParamsBySearchText,
buildSearchTextBySearchParams,
diff --git a/frontend/src/react/pages/settings/DatabasesPage.test.tsx b/frontend/src/react/pages/settings/DatabasesPage.test.tsx
index 972e52af98..4ee75900f2 100644
--- a/frontend/src/react/pages/settings/DatabasesPage.test.tsx
+++ b/frontend/src/react/pages/settings/DatabasesPage.test.tsx
@@ -1,6 +1,6 @@
import { act } from "react";
import { createRoot } from "react-dom/client";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router";
import { beforeEach, describe, expect, test, vi } from "vitest";
(
diff --git a/frontend/src/react/pages/settings/InstanceDetailPage.tsx b/frontend/src/react/pages/settings/InstanceDetailPage.tsx
index 2d0e592bfd..2742c5a6eb 100644
--- a/frontend/src/react/pages/settings/InstanceDetailPage.tsx
+++ b/frontend/src/react/pages/settings/InstanceDetailPage.tsx
@@ -2,7 +2,7 @@ import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
import {
AdvancedSearch,
getValueFromScopes,
diff --git a/frontend/src/react/router/NavigationScrollRestoration.test.tsx b/frontend/src/react/router/NavigationScrollRestoration.test.tsx
index b0e339fecb..1b65a62340 100644
--- a/frontend/src/react/router/NavigationScrollRestoration.test.tsx
+++ b/frontend/src/react/router/NavigationScrollRestoration.test.tsx
@@ -1,10 +1,7 @@
import { act, useState } from "react";
import { createRoot } from "react-dom/client";
-import {
- createMemoryRouter,
- Outlet,
- RouterProvider,
-} from "react-router-dom";
+import { createMemoryRouter, Outlet } from "react-router";
+import { RouterProvider } from "react-router/dom";
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
import { setAppRouter } from "./navigation";
import {
diff --git a/frontend/src/react/router/NavigationScrollRestoration.tsx b/frontend/src/react/router/NavigationScrollRestoration.tsx
index 45a30e89d1..b979a4e6f0 100644
--- a/frontend/src/react/router/NavigationScrollRestoration.tsx
+++ b/frontend/src/react/router/NavigationScrollRestoration.tsx
@@ -9,11 +9,7 @@ import {
useRef,
useState,
} from "react";
-import {
- type Location,
- useLocation,
- useNavigationType,
-} from "react-router-dom";
+import { type Location, useLocation, useNavigationType } from "react-router";
import type { PagedDataResult } from "@/react/hooks/usePagedData";
import { getAppRouterState, subscribeRoute } from "@/react/router/navigation";
import { minmax } from "@/utils/math";
diff --git a/frontend/src/react/router/ProjectRouteGate.test.tsx b/frontend/src/react/router/ProjectRouteGate.test.tsx
index 4daebe6917..1e6df31f43 100644
--- a/frontend/src/react/router/ProjectRouteGate.test.tsx
+++ b/frontend/src/react/router/ProjectRouteGate.test.tsx
@@ -28,7 +28,7 @@ const mocks = vi.hoisted(() => ({
notify: vi.fn(),
}));
-vi.mock("react-router-dom", () => ({
+vi.mock("react-router", () => ({
Outlet: () => <div data-testid="outlet" />,
useParams: () => mocks.params,
}));
diff --git a/frontend/src/react/router/ProjectRouteGate.tsx b/frontend/src/react/router/ProjectRouteGate.tsx
index 16a9881fd1..883de50a30 100644
--- a/frontend/src/react/router/ProjectRouteGate.tsx
+++ b/frontend/src/react/router/ProjectRouteGate.tsx
@@ -1,6 +1,6 @@
import { LoaderCircle } from "lucide-react";
import { useEffect, useRef, useState } from "react";
-import { Outlet, useParams } from "react-router-dom";
+import { Outlet, useParams } from "react-router";
import {
PermissionDeniedFallback,
useComponentPermissionState,
diff --git a/frontend/src/react/router/guard.test.ts b/frontend/src/react/router/guard.test.ts
index a4a7c82c85..31579aeafe 100644
--- a/frontend/src/react/router/guard.test.ts
+++ b/frontend/src/react/router/guard.test.ts
@@ -1,4 +1,4 @@
-import { matchRoutes } from "react-router-dom";
+import { matchRoutes, RouterContextProvider } from "react-router";
import { beforeEach, describe, expect, test, vi } from "vitest";
// Configurable fake session, controlled per test.
@@ -89,7 +89,7 @@ async function runCatchAllLoader(path: string): Promise<Response> {
url,
pattern: "*",
params: {},
- context: {},
+ context: new RouterContextProvider(),
}) as Response | Promise<Response>;
}
diff --git a/frontend/src/react/router/guard.ts b/frontend/src/react/router/guard.ts
index b28b3fd1b1..59d14354c0 100644
--- a/frontend/src/react/router/guard.ts
+++ b/frontend/src/react/router/guard.ts
@@ -1,4 +1,4 @@
-import { redirect } from "react-router-dom";
+import { redirect } from "react-router";
import { useAppStore } from "@/react/stores/app";
import { DatabaseChangeMode } from "@/types/proto-es/v1/setting_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
diff --git a/frontend/src/react/router/index.ts b/frontend/src/react/router/index.ts
index c039142da2..332d665f66 100644
--- a/frontend/src/react/router/index.ts
+++ b/frontend/src/react/router/index.ts
@@ -3,7 +3,7 @@ import {
useNavigate as useReactRouterNavigate,
useMatches,
useParams,
-} from "react-router-dom";
+} from "react-router";
import type { Permission } from "@/types";
import type {
NavigationOptions,
diff --git a/frontend/src/react/router/issueDetailRedirect.test.ts b/frontend/src/react/router/issueDetailRedirect.test.ts
index 9e61267c2e..04ba91bfa1 100644
--- a/frontend/src/react/router/issueDetailRedirect.test.ts
+++ b/frontend/src/react/router/issueDetailRedirect.test.ts
@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "react-router-dom";
+import type { LoaderFunctionArgs } from "react-router";
import { beforeEach, describe, expect, test, vi } from "vitest";
const mocks = vi.hoisted(() => ({
diff --git a/frontend/src/react/router/issueDetailRedirect.ts b/frontend/src/react/router/issueDetailRedirect.ts
index c2a7efeee9..51fb049706 100644
--- a/frontend/src/react/router/issueDetailRedirect.ts
+++ b/frontend/src/react/router/issueDetailRedirect.ts
@@ -1,5 +1,5 @@
import { create } from "@bufbuild/protobuf";
-import { type LoaderFunctionArgs, redirect } from "react-router-dom";
+import { type LoaderFunctionArgs, redirect } from "react-router";
import { issueServiceClientConnect, planServiceClientConnect } from "@/connect";
import { shouldStayOnPlanDetailPage } from "@/react/pages/project/plan-detail/utils/header";
import { issueNamePrefix, projectNamePrefix } from "@/store/modules/v1/common";
diff --git a/frontend/src/react/router/layoutPlaceholders.tsx b/frontend/src/react/router/layoutPlaceholders.tsx
index 2887361b4f..963cadd1a2 100644
--- a/frontend/src/react/router/layoutPlaceholders.tsx
+++ b/frontend/src/react/router/layoutPlaceholders.tsx
@@ -10,6 +10,6 @@
//
// (The Splash / Body / Dashboard layout placeholders that previously lived here
// have been replaced by the real layouts in `@/react/app/layouts/*`.)
-import { Outlet } from "react-router-dom";
+import { Outlet } from "react-router";
export const RouteShellOutletPlaceholder = () => <Outlet />;
diff --git a/frontend/src/react/router/lazyPage.ts b/frontend/src/react/router/lazyPage.ts
index af8ebe5894..76850f33bd 100644
--- a/frontend/src/react/router/lazyPage.ts
+++ b/frontend/src/react/router/lazyPage.ts
@@ -1,5 +1,5 @@
import { type ComponentType, createElement, useMemo } from "react";
-import { useLocation, useMatches, useParams } from "react-router-dom";
+import { useLocation, useMatches, useParams } from "react-router";
// Adapter for react-router's `lazy` route field.
//
diff --git a/frontend/src/react/router/routes.test.tsx b/frontend/src/react/router/routes.test.tsx
index d0866f4c1e..2584c71dc1 100644
--- a/frontend/src/react/router/routes.test.tsx
+++ b/frontend/src/react/router/routes.test.tsx
@@ -1,4 +1,4 @@
-import { matchRoutes, type RouteObject } from "react-router-dom";
+import { matchRoutes, type RouteObject } from "react-router";
import { describe, expect, it } from "vitest";
import { WORKSPACE_ROUTE_404 } from "@/react/router/handles";
import { routes } from "./routes";
diff --git a/frontend/src/react/router/routes.tsx b/frontend/src/react/router/routes.tsx
index 1486ee2865..c1d368cd1f 100644
--- a/frontend/src/react/router/routes.tsx
+++ b/frontend/src/react/router/routes.tsx
@@ -1,4 +1,4 @@
-import type { RouteObject } from "react-router-dom";
+import type { RouteObject } from "react-router";
import { RootLayout } from "@/react/app/RootLayout";
import { RouteErrorPage } from "@/react/app/RouteErrorPage";
import { rootGuard } from "@/react/router/guard";
diff --git a/frontend/src/react/router/routes/auth.tsx b/frontend/src/react/router/routes/auth.tsx
index 5af931d829..c9c4f5cb09 100644
--- a/frontend/src/react/router/routes/auth.tsx
+++ b/frontend/src/react/router/routes/auth.tsx
@@ -1,4 +1,4 @@
-import type { RouteObject } from "react-router-dom";
+import type { RouteObject } from "react-router";
import { SplashLayout } from "@/react/app/layouts/SplashLayout";
import {
AUTH_2FA_SETUP_MODULE,
diff --git a/frontend/src/react/router/routes/dashboard.tsx b/frontend/src/react/router/routes/dashboard.tsx
index 4a621a7c8d..f4befeb28e 100644
--- a/frontend/src/react/router/routes/dashboard.tsx
+++ b/frontend/src/react/router/routes/dashboard.tsx
@@ -1,4 +1,4 @@
-import { Navigate, type RouteObject, redirect } from "react-router-dom";
+import { Navigate, type RouteObject, redirect } from "react-router";
import { BodyLayout } from "@/react/app/layouts/BodyLayout";
import { DashboardLayout } from "@/react/app/layouts/DashboardLayout";
import { RouteErrorPage } from "@/react/app/RouteErrorPage";
diff --git a/frontend/src/react/router/routes/sqlEditor.tsx b/frontend/src/react/router/routes/sqlEditor.tsx
index 549bd8de3f..1b2ac1a168 100644
--- a/frontend/src/react/router/routes/sqlEditor.tsx
+++ b/frontend/src/react/router/routes/sqlEditor.tsx
@@ -1,5 +1,5 @@
import { lazy, Suspense } from "react";
-import { Outlet, type RouteObject } from "react-router-dom";
+import { Outlet, type RouteObject } from "react-router";
import {
SQL_EDITOR_DATABASE_MODULE,
SQL_EDITOR_HOME_MODULE,
diff --git a/frontend/src/react/router/useCurrentRoute.integration.test.tsx b/frontend/src/react/router/useCurrentRoute.integration.test.tsx
index 4889c74bca..0d51b40476 100644
--- a/frontend/src/react/router/useCurrentRoute.integration.test.tsx
+++ b/frontend/src/react/router/useCurrentRoute.integration.test.tsx
@@ -1,6 +1,7 @@
import { act } from "react";
import { createRoot } from "react-dom/client";
-import { createMemoryRouter, Outlet, RouterProvider } from "react-router-dom";
+import { createMemoryRouter, Outlet } from "react-router";
+import { RouterProvider } from "react-router/dom";
import { describe, expect, test } from "vitest";
import { SQL_EDITOR_DATABASE_MODULE } from "./handles";
import { type ReactRoute, useCurrentRoute } from "./index";
diff --git a/frontend/src/react/router/useCurrentRoute.test.tsx b/frontend/src/react/router/useCurrentRoute.test.tsx
index cf54fe15a2..41951dc513 100644
--- a/frontend/src/react/router/useCurrentRoute.test.tsx
+++ b/frontend/src/react/router/useCurrentRoute.test.tsx
@@ -30,7 +30,7 @@ const mocks = vi.hoisted(() => ({
],
}));
-vi.mock("react-router-dom", () => ({
+vi.mock("react-router", () => ({
useLocation: () => mocks.location,
useMatches: () => mocks.matches,
useNavigate: () => vi.fn(),
diff --git a/frontend/vite-plugin-export-csp-hashes.ts b/frontend/vite-plugin-export-csp-hashes.ts
index 985d5c28f5..33e69ec21a 100644
--- a/frontend/vite-plugin-export-csp-hashes.ts
+++ b/frontend/vite-plugin-export-csp-hashes.ts
@@ -110,37 +110,7 @@ export function exportCspHashes(): Plugin {
);
}
- // 2. Hash dynamically-injected scripts (e.g., iframe content)
- const dynamicScripts = [
- "src/components/MarkdownEditor/resize-observer.ts",
- ];
- console.log(
- `✓ Computing hashes for ${dynamicScripts.length} dynamically-injected scripts...`
- );
-
- for (const scriptPath of dynamicScripts) {
- try {
- const fullPath = resolve(__dirname, scriptPath);
- const scriptContent = readFileSync(fullPath, "utf-8");
- const hash = computeSha256(scriptContent);
- const cspHash = `'sha256-${hash}'`;
-
- allHashes.add(cspHash);
- inlineScriptSources.push({
- file: scriptPath,
- content:
- scriptContent.length > 60
- ? scriptContent.substring(0, 60) + "..."
- : scriptContent,
- hash: cspHash,
- });
- console.log(` ✓ ${scriptPath} -> ${cspHash}`);
- } catch (error) {
- console.warn(` ⚠️ Failed to hash ${scriptPath}:`, error);
- }
- }
-
- // 3. Scan built HTML files for inline scripts
+ // 2. Scan built HTML files for inline scripts
const htmlFiles = findHtmlFiles(outDir);
console.log(
`✓ Scanning ${htmlFiles.length} HTML files for inline scripts...`