Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: print urls when dns order change #12261

Merged
merged 4 commits into from
Mar 11, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/vite/src/node/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
import type { InlineConfig, ResolvedConfig } from '../config'
import { isDepsOptimizerEnabled, resolveConfig } from '../config'
import {
diffDnsOrderChange,
isParentDirectory,
mergeConfig,
normalizePath,
Expand Down Expand Up @@ -788,7 +789,7 @@ async function restartServer(server: ViteDevServer) {
global.__vite_start_time = performance.now()
const { port: prevPort, host: prevHost } = server.config.server
const shortcutsOptions: BindShortcutsOptions = server._shortcutsOptions

const oldUrls = server.resolvedUrls
await server.close()

let inlineConfig = server.config.inlineConfig
Expand Down Expand Up @@ -821,10 +822,12 @@ async function restartServer(server: ViteDevServer) {
} = server.config
if (!middlewareMode) {
await server.listen(port, true)
const dnsOrderChange = diffDnsOrderChange(oldUrls, newServer.resolvedUrls)
logger.info('server restarted.', { timestamp: true })
if (
(port ?? DEFAULT_DEV_PORT) !== (prevPort ?? DEFAULT_DEV_PORT) ||
host !== prevHost
host !== prevHost ||
dnsOrderChange
patak-dev marked this conversation as resolved.
Show resolved Hide resolved
) {
logger.info('')
server.printUrls()
Expand Down
39 changes: 38 additions & 1 deletion packages/vite/src/node/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
} from './constants'
import type { DepOptimizationConfig } from './optimizer'
import type { ResolvedConfig } from './config'
import type { ResolvedServerUrls } from './server'
import type { ResolvedServerUrls, ViteDevServer } from './server'
import type { CommonServerOptions } from '.'

/**
Expand Down Expand Up @@ -815,6 +815,43 @@ export async function getLocalhostAddressIfDiffersFromDNS(): Promise<
return isSame ? undefined : nodeResult.address
}

export function diffDnsOrderChange(
oldUrls: ViteDevServer['resolvedUrls'],
newUrls: ViteDevServer['resolvedUrls'],
): boolean {
if (oldUrls && newUrls) {
const { local: oldLocal, network: oldNetwork } = oldUrls
const { local: newLocal, network: newNetwork } = newUrls
const localChange = oldLocal.length !== newLocal.length
const networkChange = oldNetwork.length !== newNetwork.length
if (!localChange) {
for (let i = 0; i < oldLocal.length; i++) {
if (oldLocal[i] !== newLocal[i]) {
return true
}
}
}
if (!networkChange) {
for (let i = 0; i < oldNetwork.length; i++) {
if (oldNetwork[i] !== newNetwork[i]) {
return true
}
}
}
return localChange || networkChange
}
if (!oldUrls && !newUrls) {
return false
}
if (oldUrls && !newUrls) {
return true
}
if (!oldUrls && newUrls) {
return true
}
return false
patak-dev marked this conversation as resolved.
Show resolved Hide resolved
}

export interface Hostname {
/** undefined sets the default behaviour of server.listen */
host: string | undefined
Expand Down