fix(core): Read PATH & PATHEXT /w case insensitivity, normalize on write

package.json

@@ -50,7 +50,6 @@
     "http-proxy-middleware": "^1.0.5",
     "merge-stream": "^2.0.0",
     "npm-run-path": "^4.0.1",
-    "path-key": "^3.1.1",
     "serialize-javascript": "^5.0.1",
     "split": "^1.0.1",
     "ts-interface-checker": "^0.1.13",

src/core/spawnProcess.ts

@@ -1,10 +1,10 @@
 import { spawn } from 'child_process'
 import { resolve, normalize } from 'path'
 import npmRunPath from 'npm-run-path'
-import getPathKey from 'path-key'
 import which from 'which'
 import { NormalizedServiceConfig } from './validateAndNormalizeConfig'
 
+// Match the isWindows definition from `node-which`
 // https://github.com/npm/node-which/blob/6a822d836de79f92fb3170f685a6e283fbfeff87/which.js#L1-L3
 const isWindows =
   process.platform === 'win32' ||
@@ -16,18 +16,15 @@ export function spawnProcess(config: NormalizedServiceConfig) {
   let [binary, ...args] = config.command
   let env = { ...config.env }
 
-  // Use uppercase PATH key regardless of OS or original key
-  env.PATH = filterBlankParts(
-    npmRunPath({
-      cwd,
-      path: config.env[getPathKey({ env: config.env })] || '',
-    }),
-  )
+  let path = readEnvCaseInsensitive(env, 'PATH') || ''
+  path = filterBlankParts(npmRunPath({ cwd, path }))
+  env = writeEnvCaseNormalized(env, 'PATH', path)
 
   if (isWindows) {
-    env.PATHEXT =
-      config.env.PATHEXT || '.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH'
-
+    const pathExt =
+      readEnvCaseInsensitive(env, 'PATHEXT') ||
+      '.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH'
+    env = writeEnvCaseNormalized(env, 'PATHEXT', pathExt)
     /*
       Work around issue (same issue):
         - https://github.com/nodejs/node-v0.x-archive/issues/2318
@@ -39,12 +36,37 @@ export function spawnProcess(config: NormalizedServiceConfig) {
 
       Instead just replace `binary` with a fully-qualified version.
      */
-    binary = normalize(myWhich(cwd, binary, env.PATH, env.PATHEXT) || binary)
+    binary = normalize(myWhich(cwd, binary, path, pathExt) || binary)
   }
 
   return spawn(binary, args, { cwd, env })
 }
 
+function readEnvCaseInsensitive(
+  env: { [key: string]: string },
+  key: string,
+): string | undefined {
+  const upperCaseKey = key.toUpperCase()
+  const caseInsensitiveKey = Object.keys(env)
+    .reverse()
+    .find(key => key.toUpperCase() === upperCaseKey)
+  return caseInsensitiveKey === undefined ? undefined : env[caseInsensitiveKey]
+}
+
+function writeEnvCaseNormalized(
+  env: { [key: string]: string },
+  key: string,
+  value: string,
+): { [key: string]: string } {
+  const upperCaseKey = key.toUpperCase()
+  return {
+    ...Object.fromEntries(
+      Object.entries(env).filter(([key]) => key.toUpperCase() !== upperCaseKey),
+    ),
+    [upperCaseKey]: value,
+  }
+}
+
 function filterBlankParts(string: string) {
   const colon = isWindows ? ';' : ':'
   return string

yarn.lock

@@ -7312,7 +7312,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-key@^3.0.0, path-key@^3.1.0, path-key@^3.1.1:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==