Merge branch 'main' into feature/defaultQueryFnTypes

Author: TkDodo

examples/react/algolia/package.json

@@ -18,7 +18,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.28.6",
+    "@tanstack/eslint-plugin-query": "^5.28.11",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
     "@vitejs/plugin-react": "^4.2.1",

examples/react/basic-typescript/package.json

@@ -18,7 +18,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.28.6",
+    "@tanstack/eslint-plugin-query": "^5.28.11",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
     "@vitejs/plugin-react": "^4.2.1",

examples/react/basic/package.json

@@ -15,7 +15,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.28.6",
+    "@tanstack/eslint-plugin-query": "^5.28.11",
     "@vitejs/plugin-react": "^4.2.1",
     "vite": "^5.1.1"
   },

examples/solid/simple/package.json

@@ -14,7 +14,7 @@
     "solid-js": "^1.8.14"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.28.6",
+    "@tanstack/eslint-plugin-query": "^5.28.11",
     "typescript": "5.2.2",
     "vite": "^5.1.1",
     "vite-plugin-solid": "^2.9.1"

packages/eslint-plugin-query/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/eslint-plugin-query",
-  "version": "5.28.6",
+  "version": "5.28.11",
   "description": "ESLint plugin for TanStack Query",
   "author": "Eliya Cohen",
   "license": "MIT",

packages/eslint-plugin-query/src/__tests__/exhaustive-deps.test.ts

@@ -726,5 +726,24 @@ ruleTester.run('exhaustive-deps', rule, {
         },
       ],
     },
+    {
+      name: 'should fail if queryFn is invalid while using FunctionExpression syntax',
+      code: normalizeIndent`
+        const id = 1;
+    
+        useQuery({
+            queryKey: [],
+            queryFn() {
+              Promise.resolve(id)
+            }
+        })
+      `,
+      errors: [
+        {
+          messageId: 'missingDeps',
+          data: { deps: 'id' },
+        },
+      ],
+    },
   ],
 })

packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts

@@ -55,7 +55,10 @@ export const rule = createRule({
           scopeManager === null ||
           queryKey === undefined ||
           queryFn === undefined ||
-          queryFn.value.type !== AST_NODE_TYPES.ArrowFunctionExpression
+          !ASTUtils.isNodeOfOneOf(queryFn.value, [
+            AST_NODE_TYPES.ArrowFunctionExpression,
+            AST_NODE_TYPES.FunctionExpression,
+          ])
         ) {
           return
         }