Merge branch 'main' into patch-2

Author: jcbhmr

.github/workflows/coverage-linux-without-intl.yml

@@ -71,3 +71,4 @@ jobs:
         uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab  # v4.1.0
         with:
           directory: ./coverage
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/coverage-linux.yml

@@ -71,3 +71,4 @@ jobs:
         uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab  # v4.1.0
         with:
           directory: ./coverage
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/coverage-windows.yml

@@ -70,3 +70,4 @@ jobs:
         uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab  # v4.1.0
         with:
           directory: ./coverage
+          token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -36,7 +36,9 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V21.md#21.6.2">21.6.2</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V21.md#21.7.1">21.7.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V21.md#21.7.0">21.7.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V21.md#21.6.2">21.6.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.6.1">21.6.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.6.0">21.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.5.0">21.5.0</a><br/>

README.md

@@ -465,6 +465,8 @@ For information about the governance of the Node.js project, see
   **Trivikram Kamat** <<trivikr.dev@gmail.com>>
 * [Trott](https://github.com/Trott) -
   **Rich Trott** <<rtrott@gmail.com>> (he/him)
+* [UlisesGascon](https://github.com/ulisesgascon) -
+  **Ulises Gascón** <<ulisesgascongonzalez@gmail.com>> (he/him)
 * [vdeturckheim](https://github.com/vdeturckheim) -
   **Vladimir de Turckheim** <<vlad2t@hotmail.com>> (he/him)
 * [vmoroz](https://github.com/vmoroz) -

deps/base64/unofficial.gni

@@ -19,7 +19,7 @@ template("base64_gn_build") {
     } else {
       defines = []
     }
-    if (target_cpu == "x86" || target_cpu == "x64") {
+    if (current_cpu == "x86" || current_cpu == "x64") {
       defines += [
         "HAVE_SSSE3=1",
         "HAVE_SSE41=1",
@@ -29,10 +29,10 @@ template("base64_gn_build") {
         "HAVE_AVX512=1",
       ]
     }
-    if (target_cpu == "arm") {
+    if (current_cpu == "arm") {
       defines += [ "HAVE_NEON32=1" ]
     }
-    if (target_cpu == "arm64") {
+    if (current_cpu == "arm64") {
       defines += [ "HAVE_NEON64=1" ]
     }
     if (is_clang || !is_win) {
@@ -69,7 +69,7 @@ template("base64_gn_build") {
   source_set("base64_ssse3") {
     configs += [ ":base64_internal_config" ]
     sources = [ "base64/lib/arch/ssse3/codec.c" ]
-    if (target_cpu == "x86" || target_cpu == "x64") {
+    if (current_cpu == "x86" || current_cpu == "x64") {
       if (is_clang || !is_win) {
         cflags_c = [ "-mssse3" ]
       }
@@ -79,7 +79,7 @@ template("base64_gn_build") {
   source_set("base64_sse41") {
     configs += [ ":base64_internal_config" ]
     sources = [ "base64/lib/arch/sse41/codec.c" ]
-    if (target_cpu == "x86" || target_cpu == "x64") {
+    if (current_cpu == "x86" || current_cpu == "x64") {
       if (is_clang || !is_win) {
         cflags_c = [ "-msse4.1" ]
       }
@@ -89,7 +89,7 @@ template("base64_gn_build") {
   source_set("base64_sse42") {
     configs += [ ":base64_internal_config" ]
     sources = [ "base64/lib/arch/sse42/codec.c" ]
-    if (target_cpu == "x86" || target_cpu == "x64") {
+    if (current_cpu == "x86" || current_cpu == "x64") {
       if (is_clang || !is_win) {
         cflags_c = [ "-msse4.2" ]
       }
@@ -99,7 +99,7 @@ template("base64_gn_build") {
   source_set("base64_avx") {
     configs += [ ":base64_internal_config" ]
     sources = [ "base64/lib/arch/avx/codec.c" ]
-    if (target_cpu == "x86" || target_cpu == "x64") {
+    if (current_cpu == "x86" || current_cpu == "x64") {
       if (is_clang || !is_win) {
         cflags_c = [ "-mavx" ]
       } else if (is_win) {
@@ -111,7 +111,7 @@ template("base64_gn_build") {
   source_set("base64_avx2") {
     configs += [ ":base64_internal_config" ]
     sources = [ "base64/lib/arch/avx2/codec.c" ]
-    if (target_cpu == "x86" || target_cpu == "x64") {
+    if (current_cpu == "x86" || current_cpu == "x64") {
       if (is_clang || !is_win) {
         cflags_c = [ "-mavx2" ]
       } else if (is_win) {
@@ -123,7 +123,7 @@ template("base64_gn_build") {
   source_set("base64_avx512") {
     configs += [ ":base64_internal_config" ]
     sources = [ "base64/lib/arch/avx512/codec.c" ]
-    if (target_cpu == "x86" || target_cpu == "x64") {
+    if (current_cpu == "x86" || current_cpu == "x64") {
       if (is_clang || !is_win) {
         cflags_c = [
           "-mavx512vl",
@@ -138,7 +138,7 @@ template("base64_gn_build") {
   source_set("base64_neon32") {
     configs += [ ":base64_internal_config" ]
     sources = [ "base64/lib/arch/neon32/codec.c" ]
-    if (target_cpu == "arm") {
+    if (current_cpu == "arm") {
       if (is_clang || !is_win) {
         cflags_c = [ "-mfpu=neon" ]
       }

deps/openssl/unofficial.gni

@@ -95,29 +95,29 @@ template("openssl_gn_build") {
 
     config_path_name = ""
     if (is_win) {
-      if (target_cpu == "x86") {
+      if (current_cpu == "x86") {
         config_path_name = "VC-WIN32"
-      } else if (target_cpu == "x64") {
+      } else if (current_cpu == "x64") {
         config_path_name = "VC-WIN64A"
-      } else if (target_cpu == "arm64") {
+      } else if (current_cpu == "arm64") {
         config_path_name = "VC-WIN64-ARM"
       }
     } else if (is_linux) {
-      if (target_cpu == "x86") {
+      if (current_cpu == "x86") {
         config_path_name = "linux-elf"
-      } else if (target_cpu == "x64") {
+      } else if (current_cpu == "x64") {
         config_path_name = "linux-x86_64"
-      } else if (target_cpu == "arm") {
+      } else if (current_cpu == "arm") {
         config_path_name = "linux-armv4"
-      } else if (target_cpu == "arm64") {
+      } else if (current_cpu == "arm64") {
         config_path_name = "linux-aarch64"
       }
     } else if (is_apple) {
-      if (target_cpu == "x86") {
+      if (current_cpu == "x86") {
         config_path_name = "darwin-i386-cc"
-      } else if (target_cpu == "x64") {
+      } else if (current_cpu == "x64") {
         config_path_name = "darwin64-x86_64-cc"
-      } else if (target_cpu == "arm64") {
+      } else if (current_cpu == "arm64") {
         config_path_name = "darwin64-arm64-cc"
       }
     }
@@ -132,7 +132,7 @@ template("openssl_gn_build") {
       # TODO(zcbenz): Check gas_version and nasm_version.
       asm_name = "asm_avx2"
     }
-    if (is_win && target_cpu == "arm64") {
+    if (is_win && current_cpu == "arm64") {
       asm_name = "no-asm"
     }
     config_path = "config/archs/" + config_path_name + "/" + asm_name

doc/api/cli.md

@@ -667,7 +667,7 @@ of `--enable-source-maps`.
 <!-- YAML
 added: v20.6.0
 changes:
-  - version: REPLACEME
+  - version: v21.7.0
     pr-url: https://github.com/nodejs/node/pull/51289
     description: Add support to multi-line values.
 -->
@@ -2628,11 +2628,15 @@ V8 options that are allowed are:
 
 <!-- node-options-v8 end -->
 
+<!-- node-options-others start -->
+
 `--perf-basic-prof-only-functions`, `--perf-basic-prof`,
 `--perf-prof-unwinding-info`, and `--perf-prof` are only available on Linux.
 
 `--enable-etw-stack-walking` is only available on Windows.
 
+<!-- node-options-others end -->
+
 ### `NODE_PATH=path[:…]`
 
 <!-- YAML
@@ -2925,6 +2929,32 @@ options are of interest only to V8 developers. Despite this, there is a small
 set of V8 options that are widely applicable to Node.js, and they are
 documented here:
 
+<!-- v8-options start -->
+
+### `--abort-on-uncaught-exception`
+
+### `--disallow-code-generation-from-strings`
+
+### `--enable-etw-stack-walking`
+
+### `--harmony-shadow-realm`
+
+### `--huge-max-old-generation-size`
+
+### `--jitless`
+
+### `--interpreted-frames-native-stack`
+
+### `--prof`
+
+### `--perf-basic-prof`
+
+### `--perf-basic-prof-only-functions`
+
+### `--perf-prof`
+
+### `--perf-prof-unwinding-info`
+
 ### `--max-old-space-size=SIZE` (in megabytes)
 
 Sets the max memory size of V8's old memory section. As memory
@@ -2963,6 +2993,19 @@ for MiB in 16 32 64 128; do
 done
 ```
 
+### `--security-revert`
+
+### `--stack-trace-limit=limit`
+
+The maximum number of stack frames to collect in an error's stack trace.
+Setting it to 0 disables stack trace collection. The default value is 10.
+
+```bash
+node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
+```
+
+<!-- v8-options end -->
+
 [#42511]: https://github.com/nodejs/node/issues/42511
 [Chrome DevTools Protocol]: https://chromedevtools.github.io/devtools-protocol/
 [CommonJS]: modules.md

doc/api/crypto.md

@@ -3514,7 +3514,7 @@ Both keys must have the same `asymmetricKeyType`, which must be one of `'dh'`
 
 <!-- YAML
 added:
- - REPLACEME
+ - v21.7.0
 -->
 
 > Stability: 1.2 - Release candidate

doc/api/deprecations.md

@@ -3527,7 +3527,7 @@ deprecated. Get them from `fs.constants` or `fs.promises.constants` instead.
 
 <!-- YAML
 changes:
-  - version: REPLACEME
+  - version: v21.7.0
     pr-url: https://github.com/nodejs/node/pull/51442
     description: End-of-Life.
   - version:
@@ -3588,6 +3588,21 @@ Type: Documentation-only
 Calling `fs.Stats` class directly with `Stats()` or `new Stats()` is
 deprecated due to being internals, not intended for public use.
 
+### DEP0181: `Hmac` constructor
+
+<!-- YAML
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/51881
+    description: Documentation-only deprecation.
+-->
+
+Type: Documentation-only
+
+Calling `Hmac` class directly with `Hmac()` or `new Hmac()` is
+deprecated due to being internals, not intended for public use.
+Please use the [`crypto.createHmac()`][] method to create Hmac instances.
+
 [NIST SP 800-38D]: https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
 [RFC 6066]: https://tools.ietf.org/html/rfc6066#section-3
 [RFC 8247 Section 2.4]: https://www.rfc-editor.org/rfc/rfc8247#section-2.4
@@ -3625,6 +3640,7 @@ deprecated due to being internals, not intended for public use.
 [`crypto.createCipheriv()`]: crypto.md#cryptocreatecipherivalgorithm-key-iv-options
 [`crypto.createDecipheriv()`]: crypto.md#cryptocreatedecipherivalgorithm-key-iv-options
 [`crypto.createHash()`]: crypto.md#cryptocreatehashalgorithm-options
+[`crypto.createHmac()`]: crypto.md#cryptocreatehmacalgorithm-key-options
 [`crypto.fips`]: crypto.md#cryptofips
 [`crypto.pbkdf2()`]: crypto.md#cryptopbkdf2password-salt-iterations-keylen-digest-callback
 [`crypto.randomBytes()`]: crypto.md#cryptorandombytessize-callback