Merge pull request #2 from apollographql/update-to-graphql-playground…

…-1.7.8

Update to graphql playground 1.7.8

.circleci/config.yml

@@ -1,10 +1,11 @@
 version: 2
 
 jobs:
-
   playground-build:
     docker:
-      - image: circleci/node:8
+      # - image: circleci/node:8
+      - image: circleci/node:10
+
     steps:
       - checkout
       - run: yarn show-versions
@@ -13,7 +14,7 @@ jobs:
 
   electron-build:
     macos:
-      xcode: "9.0"
+      xcode: '9.4.1'
     steps:
       - checkout
       - run: |

.travis.yml

@@ -2,7 +2,9 @@ os: osx
 osx_image: xcode9.2
 
 language: node_js
-node_js: "8"
+node_js:
+  - "8"
+  - "10"
 
 cache:
   directories:

README.md

@@ -1,9 +1,9 @@
 <p align="center"><img src="https://imgur.com/5fzMbyV.png" width="269"></p>
 
-[![npm version](https://badge.fury.io/js/graphql-playground-react.svg)](https://badge.fury.io/js/graphql-playground-react) [![Build Status](https://travis-ci.org/prismagraphql/graphql-playground.svg?branch=master)](https://travis-ci.org/prismagraphql/graphql-playground) [![CircleCI](https://circleci.com/gh/prismagraphql/graphql-playground.svg?style=shield)](https://circleci.com/gh/prismagraphql/graphql-playground)
+[![npm version](https://badge.fury.io/js/graphql-playground-react.svg)](https://badge.fury.io/js/graphql-playground-react) [![CircleCI](https://circleci.com/gh/prisma/graphql-playground.svg?style=shield)](https://circleci.com/gh/prisma/graphql-playground)
 
 GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration). <br />
-**You can download the [desktop app](https://github.com/graphcool/graphql-playground/releases) or use the web version at graphqlbin.com: [Demo](https://www.graphqlbin.com/RVIn)**
+**You can download the [desktop app](https://github.com/prisma/graphql-playground/releases) or use the web version at graphqlbin.com: [Demo](https://www.graphqlbin.com/RVIn)**
 
 [![](https://i.imgur.com/AE5W6OW.png)](https://www.graphqlbin.com/RVIn)
 
@@ -103,6 +103,7 @@ interface ISettings {
 interface Tab {
   endpoint: string
   query: string
+  name?: string
   variables?: string
   responses?: string[]
   headers?: { [key: string]: string }

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.6.1",
+  "version": "1.8.0",
   "author": {
     "name": "Graphcool",
     "email": "hello@graph.cool",
@@ -94,11 +94,11 @@
     "graphcool-styles": "0.2.7",
     "graphcool-ui": "^0.0.14",
     "graphql": "^0.13.2",
-    "graphql-config": "^2.0.1",
+    "graphql-config": "^2.1.0",
     "graphql-config-extension-graphcool": "1.0.8",
-    "graphql-config-extension-prisma": "^0.0.12",
-    "graphql-playground-html": "^1.5.6",
-    "graphql-playground-react": "1.7.0",
+    "graphql-config-extension-prisma": "^0.2.2",
+    "graphql-playground-html": "^1.6.0",
+    "graphql-playground-react": "1.7.8",
     "immutable": "4.0.0-rc.9",
     "js-yaml": "^3.11.0",
     "lodash.merge": "^4.6.1",
@@ -137,7 +137,7 @@
     "babili-webpack-plugin": "0.1.2",
     "concurrently": "3.5.1",
     "css-loader": "0.28.11",
-    "electron": "2.0.2",
+    "electron": "2.0.11",
     "electron-builder": "20.15.1",
     "electron-devtools-installer": "2.2.4",
     "extract-text-webpack-plugin": "3.0.2",
@@ -165,7 +165,7 @@
     "tslint": "5.10.0",
     "tslint-graphcool-frontend": "0.0.3",
     "tslint-loader": "3.6.0",
-    "typescript": "2.8.3",
+    "typescript": "3.0.1",
     "url-loader": "0.6.2",
     "wait-on": "2.1.0",
     "webpack": "3.10.0",

packages/graphql-playground-electron/src/renderer/components/App.tsx

@@ -128,7 +128,8 @@ class App extends React.Component<ReduxProps, State> {
     return {
       endpoint: args.endpoint,
       subscriptionsEndpoint: args['subscriptions-endpoint'],
-      platformToken: args['platform-token'] || localStorage.platformToken,
+      platformToken:
+        args['platform-token'] || localStorage.getItem('platformToken'),
       env: args.env,
     }
   }
@@ -648,14 +649,17 @@ const mapStateToProps = createStructuredSelector({
   endpoint: getEndpoint,
 })
 
-export default connect(mapStateToProps, {
-  openSettingsTab,
-  selectNextTab,
-  selectPrevTab,
-  closeSelectedTab,
-  refetchSchema,
-  newSession,
-  saveFile,
-  newFileTab,
-  selectAppHistoryItem,
-})(App)
+export default connect(
+  mapStateToProps,
+  {
+    openSettingsTab,
+    selectNextTab,
+    selectPrevTab,
+    closeSelectedTab,
+    refetchSchema,
+    newSession,
+    saveFile,
+    newFileTab,
+    selectAppHistoryItem,
+  },
+)(App)