Repository: nodejs/node
Pull request: watch: get flags from execArgv

Fixes #61412

This seems to be a regression from https://github.com/nodejs/node/commit/cec1bd5498ff6dc70f1beaae42b5f43c89cf7860, where watch mode switched to spawning the child using getOptionsAsFlagsFromBinding() instead of process.execArgv and the original flag ordering is not preserved.

<!--
Before submitting a pull request, please read:

- the CONTRIBUTING guide at https://github.com/nodejs/node/blob/HEAD/CONTRIBUTING.md
- the commit message formatting guidelines at
  https://github.com/nodejs/node/blob/HEAD/doc/contributing/pull-requests.md#commit-message-guidelines

For code changes:
1. Include tests for any bug fixes or new features.
2. Update documentation if relevant.
3. Ensure that `make -j4 test` (UNIX), or `vcbuild test` (Windows) passes.

If you believe this PR should be highlighted in the Node.js CHANGELOG
please add the `notable-change` label.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.
-->


Changed files:
filename: lib/internal/main/watch_mode.js
patch: @@ -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

filename: test/sequential/test-watch-mode.mjs
patch: @@ -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();
+    }
+  });
 });