Skip to content

Commit

Permalink
Merge branch 'main' into zhihengGet/main
Browse files Browse the repository at this point in the history
  • Loading branch information
@lachlancollins
lachlancollins committed Jul 16, 2024
2 parents f0ebbf8 + 38e5c4b commit c0bc55c
Show file tree
Hide file tree
Showing 63 changed files with 1,454 additions and 1,280 deletions.
1 change: 1 addition & 0 deletions eslint.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export default [
'ts/ban-types': 'off',
'ts/no-empty-function': 'off',
'no-case-declarations': 'off',
'prefer-const': 'off',
},
},
]
4 changes: 2 additions & 2 deletions examples/react/algolia/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@tanstack/eslint-plugin-query": "^5.51.1",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/basic-graphql-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"vite": "^5.2.11"
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"@tanstack/eslint-plugin-query": "^5.51.1",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/default-query-function/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/offline/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"react-hot-toast": "^2.4.1"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
},
"msw": {
"workerDirectory": [
Expand Down
4 changes: 2 additions & 2 deletions examples/react/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/react-router/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@types/sort-by": "^1.2.3",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/rick-morty/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"react-router-dom": "^6.23.1"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/shadow-dom/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@types/react-dom": "npm:types-react-dom@rc",
"@typescript-eslint/eslint-plugin": "^7.15.0",
"@typescript-eslint/parser": "^7.15.0",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/simple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/star-wars/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"react-router-dom": "^6.23.1"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/react/suspense/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"react-error-boundary": "^4.0.13"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/solid/astro/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.7.0",
"@astrojs/check": "^0.8.1",
"@astrojs/node": "^8.2.5",
"@astrojs/solid-js": "^4.2.0",
"@astrojs/tailwind": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/basic-graphql-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"typescript": "5.3.3",
"vite": "^5.2.11",
"vite": "^5.3.3",
"vite-plugin-solid": "^2.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/solid/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"typescript": "5.3.3",
"vite": "^5.2.11",
"vite": "^5.3.3",
"vite-plugin-solid": "^2.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/solid/default-query-function/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"typescript": "5.3.3",
"vite": "^5.2.11",
"vite": "^5.3.3",
"vite-plugin-solid": "^2.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/solid/simple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.51.1",
"typescript": "5.3.3",
"vite": "^5.2.11",
"vite": "^5.3.3",
"vite-plugin-solid": "^2.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/auto-refetching/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"svelte": "5.0.0-next.183",
"svelte-check": "^3.7.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
8 changes: 4 additions & 4 deletions examples/svelte/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"@tanstack/svelte-query-devtools": "^5.51.1"
},
"devDependencies": {
"@sveltejs/adapter-auto": "^3.2.0",
"@sveltejs/kit": "^2.5.9",
"@sveltejs/adapter-auto": "^3.2.2",
"@sveltejs/kit": "^2.5.18",
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.3",
"svelte": "5.0.0-next.183",
"svelte-check": "^3.7.1",
"svelte-check": "^3.8.4",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/load-more-infinite-scroll/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"svelte": "5.0.0-next.183",
"svelte-check": "^3.7.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/optimistic-updates-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"svelte": "5.0.0-next.183",
"svelte-check": "^3.7.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"svelte": "5.0.0-next.183",
"svelte-check": "^3.7.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/simple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"svelte": "5.0.0-next.183",
"svelte-check": "^3.7.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/ssr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"svelte": "5.0.0-next.183",
"svelte-check": "^3.7.1",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/star-wars/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"svelte-check": "^3.7.1",
"tailwindcss": "^3.4.3",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/vue/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/vue/dependent-queries/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/vue/persister/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/vue/simple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"typescript": "5.3.3",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions integrations/react-vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dependencies": {
"@tanstack/react-query": "workspace:*",
"@tanstack/react-query-devtools": "workspace:*",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"react": "19.0.0-rc-4c2e457c7c-20240522",
"react-dom": "19.0.0-rc-4c2e457c7c-20240522",
"vite": "^5.2.11"
"vite": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion integrations/solid-vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@tanstack/solid-query": "workspace:*",
"@tanstack/solid-query-devtools": "workspace:*",
"solid-js": "^1.8.17",
"vite": "^5.2.11",
"vite": "^5.3.3",
"vite-plugin-solid": "^2.10.2"
}
}
4 changes: 2 additions & 2 deletions integrations/vue-vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"typescript": "5.3.3",
"vite": "^5.2.11",
"vue-tsc": "^1.8.26"
"vite": "^5.3.3",
"vue-tsc": "^2.0.26"
}
}
25 changes: 13 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "git",
"url": "https://github.com/TanStack/query.git"
},
"packageManager": "pnpm@9.4.0",
"packageManager": "pnpm@9.5.0",
"type": "module",
"scripts": {
"clean": "pnpm --filter \"./packages/**\" run clean",
Expand Down Expand Up @@ -42,10 +42,11 @@
"@cspell/eslint-plugin": "^8.9.1",
"@eslint-react/eslint-plugin": "^1.5.16",
"@solidjs/testing-library": "^0.8.8",
"@tanstack/config": "^0.9.6",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"@types/node": "^20.12.12",
"@tanstack/config": "^0.9.8",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/react": "^16.0.0",
"@types/eslint": "^8.56.10",
"@types/node": "^20.14.10",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@vitest/coverage-istanbul": "^2.0.2",
Expand All @@ -54,17 +55,17 @@
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"husky": "^9.0.11",
"jsdom": "^24.0.0",
"knip": "^5.16.0",
"jsdom": "^24.1.0",
"knip": "^5.26.0",
"lint-staged": "^15.2.2",
"nx": "^19.3.0",
"nx": "^19.4.3",
"prettier": "^4.0.0-alpha.8",
"prettier-plugin-svelte": "^3.2.3",
"publint": "^0.2.7",
"publint": "^0.2.8",
"react": "19.0.0-rc-4c2e457c7c-20240522",
"react-dom": "19.0.0-rc-4c2e457c7c-20240522",
"rimraf": "^5.0.7",
"sherif": "^0.8.4",
"sherif": "^0.10.0",
"solid-js": "^1.8.17",
"tsup": "^8.0.2",
"typescript": "5.3.3",
Expand All @@ -74,8 +75,8 @@
"typescript50": "npm:[email protected]",
"typescript51": "npm:[email protected]",
"typescript52": "npm:[email protected]",
"vite": "^5.2.11",
"vitest": "^2.0.2"
"vite": "^5.3.3",
"vitest": "^2.0.3"
},
"pnpm": {
"overrides": {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-query-devtools-experimental/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@angular/compiler-cli": "^17.3.10",
"@angular/core": "^17.3.10",
"@tanstack/angular-query-experimental": "workspace:*",
"eslint-plugin-jsdoc": "^48.2.13",
"eslint-plugin-jsdoc": "^48.7.0",
"ng-packagr": "^17.3.0",
"typescript": "5.3.3",
"zone.js": "^0.14.6"
Expand Down
Loading

0 comments on commit c0bc55c

Please sign in to comment.