Merge branch 'main' into backport-script

Author: joyeecheung

CHANGELOG.md

@@ -35,7 +35,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V20.md#20.6.0">20.6.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V20.md#20.6.1">20.6.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V20.md#20.6.0">20.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V20.md#20.5.1">20.5.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V20.md#20.5.0">20.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V20.md#20.4.0">20.4.0</a><br/>

Makefile

@@ -1423,6 +1423,7 @@ FORMAT_CPP_FILES += $(LINT_CPP_FILES)
 # C source codes.
 FORMAT_CPP_FILES += $(wildcard \
 	benchmark/napi/*/*.c \
+	test/js-native-api/*.h \
 	test/js-native-api/*/*.c \
 	test/js-native-api/*/*.h \
 	test/node-api/*/*.c \

benchmark/webstreams/creation.js

@@ -2,47 +2,99 @@
 const common = require('../common.js');
 const {
   ReadableStream,
+  ReadableStreamDefaultReader,
+  ReadableStreamBYOBReader,
   TransformStream,
   WritableStream,
 } = require('node:stream/web');
 const assert = require('assert');
 
 const bench = common.createBenchmark(main, {
   n: [50e3],
-  kind: ['ReadableStream', 'TransformStream', 'WritableStream'],
+  kind: [
+    'ReadableStream',
+    'TransformStream',
+    'WritableStream',
+
+    'ReadableStreamDefaultReader',
+    'ReadableStreamBYOBReader',
+
+    'ReadableStream.tee',
+  ],
 });
 
-let rs, ws, ts;
+let readableStream;
+let transformStream;
+let writableStream;
+let readableStreamDefaultReader;
+let readableStreamBYOBReader;
+let teeResult;
 
 function main({ n, kind }) {
   switch (kind) {
     case 'ReadableStream':
       bench.start();
       for (let i = 0; i < n; ++i)
-        rs = new ReadableStream();
+        readableStream = new ReadableStream();
       bench.end(n);
 
       // Avoid V8 deadcode (elimination)
-      assert.ok(rs);
+      assert.ok(readableStream);
       break;
     case 'WritableStream':
       bench.start();
       for (let i = 0; i < n; ++i)
-        ws = new WritableStream();
+        writableStream = new WritableStream();
       bench.end(n);
 
       // Avoid V8 deadcode (elimination)
-      assert.ok(ws);
+      assert.ok(writableStream);
       break;
     case 'TransformStream':
       bench.start();
       for (let i = 0; i < n; ++i)
-        ts = new TransformStream();
+        transformStream = new TransformStream();
+      bench.end(n);
+
+      // Avoid V8 deadcode (elimination)
+      assert.ok(transformStream);
+      break;
+    case 'ReadableStreamDefaultReader': {
+      const readers = Array.from({ length: n }, () => new ReadableStream());
+
+      bench.start();
+      for (let i = 0; i < n; ++i)
+        readableStreamDefaultReader = new ReadableStreamDefaultReader(readers[i]);
+      bench.end(n);
+
+      // Avoid V8 deadcode (elimination)
+      assert.ok(readableStreamDefaultReader);
+      break;
+    }
+    case 'ReadableStreamBYOBReader': {
+      const readers = Array.from({ length: n }, () => new ReadableStream({ type: 'bytes' }));
+
+      bench.start();
+      for (let i = 0; i < n; ++i)
+        readableStreamBYOBReader = new ReadableStreamBYOBReader(readers[i]);
+      bench.end(n);
+
+      // Avoid V8 deadcode (elimination)
+      assert.ok(readableStreamBYOBReader);
+      break;
+    }
+    case 'ReadableStream.tee': {
+      const streams = Array.from({ length: n }, () => new ReadableStream());
+
+      bench.start();
+      for (let i = 0; i < n; ++i)
+        teeResult = streams[i].tee();
       bench.end(n);
 
       // Avoid V8 deadcode (elimination)
-      assert.ok(ts);
+      assert.ok(teeResult);
       break;
+    }
     default:
       throw new Error('Invalid kind');
   }

benchmark/webstreams/pipe-to.js

@@ -18,7 +18,7 @@ async function main({ n, highWaterMarkR, highWaterMarkW }) {
   const rs = new ReadableStream({
     highWaterMark: highWaterMarkR,
     pull: function(controller) {
-      if (i++ === n) {
+      if (i++ < n) {
         controller.enqueue(b);
       } else {
         controller.close();

deps/npm/README.md

@@ -9,9 +9,8 @@
 
 One of the following versions of [Node.js](https://nodejs.org/en/download/) must be installed to run **`npm`**:
 
-* `14.x.x` >= `14.17.0`
-* `16.x.x` >= `16.13.0`
-* `18.0.0` or higher
+* `18.x.x` >= `18.17.0`
+* `20.5.0` or higher
 
 ### Installation
 

deps/npm/docs/content/commands/npm-install-test.md

@@ -256,6 +256,26 @@ Note: This is NOT honored by other network related commands, eg `dist-tags`,
 
 
 
+#### `cpu`
+
+* Default: null
+* Type: null or String
+
+Override CPU architecture of native modules to install. Acceptable values
+are same as `cpu` field of package.json, which comes from `process.arch`.
+
+
+
+#### `os`
+
+* Default: null
+* Type: null or String
+
+Override OS of native modules to install. Acceptable values are same as `os`
+field of package.json, which comes from `process.platform`.
+
+
+
 #### `workspace`
 
 * Default:

deps/npm/docs/content/commands/npm-install.md

@@ -646,6 +646,26 @@ Note: This is NOT honored by other network related commands, eg `dist-tags`,
 
 
 
+#### `cpu`
+
+* Default: null
+* Type: null or String
+
+Override CPU architecture of native modules to install. Acceptable values
+are same as `cpu` field of package.json, which comes from `process.arch`.
+
+
+
+#### `os`
+
+* Default: null
+* Type: null or String
+
+Override OS of native modules to install. Acceptable values are same as `os`
+field of package.json, which comes from `process.platform`.
+
+
+
 #### `workspace`
 
 * Default:

deps/npm/docs/content/commands/npm-ls.md

@@ -27,7 +27,7 @@ packages will *also* show the paths to the specified packages.  For
 example, running `npm ls promzard` in npm's source tree will show:
 
 ```bash
-npm@10.0.0 /path/to/npm
+npm@10.1.0 /path/to/npm
 └─┬ [email protected]
   └── [email protected]
 ```

deps/npm/docs/content/commands/npm.md

@@ -14,7 +14,7 @@ Note: This command is unaware of workspaces.
 
 ### Version
 
-10.0.0
+10.1.0
 
 ### Description
 

deps/npm/docs/content/using-npm/config.md

@@ -345,6 +345,16 @@ Run git commit hooks when using the `npm version` command.
 
 
 
+#### `cpu`
+
+* Default: null
+* Type: null or String
+
+Override CPU architecture of native modules to install. Acceptable values
+are same as `cpu` field of package.json, which comes from `process.arch`.
+
+
+
 #### `depth`
 
 * Default: `Infinity` if `--all` is set, otherwise `1`
@@ -1038,6 +1048,16 @@ time.
 
 
 
+#### `os`
+
+* Default: null
+* Type: null or String
+
+Override OS of native modules to install. Acceptable values are same as `os`
+field of package.json, which comes from `process.platform`.
+
+
+
 #### `otp`
 
 * Default: null