@wix/origami-site-express 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-site-express",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Run an exported Wix origami site on Node with Express and Vite.",
   "type": "module",
   "files": [
@@ -65,5 +65,5 @@
       ]
     }
   },
-  "falconPackageHash": "455a5d4751b360861bad538b9622e269cf9952063df493f85de30eb9"
+  "falconPackageHash": "c747f0aab95a2845e2ad63b387beb5dde7b4e28c62baceff7b05fc63"
 }

package/src/adapter/driver.js

@@ -12,7 +12,7 @@ async function spawnBin(command, root, env) {
     const { spawn } = await import('node:child_process')
     const child = spawn(process.execPath, [binPath(root), command], {
         cwd: root, stdio: ['ignore', 'pipe', 'pipe'],
-        env: { ...process.env, ...env, ...(command === 'start' ? { NODE_ENV: 'production' } : {}) },
+        env: { ...process.env, ...env, ...(command === 'dev' ? {} : { NODE_ENV: 'production' }) },
     })
     let output = ''
     child.stdout.on('data', chunk => { output += chunk })

package/src/server/dev.js

@@ -12,7 +12,7 @@ import { createCurrentSite } from './currentSite.js'
 /** `origami-site-express dev`: Vite in middleware mode, Express, and the core in dev mode, all live.
  * @param {{ root: string }} options */
 export async function dev({ root }) {
-    const env = loadEnv('development', root, ['VITE_', 'ORIGAMI_'])
+    const env = loadEnv('development', root, ['VITE_', 'ORIGAMI_', 'PORT', 'HOST'])
     const { errorResponse, serializePageData } = await importCoreServer(root)
     const { origamiVitePlugins } = await importCoreBuild(root)
     const node = await importCoreNode(root)
@@ -47,5 +47,5 @@ export async function dev({ root }) {
         })), resolution.embeds),
     }))
     httpServer.on('request', app)
-    await serve(httpServer, { port: port(), host: host('dev'), onClose: async () => { await vite.close(); await site()?.close() } })
+    await serve(httpServer, { port: port(env), host: host('dev', env), onClose: async () => { await vite.close(); await site()?.close() } })
 }

package/src/server/env.js

@@ -7,9 +7,10 @@ export function siteOptions(env) {
     }
 }
 
-export const port = () => Number(process.env.PORT ?? 3000)
+/** An empty PORT= means the default, not a random port. @param {Record<string, string | undefined>} [env] */
+export const port = (env = process.env) => Number(env.PORT || 3000)
 
 /** Dev serves the site's source through Vite, so it stays on this machine unless HOST says otherwise.
  * 127.0.0.1, not localhost: on macOS localhost binds only ::1. Start listens on every interface so the deployed site is reachable.
- * @param {'dev' | 'prod'} mode */
-export const host = mode => process.env.HOST || (mode === 'dev' ? '127.0.0.1' : undefined)
+ * @param {'dev' | 'prod'} mode @param {Record<string, string | undefined>} [env] */
+export const host = (mode, env = process.env) => env.HOST || (mode === 'dev' ? '127.0.0.1' : undefined)