Skip to content

chore: upgrade to solid v2 beta 10 #10616

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
brenelz wants to merge 1 commit into
base: solid-query-v6-pre
Choose a base branch
from
Open

chore: upgrade to solid v2 beta 10 #10616

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
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-beta.4",
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"astro": "^5.5.6",
"@solidjs/web": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.7",
"@solidjs/web": "2.0.0-beta.10",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^3.4.7",
"typescript": "5.8.3"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/astro/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"extends": "astro/tsconfigs/strict",
"compilerOptions": {
"jsx": "preserve",
"jsxImportSource": "solid-js"
"jsxImportSource": "@solidjs/web"
}
}
4 changes: 2 additions & 2 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,8 +12,8 @@
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"graphql": "^16.9.0",
"graphql-request": "^7.1.2",
"@solidjs/web": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.7"
"@solidjs/web": "2.0.0-beta.10",
"solid-js": "2.0.0-beta.10"
},
"devDependencies": {
"typescript": "5.8.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/basic-graphql-request/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",

/* Linting */
"strict": true,
Expand Down
4 changes: 2 additions & 2 deletions examples/solid/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dependencies": {
"@tanstack/solid-query": "^6.0.0-beta.4",
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"@solidjs/web": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.7"
"@solidjs/web": "2.0.0-beta.10",
"solid-js": "2.0.0-beta.10"
},
"devDependencies": {
"typescript": "5.8.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/basic/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",

/* Linting */
"strict": true,
Expand Down
4 changes: 2 additions & 2 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,8 +10,8 @@
"dependencies": {
"@tanstack/solid-query": "^6.0.0-beta.4",
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"@solidjs/web": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.7"
"@solidjs/web": "2.0.0-beta.10",
"solid-js": "2.0.0-beta.10"
},
"devDependencies": {
"typescript": "5.8.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/default-query-function/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",

/* Linting */
"strict": true,
Expand Down
4 changes: 2 additions & 2 deletions examples/solid/offline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"@tanstack/solid-query-persist-client": "^6.0.0-beta.4",
"msw": "^2.6.6",
"@solidjs/web": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.7"
"@solidjs/web": "2.0.0-beta.10",
"solid-js": "2.0.0-beta.10"
},
"devDependencies": {
"typescript": "5.8.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/offline/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",

/* Linting */
"strict": true,
Expand Down
4 changes: 2 additions & 2 deletions examples/solid/simple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dependencies": {
"@tanstack/solid-query": "^6.0.0-beta.4",
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"@solidjs/web": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.7"
"@solidjs/web": "2.0.0-beta.10",
"solid-js": "2.0.0-beta.10"
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.91.5",
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/simple/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",

/* Linting */
"strict": true,
Expand Down
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-beta.4",
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"@solidjs/web": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.7",
"@solidjs/web": "2.0.0-beta.10",
"solid-js": "2.0.0-beta.10",
"vinxi": "^0.5.3"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/solid-start-streaming/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"allowJs": true,
"strict": true,
"noEmit": true,
Expand Down
4 changes: 2 additions & 2 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-beta.7",
"solid-js": "2.0.0-beta.10",
"vite": "^6.4.1",
"vite-plugin-solid": "3.0.0-next.5",
"@solidjs/web": "2.0.0-beta.7"
"@solidjs/web": "2.0.0-beta.10"
}
}
6 changes: 3 additions & 3 deletions packages/solid-query-devtools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
"@babel/core": "^7.28.0",
"@babel/preset-typescript": "^7.18.6",
"@solidjs/testing-library": "^0.8.10",
"@solidjs/web": "2.0.0-beta.7",
"@solidjs/web": "2.0.0-beta.10",
"@tanstack/solid-query": "workspace:*",
"babel-preset-solid": "2.0.0-beta.7",
"babel-preset-solid": "2.0.0-beta.10",
"npm-run-all2": "^5.0.0",
"solid-js": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.10",
"tsup-preset-solid": "^2.2.0",
"vite-plugin-solid": "3.0.0-next.5"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/solid-query-devtools/src/clientOnly.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
untrack,
} from 'solid-js'
import { isServer } from '@solidjs/web'
import type { Component, ComponentProps, JSX } from 'solid-js'
import type { Component, ComponentProps } from 'solid-js'
import type { JSX } from '@solidjs/web'

/*
This function has been taken from solid-start's codebase
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query-devtools/src/devtoolsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { onlineManager, useQueryClient } from '@tanstack/solid-query'
import { TanstackQueryDevtoolsPanel } from '@tanstack/query-devtools'
import type { DevtoolsErrorType, Theme } from '@tanstack/query-devtools'
import type { QueryClient } from '@tanstack/solid-query'
import type { JSX } from 'solid-js'
import type { JSX } from '@solidjs/web'

export interface DevtoolsPanelOptions {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query-devtools/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"outDir": "./dist-ts",
"rootDir": ".",
"jsx": "preserve",
"jsxImportSource": "solid-js"
"jsxImportSource": "@solidjs/web"
},
"include": ["src", "*.config.*", "package.json"],
"references": [{ "path": "../query-devtools" }, { "path": "../solid-query" }]
Expand Down
3 changes: 2 additions & 1 deletion packages/solid-query-devtools/tsconfig.prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"compilerOptions": {
"incremental": false,
"composite": false,
"rootDir": "../../"
"rootDir": "../../",
"customConditions": []
}
}
6 changes: 3 additions & 3 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 @@ -69,12 +69,12 @@
"@babel/core": "^7.28.0",
"@babel/preset-typescript": "^7.18.6",
"@solidjs/testing-library": "^0.8.10",
"@solidjs/web": "2.0.0-beta.7",
"@solidjs/web": "2.0.0-beta.10",
"@tanstack/query-test-utils": "workspace:*",
"@tanstack/solid-query": "workspace:*",
"babel-preset-solid": "2.0.0-beta.7",
"babel-preset-solid": "2.0.0-beta.10",
"npm-run-all2": "^5.0.0",
"solid-js": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.10",
"tsup-preset-solid": "^2.2.0",
"vite-plugin-solid": "3.0.0-next.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query-persist-client/src/PersistQueryClientProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { createEffect, createMemo, createSignal, onCleanup } from 'solid-js'
import { IsRestoringContext, QueryClientProvider } from '@tanstack/solid-query'
import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core'
import type { OmitKeyof, QueryClientProviderProps } from '@tanstack/solid-query'
import type { JSX } from 'solid-js'
import type { JSX } from '@solidjs/web'

export type PersistQueryClientProviderProps = QueryClientProviderProps & {
persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query-persist-client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"outDir": "./dist-ts",
"rootDir": ".",
"jsx": "preserve",
"jsxImportSource": "solid-js"
"jsxImportSource": "@solidjs/web"
},
"include": ["src", "test-setup.ts", "*.config.*", "package.json"],
"references": [
Expand Down
6 changes: 3 additions & 3 deletions packages/solid-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
"@babel/core": "^7.28.0",
"@babel/preset-typescript": "^7.18.6",
"@solidjs/testing-library": "^0.8.10",
"@solidjs/web": "2.0.0-beta.7",
"@solidjs/web": "2.0.0-beta.10",
"@tanstack/query-test-utils": "workspace:*",
"babel-preset-solid": "2.0.0-beta.7",
"babel-preset-solid": "2.0.0-beta.10",
"npm-run-all2": "^5.0.0",
"solid-js": "2.0.0-beta.7",
"solid-js": "2.0.0-beta.10",
"tsup-preset-solid": "^2.2.0",
"vite-plugin-solid": "3.0.0-next.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query/src/QueryClientProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createContext, onCleanup, useContext } from 'solid-js'
import type { QueryClient } from './QueryClient'
import type { JSX } from 'solid-js'
import type { JSX } from '@solidjs/web'

export const QueryClientContext = createContext<(() => QueryClient) | null>(
null,
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query/src/__tests__/useIsMutating.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('useIsMutating', () => {

await vi.advanceTimersByTimeAsync(150)

expect(isMutatingArray).toEqual([0, 1, 2, 1, 0])
expect(isMutatingArray).toEqual([0, 1, 0])
})

it('should filter correctly by mutationKey', async () => {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -44,7 +44,7 @@ import type {
UseQueryResult,
} from '..'
import type { Mock } from 'vitest'
import type { JSX } from 'solid-js'
import type { JSX } from '@solidjs/web'

describe('useQuery', () => {
const queryCache = new QueryCache()
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"outDir": "./dist-ts",
"rootDir": ".",
"jsx": "preserve",
"jsxImportSource": "solid-js"
"jsxImportSource": "@solidjs/web"
},
"include": ["src", "test-setup.ts", "*.config.*", "package.json"],
"references": [{ "path": "../query-core" }]
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-query/tsconfig.legacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"outDir": "./dist-ts/legacy"
},
"include": ["src"],
Expand Down
Loading
Loading