Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 3 additions & 0 deletions server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,9 @@ async function main() {
console.log(' Auth token is configured in .env (not printed to logs).')
}
}
if (isDev) {
console.log(` \x1b[33m(dev mode: Vite client on port ${visitPort}, Express server on port ${port})\x1b[0m`)
}
console.log('')

startBackgroundTasks()
Expand Down
4 changes: 2 additions & 2 deletions server/startup-url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
* In production, the Express server serves everything on the server port.
*/
export function resolveVisitPort(serverPort: number, env: NodeJS.ProcessEnv): number {
const isDev = env.NODE_ENV === 'development'
return isDev ? Number(env.VITE_PORT || 5173) : serverPort
const isProduction = env.NODE_ENV === 'production'
return isProduction ? serverPort : Number(env.VITE_PORT || 5173)
}
15 changes: 10 additions & 5 deletions test/unit/server/startup-url.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('resolveVisitPort', () => {
expect(resolveVisitPort(3001, env)).toBe(3001)
})

it('returns default Vite port (5173) in development', () => {
it('returns default Vite port (5173) when NODE_ENV is "development"', () => {
const env = { NODE_ENV: 'development' } as NodeJS.ProcessEnv
expect(resolveVisitPort(3001, env)).toBe(5173)
})
Expand All @@ -17,13 +17,18 @@ describe('resolveVisitPort', () => {
expect(resolveVisitPort(3001, env)).toBe(8080)
})

it('returns server port when NODE_ENV is unset', () => {
it('returns Vite port when NODE_ENV is unset (dev default)', () => {
const env = {} as NodeJS.ProcessEnv
expect(resolveVisitPort(3001, env)).toBe(3001)
expect(resolveVisitPort(3001, env)).toBe(5173)
})

it('returns server port in test mode', () => {
it('returns Vite port in test mode', () => {
const env = { NODE_ENV: 'test' } as NodeJS.ProcessEnv
expect(resolveVisitPort(4000, env)).toBe(4000)
expect(resolveVisitPort(4000, env)).toBe(5173)
})

it('respects VITE_PORT when NODE_ENV is unset', () => {
const env = { VITE_PORT: '9000' } as NodeJS.ProcessEnv
expect(resolveVisitPort(3001, env)).toBe(9000)
})
})