mirror of
https://github.com/withastro/astro.git
synced 2025-03-24 23:21:57 -05:00
feat: unify preview config, support proxy
configuration from Astro and Vite
This commit is contained in:
parent
246bd7a516
commit
07618400e3
2 changed files with 14 additions and 10 deletions
|
@ -66,16 +66,19 @@ export default async function preview(inlineConfig: AstroInlineConfig): Promise<
|
||||||
if (typeof previewModule.default !== 'function') {
|
if (typeof previewModule.default !== 'function') {
|
||||||
throw new Error(`[preview] ${settings.adapter.name} cannot preview your app.`);
|
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({
|
const server = await previewModule.default({
|
||||||
|
...previewConfig,
|
||||||
outDir: settings.config.outDir,
|
outDir: settings.config.outDir,
|
||||||
client: settings.config.build.client,
|
client: settings.config.build.client,
|
||||||
serverEntrypoint: new URL(settings.config.build.serverEntry, settings.config.build.server),
|
serverEntrypoint: new URL(settings.config.build.serverEntry, settings.config.build.server),
|
||||||
host: getResolvedHostForHttpServer(settings.config.server.host),
|
host: getResolvedHostForHttpServer(previewConfig.host),
|
||||||
port: settings.config.server.port,
|
|
||||||
base: settings.config.base,
|
base: settings.config.base,
|
||||||
logger: new AstroIntegrationLogger(logger.options, settings.adapter.name),
|
logger: new AstroIntegrationLogger(logger.options, settings.adapter.name),
|
||||||
headers: settings.config.server.headers,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return server;
|
return server;
|
||||||
|
|
|
@ -23,6 +23,12 @@ export default async function createStaticPreviewServer(
|
||||||
const startServerTime = performance.now();
|
const startServerTime = performance.now();
|
||||||
|
|
||||||
let previewServer: VitePreviewServer;
|
let previewServer: VitePreviewServer;
|
||||||
|
|
||||||
|
const previewConfig = Object.assign({},
|
||||||
|
settings.config.vite.server,
|
||||||
|
settings.config.vite.preview,
|
||||||
|
settings.config.server,
|
||||||
|
)
|
||||||
try {
|
try {
|
||||||
previewServer = await preview({
|
previewServer = await preview({
|
||||||
configFile: false,
|
configFile: false,
|
||||||
|
@ -31,12 +37,7 @@ export default async function createStaticPreviewServer(
|
||||||
build: {
|
build: {
|
||||||
outDir: fileURLToPath(settings.config.outDir),
|
outDir: fileURLToPath(settings.config.outDir),
|
||||||
},
|
},
|
||||||
preview: {
|
preview: previewConfig,
|
||||||
host: settings.config.server.host,
|
|
||||||
port: settings.config.server.port,
|
|
||||||
headers: settings.config.server.headers,
|
|
||||||
open: settings.config.server.open,
|
|
||||||
},
|
|
||||||
plugins: [vitePluginAstroPreview(settings)],
|
plugins: [vitePluginAstroPreview(settings)],
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue