diff --git a/packages/astro/src/core/preview/index.ts b/packages/astro/src/core/preview/index.ts index e7e3282ff3..1090bc6711 100644 --- a/packages/astro/src/core/preview/index.ts +++ b/packages/astro/src/core/preview/index.ts @@ -66,16 +66,19 @@ export default async function preview(inlineConfig: AstroInlineConfig): Promise< if (typeof previewModule.default !== 'function') { throw new Error(`[preview] ${settings.adapter.name} cannot preview your app.`); } - + const previewConfig = Object.assign({}, + settings.config.vite.server, + settings.config.vite.preview, + settings.config.server, + ) const server = await previewModule.default({ + ...previewConfig, outDir: settings.config.outDir, client: settings.config.build.client, serverEntrypoint: new URL(settings.config.build.serverEntry, settings.config.build.server), - host: getResolvedHostForHttpServer(settings.config.server.host), - port: settings.config.server.port, + host: getResolvedHostForHttpServer(previewConfig.host), base: settings.config.base, logger: new AstroIntegrationLogger(logger.options, settings.adapter.name), - headers: settings.config.server.headers, }); return server; diff --git a/packages/astro/src/core/preview/static-preview-server.ts b/packages/astro/src/core/preview/static-preview-server.ts index 57aa48a1d0..b36ce449e2 100644 --- a/packages/astro/src/core/preview/static-preview-server.ts +++ b/packages/astro/src/core/preview/static-preview-server.ts @@ -23,6 +23,12 @@ export default async function createStaticPreviewServer( const startServerTime = performance.now(); let previewServer: VitePreviewServer; + + const previewConfig = Object.assign({}, + settings.config.vite.server, + settings.config.vite.preview, + settings.config.server, + ) try { previewServer = await preview({ configFile: false, @@ -31,12 +37,7 @@ export default async function createStaticPreviewServer( build: { outDir: fileURLToPath(settings.config.outDir), }, - preview: { - host: settings.config.server.host, - port: settings.config.server.port, - headers: settings.config.server.headers, - open: settings.config.server.open, - }, + preview: previewConfig, plugins: [vitePluginAstroPreview(settings)], }); } catch (err) {