From dae98421fc5062496b834c77f34f586ae38a1d06 Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Wed, 22 Jun 2022 15:43:43 +1000 Subject: [PATCH 1/3] Respect server.host variable in hot file --- src/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index a99f2b2..da72db3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -120,7 +120,9 @@ export default function laravel(config: string|string[]|PluginConfig): LaravelPl const isAddressInfo = (x: string|AddressInfo|null|undefined): x is AddressInfo => typeof x === 'object' if (isAddressInfo(address)) { const protocol = server.config.server.https ? 'https' : 'http' - const host = address.family === 'IPv6' ? `[${address.address}]` : address.address + const configHost = typeof resolvedConfig.server.host === 'string' ? resolvedConfig.server.host : false + const serverAddress = address.family === 'IPv6' ? `[${address.address}]` : address.address + const host = configHost || serverAddress viteDevServerUrl = `${protocol}://${host}:${address.port}` fs.writeFileSync(hotFile, viteDevServerUrl) From ddb40e5a0454ebb37c90531295946376347a9def Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Wed, 22 Jun 2022 16:02:47 +1000 Subject: [PATCH 2/3] Use injected server.config for consistency --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index da72db3..7ed5db5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -120,7 +120,7 @@ export default function laravel(config: string|string[]|PluginConfig): LaravelPl const isAddressInfo = (x: string|AddressInfo|null|undefined): x is AddressInfo => typeof x === 'object' if (isAddressInfo(address)) { const protocol = server.config.server.https ? 'https' : 'http' - const configHost = typeof resolvedConfig.server.host === 'string' ? resolvedConfig.server.host : false + const configHost = typeof server.config.server.host === 'string' ? server.config.server.host : false const serverAddress = address.family === 'IPv6' ? `[${address.address}]` : address.address const host = configHost || serverAddress viteDevServerUrl = `${protocol}://${host}:${address.port}` From 436cdc7f833c34cadad6e2eb5cbd99d0c6de4c9e Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Wed, 22 Jun 2022 16:03:10 +1000 Subject: [PATCH 3/3] Refactoring --- src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 7ed5db5..820a357 100644 --- a/src/index.ts +++ b/src/index.ts @@ -120,9 +120,9 @@ export default function laravel(config: string|string[]|PluginConfig): LaravelPl const isAddressInfo = (x: string|AddressInfo|null|undefined): x is AddressInfo => typeof x === 'object' if (isAddressInfo(address)) { const protocol = server.config.server.https ? 'https' : 'http' - const configHost = typeof server.config.server.host === 'string' ? server.config.server.host : false + const configHost = typeof server.config.server.host === 'string' ? server.config.server.host : null const serverAddress = address.family === 'IPv6' ? `[${address.address}]` : address.address - const host = configHost || serverAddress + const host = configHost ?? serverAddress viteDevServerUrl = `${protocol}://${host}:${address.port}` fs.writeFileSync(hotFile, viteDevServerUrl)