Skip to content

Commit 1f322eb

Browse files
chore: bump node to v22.19.0 (main) (#48222)
* chore: bump node in DEPS to v22.19.0 * chore: fixup patch indices * crypto: add tls.setDefaultCACertificates() nodejs/node#58822 * esm: js-string Wasm builtins in ESM Integration nodejs/node#59179 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
1 parent f009e07 commit 1f322eb

30 files changed

+112
-127
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'141.0.7361.0',
66
'node_version':
7-
'v22.18.0',
7+
'v22.19.0',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

patches/node/.patches

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ build_compile_with_c_20_support.patch
3030
add_v8_taskpirority_to_foreground_task_runner_signature.patch
3131
cli_remove_deprecated_v8_flag.patch
3232
build_restore_clang_as_default_compiler_on_macos.patch
33-
fix_remove_harmony-import-assertions_from_node_cc.patch
33+
fix_remove_outdated_v8_flags_from_node_cc.patch
3434
chore_disable_deprecation_ftbfs_in_simdjson_header.patch
3535
build_allow_unbundling_of_node_js_dependencies.patch
3636
test_use_static_method_names_in_call_stacks.patch

patches/node/build_add_gn_build_files.patch

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ index 2415940835036226799a7ea14c6687cc0d56c523..0feb07afbccad97a92cee00954443407
2424
o['variables']['v8_enable_external_code_space'] = 1 if options.enable_pointer_compression else 0
2525
o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0
2626
diff --git a/node.gni b/node.gni
27-
index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea469db7a91b 100644
27+
index d4438f7fd61598afac2c1e3184721a759d22b10c..e2407027ab05e59b2f0f1c213b98ea469db7a91b 100644
2828
--- a/node.gni
2929
+++ b/node.gni
3030
@@ -5,10 +5,10 @@
@@ -40,15 +40,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
4040

4141
# The location of OpenSSL - use the one from node's deps by default.
4242
node_openssl_path = "$node_path/deps/openssl"
43-
@@ -42,12 +42,15 @@ declare_args() {
44-
# The variable is called "openssl" for parity with node's GYP build.
45-
node_use_openssl = true
46-
47-
+ # Build node with SQLite support.
48-
+ node_use_sqlite = true
49-
+
50-
# Use the specified path to system CA (PEM format) in addition to
51-
# the BoringSSL supplied CA store or compiled-in Mozilla CA copy.
43+
@@ -50,7 +50,7 @@ declare_args() {
5244
node_openssl_system_ca_path = ""
5345

5446
# Initialize v8 platform during node.js startup.
@@ -57,7 +49,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
5749

5850
# Custom build tag.
5951
node_tag = ""
60-
@@ -67,10 +70,16 @@ declare_args() {
52+
@@ -70,10 +70,16 @@ declare_args() {
6153
# TODO(zcbenz): There are few broken things for now:
6254
# 1. cross-os compilation is not supported.
6355
# 2. node_mksnapshot crashes when cross-compiling for x64 from arm64.
@@ -76,7 +68,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
7668

7769
assert(!node_enable_inspector || node_use_openssl,
7870
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
79-
index abf1583cdac9f139056cf4809f14e28e62f6d24c..8b104e175ccf8de90c138337f83f8f6ce1348ac7 100644
71+
index b4acc40618e372b09d0cb5e3755034f08711a282..efeaaef7e4dc64a0adb5e6bdbbe18945890de62c 100644
8072
--- a/src/node_builtins.cc
8173
+++ b/src/node_builtins.cc
8274
@@ -789,6 +789,7 @@ void BuiltinLoader::RegisterExternalReferences(
@@ -279,22 +271,10 @@ index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd1
279271
if sys.platform == 'win32':
280272
files = [ x.replace('\\', '/') for x in files ]
281273
diff --git a/unofficial.gni b/unofficial.gni
282-
index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f5294aab9d37 100644
274+
index 865a0d5ce9c6792e57f4216bcaa594ca6fc7b1c8..26ebc811272ef2990f8d090c54e7f5294aab9d37 100644
283275
--- a/unofficial.gni
284276
+++ b/unofficial.gni
285-
@@ -22,6 +22,11 @@ template("node_gn_build") {
286-
} else {
287-
defines += [ "HAVE_OPENSSL=0" ]
288-
}
289-
+ if (node_use_sqlite) {
290-
+ defines += [ "HAVE_SQLITE=1" ]
291-
+ } else {
292-
+ defines += [ "HAVE_SQLITE=0" ]
293-
+ }
294-
if (node_use_amaro) {
295-
defines += [ "HAVE_AMARO=1" ]
296-
} else {
297-
@@ -142,32 +147,41 @@ template("node_gn_build") {
277+
@@ -147,31 +147,41 @@ template("node_gn_build") {
298278
public_configs = [
299279
":node_external_config",
300280
"deps/googletest:googletest_config",
@@ -317,7 +297,6 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
317297
"deps/nghttp2",
318298
- "deps/ngtcp2",
319299
"deps/postject",
320-
- "deps/sqlite",
321300
"deps/uvwasi",
322301
- "deps/zstd",
323302
"//third_party/zlib",
@@ -340,22 +319,16 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
340319
"$target_gen_dir/node_javascript.cc",
341320
] + gypi_values.node_sources
342321

343-
@@ -190,9 +204,13 @@ template("node_gn_build") {
322+
@@ -194,7 +204,7 @@ template("node_gn_build") {
344323
}
345324
if (node_use_openssl) {
346325
deps += [ "deps/ncrypto" ]
347326
- public_deps += [ "$node_openssl_path" ]
348327
+ public_deps += [ "//third_party/boringssl" ]
349328
sources += gypi_values.node_crypto_sources
350329
}
351-
+ if (node_use_sqlite) {
352-
+ deps += [ "deps/sqlite" ]
353-
+ sources += gypi_values.node_sqlite_sources
354-
+ }
355-
if (node_enable_inspector) {
356-
deps += [
357-
"$node_inspector_protocol_path:crdtp",
358-
@@ -215,6 +233,10 @@ template("node_gn_build") {
330+
if (node_use_sqlite) {
331+
@@ -223,6 +233,10 @@ template("node_gn_build") {
359332
}
360333
}
361334

@@ -366,15 +339,15 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
366339
executable(target_name) {
367340
forward_variables_from(invoker, "*")
368341

369-
@@ -289,6 +311,7 @@ template("node_gn_build") {
342+
@@ -297,6 +311,7 @@ template("node_gn_build") {
370343
}
371344

372345
executable("node_js2c") {
373346
+ defines = []
374347
deps = [
375348
"deps/uv",
376349
"$node_simdutf_path",
377-
@@ -299,26 +322,75 @@ template("node_gn_build") {
350+
@@ -307,26 +322,75 @@ template("node_gn_build") {
378351
"src/embedded_data.cc",
379352
"src/embedded_data.h",
380353
]
@@ -460,7 +433,7 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
460433
outputs = [ "$target_gen_dir/node_javascript.cc" ]
461434

462435
# Get the path to node_js2c executable of the host toolchain.
463-
@@ -332,11 +404,11 @@ template("node_gn_build") {
436+
@@ -340,11 +404,11 @@ template("node_gn_build") {
464437
get_label_info(":node_js2c($host_toolchain)", "name") +
465438
host_executable_suffix
466439

patches/node/build_compile_with_c_20_support.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ V8 requires C++20 support as of https://chromium-review.googlesource.com/c/v8/v8
1010
This can be removed when Electron upgrades to a version of Node.js containing the required V8 version.
1111

1212
diff --git a/common.gypi b/common.gypi
13-
index 679633dc6b4ce2a1f5f88e93d1a1c1feb4bbadb4..2caa183213d5632be81b763e894e37c09384391f 100644
13+
index 3a1d2fc9d147a8c89f7b5231d63d37f29979965d..6425ee9e8dba993f3e899362ce9bd7b097f08883 100644
1414
--- a/common.gypi
1515
+++ b/common.gypi
1616
@@ -539,7 +539,7 @@

patches/node/build_enable_perfetto.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327
6464

6565
module.exports = {
6666
diff --git a/node.gyp b/node.gyp
67-
index 442c1e7a6ddafbb7a7ec7a42a97ec04b28ea4d93..3a66c11d39dd2fd129c8f54098a9607e080ecca0 100644
67+
index d604e0ddd973174aa7be6f2d250af7b9c2b0fcfd..8e97aa3f44087213425927113fe72bca9ddef45b 100644
6868
--- a/node.gyp
6969
+++ b/node.gyp
7070
@@ -176,7 +176,6 @@

patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Subject: build: ensure native module compilation fails if not using a new
77
This should not be upstreamed, it is a quality-of-life patch for downstream module builders.
88

99
diff --git a/common.gypi b/common.gypi
10-
index 33af43cd768c24b26d523f3db66eb8b9eb26859a..679633dc6b4ce2a1f5f88e93d1a1c1feb4bbadb4 100644
10+
index e56ba31ed068b81f5c6fbd432cd82bb6916e9a85..3a1d2fc9d147a8c89f7b5231d63d37f29979965d 100644
1111
--- a/common.gypi
1212
+++ b/common.gypi
1313
@@ -89,6 +89,8 @@

patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ index 0244a214b187e67e0cb89f26cd019855963ec93a..b65a3be6bcb0e28f7f43367d0fa9da53
3434
let kResistStopPropagation;
3535

3636
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
37-
index 8b104e175ccf8de90c138337f83f8f6ce1348ac7..35cf42a5e533cb799bf129df0c8370bfe8310233 100644
37+
index efeaaef7e4dc64a0adb5e6bdbbe18945890de62c..557972987abeaa56918362638a17a9b6e0763238 100644
3838
--- a/src/node_builtins.cc
3939
+++ b/src/node_builtins.cc
4040
@@ -35,6 +35,7 @@ using v8::Value;

patches/node/build_restore_clang_as_default_compiler_on_macos.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ node-gyp will use the result of `process.config` that reflects the environment
1111
in which the binary got built.
1212

1313
diff --git a/common.gypi b/common.gypi
14-
index 2caa183213d5632be81b763e894e37c09384391f..2cce436c4a9e3d942f957f6c94a4ef9e3db391ce 100644
14+
index 6425ee9e8dba993f3e899362ce9bd7b097f08883..95d66f75b582b3fd3b833109dfe110ae5b196f83 100644
1515
--- a/common.gypi
1616
+++ b/common.gypi
1717
@@ -128,6 +128,7 @@

patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ they use themselves as the entry point. We should try to upstream some form
88
of this.
99

1010
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
11-
index 0cda54fd85e1e0bff13d4718a269eb3e7c60312a..6b165062a5eaa40f6e5614bca50bc33ccbdb85cc 100644
11+
index 98ed40e3076f6628b1771dade63ac51600e8e447..1eba13caf1e00a8b41b2cf8afc4168c8f98be69f 100644
1212
--- a/lib/internal/process/pre_execution.js
1313
+++ b/lib/internal/process/pre_execution.js
1414
@@ -245,12 +245,14 @@ function patchProcessObject(expandArgv1) {

patches/node/cli_move_--trace-atomics-wait_to_eol.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Reviewed-By: Benjamin Gruenbaum <[email protected]>
1515
Reviewed-By: Yagiz Nizipli <[email protected]>
1616

1717
diff --git a/doc/api/cli.md b/doc/api/cli.md
18-
index 404e87e6d1237b5ee79cafd8a959c1b6d9d23fe5..7deda572c940f7b2e8c6813f1826796a13e4db38 100644
18+
index 8cabb58e621a9951acd5551afb85c192f2b1c690..b69bacebef3e5e5e5b191c61aa5fe0f71c1edfb3 100644
1919
--- a/doc/api/cli.md
2020
+++ b/doc/api/cli.md
21-
@@ -2709,39 +2709,6 @@ added: v12.0.0
21+
@@ -2712,39 +2712,6 @@ added: v12.0.0
2222
Set default [`tls.DEFAULT_MIN_VERSION`][] to 'TLSv1.3'. Use to disable support
2323
for TLSv1.2, which is not as secure as TLSv1.3.
2424

@@ -58,7 +58,7 @@ index 404e87e6d1237b5ee79cafd8a959c1b6d9d23fe5..7deda572c940f7b2e8c6813f1826796a
5858
### `--trace-deprecation`
5959

6060
<!-- YAML
61-
@@ -3423,7 +3390,6 @@ one is included in the list below.
61+
@@ -3429,7 +3396,6 @@ one is included in the list below.
6262
* `--tls-min-v1.1`
6363
* `--tls-min-v1.2`
6464
* `--tls-min-v1.3`
@@ -67,7 +67,7 @@ index 404e87e6d1237b5ee79cafd8a959c1b6d9d23fe5..7deda572c940f7b2e8c6813f1826796a
6767
* `--trace-env-js-stack`
6868
* `--trace-env-native-stack`
6969
diff --git a/doc/node.1 b/doc/node.1
70-
index f41323c799ad34c8e17a36d81e4cc2b16e50e9ee..a9ff54edfad1d053ec1ac544f28e14a1898ac177 100644
70+
index 6913992a5476d2317a34fb69d3c6af63b686f9a6..1faef5ba1d4206a5cc4c71cb71f7a08f613fbf17 100644
7171
--- a/doc/node.1
7272
+++ b/doc/node.1
7373
@@ -539,11 +539,6 @@ but the option is supported for compatibility with older Node.js versions.
@@ -83,7 +83,7 @@ index f41323c799ad34c8e17a36d81e4cc2b16e50e9ee..a9ff54edfad1d053ec1ac544f28e14a1
8383
Print stack traces for deprecations.
8484
.
8585
diff --git a/src/node.cc b/src/node.cc
86-
index 0c2a4d344c991c2ca0d9d90934cf7921abf2a629..19d9fb77f1aaf003e43b7d7016f45e6c35df06b3 100644
86+
index 0d383dcdb80fe30e3c2d6880b44f626f065bb1f3..9d9992dacbc595c987827f55eb12ea8af0480df6 100644
8787
--- a/src/node.cc
8888
+++ b/src/node.cc
8989
@@ -232,44 +232,6 @@ void Environment::WaitForInspectorFrontendByOptions() {
@@ -150,7 +150,7 @@ index 0c2a4d344c991c2ca0d9d90934cf7921abf2a629..19d9fb77f1aaf003e43b7d7016f45e6c
150150
isolate_->SetPromiseHook(TracePromises);
151151
}
152152
diff --git a/src/node_options.cc b/src/node_options.cc
153-
index d6988a5a8c068022d10607c32e57ac667f821337..4deaa52a8a4688bca32d41b74124604b6e33c80b 100644
153+
index cfb95f65ccb0c6d150be8a4039caf26faf7cd06d..cb0ecd81b33abd7743e66e225a6cb96b4094f935 100644
154154
--- a/src/node_options.cc
155155
+++ b/src/node_options.cc
156156
@@ -773,10 +773,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
@@ -165,7 +165,7 @@ index d6988a5a8c068022d10607c32e57ac667f821337..4deaa52a8a4688bca32d41b74124604b
165165
"show stack traces on deprecations",
166166
&EnvironmentOptions::trace_deprecation,
167167
diff --git a/src/node_options.h b/src/node_options.h
168-
index 2b7df46312b8be58d6062b6a2f6084247e075c37..2d52cde518926577834f77424fa5b2231ca3374e 100644
168+
index 3ff1f4b4baa64b8ee2a4587e150ea14cb2fdfdf4..26ac54c4b18dd00b2c1f915dc1ba0e90ca70b48f 100644
169169
--- a/src/node_options.h
170170
+++ b/src/node_options.h
171171
@@ -204,7 +204,6 @@ class EnvironmentOptions : public Options {

0 commit comments

Comments
 (0)