Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4159 commits
Select commit Hold shift + click to select a range
fa0c688
stream: implement WHATWG streams
jasnell Jun 16, 2021
0e7238a
doc: correct JavaScript primitive value names in n-api.md
legendecas Jun 23, 2021
ddc60c7
doc: fix broken link in errors.md
Trott Jun 30, 2021
b11d3f1
doc: use "repository" in maintaining-V8 doc
Trott Jun 28, 2021
593212c
doc: remove obsolete cc recommendations
Trott Jun 28, 2021
88425c7
doc: remove instructions for unsupported Node.js versions
Trott Jun 28, 2021
7ebf36c
doc: add cc oss-security@lists.openwall.com
danbev Jun 29, 2021
9b7eb82
2021-07-01, Version 12.22.2 'Erbium' (LTS)
richardlau Jun 23, 2021
0969b9f
2021-07-01, Version 14.17.2 'Fermium' (LTS)
richardlau Jun 28, 2021
5ba2442
2021-07-01, Version 16.4.1 (Current)
BethGriggs Jun 25, 2021
cac4f90
deps: uv: cherry-pick 99c29c9c2c9b
bnoordhuis May 21, 2021
e817ba7
win,msi: set install directory permission
kumarak Jun 11, 2021
e5f9ef6
doc: fix CHANGELOG.md formatting
richardlau Jul 1, 2021
97bd33c
tools: update remark-preset-lint-node to 2.4.1
Trott Jun 30, 2021
3203396
stream: use finished for pump
ronag Jun 18, 2021
1544e69
inspector: move inspector async hooks to environment
joyeecheung Jun 21, 2021
954217a
stream: error Duplex write/read if not writable/readable
ronag Jul 15, 2020
8189dcc
repl: ensure correct syntax err for await parsing
guybedford Jun 25, 2021
ebcef68
tools: update @babel/eslint-parser to 7.14.7
Trott Jun 26, 2021
9ad96e2
doc: move vm.measureMemory() to expected location in doc
Trott Jul 1, 2021
9b99037
doc: move v8.stopCoverage() to expected location in doc
Trott Jul 1, 2021
5e8aeac
doc: use "pull request" instead of "PR" in packages.md
Trott Jul 1, 2021
a1f07e5
doc: update AUTHORS
Trott Jul 1, 2021
975bbbc
doc: use more consistent formatting for deprecations
Trott Jul 1, 2021
8f3d0d6
tools: remove unused `lint-pr-commit-message.sh`
richardlau Jun 22, 2021
e8b0862
doc: remove unnecessary module format comments
Trott Jul 1, 2021
dcea251
doc: normalize CSS variable names and indentation
Trott Jun 30, 2021
92fde1e
doc: rename datatypes to data types
FrankEntriken Jun 30, 2021
7868062
meta: add @nodejs/actions as CODEOWNERS
mmarchini Jun 22, 2021
32b6f4b
test: remove common.enoughTestCpu
Trott Jun 26, 2021
2d542f5
tools: update path-parse to 1.0.7
Trott Jul 2, 2021
c2e6822
test: move test-debugger-address to parallel
Trott Jul 2, 2021
6232126
test: remove checks for armv6
Trott Jun 26, 2021
8703d22
tools: remove armv6 from test tools
Trott Jun 26, 2021
68548fd
doc: fix color contrast for anchor marks in dark mode
Trott Jun 27, 2021
0738a2b
stream: finished should error on errored stream
ronag Jul 2, 2021
392213a
node-api: cctest on v8impl::Reference
legendecas Jun 8, 2021
64e4837
readline: allow completer to rewrite existing input
addaleax Jun 28, 2021
e9cf120
win,msi: use localized "Authenticated Users" name
richardlau Jul 2, 2021
3590b5d
deps: upgrade npm to 7.19.1
npm-robot Jul 1, 2021
b2ae12d
stream: throw on premature close in Readable[AsyncIterator]
RaisinTen Jun 21, 2021
3cce8f5
meta: use form schema for bug report template
targos Jun 29, 2021
cf1abe4
2021-07-05, Version 12.22.3 'Erbium' (LTS)
richardlau Jul 5, 2021
ef39695
2021-07-05, Version v14.17.3 'Fermium' (LTS)
richardlau Jul 5, 2021
c3952cf
doc: update AUTHORS file
Trott Jul 3, 2021
70cf0dc
2021-07-05, Version 16.4.2 (Current)
BethGriggs Jul 5, 2021
6dfdb0a
tools: update ESLint to 7.30.0
cjihrig Jul 3, 2021
b31c6c9
doc: move Sam Ruby to emeritus
Trott Jul 5, 2021
2fd687a
doc: remove onboarding-extras
Trott Jul 3, 2021
ce666d7
doc: update Node-api version matrix
mhdawson Jun 29, 2021
953860b
build: shorten path used in tarball build workflow
richardlau Jun 29, 2021
d45e0eb
tools: take ownership of deps/v8/tools/node
targos Jul 1, 2021
12622c5
test: remove workaround code in debugger test
Trott Jul 2, 2021
4de6f20
doc: use "repository" in guides versus repo
mhdawson Jun 29, 2021
9b68d84
doc: fix constants usage in fs.access example
cbourgois Jul 6, 2021
a8a8638
tty: enable buffering
ronag Jul 3, 2021
9257372
doc: fix boldface punctuation for full sentences
Trott Jul 5, 2021
6a4b4ce
doc: add annotation to writeFile `data` as `Object`
JakobJingleheimer Jun 27, 2021
672a8a3
src: add JSDoc typings for v8
VoltrexKeyva Jun 5, 2021
6e1906c
doc: remove emailing the TSC from offboarding doc
Trott Jul 5, 2021
f65d748
build: uvwasi honours node_shared_libuv
kapouer Jul 4, 2021
1782170
errors: remove eager stack generation for node errors
devsnek Jun 28, 2021
21cda8e
doc: remove GitHub mark
Trott Jul 3, 2021
b2fa795
test: add test for debugger restart message issue
Trott Jul 5, 2021
ce00381
stream: use finished for async iteration
ronag Jul 5, 2021
a5ba28d
stream: fix performance regression
mscdex Jul 4, 2021
8e5e873
doc: update collaborator email address
Trott Jul 5, 2021
5f3359d
tools: add find-inactive-collaborators.js
Trott Jul 5, 2021
bbdc15b
doc: use "repository" instead of "repo" in onboarding.md
Trott Jul 6, 2021
2631394
doc: simplify CRAN mirror text in benchmark guide
Trott Jul 6, 2021
c6d9d8a
doc: move ofrobots to collaborator emeritus
Trott Jul 8, 2021
394fdec
repl: correctly hoist top level await declarations
ejose19 Jul 5, 2021
8879993
repl: processTopLevelAwait fallback error handling
ejose19 Jul 6, 2021
80e7872
tools: update gyp-next to v0.9.3
gengjiawen Jul 7, 2021
b713682
doc: move AndreasMadsen to emeritus
Trott Jul 8, 2021
e4462bd
tools: pass bot token to node-pr-labeler
targos Jul 5, 2021
ff975fe
test: remove debugger workaround for AIX
Trott Jul 7, 2021
debdc1d
test: use common.PORT instead of hardcoded port number
Trott Jul 7, 2021
6463adf
test: move debugger test case to parallel
Trott Jul 7, 2021
e2148d7
deps: patch V8 to 9.1.269.38
targos Jun 29, 2021
3ac223e
http: clean up HttpParser correctly
sokra Jul 7, 2021
8970fa9
test: remove eslint-disable comment from fixture file
Trott Jul 9, 2021
c4096a3
typings: add JSDoc typings for timers
VoltrexKeyva May 28, 2021
0b27fd0
build: allow to build riscv64 using Makefile
makotokato Jun 15, 2021
72f198b
doc: replace outdated `util.promisify` timer examples with references
foxxyz Jun 26, 2021
5e32644
build: remove unused comment in Makefile
LitoMore Jun 27, 2021
b5375f2
tools,doc: fix error message for unrecognized type
aduh95 Jul 1, 2021
c476bb8
build: restore libplatform headers in distribution
jeroen Jul 6, 2021
60646ca
doc: put information about the past in details tags
Trott Jul 9, 2021
1d63897
build: add riscv into host_arch_cc
luyahan Jun 11, 2021
c4f8363
typings: add a few JSDoc typings for the net lib module
festiveelephantseal Jun 6, 2021
bb275ef
stream: unify stream utils
ronag Jul 7, 2021
5960f16
tls: move legacy code into own file
ronag Jul 9, 2021
7a7ba82
stream: don't emit prefinish after error or close
ronag Jul 9, 2021
f2f6872
stream: cleanup async handling
ronag Jul 9, 2021
70acf03
meta: fix tls code owners
ronag Jul 11, 2021
b60570a
build: update gcovr for gcc 8 compatibility
richardlau Jul 9, 2021
dbe564f
tools: add GitHub Action to run find-inactive-collaborators.mjs
Trott Jul 10, 2021
24a566c
deps: V8: cherry-pick cb4faa902e9f
targos Jul 10, 2021
ad53b58
deps: V8: cherry-pick 53784bdb8f01
targos Jul 10, 2021
12b55ed
deps: V8: cherry-pick 2b77ca200c56
targos Jul 10, 2021
12aa11c
deps: V8: cherry-pick 56fe020eec0c
targos Jul 10, 2021
4c06c40
deps: V8: cherry-pick 3805a698f7b6
targos Jul 10, 2021
8bb09f4
deps: V8: cherry-pick 359d44df4cdd
targos Jul 10, 2021
de85b1e
deps: V8: backport 5c76da8ddcf8
targos Jul 10, 2021
a5dec3a
stream: validate abort signal
ronag Jul 10, 2021
09d8c0c
stream: destroy readable on read error
ronag Jul 10, 2021
a518e4b
debugger: indicate server is ending
Trott Jul 10, 2021
3fd04e7
doc: update AUTHORS
Trott Jul 5, 2021
5cccdcc
doc: use consistent abbreviation formatting
Trott Jul 10, 2021
91ec27f
doc: do not use tilde for "about" or "approximately"
Trott Jul 10, 2021
f0838a0
doc: do not use & for "and" in text
Trott Jul 10, 2021
223625a
doc: add text about moving long commit lists out of PR description
danielleadams Jun 28, 2021
528639c
lib: rename TransferedReadableStream etc
tniessen Jul 11, 2021
3bae790
doc: fix typos in Web Streams API documentation
tniessen Jul 11, 2021
09b57f7
test: mark test-domain-error-types flaky
jasnell Jul 12, 2021
a99c230
stream: implement streams to webstreams adapters
jasnell Jun 24, 2021
2cc13ad
stream: fixup property definition to avoid prototype polution
jasnell Jul 12, 2021
4011355
doc: edit guide on pull requests
Trott Jul 11, 2021
c506660
test: put common lint exceptions into config file
Trott Jul 11, 2021
cfb7c4f
build: add `library_files` to gyp variables
himself65 Jul 7, 2021
4a9fcb3
2021-07-14, Version 16.5.0 (Current)
targos Jul 13, 2021
8306051
stream: add readableDidRead
ronag Jan 6, 2021
efd40ea
stream: forward errored to callback
ronag Jul 12, 2021
4292264
tools: use Node.js 16.x for GitHub workflow
Trott Jul 12, 2021
1bb660e
tools: change commit fetch limiting in find-inactive-collaborators
Trott Jul 12, 2021
7de8ec5
doc: move jdalton to emeritus
Trott Jul 14, 2021
c6a2077
src: remove unused guards around node-api reference
legendecas Apr 21, 2021
25e2f17
stream: implement TextEncoderStream and TextDecoderStream
jasnell Jul 11, 2021
09ad64d
stream: add CompressionStream and DecompressionStream
jasnell Jul 11, 2021
bfc07ef
build: update to setup-node@v2
Trott Jul 12, 2021
4b0776a
doc: update AUTHORS
Trott Jul 12, 2021
82b1b55
process: add api to enable source-maps programmatically
legendecas Jun 19, 2021
499f693
doc: update mailmap and deduplicate AUTHORS entry
Trott Jul 14, 2021
e2a6399
esm: refine ERR_REQUIRE_ESM errors
guybedford Jun 27, 2021
6cd12be
fs: add FileHandle.prototype.readableWebStream()
jasnell Jul 9, 2021
6ad3872
stream: import internal/util/types instead
jasnell Jul 13, 2021
e239f5e
fs: fix FileHandle::ClosePromise to return persisted Promise
jasnell Jul 13, 2021
c12db60
debugger: rename internal module
Trott Jul 13, 2021
0d42470
doc: standardize on not capitalizing _collaborator_
Trott Jul 13, 2021
eb33cb4
doc: add instructions for core vuln files
danbev Jul 1, 2021
cb3c02f
doc: add docker-node and build-wg issue contents
danbev Jul 1, 2021
1efa8fe
doc: make minor edits to pull request text
Trott Jul 14, 2021
44e3822
src: set SSL_OP_ALLOW_CLIENT_RENEGOTIATION
danbev May 20, 2021
575266a
deps: extract gtest source files to deps/googletest
legendecas Jul 14, 2021
7dbc0f7
doc: standardize on _pull request_
Trott Jul 14, 2021
14b26e0
repl: enable --experimental-repl-await /w opt-out
hemanth Jul 8, 2021
f1e936f
doc: add strategic initiatives from TSC repo
Trott Jul 15, 2021
fdf625b
deps: update to cjs-module-lexer@1.2.2
guybedford Jul 15, 2021
00cac65
url: prevent pathname setter from erasing path of path-only URLs
RaisinTen Jul 10, 2021
07e83f7
test: add NumberFormat resolvedOptions test
richardlau Jul 15, 2021
def3260
doc: use _pull request_ instead of _PR_ in onboarding doc
Trott Jul 16, 2021
a28e6bf
doc: update commit-queue.md to indicate GitHub Actions are checked
Trott Jul 16, 2021
ffa79b3
tools: fix broken link hash
Trott Jul 18, 2021
f52da94
debugger: validate sec-websocket-accept response header
copperwall Oct 20, 2020
36bcc29
test: add test for WebSocket secret verification in debugger
Trott Jul 11, 2021
e579acb
stream: add stream.compose
ronag Jun 18, 2021
284dec7
doc: use a details tag for completed initiatves
Trott Jul 17, 2021
c7d66d4
build: run workflows when a PR is ready for review
targos Jul 16, 2021
ea93efd
doc: update mailmap and AUTHORS
Trott Jul 14, 2021
1405a9e
doc: remove typo (extra ' character)
angrymouse Jul 17, 2021
057e31d
doc: revise strategic initiatives text
Trott Jul 17, 2021
c154c6c
doc: remove outdated step in onboarding exercise
Trott Jul 16, 2021
42e85c7
doc: fix broken internal link in http.md
Trott Jul 18, 2021
d0b440c
meta: add .mailmap entry for new email for existing contributor
Trott Jul 18, 2021
fcddd67
doc: simplify .mailmap file
Trott Jul 17, 2021
8f70a09
inspector: mark as stable
gireeshpunathil Mar 14, 2021
74e319f
tools: added remark-frontmatter
benhalverson Mar 9, 2021
7959b6d
build: update coverage Makefile target comments
richardlau Jul 12, 2021
a73fcda
doc: remove _Addenda_ from headers
Trott Jul 18, 2021
3cbaabc
doc: update checkbox label in backporting guide
RaisinTen Jul 17, 2021
c0f1000
http2: on receiving rst_stream with cancel code add it to pending list
kumarak Jul 17, 2021
6cdd310
deps: update V8 to 9.2.230.21
targos Jul 14, 2021
9fc4c97
build: reset embedder string to "-node.0"
targos Jul 14, 2021
d9dad36
src: update NODE_MODULE_VERSION to 95
targos Jun 10, 2021
92c18c9
deps: V8: un-cherry-pick bd019bd
refack Mar 27, 2019
e4a9da9
deps: V8: patch register-arm64.h
refack May 22, 2019
536896d
deps: V8: forward declaration of `Rtl*FunctionTable`
refack May 22, 2019
7f51e2c
deps: make v8.h compatible with VS2015
joaocgreis Nov 1, 2019
323f285
deps: fix V8 build issue with inline methods
gengjiawen Oct 14, 2020
2bb1e6c
deps: silence irrelevant V8 warnings
targos Jan 30, 2021
5190bea
deps: silence irrelevant V8 warning
targos May 1, 2021
b41c0c9
tools: update V8 gypfiles for 9.2
targos Apr 11, 2021
7d4c750
src: use non-deprecated Symbol::Description
targos Apr 14, 2021
6ceefa7
src: stop using deprecated v8::ApiObject
targos Apr 26, 2021
db0ca87
test: update trace events test expectations
targos Apr 21, 2021
dbc0312
test: remove test-debug-args
targos Apr 26, 2021
11d691e
test: ensure microtask queues are not automatically drained
jeisinger Apr 29, 2021
630f968
deps: bump minimum ICU version to 69
targos May 15, 2021
03096f4
deps: V8: cherry-pick 3d24b3ab8af0
targos Jun 10, 2021
2090932
deps: V8: backport 71e8f8bb3c26
targos Jun 16, 2021
c516f2c
deps: V8: cherry-pick 986299250e6d
richardlau Jun 16, 2021
0479bcf
deps: V8: cherry-pick a5cea1bfc38c
targos Jun 20, 2021
bc6a101
deps: V8: cherry-pick 7ff6609a5385
targos Jun 20, 2021
b08ef63
deps: V8: cherry-pick 53784bdb8f01
targos Jul 10, 2021
73840c0
deps: V8: cherry-pick 2b77ca200c56
targos Jul 10, 2021
40d3e56
deps: V8: cherry-pick 56fe020eec0c
targos Jul 10, 2021
611ef29
deps: V8: cherry-pick 3805a698f7b6
targos Jul 10, 2021
3b38c86
deps: V8: cherry-pick 359d44df4cdd
targos Jul 10, 2021
5bf29fa
deps: V8: backport 5c76da8ddcf8
targos Jul 10, 2021
e83c8ae
tools: fetch googletest dependency for V8 CI
targos Jul 14, 2021
ad5dc4c
tools: make internal link checker more robust
Trott Jul 18, 2021
65234bb
deps: upgrade npm to 7.20.0
npm-robot Jul 15, 2021
978343f
tools: email matchin is case insensitive for .mailmap
Trott Jul 18, 2021
6c32434
doc: simplify unnecessarily specific .mailmap entries
Trott Jul 18, 2021
28a579b
tools: use mailmap for find-inactive-collaborators
Trott Jul 19, 2021
5100c3c
doc,meta: update email addresses for misterdjules
Trott Jul 19, 2021
48ff0a1
stream: compose with async functions
ronag Jul 19, 2021
9bc16e6
Revert "test: skip tests for openssl-3.0.0-alpha15"
danbev Jul 19, 2021
d58f0e0
test: update OpenSSL3 error messages for beta-1
danbev Jul 19, 2021
71b2df2
doc: improve node.js+fips instructions
mayrbenjamin92 Jul 14, 2021
f1d3533
fs: check closing_ in FileHandle::Close
jasnell Jul 20, 2021
2765f2a
deps: bump HdrHistogram_C to 0.11.2
mcollina Jul 20, 2021
b6d4e27
src: close HandleWraps instead of deleting them in OnGCCollect()
addaleax Jul 19, 2021
f6b2893
meta: update AUTHORS
Trott Jul 20, 2021
44ee6c2
stream: call done() in consistent fashion
Trott Jul 20, 2021
84dfa1f
async_hooks: eliminate native PromiseHook
Jun 24, 2021
37d5739
async_hooks: emit promise trace events from JS
Jul 5, 2021
f88da65
domain: do not add domain to promise from other context
Jul 5, 2021
3fb484f
lib: comment explaining special-case handling of promises
Jul 21, 2021
834ae63
src: print native module id on native module not found
legendecas Jul 20, 2021
ab73d95
doc,tools: remove `checkLinks.mjs`
aduh95 Jun 30, 2021
56a7e0a
crypto: support Big(U)Int64Array in getRandomValues
targos Jul 19, 2021
7228640
tools: flag README/mailmap mismatches in find-inactive-collaborators
Trott Jul 19, 2021
3810199
meta: align collaborator email in .mailmap/AUTHORS with README
Trott Jul 21, 2021
61b7daf
meta: alphabetize .mailmap file
Trott Jul 21, 2021
6140b37
meta: revise .mailmap for README consistency
Trott Jul 19, 2021
32723ae
meta: align email address in README/.mailmap/AUTHORS
Trott Jul 24, 2021
e68357b
meta: align collaborator name in .mailmap/AUTHORS with README
Trott Jul 22, 2021
e4a77b1
doc: update strategic initiative champion
Trott Jul 22, 2021
b6316ab
doc: update AUTHORS
Trott Jul 22, 2021
ee7ee6e
doc: move lball@redhat.com to emeritus
lance Jul 23, 2021
5b36b8b
events: allow the options argument to be null
lpinca Jul 22, 2021
5c4e673
events: allow an event to be dispatched multiple times
lpinca Jul 15, 2021
062f8e3
perf_hooks: web performance timeline compliance
legendecas Jun 24, 2021
79f4d5a
stream: fix toWeb typo
ronag Jul 23, 2021
ab03ab4
stream: mark compose as experimental
ronag Jul 23, 2021
d872aaf
test: fix WASI link test
richardlau Jul 22, 2021
05f21be
build: fix `host_arch_cc()` for AIX/IBM i
richardlau Jul 22, 2021
c07d644
meta: update email address for collaborator
Trott Jul 25, 2021
c08a93f
meta: remove unneeded .mailmap entry
Trott Jul 25, 2021
4d47bba
meta: update collaborator email in README
Trott Jul 24, 2021
fc6de09
build: use Node.js 14 in commit-lint.yml
Trott Jul 24, 2021
1229d49
doc,lib,test: rename HKDF 'key' argument
tniessen Jul 20, 2021
257312a
crypto: fix `generateKeyPair` with encoding 'jwk'
himself65 Jul 9, 2021
da0ede1
module: refine `enrichCJSError`
aduh95 Jul 24, 2021
c1354ff
zlib: avoid converting `Uint8Array` instances to `Buffer`
aduh95 Jul 22, 2021
5ad6a99
doc: fix crypto.hkdf callback derivedKey type
panva Jul 19, 2021
497e5f8
doc: add PerformanceObserver `buffered` document
legendecas Jul 25, 2021
5dc6ee5
deps: upgrade npm to 6.14.14
npm-robot Jul 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
doc: standardize on not capitalizing _collaborator_
Sometimes we capitalize _collaborator_ and sometimes not. After
consulting the Microsoft Style Guide and The Chicago Manual of Style,
I've concluded it is best to not capitalize it. For consistency, apply
that to our various .md files.

Refs: https://docs.microsoft.com/en-us/style-guide/capitalization

PR-URL: #39379
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Trott committed Jul 16, 2021
commit 0d424707989985bcbe3cdd92aa2cb9a1ff388d50
50 changes: 25 additions & 25 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@ See:

## Collaborators

Node.js Core Collaborators maintain the [nodejs/node][] GitHub repository.
The GitHub team for Node.js Core Collaborators is @nodejs/collaborators.
Node.js core collaborators maintain the [nodejs/node][] GitHub repository.
The GitHub team for Node.js core collaborators is @nodejs/collaborators.
Collaborators have:

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

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

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

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

See:

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

### Collaborator activities

Expand All @@ -63,20 +63,20 @@ See:
* Participation in working groups
* Merging pull requests

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

## Technical Steering Committee

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

* Technical direction
* Project governance and process (including this policy)
* Contribution policy
* GitHub repository hosting
* Conduct guidelines
* Maintaining the list of Collaborators
* Maintaining the list of collaborators

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

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

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

## Collaborator nominations

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

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

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

Mention @nodejs/collaborators in the issue to notify other Collaborators about
Mention @nodejs/collaborators in the issue to notify other collaborators about
the nomination.

The nomination passes if no Collaborators oppose it after one week. Otherwise,
The nomination passes if no collaborators oppose it after one week. Otherwise,
the nomination fails.

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

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

### Onboarding

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

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

[Collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
[Consensus Seeking]: https://en.wikipedia.org/wiki/Consensus-seeking_decision-making
[TSC Charter]: https://github.com/nodejs/TSC/blob/HEAD/TSC-Charter.md
[collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
[nodejs/node]: https://github.com/nodejs/node
40 changes: 20 additions & 20 deletions doc/guides/collaborator-guide.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Node.js Collaborator Guide
# Node.js collaborator guide

## Contents

Expand Down Expand Up @@ -36,14 +36,14 @@
* [How can I help?](#how-can-i-help)
* [Who to CC in the issue tracker](#who-to-cc-in-the-issue-tracker)

This document explains how Collaborators manage the Node.js project.
This document explains how collaborators manage the Node.js project.
Collaborators should understand the
[guidelines for new contributors](../../CONTRIBUTING.md) and the
[project governance model](../../GOVERNANCE.md).

## Issues and pull requests

Mind these guidelines, the opinions of other Collaborators, and guidance of the
Mind these guidelines, the opinions of other collaborators, and guidance of the
[TSC][]. Notify other qualified parties for more input on an issue or a pull
request. See [Who to CC in the issue tracker](#who-to-cc-in-the-issue-tracker).

Expand Down Expand Up @@ -71,7 +71,7 @@ issues and pull requests can always be re-opened if necessary.
A pull request is _author ready_ when:

* There is a CI run in progress or completed.
* There is at least one Collaborator approval.
* There is at least one collaborator approval.
* There are no outstanding review comments.

Please always add the `author ready` label to the pull request in that case.
Expand All @@ -83,7 +83,7 @@ When you open a pull request, [start a CI](#testing-and-ci) right away. Later,
after new code changes or rebasing, start a new CI.

As soon as the pull request is ready to land, please do so. This allows other
Collaborators to focus on other pull requests. If your pull request is not ready
collaborators to focus on other pull requests. If your pull request is not ready
to land but is [author ready](#author-ready-pull-requests), add the
`author ready` label. If you wish to land the pull request yourself, use the
"assign yourself" link to self-assign it.
Expand Down Expand Up @@ -113,25 +113,25 @@ issues. If a user opens a security issue in the public repository:
## Accepting modifications

Contributors propose modifications to Node.js using GitHub pull requests. This
includes modifications proposed by TSC members and other Collaborators. A pull
includes modifications proposed by TSC members and other collaborators. A pull
request must pass code review and CI before landing into the codebase.

### Code reviews

At least two Collaborators must approve a pull request before the pull request
lands. One Collaborator approval is enough if the pull request has been open
At least two collaborators must approve a pull request before the pull request
lands. One collaborator approval is enough if the pull request has been open
for more than seven days.

Approving a pull request indicates that the Collaborator accepts responsibility
Approving a pull request indicates that the collaborator accepts responsibility
for the change.

Approval must be from Collaborators who are not authors of the change.
Approval must be from collaborators who are not authors of the change.

In some cases, it might be necessary to summon a GitHub team to a pull request
for review by @-mention.
See [Who to CC in the issue tracker](#who-to-cc-in-the-issue-tracker).

If you are the first Collaborator to approve a pull request that has no CI yet,
If you are the first collaborator to approve a pull request that has no CI yet,
please [start one](#testing-and-ci). Please also start a new CI if the
pull request creator pushed new code since the last CI run.

Expand Down Expand Up @@ -173,7 +173,7 @@ adding the `tsc-agenda` label to the issue.

### Waiting for approvals

Before landing pull requests, allow 48 hours for input from other Collaborators.
Before landing pull requests, allow 48 hours for input from other collaborators.
Certain types of pull requests can be fast-tracked and can land after a shorter
delay. For example:

Expand All @@ -185,14 +185,14 @@ delay. For example:
* Regressions that happen right before a release, or reported soon after.

To propose fast-tracking a pull request, apply the `fast-track` label. Then add
a comment that Collaborators can upvote.
a comment that collaborators can upvote.

If someone disagrees with the fast-tracking request, remove the label. Do not
fast-track the pull request in that case.

The pull request can be fast-tracked if two Collaborators approve the
The pull request can be fast-tracked if two collaborators approve the
fast-tracking request. To land, the pull request itself still needs two
Collaborator approvals and a passing CI.
collaborator approvals and a passing CI.

Collaborators can request fast-tracking of pull requests they did not author.
In that case only, the request itself is also one fast-track approval. Upvote
Expand Down Expand Up @@ -372,7 +372,7 @@ providing a Public API in such cases.
#### Unintended breaking changes

Sometimes, a change intended to be non-breaking turns out to be a breaking
change. If such a change lands on the master branch, a Collaborator can revert
change. If such a change lands on the master branch, a collaborator can revert
it. As an alternative to reverting, the TSC can apply the semver-major label
after-the-fact.

Expand Down Expand Up @@ -474,7 +474,7 @@ Do this if a pull request or issue:
* Is labeled `semver-major`, or
* Has a significant impact on the codebase, or
* Is controversial, or
* Is at an impasse among Collaborators who are participating in the discussion.
* Is at an impasse among collaborators who are participating in the discussion.

@-mention the `@nodejs/tsc` GitHub team if you want to elevate an issue to the
[TSC][]. Do not use the GitHub UI on the right-hand side to assign to
Expand Down Expand Up @@ -659,7 +659,7 @@ for that commit. This is an opportunity to fix commit messages.
issue. A commit message can include more than one `Fixes:` lines.
* Optional: One or more `Refs:` lines referencing a URL for any relevant
background.
* Required: A `Reviewed-By: Name <email>` line for each Collaborator who
* Required: A `Reviewed-By: Name <email>` line for each collaborator who
reviewed the change.
* Useful for @mentions / contact list if something goes wrong in the
pull request.
Expand Down Expand Up @@ -775,7 +775,7 @@ There are several LTS-related labels:
release. For example, `land-on-v10.x` would be for a change to land in Node.js
10.x.

Any Collaborator can attach these labels to any pull request/issue. As commits
Any collaborator can attach these labels to any pull request/issue. As commits
land on the staging branches, the backporter removes the `lts-watch-` label.
Likewise, as commits land in an LTS release, the releaser removes the `land-on-`
label.
Expand Down Expand Up @@ -847,7 +847,7 @@ If you cannot find who to cc for a file, `git shortlog -n -s <file>` can help.

* `author-ready` - A pull request is _author ready_ when:
* There is a CI run in progress or completed.
* There is at least one Collaborator approval (or two TSC approvals for
* There is at least one collaborator approval (or two TSC approvals for
semver-major pull requests).
* There are no outstanding review comments.

Expand Down
6 changes: 3 additions & 3 deletions doc/guides/commit-queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*tl;dr: You can land Pull Requests by adding the `commit-queue` label to it.*

Commit Queue is an experimental feature for the project which simplifies the
landing process by automating it via GitHub Actions. With it, Collaborators can
landing process by automating it via GitHub Actions. With it, collaborators can
land Pull Requests by adding the `commit-queue` label to a PR. All
checks will run via node-core-utils, and if the Pull Request is ready to land,
the Action will rebase it and push to master.
Expand Down Expand Up @@ -48,7 +48,7 @@ of the commit queue:
commit that will be correctly handled by the [`--autosquash`](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash)
option
2. A CI must've ran and succeeded since the last change on the PR
3. A Collaborator must have approved the PR since the last change
3. A collaborator must have approved the PR since the last change
4. Only Jenkins CI is checked (Actions, V8 CI and CITGM are ignored)

## Implementation
Expand Down Expand Up @@ -108,7 +108,7 @@ until all PRs have done the steps above.

## Reverting broken commits

Reverting broken commits is done manually by Collaborators, just like when
Reverting broken commits is done manually by collaborators, just like when
commits are landed manually via `git node land`. An easy way to revert is a
good feature for the project, but is not explicitly required for the Commit
Queue to work because the Action lands PRs just like collaborators do today. If
Expand Down
20 changes: 10 additions & 10 deletions doc/guides/contributing/pull-requests.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Node.js. We cannot accept such patches.

In case of doubt, open an issue in the
[issue tracker](https://github.com/nodejs/node/issues/) or contact one of the
[project Collaborators](https://github.com/nodejs/node/#current-project-team-members).
[project collaborators](https://github.com/nodejs/node/#current-project-team-members).

Node.js has many channels on the
[OpenJS Foundation Slack](https://slack-invite.openjsf.org/). Interesting
Expand Down Expand Up @@ -335,7 +335,7 @@ unhelpful is likely safe to ignore.
### Step 10: Landing

In order to land, a Pull Request needs to be reviewed and [approved][] by
at least two Node.js Collaborators (one Collaborator approval is enough if the
at least two Node.js collaborators (one collaborator approval is enough if the
pull request has been open for more than 7 days) and pass a
[CI (Continuous Integration) test run][]. After that, as long as there are no
objections from other contributors, the Pull Request can be merged. If you find
Expand Down Expand Up @@ -391,7 +391,7 @@ change over time. The first impression you give to a new contributor never does.

Nits (requests for small changes that are not essential) are fine, but try to
avoid stalling the Pull Request. Most nits can typically be fixed by the
Node.js Collaborator landing the Pull Request but they can also be an
Node.js collaborator landing the Pull Request but they can also be an
opportunity for the contributor to learn a bit more about the project.

It is always good to clearly indicate nits when you comment: e.g.
Expand Down Expand Up @@ -434,7 +434,7 @@ commit.

### Approving a change

Any Node.js core Collaborator (any GitHub user with commit rights in the
Any Node.js core collaborator (any GitHub user with commit rights in the
`nodejs/node` repository) is authorized to approve any other contributor's
work. Collaborators are not permitted to approve their own Pull Requests.

Expand Down Expand Up @@ -503,9 +503,9 @@ feedback.
All Pull Requests that contain changes to code must be run through
continuous integration (CI) testing at [https://ci.nodejs.org/][].

Only Node.js core Collaborators with commit rights to the `nodejs/node`
Only Node.js core collaborators with commit rights to the `nodejs/node`
repository may start a CI testing run. The specific details of how to do
this are included in the new Collaborator [Onboarding guide][].
this are included in the new collaborator [Onboarding guide][].

Ideally, the code change will pass ("be green") on all platform configurations
supported by Node.js (there are over 30 platform configurations currently).
Expand Down Expand Up @@ -551,9 +551,9 @@ Every Pull Request needs to be tested
to make sure that it works on the platforms that Node.js
supports. This is done by running the code through the CI system.

Only a Collaborator can start a CI run. Usually one of them will do it
Only a collaborator can start a CI run. Usually one of them will do it
for you as approvals for the Pull Request come in.
If not, you can ask a Collaborator to start a CI run.
If not, you can ask a collaborator to start a CI run.

### Waiting until the pull request gets landed

Expand All @@ -567,7 +567,7 @@ widely used, so don't be discouraged!
### Check out the collaborator guide

If you want to know more about the code review and the landing process, see the
[Collaborator Guide][].
[collaborator guide][].

### Appendix: subsystems

Expand All @@ -583,10 +583,10 @@ More than one subsystem may be valid for any particular issue or pull request.
[Building guide]: ../../../BUILDING.md
[CI (Continuous Integration) test run]: #ci-testing
[Code of Conduct]: https://github.com/nodejs/admin/blob/HEAD/CODE_OF_CONDUCT.md
[Collaborator Guide]: ../collaborator-guide.md
[Onboarding guide]: ../../../onboarding.md
[approved]: #getting-approvals-for-your-pull-request
[benchmark results]: ../writing-and-running-benchmarks.md
[collaborator guide]: ../collaborator-guide.md
[guide for writing tests in Node.js]: ../writing-tests.md
[hiding-a-comment]: https://help.github.com/articles/managing-disruptive-comments/#hiding-a-comment
[https://ci.nodejs.org/]: https://ci.nodejs.org/
Expand Down
Loading