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

chore: bump node to v22.21.1 (39-x-y) (#48616)

Browse source 
* chore: bump node in DEPS to v22.21.0

* chore: bump node in DEPS to v22.21.1

* chore: update patches

* fixup patches/node/api_remove_deprecated_getisolate.patch

* src: add percentage support to --max-old-space-size

https://github.com/nodejs/node/pull/59082
(cherry picked from commit 851df7ede67192efd3db4847eeb7b254ba62a3ea)

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2025-10-30 09:37:51 -04:00 • committed by GitHub
commit 0c0376637c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 155 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -4,7 +4,7 @@ vars = {
'chromium_version': 'chromium_version':
'142.0.7444.59', '142.0.7444.59',
'node_version': 'node_version':
'v22.20.0', 'v22.21.1',
'nan_version': 'nan_version':
'e14bdcd1f72d62bca1d541b66da43130384ec213', 'e14bdcd1f72d62bca1d541b66da43130384ec213',
'squirrel.mac_version': 'squirrel.mac_version':

1
patches/node/.patches
View file

@ -17,7 +17,6 @@ chore_expose_importmoduledynamically_and.patch
test_formally_mark_some_tests_as_flaky.patch test_formally_mark_some_tests_as_flaky.patch
fix_do_not_resolve_electron_entrypoints.patch fix_do_not_resolve_electron_entrypoints.patch
ci_ensure_node_tests_set_electron_run_as_node.patch ci_ensure_node_tests_set_electron_run_as_node.patch
fix_assert_module_in_the_renderer_process.patch
fix_allow_passing_fileexists_fn_to_legacymainresolve.patch fix_allow_passing_fileexists_fn_to_legacymainresolve.patch
fix_remove_deprecated_errno_constants.patch fix_remove_deprecated_errno_constants.patch
build_enable_perfetto.patch build_enable_perfetto.patch

96
patches/node/api_remove_deprecated_getisolate.patch
View file

@ -85,10 +85,10 @@ index 6f731b17fe0b84dd3d2c9bc9cfef1f8062a2c5f7..71a1072ed2decbee08d40eda7c47456b
return handle; return handle;
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
index a3d309d832c73ddc79564b9644d825bec7459e7f..580cbaf3858961f375ca2f53c48a07bcba82ef46 100644 index 8f50d0cc132ac65fa74cf1fc2172247b5ad42962..0c6b12f8e17b4a7e86ebc836a4e1cc77333f211a 100644
--- a/src/crypto/crypto_context.cc --- a/src/crypto/crypto_context.cc
+++ b/src/crypto/crypto_context.cc +++ b/src/crypto/crypto_context.cc
@@ -967,7 +967,7 @@ bool ArrayOfStringsToX509s(Local<Context> context, @@ -1020,7 +1020,7 @@ bool ArrayOfStringsToX509s(Local<Context> context,
Local<Array> cert_array, Local<Array> cert_array,
std::vector<X509*>* certs) { std::vector<X509*>* certs) {
ClearErrorOnReturn clear_error_on_return; ClearErrorOnReturn clear_error_on_return;
@ -310,10 +310,28 @@ index 27aeac589b19cd681923fb848ce5f36c66fc05e2..5f2900869763f40cac54e3cb3fe2e24e
module_api_version(module_api_version) { module_api_version(module_api_version) {
napi_clear_last_error(this); napi_clear_last_error(this);
diff --git a/src/module_wrap.cc b/src/module_wrap.cc diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index cbb3e7f4df72f83cb8a1afc25a7429218792e964..ffccac5589bfe12eaf7861364cc6f2e403d26679 100644 index 4a35e41e78a22993f87ab9d5919f401a7b742438..327d7b77bc306db8193fa68bc7129c33670976cb 100644
--- a/src/module_wrap.cc --- a/src/module_wrap.cc
+++ b/src/module_wrap.cc +++ b/src/module_wrap.cc
@@ -865,7 +865,7 @@ MaybeLocal<Module> ModuleWrap::ResolveModuleCallback( @@ -91,7 +91,7 @@ ModuleCacheKey ModuleCacheKey::From(Local<Context> context,
Local<String> specifier,
Local<FixedArray> import_attributes) {
CHECK_EQ(import_attributes->Length() % elements_per_attribute, 0);
- Isolate* isolate = context->GetIsolate();
+ Isolate* isolate = Isolate::GetCurrent();
std::size_t h1 = specifier->GetIdentityHash();
size_t num_attributes = import_attributes->Length() / elements_per_attribute;
ImportAttributeVector attributes;
@@ -1016,7 +1016,7 @@ MaybeLocal<Module> ModuleWrap::ResolveModuleCallback(
return {};
}
DCHECK_NOT_NULL(resolved_module);
- return resolved_module->module_.Get(context->GetIsolate());
+ return resolved_module->module_.Get(Isolate::GetCurrent());
}
// static
@@ -1025,7 +1025,7 @@ Maybe<ModuleWrap*> ModuleWrap::ResolveModule(
Local<String> specifier, Local<String> specifier,
Local<FixedArray> import_attributes, Local<FixedArray> import_attributes,
Local<Module> referrer) { Local<Module> referrer) {
@ -322,7 +340,7 @@ index cbb3e7f4df72f83cb8a1afc25a7429218792e964..ffccac5589bfe12eaf7861364cc6f2e4
Environment* env = Environment::GetCurrent(context); Environment* env = Environment::GetCurrent(context);
if (env == nullptr) { if (env == nullptr) {
THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(isolate); THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(isolate);
@@ -907,7 +907,7 @@ MaybeLocal<Promise> ImportModuleDynamically( @@ -1069,7 +1069,7 @@ MaybeLocal<Promise> ImportModuleDynamically(
Local<Value> resource_name, Local<Value> resource_name,
Local<String> specifier, Local<String> specifier,
Local<FixedArray> import_attributes) { Local<FixedArray> import_attributes) {
@ -331,7 +349,7 @@ index cbb3e7f4df72f83cb8a1afc25a7429218792e964..ffccac5589bfe12eaf7861364cc6f2e4
Environment* env = Environment::GetCurrent(context); Environment* env = Environment::GetCurrent(context);
if (env == nullptr) { if (env == nullptr) {
THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(isolate); THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(isolate);
@@ -1131,7 +1131,7 @@ MaybeLocal<Module> LinkRequireFacadeWithOriginal( @@ -1293,7 +1293,7 @@ MaybeLocal<Module> LinkRequireFacadeWithOriginal(
Local<FixedArray> import_attributes, Local<FixedArray> import_attributes,
Local<Module> referrer) { Local<Module> referrer) {
Environment* env = Environment::GetCurrent(context); Environment* env = Environment::GetCurrent(context);
@ -363,10 +381,10 @@ index 16a0c71aef949b0ddd27def9dc843298f9a6b75f..28fa4cb3e7a621480a5ff11c48666c0d
v8::Local<v8::String> constant_name = v8::String::NewFromUtf8Literal( \ v8::Local<v8::String> constant_name = v8::String::NewFromUtf8Literal( \
isolate, #constant, v8::NewStringType::kInternalized); \ isolate, #constant, v8::NewStringType::kInternalized); \
diff --git a/src/node_blob.cc b/src/node_blob.cc diff --git a/src/node_blob.cc b/src/node_blob.cc
index 9b9956f5ee3150a80f040cd0dbb9ef6589295600..14de0dad25fbf854ea23eb25abd6f9f2179e0dad 100644 index bb019dc62c100002acce0422d8da96fb3c04d737..2656e2dc08871e4d24e00af8d08b80cb82c10474 100644
--- a/src/node_blob.cc --- a/src/node_blob.cc
+++ b/src/node_blob.cc +++ b/src/node_blob.cc
@@ -554,7 +554,7 @@ void BlobBindingData::Deserialize(Local<Context> context, @@ -551,7 +551,7 @@ void BlobBindingData::Deserialize(Local<Context> context,
int index, int index,
InternalFieldInfoBase* info) { InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index); DCHECK_IS_SNAPSHOT_SLOT(index);
@ -446,7 +464,7 @@ index cbcecfba33070b820aca0e2814982160a97a6378..b1ee513fc0873a51b4885f612dbf7b95
CHECK(target->SetPrototype(env->context(), Null(env->isolate())).FromJust()); CHECK(target->SetPrototype(env->context(), Null(env->isolate())).FromJust());
diff --git a/src/node_contextify.cc b/src/node_contextify.cc diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 21a08a738e5c3506d27e402762a4a267e9278588..475b5628f9b82a2b9b86343f25759c1e6814f816 100644 index d52388717e5938570a5be6e11b01429e9b3b198e..bdaba2799d359a0ce3e8642cb6b5ceb7ddeeae2c 100644
--- a/src/node_contextify.cc --- a/src/node_contextify.cc
+++ b/src/node_contextify.cc +++ b/src/node_contextify.cc
@@ -111,7 +111,7 @@ namespace { @@ -111,7 +111,7 @@ namespace {
@ -490,7 +508,7 @@ index 492d5f455f45a5c8a957ecdabed38709a633f640..48f9917113555c7ed87e37750c45d152
Local<Array> keys; Local<Array> keys;
if (!entries->GetOwnPropertyNames(context).ToLocal(&keys)) if (!entries->GetOwnPropertyNames(context).ToLocal(&keys))
diff --git a/src/node_errors.cc b/src/node_errors.cc diff --git a/src/node_errors.cc b/src/node_errors.cc
index befb642f1effa3c4139e4cd99ff64d9c5175fd72..9c068afd1c4c3fadeee4ba035e67ec4ae72c7f73 100644 index 4386a1bc5678e351ce084cd2c47202561619b164..8d51201ad24999ed8f54e16c7878432d41841cf2 100644
--- a/src/node_errors.cc --- a/src/node_errors.cc
+++ b/src/node_errors.cc +++ b/src/node_errors.cc
@@ -633,7 +633,7 @@ v8::ModifyCodeGenerationFromStringsResult ModifyCodeGenerationFromStrings( @@ -633,7 +633,7 @@ v8::ModifyCodeGenerationFromStringsResult ModifyCodeGenerationFromStrings(
@ -511,9 +529,9 @@ index befb642f1effa3c4139e4cd99ff64d9c5175fd72..9c068afd1c4c3fadeee4ba035e67ec4a
switch (message->ErrorLevel()) { switch (message->ErrorLevel()) {
case Isolate::MessageErrorLevel::kMessageWarning: { case Isolate::MessageErrorLevel::kMessageWarning: {
Environment* env = Environment::GetCurrent(isolate); Environment* env = Environment::GetCurrent(isolate);
@@ -1118,7 +1118,7 @@ void Initialize(Local<Object> target, @@ -1161,7 +1161,7 @@ void Initialize(Local<Object> target,
SetMethod( SetMethod(
context, target, "triggerUncaughtException", TriggerUncaughtException); context, target, "getErrorSourcePositions", GetErrorSourcePositions);
- Isolate* isolate = context->GetIsolate(); - Isolate* isolate = context->GetIsolate();
+ Isolate* isolate = Isolate::GetCurrent(); + Isolate* isolate = Isolate::GetCurrent();
@ -521,10 +539,10 @@ index befb642f1effa3c4139e4cd99ff64d9c5175fd72..9c068afd1c4c3fadeee4ba035e67ec4a
READONLY_PROPERTY(target, "exitCodes", exit_codes); READONLY_PROPERTY(target, "exitCodes", exit_codes);
diff --git a/src/node_file.cc b/src/node_file.cc diff --git a/src/node_file.cc b/src/node_file.cc
index d7009937b31729f33d9c45cbda7f5440fbdac2aa..e57a3140cd90d7e7852a0c6892091e50b850ae64 100644 index 5de3ebb04b12286a07e3041d0a6dd1cc9072e76a..75be21c9e8b413f522240a906da06d26c44d5b71 100644
--- a/src/node_file.cc --- a/src/node_file.cc
+++ b/src/node_file.cc +++ b/src/node_file.cc
@@ -3753,7 +3753,7 @@ void BindingData::Deserialize(Local<Context> context, @@ -3755,7 +3755,7 @@ void BindingData::Deserialize(Local<Context> context,
int index, int index,
InternalFieldInfoBase* info) { InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index); DCHECK_IS_SNAPSHOT_SLOT(index);
@ -534,7 +552,7 @@ index d7009937b31729f33d9c45cbda7f5440fbdac2aa..e57a3140cd90d7e7852a0c6892091e50
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info); InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
BindingData* binding = BindingData* binding =
diff --git a/src/node_messaging.cc b/src/node_messaging.cc diff --git a/src/node_messaging.cc b/src/node_messaging.cc
index 1eff9399ff87510164390a1dfea84158a8856b86..e912562d768308906286890b7015cf2c462bac49 100644 index 3c5f38ba4f492749c9d7d82179d2a6563787602b..6e83da3ee975dea431e21209bba9227e504dd95b 100644
--- a/src/node_messaging.cc --- a/src/node_messaging.cc
+++ b/src/node_messaging.cc +++ b/src/node_messaging.cc
@@ -253,7 +253,7 @@ namespace { @@ -253,7 +253,7 @@ namespace {
@ -574,7 +592,7 @@ index 1eff9399ff87510164390a1dfea84158a8856b86..e912562d768308906286890b7015cf2c
data_.Reset(); data_.Reset();
return ret; return ret;
diff --git a/src/node_modules.cc b/src/node_modules.cc diff --git a/src/node_modules.cc b/src/node_modules.cc
index 6204986dc97686a248d6ae483f3a413ee5c51e47..c0108310df81c9bd1756a6fb92466a7f84e53f7c 100644 index ed22da844a61b14b8580cd3d6bb3a233b8559b38..14f2a35f87e8c2fa17898147d7247cc00c066f35 100644
--- a/src/node_modules.cc --- a/src/node_modules.cc
+++ b/src/node_modules.cc +++ b/src/node_modules.cc
@@ -64,7 +64,7 @@ void BindingData::Deserialize(v8::Local<v8::Context> context, @@ -64,7 +64,7 @@ void BindingData::Deserialize(v8::Local<v8::Context> context,
@ -586,7 +604,7 @@ index 6204986dc97686a248d6ae483f3a413ee5c51e47..c0108310df81c9bd1756a6fb92466a7f
Realm* realm = Realm::GetCurrent(context); Realm* realm = Realm::GetCurrent(context);
BindingData* binding = realm->AddBindingData<BindingData>(holder); BindingData* binding = realm->AddBindingData<BindingData>(holder);
CHECK_NOT_NULL(binding); CHECK_NOT_NULL(binding);
@@ -706,7 +706,7 @@ void BindingData::CreatePerContextProperties(Local<Object> target, @@ -656,7 +656,7 @@ void BindingData::CreatePerContextProperties(Local<Object> target,
Realm* realm = Realm::GetCurrent(context); Realm* realm = Realm::GetCurrent(context);
realm->AddBindingData<BindingData>(target); realm->AddBindingData<BindingData>(target);
@ -596,7 +614,7 @@ index 6204986dc97686a248d6ae483f3a413ee5c51e47..c0108310df81c9bd1756a6fb92466a7f
#define V(status) \ #define V(status) \
diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc
index 1cb08b715865f8337e0292fc8e2a26488ba21694..2bd20fc173d4110282ee736e49b49ce0859088f3 100644 index 9dcca7509f37f239b8442201b086df428415dcd1..b0cf8c3a8e1c3e89d621a865390b1bdb922c5540 100644
--- a/src/node_process_methods.cc --- a/src/node_process_methods.cc
+++ b/src/node_process_methods.cc +++ b/src/node_process_methods.cc
@@ -736,7 +736,7 @@ void BindingData::Deserialize(Local<Context> context, @@ -736,7 +736,7 @@ void BindingData::Deserialize(Local<Context> context,
@ -609,7 +627,7 @@ index 1cb08b715865f8337e0292fc8e2a26488ba21694..2bd20fc173d4110282ee736e49b49ce0
// Recreate the buffer in the constructor. // Recreate the buffer in the constructor.
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info); InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
diff --git a/src/node_realm.cc b/src/node_realm.cc diff --git a/src/node_realm.cc b/src/node_realm.cc
index cd2b4c0107594a8ba9bf671669e4c82326719908..d18945085ff1860bbe3796e0b47904210aafd941 100644 index 66a8ee48fc68b22eaf6c9d9209cc5cb2439e55ff..b31e244f8af7d37c35319853a478776c609b9bca 100644
--- a/src/node_realm.cc --- a/src/node_realm.cc
+++ b/src/node_realm.cc +++ b/src/node_realm.cc
@@ -19,7 +19,7 @@ using v8::String; @@ -19,7 +19,7 @@ using v8::String;
@ -622,7 +640,7 @@ index cd2b4c0107594a8ba9bf671669e4c82326719908..d18945085ff1860bbe3796e0b4790421
env->AssignToContext(context, this, ContextInfo("")); env->AssignToContext(context, this, ContextInfo(""));
} }
diff --git a/src/node_report.cc b/src/node_report.cc diff --git a/src/node_report.cc b/src/node_report.cc
index df73a8204bc0917073a70ca68d019ceab3159b08..d7bb94db78b3a729f25ceaf66d193032056b36ff 100644 index 8ff711f12e19f73e50daac2b9c0fd26773d32758..6966710e8f0be542364850776ddf76f9223a02e7 100644
--- a/src/node_report.cc --- a/src/node_report.cc
+++ b/src/node_report.cc +++ b/src/node_report.cc
@@ -399,7 +399,7 @@ static void PrintJavaScriptErrorProperties(JSONWriter* writer, @@ -399,7 +399,7 @@ static void PrintJavaScriptErrorProperties(JSONWriter* writer,
@ -648,10 +666,10 @@ index 69d8d15d8989ed31a19489e68588e730760c8ffb..d342a5ff91bbd9cb73c02c26ae3a36b9
// Recreate the buffer in the constructor. // Recreate the buffer in the constructor.
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info); InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
index 8b6fe36e1fece112269ebf193d6322a4d1dacc0a..96101167016573e80fff520256ebb78c71d83302 100644 index d8736abdadc231d72c95638dff816ea6846b0c9c..a9031da142db9969c6197a4a15e38b8197a73f73 100644
--- a/src/node_sqlite.cc --- a/src/node_sqlite.cc
+++ b/src/node_sqlite.cc +++ b/src/node_sqlite.cc
@@ -1858,7 +1858,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) { @@ -1860,7 +1860,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
if (args[0]->IsObject() && !args[0]->IsArrayBufferView()) { if (args[0]->IsObject() && !args[0]->IsArrayBufferView()) {
Local<Object> obj = args[0].As<Object>(); Local<Object> obj = args[0].As<Object>();
@ -661,7 +679,7 @@ index 8b6fe36e1fece112269ebf193d6322a4d1dacc0a..96101167016573e80fff520256ebb78c
if (!obj->GetOwnPropertyNames(context).ToLocal(&keys)) { if (!obj->GetOwnPropertyNames(context).ToLocal(&keys)) {
return false; return false;
diff --git a/src/node_task_queue.cc b/src/node_task_queue.cc diff --git a/src/node_task_queue.cc b/src/node_task_queue.cc
index c4257110d8b52017fccd8e1e746b557a0b7084df..6f00da0b515397d300e387f03f4a2bf71155cfe0 100644 index d33ee3c26c111e53edf27e6368ca8f64ff30a349..f1c53c44f201b295888e7932c5e3e2b19cb9c319 100644
--- a/src/node_task_queue.cc --- a/src/node_task_queue.cc
+++ b/src/node_task_queue.cc +++ b/src/node_task_queue.cc
@@ -48,7 +48,7 @@ void PromiseRejectCallback(PromiseRejectMessage message) { @@ -48,7 +48,7 @@ void PromiseRejectCallback(PromiseRejectMessage message) {
@ -687,7 +705,7 @@ index 09589e85e8bc131811204833d9a76f98c7b2a102..1154b452151b6b597aed67effbb3796c
BindingData* binding = realm->AddBindingData<BindingData>(holder); BindingData* binding = realm->AddBindingData<BindingData>(holder);
CHECK_NOT_NULL(binding); CHECK_NOT_NULL(binding);
diff --git a/src/node_v8.cc b/src/node_v8.cc diff --git a/src/node_v8.cc b/src/node_v8.cc
index 430d5dd4f808af7b1790bd62f06d47b86100d4e9..08a741216d88c95d580e9281e174550001ff2b21 100644 index dd2284a56c0733adb1ce316e0dfe7cde9ebd82ab..7c056021550e09bd79f9cbbf751e1452032319d5 100644
--- a/src/node_v8.cc --- a/src/node_v8.cc
+++ b/src/node_v8.cc +++ b/src/node_v8.cc
@@ -157,7 +157,7 @@ void BindingData::Deserialize(Local<Context> context, @@ -157,7 +157,7 @@ void BindingData::Deserialize(Local<Context> context,
@ -700,7 +718,7 @@ index 430d5dd4f808af7b1790bd62f06d47b86100d4e9..08a741216d88c95d580e9281e1745500
// Recreate the buffer in the constructor. // Recreate the buffer in the constructor.
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info); InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
diff --git a/src/node_wasi.cc b/src/node_wasi.cc diff --git a/src/node_wasi.cc b/src/node_wasi.cc
index 3f91b651b83a20e70d5b368e012f5ee4b9d16092..40c601acd752b559f7ffbc00c15728fbb5275ac5 100644 index 9b5ada71c174567498c4902259d97f9d11fefb91..1134856a202bac0a4ff1957d5ecc5600eab83a32 100644
--- a/src/node_wasi.cc --- a/src/node_wasi.cc
+++ b/src/node_wasi.cc +++ b/src/node_wasi.cc
@@ -49,7 +49,7 @@ using v8::WasmMemoryObject; @@ -49,7 +49,7 @@ using v8::WasmMemoryObject;
@ -712,7 +730,7 @@ index 3f91b651b83a20e70d5b368e012f5ee4b9d16092..40c601acd752b559f7ffbc00c15728fb
Environment* env = Environment::GetCurrent(context); Environment* env = Environment::GetCurrent(context);
CHECK_NOT_NULL(env); CHECK_NOT_NULL(env);
const char* err_name = uvwasi_embedder_err_code_to_string(errorno); const char* err_name = uvwasi_embedder_err_code_to_string(errorno);
@@ -275,7 +275,7 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback( @@ -274,7 +274,7 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback(
return EinvalError<R>(); return EinvalError<R>();
} }
@ -722,7 +740,7 @@ index 3f91b651b83a20e70d5b368e012f5ee4b9d16092..40c601acd752b559f7ffbc00c15728fb
if (wasi->memory_.IsEmpty()) { if (wasi->memory_.IsEmpty()) {
THROW_ERR_WASI_NOT_STARTED(isolate); THROW_ERR_WASI_NOT_STARTED(isolate);
diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc
index 74ece724e207a69e2457598a199c12f1cebcfd4a..1705e430099c5a363e02010f83d729b0aa54f8e5 100644 index e3c3223789032badbab56a558148da67e99ca9b2..9a7b7db881a564a68683c55cb10919454e80edbf 100644
--- a/src/node_webstorage.cc --- a/src/node_webstorage.cc
+++ b/src/node_webstorage.cc +++ b/src/node_webstorage.cc
@@ -58,7 +58,7 @@ using v8::Value; @@ -58,7 +58,7 @@ using v8::Value;
@ -757,10 +775,10 @@ index 8555ab556b5b74a1cf9cf30747f1f417bfe4e4d9..1a2532337504444d59098304b87e0d65
} }
} }
diff --git a/src/timers.cc b/src/timers.cc diff --git a/src/timers.cc b/src/timers.cc
index bf90e68479da141265f748775acacab513b8d437..5f0d07b4ac1d9b8df6c8bb059e5d07ac1a882b36 100644 index da4206187f7c7d2becb8a101c1ff5346a10e13f4..03f0910926f3d403121e227cee32a546b2394e04 100644
--- a/src/timers.cc --- a/src/timers.cc
+++ b/src/timers.cc +++ b/src/timers.cc
@@ -117,7 +117,7 @@ void BindingData::Deserialize(Local<Context> context, @@ -114,7 +114,7 @@ void BindingData::Deserialize(Local<Context> context,
int index, int index,
InternalFieldInfoBase* info) { InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index); DCHECK_IS_SNAPSHOT_SLOT(index);
@ -770,10 +788,10 @@ index bf90e68479da141265f748775acacab513b8d437..5f0d07b4ac1d9b8df6c8bb059e5d07ac
// Recreate the buffer in the constructor. // Recreate the buffer in the constructor.
BindingData* binding = realm->AddBindingData<BindingData>(holder); BindingData* binding = realm->AddBindingData<BindingData>(holder);
diff --git a/src/util-inl.h b/src/util-inl.h diff --git a/src/util-inl.h b/src/util-inl.h
index b21f7a8260ca6a4701f8904b9cb641428db80772..16fe55f3054fd20544babd63ff204330cb47c1a7 100644 index 17b870e2dd91ab6affd1097d0a4f691d5a1d9d80..816156282790383e896b28eb46a3b4703bbe17f0 100644
--- a/src/util-inl.h --- a/src/util-inl.h
+++ b/src/util-inl.h +++ b/src/util-inl.h
@@ -326,14 +326,14 @@ v8::Maybe<void> FromV8Array(v8::Local<v8::Context> context, @@ -335,14 +335,14 @@ v8::Maybe<void> FromV8Array(v8::Local<v8::Context> context,
std::vector<v8::Global<v8::Value>>* out) { std::vector<v8::Global<v8::Value>>* out) {
uint32_t count = js_array->Length(); uint32_t count = js_array->Length();
out->reserve(count); out->reserve(count);
@ -790,7 +808,7 @@ index b21f7a8260ca6a4701f8904b9cb641428db80772..16fe55f3054fd20544babd63ff204330
if (str.size() >= static_cast<size_t>(v8::String::kMaxLength)) [[unlikely]] { if (str.size() >= static_cast<size_t>(v8::String::kMaxLength)) [[unlikely]] {
// V8 only has a TODO comment about adding an exception when the maximum // V8 only has a TODO comment about adding an exception when the maximum
// string size is exceeded. // string size is exceeded.
@@ -349,7 +349,7 @@ v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context, @@ -358,7 +358,7 @@ v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context, v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
v8_inspector::StringView str, v8_inspector::StringView str,
v8::Isolate* isolate) { v8::Isolate* isolate) {
@ -799,7 +817,7 @@ index b21f7a8260ca6a4701f8904b9cb641428db80772..16fe55f3054fd20544babd63ff204330
if (str.length() >= static_cast<size_t>(v8::String::kMaxLength)) if (str.length() >= static_cast<size_t>(v8::String::kMaxLength))
[[unlikely]] { [[unlikely]] {
// V8 only has a TODO comment about adding an exception when the maximum // V8 only has a TODO comment about adding an exception when the maximum
@@ -376,7 +376,7 @@ template <typename T> @@ -385,7 +385,7 @@ template <typename T>
v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context, v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
const std::vector<T>& vec, const std::vector<T>& vec,
v8::Isolate* isolate) { v8::Isolate* isolate) {
@ -808,7 +826,7 @@ index b21f7a8260ca6a4701f8904b9cb641428db80772..16fe55f3054fd20544babd63ff204330
v8::EscapableHandleScope handle_scope(isolate); v8::EscapableHandleScope handle_scope(isolate);
MaybeStackBuffer<v8::Local<v8::Value>, 128> arr(vec.size()); MaybeStackBuffer<v8::Local<v8::Value>, 128> arr(vec.size());
@@ -393,7 +393,7 @@ template <typename T> @@ -402,7 +402,7 @@ template <typename T>
v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context, v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
const std::set<T>& set, const std::set<T>& set,
v8::Isolate* isolate) { v8::Isolate* isolate) {
@ -817,7 +835,7 @@ index b21f7a8260ca6a4701f8904b9cb641428db80772..16fe55f3054fd20544babd63ff204330
v8::Local<v8::Set> set_js = v8::Set::New(isolate); v8::Local<v8::Set> set_js = v8::Set::New(isolate);
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
@@ -412,7 +412,7 @@ template <typename T, typename U> @@ -421,7 +421,7 @@ template <typename T, typename U>
v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context, v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
const std::unordered_map<T, U>& map, const std::unordered_map<T, U>& map,
v8::Isolate* isolate) { v8::Isolate* isolate) {
@ -826,7 +844,7 @@ index b21f7a8260ca6a4701f8904b9cb641428db80772..16fe55f3054fd20544babd63ff204330
v8::EscapableHandleScope handle_scope(isolate); v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Map> ret = v8::Map::New(isolate); v8::Local<v8::Map> ret = v8::Map::New(isolate);
@@ -455,7 +455,7 @@ template <typename T, typename> @@ -464,7 +464,7 @@ template <typename T, typename>
v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context, v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
const T& number, const T& number,
v8::Isolate* isolate) { v8::Isolate* isolate) {
@ -835,7 +853,7 @@ index b21f7a8260ca6a4701f8904b9cb641428db80772..16fe55f3054fd20544babd63ff204330
return ConvertNumberToV8Value(isolate, number); return ConvertNumberToV8Value(isolate, number);
} }
@@ -468,7 +468,7 @@ v8::Local<v8::Array> ToV8ValuePrimitiveArray(v8::Local<v8::Context> context, @@ -477,7 +477,7 @@ v8::Local<v8::Array> ToV8ValuePrimitiveArray(v8::Local<v8::Context> context,
std::is_floating_point_v<T>, std::is_floating_point_v<T>,
"Only primitive types (bool, integral, floating-point) are supported."); "Only primitive types (bool, integral, floating-point) are supported.");
@ -894,10 +912,10 @@ index 5ca32f026f9f001ddadc14965705fe005600eddd..1b38f22b930b77d80aa53f9b12299d3c
context, that, OneByteString(isolate, name), tmpl, flag); context, that, OneByteString(isolate, name), tmpl, flag);
} }
diff --git a/src/util.h b/src/util.h diff --git a/src/util.h b/src/util.h
index 7c98de621ca4d53cbaaa5bd4488aab20c7b033a7..329d2397c87ac37d157e3325e2ab62907d7286b4 100644 index 8460fe26bbf9e83d080fdfc458d570d0ee29e6f0..dab48c59e1cd947a32cf08e5ab23cd60fe32303e 100644
--- a/src/util.h --- a/src/util.h
+++ b/src/util.h +++ b/src/util.h
@@ -756,7 +756,7 @@ inline v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context, @@ -745,7 +745,7 @@ inline v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
// Variation on NODE_DEFINE_CONSTANT that sets a String value. // Variation on NODE_DEFINE_CONSTANT that sets a String value.
#define NODE_DEFINE_STRING_CONSTANT(target, name, constant) \ #define NODE_DEFINE_STRING_CONSTANT(target, name, constant) \
do { \ do { \

2
patches/node/build_change_crdtp_protocoltypetraits_signatures_to_avoid_conflict.patch
View file

@ -14,7 +14,7 @@ error: duplicate symbol: crdtp::ProtocolTypeTraits<std::__Cr::basic_string<char,
Some distinguishing change should be upstreamed to Node.js. Some distinguishing change should be upstreamed to Node.js.
diff --git a/src/inspector/node_string.cc b/src/inspector/node_string.cc diff --git a/src/inspector/node_string.cc b/src/inspector/node_string.cc
index 8521730bd03cdfce47e9b5d0f5d68a568bc3de8c..28f4598aa7ea0e93350f79566c06d0f08313be9f 100644 index e2148e954217b9b999e9713e95f1a115ccf7d657..7ec7464cdc0ef00e6600fb897ae99e44ed0f4ad8 100644
--- a/src/inspector/node_string.cc --- a/src/inspector/node_string.cc
+++ b/src/inspector/node_string.cc +++ b/src/inspector/node_string.cc
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@

10
patches/node/build_enable_perfetto.patch
View file

@ -33,10 +33,10 @@ index 8d7204f6cb48f783adc4d1c1eb2de0c83b7fffe2..a154559a56bf383d3c26af523c9bb07b
// Non-alphabetic chars. // Non-alphabetic chars.
diff --git a/lib/internal/http.js b/lib/internal/http.js diff --git a/lib/internal/http.js b/lib/internal/http.js
index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327199acfd5 100644 index 4f250a2e70a20fddeeb7886e0c269822883f7ccf..4e5c2dd1f13e6818576c3c4c88200b5cf5fb1257 100644
--- a/lib/internal/http.js --- a/lib/internal/http.js
+++ b/lib/internal/http.js +++ b/lib/internal/http.js
@@ -8,8 +8,8 @@ const { @@ -10,8 +10,8 @@ const {
const { setUnrefTimeout } = require('internal/timers'); const { setUnrefTimeout } = require('internal/timers');
const { getCategoryEnabledBuffer, trace } = internalBinding('trace_events'); const { getCategoryEnabledBuffer, trace } = internalBinding('trace_events');
const { const {
@ -46,8 +46,8 @@ index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327
+ CHAR_UPPERCASE_E, + CHAR_UPPERCASE_E,
} = require('internal/constants'); } = require('internal/constants');
let utcCache; const { URL } = require('internal/url');
@@ -44,11 +44,13 @@ function isTraceHTTPEnabled() { @@ -50,11 +50,13 @@ function isTraceHTTPEnabled() {
const traceEventCategory = 'node,node.http'; const traceEventCategory = 'node,node.http';
function traceBegin(...args) { function traceBegin(...args) {
@ -62,7 +62,7 @@ index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327
+ trace(CHAR_UPPERCASE_E, traceEventCategory, ...args); + trace(CHAR_UPPERCASE_E, traceEventCategory, ...args);
} }
module.exports = { function ipToInt(ip) {
diff --git a/node.gyp b/node.gyp diff --git a/node.gyp b/node.gyp
index 0e0071b508f605bb9b7722f8304814dc176d907e..bcb9f371c4e4d8c665058115dc39eaa65125d679 100644 index 0e0071b508f605bb9b7722f8304814dc176d907e..bcb9f371c4e4d8c665058115dc39eaa65125d679 100644
--- a/node.gyp --- a/node.gyp

4
patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
View file

@ -8,10 +8,10 @@ they use themselves as the entry point. We should try to upstream some form
of this. of this.
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
index 98ed40e3076f6628b1771dade63ac51600e8e447..1eba13caf1e00a8b41b2cf8afc4168c8f98be69f 100644 index d12d21905c4823f45cffeea4423e99e81b1008f5..4987cd3f6c9eefb440bca3f58113df6cd5b410ac 100644
--- a/lib/internal/process/pre_execution.js --- a/lib/internal/process/pre_execution.js
+++ b/lib/internal/process/pre_execution.js +++ b/lib/internal/process/pre_execution.js
@@ -245,12 +245,14 @@ function patchProcessObject(expandArgv1) { @@ -267,12 +267,14 @@ function patchProcessObject(expandArgv1) {
// the entry point. // the entry point.
if (expandArgv1 && process.argv[1] && process.argv[1][0] !== '-') { if (expandArgv1 && process.argv[1] && process.argv[1][0] !== '-') {
// Expand process.argv[1] into a full path. // Expand process.argv[1] into a full path.

30
patches/node/chore_expose_importmoduledynamically_and.patch
View file

@ -40,11 +40,11 @@ index 9b41db8b0714b7408f79cbd5b4c460d9bc08f239..35ecfb9bbaf2c8e7351e1c69da84c82a
/** /**
diff --git a/src/module_wrap.cc b/src/module_wrap.cc diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index c52e20d742942667f43ea3e151fc6702260b176b..cbb3e7f4df72f83cb8a1afc25a7429218792e964 100644 index 1ff4971d6fedf6090120a63ba0af420dd6929c8b..4a35e41e78a22993f87ab9d5919f401a7b742438 100644
--- a/src/module_wrap.cc --- a/src/module_wrap.cc
+++ b/src/module_wrap.cc +++ b/src/module_wrap.cc
@@ -901,7 +901,7 @@ MaybeLocal<Module> ModuleWrap::ResolveModuleCallback( @@ -1063,7 +1063,7 @@ Maybe<ModuleWrap*> ModuleWrap::ResolveModule(
return module->module_.Get(isolate); return Just(module_wrap);
} }
-static MaybeLocal<Promise> ImportModuleDynamically( -static MaybeLocal<Promise> ImportModuleDynamically(
@ -52,7 +52,7 @@ index c52e20d742942667f43ea3e151fc6702260b176b..cbb3e7f4df72f83cb8a1afc25a742921
Local<Context> context, Local<Context> context,
Local<Data> host_defined_options, Local<Data> host_defined_options,
Local<Value> resource_name, Local<Value> resource_name,
@@ -973,12 +973,13 @@ void ModuleWrap::SetImportModuleDynamicallyCallback( @@ -1135,12 +1135,13 @@ void ModuleWrap::SetImportModuleDynamicallyCallback(
Realm* realm = Realm::GetCurrent(args); Realm* realm = Realm::GetCurrent(args);
HandleScope handle_scope(isolate); HandleScope handle_scope(isolate);
@ -68,7 +68,7 @@ index c52e20d742942667f43ea3e151fc6702260b176b..cbb3e7f4df72f83cb8a1afc25a742921
} }
void ModuleWrap::HostInitializeImportMetaObjectCallback( void ModuleWrap::HostInitializeImportMetaObjectCallback(
@@ -1020,13 +1021,14 @@ void ModuleWrap::SetInitializeImportMetaObjectCallback( @@ -1182,13 +1183,14 @@ void ModuleWrap::SetInitializeImportMetaObjectCallback(
Realm* realm = Realm::GetCurrent(args); Realm* realm = Realm::GetCurrent(args);
Isolate* isolate = realm->isolate(); Isolate* isolate = realm->isolate();
@ -87,7 +87,7 @@ index c52e20d742942667f43ea3e151fc6702260b176b..cbb3e7f4df72f83cb8a1afc25a742921
MaybeLocal<Value> ModuleWrap::SyntheticModuleEvaluationStepsCallback( MaybeLocal<Value> ModuleWrap::SyntheticModuleEvaluationStepsCallback(
diff --git a/src/module_wrap.h b/src/module_wrap.h diff --git a/src/module_wrap.h b/src/module_wrap.h
index 9363ce73e51cde3d3a94f9912f072d532d0f8560..c0e972ed293157726efc5fa76dfa62d3da51c22a 100644 index 695b73ca7ffea850cd88e94546125d12ddc991f6..09602a8e619ba52f3525e3d312047c6dba0484a5 100644
--- a/src/module_wrap.h --- a/src/module_wrap.h
+++ b/src/module_wrap.h +++ b/src/module_wrap.h
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@ -98,8 +98,8 @@ index 9363ce73e51cde3d3a94f9912f072d532d0f8560..c0e972ed293157726efc5fa76dfa62d3
#include "v8-script.h" #include "v8-script.h"
namespace node { namespace node {
@@ -33,7 +34,14 @@ enum HostDefinedOptions : int { @@ -86,7 +87,14 @@ struct ModuleCacheKey : public MemoryRetainer {
kLength = 9, hash(hash) {}
}; };
-class ModuleWrap : public BaseObject { -class ModuleWrap : public BaseObject {
@ -111,10 +111,10 @@ index 9363ce73e51cde3d3a94f9912f072d532d0f8560..c0e972ed293157726efc5fa76dfa62d3
+ v8::Local<v8::FixedArray> import_assertions); + v8::Local<v8::FixedArray> import_assertions);
+ +
+class NODE_EXTERN ModuleWrap : public BaseObject { +class NODE_EXTERN ModuleWrap : public BaseObject {
public: using ResolveCache =
enum InternalFields { std::unordered_map<ModuleCacheKey, uint32_t, ModuleCacheKey::Hash>;
kModuleSlot = BaseObject::kInternalFieldCount,
@@ -92,6 +100,8 @@ class ModuleWrap : public BaseObject { @@ -151,6 +159,8 @@ class ModuleWrap : public BaseObject {
static void CreateRequiredModuleFacade( static void CreateRequiredModuleFacade(
const v8::FunctionCallbackInfo<v8::Value>& args); const v8::FunctionCallbackInfo<v8::Value>& args);
@ -123,11 +123,11 @@ index 9363ce73e51cde3d3a94f9912f072d532d0f8560..c0e972ed293157726efc5fa76dfa62d3
private: private:
ModuleWrap(Realm* realm, ModuleWrap(Realm* realm,
v8::Local<v8::Object> object, v8::Local<v8::Object> object,
@@ -131,7 +141,6 @@ class ModuleWrap : public BaseObject { @@ -190,7 +200,6 @@ class ModuleWrap : public BaseObject {
v8::Local<v8::String> specifier, v8::Local<v8::String> specifier,
v8::Local<v8::FixedArray> import_attributes, v8::Local<v8::FixedArray> import_attributes,
v8::Local<v8::Module> referrer); v8::Local<v8::Module> referrer);
- static ModuleWrap* GetFromModule(node::Environment*, v8::Local<v8::Module>); - static ModuleWrap* GetFromModule(node::Environment*, v8::Local<v8::Module>);
v8::Global<v8::Module> module_; // This method may throw a JavaScript exception, so the return type is
std::unordered_map<std::string, v8::Global<v8::Object>> resolve_cache_; // wrapped in a Maybe.

18
patches/node/cli_move_--trace-atomics-wait_to_eol.patch
View file

@ -15,10 +15,10 @@ Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
diff --git a/doc/api/cli.md b/doc/api/cli.md diff --git a/doc/api/cli.md b/doc/api/cli.md
index 9a0e83b95a72486ab9751b3b8818f4beeb527041..1da7126b9d51238e9b89ee6bed602df3f5598a9e 100644 index a97053929c81ac18bcb3beda7cecb69621b6e70c..a54d0e46c8e4e3aa6be433fba73ef9a3228fa175 100644
--- a/doc/api/cli.md --- a/doc/api/cli.md
+++ b/doc/api/cli.md +++ b/doc/api/cli.md
@@ -2727,39 +2727,6 @@ added: v12.0.0 @@ -2749,39 +2749,6 @@ added: v12.0.0
Set default [`tls.DEFAULT_MIN_VERSION`][] to 'TLSv1.3'. Use to disable support Set default [`tls.DEFAULT_MIN_VERSION`][] to 'TLSv1.3'. Use to disable support
for TLSv1.2, which is not as secure as TLSv1.3. for TLSv1.2, which is not as secure as TLSv1.3.
@ -58,7 +58,7 @@ index 9a0e83b95a72486ab9751b3b8818f4beeb527041..1da7126b9d51238e9b89ee6bed602df3
### `--trace-deprecation` ### `--trace-deprecation`
<!-- YAML <!-- YAML
@@ -3445,7 +3412,6 @@ one is included in the list below. @@ -3483,7 +3450,6 @@ one is included in the list below.
* `--tls-min-v1.1` * `--tls-min-v1.1`
* `--tls-min-v1.2` * `--tls-min-v1.2`
* `--tls-min-v1.3` * `--tls-min-v1.3`
@ -67,10 +67,10 @@ index 9a0e83b95a72486ab9751b3b8818f4beeb527041..1da7126b9d51238e9b89ee6bed602df3
* `--trace-env-js-stack` * `--trace-env-js-stack`
* `--trace-env-native-stack` * `--trace-env-native-stack`
diff --git a/doc/node.1 b/doc/node.1 diff --git a/doc/node.1 b/doc/node.1
index e3b2c45af01b2e9b9522964da2572988edd2b9e9..64e975546285a1042dda6fdb54fdd502f338a929 100644 index fed2c77c2afed665be7aa17c2d53824f049a909e..7a3c09a40fca9458f83be1e7d8eec930b7d2d263 100644
--- a/doc/node.1 --- a/doc/node.1
+++ b/doc/node.1 +++ b/doc/node.1
@@ -542,11 +542,6 @@ but the option is supported for compatibility with older Node.js versions. @@ -556,11 +556,6 @@ but the option is supported for compatibility with older Node.js versions.
Set default minVersion to 'TLSv1.3'. Use to disable support for TLSv1.2 in Set default minVersion to 'TLSv1.3'. Use to disable support for TLSv1.2 in
favour of TLSv1.3, which is more secure. favour of TLSv1.3, which is more secure.
. .
@ -83,7 +83,7 @@ index e3b2c45af01b2e9b9522964da2572988edd2b9e9..64e975546285a1042dda6fdb54fdd502
Print stack traces for deprecations. Print stack traces for deprecations.
. .
diff --git a/src/node.cc b/src/node.cc diff --git a/src/node.cc b/src/node.cc
index 2dfdaec589e9b88af73ba388ea3c059ef27d243b..67d9a87f5ed97a10d29378f9067c8203941f62e2 100644 index f012b365455bb111cddea44fcff020804086ab72..b99b5170553af51466fd1ee69af3be5026f3fada 100644
--- a/src/node.cc --- a/src/node.cc
+++ b/src/node.cc +++ b/src/node.cc
@@ -232,44 +232,6 @@ void Environment::WaitForInspectorFrontendByOptions() { @@ -232,44 +232,6 @@ void Environment::WaitForInspectorFrontendByOptions() {
@ -150,10 +150,10 @@ index 2dfdaec589e9b88af73ba388ea3c059ef27d243b..67d9a87f5ed97a10d29378f9067c8203
isolate_->SetPromiseHook(TracePromises); isolate_->SetPromiseHook(TracePromises);
} }
diff --git a/src/node_options.cc b/src/node_options.cc diff --git a/src/node_options.cc b/src/node_options.cc
index e8424d7539db191a55edebb7d33a3c1dc37e2403..556776b79282d953fdc371d1901f21ca301bec1a 100644 index 4bbace2f702777fa12ba9246984894721df99b50..b067685822dc056e446e1a9402a5a6cba86cc722 100644
--- a/src/node_options.cc --- a/src/node_options.cc
+++ b/src/node_options.cc +++ b/src/node_options.cc
@@ -773,10 +773,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { @@ -827,10 +827,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
"throw an exception on deprecations", "throw an exception on deprecations",
&EnvironmentOptions::throw_deprecation, &EnvironmentOptions::throw_deprecation,
kAllowedInEnvvar); kAllowedInEnvvar);
@ -165,7 +165,7 @@ index e8424d7539db191a55edebb7d33a3c1dc37e2403..556776b79282d953fdc371d1901f21ca
"show stack traces on deprecations", "show stack traces on deprecations",
&EnvironmentOptions::trace_deprecation, &EnvironmentOptions::trace_deprecation,
diff --git a/src/node_options.h b/src/node_options.h diff --git a/src/node_options.h b/src/node_options.h
index 418dee360f867c363f1576012b32213a51c4fdd0..7078d2493ed696bc5bd92df9c629b714c1a8fbfb 100644 index d8751a6ee734233e2fc24866ed87d9cd516072ae..e12abb55e43068e8446eaabc65deb63cc469f554 100644
--- a/src/node_options.h --- a/src/node_options.h
+++ b/src/node_options.h +++ b/src/node_options.h
@@ -205,7 +205,6 @@ class EnvironmentOptions : public Options { @@ -205,7 +205,6 @@ class EnvironmentOptions : public Options {

8
patches/node/cli_remove_deprecated_v8_flag.patch
View file

@ -18,10 +18,10 @@ Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
diff --git a/doc/api/cli.md b/doc/api/cli.md diff --git a/doc/api/cli.md b/doc/api/cli.md
index b8f9fb49fcb45602828e79bd79902233b5987dda..9a0e83b95a72486ab9751b3b8818f4beeb527041 100644 index 7ff68d28f1c80d8a852f649e2c39216a2f4bdb16..a97053929c81ac18bcb3beda7cecb69621b6e70c 100644
--- a/doc/api/cli.md --- a/doc/api/cli.md
+++ b/doc/api/cli.md +++ b/doc/api/cli.md
@@ -3483,7 +3483,6 @@ V8 options that are allowed are: @@ -3522,7 +3522,6 @@ V8 options that are allowed are:
* `--disallow-code-generation-from-strings` * `--disallow-code-generation-from-strings`
* `--enable-etw-stack-walking` * `--enable-etw-stack-walking`
* `--expose-gc` * `--expose-gc`
@ -30,10 +30,10 @@ index b8f9fb49fcb45602828e79bd79902233b5987dda..9a0e83b95a72486ab9751b3b8818f4be
* `--jitless` * `--jitless`
* `--max-old-space-size` * `--max-old-space-size`
diff --git a/src/node_options.cc b/src/node_options.cc diff --git a/src/node_options.cc b/src/node_options.cc
index 8afded658c3f569de7b329ea9dddc11010748cf9..e8424d7539db191a55edebb7d33a3c1dc37e2403 100644 index 3026b3d814ae652a9996c1dcba62b4fa678ac871..4bbace2f702777fa12ba9246984894721df99b50 100644
--- a/src/node_options.cc --- a/src/node_options.cc
+++ b/src/node_options.cc +++ b/src/node_options.cc
@@ -1001,11 +1001,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser( @@ -1060,11 +1060,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
"disallow eval and friends", "disallow eval and friends",
V8Option{}, V8Option{},
kAllowedInEnvvar); kAllowedInEnvvar);

10
patches/node/fix_allow_passing_fileexists_fn_to_legacymainresolve.patch
View file

@ -53,10 +53,10 @@ index e3afd30ba1f591d0298793bc42fd7166a4219bce..408dc96307d7f52f92db41004b358051
const maybeMain = resolvedOption <= legacyMainResolveExtensionsIndexes.kResolvedByMainIndexNode ? const maybeMain = resolvedOption <= legacyMainResolveExtensionsIndexes.kResolvedByMainIndexNode ?
packageConfig.main || './' : ''; packageConfig.main || './' : '';
diff --git a/src/node_file.cc b/src/node_file.cc diff --git a/src/node_file.cc b/src/node_file.cc
index e78326ed0de805a8bf4f621cad9158635eb44aa2..d7009937b31729f33d9c45cbda7f5440fbdac2aa 100644 index 77f8f1bd4e8294f2ebc7e0724aea5902eb0f95ab..5de3ebb04b12286a07e3041d0a6dd1cc9072e76a 100644
--- a/src/node_file.cc --- a/src/node_file.cc
+++ b/src/node_file.cc +++ b/src/node_file.cc
@@ -3502,13 +3502,25 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) { @@ -3504,13 +3504,25 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) {
} }
BindingData::FilePathIsFileReturnType BindingData::FilePathIsFile( BindingData::FilePathIsFileReturnType BindingData::FilePathIsFile(
@ -83,7 +83,7 @@ index e78326ed0de805a8bf4f621cad9158635eb44aa2..d7009937b31729f33d9c45cbda7f5440
uv_fs_t req; uv_fs_t req;
int rc = uv_fs_stat(env->event_loop(), &req, file_path.c_str(), nullptr); int rc = uv_fs_stat(env->event_loop(), &req, file_path.c_str(), nullptr);
@@ -3566,6 +3578,11 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo<Value>& args) { @@ -3568,6 +3580,11 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo<Value>& args) {
std::optional<std::string> initial_file_path; std::optional<std::string> initial_file_path;
std::string file_path; std::string file_path;
@ -95,7 +95,7 @@ index e78326ed0de805a8bf4f621cad9158635eb44aa2..d7009937b31729f33d9c45cbda7f5440
if (args.Length() >= 2 && args[1]->IsString()) { if (args.Length() >= 2 && args[1]->IsString()) {
auto package_config_main = Utf8Value(isolate, args[1]).ToString(); auto package_config_main = Utf8Value(isolate, args[1]).ToString();
@@ -3586,7 +3603,7 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo<Value>& args) { @@ -3588,7 +3605,7 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo<Value>& args) {
BufferValue buff_file_path(isolate, local_file_path); BufferValue buff_file_path(isolate, local_file_path);
ToNamespacedPath(env, &buff_file_path); ToNamespacedPath(env, &buff_file_path);
@ -104,7 +104,7 @@ index e78326ed0de805a8bf4f621cad9158635eb44aa2..d7009937b31729f33d9c45cbda7f5440
case BindingData::FilePathIsFileReturnType::kIsFile: case BindingData::FilePathIsFileReturnType::kIsFile:
return args.GetReturnValue().Set(i); return args.GetReturnValue().Set(i);
case BindingData::FilePathIsFileReturnType::kIsNotFile: case BindingData::FilePathIsFileReturnType::kIsNotFile:
@@ -3623,7 +3640,7 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo<Value>& args) { @@ -3625,7 +3642,7 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo<Value>& args) {
BufferValue buff_file_path(isolate, local_file_path); BufferValue buff_file_path(isolate, local_file_path);
ToNamespacedPath(env, &buff_file_path); ToNamespacedPath(env, &buff_file_path);

67
patches/node/fix_assert_module_in_the_renderer_process.patch
View file

@ -1,67 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 16 Aug 2023 19:15:29 +0200
Subject: fix: assert module in the renderer process
When creating a Node.js Environment, embedders have the option to disable Node.js'
default overriding of Error.prepareStackTrace. However, the assert module depends on
a WeakMap that is populated with the error stacktraces in the overridden function.
This adds handling to fall back to the default implementation if Error.prepareStackTrace
if the override has been disabled.
This will be upstreamed.
diff --git a/lib/internal/assert/utils.js b/lib/internal/assert/utils.js
index 13e41d67c635c27bd5e69eb4960eace34beaef0d..9a99c9ca93907630f9f3ba7ba24577a11465661c 100644
--- a/lib/internal/assert/utils.js
+++ b/lib/internal/assert/utils.js
@@ -24,6 +24,7 @@ const AssertionError = require('internal/assert/assertion_error');
const { openSync, closeSync, readSync } = require('fs');
const { EOL } = require('internal/constants');
const { BuiltinModule } = require('internal/bootstrap/realm');
+const { getEmbedderOptions } = require('internal/options');
const { isError } = require('internal/util');
const errorCache = new SafeMap();
@@ -166,8 +167,16 @@ function getErrMessage(message, fn) {
ErrorCaptureStackTrace(err, fn);
if (errorStackTraceLimitIsWritable) Error.stackTraceLimit = tmpLimit;
- overrideStackTrace.set(err, (_, stack) => stack);
- const call = err.stack[0];
+ let call;
+ if (getEmbedderOptions().hasPrepareStackTraceCallback) {
+ overrideStackTrace.set(err, (_, stack) => stack);
+ call = err.stack[0];
+ } else {
+ const tmpPrepare = Error.prepareStackTrace;
+ Error.prepareStackTrace = (_, stack) => stack;
+ call = err.stack[0];
+ Error.prepareStackTrace = tmpPrepare;
+ }
let filename = call.getFileName();
const line = call.getLineNumber() - 1;
diff --git a/src/node_options.cc b/src/node_options.cc
index e3509abbc3bf84ac0edcd495eb3dde6219dbfc2d..8afded658c3f569de7b329ea9dddc11010748cf9 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -1566,14 +1566,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
}
Isolate* isolate = args.GetIsolate();
- constexpr size_t kOptionsSize = 4;
+ constexpr size_t kOptionsSize = 5;
std::array<Local<Name>, kOptionsSize> names = {
+ FIXED_ONE_BYTE_STRING(env->isolate(), "hasPrepareStackTraceCallback"),
FIXED_ONE_BYTE_STRING(env->isolate(), "shouldNotRegisterESMLoader"),
FIXED_ONE_BYTE_STRING(env->isolate(), "noGlobalSearchPaths"),
FIXED_ONE_BYTE_STRING(env->isolate(), "noBrowserGlobals"),
FIXED_ONE_BYTE_STRING(env->isolate(), "hasEmbedderPreload")};
std::array<Local<Value>, kOptionsSize> values = {
+ Boolean::New(isolate, env->prepare_stack_trace_callback().IsEmpty()),
Boolean::New(isolate, env->should_not_register_esm_loader()),
Boolean::New(isolate, env->no_global_search_paths()),
Boolean::New(isolate, env->no_browser_globals()),

4
patches/node/fix_cppgc_initializing_twice.patch
View file

@ -12,10 +12,10 @@ This can be removed/refactored once Node.js upgrades to a version of V8
containing the above CL. containing the above CL.
diff --git a/src/node.cc b/src/node.cc diff --git a/src/node.cc b/src/node.cc
index 67d9a87f5ed97a10d29378f9067c8203941f62e2..591af411272e50a0c26b9b11bedf6bcfe76784db 100644 index b99b5170553af51466fd1ee69af3be5026f3fada..ccb644007b8ebbf3899e64d8097d97208c0de182 100644
--- a/src/node.cc --- a/src/node.cc
+++ b/src/node.cc +++ b/src/node.cc
@@ -1246,7 +1246,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args, @@ -1239,7 +1239,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
result->platform_ = per_process::v8_platform.Platform(); result->platform_ = per_process::v8_platform.Platform();
} }

6
patches/node/fix_ensure_traverseparent_bails_on_resource_path_exit.patch
View file

@ -8,10 +8,10 @@ resource path. This commit ensures that the TraverseParent function
bails out if the parent path is outside of the resource path. bails out if the parent path is outside of the resource path.
diff --git a/src/node_modules.cc b/src/node_modules.cc diff --git a/src/node_modules.cc b/src/node_modules.cc
index 55d628f0c5e7f330e548878807de26d51ef025b5..c06779dea471b6f6a8dd29d4657162ef0faec043 100644 index 60b03b1563b230f78d8a9bdd8480da4d2ae90a27..35bfada261258407982d9e24cf7b3e820235c941 100644
--- a/src/node_modules.cc --- a/src/node_modules.cc
+++ b/src/node_modules.cc +++ b/src/node_modules.cc
@@ -291,8 +291,41 @@ const BindingData::PackageConfig* BindingData::TraverseParent( @@ -279,8 +279,41 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
Realm* realm, const std::filesystem::path& check_path) { Realm* realm, const std::filesystem::path& check_path) {
std::filesystem::path current_path = check_path; std::filesystem::path current_path = check_path;
auto env = realm->env(); auto env = realm->env();
@ -53,7 +53,7 @@ index 55d628f0c5e7f330e548878807de26d51ef025b5..c06779dea471b6f6a8dd29d4657162ef
do { do {
current_path = current_path.parent_path(); current_path = current_path.parent_path();
@@ -311,6 +344,12 @@ const BindingData::PackageConfig* BindingData::TraverseParent( @@ -299,6 +332,12 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
return nullptr; return nullptr;
} }

16
patches/node/fix_expose_readfilesync_override_for_modules.patch
View file

@ -20,7 +20,7 @@ index 82225b0a53dd828750991a4e15a060b736b6ea2b..4b0d31356a2496a7fc67876a22da2453
V(performance_entry_callback, v8::Function) \ V(performance_entry_callback, v8::Function) \
V(prepare_stack_trace_callback, v8::Function) \ V(prepare_stack_trace_callback, v8::Function) \
diff --git a/src/node_modules.cc b/src/node_modules.cc diff --git a/src/node_modules.cc b/src/node_modules.cc
index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413ee5c51e47 100644 index 35bfada261258407982d9e24cf7b3e820235c941..ed22da844a61b14b8580cd3d6bb3a233b8559b38 100644
--- a/src/node_modules.cc --- a/src/node_modules.cc
+++ b/src/node_modules.cc +++ b/src/node_modules.cc
@@ -21,6 +21,7 @@ namespace modules { @@ -21,6 +21,7 @@ namespace modules {
@ -76,8 +76,8 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
+ if (read_err < 0) { + if (read_err < 0) {
return nullptr; return nullptr;
} }
// In some systems, std::string is annotated to generate an simdjson::ondemand::document document;
@@ -249,6 +279,12 @@ const BindingData::PackageConfig* BindingData::GetPackageJSON( @@ -237,6 +267,12 @@ const BindingData::PackageConfig* BindingData::GetPackageJSON(
return &cached.first->second; return &cached.first->second;
} }
@ -90,7 +90,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
void BindingData::ReadPackageJSON(const FunctionCallbackInfo<Value>& args) { void BindingData::ReadPackageJSON(const FunctionCallbackInfo<Value>& args) {
CHECK_GE(args.Length(), 1); // path, [is_esm, base, specifier] CHECK_GE(args.Length(), 1); // path, [is_esm, base, specifier]
CHECK(args[0]->IsString()); // path CHECK(args[0]->IsString()); // path
@@ -643,6 +679,8 @@ void InitImportMetaPathHelpers(const FunctionCallbackInfo<Value>& args) { @@ -597,6 +633,8 @@ void InitImportMetaPathHelpers(const FunctionCallbackInfo<Value>& args) {
void BindingData::CreatePerIsolateProperties(IsolateData* isolate_data, void BindingData::CreatePerIsolateProperties(IsolateData* isolate_data,
Local<ObjectTemplate> target) { Local<ObjectTemplate> target) {
Isolate* isolate = isolate_data->isolate(); Isolate* isolate = isolate_data->isolate();
@ -99,7 +99,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
SetMethod(isolate, target, "readPackageJSON", ReadPackageJSON); SetMethod(isolate, target, "readPackageJSON", ReadPackageJSON);
SetMethod(isolate, SetMethod(isolate,
target, target,
@@ -685,6 +723,8 @@ void BindingData::CreatePerContextProperties(Local<Object> target, @@ -635,6 +673,8 @@ void BindingData::CreatePerContextProperties(Local<Object> target,
void BindingData::RegisterExternalReferences( void BindingData::RegisterExternalReferences(
ExternalReferenceRegistry* registry) { ExternalReferenceRegistry* registry) {
@ -107,9 +107,9 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
+ +
registry->Register(ReadPackageJSON); registry->Register(ReadPackageJSON);
registry->Register(GetNearestParentPackageJSONType); registry->Register(GetNearestParentPackageJSONType);
registry->Register(GetNearestParentPackageJSON); registry->Register(GetPackageScopeConfig<false>);
diff --git a/src/node_modules.h b/src/node_modules.h diff --git a/src/node_modules.h b/src/node_modules.h
index eb2900d8f8385238f89a6dcc972a28e5fcb1d288..e28f38d98f4f8749048af135f0dcbe55aa69c4fe 100644 index e4ba6b75bc86d14deada835903ba68a4cb0eccc5..ae77f9ec81b358bd356993617cd07671d382e8ca 100644
--- a/src/node_modules.h --- a/src/node_modules.h
+++ b/src/node_modules.h +++ b/src/node_modules.h
@@ -54,6 +54,8 @@ class BindingData : public SnapshotableObject { @@ -54,6 +54,8 @@ class BindingData : public SnapshotableObject {
@ -119,5 +119,5 @@ index eb2900d8f8385238f89a6dcc972a28e5fcb1d288..e28f38d98f4f8749048af135f0dcbe55
+ static void OverrideReadFileSync( + static void OverrideReadFileSync(
+ const v8::FunctionCallbackInfo<v8::Value>& args); + const v8::FunctionCallbackInfo<v8::Value>& args);
static void ReadPackageJSON(const v8::FunctionCallbackInfo<v8::Value>& args); static void ReadPackageJSON(const v8::FunctionCallbackInfo<v8::Value>& args);
static void GetNearestParentPackageJSON( static void GetNearestParentPackageJSONType(
const v8::FunctionCallbackInfo<v8::Value>& args); const v8::FunctionCallbackInfo<v8::Value>& args);

4
patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
View file

@ -138,10 +138,10 @@ index 757f093becd112002f3422302f4c29bb464f1a6c..c8cea2117080930105b33e4e50586a2c
// This translator function must be sync, as `require` is sync. // This translator function must be sync, as `require` is sync.
translators.set('require-commonjs-typescript', (url, source, isMain) => { translators.set('require-commonjs-typescript', (url, source, isMain) => {
diff --git a/lib/internal/url.js b/lib/internal/url.js diff --git a/lib/internal/url.js b/lib/internal/url.js
index d0c04be7c6ebc352d5958a987f3a4ba538e0d23a..00f9f3b73ed84c04ae712f6057b68737bd416333 100644 index ad1c2c9966085b8febd261b2fc776ce49bc1bd36..96fdce31168ae70ce20f3bfb81931705b2d55f31 100644
--- a/lib/internal/url.js --- a/lib/internal/url.js
+++ b/lib/internal/url.js +++ b/lib/internal/url.js
@@ -1605,6 +1605,8 @@ function fileURLToPath(path, options = kEmptyObject) { @@ -1608,6 +1608,8 @@ function fileURLToPath(path, options = kEmptyObject) {
path = new URL(path); path = new URL(path);
else if (!isURL(path)) else if (!isURL(path))
throw new ERR_INVALID_ARG_TYPE('path', ['string', 'URL'], path); throw new ERR_INVALID_ARG_TYPE('path', ['string', 'URL'], path);

27
patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
View file

@ -228,7 +228,7 @@ index d94f6e1c82c4a62547b3b395f375c86ce4deb5de..b81b9005365272217c77e2b9289bd9f8
X509View ca(sk_X509_value(peer_certs.get(), i)); X509View ca(sk_X509_value(peer_certs.get(), i));
if (!cert->view().isIssuedBy(ca)) continue; if (!cert->view().isIssuedBy(ca)) continue;
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
index c08dab17fa229d1d67d3ad5174c97192989b2bd0..a3d309d832c73ddc79564b9644d825bec7459e7f 100644 index d1430cd66dd045dcb52dd166e1eabc7202d1bd94..8f50d0cc132ac65fa74cf1fc2172247b5ad42962 100644
--- a/src/crypto/crypto_context.cc --- a/src/crypto/crypto_context.cc
+++ b/src/crypto/crypto_context.cc +++ b/src/crypto/crypto_context.cc
@@ -141,7 +141,7 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx, @@ -141,7 +141,7 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx,
@ -240,7 +240,7 @@ index c08dab17fa229d1d67d3ad5174c97192989b2bd0..a3d309d832c73ddc79564b9644d825be
X509* ca = sk_X509_value(extra_certs, i); X509* ca = sk_X509_value(extra_certs, i);
// NOTE: Increments reference count on `ca` // NOTE: Increments reference count on `ca`
@@ -1773,11 +1773,12 @@ void SecureContext::SetDHParam(const FunctionCallbackInfo<Value>& args) { @@ -1831,11 +1831,12 @@ void SecureContext::SetDHParam(const FunctionCallbackInfo<Value>& args) {
// If the user specified "auto" for dhparams, the JavaScript layer will pass // If the user specified "auto" for dhparams, the JavaScript layer will pass
// true to this function instead of the original string. Any other string // true to this function instead of the original string. Any other string
// value will be interpreted as custom DH parameters below. // value will be interpreted as custom DH parameters below.
@ -254,7 +254,7 @@ index c08dab17fa229d1d67d3ad5174c97192989b2bd0..a3d309d832c73ddc79564b9644d825be
DHPointer dh; DHPointer dh;
{ {
BIOPointer bio(LoadBIO(env, args[0])); BIOPointer bio(LoadBIO(env, args[0]));
@@ -2003,7 +2004,7 @@ void SecureContext::LoadPKCS12(const FunctionCallbackInfo<Value>& args) { @@ -2061,7 +2062,7 @@ void SecureContext::LoadPKCS12(const FunctionCallbackInfo<Value>& args) {
} }
// Add CA certs too // Add CA certs too
@ -396,10 +396,10 @@ index ca5edc8ebdf2550bb62b7969a5650733a2647f4f..198e18b58f31e361a9d2865cbe81e067
return EVPKeyCtxPointer(); return EVPKeyCtxPointer();
diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc
index 7238cda445fd663e6b45fa134f31d017bb267dfc..522655555cdb2ab2083797f736bf167d1f42c15e 100644 index fe852bdebacae49dce19a731a46fe9f1bb66eb1b..5dbcaafaf26aa3b638fdfd471cedab87c9296319 100644
--- a/src/crypto/crypto_keys.cc --- a/src/crypto/crypto_keys.cc
+++ b/src/crypto/crypto_keys.cc +++ b/src/crypto/crypto_keys.cc
@@ -949,6 +949,7 @@ void KeyObjectHandle::GetAsymmetricKeyType( @@ -948,6 +948,7 @@ void KeyObjectHandle::GetAsymmetricKeyType(
} }
bool KeyObjectHandle::CheckEcKeyData() const { bool KeyObjectHandle::CheckEcKeyData() const {
@ -407,7 +407,7 @@ index 7238cda445fd663e6b45fa134f31d017bb267dfc..522655555cdb2ab2083797f736bf167d
MarkPopErrorOnReturn mark_pop_error_on_return; MarkPopErrorOnReturn mark_pop_error_on_return;
const auto& key = data_.GetAsymmetricKey(); const auto& key = data_.GetAsymmetricKey();
@@ -965,6 +966,9 @@ bool KeyObjectHandle::CheckEcKeyData() const { @@ -964,6 +965,9 @@ bool KeyObjectHandle::CheckEcKeyData() const {
#else #else
return EVP_PKEY_public_check(ctx.get()) == 1; return EVP_PKEY_public_check(ctx.get()) == 1;
#endif #endif
@ -449,7 +449,7 @@ index 05a3882c7e17d78e27aabb29891aa250789a47c0..1f2fccce6ed8f14525557644e0bdd130
if (target if (target
diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
index 7c548d32b40365343f0e208c3aa856a1c847f4c3..6346f8f7199cf7b7d3736c59571606fff102fbb6 100644 index 9c2360df7150571377eff37fc5e958d17900da30..4505786745c54a529f904d5e7813a86204e0a78b 100644
--- a/src/crypto/crypto_util.cc --- a/src/crypto/crypto_util.cc
+++ b/src/crypto/crypto_util.cc +++ b/src/crypto/crypto_util.cc
@@ -207,7 +207,8 @@ void TestFipsCrypto(const v8::FunctionCallbackInfo<v8::Value>& args) { @@ -207,7 +207,8 @@ void TestFipsCrypto(const v8::FunctionCallbackInfo<v8::Value>& args) {
@ -506,15 +506,14 @@ index 7c548d32b40365343f0e208c3aa856a1c847f4c3..6346f8f7199cf7b7d3736c59571606ff
}, },
data); data);
Local<ArrayBuffer> buffer = ArrayBuffer::New(env->isolate(), store); Local<ArrayBuffer> buffer = ArrayBuffer::New(env->isolate(), store);
@@ -705,10 +697,12 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) { @@ -705,9 +697,11 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
} }
void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) { void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) {
+#ifndef OPENSSL_IS_BORINGSSL +#ifndef OPENSSL_IS_BORINGSSL
Environment* env = Environment::GetCurrent(args);
if (CRYPTO_secure_malloc_initialized()) if (CRYPTO_secure_malloc_initialized())
args.GetReturnValue().Set( args.GetReturnValue().Set(
BigInt::New(env->isolate(), CRYPTO_secure_used())); BigInt::New(args.GetIsolate(), CRYPTO_secure_used()));
+#endif +#endif
} }
} // namespace } // namespace
@ -555,20 +554,20 @@ index d9c533f100d25aeab1fe8589932a8ddead431258..2acab8786a8a752b17961445edeb872c
#if NODE_OPENSSL_HAS_QUIC #if NODE_OPENSSL_HAS_QUIC
#include <openssl/quic.h> #include <openssl/quic.h>
diff --git a/src/node_options.cc b/src/node_options.cc diff --git a/src/node_options.cc b/src/node_options.cc
index ed85bf11f6f325823b59b3b0275908f9210c1b24..e3509abbc3bf84ac0edcd495eb3dde6219dbfc2d 100644 index 31fc23fdbfabceab3cffd81a3e6650dde1ccd13a..3026b3d814ae652a9996c1dcba62b4fa678ac871 100644
--- a/src/node_options.cc --- a/src/node_options.cc
+++ b/src/node_options.cc +++ b/src/node_options.cc
@@ -7,7 +7,7 @@ @@ -8,7 +8,7 @@
#include "node_external_reference.h"
#include "node_internals.h" #include "node_internals.h"
#include "node_sea.h" #include "node_sea.h"
#include "uv.h"
-#if HAVE_OPENSSL -#if HAVE_OPENSSL
+#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL) +#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
#include "openssl/opensslv.h" #include "openssl/opensslv.h"
#endif #endif
diff --git a/src/node_options.h b/src/node_options.h diff --git a/src/node_options.h b/src/node_options.h
index cdbd9ca39e907ab22515293eac2c5512223f4ca2..418dee360f867c363f1576012b32213a51c4fdd0 100644 index 2e73fd2a05e329910d4c064474880f770c9f5957..d8751a6ee734233e2fc24866ed87d9cd516072ae 100644
--- a/src/node_options.h --- a/src/node_options.h
+++ b/src/node_options.h +++ b/src/node_options.h
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@

2
patches/node/fix_remove_deprecated_errno_constants.patch
View file

@ -86,7 +86,7 @@ index 0ca643aa74d13f278685d2330b791182b55c15b4..cbcecfba33070b820aca0e2814982160
NODE_DEFINE_CONSTANT(target, ETIMEDOUT); NODE_DEFINE_CONSTANT(target, ETIMEDOUT);
#endif #endif
diff --git a/src/node_errors.cc b/src/node_errors.cc diff --git a/src/node_errors.cc b/src/node_errors.cc
index 5f51add4cdf68a9487edfc9382f586cc94539571..befb642f1effa3c4139e4cd99ff64d9c5175fd72 100644 index ae8553ee2022d60fea4572976b14ba9cd253aa45..4386a1bc5678e351ce084cd2c47202561619b164 100644
--- a/src/node_errors.cc --- a/src/node_errors.cc
+++ b/src/node_errors.cc +++ b/src/node_errors.cc
@@ -862,10 +862,6 @@ const char* errno_string(int errorno) { @@ -862,10 +862,6 @@ const char* errno_string(int errorno) {

4
patches/node/fix_remove_fastapitypedarray_usage.patch
View file

@ -194,7 +194,7 @@ index e39852c8e0392e0a9ae5d4ea58be115416e19233..c94b14741c827a81d69a6f036426a344
static const v8::CFunction fast_write_string_ascii( static const v8::CFunction fast_write_string_ascii(
diff --git a/src/util.h b/src/util.h diff --git a/src/util.h b/src/util.h
index dcd6548d41be786c42ce8328d89e532a8e9d43a2..7c98de621ca4d53cbaaa5bd4488aab20c7b033a7 100644 index 8f27afbb9e4e453655f94b94daf47026b9cf2177..8460fe26bbf9e83d080fdfc458d570d0ee29e6f0 100644
--- a/src/util.h --- a/src/util.h
+++ b/src/util.h +++ b/src/util.h
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
@ -205,7 +205,7 @@ index dcd6548d41be786c42ce8328d89e532a8e9d43a2..7c98de621ca4d53cbaaa5bd4488aab20
#ifdef _WIN32 #ifdef _WIN32
/* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */ /* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */
@@ -589,6 +590,16 @@ class BufferValue : public MaybeStackBuffer<char> { @@ -582,6 +583,16 @@ class BufferValue : public MaybeStackBuffer<char> {
static_cast<char*>(name->Buffer()->Data()) + name##_offset; \ static_cast<char*>(name->Buffer()->Data()) + name##_offset; \
if (name##_length > 0) CHECK_NE(name##_data, nullptr); if (name##_length > 0) CHECK_NE(name##_data, nullptr);

8
patches/node/fix_remove_outdated_v8_flags_from_node_cc.patch
View file

@ -15,7 +15,7 @@ This patch can be removed when we upgrade to a V8 version that
contains the above CLs. contains the above CLs.
diff --git a/src/node.cc b/src/node.cc diff --git a/src/node.cc b/src/node.cc
index 07684482f855363e26c3d7299a585a8a5654015e..ed8e0d1aec60bf22c13c73628f145312caf5d841 100644 index 2d8d0000d52411992d2bd513cc7dd96b2292bab9..0ffc69d54631fa3dbac20337b26f7a0679560b96 100644
--- a/src/node.cc --- a/src/node.cc
+++ b/src/node.cc +++ b/src/node.cc
@@ -816,7 +816,7 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args, @@ -816,7 +816,7 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args,
@ -25,9 +25,9 @@ index 07684482f855363e26c3d7299a585a8a5654015e..ed8e0d1aec60bf22c13c73628f145312
- v8_args.emplace_back("--no-harmony-import-assertions"); - v8_args.emplace_back("--no-harmony-import-assertions");
+ // v8_args.emplace_back("--no-harmony-import-assertions"); + // v8_args.emplace_back("--no-harmony-import-assertions");
auto env_opts = per_process::cli_options->per_isolate->per_env; if (!per_process::cli_options->per_isolate->max_old_space_size_percentage
if (std::find(v8_args.begin(), v8_args.end(), .empty()) {
@@ -827,8 +827,8 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args, @@ -834,8 +834,8 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args,
} }
// Support stable Phase 5 WebAssembly proposals // Support stable Phase 5 WebAssembly proposals

4
patches/node/fix_replace_deprecated_setprototype.patch
View file

@ -44,10 +44,10 @@ index 2f23cc63f148a792f1302e1d2d88822730abaa33..42678e5d11e5ff9543bf12ec02fee7d3
DefineErrnoConstants(err_constants); DefineErrnoConstants(err_constants);
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
index 96101167016573e80fff520256ebb78c71d83302..cdc50b7e9abc2b5944ffd9c5ea1882f4fb9e1421 100644 index a9031da142db9969c6197a4a15e38b8197a73f73..d658ed374318a9b3946fda52371a13ae7058a069 100644
--- a/src/node_sqlite.cc --- a/src/node_sqlite.cc
+++ b/src/node_sqlite.cc +++ b/src/node_sqlite.cc
@@ -2108,7 +2108,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) { @@ -2110,7 +2110,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
if (iter->object() if (iter->object()
->GetPrototype() ->GetPrototype()
.As<Object>() .As<Object>()

6
patches/node/refactor_attach_cppgc_heap_on_v8_isolate_creation.patch
View file

@ -102,10 +102,10 @@ index 2d5fa8dbd75851bca30453548f6cbe0159509f26..c346e3a9c827993036438685d758a734
worker::Worker* worker_context_ = nullptr; worker::Worker* worker_context_ = nullptr;
PerIsolateWrapperData* wrapper_data_; PerIsolateWrapperData* wrapper_data_;
diff --git a/src/node.cc b/src/node.cc diff --git a/src/node.cc b/src/node.cc
index ed8e0d1aec60bf22c13c73628f145312caf5d841..2dfdaec589e9b88af73ba388ea3c059ef27d243b 100644 index 0ffc69d54631fa3dbac20337b26f7a0679560b96..f012b365455bb111cddea44fcff020804086ab72 100644
--- a/src/node.cc --- a/src/node.cc
+++ b/src/node.cc +++ b/src/node.cc
@@ -1295,6 +1295,14 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args, @@ -1288,6 +1288,14 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
result->platform_ = per_process::v8_platform.Platform(); result->platform_ = per_process::v8_platform.Platform();
} }
@ -120,7 +120,7 @@ index ed8e0d1aec60bf22c13c73628f145312caf5d841..2dfdaec589e9b88af73ba388ea3c059e
if (!(flags & ProcessInitializationFlags::kNoInitializeV8)) { if (!(flags & ProcessInitializationFlags::kNoInitializeV8)) {
V8::Initialize(); V8::Initialize();
@@ -1304,14 +1312,6 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args, @@ -1297,14 +1305,6 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
absl::SetMutexDeadlockDetectionMode(absl::OnDeadlockCycle::kIgnore); absl::SetMutexDeadlockDetectionMode(absl::OnDeadlockCycle::kIgnore);
} }

2
patches/node/src_remove_dependency_on_wrapper-descriptor-based_cppheap.patch
View file

@ -16,7 +16,7 @@ patch:
(cherry picked from commit 30329d06235a9f9733b1d4da479b403462d1b326) (cherry picked from commit 30329d06235a9f9733b1d4da479b403462d1b326)
diff --git a/src/env-inl.h b/src/env-inl.h diff --git a/src/env-inl.h b/src/env-inl.h
index 67b4cc2037b8e02f6382cd12a7abb157d0dbac65..4906c6c4c0ab5260d6e6387d0ed8e0687f982a38 100644 index da2c468f11cdc320cfec794b1b8b24904b93491e..98e1e1e75bae94038bba0049447ab48b0acfb8cc 100644
--- a/src/env-inl.h --- a/src/env-inl.h
+++ b/src/env-inl.h +++ b/src/env-inl.h
@@ -62,31 +62,6 @@ inline uv_loop_t* IsolateData::event_loop() const { @@ -62,31 +62,6 @@ inline uv_loop_t* IsolateData::event_loop() const {

6
patches/node/src_stop_using_deprecated_fields_of_fastapicallbackoptions.patch
View file

@ -26,7 +26,7 @@ index dbc46400501b61814d5be0ec1cb01b0dcd94e1d0..fe669d40c31a29334b047b9cfee3067f
} }
diff --git a/src/histogram.cc b/src/histogram.cc diff --git a/src/histogram.cc b/src/histogram.cc
index b655808e43d7c700ddeab7690e287bdbc9bfa50a..b0f7ae4e3af652c6dfe09f66d88485c5783f4037 100644 index 4a67b4a725ff768cbd10aef72a84af311d6ec9ec..ec7d5b1120724b7c752f92a3e3124a33cf51c0f5 100644
--- a/src/histogram.cc --- a/src/histogram.cc
+++ b/src/histogram.cc +++ b/src/histogram.cc
@@ -187,7 +187,8 @@ void HistogramBase::FastRecord(Local<Value> unused, @@ -187,7 +187,8 @@ void HistogramBase::FastRecord(Local<Value> unused,
@ -40,10 +40,10 @@ index b655808e43d7c700ddeab7690e287bdbc9bfa50a..b0f7ae4e3af652c6dfe09f66d88485c5
} }
HistogramBase* histogram; HistogramBase* histogram;
diff --git a/src/node_wasi.cc b/src/node_wasi.cc diff --git a/src/node_wasi.cc b/src/node_wasi.cc
index 090866960beb8f1759c99e95536924b8b61fb723..3f91b651b83a20e70d5b368e012f5ee4b9d16092 100644 index 85e549e4592e1d718eced31ae165dee250149b08..9b5ada71c174567498c4902259d97f9d11fefb91 100644
--- a/src/node_wasi.cc --- a/src/node_wasi.cc
+++ b/src/node_wasi.cc +++ b/src/node_wasi.cc
@@ -275,17 +275,19 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback( @@ -274,17 +274,19 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback(
return EinvalError<R>(); return EinvalError<R>();
} }

10
patches/node/src_switch_from_get_setprototype_to_get_setprototypev2.patch
View file

@ -38,7 +38,7 @@ index 487b8b7adfd35646d20fdb15be5fd6f2bee9315b..6a3c4e6952a8f3250bf1b57652a1622e
} }
return false; return false;
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
index de3d1f2f1832740b24480267f8c573794179859c..6e1680a74e21240ab99be86dcf23e60a05174888 100644 index 7b2efa49468c0bed2f5935552addd3ab37d0a50b..413db3ed9b88d7b7fb2ac6dd1153dade9ff830fd 100644
--- a/src/js_native_api_v8.cc --- a/src/js_native_api_v8.cc
+++ b/src/js_native_api_v8.cc +++ b/src/js_native_api_v8.cc
@@ -1577,7 +1577,7 @@ napi_status NAPI_CDECL napi_get_prototype(napi_env env, @@ -1577,7 +1577,7 @@ napi_status NAPI_CDECL napi_get_prototype(napi_env env,
@ -135,10 +135,10 @@ index b1ee513fc0873a51b4885f612dbf7b950b5cf2ca..2f23cc63f148a792f1302e1d2d888227
Local<Object> internal_constants = Object::New(isolate); Local<Object> internal_constants = Object::New(isolate);
CHECK(internal_constants->SetPrototype(env->context(), CHECK(internal_constants->SetPrototype(env->context(),
diff --git a/src/node_options.cc b/src/node_options.cc diff --git a/src/node_options.cc b/src/node_options.cc
index 556776b79282d953fdc371d1901f21ca301bec1a..b33193c4d017b35aec5e73c1ead04cfb3ba50d55 100644 index b067685822dc056e446e1a9402a5a6cba86cc722..e93e8684e518b30a2514768a269be6d32d1f5b94 100644
--- a/src/node_options.cc --- a/src/node_options.cc
+++ b/src/node_options.cc +++ b/src/node_options.cc
@@ -1493,7 +1493,8 @@ void GetCLIOptionsInfo(const FunctionCallbackInfo<Value>& args) { @@ -1552,7 +1552,8 @@ void GetCLIOptionsInfo(const FunctionCallbackInfo<Value>& args) {
Local<Map> options = Map::New(isolate); Local<Map> options = Map::New(isolate);
if (options if (options
@ -148,7 +148,7 @@ index 556776b79282d953fdc371d1901f21ca301bec1a..b33193c4d017b35aec5e73c1ead04cfb
.IsNothing()) { .IsNothing()) {
return; return;
} }
@@ -1533,7 +1534,8 @@ void GetCLIOptionsInfo(const FunctionCallbackInfo<Value>& args) { @@ -1592,7 +1593,8 @@ void GetCLIOptionsInfo(const FunctionCallbackInfo<Value>& args) {
if (!ToV8Value(context, _ppop_instance.aliases_).ToLocal(&aliases)) return; if (!ToV8Value(context, _ppop_instance.aliases_).ToLocal(&aliases)) return;
if (aliases.As<Object>() if (aliases.As<Object>()
@ -159,7 +159,7 @@ index 556776b79282d953fdc371d1901f21ca301bec1a..b33193c4d017b35aec5e73c1ead04cfb
return; return;
} }
diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc
index 1705e430099c5a363e02010f83d729b0aa54f8e5..0577777723747327dc57830ace316aebc0cfd891 100644 index 9a7b7db881a564a68683c55cb10919454e80edbf..bf88ce68f9173ef24a283dd370e71903220b0077 100644
--- a/src/node_webstorage.cc --- a/src/node_webstorage.cc
+++ b/src/node_webstorage.cc +++ b/src/node_webstorage.cc
@@ -532,7 +532,7 @@ template <typename T> @@ -532,7 +532,7 @@ template <typename T>

8
patches/node/support_v8_sandboxed_pointers.patch
View file

@ -64,7 +64,7 @@ index f23cedf4f2449d8edc9a8de1b70332e75d693cdd..976653dd1e9363e046788fc3419a9b64
return Buffer::New(env, ab, 0, ab->ByteLength()).FromMaybe(Local<Value>()); return Buffer::New(env, ab, 0, ab->ByteLength()).FromMaybe(Local<Value>());
} }
diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
index 6346f8f7199cf7b7d3736c59571606fff102fbb6..7eea2eaefcad5780663a6b87985925ae5d70a5f9 100644 index 4505786745c54a529f904d5e7813a86204e0a78b..eab18ab9888e2f7c0757fefab80505d8c99dc742 100644
--- a/src/crypto/crypto_util.cc --- a/src/crypto/crypto_util.cc
+++ b/src/crypto/crypto_util.cc +++ b/src/crypto/crypto_util.cc
@@ -359,10 +359,35 @@ ByteSource& ByteSource::operator=(ByteSource&& other) noexcept { @@ -359,10 +359,35 @@ ByteSource& ByteSource::operator=(ByteSource&& other) noexcept {
@ -143,10 +143,10 @@ index 6346f8f7199cf7b7d3736c59571606fff102fbb6..7eea2eaefcad5780663a6b87985925ae
void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) { void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) {
#ifndef OPENSSL_IS_BORINGSSL #ifndef OPENSSL_IS_BORINGSSL
diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
index ebc7fddeccf04a92c610849b626b33f900d63493..ed7d202d1b041f8a6cd43ae767d696fb29ab9cd9 100644 index 1592134716da2de40de4ba028ee937b765423e37..8f3ba65f1fef2c066d6df6087a08ba71100d1090 100644
--- a/src/crypto/crypto_util.h --- a/src/crypto/crypto_util.h
+++ b/src/crypto/crypto_util.h +++ b/src/crypto/crypto_util.h
@@ -243,7 +243,7 @@ class ByteSource { @@ -242,7 +242,7 @@ class ByteSource {
// Creates a v8::BackingStore that takes over responsibility for // Creates a v8::BackingStore that takes over responsibility for
// any allocated data. The ByteSource will be reset with size = 0 // any allocated data. The ByteSource will be reset with size = 0
// after being called. // after being called.
@ -189,7 +189,7 @@ index f616223cfb0f6e10f7cf57ada9704316bde2797e..eb6dad44a49d997097c8fb5009eeb60a
Local<Value> ret; Local<Value> ret;
if (!Buffer::New(env, ab, 0, ab->ByteLength()).ToLocal(&ret)) return {}; if (!Buffer::New(env, ab, 0, ab->ByteLength()).ToLocal(&ret)) return {};
diff --git a/src/node_i18n.cc b/src/node_i18n.cc diff --git a/src/node_i18n.cc b/src/node_i18n.cc
index 61b6ecd240c9500f21f683065a2f920af3afb502..ad2b1c76325cb5c8f18a618c5a85ae87b6a7bbe7 100644 index 6be3920632b25db450025ebab6a2636e4811cdbe..b49916d2b5fc5e58cf3fb67329430fd3df8fb813 100644
--- a/src/node_i18n.cc --- a/src/node_i18n.cc
+++ b/src/node_i18n.cc +++ b/src/node_i18n.cc
@@ -104,7 +104,7 @@ namespace { @@ -104,7 +104,7 @@ namespace {

4
patches/node/test_formally_mark_some_tests_as_flaky.patch
View file

@ -7,7 +7,7 @@ Instead of disabling the tests, flag them as flaky so they still run
but don't cause CI failures on flakes. but don't cause CI failures on flakes.
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 67c0c04d2365e59db111258d008f8c73173e3e96..a4204e7580e7823399f6057d57c09cba56b5ff78 100644 index 9822dc622ebfc2d1a31539474b78e03e64426195..045a415f7b9f461bd9b2c97d42051f2580b7df1a 100644
--- a/test/parallel/parallel.status --- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status +++ b/test/parallel/parallel.status
@@ -5,6 +5,16 @@ prefix parallel @@ -5,6 +5,16 @@ prefix parallel
@ -28,7 +28,7 @@ index 67c0c04d2365e59db111258d008f8c73173e3e96..a4204e7580e7823399f6057d57c09cba
test-net-write-fully-async-hex-string: PASS, FLAKY test-net-write-fully-async-hex-string: PASS, FLAKY
# https://github.com/nodejs/node/issues/52273 # https://github.com/nodejs/node/issues/52273
diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status
index 4ae3b6c5fd2eb633ae78bed1824046d862d7579b..d291954d4451b63aeb2bf46232e8705150eb9e79 100644 index f6c9c77379930a8234cd4c5f933c261d6bd1a238..28d5378e4051b78e9a7ff81886c3382e92a5da2e 100644
--- a/test/sequential/sequential.status --- a/test/sequential/sequential.status
+++ b/test/sequential/sequential.status +++ b/test/sequential/sequential.status
@@ -7,6 +7,18 @@ prefix sequential @@ -7,6 +7,18 @@ prefix sequential

1
script/node-disabled-tests.json
View file

@ -76,6 +76,7 @@
"parallel/test-snapshot-worker", "parallel/test-snapshot-worker",
"parallel/test-strace-openat-openssl", "parallel/test-strace-openat-openssl",
"parallel/test-sqlite-backup", "parallel/test-sqlite-backup",
"parallel/test-max-old-space-size-percentage",
"parallel/test-tls-alpn-server-client", "parallel/test-tls-alpn-server-client",
"parallel/test-tls-cli-min-version-1.0", "parallel/test-tls-cli-min-version-1.0",
"parallel/test-tls-cli-max-version-1.2", "parallel/test-tls-cli-max-version-1.2",