fix(cli): manually handle shared args

farm-fe · Jul 5, 2024 · 688e12f · 688e12f
1 parent fe162a3
commit 688e12f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/cli/src/config.ts b/packages/cli/src/config.ts
@@ -1,11 +1,13 @@
 import { FarmCLIOptions, UserConfig } from '@farmfe/core';
 import {
+  FarmCLIBuildOptions,
   GlobalFarmCLIOptions,
   NormalizedFarmCLIBuildOptions
 } from './types.js';
+import { resolveCommonOptions } from './utils.js';
 
 export function getOptionFromBuildOption(
-  options: NormalizedFarmCLIBuildOptions & GlobalFarmCLIOptions
+  options: FarmCLIBuildOptions & GlobalFarmCLIOptions
 ): FarmCLIOptions & UserConfig {
   const {
     input,
@@ -17,7 +19,8 @@ export function getOptionFromBuildOption(
     sourcemap,
     treeShaking,
     mode
-  } = options;
+  } = resolveCommonOptions(options) as NormalizedFarmCLIBuildOptions &
+    GlobalFarmCLIOptions;
 
   const output: UserConfig['compilation']['output'] = {
     ...(outDir && { path: outDir }),

diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
@@ -7,7 +7,11 @@ import { Logger } from '@farmfe/core';
 import spawn from 'cross-spawn';
 import walkdir from 'walkdir';
 
-import type { FarmCLICommonOptions, GlobalFarmCLIOptions } from './types.js';
+import type {
+  FarmCLIBuildOptions,
+  FarmCLICommonOptions,
+  GlobalFarmCLIOptions
+} from './types.js';
 
 const logger = new Logger();
 interface installProps {
@@ -186,7 +190,7 @@ export function resolveCliConfig(root: string, config: string) {
  */
 export function resolveCommonOptions(
   options: FarmCLICommonOptions & GlobalFarmCLIOptions
-): GlobalFarmCLIOptions {
+): FarmCLIBuildOptions & GlobalFarmCLIOptions {
   const resolvedOptions = { ...options };
   resolvedOptions.c && (resolvedOptions.config = resolvedOptions.c);
   resolvedOptions.config && (resolvedOptions.c = resolvedOptions.config);