mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-19 21:46:49 +00:00
Maurice
6c63a9bb60
* refactor(client): opt into the v7 router behaviour while still on v6 Turning the behaviour on separately from the version bump keeps the two failure modes apart: red here means a behaviour change, red on the bump means the import rewrite. The suite is unchanged either way — 527 files, 11099 tests. Only the two flags a non-data router understands are set; the rest belong to createBrowserRouter, which this app doesn't use. Both are applied at all six router mounts, so the tests exercise the same behaviour as production rather than validating v6 while prod runs v7. * fix(client): move to react-router 7.18.2 6.30.4 is affected by GHSA-wrjc-x8rr-h8h6 — open redirect through a backslash in Link and useNavigate, which this app uses in 41 places — and the 6.x line has no fix: react-router-dom 6.30.2 to 6.30.4 carries GHSA-jjmj-jmhj-qwj2 with no patched version at all. Staying is not an option, and 7.0 to 7.17 only swaps it for GHSA-chx6-hx7r-mcp5. The package rename comes with it: react-router-dom is a re-export shim in v7, so using it would only defer the same rewrite to the v8 jump. 77 occurrences across 60 files, all of them import specifiers and vi.mock strings. The surface is small — useNavigate, useParams, useSearchParams, useLocation, Routes, Route, Link, Navigate, useMatch, MemoryRouter, BrowserRouter — no data router, no loaders or actions. Nothing else had to change; the future flags from the previous commit are simply how v7 behaves, so they come back out. npm audit still reports GHSA-qwww-vcr4-c8h2 on react-router (RSC mode CSRF, fixed in 8.3.0). It needs RSC mode, which needs a server; this is a static SPA. Closing it means the v8 major, which is its own piece of work.
27 lines
879 B
TypeScript
27 lines
879 B
TypeScript
import React from 'react';
|
|
import { render, type RenderOptions } from '@testing-library/react';
|
|
import { MemoryRouter, type MemoryRouterProps } from 'react-router';
|
|
import { TranslationProvider } from '../../src/i18n/TranslationContext';
|
|
|
|
interface RenderWithProvidersOptions extends Omit<RenderOptions, 'wrapper'> {
|
|
initialEntries?: MemoryRouterProps['initialEntries'];
|
|
}
|
|
|
|
function renderWithProviders(
|
|
ui: React.ReactElement,
|
|
{ initialEntries = ['/'], ...options }: RenderWithProvidersOptions = {},
|
|
) {
|
|
function Wrapper({ children }: { children: React.ReactNode }) {
|
|
return (
|
|
<MemoryRouter initialEntries={initialEntries}>
|
|
<TranslationProvider>{children}</TranslationProvider>
|
|
</MemoryRouter>
|
|
);
|
|
}
|
|
|
|
return render(ui, { wrapper: Wrapper, ...options });
|
|
}
|
|
|
|
export * from '@testing-library/react';
|
|
export { renderWithProviders as render };
|