fix: node@10 support back in

Can't use .? so we use undefsafe
remy · Jul 7, 2023 · af3b9e2 · af3b9e2
1 parent a3f0e12
commit af3b9e2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/monitor/run.js b/lib/monitor/run.js
@@ -16,6 +16,7 @@ var restart = null;
 var psTree = require('pstree.remy');
 var path = require('path');
 var signals = require('./signals');
+const undefsafe = require('undefsafe');
 const osRelease = parseInt(require('os').release().split('.')[0], 10);
 
 function run(options) {
@@ -64,7 +65,10 @@ function run(options) {
 
   const spawnOptions = {
     env: Object.assign({}, process.env, options.execOptions.env, {
-      PATH: binPath + path.delimiter + options.execOptions.env?.PATH || process.env.PATH,
+      PATH:
+        binPath +
+        path.delimiter +
+        (undefsafe(options, '.execOptions.env.PATH') || process.env.PATH),
     }),
     stdio: stdio,
   };
@@ -129,7 +133,7 @@ function run(options) {
       silent: !hasStdio,
     };
     if (utils.isWindows) {
-      forkOptions.windowsHide = true; 
+      forkOptions.windowsHide = true;
     }
     child = fork(options.execOptions.script, forkArgs, forkOptions);
     utils.log.detail('forking');
@@ -341,7 +345,12 @@ function kill(child, signal, callback) {
     // We are handling a 'SIGKILL' , 'SIGUSR2' and 'SIGUSR1' POSIX signal under Windows the
     // same way it is handled on a UNIX system: We are performing
     // a hard shutdown without waiting for the process to clean-up.
-    if (signal === 'SIGKILL' || osRelease < 10 || signal === 'SIGUSR2' || signal==="SIGUSR1" ) {
+    if (
+      signal === 'SIGKILL' ||
+      osRelease < 10 ||
+      signal === 'SIGUSR2' ||
+      signal === 'SIGUSR1'
+    ) {
       debug('terminating process group by force: %s', child.pid);
 
       // We are using the taskkill utility to terminate the whole