Merge branch 'main' into android-configure

Author: MeowShe

.github/label-pr-config.yml

@@ -21,7 +21,7 @@ subSystemLabels:
   /^src\/tty_/: c++, tty
   /^src\/node_url/: c++, whatwg-url
   /^src\/node_util/: c++, util
-  /^src\/(?:node_v8|v8abbr)/: c++, v8 engine
+  /^src\/node_v8/: c++, v8 engine
   /^src\/node_contextify/: c++, vm
   /^src\/.*win32.*/: c++, windows
   /^src\/node_zlib/: c++, zlib
@@ -101,6 +101,7 @@ subSystemLabels:
   /^lib\/worker_threads.js$/: worker
   /^lib\/internal\/url\.js$/: whatwg-url
   /^lib\/internal\/modules\/esm/: esm
+  /^lib\/internal\/webstreams/: web streams
 
   # All other lib/ files map directly
   /^lib\/_(\w+)_\w+\.js?$/: $1  # e.g. _(stream)_wrap
@@ -123,6 +124,7 @@ exlusiveLabels:
   /^test\/report\//: test, report
   /^test\/fixtures\/es-module/: test, esm
   /^test\/es-module\//: test, esm
+  /^test\/fixtures\/wpt\/streams//: test, web streams
 
   /^test\//: test
 

.mailmap

@@ -200,6 +200,7 @@ Hannes Magnusson <[email protected]> <[email protected]>
 Hassaan Pasha <[email protected]> <[email protected]>
 Hendrik Schwalm <[email protected]>
 Henry Chin <[email protected]>
+Nick Sia <[email protected]> <[email protected]>
 Herbert Vojčík <[email protected]>
 Hitesh Kanwathirtha <[email protected]> <[email protected]>
 Icer Liang <[email protected]> <[email protected]>

AUTHORS

@@ -3503,5 +3503,16 @@ NicoNekoru <[email protected]>
 SADIK KUZU <[email protected]>
 flakey5 <[email protected]>
 Saurabh Daware <[email protected]>
+BuShe <[email protected]>
+Nick Sia <[email protected]>
+Basit Chonka <[email protected]>
+Jeremiah Gowdy <[email protected]>
+Matthew Peveler <[email protected]>
+Wing <[email protected]>
+Hana <[email protected]>
+Jeff Dickey <[email protected]>
+Matías Zúñiga <[email protected]>
+metonym <[email protected]>
+Brian Evans <[email protected]>
 
 # Generated by tools/update-authors.mjs

CHANGELOG.md

@@ -35,7 +35,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V18.md#18.7.0">18.7.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V18.md#18.8.0">18.8.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V18.md#18.7.0">18.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.6.0">18.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.5.0">18.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.4.0">18.4.0</a><br/>
@@ -62,7 +63,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V17.md#17.0.0">17.0.0</a><br/>
     </td>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V16.md#16.16.0">16.16.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V16.md#16.17.0">16.17.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V16.md#16.16.0">16.16.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V16.md#16.15.1">16.15.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V16.md#16.15.0">16.15.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V16.md#16.14.2">16.14.2</a><br/>

LICENSE

@@ -55,7 +55,7 @@ The externally maintained libraries used by Node.js are:
   """
     MIT License
 
-    Copyright (C) 2012-2020 by various contributors (see AUTHORS)
+    Copyright (C) 2012-2022 by various contributors (see AUTHORS)
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -115,6 +115,7 @@ $(NODE_EXE) $(NODE_G_EXE): config.gypi out/Makefile
 	  ln -fs out/${build_type}/$(NODE_EXE) $@; fi
 else
 ifeq ($(BUILD_WITH), ninja)
+NINJA ?= ninja
 ifeq ($(V),1)
 	NINJA_ARGS := $(NINJA_ARGS) -v
 endif
@@ -124,11 +125,11 @@ else
 	NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
 endif
 $(NODE_EXE): config.gypi out/Release/build.ninja
-	ninja -C out/Release $(NINJA_ARGS)
+	$(NINJA) -C out/Release $(NINJA_ARGS)
 	if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi
 
 $(NODE_G_EXE): config.gypi out/Debug/build.ninja
-	ninja -C out/Debug $(NINJA_ARGS)
+	$(NINJA) -C out/Debug $(NINJA_ARGS)
 	if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
 else
 $(NODE_EXE) $(NODE_G_EXE):

README.md

@@ -296,6 +296,10 @@ For information about the governance of the Node.js project, see
   **Colin Ihrig** <<[email protected]>> (he/him)
 * [codebytere](https://github.com/codebytere) -
   **Shelley Vohr** <<[email protected]>> (she/her)
+* [cola119](https://github.com/cola119) -
+  **Kohei Ueno** <<[email protected]>> (he/him)
+* [daeyeon](https://github.com/daeyeon) -
+  **Daeyeon Jeong** <<[email protected]>> (he/him)
 * [danbev](https://github.com/danbev) -
   **Daniel Bevenius** <<[email protected]>> (he/him)
 * [danielleadams](https://github.com/danielleadams) -
@@ -382,6 +386,8 @@ For information about the governance of the Node.js project, see
   **Milad Fa** <<[email protected]>> (he/him)
 * [mildsunrise](https://github.com/mildsunrise) -
   **Alba Mendez** <<[email protected]>> (she/her)
+* [MoLow](https://github.com/MoLow) -
+  **Moshe Atlow** <<[email protected]>> (he/him)
 * [mscdex](https://github.com/mscdex) -
   **Brian White** <<[email protected]>>
 * [MylesBorins](https://github.com/MylesBorins) -

benchmark/fs/readfile-partitioned.js

@@ -17,12 +17,13 @@ const zlib = require('zlib');
 const assert = require('assert');
 
 const bench = common.createBenchmark(main, {
-  dur: [5],
+  duration: [5],
+  encoding: ['', 'utf-8'],
   len: [1024, 16 * 1024 * 1024],
   concurrent: [1, 10]
 });
 
-function main({ len, dur, concurrent }) {
+function main({ len, duration, concurrent, encoding }) {
   try {
     fs.unlinkSync(filename);
   } catch {
@@ -47,10 +48,10 @@ function main({ len, dur, concurrent }) {
     } catch {
       // Continue regardless of error.
     }
-  }, dur * 1000);
+  }, duration * 1000);
 
   function read() {
-    fs.readFile(filename, afterRead);
+    fs.readFile(filename, encoding, afterRead);
   }
 
   function afterRead(er, data) {

benchmark/fs/readfile-promises.js

@@ -15,11 +15,12 @@ const filename = path.resolve(tmpdir.path,
 
 const bench = common.createBenchmark(main, {
   duration: [5],
+  encoding: ['', 'utf-8'],
   len: [1024, 16 * 1024 * 1024],
   concurrent: [1, 10]
 });
 
-function main({ len, duration, concurrent }) {
+function main({ len, duration, concurrent, encoding }) {
   try {
     fs.unlinkSync(filename);
   } catch {
@@ -44,7 +45,7 @@ function main({ len, duration, concurrent }) {
   }, duration * 1000);
 
   function read() {
-    fs.promises.readFile(filename)
+    fs.promises.readFile(filename, encoding)
       .then((res) => afterRead(undefined, res))
       .catch((err) => afterRead(err));
   }

benchmark/fs/readfile.js

@@ -15,11 +15,12 @@ const filename = path.resolve(tmpdir.path,
 
 const bench = common.createBenchmark(main, {
   duration: [5],
+  encoding: ['', 'utf-8'],
   len: [1024, 16 * 1024 * 1024],
   concurrent: [1, 10]
 });
 
-function main({ len, duration, concurrent }) {
+function main({ len, duration, concurrent, encoding }) {
   try {
     fs.unlinkSync(filename);
   } catch {
@@ -44,7 +45,7 @@ function main({ len, duration, concurrent }) {
   }, duration * 1000);
 
   function read() {
-    fs.readFile(filename, afterRead);
+    fs.readFile(filename, encoding, afterRead);
   }
 
   function afterRead(er, data) {