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(server): the server restart port should remain unchanged #14418

Merged
merged 9 commits into from
Nov 8, 2023
Merged

fix(server): the server restart port should remain unchanged #14418

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d41a4ff
fix(server): the server restart port should remain unchanged
btea Sep 20, 2023
0a20bbd
fix: avoid affect config file
btea Oct 20, 2023
b8ceced
chore: remove unnecessary logic
btea Oct 21, 2023
3844111
fix: config port taken case
btea Oct 21, 2023
6a6905b
fix: update
btea Nov 6, 2023
8354327
Merge branch 'main' into fix/server-restart-port-change
btea Nov 6, 2023
629453d
Merge branch 'main' into fix/server-restart-port-change
btea Nov 6, 2023
46f3ea3
fix: update
btea Nov 6, 2023
73c154d
fix: move global variables to server
btea Nov 7, 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
25 changes: 22 additions & 3 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 @@ -336,6 +336,14 @@ export interface ViteDevServer extends AsyncDisposable {
* @internal
*/
_shortcutsOptions?: BindCLIShortcutsOptions<ViteDevServer>
/**
* @internal
*/
_currentServerPort?: number | undefined
/**
* @internal
*/
_configServerPort?: number | undefined
}

export interface ResolvedServerUrls {
Expand Down Expand Up @@ -789,15 +797,24 @@ async function startServer(
}

const options = server.config.server
const port = inlinePort ?? options.port ?? DEFAULT_DEV_PORT
const hostname = await resolveHostname(options.host)

await httpServerStart(httpServer, {
const configPort = inlinePort ?? options.port
// When using non strict port for the dev server, the running port can be different from the config one.
// When restarting, the original port may be available but to avoid a switch of URL for the running
// browser tabs, we enforce the previously used port, expect if the config port changed.
const port =
(!configPort || configPort === server._configServerPort
? server._currentServerPort
: configPort) ?? DEFAULT_DEV_PORT
server._configServerPort = configPort

const serverPort = await httpServerStart(httpServer, {
port,
strictPort: options.strictPort,
host: hostname.host,
logger: server.config.logger,
})
server._currentServerPort = serverPort
}

function createServerCloseFn(server: HttpServer | null) {
Expand Down Expand Up @@ -917,6 +934,8 @@ async function restartServer(server: ViteDevServer) {
await server.close()

// Assign new server props to existing server instance
newServer._configServerPort = server._configServerPort
newServer._currentServerPort = server._currentServerPort
Object.assign(server, newServer)

const {
Expand Down