➕ dependency: up prettier package.json (#6184)

mock/listTableList.ts

@@ -57,7 +57,7 @@ function getRule(req: Request, res: Response, u: string) {
     let filterDataSource: TableListItem[] = [];
     status.forEach((s: string) => {
       filterDataSource = filterDataSource.concat(
-        dataSource.filter(item => {
+        dataSource.filter((item) => {
           if (parseInt(`${item.status}`, 10) === parseInt(s.split('')[0], 10)) {
             return true;
           }
@@ -69,7 +69,7 @@ function getRule(req: Request, res: Response, u: string) {
   }
 
   if (params.name) {
-    dataSource = dataSource.filter(data => data.name.includes(params.name || ''));
+    dataSource = dataSource.filter((data) => data.name.includes(params.name || ''));
   }
   const result = {
     data: dataSource,
@@ -94,7 +94,7 @@ function postRule(req: Request, res: Response, u: string, b: Request) {
   switch (method) {
     /* eslint no-case-declarations:0 */
     case 'delete':
-      tableListDataSource = tableListDataSource.filter(item => key.indexOf(item.key) === -1);
+      tableListDataSource = tableListDataSource.filter((item) => key.indexOf(item.key) === -1);
       break;
     case 'post':
       (() => {
@@ -123,7 +123,7 @@ function postRule(req: Request, res: Response, u: string, b: Request) {
     case 'update':
       (() => {
         let newRule = {};
-        tableListDataSource = tableListDataSource.map(item => {
+        tableListDataSource = tableListDataSource.map((item) => {
           if (item.key === key) {
             newRule = { ...item, desc, name };
             return { ...item, desc, name };

package.json

@@ -84,7 +84,7 @@
     "@types/react": "^16.9.17",
     "@types/react-dom": "^16.8.4",
     "@types/react-helmet": "^5.0.13",
-    "@umijs/fabric": "^2.0.2",
+    "@umijs/fabric": "^2.0.5",
     "@umijs/plugin-blocks": "^2.0.5",
     "@umijs/preset-ant-design-pro": "^1.0.1",
     "@umijs/preset-react": "^1.3.0",
@@ -99,7 +99,7 @@
     "jsdom-global": "^3.0.2",
     "lint-staged": "^10.0.0",
     "mockjs": "^1.0.1-beta3",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.1",
     "pro-download": "1.0.1",
     "stylelint": "^13.0.0"
   },

src/components/Authorized/CheckPermissions.tsx

@@ -32,7 +32,7 @@ const checkPermissions = <T, K>(
   // 数组处理
   if (Array.isArray(authority)) {
     if (Array.isArray(currentAuthority)) {
-      if (currentAuthority.some(item => authority.includes(item))) {
+      if (currentAuthority.some((item) => authority.includes(item))) {
         return target;
       }
     } else if (authority.includes(currentAuthority)) {
@@ -43,7 +43,7 @@ const checkPermissions = <T, K>(
   // string 处理
   if (typeof authority === 'string') {
     if (Array.isArray(currentAuthority)) {
-      if (currentAuthority.some(item => authority === item)) {
+      if (currentAuthority.some((item) => authority === item)) {
         return target;
       }
     } else if (authority === currentAuthority) {

src/components/GlobalHeader/NoticeIconView.tsx

@@ -61,7 +61,7 @@ class GlobalHeaderRight extends Component<GlobalHeaderRightProps> {
       return {};
     }
 
-    const newNotices = notices.map(notice => {
+    const newNotices = notices.map((notice) => {
       const newNotice = { ...notice };
 
       if (newNotice.datetime) {
@@ -100,7 +100,7 @@ class GlobalHeaderRight extends Component<GlobalHeaderRightProps> {
     const unreadMsg: {
       [key: string]: number;
     } = {};
-    Object.keys(noticeData).forEach(key => {
+    Object.keys(noticeData).forEach((key) => {
       const value = noticeData[key];
 
       if (!unreadMsg[key]) {
@@ -108,7 +108,7 @@ class GlobalHeaderRight extends Component<GlobalHeaderRightProps> {
       }
 
       if (Array.isArray(value)) {
-        unreadMsg[key] = value.filter(item => !item.read).length;
+        unreadMsg[key] = value.filter((item) => !item.read).length;
       }
     });
     return unreadMsg;
@@ -122,7 +122,7 @@ class GlobalHeaderRight extends Component<GlobalHeaderRightProps> {
       <NoticeIcon
         className={styles.action}
         count={currentUser && currentUser.unreadCount}
-        onItemClick={item => {
+        onItemClick={(item) => {
           this.changeReadState(item as NoticeItem);
         }}
         loading={fetchingNotices}

src/components/GlobalHeader/RightContent.tsx

@@ -20,7 +20,7 @@ const ENVTagColor = {
   pre: '#87d068',
 };
 
-const GlobalHeaderRight: React.SFC<GlobalHeaderRightProps> = props => {
+const GlobalHeaderRight: React.SFC<GlobalHeaderRightProps> = (props) => {
   const { theme, layout } = props;
   let className = styles.right;
 

src/components/HeaderSearch/index.tsx

@@ -20,7 +20,7 @@ export interface HeaderSearchProps {
   value?: string;
 }
 
-const HeaderSearch: React.FC<HeaderSearchProps> = props => {
+const HeaderSearch: React.FC<HeaderSearchProps> = (props) => {
   const {
     className,
     defaultValue,
@@ -86,7 +86,7 @@ const HeaderSearch: React.FC<HeaderSearchProps> = props => {
           defaultValue={defaultValue}
           aria-label={placeholder}
           placeholder={placeholder}
-          onKeyDown={e => {
+          onKeyDown={(e) => {
             if (e.key === 'Enter') {
               if (restProps.onSearch) {
                 restProps.onSearch(value);

src/components/NoticeIcon/NoticeList.tsx

@@ -97,7 +97,7 @@ const NoticeList: React.SFC<NoticeIconTabProps> = ({
         ) : null}
         {showViewMore ? (
           <div
-            onClick={e => {
+            onClick={(e) => {
               if (onViewMore) {
                 onViewMore(e);
               }

src/components/NoticeIcon/index.tsx

@@ -42,7 +42,7 @@ export interface NoticeIconProps {
 
 const NoticeIcon: React.FC<NoticeIconProps> & {
   Tab: typeof NoticeList;
-} = props => {
+} = (props) => {
   const getNotificationBox = (): React.ReactNode => {
     const {
       children,

src/components/SelectLang/index.tsx

@@ -11,7 +11,7 @@ interface SelectLangProps {
   className?: string;
 }
 
-const SelectLang: React.FC<SelectLangProps> = props => {
+const SelectLang: React.FC<SelectLangProps> = (props) => {
   const { className } = props;
   const selectedLang = getLocale();
 
@@ -32,7 +32,7 @@ const SelectLang: React.FC<SelectLangProps> = props => {
   };
   const langMenu = (
     <Menu className={styles.menu} selectedKeys={[selectedLang]} onClick={changeLang}>
-      {locales.map(locale => (
+      {locales.map((locale) => (
         <Menu.Item key={locale}>
           <span role="img" aria-label={languageLabels[locale]}>
             {languageIcons[locale]}

src/e2e/baseLayout.e2e.js

@@ -8,7 +8,7 @@ const getBrowser = require('./getBrowser');
 function formatter(routes, parentPath = '') {
   const fixedParentPath = parentPath.replace(/\/{1,}/g, '/');
   let result = [];
-  routes.forEach(item => {
+  routes.forEach((item) => {
     if (item.path) {
       result.push(`${fixedParentPath}/${item.path}`.replace(/\/{1,}/g, '/'));
     }
@@ -18,7 +18,7 @@ function formatter(routes, parentPath = '') {
       );
     }
   });
-  return uniq(result.filter(item => !!item));
+  return uniq(result.filter((item) => !!item));
 }
 
 let browser;
@@ -37,7 +37,7 @@ beforeEach(async () => {
 });
 
 describe('Ant Design Pro E2E test', () => {
-  const testPage = path => async () => {
+  const testPage = (path) => async () => {
     await page.goto(`${BASE_URL}${path}`);
     await page.waitForSelector('footer', {
       timeout: 2000,
@@ -49,7 +49,7 @@ describe('Ant Design Pro E2E test', () => {
   };
 
   const routers = formatter(RouterConfig);
-  routers.forEach(route => {
+  routers.forEach((route) => {
     it(`test pages ${route}`, testPage(route));
   });
 });

src/global.tsx

@@ -25,7 +25,7 @@ if (pwa) {
       // Send skip-waiting event to waiting SW with MessageChannel
       await new Promise((resolve, reject) => {
         const channel = new MessageChannel();
-        channel.port1.onmessage = msgEvent => {
+        channel.port1.onmessage = (msgEvent) => {
           if (msgEvent.data.error) {
             reject(msgEvent.data.error);
           } else {
@@ -62,20 +62,20 @@ if (pwa) {
   // unregister service worker
   const { serviceWorker } = navigator;
   if (serviceWorker.getRegistrations) {
-    serviceWorker.getRegistrations().then(sws => {
-      sws.forEach(sw => {
+    serviceWorker.getRegistrations().then((sws) => {
+      sws.forEach((sw) => {
         sw.unregister();
       });
     });
   }
-  serviceWorker.getRegistration().then(sw => {
+  serviceWorker.getRegistration().then((sw) => {
     if (sw) sw.unregister();
   });
 
   // remove all caches
   if (window.caches && window.caches.keys) {
-    caches.keys().then(keys => {
-      keys.forEach(key => {
+    caches.keys().then((keys) => {
+      keys.forEach((key) => {
         caches.delete(key);
       });
     });

src/layouts/BasicLayout.tsx

@@ -51,7 +51,7 @@ export type BasicLayoutContext = { [K in 'location']: BasicLayoutProps[K] } & {
  */
 
 const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
-  menuList.map(item => {
+  menuList.map((item) => {
     const localItem = { ...item, children: item.children ? menuDataRender(item.children) : [] };
     return Authorized.check(item.authority, localItem, null) as MenuDataItem;
   });
@@ -82,7 +82,7 @@ const defaultFooterDom = (
   />
 );
 
-const BasicLayout: React.FC<BasicLayoutProps> = props => {
+const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   const {
     dispatch,
     children,

src/layouts/UserLayout.tsx

@@ -13,7 +13,7 @@ export interface UserLayoutProps extends Partial<ConnectProps> {
   };
 }
 
-const UserLayout: React.FC<UserLayoutProps> = props => {
+const UserLayout: React.FC<UserLayoutProps> = (props) => {
   const {
     route = {
       routes: [],

src/models/global.ts

@@ -47,7 +47,7 @@ const GlobalModel: GlobalModelType = {
         payload: data,
       });
       const unreadCount: number = yield select(
-        (state: ConnectState) => state.global.notices.filter(item => !item.read).length,
+        (state: ConnectState) => state.global.notices.filter((item) => !item.read).length,
       );
       yield put({
         type: 'user/changeNotifyCount',
@@ -64,7 +64,7 @@ const GlobalModel: GlobalModelType = {
       });
       const count: number = yield select((state: ConnectState) => state.global.notices.length);
       const unreadCount: number = yield select(
-        (state: ConnectState) => state.global.notices.filter(item => !item.read).length,
+        (state: ConnectState) => state.global.notices.filter((item) => !item.read).length,
       );
       yield put({
         type: 'user/changeNotifyCount',
@@ -76,7 +76,7 @@ const GlobalModel: GlobalModelType = {
     },
     *changeNoticeReadState({ payload }, { put, select }) {
       const notices: NoticeItem[] = yield select((state: ConnectState) =>
-        state.global.notices.map(item => {
+        state.global.notices.map((item) => {
           const notice = { ...item };
           if (notice.id === payload) {
             notice.read = true;
@@ -94,7 +94,7 @@ const GlobalModel: GlobalModelType = {
         type: 'user/changeNotifyCount',
         payload: {
           totalCount: notices.length,
-          unreadCount: notices.filter(item => !item.read).length,
+          unreadCount: notices.filter((item) => !item.read).length,
         },
       });
     },

src/models/setting.ts

@@ -9,7 +9,7 @@ export interface SettingModelType {
   };
 }
 
-const updateColorWeak: (colorWeak: boolean) => void = colorWeak => {
+const updateColorWeak: (colorWeak: boolean) => void = (colorWeak) => {
   const root = document.getElementById('root');
   if (root) {
     root.className = colorWeak ? 'colorWeak' : '';

src/pages/ListTableList/components/CreateForm.tsx

@@ -6,7 +6,7 @@ interface CreateFormProps {
   onCancel: () => void;
 }
 
-const CreateForm: React.FC<CreateFormProps> = props => {
+const CreateForm: React.FC<CreateFormProps> = (props) => {
   const { modalVisible, onCancel } = props;
 
   return (

src/pages/ListTableList/components/UpdateForm.tsx

@@ -33,7 +33,7 @@ const formLayout = {
   wrapperCol: { span: 13 },
 };
 
-const UpdateForm: React.FC<UpdateFormProps> = props => {
+const UpdateForm: React.FC<UpdateFormProps> = (props) => {
   const [formVals, setFormVals] = useState<FormValueType>({
     name: props.values.name,
     desc: props.values.desc,

src/pages/ListTableList/index.tsx

@@ -60,7 +60,7 @@ const handleRemove = async (selectedRows: TableListItem[]) => {
   if (!selectedRows) return true;
   try {
     await removeRule({
-      key: selectedRows.map(row => row.key),
+      key: selectedRows.map((row) => row.key),
     });
     hide();
     message.success('删除成功，即将刷新');
@@ -163,7 +163,7 @@ const TableList: React.FC<{}> = () => {
             <Dropdown
               overlay={
                 <Menu
-                  onClick={async e => {
+                  onClick={async (e) => {
                     if (e.key === 'remove') {
                       await handleRemove(selectedRows);
                       action.reload();
@@ -190,13 +190,13 @@ const TableList: React.FC<{}> = () => {
             </span>
           </div>
         )}
-        request={params => queryRule(params)}
+        request={(params) => queryRule(params)}
         columns={columns}
         rowSelection={{}}
       />
       <CreateForm onCancel={() => handleModalVisible(false)} modalVisible={createModalVisible}>
         <ProTable<TableListItem, TableListItem>
-          onSubmit={async value => {
+          onSubmit={async (value) => {
             const success = await handleAdd(value);
             if (success) {
               handleModalVisible(false);
@@ -213,7 +213,7 @@ const TableList: React.FC<{}> = () => {
       </CreateForm>
       {stepFormValues && Object.keys(stepFormValues).length ? (
         <UpdateForm
-          onSubmit={async value => {
+          onSubmit={async (value) => {
             const success = await handleUpdate(value);
             if (success) {
               handleModalVisible(false);

src/pages/document.ejs

@@ -182,7 +182,14 @@
         }
       </style>
       <div
-        style="display: flex;justify-content: center;align-items: center;flex-direction: column;min-height: 420px;height: 100%;"
+        style="
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-direction: column;
+          min-height: 420px;
+          height: 100%;
+        "
       >
         <img src="/pro_icon.svg" alt="logo" width="256" />
         <div class="page-loading-warp">
@@ -193,7 +200,7 @@
             ></span>
           </div>
         </div>
-        <div style="display: flex;justify-content: center;align-items: center;">
+        <div style="display: flex; justify-content: center; align-items: center;">
           <img
             src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
             width="32"

src/pages/user/login/components/Login/LoginItem.tsx

@@ -57,7 +57,7 @@ const getFormItemOptions = ({
   return options;
 };
 
-const LoginItem: React.FC<LoginItemProps> = props => {
+const LoginItem: React.FC<LoginItemProps> = (props) => {
   const [count, setCount] = useState<number>(props.countDown || 0);
   const [timing, setTiming] = useState(false);
   // 这么写是为了防止restProps中 带入 onChange, defaultValue, rules props tabUtil
@@ -89,7 +89,7 @@ const LoginItem: React.FC<LoginItemProps> = props => {
     const { countDown } = props;
     if (timing) {
       interval = window.setInterval(() => {
-        setCount(preSecond => {
+        setCount((preSecond) => {
           if (preSecond <= 1) {
             setTiming(false);
             clearInterval(interval);
@@ -148,11 +148,11 @@ const LoginItem: React.FC<LoginItemProps> = props => {
 
 const LoginItems: Partial<LoginItemType> = {};
 
-Object.keys(ItemMap).forEach(key => {
+Object.keys(ItemMap).forEach((key) => {
   const item = ItemMap[key];
   LoginItems[key] = (props: LoginItemProps) => (
     <LoginContext.Consumer>
-      {context => (
+      {(context) => (
         <LoginItem
           customProps={item.props}
           rules={item.rules}

src/pages/user/login/components/Login/LoginTab.tsx

@@ -18,7 +18,7 @@ interface LoginTabProps extends TabPaneProps {
   active?: boolean;
 }
 
-const LoginTab: React.FC<LoginTabProps> = props => {
+const LoginTab: React.FC<LoginTabProps> = (props) => {
   useEffect(() => {
     const uniqueId = generateId('login-tab-');
     const { tabUtil } = props;
@@ -32,9 +32,9 @@ const LoginTab: React.FC<LoginTabProps> = props => {
 
 const WrapContext: React.FC<TabPaneProps> & {
   typeName: string;
-} = props => (
+} = (props) => (
   <LoginContext.Consumer>
-    {value => <LoginTab tabUtil={value.tabUtil} {...props} />}
+    {(value) => <LoginTab tabUtil={value.tabUtil} {...props} />}
   </LoginContext.Consumer>
 );
 

src/pages/user/login/components/Login/index.tsx

@@ -30,7 +30,7 @@ interface LoginType extends React.FC<LoginProps> {
   Captcha: React.FunctionComponent<LoginItemProps>;
 }
 
-const Login: LoginType = props => {
+const Login: LoginType = (props) => {
   const { className } = props;
   const [tabs, setTabs] = useState<string[]>([]);
   const [active, setActive] = useState({});
@@ -57,14 +57,14 @@ const Login: LoginType = props => {
     <LoginContext.Provider
       value={{
         tabUtil: {
-          addTab: id => {
+          addTab: (id) => {
             setTabs([...tabs, id]);
           },
-          removeTab: id => {
-            setTabs(tabs.filter(currentId => currentId !== id));
+          removeTab: (id) => {
+            setTabs(tabs.filter((currentId) => currentId !== id));
           },
         },
-        updateActive: activeItem => {
+        updateActive: (activeItem) => {
           if (!active) return;
           if (active[type]) {
             active[type].push(activeItem);
@@ -78,7 +78,7 @@ const Login: LoginType = props => {
       <div className={classNames(className, styles.login)}>
         <Form
           form={props.from}
-          onFinish={values => {
+          onFinish={(values) => {
             if (props.onSubmit) {
               props.onSubmit(values as LoginParamsType);
             }
@@ -90,7 +90,7 @@ const Login: LoginType = props => {
                 animated={false}
                 className={styles.tabs}
                 activeKey={type}
-                onChange={activeKey => {
+                onChange={(activeKey) => {
                   setType(activeKey);
                 }}
               >

src/pages/user/login/index.tsx

@@ -29,7 +29,7 @@ const LoginMessage: React.FC<{
   />
 );
 
-const Login: React.FC<LoginProps> = props => {
+const Login: React.FC<LoginProps> = (props) => {
   const { userLogin = {}, submitting } = props;
   const { status, type: loginType } = userLogin;
   const [autoLogin, setAutoLogin] = useState(true);
@@ -104,7 +104,7 @@ const Login: React.FC<LoginProps> = props => {
           />
         </Tab>
         <div>
-          <Checkbox checked={autoLogin} onChange={e => setAutoLogin(e.target.checked)}>
+          <Checkbox checked={autoLogin} onChange={(e) => setAutoLogin(e.target.checked)}>
             自动登录
           </Checkbox>
           <a

src/service-worker.js

@@ -50,7 +50,7 @@ workbox.routing.registerRoute(/\/color.less/, workbox.strategies.networkFirst())
 /**
  * Response to client after skipping waiting with MessageChannel
  */
-addEventListener('message', event => {
+addEventListener('message', (event) => {
   const replyPort = event.ports[0];
   const message = event.data;
   if (replyPort && message && message.type === 'skip-waiting') {
@@ -60,7 +60,7 @@ addEventListener('message', event => {
           replyPort.postMessage({
             error: null,
           }),
-        error =>
+        (error) =>
           replyPort.postMessage({
             error,
           }),

src/utils/utils.ts

@@ -45,7 +45,7 @@ export const getAuthorityFromRouter = <T extends Route>(
 
 export const getRouteAuthority = (path: string, routeData: Route[]) => {
   let authorities: string[] | string | undefined;
-  routeData.forEach(route => {
+  routeData.forEach((route) => {
     // match prefix
     if (pathRegexp(`${route.path}/(.*)`).test(`${path}/`)) {
       if (route.authority) {

tests/run-tests.js

@@ -17,7 +17,7 @@ const startServer = spawn(/^win/.test(process.platform) ? 'npm.cmd' : 'npm', ['s
   env,
 });
 
-startServer.stderr.on('data', data => {
+startServer.stderr.on('data', (data) => {
   // eslint-disable-next-line
   console.log(data.toString());
 });
@@ -27,7 +27,7 @@ startServer.on('exit', () => {
 });
 
 console.log('Starting development server for e2e tests...');
-startServer.stdout.on('data', data => {
+startServer.stdout.on('data', (data) => {
   console.log(data.toString());
   // hack code , wait umi
   if (
@@ -44,7 +44,7 @@ startServer.stdout.on('data', data => {
         stdio: 'inherit',
       },
     );
-    testCmd.on('exit', code => {
+    testCmd.on('exit', (code) => {
       startServer.kill();
       process.exit(code);
     });