Merge pull request #1005 from nodejs/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/label-pr-config.yml

@@ -33,6 +33,7 @@ subSystemLabels:
   /^src\/quic\/*/: c++, quic
   /^src\/node_bob*/: c++, quic
   /^src\/node_sea/: single-executable
+  /^src\/node_sqlite.*/: c++, sqlite
 
   # Properly label changes to V8 inspector integration-related files
   /^src\/inspector_/: c++, inspector, needs-ci

.github/workflows/test-asan.yml

@@ -38,7 +38,7 @@ permissions:
 
 jobs:
   test-asan:
-    if: github.event.pull_request.draft == false
+    if: false  # Temporarily disabled. References: https://github.com/nodejs/node/pull/52374, https://github.com/nodejs/node/pull/53651#issuecomment-2198510810
     runs-on: ubuntu-20.04
     env:
       CC: sccache clang

.github/workflows/tools.yml

@@ -31,6 +31,7 @@ on:
           - lint-md-dependencies
           - llhttp
           - minimatch
+          - nbytes
           - nghttp2
           - nghttp3
           - ngtcp2
@@ -220,6 +221,14 @@ jobs:
               cat temp-output
               tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
               rm temp-output
+          - id: nbytes
+            subsystem: deps
+            label: dependencies
+            run: |
+              ./tools/dep_updaters/update-nbytes.sh > temp-output
+              cat temp-output
+              tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
+              rm temp-output
           - id: nghttp2
             subsystem: deps
             label: dependencies

.mailmap

@@ -586,7 +586,7 @@ xiaoyu <[email protected]>
 Xu Meng <[email protected]> <[email protected]>
 Xuguang Mei <[email protected]> <[email protected]>
 Yael Hermon <[email protected]> <[email protected]>
-Yagiz Nizipli <yagiz[email protected]> <yagiz@nizipli.com>
+Yagiz Nizipli <yagiz@nizipli.com> <yagiz.nizipli@sentry.io>
 Yang Guo <[email protected]>
 Yash Ladha <[email protected]> <[email protected]>
 Yash Ladha <[email protected]> <[email protected]>

CHANGELOG.md

@@ -38,7 +38,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V22.md#22.4.1">22.4.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V22.md#22.5.0">22.5.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V22.md#22.4.1">22.4.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.4.0">22.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.3.0">22.3.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.2.0">22.2.0</a><br/>

LICENSE

@@ -2378,3 +2378,28 @@ The externally maintained libraries used by Node.js are:
     OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   """
+
+- on-exit-leak-free, located at lib/internal/process/finalization, is licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) 2021 Matteo Collina
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """

Makefile

@@ -1003,7 +1003,7 @@ else
 BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
 endif
 BINARYTAR=$(BINARYNAME).tar
-# OSX doesn't have xz installed by default, http://macpkg.sourceforge.net/
+# macOS doesn't have xz installed by default, http://macpkg.sourceforge.net/
 HAS_XZ ?= $(shell command -v xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
 # Supply SKIP_XZ=1 to explicitly skip .tar.xz creation
 SKIP_XZ ?= 0

README.md

@@ -164,13 +164,15 @@ For information about the governance of the Node.js project, see
 
 * [aduh95](https://github.com/aduh95) -
   **Antoine du Hamel** <<[email protected]>> (he/him)
+* [anonrig](https://github.com/anonrig) -
+  **Yagiz Nizipli** <<[email protected]>> (he/him)
 * [apapirovski](https://github.com/apapirovski) -
   **Anatoli Papirovski** <<[email protected]>> (he/him)
 * [benjamingr](https://github.com/benjamingr) -
   **Benjamin Gruenbaum** <<[email protected]>>
 * [BridgeAR](https://github.com/BridgeAR) -
   **Ruben Bridgewater** <<[email protected]>> (he/him)
-* [GeoffreyBooth](https://github.com/geoffreybooth) -
+* [GeoffreyBooth](https://github.com/GeoffreyBooth) -
   **Geoffrey Booth** <<[email protected]>> (he/him)
 * [gireeshpunathil](https://github.com/gireeshpunathil) -
   **Gireesh Punathil** <<[email protected]>> (he/him)
@@ -205,8 +207,6 @@ For information about the governance of the Node.js project, see
 
 #### TSC regular members
 
-* [anonrig](https://github.com/anonrig) -
-  **Yagiz Nizipli** <<[email protected]>> (he/him)
 * [BethGriggs](https://github.com/BethGriggs) -
   **Beth Griggs** <<[email protected]>> (she/her)
 * [bnoordhuis](https://github.com/bnoordhuis) -
@@ -292,7 +292,7 @@ For information about the governance of the Node.js project, see
 * [aduh95](https://github.com/aduh95) -
   **Antoine du Hamel** <<[email protected]>> (he/him)
 * [anonrig](https://github.com/anonrig) -
-  **Yagiz Nizipli** <<yagiz[email protected]>> (he/him)
+  **Yagiz Nizipli** <<yagiz@nizipli.com>> (he/him)
 * [apapirovski](https://github.com/apapirovski) -
   **Anatoli Papirovski** <<[email protected]>> (he/him)
 * [atlowChemi](https://github.com/atlowChemi) -
@@ -329,7 +329,7 @@ For information about the governance of the Node.js project, see
   **Deokjin Kim** <<[email protected]>> (he/him)
 * [edsadr](https://github.com/edsadr) -
   **Adrian Estrada** <<[email protected]>> (he/him)
-* [erickwendel](https://github.com/erickwendel) -
+* [ErickWendel](https://github.com/ErickWendel) -
   **Erick Wendel** <<[email protected]>> (he/him)
 * [Ethan-Arrowood](https://github.com/Ethan-Arrowood) -
   **Ethan Arrowood** <<[email protected]>> (he/him)
@@ -343,7 +343,7 @@ For information about the governance of the Node.js project, see
   **Gabriel Schulhof** <<[email protected]>>
 * [gengjiawen](https://github.com/gengjiawen) -
   **Jiawen Geng** <<[email protected]>>
-* [GeoffreyBooth](https://github.com/geoffreybooth) -
+* [GeoffreyBooth](https://github.com/GeoffreyBooth) -
   **Geoffrey Booth** <<[email protected]>> (he/him)
 * [gireeshpunathil](https://github.com/gireeshpunathil) -
   **Gireesh Punathil** <<[email protected]>> (he/him)
@@ -379,7 +379,7 @@ For information about the governance of the Node.js project, see
   **Chengzhong Wu** <<[email protected]>> (he/him)
 * [lemire](https://github.com/lemire) -
   **Daniel Lemire** <<[email protected]>>
-* [linkgoron](https://github.com/linkgoron) -
+* [Linkgoron](https://github.com/Linkgoron) -
   **Nitzan Uziely** <<[email protected]>>
 * [LiviaMedeiros](https://github.com/LiviaMedeiros) -
   **LiviaMedeiros** <<[email protected]>>
@@ -405,8 +405,6 @@ For information about the governance of the Node.js project, see
   **Moshe Atlow** <<[email protected]>> (he/him)
 * [MrJithil](https://github.com/MrJithil) -
   **Jithil P Ponnan** <<[email protected]>> (he/him)
-* [MylesBorins](https://github.com/MylesBorins) -
-  **Myles Borins** <<[email protected]>> (he/him)
 * [ovflowd](https://github.com/ovflowd) -
   **Claudio Wunder** <<[email protected]>> (he/they)
 * [panva](https://github.com/panva) -
@@ -445,7 +443,7 @@ For information about the governance of the Node.js project, see
   **Trivikram Kamat** <<[email protected]>>
 * [Trott](https://github.com/Trott) -
   **Rich Trott** <<[email protected]>> (he/him)
-* [UlisesGascon](https://github.com/ulisesgascon) -
+* [UlisesGascon](https://github.com/UlisesGascon) -
   **Ulises Gascón** <<[email protected]>> (he/him)
 * [vmoroz](https://github.com/vmoroz) -
   **Vladimir Morozov** <<[email protected]>> (he/him)
@@ -609,6 +607,8 @@ For information about the governance of the Node.js project, see
   **Chen Gang** <<[email protected]>>
 * [mscdex](https://github.com/mscdex) -
   **Brian White** <<[email protected]>>
+* [MylesBorins](https://github.com/MylesBorins) -
+  **Myles Borins** <<[email protected]>> (he/him)
 * [not-an-aardvark](https://github.com/not-an-aardvark) -
   **Teddy Katz** <<[email protected]>> (he/him)
 * [ofrobots](https://github.com/ofrobots) -

benchmark/esm/require-esm.js

@@ -0,0 +1,79 @@
+'use strict';
+
+const common = require('../common');
+const fs = require('fs');
+const tmpdir = require('../../test/common/tmpdir');
+const path = require('path');
+const assert = require('assert');
+
+const bench = common.createBenchmark(main, {
+  type: ['all', 'access', 'load'],
+  exports: ['default', 'named'],
+  n: [1000],
+}, {
+  flags: ['--experimental-require-module', '--no-warnings'],
+});
+
+function prepare(count, useDefault) {
+  tmpdir.refresh();
+  const dir = tmpdir.resolve('modules');
+  fs.mkdirSync(dir, { recursive: true });
+  let mainSource = '';
+  let useSource = 'exports.access = function() { return 0';
+  for (let i = 0; i < count; ++i) {
+    let modSource = `const value${i} = 1;\n`;
+    if (useDefault) {
+      modSource += `export default { value${i} }\n`;
+    } else {
+      modSource += `export { value${i} };\n`;
+    }
+    const filename = `mod${i}.mjs`;
+    fs.writeFileSync(
+      path.resolve(dir, filename),
+      modSource,
+      'utf8',
+    );
+    mainSource += `const mod${i} = require('./modules/${filename}');\n`;
+    if (useDefault) {
+      useSource += ` + mod${i}.default.value${i}`;
+    } else {
+      useSource += ` + mod${i}.value${i}`;
+    }
+  }
+  useSource += '; };\n';
+  const script = tmpdir.resolve('main.js');
+  fs.writeFileSync(script, mainSource + useSource, 'utf8');
+  return script;
+}
+
+function main({ n, exports, type }) {
+  const script = prepare(n, exports === 'default');
+  switch (type) {
+    case 'all': {
+      bench.start();
+      const result = require(script).access();
+      bench.end(n);
+      assert.strictEqual(result, n);
+      break;
+    }
+    case 'access': {
+      const { access } = require(script);
+      bench.start();
+      let result = access();
+      for (let i = 0; i < 99; ++i) {
+        result = access();
+      }
+      bench.end(n * 100);
+      assert.strictEqual(result, n);
+      break;
+    }
+    case 'load': {
+      bench.start();
+      const { access } = require(script);
+      bench.end(n);
+      const result = access();
+      assert.strictEqual(result, n);
+      break;
+    }
+  }
+}

configure.py

@@ -164,14 +164,14 @@
     dest="fully_static",
     default=None,
     help="Generate an executable without external dynamic libraries. This "
-         "will not work on OSX when using the default compilation environment")
+         "will not work on macOS when using the default compilation environment")
 
 parser.add_argument("--partly-static",
     action="store_true",
     dest="partly_static",
     default=None,
     help="Generate an executable with libgcc and libstdc++ libraries. This "
-         "will not work on OSX when using the default compilation environment")
+         "will not work on macOS when using the default compilation environment")
 
 parser.add_argument("--enable-vtune-profiling",
     action="store_true",
@@ -1744,7 +1744,7 @@ def without_ssl_error(option):
 def configure_static(o):
   if options.fully_static or options.partly_static:
     if flavor == 'mac':
-      warn("Generation of static executable will not work on OSX "
+      warn("Generation of static executable will not work on macOS "
             "when using the default compilation environment")
       return