cleanup __CYPRESS_GRAPHQL_PORT injection

tgriesser · tgriesser · commit f13c63ecf8cc · 2021-10-10T22:15:40.000-04:00
diff --git a/packages/frontend-shared/src/graphql/urqlClient.ts b/packages/frontend-shared/src/graphql/urqlClient.ts
@@ -43,7 +43,7 @@ export function makeUrqlClient (target: 'launchpad' | 'app'): Client {
     gqlPort = GQL_PORT_MATCH[1]
   } else {
     // @ts-ignore
-    gqlPort = window.__CYPRESS_GRAPHQL_PORT
+    gqlPort = window.__CYPRESS_GRAPHQL_PORT__
   }
 
   if (!gqlPort) {
diff --git a/packages/server/lib/routes-ct.ts b/packages/server/lib/routes-ct.ts
@@ -6,6 +6,7 @@ import send from 'send'
 import { getPathToDist } from '@packages/resolve-dist'
 import type { InitializeRoutes } from './routes'
 import { fs } from './util/fs'
+import type { DataContextShell } from '@packages/data-context/src/DataContextShell'
 
 const debug = Debug('cypress:server:routes-ct')
 
@@ -34,25 +35,21 @@ export const createRoutesCT = ({
     })
 
     proxyIndex.on('proxyRes', function (proxyRes, _req, _res) {
-      if ((_req as Request).params[0] === '') {
-        const body: any[] = []
+      const body: any[] = []
 
-        proxyRes.on('data', function (chunk) {
-          let chunkData = String(chunk)
+      proxyRes.on('data', function (chunk) {
+        let chunkData = String(chunk)
 
-          if (chunkData.includes('<head>')) {
-            chunkData = chunkData.replace('<body>', `<body><script>window.__CYPRESS_GRAPHQL_PORT = ${JSON.stringify(ctx.gqlServerPort)};</script>\n`)
-          }
+        if (chunkData.includes('<head>')) {
+          chunkData = chunkData.replace('<body>', replaceBody(ctx))
+        }
 
-          body.push(chunkData)
-        })
+        body.push(chunkData)
+      })
 
-        proxyRes.on('end', function () {
-          (_res as Response).send(body.join(''))
-        })
-      } else {
-        proxyRes.pipe(_res)
-      }
+      proxyRes.on('end', function () {
+        (_res as Response).send(body.join(''))
+      })
     })
 
     // TODO: can namespace this onto a "unified" route like __app-unified__
@@ -71,7 +68,7 @@ export const createRoutesCT = ({
       if (req.params[0] === '') {
         return fs.readFile(pathToFile, 'utf8')
         .then((file) => {
-          res.send(file.replace('<div id="app">', '<script>window.__CYPRESS_GRAPHQL_PORT = 1234</script><div id="app">'))
+          res.send(file.replace('<body>', replaceBody(ctx)))
         })
       }
 
@@ -160,3 +157,7 @@ export const createRoutesCT = ({
 
   return routesCt
 }
+
+function replaceBody (ctx: DataContextShell) {
+  return `<body><script>window.__CYPRESS_GRAPHQL_PORT__ = ${JSON.stringify(ctx.gqlServerPort)};</script>\n`
+}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export function makeUrqlClient (target: 'launchpad' \| 'app'): Client {`
`43`	`43`	`gqlPort = GQL_PORT_MATCH[1]`
`44`	`44`	`} else {`
`45`	`45`	`// @ts-ignore`
`46`		`- gqlPort = window.__CYPRESS_GRAPHQL_PORT`
	`46`	`+ gqlPort = window.__CYPRESS_GRAPHQL_PORT__`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (!gqlPort) {`