watch: get flags from execArgv

lib/internal/main/watch_mode.js

@@ -18,7 +18,7 @@ const {
   triggerUncaughtException,
   exitCodes: { kNoFailure },
 } = internalBinding('errors');
-const { getOptionValue, getOptionsAsFlagsFromBinding } = require('internal/options');
+const { getOptionValue } = require('internal/options');
 const { FilesWatcher } = require('internal/watch_mode/files_watcher');
 const { green, blue, red, white, clear } = require('internal/util/colors');
 const { convertToValidSignal } = require('internal/util');
@@ -44,14 +44,13 @@ const kCommand = ArrayPrototypeSlice(process.argv, 1);
 const kCommandStr = inspect(ArrayPrototypeJoin(kCommand, ' '));
 
 const argsWithoutWatchOptions = [];
-const argsFromBinding = getOptionsAsFlagsFromBinding();
-for (let i = 0; i < argsFromBinding.length; i++) {
-  const arg = argsFromBinding[i];
+for (let i = 0; i < process.execArgv.length; i++) {
+  const arg = process.execArgv[i];
   if (StringPrototypeStartsWith(arg, '--watch=')) {
     continue;
   }
   if (arg === '--watch') {
-    const nextArg = argsFromBinding[i + 1];
+    const nextArg = process.execArgv[i + 1];
     if (nextArg && nextArg[0] !== '-') {
       // If `--watch` doesn't include `=` and the next
       // argument is not a flag then it is interpreted as

test/sequential/test-watch-mode.mjs

@@ -893,4 +893,33 @@ process.on('message', (message) => {
       await done();
     }
   });
+
+  it('should respect the order for --env-file and --env-file-if-exists', async () => {
+    const envKey = `TEST_ENV_${Date.now()}`;
+    const jsFile = createTmpFile(`console.log('ENV: ' + process.env.${envKey});`);
+
+    const envFile = createTmpFile(`${envKey}=base`, '.env');
+    const envFileIfExists = createTmpFile(`${envKey}=override`, '.env');
+
+    const { done, restart } = runInBackground({
+      args: [
+        '--watch',
+        `--env-file=${envFile}`,
+        `--env-file-if-exists=${envFileIfExists}`,
+        jsFile,
+      ],
+    });
+
+    try {
+      const { stdout, stderr } = await restart();
+
+      assert.strictEqual(stderr, '');
+      assert.deepStrictEqual(stdout, [
+        'ENV: override',
+        `Completed running ${inspect(jsFile)}. Waiting for file changes before restarting...`,
+      ]);
+    } finally {
+      await done();
+    }
+  });
 });