Skip to content

Commit

Permalink
Merge branch 'main' into fixing-type-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
TkDodo authored Dec 17, 2024
2 parents e464740 + 4521a04 commit 3b26d75
Show file tree
Hide file tree
Showing 10 changed files with 252 additions and 251 deletions.
4 changes: 2 additions & 2 deletions docs/framework/react/plugins/broadcastQueryClient.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ broadcastQueryClient({ queryClient, broadcastChannel })
An object of options:

```tsx
interface broadcastQueryClient {
interface BroadcastQueryClientOptions {
/** The QueryClient to sync */
queryClient: QueryClient
/** This is the unique channel name that will be used
Expand All @@ -56,6 +56,6 @@ The default options are:

```tsx
{
broadcastChannel = 'react-query',
broadcastChannel = 'tanstack-query',
}
```
4 changes: 2 additions & 2 deletions examples/react/nextjs-app-prefetching/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"typescript": "5.7.2"
}
}
4 changes: 2 additions & 2 deletions examples/react/shadow-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
Expand Down
4 changes: 2 additions & 2 deletions integrations/react-next-15/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"tupleson": "0.23.1"
},
"devDependencies": {
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"typescript": "5.7.2"
}
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
"@testing-library/jest-dom": "^6.6.3",
"@types/eslint": "^9.6.1",
"@types/node": "^22.9.3",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitest/coverage-istanbul": "^2.0.4",
"@vitest/eslint-plugin": "^1.1.0",
"cpy-cli": "^5.0.0",
"esbuild-plugin-file-path-extensions": "^2.1.2",
"eslint": "^9.15.0",
"eslint-plugin-react-hooks": "^5.1.0-rc-a19a8ab4-20240829",
"eslint-plugin-react-hooks": "^5.1.0",
"jsdom": "^25.0.1",
"knip": "^5.37.2",
"nx": "^20.1.3",
Expand All @@ -76,8 +76,8 @@
},
"pnpm": {
"overrides": {
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@types/react": "$@types/react",
"@types/react-dom": "$@types/react",
"eslint": "$eslint"
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-query-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"devDependencies": {
"@tanstack/react-query": "workspace:*",
"@testing-library/react": "^16.0.1",
"@types/react": "npm:types-react@rc",
"@types/react": "^19.0.0",
"@vitejs/plugin-react": "^4.3.3",
"react": "^19.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-query-next-experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
],
"devDependencies": {
"@tanstack/react-query": "workspace:*",
"@types/react": "npm:types-react@rc",
"@types/react": "^19.0.0",
"@vitejs/plugin-react": "^4.3.3",
"next": "^14.2.18",
"react": "^19.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-query-persist-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"devDependencies": {
"@tanstack/react-query": "workspace:*",
"@testing-library/react": "^16.0.1",
"@types/react": "npm:types-react@rc",
"@types/react": "^19.0.0",
"@vitejs/plugin-react": "^4.3.3",
"react": "^19.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/react-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"@tanstack/query-persist-client-core": "workspace:*",
"@testing-library/react": "^16.0.1",
"@testing-library/react-render-stream": "^2.0.0",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitejs/plugin-react": "^4.3.3",
"eslint-plugin-react-compiler": "19.0.0-beta-0dec889-20241115",
"react": "^19.0.0",
Expand Down
Loading

0 comments on commit 3b26d75

Please sign in to comment.