chore: bump node to v20.18.3 (33-x-y) (#45299)

* chore: bump node in DEPS to v20.18.2

* chore: bump node in DEPS to v20.18.3

* src: fix outdated js2c.cc references

nodejs/node#56133

* lib: remove startsWith/endsWith primordials for char checks

nodejs/node#55407

* test,crypto: make crypto tests work with BoringSSL

nodejs/node#55491

* fix: potential WIN32_LEAN_AND_MEAN redefinition

c-ares/c-ares#869

* deps: update c-ares to v1.34.1

nodejs/node#55369

* chore fixup patch indices

* chore: fix bssl test conditiojnal

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

Author: electron-roller[bot]

DEPS

@@ -4,7 +4,7 @@ vars = {
   'chromium_version':
     '130.0.6723.191',
   'node_version':
-    'v20.18.1',
+    'v20.18.3',
   'nan_version':
     'e14bdcd1f72d62bca1d541b66da43130384ec213',
   'squirrel.mac_version':

patches/node/.patches

@@ -48,7 +48,6 @@ test_update_v8-stats_test_for_v8_12_6.patch
 src_do_not_use_soon-to-be-deprecated_v8_api.patch
 fix_add_property_query_interceptors.patch
 src_stop_using_deprecated_fields_of_fastapicallbackoptions.patch
-build_don_t_redefine_win32_lean_and_mean.patch
 src_use_supported_api_to_get_stalled_tla_messages.patch
 build_compile_with_c_20_support.patch
 add_v8_taskpirority_to_foreground_task_runner_signature.patch

patches/node/build_add_gn_build_files.patch

@@ -537,17 +537,21 @@ index 0e69d7383762f6b81c5b57698aa9d121d5a9c401..35bbeb37acc7ccb14b4b8a644ec3d4c7
          cflags_c = [
            "-mavx512vl",
 diff --git a/deps/cares/BUILD.gn b/deps/cares/BUILD.gn
-index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be02e5d73f1 100644
+index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..ef745c19f2b1cd433cc43c834a18db7eaa8e5162 100644
 --- a/deps/cares/BUILD.gn
 +++ b/deps/cares/BUILD.gn
-@@ -1,14 +1,175 @@
+@@ -1,14 +1,188 @@
 -##############################################################################
 -#                                                                            #
 -#                       DO NOT EDIT THIS FILE!                               #
 -#                                                                            #
 -##############################################################################
 +config("cares_config") {
-+  include_dirs = [ "include", "src/lib" ]
++  include_dirs = [
++    "include",
++    "src/lib",
++    "src/lib/include",
++  ]
 +}
 +static_library("cares") {
 +  defines = [ "CARES_STATICLIB" ]
@@ -563,20 +567,19 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
 +
 +  sources = [
 +    "include/ares.h",
++    "include/ares_build.h",
 +    "include/ares_dns.h",
 +    "include/ares_dns_record.h",
 +    "include/ares_nameser.h",
 +    "include/ares_version.h",
-+    "src/lib/ares__addrinfo2hostent.c",
-+    "src/lib/ares__addrinfo_localhost.c",
-+    "src/lib/ares__close_sockets.c",
-+    "src/lib/ares__hosts_file.c",
-+    "src/lib/ares__parse_into_addrinfo.c",
-+    "src/lib/ares__socket.c",
-+    "src/lib/ares__sortaddrinfo.c",
++    "src/lib/ares_addrinfo2hostent.c",
++    "src/lib/ares_addrinfo_localhost.c",
 +    "src/lib/ares_android.c",
 +    "src/lib/ares_android.h",
 +    "src/lib/ares_cancel.c",
++    "src/lib/ares_close_sockets.c",
++    "src/lib/ares_conn.c",
++    "src/lib/ares_conn.h",
 +    "src/lib/ares_cookie.c",
 +    "src/lib/ares_data.c",
 +    "src/lib/ares_data.h",
@@ -590,43 +593,43 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
 +    "src/lib/ares_gethostbyaddr.c",
 +    "src/lib/ares_gethostbyname.c",
 +    "src/lib/ares_getnameinfo.c",
++    "src/lib/ares_hosts_file.c",
 +    "src/lib/ares_inet_net_pton.h",
 +    "src/lib/ares_init.c",
 +    "src/lib/ares_ipv6.h",
 +    "src/lib/ares_library_init.c",
 +    "src/lib/ares_metrics.c",
 +    "src/lib/ares_options.c",
-+    "src/lib/ares_platform.c",
-+    "src/lib/ares_platform.h",
++    "src/lib/ares_parse_into_addrinfo.c",
 +    "src/lib/ares_private.h",
 +    "src/lib/ares_process.c",
 +    "src/lib/ares_qcache.c",
 +    "src/lib/ares_query.c",
 +    "src/lib/ares_search.c",
 +    "src/lib/ares_send.c",
++    "src/lib/ares_set_socket_functions.c",
 +    "src/lib/ares_setup.h",
++    "src/lib/ares_socket.c",
++    "src/lib/ares_socket.h",
++    "src/lib/ares_sortaddrinfo.c",
 +    "src/lib/ares_strerror.c",
 +    "src/lib/ares_sysconfig.c",
 +    "src/lib/ares_sysconfig_files.c",
 +    "src/lib/ares_timeout.c",
 +    "src/lib/ares_update_servers.c",
 +    "src/lib/ares_version.c",
-+    "src/lib/dsa/ares__array.c",
-+    "src/lib/dsa/ares__array.h",
-+    "src/lib/dsa/ares__htable.c",
-+    "src/lib/dsa/ares__htable.h",
-+    "src/lib/dsa/ares__htable_asvp.c",
-+    "src/lib/dsa/ares__htable_asvp.h",
-+    "src/lib/dsa/ares__htable_strvp.c",
-+    "src/lib/dsa/ares__htable_strvp.h",
-+    "src/lib/dsa/ares__htable_szvp.c",
-+    "src/lib/dsa/ares__htable_szvp.h",
-+    "src/lib/dsa/ares__htable_vpvp.c",
-+    "src/lib/dsa/ares__htable_vpvp.h",
-+    "src/lib/dsa/ares__llist.c",
-+    "src/lib/dsa/ares__llist.h",
-+    "src/lib/dsa/ares__slist.c",
-+    "src/lib/dsa/ares__slist.h",
++    "src/lib/dsa/ares_array.c",
++    "src/lib/dsa/ares_htable.c",
++    "src/lib/dsa/ares_htable.h",
++    "src/lib/dsa/ares_htable_asvp.c",
++    "src/lib/dsa/ares_htable_dict.c",
++    "src/lib/dsa/ares_htable_strvp.c",
++    "src/lib/dsa/ares_htable_szvp.c",
++    "src/lib/dsa/ares_htable_vpstr.c",
++    "src/lib/dsa/ares_htable_vpvp.c",
++    "src/lib/dsa/ares_llist.c",
++    "src/lib/dsa/ares_slist.c",
++    "src/lib/dsa/ares_slist.h",
 +    "src/lib/event/ares_event.h",
 +    "src/lib/event/ares_event_configchg.c",
 +    "src/lib/event/ares_event_epoll.c",
@@ -637,6 +640,17 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
 +    "src/lib/event/ares_event_wake_pipe.c",
 +    "src/lib/event/ares_event_win32.c",
 +    "src/lib/event/ares_event_win32.h",
++    "src/lib/include/ares_array.h",
++    "src/lib/include/ares_buf.h",
++    "src/lib/include/ares_htable_asvp.h",
++    "src/lib/include/ares_htable_dict.h",
++    "src/lib/include/ares_htable_strvp.h",
++    "src/lib/include/ares_htable_szvp.h",
++    "src/lib/include/ares_htable_vpstr.h",
++    "src/lib/include/ares_htable_vpvp.h",
++    "src/lib/include/ares_llist.h",
++    "src/lib/include/ares_mem.h",
++    "src/lib/include/ares_str.h",
 +    "src/lib/inet_net_pton.c",
 +    "src/lib/inet_ntop.c",
 +    "src/lib/legacy/ares_create_query.c",
@@ -663,23 +677,22 @@ index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..7f4885631a85a25692e8969991951be0
 +    "src/lib/record/ares_dns_private.h",
 +    "src/lib/record/ares_dns_record.c",
 +    "src/lib/record/ares_dns_write.c",
-+    "src/lib/str/ares__buf.c",
-+    "src/lib/str/ares__buf.h",
++    "src/lib/str/ares_buf.c",
 +    "src/lib/str/ares_str.c",
-+    "src/lib/str/ares_str.h",
-+    "src/lib/str/ares_strcasecmp.c",
-+    "src/lib/str/ares_strcasecmp.h",
 +    "src/lib/str/ares_strsplit.c",
 +    "src/lib/str/ares_strsplit.h",
-+    "src/lib/util/ares__iface_ips.c",
-+    "src/lib/util/ares__iface_ips.h",
-+    "src/lib/util/ares__threads.c",
-+    "src/lib/util/ares__threads.h",
-+    "src/lib/util/ares__timeval.c",
++    "src/lib/util/ares_iface_ips.c",
++    "src/lib/util/ares_iface_ips.h",
 +    "src/lib/util/ares_math.c",
++    "src/lib/util/ares_math.h",
 +    "src/lib/util/ares_rand.c",
-+    "src/tools/ares_getopt.c",
-+    "src/tools/ares_getopt.h",
++    "src/lib/util/ares_rand.h",
++    "src/lib/util/ares_threads.c",
++    "src/lib/util/ares_threads.h",
++    "src/lib/util/ares_time.h",
++    "src/lib/util/ares_timeval.c",
++    "src/lib/util/ares_uri.c",
++    "src/lib/util/ares_uri.h",
 +  ]
 +
 +  if (!is_win) {
@@ -2247,19 +2260,6 @@ index 706ea4f5cb90525c8ea56f794320a733c45a193f..c7ae7759595bfc7fdc31dab174a7514d
  }
 
  }  // namespace builtins
-diff --git a/src/node_builtins.h b/src/node_builtins.h
-index 1cb85b9058d06555382e565dc32192a9fa48ed9f..cec9be01abd107e8612f70daf19b4834e118ffcf 100644
---- a/src/node_builtins.h
-+++ b/src/node_builtins.h
-@@ -74,6 +74,8 @@ using BuiltinCodeCacheMap =
- // Generated by tools/js2c.py as node_javascript.cc
- void RegisterExternalReferencesForInternalizedBuiltinCode(
-     ExternalReferenceRegistry* registry);
-+void EmbedderRegisterExternalReferencesForInternalizedBuiltinCode(
-+    ExternalReferenceRegistry* registry);
- 
- // Handles compilation and caching of built-in JavaScript modules and
- // bootstrap scripts, whose source are bundled into the binary as static data.
 diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py
 new file mode 100755
 index 0000000000000000000000000000000000000000..37c16859003e61636fe2f1a4040b1e904c472d0b
@@ -2409,18 +2409,18 @@ index 0000000000000000000000000000000000000000..9be3ac447f9a4dde23fefc26e0b922b4
 +      transformed_f.write(transformed_contents)
 +
 diff --git a/tools/install.py b/tools/install.py
-index b132c7bf26c02886a7ab341a1973bf449744ba0f..757e3e60a7be01fac55c5fbb010dbbae00b1bfca 100755
+index 2dceb5c39ea4a11034ce93899fa26dc406e0b5d0..a425de8ad7833f4d39c842fd896539c1f77468bc 100755
 --- a/tools/install.py
 +++ b/tools/install.py
-@@ -264,6 +264,7 @@ def headers(options, action):
+@@ -270,6 +270,7 @@ def headers(options, action):
        'include/v8-forward.h',
        'include/v8-function-callback.h',
        'include/v8-function.h',
 +      'include/v8-handle-base.h',
        'include/v8-initialization.h',
        'include/v8-internal.h',
        'include/v8-isolate.h',
-@@ -284,6 +285,8 @@ def headers(options, action):
+@@ -290,6 +291,8 @@ def headers(options, action):
        'include/v8-promise.h',
        'include/v8-proxy.h',
        'include/v8-regexp.h',
@@ -2429,7 +2429,7 @@ index b132c7bf26c02886a7ab341a1973bf449744ba0f..757e3e60a7be01fac55c5fbb010dbbae
        'include/v8-script.h',
        'include/v8-snapshot.h',
        'include/v8-statistics.h',
-@@ -390,7 +393,7 @@ def parse_options(args):
+@@ -396,7 +399,7 @@ def parse_options(args):
    parser.add_argument('--build-dir', help='the location of built binaries',
                        default='out/Release')
    parser.add_argument('--v8-dir', help='the location of V8',

patches/node/build_compile_with_c_20_support.patch

@@ -10,7 +10,7 @@ V8 requires C++20 support as of https://chromium-review.googlesource.com/c/v8/v8
 This can be removed when Electron upgrades to a version of Node.js containing the required V8 version.
 
 diff --git a/common.gypi b/common.gypi
-index bdf1a1f33f3ea09d933757c7fee87c563cc833ab..2eb62610db2f0ebf68fa9a55ffba98291ecfe451 100644
+index 690068f093f12b6831f8ccce41289d02d7047a7a..5a3df388773ad288553bf036be42dc1a0ba75c09 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -305,7 +305,7 @@

patches/node/build_don_t_redefine_win32_lean_and_mean.patch

@@ -7,7 +7,7 @@ Subject: build: ensure native module compilation fails if not using a new
 This should not be upstreamed, it is a quality-of-life patch for downstream module builders.
 
 diff --git a/common.gypi b/common.gypi
-index 697b8bba6a55358924d6986f2eb347a99ff73889..bdf1a1f33f3ea09d933757c7fee87c563cc833ab 100644
+index 776a6dcf3a729a65b367fb5b4c5685f841089eea..690068f093f12b6831f8ccce41289d02d7047a7a 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -86,6 +86,8 @@
@@ -40,10 +40,10 @@ index 697b8bba6a55358924d6986f2eb347a99ff73889..bdf1a1f33f3ea09d933757c7fee87c56
        # list in v8/BUILD.gn.
        ['v8_enable_v8_checks == 1', {
 diff --git a/configure.py b/configure.py
-index 0d089c35d1720e05c4c61d0226a2ebc276b65d6e..cf19b9d092698e1697508e8891926947bc2f7b12 100755
+index 0df90b176e9b5403efdb1393c0f2f37bb53dc6b2..ece665915ad4d6e02762ec3165cf7b987a87949d 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -1585,6 +1585,7 @@ def configure_library(lib, output, pkgname=None):
+@@ -1595,6 +1595,7 @@ def configure_library(lib, output, pkgname=None):
 
 
  def configure_v8(o):
@@ -52,7 +52,7 @@ index 0d089c35d1720e05c4c61d0226a2ebc276b65d6e..cf19b9d092698e1697508e8891926947
    o['variables']['v8_enable_javascript_promise_hooks'] = 1
    o['variables']['v8_enable_lite_mode'] = 1 if options.v8_lite_mode else 0
 diff --git a/src/node.h b/src/node.h
-index 4f2eb9d0aab88b70c86339e750799080e980d7da..df3fb3372d6357b5d77b4f683e309b8483998128 100644
+index 7d9d9afd049237646f82c3e22f5e7a8af7314a84..a941d9987abcbb0f9db3072b8c896a5f328dd027 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -22,6 +22,12 @@

patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

@@ -46,12 +46,21 @@ index c7ae7759595bfc7fdc31dab174a7514ddd8345e7..4bf80aa6cc6385dc376fd0a3538efc27
    AddExternalizedBuiltin(
        "internal/deps/cjs-module-lexer/lexer",
 diff --git a/src/node_builtins.h b/src/node_builtins.h
-index cec9be01abd107e8612f70daf19b4834e118ffcf..3d9c6b962423555257bad4ebaad9ebd821d00042 100644
+index a73de23a1debfdac66873e0baccf882e383bfc36..c3c987d535285be84026ad0c633650bd2067d22d 100644
 --- a/src/node_builtins.h
 +++ b/src/node_builtins.h
-@@ -138,6 +138,7 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {
+@@ -74,6 +74,8 @@ using BuiltinCodeCacheMap =
+ // Generated by tools/js2c.cc as node_javascript.cc
+ void RegisterExternalReferencesForInternalizedBuiltinCode(
+     ExternalReferenceRegistry* registry);
++void EmbedderRegisterExternalReferencesForInternalizedBuiltinCode(
++    ExternalReferenceRegistry* registry);
 
-   // Generated by tools/js2c.py as node_javascript.cc
+ // Handles compilation and caching of built-in JavaScript modules and
+ // bootstrap scripts, whose source are bundled into the binary as static data.
+@@ -136,6 +138,7 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {
+ 
+   // Generated by tools/js2c.cc as node_javascript.cc
    void LoadJavaScriptSource();  // Loads data into source_
 +  void LoadEmbedderJavaScriptSource();  // Loads embedder data into source_
    UnionBytes GetConfig();       // Return data for config.gypi

patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch

@@ -11,7 +11,7 @@ node-gyp will use the result of `process.config` that reflects the environment
 in which the binary got built.
 
 diff --git a/common.gypi b/common.gypi
-index 2eb62610db2f0ebf68fa9a55ffba98291ecfe451..3ec08ee144b586d05c4e49c2251416734cbc02c5 100644
+index 5a3df388773ad288553bf036be42dc1a0ba75c09..9bbf1b277eb17d78ca385643c3177638fd75866a 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -125,6 +125,7 @@

patches/node/build_restore_clang_as_default_compiler_on_macos.patch

@@ -26,12 +26,12 @@ index 364469160af5e348f8890417de16a63c0d1dca67..75d5f58fe02fa8cfa7716ffaf761d567
          try {
            resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
 diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
-index a05d2846050c2f505eac16320f645e79182a27f6..348bb80ef7fae1e0e5f529b1313093eeadad9276 100644
+index 0bbabb80c26a1208860f6d32447c0ae53316f501..ba18bfa3cd17c2b8e977f53651ce2744b17a829f 100644
 --- a/lib/internal/process/pre_execution.js
 +++ b/lib/internal/process/pre_execution.js
-@@ -247,12 +247,14 @@ function patchProcessObject(expandArgv1) {
-   if (expandArgv1 && process.argv[1] &&
-       !StringPrototypeStartsWith(process.argv[1], '-')) {
+@@ -245,12 +245,14 @@ function patchProcessObject(expandArgv1) {
+   // the entry point.
+   if (expandArgv1 && process.argv[1] && process.argv[1][0] !== '-') {
      // Expand process.argv[1] into a full path.
 -    const path = require('path');
 -    try {

patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch

@@ -7,7 +7,7 @@ common.gypi is a file that's included in the node header bundle, despite
 the fact that we do not build node with gyp.
 
 diff --git a/common.gypi b/common.gypi
-index 1ece4f5e494533ea0fa25e0d35143fe424dbf70b..697b8bba6a55358924d6986f2eb347a99ff73889 100644
+index 04852d81103ef83c5213464f543839dea6f0b181..776a6dcf3a729a65b367fb5b4c5685f841089eea 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -88,6 +88,23 @@

patches/node/fix_add_default_values_for_variables_in_common_gypi.patch

@@ -58,10 +58,10 @@ index b9098d102b40adad7fafcc331ac62870617019b9..cb9269a31e073caf86164aa39c064037
  }
 
 diff --git a/src/node_options.cc b/src/node_options.cc
-index efbe48e10b8408642a6b5010b1a7a3749068188a..9b5f49ebb478a21acf8f0d6ed012ed6829a8a320 100644
+index b7ef44b018c7aec59d8311642a811d1280247689..e19b9d88a908154dbcfd0b0e3efbc7510609f810 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
-@@ -1405,14 +1405,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
+@@ -1409,14 +1409,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
    }
    Isolate* isolate = args.GetIsolate();