fix build, fix number color

graphql · Apr 12, 2018 · c93fb04 · c93fb04
1 parent 3bc9011
commit c93fb04
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,6 @@ jobs:
       - image: circleci/node:8
     steps:
       - checkout
-      - run: sudo npm i -g yarn
       - run: yarn show-versions
       - run: yarn install
       - run: cd packages/graphql-playground-react && yarn && yarn build
@@ -17,7 +16,6 @@ jobs:
       xcode: "9.0"
     steps:
       - checkout
-      - run: sudo npm i -g yarn
       - run: |
           if [[ -z "$CIRCLE_PULL_REQUEST" && "$CIRCLE_BRANCH" == "master" ]]
           then
@@ -29,7 +27,6 @@ jobs:
             # needed for signing in CI environments (don't ask...)
             security set-key-partition-list -S apple-tool:,apple: -s -k travis build.keychain
           fi
-      - run: sudo npm i -g yarn
       # needed for release process
       - run: brew install gettext
       # - run: yarn install

diff --git a/packages/graphql-playground-electron/package.json b/packages/graphql-playground-electron/package.json
@@ -4,7 +4,7 @@
   "homepage": "https://github.com/graphcool/graphql-playground",
   "repository": "graphcool/graphql-playground",
   "description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration)",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "author": {
     "name": "Graphcool",
     "email": "hello@graph.cool",
@@ -97,7 +97,7 @@
     "graphql-config": "^2.0.1",
     "graphql-config-extension-graphcool": "1.0.8",
     "graphql-config-extension-prisma": "0.0.9",
-    "graphql-playground-react": "1.5.13",
+    "graphql-playground-react": "1.6.2",
     "immutable": "4.0.0-rc.9",
     "js-yaml": "^3.10.0",
     "lodash.merge": "^4.6.0",

diff --git a/packages/graphql-playground-electron/src/renderer/components/App.tsx b/packages/graphql-playground-electron/src/renderer/components/App.tsx
@@ -351,12 +351,10 @@ class App extends React.Component<ReduxProps, State> {
       platformToken,
     }
 
-    if (endpoint) {
-      this.props.selectAppHistoryItem(merge(state, {
-        type: 'endpoint',
-        path: configPath,
-      }) as any)
-    }
+    this.props.selectAppHistoryItem(merge(state, {
+      type: 'endpoint',
+      path: configPath,
+    }) as any)
 
     this.setState(state)
   }

diff --git a/packages/graphql-playground-electron/yarn.lock b/packages/graphql-playground-electron/yarn.lock
@@ -222,11 +222,11 @@ apollo-link-http@^1.3.2:
     apollo-link "^1.2.1"
     apollo-link-http-common "^0.2.3"
 
-apollo-link-ws@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.7.tgz#6cc3903cbfbbefe213ea9fc8121f5fed3cef1823"
+apollo-link-ws@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.4.tgz#d0067aa0204470dbd3955aa5204f8dd72d389350"
   dependencies:
-    apollo-link "^1.2.1"
+    apollo-link "^1.0.7"
 
 apollo-link@^1.0.7, apollo-link@^1.2.1:
   version "1.2.1"
@@ -1853,6 +1853,10 @@ codemirror@^5.18.2, codemirror@^5.26.0, codemirror@^5.27.4:
   version "5.33.0"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.33.0.tgz#462ad9a6fe8d38b541a9536a3997e1ef93b40c6a"
 
+codemirror@^5.36.0:
+  version "5.36.0"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.36.0.tgz#1172ad9dc298056c06e0b34e5ccd23825ca15b40"
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -3707,16 +3711,16 @@ graphql-playground-html@1.5.6:
   dependencies:
     graphql-config "2.0.0"
 
-graphql-playground-react@1.5.13:
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/graphql-playground-react/-/graphql-playground-react-1.5.13.tgz#28aa10f0342a824102f5d68081a99a0750c9a41d"
+graphql-playground-react@1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/graphql-playground-react/-/graphql-playground-react-1.6.2.tgz#51a96e882adbc446c224ade3f84b83d3a683b442"
   dependencies:
     apollo-link "^1.0.7"
     apollo-link-http "^1.3.2"
-    apollo-link-ws "^1.0.4"
+    apollo-link-ws "1.0.4"
     calculate-size "^1.1.1"
     classnames "^2.2.5"
-    codemirror "^5.27.4"
+    codemirror "^5.36.0"
     codemirror-graphql timsuchanek/codemirror-graphql#details-fix
     copy-to-clipboard "^3.0.8"
     cuid "^1.3.8"
@@ -3732,18 +3736,18 @@ graphql-playground-react@1.5.13:
     keycode "^2.1.9"
     lodash "^4.17.4"
     lodash.debounce "^4.0.8"
-    markdown-it "^8.4.0"
-    marked "^0.3.9"
+    markdown-it "^8.4.1"
+    marked "^0.3.19"
     polished "^1.9.0"
     postcss-modules "^1.1.0"
     prop-types "^15.6.0"
     query-string "^6.0.0"
-    react "^16.2.0"
+    react "^16.3.1"
     react-addons-shallow-compare "^15.6.2"
     react-codemirror "^1.0.0"
     react-copy-to-clipboard "^5.0.1"
     react-display-name "^0.2.3"
-    react-dom "^16.2.0"
+    react-dom "^16.3.1"
     react-helmet "^5.2.0"
     react-input-autosize "^2.2.1"
     react-modal "^3.1.11"
@@ -5151,6 +5155,20 @@ markdown-it@^8.4.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.3"
 
+markdown-it@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44"
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+marked@^0.3.19:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
+
 marked@^0.3.9:
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.9.tgz#54ce6a57e720c3ac6098374ec625fcbcc97ff290"
@@ -6582,6 +6600,15 @@ react-dom@^16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+react-dom@^16.3.1:
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.1.tgz#6a3c90a4fb62f915bdbcf6204422d93a7d4ca573"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
 react-helmet@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.0.tgz#a81811df21313a6d55c5f058c4aeba5d6f3d97a7"
@@ -6731,6 +6758,15 @@ react@^16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+react@^16.3.1:
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.3.1.tgz#4a2da433d471251c69b6033ada30e2ed1202cfd8"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
 read-config-file@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-2.1.1.tgz#bd6c2b93e97a82a35f71a3c9eb43161e16692054"
@@ -8162,6 +8198,10 @@ uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
+uc.micro@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
+
 uglify-js@3.3.x:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.5.tgz#4c4143dfe08e8825746675cc49a6874a933b543e"

diff --git a/packages/graphql-playground-react/package.json b/packages/graphql-playground-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-playground-react",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "main": "./lib/lib.js",
   "typings": "./lib/lib.d.ts",
   "description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",

diff --git a/packages/graphql-playground-react/release.sh b/packages/graphql-playground-react/release.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-#npm publish
+npm publish
 
 curl -X POST \
   http://purge.jsdelivr.net/ \

diff --git a/packages/graphql-playground-react/src/components/ProjectsSideNavItem.tsx b/packages/graphql-playground-react/src/components/ProjectsSideNavItem.tsx
@@ -98,9 +98,10 @@ const Count = styled.div`
   font-size: 11px;
   font-weight: bold;
   background: rgba(255, 255, 255, 0.05);
-  color: rgba(255, 255, 255, 0.3);
+  color: ${textColor};
+  opacity: 0.6;
   transition: 0.1s linear all;
   &.active {
-    color: ${textColor};
+    opacity: 1;
   }
 `