Skip to content

Commit 188e801

Browse files
committed
Merge remote-tracking branch 'node/master' into wpt/user-timing
# Conflicts: # test/fixtures/wpt/README.md
2 parents 7d17e62 + d0b440c commit 188e801

File tree

269 files changed

+32430
-28137
lines changed

Some content is hidden

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

269 files changed

+32430
-28137
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
# tls/crypto
5555

5656
/lib/internal/crypto/* @nodejs/crypto
57-
/lib/internal/tls.js @nodejs/crypto @nodejs/net
57+
/lib/internal/tls/* @nodejs/crypto @nodejs/net
5858
/lib/crypto.js @nodejs/crypto
5959
/lib/tls.js @nodejs/crypto @nodejs/net
6060
/src/node_crypto* @nodejs/crypto

.github/workflows/build-tarball.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Build from tarball
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
push:
67
branches:
78
- master

.github/workflows/build-windows.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: build-windows
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
push:
67
branches:
78
- master

.github/workflows/commit-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# Last 100 commits should be enough for a PR
1212
fetch-depth: 100
1313
- name: Use Node.js 12
14-
uses: actions/setup-node@v1
14+
uses: actions/setup-node@v2
1515
with:
1616
node-version: 12.x
1717
- name: Validate commit messages

.github/workflows/coverage-linux.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: coverage-linux
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
paths-ignore:
67
- 'doc/**'
78
- 'deps/**'

.github/workflows/coverage-windows.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: coverage-windows
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
paths-ignore:
67
- 'doc/**'
78
- 'deps/**'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Find inactive collaborators
2+
3+
on:
4+
schedule:
5+
# Run on the 15th day of the month at 4:05 AM UTC.
6+
- cron: '5 4 15 * *'
7+
8+
workflow_dispatch:
9+
10+
env:
11+
NODE_VERSION: 16.x
12+
NUM_COMMITS: 5000
13+
14+
jobs:
15+
find:
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
with:
22+
fetch-depth: ${{ env.NUM_COMMITS }}
23+
24+
- name: Use Node.js ${{ env.NODE_VERSION }}
25+
uses: actions/setup-node@v2
26+
with:
27+
node-version: ${{ env.NODE_VERSION }}
28+
29+
- name: Find inactive collaborators
30+
run: tools/find-inactive-collaborators.mjs ${{ env.NUM_COMMITS }}

.github/workflows/label-pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ jobs:
1111
steps:
1212
- uses: nodejs/node-pr-labeler@v1
1313
with:
14+
repo-token: ${{ secrets.GH_USER_TOKEN }}
1415
configuration-path: .github/label-pr-config.yml

.github/workflows/linters.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: linters
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
push:
67
branches:
78
- master

.github/workflows/misc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: misc
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
push:
67
branches:
78
- master

.github/workflows/test-asan.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
paths-ignore:
1212
- 'doc/**'
1313
pull_request:
14+
types: [opened, synchronize, reopened, ready_for_review]
1415
paths-ignore:
1516
- 'doc/**'
1617

.github/workflows/test-linux.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: test-linux
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
push:
67
branches:
78
- master

.github/workflows/test-macos.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: test-macOS
22

33
on:
44
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
56
paths-ignore:
67
- 'doc/**'
78
push:

.mailmap

+4-1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ Danielle Adams <adamzdanielle@gmail.com> Danielle Adams <danielle.adams@heroku.c
108108
Danny Nemer <hi@dannynemer.com> <DannyNemer@users.noreply.github.com>
109109
Danny Nemer <hi@dannynemer.com> <hi@DannyNemer.com>
110110
Darshan Sen <raisinten@gmail.com>
111+
Darshan Sen <raisinten@gmail.com> <darshan.sen@postman.com>
111112
Dave Pacheco <dap@joyent.com> <dap@cs.brown.edu>
112113
David Cai <davidcai1993@yahoo.com> DavidCai <davidcai1993@yahoo.com>
113114
David Mark Clements <david.clements@nearform.com>
@@ -162,6 +163,8 @@ Hendrik Schwalm <mail@hendrikschwalm.de> hschwalm <mail@hendrikschwalm.de>
162163
Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
163164
Henry Chin <hheennrryy@gmail.com>
164165
Herbert Vojčík <herby@mailbox.sk>
166+
himself65 <himself65@mask.io> <himself6565@gmail.com>
167+
himself65 <himself65@mask.io> <himself65@outlook.com>
165168
Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
166169
Igor Savin <iselwin@gmail.com> kibertoad <iselwin@gmail.com>
167170
Igor Soarez <igorsoarez@gmail.com>
@@ -391,7 +394,7 @@ Surya Panikkal <surya.com@gmail.com> suryagh <surya.com@gmail.com>
391394
Taehee Kang <hugnosis@gmail.com> hugnosis <hugnosis@gmail.com>
392395
Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in> <thinkbigtanu@gmail.com>
393396
Taylor Woll <taylor.woll@microsoft.com> taylor.woll <tawoll@ntdev.microsoft.com>
394-
Thomas Watson Steen <w@tson.dk> Thomas Watson <w@tson.dk>
397+
Thomas Watson <w@tson.dk>
395398
Timothy O. Peters <timotewpeters@gmail.com>
396399
Timur Shemsedinov <timur.shemsedinov@gmail.com> tshemsedinov <timur.shemsedinov@gmail.com>
397400
Ting Shao <ting.shao@intel.com>

AUTHORS

+11-3
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ Yoshiya Hinosawa <stibium121@gmail.com>
11681168
Syuhei Kobayashi <nanocloudx@gmail.com>
11691169
YutamaKotaro <california.dreamin.never.die@gmail.com>
11701170
MURAKAMI Masahiko <fossamagna2@gmail.com>
1171-
Thomas Watson Steen <w@tson.dk>
1171+
Thomas Watson <w@tson.dk>
11721172
Daijiro Yamada <yamad@daiji.ro>
11731173
Kelvin Jin <kelvinjin@google.com>
11741174
Mitsuo Utano <utano320@gmail.com>
@@ -2682,7 +2682,7 @@ Alexander Sattelmaier <alexander.sattelmaier@gmail.com>
26822682
Avi ד <avi.the.coder@gmail.com>
26832683
Thomas <hakerh403@gmail.com>
26842684
Aymen Naghmouchi <aymen.aymen@live.it>
2685-
himself65 <himself6565@gmail.com>
2685+
himself65 <himself65@mask.io>
26862686
Geir Hauge <geir.hauge@gmail.com>
26872687
Patrick Gansterer <paroga@paroga.com>
26882688
Nicolas Moteau <nicolas.moteau@orange.com>
@@ -2740,7 +2740,6 @@ Alba Mendez <me@alba.sh>
27402740
zero1five <zerodengyin@gmail.com>
27412741
Gaelan <gbs@canishe.com>
27422742
Jacob <jacobq@gmail.com>
2743-
himself65 <himself65@outlook.com>
27442743
Dan Beglin <dbeglinuk@gmail.com>
27452744
Anish Asrani <anishasrani@gmail.com>
27462745
teams2ua <teams2ua@gmail.com>
@@ -3319,5 +3318,14 @@ Houssem Chebab <houssemchebeb@gmail.com>
33193318
Davidson Francis <davidsondfgl@gmail.com>
33203319
Rohan Sharma <rhnsharma5113@gmail.com>
33213320
AkshayK <iit.akshay@gmail.com>
3321+
FrankEntriken <42781627+FrankEntriken@users.noreply.github.com>
3322+
Cyrille Bourgois <cyrille.bourgois@gmail.com>
3323+
Jacob <3012099+JakobJingleheimer@users.noreply.github.com>
3324+
ejose19 <8742215+ejose19@users.noreply.github.com>
3325+
Tobias Koppers <tobias.koppers@googlemail.com>
3326+
Makoto Kato <m_kato@ga2.so-net.ne.jp>
3327+
foxxyz <foxxyz@gmail.com>
3328+
LitoMore <litomore@gmail.com>
3329+
nerdthatnoonelikes <kenrag24@gmail.com>
33223330

33233331
# Generated by tools/update-authors.js

BUILDING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ $ make test-only
305305

306306
At this point, you are ready to make code changes and re-run the tests.
307307

308-
If you are running tests before submitting a Pull Request, the recommended
308+
If you are running tests before submitting a pull request, the recommended
309309
command is:
310310

311311
```console

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ release.
3232
</tr>
3333
<tr>
3434
<td valign="top">
35-
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.4.2">16.4.2</a></b><br/>
35+
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.5.0">16.5.0</a></b><br/>
36+
<a href="doc/changelogs/CHANGELOG_V16.md#16.4.2">16.4.2</a><br/>
3637
<a href="doc/changelogs/CHANGELOG_V16.md#16.4.1">16.4.1</a><br/>
3738
<a href="doc/changelogs/CHANGELOG_V16.md#16.4.0">16.4.0</a><br/>
3839
<a href="doc/changelogs/CHANGELOG_V16.md#16.3.0">16.3.0</a><br/>

GOVERNANCE.md

+25-25
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@ See:
2828

2929
## Collaborators
3030

31-
Node.js Core Collaborators maintain the [nodejs/node][] GitHub repository.
32-
The GitHub team for Node.js Core Collaborators is @nodejs/collaborators.
31+
Node.js core collaborators maintain the [nodejs/node][] GitHub repository.
32+
The GitHub team for Node.js core collaborators is @nodejs/collaborators.
3333
Collaborators have:
3434

3535
* Commit access to the [nodejs/node][] repository
3636
* Access to the Node.js continuous integration (CI) jobs
3737

38-
Both Collaborators and non-Collaborators may propose changes to the Node.js
38+
Both collaborators and non-collaborators may propose changes to the Node.js
3939
source code. The mechanism to propose such a change is a GitHub pull request.
4040
Collaborators review and merge (_land_) pull requests.
4141

42-
Two Collaborators must approve a pull request before the pull request can land.
43-
(One Collaborator approval is enough if the pull request has been open for more
44-
than 7 days.) Approving a pull request indicates that the Collaborator accepts
45-
responsibility for the change. Approval must be from Collaborators who are not
42+
Two collaborators must approve a pull request before the pull request can land.
43+
(One collaborator approval is enough if the pull request has been open for more
44+
than 7 days.) Approving a pull request indicates that the collaborator accepts
45+
responsibility for the change. Approval must be from collaborators who are not
4646
authors of the change.
4747

48-
If a Collaborator opposes a proposed change, then the change cannot land. The
48+
If a collaborator opposes a proposed change, then the change cannot land. The
4949
exception is if the TSC votes to approve the change despite the opposition.
5050
Usually, involving the TSC is unnecessary. Often, discussions or further changes
51-
result in Collaborators removing their opposition.
51+
result in collaborators removing their opposition.
5252

5353
See:
5454

55-
* [List of Collaborators](./README.md#current-project-team-members)
56-
* [A guide for Collaborators](./doc/guides/collaborator-guide.md)
55+
* [List of collaborators](./README.md#current-project-team-members)
56+
* [A guide for collaborators](./doc/guides/collaborator-guide.md)
5757

5858
### Collaborator activities
5959

@@ -63,20 +63,20 @@ See:
6363
* Participation in working groups
6464
* Merging pull requests
6565

66-
The TSC can remove inactive Collaborators or provide them with _Emeritus_
66+
The TSC can remove inactive collaborators or provide them with _Emeritus_
6767
status. Emeriti may request that the TSC restore them to active status.
6868

6969
## Technical Steering Committee
7070

71-
A subset of the Collaborators forms the Technical Steering Committee (TSC).
71+
A subset of the collaborators forms the Technical Steering Committee (TSC).
7272
The TSC has final authority over this project, including:
7373

7474
* Technical direction
7575
* Project governance and process (including this policy)
7676
* Contribution policy
7777
* GitHub repository hosting
7878
* Conduct guidelines
79-
* Maintaining the list of Collaborators
79+
* Maintaining the list of collaborators
8080

8181
The current list of TSC members is in
8282
[the project README](./README.md#current-project-team-members).
@@ -95,7 +95,7 @@ agenda is not to review or approve all patches. Collaborators review and approve
9595
patches on GitHub.
9696

9797
Any community member can create a GitHub issue asking that the TSC review
98-
something. If consensus-seeking fails for an issue, a Collaborator may apply the
98+
something. If consensus-seeking fails for an issue, a collaborator may apply the
9999
`tsc-agenda` label. That will add it to the TSC meeting agenda.
100100

101101
Before each TSC meeting, the meeting chair will share the agenda with members of
@@ -120,11 +120,11 @@ the issue tracker is:
120120

121121
## Collaborator nominations
122122

123-
Existing Collaborators can nominate someone to become a Collaborator. Nominees
123+
Existing collaborators can nominate someone to become a collaborator. Nominees
124124
should have significant and valuable contributions across the Node.js
125125
organization.
126126

127-
To nominate a new Collaborator, open an issue in the [nodejs/node][] repository.
127+
To nominate a new collaborator, open an issue in the [nodejs/node][] repository.
128128
Provide a summary of the nominee's contributions. For example:
129129

130130
* Commits in the [nodejs/node][] repository.
@@ -144,25 +144,25 @@ Provide a summary of the nominee's contributions. For example:
144144
organization
145145
* Other participation in the wider Node.js community
146146

147-
Mention @nodejs/collaborators in the issue to notify other Collaborators about
147+
Mention @nodejs/collaborators in the issue to notify other collaborators about
148148
the nomination.
149149

150-
The nomination passes if no Collaborators oppose it after one week. Otherwise,
150+
The nomination passes if no collaborators oppose it after one week. Otherwise,
151151
the nomination fails.
152152

153153
There are steps a nominator can take in advance to make a nomination as
154-
frictionless as possible. To request feedback from other Collaborators in
155-
private, use the [Collaborators discussion page][]
156-
(which only Collaborators may view). A nominator may also work with the
154+
frictionless as possible. To request feedback from other collaborators in
155+
private, use the [collaborators discussion page][]
156+
(which only collaborators may view). A nominator may also work with the
157157
nominee to improve their contribution profile.
158158

159159
Collaborators might overlook someone with valuable contributions. In that case,
160-
the contributor may open an issue or contact a Collaborator to request a
160+
the contributor may open an issue or contact a collaborator to request a
161161
nomination.
162162

163163
### Onboarding
164164

165-
After the nomination passes, a TSC member onboards the new Collaborator. See
165+
After the nomination passes, a TSC member onboards the new collaborator. See
166166
[the onboarding guide](./onboarding.md) for details of the onboarding
167167
process.
168168

@@ -171,7 +171,7 @@ process.
171171
The TSC follows a [Consensus Seeking][] decision-making model per the
172172
[TSC Charter][].
173173

174-
[Collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
175174
[Consensus Seeking]: https://en.wikipedia.org/wiki/Consensus-seeking_decision-making
176175
[TSC Charter]: https://github.com/nodejs/TSC/blob/HEAD/TSC-Charter.md
176+
[collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
177177
[nodejs/node]: https://github.com/nodejs/node

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ The externally maintained libraries used by Node.js are:
12511251
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12521252
"""
12531253

1254-
- gtest, located at src/gtest and test/cctest/gtest, is licensed as follows:
1254+
- gtest, located at deps/googletest, is licensed as follows:
12551255
"""
12561256
Copyright 2008, Google Inc.
12571257
All rights reserved.

0 commit comments

Comments
 (0)