From b01d88e85ed7de97911b34a24471628d087d4187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E8=81=AA?= Date: Tue, 26 Mar 2019 17:34:29 +0800 Subject: [PATCH] Improvement umi/locale (#3829) --- package.json | 6 +++--- src/components/Charts/MiniProgress/index.js | 1 - src/components/GlobalHeader/RightContent.js | 2 +- src/components/PageHeaderWrapper/index.js | 2 +- src/components/SelectLang/index.js | 2 +- src/components/SettingDrawer/ThemeColor.js | 2 +- src/components/SettingDrawer/index.js | 2 +- src/global.js | 2 +- src/layouts/Header.js | 2 +- src/layouts/UserLayout.js | 2 +- src/models/menu.js | 2 +- src/pages/404.js | 2 +- src/pages/Account/Settings/BaseView.js | 2 +- src/pages/Account/Settings/BindingView.js | 2 +- src/pages/Account/Settings/Info.js | 2 +- src/pages/Account/Settings/NotificationView.js | 2 +- src/pages/Account/Settings/SecurityView.js | 2 +- src/pages/Dashboard/IntroduceRow.js | 2 +- src/pages/Dashboard/Monitor.js | 2 +- src/pages/Dashboard/OfflineData.js | 2 +- src/pages/Dashboard/ProportionSales.js | 2 +- src/pages/Dashboard/SalesCard.js | 2 +- src/pages/Dashboard/TopSearch.js | 2 +- src/pages/Editor/GGEditor/Flow/index.js | 2 +- src/pages/Editor/GGEditor/Koni/index.js | 2 +- src/pages/Editor/GGEditor/Mind/index.js | 2 +- src/pages/Exception/403.js | 2 +- src/pages/Exception/404.js | 2 +- src/pages/Exception/500.js | 2 +- src/pages/Forms/BasicForm.js | 2 +- src/pages/List/Applications.js | 2 +- src/pages/List/Articles.js | 2 +- src/pages/List/Projects.js | 2 +- src/pages/Result/Error.js | 2 +- src/pages/Result/Success.js | 2 +- src/pages/User/Login.js | 2 +- src/pages/User/Register.js | 2 +- src/pages/User/RegisterResult.js | 2 +- src/utils/getPageTitle.js | 2 +- 39 files changed, 40 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index d6fd19ce..63c93b99 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ "react-dom": "^16.7.0", "react-fittext": "^1.0.0", "react-media": "^1.9.2", - "umi": "^2.4.4" + "umi": "^2.4.4", + "umi-plugin-react": "^1.7.2" }, "devDependencies": { "@types/history": "^4.7.2", @@ -101,8 +102,7 @@ "tslint": "^5.12.1", "tslint-config-prettier": "^1.17.0", "tslint-react": "^3.6.0", - "umi-plugin-ga": "^1.1.3", - "umi-plugin-react": "^1.7.2" + "umi-plugin-ga": "^1.1.3" }, "optionalDependencies": { "puppeteer": "^1.12.1" diff --git a/src/components/Charts/MiniProgress/index.js b/src/components/Charts/MiniProgress/index.js index 6e9840f9..dd5712e8 100644 --- a/src/components/Charts/MiniProgress/index.js +++ b/src/components/Charts/MiniProgress/index.js @@ -1,6 +1,5 @@ import React from 'react'; import { Tooltip } from 'antd'; - import styles from './index.less'; const MiniProgress = ({ diff --git a/src/components/GlobalHeader/RightContent.js b/src/components/GlobalHeader/RightContent.js index 3b07c3e6..d40e1166 100644 --- a/src/components/GlobalHeader/RightContent.js +++ b/src/components/GlobalHeader/RightContent.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { FormattedMessage, formatMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi-plugin-react/locale'; import { Spin, Tag, Menu, Icon, Avatar, Tooltip, message } from 'antd'; import moment from 'moment'; import groupBy from 'lodash/groupBy'; diff --git a/src/components/PageHeaderWrapper/index.js b/src/components/PageHeaderWrapper/index.js index cd745f66..a305e1a0 100644 --- a/src/components/PageHeaderWrapper/index.js +++ b/src/components/PageHeaderWrapper/index.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import PageHeader from '@/components/PageHeader'; import { connect } from 'dva'; diff --git a/src/components/SelectLang/index.js b/src/components/SelectLang/index.js index f6abe2f2..3ce3fb8d 100644 --- a/src/components/SelectLang/index.js +++ b/src/components/SelectLang/index.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { formatMessage, setLocale, getLocale } from 'umi/locale'; +import { formatMessage, setLocale, getLocale } from 'umi-plugin-react/locale'; import { Menu, Icon } from 'antd'; import classNames from 'classnames'; import HeaderDropdown from '../HeaderDropdown'; diff --git a/src/components/SettingDrawer/ThemeColor.js b/src/components/SettingDrawer/ThemeColor.js index e5d66d4b..9765b737 100644 --- a/src/components/SettingDrawer/ThemeColor.js +++ b/src/components/SettingDrawer/ThemeColor.js @@ -1,6 +1,6 @@ import React from 'react'; import { Tooltip, Icon } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import styles from './ThemeColor.less'; const Tag = ({ color, check, ...rest }) => ( diff --git a/src/components/SettingDrawer/index.js b/src/components/SettingDrawer/index.js index 1a9be4f4..dcf341a0 100644 --- a/src/components/SettingDrawer/index.js +++ b/src/components/SettingDrawer/index.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Select, message, Drawer, List, Switch, Divider, Icon, Button, Alert, Tooltip } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { connect } from 'dva'; import omit from 'omit.js'; diff --git a/src/global.js b/src/global.js index bebe4829..a0ecf97a 100644 --- a/src/global.js +++ b/src/global.js @@ -1,6 +1,6 @@ import React from 'react'; import { notification, Button, message } from 'antd'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import defaultSettings from './defaultSettings'; window.React = React; diff --git a/src/layouts/Header.js b/src/layouts/Header.js index 9d4f7c54..d6931fbb 100644 --- a/src/layouts/Header.js +++ b/src/layouts/Header.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { Layout, message } from 'antd'; import Animate from 'rc-animate'; import { connect } from 'dva'; diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js index 18fb176e..93f826b3 100644 --- a/src/layouts/UserLayout.js +++ b/src/layouts/UserLayout.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { connect } from 'dva'; import Link from 'umi/link'; import { Icon } from 'antd'; diff --git a/src/models/menu.js b/src/models/menu.js index c49f8e20..3d98f2d8 100644 --- a/src/models/menu.js +++ b/src/models/menu.js @@ -1,6 +1,6 @@ import memoizeOne from 'memoize-one'; import isEqual from 'lodash/isEqual'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Authorized from '@/utils/Authorized'; import { menu } from '../defaultSettings'; diff --git a/src/pages/404.js b/src/pages/404.js index 34921c02..ada3484e 100644 --- a/src/pages/404.js +++ b/src/pages/404.js @@ -1,6 +1,6 @@ import React from 'react'; import Link from 'umi/link'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Exception from '@/components/Exception'; export default () => ( diff --git a/src/pages/Account/Settings/BaseView.js b/src/pages/Account/Settings/BaseView.js index f2f2b3a9..040bd7b5 100644 --- a/src/pages/Account/Settings/BaseView.js +++ b/src/pages/Account/Settings/BaseView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Form, Input, Upload, Select, Button } from 'antd'; import { connect } from 'dva'; import styles from './BaseView.less'; diff --git a/src/pages/Account/Settings/BindingView.js b/src/pages/Account/Settings/BindingView.js index 29a29890..f2908874 100644 --- a/src/pages/Account/Settings/BindingView.js +++ b/src/pages/Account/Settings/BindingView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Icon, List } from 'antd'; class BindingView extends Component { diff --git a/src/pages/Account/Settings/Info.js b/src/pages/Account/Settings/Info.js index ceee506b..c5d4ef76 100644 --- a/src/pages/Account/Settings/Info.js +++ b/src/pages/Account/Settings/Info.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import router from 'umi/router'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import { Menu } from 'antd'; import GridContent from '@/components/PageHeaderWrapper/GridContent'; import styles from './Info.less'; diff --git a/src/pages/Account/Settings/NotificationView.js b/src/pages/Account/Settings/NotificationView.js index 96677bbd..00175ccf 100644 --- a/src/pages/Account/Settings/NotificationView.js +++ b/src/pages/Account/Settings/NotificationView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { Switch, List } from 'antd'; class NotificationView extends Component { diff --git a/src/pages/Account/Settings/SecurityView.js b/src/pages/Account/Settings/SecurityView.js index 0706bd0b..96dbf32c 100644 --- a/src/pages/Account/Settings/SecurityView.js +++ b/src/pages/Account/Settings/SecurityView.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { List } from 'antd'; // import { getTimeDistance } from '@/utils/utils'; diff --git a/src/pages/Dashboard/IntroduceRow.js b/src/pages/Dashboard/IntroduceRow.js index e33a4001..f7e67df0 100644 --- a/src/pages/Dashboard/IntroduceRow.js +++ b/src/pages/Dashboard/IntroduceRow.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Row, Col, Icon, Tooltip } from 'antd'; -import { FormattedMessage, formatMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi-plugin-react/locale'; import styles from './Analysis.less'; import { ChartCard, MiniArea, MiniBar, MiniProgress, Field } from '@/components/Charts'; import Trend from '@/components/Trend'; diff --git a/src/pages/Dashboard/Monitor.js b/src/pages/Dashboard/Monitor.js index a2d812ab..de803534 100644 --- a/src/pages/Dashboard/Monitor.js +++ b/src/pages/Dashboard/Monitor.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Row, Col, Card, Tooltip } from 'antd'; import { Pie, WaterWave, Gauge, TagCloud } from '@/components/Charts'; import NumberInfo from '@/components/NumberInfo'; diff --git a/src/pages/Dashboard/OfflineData.js b/src/pages/Dashboard/OfflineData.js index f7d06ef0..71791313 100644 --- a/src/pages/Dashboard/OfflineData.js +++ b/src/pages/Dashboard/OfflineData.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Card, Tabs, Row, Col } from 'antd'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import styles from './Analysis.less'; import { TimelineChart, Pie } from '@/components/Charts'; import NumberInfo from '@/components/NumberInfo'; diff --git a/src/pages/Dashboard/ProportionSales.js b/src/pages/Dashboard/ProportionSales.js index ff16a7d2..39771300 100644 --- a/src/pages/Dashboard/ProportionSales.js +++ b/src/pages/Dashboard/ProportionSales.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Card, Radio } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import styles from './Analysis.less'; import { Pie } from '@/components/Charts'; import Yuan from '@/utils/Yuan'; diff --git a/src/pages/Dashboard/SalesCard.js b/src/pages/Dashboard/SalesCard.js index 3ab57775..ee6adf21 100644 --- a/src/pages/Dashboard/SalesCard.js +++ b/src/pages/Dashboard/SalesCard.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Row, Col, Card, Tabs, DatePicker } from 'antd'; -import { FormattedMessage, formatMessage } from 'umi/locale'; +import { FormattedMessage, formatMessage } from 'umi-plugin-react/locale'; import numeral from 'numeral'; import styles from './Analysis.less'; import { Bar } from '@/components/Charts'; diff --git a/src/pages/Dashboard/TopSearch.js b/src/pages/Dashboard/TopSearch.js index 4e75ea7d..bd893950 100644 --- a/src/pages/Dashboard/TopSearch.js +++ b/src/pages/Dashboard/TopSearch.js @@ -1,6 +1,6 @@ import React, { memo } from 'react'; import { Row, Col, Table, Tooltip, Card, Icon } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import Trend from '@/components/Trend'; import numeral from 'numeral'; import styles from './Analysis.less'; diff --git a/src/pages/Editor/GGEditor/Flow/index.js b/src/pages/Editor/GGEditor/Flow/index.js index 4dc19867..97aaf6e3 100644 --- a/src/pages/Editor/GGEditor/Flow/index.js +++ b/src/pages/Editor/GGEditor/Flow/index.js @@ -7,7 +7,7 @@ import { FlowToolbar } from '../components/EditorToolbar'; import { FlowItemPanel } from '../components/EditorItemPanel'; import { FlowDetailPanel } from '../components/EditorDetailPanel'; import styles from './index.less'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; GGEditor.setTrackable(false); diff --git a/src/pages/Editor/GGEditor/Koni/index.js b/src/pages/Editor/GGEditor/Koni/index.js index 35c4f3e1..2ae34ca1 100644 --- a/src/pages/Editor/GGEditor/Koni/index.js +++ b/src/pages/Editor/GGEditor/Koni/index.js @@ -8,7 +8,7 @@ import { KoniItemPanel } from '../components/EditorItemPanel'; import { KoniDetailPanel } from '../components/EditorDetailPanel'; import KoniCustomNode from './shape/nodes/KoniCustomNode'; import styles from '../Flow/index.less'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; GGEditor.setTrackable(false); diff --git a/src/pages/Editor/GGEditor/Mind/index.js b/src/pages/Editor/GGEditor/Mind/index.js index afb2d676..4e078f60 100644 --- a/src/pages/Editor/GGEditor/Mind/index.js +++ b/src/pages/Editor/GGEditor/Mind/index.js @@ -7,7 +7,7 @@ import { MindToolbar } from '../components/EditorToolbar'; import { MindDetailPanel } from '../components/EditorDetailPanel'; import data from '../mock/worldCup2018.json'; import styles from '../Flow/index.less'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; GGEditor.setTrackable(false); diff --git a/src/pages/Exception/403.js b/src/pages/Exception/403.js index 35e4ca3a..e91f9c91 100644 --- a/src/pages/Exception/403.js +++ b/src/pages/Exception/403.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import Exception from '@/components/Exception'; diff --git a/src/pages/Exception/404.js b/src/pages/Exception/404.js index 84c986c5..f21b1f89 100644 --- a/src/pages/Exception/404.js +++ b/src/pages/Exception/404.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import Exception from '@/components/Exception'; diff --git a/src/pages/Exception/500.js b/src/pages/Exception/500.js index 9d96f212..904844cd 100644 --- a/src/pages/Exception/500.js +++ b/src/pages/Exception/500.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import Exception from '@/components/Exception'; diff --git a/src/pages/Forms/BasicForm.js b/src/pages/Forms/BasicForm.js index 55833150..dd86ebac 100644 --- a/src/pages/Forms/BasicForm.js +++ b/src/pages/Forms/BasicForm.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Form, Input, diff --git a/src/pages/List/Applications.js b/src/pages/List/Applications.js index e36012dd..e8161898 100644 --- a/src/pages/List/Applications.js +++ b/src/pages/List/Applications.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import numeral from 'numeral'; import { connect } from 'dva'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip, Dropdown, Menu } from 'antd'; import TagSelect from '@/components/TagSelect'; import StandardFormRow from '@/components/StandardFormRow'; diff --git a/src/pages/List/Articles.js b/src/pages/List/Articles.js index 5ab311ba..6182d497 100644 --- a/src/pages/List/Articles.js +++ b/src/pages/List/Articles.js @@ -1,7 +1,7 @@ import React, { Component, Fragment } from 'react'; import { connect } from 'dva'; import { Form, Card, Select, List, Tag, Icon, Row, Col, Button } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import TagSelect from '@/components/TagSelect'; import StandardFormRow from '@/components/StandardFormRow'; diff --git a/src/pages/List/Projects.js b/src/pages/List/Projects.js index 3f4a6e9d..2ae82a88 100644 --- a/src/pages/List/Projects.js +++ b/src/pages/List/Projects.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import moment from 'moment'; import { connect } from 'dva'; import { Row, Col, Form, Card, Select, List } from 'antd'; -import { FormattedMessage } from 'umi/locale'; +import { FormattedMessage } from 'umi-plugin-react/locale'; import TagSelect from '@/components/TagSelect'; import AvatarList from '@/components/AvatarList'; diff --git a/src/pages/Result/Error.js b/src/pages/Result/Error.js index fba2da6d..b8e528d5 100644 --- a/src/pages/Result/Error.js +++ b/src/pages/Result/Error.js @@ -1,5 +1,5 @@ import React, { Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Button, Icon, Card } from 'antd'; import Result from '@/components/Result'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; diff --git a/src/pages/Result/Success.js b/src/pages/Result/Success.js index 74d19dc3..0b100806 100644 --- a/src/pages/Result/Success.js +++ b/src/pages/Result/Success.js @@ -1,5 +1,5 @@ import React, { Fragment } from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Button, Row, Col, Icon, Steps, Card } from 'antd'; import Result from '@/components/Result'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; diff --git a/src/pages/User/Login.js b/src/pages/User/Login.js index 6ddece46..e3498bd3 100644 --- a/src/pages/User/Login.js +++ b/src/pages/User/Login.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import { Checkbox, Alert, Icon } from 'antd'; import Login from '@/components/Login'; diff --git a/src/pages/User/Register.js b/src/pages/User/Register.js index ea4565c2..d685965f 100644 --- a/src/pages/User/Register.js +++ b/src/pages/User/Register.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'dva'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import router from 'umi/router'; import { Form, Input, Button, Select, Row, Col, Popover, Progress } from 'antd'; diff --git a/src/pages/User/RegisterResult.js b/src/pages/User/RegisterResult.js index 6e338b27..d1bfe59a 100644 --- a/src/pages/User/RegisterResult.js +++ b/src/pages/User/RegisterResult.js @@ -1,5 +1,5 @@ import React from 'react'; -import { formatMessage, FormattedMessage } from 'umi/locale'; +import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import { Button } from 'antd'; import Link from 'umi/link'; import Result from '@/components/Result'; diff --git a/src/utils/getPageTitle.js b/src/utils/getPageTitle.js index 0dd1e620..30e2dce1 100644 --- a/src/utils/getPageTitle.js +++ b/src/utils/getPageTitle.js @@ -1,4 +1,4 @@ -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import pathToRegexp from 'path-to-regexp'; import isEqual from 'lodash/isEqual'; import memoizeOne from 'memoize-one'; -- GitLab