Skip to content

Commit bb8909b

Browse files
Merge branch 'main' into aggregate-error
2 parents 5705140 + c43930c commit bb8909b

Some content is hidden

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

50 files changed

+807
-639
lines changed

.github/CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ This is a foundation-wide team established to manage escalation when a reporter
100100
In order to escalate to the CoCP send an email to `"[email protected]`.
101101

102102
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).

.github/CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ Then:
9999
- Add detail in subsequent lines.
100100
- A pre-commit hook will run which automatically formats your staged changes (and fixes any problems it can) with ESLint and Prettier.
101101
If ESLint fails to fix an issue, your commit will fail and you will need to manually correct the problem.
102-
1. <a name="up-to-date"/> (Optional) Ensure you are up-to-date with Mocha's `master` branch:
102+
1. <a name="up-to-date"/> (Optional) Ensure you are up-to-date with Mocha's `main` branch:
103103
- 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`.
107107
1. Push your changes to your fork; `git push origin`.
108108
1. In your browser, navigate to [mochajs/mocha](https://github.com/mochajs/mocha).
109109
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:
126126
1. Be patient while your PR is reviewed.
127127
This can take a while.
128128
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`.
130130
If this is the case, you will need to [update your PR](#up-to-date) and resolve your conflicts.
131131
1. You don't need to make a new PR to any needed changes.
132132
Instead, commit on top of your changes, and push these to your fork's branch.

.github/ISSUE_TEMPLATE/01-bug.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ body:
33
description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
44
label: Bug Report Checklist
55
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)
77
required: true
88
- 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.
99
required: true

.github/ISSUE_TEMPLATE/02-documentation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ body:
33
description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
44
label: Documentation Request Checklist
55
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)
77
required: true
88
- 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.
99
required: true

.github/ISSUE_TEMPLATE/03-feature-request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ body:
33
description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
44
label: Feature Request Checklist
55
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)
77
required: true
88
- 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.
99
required: true

.github/ISSUE_TEMPLATE/04-repository-tooling.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ body:
55
options:
66
- label: I have tried restarting my IDE and the issue persists.
77
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.
99
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)
1111
required: true
1212
- 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.
1313
required: true

.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: false
1+
blank_issues_enabled: true
22
contact_links:
33
- name: Documentation Website
44
about: Please read our documentation website before filing new issues.

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Otherwise we may not be able to review your PR. -->
66

77
- [ ] Addresses an existing open issue: fixes #000
88
- [ ] 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
1010

1111
## Overview
1212

.github/dependabot.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: 'github-actions'
4+
directory: '/'
5+
schedule:
6+
interval: 'weekly'
7+
groups:
8+
github-actions:
9+
patterns:
10+
- '*'

.github/workflows/browser-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
ref: ${{ github.event.pull_request.head.sha }}
2121
persist-credentials: false
2222
- name: 'Cache node_modules'
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: '~/.npm'
2626
key: "ubuntu-latest-node-full-lts-${{ hashFiles('**/package-lock.json') }}"
@@ -32,7 +32,7 @@ jobs:
3232
SAUCE_USERNAME: '${{secrets.SAUCE_USERNAME}}'
3333
SAUCE_ACCESS_KEY: '${{secrets.SAUCE_ACCESS_KEY}}'
3434
- name: remove 'run-browser-test' label
35-
uses: buildsville/[email protected].0
35+
uses: buildsville/[email protected].1
3636
if: ${{ always() }}
3737
with:
3838
token: ${{secrets.GITHUB_TOKEN}}

.github/workflows/compliance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name: Compliance
1212
on:
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616
types:
1717
- edited
1818
- opened

.github/workflows/mocha.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
with:
7171
persist-credentials: false
7272
- name: 'Cache node_modules'
73-
uses: actions/cache@v3
73+
uses: actions/cache@v4
7474
with:
7575
path: '~/.npm'
7676
key: "ubuntu-latest-node-lts-${{ hashFiles('**/package-lock.json') }}"
@@ -113,7 +113,7 @@ jobs:
113113
run: |
114114
echo "dir=$(npm config get cache)" >> $env:GITHUB_OUTPUT
115115
- name: 'Cache node_modules'
116-
uses: actions/cache@v3
116+
uses: actions/cache@v4
117117
with:
118118
path: ${{ matrix.os == 'ubuntu-latest' && '~/.npm' || steps.npm-cache.outputs.dir }}
119119
key: "${{ matrix.os }}-node-v${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}"
@@ -152,7 +152,7 @@ jobs:
152152
with:
153153
persist-credentials: false
154154
- name: 'Cache node_modules'
155-
uses: actions/cache@v3
155+
uses: actions/cache@v4
156156
with:
157157
path: '~/.npm'
158158
# this key is different than above, since we are running scripts
@@ -189,7 +189,7 @@ jobs:
189189
with:
190190
persist-credentials: false
191191
- name: 'Cache node_modules'
192-
uses: actions/cache@v3
192+
uses: actions/cache@v4
193193
with:
194194
path: '~/.npm'
195195
# this key is different than above, since we are running scripts

AUTHORS

+14
Original file line numberDiff line numberDiff line change
@@ -547,5 +547,19 @@ Aras Abbasi <[email protected]>
547547
548548
549549
Pelle Wessman <[email protected]>
550+
Orgad Shaneh <[email protected]>
551+
Lucas Lopes <[email protected]>
552+
Bryan Mishkin <[email protected]>
553+
Ville Lahdenvuo <[email protected]>
554+
Nathan Phillip Brink <[email protected]>
555+
Ståle Tomten <[email protected]>
556+
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
557+
Sleepy Flower <[email protected]>
558+
StevenMia <[email protected]>
559+
Simon Hanna <[email protected]>
560+
Ilia Choly <[email protected]>
561+
Marjorie Saito <[email protected]>
562+
Khoa Huynh <[email protected]>
563+
Sam Adams <[email protected]>
550564

551565
# Generated by scripts/update-authors.js

0 commit comments

Comments
 (0)