Skip to content

chore: upgrade to solid v2 rc, rename vite-plugin-solid, move branch to rc - #11173

Merged
birkskyum merged 1 commit into
TanStack:solid-query-v6-prefrom
brenelz:chore/solid-v2-rc-upgrade
Aug 12, 2026
Merged

chore: upgrade to solid v2 rc, rename vite-plugin-solid, move branch to rc#11173
birkskyum merged 1 commit into
TanStack:solid-query-v6-prefrom
brenelz:chore/solid-v2-rc-upgrade

Conversation

@brenelz

@brenelz brenelz commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Moves the v6 prerelease line onto the Solid 2.0 RC and switches this branch's prerelease tag from beta to rc.

Solid RC, with carets

solid-js, @solidjs/web, @solidjs/signals and babel-preset-solid go from the pinned 2.0.0-beta.33 to ^2.0.0-rc.0 across the three solid packages, the solid-vite integration and the solid examples. This also flips these deps from exact pins to carets so the rc line is tracked as it moves.

packages/query-devtools is untouched — it is still on Solid 1.x.

@tanstack/solid-query's peer floor moves to >=2.0.0-rc.0 <3.0.0. The deliberately broader >=2.0.0-beta.0 <3.0.0 floors on solid-query-devtools and solid-query-persist-client are left alone, matching how previous bumps handled them.

vite-plugin-solid@solidjs/vite-plugin

Renamed to @solidjs/vite-plugin at ^3.0.0-next.27 — the version published under both names, so a clean cut-over point. Covers every manifest, every vite config, and the hydration test fixture in packages/solid-query/src/__tests__/fixtures/hydration/build-and-render.mjs.

packages/query-devtools stays on vite-plugin-solid@^2.11.6; the scoped package has no 2.x line.

The -i vite-plugin-solid sherif ignore is dropped — with the rename the dependency no longer resolves to more than one version, so the ignore is redundant (verified sherif still passes without it).

Prerelease tag → rc, landing on 6.0.0-rc.0

.changeset/pre.json moves from "tag": "beta" to "tag": "rc". No workflow change is needed: solid-query-v6-pre still matches the *-pre glob in release.yml, which sets prerelease=true and passes no --tag, so changeset publish picks the dist-tag up from pre.json.

Changesets derives the pre number as (prerelease[1] ?? -1) + 1, so switching the tag alone would have continued the beta counter and produced 6.0.0-rc.9 from 6.0.0-beta.8. To land on 6.0.0-rc.0 instead, the three solid packages are set to the sentinel version 6.0.0-rc — valid semver with no numeric prerelease part, so the pre number resolves to 0 while semver.inc("6.0.0-rc", "patch") still yields 6.0.0.

That sentinel only lives here until the next ci: Version Packages commit rewrites it; nothing publishes from it, since the release action runs version before publish.

Verified by running the real changeset version against a throwaway copy of this tree:

6.0.0-rc.0     @tanstack/solid-query
6.0.0-rc.0     @tanstack/solid-query-devtools
6.0.0-rc.0     @tanstack/solid-query-persist-client
5.101.0        @tanstack/query-core      (untouched)
5.101.0        @tanstack/react-query     (untouched)
6.1.34         @tanstack/svelte-query    (untouched)

with the changelog entry landing as ## 6.0.0-rc.0 directly above ## 6.0.0-beta.8.

Known peer warning

pnpm install reports an unmet peer for @solidjs/vite-plugin@3.0.0-next.27, which declares solid-js / @solidjs/web as >=2.0.0-beta.32 <2.0.0-experimental.0. Prerelease identifiers sort alphabetically, so the real ordering is beta.32 < experimental.0 < rc.0 — the upper bound excludes the RC by accident.

It is metadata only and warning only (no strict-peer-dependencies in this repo, and pnpm defaults it to false); the plugin works against rc.0. It should clear when Solid ships a plugin release with a corrected bound. @solidjs/vite-plugin currently has exactly one published version, so there is nothing newer to move to.

Verification

  • test:lib on the three solid packages: 336 tests pass, no type errors
  • test:types, test:build, test:eslint on the three solid packages: pass
  • sherif and knip: pass
  • Real vite builds of integrations/solid-vite and examples/solid/basic: pass

No source changes were needed.

🤖 Generated with Claude Code

…to rc

- Bump solid-js, @solidjs/web, @solidjs/signals and babel-preset-solid
  2.0.0-beta.33 -> ^2.0.0-rc.0 across the solid packages, the solid-vite
  integration and the solid examples, switching these from exact pins to
  carets so the rc line is picked up as it moves
- Rename vite-plugin-solid -> @solidjs/vite-plugin ^3.0.0-next.27 (the
  version published under both names) in every manifest, vite config and
  the hydration test fixture; packages/query-devtools stays on
  vite-plugin-solid ^2.11.6 since it is still on solid 1.x
- Drop the now-redundant `-i vite-plugin-solid` sherif ignore, since the
  dependency no longer resolves to more than one version
- Raise the solid-query peer floor to >=2.0.0-rc.0 <3.0.0; the broader
  >=2.0.0-beta.0 floors on solid-query-devtools and
  solid-query-persist-client are left as they are
- Switch the changesets prerelease tag from beta to rc, and set the solid
  package versions to the 6.0.0-rc sentinel so the next `changeset
  version` lands on 6.0.0-rc.0 rather than continuing the beta counter
  into 6.0.0-rc.9
- No source changes were needed; solid-query, solid-query-devtools and
  solid-query-persist-client pass unchanged (336 tests, no type errors),
  as do the solid-vite integration and solid example vite builds

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

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 Plus

Run ID: f257899a-263e-4308-968f-ec2481815d89

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

nx-cloud Bot commented Aug 12, 2026

Copy link
Copy Markdown

View your CI Pipeline Execution ↗ for commit 19c7623

Command Status Duration Result
nx affected --targets=test:sherif,test:knip,tes... ✅ Succeeded 8m 3s View ↗
nx run-many --target=build --exclude=examples/*... ✅ Succeeded 1m 55s View ↗

☁️ Nx Cloud last updated this comment at 2026-08-12 22:55:10 UTC

@pkg-pr-new

pkg-pr-new Bot commented Aug 12, 2026

Copy link
Copy Markdown
More templates

@tanstack/angular-query-experimental

npm i https://pkg.pr.new/@tanstack/angular-query-experimental@11173

@tanstack/eslint-plugin-query

npm i https://pkg.pr.new/@tanstack/eslint-plugin-query@11173

@tanstack/lit-query

npm i https://pkg.pr.new/@tanstack/lit-query@11173

@tanstack/preact-query

npm i https://pkg.pr.new/@tanstack/preact-query@11173

@tanstack/preact-query-devtools

npm i https://pkg.pr.new/@tanstack/preact-query-devtools@11173

@tanstack/preact-query-persist-client

npm i https://pkg.pr.new/@tanstack/preact-query-persist-client@11173

@tanstack/query-async-storage-persister

npm i https://pkg.pr.new/@tanstack/query-async-storage-persister@11173

@tanstack/query-broadcast-client-experimental

npm i https://pkg.pr.new/@tanstack/query-broadcast-client-experimental@11173

@tanstack/query-core

npm i https://pkg.pr.new/@tanstack/query-core@11173

@tanstack/query-devtools

npm i https://pkg.pr.new/@tanstack/query-devtools@11173

@tanstack/query-persist-client-core

npm i https://pkg.pr.new/@tanstack/query-persist-client-core@11173

@tanstack/query-sync-storage-persister

npm i https://pkg.pr.new/@tanstack/query-sync-storage-persister@11173

@tanstack/react-query

npm i https://pkg.pr.new/@tanstack/react-query@11173

@tanstack/react-query-devtools

npm i https://pkg.pr.new/@tanstack/react-query-devtools@11173

@tanstack/react-query-next-experimental

npm i https://pkg.pr.new/@tanstack/react-query-next-experimental@11173

@tanstack/react-query-persist-client

npm i https://pkg.pr.new/@tanstack/react-query-persist-client@11173

@tanstack/solid-query

npm i https://pkg.pr.new/@tanstack/solid-query@11173

@tanstack/solid-query-devtools

npm i https://pkg.pr.new/@tanstack/solid-query-devtools@11173

@tanstack/solid-query-persist-client

npm i https://pkg.pr.new/@tanstack/solid-query-persist-client@11173

@tanstack/svelte-query

npm i https://pkg.pr.new/@tanstack/svelte-query@11173

@tanstack/svelte-query-devtools

npm i https://pkg.pr.new/@tanstack/svelte-query-devtools@11173

@tanstack/svelte-query-persist-client

npm i https://pkg.pr.new/@tanstack/svelte-query-persist-client@11173

@tanstack/vue-query

npm i https://pkg.pr.new/@tanstack/vue-query@11173

@tanstack/vue-query-devtools

npm i https://pkg.pr.new/@tanstack/vue-query-devtools@11173

commit: 19c7623

@socket-security

Copy link
Copy Markdown

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

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Added@​solidjs/​vite-plugin@​3.0.0-next.277610010088100
Added@​solidjs/​web@​2.0.0-rc.0961008397100
Addedbabel-preset-solid@​2.0.0-rc.01001009096100
Addedsolid-js@​2.0.0-rc.01001009596100
Added@​solidjs/​signals@​2.0.0-rc.09510010098100

View full report

@birkskyum
birkskyum merged commit 7b04d61 into TanStack:solid-query-v6-pre Aug 12, 2026
9 checks passed
brenelz added a commit to brenelz/query that referenced this pull request Aug 12, 2026
Brings in the squash-merged TanStack#11173, which landed the solid v2 rc upgrade
upstream. Two conflicts:

- examples/solid/simple/package.json: kept our ^5.101.4 for
  @tanstack/eslint-plugin-query. The base branch still has ^5.101.0
  because it has not taken main yet, and that bump is part of the main
  merge this branch delivers
- pnpm-lock.yaml: regenerated from the merged manifests

Verified after the merge: test:lib, test:types, test:build and
test:eslint pass for all three solid packages, sherif and knip are clean,
and the 6.0.0-rc sentinel matches what upstream now carries.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants