jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	build/config/proxy.ts
#	package.json
#	pnpm-lock.yaml
This commit is contained in:
xlsea
2025-09-01 15:06:44 +08:00
parent 7f2f3bd088 12b25e0d58
commit e230b0da81
5 changed files with 936 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/config/proxy.ts
View File

@ -1,4 +1,4 @@
import type { HttpProxy, ProxyOptions } from 'vite'; import type { ProxyOptions } from 'vite';
import { bgRed, bgYellow, green, lightBlue } from 'kolorist'; import { bgRed, bgYellow, green, lightBlue } from 'kolorist';
import { consola } from 'consola'; import { consola } from 'consola';
import { createServiceConfig } from '../../src/utils/service'; import { createServiceConfig } from '../../src/utils/service';
@ -34,7 +34,7 @@ function createProxyItem(item: App.Service.ServiceConfigItem, enableLog: boolean
target: item.baseURL, target: item.baseURL,
changeOrigin: true, changeOrigin: true,
ws: item.ws, ws: item.ws,
configure: (_proxy: HttpProxy.Server, options: ProxyOptions) => { configure: (_proxy, options) => {
_proxy.on('proxyReq', (_proxyReq, req, _res) => { _proxy.on('proxyReq', (_proxyReq, req, _res) => {
if (!enableLog) return; if (!enableLog) return;

52
package.json
View File

@ -66,11 +66,11 @@
"@sa/tinymce": "workspace:*", "@sa/tinymce": "workspace:*",
"@sa/utils": "workspace:*", "@sa/utils": "workspace:*",
"@types/streamsaver": "^2.0.5", "@types/streamsaver": "^2.0.5",
"@vueuse/core": "13.5.0", "@vueuse/core": "13.8.0",
"clipboard": "2.0.11", "clipboard": "2.0.11",
"dayjs": "1.11.13", "dayjs": "1.11.14",
"defu": "6.1.4", "defu": "6.1.4",
"echarts": "5.6.0", "echarts": "6.0.0",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
"jsencrypt": "^3.3.2", "jsencrypt": "^3.3.2",
"json5": "2.2.3", "json5": "2.2.3",
@ -80,47 +80,47 @@
"pinia": "3.0.3", "pinia": "3.0.3",
"streamsaver": "^2.0.6", "streamsaver": "^2.0.6",
"tailwind-merge": "3.3.1", "tailwind-merge": "3.3.1",
"vue": "3.5.17", "vue": "3.5.20",
"vue-advanced-cropper": "^2.8.9", "vue-advanced-cropper": "^2.8.9",
"vue-draggable-plus": "0.6.0", "vue-draggable-plus": "0.6.0",
"vue-i18n": "11.1.9", "vue-i18n": "11.1.11",
"vue-router": "4.5.1", "vue-router": "4.5.1",
"xlsx": "0.18.5" "xlsx": "0.18.5"
}, },
"devDependencies": { "devDependencies": {
"@elegant-router/vue": "0.3.8", "@elegant-router/vue": "0.3.8",
"@iconify/json": "2.2.357", "@iconify/json": "2.2.378",
"@sa/scripts": "workspace:*", "@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*", "@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.7.1", "@soybeanjs/eslint-config": "1.7.1",
"@types/node": "24.0.13", "@types/node": "24.3.0",
"@types/nprogress": "0.2.3", "@types/nprogress": "0.2.3",
"@unocss/eslint-config": "66.3.3", "@unocss/eslint-config": "66.4.2",
"@unocss/preset-icons": "66.3.3", "@unocss/preset-icons": "66.4.2",
"@unocss/preset-uno": "66.3.3", "@unocss/preset-uno": "66.4.2",
"@unocss/transformer-directives": "66.3.3", "@unocss/transformer-directives": "66.4.2",
"@unocss/transformer-variant-group": "66.3.3", "@unocss/transformer-variant-group": "66.4.2",
"@unocss/vite": "66.3.3", "@unocss/vite": "66.4.2",
"@vitejs/plugin-vue": "6.0.0", "@vitejs/plugin-vue": "6.0.1",
"@vitejs/plugin-vue-jsx": "5.0.1", "@vitejs/plugin-vue-jsx": "5.1.0",
"consola": "3.4.2", "consola": "3.4.2",
"eslint": "9.31.0", "eslint": "9.34.0",
"eslint-plugin-vue": "10.3.0", "eslint-plugin-vue": "10.4.0",
"kolorist": "1.8.0", "kolorist": "1.8.0",
"sass": "1.89.2", "sass": "1.91.0",
"simple-git-hooks": "2.13.0", "simple-git-hooks": "2.13.1",
"tsx": "4.20.3", "tsx": "4.20.5",
"typescript": "5.8.3", "typescript": "5.9.2",
"unplugin-icons": "22.1.0", "unplugin-icons": "22.2.0",
"unplugin-vue-components": "28.8.0", "unplugin-vue-components": "29.0.0",
"vite": "7.0.4", "vite": "7.1.3",
"vite-plugin-monaco-editor": "^1.1.0", "vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-progress": "0.0.7", "vite-plugin-progress": "0.0.7",
"vite-plugin-static-copy": "^3.1.0", "vite-plugin-static-copy": "^3.1.0",
"vite-plugin-svg-icons": "2.0.1", "vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.7.7", "vite-plugin-vue-devtools": "8.0.1",
"vue-eslint-parser": "10.2.0", "vue-eslint-parser": "10.2.0",
"vue-tsc": "3.0.1" "vue-tsc": "3.0.6"
}, },
"simple-git-hooks": { "simple-git-hooks": {
"commit-msg": "pnpm sa git-commit-verify", "commit-msg": "pnpm sa git-commit-verify",

2
packages/axios/package.json
View File

@ -11,7 +11,7 @@
}, },
"dependencies": { "dependencies": {
"@sa/utils": "workspace:*", "@sa/utils": "workspace:*",
"axios": "1.10.0", "axios": "1.11.0",
"axios-retry": "4.5.0", "axios-retry": "4.5.0",
"qs": "6.14.0" "qs": "6.14.0"
}, },

6
packages/scripts/package.json
View File

@ -14,14 +14,14 @@
}, },
"devDependencies": { "devDependencies": {
"@soybeanjs/changelog": "0.3.24", "@soybeanjs/changelog": "0.3.24",
"bumpp": "10.2.0", "bumpp": "10.2.3",
"c12": "3.0.4", "c12": "3.2.0",
"cac": "6.7.14", "cac": "6.7.14",
"consola": "3.4.2", "consola": "3.4.2",
"enquirer": "2.4.1", "enquirer": "2.4.1",
"execa": "9.6.0", "execa": "9.6.0",
"kolorist": "1.8.0", "kolorist": "1.8.0",
"npm-check-updates": "18.0.1", "npm-check-updates": "18.0.3",
"rimraf": "6.0.1" "rimraf": "6.0.1"
} }
} }

1505
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff