Sync main to solidl v2 pre by birkskyum · Pull Request #7522 · TanStack/router

birkskyum · 2026-06-01T23:44:36Z

merge main to solid-router-v2-pre

Put Start project setup in a single onboarding path for React and Solid while preserving old quick-start URLs with redirects.

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

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

Co-authored-by: schiller-manuel <6340397+schiller-manuel@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Co-authored-by: Tanner Linsley <tannerlinsley@gmail.com>

…ilers (#7153)

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

* ci: update all actions * disable package manager cache

* fix: fix primitive beforeLoad errors * 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>

…2-pre

coderabbitai · 2026-06-01T23:44:42Z

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: Pro

Run ID: 1ff674ce-1497-4d62-b3f3-98f0fe13cd2d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch sync-main-to-solidl-v2-pre

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 and usage tips.}

nx-cloud · 2026-06-01T23:45:12Z

View your CI Pipeline Execution ↗ for commit cf29c6e

Command	Status	Duration	Result
`nx affected --targets=test:eslint,test:unit,tes...`	✅ Succeeded	1m 53s	View ↗

☁️ Nx Cloud last updated this comment at 2026-06-02 00:32:45 UTC

github-actions · 2026-06-01T23:45:24Z

🚀 Changeset Version Preview

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

github-actions · 2026-06-01T23:48:55Z

Bundle Size Benchmarks

Commit: de26a27d524f
Measured at: 2026-06-02T00:20:25.673Z
Baseline source: history:9a6c12596ff6
Dashboard: bundle-size history

Scenario	Current (gzip)	Delta vs baseline	Initial gzip	Raw	Brotli	Trend
`react-router.minimal`	87.25 KiB	0 B (0.00%)	87.12 KiB	273.94 KiB	75.84 KiB	███████▁▁▁▁
`react-router.full`	90.69 KiB	0 B (0.00%)	90.55 KiB	285.30 KiB	78.83 KiB	███████▁▁▁▁
`solid-router.minimal`	41.90 KiB	+6.43 KiB (+18.13%)	41.78 KiB	122.46 KiB	37.86 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`solid-router.full`	46.47 KiB	+6.29 KiB (+15.66%)	46.35 KiB	136.43 KiB	41.94 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`vue-router.minimal`	52.97 KiB	0 B (0.00%)	52.84 KiB	150.26 KiB	47.66 KiB	███████▁▁▁▁
`vue-router.full`	58.60 KiB	0 B (0.00%)	58.47 KiB	167.99 KiB	52.51 KiB	███████▁▁▁▁
`react-start.minimal`	101.88 KiB	0 B (0.00%)	101.74 KiB	322.26 KiB	88.15 KiB	███████▁▁▁▁
`react-start.deferred-hydration`	102.61 KiB	0 B (0.00%)	101.76 KiB	323.63 KiB	88.82 KiB	███████▁▁▁▁
`react-start.full`	105.26 KiB	0 B (0.00%)	105.12 KiB	332.57 KiB	91.09 KiB	███████▁▁▁▁
`react-start.rsbuild.minimal`	99.58 KiB	0 B (0.00%)	99.41 KiB	316.74 KiB	85.74 KiB	███████▁▁▄▄
`react-start.rsbuild.full`	102.85 KiB	0 B (0.00%)	102.68 KiB	327.13 KiB	88.45 KiB	███████▁▁▄▄
`solid-start.minimal`	63.32 KiB	+13.74 KiB (+27.71%)	63.19 KiB	191.59 KiB	56.06 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`solid-start.deferred-hydration`	66.74 KiB	+13.89 KiB (+26.29%)	63.27 KiB	200.04 KiB	59.09 KiB	▁▁▁▁▁▁▁▁▁▁▁█
`solid-start.full`	67.20 KiB	+11.83 KiB (+21.37%)	67.07 KiB	203.02 KiB	59.29 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-01T23:50:45Z

More templates

@tanstack/arktype-adapter

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

@tanstack/eslint-plugin-router

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

@tanstack/eslint-plugin-start

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

@tanstack/history

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

@tanstack/nitro-v2-vite-plugin

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

@tanstack/react-router

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

@tanstack/react-router-devtools

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

@tanstack/react-router-ssr-query

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

@tanstack/react-start

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

@tanstack/react-start-client

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

@tanstack/react-start-rsc

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

@tanstack/react-start-server

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

@tanstack/router-cli

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

@tanstack/router-core

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

@tanstack/router-devtools

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

@tanstack/router-devtools-core

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

@tanstack/router-generator

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

@tanstack/router-plugin

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

@tanstack/router-ssr-query-core

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

@tanstack/router-utils

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

@tanstack/router-vite-plugin

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

@tanstack/solid-router

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

@tanstack/solid-router-devtools

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

@tanstack/solid-router-ssr-query

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

@tanstack/solid-start

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

@tanstack/solid-start-client

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

@tanstack/solid-start-server

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

@tanstack/start-client-core

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

@tanstack/start-fn-stubs

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

@tanstack/start-plugin-core

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

@tanstack/start-server-core

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

@tanstack/start-static-server-functions

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

@tanstack/start-storage-context

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

@tanstack/valibot-adapter

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

@tanstack/virtual-file-routes

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

@tanstack/vue-router

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

@tanstack/vue-router-devtools

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

@tanstack/vue-router-ssr-query

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

@tanstack/vue-start

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

@tanstack/vue-start-client

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

@tanstack/vue-start-server

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

@tanstack/zod-adapter

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

commit: cf29c6e

codspeed-hq · 2026-06-02T00:04:41Z

Merging this PR will not alter performance

⚠️

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

⚡ 2 improved benchmarks
❌ 1 regressed benchmark
✅ 2 untouched benchmarks
⏩ 1 skipped benchmark¹

Warning

Please fix the performance issues or acknowledge them on CodSpeed.

Performance Changes

	Benchmark	`BASE`	`HEAD`	Efficiency
❌	`ssr request loop (vue)`	420.3 ms	482 ms	-12.8%
⚡	`client-side navigation loop (solid)`	72.6 ms	66.3 ms	+9.62%
⚡	`ssr request loop (solid)`	174.6 ms	161.9 ms	+7.84%

Tip

Investigate this regression by commenting @codspeedbot fix this regression on this PR, or directly use the CodSpeed MCP with your agent.

_{Comparing sync-main-to-solidl-v2-pre (cf29c6e) with solid-router-v2-pre (67a9040)²}

1 benchmark was skipped, so the baseline result was used instead. If it was deleted from the codebase, click here and archive it to remove it from the performance reports. ↩
No successful run was found on solid-router-v2-pre (cf29c6e) 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. ↩

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 fix the failing @tanstack/solid-start-client:test:eslint task by moving the misplaced eslint-disable-next-line comment in GenericHydrate.tsx one line down, so it directly precedes the (isServer ?? typeof window === 'undefined') expression that triggers @typescript-eslint/no-unnecessary-condition. Previously the comment applied to the outer ( on the next line — an innocuous character — leaving the actual ESLint violation uncovered and generating both an "unused directive" warning and the original error.

Tip

✅ We verified this fix by re-running @tanstack/solid-start-client:test:eslint.

diff --git a/packages/solid-start-client/src/GenericHydrate.tsx b/packages/solid-start-client/src/GenericHydrate.tsx
index b959f161..3e6bb08b 100644
--- a/packages/solid-start-client/src/GenericHydrate.tsx
+++ b/packages/solid-start-client/src/GenericHydrate.tsx
@@ -355,8 +355,8 @@ export function GenericHydrate(props: InternalHydrateProps) {
   Solid.createRenderEffect(
     () =>
       !(
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         (
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
           (isServer ?? typeof window === 'undefined') ||
           gate.resolved ||
           initialHydrateStrategy._t === 'never' ||

Or Apply changes locally with:

npx nx-cloud apply-locally s89H-1h8Q

Apply fix locally with your editor ↗ View interactive diff ↗

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

tannerlinsley and others added 30 commits March 23, 2026 11:06

docs: add router events guide

212a3ca

Merge branch 'main' of https://github.com/tanstack/router

c3915a1

docs(start): merge quick start into getting started

24cc08f

Put Start project setup in a single onboarding path for React and Solid while preserving old quick-start URLs with redirects.

fix: preserve request context precedence for server functions (#7135)

f7e9c5e

ci: changeset release

1d31393

fix: don't leak internal props in Link (#7138)

4b9ed6c

ci: changeset release

52fb98e

fix(router): handle redirected lazy pending matches (#7137)

b29d64d

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

chore: stabilize test (#7142)

240b482

ci: changeset release

edb24b4

fix: MatchRoute types (#7139)

540d221

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

fix(react-router): clear stale route errors on navigation (#7136)

70ec1da

Co-authored-by: schiller-manuel <6340397+schiller-manuel@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

ci: changeset release

06f7f8d

efp (#7144)

f920527

Co-authored-by: Tanner Linsley <tannerlinsley@gmail.com>

ci: changeset release

076045b

fix: republish react-start-rsc dependency chain

3384abc

ci: changeset release

61d7670

chore: sync published start package versions

e61c49c

ci: changeset release

13ec8a3

fix publishing

2d53c05

ci: changeset release

4c09f5d

fix

f8ac427

ci: apply automated fixes

6a9208d

ci: changeset release

d11977f

refactor: switch router stores to atom get/set API (#7150)

459057c

ci: changeset release

27890af

refactor: shorten internal router store names (#7152)

6355bb7

ci: changeset release

c066031

chore(types): re-export SearchMiddleware type from react-router (#7087)

b059766

fix(start-plugin-core): reuse deduped server function ids across comp…

d3f20fb

…ilers (#7153)

schiller-manuel and others added 10 commits May 29, 2026 02:27

fix: fix streaming (#7497)

d1997b6

ci: Version Packages (#7504)

8b36591

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

ci: update all actions (#7506)

86b8f9f

* ci: update all actions * disable package manager cache

fix: fix primitive beforeLoad errors (#7505)

2f53749

* fix: fix primitive beforeLoad errors * ci: apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

ci: Version Packages (#7508)

0ac831b

feat(rsbuild): add RSC support (#7509)

9cb7a00

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

ci: Version Packages (#7513)

9a6c125

docs (#7520)

e51ad23

docs (#7521)

54b0d9a

Merge remote-tracking branch 'origin/main' into sync-main-to-solidl-v…

f013849

…2-pre

github-actions Bot added documentation Everything documentation related package: router-plugin package: solid-router package: solid-start-client package: solid-start-server package: solid-start package: solid-router-devtools package: solid-router-ssr-query labels Jun 1, 2026

ci: apply automated fixes

fe28cbc

re-skip not-found

a304873

nx-cloud Bot reviewed Jun 2, 2026

View reviewed changes

lint

cf29c6e

birkskyum merged commit cf29c6e into solid-router-v2-pre Jun 2, 2026
22 of 23 checks passed

birkskyum deleted the sync-main-to-solidl-v2-pre branch June 2, 2026 00:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Sync main to solidl v2 pre#7522

Sync main to solidl v2 pre#7522
birkskyum merged 241 commits into
solid-router-v2-prefrom
sync-main-to-solidl-v2-pre

birkskyum commented Jun 1, 2026

Uh oh!

coderabbitai Bot commented Jun 1, 2026 •

edited

Loading

Review skipped

Uh oh!

nx-cloud Bot commented Jun 1, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 1, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 1, 2026 •

edited

Loading

Uh oh!

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

edited

Loading

Uh oh!

codspeed-hq Bot commented Jun 2, 2026 •

edited

Loading

Uh oh!

nx-cloud Bot left a comment •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

birkskyum commented Jun 1, 2026

Uh oh!

coderabbitai Bot commented Jun 1, 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 Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

🚀 Changeset Version Preview

Uh oh!

github-actions Bot commented Jun 1, 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 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Merging this PR will not alter performance

Performance Changes

Footnotes

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!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

coderabbitai Bot commented Jun 1, 2026 •

edited

Loading

nx-cloud Bot commented Jun 1, 2026 •

edited

Loading

github-actions Bot commented Jun 1, 2026 •

edited

Loading

github-actions Bot commented Jun 1, 2026 •

edited

Loading

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

edited

Loading

codspeed-hq Bot commented Jun 2, 2026 •

edited

Loading

nx-cloud Bot left a comment •

edited

Loading