From fa5045f1882a4632dfd967037da1932b12a805be Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Wed, 29 Jun 2022 14:58:08 +0200
Subject: [PATCH] Use graphql as direct dependency of CLI (#168)

* ESLint cache
---
 .changeset/mean-chefs-refuse.md                    | 5 +++++
 .github/workflows/ci.yaml                          | 8 ++++++++
 package.json                                       | 2 +-
 packages/libraries/cli/package.json                | 4 +---
 packages/web/app/src/components/v2/badge.tsx       | 2 +-
 packages/web/app/src/components/v2/radio-group.tsx | 2 +-
 yarn.lock                                          | 2 +-
 7 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/mean-chefs-refuse.md

diff --git a/.changeset/mean-chefs-refuse.md b/.changeset/mean-chefs-refuse.md
new file mode 100644
index 000000000..1f3c277b5
--- /dev/null
+++ b/.changeset/mean-chefs-refuse.md
@@ -0,0 +1,5 @@
+---
+'@graphql-hive/cli': minor
+---
+
+Use graphql@^16.0.0 as direct dependency
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 23942cc38..bb23c14fc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -256,6 +256,14 @@ jobs:
           path: '**/node_modules'
           key: ${{ github.sha }}
 
+      - name: ESLint cache
+        uses: actions/cache@v2
+        with:
+          path: '.eslintcache'
+          key: ${{ runner.os }}-eslint-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-eslint
+
       - name: Setup Turbo
         run: node ./scripts/turborepo-setup.js
 
diff --git a/package.json b/package.json
index 20c26c966..4d2bd1b2a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "prerelease": "yarn build:libraries",
     "release": "changeset publish",
     "test": "jest",
-    "lint": "eslint --ignore-path .gitignore \"packages/**/*.{ts,tsx}\"",
+    "lint": "eslint --cache --ignore-path .gitignore \"packages/**/*.{ts,tsx}\"",
     "prettier": "prettier --cache --write --list-different .",
     "lint:prettier": "prettier --cache --check .",
     "setup": "yarn workspace @hive/storage run setup",
diff --git a/packages/libraries/cli/package.json b/packages/libraries/cli/package.json
index 8599dbd27..a311368ef 100644
--- a/packages/libraries/cli/package.json
+++ b/packages/libraries/cli/package.json
@@ -52,6 +52,7 @@
     "colors": "1.4.0",
     "env-ci": "7.1.0",
     "git-parse": "2.1.1",
+    "graphql": "^16.0.0",
     "graphql-request": "4.1.0",
     "graphql-tag": "2.12.6",
     "log-symbols": "4.1.0",
@@ -59,9 +60,6 @@
     "tslib": "2.3.1",
     "ts-node": "10.7.0"
   },
-  "peerDependencies": {
-    "graphql": "^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
-  },
   "devDependencies": {
     "oclif": "^3.0.1",
     "@types/env-ci": "3.1.1",
diff --git a/packages/web/app/src/components/v2/badge.tsx b/packages/web/app/src/components/v2/badge.tsx
index 916c3c109..05ef19471 100644
--- a/packages/web/app/src/components/v2/badge.tsx
+++ b/packages/web/app/src/components/v2/badge.tsx
@@ -24,7 +24,7 @@ export const Badge = ({
           yellow: 'border-yellow-900 bg-yellow-500',
           green: 'border-green-900 bg-green-500',
           gray: 'border-gray-900 bg-gray-500',
-          orange: 'bg-orange-500 border-orange-900',
+          orange: 'border-orange-900 bg-orange-500',
           // TODO: add variants and uncomment https://javisperez.github.io/tailwindcolorshades/?jumbo=7f818c&alizarin-crimson=ed2e39
           // cyan: 'bg-cyan-500 border-cyan-900',
           // purple: 'border-purple-900 bg-purple-500',
diff --git a/packages/web/app/src/components/v2/radio-group.tsx b/packages/web/app/src/components/v2/radio-group.tsx
index 507478109..accf148f8 100644
--- a/packages/web/app/src/components/v2/radio-group.tsx
+++ b/packages/web/app/src/components/v2/radio-group.tsx
@@ -15,8 +15,8 @@ export const Radio = ({ children, className, ...props }: RadioGroupItemProps): R
     <Item
       className={clsx(
         `
-        hover:border-orange-500/50
         radix-state-checked:border-orange-500
+        hover:border-orange-500/50
         relative
         overflow-hidden
         rounded-sm
diff --git a/yarn.lock b/yarn.lock
index 90f651005..fa025e948 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10001,7 +10001,7 @@ 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@16.5.0:
+graphql@16.5.0, graphql@^16.0.0:
   version "16.5.0"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.5.0.tgz#41b5c1182eaac7f3d47164fb247f61e4dfb69c85"
   integrity sha512-qbHgh8Ix+j/qY+a/ZcJnFQ+j8ezakqPiHwPiZhV/3PgGlgf96QMBB5/f2rkiC9sgLoy/xvT6TSiaf2nTHJh5iA==