Skip to content

Commit 13e0196

Browse files
committed
Fixed peer dependencies #348
1 parent 5a1bc4b commit 13e0196

File tree

35 files changed

+25918
-5941
lines changed

35 files changed

+25918
-5941
lines changed

packages/rmw-shell/cra-template-rmw/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cra-template-rmw",
3-
"version": "4.0.12",
3+
"version": "4.0.13",
44
"keywords": [
55
"react",
66
"create-react-app",

packages/rmw-shell/cra-template-rmw/template.json

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
{
22
"package": {
33
"dependencies": {
4-
"jss-rtl": "0.x",
5-
"rmw-shell":"11.x",
6-
"@formatjs/intl-relativetimeformat": "9.x",
4+
"@emotion/react": "11.x",
5+
"@emotion/styled": "11.x",
6+
"@fontsource/roboto": "4.x",
7+
"@mui/icons-material": "5.x",
8+
"@mui/lab": "^5.0.0-alpha.49",
9+
"@mui/material": "5.x",
10+
"@mui/styles": "5.x",
711
"base-shell": "2.x",
812
"chart.js": "3.x",
9-
"final-form": "4.x",
10-
"final-form-arrays": "3.x",
13+
"final-form": "^4.19.1",
1114
"firebase": "9.x",
1215
"firebaseui": "6.x",
1316
"github-markdown-css": "5.x",
1417
"intl": "1.x",
18+
"jss-rtl": "0.x",
1519
"material-ui-image": "3.x",
1620
"material-ui-shell": "3.x",
1721
"moment": "2.x",
@@ -21,26 +25,18 @@
2125
"react-beautiful-dnd": "13.x",
2226
"react-chartjs-2": "4.x",
2327
"react-countup": "6.x",
24-
"react-custom-scrollbars": "4.x",
28+
"react-custom-scrollbars-2": "4.x",
2529
"react-dom": "17.x",
2630
"react-easy-crop": "4.x",
27-
"react-final-form": "6.x",
28-
"react-final-form-arrays": "3.x",
31+
"react-final-form": "^6.5.1",
2932
"react-helmet": "6.x",
3033
"react-intl": "5.x",
3134
"react-ios-pwa-prompt": "1.x",
3235
"react-linkify": "^1.0.0-alpha",
3336
"react-markdown": "7.x",
34-
"react-router-dom": "6.x",
37+
"react-router-dom": "5.x",
3538
"react-virtualized-auto-sizer": "1.x",
36-
"react-window": "1.x",
37-
"@mui/material": "5.x",
38-
"@emotion/react": "11.x",
39-
"@emotion/styled": "11.x",
40-
"@fontsource/roboto": "4.x",
41-
"@mui/icons-material": "5.x",
42-
"@mui/styles": "5.x",
43-
"@mui/lab": "^5.0.0-alpha.49"
39+
"react-window": "1.x"
4440
},
4541
"eslintConfig": {
4642
"extends": ["react-app", "react-app/jest"]

packages/rmw-shell/cra-template-rmw/template/src/pages/LandingPage/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Toolbar from '@mui/material/Toolbar'
55
import Button from '@mui/material/Button'
66
import CircularProgress from '@mui/material/CircularProgress'
77
import { Helmet } from 'react-helmet'
8-
import { Scrollbars } from 'react-custom-scrollbars'
8+
import { Scrollbars } from 'react-custom-scrollbars-2'
99
import { useNavigate } from 'react-router-dom'
1010

1111
const PageContent = lazy(() => import('./PageContent'))

0 commit comments

Comments
 (0)