Skip to content

Commit 43a8f3b

Browse files
authored
Merge branch 'youzan:main' into main
2 parents 9a6ca14 + 8dd13ea commit 43a8f3b

File tree

989 files changed

+57690
-38976
lines changed

Some content is hidden

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

989 files changed

+57690
-38976
lines changed

.gitee/ISSUE_TEMPLATE.zh-CN.md

-5
This file was deleted.

.github/CONTRIBUTING.md

+3-38
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,4 @@
1-
# Contributing to Vant
1+
# Vant Contributing Guide
22

3-
The following is a set of guidelines for contributing to Vant. Please spend several minutes in reading these guidelines before you create an issue or pull request.
4-
5-
Anyway, these are just guidelines, not rules, use your best judgment and feel free to propose changes to this document in a pull request.
6-
7-
## Opening an Issue
8-
9-
If you think you have found a bug, or have a new feature idea, please start by making sure it hasn't already been reported or fixed. You can search through existing issues and PRs to see if someone has reported one similar to yours.
10-
11-
Next, create a new issue that briefly explains the problem, and provides a bit of background as to the circumstances that triggered it, and steps to reproduce it.
12-
13-
## Submitting a Pull Request
14-
15-
It's welcomed to pull request, And there are some tips about that:
16-
17-
- Before working on a large change, it is best to open an issue first to discuss it with the maintainers.
18-
19-
- When in doubt, keep your pull requests small. To give a PR the best chance of getting accepted, don't bundle more than one feature or bug fix per pull request. It's always best to create two smaller PRs than one big one.
20-
21-
- When adding new features or modifying existing, please attempt to include tests to confirm the new behavior.
22-
23-
- Rebase before creating a PR to keep commit history clear.
24-
25-
- Add some descriptions and refer relative issues for you PR.
26-
27-
## Getting started
28-
29-
You will need [Node.js >= 14](https://nodejs.org) and [pnpm](https://pnpm.io).
30-
31-
```bash
32-
git clone [email protected]:vant-ui/vant.git
33-
34-
# Install dependencies
35-
pnpm i
36-
37-
# Start development
38-
pnpm dev
39-
```
3+
- [English Version](../packages/vant/docs/markdown/contribution.en-US.md)
4+
- [中文版](../packages/vant/docs/markdown/contribution.zh-CN.md)

.github/ISSUE_TEMPLATE/template-5-bug-report-vant.en-US.yml .github/ISSUE_TEMPLATE/template-1-bug-report-vant.en-US.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
id: reproduce
88
attributes:
99
label: Reproduction Link
10-
description: Please provide a simple [codesandbox](https://codesandbox.io/s/vant-3-issue-template-8fuq5o) or GitHub repository link. Do not fill in invalid links, this will cause your issue to be closed directly.
10+
description: Please provide a simple [codesandbox](https://codesandbox.io/p/devbox/vant-4-issue-template-8fuq5o) or GitHub repository link. Do not fill in invalid links, this will cause your issue to be closed directly.
1111
validations:
1212
required: true
1313

@@ -16,7 +16,7 @@ body:
1616
attributes:
1717
label: Vant Version
1818
description: Please fill in the version actually installed in node_modules/vant/package.json
19-
placeholder: E.g. 3.2.0
19+
placeholder: E.g. 4.2.0
2020
validations:
2121
required: true
2222

.github/ISSUE_TEMPLATE/template-2-bug-report-vant-cli.zh-CN.yml

-51
This file was deleted.

.github/ISSUE_TEMPLATE/template-1-bug-report-vant.zh-CN.yml .github/ISSUE_TEMPLATE/template-3-bug-report-vant.zh-CN.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 我要反馈 Vant 的 Bug
1+
name: 我要反馈 Bug
22
description: 通过标准模板进行 Bug 反馈。
33
title: "[Bug Report] 请在此填写标题"
44
labels: ["bug: need confirm"]
@@ -16,7 +16,7 @@ body:
1616
id: reproduce
1717
attributes:
1818
label: 重现链接
19-
description: 请提供一个尽可能简单的 [codesandbox](https://codesandbox.io/s/vant-3-issue-template-8fuq5o) 或 GitHub 仓库链接。不要填写无效的链接,这会导致你的 issue 被直接关闭。
19+
description: 请提供一个尽可能简单的 [codesandbox](https://codesandbox.io/p/devbox/vant-4-issue-template-8fuq5o) 或 GitHub 仓库链接。不要填写无效的链接,这会导致你的 issue 被直接关闭。
2020
validations:
2121
required: true
2222

@@ -25,7 +25,7 @@ body:
2525
attributes:
2626
label: Vant 版本
2727
description: 你正在使用的 Vant 版本是多少?(请填写 node_modules/vant/package.json 里实际安装的版本)
28-
placeholder: 比如 3.2.0
28+
placeholder: 比如 4.2.0
2929
validations:
3030
required: true
3131

.github/ISSUE_TEMPLATE/template-4-feature-request-vant-cli.zh-CN.yml

-29
This file was deleted.

.github/ISSUE_TEMPLATE/template-3-feature-request-vant.zh-CN.yml .github/ISSUE_TEMPLATE/template-4-feature-request-vant.zh-CN.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 我想要一个 Vant 的新功能
1+
name: 我想要一个新功能
22
description: 通过标准模板描述一下你的功能需求。
33
title: "[Feature Request] 请在此填写标题"
44
labels: ["feature: need confirm"]

.github/PULL_REQUEST_TEMPLATE.md

+2-29
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,3 @@
1-
### Before submitting a pull request, please make sure the following is done:
1+
Before submitting a pull request, please read the [contributing guide](https://vant-ui.github.io/vant/#/en-US/contribution).
22

3-
1. Read the [contributing guide](https://github.com/vant-ui/vant/blob/main/.github/CONTRIBUTING.md).
4-
2. If you've added code that should be tested, add tests.
5-
3. If you've changed APIs, update the documentation.
6-
4. Ensure the test suite passes (`npm test`).
7-
8-
#### Title Format
9-
10-
type(ComponentName?):commit message
11-
12-
Example:
13-
14-
- docs: fix typo in quickstart
15-
- build: optimize build speed
16-
- fix(Button): incorrect style
17-
- feat(Button): add color prop
18-
19-
Allowed Types:
20-
21-
- fix
22-
- feat
23-
- docs
24-
- perf
25-
- test
26-
- types
27-
- build
28-
- chore
29-
- refactor
30-
- breaking change
3+
在提交 pull request 之前,请阅读 [贡献指南](https://vant-ui.github.io/vant/#/zh-CN/contribution)

.github/pr-labeler.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"change: feat":
2+
- "/^(feat|types|style)/"
3+
"change: fix":
4+
- "/^fix/"
5+
"change: perf":
6+
- "/^perf/"
7+
"change: breaking":
8+
- "/^breaking change/"
9+
"change: docs":
10+
- "/^docs/"

.github/release.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# .github/release.yml
2+
3+
changelog:
4+
exclude:
5+
authors:
6+
# Ignore the release PR created by github-actions
7+
- github-actions
8+
categories:
9+
- title: Breaking Changes 🍭
10+
labels:
11+
- "change: breaking"
12+
- title: New Features 🎉
13+
labels:
14+
- "change: feat"
15+
- title: Performance 🚀
16+
labels:
17+
- "change: perf"
18+
- title: Bug Fixes 🐞
19+
labels:
20+
- "change: fix"
21+
- title: Document 📖
22+
labels:
23+
- "change: docs"
24+
- title: Other Changes
25+
labels:
26+
- "*"

.github/renovate.json5

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["config:recommended", "schedule:weekly"],
4+
"dependencyDashboard": false,
5+
"packageRules": [
6+
// Use chore as semantic commit type for commit messages
7+
{
8+
"matchPackagePatterns": ["*"],
9+
"semanticCommitType": "chore",
10+
// always bump package.json
11+
"rangeStrategy": "bump"
12+
},
13+
{
14+
"groupName": "rsbuild",
15+
"packagePatterns": ["rsbuild"],
16+
"groupSlug": "rsbuild"
17+
},
18+
{
19+
"groupName": "vite",
20+
"packagePatterns": ["vite"],
21+
"groupSlug": "vite"
22+
},
23+
{
24+
"groupName": "types",
25+
"packagePatterns": ["^@types/"],
26+
"groupSlug": "types"
27+
},
28+
{
29+
"groupName": "all patch dependencies",
30+
"groupSlug": "all-patch",
31+
"matchPackagePatterns": ["*"],
32+
"matchUpdateTypes": ["patch"]
33+
},
34+
// manually update peer dependencies
35+
{
36+
"depTypeList": ["peerDependencies"],
37+
"enabled": false
38+
}
39+
]
40+
}

.github/workflows/codeql-analysis.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ name: "CodeQL"
1414
on:
1515
push:
1616
branches: [ main ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ main ]
2017
schedule:
2118
- cron: '36 21 * * 2'
2219

@@ -39,11 +36,11 @@ jobs:
3936

4037
steps:
4138
- name: Checkout repository
42-
uses: actions/checkout@v2
39+
uses: actions/checkout@v4
4340

4441
# Initializes the CodeQL tools for scanning.
4542
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
43+
uses: github/codeql-action/init@v3
4744
with:
4845
languages: ${{ matrix.language }}
4946
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +51,7 @@ jobs:
5451
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5552
# If this step fails, then you should remove it and run the build manually (see below)
5653
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
54+
uses: github/codeql-action/autobuild@v3
5855

5956
# ℹ️ Command-line programs to run using the OS shell.
6057
# 📚 https://git.io/JvXDl
@@ -68,4 +65,4 @@ jobs:
6865
# make release
6966

7067
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
68+
uses: github/codeql-action/analyze@v3

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

+8-27
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ on:
1010

1111
jobs:
1212
build-and-deploy:
13-
runs-on: ubuntu-latest
13+
if: github.repository == 'youzan/vant'
14+
runs-on: macos-14
1415
steps:
1516
- name: Checkout 🛎️
16-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1718
with:
1819
ref: 'main'
1920

2021
- name: Install pnpm
2122
run: corepack enable
2223

23-
- uses: actions/setup-node@v2
24+
- uses: actions/setup-node@v4
2425
with:
2526
node-version: '18'
2627
cache: 'pnpm'
@@ -31,36 +32,16 @@ jobs:
3132
- name: Build Site
3233
run: npm run build:site
3334

34-
- name: Deploy for Gitee 🚀
35-
uses: JamesIves/[email protected]
36-
with:
37-
branch: gh-pages
38-
folder: packages/vant/site-dist
39-
clean: true
40-
clean-exclude: |
41-
1.x/*
42-
1.x/**/*
43-
next/*
44-
next/**/*
45-
v1/*
46-
v1/**/*
47-
v2/*
48-
v2/**/*
49-
v3/*
50-
v3/**/*
51-
v4/*
52-
v4/**/*
53-
vant-use/*
54-
vant-use/**/*
55-
5635
- name: Deploy for GitHub 🚀
57-
uses: JamesIves/github-pages-deploy-action@v4.4.1
36+
uses: JamesIves/github-pages-deploy-action@v4.6.3
5837
with:
59-
branch: main
38+
branch: gh-pages
6039
folder: packages/vant/site-dist
6140
token: ${{ secrets.VANT_UI_TOKEN }}
6241
repository-name: vant-ui/vant-ui.github.io
6342
target-folder: vant
43+
# enable single-commit to reduce the repo size
44+
single-commit: true
6445
clean: true
6546
clean-exclude: |
6647
1.x/*

0 commit comments

Comments
 (0)