📦 package: remove father (#538)

* 📦 package: remove father * fix ts lint * fix tsc error
ant-design · Jul 6, 2020 · fc09ab1 · fc09ab1
1 parent e31e4ae
commit fc09ab1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 66 deletions.
diff --git a/example/src/e2e/baseLayout.e2e.js b/example/src/e2e/baseLayout.e2e.js
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "/dist"
   ],
   "scripts": {
-    "build": "father build && webpack",
+    "build": "father-build && webpack",
     "start": "dumi dev",
     "lint": "npm run lint-eslint && npm run lint:style",
     "lint-eslint": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
@@ -45,7 +45,7 @@
     "site": "dumi build && gh-pages -d ./dist",
     "site_build": "dumi build",
     "doc": "cd ./example && umi dev",
-    "test": "father test",
+    "test": "umi-test",
     "tsc": "tsc"
   },
   "husky": {
@@ -122,7 +122,7 @@
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.4.3",
     "eslint": "^7.2.0",
-    "father": "^2.26.0",
+    "father-build": "^1.18.1",
     "gh-pages": "^3.1.0",
     "husky": "^4.0.0",
     "jsdom": "^16.2.0",
@@ -143,6 +143,7 @@
     "typescript": "^3.8.3",
     "umi": "^3.0.0",
     "umi-plugin-githubpages": "^2.0.0",
+    "umi-test": "^1.9.6",
     "umi-types": "^0.5.11",
     "webpack-cli": "^3.3.10"
   },

diff --git a/src/SiderMenu/BaseMenu.tsx b/src/SiderMenu/BaseMenu.tsx
@@ -233,7 +233,7 @@ class MenuUtil {
  * @param BaseMenuProps
  */
 const getOpenKeysProps = (
-  openKeys: string[] | false = [],
+  openKeys: React.ReactText[] | false = [],
   { layout, collapsed }: BaseMenuProps,
 ): {
   openKeys?: undefined | string[];
@@ -276,7 +276,7 @@ const BaseMenu: React.FC<BaseMenuProps> = (props) => {
   const [defaultOpenAll, setDefaultOpenAll] = useState(menu.defaultOpenAll);
 
   const [openKeys, setOpenKeys] = useMergeValue<
-    WithFalse<string[] | undefined>
+    WithFalse<React.ReactText[] | undefined>
   >(
     () => {
       if (menu.defaultOpenAll) {
@@ -398,7 +398,7 @@ const BaseMenu: React.FC<BaseMenuProps> = (props) => {
       selectedKeys={selectedKeys}
       style={style}
       className={cls}
-      onOpenChange={setOpenKeys}
+      onOpenChange={(keys) => setOpenKeys(keys as string[])}
       {...props.menuProps}
     >
       {menuUtils.getNavMenuItems(

diff --git a/tests/__tests__/compatible.test.tsx b/tests/__tests__/compatible.test.tsx
@@ -1,4 +1,4 @@
-import { mount, render } from 'enzyme';
+import { mount } from 'enzyme';
 
 import React from 'react';
 import BasicLayout from '../../src/BasicLayout';

diff --git a/tsconfig.json b/tsconfig.json
@@ -21,7 +21,7 @@
       "@ant-design/pro-layout": ["./src"]
     }
   },
-  "include": ["**/tests/", "**/src/", "**/docs/"],
+  "include": ["**/src/", "**/docs/"],
   "exclude": [
     "node_modules",
     "build",
@@ -31,6 +31,8 @@
     "jest",
     "tslint:latest",
     "tslint-config-prettier",
-    "example"
+    "example",
+    "**/tests/",
+    "**/docs/"
   ]
 }