updates

Author: timsuchanek

packages/graphql-playground-html/package.json

@@ -1,8 +1,10 @@
 {
   "name": "graphql-playground-html",
-  "version": "1.3.7-alpha.3",
-  "homepage": "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-html",
-  "description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
+  "version": "1.3.7-alpha.8",
+  "homepage":
+    "https://github.com/graphcool/graphql-playground/tree/master/packages/graphql-playground-html",
+  "description":
+    "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",
   "contributors": [
     "Tim Suchanek <[email protected]>",
     "Johannes Schickling <[email protected]>",
@@ -11,19 +13,12 @@
   "repository": "http://github.com/graphcool/graphql-playground.git",
   "license": "SEE LICENSE IN LICENSE",
   "main": "dist/index.js",
-  "files": [
-    "dist"
-  ],
+  "files": ["dist"],
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build"
   },
-  "keywords": [
-    "graphql",
-    "graphiql",
-    "playground",
-    "graphcool"
-  ],
+  "keywords": ["graphql", "graphiql", "playground", "graphcool"],
   "devDependencies": {
     "@types/node": "^8.0.47",
     "typescript": "^2.6.1"

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

@@ -1,7 +1,7 @@
 import * as path from 'path'
 import * as fs from 'fs'
 import {
-  getUsedEnvs,
+  // getUsedEnvs,
   getGraphQLConfig,
   findGraphQLConfigFile,
   resolveEnvsInValues,
@@ -12,10 +12,12 @@ import * as dotenv from 'dotenv'
 import getLoadingMarkup from './get-loading-markup'
 
 export interface MiddlewareOptions {
-  endpoint: string
-  subscriptionEndpoint?: string
-  setTitle?: string
-  folderName?: string
+  endpoint?: string
+  subscriptionsEndpoint?: string
+  htmlTitle?: string
+  workspaceName?: string
+  env?: any
+  useGraphQLConfig?: boolean
 }
 
 export interface RenderPageOptions extends MiddlewareOptions {
@@ -25,37 +27,31 @@ export interface RenderPageOptions extends MiddlewareOptions {
 
 const loading = getLoadingMarkup()
 
-let config
-let configPath
-let configString
-let folderName
-let env
-async function init() {
-  dotenv.config()
-  try {
-    config = getGraphQLConfig().config
-    config = resolveEnvsInValues(config, process.env)
-    config = await patchEndpointsToConfig(config, process.cwd(), process.env)
-    configPath = findGraphQLConfigFile(process.cwd())
-    configString = fs.readFileSync(configPath, 'utf-8')
-    folderName = path.basename(process.cwd())
-    env = getUsedEnvs(config)
-  } catch (e) {
-    /* tslint:disable-next-line */
-    console.error(e)
-  }
-}
+dotenv.config()
 
-init()
+export async function renderPlaygroundPage(options: RenderPageOptions) {
+  const env = options.env || {}
 
-export function renderPlaygroundPage(options: RenderPageOptions) {
-  const extendedOptions = {
+  const extendedOptions: any = {
     ...options,
-    config,
-    configString,
-    folderName,
     canSaveConfig: false,
-    env,
+  }
+  if (options.htmlTitle) {
+    extendedOptions.title = options.htmlTitle
+  }
+  if (options.useGraphQLConfig) {
+    let config = getGraphQLConfig().config
+    config = resolveEnvsInValues(config, env)
+    config = await patchEndpointsToConfig(config, process.cwd(), env)
+    const configPath = findGraphQLConfigFile(process.cwd())
+    const configString = fs.readFileSync(configPath, 'utf-8')
+    const folderName = path.basename(process.cwd())
+    extendedOptions.folderName = options.workspaceName || folderName
+    extendedOptions.config = config
+    extendedOptions.configString = configString
+  }
+  if (options.subscriptionsEndpoint) {
+    extendedOptions.subscriptionEndpoint = options.subscriptionsEndpoint
   }
   if (!extendedOptions.endpoint && !extendedOptions.configString) {
     /* tslint:disable-next-line */

packages/graphql-playground-middleware-express/examples/graphcool/index.js

@@ -2,7 +2,7 @@ const express = require('express')
 const bodyParser = require('body-parser')
 const { graphqlExpress } = require('apollo-server-express')
 const { makeExecutableSchema } = require('graphql-tools')
-const expressPlayground = require('../../src/index').default
+const expressPlayground = require('graphql-playground-middleware-express').default
 
 const schema = makeExecutableSchema({
   typeDefs: `
@@ -19,12 +19,12 @@ const schema = makeExecutableSchema({
     },
   },
 })
-const PORT = 4000
+const PORT = 4001
 
 const app = express()
 
 app.use('/graphql', bodyParser.json(), graphqlExpress({ schema }))
-app.get('/playground', expressPlayground({ endpoint: '/graphql' }))
+app.get('/playground', expressPlayground({ endpoint: '/graphql', env: process.env, useGraphQLConfig: true}))
 
 app.listen(PORT)
 

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

@@ -15,7 +15,7 @@
     "cors": "^2.8.4",
     "express": "^4.16.2",
     "graphql": "^0.11.7",
-    "graphql-playground-middleware-express": "^1.2.1-beta.2",
+    "graphql-playground-middleware-express": "^1.3.8-beta.3",
     "graphql-tools": "^2.7.1"
   }
 }