mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: bump node to v20.14.0 (main) (#42329)

Browse source 
* chore: bump node in DEPS to v20.14.0

* chore: update patches

---------

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>
This commit is contained in:
electron-roller[bot] 2024-05-31 18:06:36 +02:00 committed by GitHub
parent 9f88820be9
commit 4436ce53bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -4,7 +4,7 @@ vars = {
'chromium_version':
'126.0.6445.0',
'node_version':
'v20.13.1',
'v20.14.0',
'nan_version':
'e14bdcd1f72d62bca1d541b66da43130384ec213',
'squirrel.mac_version':

2
patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
View file

@ -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 096cb79db88ce65c3cc57111feb673f37cfd3bb1..a2b0c2a12160b1f59379c552b30b91c3ee65cc12 100644
index 9a27610992612b59eadcc8e481683cf1e6a5dbb6..1fad20645d059ad5f3efaa9279f582f99cb1006b 100644
--- a/common.gypi
+++ b/common.gypi
@@ -87,6 +87,8 @@

2
patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
View file

@ -10,7 +10,7 @@ in.
This should be upstreamed.
diff --git a/common.gypi b/common.gypi
index a2b0c2a12160b1f59379c552b30b91c3ee65cc12..0c0ac7920f00ed1a1561f17fa7cfe9a127f02820 100644
index 1fad20645d059ad5f3efaa9279f582f99cb1006b..4fbb33550e8a044b92997a42eb6603f151ba1043 100644
--- a/common.gypi
+++ b/common.gypi
@@ -134,6 +134,7 @@

2
patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
View file

@ -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 c49e2494659bf20f925a11bfa86409c3224e0213..096cb79db88ce65c3cc57111feb673f37cfd3bb1 100644
index 0af8af37c6cf02d99456d30e4639bbddf8e6ace9..9a27610992612b59eadcc8e481683cf1e6a5dbb6 100644
--- a/common.gypi
+++ b/common.gypi
@@ -89,6 +89,23 @@

4
patches/node/fix_assert_module_in_the_renderer_process.patch
View file

@ -58,10 +58,10 @@ index f9d29f0065b1de63a62cfdce74a9705c22dd87d7..3f44160f1bd40fc2d4658f10edf0d0b3
}
diff --git a/src/node_options.cc b/src/node_options.cc
index aff7ed4956fab5a9ae4f32a34a16682f55c66b5f..659d964dd132bb0060c259d26d38ed5524451e8a 100644
index dae3237abc95362db81a1f529becfac43454d709..ee8e6f342bf4956c5f186337b6c051e1d62a6dcd 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -1295,6 +1295,11 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
@@ -1301,6 +1301,11 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
Local<Context> context = env->context();
Local<Object> ret = Object::New(isolate);

4
patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
View file

@ -423,7 +423,7 @@ index cf051585e779e2b03bd7b95fe5008b89cc7f8162..9de49c6828468fdf846dcd4ad445390f
#if NODE_OPENSSL_HAS_QUIC
#include <openssl/quic.h>
diff --git a/src/node_options.cc b/src/node_options.cc
index 556b3c1592e056a34b6d93b4156b6e3525f3d316..aff7ed4956fab5a9ae4f32a34a16682f55c66b5f 100644
index 937ce44696175dc80edabcd9fc2709a6716d1a66..dae3237abc95362db81a1f529becfac43454d709 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -6,7 +6,7 @@
@ -436,7 +436,7 @@ index 556b3c1592e056a34b6d93b4156b6e3525f3d316..aff7ed4956fab5a9ae4f32a34a16682f
#endif
diff --git a/src/node_options.h b/src/node_options.h
index 703e1d2b1bfc55150d2657aeb95fb3ab16f58b21..5e8c38c938baa2a474ef97fe6fef4bb82c4927ce 100644
index 0a2f5512f689f87b73aa582782c484f73a4ebc43..e1985f2188eec6869521aecd39d2d74d5cc1616a 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -11,7 +11,7 @@

10
patches/node/fix_revert_src_lb_reducing_c_calls_of_esm_legacy_main_resolve.patch
View file

@ -142,7 +142,7 @@ index 30f6abd5d2d3fb7aceaa6191ebd99642e34d9ee4..cd5f59a5c27afd74f68c920a6ab5b8bc
const encodedSepRegEx = /%2F|%5C/i;
diff --git a/src/node_file.cc b/src/node_file.cc
index 913fdf2d7826b7879c37c5833162cffa903eb3c3..d9a4053fa595d0b3b63f7fcdc3f21ee897c4f520 100644
index 0ec5c6f4845e7b1f279caabca43a06ab41193d00..1e66de2fb7860a0d0dcab6c7bded90a048886cf8 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -19,14 +19,11 @@
@ -160,7 +160,7 @@ index 913fdf2d7826b7879c37c5833162cffa903eb3c3..d9a4053fa595d0b3b63f7fcdc3f21ee8
#include "node_process-inl.h"
#include "node_stat_watcher.h"
#include "node_url.h"
@@ -2988,134 +2985,6 @@ constexpr std::array<std::string_view, 10> legacy_main_extensions = {
@@ -3116,134 +3113,6 @@ constexpr std::array<std::string_view, 10> legacy_main_extensions = {
} // namespace
@ -295,7 +295,7 @@ index 913fdf2d7826b7879c37c5833162cffa903eb3c3..d9a4053fa595d0b3b63f7fcdc3f21ee8
void BindingData::MemoryInfo(MemoryTracker* tracker) const {
tracker->TrackField("stats_field_array", stats_field_array);
tracker->TrackField("stats_field_bigint_array", stats_field_bigint_array);
@@ -3215,19 +3084,6 @@ InternalFieldInfoBase* BindingData::Serialize(int index) {
@@ -3343,19 +3212,6 @@ InternalFieldInfoBase* BindingData::Serialize(int index) {
return info;
}
@ -315,7 +315,7 @@ index 913fdf2d7826b7879c37c5833162cffa903eb3c3..d9a4053fa595d0b3b63f7fcdc3f21ee8
static void CreatePerIsolateProperties(IsolateData* isolate_data,
Local<ObjectTemplate> target) {
Isolate* isolate = isolate_data->isolate();
@@ -3282,7 +3138,6 @@ static void CreatePerIsolateProperties(IsolateData* isolate_data,
@@ -3410,7 +3266,6 @@ static void CreatePerIsolateProperties(IsolateData* isolate_data,
SetMethod(isolate, target, "mkdtemp", Mkdtemp);
StatWatcher::CreatePerIsolateProperties(isolate_data, target);
@ -323,7 +323,7 @@ index 913fdf2d7826b7879c37c5833162cffa903eb3c3..d9a4053fa595d0b3b63f7fcdc3f21ee8
target->Set(
FIXED_ONE_BYTE_STRING(isolate, "kFsStatsFieldsNumber"),
@@ -3355,7 +3210,6 @@ BindingData* FSReqBase::binding_data() {
@@ -3483,7 +3338,6 @@ BindingData* FSReqBase::binding_data() {
void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
registry->Register(Access);
StatWatcher::RegisterExternalReferences(registry);

2
patches/node/test_match_wpt_streams_transferable_transform-stream-members_any_js.patch
View file

@ -7,7 +7,7 @@ Subject: test: match wpt/streams/transferable/transform-stream-members.any.js
All four of this calls should fail - see third_party/blink/web_tests/external/wpt/streams/transferable/transform-stream-members.any-expected.txt
diff --git a/test/wpt/status/streams.json b/test/wpt/status/streams.json
index 3b6e0ce6429f9dddb0b1a6882ce9e3a5158300e5..7ec49a378bfc84728b473d5df69675fff1dfdfef 100644
index 8d6a4c6d2fe27b349ca8a4cbcdc51c3eec06ede9..1e7af48a149ba2c8bed01cd6584e59dc0bc6b676 100644
--- a/test/wpt/status/streams.json
+++ b/test/wpt/status/streams.json
@@ -50,7 +50,9 @@