chore: support serve command use custom serve launcher (#6817)

Author: zllkjc

.changeset/good-cars-knock.md

@@ -0,0 +1,7 @@
+---
+'@modern-js/app-tools': patch
+'@modern-js/prod-server': patch
+---
+
+chore: support serve command use custom serve launcher
+chore: 支持 serve 命令使用自定义启动器

packages/server/prod-server/src/index.ts

@@ -6,10 +6,7 @@ import {
   loadServerRuntimeConfig,
 } from '@modern-js/server-core/node';
 import sourceMapSupport from 'source-map-support';
-import {
-  type ApplyPlugins,
-  applyPlugins as defaultApplyPlugins,
-} from './apply';
+import { applyPlugins } from './apply';
 import type { BaseEnv, ProdServerOptions } from './types';
 
 sourceMapSupport.install();
@@ -25,10 +22,7 @@ export type { ServerPlugin } from '@modern-js/server-core';
 
 export type { ProdServerOptions, BaseEnv } from './types';
 
-export const createProdServer = async (
-  options: ProdServerOptions,
-  applyPlugins?: ApplyPlugins,
-) => {
+export const createProdServer = async (options: ProdServerOptions) => {
   await loadServerEnv(options);
 
   const serverBaseOptions = options;
@@ -57,7 +51,7 @@ export const createProdServer = async (
   // load env file.
   const nodeServer = await createNodeServer(server.handle.bind(server));
 
-  await (applyPlugins || defaultApplyPlugins)(server, options, nodeServer);
+  await applyPlugins(server, options, nodeServer);
 
   await server.init();
 

packages/solutions/app-tools/src/commands/dev.ts

@@ -17,7 +17,7 @@ import { registerCompiler } from '../utils/register';
 import { generateRoutes } from '../utils/routes';
 import type { DevOptions } from '../utils/types';
 
-export interface ExtraServerOptions {
+interface ExtraServerOptions {
   applyPlugins?: ApplyPlugins;
 }
 

packages/solutions/app-tools/src/commands/serve.ts

@@ -11,7 +11,10 @@ import {
 import type { AppNormalizedConfig, AppTools } from '../types';
 import { loadServerPlugins } from '../utils/loadPlugins';
 import { printInstructions } from '../utils/printInstructions';
-import type { ExtraServerOptions } from './dev';
+
+type ExtraServerOptions = {
+  launcher?: typeof createProdServer;
+};
 
 export const serve = async (
   api: CLIPluginAPI<AppTools<'shared'>>,
@@ -54,50 +57,47 @@ export const serve = async (
 
   const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
 
-  const app = await createProdServer(
-    {
-      metaName,
-      pwd: distDirectory,
-      config: {
-        ...userConfig,
-        dev: userConfig.dev as any,
-        // server-core can't get RegExp & Function output.enableInlineScripts by JSON.stringy;
-        output: {
-          path: userConfig.output.distPath?.root,
-          ...(userConfig.output || {}),
-        } as any,
-      },
-      routes: serverRoutes,
-      plugins: pluginInstances,
-      serverConfigFile,
-      serverConfigPath,
-      appContext: {
-        appDirectory,
-        internalDirectory,
-        sharedDirectory: getTargetDir(
-          appContext.sharedDirectory,
-          appContext.appDirectory,
-          appContext.distDirectory,
-        ),
-        apiDirectory: isCrossProjectServer
-          ? appContext.apiDirectory
-          : getTargetDir(
-              appContext.apiDirectory,
-              appContext.appDirectory,
-              appContext.distDirectory,
-            ),
-        lambdaDirectory: isCrossProjectServer
-          ? appContext.lambdaDirectory
-          : getTargetDir(
-              appContext.lambdaDirectory,
-              appContext.appDirectory,
-              appContext.distDirectory,
-            ),
-      },
-      runMode,
+  const app = await (serverOptions?.launcher || createProdServer)({
+    metaName,
+    pwd: distDirectory,
+    config: {
+      ...userConfig,
+      dev: userConfig.dev as any,
+      // server-core can't get RegExp & Function output.enableInlineScripts by JSON.stringy;
+      output: {
+        path: userConfig.output.distPath?.root,
+        ...(userConfig.output || {}),
+      } as any,
     },
-    serverOptions?.applyPlugins,
-  );
+    routes: serverRoutes,
+    plugins: pluginInstances,
+    serverConfigFile,
+    serverConfigPath,
+    appContext: {
+      appDirectory,
+      internalDirectory,
+      sharedDirectory: getTargetDir(
+        appContext.sharedDirectory,
+        appContext.appDirectory,
+        appContext.distDirectory,
+      ),
+      apiDirectory: isCrossProjectServer
+        ? appContext.apiDirectory
+        : getTargetDir(
+            appContext.apiDirectory,
+            appContext.appDirectory,
+            appContext.distDirectory,
+          ),
+      lambdaDirectory: isCrossProjectServer
+        ? appContext.lambdaDirectory
+        : getTargetDir(
+            appContext.lambdaDirectory,
+            appContext.appDirectory,
+            appContext.distDirectory,
+          ),
+    },
+    runMode,
+  });
 
   app.listen(port, async () => {
     await printInstructions(