You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .github/CODE_OF_CONDUCT.md
+1-1
Original file line number
Diff line number
Diff line change
@@ -100,4 +100,4 @@ This is a foundation-wide team established to manage escalation when a reporter
100
100
In order to escalate to the CoCP send an email to `"[email protected]`.
101
101
102
102
For more information, refer to the full
103
-
[Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/blob/master/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md).
103
+
[Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/tree/main/proposals/approved/CODE_OF_CONDUCT).
Copy file name to clipboardExpand all lines: .github/CONTRIBUTING.md
+5-5
Original file line number
Diff line number
Diff line change
@@ -99,11 +99,11 @@ Then:
99
99
- Add detail in subsequent lines.
100
100
- A pre-commit hook will run which automatically formats your staged changes (and fixes any problems it can) with ESLint and Prettier.
101
101
If ESLint fails to fix an issue, your commit will fail and you will need to manually correct the problem.
102
-
1. <aname="up-to-date"/> (Optional) Ensure you are up-to-date with Mocha's `master` branch:
102
+
1. <aname="up-to-date"/> (Optional) Ensure you are up-to-date with Mocha's `main` branch:
103
103
- You can add an "upstream" remote repo using `git remote add upstream https://github.com/mochajs/mocha.git && git fetch upstream`.
104
-
- Navigate to your `master` branch using `git checkout master`.
105
-
- Pull changes from `upstream` using `git pull upstream master`.
106
-
- If any changes were pulled in, update your branch from `master` by switching back to your branch (`git checkout <your-branch>`) then merging using `git merge master`.
104
+
- Navigate to your `main` branch using `git checkout main`.
105
+
- Pull changes from `upstream` using `git pull upstream main`.
106
+
- If any changes were pulled in, update your branch from `main` by switching back to your branch (`git checkout <your-branch>`) then merging using `git merge main`.
107
107
1. Push your changes to your fork; `git push origin`.
108
108
1. In your browser, navigate to [mochajs/mocha](https://github.com/mochajs/mocha).
109
109
You should see a notification about your recent changes in your fork's branch, with a (green?) button to create a pull request.
@@ -126,7 +126,7 @@ Now that the pull request exists, some tasks will be run on it:
126
126
1. Be patient while your PR is reviewed.
127
127
This can take a while.
128
128
We may request changes, but don't be afraid to question them.
129
-
1. Your PR might become conflicted with the code in `master`.
129
+
1. Your PR might become conflicted with the code in `main`.
130
130
If this is the case, you will need to [update your PR](#up-to-date) and resolve your conflicts.
131
131
1. You don't need to make a new PR to any needed changes.
132
132
Instead, commit on top of your changes, and push these to your fork's branch.
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/01-bug.yml
+1-1
Original file line number
Diff line number
Diff line change
@@ -3,7 +3,7 @@ body:
3
3
description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
4
4
label: Bug Report Checklist
5
5
options:
6
-
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
6
+
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
7
7
required: true
8
8
- label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/02-documentation.yml
+1-1
Original file line number
Diff line number
Diff line change
@@ -3,7 +3,7 @@ body:
3
3
description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
4
4
label: Documentation Request Checklist
5
5
options:
6
-
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
6
+
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
7
7
required: true
8
8
- label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/03-feature-request.yml
+1-1
Original file line number
Diff line number
Diff line change
@@ -3,7 +3,7 @@ body:
3
3
description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
4
4
label: Feature Request Checklist
5
5
options:
6
-
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
6
+
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
7
7
required: true
8
8
- label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/04-repository-tooling.yml
+2-2
Original file line number
Diff line number
Diff line change
@@ -5,9 +5,9 @@ body:
5
5
options:
6
6
- label: I have tried restarting my IDE and the issue persists.
7
7
required: true
8
-
- label: I have pulled the latest `master` branch of the repository.
8
+
- label: I have pulled the latest `main` branch of the repository.
9
9
required: true
10
-
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
10
+
- label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
11
11
required: true
12
12
- label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+1-1
Original file line number
Diff line number
Diff line change
@@ -6,7 +6,7 @@ Otherwise we may not be able to review your PR. -->
6
6
7
7
-[ ] Addresses an existing open issue: fixes #000
8
8
-[ ] That issue was marked as [`status: accepting prs`](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3A%22status%3A+accepting+prs%22)
9
-
-[ ] Steps in [CONTRIBUTING.md](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md) were taken
9
+
-[ ] Steps in [CONTRIBUTING.md](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md) were taken
Copy file name to clipboardExpand all lines: MAINTAINERS.md
+10-10
Original file line number
Diff line number
Diff line change
@@ -25,7 +25,7 @@ A "user" for the purpose of this document is any _individual developer_ who cons
25
25
A user interacts with contributors.
26
26
A user interacts with the software, web site, documentation, etc., which these contributors provide.
27
27
28
-
As a user, you're expected to follow the [code of conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) when interacting in Mocha's "official" social spaces.
28
+
As a user, you're expected to follow the [code of conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) when interacting in Mocha's "official" social spaces.
29
29
This includes:
30
30
31
31
- Any channel under the `mochajs` Discord
@@ -54,7 +54,7 @@ Contributions include (but are not limited to):
54
54
1. Researching the user base, getting feedback, etc. Don't spam.
55
55
56
56
A contributor is _usually_ a user as well, but this isn't a hard-and-fast rule.
57
-
A contributor is also expected to adhere to the [code of conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) as a user would.
57
+
A contributor is also expected to adhere to the [code of conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) as a user would.
58
58
59
59
As you can see, it's wide open! Think of it another way: if you are _adding value to Mocha_, then you are a contributor.
60
60
@@ -123,7 +123,7 @@ You may choose to do zero or more of these _at their discretion_:
123
123
- Add new maintainers to the team
124
124
- Tag releases and publish Mocha to npm
125
125
126
-
> While maintainers have the ability to commit directly to the `master` branch, _this is to be avoided_ if any other maintainer could reasonably take issue with the change, or the change affects Mocha's API or output.
126
+
> While maintainers have the ability to commit directly to the `main` branch, _this is to be avoided_ if any other maintainer could reasonably take issue with the change, or the change affects Mocha's API or output.
127
127
> For example, a spelling correction in `CHANGELOG.md` may not require a pull request.
128
128
> A change to a reporter's output most certainly would! Maintainers are trusted to use their best judgement; if unsure, err on the side of caution.
129
129
@@ -347,8 +347,8 @@ Here are some suggestions:
347
347
348
348
## Branches
349
349
350
-
`master` is the only maintained branch in `mochajs/mocha` or any of the other repos.
351
-
**`master` is the only branch to which force-pushing is disallowed.**
350
+
`main` is the only maintained branch in `mochajs/mocha` or any of the other repos.
351
+
**`main` is the only branch to which force-pushing is disallowed.**
352
352
353
353
Maintainers may push new branches to a repo, as long as they remove them when finished (merging a PR will prompt to do so).
354
354
@@ -371,7 +371,7 @@ Likewise, if the PR is `semver-minor`, create or use a new milestone correlating
371
371
If it's unclear what the next milestone will be, use or create a milestone named `next`.
372
372
This milestone will be renamed to the new version at release time.
373
373
374
-
By using milestones, we can cherry-pick non-breaking changes into minor or patch releases, and keep `master` as the latest version.
374
+
By using milestones, we can cherry-pick non-breaking changes into minor or patch releases, and keep `main` as the latest version.
375
375
376
376
**This is subject to change, hopefully.**
377
377
@@ -380,7 +380,7 @@ By using milestones, we can cherry-pick non-breaking changes into minor or patch
380
380
_It's easier to release often._
381
381
382
382
1. Decide whether this is a `patch`, `minor`, or `major` release.
383
-
1. Checkout `master` in your working copy & pull.
383
+
1. Checkout `main` in your working copy & pull.
384
384
1. Modify `CHANGELOG.md`; follow the existing conventions in that file.
385
385
Use the "pull request" number, unless there isn't one.
386
386
_You do not need to add Markdown links; this is done automatically._
@@ -391,15 +391,15 @@ _It's easier to release often._
391
391
(Hint--use `-m`: e.g., `npm version patch -m 'Release v%s'`)
392
392
1. This command will update the list of authors (from the Git history) in `AUTHORS`, and add GitHub links to `CHANGELOG.md`.
393
393
1. These changes are then added to the Git "stage" and will be added to the commit.
394
-
1. Push `master` to `origin` with your new tag; e.g. `git push origin master --tags`
394
+
1. Push `main` to `origin` with your new tag; e.g. `git push origin main --tags`
395
395
1. Copy & paste the `CHANGELOG.md` lines to a new GitHub "release".
396
396
Save release as draft.
397
397
1. Meanwhile, you can check [the build](https://travis-ci.org/mochajs/mocha) on Travis-CI and [GitHub Actions](https://github.com/mochajs/mocha/actions?query=workflow%3A%22Windows+CI%22).
398
398
1. Once the build is green, you'll want to trigger an update of `mochajs.org`:
399
-
1._If you're doing a prerelease_, fast-forward the `next` branch to `master`, and push it.
399
+
1._If you're doing a prerelease_, fast-forward the `next` branch to `main`, and push it.
400
400
This updates [https://next.mochajs.org](https://next.mochajs.org).
401
401
That's all.
402
-
1._If this is NOT a prerelease_, fast-forward the `mochajs.org` branch to `master` and push it.
402
+
1._If this is NOT a prerelease_, fast-forward the `mochajs.org` branch to `main` and push it.
403
403
This updates [https://mochajs.org](https://mochajs.org).
404
404
1._If this is a "final" release_ (the first release of a major _after_ one or more prereleases) then remove the `next` tag from npm via `npm dist-tag rm next`.
405
405
1. Finally, you're satisfied with the release notes, open your draft release on GitHub, then click "publish."
- New to contributing to Mocha? Check out this list of [good first issues](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
61
61
- Mocha could use a hand with [these issues](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3A%22status%3A+accepting+prs%22)
62
-
- The [maintainer's handbook](https://github.com/mochajs/mocha/blob/master/MAINTAINERS.md) explains how things get done
62
+
- The [maintainer's handbook](https://github.com/mochajs/mocha/blob/main/MAINTAINERS.md) explains how things get done
63
63
64
64
Finally, come [chat with the maintainers on Discord](https://discord.gg/KeDn2uXhER) if you want to help with:
65
65
@@ -69,6 +69,6 @@ Finally, come [chat with the maintainers on Discord](https://discord.gg/KeDn2uXh
69
69
70
70
## License
71
71
72
-
Copyright 2011-2022 OpenJS Foundation and contributors. Licensed [MIT](https://github.com/mochajs/mocha/blob/master/LICENSE).
72
+
Copyright 2011-2022 OpenJS Foundation and contributors. Licensed [MIT](https://github.com/mochajs/mocha/blob/main/LICENSE).
Copy file name to clipboardExpand all lines: docs/api-tutorials/custom-reporter.md
+1-1
Original file line number
Diff line number
Diff line change
@@ -13,7 +13,7 @@ If you're looking to get started quickly, here's an example of a custom reporter
13
13
14
14
To use this reporter, execute `mocha --reporter /path/to/my-reporter.js`.
15
15
16
-
For further examples, the built-in reporter implementations are the [best place to look](https://github.com/mochajs/mocha/tree/master/lib/reporters). The [integration tests](https://github.com/mochajs/mocha/tree/master/test/reporters) may also be helpful.
16
+
For further examples, the built-in reporter implementations are the [best place to look](https://github.com/mochajs/mocha/tree/main/lib/reporters). The [integration tests](https://github.com/mochajs/mocha/tree/main/test/reporters) may also be helpful.
0 commit comments