From: Eduardo San Martin Morote Date: Tue, 18 Jan 2022 19:59:03 +0000 (+0100) Subject: chore: rename branch X-Git-Tag: v4.0.13~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5584a098cdadfdea359aad5b973e8d33109696d0;p=thirdparty%2Fvuejs%2Frouter.git chore: rename branch --- diff --git a/.github/contributing.md b/.github/contributing.md index c2ed3d7d..807cd45a 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -17,7 +17,7 @@ Hi! I'm really excited that you are interested in contributing to Vue Router. Be ## Pull Request Guidelines -- Checkout a topic branch from a base branch, e.g. `master`, and merge back against that branch. +- Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch. - If adding a new feature: diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 824b4359..9c6a1a28 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -20,4 +20,4 @@ jobs: with: tag_name: ${{ github.ref }} body: | - Please refer to [CHANGELOG.md](https://github.com/vuejs/router/blob/master/CHANGELOG.md) for details. + Please refer to [CHANGELOG.md](https://github.com/vuejs/router/blob/main/CHANGELOG.md) for details. diff --git a/.github/workflows/size-check.yml b/.github/workflows/size-check.yml index c0bb7526..1d12c962 100644 --- a/.github/workflows/size-check.yml +++ b/.github/workflows/size-check.yml @@ -2,10 +2,10 @@ name: 'size' on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: size: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 8a60bfb0..31a974e1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# vue-router-next [![release candidate](https://img.shields.io/npm/v/vue-router/next.svg)](https://www.npmjs.com/package/vue-router/v/next) [![CircleCI](https://badgen.net/circleci/github/vuejs/router/master)](https://circleci.com/gh/vuejs/router) +# vue-router-next [![release candidate](https://img.shields.io/npm/v/vue-router/next.svg)](https://www.npmjs.com/package/vue-router/v/next) [![CircleCI](https://badgen.net/circleci/github/vuejs/router/main)](https://circleci.com/gh/vuejs/router) > This is the repository for Vue Router 4 (for Vue 3) @@ -73,7 +73,7 @@ Please consult the [Migration Guide](https://next.router.vuejs.org/guide/migrati ## Contributing -See [Contributing Guide](https://github.com/vuejs/router/blob/master/.github/contributing.md). +See [Contributing Guide](https://github.com/vuejs/router/blob/main/.github/contributing.md). ## Special Thanks diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts index c7b5e178..4b60989a 100644 --- a/docs/.vitepress/config.ts +++ b/docs/.vitepress/config.ts @@ -36,7 +36,7 @@ const config = defineConfig({ repo: 'vuejs/router', docsRepo: 'vuejs/router', docsDir: 'docs', - docsBranch: 'master', + docsBranch: 'main', editLinks: true, editLinkText: 'Suggest changes to this page', @@ -77,7 +77,7 @@ const config = defineConfig({ }, { text: 'Changelog', - link: 'https://github.com/vuejs/router/blob/master/CHANGELOG.md', + link: 'https://github.com/vuejs/router/blob/main/CHANGELOG.md', }, ], @@ -207,7 +207,7 @@ const config = defineConfig({ }, { text: '更新日志', - link: 'https://github.com/vuejs/router/blob/master/CHANGELOG.md', + link: 'https://github.com/vuejs/router/blob/main/CHANGELOG.md', }, ], diff --git a/docs/introduction.md b/docs/introduction.md index b4392212..1c45a109 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -13,7 +13,7 @@ Vue Router is the official router for [Vue.js](http://v3.vuejs.org). It deeply i - Customizable Scroll Behavior - Proper encoding for URLs -[Get started](./guide/) or play with the [playground](https://github.com/vuejs/router/tree/master/playground) (see [`README.md`](https://github.com/vuejs/router) to run them). +[Get started](./guide/) or play with the [playground](https://github.com/vuejs/router/tree/main/playground) (see [`README.md`](https://github.com/vuejs/router) to run them). diff --git a/docs/zh/introduction.md b/docs/zh/introduction.md index 135aa76b..823de735 100644 --- a/docs/zh/introduction.md +++ b/docs/zh/introduction.md @@ -13,7 +13,7 @@ Vue Router 是 [Vue.js](http://v3.vuejs.org) 的官方路由。它与 Vue.js 核 - 可定制的滚动行为 - URL 的正确编码 -[入门](./guide/)或使用 [playground](https://github.com/vuejs/router/tree/master/playground) (详见[`README.md`](https://github.com/vuejs/router)来运行它们)。 +[入门](./guide/)或使用 [playground](https://github.com/vuejs/router/tree/main/playground) (详见[`README.md`](https://github.com/vuejs/router)来运行它们)。