File tree Expand file tree Collapse file tree 3 files changed +24
-9
lines changed
packages/graphql-playground-electron Expand file tree Collapse file tree 3 files changed +24
-9
lines changed Original file line number Diff line number Diff line change 95
95
"graphcool-ui" : " ^0.0.13" ,
96
96
"graphql-config" : " ^1.1.2" ,
97
97
"graphql-config-extension-graphcool" : " 1.0.4" ,
98
- "graphql-config-extension-prisma" : " 0.0.1 " ,
98
+ "graphql-config-extension-prisma" : " 0.0.3 " ,
99
99
"graphql-playground-react" : " 1.3.22" ,
100
100
"js-yaml" : " ^3.10.0" ,
101
101
"lodash.merge" : " ^4.6.0" ,
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ import * as os from 'os'
20
20
import * as yaml from 'js-yaml'
21
21
import * as findUp from 'find-up'
22
22
import { patchEndpointsToConfigData } from 'graphql-config-extension-graphcool'
23
+ import { patchEndpointsToConfigData as patchPrismaEndpointsToConfigData } from 'graphql-config-extension-prisma'
23
24
// import { PermissionSession } from 'graphql-playground/lib/types'
24
25
25
26
const { dialog } = remote
@@ -119,7 +120,15 @@ cd ${folderPath}; graphql playground`)
119
120
}
120
121
121
122
const configDir = path . dirname ( configPath )
122
- const config = await patchEndpointsToConfigData (
123
+ let config = await patchEndpointsToConfigData (
124
+ resolveEnvsInValues (
125
+ getGraphQLConfig ( path . dirname ( configPath ) ) . config ,
126
+ process . env ,
127
+ ) ,
128
+ configDir ,
129
+ process . env ,
130
+ )
131
+ config = await patchPrismaEndpointsToConfigData (
123
132
resolveEnvsInValues (
124
133
getGraphQLConfig ( path . dirname ( configPath ) ) . config ,
125
134
process . env ,
@@ -259,6 +268,11 @@ cd ${folderPath}; graphql playground`)
259
268
input . cwd ,
260
269
input . env ,
261
270
)
271
+ config = await patchPrismaEndpointsToConfigData (
272
+ resolvedConfig ,
273
+ input . cwd ,
274
+ input . env ,
275
+ )
262
276
263
277
if ( ! this . configContainsEndpoints ( config ) ) {
264
278
const graphcoolNote = configString . includes ( 'graphcool' )
Original file line number Diff line number Diff line change 3513
3513
graphcool-yml "0.4.8"
3514
3514
graphql-config "^1.1.4"
3515
3515
3516
-
3517
- version "0.0.1 "
3518
- resolved "https://registry.yarnpkg.com/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.0.1 .tgz#ab02d0aa80bc12883e4c898b04e0db5e73ed1936 "
3516
+
3517
+ version "0.0.3 "
3518
+ resolved "https://registry.yarnpkg.com/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.0.3 .tgz#2fea0a34ef128e1763cb3ebfa6becd99549fe1ef "
3519
3519
dependencies :
3520
3520
graphql-config "^1.1.4"
3521
- prisma-yml "0.0.2 "
3521
+ prisma-yml "0.0.4 "
3522
3522
3523
3523
3524
3524
version "1.1.4"
@@ -6150,12 +6150,13 @@ prisma-json-schema@^0.0.1:
6150
6150
version "0.0.1"
6151
6151
resolved "https://registry.yarnpkg.com/prisma-json-schema/-/prisma-json-schema-0.0.1.tgz#0802e156a293faefdf21e5e41beb8d3681f45cb1"
6152
6152
6153
-
6154
- version "0.0.2 "
6155
- resolved "https://registry.yarnpkg.com/prisma-yml/-/prisma-yml-0.0.2 .tgz#7f86e5fcb7dfe4a8cbf104a8b36ea9de69a9c0d3 "
6153
+
6154
+ version "0.0.4 "
6155
+ resolved "https://registry.yarnpkg.com/prisma-yml/-/prisma-yml-0.0.4 .tgz#66b54f5056f087ff548719bb62e5251ca49fe4b1 "
6156
6156
dependencies :
6157
6157
ajv "^5.5.1"
6158
6158
bluebird "^3.5.1"
6159
+ chalk "^2.3.0"
6159
6160
debug "^3.1.0"
6160
6161
dotenv "^4.0.0"
6161
6162
fs-extra "^4.0.3"
You can’t perform that action at this time.
0 commit comments