refactor: simplify Rsbuild commands

Author: chenjiahan

src/cli/commands.ts

@@ -1,97 +1,38 @@
 import cac from 'cac';
-import { logger } from '@rsbuild/core';
-import type { BuildOptions, DevOptions, PreviewOptions } from './types.js';
 
 declare global {
   const RSTACK_VERSION: string;
 }
 
+async function runRsbuildCLI(): Promise<void> {
+  const args = process.argv.slice(2);
+  process.argv = [process.execPath, 'rsbuild', ...args];
+
+  const { runCLI } = await import('@rsbuild/core');
+  runCLI();
+}
+
 export function setupCommands(): void {
   const cli = cac('rs');
   const { argv } = process;
 
   cli.version(RSTACK_VERSION);
 
-  cli.command('dev', 'Start the Rsbuild dev server').action(async (options: DevOptions) => {
-    try {
-      const { initRsbuild } = await import('./rsbuild.js');
-      const rsbuild = await initRsbuild({
-        options,
-      });
-
-      if (!rsbuild) {
-        return;
-      }
-
-      await rsbuild.startDevServer();
-    } catch (err) {
-      logger.error('Failed to start dev server.');
-      logger.error(err);
-      process.exit(1);
-    }
-  });
+  cli
+    .command('dev [...args]', 'Start the Rsbuild dev server')
+    .allowUnknownOptions()
+    .action(runRsbuildCLI);
 
   cli
-    .command('build', 'Run Rsbuild to build the app for production')
+    .command('build [...args]', 'Run Rsbuild to build the app for production')
+    .allowUnknownOptions()
     .option('-w, --watch', 'Enable watch mode to automatically rebuild on file changes')
-    .action(async (options: BuildOptions) => {
-      try {
-        if (!options.watch) {
-          process.env.RSPACK_UNSAFE_FAST_DROP = 'true';
-        }
-
-        const { initRsbuild } = await import('./rsbuild.js');
-        const rsbuild = await initRsbuild({
-          options,
-        });
-
-        if (!rsbuild) {
-          return;
-        }
-
-        const buildResult = await rsbuild.build({
-          watch: options.watch,
-        });
-
-        if (buildResult) {
-          if (options.watch) {
-            // TODO
-          } else {
-            await buildResult.close();
-          }
-        }
-      } catch (err) {
-        const RSPACK_BUILD_ERROR = 'Rspack build failed.';
-        const isRspackError = err instanceof Error && err.message === RSPACK_BUILD_ERROR;
-        if (!isRspackError) {
-          logger.error('Failed to build.');
-        }
-
-        logger.error(err);
-        process.exit(1);
-      }
-    });
+    .action(runRsbuildCLI);
 
   cli
-    .command('preview', 'Preview the production build locally via Rsbuild')
-    .action(async (options: PreviewOptions) => {
-      try {
-        const { initRsbuild } = await import('./rsbuild.js');
-        const rsbuild = await initRsbuild({
-          options,
-        });
-
-        if (!rsbuild) {
-          return;
-        }
-
-        await rsbuild.preview();
-      } catch (err) {
-        logger.error('Failed to start preview server.');
-        logger.error(err);
-        process.exit(1);
-      }
-    });
+    .command('preview [...args]', 'Preview the production build locally via Rsbuild')
+    .allowUnknownOptions()
+    .action(runRsbuildCLI);
 
   cli.command('test [...args]', 'Run tests with Rstest').action(async () => {
     const { runCLI } = await import('@rstest/core');

src/cli/index.ts

@@ -1,38 +1,5 @@
-import { logger } from '@rsbuild/core';
 import { setupCommands } from './commands.js';
 
-const { argv } = process;
-
-function initNodeEnv(command: string | undefined) {
-  if (process.env.NODE_ENV) {
-    return;
-  }
-
-  switch (command) {
-    case 'build':
-    case 'preview':
-      process.env.NODE_ENV = 'production';
-      break;
-    case 'dev':
-      process.env.NODE_ENV = 'development';
-      break;
-    case 'test':
-      process.env.NODE_ENV = 'test';
-      process.env.RSTEST = 'true';
-      break;
-  }
-}
-
 export function runCLI(): void {
-  const command = argv[2];
-
-  initNodeEnv(command);
-
-  try {
-    setupCommands();
-  } catch (err) {
-    logger.error('Failed to start Rstack CLI.');
-    logger.error(err);
-    process.exit(1);
-  }
+  setupCommands();
 }