Merge branch 'v5' into tludlow-context-sharing-removal

TanStack · Jan 8, 2023 · a636682 · a636682
2 parents 5ef0708 + 59a34da
commit a636682
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 662 deletions.
diff --git a/docs/config.json b/docs/config.json
@@ -294,10 +294,6 @@
             {
               "label": "Exhaustive Deps",
               "to": "react/eslint/exhaustive-deps"
-            },
-            {
-              "label": "Prefer object syntax",
-              "to": "react/eslint/prefer-query-object-syntax"
             }
           ]
         },

diff --git a/docs/react/eslint/eslint-plugin-query.md b/docs/react/eslint/eslint-plugin-query.md
@@ -33,7 +33,6 @@ Then configure the rules you want to use under the rules section:
 {
   "rules": {
     "@tanstack/query/exhaustive-deps": "error",
-    "@tanstack/query/prefer-query-object-syntax": "error"
   }
 }
 ```

diff --git a/docs/react/eslint/prefer-query-object-syntax.md b/docs/react/eslint/prefer-query-object-syntax.md
diff --git a/docs/react/guides/migrating-to-react-query-5.md b/docs/react/guides/migrating-to-react-query-5.md
@@ -139,3 +139,7 @@ You can achieve the same functionality by passing a function to `structuralShari
 ### The `useErrorBoundary` prop has been renamed to `throwErrors`
 
 To make the `useErrorBoundary` prop more framework-agnostic and avoid confusion with the established React function prefix "`use`" for hooks and the "ErrorBoundary" component name, it has been renamed to `throwErrors` to more accurately reflect its functionality.
+
+### eslint `prefer-query-object-syntax` rule is removed
+
+Since the only supported syntax now is the object syntax, this rule is no longer needed
diff --git a/examples/solid/simple/.eslintrc b/examples/solid/simple/.eslintrc
@@ -7,6 +7,5 @@
   "rules": {
     "react/react-in-jsx-scope": "off",
     "jsx-a11y/accessible-emoji": "off",
-    "@tanstack/query/prefer-query-object-syntax": "off"
   }
 }
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "repository": "https://github.com/tanstack/query.git",
   "scripts": {
     "clean": "pnpm --filter \"./packages/**\" --parallel --no-bail run clean",
-    "preinstall": "if [ \"$CI\" = \"true\" ]; then echo \"Skipping preinstall...\"; else npx -y only-allow pnpm; fi",
+    "preinstall": "node -e \"if(process.env.CI == 'true') {console.log('Skipping preinstall...'); process.exit(1)}\" || npx -y only-allow pnpm",
     "install:csb": "pnpm install --frozen-lockfile",
     "test": "pnpm run test:ci",
     "test:ci": "pnpm run test:format && pnpm run test:eslint && pnpm run test:jest --collectCoverage false && pnpm run typecheck",

diff --git a/packages/eslint-plugin-query/src/configs/index.test.ts b/packages/eslint-plugin-query/src/configs/index.test.ts
@@ -10,7 +10,6 @@ describe('configs', () => {
           ],
           "rules": {
             "@tanstack/query/exhaustive-deps": "error",
-            "@tanstack/query/prefer-query-object-syntax": "error",
           },
         },
       }

diff --git a/packages/eslint-plugin-query/src/rules/index.ts b/packages/eslint-plugin-query/src/rules/index.ts
@@ -1,7 +1,5 @@
 import * as exhaustiveDeps from './exhaustive-deps/exhaustive-deps.rule'
-import * as preferObjectSyntax from './prefer-query-object-syntax/prefer-query-object-syntax'
 
 export const rules = {
   [exhaustiveDeps.name]: exhaustiveDeps.rule,
-  [preferObjectSyntax.name]: preferObjectSyntax.rule,
 }