Lock files (#28)

* upgrade @emotion/cache, @emotion/react, @emotion/styled,@mui/icons-material, @mui/lab, @mui/material, @mui/styles, @mui/systems, @mui/utils, @muix-data-grid & @tabler/icons * upgrade @testing-library/jest-dom & apexcharts * upgrade formik * upgrade history, props-types & react-apexcharts * upgrade react-router, react-router-dom & set basename * upgrade redux * upgrade @babel/core, @babel/eslint-parser * add @babel/preset-react * upgrade eslint-config-prettier * upgrade eslint-plugin-import & eslint-plugin-jsx-a11y * upgrade eslint-plugin-react, hook and prettier * upgrade eslint-plugin-react, hook and prettier * router issue fixed * upgrade mui popup state * upgrade yup * upgrade sass * Removed unused packages. Co-authored-by: Harshad <codedthemes@gmail.com>
codedthemes · Jul 1, 2022 · 097b87a · 097b87a
1 parent 44fe3a7
commit 097b87a
Show file tree

Hide file tree

Showing 6 changed files with 1,031 additions and 526 deletions.
diff --git a/package.json b/package.json
@@ -1,41 +1,35 @@
 {
     "name": "berry-material-react-free",
-    "version": "3.0.1",
+    "version": "3.1.0",
     "private": true,
     "homepage": "https://berrydashboard.io/free",
     "dependencies": {
-        "@emotion/cache": "^11.4.0",
-        "@emotion/react": "^11.4.0",
-        "@emotion/styled": "^11.3.0",
-        "@mui/icons-material": "^5.0.3",
-        "@mui/lab": "^5.0.0-alpha.50",
-        "@mui/material": "^5.0.3",
-        "@mui/styles": "^5.0.1",
-        "@mui/system": "^5.0.3",
-        "@mui/utils": "^5.0.1",
-        "@mui/x-data-grid": "^5.0.0-beta.3",
-        "@tabler/icons": "^1.39.1",
-        "@testing-library/jest-dom": "^5.11.10",
-        "@testing-library/react": "^11.2.6",
-        "@testing-library/user-event": "^12.8.3",
-        "apexcharts": "^3.26.1",
-        "clsx": "^1.1.1",
-        "formik": "^2.2.6",
+        "@emotion/cache": "^11.9.3",
+        "@emotion/react": "^11.9.3",
+        "@emotion/styled": "^11.9.3",
+        "@mui/icons-material": "^5.8.4",
+        "@mui/lab": "^5.0.0-alpha.70",
+        "@mui/material": "^5.8.6",
+        "@mui/styles": "^5.8.6",
+        "@mui/system": "^5.8.6",
+        "@mui/utils": "^5.8.6",
+        "@tabler/icons": "^1.72.0",
+        "apexcharts": "^3.35.3",
+        "formik": "^2.2.9",
         "framer-motion": "^4.1.13",
-        "history": "^5.0.0",
-        "material-ui-popup-state": "^1.8.0",
-        "prop-types": "^15.7.2",
+        "material-ui-popup-state": "^3.1.1",
+        "prop-types": "^15.8.1",
         "react": "^17.0.2",
-        "react-apexcharts": "^1.3.7",
+        "react-apexcharts": "^1.4.0",
         "react-device-detect": "^1.17.0",
         "react-dom": "^17.0.2",
         "react-perfect-scrollbar": "^1.5.8",
         "react-redux": "^7.2.3",
-        "react-router": "6.0.0-beta.0",
-        "react-router-dom": "6.0.0-beta.0",
+        "react-router": "6.3.0",
+        "react-router-dom": "6.3.0",
         "react-scripts": "^4.0.3",
-        "redux": "^4.0.5",
-        "yup": "^0.32.9"
+        "redux": "^4.2.0",
+        "yup": "^0.32.11"
     },
     "scripts": {
         "start": "react-scripts start",
@@ -55,9 +49,9 @@
     },
     "browserslist": {
         "production": [
-            ">0.2%",
-            "not dead",
-            "not op_mini all"
+            "defaults",
+            "not IE 11",
+            "maintained node versions"
         ],
         "development": [
             "last 1 chrome version",
@@ -66,20 +60,21 @@
         ]
     },
     "devDependencies": {
-        "@babel/core": "^7.14.8",
-        "@babel/eslint-parser": "^7.15.8",
+        "@babel/core": "^7.18.6",
+        "@babel/eslint-parser": "^7.18.2",
+        "@babel/preset-react": "^7.18.6",
         "eslint": "^7.27.0",
         "eslint-config-airbnb-typescript": "^12.3.1",
-        "eslint-config-prettier": "^8.3.0",
+        "eslint-config-prettier": "^8.5.0",
         "eslint-config-react-app": "6.0.0",
         "eslint-import-resolver-typescript": "2.4.0",
         "eslint-plugin-flowtype": "^5.7.2",
-        "eslint-plugin-import": "^2.23.3",
-        "eslint-plugin-jsx-a11y": "6.3.1",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jsx-a11y": "6.6.0",
         "eslint-plugin-prettier": "^3.4.0",
-        "eslint-plugin-react": "^7.26.1",
-        "eslint-plugin-react-hooks": "4.0.8",
-        "prettier": "^2.2.1",
-        "sass": "^1.42.1"
+        "eslint-plugin-react": "^7.30.1",
+        "eslint-plugin-react-hooks": "4.6.0",
+        "prettier": "^2.7.1",
+        "sass": "^1.53.0"
     }
 }
diff --git a/src/index.js b/src/index.js
@@ -11,12 +11,13 @@ import { store } from 'store';
 
 // style + assets
 import 'assets/scss/style.scss';
+import config from './config';
 
 // ==============================|| REACT DOM RENDER  ||============================== //
 
 ReactDOM.render(
     <Provider store={store}>
-        <BrowserRouter>
+        <BrowserRouter basename={config.basename}>
             <App />
         </BrowserRouter>
     </Provider>,

diff --git a/src/layout/MainLayout/Sidebar/MenuList/NavItem/index.js b/src/layout/MainLayout/Sidebar/MenuList/NavItem/index.js
@@ -9,7 +9,6 @@ import { Avatar, Chip, ListItemButton, ListItemIcon, ListItemText, Typography, u
 
 // project imports
 import { MENU_OPEN, SET_MENU } from 'store/actions';
-import config from 'config';
 
 // assets
 import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
@@ -41,7 +40,7 @@ const NavItem = ({ item, level }) => {
     }
 
     let listItemProps = {
-        component: forwardRef((props, ref) => <Link ref={ref} {...props} to={`${config.basename}${item.url}`} target={itemTarget} />)
+        component: forwardRef((props, ref) => <Link ref={ref} {...props} to={item.url} target={itemTarget} />)
     };
     if (item?.external) {
         listItemProps = { component: 'a', href: item.url, target: itemTarget };

diff --git a/src/routes/MainRoutes.js b/src/routes/MainRoutes.js
@@ -28,31 +28,61 @@ const MainRoutes = {
             element: <DashboardDefault />
         },
         {
-            path: '/dashboard/default',
-            element: <DashboardDefault />
+            path: 'dashboard',
+            children: [
+                {
+                    path: 'default',
+                    element: <DashboardDefault />
+                }
+            ]
         },
         {
-            path: '/utils/util-typography',
-            element: <UtilsTypography />
+            path: 'utils',
+            children: [
+                {
+                    path: 'util-typography',
+                    element: <UtilsTypography />
+                }
+            ]
         },
         {
-            path: '/utils/util-color',
-            element: <UtilsColor />
+            path: 'utils',
+            children: [
+                {
+                    path: 'util-color',
+                    element: <UtilsColor />
+                }
+            ]
         },
         {
-            path: '/utils/util-shadow',
-            element: <UtilsShadow />
+            path: 'utils',
+            children: [
+                {
+                    path: 'util-shadow',
+                    element: <UtilsShadow />
+                }
+            ]
         },
         {
-            path: '/icons/tabler-icons',
-            element: <UtilsTablerIcons />
+            path: 'icons',
+            children: [
+                {
+                    path: 'tabler-icons',
+                    element: <UtilsTablerIcons />
+                }
+            ]
         },
         {
-            path: '/icons/material-icons',
-            element: <UtilsMaterialIcons />
+            path: 'icons',
+            children: [
+                {
+                    path: 'material-icons',
+                    element: <UtilsMaterialIcons />
+                }
+            ]
         },
         {
-            path: '/sample-page',
+            path: 'sample-page',
             element: <SamplePage />
         }
     ]

diff --git a/src/routes/index.js b/src/routes/index.js
@@ -3,10 +3,9 @@ import { useRoutes } from 'react-router-dom';
 // routes
 import MainRoutes from './MainRoutes';
 import AuthenticationRoutes from './AuthenticationRoutes';
-import config from 'config';
 
 // ==============================|| ROUTING RENDER ||============================== //
 
 export default function ThemeRoutes() {
-    return useRoutes([MainRoutes, AuthenticationRoutes], config.basename);
+    return useRoutes([MainRoutes, AuthenticationRoutes]);
 }