Skip to content

Commit 56f1f60

Browse files
authored
Merge branch 'main' into patch-2
2 parents ed54df2 + 4e109e5 commit 56f1f60

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+954
-174
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ jobs:
7171
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
7272
with:
7373
directory: ./coverage
74+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/coverage-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ jobs:
7171
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
7272
with:
7373
directory: ./coverage
74+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/coverage-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ jobs:
7070
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
7171
with:
7272
directory: ./coverage
73+
token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ release.
3636
</tr>
3737
<tr>
3838
<td valign="top">
39-
<b><a href="doc/changelogs/CHANGELOG_V21.md#21.6.2">21.6.2</a></b><br/>
39+
<b><a href="doc/changelogs/CHANGELOG_V21.md#21.7.1">21.7.1</a></b><br/>
40+
<a href="doc/changelogs/CHANGELOG_V21.md#21.7.0">21.7.0</a><br/>
41+
<a href="doc/changelogs/CHANGELOG_V21.md#21.6.2">21.6.2</a><br/>
4042
<a href="doc/changelogs/CHANGELOG_V21.md#21.6.1">21.6.1</a><br/>
4143
<a href="doc/changelogs/CHANGELOG_V21.md#21.6.0">21.6.0</a><br/>
4244
<a href="doc/changelogs/CHANGELOG_V21.md#21.5.0">21.5.0</a><br/>

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,8 @@ For information about the governance of the Node.js project, see
465465
**Trivikram Kamat** <<[email protected]>>
466466
* [Trott](https://github.com/Trott) -
467467
**Rich Trott** <<[email protected]>> (he/him)
468+
* [UlisesGascon](https://github.com/ulisesgascon) -
469+
**Ulises Gascón** <<[email protected]>> (he/him)
468470
* [vdeturckheim](https://github.com/vdeturckheim) -
469471
**Vladimir de Turckheim** <<[email protected]>> (he/him)
470472
* [vmoroz](https://github.com/vmoroz) -

deps/base64/unofficial.gni

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ template("base64_gn_build") {
1919
} else {
2020
defines = []
2121
}
22-
if (target_cpu == "x86" || target_cpu == "x64") {
22+
if (current_cpu == "x86" || current_cpu == "x64") {
2323
defines += [
2424
"HAVE_SSSE3=1",
2525
"HAVE_SSE41=1",
@@ -29,10 +29,10 @@ template("base64_gn_build") {
2929
"HAVE_AVX512=1",
3030
]
3131
}
32-
if (target_cpu == "arm") {
32+
if (current_cpu == "arm") {
3333
defines += [ "HAVE_NEON32=1" ]
3434
}
35-
if (target_cpu == "arm64") {
35+
if (current_cpu == "arm64") {
3636
defines += [ "HAVE_NEON64=1" ]
3737
}
3838
if (is_clang || !is_win) {
@@ -69,7 +69,7 @@ template("base64_gn_build") {
6969
source_set("base64_ssse3") {
7070
configs += [ ":base64_internal_config" ]
7171
sources = [ "base64/lib/arch/ssse3/codec.c" ]
72-
if (target_cpu == "x86" || target_cpu == "x64") {
72+
if (current_cpu == "x86" || current_cpu == "x64") {
7373
if (is_clang || !is_win) {
7474
cflags_c = [ "-mssse3" ]
7575
}
@@ -79,7 +79,7 @@ template("base64_gn_build") {
7979
source_set("base64_sse41") {
8080
configs += [ ":base64_internal_config" ]
8181
sources = [ "base64/lib/arch/sse41/codec.c" ]
82-
if (target_cpu == "x86" || target_cpu == "x64") {
82+
if (current_cpu == "x86" || current_cpu == "x64") {
8383
if (is_clang || !is_win) {
8484
cflags_c = [ "-msse4.1" ]
8585
}
@@ -89,7 +89,7 @@ template("base64_gn_build") {
8989
source_set("base64_sse42") {
9090
configs += [ ":base64_internal_config" ]
9191
sources = [ "base64/lib/arch/sse42/codec.c" ]
92-
if (target_cpu == "x86" || target_cpu == "x64") {
92+
if (current_cpu == "x86" || current_cpu == "x64") {
9393
if (is_clang || !is_win) {
9494
cflags_c = [ "-msse4.2" ]
9595
}
@@ -99,7 +99,7 @@ template("base64_gn_build") {
9999
source_set("base64_avx") {
100100
configs += [ ":base64_internal_config" ]
101101
sources = [ "base64/lib/arch/avx/codec.c" ]
102-
if (target_cpu == "x86" || target_cpu == "x64") {
102+
if (current_cpu == "x86" || current_cpu == "x64") {
103103
if (is_clang || !is_win) {
104104
cflags_c = [ "-mavx" ]
105105
} else if (is_win) {
@@ -111,7 +111,7 @@ template("base64_gn_build") {
111111
source_set("base64_avx2") {
112112
configs += [ ":base64_internal_config" ]
113113
sources = [ "base64/lib/arch/avx2/codec.c" ]
114-
if (target_cpu == "x86" || target_cpu == "x64") {
114+
if (current_cpu == "x86" || current_cpu == "x64") {
115115
if (is_clang || !is_win) {
116116
cflags_c = [ "-mavx2" ]
117117
} else if (is_win) {
@@ -123,7 +123,7 @@ template("base64_gn_build") {
123123
source_set("base64_avx512") {
124124
configs += [ ":base64_internal_config" ]
125125
sources = [ "base64/lib/arch/avx512/codec.c" ]
126-
if (target_cpu == "x86" || target_cpu == "x64") {
126+
if (current_cpu == "x86" || current_cpu == "x64") {
127127
if (is_clang || !is_win) {
128128
cflags_c = [
129129
"-mavx512vl",
@@ -138,7 +138,7 @@ template("base64_gn_build") {
138138
source_set("base64_neon32") {
139139
configs += [ ":base64_internal_config" ]
140140
sources = [ "base64/lib/arch/neon32/codec.c" ]
141-
if (target_cpu == "arm") {
141+
if (current_cpu == "arm") {
142142
if (is_clang || !is_win) {
143143
cflags_c = [ "-mfpu=neon" ]
144144
}

deps/openssl/unofficial.gni

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,29 +95,29 @@ template("openssl_gn_build") {
9595

9696
config_path_name = ""
9797
if (is_win) {
98-
if (target_cpu == "x86") {
98+
if (current_cpu == "x86") {
9999
config_path_name = "VC-WIN32"
100-
} else if (target_cpu == "x64") {
100+
} else if (current_cpu == "x64") {
101101
config_path_name = "VC-WIN64A"
102-
} else if (target_cpu == "arm64") {
102+
} else if (current_cpu == "arm64") {
103103
config_path_name = "VC-WIN64-ARM"
104104
}
105105
} else if (is_linux) {
106-
if (target_cpu == "x86") {
106+
if (current_cpu == "x86") {
107107
config_path_name = "linux-elf"
108-
} else if (target_cpu == "x64") {
108+
} else if (current_cpu == "x64") {
109109
config_path_name = "linux-x86_64"
110-
} else if (target_cpu == "arm") {
110+
} else if (current_cpu == "arm") {
111111
config_path_name = "linux-armv4"
112-
} else if (target_cpu == "arm64") {
112+
} else if (current_cpu == "arm64") {
113113
config_path_name = "linux-aarch64"
114114
}
115115
} else if (is_apple) {
116-
if (target_cpu == "x86") {
116+
if (current_cpu == "x86") {
117117
config_path_name = "darwin-i386-cc"
118-
} else if (target_cpu == "x64") {
118+
} else if (current_cpu == "x64") {
119119
config_path_name = "darwin64-x86_64-cc"
120-
} else if (target_cpu == "arm64") {
120+
} else if (current_cpu == "arm64") {
121121
config_path_name = "darwin64-arm64-cc"
122122
}
123123
}
@@ -132,7 +132,7 @@ template("openssl_gn_build") {
132132
# TODO(zcbenz): Check gas_version and nasm_version.
133133
asm_name = "asm_avx2"
134134
}
135-
if (is_win && target_cpu == "arm64") {
135+
if (is_win && current_cpu == "arm64") {
136136
asm_name = "no-asm"
137137
}
138138
config_path = "config/archs/" + config_path_name + "/" + asm_name

doc/api/cli.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ of `--enable-source-maps`.
667667
<!-- YAML
668668
added: v20.6.0
669669
changes:
670-
- version: REPLACEME
670+
- version: v21.7.0
671671
pr-url: https://github.com/nodejs/node/pull/51289
672672
description: Add support to multi-line values.
673673
-->
@@ -2628,11 +2628,15 @@ V8 options that are allowed are:
26282628

26292629
<!-- node-options-v8 end -->
26302630

2631+
<!-- node-options-others start -->
2632+
26312633
`--perf-basic-prof-only-functions`, `--perf-basic-prof`,
26322634
`--perf-prof-unwinding-info`, and `--perf-prof` are only available on Linux.
26332635

26342636
`--enable-etw-stack-walking` is only available on Windows.
26352637

2638+
<!-- node-options-others end -->
2639+
26362640
### `NODE_PATH=path[:…]`
26372641

26382642
<!-- YAML
@@ -2925,6 +2929,32 @@ options are of interest only to V8 developers. Despite this, there is a small
29252929
set of V8 options that are widely applicable to Node.js, and they are
29262930
documented here:
29272931

2932+
<!-- v8-options start -->
2933+
2934+
### `--abort-on-uncaught-exception`
2935+
2936+
### `--disallow-code-generation-from-strings`
2937+
2938+
### `--enable-etw-stack-walking`
2939+
2940+
### `--harmony-shadow-realm`
2941+
2942+
### `--huge-max-old-generation-size`
2943+
2944+
### `--jitless`
2945+
2946+
### `--interpreted-frames-native-stack`
2947+
2948+
### `--prof`
2949+
2950+
### `--perf-basic-prof`
2951+
2952+
### `--perf-basic-prof-only-functions`
2953+
2954+
### `--perf-prof`
2955+
2956+
### `--perf-prof-unwinding-info`
2957+
29282958
### `--max-old-space-size=SIZE` (in megabytes)
29292959

29302960
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
29632993
done
29642994
```
29652995

2996+
### `--security-revert`
2997+
2998+
### `--stack-trace-limit=limit`
2999+
3000+
The maximum number of stack frames to collect in an error's stack trace.
3001+
Setting it to 0 disables stack trace collection. The default value is 10.
3002+
3003+
```bash
3004+
node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
3005+
```
3006+
3007+
<!-- v8-options end -->
3008+
29663009
[#42511]: https://github.com/nodejs/node/issues/42511
29673010
[Chrome DevTools Protocol]: https://chromedevtools.github.io/devtools-protocol/
29683011
[CommonJS]: modules.md

doc/api/crypto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3514,7 +3514,7 @@ Both keys must have the same `asymmetricKeyType`, which must be one of `'dh'`
35143514

35153515
<!-- YAML
35163516
added:
3517-
- REPLACEME
3517+
- v21.7.0
35183518
-->
35193519

35203520
> Stability: 1.2 - Release candidate

doc/api/deprecations.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3527,7 +3527,7 @@ deprecated. Get them from `fs.constants` or `fs.promises.constants` instead.
35273527

35283528
<!-- YAML
35293529
changes:
3530-
- version: REPLACEME
3530+
- version: v21.7.0
35313531
pr-url: https://github.com/nodejs/node/pull/51442
35323532
description: End-of-Life.
35333533
- version:
@@ -3588,6 +3588,21 @@ Type: Documentation-only
35883588
Calling `fs.Stats` class directly with `Stats()` or `new Stats()` is
35893589
deprecated due to being internals, not intended for public use.
35903590

3591+
### DEP0181: `Hmac` constructor
3592+
3593+
<!-- YAML
3594+
changes:
3595+
- version: REPLACEME
3596+
pr-url: https://github.com/nodejs/node/pull/51881
3597+
description: Documentation-only deprecation.
3598+
-->
3599+
3600+
Type: Documentation-only
3601+
3602+
Calling `Hmac` class directly with `Hmac()` or `new Hmac()` is
3603+
deprecated due to being internals, not intended for public use.
3604+
Please use the [`crypto.createHmac()`][] method to create Hmac instances.
3605+
35913606
[NIST SP 800-38D]: https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
35923607
[RFC 6066]: https://tools.ietf.org/html/rfc6066#section-3
35933608
[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.
36253640
[`crypto.createCipheriv()`]: crypto.md#cryptocreatecipherivalgorithm-key-iv-options
36263641
[`crypto.createDecipheriv()`]: crypto.md#cryptocreatedecipherivalgorithm-key-iv-options
36273642
[`crypto.createHash()`]: crypto.md#cryptocreatehashalgorithm-options
3643+
[`crypto.createHmac()`]: crypto.md#cryptocreatehmacalgorithm-key-options
36283644
[`crypto.fips`]: crypto.md#cryptofips
36293645
[`crypto.pbkdf2()`]: crypto.md#cryptopbkdf2password-salt-iterations-keylen-digest-callback
36303646
[`crypto.randomBytes()`]: crypto.md#cryptorandombytessize-callback

doc/api/diagnostics_channel.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,11 @@ if the given function throws an error. This will run the given function using
789789
[`channel.runStores(context, ...)`][] on the `start` channel which ensures all
790790
events should have any bound stores set to match this trace context.
791791

792+
To ensure only correct trace graphs are formed, events will only be published
793+
if subscribers are present prior to starting the trace. Subscriptions which are
794+
added after the trace begins will not receive future events from that trace,
795+
only future traces will be seen.
796+
792797
```mjs
793798
import diagnostics_channel from 'node:diagnostics_channel';
794799

@@ -838,6 +843,11 @@ returned promise rejects. This will run the given function using
838843
[`channel.runStores(context, ...)`][] on the `start` channel which ensures all
839844
events should have any bound stores set to match this trace context.
840845

846+
To ensure only correct trace graphs are formed, events will only be published
847+
if subscribers are present prior to starting the trace. Subscriptions which are
848+
added after the trace begins will not receive future events from that trace,
849+
only future traces will be seen.
850+
841851
```mjs
842852
import diagnostics_channel from 'node:diagnostics_channel';
843853

@@ -891,6 +901,11 @@ the callback is set. This will run the given function using
891901
[`channel.runStores(context, ...)`][] on the `start` channel which ensures all
892902
events should have any bound stores set to match this trace context.
893903

904+
To ensure only correct trace graphs are formed, events will only be published
905+
if subscribers are present prior to starting the trace. Subscriptions which are
906+
added after the trace begins will not receive future events from that trace,
907+
only future traces will be seen.
908+
894909
```mjs
895910
import diagnostics_channel from 'node:diagnostics_channel';
896911

@@ -979,6 +994,11 @@ of the callback while the `error` will either be a thrown error visible in the
979994
`end` event or the first callback argument in either of the `asyncStart` or
980995
`asyncEnd` events.
981996

997+
To ensure only correct trace graphs are formed, events should only be published
998+
if subscribers are present prior to starting the trace. Subscriptions which are
999+
added after the trace begins should not receive future events from that trace,
1000+
only future traces will be seen.
1001+
9821002
Tracing channels should follow a naming pattern of:
9831003

9841004
* `tracing:module.class.method:start` or `tracing:module.function:start`

doc/api/errors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2372,7 +2372,7 @@ V8 startup snapshot even though Node.js isn't building one.
23722372
### `ERR_NOT_IN_SINGLE_EXECUTABLE_APPLICATION`
23732373

23742374
<!-- YAML
2375-
added: REPLACEME
2375+
added: v21.7.0
23762376
-->
23772377

23782378
The operation cannot be performed when it's not in a single-executable
@@ -2529,7 +2529,7 @@ and HTTP/2 `Server` instances.
25292529
### `ERR_SINGLE_EXECUTABLE_APPLICATION_ASSET_NOT_FOUND`
25302530

25312531
<!-- YAML
2532-
added: REPLACEME
2532+
added: v21.7.0
25332533
-->
25342534

25352535
A key was passed to single executable application APIs to identify an asset,

doc/api/http2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2893,7 +2893,7 @@ the given `Buffer` as generated by `http2.getPackedSettings()`.
28932893
### `http2.performServerHandshake(socket[, options])`
28942894

28952895
<!-- YAML
2896-
added: REPLACEME
2896+
added: v21.7.0
28972897
-->
28982898

28992899
* `socket` {stream.Duplex}
@@ -3662,7 +3662,7 @@ will result in a [`TypeError`][] being thrown.
36623662
#### `response.appendHeader(name, value)`
36633663

36643664
<!-- YAML
3665-
added: REPLACEME
3665+
added: v21.7.0
36663666
-->
36673667

36683668
* `name` {string}

doc/api/n-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3088,7 +3088,7 @@ The JavaScript `string` type is described in
30883088
#### `node_api_create_property_key_utf16`
30893089

30903090
<!-- YAML
3091-
added: REPLACEME
3091+
added: v21.7.0
30923092
-->
30933093

30943094
> Stability: 1 - Experimental

doc/api/process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,7 @@ debugger. See [Signal Events][].
22652265
## `process.loadEnvFile(path)`
22662266
22672267
<!-- YAML
2268-
added: REPLACEME
2268+
added: v21.7.0
22692269
-->
22702270
22712271
> Stability: 1.1 - Active development

0 commit comments

Comments
 (0)