fix(bazel): ensure PORT variable is prioritized over CLI flag

This is necessary for `server_test` to override the port that may be
specified via Starlark, or the CLI flag.

Author: devversion

bazel/http-server/main.ts

@@ -11,14 +11,18 @@ import yargs from 'yargs';
 import {HttpServer} from './server';
 import {setupBazelWatcherSupport} from './ibazel';
 
-const {rootPaths, historyApiFallback, enableDevUi, environmentVariables, port, relaxCors} = yargs(
-  process.argv.slice(2),
-)
+const {
+  rootPaths,
+  historyApiFallback,
+  enableDevUi,
+  environmentVariables,
+  port: cliPort,
+  relaxCors,
+} = yargs(process.argv.slice(2))
   .strict()
   .option('port', {
     type: 'number',
-    default: process.env['PORT'] !== undefined ? Number(process.env['PORT']) : 4200,
-    defaultDescription: '${PORT}, or 4200 if unset',
+    default: 4200,
   })
   .option('historyApiFallback', {type: 'boolean', default: false})
   .option('rootPaths', {type: 'array', string: true, default: ['']})
@@ -27,6 +31,12 @@ const {rootPaths, historyApiFallback, enableDevUi, environmentVariables, port, r
   .option('relaxCors', {type: 'boolean', default: false})
   .parseSync();
 
+let port = cliPort;
+// Process environment port always overrides the CLI, or rule attribute-specified port.
+if (process.env.PORT !== undefined) {
+  port = Number(process.env.PORT);
+}
+
 // In non-test executions, we will never allow for the browser-sync dev UI.
 const enableUi = process.env.TEST_TARGET === undefined && enableDevUi;
 const server = new HttpServer(