Merge pull request #6 from flatlogic/update

update project

Author: Blari

README.md

@@ -11,7 +11,7 @@ Built with [React](https://facebook.github.io/react/), [Material-UI](https://mat
 
 ## Features
 
-- React (**17.0.2**)
+- React (**18.2.0**)
 - React Hooks
 - React Context
 - **No jQuery and Bootstrap!**

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# [2.3.3] - 16/05/2023
+
+- Update dependencies
+- Update react version
+
 # [2.3.2] - 20/07/2022
 
 - Fix ecommerce editing

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-material-full",
   "description": "React Material Admin Full",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "private": true,
   "homepage": "./",
   "scripts": {
@@ -12,26 +12,26 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@emotion/react": "^11.8.2",
-    "@emotion/styled": "^11.8.1",
-    "@fullcalendar/daygrid": "^5.11.0",
-    "@fullcalendar/interaction": "^5.11.0",
-    "@fullcalendar/list": "^5.11.0",
-    "@fullcalendar/react": "^5.11.1",
-    "@fullcalendar/timegrid": "^5.11.0",
-    "@mdi/js": "^6.7.96",
-    "@mdi/react": "^1.6.0",
-    "@mui/icons-material": "^5.5.1",
-    "@mui/material": "^5.5.1",
-    "@mui/styled-engine-sc": "^5.4.2",
-    "@mui/styles": "^5.6.2",
-    "@mui/x-data-grid": "^5.6.1",
-    "@mui/x-date-pickers": "^5.0.0-alpha.1",
-    "apexcharts": "^3.35.2",
-    "axios": "^0.21.1",
+    "@emotion/react": "^11.11.0",
+    "@emotion/styled": "^11.11.0",
+    "@fullcalendar/daygrid": "^5.11.5",
+    "@fullcalendar/interaction": "^5.11.5",
+    "@fullcalendar/list": "^5.11.5",
+    "@fullcalendar/react": "^5.11.5",
+    "@fullcalendar/timegrid": "^5.11.5",
+    "@mdi/js": "^6.9.96",
+    "@mdi/react": "^1.6.1",
+    "@mui/icons-material": "^5.11.16",
+    "@mui/material": "^5.13.0",
+    "@mui/styled-engine-sc": "^5.12.0",
+    "@mui/styles": "^5.12.3",
+    "@mui/x-data-grid": "^5.17.26",
+    "@mui/x-date-pickers": "^5.0.20",
+    "apexcharts": "^3.40.0",
+    "axios": "^0.21.4",
     "babel-eslint": "10.1.0",
-    "classnames": "^2.2.6",
-    "connected-react-router": "^6.0.0",
+    "classnames": "^2.3.2",
+    "connected-react-router": "^6.9.3",
     "css-loader": "2.1.1",
     "date-fns": "2.28.0",
     "eslint": "^6.8.0",
@@ -40,33 +40,33 @@
     "font-awesome": "^4.7.0",
     "formik": "2.2.9",
     "history": "4.10.1",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "line-awesome": "^1.3.0",
     "lodash": "^4.17.21",
-    "moment": "2.29.1",
-    "mui-datatables": "^4.2.2",
+    "moment": "2.29.4",
+    "mui-datatables": "^4.3.0",
     "prop-types": "^15.8.1",
     "query-string": "7.1.0",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
     "react-apexcharts": "^1.4.0",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.2.0",
     "react-google-maps": "^9.4.5",
-    "react-redux": "^7.2.4",
-    "react-router-dom": "^5.2.0",
+    "react-redux": "^7.2.9",
+    "react-router-dom": "^5.3.4",
     "react-scripts": "3.4.3",
     "react-simple-maps": "^0.12.1",
     "react-sortablejs": "^1.5.1",
     "react-swipeable-views": "^0.14.0",
     "react-swipeable-views-utils": "^0.14.0",
-    "react-syntax-highlighter": "^11.0.2",
-    "recharts": "^2.1.10",
-    "redux": "^4.0.5",
-    "redux-thunk": "^2.3.0",
+    "react-syntax-highlighter": "^11.0.3",
+    "recharts": "^2.6.2",
+    "redux": "^4.2.1",
+    "redux-thunk": "^2.4.2",
     "sortablejs": "^1.15.0",
-    "tinycolor2": "^1.4.2",
-    "typescript": "^4.1.2",
+    "tinycolor2": "^1.6.0",
+    "typescript": "^4.9.5",
     "url-loader": "2.3.0",
-    "yup": "^0.32.9"
+    "yup": "^0.32.11"
   },
   "eslintConfig": {
     "extends": "react-app"
@@ -79,16 +79,16 @@
   ],
   "devDependencies": {
     "@babel/helper-call-delegate": "7.11.4",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^12.0.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@types/sortablejs": "^1.13.0",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^14.0.0",
+    "@testing-library/user-event": "^14.4.3",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^20.1.5",
+    "@types/react": "^18.2.6",
+    "@types/react-dom": "^18.2.4",
+    "@types/sortablejs": "^1.15.1",
     "cross-env": "^7.0.3",
     "eslint-plugin-css-modules": "^2.11.0",
-    "sass": "^1.45.0"
+    "sass": "^1.62.1"
   }
 }

src/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import ReactDOM from 'react-dom/client';
 import axios from 'axios';
 import { createStore, applyMiddleware, compose } from 'redux';
 import ReduxThunk from 'redux-thunk';
@@ -45,7 +45,9 @@ export const store = createStore(
   compose(applyMiddleware(routerMiddleware(history), ReduxThunk)),
 );
 
-ReactDOM.render(
+const root = ReactDOM.createRoot(document.getElementById('root'));
+
+root.render(
   <Provider store={store}>
     <LayoutProvider>
       <UserProvider>
@@ -66,7 +68,6 @@ ReactDOM.render(
       </UserProvider>
     </LayoutProvider>
   </Provider>,
-  document.getElementById('root'),
 );
 
 // If you want your app to work offline and load faster, you can change