feat: 完善根据用户配置端口号启动

imsunhao · Jun 27, 2019 · 48532ed · 48532ed
1 parent 89fe889
commit 48532ed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/@types/index.d.ts b/@types/index.d.ts
@@ -269,7 +269,7 @@ declare namespace build {
     /**
      * build 通用 webpack 配置
      */
-    interface options extends BuildService.serverInitOptions {
+    interface options extends BuildService.serverInitOptions, BuildService.parsedArgs.serverStart {
       /**
        * 当前程序运行版本
        */

diff --git a/doc/build.config.ts b/doc/build.config.ts
@@ -15,8 +15,11 @@ export default function(inject: ConfigOptions.getOptionsInject): ConfigOptions.o
   const client: any = getClient(config, inject)
   const server: any = getServer(config, inject)
 
+  const { port } = config
+
   return {
     env: ['SERVER_ENV', 'ENV', 'NODE_ENV'],
+    port,
     babelrc: {
       presets: [
         [

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -158,6 +158,20 @@ async function setWebpack(
   process.env.PUBLIC_PATH = path
   return options
 }
+
+/**
+ * 通过 用户的设定 完善 argv参数
+ * @param options build 通用 webpack 配置
+ * @param argv BuildService 通用 启动参数
+ */
+function completeArgvByUserConfig(
+  argv: BuildService.parsedArgs,
+  options: ConfigOptions.options
+) {
+  if (!argv.port) argv.port = options.port
+  if (!argv.fileDescriptor) argv.fileDescriptor = options.fileDescriptor
+  return argv
+}
 /**
  * 设置 静态文件后缀
  * @param options build 通用 webpack 配置
@@ -284,6 +298,8 @@ export async function initConfig(
 
   buildServiceConfig = options
 
+  argv = completeArgvByUserConfig(argv, options)
+
   return options
 }
 /**