diff --git a/.eslintrc.js b/.eslintrc.js
index 8279dfc9c4ab41..d9185356d15b06 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -43,6 +43,7 @@ module.exports = {
{
files: [
'doc/api/esm.md',
+ 'doc/api/module.md',
'doc/api/modules.md',
'test/es-module/test-esm-type-flag.js',
'test/es-module/test-esm-type-flag-alias.js',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 247b5c17b54805..0f5587af43be5d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,7 +5,24 @@
# 3. PRs touching any code with a codeowner must be signed off by at least one
# person on the code owner team.
+# tsc & commcomm
+
/.github/CODEOWNERS @nodejs/tsc
+/GOVERNANCE.md @nodejs/tsc
+/onboarding.md @nodejs/tsc
+/CODE_OF_CONDUCT.md @nodejs/tsc @nodejs/community-committee
+/CONTRIBUTING.md @nodejs/tsc @nodejs/community-committee
+/LICENSE @nodejs/tsc @nodejs/community-committee
+/doc/guides/contributing/code-of-conduct.md @nodejs/tsc @nodejs/community-committee
+# TODO(mmarchini): the bot doens't have a notion of precedence, that might
+# change when move the codeowners code to an Action, at which point we can
+# uncomment the line below
+# /doc/guides/contributing/*.md @nodejs/tsc
+/doc/guides/contributing/issues.md @nodejs/tsc
+/doc/guides/contributing/pull-requests.md @nodejs/tsc
+/doc/guides/collaborator-guide.md @nodejs/tsc
+/doc/guides/offboarding.md @nodejs/tsc
+/doc/guides/onboarding-extras.md @nodejs/tsc
# net
@@ -21,7 +38,7 @@
/lib/internal/net.js @nodejs/net
/lib/internal/socket_list.js @nodejs/net
/lib/internal/js_stream_socket.js @nodejs/net
-/src/cares_wrap.h @nodejs/net
+/src/cares_wrap.cc @nodejs/net
/src/connect_wrap.* @nodejs/net
/src/connection_wrap.* @nodejs/net
/src/node_sockaddr* @nodejs/net
@@ -41,7 +58,6 @@
/deps/llhttp/* @nodejs/http @nodejs/net
/doc/api/http.md @nodejs/http @nodejs/net
-/doc/api/http2.md @nodejs/http @nodejs/net
/lib/_http_* @nodejs/http @nodejs/net
/lib/http.js @nodejs/http @nodejs/net
/lib/https.js @nodejs/crypto @nodejs/net @nodejs/http
@@ -51,7 +67,7 @@
# http2
/deps/nghttp2/* @nodejs/http2 @nodejs/net
-/doc/api/http2.md @nodejs/http2 @nodejs/net
+/doc/api/http2.md @nodejs/http2 @nodejs/http @nodejs/net
/lib/http2.js @nodejs/http2 @nodejs/net
/lib/internal/http2/* @nodejs/http2 @nodejs/net
/src/node_http2* @nodejs/http2 @nodejs/net
diff --git a/.github/workflows/auto-start-ci.yml b/.github/workflows/auto-start-ci.yml
index 0bc9e7c1c65fc2..cb9318ab4ade9f 100644
--- a/.github/workflows/auto-start-ci.yml
+++ b/.github/workflows/auto-start-ci.yml
@@ -3,12 +3,10 @@ name: Auto Start CI
on:
schedule:
- # `schedule` event is used instead of `pull_request` because when a
- # `pull_requesst` event is triggered on a PR from a fork, GITHUB_TOKEN will
- # be read-only, and the Action won't have access to any other repository
- # secrets, which it needs to access Jenkins API. Runs every five minutes
- # (fastest the scheduler can run). Five minutes is optimistic, it can take
- # longer to run.
+ # Runs every five minutes (fastest the scheduler can run). Five minutes is
+ # optimistic, it can take longer to run.
+ # To understand why `schedule` is used instead of other events, refer to
+ # ./doc/guides/commit-queue.md
- cron: "*/5 * * * *"
jobs:
diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml
new file mode 100644
index 00000000000000..9db520d5c35a59
--- /dev/null
+++ b/.github/workflows/commit-queue.yml
@@ -0,0 +1,81 @@
+---
+# This action requires the following secrets to be set on the repository:
+# GH_USER_NAME: GitHub user whose Jenkins and GitHub token are defined below
+# GH_USER_TOKEN: GitHub user token, to be used by ncu and to push changes
+# JENKINS_TOKEN: Jenkins token, to be used to check CI status
+
+name: Commit Queue
+
+on:
+ # `schedule` event is used instead of `pull_request` because when a
+ # `pull_request` event is triggered on a PR from a fork, GITHUB_TOKEN will
+ # be read-only, and the Action won't have access to any other repository
+ # secrets, which it needs to access Jenkins API.
+ schedule:
+ - cron: "*/5 * * * *"
+
+jobs:
+ commitQueue:
+ if: github.repository == 'nodejs/node'
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ # A personal token is required because pushing with GITHUB_TOKEN will
+ # prevent commits from running CI after they land on master. It needs
+ # to be set here because `checkout` configures GitHub authentication
+ # for push as well.
+ token: ${{ secrets.GH_USER_TOKEN }}
+
+ # Install dependencies
+ - name: Install Node.js
+ uses: actions/setup-node@v2-beta
+ with:
+ node-version: '12'
+ - name: Install dependencies
+ run: |
+ sudo apt-get install jq -y
+ # TODO(mmarchini): install from npm after next ncu release is out
+ npm install -g 'https://github.com/mmarchini/node-core-utils#commit-queue-branch'
+ # npm install -g node-core-utils
+
+ - name: Set variables
+ run: |
+ echo "::set-env name=REPOSITORY::$(echo ${{ github.repository }} | cut -d/ -f2)"
+ echo "::set-env name=OWNER::${{ github.repository_owner }}"
+
+ - name: Get Pull Requests
+ uses: octokit/graphql-action@v2.x
+ id: get_mergable_pull_requests
+ with:
+ query: |
+ query release($owner:String!,$repo:String!, $base_ref:String!) {
+ repository(owner:$owner, name:$repo) {
+ pullRequests(baseRefName: $base_ref, labels: ["commit-queue"], states: OPEN, last: 100) {
+ nodes {
+ number
+ }
+ }
+ }
+ }
+ owner: ${{ env.OWNER }}
+ repo: ${{ env.REPOSITORY }}
+ # Commit queue is only enabled for the default branch on the repository
+ # TODO(mmarchini): get the default branch programmatically instead of
+ # assuming `master`
+ base_ref: "master"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Configure node-core-utils
+ run: |
+ ncu-config set branch master
+ ncu-config set upstream origin
+ ncu-config set username "${{ secrets.GH_USER_NAME }}"
+ ncu-config set token "${{ secrets.GH_USER_TOKEN }}"
+ ncu-config set jenkins_token "${{ secrets.JENKINS_TOKEN }}"
+ ncu-config set repo "${{ env.REPOSITORY }}"
+ ncu-config set owner "${{ env.OWNER }}"
+
+ - name: Start the commit queue
+ run: ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ secrets.GITHUB_TOKEN }} $(echo '${{ steps.get_mergable_pull_requests.outputs.data }}' | jq '.repository.pullRequests.nodes | map(.number) | .[]')
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 2a9a722e9c0bfc..3cd4def9f986bc 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -77,3 +77,11 @@ jobs:
run: |
make lint-py-build || true
NODE=$(which node) make lint-py
+
+ lint-codeowners:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: mszostok/codeowners-validator@v0.4.0
+ with:
+ checks: "files,duppatterns"
diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
index 403a47614f8005..df33822770523b 100644
--- a/.github/workflows/misc.yml
+++ b/.github/workflows/misc.yml
@@ -28,3 +28,5 @@ jobs:
with:
name: docs
path: out/doc
+ - name: Check links
+ run: node tools/doc/checkLinks.js .
diff --git a/.gitignore b/.gitignore
index 5b07ec4a8e3cdc..75039956cb18b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,6 +130,9 @@ _UpgradeReport_Files/
# Ignore dependencies fetched by deps/v8/tools/node/fetch_deps.py
/deps/.cipd
+# === Rules for Windows vcbuild.bat ===
+/temp-vcbuild
+
# === Global Rules ===
# Keep last to avoid being excluded
*.pyc
diff --git a/BUILDING.md b/BUILDING.md
index 9c8b868e6323d5..45e7f7dda3e6b5 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -110,7 +110,7 @@ platforms. This is true regardless of entries in the table below.
| Windows | x64, x86 (WoW64) | >= Windows 8.1/2012 R2 | Tier 1 | [4](#fn4),[5](#fn5) |
| Windows | x86 (native) | >= Windows 8.1/2012 R2 | Tier 1 (running) / Experimental (compiling) [6](#fn6) | |
| Windows | x64, x86 | Windows Server 2012 (not R2) | Experimental | |
-| Windows | arm64 | >= Windows 10 | Experimental | |
+| Windows | arm64 | >= Windows 10 | Tier 2 (compiling) / Experimental (running) | |
| macOS | x64 | >= 10.11 | Tier 1 | |
| SmartOS | x64 | >= 18 | Tier 2 | |
| AIX | ppc64be >=power7 | >= 7.2 TL02 | Tier 2 | |
@@ -237,7 +237,7 @@ test with Python 3.
* GNU Make 3.81 or newer
* Python (see note above)
* Python 2.7
- * Python 3.5, 3.6, 3.7, and 3.8.
+ * Python 3.5, 3.6, 3.7, and 3.8
Installation via Linux package manager can be achieved with:
@@ -256,7 +256,7 @@ Python 3 users may also need to install `python3-distutils`.
* Xcode Command Line Tools >= 10 for macOS
* Python (see note above)
* Python 2.7
- * Python 3.5, 3.6, 3.7, and 3.8.
+ * Python 3.5, 3.6, 3.7, and 3.8
macOS users can install the `Xcode Command Line Tools` by running
`xcode-select --install`. Alternatively, if you already have the full Xcode
@@ -531,7 +531,7 @@ to run it again before invoking `make -j4`.
[Visual Studio 2017 or 2019](https://visualstudio.microsoft.com/downloads/) or
the "Visual C++ build tools" workload from the
[Build Tools](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019),
- with the default optional components.
+ with the default optional components
* Basic Unix tools required for some tests,
[Git for Windows](https://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.
@@ -545,12 +545,11 @@ Optional requirements to build the MSI installer package:
* The [WiX Toolset v3.11](https://wixtoolset.org/releases/) and the
[Wix Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension)
or the [Wix Toolset Visual Studio 2019 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension).
+* The [WiX Toolset v3.14](https://wixtoolset.org/releases/) if
+ building for Windows 10 on ARM (ARM64)
Optional requirements for compiling for Windows 10 on ARM (ARM64):
-* ARM64 Windows build machine
- * Due to a GYP limitation, this is required to run compiled code
- generation tools (like V8's builtins and mksnapshot tools)
* Visual Studio 15.9.0 or newer
* Visual Studio optional components
* Visual C++ compilers and libraries for ARM64
@@ -565,7 +564,7 @@ This script will install the following [Chocolatey](https://chocolatey.org/)
packages:
* [Git for Windows](https://chocolatey.org/packages/git) with the `git` and
- Unix tools added to the `PATH`.
+ Unix tools added to the `PATH`
* [Python 3.x](https://chocolatey.org/packages/python) and
[legacy Python](https://chocolatey.org/packages/python2)
* [Visual Studio 2019 Build Tools](https://chocolatey.org/packages/visualstudio2019buildtools)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 446edd44508f3e..d6ce61803d1f25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,8 @@ release.
-14.8.0
+14.9.0
+14.8.0 14.7.0 14.6.0 14.5.0
diff --git a/Makefile b/Makefile
index 6b3818b01d5dee..97134eee65e1aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1268,7 +1268,7 @@ LINT_CPP_EXCLUDE += $(wildcard test/js-native-api/??_*/*.cc test/js-native-api/?
LINT_CPP_EXCLUDE += src/tracing/trace_event.h src/tracing/trace_event_common.h
LINT_CPP_FILES = $(filter-out $(LINT_CPP_EXCLUDE), $(wildcard \
- benchmark/napi/function_call/binding.cc \
+ benchmark/napi/*/*.cc \
src/*.c \
src/*.cc \
src/*.h \
diff --git a/README.md b/README.md
index 75ecb02a2b85e0..6e3a1d80be11d0 100644
--- a/README.md
+++ b/README.md
@@ -153,8 +153,6 @@ For information about the governance of the Node.js project, see
### TSC (Technical Steering Committee)
-* [addaleax](https://github.com/addaleax) -
-**Anna Henningsen** <anna@addaleax.net> (she/her)
* [apapirovski](https://github.com/apapirovski) -
**Anatoli Papirovski** <apapirovski@mac.com> (he/him)
* [BethGriggs](https://github.com/BethGriggs) -
@@ -196,6 +194,8 @@ For information about the governance of the Node.js project, see
### TSC Emeriti
+* [addaleax](https://github.com/addaleax) -
+**Anna Henningsen** <anna@addaleax.net> (she/her)
* [bnoordhuis](https://github.com/bnoordhuis) -
**Ben Noordhuis** <info@bnoordhuis.nl>
* [chrisdickinson](https://github.com/chrisdickinson) -
diff --git a/benchmark/napi/function_args/binding.cc b/benchmark/napi/function_args/binding.cc
index 9f250aaa83db50..2c54dd424d405d 100644
--- a/benchmark/napi/function_args/binding.cc
+++ b/benchmark/napi/function_args/binding.cc
@@ -2,18 +2,20 @@
#include
#include
-using v8::Isolate;
+using v8::Array;
+using v8::ArrayBuffer;
+using v8::ArrayBufferView;
+using v8::BackingStore;
using v8::Context;
+using v8::FunctionCallbackInfo;
+using v8::Isolate;
using v8::Local;
using v8::MaybeLocal;
-using v8::Value;
using v8::Number;
-using v8::String;
using v8::Object;
-using v8::Array;
-using v8::ArrayBufferView;
-using v8::ArrayBuffer;
-using v8::FunctionCallbackInfo;
+using v8::String;
+using v8::Uint32;
+using v8::Value;
void CallWithString(const FunctionCallbackInfo& args) {
assert(args.Length() == 1 && args[0]->IsString());
@@ -22,7 +24,7 @@ void CallWithString(const FunctionCallbackInfo& args) {
const int32_t length = str->Utf8Length(args.GetIsolate()) + 1;
char* buf = new char[length];
str->WriteUtf8(args.GetIsolate(), buf, length);
- delete [] buf;
+ delete[] buf;
}
}
@@ -31,7 +33,7 @@ void CallWithArray(const FunctionCallbackInfo& args) {
if (args.Length() == 1 && args[0]->IsArray()) {
const Local array = args[0].As();
uint32_t length = array->Length();
- for (uint32_t i = 0; i < length; ++ i) {
+ for (uint32_t i = 0; i < length; i++) {
Local v;
v = array->Get(args.GetIsolate()->GetCurrentContext(),
i).ToLocalChecked();
@@ -101,12 +103,10 @@ void CallWithTypedarray(const FunctionCallbackInfo& args) {
const size_t byte_length = view->ByteLength();
assert(byte_length > 0);
assert(view->HasBuffer());
- Local buffer;
- buffer = view->Buffer();
- ArrayBuffer::Contents contents;
- contents = buffer->GetContents();
+ Local buffer = view->Buffer();
+ std::shared_ptr bs = buffer->GetBackingStore();
const uint32_t* data = reinterpret_cast(
- static_cast(contents.Data()) + byte_offset);
+ static_cast(bs->Data()) + byte_offset);
assert(data);
}
}
@@ -114,11 +114,11 @@ void CallWithTypedarray(const FunctionCallbackInfo& args) {
void CallWithArguments(const FunctionCallbackInfo& args) {
assert(args.Length() > 1 && args[0]->IsNumber());
if (args.Length() > 1 && args[0]->IsNumber()) {
- int32_t loop = args[0].As()->Value();
+ int32_t loop = args[0].As()->Value();
for (int32_t i = 1; i < loop; ++i) {
assert(i < args.Length());
assert(args[i]->IsUint32());
- args[i].As()->Value();
+ args[i].As()->Value();
}
}
}
diff --git a/benchmark/process/resourceUsage.js b/benchmark/process/resourceUsage.js
new file mode 100644
index 00000000000000..83871db680b3b7
--- /dev/null
+++ b/benchmark/process/resourceUsage.js
@@ -0,0 +1,14 @@
+'use strict';
+
+const common = require('../common.js');
+const bench = common.createBenchmark(main, {
+ n: [1e5]
+});
+
+function main({ n }) {
+ bench.start();
+ for (let i = 0; i < n; i++) {
+ process.resourceUsage();
+ }
+ bench.end(n);
+}
diff --git a/common.gypi b/common.gypi
index 3ec4581ea811fb..0025a6782f36a2 100644
--- a/common.gypi
+++ b/common.gypi
@@ -36,7 +36,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.12',
+ 'v8_embedder_string': '-node.13',
##### V8 defaults for Node.js #####
@@ -54,6 +54,9 @@
# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
+ # Sets -dOBJECT_PRINT.
+ 'v8_enable_object_print%': 1,
+
# https://github.com/nodejs/node/pull/22920/files#r222779926
'v8_enable_handle_zapping': 0,
diff --git a/configure.py b/configure.py
index 749692b9e2d69b..ff09f27f4d14af 100755
--- a/configure.py
+++ b/configure.py
@@ -392,6 +392,11 @@
dest='v8_options',
help='v8 options to pass, see `node --v8-options` for examples.')
+parser.add_option('--with-ossfuzz',
+ action='store_true',
+ dest='ossfuzz',
+ help='Enables building of fuzzers. This command should be run in an OSS-Fuzz Docker image.')
+
parser.add_option('--with-arm-float-abi',
action='store',
dest='arm_float_abi',
@@ -659,6 +664,12 @@
'memory footprint, but also implies no just-in-time compilation ' +
'support, thus much slower execution)')
+parser.add_option('--v8-enable-object-print',
+ action='store_true',
+ dest='v8_enable_object_print',
+ default=True,
+ help='compile V8 with auxiliar functions for native debuggers')
+
parser.add_option('--node-builtin-modules-path',
action='store',
dest='node_builtin_modules_path',
@@ -1266,6 +1277,7 @@ def configure_v8(o):
o['variables']['v8_no_strict_aliasing'] = 1 # Work around compiler bugs.
o['variables']['v8_optimized_debug'] = 0 if options.v8_non_optimized_debug else 1
o['variables']['dcheck_always_on'] = 1 if options.v8_with_dchecks else 0
+ o['variables']['v8_enable_object_print'] = 1 if options.v8_enable_object_print else 0
o['variables']['v8_random_seed'] = 0 # Use a random seed for hash tables.
o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks.
o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1
@@ -1763,6 +1775,9 @@ def make_bin_override():
configure_static(output)
configure_inspector(output)
+# Forward OSS-Fuzz settings
+output['variables']['ossfuzz'] = b(options.ossfuzz)
+
# variables should be a root level element,
# move everything else to target_defaults
variables = output['variables']
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index 427166a068bf50..c390455e200fbe 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -702,3 +702,8 @@ vanishcode
Jean-Charles Sisk
Martin Packman
Danielle Adams
+Gianfranco Costamagna
+Antonio
+Sandra Tatarevićová
+Antoine du Hamel
+Assaf Sapir
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index f8f356d46cf026..0f07a687af988e 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,3 +1,37 @@
+## 6.14.8 (2020-08-17)
+
+### BUG FIXES
+* [`9262e8c88`](https://github.com/npm/cli/commit/9262e8c88f2f828206423928b8e21eea67f4801a)
+ [#1575](https://github.com/npm/cli/pull/1575)
+ npm install --dev deprecation message
+ ([@sandratatarevicova](https://github.com/sandratatarevicova))
+* [`765cfe0bc`](https://github.com/npm/cli/commit/765cfe0bc05a10b72026291ff0ca7c9ca5cb3f57)
+ [#1658](https://github.com/npm/cli/issues/1658)
+ remove unused broken require
+ ([@aduh95](https://github.com/aduh95))
+* [`4e28de79a`](https://github.com/npm/cli/commit/4e28de79a3a0aacc7603010a592beb448ceb6f5f)
+ [#1663](https://github.com/npm/cli/pull/1663)
+ Do not send user secret in the referer header
+ ([@assapir](https://github.com/assapir))
+
+### DOCUMENTATION
+* [`8abdf30c9`](https://github.com/npm/cli/commit/8abdf30c95ec90331456f3f2ed78e2703939bb74)
+ [#1572](https://github.com/npm/cli/pull/1572)
+ docs: add missing metadata in semver page
+ ([@tripu](https://github.com/tripu))
+* [`8cedcca46`](https://github.com/npm/cli/commit/8cedcca464ced5aab58be83dd5049c3df13384de)
+ [#1614](https://github.com/npm/cli/pull/1614)
+ Node-gyp supports both Python and legacy Python
+ ([@cclauss](https://github.com/cclauss))
+
+### DEPENDENCIES
+* [`a303b75fd`](https://github.com/npm/cli/commit/a303b75fd7c4b2644da02ad2ad46d80dfceec3c5)
+ `update-notifier@2.5.0`
+* [`c48600832`](https://github.com/npm/cli/commit/c48600832aff4cc349f59997e08dc4bbde15bd49)
+ `npm-registry-fetch@4.0.7`
+* [`a6e9fc4df`](https://github.com/npm/cli/commit/a6e9fc4df7092ba3eb5394193638b33c24855c36)
+ `meant@1.0.2`:
+
## 6.14.7 (2020-07-21)
### BUG FIXES
diff --git a/deps/npm/docs/content/cli-commands/npm.md b/deps/npm/docs/content/cli-commands/npm.md
index 2d9789dd77c1c6..d95d24f7e0f764 100644
--- a/deps/npm/docs/content/cli-commands/npm.md
+++ b/deps/npm/docs/content/cli-commands/npm.md
@@ -60,8 +60,7 @@ requires compiling of C++ Code, npm will use
[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/nodejs/node-gyp).
+Python and Microsoft Visual Studio C++ are needed.
For more information visit
[the node-gyp repository](https://github.com/nodejs/node-gyp) and
the [node-gyp Wiki](https://github.com/nodejs/node-gyp/wiki).
diff --git a/deps/npm/docs/content/using-npm/semver.md b/deps/npm/docs/content/using-npm/semver.md
index 92c6381b7fe850..d8d7e1453ced7f 100644
--- a/deps/npm/docs/content/using-npm/semver.md
+++ b/deps/npm/docs/content/using-npm/semver.md
@@ -1,3 +1,9 @@
+---
+section: using-npm
+title: semver
+description: The semantic versioner for npm
+---
+
semver(7) -- The semantic versioner for npm
===========================================
diff --git a/deps/npm/docs/public/cli-commands/npm-access/index.html b/deps/npm/docs/public/cli-commands/npm-access/index.html
index 9ad76a3e9f5e91..1078ec62acb94c 100644
--- a/deps/npm/docs/public/cli-commands/npm-access/index.html
+++ b/deps/npm/docs/public/cli-commands/npm-access/index.html
@@ -74,7 +74,7 @@
}
}
})
-
