diff --git a/.vscode/settings.json b/.vscode/settings.json index 4718ffd990e..ed5e943f71d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,14 @@ { - "eslint.enable": true + "eslint.enable": true, + "files.exclude": { + "**/.git": true, + "**/.DS_Store": true, + "**/node_modules": true, + "test-lib": true, + "lib": true, + "coverage": true, + "npm": true, + "**/dist": true + }, + "typescript.tsdk": "node_modules/typescript/lib" } \ No newline at end of file diff --git a/packages/plugin/src/rules/graphql-js-validation.ts b/packages/plugin/src/rules/graphql-js-validation.ts index 3197ea75aeb..2b0d381aea5 100644 --- a/packages/plugin/src/rules/graphql-js-validation.ts +++ b/packages/plugin/src/rules/graphql-js-validation.ts @@ -6,7 +6,6 @@ import { join, dirname } from 'path'; import { GraphQLESLintRule, GraphQLESLintRuleContext } from '../types'; import { requireGraphQLSchemaFromContext, requireSiblingsOperations } from '../utils'; import { GraphQLESTreeNode } from '../estree-parser'; -import { SDLValidationRule } from 'graphql/validation/ValidationContext'; function extractRuleName(stack?: string): string | null { const match = (stack || '').match(/validation[/\\\\]rules[/\\\\](.*?)\.js:/) || []; diff --git a/patches/eslint+8.1.0.patch b/patches/eslint+8.1.0.patch index 8a892127602..bfaa9aa569f 100644 --- a/patches/eslint+8.1.0.patch +++ b/patches/eslint+8.1.0.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/eslint/lib/rule-tester/rule-tester.js b/node_modules/eslint/lib/rule-tester/rule-tester.js -index 324af7b..e771420 100644 +index 7f590a5..5368321 100644 --- a/node_modules/eslint/lib/rule-tester/rule-tester.js +++ b/node_modules/eslint/lib/rule-tester/rule-tester.js -@@ -943,8 +943,18 @@ class RuleTester { +@@ -946,7 +946,17 @@ class RuleTester { "Expected no autofixes to be suggested" ); } else { @@ -21,4 +21,3 @@ index 324af7b..e771420 100644 } } else { assert.strictEqual( - result.output, diff --git a/yarn.lock b/yarn.lock index 99c9af3157f..cc21bc365eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3994,23 +3994,11 @@ graphql-ws@^5.0.0: resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.3.0.tgz#345f73686b639735f1f4ef0b9ea28e17c7f6a745" integrity sha512-53MbSTOmgx5i6hf3DHVD5PrXix1drDmt2ja8MW7NG+aTpKGzkXVLyNcyNpxme4SK8jVtIV6ZIHkiwirqN0efpw== -graphql@15.5.3: - version "15.5.3" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.3.tgz#c72349017d5c9f5446a897fe6908b3186db1da00" - integrity sha512-sM+jXaO5KinTui6lbK/7b7H/Knj9BpjGxZ+Ki35v7YbUJxxdBCUqNM0h3CRVU1ZF9t5lNiBzvBCSYPvIwxPOQA== - -graphql@15.7.1: +graphql@15.5.3, graphql@15.7.1, graphql@^14.5.3: version "15.7.1" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.7.1.tgz#c821a1741e04e2bc2c91e138f34c06a86c0464f1" integrity sha512-x34S6gC0/peBZnlK60zCJox/d45A7p6At9oN9EPA3qhoIAlR4LNZmXRLkICBckwwTMJzVdA8cx3QIQZMOl606A== -graphql@^14.5.3: - version "14.7.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz#7fa79a80a69be4a31c27dda824dc04dac2035a72" - integrity sha512-l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA== - dependencies: - iterall "^1.2.2" - hard-rejection@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" @@ -4444,7 +4432,7 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -iterall@^1.2.1, iterall@^1.2.2: +iterall@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==