Merge branch 'main' into main

NervJS · Apr 17, 2024 · c7cd2be · c7cd2be
2 parents 198b7bd + 7b993ed
commit c7cd2be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/taro-cli/src/util/defineConfig.ts b/packages/taro-cli/src/util/defineConfig.ts
@@ -9,7 +9,7 @@ export interface ConfigEnv {
   mode: string
 }
 
-export type UserConfigFn = (mergin: WebpackMerge, env: ConfigEnv) => IProjectConfig | Promise<IProjectConfig>
+export type UserConfigFn = (merge: WebpackMerge, env: ConfigEnv) => IProjectConfig | Promise<IProjectConfig>
 export type UserConfigExport = IProjectConfig | Promise<IProjectConfig> | UserConfigFn
 
 /**