Skip to content

Commit db7dbd0

Browse files
electron-roller[bot]jkleinsc
authored andcommitted
chore: bump node to v20.18.0 (main) (electron#44119)
* chore: bump node in DEPS to v20.18.0 * chore: update patches * src: improve buffer.transcode performance nodejs/node#54153 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <[email protected]>
1 parent 5225360 commit db7dbd0

File tree

29 files changed

+216
-247
lines changed

29 files changed

+216
-247
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
'131.0.6754.0',
66
'node_version':
7-
'v20.17.0',
7+
'v20.18.0',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

patches/node/.patches

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ src_do_not_use_deprecated_v8_api.patch
4545
src_use_new_v8_api_to_define_stream_accessor.patch
4646
src_remove_dependency_on_wrapper-descriptor-based_cppheap.patch
4747
test_update_v8-stats_test_for_v8_12_6.patch
48-
chore_remove_calls_to_v8_functioncallbackinfo_holder.patch
4948
src_do_not_use_soon-to-be-deprecated_v8_api.patch
5049
fix_add_property_query_interceptors.patch
51-
src_account_for_openssl_unexpected_version.patch
5250
src_stop_using_deprecated_fields_of_fastapicallbackoptions.patch
5351
src_use_supported_api_to_get_stalled_tla_messages.patch
5452
build_don_t_redefine_win32_lean_and_mean.patch

patches/node/build_add_gn_build_files.patch

Lines changed: 83 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -537,10 +537,10 @@ index 0e69d7383762f6b81c5b57698aa9d121d5a9c401..35bbeb37acc7ccb14b4b8a644ec3d4c7
537537
cflags_c = [
538538
"-mavx512vl",
539539
diff --git a/deps/cares/BUILD.gn b/deps/cares/BUILD.gn
540-
index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..d083aea4cb895d8425041879f1b22a6ee43a0b60 100644
540+
index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be02e5d73f1 100644
541541
--- a/deps/cares/BUILD.gn
542542
+++ b/deps/cares/BUILD.gn
543-
@@ -1,14 +1,172 @@
543+
@@ -1,14 +1,175 @@
544544
-##############################################################################
545545
-# #
546546
-# DO NOT EDIT THIS FILE! #
@@ -569,60 +569,18 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..d083aea4cb895d8425041879f1b22a6e
569569
+ "include/ares_version.h",
570570
+ "src/lib/ares__addrinfo2hostent.c",
571571
+ "src/lib/ares__addrinfo_localhost.c",
572-
+ "src/lib/ares__buf.c",
573-
+ "src/lib/ares__buf.h",
574572
+ "src/lib/ares__close_sockets.c",
575573
+ "src/lib/ares__hosts_file.c",
576-
+ "src/lib/ares__htable.c",
577-
+ "src/lib/ares__htable.h",
578-
+ "src/lib/ares__htable_asvp.c",
579-
+ "src/lib/ares__htable_asvp.h",
580-
+ "src/lib/ares__htable_strvp.c",
581-
+ "src/lib/ares__htable_strvp.h",
582-
+ "src/lib/ares__htable_szvp.c",
583-
+ "src/lib/ares__htable_szvp.h",
584-
+ "src/lib/ares__htable_vpvp.c",
585-
+ "src/lib/ares__htable_vpvp.h",
586-
+ "src/lib/ares__iface_ips.c",
587-
+ "src/lib/ares__iface_ips.h",
588-
+ "src/lib/ares__llist.c",
589-
+ "src/lib/ares__llist.h",
590574
+ "src/lib/ares__parse_into_addrinfo.c",
591-
+ "src/lib/ares__slist.c",
592-
+ "src/lib/ares__slist.h",
593575
+ "src/lib/ares__socket.c",
594576
+ "src/lib/ares__sortaddrinfo.c",
595-
+ "src/lib/ares__threads.c",
596-
+ "src/lib/ares__threads.h",
597-
+ "src/lib/ares__timeval.c",
598577
+ "src/lib/ares_android.c",
599578
+ "src/lib/ares_android.h",
600579
+ "src/lib/ares_cancel.c",
601-
+ "src/lib/ares_create_query.c",
580+
+ "src/lib/ares_cookie.c",
602581
+ "src/lib/ares_data.c",
603582
+ "src/lib/ares_data.h",
604583
+ "src/lib/ares_destroy.c",
605-
+ "src/lib/ares_dns_mapping.c",
606-
+ "src/lib/ares_dns_multistring.c",
607-
+ "src/lib/ares_dns_multistring.h",
608-
+ "src/lib/ares_dns_name.c",
609-
+ "src/lib/ares_dns_parse.c",
610-
+ "src/lib/ares_dns_record.c",
611-
+ "src/lib/ares_dns_private.h",
612-
+ "src/lib/ares_dns_write.c",
613-
+ "src/lib/ares_event_configchg.c",
614-
+ "src/lib/ares_event.h",
615-
+ "src/lib/ares_event_win32.h",
616-
+ "src/lib/ares_event_epoll.c",
617-
+ "src/lib/ares_event_kqueue.c",
618-
+ "src/lib/ares_event_poll.c",
619-
+ "src/lib/ares_event_select.c",
620-
+ "src/lib/ares_event_thread.c",
621-
+ "src/lib/ares_event_wake_pipe.c",
622-
+ "src/lib/ares_event_win32.c",
623-
+ "src/lib/ares_expand_name.c",
624-
+ "src/lib/ares_expand_string.c",
625-
+ "src/lib/ares_fds.c",
626584
+ "src/lib/ares_free_hostent.c",
627585
+ "src/lib/ares_free_string.c",
628586
+ "src/lib/ares_freeaddrinfo.c",
@@ -632,49 +590,94 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..d083aea4cb895d8425041879f1b22a6e
632590
+ "src/lib/ares_gethostbyaddr.c",
633591
+ "src/lib/ares_gethostbyname.c",
634592
+ "src/lib/ares_getnameinfo.c",
635-
+ "src/lib/ares_getsock.c",
636593
+ "src/lib/ares_inet_net_pton.h",
637594
+ "src/lib/ares_init.c",
638-
+ "src/lib/ares_library_init.c",
639595
+ "src/lib/ares_ipv6.h",
640-
+ "src/lib/ares_math.c",
596+
+ "src/lib/ares_library_init.c",
641597
+ "src/lib/ares_metrics.c",
642598
+ "src/lib/ares_options.c",
643-
+ "src/lib/ares_parse_a_reply.c",
644-
+ "src/lib/ares_parse_aaaa_reply.c",
645-
+ "src/lib/ares_parse_caa_reply.c",
646-
+ "src/lib/ares_parse_mx_reply.c",
647-
+ "src/lib/ares_parse_naptr_reply.c",
648-
+ "src/lib/ares_parse_ns_reply.c",
649-
+ "src/lib/ares_parse_ptr_reply.c",
650-
+ "src/lib/ares_parse_soa_reply.c",
651-
+ "src/lib/ares_parse_srv_reply.c",
652-
+ "src/lib/ares_parse_txt_reply.c",
653-
+ "src/lib/ares_parse_uri_reply.c",
654599
+ "src/lib/ares_platform.c",
655600
+ "src/lib/ares_platform.h",
656601
+ "src/lib/ares_private.h",
657602
+ "src/lib/ares_process.c",
658603
+ "src/lib/ares_qcache.c",
659604
+ "src/lib/ares_query.c",
660-
+ "src/lib/ares_rand.c",
661605
+ "src/lib/ares_search.c",
662606
+ "src/lib/ares_send.c",
663607
+ "src/lib/ares_setup.h",
664-
+ "src/lib/ares_strcasecmp.c",
665-
+ "src/lib/ares_strcasecmp.h",
666-
+ "src/lib/ares_str.c",
667-
+ "src/lib/ares_str.h",
668608
+ "src/lib/ares_strerror.c",
669-
+ "src/lib/ares_strsplit.c",
670-
+ "src/lib/ares_strsplit.h",
671609
+ "src/lib/ares_sysconfig.c",
672610
+ "src/lib/ares_sysconfig_files.c",
673611
+ "src/lib/ares_timeout.c",
674612
+ "src/lib/ares_update_servers.c",
675613
+ "src/lib/ares_version.c",
614+
+ "src/lib/dsa/ares__array.c",
615+
+ "src/lib/dsa/ares__array.h",
616+
+ "src/lib/dsa/ares__htable.c",
617+
+ "src/lib/dsa/ares__htable.h",
618+
+ "src/lib/dsa/ares__htable_asvp.c",
619+
+ "src/lib/dsa/ares__htable_asvp.h",
620+
+ "src/lib/dsa/ares__htable_strvp.c",
621+
+ "src/lib/dsa/ares__htable_strvp.h",
622+
+ "src/lib/dsa/ares__htable_szvp.c",
623+
+ "src/lib/dsa/ares__htable_szvp.h",
624+
+ "src/lib/dsa/ares__htable_vpvp.c",
625+
+ "src/lib/dsa/ares__htable_vpvp.h",
626+
+ "src/lib/dsa/ares__llist.c",
627+
+ "src/lib/dsa/ares__llist.h",
628+
+ "src/lib/dsa/ares__slist.c",
629+
+ "src/lib/dsa/ares__slist.h",
630+
+ "src/lib/event/ares_event.h",
631+
+ "src/lib/event/ares_event_configchg.c",
632+
+ "src/lib/event/ares_event_epoll.c",
633+
+ "src/lib/event/ares_event_kqueue.c",
634+
+ "src/lib/event/ares_event_poll.c",
635+
+ "src/lib/event/ares_event_select.c",
636+
+ "src/lib/event/ares_event_thread.c",
637+
+ "src/lib/event/ares_event_wake_pipe.c",
638+
+ "src/lib/event/ares_event_win32.c",
639+
+ "src/lib/event/ares_event_win32.h",
676640
+ "src/lib/inet_net_pton.c",
677641
+ "src/lib/inet_ntop.c",
642+
+ "src/lib/legacy/ares_create_query.c",
643+
+ "src/lib/legacy/ares_expand_name.c",
644+
+ "src/lib/legacy/ares_expand_string.c",
645+
+ "src/lib/legacy/ares_fds.c",
646+
+ "src/lib/legacy/ares_getsock.c",
647+
+ "src/lib/legacy/ares_parse_a_reply.c",
648+
+ "src/lib/legacy/ares_parse_aaaa_reply.c",
649+
+ "src/lib/legacy/ares_parse_caa_reply.c",
650+
+ "src/lib/legacy/ares_parse_mx_reply.c",
651+
+ "src/lib/legacy/ares_parse_naptr_reply.c",
652+
+ "src/lib/legacy/ares_parse_ns_reply.c",
653+
+ "src/lib/legacy/ares_parse_ptr_reply.c",
654+
+ "src/lib/legacy/ares_parse_soa_reply.c",
655+
+ "src/lib/legacy/ares_parse_srv_reply.c",
656+
+ "src/lib/legacy/ares_parse_txt_reply.c",
657+
+ "src/lib/legacy/ares_parse_uri_reply.c",
658+
+ "src/lib/record/ares_dns_mapping.c",
659+
+ "src/lib/record/ares_dns_multistring.c",
660+
+ "src/lib/record/ares_dns_multistring.h",
661+
+ "src/lib/record/ares_dns_name.c",
662+
+ "src/lib/record/ares_dns_parse.c",
663+
+ "src/lib/record/ares_dns_private.h",
664+
+ "src/lib/record/ares_dns_record.c",
665+
+ "src/lib/record/ares_dns_write.c",
666+
+ "src/lib/str/ares__buf.c",
667+
+ "src/lib/str/ares__buf.h",
668+
+ "src/lib/str/ares_str.c",
669+
+ "src/lib/str/ares_str.h",
670+
+ "src/lib/str/ares_strcasecmp.c",
671+
+ "src/lib/str/ares_strcasecmp.h",
672+
+ "src/lib/str/ares_strsplit.c",
673+
+ "src/lib/str/ares_strsplit.h",
674+
+ "src/lib/util/ares__iface_ips.c",
675+
+ "src/lib/util/ares__iface_ips.h",
676+
+ "src/lib/util/ares__threads.c",
677+
+ "src/lib/util/ares__threads.h",
678+
+ "src/lib/util/ares__timeval.c",
679+
+ "src/lib/util/ares_math.c",
680+
+ "src/lib/util/ares_rand.c",
678681
+ "src/tools/ares_getopt.c",
679682
+ "src/tools/ares_getopt.h",
680683
+ ]
@@ -1265,10 +1268,10 @@ index 0000000000000000000000000000000000000000..af9cbada10203b387fb9732b346583b1
12651268
+}
12661269
diff --git a/filenames.json b/filenames.json
12671270
new file mode 100644
1268-
index 0000000000000000000000000000000000000000..646df853a2b985f14fd66cae6af854977c074706
1271+
index 0000000000000000000000000000000000000000..889a487e24721a8ecfef91f5a655892a607bb12f
12691272
--- /dev/null
12701273
+++ b/filenames.json
1271-
@@ -0,0 +1,737 @@
1274+
@@ -0,0 +1,741 @@
12721275
+// This file is automatically generated by generate_gn_filenames_json.py
12731276
+// DO NOT EDIT
12741277
+{
@@ -1477,6 +1480,7 @@ index 0000000000000000000000000000000000000000..646df853a2b985f14fd66cae6af85497
14771480
+ "lib/internal/assert.js",
14781481
+ "lib/internal/assert/assertion_error.js",
14791482
+ "lib/internal/assert/calltracker.js",
1483+
+ "lib/internal/assert/utils.js",
14801484
+ "lib/internal/async_hooks.js",
14811485
+ "lib/internal/blob.js",
14821486
+ "lib/internal/blocklist.js",
@@ -1548,6 +1552,7 @@ index 0000000000000000000000000000000000000000..646df853a2b985f14fd66cae6af85497
15481552
+ "lib/internal/http2/util.js",
15491553
+ "lib/internal/idna.js",
15501554
+ "lib/internal/inspector_async_hook.js",
1555+
+ "lib/internal/inspector_network_tracking.js",
15511556
+ "lib/internal/js_stream_socket.js",
15521557
+ "lib/internal/legacy/processbinding.js",
15531558
+ "lib/internal/linkedlist.js",
@@ -1655,13 +1660,15 @@ index 0000000000000000000000000000000000000000..646df853a2b985f14fd66cae6af85497
16551660
+ "lib/internal/test/transfer.js",
16561661
+ "lib/internal/test_runner/coverage.js",
16571662
+ "lib/internal/test_runner/harness.js",
1663+
+ "lib/internal/test_runner/mock/loader.js",
16581664
+ "lib/internal/test_runner/mock/mock.js",
16591665
+ "lib/internal/test_runner/mock/mock_timers.js",
16601666
+ "lib/internal/test_runner/reporter/dot.js",
16611667
+ "lib/internal/test_runner/reporter/junit.js",
16621668
+ "lib/internal/test_runner/reporter/lcov.js",
16631669
+ "lib/internal/test_runner/reporter/spec.js",
16641670
+ "lib/internal/test_runner/reporter/tap.js",
1671+
+ "lib/internal/test_runner/reporter/utils.js",
16651672
+ "lib/internal/test_runner/reporter/v8-serializer.js",
16661673
+ "lib/internal/test_runner/runner.js",
16671674
+ "lib/internal/test_runner/test.js",
@@ -2007,10 +2014,10 @@ index 0000000000000000000000000000000000000000..646df853a2b985f14fd66cae6af85497
20072014
+ ]
20082015
+}
20092016
diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn
2010-
index 909fd14345fcd988c381e640280f4b33f2e0c351..800431e6659f95f0495cb90b8fa2cccbc9f34661 100644
2017+
index 909fd14345fcd988c381e640280f4b33f2e0c351..3b430a666a7d5cb52ec41f8d828284625f916701 100644
20112018
--- a/src/inspector/BUILD.gn
20122019
+++ b/src/inspector/BUILD.gn
2013-
@@ -1,14 +1,202 @@
2020+
@@ -1,14 +1,208 @@
20142021
-##############################################################################
20152022
-# #
20162023
-# DO NOT EDIT THIS FILE! #
@@ -2034,6 +2041,8 @@ index 909fd14345fcd988c381e640280f4b33f2e0c351..800431e6659f95f0495cb90b8fa2cccb
20342041
+ "protocol/NodeTracing.h",
20352042
+ "protocol/NodeRuntime.cpp",
20362043
+ "protocol/NodeRuntime.h",
2044+
+ "protocol/Network.cpp",
2045+
+ "protocol/Network.h",
20372046
+]
20382047

20392048
-inspector_gn_build("inspector") {
@@ -2066,6 +2075,10 @@ index 909fd14345fcd988c381e640280f4b33f2e0c351..800431e6659f95f0495cb90b8fa2cccb
20662075
+ "tracing_agent.h",
20672076
+ "worker_agent.cc",
20682077
+ "worker_agent.h",
2078+
+ "network_inspector.cc",
2079+
+ "network_inspector.h",
2080+
+ "network_agent.cc",
2081+
+ "network_agent.h",
20692082
+ "worker_inspector.cc",
20702083
+ "worker_inspector.h",
20712084
+ ]

patches/node/build_compile_with_c_20_support.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ 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 8736ad12eec294070a5160a64248044cd16347c9..216200c279c599f6dee228120ff5f3943fa52ffd 100644
13+
index bdf1a1f33f3ea09d933757c7fee87c563cc833ab..2eb62610db2f0ebf68fa9a55ffba98291ecfe451 100644
1414
--- a/common.gypi
1515
+++ b/common.gypi
16-
@@ -307,7 +307,7 @@
16+
@@ -305,7 +305,7 @@
1717
'VCCLCompilerTool': {
1818
'AdditionalOptions': [
1919
'/Zc:__cplusplus',
@@ -22,7 +22,7 @@ index 8736ad12eec294070a5160a64248044cd16347c9..216200c279c599f6dee228120ff5f394
2222
],
2323
'BufferSecurityCheck': 'true',
2424
'DebugInformationFormat': 1, # /Z7 embed info in .obj files
25-
@@ -489,7 +489,7 @@
25+
@@ -487,7 +487,7 @@
2626
}],
2727
[ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
2828
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
@@ -31,7 +31,7 @@ index 8736ad12eec294070a5160a64248044cd16347c9..216200c279c599f6dee228120ff5f394
3131
'defines': [ '__STDC_FORMAT_MACROS' ],
3232
'ldflags': [ '-rdynamic' ],
3333
'target_conditions': [
34-
@@ -660,7 +660,7 @@
34+
@@ -658,7 +658,7 @@
3535
['clang==1', {
3636
'xcode_settings': {
3737
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',

patches/node/build_enable_perfetto.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ index 8d7204f6cb48f783adc4d1c1eb2de0c83b7fffe2..a154559a56bf383d3c26af523c9bb07b
3333

3434
// Non-alphabetic chars.
3535
diff --git a/lib/internal/http.js b/lib/internal/http.js
36-
index c26c322aafc64ed9ca2a7c1fd703555a251db9de..f94bc5824d6c83fd1feca31c572dcfd3ac130bda 100644
36+
index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327199acfd5 100644
3737
--- a/lib/internal/http.js
3838
+++ b/lib/internal/http.js
39-
@@ -10,8 +10,8 @@ const {
39+
@@ -8,8 +8,8 @@ const {
4040
const { setUnrefTimeout } = require('internal/timers');
4141
const { getCategoryEnabledBuffer, trace } = internalBinding('trace_events');
4242
const {
@@ -47,7 +47,7 @@ index c26c322aafc64ed9ca2a7c1fd703555a251db9de..f94bc5824d6c83fd1feca31c572dcfd3
4747
} = require('internal/constants');
4848

4949
let utcCache;
50-
@@ -46,11 +46,13 @@ function isTraceHTTPEnabled() {
50+
@@ -44,11 +44,13 @@ function isTraceHTTPEnabled() {
5151
const traceEventCategory = 'node,node.http';
5252

5353
function traceBegin(...args) {

patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ 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 689e7fb2339253d0f2be3ccf33ecd76660ccf176..8736ad12eec294070a5160a64248044cd16347c9 100644
10+
index 697b8bba6a55358924d6986f2eb347a99ff73889..bdf1a1f33f3ea09d933757c7fee87c563cc833ab 100644
1111
--- a/common.gypi
1212
+++ b/common.gypi
13-
@@ -87,6 +87,8 @@
13+
@@ -86,6 +86,8 @@
1414
'v8_use_perfetto': 0,
1515
'tsan%': 0,
1616

@@ -19,15 +19,15 @@ index 689e7fb2339253d0f2be3ccf33ecd76660ccf176..8736ad12eec294070a5160a64248044c
1919
##### end V8 defaults #####
2020

2121
# When building native modules using 'npm install' with the system npm,
22-
@@ -287,6 +289,7 @@
22+
@@ -285,6 +287,7 @@
2323
# Defines these mostly for node-gyp to pickup.
2424
'defines': [
2525
'_GLIBCXX_USE_CXX11_ABI=1',
2626
+ 'ELECTRON_ENSURE_CONFIG_GYPI',
2727
],
2828

2929
# Forcibly disable -Werror. We support a wide range of compilers, it's
30-
@@ -416,6 +419,11 @@
30+
@@ -414,6 +417,11 @@
3131
}],
3232
],
3333
}],
@@ -40,10 +40,10 @@ index 689e7fb2339253d0f2be3ccf33ecd76660ccf176..8736ad12eec294070a5160a64248044c
4040
# list in v8/BUILD.gn.
4141
['v8_enable_v8_checks == 1', {
4242
diff --git a/configure.py b/configure.py
43-
index 3084cc964cbe6d02f98d08cd6f847ea7f4a3d0db..5b6a3b62082985debf6ebc4bc09a7d056f58514a 100755
43+
index a6f66c41f75bffcfaf75d4415c694300b7624136..7ca0762fe3590fef7b88ba684de44d99aaecace4 100755
4444
--- a/configure.py
4545
+++ b/configure.py
46-
@@ -1559,6 +1559,7 @@ def configure_library(lib, output, pkgname=None):
46+
@@ -1585,6 +1585,7 @@ def configure_library(lib, output, pkgname=None):
4747

4848

4949
def configure_v8(o):

0 commit comments

Comments
 (0)