fix: correct defineConfig parameter typing for extending umi

umijs · Dec 23, 2022 · b4922a8 · b4922a8
1 parent 94e7e76
commit b4922a8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -11,7 +11,7 @@ import { defineConfig as defineUmiConfig } from 'umi';
 
 type IUmiConfig = Parameters<typeof defineUmiConfig>[0];
 
-export interface IDumiConfig extends IUmiConfig {
+interface IDumiExtendsConfig {
   resolve: {
     docDirs: (string | { type?: string; dir: string })[];
     /**
@@ -33,9 +33,11 @@ export interface IDumiConfig extends IUmiConfig {
   // eslint-disable-next-line @typescript-eslint/ban-types
   extraRehypePlugins?: (string | Function | [string | Function, object])[];
 }
+export type IDumiConfig = IUmiConfig & IDumiExtendsConfig;
 
 export interface IDumiUserConfig
-  extends Partial<Omit<IDumiConfig, 'resolve' | 'locales'>> {
+  extends Partial<Omit<IDumiConfig, 'resolve' | 'locales'>>,
+    IUmiConfig {
   resolve?: Partial<IDumiConfig['resolve']>;
   locales?: (
     | IDumiConfig['locales'][0]