chore: bump node to v18.13.0 (main) (electron#36818)

* chore: bump node in DEPS to v18.13.0 * child_process: validate arguments for null bytes nodejs/node#44782 * bootstrap: merge main thread and worker thread initializations nodejs/node#44869 * module: ensure relative requires work from deleted directories nodejs/node#42384 * src: add support for externally shared js builtins nodejs/node#44000 * lib: disambiguate `native module` to `binding` nodejs/node#45673 * test: convert test-debugger-pid to async/await nodejs/node#45179 * deps: upgrade to libuv 1.44.2 nodejs/node#42340 * src: fix cppgc incompatibility in v8 nodejs/node#43521 * src: use qualified `std::move` call in node_http2 nodejs/node#45555 * build: fix env.h for cpp20 nodejs/node#45516 * test: remove experimental-wasm-threads flag nodejs/node#45074 * src: iwyu in cleanup_queue.cc nodejs/node#44983 * src: add missing include for `std::all_of` nodejs/node#45541 * deps: update ICU to 72.1 nodejs/node#45068 * chore: fixup patch indices * chore: remove errant semicolons - nodejs/node#44179 - nodejs/node#44193 * src: add support for externally shared js builtins nodejs/node#44376 * chore: add missing GN filenames * deps: update nghttp2 to 1.51.0 nodejs/node#45537 * chore: disable more Node.js snapshot tests The Snapshot feature is currently disabled * chore: disable ICU timezone tests Node.js uses a different version of ICU than Electron so they will often be out of sync. * chore: disable threadpool event tracing test Event tracing is not enabled in embedded Node.js * chore: fixup patch indices * chore: comments from review Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
brightsign · Mar 15, 2023 · c6ae563 · c6ae563
1 parent 270f2db
commit c6ae563
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 0 deletions.
diff --git a/patches/node/.patches b/patches/node/.patches
@@ -25,6 +25,7 @@ build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
 fix_override_createjob_in_node_platform.patch
 v8_api_advance_api_deprecation.patch
 fixup_for_error_declaration_shadows_a_local_variable.patch
+fixup_for_wc_98-compat-extra-semi.patch
 fix_parallel_test-v8-stats.patch
 fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
 heap_remove_allocationspace_map_space_enum_constant.patch
@@ -36,3 +37,5 @@ allow_embedder_to_control_codegenerationfromstringscallback.patch
 src_allow_optional_isolation_termination_in_node.patch
 test_mark_cpu_prof_tests_as_flaky_in_electron.patch
 lib_fix_broadcastchannel_initialization_location.patch
+chore_remove_errant_semicolons.patch
+chore_remove_unreached_return.patch
diff --git a/patches/node/chore_remove_errant_semicolons.patch b/patches/node/chore_remove_errant_semicolons.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <[email protected]>
+Date: Mon, 9 Jan 2023 13:53:36 +0100
+Subject: chore: remove errant semicolons
+
+- https://github.com/nodejs/node/pull/44179
+- https://github.com/nodejs/node/pull/44193
+
+This should be upstreamed.
+
+diff --git a/src/node_realm.h b/src/node_realm.h
+index 9ece8cb38958c364c6177118a5e7443c3a6bdf1a..0d3259a149e94b7d9657959c0ccac25a146978b4 100644
+--- a/src/node_realm.h
++++ b/src/node_realm.h
+@@ -55,7 +55,7 @@ class Realm : public MemoryRetainer {
+   Realm& operator=(Realm&&) = delete;
+
+   SET_MEMORY_INFO_NAME(Realm)
+-  SET_SELF_SIZE(Realm);
++  SET_SELF_SIZE(Realm)
+   void MemoryInfo(MemoryTracker* tracker) const override;
+
+   void CreateProperties();
+diff --git a/src/node_util.h b/src/node_util.h
+index 616b8c003b2d0dd80e01297ca3fe7e4926220ad7..9590842ae4764dd3363a4d74038d3351f0061177 100644
+--- a/src/node_util.h
++++ b/src/node_util.h
+@@ -12,7 +12,7 @@ namespace util {
+
+ class WeakReference : public SnapshotableObject {
+  public:
+-  SERIALIZABLE_OBJECT_METHODS();
++  SERIALIZABLE_OBJECT_METHODS()
+
+   static constexpr FastStringKey type_name{"node::util::WeakReference"};
+   static constexpr EmbedderObjectType type_int =
diff --git a/patches/node/chore_remove_unreached_return.patch b/patches/node/chore_remove_unreached_return.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <[email protected]>
+Date: Mon, 9 Jan 2023 14:34:01 +0100
+Subject: chore: remove unreached return
+
+https://github.com/nodejs/node/pull/44376 added a return after a call to
+ABORT(), triggering an unreachable code error.
+
+This should be upstreamed.
+
+diff --git a/src/node_builtins.cc b/src/node_builtins.cc
+index 25b02f9904127780c68db9b451a7dfcf02a6fc5e..1be20aea500fd9d606c5a38a86b4aef66b49d133 100644
+--- a/src/node_builtins.cc
++++ b/src/node_builtins.cc
+@@ -247,7 +247,6 @@ void BuiltinLoader::AddExternalizedBuiltin(const char* id,
+     fprintf(
+         stderr, "Cannot load externalized builtin: \"%s:%s\".\n", id, filename);
+     ABORT();
+-    return;
+   }
+
+   icu::UnicodeString utf16 = icu::UnicodeString::fromUTF8(