diff --git a/.eslintrc.json b/.eslintrc.json index aef398db9..4bc70daad 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,7 +3,7 @@ "browser": true, "es2021": true }, - "extends": ["plugin:react/recommended", "airbnb", "prettier"], + "extends": ["plugin:react/recommended", "prettier"], "parserOptions": { "ecmaFeatures": { "jsx": true @@ -19,6 +19,7 @@ "endOfLine": "auto" } ], + "react/display-name": "off", "default-param-last": "off", "react/react-in-jsx-scope": "off", "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }], diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..5c6c95870 --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +legacy-peer-deps=true +auto-install-peers=true +strict-peer-dependencies=false \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5629f2696..53a1317d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [2.2.0] 2023-22-05 + +- Fix issues +- Update dependencies +- Migrate to React 18 +- Fix vulnerabilities issues +- Fix installation issues + ## [2.1.0] 2022-02-14 ### Bug fixing diff --git a/README.md b/README.md index 491b5e226..863724f8f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [Material Dashboard 2 React](http://demos.creative-tim.com/material-dashboard-react/#/dashboard?ref=readme-mdr) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?url=https://www.creative-tim.com/product/material-dashboard-react&text=Check%20Material%20Dashboard%202%20react%20made%20by%20@CreativeTim%20#webdesign%20#dashboard%20#materialdesign%20#react%20https://www.creative-tim.com/product/material-dashboard-react) -![version](https://img.shields.io/badge/version-2.1.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) +![version](https://img.shields.io/badge/version-2.2.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) ![Image](https://s3.amazonaws.com/creativetim_bucket/products/71/original/material-dashboard-react.jpg?1638950990) @@ -193,7 +193,7 @@ If you have questions or need help integrating the product please [contact us](h ## Licensing -- Copyright 2021 [Creative Tim](https://www.creative-tim.com?ref=readme-mdr) +- Copyright 2023 [Creative Tim](https://www.creative-tim.com?ref=readme-mdr) - Creative Tim [license](https://www.creative-tim.com/license?ref=readme-mdr) ## Useful Links diff --git a/package.json b/package.json index 8e2cd45b5..01521c624 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "material-dashboard-2-react", - "version": "2.1.0", + "version": "2.2.0", "private": true, "author": "Creative Tim", "license": "See license in https://www.creative-tim.com/license", @@ -12,38 +12,29 @@ "type": "git", "url": "git+https://github.com/creativetimofficial/material-dashboard-react.git" }, - "engines": { - "node": "14 || 15 || 16", - "npm": ">=6" - }, "dependencies": { - "@emotion/cache": "11.7.1", - "@emotion/react": "11.7.1", - "@emotion/styled": "11.6.0", - "@mui/icons-material": "5.4.1", - "@mui/material": "5.4.1", - "@mui/styled-engine": "5.4.1", - "@testing-library/jest-dom": "5.16.2", - "@testing-library/react": "12.1.2", - "@testing-library/user-event": "13.5.0", - "chart.js": "3.4.1", + "@emotion/cache": "11.10.8", + "@emotion/react": "11.10.8", + "@emotion/styled": "11.10.8", + "@mui/icons-material": "5.11.16", + "@mui/material": "5.12.3", + "chart.js": "4.3.0", "chroma-js": "2.4.2", "prop-types": "15.8.1", - "react": "17.0.2", - "react-chartjs-2": "3.0.4", - "react-dom": "17.0.2", - "react-github-btn": "1.2.1", - "react-router-dom": "6.2.1", - "react-scripts": "5.0.0", - "react-table": "7.7.0", - "stylis": "4.0.13", + "react": "18.2.0", + "react-chartjs-2": "5.2.0", + "react-dom": "18.2.0", + "react-github-btn": "1.4.0", + "react-router-dom": "6.11.0", + "react-scripts": "5.0.1", + "react-table": "7.8.0", + "stylis": "4.1.4", "stylis-plugin-rtl": "2.1.1", - "web-vitals": "2.1.4", - "yup": "0.32.11" + "yup": "1.1.1" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", + "start": "GENERATE_SOURCEMAP=false react-scripts start", + "build": "GENERATE_SOURCEMAP=false react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject", "install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start" @@ -67,14 +58,16 @@ ] }, "devDependencies": { - "eslint": "8.8.0", - "eslint-config-airbnb": "19.0.4", - "eslint-config-prettier": "8.3.0", - "eslint-plugin-import": "2.25.4", - "eslint-plugin-jsx-a11y": "6.5.1", - "eslint-plugin-prettier": "4.0.0", - "eslint-plugin-react": "7.28.0", - "eslint-plugin-react-hooks": "4.3.0", - "prettier": "2.5.1" + "eslint": "8.39.0", + "eslint-config-prettier": "8.8.0", + "eslint-plugin-import": "2.27.5", + "eslint-plugin-jsx-a11y": "6.7.1", + "eslint-plugin-prettier": "4.2.1", + "eslint-plugin-react": "7.32.2", + "eslint-plugin-react-hooks": "4.6.0", + "prettier": "2.8.8" + }, + "overrides": { + "svgo": "3.0.2" } } diff --git a/public/index.html b/public/index.html index 7ac903b40..86f3333c9 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,6 @@