fix: correct defineConfig parameter typing (#1389)

* fix: tsconfig path alias for dumi * fix: correct defineConfig parameter typing for extending umi
umijs · Dec 26, 2022 · 63fd21e · 63fd21e
1 parent 0932d49
commit 63fd21e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -7,10 +7,11 @@ import type { IModify } from '@umijs/core';
 import type { AssetsPackage, ExampleBlockAsset } from 'dumi-assets-types';
 import type { Element } from 'hast';
 import type { IApi as IUmiApi } from 'umi';
+import { defineConfig as defineUmiConfig } from 'umi';
 
-type IUmiConfig = IUmiApi['config'];
+type IUmiConfig = Parameters<typeof defineUmiConfig>[0];
 
-export interface IDumiConfig extends IUmiConfig {
+interface IDumiExtendsConfig {
   resolve: {
     docDirs: (string | { type?: string; dir: string })[];
     /**
@@ -32,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]

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,7 @@
     "baseUrl": "./",
     "paths": {
       "@/*": ["src/*"],
-      "@@/*": ["./.dumi/tmp"]
+      "@@/*": [".dumi/tmp/*"]
     },
     "types": ["vitest/globals"]
   },