@multiplatform.one/config 7.7.2 → 7.7.4

package/lib/index.js

@@ -1,4 +1,4 @@
-import { t as createViteConfig } from "./vite-uwqTTN8M.js";
+import { t as createViteConfig } from "./vite-DF5gYMDn.js";
 import { t as createStorybookViteConfig } from "./storybook-BuO1e8Sb.js";
 import { n as tamaguiWorkspacePathsFile, t as ensureTamaguiWorkspacePaths } from "./tamaguiWorkspacePaths-ZIcqybtn.js";
 import { createVitestConfig } from "./vitest.js";

package/lib/{vite-uwqTTN8M.js → vite-DF5gYMDn.js}

@@ -171,7 +171,7 @@ function createViteConfig(options = {}) {
 			"@opentelemetry/sdk-trace-node"
 		]
 	} : void 0;
-	const onePort = Number(process.env.ONE_PORT) || 3e3;
+	const onePort = Number(process.env.ONE_PORT);
 	const defaultServer = {
 		allowedHosts: [
 			"localhost",
@@ -183,7 +183,7 @@ function createViteConfig(options = {}) {
 		watch: { ignored: ["**/src-tauri/**"] },
 		...one ? { hmr: {
 			path: "/__vxrnhmr",
-			clientPort: onePort
+			...onePort ? { clientPort: onePort } : {}
 		} } : {},
 		...server
 	};

package/lib/vite.js

@@ -1,4 +1,4 @@
-import { t as createViteConfig } from "./vite-uwqTTN8M.js";
+import { t as createViteConfig } from "./vite-DF5gYMDn.js";
 import { n as publicPackageViteSourceAliases, t as discoverPublicPackageRoots } from "./workspacePublicPackages-COicQSj4.js";
 
 export { createViteConfig, discoverPublicPackageRoots, publicPackageViteSourceAliases };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/config",
-  "version": "7.7.2",
+  "version": "7.7.4",
   "description": "Shared build and test configuration presets for multiplatform.one",
   "keywords": [
     "config",
@@ -102,7 +102,7 @@
     "vite-plugin-external": "^6.2.2",
     "vite-plugin-i18next-loader": "^3.1.3",
     "vitest": "^4.1.5",
-    "@multiplatform.one/utils": "7.7.2"
+    "@multiplatform.one/utils": "7.7.4"
   },
   "devDependencies": {
     "tsdown": "^0.21.10",

package/src/vite.spec.ts

@@ -5,7 +5,7 @@
  * escape hatches.
  */
 
-import { beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { Plugin } from "vite";
 import { createViteConfig } from "./vite.js";
 
@@ -146,3 +146,23 @@ describe("public config bake", () => {
     expect(process.env[bakedValues]).toBeUndefined();
   });
 });
+
+describe("One HMR ports (MPO-233)", () => {
+  afterEach(() => vi.unstubAllEnvs());
+  it("lets Vite use the actual listener when no proxy port is configured", () => {
+    vi.stubEnv("ONE_PORT", "");
+    const config = createViteConfig({ one: true, server: { port: 3456 } });
+    expect(config.server?.hmr).toEqual({ path: "/__vxrnhmr" });
+  });
+  it("retains an explicitly configured proxy bypass port", () => {
+    vi.stubEnv("ONE_PORT", "3000");
+    const config = createViteConfig({ one: true });
+    expect(config.server?.hmr).toEqual({ path: "/__vxrnhmr", clientPort: 3000 });
+  });
+  it("preserves an explicit consumer HMR override", () => {
+    vi.stubEnv("ONE_PORT", "3000");
+    const hmr = { path: "/custom-hmr", clientPort: 9000 };
+    const config = createViteConfig({ one: true, server: { hmr } });
+    expect(config.server?.hmr).toEqual(hmr);
+  });
+});

package/src/vite.ts

@@ -405,13 +405,14 @@ export function createViteConfig(options: CreateViteConfigOptions = {}): UserCon
   // When the One app runs behind Frappe's dev proxy (port 8000 → 3000), the
   // browser page origin is :8000 but the vxrn HMR WebSocket lives on :3000.
   // Werkzeug (WSGI) can't proxy WebSocket upgrades, so we tell the HMR client
-  // to connect directly to the One dev server port.
+  // to connect directly when ONE_PORT is explicitly configured. Otherwise Vite
+  // derives the client port from its actual listener, including CLI --port.
   //
   // IMPORTANT: vxrn internally sets `hmr.path = '/__vxrnhmr'`.  We must
   // include the path here because config merging replaces the entire `hmr`
   // object (shallow merge at the `server` level).  If vxrn ever changes the
   // path, update it here too.
-  const onePort = Number(process.env.ONE_PORT) || 3000;
+  const onePort = Number(process.env.ONE_PORT);
   const defaultServer: UserConfig["server"] = {
     allowedHosts: ["localhost", "127.0.0.1", "app.localhost", "app.test"],
     strictPort: true,
@@ -422,7 +423,7 @@ export function createViteConfig(options: CreateViteConfigOptions = {}): UserCon
       ? {
           hmr: {
             path: "/__vxrnhmr",
-            clientPort: onePort,
+            ...(onePort ? { clientPort: onePort } : {}),
           },
         }
       : {}),

package/types/vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../src/vite.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAU,UAAU,EAAE,MAAM,MAAM,CAAC;AAI/C,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE5B;;OAEG;IACH,OAAO,CAAC,EACJ,OAAO,GACP;QACE;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAEtB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAEhB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEN;;OAEG;IACH,IAAI,CAAC,EACD,OAAO,GACP;QACE;;;WAGG;QACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAEjB;;WAEG;QACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B,CAAC;IAEN;;;OAGG;IACH,GAAG,CAAC,EACA,OAAO,GACP;QACE,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC3B,GAAG,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACtD,KAAK,CAAC,EAAE;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;QAC/B,MAAM,CAAC,EAAE;YAAE,GAAG,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC,CAAC;IAEN;;OAEG;IACH,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE9B;;OAEG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAEhC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAEF;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAEtB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAElC;;;OAGG;IACH,WAAW,CAAC,EAAE;QACZ;;;;;;WAMG;QACH,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB;;;;;;;WAOG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,uBAA4B,GAAG,UAAU,CA0TlF;AAED,OAAO,EACL,0BAA0B,EAC1B,8BAA8B,GAC/B,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../src/vite.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAU,UAAU,EAAE,MAAM,MAAM,CAAC;AAI/C,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE5B;;OAEG;IACH,OAAO,CAAC,EACJ,OAAO,GACP;QACE;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAEtB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAEhB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEN;;OAEG;IACH,IAAI,CAAC,EACD,OAAO,GACP;QACE;;;WAGG;QACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAEjB;;WAEG;QACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B,CAAC;IAEN;;;OAGG;IACH,GAAG,CAAC,EACA,OAAO,GACP;QACE,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC3B,GAAG,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACtD,KAAK,CAAC,EAAE;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;QAC/B,MAAM,CAAC,EAAE;YAAE,GAAG,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC,CAAC;IAEN;;OAEG;IACH,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE9B;;OAEG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAEhC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAEF;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAEtB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAElC;;;OAGG;IACH,WAAW,CAAC,EAAE;QACZ;;;;;;WAMG;QACH,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB;;;;;;;WAOG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,uBAA4B,GAAG,UAAU,CA2TlF;AAED,OAAO,EACL,0BAA0B,EAC1B,8BAA8B,GAC/B,MAAM,8BAA8B,CAAC"}