Merge branch 'main' into fix-49848

Author: MrJithil

.eslintrc.js

@@ -361,5 +361,6 @@ module.exports = {
     WritableStream: 'readable',
     WritableStreamDefaultWriter: 'readable',
     WritableStreamDefaultController: 'readable',
+    WebSocket: 'readable',
   },
 };

.github/CODEOWNERS

@@ -20,10 +20,10 @@
 /LICENSE @nodejs/tsc
 /onboarding.md @nodejs/tsc
 
-# website
-/doc/api_assets @nodejs/website
-/doc/template.html @nodejs/website
-/tools/doc @nodejs/website
+# nodejs.org website
+/doc/api_assets @nodejs/nodejs-website
+/doc/template.html @nodejs/nodejs-website
+/tools/doc @nodejs/web-infra
 
 # streams
 

CHANGELOG.md

@@ -34,7 +34,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V20.md#20.7.0">20.7.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V20.md#20.8.0">20.8.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V20.md#20.7.0">20.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V20.md#20.6.1">20.6.1</a><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/>

android_configure.py

@@ -70,6 +70,7 @@ def patch_android():
 GYP_DEFINES += " v8_target_arch=" + arch
 GYP_DEFINES += " android_target_arch=" + arch
 GYP_DEFINES += " host_os=" + host_os + " OS=android"
+GYP_DEFINES += " android_ndk_path=" + android_ndk_path
 os.environ['GYP_DEFINES'] = GYP_DEFINES
 
 if os.path.exists("./configure"):

benchmark/error/format-list.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const common = require('../common.js');
+
+const bench = common.createBenchmark(main, {
+  n: [1e7],
+  input: [
+    '',
+    'a',
+    'a,b',
+    'a,b,c',
+    'a,b,c,d',
+  ],
+  type: [
+    'undefined',
+    'and',
+    'or',
+  ],
+}, {
+  flags: ['--expose-internals'],
+});
+
+function main({ n, input, type }) {
+  const {
+    formatList,
+  } = require('internal/errors');
+
+  const list = input.split(',');
+
+  if (type === 'undefined') {
+    bench.start();
+    for (let i = 0; i < n; ++i) {
+      formatList(list);
+    }
+    bench.end(n);
+    return;
+  }
+
+  bench.start();
+  for (let i = 0; i < n; ++i) {
+    formatList(list, type);
+  }
+  bench.end(n);
+}

benchmark/streams/writable-manywrites.js

@@ -4,7 +4,7 @@ const common = require('../common');
 const Writable = require('stream').Writable;
 
 const bench = common.createBenchmark(main, {
-  n: [2e6],
+  n: [1e5],
   sync: ['yes', 'no'],
   writev: ['yes', 'no'],
   callback: ['yes', 'no'],
@@ -13,7 +13,7 @@ const bench = common.createBenchmark(main, {
 
 function main({ n, sync, writev, callback, len }) {
   const b = Buffer.allocUnsafe(len);
-  const s = new Writable();
+  const s = new Writable({ highWaterMark: 16 * 1024 });
   sync = sync === 'yes';
 
   const writecb = (cb) => {

common.gypi

@@ -230,7 +230,7 @@
             ],
           },],
           ['OS == "android"', {
-            'cflags': [ '-fPIC' ],
+            'cflags': [ '-fPIC', '-I<(android_ndk_path)/sources/android/cpufeatures' ],
             'ldflags': [ '-fPIC' ]
           }],
         ],

deps/openssl/openssl-cl_asm.gypi

@@ -1,6 +1,6 @@
 {
   'conditions': [
-    ['target_arch=="ppc64" and OS=="aix"', {
+    ['target_arch=="ppc64" and OS in ("aix", "os400")', {
       'includes': ['config/archs/aix64-gcc-as/asm/openssl-cl.gypi'],
     }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
       'includes': ['config/archs/linux-ppc64le/asm/openssl-cl.gypi'],

deps/openssl/openssl-cl_asm_avx2.gypi

@@ -1,6 +1,6 @@
 {
   'conditions': [
-    ['target_arch=="ppc64" and OS=="aix"', {
+    ['target_arch=="ppc64" and OS in ("aix", "os400")', {
       'includes': ['config/archs/aix64-gcc-as/asm_avx2/openssl-cl.gypi'],
     }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
       'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi'],

deps/openssl/openssl-cl_no_asm.gypi

@@ -1,6 +1,6 @@
 {
   'conditions': [
-    ['target_arch=="ppc64" and OS=="aix"', {
+    ['target_arch=="ppc64" and OS in ("aix", "os400")', {
       'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'],
     }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
       'includes': ['config/archs/linux-ppc64le/no-asm/openssl-cl.gypi'],