Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v9.6.0 proposal #18902

Merged
merged 206 commits into from
Feb 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
25ce458
net,src: refactor writeQueueSize tracking
apapirovski Dec 11, 2017
3725d4c
tls: remove cleartext input data queue
addaleax Dec 27, 2017
11566fe
deps: cherry-pick dbfe4a49d8 from upstream V8
Nov 9, 2017
00d5422
module: Set dynamic import callback
Oct 1, 2017
d89f310
module: enable dynamic import flag for esmodules
MylesBorins Jan 25, 2018
b5752ee
test: fix require-deps-deprecation for installed deps
Tiriel Dec 24, 2017
6b1a40e
doc: capitalize non-primitive types
vsemozhetbyt Jan 12, 2018
3ae5cf2
events: move domain handling from events to domain
vdeturckheim Nov 30, 2017
28edc1d
events: use Reflect.apply
apapirovski Dec 4, 2017
35471bc
domain: fix error emit handling
apapirovski Dec 10, 2017
afc87c2
module: refactor loader
devsnek Nov 26, 2017
1fd1395
lib,doc: revert format name to cjs over commonjs
guybedford Feb 6, 2018
8c6dc62
doc: dedupe links
vsemozhetbyt Jan 17, 2018
9e7f863
deps: ICU 60.2 bump
srl295 Dec 14, 2017
74051c6
inspector: --inspect-brk for es modules
guybedford Jan 16, 2018
19abee1
test: fix a bug & lint issues in inspector-helper
apapirovski Jan 22, 2018
cc80914
test: fix flaky cluster unix socket test
bnoordhuis Jan 20, 2018
b5267a6
test: force context allocation in test module
hashseed Jan 23, 2018
d764039
http: switch on string values
sethbrenith Jan 24, 2018
44bf0f4
domain: further abstract usage in C++
apapirovski Jan 19, 2018
2d968ca
doc: Update tools/icu/README.md
srl295 Nov 10, 2017
ef45bb4
tools: fix icu readme lint error
apapirovski Jan 30, 2018
b841abc
doc: warn about GCM authenticity
tniessen Jan 25, 2018
b76e111
doc: fix manpage warnings
silverwind Jan 29, 2018
8a627b1
doc: add pending-deprecation to COLLABORATOR_GUIDE
ChALkeR Jan 29, 2018
61d4e1d
doc: reorder section on updating PR branch
ofrobots Jan 24, 2018
272fd2e
src: fix vector subscript out of range
apapirovski Jan 30, 2018
07e4ba2
url: simplify loop in parser
tniessen Jan 30, 2018
22093ab
doc: add Gibson Fahnestock to TSC
Trott Jan 31, 2018
a07cd06
n-api: change assert ok check to notStrictEqual.
nbdaaron Jan 27, 2018
0a47b98
perf_hooks: add warning when too many entries in the timeline
jasnell Jan 10, 2018
ae372f0
doc: linkify missing types
vsemozhetbyt Jan 29, 2018
eb25252
test: move tmpdir to submodule of common
Trott Dec 25, 2017
6b74064
test: fix flaky test-http-dns-error
bengl Oct 26, 2017
8b2a272
http: process headers after setting up agent
rvagg Oct 24, 2017
a893b42
crypto: use non-deprecated v8::Object::Set
danbev Dec 6, 2017
4a5d7d4
benchmark: fix platform in basename-win32
BridgeAR Jan 23, 2018
7da01f4
benchmark: fix variables not being set
BridgeAR Jan 23, 2018
9acf754
benchmark: (assert) refactor
BridgeAR Jan 23, 2018
cb13c7c
benchmark: (buffer) refactor
BridgeAR Jan 23, 2018
0851822
benchmark: (crypto) refactor
BridgeAR Jan 23, 2018
76cb958
benchmark: (url) refactor
BridgeAR Jan 23, 2018
076b3d9
benchmark: (es) refactor
BridgeAR Jan 23, 2018
28156e1
benchmark: (http(2)) refactor
BridgeAR Jan 23, 2018
f018670
benchmark: (timers) refactor
BridgeAR Jan 23, 2018
9c12582
benchmark: refactor
BridgeAR Jan 23, 2018
43956e9
src: free memory before re-setting URLHost value
prog1dev Jan 23, 2018
4f4bfbe
tools: auto fix custom eslint rule
shobhitchittora Oct 31, 2017
d469a06
benchmark: cut down http benchmark run time
joyeecheung Jan 25, 2018
74a823c
doc: improve stream documentation
Jan 25, 2018
f6c9a2b
test: speed up parallel/test-tls-session-cache
addaleax Jan 29, 2018
650ec2d
lib: extract validation functions
timotew Jan 28, 2018
8c9b41a
test: show pending exception error in napi tests
reccanti Jan 27, 2018
9ae513a
benchmark: shorten config name in http benchmark
joyeecheung Jan 30, 2018
51a8e1d
lib: remove debugger dead code
liqyan Jan 22, 2018
464df6d
src: allow --perf-(basic-)?prof in NODE_OPTIONS
Leko Dec 11, 2017
442903f
deps: update node-inspect to 1.11.3
Jan 24, 2018
ffbad83
benchmark: spread operator benchmark
jasnell Jan 29, 2018
da0d776
test: mark test-inspector-stop-profile-after-done flaky
MylesBorins Feb 1, 2018
0865d11
async_hooks: clean up comments
ofrobots Jan 30, 2018
58003d4
doc: move Brian White to TSC Emeriti list
Trott Jan 31, 2018
560f657
stream: delete redundant code
Jan 14, 2018
450f5f4
stream: delete redundant code
Jan 15, 2018
cec3d1e
process: fix reading zero-length env vars on win32
addaleax Jan 30, 2018
c8f729f
v8: add missing ',' in OpenBSD's 'sources' section.
qbit Jan 30, 2018
9c6bb5f
build: add cflags for OpenBSD, remove stray comma.
qbit Jan 30, 2018
25a7bde
doc: streamline README intro
Trott Jan 31, 2018
9af1e4b
string_decoder: reset decoder on end
jridgewell Feb 1, 2018
a4cc0fb
stream: delete unused code
Jan 21, 2018
ae8f5db
n-api: implement wrapping using private properties
Jan 23, 2018
958f5ed
net: remove redundant code from _writeGeneric()
lpinca Jan 29, 2018
0d390f7
test: add test for tls benchmarks
apapirovski Feb 1, 2018
935eac1
http: remove domain specific code
apapirovski Jan 29, 2018
146e8ac
timers: remove domain specific code
apapirovski Jan 29, 2018
ffc8e8e
doc: remove removed apis from http2 docs
kjin Jan 29, 2018
52aeb2a
test: verify the shell option works properly on execFile
jvelezpo Jan 25, 2018
c34e2f4
win, build: fix intl-none option
poiru Jan 22, 2018
dae86b3
doc: improve http.request documentation
Zarel Jan 8, 2018
a7ad003
doc: shell option for the execFile and execFileSync functions
jvelezpo Jan 18, 2018
be5c293
build: allow x86_64 as a dest_cpu alias for x64
rvagg Jan 9, 2018
e00bb16
tools: non-Ascii linter for /lib only
SirR4T Jan 8, 2018
64c36d3
src, lib: return promises from link
devsnek Jan 26, 2018
aabbdc8
tools: add .mjs linting for Windows
vsemozhetbyt Feb 4, 2018
a13fbdd
test: remove destructor from node_test_fixture
danbev Feb 2, 2018
27532f4
stream: cleanup() when unpiping all streams.
Jan 20, 2018
d258112
n-api: wrap control flow macro in do/while
bnoordhuis Feb 2, 2018
2418c86
doc: expand on promises and async_hooks
ofrobots Feb 2, 2018
5f0b343
doc: remove usage of you in n-api doc
mhdawson Feb 2, 2018
6256d70
doc: add section for strategic initiatives
mhdawson Nov 17, 2017
4dea9e0
doc: small typo in n-api.md
iSkore Feb 4, 2018
4bf8b6a
n-api: add methods to open/close callback scope
mhdawson Dec 13, 2017
9c818cf
n-api: remove extra reference from test
Feb 3, 2018
10dc25d
test: improve tests for test-http-url.parse
starkwang Feb 2, 2018
4f521c7
doc: add introduce about cli options
starkwang Jan 31, 2018
c642e22
build: add doc linting when runnning `make lint`
camilo86 Jan 31, 2018
e8a75ee
doc: fix typo in n-api.md
vsemozhetbyt Feb 6, 2018
3ec3c32
src: fix crypto.pbkdf2 callback error argument
BufoViridis Jan 30, 2018
c18d958
doc: modify the return value of request.write()
Feb 2, 2018
7a432c1
doc: update onboarding-extras
devsnek Feb 3, 2018
c247cb0
http: add options to http.createServer()
Oct 19, 2017
7806c51
http2: add http fallback options to .createServer
hekike Oct 27, 2017
7241fa0
doc: fix typo in http2.md
vsemozhetbyt Feb 6, 2018
5439154
doc: add missing "changes" key in YAML comment
lpinca Feb 6, 2018
a33dc81
tools: add fixer for prefer-assert-iferror.js
shobhitchittora Oct 31, 2017
ef2d9c2
test: do not check TXT content in test-dns-any
joyeecheung Feb 3, 2018
30a233c
test: fix flaky test-http2-session-unref
apapirovski Feb 5, 2018
dc4da22
doc: be more explicit in the sypnosis
timotew Jan 4, 2018
0277993
test: improve error message output
bshankar Feb 1, 2018
36332eb
readline: use Date.now() and move test to parallel
apapirovski Feb 4, 2018
f3e6c76
test: refactor test-http-abort-before-end
cjihrig Feb 1, 2018
e7508e5
doc: fix link in https.md
vsemozhetbyt Feb 7, 2018
4722004
doc: fix MDN links to avoid redirections
vsemozhetbyt Feb 7, 2018
15db296
build: do not suppress output in make doc-only
joyeecheung Feb 1, 2018
ba46103
stream: fix misleading error message
lpinca Feb 6, 2018
4d78eb8
benchmark: improve compare output
BridgeAR Feb 5, 2018
6ed4e69
net: remove Socket.prototoype.read
addaleax Feb 4, 2018
a667ac1
test: fix flaky timers-block-eventloop test
apapirovski Feb 4, 2018
2089814
test: properly tag anonymous namespaces
mhdawson Feb 5, 2018
affddd3
doc: fix description of createDecipheriv
tniessen Feb 8, 2018
832e052
doc: add missing meta for createCipheriv
tniessen Feb 8, 2018
f0f0103
doc: fix links in YAML metadata of assert.md
vsemozhetbyt Feb 9, 2018
af977db
doc: add devsnek to collaborators
devsnek Feb 9, 2018
c0d6945
http2: add req and res options to server creation
Oct 5, 2017
4981e98
doc: fix links to Style Guide and CPP Style Guide
justin0022 Feb 9, 2018
d190c9a
src: add "icu::" prefix before ICU symbols
srl295 Feb 8, 2018
7c682f2
https: add extra options to Agent#getName()
princjef Oct 17, 2017
a7419d0
src: replace var for let / const.
estrada9166 Feb 8, 2018
34f4934
fs: fix stack overflow in fs.readdirSync
joyeecheung Feb 8, 2018
7b377cf
doc: add history for url.parse
styfle Feb 9, 2018
876e186
doc: fix exporting a function example
Feb 8, 2018
c38576e
buffer: simplify check size in assertSize
Connormiha Feb 8, 2018
080368b
build: no longer have v8-debug.h as dependency.
hashseed Feb 9, 2018
3cfb313
doc: add error check to fs example
evanlucas Feb 9, 2018
72d7159
test: fix flaky repl-timeout-throw
santigimeno Feb 10, 2018
b5073a0
doc: mark NAPI_AUTO_LENGTH as code
tniessen Feb 10, 2018
1767ef0
url: simplify constructor URLSearchParams. Remove needless check null
Connormiha Feb 10, 2018
8e39c3b
async_hooks: rename PromiseWrap.parentId
ofrobots Feb 8, 2018
ae3398a
tools: fix eslint isRequired
BridgeAR Feb 12, 2018
5e5276b
http2: use `_final` instead of `on('finish')`
addaleax Feb 7, 2018
35ce3a8
fs: make URL paths no longer experimental
jasnell Feb 6, 2018
e9c9200
test: add useful info to error msg and refactor
chinhuang007 Feb 2, 2018
3362ae7
test: fix and improve error message
kcaulfield94 Feb 1, 2018
6c04163
test: fix missing param in benchmark-timers
apapirovski Feb 12, 2018
92ed071
doc: add mmarchini to collaborators
Feb 12, 2018
5331454
path: replace "magic" numbers by readable constants
daynin Feb 8, 2018
5b88cb7
test: add crypto check to test-benchmark-tls
danbev Feb 12, 2018
7f5334e
async_hooks: deprecate unsafe emit{Before,After}
ofrobots Feb 1, 2018
0a97e1d
lib: provide proper deprecation code
BridgeAR Feb 10, 2018
a258f6b
src: flatten ContextifyContext
devsnek Dec 9, 2017
1cbd76a
vm: add modules
devsnek Jan 14, 2018
de3231c
src: factor out some common vm functions
TimothyGu Jan 13, 2018
02afdbc
vm: flip Module#link's signature
devsnek Jan 31, 2018
cb36b67
loader: fix up #18394
devsnek Feb 1, 2018
18c4933
test: remove unnecessary timer
cjihrig Feb 11, 2018
d6786d2
test: add multiline repl input regression test
cjihrig Feb 11, 2018
17d4dd5
doc: move Fedor to TSC Emeritus
MylesBorins Feb 13, 2018
9bec493
doc: update crypo Certficate class.
antoine-amara Feb 11, 2018
2c7de9d
build,win: replace run-python subroutine with single find_python call
seishun Feb 7, 2018
5b75572
fs: replace magic numbers by named constants
daynin Feb 13, 2018
7e75a78
test: add lib path env when node_shared=true
yhwang Feb 2, 2018
1557d93
lib: set process.execPath on OpenBSD
qbit Feb 3, 2018
ed55374
test: update a few tests to work on OpenBSD
qbit Feb 3, 2018
f3ab106
buffer: remove obsolete NaN check
BridgeAR Feb 12, 2018
16aeddd
lib: switch to Number.isNaN
BridgeAR Feb 12, 2018
75c691b
test: wrap countdown callback in common.mustCall
Bamieh Nov 21, 2017
0fc33fb
doc: remove extra space in README.md
Feb 16, 2018
91f2cf9
child_process: fix stdio sockets creation
santigimeno Feb 6, 2018
8b5ca48
test: try to connect after server was closed
Leko Jan 19, 2018
cf10a94
test: reduce benchmark test run time
juggernaut451 Feb 14, 2018
849f5c3
test: make tls test more rigorous
bnoordhuis Feb 15, 2018
6ce8b24
http: simplify checkInvalidHeaderChar
sethbrenith Jan 25, 2018
b3b5ac5
test: refactor of test-tls-over-http-tunnel
juggernaut451 Feb 14, 2018
7874cb0
test: refactor parallel/test-tls-addca
juggernaut451 Feb 15, 2018
66f8d34
test,benchmark,doc: enable dot-notation rule
BridgeAR Feb 13, 2018
20ad397
doc: note that linting is required in releases.md
gibfahn Feb 14, 2018
cd2fa04
doc: activate `no-multiple-empty-lines` rule
BridgeAR Feb 13, 2018
1c77929
doc: warn against concurrent http2stream.respondWithFD
addaleax Feb 13, 2018
dc45685
test: fix warnings in addon tests
ofrobots Feb 16, 2018
f960ad4
test: add common.skipIfEslintMissing
MylesBorins Feb 15, 2018
dba5e35
test: refactor parallel/test-tls-0-dns-altname
juggernaut451 Feb 15, 2018
1bff0aa
doc: add Yihong Wang to collaborators
yhwang Feb 16, 2018
810925b
lib: replace `eval` with `vm.runInThisContext`
MylesBorins Feb 7, 2018
b9ea4c4
net: simplify net.Socket#end()
addaleax Feb 11, 2018
3439635
path: replace duplicate conditions by functions
daynin Feb 10, 2018
02e9e99
doc: fix minor typos in GOVERNANCE.md
Trott Feb 17, 2018
fa0b987
test: refactor stream-*-constructor-set-methods
lpinca Feb 16, 2018
33271e6
doc: mark accessing IPC channel fd as undefined
bzoz Dec 8, 2017
0dd8ea4
doc: refactor manpage to use mdoc(7) macros
Alhadis Feb 3, 2018
d73f214
test: refactor parallel/test-tls-pause
juggernaut451 Feb 11, 2018
741e82e
lib: allow process kill by signal number
sam-github Nov 12, 2017
3f865ea
tools: auto fix custom crypto-check eslint rule
shobhitchittora Oct 31, 2017
aa241ed
tools: custom eslint autofix for inspector-check.js
shobhitchittora Oct 31, 2017
0568f75
fs: remove useless comments which duplicate names of variables
daynin Feb 12, 2018
9957916
src: add nullptr check for session in DEBUG macro
danbev Feb 16, 2018
f8f1423
tls: tls_wrap causes debug assert in vector
kfarnung Feb 17, 2018
8047c27
doc: fix typo in http2.md
vsemozhetbyt Feb 19, 2018
63b0c15
doc: fix broken link in pull-requests.md
justin0022 Feb 19, 2018
e1f8273
doc: improved documentation for fs.unlink()
dustinnewman Feb 18, 2018
f90490d
test: http2 client operations after destroy
trivikr Feb 18, 2018
b7e6ac7
test: http2 client ping errors
trivikr Feb 18, 2018
b02f4e1
test: http2 client settings invalid callback
trivikr Feb 18, 2018
2d98b58
deps: V8: backport 76c3ac5 from upstream
ofrobots Jan 22, 2018
2f836e7
doc: update onboarding.md for faster exercise completion
Trott Feb 18, 2018
7624686
doc: fix minor grammar/typographical issues in onboarding.md
Trott Feb 18, 2018
6edf952
doc: fix nits in tools/doc/README.md
vsemozhetbyt Feb 19, 2018
cb18511
2018-02-22, Version 9.6.0 (Current)
MylesBorins Feb 21, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
lib/internal/v8_prof_polyfill.js
lib/punycode.js
test/addons/??_*
test/es-module/test-esm-dynamic-import.js
test/fixtures
test/message/esm_display_syntax_error.mjs
tools/node_modules
Expand Down
2 changes: 2 additions & 0 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ rules:
accessor-pairs: error
array-callback-return: error
dot-location: [error, property]
dot-notation: error
eqeqeq: [error, smart]
no-fallthrough: error
no-global-assign: error
Expand Down Expand Up @@ -74,6 +75,7 @@ rules:
message: __defineSetter__ is deprecated.
no-return-await: error
no-self-assign: error
no-self-compare: error
no-throw-literal: error
no-unused-labels: error
no-useless-call: error
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V9.md#9.5.0">9.5.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V9.md#9.6.0">9.6.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.5.0">9.5.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.4.0">9.4.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.3.0">9.3.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.2.1">9.2.1</a><br/>
Expand Down
22 changes: 13 additions & 9 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,10 @@ Node.js uses three Deprecation levels:
being staged for deprecation in a future Node.js major release. An explicit
notice indicating the deprecated status is added to the API documentation
but no functional changes are implemented in the code. There will be no
runtime deprecation warnings emitted for such deprecations.
runtime deprecation warnings emitted for such deprecations by default.
Documentation-only deprecations may trigger a runtime warning when launched
with [`--pending-deprecation`][] flag (or its alternative,
`NODE_PENDING_DEPRECATION=1` environment variable).

* *Runtime Deprecation* refers to the use of process warnings emitted at
runtime the first time that a deprecated API is used. A command-line
Expand Down Expand Up @@ -593,20 +596,20 @@ Validate that the commit message is properly formatted using
$ git rev-list upstream/master...HEAD | xargs core-validate-commit
```

Optional: When landing your own commits, force push the amended commit to the
branch you used to open the pull request. If your branch is called `bugfix`,
then the command would be `git push --force-with-lease origin master:bugfix`.
When the pull request is closed, this will cause the pull request to
show the purple merged status rather than the red closed status that is
usually used for pull requests that weren't merged.

Time to push it:

```text
$ git push upstream master
```
* Optional: Force push the amended commit to the branch you used to
open the pull request. If your branch is called `bugfix`, then the
command would be `git push --force-with-lease origin master:bugfix`.
When the pull request is closed, this will cause the pull request to
show the purple merged status rather than the red closed status that is
usually used for pull requests that weren't merged. Only do this when
landing your own contributions.

* Close the pull request with a "Landed in `<commit hash>`" comment. If
Close the pull request with a "Landed in `<commit hash>`" comment. If
your pull request shows the purple merged status then you should still
add the "Landed in <commit hash>..<commit hash>" comment if you added
multiple commits.
Expand Down Expand Up @@ -744,6 +747,7 @@ LTS working group and the Release team.
[backporting guide]: doc/guides/backporting-to-release-lines.md
[Stability Index]: doc/api/documentation.md#stability-index
[Enhancement Proposal]: https://github.com/nodejs/node-eps
[`--pending-deprecation`]: doc/api/cli.md#--pending-deprecation
[git-username]: https://help.github.com/articles/setting-your-username-in-git/
[`node-core-utils`]: https://github.com/nodejs/node-core-utils
[TSC]: https://github.com/nodejs/TSC
4 changes: 2 additions & 2 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ responsibility for the change. In the case of pull requests proposed
by an existing Collaborator, an additional Collaborator is required
for sign-off.

If one or more Collaborators oppose a proposed change, then the change can not
If one or more Collaborators oppose a proposed change, then the change cannot
be accepted unless:

* Discussions and/or additional changes result in no Collaborators objecting to
Expand Down Expand Up @@ -73,7 +73,7 @@ may request that the TSC restore them to active status.

## Technical Steering Committee

A subset of the Collaborators form 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
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ doc-only: $(apidoc_dirs) $(apiassets) ## Builds the docs with the local or the
if [ ! -d doc/api/assets ]; then \
$(MAKE) tools/doc/node_modules/js-yaml/package.json; \
fi;
@$(MAKE) -s $(apidocs_html) $(apidocs_json)
@$(MAKE) $(apidocs_html) $(apidocs_json)

.PHONY: doc
doc: $(NODE_EXE) doc-only
Expand Down Expand Up @@ -1183,6 +1183,7 @@ lint: ## Run JS, C++, MD and doc linters.
$(MAKE) lint-js || EXIT_STATUS=$$? ; \
$(MAKE) lint-cpp || EXIT_STATUS=$$? ; \
$(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \
$(MAKE) lint-md || EXIT_STATUS=$$? ; \
exit $$EXIT_STATUS
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+

Expand Down
26 changes: 17 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
<a title="CII Best Practices" href="https://bestpractices.coreinfrastructure.org/projects/29"><img src="https://bestpractices.coreinfrastructure.org/projects/29/badge"></a>
</p>

Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js
uses an event-driven, non-blocking I/O model that makes it lightweight and
efficient. The Node.js package ecosystem, [npm][], is the largest ecosystem of
open source libraries in the world.
Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. For
more information on using Node.js, see the
[Node.js Website][].

The Node.js project is supported by the
[Node.js Foundation](https://nodejs.org/en/foundation/). Contributions,
Expand Down Expand Up @@ -245,8 +244,8 @@ For more information about the governance of the Node.js project, see
**Franziska Hinkelmann** &lt;franziska.hinkelmann@gmail.com&gt; (she/her)
* [Fishrock123](https://github.com/Fishrock123) -
**Jeremiah Senkpiel** &lt;fishrock123@rocketmail.com&gt;
* [indutny](https://github.com/indutny) -
**Fedor Indutny** &lt;fedor.indutny@gmail.com&gt;
* [gibfahn](https://github.com/gibfahn) -
**Gibson Fahnestock** &lt;gibfahn@gmail.com&gt; (he/him)
* [jasnell](https://github.com/jasnell) -
**James M Snell** &lt;jasnell@gmail.com&gt; (he/him)
* [joyeecheung](https://github.com/joyeecheung) -
Expand All @@ -255,8 +254,6 @@ For more information about the governance of the Node.js project, see
**Matteo Collina** &lt;matteo.collina@gmail.com&gt; (he/him)
* [mhdawson](https://github.com/mhdawson) -
**Michael Dawson** &lt;michael_dawson@ca.ibm.com&gt; (he/him)
* [mscdex](https://github.com/mscdex) -
**Brian White** &lt;mscdex@mscdex.net&gt;
* [MylesBorins](https://github.com/MylesBorins) -
**Myles Borins** &lt;myles.borins@gmail.com&gt; (he/him)
* [ofrobots](https://github.com/ofrobots) -
Expand All @@ -278,10 +275,14 @@ For more information about the governance of the Node.js project, see
**Ben Noordhuis** &lt;info@bnoordhuis.nl&gt;
* [chrisdickinson](https://github.com/chrisdickinson) -
**Chris Dickinson** &lt;christopher.s.dickinson@gmail.com&gt;
* [indutny](https://github.com/indutny) -
**Fedor Indutny** &lt;fedor.indutny@gmail.com&gt;
* [isaacs](https://github.com/isaacs) -
**Isaac Z. Schlueter** &lt;i@izs.me&gt;
* [joshgav](https://github.com/joshgav) -
**Josh Gavant** &lt;josh.gavant@outlook.com&gt;
* [mscdex](https://github.com/mscdex) -
**Brian White** &lt;mscdex@mscdex.net&gt;
* [nebrius](https://github.com/nebrius) -
**Bryan Hughes** &lt;bryan@nebri.us&gt;
* [orangemocha](https://github.com/orangemocha) -
Expand Down Expand Up @@ -339,6 +340,8 @@ For more information about the governance of the Node.js project, see
**Daniel Bevenius** &lt;daniel.bevenius@gmail.com&gt;
* [DavidCai1993](https://github.com/DavidCai1993) -
**David Cai** &lt;davidcai1993@yahoo.com&gt; (he/him)
* [devsnek](https://github.com/devsnek) -
**Gus Caplan** &lt;me@gus.host&gt; (he/him)
* [edsadr](https://github.com/edsadr) -
**Adrian Estrada** &lt;edsadr@gmail.com&gt; (he/him)
* [eljefedelrodeodeljefe](https://github.com/eljefedelrodeodeljefe) -
Expand Down Expand Up @@ -423,6 +426,8 @@ For more information about the governance of the Node.js project, see
**Mikeal Rogers** &lt;mikeal.rogers@gmail.com&gt;
* [misterdjules](https://github.com/misterdjules) -
**Julien Gilli** &lt;jgilli@nodejs.org&gt;
* [mmarchini](https://github.com/mmarchini) -
**Matheus Marchini** &lt;matheus@sthima.com&gt;
* [mscdex](https://github.com/mscdex) -
**Brian White** &lt;mscdex@mscdex.net&gt;
* [MylesBorins](https://github.com/MylesBorins) -
Expand Down Expand Up @@ -509,6 +514,8 @@ For more information about the governance of the Node.js project, see
**Jeremy Whitlock** &lt;jwhitlock@apache.org&gt;
* [XadillaX](https://github.com/XadillaX) -
**Khaidi Chu** &lt;i@2333.moe&gt; (he/him)
* [yhwang](https://github.com/yhwang) -
**Yihong Wang** &lt;yh.wang@ibm.com&gt;
* [yorkie](https://github.com/yorkie) -
**Yorkie Liu** &lt;yorkiefixer@gmail.com&gt;
* [yosuke-furukawa](https://github.com/yosuke-furukawa) -
Expand Down Expand Up @@ -590,12 +597,13 @@ Previous releases may also have been signed with one of the following GPG keys:

* [Contributing to the project][]
* [Working Groups][]
* [Strategic Initiatives][]

[npm]: https://www.npmjs.com
[Code of Conduct]: https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md
[Contributing to the project]: CONTRIBUTING.md
[Node.js Help]: https://github.com/nodejs/help
[Node.js Website]: https://nodejs.org/en/
[Questions tagged 'node.js' on StackOverflow]: https://stackoverflow.com/questions/tagged/node.js
[Working Groups]: https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md
[Strategic Initiatives]: https://github.com/nodejs/TSC/blob/master/Strategic-Initiatives.md
[#node.js channel on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
2 changes: 1 addition & 1 deletion benchmark/_http-benchmarkers.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ exports.run = function(options, callback) {
port: exports.PORT,
path: '/',
connections: 100,
duration: 10,
duration: 5,
benchmarker: exports.default_http_benchmarker
}, options);
if (!options.benchmarker) {
Expand Down
45 changes: 8 additions & 37 deletions benchmark/assert/deepequal-buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ const bench = common.createBenchmark(main, {
});

function main({ len, n, method }) {
var i;

const data = Buffer.allocUnsafe(len + 1);
const actual = Buffer.alloc(len);
const expected = Buffer.alloc(len);
Expand All @@ -24,40 +22,13 @@ function main({ len, n, method }) {
data.copy(expected);
data.copy(expectedWrong);

switch (method) {
case '':
// Empty string falls through to next line as default, mostly for tests.
case 'deepEqual':
bench.start();
for (i = 0; i < n; ++i) {
// eslint-disable-next-line no-restricted-properties
assert.deepEqual(actual, expected);
}
bench.end(n);
break;
case 'deepStrictEqual':
bench.start();
for (i = 0; i < n; ++i) {
assert.deepStrictEqual(actual, expected);
}
bench.end(n);
break;
case 'notDeepEqual':
bench.start();
for (i = 0; i < n; ++i) {
// eslint-disable-next-line no-restricted-properties
assert.notDeepEqual(actual, expectedWrong);
}
bench.end(n);
break;
case 'notDeepStrictEqual':
bench.start();
for (i = 0; i < n; ++i) {
assert.notDeepStrictEqual(actual, expectedWrong);
}
bench.end(n);
break;
default:
throw new Error('Unsupported method');
// eslint-disable-next-line no-restricted-properties
const fn = method !== '' ? assert[method] : assert.deepEqual;
const value2 = method.includes('not') ? expectedWrong : expected;

bench.start();
for (var i = 0; i < n; ++i) {
fn(actual, value2);
}
bench.end(n);
}
2 changes: 1 addition & 1 deletion benchmark/assert/deepequal-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ function main({ n, len, method }) {
benchmark(assert.notDeepEqual, n, values, values2);
break;
default:
throw new Error('Unsupported method');
throw new Error(`Unsupported method ${method}`);
}
}
44 changes: 8 additions & 36 deletions benchmark/assert/deepequal-object.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,47 +28,19 @@ function createObj(source, add = '') {
function main({ size, n, method }) {
// TODO: Fix this "hack". `n` should not be manipulated.
n = n / size;
var i;

const source = Array.apply(null, Array(size));
const actual = createObj(source);
const expected = createObj(source);
const expectedWrong = createObj(source, '4');

switch (method) {
case '':
// Empty string falls through to next line as default, mostly for tests.
case 'deepEqual':
bench.start();
for (i = 0; i < n; ++i) {
// eslint-disable-next-line no-restricted-properties
assert.deepEqual(actual, expected);
}
bench.end(n);
break;
case 'deepStrictEqual':
bench.start();
for (i = 0; i < n; ++i) {
assert.deepStrictEqual(actual, expected);
}
bench.end(n);
break;
case 'notDeepEqual':
bench.start();
for (i = 0; i < n; ++i) {
// eslint-disable-next-line no-restricted-properties
assert.notDeepEqual(actual, expectedWrong);
}
bench.end(n);
break;
case 'notDeepStrictEqual':
bench.start();
for (i = 0; i < n; ++i) {
assert.notDeepStrictEqual(actual, expectedWrong);
}
bench.end(n);
break;
default:
throw new Error('Unsupported method');
// eslint-disable-next-line no-restricted-properties
const fn = method !== '' ? assert[method] : assert.deepEqual;
const value2 = method.includes('not') ? expectedWrong : expected;

bench.start();
for (var i = 0; i < n; ++i) {
fn(actual, value2);
}
bench.end(n);
}
Loading