From 1084154f56f93f56b75b85650e054214fdbaff2e Mon Sep 17 00:00:00 2001
From: MarioCadenas <MarioCadenas@users.noreply.github.com>
Date: Fri, 20 Feb 2026 19:31:42 +0100
Subject: [PATCH] feat: allow overriding vite client port

---
 packages/appkit/src/plugins/server/vite-dev-server.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/appkit/src/plugins/server/vite-dev-server.ts b/packages/appkit/src/plugins/server/vite-dev-server.ts
index feefc6e4..f6f33fec 100644
--- a/packages/appkit/src/plugins/server/vite-dev-server.ts
+++ b/packages/appkit/src/plugins/server/vite-dev-server.ts
@@ -58,11 +58,17 @@ export class ViteDevServer extends BaseServer {
     );
 
     const userConfig = loadedConfig?.config ?? {};
+    const viteClientPort = process.env.VITE_CLIENT_PORT;
+    const serverHmr = viteClientPort
+      ? { hmr: { clientPort: viteClientPort } }
+      : {};
+
     const coreConfig = {
       configFile: false,
       root: clientRoot,
       server: {
         middlewareMode: true,
+        ...serverHmr,
         watch: {
           useFsEvents: true,
           ignored: ["**/node_modules/**", "!**/node_modules/@databricks/**"],