diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index bf509e4967c..ad63dc4d065 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -32,10 +32,10 @@ jobs: uses: actions/cache@v2 with: path: '**/node_modules' - key: ${{ runner.os }}-16-8-15-node-modules-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-16-8-16-node-modules-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-16-8-15-node-modules-${{ hashFiles('yarn.lock') }} - ${{ runner.os }}-16-8-15-node-modules- + ${{ runner.os }}-16-8-16-node-modules-${{ hashFiles('yarn.lock') }} + ${{ runner.os }}-16-8-16-node-modules- - name: Install Dependencies using Yarn run: yarn install && git checkout yarn.lock && yarn patch-package - name: Release Canary diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3aa82af4c0..c7d2bd7dc9e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,10 +35,10 @@ jobs: uses: actions/cache@v2 with: path: '**/node_modules' - key: ${{ runner.os }}-16-8-15-node-modules-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-16-8-16-node-modules-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-16-8-15-node-modules-${{ hashFiles('yarn.lock') }} - ${{ runner.os }}-16-8-15-node-modules- + ${{ runner.os }}-16-8-16-node-modules-${{ hashFiles('yarn.lock') }} + ${{ runner.os }}-16-8-16-node-modules- - name: Install Dependencies using Yarn run: yarn install && git checkout yarn.lock && yarn patch-package - name: Create Release Pull Request or Publish to npm diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 08ce054ab6e..626e3209e1b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,10 +25,10 @@ jobs: uses: actions/cache@v2 with: path: '**/node_modules' - key: ${{ runner.os }}-16-15-node-modules-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-16-16-node-modules-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-16-15-node-modules-${{ hashFiles('yarn.lock') }} - ${{ runner.os }}-16-15-node-modules- + ${{ runner.os }}-16-16-node-modules-${{ hashFiles('yarn.lock') }} + ${{ runner.os }}-16-16-node-modules- - name: Install Dependencies using Yarn run: yarn install && git checkout yarn.lock - name: Lint @@ -41,7 +41,7 @@ jobs: graphql_version: # - 14 - 15 - - 16.0.0-rc.7 + - 16 steps: - name: Checkout Master uses: actions/checkout@v2 @@ -83,7 +83,7 @@ jobs: graphql_version: # - 14 - 15 - - 16.0.0-rc.7 + - 16 steps: - name: Checkout Master uses: actions/checkout@v2 diff --git a/examples/basic/package.json b/examples/basic/package.json index ab2dc4f162b..340a97738ec 100644 --- a/examples/basic/package.json +++ b/examples/basic/package.json @@ -9,7 +9,7 @@ "lint": "eslint ." }, "dependencies": { - "graphql": "15.7.1" + "graphql": "16.0.0" }, "devDependencies": { "@graphql-eslint/eslint-plugin": "2.3.2", diff --git a/examples/code-file/package.json b/examples/code-file/package.json index 7ca15b2f0b8..29b6cc7468f 100644 --- a/examples/code-file/package.json +++ b/examples/code-file/package.json @@ -9,7 +9,7 @@ "lint": "eslint ." }, "dependencies": { - "graphql": "15.7.1" + "graphql": "16.0.0" }, "devDependencies": { "@graphql-eslint/eslint-plugin": "2.3.2", diff --git a/examples/graphql-config-code-file/package.json b/examples/graphql-config-code-file/package.json index d90638cd1f9..0160bef93fb 100644 --- a/examples/graphql-config-code-file/package.json +++ b/examples/graphql-config-code-file/package.json @@ -9,7 +9,7 @@ "lint": "eslint --ext graphql,js ." }, "dependencies": { - "graphql": "15.7.1", + "graphql": "16.0.0", "graphql-tag": "^2.12.5" }, "devDependencies": { diff --git a/examples/graphql-config/package.json b/examples/graphql-config/package.json index ddce1f40ace..a8328b2647c 100644 --- a/examples/graphql-config/package.json +++ b/examples/graphql-config/package.json @@ -9,7 +9,7 @@ "lint": "eslint ." }, "dependencies": { - "graphql": "15.7.1" + "graphql": "16.0.0" }, "devDependencies": { "@graphql-eslint/eslint-plugin": "2.3.2", diff --git a/examples/prettier/package.json b/examples/prettier/package.json index 7aebc6469c3..16f57aa0f44 100644 --- a/examples/prettier/package.json +++ b/examples/prettier/package.json @@ -9,7 +9,7 @@ "lint": "eslint ." }, "dependencies": { - "graphql": "15.7.1" + "graphql": "16.0.0" }, "devDependencies": { "@graphql-eslint/eslint-plugin": "2.3.2", diff --git a/package.json b/package.json index 482fc846e48..047ff57b1d6 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ }, "resolutions": { "@changesets/git": "1.1.2", - "graphql": "15.7.1" + "graphql": "16.0.0" }, "lint-staged": { "{packages,scripts}/**/*.{ts,tsx,js,jsx,cjs,mjs}": [ diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 366448578e8..0751eef66f8 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -41,7 +41,7 @@ "@types/graphql-depth-limit": "1.1.3", "@types/lodash.lowercase": "4.3.6", "bob-the-bundler": "1.5.1", - "graphql": "15.7.2", + "graphql": "16.0.0", "typescript": "4.4.4" }, "peerDependencies": { diff --git a/packages/plugin/src/rules/no-deprecated.ts b/packages/plugin/src/rules/no-deprecated.ts index 511b08552f1..6ca1b3466e5 100644 --- a/packages/plugin/src/rules/no-deprecated.ts +++ b/packages/plugin/src/rules/no-deprecated.ts @@ -104,12 +104,8 @@ const rule: GraphQLESLintRule<[], true> = { const typeInfo = node.typeInfo(); if (typeInfo && typeInfo.fieldDef) { -<<<<<<< HEAD - if (typeInfo.fieldDef.isDeprecated) { - const fieldName = node.name.value; -======= if (typeInfo.fieldDef.deprecationReason) { ->>>>>>> ... + const fieldName = node.name.value; context.report({ loc: getLocation(node.loc, fieldName), messageId: NO_DEPRECATED, diff --git a/scripts/match-graphql.js b/scripts/match-graphql.js index 58eb40615eb..c19a782ee92 100644 --- a/scripts/match-graphql.js +++ b/scripts/match-graphql.js @@ -1,6 +1,6 @@ const { writeFileSync } = require('fs'); const { resolve } = require('path'); -const { argv, cwd } = require('process'); +const { argv } = require('process'); const pkgPath = resolve(__dirname, '../package.json'); diff --git a/yarn.lock b/yarn.lock index e4fdba7c392..e88a93b7432 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3923,10 +3923,10 @@ 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.7.1, graphql@15.7.2, 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@16.0.0, graphql@^14.5.3: + version "16.0.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.0.0.tgz#5724f2767aefa543418e83671372117c39408c8f" + integrity sha512-n9NxoRfwnpYBZB/WJ7L166gyrShuZ8qYgVaX8oxVyELcJfAwkvwPt6WlYIl90WRlzqDjaNWvLmNOSnKs5llZWQ== hard-rejection@^2.1.0: version "2.1.0"