Skip to content
This repository has been archived by the owner on May 26, 2023. It is now read-only.

Upgrade to version 1.7.8 #1

Merged
merged 68 commits into from
Oct 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
d0af123
[WIP] Feature tests (#750)
Jul 6, 2018
c4d0371
Nuke console.log from fetchingSagas.ts (#754)
timkendall Jul 6, 2018
e2cf374
Output 'result' from apollo-link-http error (#755)
skevy Jul 6, 2018
6662765
Fix custom theme and settings (#759)
BrunoScheufler Jul 6, 2018
3dcd697
bump versions
timsuchanek Jul 6, 2018
7d7969f
Add workspaceName prop (#772)
BrunoScheufler Aug 1, 2018
4c22d5f
Fixes #774 (#775)
huv1k Aug 1, 2018
2227567
Ui fixes (#789)
huv1k Aug 1, 2018
fd6957f
bump graphcool-styles
timsuchanek Aug 1, 2018
e1f7159
Fix settings (#806)
huv1k Aug 2, 2018
15f9a2b
show graphql extensions (#813)
robrichard Aug 23, 2018
c71868f
Changed comment on input page. (#818)
heymartinadams Aug 23, 2018
85c203f
fix(schema) update color in query/mutation comment (#811)
johannpinson Aug 23, 2018
8cc57bb
run ./scripts/release-react.sh, robust jq test and bump electron (#822)
Aug 23, 2018
2345b29
Update README.md
timsuchanek Aug 24, 2018
bb6baa1
feat: update graphql-config dependency
timsuchanek Sep 5, 2018
9cba602
Update README.md
timsuchanek Sep 5, 2018
4dfe52a
First icons
huv1k Sep 9, 2018
3f457e5
chore: bump versions
timsuchanek Sep 11, 2018
02dbe8f
History finished
huv1k Sep 16, 2018
ac4706b
Remove old stuff + Search
huv1k Sep 17, 2018
027a2f5
Graphcool icons gone + variables
huv1k Sep 18, 2018
628185b
Docs missing
huv1k Sep 19, 2018
3b4ed59
Missing type link and few from docs
huv1k Sep 20, 2018
0bc2cac
Remove old theming
huv1k Sep 20, 2018
51df3c2
Before cleanup
huv1k Sep 23, 2018
9e1c0fa
Fix deps and lint
huv1k Sep 23, 2018
cc2cedf
Fix lint and build
huv1k Sep 23, 2018
8619d6f
Make tabs sortable (#848)
rynobax Oct 15, 2018
dc95f67
Adding tooltips to buttons without text (#852)
kapiljaveri Oct 15, 2018
c8a7099
Make tab name input always controlled (#851)
rynobax Oct 15, 2018
3d2732d
fix: close body tag (#833)
DavidJFelix Oct 15, 2018
7445adf
Adding default header option to GraphQLPlayground.init() (#825)
wilsongp Oct 15, 2018
4d1a0b8
Fix MiddlewareApp never properly applying settings passed as props. (…
leonaves Oct 15, 2018
841bd26
renderPlaygroundPage - cdnUrl config option (#845)
penx Oct 15, 2018
1202476
Use query definition name as firstOperationName if any (#855)
olimsaidov Oct 15, 2018
2648344
First icons
huv1k Sep 9, 2018
bd927ad
History finished
huv1k Sep 16, 2018
60cd032
Remove old stuff + Search
huv1k Sep 17, 2018
54e75c8
Graphcool icons gone + variables
huv1k Sep 18, 2018
f8926a0
Docs missing
huv1k Sep 19, 2018
bffcdcf
Missing type link and few from docs
huv1k Sep 20, 2018
d98b484
Remove old theming
huv1k Sep 20, 2018
748abc8
Before cleanup
huv1k Sep 23, 2018
8e7e413
Fix deps and lint
huv1k Sep 23, 2018
9174ecc
Fix lint and build
huv1k Sep 23, 2018
87db722
Remove cursor in result window
huv1k Oct 15, 2018
d3a7119
Merge branch 'styled-finish' of https://github.com/graphcool/graphql-…
huv1k Oct 15, 2018
2f324c4
Change icons and fix details
huv1k Oct 15, 2018
e65d377
Merge branch 'styled-finish'
huv1k Oct 15, 2018
549a121
Fix/share url (#847)
lydiahallie Oct 15, 2018
6cc3e85
Fix sharing returned data from sharing endpoint
huv1k Oct 15, 2018
cd23dcf
Fix playground vulnerabilities
huv1k Oct 15, 2018
e3ca8c2
Remove package lock
huv1k Oct 15, 2018
77ce915
Remove package lock
huv1k Oct 15, 2018
6c51227
Lodash not Lodas
huv1k Oct 15, 2018
6d03db8
Upgrade to styled components 4
huv1k Oct 16, 2018
dd90fe9
Release of new version
huv1k Oct 16, 2018
3729920
Upgrade circle node version
huv1k Oct 16, 2018
153e8d8
chore: add Node.js 10 (#676)
DanielRuf Oct 16, 2018
8e0480b
Remove node 8 from circle
huv1k Oct 16, 2018
f2c4b15
Upgrade macOS version for new node
huv1k Oct 16, 2018
6752bd0
Upgrade macOS version for new node
huv1k Oct 16, 2018
2fb6533
Revert "Upgrade macOS version for new node"
huv1k Oct 16, 2018
01bd844
Fix building of electron app with new typescript
huv1k Oct 16, 2018
9382abf
Release 1.8 playground
huv1k Oct 16, 2018
95c21ff
Upgrade html and middleware versions
huv1k Oct 16, 2018
5ea711c
fix(graphql 14): version bump via graphql-config (#861)
Oct 17, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,7 +14,7 @@ jobs:

electron-build:
macos:
xcode: "9.0"
xcode: '9.4.1'
steps:
- checkout
- run: |
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ os: osx
osx_image: xcode9.2

language: node_js
node_js: "8"
node_js:
- "8"
- "10"

cache:
directories:
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -103,6 +103,7 @@ interface ISettings {
interface Tab {
endpoint: string
query: string
name?: string
variables?: string
responses?: string[]
headers?: { [key: string]: string }
Expand Down
14 changes: 7 additions & 7 deletions packages/graphql-playground-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}
Expand Down Expand Up @@ -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)
Loading