From 82883141a1d38fb1937407988ea7a4494e6541df Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 12 Sep 2022 11:34:29 +0800 Subject: [PATCH] chore: rename main branch from dev to main (#11042) --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/sync-gitee.yml | 2 +- .github/workflows/test.yml | 2 +- README.md | 6 +++--- README.zh-CN.md | 6 +++--- packages/vant-cli/README.md | 8 ++++---- packages/vant-cli/README.zh-CN.md | 8 ++++---- packages/vant-cli/docs/commands.md | 2 +- packages/vant-cli/docs/commands.zh-CN.md | 2 +- packages/vant/docs/markdown/advanced-usage.en-US.md | 2 +- packages/vant/docs/markdown/advanced-usage.zh-CN.md | 2 +- packages/vant/docs/markdown/design.en-US.md | 4 ++-- packages/vant/docs/markdown/design.zh-CN.md | 4 ++-- packages/vant/docs/markdown/home.en-US.md | 8 ++++---- packages/vant/docs/markdown/home.zh-CN.md | 6 +++--- packages/vant/src/area/README.md | 2 +- packages/vant/src/area/README.zh-CN.md | 2 +- packages/vant/src/locale/README.md | 2 +- packages/vant/src/locale/README.zh-CN.md | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 53880b8ac..62a2ef29c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ ### Before submitting a pull request, please make sure the following is done: -1. Read the [contributing guide](https://github.com/vant-ui/vant/blob/dev/.github/CONTRIBUTING.md). +1. Read the [contributing guide](https://github.com/vant-ui/vant/blob/main/.github/CONTRIBUTING.md). 2. If you've added code that should be tested, add tests. 3. If you've changed APIs, update the documentation. 4. Ensure the test suite passes (`npm test`). diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2672aff4d..517a7f863 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ dev ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ dev ] + branches: [ main ] schedule: - cron: '36 21 * * 2' diff --git a/.github/workflows/sync-gitee.yml b/.github/workflows/sync-gitee.yml index c84eeec8f..4af30f4d0 100644 --- a/.github/workflows/sync-gitee.yml +++ b/.github/workflows/sync-gitee.yml @@ -2,7 +2,7 @@ name: Sync to Gitee on: push: - branches: [dev, 2.x, gh-pages] + branches: [main, 2.x, 3.x, gh-pages] workflow_dispatch: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1fe5e5cef..c83311b1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ on: pull_request: branches: - - dev + - main workflow_dispatch: diff --git a/README.md b/README.md index 4dd0014bd..af8a8bc64 100644 --- a/README.md +++ b/README.md @@ -92,9 +92,9 @@ Vant 3/4 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3) | --- | --- | | [vant-weapp](https://github.com/vant-ui/vant-weapp) | WeChat MiniProgram UI | | [vant-demo](https://github.com/vant-ui/vant-demo) | Collection of Vant demos | -| [vant-cli](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli) | Scaffold for UI library | -| [vant-icons](https://github.com/vant-ui/vant/tree/dev/packages/vant-icons) | Vant icons | -| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/dev/packages/vant-touch-emulator) | Using vant in desktop browsers | +| [vant-cli](https://github.com/vant-ui/vant/tree/main/packages/vant-cli) | Scaffold for UI library | +| [vant-icons](https://github.com/vant-ui/vant/tree/main/packages/vant-icons) | Vant icons | +| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/main/packages/vant-touch-emulator) | Using vant in desktop browsers | ## Community Ecosystem diff --git a/README.zh-CN.md b/README.zh-CN.md index 69ea63b52..8e47e37a0 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -98,9 +98,9 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0（与 Vue 3 一 | --- | --- | | [vant-weapp](https://github.com/vant-ui/vant-weapp) | Vant 微信小程序版 | | [vant-demo](https://github.com/vant-ui/vant-demo) | Vant 官方示例合集 | -| [vant-cli](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli) | 开箱即用的组件库搭建工具 | -| [vant-icons](https://github.com/vant-ui/vant/tree/dev/packages/vant-icons) | Vant 图标库 | -| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/dev/packages/vant-touch-emulator) | 在桌面端使用 Vant 的辅助库 | +| [vant-cli](https://github.com/vant-ui/vant/tree/main/packages/vant-cli) | 开箱即用的组件库搭建工具 | +| [vant-icons](https://github.com/vant-ui/vant/tree/main/packages/vant-icons) | Vant 图标库 | +| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/main/packages/vant-touch-emulator) | 在桌面端使用 Vant 的辅助库 | ## 社区生态 diff --git a/packages/vant-cli/README.md b/packages/vant-cli/README.md index efbc131b0..569eea14c 100644 --- a/packages/vant-cli/README.md +++ b/packages/vant-cli/README.md @@ -65,7 +65,7 @@ Please add the followed config to `package.json` file. ## More Details -- [cli](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/commands.md) -- [config](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/config.md) -- [directory structure](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/directory.md) -- [CHANGELOG](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/changelog.md) +- [cli](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/commands.md) +- [config](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/config.md) +- [directory structure](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/directory.md) +- [CHANGELOG](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/changelog.md) diff --git a/packages/vant-cli/README.zh-CN.md b/packages/vant-cli/README.zh-CN.md index cb8f72123..81c7d752d 100644 --- a/packages/vant-cli/README.zh-CN.md +++ b/packages/vant-cli/README.zh-CN.md @@ -62,7 +62,7 @@ pnpm add @vant/cli -D ## 详细文档 -- [命令](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/commands.zh-CN.md) -- [配置指南](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/config.zh-CN.md) -- [目录结构](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/directory.zh-CN.md) -- [更新日志](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/changelog.md) +- [命令](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/commands.zh-CN.md) +- [配置指南](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/config.zh-CN.md) +- [目录结构](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/directory.zh-CN.md) +- [更新日志](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/changelog.md) diff --git a/packages/vant-cli/docs/commands.md b/packages/vant-cli/docs/commands.md index 06d2093ef..ea9fd90f2 100644 --- a/packages/vant-cli/docs/commands.md +++ b/packages/vant-cli/docs/commands.md @@ -29,7 +29,7 @@ Start local dev server for browsering components and demo. Build Vue component library. -Files will be output to `es` and `lib` directory. More details [directory structure](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/directory.md) +Files will be output to `es` and `lib` directory. More details [directory structure](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/directory.md) Please add the followed config to `package.json` when publish to npm. diff --git a/packages/vant-cli/docs/commands.zh-CN.md b/packages/vant-cli/docs/commands.zh-CN.md index 99bd1eef3..e9c0cf845 100644 --- a/packages/vant-cli/docs/commands.zh-CN.md +++ b/packages/vant-cli/docs/commands.zh-CN.md @@ -31,7 +31,7 @@ npx vant-cli dev 构建组件库。 -运行 build 命令会在 `es` 和 `lib` 目录下生成可用于生产环境的组件代码，详见 [目录结构](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli/docs/directory.zh-CN.md)。 +运行 build 命令会在 `es` 和 `lib` 目录下生成可用于生产环境的组件代码，详见 [目录结构](https://github.com/vant-ui/vant/tree/main/packages/vant-cli/docs/directory.zh-CN.md)。 发布 npm 时，请将以下配置加入到 `package.json` 中，使 npm 包能被正确识别: diff --git a/packages/vant/docs/markdown/advanced-usage.en-US.md b/packages/vant/docs/markdown/advanced-usage.en-US.md index 9c41c3aba..e581eceb0 100644 --- a/packages/vant/docs/markdown/advanced-usage.en-US.md +++ b/packages/vant/docs/markdown/advanced-usage.en-US.md @@ -132,7 +132,7 @@ module.exports = { ### Adapt to PC Browsers -Vant is a mobile-first component library, if you want to use Vant in PC browsers, you can use the [@vant/touch-emulator](https://github.com/vant-ui/vant/tree/dev/packages/vant-touch-emulator) module. This module will automatically convert the mouse events of the PC browser into the touch events of the mobile browser. +Vant is a mobile-first component library, if you want to use Vant in PC browsers, you can use the [@vant/touch-emulator](https://github.com/vant-ui/vant/tree/main/packages/vant-touch-emulator) module. This module will automatically convert the mouse events of the PC browser into the touch events of the mobile browser. ```bash # Install diff --git a/packages/vant/docs/markdown/advanced-usage.zh-CN.md b/packages/vant/docs/markdown/advanced-usage.zh-CN.md index 4d8d04cf3..542b8c90c 100644 --- a/packages/vant/docs/markdown/advanced-usage.zh-CN.md +++ b/packages/vant/docs/markdown/advanced-usage.zh-CN.md @@ -197,7 +197,7 @@ module.exports = { Vant 是一个面向移动端的组件库，因此默认只适配了移动端设备，这意味着组件只监听了移动端的 `touch` 事件，没有监听桌面端的 `mouse` 事件。 -如果你需要在桌面端使用 Vant，可以引入我们提供的 [@vant/touch-emulator](https://github.com/vant-ui/vant/tree/dev/packages/vant-touch-emulator)，这个库会在桌面端自动将 `mouse` 事件转换成对应的 `touch` 事件，使得组件能够在桌面端使用。 +如果你需要在桌面端使用 Vant，可以引入我们提供的 [@vant/touch-emulator](https://github.com/vant-ui/vant/tree/main/packages/vant-touch-emulator)，这个库会在桌面端自动将 `mouse` 事件转换成对应的 `touch` 事件，使得组件能够在桌面端使用。 ```bash # 安装模块 diff --git a/packages/vant/docs/markdown/design.en-US.md b/packages/vant/docs/markdown/design.en-US.md index 4e45baa64..ff980ca5d 100644 --- a/packages/vant/docs/markdown/design.en-US.md +++ b/packages/vant/docs/markdown/design.en-US.md @@ -22,7 +22,7 @@ Contains color specifications, font specifications, and component design specifi -Download +Download ### Icons (Sketch) @@ -30,7 +30,7 @@ Contains icon library resources. -Download +Download ### Axure diff --git a/packages/vant/docs/markdown/design.zh-CN.md b/packages/vant/docs/markdown/design.zh-CN.md index 592f8bdea..111e7ab5d 100644 --- a/packages/vant/docs/markdown/design.zh-CN.md +++ b/packages/vant/docs/markdown/design.zh-CN.md @@ -22,7 +22,7 @@ -下载 +下载 ### 图标设计稿（Sketch） @@ -30,7 +30,7 @@ -下载 +下载 #### 在线资源 diff --git a/packages/vant/docs/markdown/home.en-US.md b/packages/vant/docs/markdown/home.en-US.md index f8c3c2b67..3ccc0c34f 100644 --- a/packages/vant/docs/markdown/home.en-US.md +++ b/packages/vant/docs/markdown/home.en-US.md @@ -41,9 +41,9 @@ Vant 3/4 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3) | --- | --- | | [vant-weapp](https://github.com/vant-ui/vant-weapp) | WeChat MiniProgram UI | | [vant-demo](https://github.com/vant-ui/vant-demo) | Collection of Vant demos | -| [vant-cli](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli) | Scaffold for UI library | -| [vant-icons](https://github.com/vant-ui/vant/tree/dev/packages/vant-icons) | Vant icons | -| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/dev/packages/vant-touch-emulator) | Using vant in desktop browsers | +| [vant-cli](https://github.com/vant-ui/vant/tree/main/packages/vant-cli) | Scaffold for UI library | +| [vant-icons](https://github.com/vant-ui/vant/tree/main/packages/vant-icons) | Vant icons | +| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/main/packages/vant-touch-emulator) | Using vant in desktop browsers | ### Community Ecosystem @@ -82,7 +82,7 @@ Thanks to the following friends for their contributions to Vant: ### Contribution Guide -Please make sure to read the [Contributing Guide](https://github.com/vant-ui/vant/blob/dev/.github/CONTRIBUTING.md) before making a pull request. +Please make sure to read the [Contributing Guide](https://github.com/vant-ui/vant/blob/main/.github/CONTRIBUTING.md) before making a pull request. ### LICENSE diff --git a/packages/vant/docs/markdown/home.zh-CN.md b/packages/vant/docs/markdown/home.zh-CN.md index 82b568e00..760efbe1e 100644 --- a/packages/vant/docs/markdown/home.zh-CN.md +++ b/packages/vant/docs/markdown/home.zh-CN.md @@ -53,9 +53,9 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0（与 Vue 3 一 | --- | --- | | [vant-weapp](https://github.com/vant-ui/vant-weapp) | Vant 微信小程序版 | | [vant-demo](https://github.com/vant-ui/vant-demo) | Vant 官方示例合集 | -| [vant-cli](https://github.com/vant-ui/vant/tree/dev/packages/vant-cli) | 开箱即用的组件库搭建工具 | -| [vant-icons](https://github.com/vant-ui/vant/tree/dev/packages/vant-icons) | Vant 图标库 | -| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/dev/packages/vant-touch-emulator) | 在桌面端使用 Vant 的辅助库 | +| [vant-cli](https://github.com/vant-ui/vant/tree/main/packages/vant-cli) | 开箱即用的组件库搭建工具 | +| [vant-icons](https://github.com/vant-ui/vant/tree/main/packages/vant-icons) | Vant 图标库 | +| [vant-touch-emulator](https://github.com/vant-ui/vant/tree/main/packages/vant-touch-emulator) | 在桌面端使用 Vant 的辅助库 | ### 社区生态 diff --git a/packages/vant/src/area/README.md b/packages/vant/src/area/README.md index 0ce52ad4e..e24e1cd21 100644 --- a/packages/vant/src/area/README.md +++ b/packages/vant/src/area/README.md @@ -52,7 +52,7 @@ export default { ### @vant/area-data -Vant officially provides a default China area data, which can be imported through [@vant/area-data](https://github.com/vant-ui/vant/tree/dev/packages/vant-area-data): +Vant officially provides a default China area data, which can be imported through [@vant/area-data](https://github.com/vant-ui/vant/tree/main/packages/vant-area-data): ```bash # with npm diff --git a/packages/vant/src/area/README.zh-CN.md b/packages/vant/src/area/README.zh-CN.md index ddb287d94..2349c3e1b 100644 --- a/packages/vant/src/area/README.zh-CN.md +++ b/packages/vant/src/area/README.zh-CN.md @@ -54,7 +54,7 @@ const areaList = { ### @vant/area-data -Vant 官方提供了一份默认的中国省市区数据，可以通过 [@vant/area-data](https://github.com/vant-ui/vant/tree/dev/packages/vant-area-data) 引入： +Vant 官方提供了一份默认的中国省市区数据，可以通过 [@vant/area-data](https://github.com/vant-ui/vant/tree/main/packages/vant-area-data) 引入： ```bash # 通过 npm diff --git a/packages/vant/src/locale/README.md b/packages/vant/src/locale/README.md index d697607f8..25703594d 100644 --- a/packages/vant/src/locale/README.md +++ b/packages/vant/src/locale/README.md @@ -72,7 +72,7 @@ Current supported languages: | Traditional Chinese (HK) | zh-HK | - | | Traditional Chinese (TW) | zh-TW | - | -> View all language configs [Here](https://github.com/vant-ui/vant/tree/dev/packages/vant/src/locale/lang). +> View all language configs [Here](https://github.com/vant-ui/vant/tree/main/packages/vant/src/locale/lang). ### Add new language diff --git a/packages/vant/src/locale/README.zh-CN.md b/packages/vant/src/locale/README.zh-CN.md index c5482873e..e413a227f 100644 --- a/packages/vant/src/locale/README.zh-CN.md +++ b/packages/vant/src/locale/README.zh-CN.md @@ -73,7 +73,7 @@ Locale.add(messages); | 繁體中文（港） | zh-HK | - | | 繁體中文（台） | zh-TW | - | -> 在 [这里](https://github.com/vant-ui/vant/tree/dev/packages/vant/src/locale/lang) 查看所有的语言包源文件。 +> 在 [这里](https://github.com/vant-ui/vant/tree/main/packages/vant/src/locale/lang) 查看所有的语言包源文件。 ## 常见问题