fix(router-core): lane match loader rewrite - #7805
Open
Sheraff wants to merge 64 commits into
Open
Conversation
Sheraff
changed the title
Contributor
|
View your CI Pipeline Execution ↗ for commit 1d20a9d
☁️ Nx Cloud last updated this comment at |
Contributor
🚀 Changeset Version Preview4 package(s) bumped directly, 19 bumped as dependents. 🟩 Patch bumps
|
Contributor
📝 WalkthroughWalkthroughThe PR rewrites router loading around client/server lanes, simplifies match stores, updates React/Solid/Vue rendering and SSR integration, changes HMR refresh behavior, adds extensive lifecycle and hydration tests, and updates loading documentation and end-to-end fixtures. ChangesRouter loading pipeline
Estimated code review effort: 5 (Critical) | ~120 minutes Possibly related issues
Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 6 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (6 passed)
✨ Finishing Touches 💡 1📝 Generate docstrings 💡
🧪 Generate unit tests (beta)
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. Comment |
Contributor
Bundle Size Benchmarks
The following scenarios have bundle-size changes compared with the baseline:
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. |
Merging this PR will regress 15 benchmarks
|
| Mode | Benchmark | BASE |
HEAD |
Efficiency | |
|---|---|---|---|---|---|
| ❌ | Memory | mem server serialization-payload (react) |
3.4 MB | 5.2 MB | -33.99% |
| ❌ | Simulation | client-control-flow navigation loop (vue) |
50.4 ms | 56.7 ms | -11.05% |
| ❌ | Simulation | client-async-pipeline navigation loop (vue) |
45.9 ms | 51.5 ms | -10.92% |
| ❌ | Simulation | ssr loaders (react) |
59.2 ms | 65 ms | -8.96% |
| ❌ | Simulation | ssr request loop (solid) |
147 ms | 158.1 ms | -7.04% |
| ❌ | Simulation | client-preload interaction loop (vue) |
54.9 ms | 58.9 ms | -6.92% |
| ❌ | Simulation | ssr global-mw server-fn (vue) |
59.9 ms | 64.2 ms | -6.63% |
| ❌ | Simulation | ssr server-fn raw-response (vue) |
56.5 ms | 60.3 ms | -6.31% |
| ❌ | Simulation | ssr server-fn not-found (vue) |
74 ms | 78.9 ms | -6.19% |
| ❌ | Simulation | ssr server-fn send-context (vue) |
72.8 ms | 77.5 ms | -6.06% |
| ❌ | Simulation | ssr server-fn POST (vue) |
71.5 ms | 75.3 ms | -5.14% |
| ❌ | Simulation | ssr server-fn raw-response (react) |
55.3 ms | 58.2 ms | -5.02% |
| ❌ | Simulation | ssr server-fn GET (vue) |
74.5 ms | 77.6 ms | -4.07% |
| ❌ | Simulation | ssr server-fn multipart (react) |
58.8 ms | 60.8 ms | -3.3% |
| ❌ | Simulation | ssr server-fn multipart (vue) |
64.3 ms | 66.4 ms | -3.17% |
| ⚡ | Memory | mem client interrupted-navigations (solid) |
841 KB | 403.7 KB | ×2.1 |
| ⚡ | Memory | mem server error-paths redirect (vue) |
676.3 KB | 351.7 KB | +92.32% |
| ⚡ | Memory | mem client interrupted-navigations (react) |
757.4 KB | 409.3 KB | +85.03% |
| ⚡ | Simulation | ssr redirect (solid) |
59.5 ms | 36.8 ms | +61.6% |
| ⚡ | Simulation | ssr redirect (react) |
61.2 ms | 38.2 ms | +60.06% |
| ... | ... | ... | ... | ... | ... |
ℹ️ Only the first 20 benchmarks are displayed. Go to the app to view all benchmarks.
Tip
Investigate this regression by commenting @codspeedbot fix this regression on this PR, or directly use the CodSpeed MCP with your agent.
Comparing fix-router-core-lane-match-loader (b8204ea) with main (a3ee355)
![coderabbitai[bot]](https://cdn.github.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 6
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
packages/vue-router/src/useMatch.tsx (1)
137-154: 📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick winPreserve the generic result type instead of erasing it with
any.
Vue.computed<any>allows the implementation to violate the declaredThrowOrOptional<UseMatchResult<...>>contract without a compiler error. Typematchandresultfrom the existing generic aliases.As per coding guidelines, “Use TypeScript strict mode with extensive type safety.”
🤖 Prompt for 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. In `@packages/vue-router/src/useMatch.tsx` around lines 137 - 154, Update the computed result in the useMatch flow to preserve the existing generic result type instead of using Vue.computed<any>. Type match and result with the existing generic aliases, including the declared ThrowOrOptional<UseMatchResult<...>> contract, so incorrect return values are caught by TypeScript while preserving the current selection and missing-match behavior.Source: Coding guidelines
🧹 Nitpick comments (7)
e2e/solid-start/selective-ssr/tests/issue-7283-dev-hydration.spec.ts (1)
27-27: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winUse braces for all conditional bodies.
These one-line
ifstatements violate the repository’s TypeScript control-flow convention.As per coding guidelines,
**/*.{ts,tsx,js,jsx}must use curly braces for control statements.Also applies to: 79-79, 84-84
🤖 Prompt for 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. In `@e2e/solid-start/selective-ssr/tests/issue-7283-dev-hydration.spec.ts` at line 27, Update the one-line conditional statements in issue-7283-dev-hydration.spec.ts, including the checks around lines 27, 79, and 84, to wrap each conditional body in curly braces while preserving their existing behavior.Source: Coding guidelines
packages/solid-router/tests/transitioner-remount.test.tsx (1)
54-54: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winAvoid discarding location-state type safety.
Assert the partial state shape directly instead of casting to
any.Proposed change
- expect((router.state.location.state as any).remounted).toBe(true) + expect(router.state.location.state).toMatchObject({ remounted: true })As per coding guidelines, TypeScript files must use strict mode with extensive type safety.
🤖 Prompt for 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. In `@packages/solid-router/tests/transitioner-remount.test.tsx` at line 54, Replace the any cast in the remounted-state assertion with a type-safe assertion of the partial location-state shape, using an appropriate typed access or narrowing approach so router.state.location.state remains checked by TypeScript.Source: Coding guidelines
packages/router-core/tests/fatal-load-rejection.test.ts (1)
25-30: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winModel the error component without bypassing its route contract.
as anyprevents this test from detecting changes to theerrorComponentinterface. Use a callable mock component with itspreloadproperty attached, matching the runtime shape used elsewhere.Proposed fix
+ const ErrorComponent = Object.assign(() => null, { + preload: errorComponentPreload, + }) + const rootRoute = new BaseRootRoute({ loader: () => 'root data', - errorComponent: { preload: errorComponentPreload } as any, + errorComponent: ErrorComponent, })As per coding guidelines, TypeScript files must use strict mode with extensive type safety.
🤖 Prompt for 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. In `@packages/router-core/tests/fatal-load-rejection.test.ts` around lines 25 - 30, Update the errorComponent setup in the BaseRootRoute test to use a typed callable mock component with its preload property attached, matching the runtime component shape. Remove the as any cast so TypeScript validates the errorComponent contract and the test catches interface changes.Source: Coding guidelines
packages/router-core/tests/issue-6371-search-default-normalization-abort.test.ts (1)
60-75: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winKeep the canonical replacement setup type-checked.
Both
as anycasts allow this regression test to keep compiling ifbuildLocationorcommitLocationchanges incompatibly. Please use their declared/internal option types or a typed helper for the Transitioner operation being reproduced.As per coding guidelines, TypeScript files must use strict mode with extensive type safety.
🤖 Prompt for 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. In `@packages/router-core/tests/issue-6371-search-default-normalization-abort.test.ts` around lines 60 - 75, Remove the as any casts from the buildLocation and commitLocation calls in this regression test. Use the declared option types or a typed helper representing the Transitioner operation so both canonical replacement setup calls remain strictly type-checked while preserving their existing behavior.Source: Coding guidelines
packages/router-core/tests/issue-4444-param-parse-error-lazy-child.test.ts (1)
19-21: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winAssert that the lazy child chunk was never requested.
The test can currently pass even if
lazyFnruns before the child is trimmed, leaving the documented regression partially uncovered.Proposed assertion
expect( router.state.matches.find((match) => match.status === 'pending'), ).toBeUndefined() +expect(lazyFn).not.toHaveBeenCalled() expect(router.state.isLoading).toBe(false)Also applies to: 60-68
🤖 Prompt for 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. In `@packages/router-core/tests/issue-4444-param-parse-error-lazy-child.test.ts` around lines 19 - 21, Update the test using the lazyFn mock so it explicitly asserts lazyFn was never called when the child route is trimmed after the parameter parse error. Place the assertion after the relevant navigation or error-handling flow, preserving the existing test behavior while verifying the lazy child chunk is not requested.packages/react-router/tests/transactional-loading.test.tsx (1)
130-148: 🎯 Functional Correctness | 🔵 Trivial | ⚡ Quick winCapture every committed pair to verify atomic publication.
The final sequential assertions can miss a transient mixed-generation render after
childRefreshresolves. Record parent/child values on each committed render and assert that neitherparent-v2/child-v1norparent-v1/child-v2occurs.🤖 Prompt for 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. In `@packages/react-router/tests/transactional-loading.test.tsx` around lines 130 - 148, Update the transactional loading test around the final refresh sequence to record the parent and child values on every committed render, then assert no mixed-generation pair occurs: parent-v2 with child-v1 or parent-v1 with child-v2. Keep the existing final-state assertions and use the render-observation mechanism already provided by the test setup.packages/router-core/src/router.ts (1)
1330-1338: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low valueSilent
catch {}hides listener failures.Swallowing all listener exceptions keeps one bad listener from breaking others, but the fully empty catch also hides real bugs during development. Consider logging in non-production.
♻️ Suggested dev logging
if (listener.eventType === routerEvent.type) { try { listener.fn(routerEvent) - } catch {} + } catch (err) { + if (process.env.NODE_ENV !== 'production') { + console.error( + `Error in router event listener for "${routerEvent.type}":`, + err, + ) + } + } }If tests assert fully-silent behavior, feel free to disregard.
🤖 Prompt for 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. In `@packages/router-core/src/router.ts` around lines 1330 - 1338, Update the catch block in the emit method to retain listener isolation while reporting listener exceptions in non-production environments. Preserve the existing behavior of continuing to notify other subscribers and keeping production logging silent.
🤖 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/solid-start/selective-ssr/src/routes/ssr-false-pending-min.tsx`:
- Around line 6-13: Update recordEvent to avoid casting window to any by
declaring a local Window augmentation for the __events event buffer, then
initialize and append through window.__events. Preserve the existing server
guard and event shape, including the performance timestamp.
In `@packages/react-router/tests/router.test.tsx`:
- Around line 2463-2467: Update the navigation assertion in the router test to
target the parent route’s specific not-found boundary, using its unique test
identifier or boundary-specific text instead of the broad “Not Found” match;
keep the existing home-page and navigation steps unchanged.
In `@packages/router-core/tests/issue-6221-head-waits-for-loader.test.ts`:
- Line 23: Update the authentication check in the relevant test to wrap the
notFound call inside curly braces, preserving the existing condition and
behavior.
In `@packages/solid-router/src/Transitioner.tsx`:
- Around line 47-65: Move the Solid.onCleanup registration for unsub immediately
after router.history.subscribe(router.load), before the early return in the
Transitioner setup. Keep the existing cleanup callback unchanged and remove the
later registration so every execution path disposes the history subscription.
In `@packages/solid-router/tests/on-rendered-change-info.test.tsx`:
- Around line 44-61: Update the onRendered transition handling to call
getLocationChangeInfo with the previously rendered location as the first
argument and the latest resolved location as the second. Ensure fromLocation,
toLocation, and change flags reflect the actual transition, including same-href
state changes; locate the change in the code that constructs the onRendered
event.
In `@packages/vue-router/tests/pending-fallback-promise-replacement.test.tsx`:
- Around line 13-18: Update the afterEach cleanup hook to drain and await all
testCleanups while fake timers remain active, then restore real timers in a
finally block so timer state is reset even if cleanup fails. Preserve the
existing cleanup() call after the callbacks settle.
---
Outside diff comments:
In `@packages/vue-router/src/useMatch.tsx`:
- Around line 137-154: Update the computed result in the useMatch flow to
preserve the existing generic result type instead of using Vue.computed<any>.
Type match and result with the existing generic aliases, including the declared
ThrowOrOptional<UseMatchResult<...>> contract, so incorrect return values are
caught by TypeScript while preserving the current selection and missing-match
behavior.
---
Nitpick comments:
In `@e2e/solid-start/selective-ssr/tests/issue-7283-dev-hydration.spec.ts`:
- Line 27: Update the one-line conditional statements in
issue-7283-dev-hydration.spec.ts, including the checks around lines 27, 79, and
84, to wrap each conditional body in curly braces while preserving their
existing behavior.
In `@packages/react-router/tests/transactional-loading.test.tsx`:
- Around line 130-148: Update the transactional loading test around the final
refresh sequence to record the parent and child values on every committed
render, then assert no mixed-generation pair occurs: parent-v2 with child-v1 or
parent-v1 with child-v2. Keep the existing final-state assertions and use the
render-observation mechanism already provided by the test setup.
In `@packages/router-core/src/router.ts`:
- Around line 1330-1338: Update the catch block in the emit method to retain
listener isolation while reporting listener exceptions in non-production
environments. Preserve the existing behavior of continuing to notify other
subscribers and keeping production logging silent.
In `@packages/router-core/tests/fatal-load-rejection.test.ts`:
- Around line 25-30: Update the errorComponent setup in the BaseRootRoute test
to use a typed callable mock component with its preload property attached,
matching the runtime component shape. Remove the as any cast so TypeScript
validates the errorComponent contract and the test catches interface changes.
In `@packages/router-core/tests/issue-4444-param-parse-error-lazy-child.test.ts`:
- Around line 19-21: Update the test using the lazyFn mock so it explicitly
asserts lazyFn was never called when the child route is trimmed after the
parameter parse error. Place the assertion after the relevant navigation or
error-handling flow, preserving the existing test behavior while verifying the
lazy child chunk is not requested.
In
`@packages/router-core/tests/issue-6371-search-default-normalization-abort.test.ts`:
- Around line 60-75: Remove the as any casts from the buildLocation and
commitLocation calls in this regression test. Use the declared option types or a
typed helper representing the Transitioner operation so both canonical
replacement setup calls remain strictly type-checked while preserving their
existing behavior.
In `@packages/solid-router/tests/transitioner-remount.test.tsx`:
- Line 54: Replace the any cast in the remounted-state assertion with a
type-safe assertion of the partial location-state shape, using an appropriate
typed access or narrowing approach so router.state.location.state remains
checked by TypeScript.
🪄 Autofix (Beta)
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
Run ID: a9eff563-1e9d-4b5e-9e0d-17c99dcf056c
📒 Files selected for processing (162)
benchmarks/memory/client/scenarios/interrupted-navigations/shared.tse2e/solid-start/selective-ssr/src/routeTree.gen.tse2e/solid-start/selective-ssr/src/routes/ssr-false-pending-min.tsxe2e/solid-start/selective-ssr/tests/issue-7283-dev-hydration.spec.tspackages/react-router/src/Match.tsxpackages/react-router/src/Matches.tsxpackages/react-router/src/Transitioner.tsxpackages/react-router/src/lazyRouteComponent.tsxpackages/react-router/src/ssr/renderRouterToStream.tsxpackages/react-router/src/ssr/renderRouterToString.tsxpackages/react-router/tests/Matches.test.tsxpackages/react-router/tests/ancestor-loader-child-pending-min.test.tsxpackages/react-router/tests/component-preload-retry-pending-min.test.tsxpackages/react-router/tests/component-preload-retry.test.tsxpackages/react-router/tests/errorComponent.test.tsxpackages/react-router/tests/hydration-capped-boundary-pending.test.tsxpackages/react-router/tests/hydration-terminal-lane.test.tsxpackages/react-router/tests/issue-4759-pending-frame.test.tsxpackages/react-router/tests/issue-7051-force-pending-suspense.test.tsxpackages/react-router/tests/issue-7367-pending-min-redirect.test.tsxpackages/react-router/tests/issue-7457-redirect-chain-first-load.test.tsxpackages/react-router/tests/issue-7638-invalidate-transition-error.test.tsxpackages/react-router/tests/loaders.test.tsxpackages/react-router/tests/on-rendered-same-href-state.test.tsxpackages/react-router/tests/pending-fallback-promise-replacement.test.tsxpackages/react-router/tests/preloaded-mount-resolution.test.tsxpackages/react-router/tests/redirect.test.tsxpackages/react-router/tests/root-pending-min.test.tsxpackages/react-router/tests/router.test.tsxpackages/react-router/tests/store-updates-during-navigation.test.tsxpackages/react-router/tests/transactional-loading.test.tsxpackages/react-router/tests/transitioner-listener-errors.test.tsxpackages/react-router/tests/transitioner-render-ack.test.tsxpackages/react-router/tests/transitioner-router-swap.test.tsxpackages/react-router/tests/useNavigate.test.tsxpackages/router-core/src/Matches.tspackages/router-core/src/hydrate.tspackages/router-core/src/isServer/client.tspackages/router-core/src/isServer/development.tspackages/router-core/src/isServer/server.tspackages/router-core/src/load-matches.tspackages/router-core/src/load.client.tspackages/router-core/src/load.server.tspackages/router-core/src/redirect.tspackages/router-core/src/route-chunks.tspackages/router-core/src/route.tspackages/router-core/src/router.tspackages/router-core/src/ssr/createRequestHandler.tspackages/router-core/src/ssr/ssr-client.tspackages/router-core/src/ssr/ssr-server.tspackages/router-core/src/stores.tspackages/router-core/tests/background-assets-stale.test.tspackages/router-core/tests/background-trim-abort.test.tspackages/router-core/tests/blocked-navigation-current-load.test.tspackages/router-core/tests/boundary-component-chunk.test.tspackages/router-core/tests/callbacks.test.tspackages/router-core/tests/chunk-failure-lifecycle.test.tspackages/router-core/tests/client-lane-adversarial.test.tspackages/router-core/tests/fatal-load-rejection.test.tspackages/router-core/tests/granular-stores.test.tspackages/router-core/tests/hydrate.test.tspackages/router-core/tests/hydrated-stay-match-data.test.tspackages/router-core/tests/hydration-asset-context-order.test.tspackages/router-core/tests/hydration-boundary-chunks.test.tspackages/router-core/tests/hydration-currentness.test.tspackages/router-core/tests/invalidate-pre-rematch-failure.test.tspackages/router-core/tests/issue-3928-rapid-reload-abort.test.tspackages/router-core/tests/issue-4078-loader-notfound-root-boundary.test.tspackages/router-core/tests/issue-4444-param-parse-error-lazy-child.test.tspackages/router-core/tests/issue-4476-preload-navigate-abort.test.tspackages/router-core/tests/issue-4572-preload-root-beforeload-flags.test.tspackages/router-core/tests/issue-4684-head-on-beforeload-error.test.tspackages/router-core/tests/issue-5106-hydrated-notfound-boundary.test.tspackages/router-core/tests/issue-6107-preload-chunk-failure.test.tspackages/router-core/tests/issue-6221-head-waits-for-loader.test.tspackages/router-core/tests/issue-6351-fuzzy-notfound-layout.test.tspackages/router-core/tests/issue-6371-search-default-normalization-abort.test.tspackages/router-core/tests/issue-7379-head-matches-direct-load.test.tspackages/router-core/tests/issue-7635-dehydrated-error-child-head.test.tspackages/router-core/tests/load-route-chunk.test.tspackages/router-core/tests/load.test.tspackages/router-core/tests/preflight-reentrant-context.test.tspackages/router-core/tests/preload-adoption.test.tspackages/router-core/tests/preload-background-parent-coherence.test.tspackages/router-core/tests/preload-public-cache-behavior.test.tspackages/router-core/tests/preload-public-signal-lifetime.test.tspackages/router-core/tests/routerTestUtils.tspackages/router-core/tests/serial-failure-foreground-prefix.test.tspackages/router-core/tests/server-async-headers-decorative-hang.test.tspackages/router-core/tests/server-beforeload-preload-flag.test.tspackages/router-core/tests/server-chunk-failure-lifecycle.test.tspackages/router-core/tests/server-concurrent-error-notfound.test.tspackages/router-core/tests/server-headers-asset-failure.test.tspackages/router-core/tests/server-loader-abort-error.test.tspackages/router-core/tests/server-serial-ssr-notfound.test.tspackages/router-core/tests/server-ssr-false-assets.test.tspackages/router-core/tests/server-ssr-option-error.test.tspackages/router-core/tests/stay-match-abort.test.tspackages/router-core/tests/superseded-load-await.test.tspackages/router-devtools-core/src/AgeTicker.tsxpackages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsxpackages/router-plugin/src/core/hmr/handle-route-update.tspackages/router-plugin/tests/add-hmr.test.tspackages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsxpackages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsxpackages/router-plugin/tests/handle-route-update.test.tspackages/solid-router/src/ClientOnly.tsxpackages/solid-router/src/Match.tsxpackages/solid-router/src/Matches.tsxpackages/solid-router/src/Transitioner.tsxpackages/solid-router/src/lazyRouteComponent.tsxpackages/solid-router/src/matchContext.tsxpackages/solid-router/src/routerStores.tspackages/solid-router/src/ssr/renderRouterToStream.tsxpackages/solid-router/src/ssr/renderRouterToString.tsxpackages/solid-router/src/useMatch.tsxpackages/solid-router/tests/Transitioner.test.tsxpackages/solid-router/tests/component-preload-retry.test.tsxpackages/solid-router/tests/link.test.tsxpackages/solid-router/tests/loaders.test.tsxpackages/solid-router/tests/on-rendered-change-info.test.tsxpackages/solid-router/tests/pending-fallback-promise-replacement.test.tsxpackages/solid-router/tests/redirect.test.tsxpackages/solid-router/tests/router.test.tsxpackages/solid-router/tests/same-route-pending-blank.test.tsxpackages/solid-router/tests/server/errorComponent.test.tsxpackages/solid-router/tests/store-updates-during-navigation.test.tsxpackages/solid-router/tests/transitioner-listener-errors.test.tsxpackages/solid-router/tests/transitioner-remount.test.tsxpackages/solid-router/tests/transitioner-render-ack.test.tsxpackages/solid-router/tests/use-match-outgoing-transition.test.tsxpackages/start-server-core/src/createStartHandler.tspackages/vue-router/src/Match.tsxpackages/vue-router/src/Matches.tsxpackages/vue-router/src/Transitioner.tsxpackages/vue-router/src/lazyRouteComponent.tsxpackages/vue-router/src/matchContext.tsxpackages/vue-router/src/routerStores.tspackages/vue-router/src/ssr/renderRouterToStream.tsxpackages/vue-router/src/ssr/renderRouterToString.tsxpackages/vue-router/src/useMatch.tsxpackages/vue-router/tests/Matches.test.tsxpackages/vue-router/tests/Transitioner.test.tsxpackages/vue-router/tests/component-preload-retry.test.tsxpackages/vue-router/tests/hydration-capped-boundary-pending.test.tsxpackages/vue-router/tests/link.test.tsxpackages/vue-router/tests/loaders.test.tsxpackages/vue-router/tests/pending-fallback-promise-replacement.test.tsxpackages/vue-router/tests/redirect.test.tsxpackages/vue-router/tests/router.test.tsxpackages/vue-router/tests/store-updates-during-navigation.test.tsxpackages/vue-router/tests/transitioner-idle-after-render.test.tsxpackages/vue-router/tests/transitioner-listener-errors.test.tsxpackages/vue-router/tests/transitioner-remount-rendered.test.tsx
💤 Files with no reviewable changes (13)
- packages/router-plugin/tests/add-hmr.test.ts
- packages/solid-router/src/matchContext.tsx
- packages/router-core/src/load-matches.ts
- packages/solid-router/tests/server/errorComponent.test.tsx
- packages/solid-router/tests/Transitioner.test.tsx
- packages/router-core/src/redirect.ts
- packages/vue-router/src/routerStores.ts
- packages/router-core/src/ssr/ssr-server.ts
- packages/solid-router/src/routerStores.ts
- packages/router-core/tests/callbacks.test.ts
- packages/vue-router/tests/redirect.test.tsx
- packages/solid-router/tests/redirect.test.tsx
- benchmarks/memory/client/scenarios/interrupted-navigations/shared.ts
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
packages/router-core/tests/preload-beforeload-reuse.test.ts (1)
222-280: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winAdd a same-route
loaderDepscase. This test only changes the parent match; it doesn’t cover reusing preloaded child context when the route’s own deps change.🤖 Prompt for 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. In `@packages/router-core/tests/preload-beforeload-reuse.test.ts` around lines 222 - 280, Extend the test around childBeforeLoad to add a same-route loaderDeps scenario where the child route’s own dependencies change between preload and navigation. Configure childRoute with loaderDeps and assert the preloaded child context is not reused, including updated context values and the expected preload flags.
🤖 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 `@packages/router-core/tests/preload-beforeload-reuse.test.ts`:
- Around line 242-245: Update the regression case around loaderDeps and context
to preserve type checking for the version contract: add a typed validateSearch
definition for version, replace Record<string, any> with the inferred or
explicit validated search type, and remove the as any casts around preloadRoute,
navigate, and beforeLoad replacement by using typed route refresh helpers or a
type-compatible mock.
---
Nitpick comments:
In `@packages/router-core/tests/preload-beforeload-reuse.test.ts`:
- Around line 222-280: Extend the test around childBeforeLoad to add a
same-route loaderDeps scenario where the child route’s own dependencies change
between preload and navigation. Configure childRoute with loaderDeps and assert
the preloaded child context is not reused, including updated context values and
the expected preload flags.
🪄 Autofix (Beta)
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
Run ID: beb16cf3-124d-4a1b-ae41-86535af7b3c1
📒 Files selected for processing (3)
docs/router/guide/preloading.mdpackages/router-core/src/load-client.tspackages/router-core/tests/preload-beforeload-reuse.test.ts
🚧 Files skipped from review as they are similar to previous changes (1)
- packages/router-core/src/load-client.ts
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 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 `@packages/router-core/tests/hydration-currentness.test.ts`:
- Around line 205-232: Extract the repeated mockWindow.$_TSR scaffolding in the
hydration currentness tests into a helper such as mockDehydratedRouter,
accepting only the matches array and preserving the shared manifest,
dehydratedData, callbacks, buffer, and initialized values. Replace the
duplicated setups at the referenced test blocks with this helper while keeping
each test’s matches payload unchanged.
🪄 Autofix (Beta)
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
Run ID: dae5e328-1744-4525-a06b-e2022da66f47
📒 Files selected for processing (10)
e2e/react-start/basic/src/routes/specialChars/search.tsxe2e/react-start/basic/tests/special-characters.spec.tspackages/react-router/src/Transitioner.tsxpackages/router-core/src/load-client.tspackages/router-core/src/router.tspackages/router-core/tests/hydrated-stay-match-data.test.tspackages/router-core/tests/hydration-currentness.test.tspackages/solid-router/src/Transitioner.tsxpackages/solid-router/tests/transitioner-render-ack.test.tsxpackages/vue-router/src/Transitioner.tsx
🚧 Files skipped from review as they are similar to previous changes (7)
- packages/solid-router/tests/transitioner-render-ack.test.tsx
- packages/react-router/src/Transitioner.tsx
- packages/router-core/tests/hydrated-stay-match-data.test.ts
- packages/solid-router/src/Transitioner.tsx
- packages/vue-router/src/Transitioner.tsx
- packages/router-core/src/load-client.ts
- packages/router-core/src/router.ts
![nx-cloud[bot]](https://cdn.github.com/in/80458?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
* fix(router-core): complete lane match loader rewrite * fix(router-core): harden match loading lifecycle * fix(router-core): preserve hydrated context handoff * bench(memory): accept expected abort errors * perf(ssr): reduce request cancellation overhead (#7862)
…match-loader # Conflicts: # e2e/react-start/selective-ssr/src/routeTree.gen.ts # e2e/solid-start/selective-ssr/src/routeTree.gen.ts
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
* fix(router-core): harden lane loading lifecycle * ci: apply automated fixes * fix(router-core): optimize lane loading followups * fix(router-core): simplify redirect limit handling * refactor(router-core): clarify loader state and caches --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
* perf(router): reduce SSR lane loading overhead * ci: apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
* fix(router): address lane loader regressions * perf(router-core): shave asset-prefix bookkeeping bytes - rename the internal `_dataOnlyAssetEnd` match field to `_assetEnd`: property keys survive minification, so the shorter internal name saves bytes at every site in every bundle - reduce the `_getAssetMatches` guard to a presence check: the field is only ever set on hydration presentation clones that already satisfy the pending/data-only/error-free/not-not-found conditions, and commits clear it (invariant documented at the guard) - clone-then-patch the hydration handoff splice instead of spreading a conditional object per element, and drop the unreachable zero guard in `_getAssetMatches` Measured (gzip, vs PR tip): react-router.full -43 B, vue-router.full -35 B, react-router.minimal -8 B. All unit suites green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(router-devtools): preload lazy panel --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…7883) * fix(router): final-review regressions, changeset, and byte recovery Fixes the regressions vs main found in the final review of #7805: - restore history-subscription cleanup on router provider unmount in all three adapters (react returns the unsubscribe unconditionally, solid uses onCleanup, vue uses onUnmounted), pinned by new transitioner-remount tests — a discarded router could previously keep loading on back/forward as a zombie - same-destination navigations now join the in-flight transaction instead of aborting and restarting it (double-click no longer reruns loaders); reloads and same-location redirects keep restart semantics - commitMatches cache retention can no longer resurrect a one-generation-old loaderData when a newer committed success exists for the same match id - same-location dedup keeps __tempLocation/__tempKey so masked vs real same-href navigations commit their state again Adds the missing release changeset enumerating the removed/changed public API with migration hints. Byte recovery: merges rendered-matches.ts, route-chunks.ts and hydrate.ts into load-client.ts so the client bundle shares gzip dictionary context across what were separate module boundaries (-104..-186 gzip B per start scenario; plain router scenarios remain net-negative vs main and hydration still tree-shakes out of them). The solid/vue store-update-count pins were re-adjusted after verifying the published update sequences are byte-identical: the counts only shifted because a one-microtask timing change moves the tests' waitFor-sampled window boundary (5 of 7 counts decreased). * test(router-devtools-core): keep panel chunk warm-up out of the test budget The cache-replacement test warmed Vite's lazy transform of BaseTanStackRouterDevtoolsPanel inside the test body, so on slow CI runners the transform alone could blow the 5s test timeout (observed at 5.89s). Move the warm-up to a beforeAll with its own generous timeout and give the test itself explicit headroom. Pre-existing flake on the lane branch tip, surfaced by this PR's CI being the first to run on it. * refactor(router-core): extend lane typestate to matches and commits The lane pipeline already carried phase brands at lane granularity (Lane<'matched'|'contextualized'|'reduced'|'projected'>); this finishes the pattern at the two granularities it was missing, at zero runtime cost (all emitted dist JS verified byte-identical): - settleInto becomes the sole granter of a SettledMatch brand via an assertion signature, and cacheLoaderMatch requires it — the loader -> settle -> cache ordering is now compiler-enforced. The one legitimate phase jump (hydration cache-seeding of already-settled dehydrated data) is a single named, commented boundary cast. - commitMatches/commitRefreshMatches only accept a projected lane's matches (LaneMatches<'projected'>), so committing an earlier-phase lane no longer compiles. - LoadTransaction's dev-only refresh triple collapses into one optional slot [presentation, handoff?], making a half-armed refresh state unrepresentable and shrinking the clear/read sites.
…match-loader # Conflicts: # e2e/react-start/selective-ssr/src/routeTree.gen.ts # e2e/react-start/selective-ssr/src/routes/__root.tsx # e2e/react-start/selective-ssr/tests/app.spec.ts # packages/react-router/tests/component-preload-retry-pending-min.test.tsx # packages/react-router/tests/not-found.test.tsx # packages/react-router/tests/public-presentation-lane-contract.test.tsx # packages/react-router/tests/redirect.test.tsx # packages/react-router/tests/transactional-loading.test.tsx # packages/react-router/tests/transitioner-remount.test.tsx # packages/react-start-client/src/tests/hydrateStart.test.ts # packages/router-core/tests/background-trim-abort.test.ts # packages/router-core/tests/boundary-component-chunk.test.ts # packages/router-core/tests/callbacks.test.ts # packages/router-core/tests/client-lane-adversarial.test.ts # packages/router-core/tests/error-boundary-cache-generation.test.ts # packages/router-core/tests/granular-stores.test.ts # packages/router-core/tests/hydrate.test.ts # packages/router-core/tests/issue-6221-head-waits-for-loader.test.ts # packages/router-core/tests/loader-architecture-regressions.test.ts # packages/router-core/tests/loader-self-abort.test.ts # packages/router-core/tests/masked-location-state-commit.test.ts # packages/router-core/tests/parent-match-promise.test.ts # packages/router-core/tests/preload-adoption.test.ts # packages/router-core/tests/preload-beforeload-reuse.test.ts # packages/router-core/tests/preload-navigation-adoption.test.ts # packages/router-core/tests/preload-public-cache-behavior.test.ts # packages/router-core/tests/public-client-loading-contract.test.ts # packages/router-core/tests/public-preload-lane-contract.test.ts # packages/router-core/tests/same-destination-navigation-join.test.ts # packages/router-core/tests/server-beforeload-preload-flag.test.ts # packages/router-core/tests/server-loader-abort-error.test.ts # packages/router-plugin/tests/handle-route-update.test.ts # packages/solid-router/tests/component-preload-retry.test.tsx # packages/solid-router/tests/createLazyRoute.test.tsx # packages/solid-router/tests/loaders.test.tsx # packages/solid-start-client/src/tests/hydrateStart.test.ts # packages/vue-router/tests/Transitioner.test.tsx # packages/vue-router/tests/disableGlobalCatchBoundary.test.tsx # packages/vue-router/tests/transitioner-remount-rendered.test.tsx # packages/vue-router/tests/transitioner-remount.test.tsx # packages/vue-router/tests/useMatch.test.tsx
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🧹 Nitpick comments (1)
e2e/react-router/issue-7120/package.json (1)
14-21: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winResolve the internal workspace protocol before merging.
These internal dependencies use
workspace:^, while the current coding guideline requiresworkspace:*. The supplied repository learning states that e2e applications conventionally useworkspace:^, so please confirm which policy governs this PR. If the current guideline is authoritative, update all three ranges:Proposed fix
- "`@tanstack/react-router`": "workspace:^", - "`@tanstack/router-plugin`": "workspace:^", + "`@tanstack/react-router`": "workspace:*", + "`@tanstack/router-plugin`": "workspace:*", ... - "`@tanstack/router-e2e-utils`": "workspace:^", + "`@tanstack/router-e2e-utils`": "workspace:*",As per coding guidelines, internal dependencies in
package.jsonmust useworkspace:*; based on learnings, e2e apps conventionally useworkspace:^, so this policy conflict needs explicit resolution.🤖 Prompt for 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. In `@e2e/react-router/issue-7120/package.json` around lines 14 - 21, Resolve the policy conflict for internal workspace dependencies in this package: confirm whether the current guideline or the e2e convention governs this PR, then update all three workspace ranges in the package manifest to the authoritative protocol, using workspace:* if the guideline applies.Sources: Coding guidelines, Learnings
🤖 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 @.changeset/lane-match-loader-rewrite.md:
- Around line 2-5: Update the changeset release levels for
`@tanstack/router-core`, `@tanstack/react-router`, `@tanstack/solid-router`, and
`@tanstack/vue-router` from patch to major to reflect the removed public members
and changed StartTransitionFn signature.
In `@e2e/react-router/issue-7457/src/main.tsx`:
- Around line 21-25: Declare the ambient __pendingSeen flag in
e2e/react-router/issue-7457/src/vite-env.d.ts, then replace the any-cast global
access in DefaultPendingComponent within
e2e/react-router/issue-7457/src/main.tsx and the corresponding test access in
e2e/react-router/issue-7457/tests/issue-7457.repro.spec.ts with direct
globalThis.__pendingSeen usage.
---
Nitpick comments:
In `@e2e/react-router/issue-7120/package.json`:
- Around line 14-21: Resolve the policy conflict for internal workspace
dependencies in this package: confirm whether the current guideline or the e2e
convention governs this PR, then update all three workspace ranges in the
package manifest to the authoritative protocol, using workspace:* if the
guideline applies.
🪄 Autofix (Beta)
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
Run ID: 51034e37-ca80-4e45-ba7e-ca5dbe8df417
📒 Files selected for processing (46)
.changeset/lane-match-loader-rewrite.mdbenchmarks/memory/server/scenarios/aborted-requests/shared.tsdocs/router/api/router/RouteMatchType.mddocs/router/api/router/RouteOptionsType.mddocs/router/api/router/RouterOptionsType.mddocs/router/api/router/RouterStateType.mddocs/router/api/router/RouterType.mddocs/router/api/router/useChildMatchesHook.mddocs/router/api/router/useMatchesHook.mddocs/router/api/router/useParentMatchesHook.mddocs/router/guide/data-loading.mddocs/router/guide/path-params.mddocs/router/guide/preloading.mddocs/router/how-to/debug-router-issues.mde2e/react-router/issue-7120/index.htmle2e/react-router/issue-7120/package.jsone2e/react-router/issue-7120/playwright.config.tse2e/react-router/issue-7120/src/main.tsxe2e/react-router/issue-7120/src/redirectGate.tse2e/react-router/issue-7120/src/routeTree.gen.tse2e/react-router/issue-7120/src/routes/__root.tsxe2e/react-router/issue-7120/src/routes/index.tsxe2e/react-router/issue-7120/src/routes/posts.lazy.tsxe2e/react-router/issue-7120/src/routes/posts.tsxe2e/react-router/issue-7120/src/vite-env.d.tse2e/react-router/issue-7120/tests/issue-7120.repro.spec.tse2e/react-router/issue-7120/tsconfig.jsone2e/react-router/issue-7120/vite.config.tse2e/react-router/issue-7457/index.htmle2e/react-router/issue-7457/package.jsone2e/react-router/issue-7457/playwright.config.tse2e/react-router/issue-7457/src/main.tsxe2e/react-router/issue-7457/src/routeTree.gen.tse2e/react-router/issue-7457/src/routes/__root.tsxe2e/react-router/issue-7457/src/routes/another.tsxe2e/react-router/issue-7457/src/routes/index.tsxe2e/react-router/issue-7457/src/vite-env.d.tse2e/react-router/issue-7457/tests/issue-7457.repro.spec.tse2e/react-router/issue-7457/tsconfig.jsone2e/react-router/issue-7457/vite.config.jse2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.tse2e/react-start/selective-ssr/src/routes/__root.tsxe2e/react-start/selective-ssr/tests/app.spec.tse2e/solid-start/selective-ssr/dev-server.tse2e/solid-start/selective-ssr/playwright.config.tse2e/solid-start/selective-ssr/tests/issue-7283-dev-hydration.spec.ts
Comment on lines
+2
to
+5
| '@tanstack/router-core': patch | ||
| '@tanstack/react-router': patch | ||
| '@tanstack/solid-router': patch | ||
| '@tanstack/vue-router': patch |
Contributor
There was a problem hiding this comment.
🗄️ Data Integrity & Integration | 🟠 Major | 🏗️ Heavy lift
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "== changeset file =="
cat -n .changeset/lane-match-loader-rewrite.md
echo
echo "== repo files mentioning semver / changeset / major release =="
rg -n --hidden --glob '!**/node_modules/**' --glob '!**/.git/**' -e 'semver|major release|patch release|changeset' README* .changeset docs . 2>/dev/null | head -n 200Repository: TanStack/router
Length of output: 18706
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "== file list around changesets =="
git ls-files '.changeset/*' | sed -n '1,120p'
echo
echo "== outline of the referenced changeset =="
wc -l .changeset/lane-match-loader-rewrite.md
sed -n '1,120p' .changeset/lane-match-loader-rewrite.mdRepository: TanStack/router
Length of output: 3407
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "== .changeset/config.json =="
cat -n .changeset/config.json
echo
echo "== docs / config mentioning patch or major policy =="
rg -n --hidden --glob '!**/node_modules/**' --glob '!**/.git/**' -e 'patch.*major|major.*patch|breaking.*patch|changeset.*patch|changeset.*major|semver policy|version policy|breaking change' .changeset docs README* package.json .github . 2>/dev/null | head -n 200Repository: TanStack/router
Length of output: 16531
Use a major changeset for the API removals. The affected sections remove public members and change StartTransitionFn’s signature, so patch release metadata is inconsistent with the documented breaking surface.
🤖 Prompt for 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.
In @.changeset/lane-match-loader-rewrite.md around lines 2 - 5, Update the
changeset release levels for `@tanstack/router-core`, `@tanstack/react-router`,
`@tanstack/solid-router`, and `@tanstack/vue-router` from patch to major to reflect
the removed public members and changed StartTransitionFn signature.
Comment on lines
+21
to
+25
| function DefaultPendingComponent() { | ||
| useEffect(() => { | ||
| ;(globalThis as any).__pendingSeen = true | ||
| }, []) | ||
| return <div data-testid="app-pending">loading</div> |
Contributor
There was a problem hiding this comment.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
fd '^tsconfig\.json$' e2e/react-router/issue-7457 -x sh -c '
echo "--- $1"
sed -n "1,220p" "$1"
' sh {}
rg -n --glob '*.{ts,tsx,d.ts}' \
'\(globalThis as any\)\.__pendingSeen|declare global|__pendingSeen' \
e2e/react-router/issue-7457Repository: TanStack/router
Length of output: 756
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "--- files"
git ls-files e2e/react-router/issue-7457
echo
echo "--- declaration/global matches"
rg -n --glob 'e2e/react-router/issue-7457/**/*.{ts,tsx,d.ts}' \
'declare global|interface Window|__pendingSeen|globalThis as any' \
e2e/react-router/issue-7457
echo
echo "--- tsconfig files"
fd 'tsconfig\.json$' e2e/react-router/issue-7457 -x sh -c '
echo "### $1"
sed -n "1,220p" "$1"
' sh {}Repository: TanStack/router
Length of output: 1377
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "--- vite-env.d.ts"
cat -n e2e/react-router/issue-7457/src/vite-env.d.ts
echo
echo "--- package.json"
cat -n e2e/react-router/issue-7457/package.json
echo
echo "--- playwright.config.ts"
cat -n e2e/react-router/issue-7457/playwright.config.tsRepository: TanStack/router
Length of output: 2095
Declare __pendingSeen instead of casting globalThis to any. Add the ambient flag declaration in e2e/react-router/issue-7457/src/vite-env.d.ts, then use globalThis.__pendingSeen directly in e2e/react-router/issue-7457/src/main.tsx and e2e/react-router/issue-7457/tests/issue-7457.repro.spec.ts.
📍 Affects 2 files
e2e/react-router/issue-7457/src/main.tsx#L21-L25(this comment)e2e/react-router/issue-7457/tests/issue-7457.repro.spec.ts#L29-L31
🤖 Prompt for 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.
In `@e2e/react-router/issue-7457/src/main.tsx` around lines 21 - 25, Declare the
ambient __pendingSeen flag in e2e/react-router/issue-7457/src/vite-env.d.ts,
then replace the any-cast global access in DefaultPendingComponent within
e2e/react-router/issue-7457/src/main.tsx and the corresponding test access in
e2e/react-router/issue-7457/tests/issue-7457.repro.spec.ts with direct
globalThis.__pendingSeen usage.
Source: Coding guidelines
* Always execute beforeLoad for client lanes * Simplify hydration handoff validation * ci: apply automated fixes * doc update
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
packages/router-core/src/load-client.ts (1)
456-463: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low valueMutating lease decrement inside the guard is easy to misread.
--flight[2]both decrements and drives control flow, and an already-zero lease (reserved bytransferPredecessorResources) would underflow to-1and silently keep the registry entry. Consider making the reservation state explicit.♻️ Suggested clarification
- if (!flight || --flight[2]) { + if (!flight) { + return + } + if (process.env.NODE_ENV !== 'production' && flight[2] < 1) { + throw new Error('Invariant failed: releasing a flight without a lease') + } + if (--flight[2]) { return }🤖 Prompt for 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. In `@packages/router-core/src/load-client.ts` around lines 456 - 463, Update releaseOwnedFlight so the lease decrement is performed explicitly before the guard, and handle an already-zero lease as a reserved state without underflowing or retaining the registry entry. Preserve the existing early return for missing flights and only release/delete the owned flight when the resulting lease count indicates it is no longer reserved.
🤖 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.
Nitpick comments:
In `@packages/router-core/src/load-client.ts`:
- Around line 456-463: Update releaseOwnedFlight so the lease decrement is
performed explicitly before the guard, and handle an already-zero lease as a
reserved state without underflowing or retaining the registry entry. Preserve
the existing early return for missing flights and only release/delete the owned
flight when the resulting lease count indicates it is no longer reserved.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 0aebeb69-11ac-4054-a1d1-fbf438a22719
📒 Files selected for processing (17)
docs/router/api/router/RouterType.mddocs/router/guide/preloading.mdpackages/react-router/src/Transitioner.tsxpackages/router-core/INTERNALS.mdpackages/router-core/src/load-client.tspackages/router-core/src/router.tspackages/router-core/tests/issue-3928-rapid-reload-abort.test.tspackages/router-core/tests/issue-6371-search-default-normalization-abort.test.tspackages/router-core/tests/load.test.tspackages/router-core/tests/loader-architecture-regressions.test.tspackages/router-core/tests/preload-adoption.test.tspackages/router-core/tests/preload-beforeload-reuse.test.tspackages/router-core/tests/preload-navigation-adoption.test.tspackages/router-core/tests/preload-public-cache-behavior.test.tspackages/router-core/tests/public-hydration-contract.test.tspackages/router-core/tests/public-preload-lane-contract.test.tspackages/router-core/tests/same-destination-navigation-join.test.ts
🚧 Files skipped from review as they are similar to previous changes (3)
- docs/router/guide/preloading.md
- docs/router/api/router/RouterType.md
- packages/router-core/tests/preload-beforeload-reuse.test.ts
Contributor
There was a problem hiding this comment.
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 has identified a possible root cause for your failed CI:
We determined this failure is an environment state issue rather than a code regression. The error originates from a stale compiled dist artifact (e2e/e2e-utils/dist/esm/e2eSetupTeardown.js) that was missing the e2eStartDummyServer export at test execution time, even though the source file correctly defines it and the PR makes no changes to e2e-utils. The dist has since been rebuilt correctly, confirming this was a build ordering issue in the CI environment.
No code changes were suggested for this issue.
Trigger a rerun:
🎓 Learn more about Self-Healing CI on nx.dev
Use scoped Vitest test cleanup
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (2)
packages/router-plugin/tests/handle-route-update.test.ts (1)
603-606: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winAvoid unchecked
anyfor the React act global.Use a typed
globalThisextension so writes toIS_REACT_ACT_ENVIRONMENTremain type-checked. As per coding guidelines, “Use TypeScript strict mode with extensive type safety.”Proposed fix
+const testGlobal = globalThis as typeof globalThis & { + IS_REACT_ACT_ENVIRONMENT?: boolean +} + - delete (globalThis as any).IS_REACT_ACT_ENVIRONMENT + delete testGlobal.IS_REACT_ACT_ENVIRONMENT ... - ;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = previousActEnvironment + testGlobal.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment🤖 Prompt for 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. In `@packages/router-plugin/tests/handle-route-update.test.ts` around lines 603 - 606, Replace the unchecked globalThis casts in the IS_REACT_ACT_ENVIRONMENT restoration logic with a typed globalThis extension, declaring the optional React act environment property in the appropriate global type scope. Keep the existing delete behavior for undefined values and assignment behavior for saved values while ensuring both writes remain type-checked.Source: Coding guidelines
packages/start-server-core/tests/createStartHandler.test.ts (1)
577-583: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winExtract repeated
onTestFinishedcleanup pair into a shared helper.The
consoleError.mockRestore()+router.serverSsr?.cleanup()pair is duplicated verbatim across this and (per the change-details) many other cancellation tests in this file. A small helper (e.g.registerCancellationCleanup(router, consoleError)) called once per test would reduce repetition and keep future changes to the cleanup sequence in one place.♻️ Suggested helper
function registerCancellationCleanup( router: AnyRouter, consoleError: ReturnType<typeof vi.spyOn>, ) { onTestFinished(() => { consoleError.mockRestore() }) onTestFinished(() => { router.serverSsr?.cleanup() }) }Then in each test:
- onTestFinished(() => { - consoleError.mockRestore() - }) - onTestFinished(() => { - router.serverSsr?.cleanup() - }) + registerCancellationCleanup(router, consoleError)Also applies to: 641-646
🤖 Prompt for 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. In `@packages/start-server-core/tests/createStartHandler.test.ts` around lines 577 - 583, Extract the duplicated consoleError.mockRestore and router.serverSsr?.cleanup registrations into a shared registerCancellationCleanup helper near the test utilities, accepting the router and spy arguments. Replace both cancellation-test cleanup pairs, including the occurrences around the referenced tests, with one helper call per test while preserving cleanup order and behavior.
🤖 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.
Nitpick comments:
In `@packages/router-plugin/tests/handle-route-update.test.ts`:
- Around line 603-606: Replace the unchecked globalThis casts in the
IS_REACT_ACT_ENVIRONMENT restoration logic with a typed globalThis extension,
declaring the optional React act environment property in the appropriate global
type scope. Keep the existing delete behavior for undefined values and
assignment behavior for saved values while ensuring both writes remain
type-checked.
In `@packages/start-server-core/tests/createStartHandler.test.ts`:
- Around line 577-583: Extract the duplicated consoleError.mockRestore and
router.serverSsr?.cleanup registrations into a shared
registerCancellationCleanup helper near the test utilities, accepting the router
and spy arguments. Replace both cancellation-test cleanup pairs, including the
occurrences around the referenced tests, with one helper call per test while
preserving cleanup order and behavior.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 92fb7592-301b-4518-bb89-d03cef737520
📒 Files selected for processing (25)
packages/react-router/tests/issue-4467-lazy-route-pending.test.tsxpackages/react-router/tests/issue-4476-react-query-cancellation.test.tsxpackages/react-router/tests/issue-4759-pending-frame.test.tsxpackages/react-router/tests/issue-6371-search-default-normalization-abort.test.tsxpackages/react-router/tests/preloaded-mount-resolution.test.tsxpackages/react-router/tests/renderRouterToStream.test.tsxpackages/router-core/tests/hmr-refresh-lifecycle.test.tspackages/router-core/tests/hydration-currentness.test.tspackages/router-core/tests/issue-4078-loader-notfound-root-boundary.test.tspackages/router-core/tests/issue-5427-hydration-root-global-not-found.test.tspackages/router-core/tests/issue-6221-head-waits-for-loader.test.tspackages/router-core/tests/issue-7602-parent-beforeload-context-child-loader.test.tspackages/router-core/tests/issue-7759-in-flight-preload-eviction.test.tspackages/router-core/tests/public-hydration-contract.test.tspackages/router-core/tests/public-preload-lane-contract.test.tspackages/router-core/tests/server-chunk-failure-lifecycle.test.tspackages/router-core/tests/ssr-server-cleanup.test.tspackages/router-plugin/tests/handle-route-update.test.tspackages/solid-router/tests/createLazyRoute.test.tsxpackages/solid-router/tests/errorComponent.test.tsxpackages/solid-router/tests/transitioner-listener-errors.test.tsxpackages/solid-router/tests/transitioner-render-ack.test.tsxpackages/start-server-core/tests/createStartHandler.test.tspackages/vue-router/tests/Transitioner.test.tsxpackages/vue-router/tests/transitioner-listener-errors.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixed by this PR
causeuses cached match in beforeLoad and loader functions #3179onBeforeNavigatenot invoked afterredirectwithinbeforeLoadmethod was invoked #3920preload&causefor the root'sbeforeLoad' arguments whendefaultPreload: "intent"#4572notFoundComponentcannot be rendered on prerendered routes #5427MatchInnerImplerror #7367matchesinheadproperty does not haveloaderDataorcontextpresent #7379beforeLoadisn't propagated to sub-route while loader of sub-route is executing #7602document.titleafter parent'sbeforeLoadthrows #7635throw undefinedwhen a redirected match's loadPromise was already cleared — escapes CatchBoundary and unmounts the whole app #7753history.scrollRestoration = 'manual'breaks native restoration (iOS swipe-back, Chrome hard refresh) #7815fixes #2980, fixes #3179, fixes #3920, fixes #3928, fixes #4444, fixes #4467, fixes #4476, fixes #4572, fixes #4614, fixes #4759, fixes #5427, fixes #6107, fixes #6221, fixes #6351, fixes #6371, fixes #7051, fixes #7120, fixes #7283, fixes #7367, fixes #7379, fixes #7457, fixes #7602, fixes #7635, fixes #7673, fixes #7753, fixes #7759, fixes #7815
Already fixed on main (but we added tests)
AbortError: signal is aborted without reasonis bubbling up when using loader with basepath #4517headis not executed whenbeforeLoadthrows an Error #4684contexton preload (intent) #5778Ignored by this PR
Route.useRouteContext()returns an empty object instead of null #7110Summary by CodeRabbit