From d9fe675af477cb13af54fce2914dba02c1824b30 Mon Sep 17 00:00:00 2001
From: neverland <jait.chen@foxmail.com>
Date: Sat, 5 Nov 2022 20:03:58 +0800
Subject: [PATCH] feat(cli): allow to custom server.port (#11222)

---
 packages/vant-cli/src/common/index.ts          | 4 ++--
 packages/vant-cli/src/compiler/compile-site.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/vant-cli/src/common/index.ts b/packages/vant-cli/src/common/index.ts
index bb027de5c..da0add89f 100644
--- a/packages/vant-cli/src/common/index.ts
+++ b/packages/vant-cli/src/common/index.ts
@@ -114,12 +114,12 @@ export function smartOutputFile(filePath: string, content: string) {
   outputFileSync(filePath, content);
 }
 
-export function mergeCustomViteConfig(config: InlineConfig) {
+export function mergeCustomViteConfig(config: InlineConfig): InlineConfig {
   const vantConfig = getVantConfig();
   const configureVite = vantConfig.build?.configureVite;
 
   if (configureVite) {
-    return configureVite(config);
+    return configureVite(config) || config;
   }
   return config;
 }
diff --git a/packages/vant-cli/src/compiler/compile-site.ts b/packages/vant-cli/src/compiler/compile-site.ts
index 26c19360f..ed92db3ec 100644
--- a/packages/vant-cli/src/compiler/compile-site.ts
+++ b/packages/vant-cli/src/compiler/compile-site.ts
@@ -34,7 +34,7 @@ export async function compileSite(production = false) {
   } else {
     const config = mergeCustomViteConfig(getViteConfigForSiteDev());
     const server = await createServer(config);
-    await server.listen();
+    await server.listen(config.server?.port);
 
     const require = createRequire(import.meta.url);
     const { version } = require('vite/package.json');