Merge branch 'main' into query-core/fix/shorten-listeners-code

README.md

@@ -8,8 +8,6 @@ Hooks for fetching, caching and updating asynchronous data in React, Solid, Svel
   <img alt="#TanStack" src="https://img.shields.io/twitter/url?color=%2308a0e9&label=%23TanStack&style=social&url=https%3A%2F%2Ftwitter.com%2Fintent%2Ftweet%3Fbutton_hashtag%3DTanStack">
 </a><a href="https://discord.com/invite/WrRKjPJ" target="\_parent">
   <img alt="" src="https://img.shields.io/badge/Discord-TanStack-%235865F2" />
-</a><a href="https://github.com/TanStack/query/actions?query=workflow%3A%22react-query+tests%22">
-<img src="https://github.com/TanStack/query/workflows/react-query%20tests/badge.svg" />
 </a><a href="https://www.npmjs.com/package/@tanstack/query-core" target="\_parent">
   <img alt="" src="https://img.shields.io/npm/dm/@tanstack/query-core.svg" />
 </a><a href="https://bundlejs.com/?q=%40tanstack%2Freact-query&config=%7B%22esbuild%22%3A%7B%22external%22%3A%5B%22react%22%2C%22react-dom%22%5D%7D%7D&badge=" target="\_parent">

docs/eslint/eslint-plugin-query.md

@@ -11,11 +11,23 @@ The plugin is a separate package that you need to install:
 
 ```bash
 $ npm i -D @tanstack/eslint-plugin-query
-# or
+```
+
+or
+
+```bash
 $ pnpm add -D @tanstack/eslint-plugin-query
-# or
+```
+
+or
+
+```bash
 $ yarn add -D @tanstack/eslint-plugin-query
-# or
+```
+
+or
+
+```bash
 $ bun add -D @tanstack/eslint-plugin-query
 ```
 

docs/framework/angular/devtools.md

@@ -9,11 +9,23 @@ The devtools are a separate package that you need to install:
 
 ```bash
 $ npm i @tanstack/angular-query-devtools-experimental
-# or
+```
+
+or
+
+```bash
 $ pnpm add @tanstack/angular-query-devtools-experimental
-# or
+```
+
+or
+
+```bash
 $ yarn add @tanstack/angular-query-devtools-experimental
-# or
+```
+
+or
+
+```bash
 $ bun add @tanstack/angular-query-devtools-experimental
 ```
 

docs/framework/angular/installation.md

@@ -11,11 +11,23 @@ _Angular Query is compatible with Angular v16 and higher_
 
 ```bash
 npm i @tanstack/angular-query-experimental
-# or
+```
+
+or
+
+```bash
 pnpm add @tanstack/angular-query-experimental
-# or
+```
+
+or
+
+```bash
 yarn add @tanstack/angular-query-experimental
-# or
+```
+
+or
+
+```bash
 bun add @tanstack/angular-query-experimental
 ```
 

docs/framework/react/devtools.md

@@ -21,11 +21,23 @@ The devtools are a separate package that you need to install:
 
 ```bash
 $ npm i @tanstack/react-query-devtools
-# or
+```
+
+or
+
+```bash
 $ pnpm add @tanstack/react-query-devtools
-# or
+```
+
+or
+
+```bash
 $ yarn add @tanstack/react-query-devtools
-# or
+```
+
+or
+
+```bash
 $ bun add @tanstack/react-query-devtools
 ```
 

docs/framework/react/guides/request-waterfalls.md

@@ -118,8 +118,8 @@ const [usersQuery, teamsQuery, projectsQuery] = useSuspenseQueries({
     { queryKey: ['users'], queryFn: fetchUsers },
     { queryKey: ['teams'], queryFn: fetchTeams },
     { queryKey: ['projects'], queryFn: fetchProjects },
-  ]
-}
+  ],
+})
 ```
 
 ### Nested Component Waterfalls

docs/framework/react/installation.md

@@ -11,11 +11,23 @@ or a good ol' `<script>` via
 
 ```bash
 npm i @tanstack/react-query
-# or
+```
+
+or
+
+```bash
 pnpm add @tanstack/react-query
-# or
+```
+
+or
+
+```bash
 yarn add @tanstack/react-query
-# or
+```
+
+or
+
+```bash
 bun add @tanstack/react-query
 ```
 
@@ -58,10 +70,22 @@ It is recommended to also use our [ESLint Plugin Query](../../../eslint/eslint-p
 
 ```bash
 npm i -D @tanstack/eslint-plugin-query
-# or
+```
+
+or
+
+```bash
 pnpm add -D @tanstack/eslint-plugin-query
-# or
+```
+
+or
+
+```bash
 yarn add -D @tanstack/eslint-plugin-query
-# or
+```
+
+or
+
+```bash
 bun add -D @tanstack/eslint-plugin-query
 ```

docs/framework/solid/devtools.md

@@ -13,11 +13,23 @@ The devtools are a separate package that you need to install:
 
 ```bash
 $ npm i @tanstack/solid-query-devtools
-# or
+```
+
+or
+
+```bash
 $ pnpm add @tanstack/solid-query-devtools
-# or
+```
+
+or
+
+```bash
 $ yarn add @tanstack/solid-query-devtools
-# or
+```
+
+or
+
+```bash
 $ bun add @tanstack/solid-query-devtools
 ```
 

docs/framework/solid/installation.md

@@ -11,11 +11,23 @@ or a good ol' `<script>` via
 
 ```bash
 npm i @tanstack/solid-query
-# or
+```
+
+or
+
+```bash
 pnpm add @tanstack/solid-query
-# or
+```
+
+or
+
+```bash
 yarn add @tanstack/solid-query
-# or
+```
+
+or
+
+```bash
 bun add @tanstack/solid-query
 ```
 

docs/framework/svelte/installation.md

@@ -11,11 +11,23 @@ You can install Svelte Query via [NPM](https://npmjs.com).
 
 ```bash
 npm i @tanstack/svelte-query
-# or
+```
+
+or
+
+```bash
 pnpm add @tanstack/svelte-query
-# or
+```
+
+or
+
+```bash
 yarn add @tanstack/svelte-query
-# or
+```
+
+or
+
+```bash
 bun add @tanstack/svelte-query
 ```
 

docs/framework/vue/devtools.md

@@ -16,11 +16,23 @@ The devtools component is a separate package that you need to install:
 
 ```bash
 $ npm i @tanstack/vue-query-devtools
-# or
+```
+
+or
+
+```bash
 $ pnpm add @tanstack/vue-query-devtools
-# or
+```
+
+or
+
+```bash
 $ yarn add @tanstack/vue-query-devtools
-# or
+```
+
+or
+
+```bash
 $ bun add @tanstack/vue-query-devtools
 ```
 

docs/framework/vue/installation.md

@@ -9,11 +9,23 @@ You can install Vue Query via [NPM](https://npmjs.com).
 
 ```bash
 npm i @tanstack/vue-query
-# or
+```
+
+or
+
+```bash
 pnpm add @tanstack/vue-query
-# or
+```
+
+or
+
+```bash
 yarn add @tanstack/vue-query
-# or
+```
+
+or
+
+```bash
 bun add @tanstack/vue-query
 ```
 

eslint.config.js

@@ -3,6 +3,7 @@
 // @ts-ignore Needed due to moduleResolution Node vs Bundler
 import { tanstackConfig } from '@tanstack/config/eslint'
 import pluginCspell from '@cspell/eslint-plugin'
+import vitest from '@vitest/eslint-plugin'
 
 export default [
   ...tanstackConfig,
@@ -40,4 +41,13 @@ export default [
       'no-case-declarations': 'off',
     },
   },
+  {
+    files: ['**/*.spec.ts*', '**/*.test.ts*', '**/*.test-d.ts*'],
+    plugins: { vitest },
+    rules: {
+      ...vitest.configs.recommended.rules,
+      'vitest/expect-expect': 'warn',
+    },
+    settings: { vitest: { typecheck: true } },
+  },
 ]

package.json

@@ -49,6 +49,7 @@
     "@types/react": "npm:types-react@rc",
     "@types/react-dom": "npm:types-react-dom@rc",
     "@vitest/coverage-istanbul": "^2.0.4",
+    "@vitest/eslint-plugin": "^1.0.2",
     "cpy-cli": "^5.0.0",
     "esbuild-plugin-file-path-extensions": "^2.1.2",
     "eslint": "^8.57.0",

packages/angular-query-experimental/README.md

@@ -35,11 +35,23 @@ Visit https://tanstack.com/query/latest/docs/framework/angular/overview
 
    ```bash
    $ npm i @tanstack/angular-query-experimental
-   # or
+   ```
+
+   or
+
+   ```bash
    $ pnpm add @tanstack/angular-query-experimental
-   # or
+   ```
+
+   or
+
+   ```bash
    $ yarn add @tanstack/angular-query-experimental
-   # or
+   ```
+
+   or
+
+   ```bash
    $ bun add @tanstack/angular-query-experimental
    ```
 

packages/angular-query-experimental/src/__tests__/inject-mutation-state.test.ts

@@ -30,7 +30,7 @@ describe('injectMutationState', () => {
   })
 
   describe('injectMutationState', () => {
-    test('should return variables after calling mutate', async () => {
+    test('should return variables after calling mutate 1', async () => {
       const mutationKey = ['mutation']
       const variables = 'foo123'
 
@@ -91,7 +91,7 @@ describe('injectMutationState', () => {
       expect(mutationState()).toEqual([variables2])
     })
 
-    test('should return variables after calling mutate', async () => {
+    test('should return variables after calling mutate 2', async () => {
       queryClient.clear()
       const mutationKey = ['mutation']
       const variables = 'bar234'

packages/angular-query-experimental/src/util/assert-injector/assert-injector.test.ts

@@ -20,7 +20,7 @@ import {
 import { TestBed } from '@angular/core/testing'
 import { assertInjector } from './assert-injector'
 
-describe(assertInjector.name, () => {
+describe('assertInjector', () => {
   const token = new InjectionToken('token', {
     factory: () => 1,
   })