Merge remote-tracking branch 'Soybean/main' into dev

# Conflicts:
#	.vscode/settings.json
#	README.en_US.md
#	README.md
#	package.json
#	pnpm-lock.yaml
This commit is contained in:
xlsea 2025-07-11 17:46:01 +08:00
commit 2d02128164
5 changed files with 255 additions and 241 deletions

View File

@ -11,6 +11,9 @@
"i18n-ally.editor.preferEditor": true,
"i18n-ally.keystyle": "nested",
"i18n-ally.localesPaths": ["src/locales/langs"],
"i18n-ally.parsers.typescript.compilerOptions": {
"moduleResolution": "node"
},
"prettier.enable": false,
"typescript.tsdk": "node_modules/typescript/lib",
"unocss.root": ["./"],

View File

@ -21,7 +21,7 @@
"Soybean Admin",
"Vue3 admin ",
"vue-admin-template",
"Vite6",
"Vite7",
"TypeScript",
"naive-ui",
"naive-ui-admin",
@ -66,7 +66,7 @@
"@sa/tinymce": "workspace:*",
"@sa/utils": "workspace:*",
"@types/streamsaver": "^2.0.5",
"@vueuse/core": "13.4.0",
"@vueuse/core": "13.5.0",
"clipboard": "2.0.11",
"dayjs": "1.11.13",
"defu": "6.1.4",
@ -83,16 +83,16 @@
"vue": "3.5.17",
"vue-advanced-cropper": "^2.8.9",
"vue-draggable-plus": "0.6.0",
"vue-i18n": "11.1.7",
"vue-i18n": "11.1.9",
"vue-router": "4.5.1"
},
"devDependencies": {
"@elegant-router/vue": "0.3.8",
"@iconify/json": "2.2.353",
"@iconify/json": "2.2.354",
"@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.7.0",
"@types/node": "24.0.4",
"@types/node": "24.0.10",
"@types/nprogress": "0.2.3",
"@unocss/eslint-config": "66.3.2",
"@unocss/preset-icons": "66.3.2",
@ -101,25 +101,25 @@
"@unocss/transformer-variant-group": "66.3.2",
"@unocss/vite": "66.3.2",
"@vitejs/plugin-vue": "6.0.0",
"@vitejs/plugin-vue-jsx": "5.0.0",
"@vitejs/plugin-vue-jsx": "5.0.1",
"consola": "3.4.2",
"eslint": "9.29.0",
"eslint-plugin-vue": "10.2.0",
"eslint": "9.30.1",
"eslint-plugin-vue": "10.3.0",
"kolorist": "1.8.0",
"sass": "1.89.2",
"simple-git-hooks": "2.13.0",
"tsx": "4.20.3",
"typescript": "5.8.3",
"unplugin-icons": "22.1.0",
"unplugin-vue-components": "28.7.0",
"vite": "7.0.0",
"unplugin-vue-components": "28.8.0",
"vite": "7.0.1",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-progress": "0.0.7",
"vite-plugin-static-copy": "^3.0.2",
"vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.7.7",
"vue-eslint-parser": "10.1.4",
"vue-tsc": "2.2.10"
"vue-eslint-parser": "10.2.0",
"vue-tsc": "3.0.1"
},
"simple-git-hooks": {
"commit-msg": "pnpm sa git-commit-verify",

View File

@ -15,6 +15,6 @@
"dependencies": {
"@alova/mock": "2.0.17",
"@sa/utils": "workspace:*",
"alova": "3.3.3"
"alova": "3.3.4"
}
}

View File

@ -11,7 +11,7 @@
},
"dependencies": {
"@sa/utils": "workspace:*",
"simplebar-vue": "2.4.1"
"simplebar-vue": "2.4.2"
},
"devDependencies": {
"typed-css-modules": "0.9.1"

File diff suppressed because it is too large Load Diff