refactor(solid): retire solid-router-ssr-query — native channels carry the Router + Query pairing by ryansolid · Pull Request #8193 · TanStack/router

ryansolid · 2026-08-29T09:20:10Z

Draft — for discussion. Works against published packages today (@tanstack/solid-query@6.0.0-rc.1, solid-js@2.0.0-rc.4); all three converted e2e suites pass.

Summary

On the Solid v2 line, @tanstack/solid-router-ssr-query bundles three unrelated things, and each now has a better home:

SSR transport (the bulk of the package — router-ssr-query-core's dehydrate + query stream + client hydrate). Native to solid-query v6: QueryClientProvider serializes the request's cache into Solid's hydration registry (content-addressed by query hash, promise-valued at fetch-dispatch so pending queries stream, covering never-mounted loader prefetches) and primes the client cache from it. Running the package alongside it ships every query payload twice — which is what the e2e apps were doing: once through the router's dehydration stream, once through the hydration registry.
wrapQueryClient. A JSX expression — the router's own Wrap option:

Wrap: (props) => (
  <QueryClientProvider client={queryClient}>{props.children}</QueryClientProvider>
)

handleRedirects. Runtime navigation glue, not an SSR concern: cache-driven fetches (mount fetches, background refetches, mutations) run outside the router, so a queryFn/mutationFn throwing redirect() needs handing to router.navigate. That's a small userland composition of public APIs on both sides — isRedirect/resolveRedirect from the router, config.onError on the query/mutation caches (see routeCacheRedirects in the converted apps). Loader-driven redirects were never the package's: they propagate through the loader and the router handles them on both sides.

This PR converts the three Solid Start e2e apps (basic-solid-query, server-functions, server-routes) to the composition, removes the dependency, and marks the package deprecated for the v2 line in its README.

Verification

basic-solid-query: 6/6 — SSR hydration, nested layouts, suspense transitions, query-preserving navigation, all on the native transport only.
server-functions: 29/29 — including redirect-test (mount-time query redirect via the onError glue) and redirect-test-ssr (render-time query redirect resolving through the stream handler), demonstrating handleRedirects is fully replaced.
server-routes: 2/2.

Notes

The same composition is the reference pattern in solidjs/templates' fullstack-tanstack (bare vite + TanStack Router + Query, no Start — solid-v2/fullstack-tanstack: multi-source single-flight solidjs/templates#287), which is the point: none of it is Start-specific.
Complementary to #8192 (named single-flight sources + loadFlightTarget): this PR is the SSR/read side going native, that one is the mutation/write side. Together they remove the need for any *-ssr-query package on Solid.
docs/router/integrations/query.md's Solid tab still shows the old setup — happy to rewrite it once there's agreement on direction.
React/Vue packages untouched; the router-ssr-query-core transport remains correct for frameworks without a native serialization channel.

Made with Cursor

…els carry the Router + Query pairing solid-query v6's QueryClientProvider serializes the request's cache into Solid's hydration registry during SSR and primes the client cache from it, so running the ssr-query transport alongside it ships every query payload twice. The package's two runtime conveniences are each a few lines of userland composition on public APIs: the provider wrap via the router's Wrap option, and cache-driven redirect() errors handed to router.navigate from the caches' config.onError. Converts the three Solid Start e2e apps to the composition (all suites green, including the redirect-from-query tests) and marks the package deprecated for the v2 line. Co-authored-by: Cursor <cursoragent@cursor.com>

coderabbitai · 2026-08-29T09:20:17Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Team

Run ID: ec5ca418-4373-46ae-a471-b523f20e3207

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

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.}

nx-cloud · 2026-08-29T21:00:22Z

View your CI Pipeline Execution ↗ for commit cd60db7

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

☁️ Nx Cloud last updated this comment at 2026-09-02 21:24:16 UTC

pkg-pr-new · 2026-08-29T21:04:58Z

More templates

@tanstack/arktype-adapter

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

@tanstack/eslint-plugin-router

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

@tanstack/eslint-plugin-start

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

@tanstack/history

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

@tanstack/nitro-v2-vite-plugin

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

@tanstack/react-router

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

@tanstack/react-router-devtools

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

@tanstack/react-router-ssr-query

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

@tanstack/react-start

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

@tanstack/react-start-client

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

@tanstack/react-start-rsc

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

@tanstack/react-start-server

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

@tanstack/router-cli

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

@tanstack/router-core

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

@tanstack/router-devtools

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

@tanstack/router-devtools-core

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

@tanstack/router-generator

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

@tanstack/router-plugin

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

@tanstack/router-ssr-query-core

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

@tanstack/router-utils

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

@tanstack/router-vite-plugin

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

@tanstack/solid-router

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

@tanstack/solid-router-devtools

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

@tanstack/solid-router-ssr-query

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

@tanstack/solid-start

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

@tanstack/solid-start-client

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

@tanstack/solid-start-server

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

@tanstack/start-client-core

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

@tanstack/start-fn-stubs

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

@tanstack/start-plugin-core

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

@tanstack/start-server-core

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

@tanstack/start-static-server-functions

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

@tanstack/start-storage-context

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

@tanstack/valibot-adapter

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

@tanstack/virtual-file-routes

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

@tanstack/vue-router

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

@tanstack/vue-router-devtools

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

@tanstack/vue-router-ssr-query

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

@tanstack/vue-start

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

@tanstack/vue-start-client

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

@tanstack/vue-start-server

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

@tanstack/zod-adapter

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

commit: cd60db7

brenelz · 2026-08-29T21:07:16Z

I'm on board with this. Would be one less package to maintain.

Running the package alongside it ships every query payload twice

That doesn't seem ideal

codspeed-hq · 2026-08-29T21:16:11Z

Hooray! CodSpeed harness just leveled up!

The base and head of this comparison were measured with different runner settings, so their benchmark values are not directly comparable.

What changed between base and head:

CodSpeed runner v5 changed how benchmarks are measured (base 4.15.0 → head 5.0.2). View release notes
Cycle estimation (off → on) changes how benchmark performance is calculated. Learn more about cycle estimation

Re-run the base with the same settings to get a valid performance comparison.

_{Comparing ryansolid:feat/solid-native-query-ssr (cd60db7) with solid-router-v2-pre (67a9040)¹}

No successful run was found on solid-router-v2-pre (5010e89) during the generation of this report, so 67a9040 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report. ↩

Co-authored-by: Cursor <cursoragent@cursor.com>

ryansolid marked this pull request as ready for review September 2, 2026 21:05

birkskyum approved these changes Sep 2, 2026

View reviewed changes

chore: changeset for the solid-router-ssr-query deprecation notice

cd60db7

Co-authored-by: Cursor <cursoragent@cursor.com>

brenelz approved these changes Sep 2, 2026

View reviewed changes

ryansolid mentioned this pull request Sep 2, 2026

feat(solid): named single-flight source + loadFlightTarget, the cache-agnostic trigger #8192

Merged

4 tasks

brenelz merged commit 5a6935f into TanStack:solid-router-v2-pre Sep 2, 2026
24 of 26 checks passed

github-actions Bot mentioned this pull request Sep 2, 2026

ci: Version Packages (rc) #8219

Open

Navigation Menu

Uh oh!

Uh oh!

refactor(solid): retire solid-router-ssr-query — native channels carry the Router + Query pairing - #8193

refactor(solid): retire solid-router-ssr-query — native channels carry the Router + Query pairing#8193
brenelz merged 2 commits into
TanStack:solid-router-v2-prefrom
ryansolid:feat/solid-native-query-ssr

ryansolid commented Aug 29, 2026

Uh oh!

coderabbitai Bot commented Aug 29, 2026 •

edited

Loading

Review skipped

Uh oh!

nx-cloud Bot commented Aug 29, 2026 •

edited

Loading

Uh oh!

pkg-pr-new Bot commented Aug 29, 2026 •

edited

Loading

Uh oh!

brenelz commented Aug 29, 2026

Uh oh!

codspeed-hq Bot commented Aug 29, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

ryansolid commented Aug 29, 2026

Summary

Verification

Notes

Uh oh!

coderabbitai Bot commented Aug 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

nx-cloud Bot commented Aug 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pkg-pr-new Bot commented Aug 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

brenelz commented Aug 29, 2026

Uh oh!

codspeed-hq Bot commented Aug 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Hooray! CodSpeed harness just leveled up!

Footnotes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coderabbitai Bot commented Aug 29, 2026 •

edited

Loading

nx-cloud Bot commented Aug 29, 2026 •

edited

Loading

pkg-pr-new Bot commented Aug 29, 2026 •

edited

Loading

codspeed-hq Bot commented Aug 29, 2026 •

edited

Loading