Skip to content

Commit 08fc64e

Browse files
authored
Merge pull request #3936 from element-hq/dependabot/npm_and_yarn/frontend/tanstack-router-fe6322bb73
build(deps): bump the tanstack-router group across 1 directory with 3 updates
2 parents 2ed8b0f + cca4eb3 commit 08fc64e

File tree

6 files changed

+92
-67
lines changed

6 files changed

+92
-67
lines changed

frontend/package-lock.json

Lines changed: 67 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@radix-ui/react-collapsible": "^1.1.2",
2424
"@radix-ui/react-dialog": "^1.1.5",
2525
"@tanstack/react-query": "^5.66.0",
26-
"@tanstack/react-router": "^1.98.0",
26+
"@tanstack/react-router": "^1.98.4",
2727
"@tanstack/router-zod-adapter": "^1.81.5",
2828
"@vector-im/compound-design-tokens": "3.0.1",
2929
"@vector-im/compound-web": "^7.6.2",
@@ -54,8 +54,8 @@
5454
"@storybook/react-vite": "^8.5.2",
5555
"@storybook/test": "^8.5.0",
5656
"@tanstack/react-query-devtools": "^5.66.0",
57-
"@tanstack/router-devtools": "^1.98.0",
58-
"@tanstack/router-vite-plugin": "^1.98.0",
57+
"@tanstack/router-devtools": "^1.98.4",
58+
"@tanstack/router-vite-plugin": "^1.98.6",
5959
"@testing-library/jest-dom": "^6.6.3",
6060
"@testing-library/react": "^16.2.0",
6161
"@testing-library/user-event": "^14.6.1",

frontend/src/router.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { routeTree } from "./routeTree.gen";
1313
// Create a new router instance
1414
export const router = createRouter({
1515
routeTree,
16+
scrollRestoration: true,
1617
basepath: config.root,
1718
defaultPendingComponent: LoadingScreen,
1819
defaultPreload: "intent",

frontend/src/routes/__root.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
99
import {
1010
type ErrorRouteComponent,
1111
Outlet,
12-
ScrollRestoration,
1312
createRootRouteWithContext,
1413
} from "@tanstack/react-router";
1514
import { TanStackRouterDevtools } from "@tanstack/router-devtools";
@@ -28,7 +27,6 @@ export const Route = createRootRouteWithContext<{
2827
}>()({
2928
component: () => (
3029
<>
31-
<ScrollRestoration />
3230
<Outlet />
3331

3432
{import.meta.env.DEV &&

frontend/tests/routes/__snapshots__/reset-cross-signing.test.tsx.snap

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ exports[`Reset cross signing > renders the cancelled page 1`] = `
4848
</p>
4949
</div>
5050
</div>
51+
<script>
52+
53+
</script>
5154
</DocumentFragment>
5255
`;
5356

@@ -234,6 +237,9 @@ exports[`Reset cross signing > renders the deep link page 1`] = `
234237
</p>
235238
</footer>
236239
</div>
240+
<script>
241+
242+
</script>
237243
</DocumentFragment>
238244
`;
239245

@@ -322,6 +328,9 @@ exports[`Reset cross signing > renders the errored page 1`] = `
322328
</p>
323329
</footer>
324330
</div>
331+
<script>
332+
333+
</script>
325334
</DocumentFragment>
326335
`;
327336

@@ -508,6 +517,9 @@ exports[`Reset cross signing > renders the page 1`] = `
508517
</p>
509518
</footer>
510519
</div>
520+
<script>
521+
522+
</script>
511523
</DocumentFragment>
512524
`;
513525

@@ -554,6 +566,9 @@ exports[`Reset cross signing > renders the success page 1`] = `
554566
</p>
555567
</div>
556568
</div>
569+
<script>
570+
571+
</script>
557572
</DocumentFragment>
558573
`;
559574

@@ -600,5 +615,8 @@ exports[`Reset cross signing > renders the success page 2`] = `
600615
</p>
601616
</div>
602617
</div>
618+
<script>
619+
620+
</script>
603621
</DocumentFragment>
604622
`;

frontend/tests/routes/account/__snapshots__/index.test.tsx.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,5 +736,8 @@ exports[`Account home page > renders the page 1`] = `
736736
</p>
737737
</footer>
738738
</div>
739+
<script>
740+
741+
</script>
739742
</DocumentFragment>
740743
`;

0 commit comments

Comments
 (0)