From 266b650a50a3fc3389e9a486ac98b6da1d660cc1 Mon Sep 17 00:00:00 2001 From: Hugo Date: Fri, 7 Oct 2022 17:00:55 +0200 Subject: [PATCH 1/4] Fix dev port --- packages/histoire/src/node/commands/dev.ts | 2 +- packages/histoire/src/node/server.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/histoire/src/node/commands/dev.ts b/packages/histoire/src/node/commands/dev.ts index 3bd69736..4b4044ea 100644 --- a/packages/histoire/src/node/commands/dev.ts +++ b/packages/histoire/src/node/commands/dev.ts @@ -15,7 +15,7 @@ export async function devCommand (options: DevOptions) { const ctx = await createContext({ mode: 'dev', }) - const { server, close } = await createServer(ctx, options.port ?? 6006) + const { server, close } = await createServer(ctx, { port: options.port }) server.printUrls() // Histoire config watcher diff --git a/packages/histoire/src/node/server.ts b/packages/histoire/src/node/server.ts index a67bbb14..5333f4be 100644 --- a/packages/histoire/src/node/server.ts +++ b/packages/histoire/src/node/server.ts @@ -9,7 +9,7 @@ import { useModuleLoader } from './load.js' import { wrapLogError } from './util/log.js' import { createMarkdownFilesWatcher, onMarkdownListChange } from './markdown.js' -export async function createServer (ctx: Context, port: number) { +export async function createServer (ctx: Context, config: {port?: number} = {}) { const server = await createViteServer(await getViteConfigWithPlugins(false, ctx)) await server.pluginContainer.buildStart({}) @@ -36,7 +36,7 @@ export async function createServer (ctx: Context, port: number) { } // Wait for pre-bundling (in `listen()`) - await server.listen(port) + await server.listen(config.port ?? server.config.server?.port ?? 6006) const { clearCache, From 8c9e082d4bff41aafb99306d0aa96947f545c8d5 Mon Sep 17 00:00:00 2001 From: Hugo Date: Fri, 7 Oct 2022 17:08:56 +0200 Subject: [PATCH 2/4] Export option interface --- packages/histoire/src/node/server.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/histoire/src/node/server.ts b/packages/histoire/src/node/server.ts index 5333f4be..1480d41f 100644 --- a/packages/histoire/src/node/server.ts +++ b/packages/histoire/src/node/server.ts @@ -9,7 +9,11 @@ import { useModuleLoader } from './load.js' import { wrapLogError } from './util/log.js' import { createMarkdownFilesWatcher, onMarkdownListChange } from './markdown.js' -export async function createServer (ctx: Context, config: {port?: number} = {}) { +export interface CreateServerOptions { + port?: number +} + +export async function createServer (ctx: Context, options: CreateServerOptions = {}) { const server = await createViteServer(await getViteConfigWithPlugins(false, ctx)) await server.pluginContainer.buildStart({}) @@ -36,7 +40,7 @@ export async function createServer (ctx: Context, config: {port?: number} = {}) } // Wait for pre-bundling (in `listen()`) - await server.listen(config.port ?? server.config.server?.port ?? 6006) + await server.listen(options.port ?? server.config.server?.port ?? 6006) const { clearCache, From 02d2b9b5e0efdd46b0a685d8e6521fb609b9c74b Mon Sep 17 00:00:00 2001 From: Hugo Date: Fri, 7 Oct 2022 18:11:34 +0200 Subject: [PATCH 3/4] Default to 6006 if histoire port is not defined --- packages/histoire/src/node/server.ts | 2 +- packages/histoire/src/node/vite.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/histoire/src/node/server.ts b/packages/histoire/src/node/server.ts index 1480d41f..c17bdfd5 100644 --- a/packages/histoire/src/node/server.ts +++ b/packages/histoire/src/node/server.ts @@ -40,7 +40,7 @@ export async function createServer (ctx: Context, options: CreateServerOptions = } // Wait for pre-bundling (in `listen()`) - await server.listen(options.port ?? server.config.server?.port ?? 6006) + await server.listen(options.port ?? server.config.server?.port) const { clearCache, diff --git a/packages/histoire/src/node/vite.ts b/packages/histoire/src/node/vite.ts index d4cefce5..a7715107 100644 --- a/packages/histoire/src/node/vite.ts +++ b/packages/histoire/src/node/vite.ts @@ -105,9 +105,10 @@ async function mergeHistoireViteConfig (viteConfig: InlineConfig, ctx: Context) export async function getViteConfigWithPlugins (isServer: boolean, ctx: Context): Promise { const resolvedViteConfig = await resolveViteConfig(ctx) - const userViteConfig = await loadViteConfigFromFile({ command: ctx.mode === 'dev' ? 'serve' : 'build', mode: ctx.mode }) + const userViteConfigFile = await loadViteConfigFromFile({ command: ctx.mode === 'dev' ? 'serve' : 'build', mode: ctx.mode }) + const userViteConfig = mergeViteConfig(userViteConfigFile.config ?? {}, { server: { port: 6006 } }) - const inlineConfig = await mergeHistoireViteConfig(userViteConfig?.config ?? {}, ctx) + const inlineConfig = await mergeHistoireViteConfig(userViteConfig, ctx) const plugins: VitePlugin[] = [] const hasPnpm = !!(await findUp(ctx.root, ['pnpm-lock.yaml'])) From 7d938fbefaea2e0b20d20547ad2345a7d14d35b9 Mon Sep 17 00:00:00 2001 From: Hugo Date: Fri, 7 Oct 2022 18:15:49 +0200 Subject: [PATCH 4/4] Fix build error --- packages/histoire/src/node/vite.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/histoire/src/node/vite.ts b/packages/histoire/src/node/vite.ts index a7715107..b448a497 100644 --- a/packages/histoire/src/node/vite.ts +++ b/packages/histoire/src/node/vite.ts @@ -106,7 +106,7 @@ export async function getViteConfigWithPlugins (isServer: boolean, ctx: Context) const resolvedViteConfig = await resolveViteConfig(ctx) const userViteConfigFile = await loadViteConfigFromFile({ command: ctx.mode === 'dev' ? 'serve' : 'build', mode: ctx.mode }) - const userViteConfig = mergeViteConfig(userViteConfigFile.config ?? {}, { server: { port: 6006 } }) + const userViteConfig = mergeViteConfig(userViteConfigFile?.config ?? {}, { server: { port: 6006 } }) const inlineConfig = await mergeHistoireViteConfig(userViteConfig, ctx) const plugins: VitePlugin[] = []