Skip to content

fix(solid-query): follow Solid 2.0.0-rc.9 #11543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryansolid wants to merge 1 commit into
base: solid-query-v6-pre
Choose a base branch
from
+1,303 −781
Open

fix(solid-query): follow Solid 2.0.0-rc.9 #11543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .changeset/solid-rc9.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@tanstack/solid-query': patch
'@tanstack/solid-query-devtools': patch
'@tanstack/solid-query-persist-client': patch
---

Follow Solid 2.0.0-rc.9. The packages build with `@solidjs/babel-plugin` (the Solid 2.0 compiler, matching the rc.9 runtime's delegated-event contract) and test under vite 8; the `solid-js` / `@solidjs/web` peer floor is `2.0.0-rc.9`.

`useQuery`'s setup-time snapshots (the meta projection's seed, the mount counts) now read the cache directly instead of through the hook's version signal. Under hydration, priming writes that signal during setup, and a write made during the hydration pass is held: a computation in the pass that reads it — tracked or not — is served the pre-write value and replays when the pass ends. For the hook's own derived nodes that replay is the takeover; for the computation instantiating the component (a `<Loading>` boundary's children) it was a remount, re-creating the hydrated component as a client render and letting cache writes reach the DOM while the stream was still open.
4 changes: 2 additions & 2 deletions examples/solid/astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@tanstack/solid-query": "^6.0.0-rc.4",
"@tanstack/solid-query-devtools": "^6.0.0-rc.4",
"astro": "^5.5.6",
"@solidjs/web": "^2.0.0-rc.0",
"solid-js": "^2.0.0-rc.0",
"@solidjs/web": "^2.0.0-rc.9",
"solid-js": "^2.0.0-rc.9",
"tailwindcss": "^3.4.7",
"typescript": "5.8.3"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/solid/basic-graphql-request/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"@tanstack/solid-query-devtools": "^6.0.0-rc.4",
"graphql": "^16.9.0",
"graphql-request": "^7.1.2",
"@solidjs/web": "^2.0.0-rc.0",
"solid-js": "^2.0.0-rc.0"
"@solidjs/web": "^2.0.0-rc.9",
"solid-js": "^2.0.0-rc.9"
},
"devDependencies": {
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"typescript": "5.8.3",
"vite": "^6.4.1"
"vite": "^8.3.0"
}
}
8 changes: 4 additions & 4 deletions examples/solid/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"dependencies": {
"@tanstack/solid-query": "^6.0.0-rc.4",
"@tanstack/solid-query-devtools": "^6.0.0-rc.4",
"@solidjs/web": "^2.0.0-rc.0",
"solid-js": "^2.0.0-rc.0"
"@solidjs/web": "^2.0.0-rc.9",
"solid-js": "^2.0.0-rc.9"
},
"devDependencies": {
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"typescript": "5.8.3",
"vite": "^6.4.1"
"vite": "^8.3.0"
}
}
8 changes: 4 additions & 4 deletions examples/solid/default-query-function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"dependencies": {
"@tanstack/solid-query": "^6.0.0-rc.4",
"@tanstack/solid-query-devtools": "^6.0.0-rc.4",
"@solidjs/web": "^2.0.0-rc.0",
"solid-js": "^2.0.0-rc.0"
"@solidjs/web": "^2.0.0-rc.9",
"solid-js": "^2.0.0-rc.9"
},
"devDependencies": {
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"typescript": "5.8.3",
"vite": "^6.4.1"
"vite": "^8.3.0"
}
}
8 changes: 4 additions & 4 deletions examples/solid/offline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"@tanstack/solid-query-devtools": "^6.0.0-rc.4",
"@tanstack/solid-query-persist-client": "^6.0.0-rc.4",
"msw": "^2.6.6",
"@solidjs/web": "^2.0.0-rc.0",
"solid-js": "^2.0.0-rc.0"
"@solidjs/web": "^2.0.0-rc.9",
"solid-js": "^2.0.0-rc.9"
},
"devDependencies": {
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"typescript": "5.8.3",
"vite": "^6.4.1"
"vite": "^8.3.0"
},
"msw": {
"workerDirectory": [
Expand Down
8 changes: 4 additions & 4 deletions examples/solid/simple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"dependencies": {
"@tanstack/solid-query": "^6.0.0-rc.4",
"@tanstack/solid-query-devtools": "^6.0.0-rc.4",
"@solidjs/web": "^2.0.0-rc.0",
"solid-js": "^2.0.0-rc.0"
"@solidjs/web": "^2.0.0-rc.9",
"solid-js": "^2.0.0-rc.9"
},
"devDependencies": {
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"@tanstack/eslint-plugin-query": "^5.101.4",
"typescript": "5.8.3",
"vite": "^6.4.1"
"vite": "^8.3.0"
}
}
4 changes: 2 additions & 2 deletions examples/solid/solid-start-streaming/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@solidjs/start": "^1.1.3",
"@tanstack/solid-query": "^6.0.0-rc.4",
"@tanstack/solid-query-devtools": "^6.0.0-rc.4",
"@solidjs/web": "^2.0.0-rc.0",
"solid-js": "^2.0.0-rc.0",
"@solidjs/web": "^2.0.0-rc.9",
"solid-js": "^2.0.0-rc.9",
"vinxi": "^0.5.3"
},
"engines": {
Expand Down
8 changes: 4 additions & 4 deletions integrations/solid-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dependencies": {
"@tanstack/solid-query": "workspace:*",
"@tanstack/solid-query-devtools": "workspace:*",
"solid-js": "^2.0.0-rc.0",
"vite": "^6.4.1",
"@solidjs/web": "^2.0.0-rc.0",
"@solidjs/vite-plugin": "^3.0.0-next.27"
"solid-js": "^2.0.0-rc.9",
"vite": "^8.3.0",
"@solidjs/web": "^2.0.0-rc.9",
"@solidjs/vite-plugin": "^3.0.0-next.44"
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"test:pr": "nx affected --targets=test:sherif,test:knip,test:docs,test:eslint,test:lib,test:types,test:build,build",
"test:ci": "nx run-many --targets=test:sherif,test:knip,test:docs,test:eslint,test:lib,test:types,test:build,build",
"test:eslint": "nx affected --target=test:eslint",
"test:sherif": "sherif -i typescript -i solid-js -p \"./integrations/*\" -p \"./examples/*\"",
"test:sherif": "sherif -i typescript -i solid-js -i vite -p \"./integrations/*\" -p \"./examples/*\"",
"test:size": "size-limit",
"test:lib": "nx affected --target=test:lib --exclude=examples/**",
"test:lib:dev": "pnpm run test:lib && nx watch --all -- pnpm run test:lib",
Expand Down
17 changes: 10 additions & 7 deletions packages/solid-query-devtools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,21 @@
"devDependencies": {
"@babel/core": "^7.28.0",
"@babel/preset-typescript": "^7.18.6",
"@solidjs/signals": "^2.0.0-rc.6",
"@solidjs/babel-plugin": "^2.0.0-rc.9",
"@solidjs/signals": "^2.0.0-rc.9",
"@solidjs/testing-library": "^0.8.10",
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/web": "^2.0.0-rc.6",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"@solidjs/web": "^2.0.0-rc.9",
"@tanstack/solid-query": "workspace:*",
"babel-preset-solid": "^2.0.0-rc.2",
"@vitest/coverage-istanbul": "4.0.6",
"npm-run-all2": "^5.0.0",
"solid-js": "^2.0.0-rc.6",
"tsup-preset-solid": "^2.2.0"
"solid-js": "^2.0.0-rc.9",
"tsup-preset-solid": "^2.2.0",
"vite": "^8.3.0",
"vitest": "^4.0.18"
},
"peerDependencies": {
"@tanstack/solid-query": "workspace:^",
"solid-js": ">=2.0.0-beta.0 <3.0.0"
"solid-js": ">=2.0.0-rc.9 <3.0.0"
}
}
17 changes: 8 additions & 9 deletions packages/solid-query-devtools/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
import { parse } from 'path'
import { readFile } from 'fs/promises'
import { transformAsync } from '@babel/core'
import solid from 'babel-preset-solid'
import solid from '@solidjs/babel-plugin'
import ts from '@babel/preset-typescript'
import { defineConfig } from 'tsup'
import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid'

import type { Plugin } from 'esbuild'

// Custom esbuild plugin that uses the locally-installed babel-preset-solid v2,
// which correctly emits '@solidjs/web' imports instead of 'solid-js/web'.
// Custom esbuild plugin that compiles JSX with @solidjs/babel-plugin — the
// Solid 2.0 compiler, whose output targets the same @solidjs/web runtime the
// package declares as a peer (tsup-preset-solid's own plugin is Solid 1.x).
function solidV2Plugin(options: { generate: 'dom' | 'ssr' }): Plugin {
return {
name: 'esbuild:solid-v2',
Expand All @@ -20,10 +21,8 @@ function solidV2Plugin(options: { generate: 'dom' | 'ssr' }): Plugin {
const { name, ext } = parse(args.path)
const filename = name + ext
const result = await transformAsync(source, {
presets: [
[solid, { generate: options.generate }],
[ts, {}],
],
presets: [[ts, {}]],
plugins: [[solid, { generate: options.generate }]],
filename,
sourceMaps: 'inline',
})
Expand Down Expand Up @@ -60,8 +59,8 @@ export default defineConfig(() => {
tsup_option.experimentalDts = true
delete tsup_option.dts

// Replace the default solid esbuild plugin (which uses babel-preset-solid v1)
// with our custom one that uses babel-preset-solid v2 for Solid v2 compatibility.
// Replace the default solid esbuild plugin (Solid 1.x's babel-preset-solid)
// with the Solid 2.0 compiler.
if (tsup_option.esbuildPlugins) {
const nonSolidPlugins = tsup_option.esbuildPlugins.filter(
(p) => !p.name.includes('solid'),
Expand Down
15 changes: 9 additions & 6 deletions packages/solid-query-persist-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,21 @@
"devDependencies": {
"@babel/core": "^7.28.0",
"@babel/preset-typescript": "^7.18.6",
"@solidjs/babel-plugin": "^2.0.0-rc.9",
"@solidjs/testing-library": "^0.8.10",
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/web": "^2.0.0-rc.6",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"@solidjs/web": "^2.0.0-rc.9",
"@tanstack/query-test-utils": "workspace:*",
"@tanstack/solid-query": "workspace:*",
"babel-preset-solid": "^2.0.0-rc.2",
"@vitest/coverage-istanbul": "4.0.6",
"npm-run-all2": "^5.0.0",
"solid-js": "^2.0.0-rc.6",
"tsup-preset-solid": "^2.2.0"
"solid-js": "^2.0.0-rc.9",
"tsup-preset-solid": "^2.2.0",
"vite": "^8.3.0",
"vitest": "^4.0.18"
},
"peerDependencies": {
"@tanstack/solid-query": "workspace:^",
"solid-js": ">=2.0.0-beta.0 <3.0.0"
"solid-js": ">=2.0.0-rc.9 <3.0.0"
}
}
17 changes: 8 additions & 9 deletions packages/solid-query-persist-client/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
import { parse } from 'path'
import { readFile } from 'fs/promises'
import { transformAsync } from '@babel/core'
import solid from 'babel-preset-solid'
import solid from '@solidjs/babel-plugin'
import ts from '@babel/preset-typescript'
import { defineConfig } from 'tsup'
import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid'

import type { Plugin } from 'esbuild'

// Custom esbuild plugin that uses the locally-installed babel-preset-solid v2,
// which correctly emits '@solidjs/web' imports instead of 'solid-js/web'.
// Custom esbuild plugin that compiles JSX with @solidjs/babel-plugin — the
// Solid 2.0 compiler, whose output targets the same @solidjs/web runtime the
// package declares as a peer (tsup-preset-solid's own plugin is Solid 1.x).
function solidV2Plugin(options: { generate: 'dom' | 'ssr' }): Plugin {
return {
name: 'esbuild:solid-v2',
Expand All @@ -20,10 +21,8 @@ function solidV2Plugin(options: { generate: 'dom' | 'ssr' }): Plugin {
const { name, ext } = parse(args.path)
const filename = name + ext
const result = await transformAsync(source, {
presets: [
[solid, { generate: options.generate }],
[ts, {}],
],
presets: [[ts, {}]],
plugins: [[solid, { generate: options.generate }]],
filename,
sourceMaps: 'inline',
})
Expand Down Expand Up @@ -54,8 +53,8 @@ export default defineConfig(() => {
tsup_option.experimentalDts = true
delete tsup_option.dts

// Replace the default solid esbuild plugin (which uses babel-preset-solid v1)
// with our custom one that uses babel-preset-solid v2 for Solid v2 compatibility.
// Replace the default solid esbuild plugin (Solid 1.x's babel-preset-solid)
// with the Solid 2.0 compiler.
if (tsup_option.esbuildPlugins) {
const nonSolidPlugins = tsup_option.esbuildPlugins.filter(
(p) => !p.name.includes('solid'),
Expand Down
17 changes: 10 additions & 7 deletions packages/solid-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,20 @@
"devDependencies": {
"@babel/core": "^7.28.0",
"@babel/preset-typescript": "^7.18.6",
"@solidjs/babel-plugin": "^2.0.0-rc.9",
"@solidjs/testing-library": "^0.8.10",
"@solidjs/vite-plugin": "^3.0.0-next.27",
"@solidjs/web": "^2.0.0-rc.6",
"@solidjs/vite-plugin": "^3.0.0-next.44",
"@solidjs/web": "^2.0.0-rc.9",
"@tanstack/query-test-utils": "workspace:*",
"babel-preset-solid": "^2.0.0-rc.2",
"@vitest/coverage-istanbul": "4.0.6",
"npm-run-all2": "^5.0.0",
"solid-js": "^2.0.0-rc.6",
"tsup-preset-solid": "^2.2.0"
"solid-js": "^2.0.0-rc.9",
"tsup-preset-solid": "^2.2.0",
"vite": "^8.3.0",
"vitest": "^4.0.18"
},
"peerDependencies": {
"@solidjs/web": ">=2.0.0-rc.6 <3.0.0",
"solid-js": ">=2.0.0-rc.6 <3.0.0"
"@solidjs/web": ">=2.0.0-rc.9 <3.0.0",
"solid-js": ">=2.0.0-rc.9 <3.0.0"
}
}
14 changes: 6 additions & 8 deletions packages/solid-query/src/__tests__/useMutation-semantics.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,14 @@ describe('useMutation 2.0 semantics', () => {
expect(rendered.getByText('count: 0, pending: true')).toBeInTheDocument()

// Mutation succeeds at +10ms, invalidation refetch needs +5ms more.
// The settle holds until fresh data lands. Engine sequencing for
// optimistic overlays: async landings commit UNDER the overlay mask,
// then the mask lifts in the immediately-following commit — so fresh
// data appears first with pending still up, and pending clears next.
// The invariant that matters: stale data is never paired with a
// settled mutation — (0, false) never reappears, (0-settled) and
// (1-before-success-landed) don't exist.
// The settle holds until fresh data lands, and the optimistic frame
// releases once nothing authoritative is left to wait on — fresh data
// and the lifted overlay commit in ONE frame. The invariant: stale
// data is never paired with a settled mutation — (0, false) never
// reappears, and (1, true) is not a frame either.
await vi.advanceTimersByTimeAsync(20)
expect(rendered.getByText('count: 1, pending: false')).toBeInTheDocument()
expect(commits).toEqual(['0:false', '0:true', '1:true', '1:false'])
expect(commits).toEqual(['0:false', '0:true', '1:false'])
})

it('reset returns to idle', async () => {
Expand Down
35 changes: 24 additions & 11 deletions packages/solid-query/src/__tests__/useQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,11 +759,18 @@ describe('useQuery', () => {

setCount(1)
await vi.advanceTimersByTimeAsync(10)
// Switching to a disabled key never fetches; the committed value from the
// Switching to a disabled key never fetches; the committed frame from the
// previous key holds while the new (never-arriving) read stays pending.
// Every committed face reads that frame — status included: the meta
// projection's flip to 'pending' is held in the same batch as the data
// node, so it is not visible mid-hold (a write becomes visible at flush,
// to every channel). The pending probe is the one channel that says a
// new answer is outstanding.
expect(fetches).toBe(1)
expect(state.status).toBe('pending')
expect(rendered.getByText('data: 0')).toBeInTheDocument()
expect(state.status).toBe('success')
expect(state.fetchStatus).toBe('idle')
expect(state.isFetching).toBe(true)

// Settle the parked read before the test ends: a transition held on a
// never-resolving promise outlives unmount in the global reactive engine
Expand Down Expand Up @@ -3522,8 +3529,13 @@ describe('useQuery', () => {

fireEvent.click(rendered.getByRole('button', { name: /reset/i }))
await vi.advanceTimersByTimeAsync(5)
// Reset wipes the committed data and refetches from scratch
expect(state.isPending).toBe(true)
// Reset wipes the cache entry and refetches from scratch. The refetch
// is a transition: the committed frame — data AND the meta faces read
// from it — holds until the new answer lands, so `isPending` stays
// false and the DOM keeps 'data: 1'. The pending probe is what reports
// the outstanding fetch.
expect(rendered.getByText('data: 1')).toBeInTheDocument()
expect(state.isPending).toBe(false)
expect(state.isFetching).toBe(true)

await vi.advanceTimersByTimeAsync(5)
Expand Down Expand Up @@ -3579,15 +3591,16 @@ describe('useQuery', () => {

fireEvent.click(rendered.getByRole('button', { name: /reset/i }))
await vi.advanceTimersByTimeAsync(10)
// Resetting a disabled query does not refetch
expect(state.isPending).toBe(true)
// Resetting a disabled query does not refetch. The data read parks on
// the wiped entry (nothing cached, nothing enabled to fetch it), and a
// parked read is a hold: the committed frame — 'data: 1', status
// 'success' — stays up, so `isPending` reads false. `fetchStatus` is
// the honest "nothing in flight" here; `isFetching` ORs in the pending
// probe on the parked node and reports true (see port-notes/useQuery.md).
expect(rendered.getByText('data: 1')).toBeInTheDocument()
expect(state.isPending).toBe(false)
expect(state.fetchStatus).toBe('idle')
expect(count).toBe(1)
// PORT-REVIEW (kept running): `state.isFetching` reports true here even
// though nothing fetches — the isFetching projection ORs in a
// "value pending" probe on the data node, and after a reset the disabled
// query's data read is parked pending forever. Asserting via fetchStatus
// (which correctly reads 'idle') instead. See port-notes/useQuery.md.

// Settle the parked pending read before the test ends (a never-resolving
// read held past unmount corrupts the global reactive engine).
Expand Down
Loading
Loading