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

# Conflicts:
#	CHANGELOG.md
#	README.en_US.md
#	README.md
#	package.json
#	pnpm-lock.yaml
#	src/App.vue
#	src/theme/settings.ts
#	src/views/_builtin/iframe-page/[url].vue
This commit is contained in:
xlsea
2025-06-25 11:17:46 +08:00
42 changed files with 1234 additions and 1978 deletions

View File

@ -57,7 +57,7 @@
"@sa/materials": "workspace:*",
"@sa/tinymce": "workspace:*",
"@sa/utils": "workspace:*",
"@vueuse/core": "13.3.0",
"@vueuse/core": "13.4.0",
"clipboard": "2.0.11",
"dayjs": "1.11.13",
"defu": "6.1.4",
@ -66,49 +66,49 @@
"jsencrypt": "^3.3.2",
"json5": "2.2.3",
"monaco-editor": "^0.52.0",
"naive-ui": "2.41.1",
"naive-ui": "2.42.0",
"nprogress": "0.2.0",
"pinia": "3.0.3",
"tailwind-merge": "3.3.0",
"vue": "3.5.16",
"tailwind-merge": "3.3.1",
"vue": "3.5.17",
"vue-advanced-cropper": "^2.8.9",
"vue-draggable-plus": "0.6.0",
"vue-i18n": "11.1.5",
"vue-i18n": "11.1.7",
"vue-router": "4.5.1"
},
"devDependencies": {
"@elegant-router/vue": "0.3.8",
"@iconify/json": "2.2.347",
"@iconify/json": "2.2.352",
"@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.6.1",
"@types/node": "22.15.30",
"@types/node": "24.0.3",
"@types/nprogress": "0.2.3",
"@unocss/eslint-config": "66.1.4",
"@unocss/preset-icons": "66.1.4",
"@unocss/preset-uno": "66.1.4",
"@unocss/transformer-directives": "66.1.4",
"@unocss/transformer-variant-group": "66.1.4",
"@unocss/vite": "66.1.4",
"@vitejs/plugin-vue": "5.2.4",
"@vitejs/plugin-vue-jsx": "4.2.0",
"@unocss/eslint-config": "66.2.3",
"@unocss/preset-icons": "66.2.3",
"@unocss/preset-uno": "66.2.3",
"@unocss/transformer-directives": "66.2.3",
"@unocss/transformer-variant-group": "66.2.3",
"@unocss/vite": "66.2.3",
"@vitejs/plugin-vue": "6.0.0",
"@vitejs/plugin-vue-jsx": "5.0.0",
"consola": "3.4.2",
"eslint": "9.28.0",
"eslint": "9.29.0",
"eslint-plugin-vue": "10.2.0",
"kolorist": "1.8.0",
"sass": "1.89.1",
"sass": "1.89.2",
"simple-git-hooks": "2.13.0",
"tsx": "4.19.4",
"tsx": "4.20.3",
"typescript": "5.8.3",
"unplugin-icons": "22.1.0",
"unplugin-vue-components": "28.7.0",
"vite": "6.3.5",
"vite": "7.0.0",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-progress": "0.0.7",
"vite-plugin-static-copy": "^3.0.0",
"vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.7.6",
"vue-eslint-parser": "10.1.3",
"vite-plugin-vue-devtools": "7.7.7",
"vue-eslint-parser": "10.1.4",
"vue-tsc": "2.2.10"
},
"simple-git-hooks": {