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

v12.18.1 proposal #33811

Merged
merged 88 commits into from
Jun 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
194789f
stream: make all streams error in a pipeline
mcollina Dec 9, 2019
edf75e4
src: use basename(argv0) for --trace-uncaught suggestion
addaleax Apr 12, 2020
1766514
test: add tests for options.fs in fs streams
julianduque May 1, 2020
e572cf9
doc: fix style and grammer in buffer.md
seishun May 1, 2020
c6cf048
doc: explicitly doc package.exports is breaking
MylesBorins Apr 26, 2020
b43fc64
Revert "src: add aliased-buffer-overflow abort test"
richardlau May 1, 2020
c054834
Revert "src: add test/abort build tasks"
richardlau May 1, 2020
ea3a68f
doc: doc and test URLSearchParams discrepancy
jasnell May 4, 2020
033bc96
doc: update napi_async_init documentation
mhdawson Apr 30, 2020
4294d92
stream: make from read one at a time
ronag May 1, 2020
82da74b
n-api: add uint32 test for -1
May 5, 2020
ac5cdd6
doc: add warnings about transferring Buffers and ArrayBuffer
jasnell May 5, 2020
2262962
doc: remove AsyncWrap mentions from async_hooks.md
puzpuzpuz May 5, 2020
ad7a890
doc: add troubleshooting guide for AsyncLocalStorage
puzpuzpuz May 5, 2020
33aacbe
wasi: prevent syscalls before start
tniessen May 4, 2020
4a58420
doc: specify unit of time passed to `fs.utimes`
SimenB May 4, 2020
8b44be9
doc: add Uint8Array to `end` and `write`
rexagod May 2, 2020
9038620
doc: update Buffer(size) documentation
seishun May 1, 2020
0cee4c3
doc: removed unnecessary util imports from vm examples
WalasPrime Apr 30, 2020
59619b0
doc: mention python3-distutils dependency in BUILDING.md
osher Apr 30, 2020
9017bce
lib: fix grammar in internal/bootstrap/loaders.js
szTheory May 2, 2020
139eb6b
test: skip some console tests on dumb terminal
AdamMajer Apr 30, 2020
0177cbf
test: rename test-lookupService-promises
rickyes Apr 27, 2020
0c7cf24
doc: correct description of `decipher.setAuthTag` in crypto.md
jbuhacoff Apr 27, 2020
ed62d43
src: clean up large pages code
May 5, 2020
22f2c2c
wasi: fix poll_oneoff memory interface
cjihrig May 5, 2020
9dde1db
doc: add warning for socket.connect reuse
ronag May 5, 2020
77caf92
module: better error for named exports from cjs
MylesBorins May 5, 2020
a5e8c5c
src: split out callback queue implementation from Environment
addaleax May 6, 2020
6881410
lib: refactored scheduling policy assignment
yashLadha Apr 5, 2020
d64dbfa
meta: add issue template for API reference docs
DerekNonGeneric Apr 20, 2020
642f813
src: fix invalid windowBits=8 gzip segfault
bnoordhuis Apr 24, 2020
631e433
zlib: reject windowBits=8 when mode=GZIP
bnoordhuis Apr 24, 2020
66dbaff
http2: add `bytesWritten` test for `Http2Stream`
rexagod Apr 21, 2020
964adfa
buffer: improve copy() performance
seishun May 2, 2020
4d6f56a
deps: upgrade npm to 6.14.5
ruyadorno May 4, 2020
68551d2
perf_hooks: fix error message for invalid entryTypes
targos May 7, 2020
cd92052
test: add hr-time Web platform tests
targos May 7, 2020
5d5e66c
tools: add eslint rule to only pass through 'test' to debuglog
BridgeAR Mar 9, 2020
cdd7d3a
tools: remove obsolete no-restricted-syntax eslint rules
BridgeAR Mar 9, 2020
b630079
src: remove unnecessary Isolate::GetCurrent() calls
addaleax May 8, 2020
59769c4
lib: fix typo in timers insert function comment
danbev May 8, 2020
2645b1c
tools: update ESLint to 7.0.0
cjihrig May 8, 2020
c459832
test: fix test-net-throttle
Trott May 9, 2020
f27ae6e
src: fix typo in comment in async_wrap.cc
danbev May 11, 2020
30c9cb5
doc: fix typo in n-api.md
danbev May 9, 2020
318fcf8
doc: add note about clientError writable handling
ShogunPanda May 8, 2020
548672d
src: use MaybeLocal.ToLocal instead of IsEmpty
danbev May 8, 2020
82c43d1
src: delete unused variables to resolve compile time print warning
rickyes May 11, 2020
fe780a5
src: remove unused using declarations in node.cc
danbev May 6, 2020
1f159e4
src: add primordials to arguments comment
danbev May 9, 2020
fa16313
test: update WPT interfaces and hr-time
joyeecheung May 12, 2020
33a7878
test: refactor WPTRunner
joyeecheung May 6, 2020
7315c22
tls: fix --tls-keylog option
mildsunrise May 12, 2020
3d8ba29
doc: add examples for implementing ESM
rosaxxny Apr 30, 2020
9f594be
test: fix test-dns-idna2008
Trott May 12, 2020
d2897a2
doc: enhance guides by fixing and making grammar more consistent
ChrisAHolland Apr 29, 2020
aa4611c
fs: clean up Dir.read() uv_fs_t data before calling into JS
addaleax May 6, 2020
c129e88
fs: forbid concurrent operations on Dir handle
addaleax May 7, 2020
8a92698
worker: call CancelTerminateExecution() before exiting Locker
addaleax May 10, 2020
ba93c8d
async_hooks: clear async_id_stack for terminations in more places
addaleax May 11, 2020
5da7d52
test: regression tests for async_hooks + Promise + Worker interaction
addaleax May 10, 2020
a0bc2e3
src: replace to CHECK_NOT_NULL in node_crypto
himself65 May 13, 2020
4f6e4ae
module: add specific error for dir import
aduh95 May 3, 2020
a029dca
esm: improve commonjs hint on module not found
aduh95 May 14, 2020
29d24db
src: add #include <string> in json_utils.h
zcbenz May 10, 2020
b4d9034
worker: fix crash when .unref() is called during exit
addaleax May 14, 2020
b924910
src: distinguish refed/unrefed threadsafe Immediates
addaleax May 9, 2020
a9ed287
doc: fix extension in esm example
devsnek May 14, 2020
e240d56
tools: update dependencies for markdown linting
Trott May 15, 2020
5d80576
errors: skip fatal error highlighting on windows
Hakerh400 Apr 28, 2020
9883ba6
src: add promise_resolve to SetupHooks comment
danbev May 12, 2020
e668376
src: remove unused misc variable
danbev May 15, 2020
548db2e
src: remove unused IsolateSettings variable
danbev May 15, 2020
a48aeb3
doc: clarify about the Node.js-only extensions in perf_hooks
joyeecheung May 1, 2020
402aa1b
deps: upgrade to libuv 1.38.0
cjihrig May 17, 2020
4749156
doc: add comment about highWaterMark limit
benjamingr May 16, 2020
0c9b826
doc: update function description for `decipher.setAAD`
jbuhacoff Apr 27, 2020
c797c7c
src: reduce duplication in RegisterHandleCleanups
danbev May 15, 2020
5eed20b
worker: fix race condition in node_messaging.cc
addaleax May 16, 2020
fa4a37c
http2: comment on usage of `Object.create(null)`
rexagod Apr 25, 2020
7d8a226
doc: fix typos in handle scope descriptions
tniessen May 6, 2020
9572701
doc: add fs.open() multiple constants example
Ethan-Arrowood May 7, 2020
98a7026
doc: document module.path
aduh95 May 9, 2020
e67df04
src: use BaseObjectPtr in StreamReq::Dispose
jasnell Apr 27, 2020
5c7176b
deps: update to uvwasi 0.0.9
cjihrig May 4, 2020
af95bd7
deps: V8: cherry-pick 548f6c81d424
dominykas May 20, 2020
6665f73
2020-06-17, Version 12.18.1 'Erbium' (LTS)
codebytere Jun 9, 2020
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
  •  
  •  
  •  
44 changes: 0 additions & 44 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,34 +189,6 @@ module.exports = {
// as well to lib/.eslintrc.yaml.
'no-restricted-syntax': [
'error',
{
selector: "CallExpression[callee.property.name='deepStrictEqual'][arguments.2.type='Literal']",
message: 'Do not use a literal for the third argument of assert.deepStrictEqual()',
},
{
selector: "CallExpression[callee.property.name='doesNotThrow']",
message: 'Do not use `assert.doesNotThrow()`. Write the code without the wrapper and add a comment instead.',
},
{
selector: "CallExpression[callee.property.name='doesNotReject']",
message: 'Do not use `assert.doesNotReject()`. Write the code without the wrapper and add a comment instead.',
},
{
selector: "CallExpression[callee.property.name='rejects'][arguments.length<2]",
message: '`assert.rejects()` must be invoked with at least two arguments.',
},
{
selector: "CallExpression[callee.property.name='strictEqual'][arguments.2.type='Literal']",
message: 'Do not use a literal for the third argument of assert.strictEqual()',
},
{
selector: "CallExpression[callee.property.name='throws'][arguments.1.type='Literal']:not([arguments.1.regex])",
message: 'Use an object as second argument of `assert.throws()`.',
},
{
selector: "CallExpression[callee.property.name='throws'][arguments.length<2]",
message: '`assert.throws()` must be invoked with at least two arguments.',
},
{
selector: "CallExpression[callee.name='setTimeout'][arguments.length<2]",
message: '`setTimeout()` must be invoked with at least two arguments.',
Expand All @@ -229,22 +201,6 @@ module.exports = {
selector: 'ThrowStatement > CallExpression[callee.name=/Error$/]',
message: 'Use `new` keyword when throwing an `Error`.',
},
{
selector: "CallExpression[callee.property.name='notDeepStrictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression']):not([arguments.1.type='UnaryExpression'])",
message: 'The first argument should be the `actual`, not the `expected` value.',
},
{
selector: "CallExpression[callee.property.name='notStrictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression']):not([arguments.1.type='UnaryExpression'])",
message: 'The first argument should be the `actual`, not the `expected` value.',
},
{
selector: "CallExpression[callee.property.name='deepStrictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression']):not([arguments.1.type='UnaryExpression'])",
message: 'The first argument should be the `actual`, not the `expected` value.',
},
{
selector: "CallExpression[callee.property.name='strictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression']):not([arguments.1.type='UnaryExpression'])",
message: 'The first argument should be the `actual`, not the `expected` value.',
},
{
selector: "CallExpression[callee.name='isNaN']",
message: 'Use Number.isNaN() instead of the global isNaN() function.',
Expand Down
54 changes: 54 additions & 0 deletions .github/ISSUE_TEMPLATE/3-api-ref-docs-problem.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
name: "\U0001F4D7 Open an issue regarding the Node.js API reference docs"
about: Let us know about any problematic API reference documents
title: "doc: "
labels: doc
---

# 📗 API Reference Docs Problem

<!------------------------------------------------------------------------------
Thank you for wanting to make nodejs.org better!

This template is for issues with the Node.js API reference docs.

For more general support, please open an issue in
our help repo at “https://github.com/nodejs/help”.

For the issue title, enter a one-line summary after “doc: ”.
The “✍️” signifies a request for input. If unsure, do the best you can.

If you found a problem with nodejs.org beyond the API reference docs, please
open an issue in our website repo at “https://github.com/nodejs/nodejs.org”.
------------------------------------------------------------------------------->

<!--
Version: output of “node -v”
Platform: output of “uname -a” (UNIX), or version and 32 or 64-bit (Windows)
Subsystem: if known, please specify affected core module name
-->

- **Version**: ✍️
- **Platform**: ✍️
- **Subsystem**: ✍️

## Location

_Section of the site where the content exists_

Affected URL(s):
- https://nodejs.org/api/✍️

## Problem description

_Concise explanation of what you found to be problematic_

<!-- If applicable, include any screenshots that may help solve the problem. -->

✍️

---

<!-- Use “[x]” to check the box below if interested in contributing. -->

- [ ] I would like to work on this issue and submit a pull request.
2 changes: 2 additions & 0 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ Installation via Linux package manager can be achieved with:

FreeBSD and OpenBSD users may also need to install `libexecinfo`.

Python 3 users may also need to install `python3-distutils`.

#### macOS prerequisites

* Xcode Command Line Tools >= 8 for macOS
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.18.0">12.18.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.18.1">12.18.1</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.18.0">12.18.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.17.0">12.17.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.16.3">12.16.3</a><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.16.2">12.16.2</a><br/>
Expand Down
53 changes: 6 additions & 47 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ v8:
tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)

.PHONY: jstest
jstest: build-addons build-abort-tests build-js-native-api-tests build-node-api-tests ## Runs addon tests and JS tests
jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addon tests and JS tests
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
--skip-tests=$(CI_SKIP_TESTS) \
$(CI_JS_SUITES) \
Expand All @@ -316,7 +316,6 @@ test: all ## Runs default tests, linters, and builds docs.
$(MAKE) -s tooltest
$(MAKE) -s test-doc
$(MAKE) -s build-addons
$(MAKE) -s build-abort-tests
$(MAKE) -s build-js-native-api-tests
$(MAKE) -s build-node-api-tests
$(MAKE) -s cctest
Expand All @@ -325,7 +324,6 @@ test: all ## Runs default tests, linters, and builds docs.
.PHONY: test-only
test-only: all ## For a quick test, does not run linter or build docs.
$(MAKE) build-addons
$(MAKE) build-abort-tests
$(MAKE) build-js-native-api-tests
$(MAKE) build-node-api-tests
$(MAKE) cctest
Expand All @@ -335,7 +333,6 @@ test-only: all ## For a quick test, does not run linter or build docs.
# Used by `make coverage-test`
test-cov: all
$(MAKE) build-addons
$(MAKE) build-abort-tests
$(MAKE) build-js-native-api-tests
$(MAKE) build-node-api-tests
$(MAKE) cctest
Expand Down Expand Up @@ -455,31 +452,6 @@ test/node-api/.buildstamp: $(ADDONS_PREREQS) \
# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.
build-node-api-tests: | $(NODE_EXE) test/node-api/.buildstamp

ABORT_BINDING_GYPS := \
$(filter-out test/abort/??_*/binding.gyp, \
$(wildcard test/abort/*/binding.gyp))

ABORT_BINDING_SOURCES := \
$(filter-out test/abort/??_*/*.c, $(wildcard test/abort/*/*.c)) \
$(filter-out test/abort/??_*/*.cc, $(wildcard test/abort/*/*.cc)) \
$(filter-out test/abort/??_*/*.h, $(wildcard test/abort/*/*.h))

# Implicitly depends on $(NODE_EXE), see the build-node-api-tests rule for rationale.
test/abort/.buildstamp: $(ADDONS_PREREQS) \
$(ABORT_BINDING_GYPS) $(ABORT_BINDING_SOURCES) \
src/node_api.h src/node_api_types.h src/js_native_api.h \
src/js_native_api_types.h src/js_native_api_v8.h src/js_native_api_v8_internals.h
@$(call run_build_addons,"$$PWD/test/abort",$@)

.PHONY: build-abort-tests
# .buildstamp needs $(NODE_EXE) but cannot depend on it
# directly because it calls make recursively. The parent make cannot know
# if the subprocess touched anything so it pessimistically assumes that
# .buildstamp is out of date and need a rebuild.
# Just goes to show that recursive make really is harmful...
# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.
build-abort-tests: | $(NODE_EXE) test/abort/.buildstamp

BENCHMARK_NAPI_BINDING_GYPS := $(wildcard benchmark/napi/*/binding.gyp)

BENCHMARK_NAPI_BINDING_SOURCES := \
Expand All @@ -500,14 +472,12 @@ clear-stalled:
echo $${PS_OUT} | xargs kill -9; \
fi

test-build: | all build-addons build-abort-tests build-js-native-api-tests build-node-api-tests
test-build: | all build-addons build-js-native-api-tests build-node-api-tests

test-build-js-native-api: all build-js-native-api-tests

test-build-node-api: all build-node-api-tests

test-build-abort: all build-abort-tests

.PHONY: test-all
test-all: test-build ## Run default tests with both Debug and Release builds.
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug,release
Expand All @@ -520,7 +490,7 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/*

# CI_* variables should be kept synchronized with the ones in vcbuild.bat
CI_NATIVE_SUITES ?= addons js-native-api node-api abort
CI_NATIVE_SUITES ?= addons js-native-api node-api
CI_JS_SUITES ?= default
ifeq ($(node_use_openssl), false)
CI_DOC := doctool
Expand All @@ -532,7 +502,7 @@ endif
# Build and test addons without building anything else
# Related CI job: node-test-commit-arm-fanned
test-ci-native: LOGLEVEL := info
test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp test/abort/.buildstamp
test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
Expand All @@ -554,7 +524,7 @@ test-ci-js: | clear-stalled
.PHONY: test-ci
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
test-ci: LOGLEVEL := info
test-ci: | clear-stalled build-addons build-abort-tests build-js-native-api-tests build-node-api-tests doc-only
test-ci: | clear-stalled build-addons build-js-native-api-tests build-node-api-tests doc-only
out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
Expand Down Expand Up @@ -659,17 +629,8 @@ test-node-api-clean:
$(RM) -r test/node-api/*/build
$(RM) test/node-api/.buildstamp

.PHONY: test-abort
test-abort: test-build-abort
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test-abort

.PHONY: test-abort-clean
test-abort-clean:
$(RM) -r test/abort/*/build
$(RM) test/abort/.buildstamp

.PHONY: test-addons
test-addons: test-build test-js-native-api test-node-api test-abort
test-addons: test-build test-js-native-api test-node-api
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons

.PHONY: test-addons-clean
Expand All @@ -679,7 +640,6 @@ test-addons-clean:
$(RM) test/addons/.buildstamp test/addons/.docbuildstamp
$(MAKE) test-js-native-api-clean
$(MAKE) test-node-api-clean
$(MAKE) test-abort-clean

test-async-hooks:
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks
Expand All @@ -688,7 +648,6 @@ test-with-async-hooks:
$(MAKE) build-addons
$(MAKE) build-js-native-api-tests
$(MAKE) build-node-api-tests
$(MAKE) build-abort-tests
$(MAKE) cctest
NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
$(CI_JS_SUITES) \
Expand Down
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.37',
'v8_embedder_string': '-node.38',

##### V8 defaults for Node.js #####

Expand Down
2 changes: 1 addition & 1 deletion deps/npm/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ html/*.png

*.pyc


Session.vim
.nyc_output
3 changes: 0 additions & 3 deletions deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ node_js:

env: "DEPLOY_VERSION=testing"

notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

install:
- "node . install"

Expand Down
4 changes: 4 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -691,3 +691,7 @@ Vitaliy Markitanov <9357021+vit100@users.noreply.github.com>
simon_s <simon_s@afimilk.co.il>
John Kennedy <john.kennedy.9147@gmail.com>
Bernard Kitchens <bernard@npmjs.com>
Jarda Snajdr <jsnajdr@gmail.com>
Naix Geng <1308363651@qq.com>
Dylan Treisman <dylanzt@gmail.com>
mum-never-proud <abhuz@hotmail.com>
15 changes: 15 additions & 0 deletions deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## 6.14.5 (2020-05-01)

### BUG FIXES

* [`33ec41f18`](https://github.com/npm/cli/commit/33ec41f18f557146607cb14a7a38c707fce6d42c) [#758](https://github.com/npm/cli/pull/758) fix: relativize file links when inflating shrinkwrap ([@jsnajdr](https://github.com/jsnajdr))
* [`94ed456df`](https://github.com/npm/cli/commit/94ed456dfb0b122fd4192429024f034d06c3c454) [#1162](https://github.com/npm/cli/pull/1162) fix: npm init help output ([@mum-never-proud](https://github.com/mum-never-proud))

### DEPENDENCIES

* [`5587ac01f`](https://github.com/npm/cli/commit/5587ac01ffd0d2ea830a6bbb67bb34a611ffc409) `npm-registry-fetch@4.0.4`
* [`fc5d94c39`](https://github.com/npm/npm-registry-fetch/commit/fc5d94c39ca218d78df77249ab3a6bf1d9ed9db1) fix: removed default timeout
* [`07a4d8884`](https://github.com/npm/cli/commit/07a4d8884448359bac485a49c05fd2d23d06834b) `graceful-fs@4.2.4`
* [`8228d1f2e`](https://github.com/npm/cli/commit/8228d1f2e427ad9adee617266108acd1ee39b4a5) `mkdirp@0.5.5`
* [`e6d208317`](https://github.com/npm/cli/commit/e6d20831740a84aea766da2a2913cf82a4d56ada) `nopt@4.0.3`

## 6.14.4 (2020-03-24)

### DEPENDENCIES
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ All interactions in the npm repository are covered by the [npm Code of Conduct](
# Make sure you install the dependencies first before running tests.
$ npm install

# Run tests for the CLI (it could take awhile).
# Run tests for the CLI (it could take a while).
$ npm run test
```

Expand All @@ -97,7 +97,7 @@ $ make link
#################
# ALTERNATIVELY
#################
# If ou're working on a feature or bug, you can run the same command on your
# If you're working on a feature or bug, you can run the same command on your
# working branch and link that code.

# Create new branch to work from (there are many ways)
Expand Down Expand Up @@ -130,7 +130,7 @@ let you know that it's sent the request to start the benchmark suite.

![image](https://user-images.githubusercontent.com/2818462/72312698-e2e57f80-3656-11ea-9fcf-4a8f6b97b0d1.png)

If you've updated your pull-reuqest and you'd like to run the the benchmark suite again, simple update your original comment, by adding `test this please ✅` again, or simply just adding another emoji to the **end**. _(The trigger is the phrase "test this please ✅" at the beginning of a comment. Updates will trigger as well, so long as the phrase stays at the beginning.)_.
If you've updated your pull-request and you'd like to run the the benchmark suite again, simple update your original comment, by adding `test this please ✅` again, or simply just adding another emoji to the **end**. _(The trigger is the phrase "test this please ✅" at the beginning of a comment. Updates will trigger as well, so long as the phrase stays at the beginning.)_.

![image](https://user-images.githubusercontent.com/2818462/72313006-ec231c00-3657-11ea-9bd9-227634d67362.png)

Expand Down
10 changes: 5 additions & 5 deletions deps/npm/docs/content/cli-commands/npm.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ on a preinstalled git.

If one of the packages npm tries to install is a native node module and
requires compiling of C++ Code, npm will use
[node-gyp](https://github.com/TooTallNate/node-gyp) for that task.
For a Unix system, [node-gyp](https://github.com/TooTallNate/node-gyp)
[node-gyp](https://github.com/nodejs/node-gyp) for that task.
For a Unix system, [node-gyp](https://github.com/nodejs/node-gyp)
needs Python, make and a buildchain like GCC. On Windows,
Python and Microsoft Visual Studio C++ are needed. Python 3 is
not supported by [node-gyp](https://github.com/TooTallNate/node-gyp).
not supported by [node-gyp](https://github.com/nodejs/node-gyp).
For more information visit
[the node-gyp repository](https://github.com/TooTallNate/node-gyp) and
the [node-gyp Wiki](https://github.com/TooTallNate/node-gyp/wiki).
[the node-gyp repository](https://github.com/nodejs/node-gyp) and
the [node-gyp Wiki](https://github.com/nodejs/node-gyp/wiki).

### Directories

Expand Down
Loading