fix: remove .json check from require_async, prevent child_process spa…

…wn (#18416)
cypress-io · Oct 8, 2021 · 32464f3 · 32464f3 · cypress-bot · Oct 8, 2021
1 parent c18b5e6
commit 32464f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/packages/server/lib/util/require_async.ts b/packages/server/lib/util/require_async.ts
@@ -4,7 +4,6 @@ import * as cp from 'child_process'
 import * as inspector from 'inspector'
 import * as util from '../plugins/util'
 import * as errors from '../errors'
-import { fs } from '../util/fs'
 import Debug from 'debug'
 
 const debug = Debug('cypress:server:require_async')
@@ -33,10 +32,6 @@ export async function requireAsync (filePath: string, options: RequireAsyncOptio
       killChildProcess()
     }
 
-    if (/\.json$/.test(filePath)) {
-      fs.readJson(path.resolve(options.projectRoot, filePath)).then((result) => resolve(result)).catch(reject)
-    }
-
     const childOptions: ChildOptions = {
       stdio: 'inherit',
     }

diff --git a/packages/server/lib/util/settings.ts b/packages/server/lib/util/settings.ts
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import Promise from 'bluebird'
 import path from 'path'
+
 import errors from '../errors'
 import { fs } from '../util/fs'
 import { requireAsync } from './require_async'
@@ -146,11 +147,12 @@ export function read (projectRoot, options: SettingsOptions = {}) {
 
   const file = pathToConfigFile(projectRoot, options)
 
-  return requireAsync(file,
-    {
-      projectRoot,
-      loadErrorCode: 'CONFIG_FILE_ERROR',
-    })
+  const readPromise = /\.json$/.test(file) ? fs.readJSON(path.resolve(projectRoot, file)) : requireAsync(file, {
+    projectRoot,
+    loadErrorCode: 'CONFIG_FILE_ERROR',
+  })
+
+  return readPromise
   .catch((err) => {
     if (err.type === 'MODULE_NOT_FOUND' || err.code === 'ENOENT') {
       if (options.args?.runProject) {