Unverified Commit fc34f89a authored by Chulki Lee's avatar Chulki Lee Committed by GitHub

Fix hostname message in dev/start (#20409)

parent 6c51ad96
...@@ -5,8 +5,8 @@ import createStore from 'next/dist/compiled/unistore' ...@@ -5,8 +5,8 @@ import createStore from 'next/dist/compiled/unistore'
import formatWebpackMessages from '../../client/dev/error-overlay/format-webpack-messages' import formatWebpackMessages from '../../client/dev/error-overlay/format-webpack-messages'
import { OutputState, store as consoleStore } from './store' import { OutputState, store as consoleStore } from './store'
export function startedDevelopmentServer(appUrl: string) { export function startedDevelopmentServer(appUrl: string, bindAddr: string) {
consoleStore.setState({ appUrl }) consoleStore.setState({ appUrl, bindAddr })
} }
let previousClient: import('webpack').Compiler | null = null let previousClient: import('webpack').Compiler | null = null
......
...@@ -4,8 +4,8 @@ import stripAnsi from 'next/dist/compiled/strip-ansi' ...@@ -4,8 +4,8 @@ import stripAnsi from 'next/dist/compiled/strip-ansi'
import * as Log from './log' import * as Log from './log'
export type OutputState = export type OutputState =
| { bootstrap: true; appUrl: string | null } | { bootstrap: true; appUrl: string | null; bindAddr: string | null }
| ({ bootstrap: false; appUrl: string | null } & ( | ({ bootstrap: false; appUrl: string | null; bindAddr: string | null } & (
| { loading: true } | { loading: true }
| { | {
loading: false loading: false
...@@ -15,9 +15,13 @@ export type OutputState = ...@@ -15,9 +15,13 @@ export type OutputState =
} }
)) ))
export const store = createStore<OutputState>({ appUrl: null, bootstrap: true }) export const store = createStore<OutputState>({
appUrl: null,
bindAddr: null,
bootstrap: true,
})
let lastStore: OutputState = { appUrl: null, bootstrap: true } let lastStore: OutputState = { appUrl: null, bindAddr: null, bootstrap: true }
function hasStoreChanged(nextStore: OutputState) { function hasStoreChanged(nextStore: OutputState) {
if ( if (
([ ([
...@@ -40,7 +44,7 @@ store.subscribe((state) => { ...@@ -40,7 +44,7 @@ store.subscribe((state) => {
if (state.bootstrap) { if (state.bootstrap) {
if (state.appUrl) { if (state.appUrl) {
Log.ready(`started server on ${state.appUrl}`) Log.ready(`started server on ${state.bindAddr}, url: ${state.appUrl}`)
} }
return return
} }
......
...@@ -43,7 +43,7 @@ const nextDev: cliCommand = (argv) => { ...@@ -43,7 +43,7 @@ const nextDev: cliCommand = (argv) => {
Options Options
--port, -p A port number on which to start the application --port, -p A port number on which to start the application
--hostname, -H Hostname on which to start the application --hostname, -H Hostname on which to start the application (default: 0.0.0.0)
--help, -h Displays this message --help, -h Displays this message
`) `)
process.exit(0) process.exit(0)
...@@ -106,15 +106,12 @@ const nextDev: cliCommand = (argv) => { ...@@ -106,15 +106,12 @@ const nextDev: cliCommand = (argv) => {
} }
const port = args['--port'] || 3000 const port = args['--port'] || 3000
const appUrl = `http://${args['--hostname'] || 'localhost'}:${port}` const host = args['--hostname'] || '0.0.0.0'
const appUrl = `http://${host === '0.0.0.0' ? 'localhost' : host}:${port}`
startServer( startServer({ dir, dev: true, isNextDevCommand: true }, port, host)
{ dir, dev: true, isNextDevCommand: true },
port,
args['--hostname']
)
.then(async (app) => { .then(async (app) => {
startedDevelopmentServer(appUrl) startedDevelopmentServer(appUrl, `${host}:${port}`)
// Start preflight after server is listening and ignore errors: // Start preflight after server is listening and ignore errors:
preflight().catch(() => {}) preflight().catch(() => {})
// Finalize server bootup: // Finalize server bootup:
......
...@@ -42,7 +42,7 @@ const nextStart: cliCommand = (argv) => { ...@@ -42,7 +42,7 @@ const nextStart: cliCommand = (argv) => {
Options Options
--port, -p A port number on which to start the application --port, -p A port number on which to start the application
--hostname, -H Hostname on which to start the application --hostname, -H Hostname on which to start the application (default: 0.0.0.0)
--help, -h Displays this message --help, -h Displays this message
`) `)
process.exit(0) process.exit(0)
...@@ -50,11 +50,11 @@ const nextStart: cliCommand = (argv) => { ...@@ -50,11 +50,11 @@ const nextStart: cliCommand = (argv) => {
const dir = resolve(args._[0] || '.') const dir = resolve(args._[0] || '.')
const port = args['--port'] || 3000 const port = args['--port'] || 3000
startServer({ dir }, port, args['--hostname']) const host = args['--hostname'] || '0.0.0.0'
const appUrl = `http://${host === '0.0.0.0' ? 'localhost' : host}:${port}`
startServer({ dir }, port, host)
.then(async (app) => { .then(async (app) => {
Log.ready( Log.ready(`started server on ${host}:${port}, url: ${appUrl}`)
`started server on http://${args['--hostname'] || 'localhost'}:${port}`
)
await app.prepare() await app.prepare()
}) })
.catch((err) => { .catch((err) => {
......
...@@ -204,6 +204,7 @@ describe('CLI Usage', () => { ...@@ -204,6 +204,7 @@ describe('CLI Usage', () => {
test('--port', async () => { test('--port', async () => {
const port = await findPort() const port = await findPort()
const output = await runNextCommandDev([dir, '--port', port], true) const output = await runNextCommandDev([dir, '--port', port], true)
expect(output).toMatch(new RegExp(`on 0.0.0.0:${port}`))
expect(output).toMatch(new RegExp(`http://localhost:${port}`)) expect(output).toMatch(new RegExp(`http://localhost:${port}`))
}) })
...@@ -214,12 +215,14 @@ describe('CLI Usage', () => { ...@@ -214,12 +215,14 @@ describe('CLI Usage', () => {
const output = await runNextCommandDev([dir, '--port', port], true, { const output = await runNextCommandDev([dir, '--port', port], true, {
env: { NODE_OPTIONS: '--inspect' }, env: { NODE_OPTIONS: '--inspect' },
}) })
expect(output).toMatch(new RegExp(`on 0.0.0.0:${port}`))
expect(output).toMatch(new RegExp(`http://localhost:${port}`)) expect(output).toMatch(new RegExp(`http://localhost:${port}`))
}) })
test('-p', async () => { test('-p', async () => {
const port = await findPort() const port = await findPort()
const output = await runNextCommandDev([dir, '-p', port], true) const output = await runNextCommandDev([dir, '-p', port], true)
expect(output).toMatch(new RegExp(`on 0.0.0.0:${port}`))
expect(output).toMatch(new RegExp(`http://localhost:${port}`)) expect(output).toMatch(new RegExp(`http://localhost:${port}`))
}) })
...@@ -262,7 +265,8 @@ describe('CLI Usage', () => { ...@@ -262,7 +265,8 @@ describe('CLI Usage', () => {
[dir, '--hostname', '0.0.0.0', '--port', port], [dir, '--hostname', '0.0.0.0', '--port', port],
true true
) )
expect(output).toMatch(new RegExp(`http://0.0.0.0:${port}`)) expect(output).toMatch(new RegExp(`on 0.0.0.0:${port}`))
expect(output).toMatch(new RegExp(`http://localhost:${port}`))
}) })
test('-H', async () => { test('-H', async () => {
...@@ -271,7 +275,8 @@ describe('CLI Usage', () => { ...@@ -271,7 +275,8 @@ describe('CLI Usage', () => {
[dir, '-H', '0.0.0.0', '--port', port], [dir, '-H', '0.0.0.0', '--port', port],
true true
) )
expect(output).toMatch(new RegExp(`http://0.0.0.0:${port}`)) expect(output).toMatch(new RegExp(`on 0.0.0.0:${port}`))
expect(output).toMatch(new RegExp(`http://localhost:${port}`))
}) })
test('should warn when unknown argument provided', async () => { test('should warn when unknown argument provided', async () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment