Skip to content

Commit 524155b

Browse files
committed
Merge branch 'master' of github.com:graphcool/graphql-playground
2 parents 0484f5c + b8e7cf3 commit 524155b

File tree

11 files changed

+62
-45
lines changed

11 files changed

+62
-45
lines changed

packages/graphql-playground-electron/src/main/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ import { createWindow } from './createWindow'
1616
import { WindowContext } from './types'
1717
import { startUpdates } from './updates'
1818
import squirrelStartup = require('electron-squirrel-startup')
19+
import * as Raven from 'raven'
20+
Raven.config(
21+
'https://cce868d3730e473e9350f1436da7d908:[email protected]/297194',
22+
).install()
1923

2024
log.transports.file.level = 'info'
2125
log.transports.console.level = 'debug'
Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
{
22
"name": "graphql-playground-html",
3-
"version": "1.5.4",
4-
"homepage":
5-
"https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-html",
6-
"description":
7-
"GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
3+
"version": "1.5.5",
4+
"homepage": "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-html",
5+
"description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
86
"contributors": [
97
"Tim Suchanek <[email protected]>",
108
"Johannes Schickling <[email protected]>",
@@ -13,14 +11,21 @@
1311
"repository": "http://github.com/graphcool/graphql-playground.git",
1412
"license": "SEE LICENSE IN LICENSE",
1513
"main": "dist/index.js",
16-
"files": ["dist"],
14+
"files": [
15+
"dist"
16+
],
1717
"scripts": {
1818
"build": "rimraf dist && tsc",
1919
"prepare": "npm run build"
2020
},
21-
"keywords": ["graphql", "graphiql", "playground", "graphcool"],
21+
"keywords": [
22+
"graphql",
23+
"graphiql",
24+
"playground",
25+
"graphcool"
26+
],
2227
"devDependencies": {
23-
"@types/node": "9.4.0",
28+
"@types/node": "9.4.6",
2429
"graphql-config": "1.1.7",
2530
"rimraf": "2.6.2",
2631
"typescript": "2.6.2"
@@ -30,6 +35,6 @@
3035
"definition": "dist/index.d.ts"
3136
},
3237
"dependencies": {
33-
"graphql-config": "1.1.7"
38+
"graphql-config": "2.0.0"
3439
}
3540
}

packages/graphql-playground-html/yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# yarn lockfile v1
33

44

5-
"@types/[email protected].0":
6-
version "9.4.0"
7-
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.0.tgz#b85a0bcf1e1cc84eb4901b7e96966aedc6f078d1"
5+
"@types/[email protected].6":
6+
version "9.4.6"
7+
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
88

99
argparse@^1.0.7:
1010
version "1.0.9"
@@ -59,14 +59,14 @@ glob@^7.0.5:
5959
once "^1.3.0"
6060
path-is-absolute "^1.0.0"
6161

62-
graphql-config@1.1.7:
63-
version "1.1.7"
64-
resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-1.1.7.tgz#546c443d3ad877ceb8e13f40fbc8937af0d35dbe"
62+
graphql-config@2.0.0:
63+
version "2.0.0"
64+
resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-2.0.0.tgz#daf69091055c6f675d63893a2d14c48f3fec3327"
6565
dependencies:
66-
graphql "^0.12.3"
6766
graphql-import "^0.4.0"
6867
graphql-request "^1.4.0"
6968
js-yaml "^3.10.0"
69+
lodash "^4.17.4"
7070
minimatch "^3.0.4"
7171

7272
graphql-import@^0.4.0:

packages/graphql-playground-middleware-express/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "graphql-playground-middleware-express",
3-
"version": "1.5.6",
3+
"version": "1.5.8",
44
"homepage": "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-middleware-express",
55
"description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
66
"contributors": [
@@ -14,7 +14,7 @@
1414
"files": [
1515
"dist"
1616
],
17-
"playgroundVersion": "1.4.3",
17+
"playgroundVersion": "1.4.7",
1818
"scripts": {
1919
"build": "rimraf dist && tsc",
2020
"prepare": "npm run build"
@@ -34,7 +34,7 @@
3434
"typescript": "2.6.2"
3535
},
3636
"dependencies": {
37-
"graphql-playground-html": "1.5.4"
37+
"graphql-playground-html": "1.5.5"
3838
},
3939
"typings": "dist/index.d.ts",
4040
"typescript": {

packages/graphql-playground-middleware-express/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ glob@^7.0.5:
5959
once "^1.3.0"
6060
path-is-absolute "^1.0.0"
6161

62-
graphql-config@1.1.7:
63-
version "1.1.7"
64-
resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-1.1.7.tgz#546c443d3ad877ceb8e13f40fbc8937af0d35dbe"
62+
graphql-config@2.0.0:
63+
version "2.0.0"
64+
resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-2.0.0.tgz#daf69091055c6f675d63893a2d14c48f3fec3327"
6565
dependencies:
66-
graphql "^0.12.3"
6766
graphql-import "^0.4.0"
6867
graphql-request "^1.4.0"
6968
js-yaml "^3.10.0"
69+
lodash "^4.17.4"
7070
minimatch "^3.0.4"
7171

7272
graphql-import@^0.4.0:
@@ -76,11 +76,11 @@ graphql-import@^0.4.0:
7676
graphql "^0.12.3"
7777
lodash "^4.17.4"
7878

79-
80-
version "1.5.4"
81-
resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.5.4.tgz#82752ec4ee36c62d64ccebf7d3ca47477c213bb6"
79+
80+
version "1.5.5"
81+
resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.5.5.tgz#e2aca543eb66b435ead495b45244b2604d6b2d48"
8282
dependencies:
83-
graphql-config "1.1.7"
83+
graphql-config "2.0.0"
8484

8585
graphql-request@^1.4.0:
8686
version "1.4.1"

packages/graphql-playground-middleware-hapi/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "graphql-playground-middleware-hapi",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"homepage": "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-middleware-hapi",
55
"description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
66
"contributors": [
@@ -15,7 +15,7 @@
1515
"files": [
1616
"dist"
1717
],
18-
"playgroundVersion": "1.4.3",
18+
"playgroundVersion": "1.4.7",
1919
"scripts": {
2020
"build": "rimraf dist && tsc",
2121
"prepare": "npm run build"

packages/graphql-playground-middleware-koa/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "graphql-playground-middleware-koa",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"homepage": "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-middleware-koa",
55
"description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
66
"contributors": [
@@ -14,7 +14,7 @@
1414
"files": [
1515
"dist"
1616
],
17-
"playgroundVersion": "1.4.3",
17+
"playgroundVersion": "1.4.7",
1818
"scripts": {
1919
"build": "rimraf dist && tsc",
2020
"prepare": "npm run build"

packages/graphql-playground-middleware-lambda/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "graphql-playground-middleware-lambda",
3-
"version": "1.4.2",
3+
"version": "1.4.4",
44
"homepage": "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-middleware-lambada",
55
"description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
66
"contributors": [
@@ -14,7 +14,7 @@
1414
"files": [
1515
"dist"
1616
],
17-
"playgroundVersion": "1.4.3",
17+
"playgroundVersion": "1.4.7",
1818
"scripts": {
1919
"build": "rimraf dist && tsc",
2020
"prepare": "npm run build"
@@ -39,6 +39,6 @@
3939
"definition": "dist/index.d.ts"
4040
},
4141
"dependencies": {
42-
"graphql-playground-html": "1.5.4"
42+
"graphql-playground-html": "1.5.5"
4343
}
4444
}

packages/graphql-playground-middleware-lambda/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ glob@^7.0.5:
5959
once "^1.3.0"
6060
path-is-absolute "^1.0.0"
6161

62-
graphql-config@1.1.7:
63-
version "1.1.7"
64-
resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-1.1.7.tgz#546c443d3ad877ceb8e13f40fbc8937af0d35dbe"
62+
graphql-config@2.0.0:
63+
version "2.0.0"
64+
resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-2.0.0.tgz#daf69091055c6f675d63893a2d14c48f3fec3327"
6565
dependencies:
66-
graphql "^0.12.3"
6766
graphql-import "^0.4.0"
6867
graphql-request "^1.4.0"
6968
js-yaml "^3.10.0"
69+
lodash "^4.17.4"
7070
minimatch "^3.0.4"
7171

7272
graphql-import@^0.4.0:
@@ -76,11 +76,11 @@ graphql-import@^0.4.0:
7676
graphql "^0.12.3"
7777
lodash "^4.17.4"
7878

79-
80-
version "1.5.4"
81-
resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.5.4.tgz#82752ec4ee36c62d64ccebf7d3ca47477c213bb6"
79+
80+
version "1.5.5"
81+
resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.5.5.tgz#e2aca543eb66b435ead495b45244b2604d6b2d48"
8282
dependencies:
83-
graphql-config "1.1.7"
83+
graphql-config "2.0.0"
8484

8585
graphql-request@^1.4.0:
8686
version "1.4.1"

packages/graphql-playground-react/yarn.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6617,6 +6617,14 @@ query-string@^4.1.0:
66176617
object-assign "^4.1.0"
66186618
strict-uri-encode "^1.0.0"
66196619

6620+
query-string@^5.1.0:
6621+
version "5.1.0"
6622+
resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.0.tgz#9583b15fd1307f899e973ed418886426a9976469"
6623+
dependencies:
6624+
decode-uri-component "^0.2.0"
6625+
object-assign "^4.1.0"
6626+
strict-uri-encode "^1.0.0"
6627+
66206628
querystring-es3@^0.2.0:
66216629
version "0.2.1"
66226630
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"

0 commit comments

Comments
 (0)