add graphcool extension to middlewares

Author: timsuchanek

packages/graphql-playground-electron/src/ElectronApp.tsx

@@ -9,6 +9,7 @@ import {
   getGraphQLConfig,
   findGraphQLConfigFile,
   GraphQLConfigData,
+  resolveEnvsInValues,
 } from 'graphql-config'
 import { createNewWindow } from './utils'
 import createStore from './createStore'
@@ -116,7 +117,10 @@ cd ${folderPath}; graphql playground`)
       }
 
       const config = await patchEndpointsToConfig(
-        getGraphQLConfig(path.dirname(configPath)).config,
+        resolveEnvsInValues(
+          getGraphQLConfig(path.dirname(configPath)).config,
+          process.env,
+        ),
         path.dirname(configPath),
       )
 
@@ -235,7 +239,7 @@ cd ${folderPath}; graphql playground`)
         ? path.basename(path.dirname(configPath))
         : undefined
       config = await patchEndpointsToConfig(
-        getGraphQLConfig(input.cwd).config,
+        resolveEnvsInValues(getGraphQLConfig(input.cwd).config, input.env),
         input.cwd,
       )
     }

packages/graphql-playground-html/package.json

@@ -1,8 +1,10 @@
 {
   "name": "graphql-playground-html",
-  "version": "1.3.6",
-  "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.2",
+  "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"
@@ -33,6 +28,7 @@
     "definition": "dist/index.d.ts"
   },
   "dependencies": {
-    "graphql-config": "^1.0.9"
+    "graphql-config": "^1.0.9",
+    "graphql-config-extension-graphcool": "^0.0.1"
   }
 }

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

@@ -4,7 +4,9 @@ import {
   getUsedEnvs,
   getGraphQLConfig,
   findGraphQLConfigFile,
+  resolveEnvsInValues,
 } from 'graphql-config'
+import { patchEndpointsToConfig } from 'graphql-config-extension-graphcool'
 
 import getLoadingMarkup from './get-loading-markup'
 
@@ -22,23 +24,32 @@ export interface RenderPageOptions extends MiddlewareOptions {
 
 const loading = getLoadingMarkup()
 
-export function renderPlaygroundPage(options: RenderPageOptions) {
-  let config
-  let configPath
-  let configString
-  let folderName
-  let env
+let config
+let configPath
+let configString
+let folderName
+let env
+async function init() {
   try {
     config = getGraphQLConfig().config
+    config = resolveEnvsInValues(config, process.env)
+    config = await patchEndpointsToConfig(config, process.cwd())
     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)
   }
+}
+
+init()
+
+export function renderPlaygroundPage(options: RenderPageOptions) {
   const extendedOptions = {
     ...options,
+    config,
     configString,
     folderName,
     canSaveConfig: false,