chore: move to cli & support mf restart

Author: 9aoy

packages/core/src/cli/build.ts

@@ -1,15 +1,12 @@
 import { type RsbuildInstance, createRsbuild } from '@rsbuild/core';
 import { composeRsbuildEnvironments, pruneEnvironments } from '../config';
-import { onBeforeRestartServer, watchFilesForRestart } from '../restart';
 import type { RslibConfig } from '../types/config';
 import type { BuildOptions } from './commands';
-import { loadRslibConfig } from './init';
+import { onBeforeRestartServer } from './restart';
 
 export async function build(
   config: RslibConfig,
-  options: Pick<BuildOptions, 'lib' | 'watch'> & {
-    configFilePath?: string;
-  } = {},
+  options: Pick<BuildOptions, 'lib' | 'watch'> = {},
 ): Promise<RsbuildInstance> {
   const environments = await composeRsbuildEnvironments(config);
   const rsbuildInstance = await createRsbuild({
@@ -22,24 +19,8 @@ export async function build(
     watch: options.watch,
   });
 
-  if (options?.watch) {
-    const files: string[] = [];
-
-    if (options.configFilePath) {
-      files.push(options.configFilePath);
-    }
-
+  if (options.watch) {
     onBeforeRestartServer(buildInstance.close);
-
-    watchFilesForRestart(files, async () => {
-      const { content: rslibConfig, filePath: configFilePath } =
-        await loadRslibConfig(options);
-
-      await build(rslibConfig, {
-        configFilePath,
-        ...options,
-      });
-    });
   } else {
     await buildInstance.close();
   }

packages/core/src/cli/commands.ts

@@ -5,6 +5,7 @@ import { build } from './build';
 import { loadRslibConfig } from './init';
 import { inspect } from './inspect';
 import { startMFDevServer } from './mf';
+import { watchFilesForRestart } from './restart';
 
 export type CommonOptions = {
   root?: string;
@@ -62,13 +63,20 @@ export function runCli(): void {
     .description('build the library for production')
     .action(async (options: BuildOptions) => {
       try {
-        const { content: rslibConfig, filePath: configFilePath } =
-          await loadRslibConfig(options);
-        await build(rslibConfig, {
-          configFilePath,
-          lib: options.lib,
-          watch: options.watch,
-        });
+        const cliBuild = async () => {
+          const { content: rslibConfig, filePath } =
+            await loadRslibConfig(options);
+
+          await build(rslibConfig, options);
+
+          if (options?.watch) {
+            watchFilesForRestart([filePath], async () => {
+              await cliBuild();
+            });
+          }
+        };
+
+        await cliBuild();
       } catch (err) {
         logger.error('Failed to build.');
         logger.error(err);
@@ -110,9 +118,18 @@ export function runCli(): void {
     .description('start Rsbuild dev server of Module Federation format')
     .action(async (options: CommonOptions) => {
       try {
-        const { content: rslibConfig } = await loadRslibConfig(options);
-        // TODO: support lib option in mf dev server
-        await startMFDevServer(rslibConfig);
+        const mfDev = async () => {
+          const { content: rslibConfig, filePath } =
+            await loadRslibConfig(options);
+          // TODO: support lib option in mf dev server
+          await startMFDevServer(rslibConfig);
+
+          watchFilesForRestart([filePath], async () => {
+            await mfDev();
+          });
+        };
+
+        await mfDev();
       } catch (err) {
         logger.error('Failed to start mf dev.');
         logger.error(err);

packages/core/src/cli/mf.ts

@@ -2,6 +2,7 @@ import { createRsbuild, mergeRsbuildConfig } from '@rsbuild/core';
 import type { RsbuildConfig, RsbuildInstance } from '@rsbuild/core';
 import { composeCreateRsbuildConfig } from '../config';
 import type { RslibConfig } from '../types';
+import { onBeforeRestartServer } from './restart';
 
 export async function startMFDevServer(
   config: RslibConfig,
@@ -27,7 +28,9 @@ async function initMFRsbuild(
   const rsbuildInstance = await createRsbuild({
     rsbuildConfig: mfRsbuildConfig.config,
   });
-  await rsbuildInstance.startDevServer();
+  const devServer = await rsbuildInstance.startDevServer();
+
+  onBeforeRestartServer(devServer.server.close);
   return rsbuildInstance;
 }
 

packages/core/src/restart.ts renamed to packages/core/src/cli/restart.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import chokidar from 'chokidar';
-import { color, debounce, isTTY } from './utils/helper';
-import { logger } from './utils/logger';
+import { color, debounce, isTTY } from '../utils/helper';
+import { logger } from '../utils/logger';
 
 export async function watchFilesForRestart(
   files: string[],

packages/plugin-dts/src/index.ts

@@ -145,13 +145,16 @@ export const pluginDts = (options: PluginDtsOptions = {}): RsbuildPlugin => ({
       order: 'post',
     });
 
-    api.onCloseBuild(() => {
+    const killProcesses = () => {
       for (const childProcess of childProcesses) {
         if (!childProcess.killed) {
           childProcess.kill();
         }
       }
       childProcesses = [];
-    });
+    };
+
+    api.onCloseBuild(killProcesses);
+    api.onCloseDevServer(killProcesses);
   },
 });