Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TanStack/query
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.49.0
Choose a base ref
...
head repository: TanStack/query
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.49.1
Choose a head ref
  • 4 commits
  • 88 files changed
  • 3 contributors

Commits on Jun 30, 2024

  1. ci: Optimise Nx workflow (#7648) 

    * ci: Optimise Nx workflow

* Merge test:build and test:attw
    @lachlancollins
    lachlancollins authored Jun 30, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    a80cea3 View commit details

  2. docs(examples): Update Next.js version (#7649)

    @lachlancollins
    lachlancollins authored Jun 30, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    f454bf1 View commit details

  3. fix(react-query): add experimental beforeQuery/afterQuery client opti… 

    …ons (#7650)
    @tannerlinsley
    tannerlinsley authored Jun 30, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    8927e4c View commit details

  4. release: v5.49.1

    @tannerlinsley
    tannerlinsley committed Jun 30, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    3ee5bd8 View commit details
Showing with 457 additions and 446 deletions.
  1. +3 −12 .github/workflows/ci.yml
  2. +5 −12 .github/workflows/pr.yml
  3. +3 −3 .nx/workflows/dynamic-changesets.yaml
  4. +2 −2 examples/angular/basic/package.json
  5. +2 −2 examples/angular/infinite-query-with-max-pages/package.json
  6. +2 −2 examples/angular/router/package.json
  7. +2 −2 examples/angular/simple/package.json
  8. +3 −3 examples/react/algolia/package.json
  9. +6 −1 examples/react/auto-refetching/next.config.js
  10. +4 −3 examples/react/auto-refetching/package.json
  11. +2 −2 examples/react/basic-graphql-request/package.json
  12. +5 −5 examples/react/basic-typescript/package.json
  13. +3 −3 examples/react/basic/package.json
  14. +2 −2 examples/react/default-query-function/package.json
  15. +6 −1 examples/react/infinite-query-with-max-pages/next.config.js
  16. +4 −3 examples/react/infinite-query-with-max-pages/package.json
  17. +6 −1 examples/react/load-more-infinite-scroll/next.config.js
  18. +4 −3 examples/react/load-more-infinite-scroll/package.json
  19. +3 −1 examples/react/nextjs-app-prefetching/next.config.js
  20. +3 −2 examples/react/nextjs-app-prefetching/package.json
  21. +3 −1 examples/react/nextjs-suspense-streaming/next.config.js
  22. +5 −4 examples/react/nextjs-suspense-streaming/package.json
  23. +6 −1 examples/react/nextjs/next.config.js
  24. +4 −3 examples/react/nextjs/package.json
  25. +4 −4 examples/react/offline/package.json
  26. +6 −1 examples/react/optimistic-updates-cache/next.config.js
  27. +4 −3 examples/react/optimistic-updates-cache/package.json
  28. +6 −1 examples/react/optimistic-updates-ui/next.config.js
  29. +4 −3 examples/react/optimistic-updates-ui/package.json
  30. +6 −1 examples/react/pagination/next.config.js
  31. +4 −3 examples/react/pagination/package.json
  32. +2 −2 examples/react/playground/package.json
  33. +6 −1 examples/react/prefetching/next.config.js
  34. +4 −3 examples/react/prefetching/package.json
  35. +2 −2 examples/react/react-native/package.json
  36. +2 −2 examples/react/react-router/package.json
  37. +2 −2 examples/react/rick-morty/package.json
  38. +2 −2 examples/react/shadow-dom/package.json
  39. +2 −2 examples/react/simple/package.json
  40. +2 −2 examples/react/star-wars/package.json
  41. +2 −2 examples/react/suspense/package.json
  42. +2 −2 examples/solid/astro/package.json
  43. +2 −2 examples/solid/basic-graphql-request/package.json
  44. +2 −2 examples/solid/basic-typescript/package.json
  45. +2 −2 examples/solid/default-query-function/package.json
  46. +3 −3 examples/solid/simple/package.json
  47. +2 −2 examples/solid/solid-start-streaming/package.json
  48. +2 −2 examples/svelte/auto-refetching/package.json
  49. +2 −2 examples/svelte/basic/package.json
  50. +2 −2 examples/svelte/load-more-infinite-scroll/package.json
  51. +2 −2 examples/svelte/optimistic-updates-typescript/package.json
  52. +2 −2 examples/svelte/playground/package.json
  53. +2 −2 examples/svelte/simple/package.json
  54. +2 −2 examples/svelte/ssr/package.json
  55. +2 −2 examples/svelte/star-wars/package.json
  56. +1 −1 examples/vue/2.6-basic/package.json
  57. +1 −1 examples/vue/2.7-basic/package.json
  58. +2 −2 examples/vue/basic/package.json
  59. +1 −1 examples/vue/dependent-queries/package.json
  60. +1 −1 examples/vue/nuxt3/package.json
  61. +4 −4 examples/vue/persister/package.json
  62. +2 −2 examples/vue/simple/package.json
  63. +1 −1 integrations/react-next/package.json
  64. +0 −5 nx.json
  65. +2 −3 package.json
  66. +2 −3 packages/angular-query-devtools-experimental/package.json
  67. +2 −3 packages/angular-query-experimental/package.json
  68. +2 −3 packages/eslint-plugin-query/package.json
  69. +2 −3 packages/query-async-storage-persister/package.json
  70. +2 −3 packages/query-broadcast-client-experimental/package.json
  71. +2 −3 packages/query-core/package.json
  72. +2 −3 packages/query-devtools/package.json
  73. +2 −3 packages/query-persist-client-core/package.json
  74. +2 −3 packages/query-sync-storage-persister/package.json
  75. +2 −3 packages/react-query-devtools/package.json
  76. +3 −4 packages/react-query-next-experimental/package.json
  77. +2 −3 packages/react-query-persist-client/package.json
  78. +2 −3 packages/react-query/package.json
  79. +6 −0 packages/react-query/src/useBaseQuery.ts
  80. +2 −3 packages/solid-query-devtools/package.json
  81. +2 −3 packages/solid-query-persist-client/package.json
  82. +2 −3 packages/solid-query/package.json
  83. +2 −3 packages/svelte-query-devtools/package.json
  84. +2 −3 packages/svelte-query-persist-client/package.json
  85. +2 −3 packages/svelte-query/package.json
  86. +2 −3 packages/vue-query-devtools/package.json
  87. +2 −3 packages/vue-query/package.json
  88. +216 −222 pnpm-lock.yaml
15 changes: 3 additions & 12 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -25,18 +25,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Setup pnpm
uses: pnpm/action-setup@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: pnpm
fetch-depth: 0
- name: Start Nx Agents
run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml"
- name: Install dependencies
run: pnpm install --frozen-lockfile --prefer-offline
- name: Setup Tools
uses: tanstack/config/.github/setup@main
- name: Run Tests
run: pnpm run test:ci --parallel=3
- name: Stop Nx Agents
@@ -49,10 +42,8 @@ jobs:
npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
pnpm run cipublish
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
TAG: ${{ inputs.tag }}
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
17 changes: 5 additions & 12 deletions .github/workflows/pr.yml
View file
Original file line number Diff line number Diff line change
@@ -13,27 +13,20 @@ env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

jobs:
main:
name: Nx Cloud - Main Job
test:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup pnpm
uses: pnpm/action-setup@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: pnpm
- name: Start Nx Agents
run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml"
- name: Install dependencies
run: pnpm install --frozen-lockfile --prefer-offline
- name: Setup Tools
uses: tanstack/config/.github/setup@main
- name: Get base and head commits for `nx affected`
uses: nrwl/nx-set-shas@v3
uses: nrwl/nx-set-shas@v4
with:
main-branch-name: 'main'
- name: Run Tests
6 changes: 3 additions & 3 deletions .nx/workflows/dynamic-changesets.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distribute-on:
small-changeset: 8 linux-medium-js
medium-changeset: 10 linux-medium-js
large-changeset: 12 linux-medium-js
small-changeset: 3 linux-medium-js
medium-changeset: 6 linux-medium-js
large-changeset: 10 linux-medium-js
4 changes: 2 additions & 2 deletions examples/angular/basic/package.json
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
"@angular/core": "^17.3.10",
"@angular/platform-browser": "^17.3.10",
"@angular/platform-browser-dynamic": "^17.3.10",
"@tanstack/angular-query-experimental": "^5.49.0",
"@tanstack/angular-query-experimental": "^5.49.1",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
"zone.js": "^0.14.6"
@@ -23,7 +23,7 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.10",
"@tanstack/angular-query-devtools-experimental": "^5.49.0",
"@tanstack/angular-query-devtools-experimental": "^5.49.1",
"typescript": "5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/angular/infinite-query-with-max-pages/package.json
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
"@angular/core": "^17.3.10",
"@angular/platform-browser": "^17.3.10",
"@angular/platform-browser-dynamic": "^17.3.10",
"@tanstack/angular-query-experimental": "^5.49.0",
"@tanstack/angular-query-experimental": "^5.49.1",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
"zone.js": "^0.14.6"
@@ -23,7 +23,7 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.10",
"@tanstack/angular-query-devtools-experimental": "^5.49.0",
"@tanstack/angular-query-devtools-experimental": "^5.49.1",
"typescript": "5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/angular/router/package.json
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
"@angular/platform-browser": "^17.3.10",
"@angular/platform-browser-dynamic": "^17.3.10",
"@angular/router": "^17.3.10",
"@tanstack/angular-query-experimental": "^5.49.0",
"@tanstack/angular-query-experimental": "^5.49.1",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
"zone.js": "^0.14.6"
@@ -24,7 +24,7 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.10",
"@tanstack/angular-query-devtools-experimental": "^5.49.0",
"@tanstack/angular-query-devtools-experimental": "^5.49.1",
"typescript": "5.3.3"
}
}
4 changes: 2 additions & 2 deletions examples/angular/simple/package.json
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
"@angular/platform-browser": "^17.3.10",
"@angular/platform-browser-dynamic": "^17.3.10",
"@angular/router": "^17.3.10",
"@tanstack/angular-query-experimental": "^5.49.0",
"@tanstack/angular-query-experimental": "^5.49.1",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
"zone.js": "^0.14.6"
@@ -24,7 +24,7 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.10",
"@tanstack/angular-query-devtools-experimental": "^5.49.0",
"@tanstack/angular-query-devtools-experimental": "^5.49.1",
"typescript": "5.3.3"
}
}
6 changes: 3 additions & 3 deletions examples/react/algolia/package.json
View file
Original file line number Diff line number Diff line change
@@ -11,14 +11,14 @@
"dependencies": {
"@algolia/client-search": "4.23.3",
"@algolia/transporter": "4.23.3",
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"algoliasearch": "4.23.3",
"react": "19.0.0-rc-4c2e457c7c-20240522",
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.49.0",
"@tanstack/eslint-plugin-query": "^5.49.1",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@vitejs/plugin-react": "^4.2.1",
7 changes: 6 additions & 1 deletion examples/react/auto-refetching/next.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
module.exports = {
// @ts-check

/** @type {import('next').NextConfig} */
const nextConfig = {
eslint: {
ignoreDuringBuilds: true,
},
}

export default nextConfig
7 changes: 4 additions & 3 deletions examples/react/auto-refetching/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"name": "@tanstack/query-example-react-auto-refetching",
"private": true,
"type": "module",
"scripts": {
"dev": "next",
"build": "next build",
"start": "next start"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"axios": "^1.6.8",
"isomorphic-unfetch": "4.0.2",
"next": "^14.0.0",
"next": "^14.2.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
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
@@ -8,8 +8,8 @@
"preview": "vite preview"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"graphql": "^16.8.1",
"graphql-request": "^7.0.1",
"react": "19.0.0-rc-4c2e457c7c-20240522",
10 changes: 5 additions & 5 deletions examples/react/basic-typescript/package.json
View file
Original file line number Diff line number Diff line change
@@ -9,16 +9,16 @@
"test:types": "tsc"
},
"dependencies": {
"@tanstack/query-sync-storage-persister": "^5.49.0",
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query-persist-client": "^5.49.0",
"@tanstack/query-sync-storage-persister": "^5.49.1",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"@tanstack/react-query-persist-client": "^5.49.1",
"axios": "^1.6.8",
"react": "19.0.0-rc-4c2e457c7c-20240522",
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.49.0",
"@tanstack/eslint-plugin-query": "^5.49.1",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@vitejs/plugin-react": "^4.2.1",
6 changes: 3 additions & 3 deletions examples/react/basic/package.json
View file
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@
"preview": "vite preview"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"axios": "^1.6.8",
"react": "19.0.0-rc-4c2e457c7c-20240522",
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.49.0",
"@tanstack/eslint-plugin-query": "^5.49.1",
"@vitejs/plugin-react": "^4.2.1",
"vite": "^5.2.11"
},
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
@@ -8,8 +8,8 @@
"preview": "vite preview"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"axios": "^1.6.8",
"react": "19.0.0-rc-4c2e457c7c-20240522",
"react-dom": "19.0.0-rc-4c2e457c7c-20240522"
7 changes: 6 additions & 1 deletion examples/react/infinite-query-with-max-pages/next.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
module.exports = {
// @ts-check

/** @type {import('next').NextConfig} */
const nextConfig = {
eslint: {
ignoreDuringBuilds: true,
},
}

export default nextConfig
7 changes: 4 additions & 3 deletions examples/react/infinite-query-with-max-pages/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"name": "@tanstack/query-example-react-infinite-query-with-max-pages",
"private": true,
"type": "module",
"scripts": {
"dev": "next",
"build": "next build",
"start": "next start"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"axios": "^1.6.8",
"isomorphic-unfetch": "4.0.2",
"next": "^14.0.0",
"next": "^14.2.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intersection-observer": "^8.34.0"
7 changes: 6 additions & 1 deletion examples/react/load-more-infinite-scroll/next.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
module.exports = {
// @ts-check

/** @type {import('next').NextConfig} */
const nextConfig = {
eslint: {
ignoreDuringBuilds: true,
},
}

export default nextConfig
7 changes: 4 additions & 3 deletions examples/react/load-more-infinite-scroll/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"name": "@tanstack/query-example-react-load-more-infinite-scroll",
"private": true,
"type": "module",
"scripts": {
"dev": "next",
"build": "next build",
"start": "next start"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"axios": "^1.6.8",
"isomorphic-unfetch": "4.0.2",
"next": "^14.0.0",
"next": "^14.2.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intersection-observer": "^8.34.0"
4 changes: 3 additions & 1 deletion examples/react/nextjs-app-prefetching/next.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// @ts-check

/** @type {import('next').NextConfig} */
const nextConfig = {
eslint: {
ignoreDuringBuilds: true,
},
}

module.exports = nextConfig
export default nextConfig
5 changes: 3 additions & 2 deletions examples/react/nextjs-app-prefetching/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"name": "nextjs-app-prefetching",
"private": true,
"type": "module",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"test:types": "tsc"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"next": "^15.0.0-rc.0",
"react": "^19.0.0-rc-4c2e457c7c-20240522",
"react-dom": "^19.0.0-rc-4c2e457c7c-20240522"
4 changes: 3 additions & 1 deletion examples/react/nextjs-suspense-streaming/next.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// @ts-check

/** @type {import('next').NextConfig} */
const nextConfig = {
eslint: {
@@ -10,4 +12,4 @@ const nextConfig = {
},
}

module.exports = nextConfig
export default nextConfig
9 changes: 5 additions & 4 deletions examples/react/nextjs-suspense-streaming/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"name": "@tanstack/query-example-nextjs-suspense-streaming",
"private": true,
"type": "module",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"test:types": "tsc"
},
"dependencies": {
"@tanstack/react-query": "^5.49.0",
"@tanstack/react-query-devtools": "^5.49.0",
"@tanstack/react-query-next-experimental": "^5.49.0",
"next": "^14.0.0",
"@tanstack/react-query": "^5.49.1",
"@tanstack/react-query-devtools": "^5.49.1",
"@tanstack/react-query-next-experimental": "^5.49.1",
"next": "^14.2.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"superjson": "^2.2.1"
Loading