Skip to content

fix(react-router): useMatchRoute w/ React Compiler - #8015

Merged
Sheraff merged 8 commits into
mainfrom
fix-react-router-use-match-route-react-compiler
Aug 12, 2026
Merged

fix(react-router): useMatchRoute w/ React Compiler#8015
Sheraff merged 8 commits into
mainfrom
fix-react-router-use-match-route-react-compiler

Conversation

@Sheraff

@Sheraff Sheraff commented Aug 8, 2026

Copy link
Copy Markdown
Collaborator

fixes #4499

Summary by CodeRabbit

Bug Fixes

  • Improved useMatchRoute behavior during navigation and server-side rendering.
  • Preserved callback stability across unchanged renders and batched state updates.
  • Ensured route matching responds correctly to location and router status changes.

Tests

  • Added React Compiler end-to-end coverage for route matching.
  • Verified navigation between routes, nested routing, and matched-route display.
  • Added regression coverage for callback identity and state updates.

@nx-cloud

nx-cloud Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

View your CI Pipeline Execution ↗ for commit 3abdab7

Command Status Duration Result
nx affected --targets=test:eslint,test:unit,tes... ✅ Succeeded 12m 22s View ↗
nx run-many --target=build --exclude=examples/*... ✅ Succeeded 2m 12s View ↗

☁️ Nx Cloud last updated this comment at 2026-08-10 09:39:30 UTC

@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Changeset Version Preview

No changeset entries found. Merging this PR will not cause a version bump for any packages.

@coderabbitai

coderabbitai Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review
📝 Walkthrough

Walkthrough

useMatchRoute now updates its client callback when match state changes. SSR returns a direct matcher. The PR adds unit and React Compiler end-to-end coverage for navigation updates.

Changes

React Compiler match route updates

Layer / File(s) Summary
Conditional match callback dependencies
packages/react-router/src/Matches.tsx, packages/react-router/tests/Matches.test.tsx
Client callback dependencies now include location, resolved-location, and status values. SSR uses a direct matcher. Tests verify callback identity across state changes and equivalent updates.
React Compiler test application
e2e/react-router/react-compiler/index.html, e2e/react-router/react-compiler/package.json, e2e/react-router/react-compiler/tsconfig.json, e2e/react-router/react-compiler/vite.config.js, e2e/react-router/react-compiler/src/main.tsx
Adds the React Compiler fixture, route application, navigation links, matched-route output, and router mounting.
React Compiler navigation validation
e2e/react-router/react-compiler/playwright.config.ts, e2e/react-router/react-compiler/tests/use-match-route.spec.ts
Configures Playwright with a Vite test server and Chromium project. The test verifies matched-route output during Home to About to Home navigation.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Browser
  participant RouterProvider
  participant useMatchRoute
  participant MatchState
  Browser->>RouterProvider: Navigate from Home to About
  RouterProvider->>MatchState: Update location and route state
  MatchState->>useMatchRoute: Update callback dependencies
  useMatchRoute->>Browser: Render matched route name
Loading

Possibly related PRs

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 25.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the React Router fix for useMatchRoute with the React Compiler.
Linked Issues check ✅ Passed The changes update useMatchRoute for navigation changes and add tests that verify matched-route updates with the React Compiler [#4499].
Out of Scope Changes check ✅ Passed The implementation, regression tests, and React Compiler E2E fixture directly support the linked issue.
✨ Finishing Touches 💡 1
📝 Generate docstrings 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix-react-router-use-match-route-react-compiler

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

Bundle Size Benchmarks

  • Commit: bce528b2492c
  • Measured at: 2026-08-10T09:20:55.306Z
  • Baseline source: history:44a8c3e1d2af
  • Dashboard: bundle-size history

The following scenarios have bundle-size changes compared with the baseline:

Scenario Current (gzip) Delta vs baseline Initial gzip Raw Brotli Trend
react-router.minimal 83.92 KiB +4 B (+0.00%) 83.78 KiB 262.68 KiB 73.02 KiB ███▁▁▁▁▁▁▁▁
react-router.full 87.43 KiB +2 B (+0.00%) 87.29 KiB 274.40 KiB 76.08 KiB ███▁▁▁▁▁▁▁▁▁
solid-router.minimal 33.24 KiB +3 B (+0.01%) 33.12 KiB 96.52 KiB 30.00 KiB ███▁▁▁▁▁▁▁▁
solid-router.full 38.07 KiB +5 B (+0.01%) 37.94 KiB 111.15 KiB 34.28 KiB ███▁▁▁▁▁▁▁▁
vue-router.minimal 49.53 KiB +1 B (+0.00%) 49.40 KiB 138.26 KiB 44.63 KiB ███▁▁▁▁▁▁▁▁
vue-router.full 55.10 KiB +1 B (+0.00%) 54.98 KiB 156.44 KiB 49.64 KiB ███▁▁▁▁▁▁▁▁
react-start.full 99.92 KiB +3 B (+0.00%) 99.79 KiB 314.61 KiB 86.61 KiB ███▁▁▁▁▁▁▁▁▁
react-start.rsbuild.minimal 100.07 KiB +2 B (+0.00%) 99.90 KiB 315.45 KiB 86.30 KiB ▁▂▂▂▂▆█████
react-start.rsbuild.minimal-iife 100.47 KiB +4 B (+0.00%) 100.31 KiB 316.38 KiB 86.67 KiB ▁▂▂▂▂▆█████
react-start.rsbuild.full 103.39 KiB +2 B (+0.00%) 103.22 KiB 325.54 KiB 88.99 KiB ▁▃▃▃▃▆██████
solid-start.minimal 46.01 KiB +1 B (+0.00%) 45.89 KiB 137.57 KiB 40.95 KiB ███▁▁▁▁▁▁▁▁
solid-start.deferred-hydration 49.09 KiB +4 B (+0.01%) 45.95 KiB 145.04 KiB 43.69 KiB ███▁▁▁▁▁▁▁▁
solid-start.full 51.09 KiB +3 B (+0.01%) 50.97 KiB 152.96 KiB 45.33 KiB ███▁▁▁▁▁▁▁▁
vue-start.minimal 65.55 KiB +2 B (+0.00%) 65.42 KiB 189.08 KiB 58.40 KiB ███▁▁▁▁▁▁▁▁
vue-start.full 69.38 KiB +4 B (+0.01%) 69.25 KiB 201.36 KiB 61.60 KiB ███▁▁▁▁▁▁▁▁

Current gzip tracks all emitted client JS chunks. Initial gzip tracks only the entry/import graph. Trend sparkline is historical current gzip ending with this PR measurement; lower is better.

@pkg-pr-new

pkg-pr-new Bot commented Aug 8, 2026

Copy link
Copy Markdown
More templates

@tanstack/arktype-adapter

npm i https://pkg.pr.new/@tanstack/arktype-adapter@8015

@tanstack/eslint-plugin-router

npm i https://pkg.pr.new/@tanstack/eslint-plugin-router@8015

@tanstack/eslint-plugin-start

npm i https://pkg.pr.new/@tanstack/eslint-plugin-start@8015

@tanstack/history

npm i https://pkg.pr.new/@tanstack/history@8015

@tanstack/nitro-v2-vite-plugin

npm i https://pkg.pr.new/@tanstack/nitro-v2-vite-plugin@8015

@tanstack/react-router

npm i https://pkg.pr.new/@tanstack/react-router@8015

@tanstack/react-router-devtools

npm i https://pkg.pr.new/@tanstack/react-router-devtools@8015

@tanstack/react-router-ssr-query

npm i https://pkg.pr.new/@tanstack/react-router-ssr-query@8015

@tanstack/react-start

npm i https://pkg.pr.new/@tanstack/react-start@8015

@tanstack/react-start-client

npm i https://pkg.pr.new/@tanstack/react-start-client@8015

@tanstack/react-start-rsc

npm i https://pkg.pr.new/@tanstack/react-start-rsc@8015

@tanstack/react-start-server

npm i https://pkg.pr.new/@tanstack/react-start-server@8015

@tanstack/router-cli

npm i https://pkg.pr.new/@tanstack/router-cli@8015

@tanstack/router-core

npm i https://pkg.pr.new/@tanstack/router-core@8015

@tanstack/router-devtools

npm i https://pkg.pr.new/@tanstack/router-devtools@8015

@tanstack/router-devtools-core

npm i https://pkg.pr.new/@tanstack/router-devtools-core@8015

@tanstack/router-generator

npm i https://pkg.pr.new/@tanstack/router-generator@8015

@tanstack/router-plugin

npm i https://pkg.pr.new/@tanstack/router-plugin@8015

@tanstack/router-ssr-query-core

npm i https://pkg.pr.new/@tanstack/router-ssr-query-core@8015

@tanstack/router-utils

npm i https://pkg.pr.new/@tanstack/router-utils@8015

@tanstack/router-vite-plugin

npm i https://pkg.pr.new/@tanstack/router-vite-plugin@8015

@tanstack/solid-router

npm i https://pkg.pr.new/@tanstack/solid-router@8015

@tanstack/solid-router-devtools

npm i https://pkg.pr.new/@tanstack/solid-router-devtools@8015

@tanstack/solid-router-ssr-query

npm i https://pkg.pr.new/@tanstack/solid-router-ssr-query@8015

@tanstack/solid-start

npm i https://pkg.pr.new/@tanstack/solid-start@8015

@tanstack/solid-start-client

npm i https://pkg.pr.new/@tanstack/solid-start-client@8015

@tanstack/solid-start-server

npm i https://pkg.pr.new/@tanstack/solid-start-server@8015

@tanstack/start-client-core

npm i https://pkg.pr.new/@tanstack/start-client-core@8015

@tanstack/start-fn-stubs

npm i https://pkg.pr.new/@tanstack/start-fn-stubs@8015

@tanstack/start-plugin-core

npm i https://pkg.pr.new/@tanstack/start-plugin-core@8015

@tanstack/start-server-core

npm i https://pkg.pr.new/@tanstack/start-server-core@8015

@tanstack/start-static-server-functions

npm i https://pkg.pr.new/@tanstack/start-static-server-functions@8015

@tanstack/start-storage-context

npm i https://pkg.pr.new/@tanstack/start-storage-context@8015

@tanstack/valibot-adapter

npm i https://pkg.pr.new/@tanstack/valibot-adapter@8015

@tanstack/virtual-file-routes

npm i https://pkg.pr.new/@tanstack/virtual-file-routes@8015

@tanstack/vue-router

npm i https://pkg.pr.new/@tanstack/vue-router@8015

@tanstack/vue-router-devtools

npm i https://pkg.pr.new/@tanstack/vue-router-devtools@8015

@tanstack/vue-router-ssr-query

npm i https://pkg.pr.new/@tanstack/vue-router-ssr-query@8015

@tanstack/vue-start

npm i https://pkg.pr.new/@tanstack/vue-start@8015

@tanstack/vue-start-client

npm i https://pkg.pr.new/@tanstack/vue-start-client@8015

@tanstack/vue-start-server

npm i https://pkg.pr.new/@tanstack/vue-start-server@8015

@tanstack/zod-adapter

npm i https://pkg.pr.new/@tanstack/zod-adapter@8015

commit: 3abdab7

@codspeed-hq

codspeed-hq Bot commented Aug 8, 2026

Copy link
Copy Markdown

Merging this PR will regress 0 benchmarks

⚠️ Different runtime environments detected

Some benchmarks with significant performance changes were compared across different runtime environments,
which may affect the accuracy of the results.

Open the report in CodSpeed to investigate

⚡ 7 improved benchmarks
❌ 2 (👁 2) regressed benchmarks
✅ 171 untouched benchmarks

Performance Changes

Mode Benchmark BASE HEAD Efficiency
Memory mem client unique-location-churn (solid) 436.9 KB 341.5 KB +27.94%
Simulation ssr server-fn not-found (solid) 70.4 ms 66.1 ms +6.51%
Simulation ssr server-fn POST (solid) 73 ms 68.6 ms +6.43%
Simulation ssr server-fn send-context (solid) 70.7 ms 67.1 ms +5.36%
Simulation ssr server-fn GET (solid) 82.6 ms 79.3 ms +4.26%
Simulation ssr server-fn redirect (solid) 55.9 ms 54.1 ms +3.25%
Memory mem server error-paths not-found (vue) 329.9 KB 320.1 KB +3.05%
👁 Memory mem server error-paths redirect (vue) 293 KB 381.4 KB -23.18%
👁 Memory mem server error-paths not-found (solid) 661.7 KB 742.6 KB -10.88%

Tip

Curious why this is faster? Comment @codspeedbot explain why this is faster on this PR, or directly use the CodSpeed MCP with your agent.


Comparing fix-react-router-use-match-route-react-compiler (3abdab7) with main (af8dcb8)

Open in CodSpeed

@nx-cloud nx-cloud Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Important

At least one additional CI pipeline execution has run since the conclusion below was written and it may no longer be applicable.

Nx Cloud is proposing a fix for your failed CI:

We fixed the react-hooks/exhaustive-deps ESLint errors in useMatchRoute by moving the useStore calls to the top level of the hook unconditionally, then referencing their return values in a plain array literal passed to useCallback. This ensures both React's rules of hooks and the React Compiler's requirement for unconditional hook invocations are satisfied, while still correctly tracking location, resolvedLocation, and status changes as useCallback dependencies.

Warning

We could not verify this fix.

Suggested Fix changes
diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx
index 9d7708fc..a8df3ba0 100644
--- a/packages/react-router/src/Matches.tsx
+++ b/packages/react-router/src/Matches.tsx
@@ -154,6 +154,16 @@ export type UseMatchRouteOptions<
 export function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {
   const router = useRouter()
 
+  const locationHref = useStore(
+    router.stores.location,
+    (location) => location.href,
+  )
+  const resolvedLocationHref = useStore(
+    router.stores.resolvedLocation,
+    (location) => location?.href,
+  )
+  const status = useStore(router.stores.status, (status) => status)
+
   return React.useCallback(
     <
       const TFrom extends string = string,
@@ -174,20 +184,7 @@ export function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {
         includeSearch,
       })
     },
-    (isServer ?? router.isServer)
-      ? [router]
-      : [
-          router,
-          // eslint-disable-next-line react-hooks/rules-of-hooks
-          useStore(router.stores.location, (location) => location.href),
-          // eslint-disable-next-line react-hooks/rules-of-hooks
-          useStore(
-            router.stores.resolvedLocation,
-            (location) => location?.href,
-          ),
-          // eslint-disable-next-line react-hooks/rules-of-hooks
-          useStore(router.stores.status, (status) => status),
-        ],
+    [router, locationHref, resolvedLocationHref, status],
   )
 }
 

Apply fix via Nx Cloud  Reject fix via Nx Cloud


Or Apply changes locally with:

npx nx-cloud apply-locally c0UJ-Wu8o

Apply fix locally with your editor ↗   View interactive diff ↗



🎓 Learn more about Self-Healing CI on nx.dev

Sheraff and others added 3 commits August 8, 2026 22:52
Co-authored-by: Kamal Bennani <kamal.bennani@aircall.io>
Co-authored-by: Sarah Gerrard <98355961+LadyBluenotes@users.noreply.github.com>
@socket-security

socket-security Bot commented Aug 8, 2026

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Added@​rolldown/​plugin-babel@​0.2.37310010089100
Addedbabel-plugin-react-compiler@​1.0.01001007990100

View full report

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@e2e/react-router/react-compiler/package.json`:
- Line 14: Update the internal dependency entries in package.json, including the
`@tanstack/react-router` entry and the other referenced workspace dependency, to
use the workspace:* protocol instead of workspace:^.

In `@e2e/react-router/react-compiler/src/main.tsx`:
- Line 12: Remove the useRouterState import and subscription from the
reproduction, including its useMemo dependency in the relevant component. Keep
the label computation dependent only on matchRoute from useMatchRoute so the E2E
fixture verifies navigation updates through useMatchRoute alone.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: cdcec0a0-73fa-45ae-b6ac-dffb666f6766

📥 Commits

Reviewing files that changed from the base of the PR and between 6924573 and 67802df.

⛔ Files ignored due to path filters (1)
  • pnpm-lock.yaml is excluded by !**/pnpm-lock.yaml
📒 Files selected for processing (9)
  • e2e/react-router/react-compiler/index.html
  • e2e/react-router/react-compiler/package.json
  • e2e/react-router/react-compiler/playwright.config.ts
  • e2e/react-router/react-compiler/src/main.tsx
  • e2e/react-router/react-compiler/tests/use-match-route.spec.ts
  • e2e/react-router/react-compiler/tsconfig.json
  • e2e/react-router/react-compiler/vite.config.js
  • packages/react-router/src/Matches.tsx
  • packages/react-router/tests/Matches.test.tsx
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/react-router/src/Matches.tsx

Comment thread e2e/react-router/react-compiler/package.json
Comment thread e2e/react-router/react-compiler/src/main.tsx Outdated
@github-actions github-actions Bot added the documentation Everything documentation related label Aug 10, 2026
@Sheraff
Sheraff merged commit 31355ae into main Aug 12, 2026
26 checks passed
@Sheraff
Sheraff deleted the fix-react-router-use-match-route-react-compiler branch August 12, 2026 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Everything documentation related package: react-router

Projects

None yet

Development

Successfully merging this pull request may close these issues.

useMatchRoute not updating when using React Compiler

1 participant