Append base to hot file (#290)

timacdonald · web-flow · commit fcd76b504dfd · 2024-05-09T10:26:26.000-04:00
diff --git a/src/index.ts b/src/index.ts
@@ -84,7 +84,7 @@ interface LaravelPlugin extends Plugin {
     config: (config: UserConfig, env: ConfigEnv) => UserConfig
 }
 
-type DevServerUrl = `${'http'|'https'}://${string}:${number}`
+type DevServerUrl = `${'http'|'https'}://${string}:${number}${string}`
 
 let exitHandlersBound = false
 
@@ -431,8 +431,9 @@ function resolveDevServerUrl(address: AddressInfo, config: ResolvedConfig, userC
 
     const configHmrClientPort = typeof config.server.hmr === 'object' ? config.server.hmr.clientPort : null
     const port = configHmrClientPort ?? address.port
+    const base = config.base.replace(/\/$/, '')
 
-    return `${protocol}://${host}:${port}`
+    return `${protocol}://${host}:${port}${base}`
 }
 
 function isIpv6(address: AddressInfo): boolean {

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ interface LaravelPlugin extends Plugin {`
`84`	`84`	`config: (config: UserConfig, env: ConfigEnv) => UserConfig`
`85`	`85`	`}`
`86`	`86`
`87`		-type DevServerUrl = `${'http'\|'https'}://${string}:${number}`
	`87`	+type DevServerUrl = `${'http'\|'https'}://${string}:${number}${string}`
`88`	`88`
`89`	`89`	`let exitHandlersBound = false`
`90`	`90`
`@@ -431,8 +431,9 @@ function resolveDevServerUrl(address: AddressInfo, config: ResolvedConfig, userC`
`431`	`431`
`432`	`432`	`const configHmrClientPort = typeof config.server.hmr === 'object' ? config.server.hmr.clientPort : null`
`433`	`433`	`const port = configHmrClientPort ?? address.port`
	`434`	`+ const base = config.base.replace(/\/$/, '')`
`434`	`435`
`435`		- return `${protocol}://${host}:${port}`
	`436`	+ return `${protocol}://${host}:${port}${base}`
`436`	`437`	`}`
`437`	`438`
`438`	`439`	`function isIpv6(address: AddressInfo): boolean {`