chore(deps): update dependency graphql to v15.7.1 (#6910)

* chore(deps): update dependency graphql to v15.7.1 * Bump * Fix workflow Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Arda TANRIKULU <[email protected]>
pavinthan · Oct 27, 2021 · 59fa558 · 59fa558
1 parent f170663
commit 59fa558
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 29 deletions.
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.8.0'
+          node-version: 17
       - name: Configure Git Credentials
         run: |
           git config --global user.email "[email protected]"
@@ -46,9 +46,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16.8.0-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16.8.0-yarn-
+            ${{ runner.os }}-17-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Release Canary

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,14 +18,14 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@master
         with:
-          node-version: 16.8.0
+          node-version: 17
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16.8.0-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16.8.0-yarn-
+            ${{ runner.os }}-17-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install
       - name: Lint
@@ -39,14 +39,14 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@master
         with:
-          node-version: 16.8.0
+          node-version: 17
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16.8.0-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16.8.0-yarn-
+            ${{ runner.os }}-17-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install
       - name: Build
@@ -66,14 +66,14 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@master
         with:
-          node-version: 16.8.0
+          node-version: 17
       - name: Cache Yarn
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16.8.0-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16.8.0-yarn-
+            ${{ runner.os }}-17-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install
       - name: Build
@@ -88,10 +88,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest] # remove windows to speed up the tests
-        node_version: [12, '16.8.0']
+        node_version: [12, 17]
         graphql_version:
           - 15
-          - 16.0.0-rc.5
+          - 16.0.0-rc.7
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -105,7 +105,7 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarnn
+            ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn-
       - name: Use GraphQL v${{matrix.graphql_version}}
         run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
       - name: Install Dependencies using Yarn

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.8.0'
+          node-version: 17
       - name: Setup NPM credentials
         run: echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
         env:
@@ -35,9 +35,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16.8.0-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16.8.0-yarn-
+            ${{ runner.os }}-17-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install && git checkout yarn.lock
       - name: Create Release Pull Request or Publish to npm

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@master
         with:
-          node-version: '16.8.0'
+          node-version: 17
       - name: Cache Yarn
         uses: actions/cache@v2
         with:

diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "flow-parser": "0.162.1",
     "fs-extra": "10.0.0",
     "globby": "11.0.4",
-    "graphql": "15.6.1",
+    "graphql": "15.7.1",
     "graphql-tag": "2.12.5",
     "husky": "7.0.4",
     "java-ast": "0.3.0",
@@ -114,7 +114,7 @@
     "prettier": "2.4.1",
     "babel-jest": "27.3.1",
     "jest-runner": "27.3.1",
-    "graphql": "15.6.1",
+    "graphql": "15.7.1",
     "graphql-language-service-interface": "2.8.4",
     "**/apollo-language-server/graphql": "^15.0.0",
     "**/@types/graphql-upload/graphql": "^15.0.0"

diff --git a/patches/babel-jest+27.2.5.patch → patches/babel-jest+27.3.1.patch b/patches/babel-jest+27.2.5.patch → patches/babel-jest+27.3.1.patch
diff --git a/scripts/match-graphql.js b/scripts/match-graphql.js
@@ -13,9 +13,10 @@ if (pkg.resolutions.graphql.startsWith(version)) {
   console.info(`GraphQL v${version} already installed! Skipping.`);
 }
 
-pkg.devDependencies.graphql = `^${version}`;
-pkg.resolutions.graphql = `^${version}`;
-pkg.resolutions['**/apollo-language-server/graphql'] = `^${version}`;
-pkg.resolutions['**/@types/graphql-upload/graphql'] = `^${version}`;
+const npmVersion = version.includes('-') ? version : `^${version}`;
+pkg.devDependencies.graphql = npmVersion;
+pkg.resolutions.graphql = npmVersion;
+pkg.resolutions['**/apollo-language-server/graphql'] = npmVersion;
+pkg.resolutions['**/@types/graphql-upload/graphql'] = npmVersion;
 
 writeFileSync(pkgPath, JSON.stringify(pkg, null, 2), 'utf8');
diff --git a/yarn.lock b/yarn.lock
@@ -8156,10 +8156,10 @@ graphql-ws@^5.4.1:
   resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.5.0.tgz#79f10248d23d104369eaef93acb9f887276a2c42"
   integrity sha512-WQepPMGQQoqS2VsrI2I3RMLCVz3CW4/6ZqGV6ABDOwH4R62DzjxwMlwZbj6vhSI/7IM3/C911yITwgs77iO/hw==
 
-graphql@15.6.1, graphql@^15.0.0, graphql@^15.5.1:
-  version "15.6.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.6.1.tgz#9125bdf057553525da251e19e96dab3d3855ddfc"
-  integrity sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==
+graphql@15.7.1, graphql@^15.0.0, graphql@^15.5.1:
+  version "15.7.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.7.1.tgz#c821a1741e04e2bc2c91e138f34c06a86c0464f1"
+  integrity sha512-x34S6gC0/peBZnlK60zCJox/d45A7p6At9oN9EPA3qhoIAlR4LNZmXRLkICBckwwTMJzVdA8cx3QIQZMOl606A==
 
 gray-matter@^4.0.3:
   version "4.0.3"