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

refactor!: move side effect of restart server to the caller #8746

Merged
merged 5 commits into from
Oct 26, 2023
Merged

refactor!: move side effect of restart server to the caller #8746

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d63cdb3
refactor: move side effect of restart server to the caller
CHOYSEN Jun 23, 2022
b01a9ec
Merge branch 'main' into pr/CHOYSEN/8746
bluwy Oct 23, 2023
00528b4
fix: only print url in non middlewareMode
bluwy Oct 23, 2023
ec2c0ce
fix: solution 1
bluwy Oct 25, 2023
c3fac74
Merge branch 'main' into fix/13
bluwy Oct 26, 2023
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
18 changes: 17 additions & 1 deletion packages/vite/src/node/server/hmr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import type { Server } from 'node:http'
import colors from 'picocolors'
import type { Update } from 'types/hmrPayload'
import type { RollupError } from 'rollup'
import { CLIENT_DIR } from '../constants'
import { CLIENT_DIR, DEFAULT_DEV_PORT } from '../constants'
import {
createDebugger,
diffDnsOrderChange,
normalizePath,
unique,
withTrailingSlash,
Expand Down Expand Up @@ -77,7 +78,22 @@ export async function handleHMRUpdate(
{ clear: true, timestamp: true },
)
try {
const { port: prevPort, host: prevHost, middlewareMode } = config.server
const oldUrls = server.resolvedUrls
await server.restart()
const {
logger,
server: { port, host },
} = server.config
if (
!middlewareMode &&
((port ?? DEFAULT_DEV_PORT) !== (prevPort ?? DEFAULT_DEV_PORT) ||
host !== prevHost ||
diffDnsOrderChange(oldUrls, server.resolvedUrls))
) {
logger.info('')
server.printUrls()
}
} catch (e) {
config.logger.error(colors.red(e))
}
Expand Down
16 changes: 2 additions & 14 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 @@ -24,7 +24,6 @@ import {
import type { InlineConfig, ResolvedConfig } from '../config'
import { isDepsOptimizerEnabled, resolveConfig } from '../config'
import {
diffDnsOrderChange,
isInNodeModules,
isParentDirectory,
mergeConfig,
Expand Down Expand Up @@ -863,9 +862,7 @@ export function resolveServerOptions(

async function restartServer(server: ViteDevServer) {
global.__vite_start_time = performance.now()
const { port: prevPort, host: prevHost } = server.config.server
const shortcutsOptions = server._shortcutsOptions
const oldUrls = server.resolvedUrls

let inlineConfig = server.config.inlineConfig
if (server._forceOptimizeOnRestart) {
Expand Down Expand Up @@ -895,23 +892,14 @@ async function restartServer(server: ViteDevServer) {

const {
logger,
server: { port, host, middlewareMode },
server: { port, middlewareMode },
} = server.config
if (!middlewareMode) {
await server.listen(port, true)
logger.info('server restarted.', { timestamp: true })
if (
(port ?? DEFAULT_DEV_PORT) !== (prevPort ?? DEFAULT_DEV_PORT) ||
host !== prevHost ||
diffDnsOrderChange(oldUrls, newServer.resolvedUrls)
) {
logger.info('')
server.printUrls()
}
} else {
server.ws.listen()
logger.info('server restarted.', { timestamp: true })
}
logger.info('server restarted.', { timestamp: true })

if (shortcutsOptions) {
shortcutsOptions.print = false
Expand Down