Skip to content

Commit 2e2ff5d

Browse files
author
Josh Goldberg
authored
chore: rename default branch to 'main' (typescript-eslint#4171)
1 parent 6c3816b commit 2e2ff5d

Some content is hidden

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

60 files changed

+136
-136
lines changed

.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The more relevant information you can include, the faster we can find the issue
1515

1616
- [ ] I have tried restarting my IDE and the issue persists.
1717
- [ ] I have updated to the latest version of the packages.
18-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
18+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
1919

2020
**Repro**
2121

.github/ISSUE_TEMPLATE/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ contact_links:
33
-
44
name: FAQ
55
about: Please check out our FAQ before filing new issues
6-
url: https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md
6+
url: https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md
77
-
88
name: Getting Started Guide
99
about: If you're looking for help setting up check out our getting started guide
10-
url: https://github.com/typescript-eslint/typescript-eslint/tree/master/docs/getting-started
10+
url: https://github.com/typescript-eslint/typescript-eslint/tree/main/docs/getting-started

.github/ISSUE_TEMPLATE/documentation-request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The more relevant information you can include, the faster we can find the issue
1414
-->
1515

1616
- [ ] I have looked on [typescript-eslint.io](https://typescript-eslint.io).
17-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/FAQ.md) and my problem is not listed.
17+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/FAQ.md) and my problem is not listed.
1818

1919
## Suggested Changes
2020

.github/ISSUE_TEMPLATE/eslint-plugin-tslint.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you have a problem with a specific lint rule, please back out and select the
2323

2424
- [ ] I have tried restarting my IDE and the issue persists.
2525
- [ ] I have updated to the latest version of the packages.
26-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
26+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
2727

2828
**Repro**
2929

.github/ISSUE_TEMPLATE/eslint-plugin-typescript.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ Are you opening an issue because the rule you're trying to use is not found?
2222
1) Check the releases log: https://github.com/typescript-eslint/typescript-eslint/releases
2323
- If the rule isn't listed there, then chances are it hasn't been released to the main npm tag yet.
2424
2) Try installing the `canary` tag: `npm i @typescript-eslint/eslint-plugin@canary`.
25-
- The canary tag is built for every commit to master, so it contains the bleeding edge build.
25+
- The canary tag is built for every commit to main, so it contains the bleeding edge build.
2626
3) If ESLint still can't find the rule, then consider reporting an issue.
2727
-->
2828

2929
- [ ] I have tried restarting my IDE and the issue persists.
3030
- [ ] I have updated to the latest version of the packages.
31-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
31+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
3232

3333
**Repro**
3434

.github/ISSUE_TEMPLATE/eslint-plugin-typescript.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
value: |
1212
Before opening a new issue:
1313
- Look for existing [open or closed rule proposals](https://github.com/typescript-eslint/typescript-eslint/issues?q=label%3A%22enhancement%3A+new+base+rule+extension%22)
14-
- Look for [existing rules](https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin)
14+
- Look for [existing rules](https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/eslint-plugin)
1515
- Ensure that the rule you want to propose is related to types. If not, consider looking into [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn)
1616
- type: textarea
1717
validations:

.github/ISSUE_TEMPLATE/typescript-eslint-parser.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you have a problem with a specific lint rule, please back out and select the
2424

2525
- [ ] I have tried restarting my IDE and the issue persists.
2626
- [ ] I have updated to the latest version of the packages.
27-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
27+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
2828

2929
**Repro**
3030

.github/ISSUE_TEMPLATE/typescript-eslint-scope-manager.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you have a problem with the parser, please back out and select the `@typescri
2424

2525
- [ ] I have tried restarting my IDE and the issue persists.
2626
- [ ] I have updated to the latest version of the packages.
27-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
27+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
2828

2929
**Repro**
3030

.github/ISSUE_TEMPLATE/typescript-eslint-utils.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you have a problem with the parser, please back out and select the `@typescri
2424

2525
- [ ] I have tried restarting my IDE and the issue persists.
2626
- [ ] I have updated to the latest version of the packages.
27-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
27+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
2828

2929
**Repro**
3030

.github/ISSUE_TEMPLATE/typescript-estree.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you have a problem with a specific lint rule, please back out and select the
2323

2424
- [ ] I have tried restarting my IDE and the issue persists.
2525
- [ ] I have updated to the latest version of the packages.
26-
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
26+
- [ ] I have [read the FAQ](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TROUBLESHOOTING.md) and my problem is not listed.
2727

2828
**Repro**
2929

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Please fill out all fields below -- otherwise we may not be able to review your
77

88
- [ ] Addresses an existing issue: fixes #000
99
- [ ] That issue was marked as [accepting prs](https://github.com/typescript-eslint/typescript-eslint/issues?q=is%3Aopen+is%3Aissue+label%3A%22accepting+prs%22)
10-
- [ ] Steps in [CONTRIBUTING.md](https://github.com/typescript-eslint/typescript-eslint/blob/master/CONTRIBUTING.md) were taken
10+
- [ ] Steps in [CONTRIBUTING.md](https://github.com/typescript-eslint/typescript-eslint/blob/main/CONTRIBUTING.md) were taken
1111

1212
## Overview
1313

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- v5
88
pull_request:
99
branches:
@@ -310,7 +310,7 @@ jobs:
310310
linting_and_style,
311311
integration_tests,
312312
]
313-
if: github.repository == 'typescript-eslint/typescript-eslint' && github.ref == 'refs/heads/master'
313+
if: github.repository == 'typescript-eslint/typescript-eslint' && github.ref == 'refs/heads/main'
314314
steps:
315315
- uses: actions/checkout@v2
316316
# Fetch all history for all tags and branches in this job because lerna needs it

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Please refrain from leaving useless comments on issues. Comments like "+1", or "
2424

2525
Please refrain from commenting on old, closed issues and PRs. Your issue is rarely related enough to a closed issue to warrant "necroing" a dead thread - raising a new issue means you can fill in the template, and make it easier for us to help you. Often times if you comment on a closed issue, we will just ask you to open a new issue, so please save everyone's time, and **_help us to help you_**.
2626

27-
Please refrain from commenting on `master` commits. Commit comments are not searchable, meaning that nobody else can discover your comments. Raise an issue and reference the commit instead so that everyone can see your comment, and you can fill out the template.
27+
Please refrain from commenting on `main` commits. Commit comments are not searchable, meaning that nobody else can discover your comments. Raise an issue and reference the commit instead so that everyone can see your comment, and you can fill out the template.
2828

2929
---
3030

@@ -88,7 +88,7 @@ Within the body of your PR, make sure you reference the issue that you have work
8888

8989
Make sure you use the "Fixes #xxx" format to reference issues, so that GitHub automatically closes the issues when we merge the PR. Also note that if you are fixing multiple issues at once, you can only reference one issue per line, and must put one "Fixes #xxx" per issue number.
9090

91-
In terms of your commit history - we do not care about the number, or style of commits in your history, because we squash merge every PR into master. Feel free to commit in whatever style you feel comfortable with.
91+
In terms of your commit history - we do not care about the number, or style of commits in your history, because we squash merge every PR into `main`. Feel free to commit in whatever style you feel comfortable with.
9292

9393
**_One thing we ask is to please avoid force pushing after you have raised a PR_**. GitHub is not able to track changes across force pushes, which makes it impossible to efficiently do incremental reviews. This slows us down, and means it will take longer for us to get your PR merged.
9494

@@ -98,4 +98,4 @@ With your PR raised, and the CI showing green, your PR will [sit in the queue to
9898

9999
Please note that as this project is maintained by volunteers, it may take a while for us to get around to your PR (sometimes a month or more). Be patient, we'll get to it. Please refrain from commenting asking for a review, or similar bump comments. **_These just create spam for maintainers, and does not push your PR higher in the queue_**.
100100

101-
Once we have reviewed your PR, we will provide any feedback that needs addressing. If you feel a requested change is wrong, don't be afraid to discuss with us in the comments. Once the feedback is addressed, and the PR is reviewed, we'll ensure the branch is up to date with master, and merge it for you.
101+
Once we have reviewed your PR, we will provide any feedback that needs addressing. If you feel a requested change is wrong, don't be afraid to discuss with us in the comments. Once the feedback is addressed, and the PR is reviewed, we'll ensure the branch is up to date with `main`, and merge it for you.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ See https://typescript-eslint.io/docs/development/architecture/packages for more
3535

3636
All of the packages are published with the same version number to make it easier to coordinate both releases and installations.
3737

38-
We publish a canary release on every successful merge to master, so **you never need to wait for a new stable version to make use of any updates**.
38+
We publish a canary release on every successful merge to `main`, so **you never need to wait for a new stable version to make use of any updates**.
3939

4040
Additionally, we promote the to the `latest` tag on NPM once per week, **on Mondays at 1 pm Eastern**.
4141

4242
The latest version under the `latest` tag is:
4343

4444
<a href="https://www.npmjs.com/package/@typescript-eslint/parser"><img src="https://img.shields.io/npm/v/@typescript-eslint/parser/latest.svg?style=flat-square" alt="NPM Version" /></a>
4545

46-
The latest version under the `canary` tag **(latest commit to master)** is:
46+
The latest version under the `canary` tag **(latest commit to `main`)** is:
4747

4848
<a href="https://www.npmjs.com/package/@typescript-eslint/parser"><img src="https://img.shields.io/npm/v/@typescript-eslint/parser/canary.svg?style=flat-square" alt="NPM Version" /></a>
4949

docs/development/architecture/PACKAGES.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ Any custom rules you write generally will be as well.
6969
**TSLint is deprecated.** It is in your best interest to migrate off it entirely. See [Linting > TSLint](../../linting/TSLINT.md).
7070
:::
7171

72-
[`@typescript-eslint/eslint-plugin-tslint`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin-tslint
73-
[`@typescript-eslint/eslint-plugin`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin
74-
[`@typescript-eslint/experimental-utils`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/experimental-utils
75-
[`@typescript-eslint/parser`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/parser
76-
[`@typescript-eslint/scope-manager`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/scope-manager
77-
[`@typescript-eslint/typescript-estree`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/typescript-estree
78-
[`@typescript-eslint/typescript-estree`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/typescript-estree
72+
[`@typescript-eslint/eslint-plugin-tslint`]: https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/eslint-plugin-tslint
73+
[`@typescript-eslint/eslint-plugin`]: https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/eslint-plugin
74+
[`@typescript-eslint/experimental-utils`]: https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/experimental-utils
75+
[`@typescript-eslint/parser`]: https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/parser
76+
[`@typescript-eslint/scope-manager`]: https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/scope-manager
77+
[`@typescript-eslint/typescript-estree`]: https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/typescript-estree
78+
[`@typescript-eslint/typescript-estree`]: https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/typescript-estree

docs/linting/TSLINT.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ TSLint was a linter equivalent to ESLint that was written specifically to work d
1212

1313
If you are looking for help in migrating from TSLint to ESLint, see [`tslint-to-eslint-config`](https://github.com/typescript-eslint/tslint-to-eslint-config).
1414

15-
You can look at [`the plugin ROADMAP.md`](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/ROADMAP.md) for an up to date overview of how TSLint rules compare to the ones in this package.
15+
You can look at [`the plugin ROADMAP.md`](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/ROADMAP.md) for an up to date overview of how TSLint rules compare to the ones in this package.
1616

1717
There is also the ultimate fallback option of using both linters together for a while during your transition if you
1818
absolutely have to by using TSLint _within_ ESLint.
19-
For this option, check out [`@typescript-eslint/eslint-plugin-tslint`](https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin-tslint).
19+
For this option, check out [`@typescript-eslint/eslint-plugin-tslint`](https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/eslint-plugin-tslint).
2020

2121
## Why Deprecate TSLint?
2222

nx.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
".github/workflows/ci.yml": "*"
99
},
1010
"affected": {
11-
"defaultBase": "master"
11+
"defaultBase": "main"
1212
},
1313
"workspaceLayout": {
1414
"libsDir": "packages"

0 commit comments

Comments
 (0)