Skip to content

Commit 72ce36c

Browse files
committed
fix(deps): Remove extension dependencies
Closes #493
1 parent d347e20 commit 72ce36c

File tree

8 files changed

+23
-1081
lines changed

8 files changed

+23
-1081
lines changed

packages/graphql-playground-html/package.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "graphql-playground-html",
3-
"version": "1.4.4",
3+
"version": "1.5.0",
44
"homepage": "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-html",
55
"description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
66
"contributors": [
@@ -26,17 +26,13 @@
2626
],
2727
"devDependencies": {
2828
"@types/node": "8.5.5",
29+
"graphql-config": "1.1.7",
2930
"rimraf": "2.6.2",
3031
"typescript": "2.6.2"
3132
},
3233
"typings": "dist/index.d.ts",
3334
"typescript": {
3435
"definition": "dist/index.d.ts"
3536
},
36-
"dependencies": {
37-
"dotenv": "^4.0.0",
38-
"graphql-config": "^1.1.1",
39-
"graphql-config-extension-graphcool": "1.0.4",
40-
"graphql-config-extension-prisma": "0.0.3"
41-
}
37+
"dependencies": {}
4238
}

packages/graphql-playground-html/src/render-playground-page.ts

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
1-
import * as path from 'path'
2-
import * as fs from 'fs'
3-
import {
4-
// getUsedEnvs,
5-
getGraphQLConfig,
6-
findGraphQLConfigFile,
7-
resolveEnvsInValues,
8-
} from 'graphql-config'
9-
import { patchEndpointsToConfigData } from 'graphql-config-extension-graphcool'
10-
import { patchEndpointsToConfigData as patchPrismaEndpointsToConfigData } from 'graphql-config-extension-prisma'
11-
import * as dotenv from 'dotenv'
12-
131
import getLoadingMarkup from './get-loading-markup'
2+
import { GraphQLConfigData } from 'graphql-config/lib/types'
143

154
export interface MiddlewareOptions {
165
endpoint?: string
176
subscriptionsEndpoint?: string
187
htmlTitle?: string
198
workspaceName?: string
209
env?: any
21-
useGraphQLConfig?: boolean
10+
config?: GraphQLConfigData
2211
}
2312

2413
export interface RenderPageOptions extends MiddlewareOptions {
@@ -28,33 +17,20 @@ export interface RenderPageOptions extends MiddlewareOptions {
2817

2918
const loading = getLoadingMarkup()
3019

31-
dotenv.config()
32-
33-
export async function renderPlaygroundPage(options: RenderPageOptions) {
34-
const env = options.env || {}
35-
20+
export function renderPlaygroundPage(options: RenderPageOptions) {
3621
const extendedOptions: any = {
3722
...options,
3823
canSaveConfig: false,
3924
}
4025
if (options.htmlTitle) {
4126
extendedOptions.title = options.htmlTitle
4227
}
43-
if (options.useGraphQLConfig) {
44-
let config = getGraphQLConfig().config
45-
config = resolveEnvsInValues(config, env)
46-
config = await patchEndpointsToConfigData(config, process.cwd(), env)
47-
config = await patchPrismaEndpointsToConfigData(config, process.cwd(), env)
48-
const configPath = findGraphQLConfigFile(process.cwd())
49-
const configString = fs.readFileSync(configPath, 'utf-8')
50-
const folderName = path.basename(process.cwd())
51-
extendedOptions.folderName = options.workspaceName || folderName
52-
extendedOptions.config = config
53-
extendedOptions.configString = configString
54-
}
5528
if (options.subscriptionsEndpoint) {
5629
extendedOptions.subscriptionEndpoint = options.subscriptionsEndpoint
5730
}
31+
if (options.config) {
32+
extendedOptions.configString = JSON.stringify(options.config, null, 2)
33+
}
5834
if (!extendedOptions.endpoint && !extendedOptions.configString) {
5935
/* tslint:disable-next-line */
6036
console.warn(

0 commit comments

Comments
 (0)