From d2633f52658efdfbac47a19da01c2e87a8e5663d Mon Sep 17 00:00:00 2001
From: Sheraff <fpellet@ensc.fr>
Date: Sat, 23 Aug 2025 16:15:33 +0200
Subject: [PATCH 1/2] test(react-router): add more variants to store-updates
 test

---
 .../store-updates-during-navigation.test.tsx  | 90 +++++++++++++++++--
 1 file changed, 83 insertions(+), 7 deletions(-)

diff --git a/packages/react-router/tests/store-updates-during-navigation.test.tsx b/packages/react-router/tests/store-updates-during-navigation.test.tsx
index 9a587392748..cf6480eb801 100644
--- a/packages/react-router/tests/store-updates-during-navigation.test.tsx
+++ b/packages/react-router/tests/store-updates-during-navigation.test.tsx
@@ -31,6 +31,7 @@ function setup({
   scripts,
   defaultPendingMs,
   defaultPendingMinMs,
+  staleTime,
 }: {
   beforeLoad?: () => any
   loader?: () => any
@@ -39,24 +40,24 @@ function setup({
   scripts?: () => any
   defaultPendingMs?: number
   defaultPendingMinMs?: number
+  staleTime?: number
 }) {
   const select = vi.fn()
 
   const rootRoute = createRootRoute({
     component: function RootComponent() {
       useRouterState({ select })
-      return <Outlet />
+      return <>
+        <Link to="/">Back</Link>
+        <Link to="/posts">Posts</Link>
+        <Outlet />
+      </>
     },
   })
   const indexRoute = createRoute({
     getParentRoute: () => rootRoute,
     path: '/',
-    component: () => (
-      <>
-        <h1>Index</h1>
-        <Link to="/posts">Posts</Link>
-      </>
-    ),
+    component: () => <h1>Index</h1>,
   })
 
   const postsRoute = createRoute({
@@ -83,6 +84,8 @@ function setup({
     defaultPendingComponent: () => <p>Loading...</p>,
     defaultNotFoundComponent: () => <h1>Not Found Title</h1>,
     defaultPreload: 'intent',
+    defaultStaleTime: staleTime,
+    defaultGcTime: staleTime,
   })
 
   render(<RouterProvider router={router} />)
@@ -90,6 +93,13 @@ function setup({
   return { select, router }
 }
 
+async function back() {
+  const link = await waitFor(() => screen.getByRole('link', { name: 'Back' }))
+  fireEvent.click(link)
+  const title = await waitFor(() => screen.getByRole('heading', { name: /Index/ }))
+  expect(title).toBeInTheDocument()
+}
+
 async function run({ select }: ReturnType<typeof setup>) {
   // navigate to /posts
   const link = await waitFor(() => screen.getByRole('link', { name: 'Posts' }))
@@ -211,4 +221,70 @@ describe("Store doesn't update *too many* times during navigation", () => {
     // Any change that increases this number should be investigated.
     expect(updates).toBe(14)
   })
+
+  test('navigate, w/ preloaded & async loaders', async () => {
+    const params = setup({
+      beforeLoad: () => Promise.resolve({ foo: 'bar' }),
+      loader: () => resolveAfter(100, { hello: 'world' }),
+      staleTime: 1000,
+    })
+
+    await params.router.preloadRoute({ to: '/posts' })
+    const updates = await run(params)
+
+    // This number should be as small as possible to minimize the amount of work
+    // that needs to be done during a navigation.
+    // Any change that increases this number should be investigated.
+    expect(updates).toBe(7)
+  })
+
+  test('navigate, w/ preloaded & sync loaders', async () => {
+    const params = setup({
+      beforeLoad: () => ({ foo: 'bar' }),
+      loader: () => ({ hello: 'world' }),
+      staleTime: 1000,
+    })
+
+    await params.router.preloadRoute({ to: '/posts' })
+    const updates = await run(params)
+
+    // This number should be as small as possible to minimize the amount of work
+    // that needs to be done during a navigation.
+    // Any change that increases this number should be investigated.
+    expect(updates).toBe(6)
+  })
+
+  test('navigate, w/ previous navigation & async loader', async () => {
+    const params = setup({
+      loader: () => resolveAfter(100, { hello: 'world' }),
+      staleTime: 1000,
+    })
+
+    await run(params)
+    await back()
+    const updates = await run(params)
+
+    // This number should be as small as possible to minimize the amount of work
+    // that needs to be done during a navigation.
+    // Any change that increases this number should be investigated.
+    expect(updates).toBe(5)
+  })
+
+  test('preload a preloaded route w/ async loader', async () => {
+    const params = setup({
+      loader: () => resolveAfter(100, { hello: 'world' }),
+    })
+
+    await params.router.preloadRoute({ to: '/posts' })
+    await new Promise((r) => setTimeout(r, 20))
+    const before = params.select.mock.calls.length
+    await params.router.preloadRoute({ to: '/posts' })
+    const after = params.select.mock.calls.length
+    const updates = after - before
+
+    // This number should be as small as possible to minimize the amount of work
+    // that needs to be done during a navigation.
+    // Any change that increases this number should be investigated.
+    expect(updates).toBe(1)
+  })
 })

From 6521321a652bedc328d70b99b113a5f8374b49b8 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 23 Aug 2025 14:18:27 +0000
Subject: [PATCH 2/2] ci: apply automated fixes

---
 .../store-updates-during-navigation.test.tsx     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/react-router/tests/store-updates-during-navigation.test.tsx b/packages/react-router/tests/store-updates-during-navigation.test.tsx
index cf6480eb801..d68373ff4ee 100644
--- a/packages/react-router/tests/store-updates-during-navigation.test.tsx
+++ b/packages/react-router/tests/store-updates-during-navigation.test.tsx
@@ -47,11 +47,13 @@ function setup({
   const rootRoute = createRootRoute({
     component: function RootComponent() {
       useRouterState({ select })
-      return <>
-        <Link to="/">Back</Link>
-        <Link to="/posts">Posts</Link>
-        <Outlet />
-      </>
+      return (
+        <>
+          <Link to="/">Back</Link>
+          <Link to="/posts">Posts</Link>
+          <Outlet />
+        </>
+      )
     },
   })
   const indexRoute = createRoute({
@@ -96,7 +98,9 @@ function setup({
 async function back() {
   const link = await waitFor(() => screen.getByRole('link', { name: 'Back' }))
   fireEvent.click(link)
-  const title = await waitFor(() => screen.getByRole('heading', { name: /Index/ }))
+  const title = await waitFor(() =>
+    screen.getByRole('heading', { name: /Index/ }),
+  )
   expect(title).toBeInTheDocument()
 }