From e4c0e19cbaa30daecccdd2faa3fc18a4a9fa75ee Mon Sep 17 00:00:00 2001
From: Bryan Field <bfield@700software.com>
Date: Tue, 14 May 2024 17:03:13 -0400
Subject: [PATCH] quick fix for #9345 by allowing env `HMR_PORT` alongside env
 `PORT`

---
 packages/core/core/src/resolveOptions.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/core/core/src/resolveOptions.js b/packages/core/core/src/resolveOptions.js
index 6c78461f76d..161d5a22b10 100644
--- a/packages/core/core/src/resolveOptions.js
+++ b/packages/core/core/src/resolveOptions.js
@@ -146,6 +146,7 @@ export default async function resolveOptions(
   };
 
   let port = determinePort(initialOptions.serveOptions, env.PORT);
+  let hmrPort = determinePort(initialOptions.hmrOptions, env.HMR_PORT);
 
   return {
     config: getRelativeConfigSpecifier(
@@ -162,7 +163,13 @@ export default async function resolveOptions(
     env,
     mode,
     shouldAutoInstall: initialOptions.shouldAutoInstall ?? false,
-    hmrOptions: initialOptions.hmrOptions ?? null,
+    hmrOptions:
+      initialOptions.hmrOptions != null
+        ? {
+            ...initialOptions.hmrOptions,
+            port: hmrPort,
+          }
+        : null,
     shouldBuildLazily,
     lazyIncludes,
     lazyExcludes,