Skip to content

Commit 2a16a4b

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/react-and-react-dom-17.0.1
2 parents 762bea3 + 5917047 commit 2a16a4b

2 files changed

Lines changed: 3817 additions & 2746 deletions

File tree

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"date-fns-tz": "^1.0.7",
1111
"history": "^4.9.0",
1212
"immer": "^8.0.1",
13-
"polished": "^3.4.1",
13+
"polished": "^4.1.1",
1414
"prop-types": "^15.7.2",
1515
"react": "^17.0.1",
1616
"react-dom": "^17.0.1",
1717
"react-icons": "^3.7.0",
1818
"react-perfect-scrollbar": "^1.5.3",
1919
"react-redux": "^7.1.0",
2020
"react-router-dom": "^5.0.1",
21-
"react-scripts": "3.0.1",
21+
"react-scripts": "4.0.3",
2222
"react-toastify": "^5.3.2",
2323
"reactotron-react-js": "^3.3.2",
2424
"reactotron-redux": "^3.1.1",
@@ -55,15 +55,15 @@
5555
"babel-eslint": "^10.0.2",
5656
"customize-cra": "^1.0.0",
5757
"eslint": "^5.16.0",
58-
"eslint-config-airbnb": "^17.1.1",
58+
"eslint-config-airbnb": "^18.2.1",
5959
"eslint-config-prettier": "^6.0.0",
6060
"eslint-import-resolver-babel-plugin-root-import": "^1.1.1",
6161
"eslint-plugin-import": "^2.18.2",
6262
"eslint-plugin-jsx-a11y": "^6.2.3",
6363
"eslint-plugin-prettier": "^3.1.0",
6464
"eslint-plugin-react": "^7.14.3",
6565
"eslint-plugin-react-hooks": "^1.6.1",
66-
"prettier": "^1.18.2",
66+
"prettier": "^2.2.1",
6767
"react-app-rewired": "^2.1.3"
6868
}
6969
}

0 commit comments

Comments
 (0)