xinyin025/soybean-admin
1
0
Fork 0
mirror of https://github.com/soybeanjs/soybean-admin.git synced 2025-11-20 07:33:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(components): resolve conflict

Browse Source
This commit is contained in:
xiaojunnuo
2023-05-22 12:22:13 +08:00
parent f7090d3dbc 40f8587fd6
commit 3c33f89ec1
12 changed files with 1239 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
package.json
View File

@@ -74,42 +74,42 @@
"echarts": "^5.4.2",
"form-data": "^4.0.0",
"lodash-es": "^4.17.21",
"naive-ui": "2.34.3",
"pinia": "^2.0.35",
"naive-ui": "2.34.4",
"pinia": "^2.1.3",
"print-js": "^1.6.0",
"qs": "^6.11.1",
"swiper": "^9.2.4",
"qs": "^6.11.2",
"swiper": "^9.3.2",
"ua-parser-js": "^1.0.35",
"vditor": "^3.9.2",
"vue": "3.2.47",
"vue": "3.3.4",
"vue-i18n": "^9.2.2",
"vue-router": "^4.1.6",
"vue-router": "^4.2.1",
"vuedraggable": "^4.1.0",
"wangeditor": "^4.7.15",
"xgplayer": "^3.0.2"
},
"devDependencies": {
"@amap/amap-jsapi-types": "^0.0.13",
"@iconify/json": "^2.2.61",
"@iconify/json": "^2.2.67",
"@iconify/vue": "^4.1.1",
"@soybeanjs/cli": "^0.1.9",
"@soybeanjs/vite-plugin-vue-page-route": "^0.0.5",
"@types/bmapgl": "^0.0.7",
"@types/crypto-js": "^4.1.1",
"@types/node": "20.1.0",
"@types/node": "20.2.1",
"@types/qs": "^6.9.7",
"@types/ua-parser-js": "^0.7.36",
"@unocss/preset-uno": "^0.51.12",
"@unocss/transformer-directives": "^0.51.12",
"@unocss/vite": "^0.51.12",
"@vitejs/plugin-vue": "^4.2.1",
"@unocss/preset-uno": "^0.52.0",
"@unocss/transformer-directives": "^0.52.0",
"@unocss/vite": "^0.52.0",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.0.1",
"better-mock": "^0.3.6",
"conventional-changelog": "^3.1.25",
"cross-env": "^7.0.3",
"eslint": "^8.40.0",
"eslint-config-soybeanjs": "^0.3.3",
"eslint": "^8.41.0",
"eslint-config-soybeanjs": "^0.3.7",
"lint-staged": "13.2.2",
"mockjs": "^1.1.0",
"rollup-plugin-visualizer": "^5.9.0",
"sass": "^1.62.1",
"simple-git-hooks": "^2.8.1",
@@ -118,14 +118,18 @@
"typescript": "5.0.4",
"unplugin-icons": "^0.16.1",
"unplugin-vue-components": "0.24.1",
"unplugin-vue-define-options": "^1.3.4",
"vite": "^4.3.5",
"vite": "^4.3.8",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-mock": "2.9.8",
"vite-plugin-progress": "^0.0.7",
"vite-plugin-pwa": "^0.14.7",
"vite-plugin-pwa": "^0.15.0",
"vite-plugin-svg-icons": "^2.0.1",
"vue-tsc": "1.6.4"
"vue-tsc": "1.6.5"
},
"pnpm": {
"patchedDependencies": {
"mockjs@1.1.0": "patches/mockjs@1.1.0.patch"
}
},
"simple-git-hooks": {
"commit-msg": "pnpm soy git-commit-verify",