Skip to content

Commit 1740ca2

Browse files
committed
Merge branch 'main' into example
2 parents 643ccec + e89b86c commit 1740ca2

File tree

7 files changed

+1241
-1463
lines changed

7 files changed

+1241
-1463
lines changed

.vscode/settings.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
"i18n-ally.editor.preferEditor": true,
1212
"i18n-ally.keystyle": "nested",
1313
"i18n-ally.localesPaths": ["src/locales/langs"],
14+
"i18n-ally.parsers.typescript.compilerOptions": {
15+
"moduleResolution": "node"
16+
},
1417
"prettier.enable": false,
1518
"typescript.tsdk": "node_modules/typescript/lib",
16-
"unocss.root": ["./"],
17-
"vue.server.hybridMode": true
19+
"unocss.root": ["./"]
1820
}

README.en_US.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
Make sure your environment meets the following requirements:
100100

101101
- **git**: you need git to clone and manage project versions.
102-
- **NodeJS**: >=18.12.0, recommended 18.19.0 or higher.
103-
- **pnpm**: >= 8.7.0, recommended 8.14.0 or higher.
102+
- **NodeJS**: >=20.19.0, recommended 20.19.0 or higher.
103+
- **pnpm**: >= 10.5.0, recommended 10.5.0 or higher.
104104

105105
**Clone Project**
106106

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
确保你的环境满足以下要求:
125125

126126
- **git**: 你需要git来克隆和管理项目版本。
127-
- **NodeJS**: >=18.12.0,推荐 18.19.0 或更高。
128-
- **pnpm**: >= 8.7.0,推荐 8.14.0 或更高。
127+
- **NodeJS**: >=20.19.0,推荐 20.19.0 或更高。
128+
- **pnpm**: >= 10.5.0,推荐 10.5.0 或更高。
129129

130130
**克隆项目**
131131

package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"UnoCSS"
2828
],
2929
"engines": {
30-
"node": ">=18.20.0",
31-
"pnpm": ">=8.7.0"
30+
"node": ">=20.19.0",
31+
"pnpm": ">=10.5.0"
3232
},
3333
"scripts": {
3434
"build": "vite build --mode prod",
@@ -48,8 +48,8 @@
4848
},
4949
"dependencies": {
5050
"@antv/data-set": "0.11.8",
51-
"@antv/g2": "5.3.3",
52-
"@antv/g6": "5.0.48",
51+
"@antv/g2": "5.3.4",
52+
"@antv/g6": "5.0.49",
5353
"@better-scroll/core": "2.5.1",
5454
"@iconify/vue": "5.0.0",
5555
"@sa/alova": "workspace:*",
@@ -60,15 +60,15 @@
6060
"@sa/utils": "workspace:*",
6161
"@visactor/vchart": "2.0.0",
6262
"@visactor/vchart-theme": "1.12.2",
63-
"@visactor/vtable-editors": "1.19.1",
64-
"@visactor/vtable-gantt": "1.19.1",
65-
"@visactor/vue-vtable": "1.19.1",
66-
"@vueuse/components": "13.4.0",
67-
"@vueuse/core": "13.4.0",
63+
"@visactor/vtable-editors": "1.19.3",
64+
"@visactor/vtable-gantt": "1.19.3",
65+
"@visactor/vue-vtable": "1.19.3",
66+
"@vueuse/components": "13.5.0",
67+
"@vueuse/core": "13.5.0",
6868
"clipboard": "2.0.11",
6969
"dayjs": "1.11.13",
7070
"defu": "6.1.4",
71-
"dhtmlx-gantt": "9.0.12",
71+
"dhtmlx-gantt": "9.0.13",
7272
"dompurify": "3.2.6",
7373
"echarts": "5.6.0",
7474
"jsbarcode": "3.12.1",
@@ -78,14 +78,14 @@
7878
"pinia": "3.0.3",
7979
"pinyin-pro": "3.26.0",
8080
"print-js": "1.6.0",
81-
"pro-naive-ui": "2.2.0",
82-
"swiper": "11.2.8",
81+
"pro-naive-ui": "2.3.2",
82+
"swiper": "11.2.10",
8383
"tailwind-merge": "3.3.1",
8484
"typeit": "8.8.7",
8585
"vditor": "3.11.1",
8686
"vue": "3.5.17",
8787
"vue-draggable-plus": "0.6.0",
88-
"vue-i18n": "11.1.7",
88+
"vue-i18n": "11.1.9",
8989
"vue-pdf-embed": "2.1.2",
9090
"vue-router": "4.5.1",
9191
"wangeditor": "4.7.15",
@@ -95,24 +95,24 @@
9595
"devDependencies": {
9696
"@amap/amap-jsapi-types": "0.0.15",
9797
"@elegant-router/vue": "0.3.8",
98-
"@iconify/json": "2.2.352",
98+
"@iconify/json": "2.2.357",
9999
"@sa/scripts": "workspace:*",
100100
"@sa/uno-preset": "workspace:*",
101-
"@soybeanjs/eslint-config": "1.6.1",
101+
"@soybeanjs/eslint-config": "1.7.1",
102102
"@types/bmapgl": "0.0.7",
103-
"@types/node": "24.0.3",
103+
"@types/node": "24.0.13",
104104
"@types/nprogress": "0.2.3",
105-
"@unocss/eslint-config": "66.2.3",
106-
"@unocss/preset-icons": "66.2.3",
107-
"@unocss/preset-uno": "66.2.3",
108-
"@unocss/transformer-directives": "66.2.3",
109-
"@unocss/transformer-variant-group": "66.2.3",
110-
"@unocss/vite": "66.2.3",
105+
"@unocss/eslint-config": "66.3.3",
106+
"@unocss/preset-icons": "66.3.3",
107+
"@unocss/preset-uno": "66.3.3",
108+
"@unocss/transformer-directives": "66.3.3",
109+
"@unocss/transformer-variant-group": "66.3.3",
110+
"@unocss/vite": "66.3.3",
111111
"@vitejs/plugin-vue": "6.0.0",
112-
"@vitejs/plugin-vue-jsx": "5.0.0",
112+
"@vitejs/plugin-vue-jsx": "5.0.1",
113113
"consola": "3.4.2",
114-
"eslint": "9.29.0",
115-
"eslint-plugin-vue": "10.2.0",
114+
"eslint": "9.31.0",
115+
"eslint-plugin-vue": "10.3.0",
116116
"kolorist": "1.8.0",
117117
"lint-staged": "16.1.2",
118118
"pro-naive-ui-resolver": "1.0.2",
@@ -121,13 +121,13 @@
121121
"tsx": "4.20.3",
122122
"typescript": "5.8.3",
123123
"unplugin-icons": "22.1.0",
124-
"unplugin-vue-components": "28.7.0",
125-
"vite": "7.0.0",
124+
"unplugin-vue-components": "28.8.0",
125+
"vite": "7.0.4",
126126
"vite-plugin-progress": "0.0.7",
127127
"vite-plugin-svg-icons": "2.0.1",
128128
"vite-plugin-vue-devtools": "7.7.7",
129-
"vue-eslint-parser": "10.1.4",
130-
"vue-tsc": "2.2.10"
129+
"vue-eslint-parser": "10.2.0",
130+
"vue-tsc": "3.0.1"
131131
},
132132
"simple-git-hooks": {
133133
"commit-msg": "pnpm sa git-commit-verify",

packages/alova/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"dependencies": {
1616
"@alova/mock": "2.0.17",
1717
"@sa/utils": "workspace:*",
18-
"alova": "3.3.3"
18+
"alova": "3.3.4"
1919
}
2020
}

packages/materials/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"@sa/utils": "workspace:*",
14-
"simplebar-vue": "2.4.1"
14+
"simplebar-vue": "2.4.2"
1515
},
1616
"devDependencies": {
1717
"typed-css-modules": "0.9.1"

0 commit comments

Comments
 (0)