XinLingKeJi/jdt-mer
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/views/demo/editor/md-editor.vue
This commit is contained in:
YuanHuakk
2023-09-08 10:30:06 +08:00
parent 363270378a 3ed1aafa80
commit 5d1b96be72
2 changed files with 1602 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package.json
View File

@@ -31,14 +31,14 @@
] ]
}, },
"dependencies": { "dependencies": {
"@unocss/eslint-config": "^0.55.0", "@unocss/eslint-config": "^0.55.3",
"@vueuse/core": "^10.3.0", "@vueuse/core": "^10.4.0",
"@wangeditor/editor": "^5.1.23", "@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12", "@wangeditor/editor-for-vue": "5.1.12",
"axios": "^1.4.0", "axios": "^1.5.0",
"dayjs": "^1.11.9", "dayjs": "^1.11.9",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"md-editor-v3": "^4.2.2", "md-editor-v3": "^4.4.0",
"mockjs": "^1.1.0", "mockjs": "^1.1.0",
"pinia": "^2.1.6", "pinia": "^2.1.6",
"vite": "^4.4.9", "vite": "^4.4.9",
@@ -49,10 +49,10 @@
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^17.7.1", "@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0", "@commitlint/config-conventional": "^17.7.0",
"@iconify/json": "^2.2.100", "@iconify/json": "^2.2.106",
"@iconify/vue": "^4.1.1", "@iconify/vue": "^4.1.1",
"@unocss/preset-rem-to-px": "^0.55.0", "@unocss/preset-rem-to-px": "^0.55.3",
"@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue": "^4.3.3",
"@vue/compiler-sfc": "^3.3.4", "@vue/compiler-sfc": "^3.3.4",
"@zclzone/eslint-config": "^0.0.4", "@zclzone/eslint-config": "^0.0.4",
"chalk": "^5.3.0", "chalk": "^5.3.0",
@@ -63,17 +63,17 @@
"esno": "^0.17.0", "esno": "^0.17.0",
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"husky": "^8.0.3", "husky": "^8.0.3",
"lint-staged": "^13.2.3", "lint-staged": "^14.0.1",
"naive-ui": "^2.34.4", "naive-ui": "^2.34.4",
"rollup-plugin-visualizer": "^5.9.2", "rollup-plugin-visualizer": "^5.9.2",
"sass": "^1.65.1", "sass": "^1.66.1",
"unocss": "0.55.0", "unocss": "0.55.3",
"unplugin-auto-import": "^0.16.6", "unplugin-auto-import": "^0.16.6",
"unplugin-icons": "^0.16.5", "unplugin-icons": "^0.16.5",
"unplugin-vue-components": "^0.25.1", "unplugin-vue-components": "^0.25.1",
"vite-plugin-compression": "^0.5.1", "vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0", "vite-plugin-html": "^3.2.0",
"vite-plugin-mock": "^2.9.6", "vite-plugin-mock": "2.9.6",
"vite-plugin-svg-icons": "^2.0.1" "vite-plugin-svg-icons": "^2.0.1"
} }
} }

3217
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff