From 4968d8145a1f17f4995a4b35b1d1b17c3acbf38c Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 17:13:35 +0200 Subject: [PATCH] chore: bump node to v18.18.2 (main) (#40205) * chore: bump node in DEPS to v18.18.2 * chore: update patches * deps: update nghttp2 to 1.55.0 https://github.com/nodejs/node/pull/48746 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- DEPS | 2 +- patches/node/build_add_gn_build_files.patch | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 1f24a90613232..dba2c7d1ed284 100644 --- a/DEPS +++ b/DEPS @@ -4,7 +4,7 @@ vars = { 'chromium_version': '120.0.6099.5', 'node_version': - 'v18.18.1', + 'v18.18.2', 'nan_version': 'e14bdcd1f72d62bca1d541b66da43130384ec213', 'squirrel.mac_version': diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index cff0736ad65f4..96734be769e07 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -849,10 +849,10 @@ index 0000000000000000000000000000000000000000..fb000f8ee7647c375bc190d1729d67bb +} diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn new file mode 100644 -index 0000000000000000000000000000000000000000..23eed033d31eced6a85c794eee550655af7a9a1d +index 0000000000000000000000000000000000000000..7d2ca477db2415f43ababa270d8aefa3124b2765 --- /dev/null +++ b/deps/nghttp2/BUILD.gn -@@ -0,0 +1,48 @@ +@@ -0,0 +1,51 @@ +config("nghttp2_config") { + defines = [ "NGHTTP2_STATICLIB" ] + include_dirs = [ "lib/includes" ] @@ -894,11 +894,14 @@ index 0000000000000000000000000000000000000000..23eed033d31eced6a85c794eee550655 + "lib/nghttp2_pq.c", + "lib/nghttp2_priority_spec.c", + "lib/nghttp2_queue.c", ++ "lib/nghttp2_ratelim.c", + "lib/nghttp2_rcbuf.c", + "lib/nghttp2_session.c", + "lib/nghttp2_stream.c", + "lib/nghttp2_submit.c", ++ "lib/nghttp2_time.c", + "lib/nghttp2_version.c", ++ "lib/sfparse.c" + ] +} diff --git a/deps/simdutf/BUILD.gn b/deps/simdutf/BUILD.gn @@ -2104,7 +2107,7 @@ index 0000000000000000000000000000000000000000..4ab828dcbf322a9e28674e48c4a6868b + args = rebase_path(inputs + outputs, root_build_dir) +} diff --git a/src/node_version.h b/src/node_version.h -index ac1fc294a412b1a63b6f6bb4c49cd5ce34fb8ad7..eaa480cd63217dc9cd6868dff411932adef4ef08 100644 +index 88cc915177bcf8b86eb8f9f16b215cb6d06b3aa7..8df52c22dd76a850d421075effc44fbfb32307db 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -89,7 +89,10 @@