Skip to content

Commit

Permalink
Merge branch 'main' into ts-test-matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
lachlancollins authored Jun 22, 2024
2 parents c835c7b + 32bce35 commit 271b181
Show file tree
Hide file tree
Showing 12 changed files with 575 additions and 578 deletions.
2 changes: 1 addition & 1 deletion examples/react/basic-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"typescript": "5.3.3",
"vite": "^5.2.11"
Expand Down
2 changes: 1 addition & 1 deletion examples/react/shadow-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"typescript": "5.3.3",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"namespace": "@tanstack",
"devDependencies": {
"@arethetypeswrong/cli": "^0.15.3",
"@cspell/eslint-plugin": "^8.8.1",
"@cspell/eslint-plugin": "^8.9.1",
"@solidjs/testing-library": "^0.8.8",
"@tanstack/config": "^0.7.11",
"@testing-library/jest-dom": "^6.4.5",
Expand All @@ -52,16 +52,16 @@
"@types/node": "^20.12.12",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@vitest/coverage-istanbul": "^1.6.0",
"cpy-cli": "^5.0.0",
"esbuild-plugin-file-path-extensions": "^2.1.0",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react-hooks": "^4.6.2",
"husky": "^9.0.11",
"jsdom": "^24.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-query-devtools-experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@angular/core": "^17.3.10",
"@angular/common": "^17.3.10",
"@tanstack/angular-query-experimental": "workspace:*",
"eslint-plugin-jsdoc": "^48.2.7",
"eslint-plugin-jsdoc": "^48.2.13",
"ng-packagr": "^17.3.0",
"typescript": "5.3.3",
"zone.js": "^0.14.6"
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-query-experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@angular/core": "^17.3.10",
"@angular/platform-browser": "^17.3.10",
"@angular/platform-browser-dynamic": "^17.3.10",
"eslint-plugin-jsdoc": "^48.2.7",
"eslint-plugin-jsdoc": "^48.2.13",
"@microsoft/api-extractor": "^7.46.2",
"ng-packagr": "^17.3.0",
"typescript": "5.3.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/eslint-plugin-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"src"
],
"dependencies": {
"@typescript-eslint/utils": "8.0.0-alpha.28"
"@typescript-eslint/utils": "8.0.0-alpha.30"
},
"devDependencies": {
"@typescript-eslint/rule-tester": "8.0.0-alpha.28",
"eslint": "^9.4.0"
"@typescript-eslint/rule-tester": "8.0.0-alpha.30",
"eslint": "^9.5.0"
},
"peerDependencies": {
"eslint": "^8 || ^9"
Expand Down
2 changes: 1 addition & 1 deletion packages/query-core/src/__tests__/queryClient.test-d.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('getQueryData', () => {
})

it('should only allow Arrays to be passed', () => {
const queryKey = 'key' as const
const queryKey = 'key'
const queryClient = new QueryClient()
// @ts-expect-error TS2345: Argument of type 'string' is not assignable to parameter of type 'QueryKey'
return queryClient.getQueryData(queryKey)
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte-query-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"@sveltejs/package": "^2.3.1",
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"@tanstack/svelte-query": "workspace:*",
"eslint-plugin-svelte": "^2.39.0",
"eslint-plugin-svelte": "^2.40.0",
"svelte": "^4.2.17",
"svelte-check": "^3.7.1",
"svelte-eslint-parser": "^0.36.0"
"svelte-eslint-parser": "^0.39.1"
},
"peerDependencies": {
"@tanstack/svelte-query": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte-query-persist-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"@tanstack/svelte-query": "workspace:*",
"@testing-library/svelte": "^5.1.0",
"eslint-plugin-svelte": "^2.39.0",
"eslint-plugin-svelte": "^2.40.0",
"svelte": "^4.2.17",
"svelte-check": "^3.7.1",
"svelte-eslint-parser": "^0.36.0"
"svelte-eslint-parser": "^0.39.1"
},
"peerDependencies": {
"@tanstack/svelte-query": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"@sveltejs/package": "^2.3.1",
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"@testing-library/svelte": "^5.1.0",
"eslint-plugin-svelte": "^2.39.0",
"eslint-plugin-svelte": "^2.40.0",
"svelte": "^4.2.17",
"svelte-check": "^3.7.1",
"svelte-eslint-parser": "^0.36.0"
"svelte-eslint-parser": "^0.39.1"
},
"peerDependencies": {
"svelte": "^3.54.0 || ^4.0.0 || ^5.0.0-next.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-query/src/__tests__/queryClient.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('getQueryData', () => {
})

it('should only allow Arrays to be passed', () => {
const queryKey = 'key' as const
const queryKey = 'key'
const queryClient = new QueryClient()
// @ts-expect-error TS2345: Argument of type 'string' is not assignable to parameter of type 'QueryKey'
return queryClient.getQueryData(queryKey)
Expand Down
Loading

0 comments on commit 271b181

Please sign in to comment.