mirrors/mue
1
0
Fork 0
mirror of https://github.com/mue/mue.git synced 2026-07-28 11:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
David Ralph
2023-01-08 21:51:00 +00:00
committed by GitHub
parent a6b56cf2e4 1d151c277d
commit 4caaa8c576
7 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
package.json
View File

@@ -9,25 +9,20 @@
"homepage": "https://muetab.com",
"bugs": "https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D",
"license": "BSD-3-Clause",
"version": "7.0.0",
"version": "6.0.6",
"dependencies": {
"@eartharoid/i18n": "1.2.1",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@floating-ui/react-dom": "^1.0.1",
"@fontsource/lexend-deca": "4.5.12",
"@fontsource/montserrat": "4.5.13",
"@mui/material": "5.11.1",
"@sentry/react": "^7.21.1",
"embla-carousel-autoplay": "^7.0.5",
"embla-carousel-react": "^7.0.5",
"fast-blurhash": "^1.1.2",
"image-conversion": "^2.1.1",
"react": "^18.2.0",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@fontsource/lexend-deca": "4.4.5",
"@fontsource/montserrat": "4.4.5",
"@mui/material": "5.10.13",
"react": "18.2.0",
"react-clock": "4.0.0",
"react-color-gradient-picker": "0.1.2",
"react-dom": "^18.2.0",
"react-icons": "^4.6.0",
"react-dom": "18.2.0",
"react-hot-keys": "2.7.2",
"react-icons": "^4.3.1",
"react-modal": "3.16.1",
"react-sortable-hoc": "2.0.0",
"react-toastify": "9.1.1"
@@ -36,16 +31,19 @@
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@eartharoid/deep-merge": "^0.0.2",
"@vitejs/plugin-react": "3.0.0",
"eslint": "^8.30.0",
"eslint-config-react-app": "^7.0.1",
"husky": "^8.0.2",
"prettier": "^2.8.1",
"sass": "^1.57.1",
"stylelint": "^14.16.0",
"stylelint-config-prettier-scss": "^0.0.1",
"stylelint-config-standard-scss": "^6.1.0",
"vite": "4.0.3"
"babel-loader": "^9.0.0",
"copy-webpack-plugin": "9.1.0",
"css-loader": "^6.7.1",
"eslint": "^8.12.0",
"eslint-config-react-app": "^7.0.0",
"html-webpack-plugin": "^5.5.0",
"mini-css-extract-plugin": "^2.6.0",
"sass": "^1.50.0",
"sass-loader": "^13.0.0",
"source-map-loader": "^4.0.0",
"webpack": "^5.71.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.8.1"
},
"scripts": {
"dev": "vite",