Skip to content

Commit

Permalink
fix: do not override userConfig.server.origin when provided (#505)
Browse files Browse the repository at this point in the history
  • Loading branch information
elthariel authored Nov 5, 2024
1 parent 19fb7af commit 57a6e7a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion vite-plugin-ruby/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function coerceConfigurationValues (config: ResolvedConfig, projectRoot: string,
const server: ServerOptions = { fs, host: config.host, https, port, strictPort: true }

if (booleanOption(config.skipProxy))
server.origin = `${https ? 'https' : 'http'}://${config.host}:${config.port}`
server.origin = userConfig.server?.origin || `${https ? 'https' : 'http'}://${config.host}:${config.port}`

// Connect directly to the Vite dev server, rack-proxy does not proxy websocket connections.
const hmr = userConfig.server?.hmr ?? {}
Expand Down

0 comments on commit 57a6e7a

Please sign in to comment.