Solid router main merge by brenelz · Pull Request #7628 · TanStack/router

brenelz · 2026-06-13T21:08:22Z

No description provided.

ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix(start-rsbuild): compile node_modules for RSC directives * chore: add comments * chore: add changeset

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com>

) Co-authored-by: Manuel Schiller <manuel.schiller@caligano.de>

…7559) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

…ports (#7560) * fix(router-plugin): preserve generated route state for aliased HMR imports fixes #4303 * ci: apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* fix(benchmarks): run SSR setup imports natively * fix(benchmarks): update codspeed vitest plugin * fix(benchmarks): avoid SSR CodSpeed setup hooks * ci: apply automated fixes * fix(benchmarks): preload SSR handlers before bench * ci: apply automated fixes * ensure benchmarks build are NODE_ENV=production * fail codspeed on error, to avoid future skips like this one --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

…Sharing logic (#7577)

)

nx-cloud · 2026-06-13T21:08:55Z

View your CI Pipeline Execution ↗ for commit 545866d

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

☁️ Nx Cloud last updated this comment at 2026-06-13 21:36:55 UTC

github-actions · 2026-06-13T21:09:08Z

🚀 Changeset Version Preview

3 package(s) bumped directly, 19 bumped as dependents.

🟩 Patch bumps

Package	Version	Reason
`@tanstack/react-router`	1.170.15 → 1.170.16-beta.0	Changeset
`@tanstack/solid-router`	2.0.0-beta.21 → 2.0.0-beta.22	Changeset
`@tanstack/start-server-core`	1.169.14 → 1.169.15-beta.0	Changeset
`@tanstack/arktype-adapter`	1.167.0 → 1.167.1-beta.0	Dependent
`@tanstack/react-router-devtools`	1.167.0 → 1.167.1-beta.0	Dependent
`@tanstack/react-router-ssr-query`	1.167.1 → 1.167.2-beta.0	Dependent
`@tanstack/react-start`	1.168.25 → 1.168.26-beta.0	Dependent
`@tanstack/react-start-client`	1.168.13 → 1.168.14-beta.0	Dependent
`@tanstack/react-start-rsc`	0.1.24 → 0.1.25-beta.0	Dependent
`@tanstack/react-start-server`	1.167.19 → 1.167.20-beta.0	Dependent
`@tanstack/router-devtools`	1.167.0 → 1.167.1-beta.0	Dependent
`@tanstack/router-plugin`	1.168.18 → 1.168.19-beta.0	Dependent
`@tanstack/router-vite-plugin`	1.167.18 → 1.167.19-beta.0	Dependent
`@tanstack/solid-start`	2.0.0-beta.22 → 2.0.0-beta.23	Dependent
`@tanstack/solid-start-client`	2.0.0-beta.21 → 2.0.0-beta.22	Dependent
`@tanstack/solid-start-server`	2.0.0-beta.21 → 2.0.0-beta.22	Dependent
`@tanstack/start-plugin-core`	1.171.17 → 1.171.18-beta.0	Dependent
`@tanstack/start-static-server-functions`	1.167.17 → 1.167.18-beta.0	Dependent
`@tanstack/valibot-adapter`	1.167.0 → 1.167.1-beta.0	Dependent
`@tanstack/vue-start`	1.168.24 → 1.168.25-beta.0	Dependent
`@tanstack/vue-start-server`	1.167.19 → 1.167.20-beta.0	Dependent
`@tanstack/zod-adapter`	1.167.0 → 1.167.1-beta.0	Dependent

socket-security · 2026-06-13T21:09:48Z

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

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	nx@22.7.5
	@nx/devkit@22.7.5
	@codspeed/vitest-plugin@5.5.0

View full report

socket-security · 2026-06-13T21:09:53Z

Warning

Review the following alerts detected in dependencies.

According to your organization's Security Policy, it is recommended to resolve "Warn" alerts. Learn more about Socket for GitHub.

Action	Severity	Alert (click "▶" to expand/collapse)
Warn		Obfuscated code: npm `nx` is 90.0% likely obfuscated Confidence: 0.90 Location: Package overview From: package.json → `npm/nx@22.7.5` ℹ Read more on: This package \| This alert \| What is obfuscated code? Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at `support@socket.dev`. Suggestion: Packages should not obfuscate their code. Consider not using packages with obfuscated code. Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment `@SocketSecurity ignore npm/nx@22.7.5`. You can also ignore all packages with `@SocketSecurity ignore-all`. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

github-actions · 2026-06-13T21:13:06Z

Bundle Size Benchmarks

Commit: 34792ba9d732
Measured at: 2026-06-13T21:35:26.342Z
Baseline source: history:689c5ab32e9b
Dashboard: bundle-size history

Scenario	Current (gzip)	Delta vs baseline	Initial gzip	Raw	Brotli	Trend
`react-router.minimal`	87.29 KiB	0 B (0.00%)	87.15 KiB	273.66 KiB	75.88 KiB	▁▁▁▁▃██████
`react-router.full`	91.02 KiB	0 B (0.00%)	90.88 KiB	285.56 KiB	79.09 KiB	█▁▁▁▁▄▄▄▄▄▄
`solid-router.minimal`	41.92 KiB	+6.43 KiB (+18.14%)	41.79 KiB	122.10 KiB	37.84 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`solid-router.full`	46.85 KiB	+6.32 KiB (+15.59%)	46.72 KiB	137.19 KiB	42.28 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`vue-router.minimal`	52.97 KiB	0 B (0.00%)	52.84 KiB	149.90 KiB	47.62 KiB	██▁▁▁▁▁▁▁▁▁
`vue-router.full`	58.96 KiB	0 B (0.00%)	58.83 KiB	168.66 KiB	52.87 KiB	▁▁█████████
`react-start.minimal`	101.91 KiB	0 B (0.00%)	101.77 KiB	321.98 KiB	88.21 KiB	▁▁▂▂▃██████
`react-start.deferred-hydration`	102.65 KiB	0 B (0.00%)	101.80 KiB	323.36 KiB	88.90 KiB	▁▂▂▂▂██████
`react-start.full`	105.31 KiB	0 B (0.00%)	105.18 KiB	331.91 KiB	91.06 KiB	█▁▁▁▂▆▆▆▆▆▆
`react-start.rsbuild.minimal`	99.63 KiB	0 B (0.00%)	99.46 KiB	316.43 KiB	85.79 KiB	▃▁▂▂▃██████
`react-start.rsbuild.minimal-iife`	100.03 KiB	0 B (0.00%)	99.87 KiB	317.37 KiB	86.08 KiB	▃▁▂▂▃██████
`react-start.rsbuild.full`	102.86 KiB	0 B (0.00%)	102.68 KiB	326.48 KiB	88.53 KiB	█▁▁▁▁▅▅▅▅▅▅
`solid-start.minimal`	63.34 KiB	+13.74 KiB (+27.71%)	63.21 KiB	191.24 KiB	56.07 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`solid-start.deferred-hydration`	66.75 KiB	+13.89 KiB (+26.28%)	63.29 KiB	199.69 KiB	59.16 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`solid-start.full`	67.28 KiB	+11.88 KiB (+21.45%)	67.15 KiB	202.87 KiB	59.43 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`vue-start.minimal`	71.02 KiB	0 B (0.00%)	70.89 KiB	207.04 KiB	62.93 KiB	▁▁█████████
`vue-start.full`	75.01 KiB	0 B (0.00%)	74.88 KiB	219.68 KiB	66.40 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 · 2026-06-13T21:15:09Z

More templates

@tanstack/arktype-adapter

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

@tanstack/eslint-plugin-router

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

@tanstack/eslint-plugin-start

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

@tanstack/history

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

@tanstack/nitro-v2-vite-plugin

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

@tanstack/react-router

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

@tanstack/react-router-devtools

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

@tanstack/react-router-ssr-query

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

@tanstack/react-start

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

@tanstack/react-start-client

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

@tanstack/react-start-rsc

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

@tanstack/react-start-server

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

@tanstack/router-cli

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

@tanstack/router-core

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

@tanstack/router-devtools

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

@tanstack/router-devtools-core

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

@tanstack/router-generator

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

@tanstack/router-plugin

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

@tanstack/router-ssr-query-core

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

@tanstack/router-utils

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

@tanstack/router-vite-plugin

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

@tanstack/solid-router

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

@tanstack/solid-router-devtools

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

@tanstack/solid-router-ssr-query

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

@tanstack/solid-start

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

@tanstack/solid-start-client

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

@tanstack/solid-start-server

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

@tanstack/start-client-core

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

@tanstack/start-fn-stubs

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

@tanstack/start-plugin-core

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

@tanstack/start-server-core

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

@tanstack/start-static-server-functions

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

@tanstack/start-storage-context

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

@tanstack/valibot-adapter

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

@tanstack/virtual-file-routes

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

@tanstack/vue-router

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

@tanstack/vue-router-devtools

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

@tanstack/vue-router-ssr-query

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

@tanstack/vue-start

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

@tanstack/vue-start-client

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

@tanstack/vue-start-server

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

@tanstack/zod-adapter

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

commit: 3fe770a

nx-cloud

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 solid SSR benchmark type-check failures by updating jsxImportSource from "solid-js" to "@solidjs/web" in all 14 solid scenario tsconfigs, aligning them with how @tanstack/solid-router and @tanstack/solid-start already configure TypeScript for solid-js 2.x. We also replaced the Suspense import and JSX usage in the streaming benchmark with Loading, which is the solid-js 2.x equivalent.

Tip

✅ We verified this fix by re-running tanstack-router-e2e-vue-basic-vue-query-file-based:test:e2e, @benchmarks/ssr-assets-solid:test:types:ssr.

Warning

The suggested diff is too large to display here, but you can view it on Nx Cloud ↗

Or Apply changes locally with:

npx nx-cloud apply-locally YXEb-J3MP

Apply fix locally with your editor ↗ View interactive diff ↗

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

codspeed-hq · 2026-06-13T21:39:50Z

Merging this PR will improve performance by 65.52%

⚠️

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

⚡ 4 improved benchmarks
✅ 2 untouched benchmarks
🆕 90 new benchmarks

Performance Changes

	Mode	Benchmark	`BASE`	`HEAD`	Efficiency
⚡	Simulation	`ssr request loop (react)`	330.5 ms	81.1 ms	×4.1
⚡	Simulation	`ssr request loop (vue)`	420.3 ms	286.7 ms	+46.57%
⚡	Simulation	`client-side navigation loop (solid)`	72.6 ms	62.7 ms	+15.85%
⚡	Simulation	`ssr request loop (solid)`	174.6 ms	161 ms	+8.45%
🆕	Simulation	`ssr global-mw server-fn (vue)`	N/A	60 ms	N/A
🆕	Simulation	`ssr not-found (vue)`	N/A	168.8 ms	N/A
🆕	Simulation	`ssr redirect (vue)`	N/A	68.4 ms	N/A
🆕	Simulation	`ssr head (vue)`	N/A	325.1 ms	N/A
🆕	Simulation	`ssr loaders (vue)`	N/A	136.6 ms	N/A
🆕	Simulation	`ssr selective (vue)`	N/A	139.9 ms	N/A
🆕	Simulation	`ssr server-fn GET (vue)`	N/A	74.5 ms	N/A
🆕	Simulation	`ssr server-fn POST (vue)`	N/A	71.4 ms	N/A
🆕	Simulation	`ssr server-route middleware (vue)`	N/A	63.3 ms	N/A
🆕	Simulation	`ssr server-route (vue)`	N/A	60.9 ms	N/A
🆕	Simulation	`ssr streaming deferred (vue)`	N/A	105 ms	N/A
🆕	Simulation	`ssr assets inline-css cdn (vue)`	N/A	187.4 ms	N/A
🆕	Simulation	`ssr assets linked-css control (vue)`	N/A	214.3 ms	N/A
🆕	Simulation	`ssr before-load chain (vue)`	N/A	184.2 ms	N/A
🆕	Simulation	`ssr control-flow error 500 (vue)`	N/A	198.1 ms	N/A
🆕	Simulation	`ssr control-flow route headers (vue)`	N/A	213.4 ms	N/A
...	...	...	...	...	...

ℹ️ Only the first 20 benchmarks are displayed. Go to the app to view all benchmarks.

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 solid-router-main-merge2 (3fe770a) with solid-router-v2-pre (67a9040)¹}

No successful run was found on solid-router-v2-pre (65133ed) 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. ↩

birkskyum · 2026-06-13T22:12:43Z

@@ -0,0 +1,5 @@
+---
+'@tanstack/react-router': patch


we shouldn't bring changesets from the main branch to this pre branch. It'll trigger react-router betas

github-actions Bot and others added 30 commits June 2, 2026 22:50

ci: Version Packages (#7525)

7fc7c34

ci: changeset release Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

docs: clarify auth data boundaries (#7537)

ccf87fb

fix(start-rsbuild): compile node_modules for RSC directives (#7540)

8091918

* fix(start-rsbuild): compile node_modules for RSC directives * chore: add comments * chore: add changeset

ci: Version Packages (#7544)

8c7e54e

fix(examples): make isRoot check work (#7547)

1d113f0

refactor: remove unnecessary any assertions (#7542)

bb99f66

refactor: remove unused dependencies (#7541)

fee0b58

improve bundle size benchmarks and add initial skill (#7450)

3dcc016

fix(router-core): retain search over validation defaults (#7549)

7a83e67

fix build (#7550)

fb0399e

Revert #7524 (#7533)

76b3d3b

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

fix(start): clean up server function handler imports (#7552)

301f6ba

Co-authored-by: nx-cloud[bot] <71083854+nx-cloud[bot]@users.noreply.github.com>

fix build (#7553)

6b453df

fix(router-core): fix search middleware type to use schema output (#7381

2cca73c

) Co-authored-by: Manuel Schiller <manuel.schiller@caligano.de>

ci: Version Packages (#7554)

a8647d2

fix(router-core): respect stripped params in retainSearchParams (#7555)

ac10815

ci: Version Packages (#7556)

65ad906

add regression tests (#7557)

e99e855

fix(router-core): allow retained search params to reset to defaults (#…

df1076c

…7559) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

ci: Version Packages (#7561)

996b9be

fix(router-core): skip scroll restoration setup when disabled (#7562)

776d8ef

ci: Version Packages (#7563)

10a7ff8

rename inputValidator to validator (#7566)

9bebf8d

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

ci: Version Packages (#7567)

757d433

refactor(react-router): useMatches skips useRef during SSR (#7575)

4a93cff

docs: add 🟡 (Experimental) for TanStack Start RSC support (#7573)

f111a38

refactor(react-router): Reduce bundle size by sharing hook structural…

689d88e

…Sharing logic (#7577)

refactor(router-core): avoid creating promises when not necessary (#7582

5127d86

)

ci: apply automated fixes

0747d9b

nx-cloud Bot reviewed Jun 13, 2026

View reviewed changes

fix: update solid ssr benchmark types

3fe770a

birkskyum reviewed Jun 13, 2026

View reviewed changes

brenelz marked this pull request as draft June 14, 2026 01:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Solid router main merge#7628

Solid router main merge#7628
brenelz wants to merge 46 commits into
solid-router-v2-prefrom
solid-router-main-merge2

brenelz commented Jun 13, 2026

Uh oh!

nx-cloud Bot commented Jun 13, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 13, 2026 •

edited

Loading

Uh oh!

socket-security Bot commented Jun 13, 2026 •

edited

Loading

Uh oh!

socket-security Bot commented Jun 13, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 13, 2026 •

edited

Loading

Uh oh!

pkg-pr-new Bot commented Jun 13, 2026 •

edited

Loading

Uh oh!

nx-cloud Bot left a comment •

edited

Loading

Uh oh!

codspeed-hq Bot commented Jun 13, 2026 •

edited

Loading

Uh oh!

birkskyum Jun 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Conversation

brenelz commented Jun 13, 2026

Uh oh!

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

Uh oh!

Uh oh!

github-actions Bot commented Jun 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚀 Changeset Version Preview

🟩 Patch bumps

Uh oh!

socket-security Bot commented Jun 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

socket-security Bot commented Jun 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jun 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bundle Size Benchmarks

Uh oh!

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

Uh oh!

Uh oh!

nx-cloud Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Nx Cloud is proposing a fix for your failed CI:

Uh oh!

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

Uh oh!

Merging this PR will improve performance by 65.52%

Performance Changes

Footnotes

Uh oh!

birkskyum Jun 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

nx-cloud Bot commented Jun 13, 2026 •

edited

Loading

github-actions Bot commented Jun 13, 2026 •

edited

Loading

socket-security Bot commented Jun 13, 2026 •

edited

Loading

socket-security Bot commented Jun 13, 2026 •

edited

Loading

github-actions Bot commented Jun 13, 2026 •

edited

Loading

pkg-pr-new Bot commented Jun 13, 2026 •

edited

Loading

nx-cloud Bot left a comment •

edited

Loading

codspeed-hq Bot commented Jun 13, 2026 •

edited

Loading