Skip to content

Commit 3b5c402

Browse files
AnLiBoBoAnLiBoBo
authored
Merge branch 'youzan:main' into main
2 parents 43a8f3b + 379f44a commit 3b5c402

File tree

104 files changed

+3789
-1885
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3789
-1885
lines changed

‎.github/workflows/deploy-v4-site.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: npm run build:site
3434

3535
- name: Deploy for GitHub 🚀
36-
uses: JamesIves/[email protected].3
36+
uses: JamesIves/[email protected].8
3737
with:
3838
branch: gh-pages
3939
folder: packages/vant/site-dist

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ Vant 3/4 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3)
125125
| [vant-aliapp](https://github.com/ant-move/Vant-Aliapp) | Alipay MiniProgram UI |
126126
| [vant-theme](https://github.com/Aisen60/vant-theme) | Online theme preview built on Vant UI |
127127
| [@antmjs/vantui](https://github.com/antmjs/vantui) | Mobile UI Components based on Vant, supporting Taro and React |
128+
| [Taroify](https://github.com/mallfoundry/taroify) | Taroify is the Taro version of Vant |
128129
| [vant-playground](https://github.com/LadyChatterleyLover/vant-playground) | Vant Playground |
129130
| [sfc-playground-vant](https://github.com/zhixiaoqiang/sfc-playground-vant) | Vant Playground |
130131
| [vue3-h5-template](https://github.com/yulimchen/vue3-h5-template) | Mobile project template based on Vant |

‎README.zh-CN.md

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0（与 Vue 3 一
131131
| [vant-aliapp](https://github.com/ant-move/Vant-Aliapp) | Vant 支付宝小程序版 |
132132
| [vant-theme](https://github.com/Aisen60/vant-theme) | Vant 在线主题预览工具 |
133133
| [@antmjs/vantui](https://github.com/antmjs/vantui) | 基于 Vant Weapp 开发的多端组件库，同时支持 Taro 和 React |
134+
| [Taroify](https://github.com/mallfoundry/taroify) | Taroify 是 Vant 的 Taro 版本，两者基于相同的视觉规范，提供一致的 API 接口，助力开发者快速搭建小程序应用 |
134135
| [vant-playground](https://github.com/LadyChatterleyLover/vant-playground) | Vant Playground |
135136
| [sfc-playground-vant](https://github.com/zhixiaoqiang/sfc-playground-vant) | Vant Playground |
136137
| [vue3-h5-template](https://github.com/yulimchen/vue3-h5-template) | 基于 Vant 的移动端项目模板 |

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
"*.{ts,tsx,js,vue}": "eslint --fix"
1818
},
1919
"engines": {
20-
"pnpm": ">= 9.0.0"
20+
"pnpm": ">= 9.9.0"
2121
},
22-
"packageManager": "pnpm@9.1.4",
22+
"packageManager": "pnpm@9.12.2",
2323
"devDependencies": {
2424
"@vant/cli": "workspace:*",
2525
"@vant/eslint-config": "workspace:*",
26-
"eslint": "^8.57.0",
27-
"husky": "^9.1.1",
26+
"eslint": "^8.57.1",
27+
"husky": "^9.1.6",
2828
"nano-staged": "^0.8.0",
2929
"prettier": "^3.3.3"
3030
},
3131
"overrides": {
32-
"esbuild": "^0.20.2"
32+
"esbuild": "^0.24.0"
3333
}
3434
}

‎packages/create-vant-cli-app/generators/vue3/package.json.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
"*.{ts,tsx,js,vue}": "eslint --fix"
2525
},
2626
"peerDependencies": {
27-
"vue": "^3.3.4"
27+
"vue": "^3.5.0"
2828
},
2929
"devDependencies": {
3030
"@vant/cli": "^7.0.0",
31-
"vue": "^3.3.4",
31+
"vue": "^3.5.0",
3232
"sass": "^1.49.7"
3333
},
3434
"eslintConfig": {

‎packages/create-vant-cli-app/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
"license": "MIT",
3333
"devDependencies": {
3434
"@types/fs-extra": "^11.0.4",
35-
"rimraf": "^5.0.9",
36-
"typescript": "^5.4.5"
35+
"rimraf": "^6.0.1",
36+
"typescript": "^5.6.3"
3737
},
3838
"dependencies": {
39-
"rslog": "^1.2.2",
39+
"rslog": "^1.2.3",
4040
"fast-glob": "^3.3.2",
4141
"fs-extra": "^11.2.0",
4242
"enquirer": "2.4.1",
43-
"picocolors": "^1.0.1"
43+
"picocolors": "^1.1.1"
4444
}
4545
}

‎packages/vant-area-data/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vant/area-data",
3-
"version": "1.5.2",
3+
"version": "2.0.0",
44
"description": "Vant 省市区数据",
55
"main": "dist/index.cjs.js",
66
"module": "dist/index.esm.mjs",
@@ -39,8 +39,8 @@
3939
"author": "chenjiahan",
4040
"license": "MIT",
4141
"devDependencies": {
42-
"esbuild": "^0.20.2",
43-
"rimraf": "^5.0.9",
44-
"typescript": "^5.4.5"
42+
"esbuild": "^0.24.0",
43+
"rimraf": "^6.0.1",
44+
"typescript": "^5.6.3"
4545
}
4646
}

‎packages/vant-area-data/src/index.ts

+26-25
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,7 @@ export const areaList: {
977977
220174: '长春汽车经济技术开发区',
978978
220182: '榆树市',
979979
220183: '德惠市',
980+
220184: '公主岭市',
980981
220192: '经济技术开发区',
981982
220202: '昌邑区',
982983
220203: '龙潭区',
@@ -993,7 +994,6 @@ export const areaList: {
993994
220303: '铁东区',
994995
220322: '梨树县',
995996
220323: '伊通满族自治县',
996-
220381: '公主岭市',
997997
220382: '双辽市',
998998
220402: '龙山区',
999999
220403: '西安区',
@@ -1223,13 +1223,13 @@ export const areaList: {
12231223
320585: '太仓市',
12241224
320590: '工业园区',
12251225
320591: '高新区',
1226-
320602: '崇川区',
12271226
320611: '港闸区',
12281227
320612: '通州区',
1228+
320613: '崇川区',
1229+
320614: '海门区',
12291230
320623: '如东县',
12301231
320681: '启东市',
12311232
320682: '如皋市',
1232-
320684: '海门市',
12331233
320685: '海安市',
12341234
320691: '高新区',
12351235
320703: '连云区',
@@ -1517,13 +1517,13 @@ export const areaList: {
15171517
350305: '秀屿区',
15181518
350322: '仙游县',
15191519
350402: '梅列区',
1520-
350403: '三元区',
1520+
350404: '三元区',
1521+
350405: '沙县区',
15211522
350421: '明溪县',
15221523
350423: '清流县',
15231524
350424: '宁化县',
15241525
350425: '大田县',
15251526
350426: '尤溪县',
1526-
350427: '沙县',
15271527
350428: '将乐县',
15281528
350429: '泰宁县',
15291529
350430: '建宁县',
@@ -1542,15 +1542,15 @@ export const areaList: {
15421542
350583: '南安市',
15431543
350602: '芗城区',
15441544
350603: '龙文区',
1545+
350604: '龙海区',
1546+
350605: '长泰区',
15451547
350622: '云霄县',
15461548
350623: '漳浦县',
15471549
350624: '诏安县',
1548-
350625: '长泰县',
15491550
350626: '东山县',
15501551
350627: '南靖县',
15511552
350628: '平和县',
15521553
350629: '华安县',
1553-
350681: '龙海市',
15541554
350702: '延平区',
15551555
350703: '建阳区',
15561556
350721: '顺昌县',
@@ -1731,13 +1731,13 @@ export const areaList: {
17311731
370611: '福山区',
17321732
370612: '牟平区',
17331733
370613: '莱山区',
1734+
370614: '蓬莱区',
17341735
370634: '长岛县',
17351736
370671: '烟台高新技术产业开发区',
17361737
370672: '烟台经济技术开发区',
17371738
370681: '龙口市',
17381739
370682: '莱阳市',
17391740
370683: '莱州市',
1740-
370684: '蓬莱市',
17411741
370685: '招远市',
17421742
370686: '栖霞市',
17431743
370687: '海阳市',
@@ -1869,17 +1869,16 @@ export const areaList: {
18691869
410303: '西工区',
18701870
410304: '瀍河回族区',
18711871
410305: '涧西区',
1872-
410306: '吉利区',
1872+
410307: '偃师区',
1873+
410308: '孟津区',
18731874
410311: '洛龙区',
1874-
410322: '孟津县',
18751875
410323: '新安县',
18761876
410324: '栾川县',
18771877
410325: '嵩县',
18781878
410326: '汝阳县',
18791879
410327: '宜阳县',
18801880
410328: '洛宁县',
18811881
410329: '伊川县',
1882-
410381: '偃师市',
18831882
410402: '新华区',
18841883
410403: '卫东区',
18851884
410404: '石龙区',
@@ -2082,11 +2081,11 @@ export const areaList: {
20822081
421002: '沙市区',
20832082
421003: '荆州区',
20842083
421022: '公安县',
2085-
421023: '监利县',
20862084
421024: '江陵县',
20872085
421081: '石首市',
20882086
421083: '洪湖市',
20892087
421087: '松滋市',
2088+
421088: '监利市',
20902089
421102: '黄州区',
20912090
421121: '团风县',
20922091
421122: '红安县',
@@ -2210,7 +2209,6 @@ export const areaList: {
22102209
431081: '资兴市',
22112210
431102: '零陵区',
22122211
431103: '冷水滩区',
2213-
431121: '祁阳县',
22142212
431122: '东安县',
22152213
431123: '双牌县',
22162214
431124: '道县',
@@ -2219,6 +2217,7 @@ export const areaList: {
22192217
431127: '蓝山县',
22202218
431128: '新田县',
22212219
431129: '江华瑶族自治县',
2220+
431181: '祁阳市',
22222221
431202: '鹤城区',
22232222
431221: '中方县',
22242223
431222: '沅陵县',
@@ -2438,7 +2437,7 @@ export const areaList: {
24382437
450124: '马山县',
24392438
450125: '上林县',
24402439
450126: '宾阳县',
2441-
450127: '横县',
2440+
450181: '横州市',
24422441
450202: '城中区',
24432442
450203: '鱼峰区',
24442443
450204: '柳南区',
@@ -2630,10 +2629,10 @@ export const areaList: {
26302629
510115: '温江区',
26312630
510116: '双流区',
26322631
510117: '郫都区',
2632+
510118: '新津区',
26332633
510121: '金堂县',
26342634
510129: '大邑县',
26352635
510131: '蒲江县',
2636-
510132: '新津县',
26372636
510181: '都江堰市',
26382637
510182: '彭州市',
26392638
510183: '邛崃市',
@@ -2789,10 +2788,10 @@ export const areaList: {
27892788
513337: '稻城县',
27902789
513338: '得荣县',
27912790
513401: '西昌市',
2791+
513402: '会理市',
27922792
513422: '木里藏族自治县',
27932793
513423: '盐源县',
27942794
513424: '德昌县',
2795-
513425: '会理县',
27962795
513426: '会东县',
27972796
513427: '宁南县',
27982797
513428: '普格县',
@@ -2817,7 +2816,7 @@ export const areaList: {
28172816
520181: '清镇市',
28182817
520201: '钟山区',
28192818
520203: '六枝特区',
2820-
520221: '水城县',
2819+
520204: '水城区',
28212820
520281: '盘州市',
28222821
520302: '红花岗区',
28232822
520303: '汇川区',
@@ -2841,12 +2840,12 @@ export const areaList: {
28412840
520425: '紫云苗族布依族自治县',
28422841
520502: '七星关区',
28432842
520521: '大方县',
2844-
520522: '黔西县',
28452843
520523: '金沙县',
28462844
520524: '织金县',
28472845
520525: '纳雍县',
28482846
520526: '威宁彝族回族苗族自治县',
28492847
520527: '赫章县',
2848+
520581: '黔西市',
28502849
520602: '碧江区',
28512850
520603: '万山区',
28522851
520621: '江口县',
@@ -2965,6 +2964,7 @@ export const areaList: {
29652964
530926: '耿马傣族佤族自治县',
29662965
530927: '沧源佤族自治县',
29672966
532301: '楚雄市',
2967+
532302: '禄丰市',
29682968
532322: '双柏县',
29692969
532323: '牟定县',
29702970
532324: '南华县',
@@ -2973,7 +2973,6 @@ export const areaList: {
29732973
532327: '永仁县',
29742974
532328: '元谋县',
29752975
532329: '武定县',
2976-
532331: '禄丰县',
29772976
532501: '个旧市',
29782977
532502: '开远市',
29792978
532503: '蒙自市',
@@ -3061,11 +3060,11 @@ export const areaList: {
30613060
540330: '边坝县',
30623061
540402: '巴宜区',
30633062
540421: '工布江达县',
3064-
540422: '米林县',
30653063
540423: '墨脱县',
30663064
540424: '波密县',
30673065
540425: '察隅县',
30683066
540426: '朗县',
3067+
540481: '米林市',
30693068
540502: '乃东区',
30703069
540521: '扎囊县',
30713070
540522: '贡嘎县',
@@ -3076,8 +3075,8 @@ export const areaList: {
30763075
540527: '洛扎县',
30773076
540528: '加查县',
30783077
540529: '隆子县',
3079-
540530: '错那县',
30803078
540531: '浪卡子县',
3079+
540581: '错那市',
30813080
540602: '色尼区',
30823081
540621: '嘉黎县',
30833082
540622: '比如县',
@@ -3116,7 +3115,7 @@ export const areaList: {
31163115
610302: '渭滨区',
31173116
610303: '金台区',
31183117
610304: '陈仓区',
3119-
610322: '凤翔县',
3118+
610305: '凤翔区',
31203119
610323: '岐山县',
31213120
610324: '扶风县',
31223121
610326: '眉县',
@@ -3194,8 +3193,8 @@ export const areaList: {
31943193
610925: '岚皋县',
31953194
610926: '平利县',
31963195
610927: '镇坪县',
3197-
610928: '旬阳县',
31983196
610929: '白河县',
3197+
610981: '旬阳市',
31993198
611002: '商州区',
32003199
611021: '洛南县',
32013200
611022: '丹凤县',
@@ -3314,7 +3313,7 @@ export const areaList: {
33143313
632222: '祁连县',
33153314
632223: '海晏县',
33163315
632224: '刚察县',
3317-
632321: '同仁县',
3316+
632301: '同仁市',
33183317
632322: '尖扎县',
33193318
632323: '泽库县',
33203319
632324: '河南蒙古族自治县',
@@ -3448,8 +3447,8 @@ export const areaList: {
34483447
654028: '尼勒克县',
34493448
654201: '塔城市',
34503449
654202: '乌苏市',
3450+
654203: '沙湾市',
34513451
654221: '额敏县',
3452-
654223: '沙湾县',
34533452
654224: '托里县',
34543453
654225: '裕民县',
34553454
654226: '和布克赛尔蒙古自治县',
@@ -3470,6 +3469,8 @@ export const areaList: {
34703469
659008: '可克达拉市',
34713470
659009: '昆玉市',
34723471
659010: '胡杨河市',
3472+
659011: '新星市',
3473+
659012: '白杨市',
34733474
710101: '中正区',
34743475
710102: '大同区',
34753476
710103: '中山区',

‎packages/vant-auto-import-resolver/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"author": "chenjiahan",
4040
"license": "MIT",
4141
"devDependencies": {
42-
"rimraf": "^5.0.9",
43-
"typescript": "^5.4.5"
42+
"rimraf": "^6.0.1",
43+
"typescript": "^5.6.3"
4444
}
4545
}

‎packages/vant-cli/README.zh-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Vant CLI
22

3-
Vant CLI 是一个基于 Vite 实现的 Vue 组件库构建工具，通过 Vant CLI 可以快速搭建一套功能完备的 Vue 组件库。
3+
Vant CLI 是一个基于 Rsbuild 实现的 Vue 组件库构建工具，通过 Vant CLI 可以快速搭建一套功能完备的 Vue 组件库。
44

55
### 特性
66

7-
- 基于 Vite 实现，享受愉悦的开发体验
7+
- 基于 Rsbuild 实现，享受愉悦的开发体验
88
- 提供丰富的命令，涵盖从开发测试到构建发布的完整流程
99
- 基于约定的目录结构，自动生成优雅的文档站点和组件示例
1010
- 内置 ESLint 校验规则，提交代码时自动执行校验

0 commit comments

Comments
 (0)