Skip to content

Commit 23a535e

Browse files
electron-roller[bot]codebytere
authored andcommitted
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 <shelley.vohr@gmail.com>
1 parent fab9648 commit 23a535e

File tree

3 files changed

+61
-0
lines changed

3 files changed

+61
-0
lines changed

patches/node/.patches

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
2525
fix_override_createjob_in_node_platform.patch
2626
v8_api_advance_api_deprecation.patch
2727
fixup_for_error_declaration_shadows_a_local_variable.patch
28+
fixup_for_wc_98-compat-extra-semi.patch
2829
fix_parallel_test-v8-stats.patch
2930
fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
3031
heap_remove_allocationspace_map_space_enum_constant.patch
@@ -36,3 +37,5 @@ allow_embedder_to_control_codegenerationfromstringscallback.patch
3637
src_allow_optional_isolation_termination_in_node.patch
3738
test_mark_cpu_prof_tests_as_flaky_in_electron.patch
3839
lib_fix_broadcastchannel_initialization_location.patch
40+
chore_remove_errant_semicolons.patch
41+
chore_remove_unreached_return.patch
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shelley Vohr <shelley.vohr@gmail.com>
3+
Date: Mon, 9 Jan 2023 13:53:36 +0100
4+
Subject: chore: remove errant semicolons
5+
6+
- https://github.com/nodejs/node/pull/44179
7+
- https://github.com/nodejs/node/pull/44193
8+
9+
This should be upstreamed.
10+
11+
diff --git a/src/node_realm.h b/src/node_realm.h
12+
index 9ece8cb38958c364c6177118a5e7443c3a6bdf1a..0d3259a149e94b7d9657959c0ccac25a146978b4 100644
13+
--- a/src/node_realm.h
14+
+++ b/src/node_realm.h
15+
@@ -55,7 +55,7 @@ class Realm : public MemoryRetainer {
16+
Realm& operator=(Realm&&) = delete;
17+
18+
SET_MEMORY_INFO_NAME(Realm)
19+
- SET_SELF_SIZE(Realm);
20+
+ SET_SELF_SIZE(Realm)
21+
void MemoryInfo(MemoryTracker* tracker) const override;
22+
23+
void CreateProperties();
24+
diff --git a/src/node_util.h b/src/node_util.h
25+
index 616b8c003b2d0dd80e01297ca3fe7e4926220ad7..9590842ae4764dd3363a4d74038d3351f0061177 100644
26+
--- a/src/node_util.h
27+
+++ b/src/node_util.h
28+
@@ -12,7 +12,7 @@ namespace util {
29+
30+
class WeakReference : public SnapshotableObject {
31+
public:
32+
- SERIALIZABLE_OBJECT_METHODS();
33+
+ SERIALIZABLE_OBJECT_METHODS()
34+
35+
static constexpr FastStringKey type_name{"node::util::WeakReference"};
36+
static constexpr EmbedderObjectType type_int =
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shelley Vohr <shelley.vohr@gmail.com>
3+
Date: Mon, 9 Jan 2023 14:34:01 +0100
4+
Subject: chore: remove unreached return
5+
6+
https://github.com/nodejs/node/pull/44376 added a return after a call to
7+
ABORT(), triggering an unreachable code error.
8+
9+
This should be upstreamed.
10+
11+
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
12+
index 25b02f9904127780c68db9b451a7dfcf02a6fc5e..1be20aea500fd9d606c5a38a86b4aef66b49d133 100644
13+
--- a/src/node_builtins.cc
14+
+++ b/src/node_builtins.cc
15+
@@ -247,7 +247,6 @@ void BuiltinLoader::AddExternalizedBuiltin(const char* id,
16+
fprintf(
17+
stderr, "Cannot load externalized builtin: \"%s:%s\".\n", id, filename);
18+
ABORT();
19+
- return;
20+
}
21+
22+
icu::UnicodeString utf16 = icu::UnicodeString::fromUTF8(

0 commit comments

Comments
 (0)