Skip to content

Commit 76352f9

Browse files
committed
🦄 refactor: Upgrading to antd4 and ts4
1 parent c2515f8 commit 76352f9

File tree

12 files changed

+26
-17
lines changed

12 files changed

+26
-17
lines changed

diary-front/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"start":
88
"REACT_APP_PROTOCOL=http REACT_APP_DOMAIN=local.deardiary.network REACT_APP_PORT=14464 node scripts/start.js",
99
"pretty":
10-
"prettier --write --trailing-comma es5 --single-quote --arrow-parens always \"{src/**/*.{js,ts,tsx},*.json}\" && tslint --project . --fix",
10+
"prettier --write --trailing-comma es5 --single-quote --print-width 120 --arrow-parens always \"{src/**/*.{js,ts,tsx},*.json}\" && tslint --project . --fix",
1111
"build": "node scripts/build.js",
1212
"test": "node scripts/test.js --env=jsdom",
1313
"tslint-check": "tslint-config-prettier-check ./tslint.json",
@@ -17,8 +17,8 @@
1717
"@types/draft-js": "^0.10.20",
1818
"@types/react-highlight-words": "^0.6.4",
1919
"@types/react-router-dom": "^4.2.6",
20-
"@types/recharts": "^1.0.18",
21-
"antd": "3.4.2",
20+
"@ant-design/compatible": "^1.1.0",
21+
"antd": "^4.0.0",
2222
"append-query": "^2.0.1",
2323
"autoprefixer": "7.1.6",
2424
"babel-jest": "^22.1.0",
@@ -55,7 +55,7 @@
5555
"react-live-clock": "^2.0.3",
5656
"react-redux": "^5.0.7",
5757
"react-router-dom": "^4.2.2",
58-
"recharts": "^1.0.0-beta.10",
58+
"recharts": "^2.1.0",
5959
"redux": "^3.7.2",
6060
"redux-logger": "^3.0.6",
6161
"redux-thunk": "=2.2.0",
@@ -67,7 +67,7 @@
6767
"ts-loader": "^2.3.7",
6868
"tsconfig-paths-webpack-plugin": "^2.0.0",
6969
"tslint-config-prettier": "^1.10.0",
70-
"typescript": "^2.7.2",
70+
"typescript": "^4.0.0",
7171
"uglifyjs-webpack-plugin": "^1.1.8",
7272
"url-loader": "0.6.2",
7373
"url-polyfill": "^1.0.13",

diary-front/src/components/DiaryHeaderContainer.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import React from 'react';
22
import { connect } from 'react-redux';
33
import { Link, NavLink, withRouter } from 'react-router-dom';
44

5-
import { Button, Dropdown, Icon, Layout, Menu } from 'antd';
5+
import { Icon } from '@ant-design/compatible';
6+
import { Button, Dropdown, Layout, Menu } from 'antd';
67

78
import { ReduxState, User } from 'reducers';
89
import { dispatch } from 'reducers/store';

diary-front/src/components/DiaryLoginView.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from 'react';
22
import { connect } from 'react-redux';
33

4-
import { Button, Form, Icon, Input, message } from 'antd';
4+
import { Icon } from '@ant-design/compatible';
5+
import { Button, Form, Input, message } from 'antd';
56
import { FormComponentProps } from 'antd/lib/form';
67

78
import { dispatch } from 'reducers/store';

diary-front/src/components/DigestModule/DigestFormContainer.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import * as moment from 'moment';
55
import React from 'react';
66
import { connect } from 'react-redux';
77

8-
import { Button, Card, DatePicker, Form, Icon, Input, message } from 'antd';
8+
import { Icon } from '@ant-design/compatible';
9+
import { Button, Card, DatePicker, Form, Input, message } from 'antd';
910

1011
import { ReduxState, User } from 'reducers';
1112
import { dispatch } from 'reducers/store';

diary-front/src/components/DigestModule/DigestTagsObject.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { SelectValue } from 'antd/lib/select';
22
import React from 'react';
33
import { connect } from 'react-redux';
44

5-
import { Icon, Input, Select, Tooltip } from 'antd';
5+
import { Icon } from '@ant-design/compatible';
6+
import { Input, Select, Tooltip } from 'antd';
67

78
import { ReduxState } from 'reducers';
89
import { Digest, FrequencyMap } from 'utils/api';

diary-front/src/components/EntryModule/EntryDayContainer.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import classnames from 'classnames';
22
import React from 'react';
33
import { connect } from 'react-redux';
44

5-
import { Badge, Button, Card, Icon, message } from 'antd';
5+
import { Icon } from '@ant-design/compatible';
6+
import { Badge, Button, Card, message } from 'antd';
67

78
import ReactDOM from 'react-dom';
89
import { ReduxState, User } from 'reducers';

diary-front/src/components/ReminderModule/ReminderFormContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import * as moment from 'moment';
44
import React from 'react';
55
import { connect } from 'react-redux';
66

7+
import { Icon } from '@ant-design/compatible';
78
import {
89
Button,
910
Card,
1011
DatePicker,
1112
Form,
12-
Icon,
1313
Input,
1414
InputNumber,
1515
message,

diary-front/src/components/TodoModule/TodoFormContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import * as moment from 'moment';
44
import React from 'react';
55
import { connect } from 'react-redux';
66

7+
import { Icon } from '@ant-design/compatible';
78
import {
89
Button,
910
Card,
1011
DatePicker,
1112
Form,
12-
Icon,
1313
Input,
1414
InputNumber,
1515
message,

diary-front/src/components/common/Tag.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Animate from 'rc-animate';
44
import * as React from 'react';
55
import * as ReactDOM from 'react-dom';
66

7-
import { Icon } from 'antd';
7+
import { Icon } from '@ant-design/compatible';
88

99
import { FrequencyMap } from 'utils/api';
1010

diary-front/src/utils/util.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import * as moment from 'moment';
33
import React from 'react';
44
import { withRouter } from 'react-router';
55

6-
import { AutoComplete, Icon } from 'antd';
6+
import { Icon } from '@ant-design/compatible';
7+
import { AutoComplete } from 'antd';
78

89
import { isArray } from 'util';
910
import { Digest, EntriesDateMap, Entry, FrequencyMap } from 'utils/api';

0 commit comments

Comments
 (0)