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.

Sign up for GitHub

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

Jump to bottom

fix: print urls when dns order change #12261

Merged
merged 4 commits into from
Mar 11, 2023
Merged

fix: print urls when dns order change #12261

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cf69ce
feat: print urls when dns order change
btea Mar 2, 2023
83a933f
fix: remove variable
btea Mar 2, 2023
e18cf2b
fix: simplify the code
btea Mar 2, 2023
0537299
fix: adjust judgment
btea Mar 2, 2023
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
6 changes: 4 additions & 2 deletions packages/vite/src/node/server/index.ts
View file
Open in desktop
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 @@ -824,7 +825,8 @@ async function restartServer(server: ViteDevServer) {
logger.info('server restarted.', { timestamp: true })
if (
(port ?? DEFAULT_DEV_PORT) !== (prevPort ?? DEFAULT_DEV_PORT) ||
host !== prevHost
host !== prevHost ||
diffDnsOrderChange(oldUrls, newServer.resolvedUrls)
) {
logger.info('')
server.printUrls()
Expand Down
13 changes: 12 additions & 1 deletion packages/vite/src/node/utils.ts
View file
Open in desktop
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,17 @@ export async function getLocalhostAddressIfDiffersFromDNS(): Promise<
return isSame ? undefined : nodeResult.address
}

export function diffDnsOrderChange(
oldUrls: ViteDevServer['resolvedUrls'],
newUrls: ViteDevServer['resolvedUrls'],
): boolean {
return !(
oldUrls === newUrls ||
(arrayEqual(oldUrls?.local || [], newUrls?.local || []) &&
arrayEqual(oldUrls?.network || [], newUrls?.network || []))
)
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