Skip to content

Commit 9d6965c

Browse files
authored
chore: rename references to default branch (#277)
1 parent b289638 commit 9d6965c

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ before_script:
2121
jobs:
2222
include:
2323
- stage: release
24-
if: branch = master AND type != pull_request AND fork = false
24+
if: branch = main AND type != pull_request AND fork = false
2525
node_js: 14
2626
env: ESLINT=7
2727
script: npm run build

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ Working on your first Pull Request? You can learn how from this free series
1212
3. Run `npm install` to install corresponding dependencies
1313
4. Create a branch for your PR named like `pr/your-branch-name` (you can do this through git CLI with `git checkout -b pr/your-branch-name`)
1414

15-
> Tip: Keep your `master` branch pointing at the original repository and make
15+
> Tip: Keep your `main` branch pointing at the original repository and make
1616
> pull requests from branches on your fork. To do this, run:
1717
>
1818
> ```
1919
> git remote add upstream https://github.com/testing-library/eslint-plugin-testing-library.git
2020
> git fetch upstream
21-
> git branch --set-upstream-to=upstream/master master
21+
> git branch --set-upstream-to=upstream/main main
2222
> ```
2323
>
2424
> This will add the original repository as a "remote" called "upstream," Then
25-
> fetch the git information from that remote, then set your local `master`
26-
> branch to use the upstream master branch whenever you run `git pull`. Then you
27-
> can make all of your pull request branches based on this `master` branch.
28-
> Whenever you want to update your version of `master`, do a regular `git pull`.
25+
> fetch the git information from that remote, then set your local `main`
26+
> branch to use the upstream main branch whenever you run `git pull`. Then you
27+
> can make all of your pull request branches based on this `main` branch.
28+
> Whenever you want to update your version of `main`, do a regular `git pull`.
2929
3030
## Committing and Pushing changes
3131
@@ -65,7 +65,7 @@ Additionally, you need to do a couple of extra things:
6565
6666
- Import the new rule in `lib/index.ts` and include it
6767
in `rules` constant (there is a test which will make sure you did
68-
this). Remember to include your rule under corresponding `config` if necessary
68+
this). Remember to include your rule under corresponding `config` if necessary
6969
(a snapshot test will check this too, but you can update it just running
7070
`npm run test:update`).
7171
- Include your rule in the "Supported Rules" table within the [README.md](./README.md).

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
[![Tweet][tweet-badge]][tweet-url]
2424

2525
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
26+
2627
[![All Contributors](https://img.shields.io/badge/all_contributors-35-orange.svg?style=flat-square)](#contributors-)
28+
2729
<!-- ALL-CONTRIBUTORS-BADGE:END -->
2830

2931
## Installation
@@ -156,7 +158,7 @@ To enable this configuration use the `extends` property in your
156158
[version-badge]: https://img.shields.io/npm/v/eslint-plugin-testing-library?style=flat-square
157159
[version-url]: https://www.npmjs.com/package/eslint-plugin-testing-library
158160
[license-badge]: https://img.shields.io/npm/l/eslint-plugin-testing-library?style=flat-square
159-
[license-url]: https://github.com/belco90/eslint-plugin-testing-library/blob/master/license
161+
[license-url]: https://github.com/belco90/eslint-plugin-testing-library/blob/main/license
160162
[pr-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
161163
[pr-url]: http://makeapullrequest.com
162164
[gh-watchers-badge]: https://img.shields.io/github/watchers/Belco90/eslint-plugin-testing-library?style=social
@@ -228,6 +230,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
228230

229231
<!-- markdownlint-enable -->
230232
<!-- prettier-ignore-end -->
233+
231234
<!-- ALL-CONTRIBUTORS-LIST:END -->
232235

233236
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

lib/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const combineQueries = (variants: string[], methods: string[]) => {
1010
return combinedQueries;
1111
};
1212

13-
const getDocsUrl = (ruleName: string) =>
14-
`https://github.com/testing-library/eslint-plugin-testing-library/tree/master/docs/rules/${ruleName}.md`;
13+
const getDocsUrl = (ruleName: string): string =>
14+
`https://github.com/testing-library/eslint-plugin-testing-library/tree/main/docs/rules/${ruleName}.md`;
1515

1616
const LIBRARY_MODULES = [
1717
'@testing-library/dom',

0 commit comments

Comments
 (0)