From 4aec59545a6c3cd481751c69b2da95eb66dafb24 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sun, 1 Jul 2018 14:34:24 -0300 Subject: [PATCH] fix(docz-core): app running port message --- packages/docz-core/src/bundlers/webpack/config.ts | 2 +- packages/docz-core/src/commands/dev.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/docz-core/src/bundlers/webpack/config.ts b/packages/docz-core/src/bundlers/webpack/config.ts index f5dfaa5cc..6756606ca 100644 --- a/packages/docz-core/src/bundlers/webpack/config.ts +++ b/packages/docz-core/src/bundlers/webpack/config.ts @@ -218,7 +218,7 @@ export const createConfig = (babelrc: BabelRC) => ( { compilationSuccessInfo: { messages: [ - `You application is running at ${protocol}://${hostname}:${port}`, + `Your application is running at ${protocol}://${hostname}:${port}`, ], }, }, diff --git a/packages/docz-core/src/commands/dev.ts b/packages/docz-core/src/commands/dev.ts index 468ce96ed..30ebb368e 100644 --- a/packages/docz-core/src/commands/dev.ts +++ b/packages/docz-core/src/commands/dev.ts @@ -15,16 +15,17 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development' export const dev = async (args: Config) => { const config = loadConfig(args) - const bundler = webpack(config, 'development') + const port = await detectPort(config.port) + const bundler = webpack({ ...config, port }, 'development') const entries = new Entries(config) const map = await entries.get() const server = await bundler.createServer(bundler.getConfig()) const app = await server.start() - app.on('listening', async ({ server }) => { - const port = await detectPort(config.websocketPort) + app.on('listening', async ({ server, options }) => { + const websocketPort = await detectPort(config.websocketPort) const run = Plugin.runPluginsMethod(config.plugins) - const newConfig = { ...config, websocketPort: port } + const newConfig = { ...config, websocketPort } const dataServer = new DataServer({ server, config: newConfig }) try { @@ -35,7 +36,7 @@ export const dev = async (args: Config) => { await Entries.writeApp(newConfig, true) await Entries.writeImports(map) - logger.info(`Setup entries socket on port ${port}`) + logger.info(`Setup entries socket on port ${websocketPort}`) await dataServer.processEntries(entries) await dataServer.processThemeConfig() await run('onServerListening', server)