Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions app/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,13 @@ function render() {
// This means RR is best thought of as an external store that runs
// independently of the React render lifecycle.
const router = createBrowserRouter(routes, {
// https://reactrouter.com/en/main/guides/api-development-strategy#current-future-flags
future: { v7_normalizeFormMethod: true },
// https://reactrouter.com/en/6.24.0/upgrading/future
future: {
v7_fetcherPersist: true,
v7_normalizeFormMethod: true,
v7_partialHydration: true,
v7_relativeSplatPath: true,
},
})

root.render(
Expand All @@ -52,7 +57,13 @@ function render() {
<ConfirmActionModal />
<SkipLink id="skip-nav" />
<ReduceMotion />
<RouterProvider router={router} />
<RouterProvider
router={router}
// this breaks the scroll restore test. turn it on after we change
// the layout so the whole page scrolls and switch back to RR's
// built in useScrollRestoration
// future={{ v7_startTransition: true }}
/>
</ErrorBoundary>
{/* <ReactQueryDevtools initialIsOpen={false} /> */}
</QueryClientProvider>
Expand Down
53 changes: 28 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"react-hook-form": "^7.51.4",
"react-is": "^18.3.1",
"react-merge-refs": "^2.1.1",
"react-router-dom": "^6.23.0",
"react-router-dom": "^6.24.0",
"react-stately": "^3.31.0",
"recharts": "^2.12.6",
"remeda": "^2.0.3",
Expand Down