π OpenHands: AI-Driven Development
fix(dev): stop baking absolute VITE_BACKEND_BASE_URL in npm run dev (#16605)
Graham Neubigbab1baf2de10
diff --git a/.github/pr-assets/pr-16605-test-results.png b/.github/pr-assets/pr-16605-test-results.pngnew file mode 100644index 0000000000..6bc0237ce3Binary files /dev/null and b/.github/pr-assets/pr-16605-test-results.png differdiff --git a/__tests__/scripts/dev-with-automation.test.ts b/__tests__/scripts/dev-with-automation.test.tsindex 1c8c504ace..87b43890ec 100644--- a/__tests__/scripts/dev-with-automation.test.ts+++ b/__tests__/scripts/dev-with-automation.test.ts@@ -451,7 +451,6 @@ describe("stack mode routing", () => {expect(buildViteBackendEnv(config, {})).toEqual({VITE_BACKEND_HOST: "127.0.0.1:8000",- VITE_BACKEND_BASE_URL: "http://127.0.0.1:8000",});});@@ -460,7 +459,6 @@ describe("stack mode routing", () => {expect(buildViteBackendEnv(config, {})).toEqual({VITE_BACKEND_HOST: `127.0.0.1:${config.ingressPort}`,- VITE_BACKEND_BASE_URL: `http://127.0.0.1:${config.ingressPort}`,});});@@ -476,7 +474,38 @@ describe("stack mode routing", () => {}),).toEqual({VITE_BACKEND_HOST: "backend.example.test",- VITE_BACKEND_BASE_URL: "https://backend.example.test",+ VITE_USE_TLS: "true",+ });+ });++ it("respects an explicit VITE_USE_TLS override with VITE_BACKEND_BASE_URL", async () => {+ const config = await buildConfig(+ { frontendOnly: true },+ envWithIsolatedKeyPath(),+ );++ expect(+ buildViteBackendEnv(config, {+ VITE_BACKEND_BASE_URL: "https://backend.example.test",+ VITE_USE_TLS: "false",+ }),+ ).toEqual({+ VITE_BACKEND_HOST: "backend.example.test",+ });+ });++ it("does not set VITE_USE_TLS for http:// VITE_BACKEND_BASE_URL", async () => {+ const config = await buildConfig(+ { frontendOnly: true },+ envWithIsolatedKeyPath(),+ );++ expect(+ buildViteBackendEnv(config, {+ VITE_BACKEND_BASE_URL: "http://backend.example.test",+ }),+ ).toEqual({+ VITE_BACKEND_HOST: "backend.example.test",});});diff --git a/scripts/dev-with-automation.mjs b/scripts/dev-with-automation.mjsindex bfdf5f270c..0bf41bda26 100644--- a/scripts/dev-with-automation.mjs+++ b/scripts/dev-with-automation.mjs@@ -730,17 +730,34 @@ function getFrontendBackend(config) {}function buildViteBackendEnv(config, env = process.env) {- const backendBaseUrl = config.launchAgentServer- ? `http://127.0.0.1:${config.ingressPort}`- : (env.VITE_BACKEND_BASE_URL ?? "http://127.0.0.1:8000");+ // VITE_BACKEND_HOST tells the Vite dev-server proxy (vite.config.ts) where+ // to forward /api, /sockets, etc. It is NOT read by the frontend at+ // runtime, so it is safe to keep as an absolute address.+ //+ // VITE_BACKEND_BASE_URL is intentionally left unset so the frontend falls+ // back to window.location.origin (same-origin) at runtime β matching the+ // behaviour of dev:static / agent-canvas and keeping the dev server+ // portable across localhost, LAN hosts, SSH tunnels, and ngrok.const backendHost = config.launchAgentServer? `127.0.0.1:${config.ingressPort}`- : (env.VITE_BACKEND_HOST ?? new URL(backendBaseUrl).host);+ : (env.VITE_BACKEND_HOST ??+ env.VITE_BACKEND_BASE_URL?.replace(/^https?:\/\//, "") ??+ "127.0.0.1:8000");- return {- VITE_BACKEND_HOST: backendHost,- VITE_BACKEND_BASE_URL: backendBaseUrl,- };+ const env_out = { VITE_BACKEND_HOST: backendHost };++ // If the user supplied VITE_BACKEND_BASE_URL with an https:// scheme and+ // did not explicitly set VITE_USE_TLS, propagate the HTTPS intent so the+ // Vite proxy forwards over TLS instead of plain HTTP.+ if (+ !config.launchAgentServer &&+ env.VITE_BACKEND_BASE_URL?.startsWith("https://") &&+ env.VITE_USE_TLS === undefined+ ) {+ env_out.VITE_USE_TLS = "true";+ }++ return env_out;}function buildAgentServerAutomationEnv(config) {