Merge remote-tracking branch 'origin/main' into v4

# Conflicts:
#	lib/utils.ts
#	package.json

Author: Belco90

.travis.yml

@@ -26,12 +26,14 @@ jobs:
         - npm run format:check
         - npm run lint -- --max-warnings 0
     - stage: release
-      if: branch = master AND type != pull_request AND fork = false
+      if: branch = main AND type != pull_request AND fork = false
       node_js: 14
       env: ESLINT=7
       script: npm run build
       deploy:
         provider: script
         skip_cleanup: true
+        on:
+          branch: main
         script:
           - npx semantic-release

CONTRIBUTING.md

@@ -12,20 +12,20 @@ Working on your first Pull Request? You can learn how from this free series
 3. Run `npm install` to install corresponding dependencies
 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`)
 
-> Tip: Keep your `master` branch pointing at the original repository and make
+> Tip: Keep your `main` branch pointing at the original repository and make
 > pull requests from branches on your fork. To do this, run:
 >
 > ```
 > git remote add upstream https://github.com/testing-library/eslint-plugin-testing-library.git
 > git fetch upstream
-> git branch --set-upstream-to=upstream/master master
+> git branch --set-upstream-to=upstream/main main
 > ```
 >
 > This will add the original repository as a "remote" called "upstream," Then
-> fetch the git information from that remote, then set your local `master`
-> branch to use the upstream master branch whenever you run `git pull`. Then you
-> can make all of your pull request branches based on this `master` branch.
-> Whenever you want to update your version of `master`, do a regular `git pull`.
+> fetch the git information from that remote, then set your local `main`
+> branch to use the upstream main branch whenever you run `git pull`. Then you
+> can make all of your pull request branches based on this `main` branch.
+> Whenever you want to update your version of `main`, do a regular `git pull`.
 
 ## Committing and Pushing changes
 

README.md

@@ -158,7 +158,7 @@ To enable this configuration use the `extends` property in your
 [version-badge]: https://img.shields.io/npm/v/eslint-plugin-testing-library?style=flat-square
 [version-url]: https://www.npmjs.com/package/eslint-plugin-testing-library
 [license-badge]: https://img.shields.io/npm/l/eslint-plugin-testing-library?style=flat-square
-[license-url]: https://github.com/belco90/eslint-plugin-testing-library/blob/master/license
+[license-url]: https://github.com/belco90/eslint-plugin-testing-library/blob/main/license
 [pr-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
 [pr-url]: http://makeapullrequest.com
 [gh-watchers-badge]: https://img.shields.io/github/watchers/Belco90/eslint-plugin-testing-library?style=social

lib/utils.ts

@@ -13,7 +13,7 @@ const combineQueries = (variants: string[], methods: string[]): string[] => {
 };
 
 const getDocsUrl = (ruleName: string): string =>
-  `https://github.com/testing-library/eslint-plugin-testing-library/tree/master/docs/rules/${ruleName}.md`;
+  `https://github.com/testing-library/eslint-plugin-testing-library/tree/main/docs/rules/${ruleName}.md`;
 
 const LIBRARY_MODULES = [
   '@testing-library/dom',

package.json

@@ -21,7 +21,21 @@
     "url": "https://github.com/testing-library/eslint-plugin-testing-library/issues"
   },
   "release": {
-    "pkgRoot": "dist"
+    "pkgRoot": "dist",
+    "branches": [
+      "+([0-9])?(.{+([0-9]),x}).x",
+      "main",
+      "next",
+      "next-major",
+      {
+        "name": "beta",
+        "prerelease": true
+      },
+      {
+        "name": "alpha",
+        "prerelease": true
+      }
+    ]
   },
   "main": "index.js",
   "scripts": {