Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor: add getServerUrlByHost to generate dev and preview url
  • Loading branch information
BuptStEve committed Apr 11, 2025
commit 5c3d7f08b86a5a5fdf7242f72452fa4d503b7bc8
10 changes: 2 additions & 8 deletions packages/vite/src/node/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { indexHtmlMiddleware } from './server/middlewares/indexHtml'
import { notFoundMiddleware } from './server/middlewares/notFound'
import { proxyMiddleware } from './server/middlewares/proxy'
import {
getServerUrlByHost,
resolveHostname,
resolveServerUrls,
setupSIGTERMListener,
Expand Down Expand Up @@ -276,14 +277,7 @@ export async function preview(
)

if (options.open) {
const host = options.host
const url =
typeof host === 'string'
? [
...(server.resolvedUrls?.local ?? []),
...(server.resolvedUrls?.network ?? []),
].find((url) => url.includes(host))
: (server.resolvedUrls.local[0] ?? server.resolvedUrls.network[0])
const url = getServerUrlByHost(server, options.host)
if (url) {
const path =
typeof options.open === 'string' ? new URL(options.open, url).href : url
Expand Down
11 changes: 2 additions & 9 deletions packages/vite/src/node/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import type { InlineConfig, ResolvedConfig } from '../config'
import { resolveConfig } from '../config'
import {
diffDnsOrderChange,
getServerUrlByHost,
isInNodeModules,
isObject,
isParentDirectory,
Expand Down Expand Up @@ -659,15 +660,7 @@ export async function _createServer(
},
openBrowser() {
const options = server.config.server
const host = options.host
let url: string | undefined
if (typeof host === 'string') {
url = [
...(server.resolvedUrls?.local ?? []),
...(server.resolvedUrls?.network ?? []),
].find((url) => url.includes(host))
}
url ??= server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0]
const url = getServerUrlByHost(server, options.host)
if (url) {
const path =
typeof options.open === 'string'
Expand Down
14 changes: 14 additions & 0 deletions packages/vite/src/node/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1656,3 +1656,17 @@ export const teardownSIGTERMListener = (
}
}
}

export function getServerUrlByHost(
server: PreviewServer | ViteDevServer,
host: CommonServerOptions['host'],
): string | undefined {
if (typeof host !== 'string') {
return server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0]
}

return [
...(server.resolvedUrls?.local ?? []),
...(server.resolvedUrls?.network ?? []),
].find((url) => url.includes(host))
}