diff --git a/DEPS b/DEPS index 5e4c7ab0d0..434d5b5697 100644 --- a/DEPS +++ b/DEPS @@ -4,7 +4,7 @@ vars = { 'chromium_version': '146.0.7666.0', 'node_version': - 'v24.13.0', + 'v24.13.1', 'nan_version': '675cefebca42410733da8a454c8d9391fcebfbc2', 'squirrel.mac_version': diff --git a/patches/node/.patches b/patches/node/.patches index 0bc1e46fc2..1923c84d69 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -28,7 +28,6 @@ fix_adjust_wpt_and_webidl_tests_for_enabled_float16array.patch refactor_attach_cppgc_heap_on_v8_isolate_creation.patch fix_cppgc_initializing_twice.patch fix_expose_readfilesync_override_for_modules.patch -fix_array_out-of-bounds_read_in_boyer-moore_search.patch test_accomodate_v8_thenable_stack_trace_change_in_snapshot.patch chore_exclude_electron_node_folder_from_exit-time-destructors.patch api_remove_deprecated_getisolate.patch @@ -40,10 +39,9 @@ api_delete_deprecated_fields_on_v8_isolate.patch api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch fix_ensure_traverseparent_bails_on_resource_path_exit.patch reland_temporal_unflag_temporal.patch -src_handle_der_decoding_errors_from_system_certificates.patch fix_suppress_nodiscard_warning_for_copy_options_operator.patch -test_make_buffer_sizes_32bit-aware_in.patch src_refactor_module_wrap_cc_to_update_fixedarray_get_params.patch src_refactor_wasmstreaming_finish_to_accept_a_callback.patch src_stop_using_v8_propertycallbackinfo_t_this.patch build_restore_macos_deployment_target_to_12_0.patch +fix_generate_config_gypi_needs_to_generate_valid_json.patch diff --git a/patches/node/api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch b/patches/node/api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch index d5787d3e64..0c85eae51a 100644 --- a/patches/node/api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch +++ b/patches/node/api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch @@ -58,7 +58,7 @@ index 404e2aa8c88d0cc0e6717c01e0df68899c64cc32..16462f305a2ac6b6c3d7b85024f2e526 } diff --git a/src/env-inl.h b/src/env-inl.h -index 97c43afb487b58c0c77bd59b4a6b6d7a13690053..23a4d7b651935a4029249fb2f1dd3ed46ea3b26f 100644 +index 74bbb9fb83246a90bc425e259150f0868020ac9e..a4b3a1c0907c9d50baf6c8cd473cb4c7369d0a5c 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -189,7 +189,8 @@ inline Environment* Environment::GetCurrent(v8::Local context) { @@ -178,10 +178,10 @@ index cb13d84388bcc6806d3b038a51e1cc2d1feccda1..687b2cf3e63b2a3306e2cbac67e3e216 MakeWeak(); } diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc -index fe4aad63bc877be105830a80aa6be10ce3f8fda4..588b1fef718853bec95a4e4a3b14809a0e7018ea 100644 +index 67278974199db46fed85b443e7cdd30accd7687f..e52c08541ec4180f16e4bceaac1bd6b97cf13e8b 100644 --- a/src/node_process_methods.cc +++ b/src/node_process_methods.cc -@@ -672,8 +672,8 @@ void BindingData::RegisterExternalReferences( +@@ -680,8 +680,8 @@ void BindingData::RegisterExternalReferences( BindingData* BindingData::FromV8Value(Local value) { Local v8_object = value.As(); @@ -193,10 +193,10 @@ index fe4aad63bc877be105830a80aa6be10ce3f8fda4..588b1fef718853bec95a4e4a3b14809a void BindingData::MemoryInfo(MemoryTracker* tracker) const { diff --git a/src/node_realm-inl.h b/src/node_realm-inl.h -index f162d1506c990a5fe578be6f1324427e3f9023f4..b57bb0b42e98b954c0c8662c667e589d6c68a5d3 100644 +index 0af487a9abc9ee1783367ac86b0016ab89e02006..c01cef477aaba52f9894943acede7fb22ed17dcb 100644 --- a/src/node_realm-inl.h +++ b/src/node_realm-inl.h -@@ -21,7 +21,8 @@ inline Realm* Realm::GetCurrent(v8::Local context) { +@@ -22,7 +22,8 @@ inline Realm* Realm::GetCurrent(v8::Local context) { return nullptr; } return static_cast( diff --git a/patches/node/api_remove_deprecated_getisolate.patch b/patches/node/api_remove_deprecated_getisolate.patch index 2b2433ff9e..ba8542f51a 100644 --- a/patches/node/api_remove_deprecated_getisolate.patch +++ b/patches/node/api_remove_deprecated_getisolate.patch @@ -85,10 +85,10 @@ index cc60ddddb037e0279615bbe24821eb20fd8da677..37d83e41b618a07aca98118260abe961 return handle; diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc -index f3631d538a38dc3a93a47707ea8dab0462fa2140..12ad6e6ddbda2cc679e733f7a9c6b9e4cf9623dd 100644 +index 2e3f31e1765024373c3fc2acd33fc3bfb352a906..ca62d3001bf51193d78caac0cccd93c188a8410c 100644 --- a/src/crypto/crypto_context.cc +++ b/src/crypto/crypto_context.cc -@@ -1022,7 +1022,7 @@ bool ArrayOfStringsToX509s(Local context, +@@ -1045,7 +1045,7 @@ bool ArrayOfStringsToX509s(Local context, Local cert_array, std::vector* certs) { ClearErrorOnReturn clear_error_on_return; @@ -120,10 +120,10 @@ index 4c5427596d1c90d3a413cdd9ff4f1151e657073d..70135a6be65e41fcb3564ddf6d1e8083 NewStringType::kNormal, mem->length) diff --git a/src/encoding_binding.cc b/src/encoding_binding.cc -index 266f640fb1c6503a424e77cc41fc15bc658bb6a5..877ae8a18f6b8f2c7e3474dfba060d99db88e6b9 100644 +index a913e34c73db3fb62aedcf28bee1bf1c4d59de7a..9de38eb9907269e99fdf0907aa35862572a2c643 100644 --- a/src/encoding_binding.cc +++ b/src/encoding_binding.cc -@@ -76,7 +76,7 @@ void BindingData::Deserialize(Local context, +@@ -75,7 +75,7 @@ void BindingData::Deserialize(Local context, int index, InternalFieldInfoBase* info) { DCHECK_IS_SNAPSHOT_SLOT(index); @@ -388,10 +388,10 @@ index d278a32c9934c15bc721da164efccca7bc7e7111..ab862bf93a411e6ae6da7c9f9706cee2 BlobBindingData* binding = realm->AddBindingData(holder); CHECK_NOT_NULL(binding); diff --git a/src/node_builtins.cc b/src/node_builtins.cc -index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310cedc8093c5f 100644 +index 703ac1be06249736073f797058d170576a0db1bf..f0607ec9fd1983386166d0f4782adac99ace943e 100644 --- a/src/node_builtins.cc +++ b/src/node_builtins.cc -@@ -274,7 +274,7 @@ MaybeLocal BuiltinLoader::LookupAndCompileInternal( +@@ -275,7 +275,7 @@ MaybeLocal BuiltinLoader::LookupAndCompileInternal( const char* id, LocalVector* parameters, Realm* optional_realm) { @@ -400,7 +400,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced EscapableHandleScope scope(isolate); Local source; -@@ -396,7 +396,7 @@ void BuiltinLoader::SaveCodeCache(const char* id, Local fun) { +@@ -397,7 +397,7 @@ void BuiltinLoader::SaveCodeCache(const char* id, Local fun) { MaybeLocal BuiltinLoader::LookupAndCompile(Local context, const char* id, Realm* optional_realm) { @@ -409,7 +409,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced LocalVector parameters(isolate); // Detects parameters of the scripts based on module ids. // internal/bootstrap/realm: process, getLinkedBinding, -@@ -450,7 +450,7 @@ MaybeLocal BuiltinLoader::LookupAndCompile(Local context, +@@ -451,7 +451,7 @@ MaybeLocal BuiltinLoader::LookupAndCompile(Local context, MaybeLocal BuiltinLoader::CompileAndCall(Local context, const char* id, Realm* realm) { @@ -418,7 +418,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced // Detects parameters of the scripts based on module ids. // internal/bootstrap/realm: process, getLinkedBinding, // getInternalBinding, primordials -@@ -506,7 +506,7 @@ MaybeLocal BuiltinLoader::CompileAndCall(Local context, +@@ -507,7 +507,7 @@ MaybeLocal BuiltinLoader::CompileAndCall(Local context, if (!maybe_fn.ToLocal(&fn)) { return MaybeLocal(); } @@ -427,7 +427,7 @@ index e69eb280050cae0c0f394b2f956eef947e628904..9bb4576fcf4f07550e7d6f4ff2310ced return fn->Call(context, undefined, argc, argv); } -@@ -544,14 +544,14 @@ bool BuiltinLoader::CompileAllBuiltinsAndCopyCodeCache( +@@ -545,14 +545,14 @@ bool BuiltinLoader::CompileAllBuiltinsAndCopyCodeCache( to_eager_compile_.emplace(id); } @@ -533,10 +533,10 @@ index 55a0c986c5b6989ee9ce277bb6a9778abb2ad2ee..809d88f21e5572807e38132d40ee7587 READONLY_PROPERTY(target, "exitCodes", exit_codes); diff --git a/src/node_file.cc b/src/node_file.cc -index 7dfb7a486040e0188eb53ee7a65f91a99e713a3a..c364f2a4f6dd6ec066b00f364108383154be12ec 100644 +index ba6ffc2b6565dea500bc8dd4818c8fcb7648694a..e834325a763f7ea8f53210145b5edd134d6b67e6 100644 --- a/src/node_file.cc +++ b/src/node_file.cc -@@ -3834,7 +3834,7 @@ void BindingData::Deserialize(Local context, +@@ -3843,7 +3843,7 @@ void BindingData::Deserialize(Local context, int index, InternalFieldInfoBase* info) { DCHECK_IS_SNAPSHOT_SLOT(index); @@ -586,7 +586,7 @@ index 57e068ae249d618c2658638f9f3b03e1fedb6524..8c51ae4e0a435971c6d0288af8781087 data_.Reset(); return ret; diff --git a/src/node_modules.cc b/src/node_modules.cc -index d3907c3d063c7757cdd7ef99ed09bea1eb58a3fd..df9925404e77ec61900f89a5241c86a599e548c5 100644 +index cecdda74847801fd5821bc0afdf0dfc9f131c44a..04ebecc5d924f6c2fddd9992462d1ff692e1cee5 100644 --- a/src/node_modules.cc +++ b/src/node_modules.cc @@ -70,7 +70,7 @@ void BindingData::Deserialize(v8::Local context, @@ -598,7 +598,7 @@ index d3907c3d063c7757cdd7ef99ed09bea1eb58a3fd..df9925404e77ec61900f89a5241c86a5 Realm* realm = Realm::GetCurrent(context); BindingData* binding = realm->AddBindingData(holder); CHECK_NOT_NULL(binding); -@@ -709,7 +709,7 @@ void BindingData::CreatePerContextProperties(Local target, +@@ -750,7 +750,7 @@ void BindingData::CreatePerContextProperties(Local target, Realm* realm = Realm::GetCurrent(context); realm->AddBindingData(target); @@ -608,10 +608,10 @@ index d3907c3d063c7757cdd7ef99ed09bea1eb58a3fd..df9925404e77ec61900f89a5241c86a5 #define V(status) \ diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc -index e453bacc3e5247493a3582c24174bfe6e590825d..fe4aad63bc877be105830a80aa6be10ce3f8fda4 100644 +index 4a258e5f140994536386492059d64c9cf94ea0a6..67278974199db46fed85b443e7cdd30accd7687f 100644 --- a/src/node_process_methods.cc +++ b/src/node_process_methods.cc -@@ -737,7 +737,7 @@ void BindingData::Deserialize(Local context, +@@ -745,7 +745,7 @@ void BindingData::Deserialize(Local context, int index, InternalFieldInfoBase* info) { DCHECK_IS_SNAPSHOT_SLOT(index); @@ -621,7 +621,7 @@ index e453bacc3e5247493a3582c24174bfe6e590825d..fe4aad63bc877be105830a80aa6be10c // Recreate the buffer in the constructor. InternalFieldInfo* casted_info = static_cast(info); diff --git a/src/node_realm.cc b/src/node_realm.cc -index 2a5fe9fe501d1fd9356eeb7d044a872fa5a55f38..39f6f142044c42904d234da20a266315346c135a 100644 +index 6d2e4eb641a8ffaacf4aebd3522008a285387a30..47bd7d9f19077ac7a558c73db5f51bdf8da291e7 100644 --- a/src/node_realm.cc +++ b/src/node_realm.cc @@ -22,7 +22,7 @@ using v8::String; @@ -660,7 +660,7 @@ index c2e24b4645e7903e08c80aead1c18c7bcff1bd89..e34d24d51d5c090b560d06f727043f20 // Recreate the buffer in the constructor. InternalFieldInfo* casted_info = static_cast(info); diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc -index 955b76cbc71d0cd3a1cc01c3c0dea0536a792dc0..0b111ce1fb1d59cad019ba13bbfc513f157d3f06 100644 +index 6bfc54dd81446545ebbb0faedb55a5383b81de49..2e52fb801684feb22800d4809daab006fc7cae9c 100644 --- a/src/node_sqlite.cc +++ b/src/node_sqlite.cc @@ -2061,7 +2061,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo& args) { @@ -736,7 +736,7 @@ index 370221d3cddc201180260ecb3a222bc831c91093..f5aff2f65fe6b9f48cf970ab3e7c57cf THROW_ERR_WASI_NOT_STARTED(isolate); return EinvalError(); diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc -index cc90af827a3fbd14fb4cbfbfd39cc661f22cf6e1..5819d9bca845e0eed6d4d93564469d8f3c36200b 100644 +index 5c7d268d38ff55ce4db07463b1ea0bcb2f4e63ea..bd83654012442195866e57173b6e5d4d25fecf0f 100644 --- a/src/node_webstorage.cc +++ b/src/node_webstorage.cc @@ -57,7 +57,7 @@ using v8::Value; @@ -748,7 +748,7 @@ index cc90af827a3fbd14fb4cbfbfd39cc661f22cf6e1..5819d9bca845e0eed6d4d93564469d8f auto dom_exception_str = FIXED_ONE_BYTE_STRING(isolate, "DOMException"); auto err_name = FIXED_ONE_BYTE_STRING(isolate, "QuotaExceededError"); auto err_message = -@@ -433,7 +433,7 @@ Maybe Storage::Store(Local key, Local value) { +@@ -437,7 +437,7 @@ Maybe Storage::Store(Local key, Local value) { } static MaybeLocal Uint32ToName(Local context, uint32_t index) { @@ -758,10 +758,10 @@ index cc90af827a3fbd14fb4cbfbfd39cc661f22cf6e1..5819d9bca845e0eed6d4d93564469d8f static void Clear(const FunctionCallbackInfo& info) { diff --git a/src/node_worker.cc b/src/node_worker.cc -index 62c53368d1173edb7eb42e3337049c46fd7cdda9..7d08d8af7f6d99f7bd41cb7eb91063c630b3f87b 100644 +index e7d26b4c8cbb08a175084ceac51395860dc60598..fa4ec53ee556a23c8fd018caa1eee51bc5e004fe 100644 --- a/src/node_worker.cc +++ b/src/node_worker.cc -@@ -1466,8 +1466,6 @@ void GetEnvMessagePort(const FunctionCallbackInfo& args) { +@@ -1465,8 +1465,6 @@ void GetEnvMessagePort(const FunctionCallbackInfo& args) { Local port = env->message_port(); CHECK_IMPLIES(!env->is_main_thread(), !port.IsEmpty()); if (!port.IsEmpty()) { diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index c4a490dca2..83da595804 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -11,7 +11,7 @@ really in 20/21. We have to wait until 22 is released to be able to build with upstream GN files. diff --git a/configure.py b/configure.py -index 750ddc8ace6cad894e738f6e1d983b5906acc10f..e063f9131d4d547d231811dafea03c8c52b611e6 100755 +index f31d460038db2fa2fa4c47d62be3100da959978f..209f23b04663113e4f6b3c3242c0544cfed9a950 100755 --- a/configure.py +++ b/configure.py @@ -1736,7 +1736,7 @@ def configure_v8(o, configs): @@ -68,10 +68,10 @@ index d4438f7fd61598afac2c1e3184721a759d22b10c..e2407027ab05e59b2f0f1c213b98ea46 assert(!node_enable_inspector || node_use_openssl, diff --git a/src/node_builtins.cc b/src/node_builtins.cc -index 581b9886ded52f294b7cc6b080b2269b7617c85e..e43e2559aaf48add88aad342b1c96fd34f26c87f 100644 +index 7b34b14856a5193c723987f69d6040bdb6aa7c34..90fdf52d79954bf2cd86fd1d2d6da8199683d344 100644 --- a/src/node_builtins.cc +++ b/src/node_builtins.cc -@@ -774,6 +774,7 @@ void BuiltinLoader::RegisterExternalReferences( +@@ -775,6 +775,7 @@ void BuiltinLoader::RegisterExternalReferences( registry->Register(GetNatives); RegisterExternalReferencesForInternalizedBuiltinCode(registry); @@ -95,7 +95,7 @@ index 7a7b84337feb67960819472e43192dbdc151e299..bcdd50f635757f41287c87df1db9cd3b diff --git a/tools/js2c.cc b/tools/js2c.cc old mode 100644 new mode 100755 -index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2e9dfb0f0 +index 9c2f70de4e00834ff448e573743898072dc14c5d..71a12c606f4da7165cc41a295a278b2e504af1b6 --- a/tools/js2c.cc +++ b/tools/js2c.cc @@ -28,6 +28,7 @@ namespace js2c { @@ -190,7 +190,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2 static_cast(def_buf.size()), def_buf.data(), static_cast(init_buf.size()), -@@ -846,12 +890,15 @@ int JS2C(const FileList& js_files, +@@ -836,12 +880,15 @@ int JS2C(const FileList& js_files, } } @@ -206,7 +206,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2 Fragment out = Format(definitions, initializers, registrations); return WriteIfChanged(out, dest); } -@@ -877,6 +924,8 @@ int Main(int argc, char* argv[]) { +@@ -867,6 +914,8 @@ int Main(int argc, char* argv[]) { std::string arg(argv[i]); if (arg == "--verbose") { is_verbose = true; @@ -215,7 +215,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2 } else if (arg == "--root") { if (i == argc - 1) { fprintf(stderr, "--root must be followed by a path\n"); -@@ -925,6 +974,14 @@ int Main(int argc, char* argv[]) { +@@ -915,6 +964,14 @@ int Main(int argc, char* argv[]) { } } @@ -230,7 +230,7 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2 // Should have exactly 3 types: `.js`, `.mjs` and `.gypi`. assert(file_map.size() == 3); auto gypi_it = file_map.find(".gypi"); -@@ -951,6 +1008,7 @@ int Main(int argc, char* argv[]) { +@@ -941,6 +998,7 @@ int Main(int argc, char* argv[]) { std::sort(mjs_it->second.begin(), mjs_it->second.end()); return JS2C(js_it->second, mjs_it->second, gypi_it->second[0], output); diff --git a/patches/node/build_enable_perfetto.patch b/patches/node/build_enable_perfetto.patch index 56b7a7fdcc..b4499c0661 100644 --- a/patches/node/build_enable_perfetto.patch +++ b/patches/node/build_enable_perfetto.patch @@ -64,7 +64,7 @@ index e664663348adc7bb31f7c9ec78481bbeb71401d9..62b659beb766b8256b214447af376f43 function ipToInt(ip) { diff --git a/node.gyp b/node.gyp -index c3917f805464669c709bef83b9982ef95d0fbaa1..56e11cde31897260bf41db3f32f5c6d6fbd6d5bf 100644 +index c035d1d7cdac1d18cca0ef5cefbc5ce4c1fd1b86..a48e4e5d1fb7621b12b9abeaaf78214515a23efc 100644 --- a/node.gyp +++ b/node.gyp @@ -176,7 +176,6 @@ diff --git a/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch b/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch index 1020e9f6aa..17de7453bf 100644 --- a/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch +++ b/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch @@ -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 8280cff0d93d42a95875b78de84221aa1bcae092..76a03b9a5458f4afc0ab5768c8a2e90633749fe9 100644 +index cf3ceaf19972ee107deff63b4dba16c12191c615..6159350823fd9f0090e2b98e8797e829fd481750 100644 --- a/common.gypi +++ b/common.gypi @@ -89,6 +89,8 @@ @@ -42,7 +42,7 @@ index 8280cff0d93d42a95875b78de84221aa1bcae092..76a03b9a5458f4afc0ab5768c8a2e906 # list in v8/BUILD.gn. ['v8_enable_v8_checks == 1', { diff --git a/configure.py b/configure.py -index e063f9131d4d547d231811dafea03c8c52b611e6..a5c764d9e7fb0ffa219202015ec67ed6d3e14c04 100755 +index 209f23b04663113e4f6b3c3242c0544cfed9a950..88164b99ae3d37f47e5e9a9ba96d7b450d6ba4ab 100755 --- a/configure.py +++ b/configure.py @@ -1717,6 +1717,7 @@ def configure_library(lib, output, pkgname=None): diff --git a/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch b/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch index 57afd30f2c..0eb500c540 100644 --- a/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch +++ b/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch @@ -34,7 +34,7 @@ index 605dee28cace56f2366fec9d7f18894559044ae4..15dcabb3b1682438eb6d5a681363b7ea let kResistStopPropagation; diff --git a/src/node_builtins.cc b/src/node_builtins.cc -index e43e2559aaf48add88aad342b1c96fd34f26c87f..e69eb280050cae0c0f394b2f956eef947e628904 100644 +index 90fdf52d79954bf2cd86fd1d2d6da8199683d344..703ac1be06249736073f797058d170576a0db1bf 100644 --- a/src/node_builtins.cc +++ b/src/node_builtins.cc @@ -39,6 +39,7 @@ using v8::Value; diff --git a/patches/node/build_restore_clang_as_default_compiler_on_macos.patch b/patches/node/build_restore_clang_as_default_compiler_on_macos.patch index d5c1291a62..298dbe95bd 100644 --- a/patches/node/build_restore_clang_as_default_compiler_on_macos.patch +++ b/patches/node/build_restore_clang_as_default_compiler_on_macos.patch @@ -11,7 +11,7 @@ node-gyp will use the result of `process.config` that reflects the environment in which the binary got built. diff --git a/common.gypi b/common.gypi -index 76a03b9a5458f4afc0ab5768c8a2e90633749fe9..bdadbdaa607b2f668749fc484271de8d126bbd17 100644 +index 6159350823fd9f0090e2b98e8797e829fd481750..5f47ec9bb405f6c1574304ac68807929604cd402 100644 --- a/common.gypi +++ b/common.gypi @@ -128,6 +128,7 @@ diff --git a/patches/node/build_restore_macos_deployment_target_to_12_0.patch b/patches/node/build_restore_macos_deployment_target_to_12_0.patch index 4cfa72e7f8..e5ab8aab71 100644 --- a/patches/node/build_restore_macos_deployment_target_to_12_0.patch +++ b/patches/node/build_restore_macos_deployment_target_to_12_0.patch @@ -10,7 +10,7 @@ M151, and so we should allow for building until then. This patch can be removed at the M151 branch point. diff --git a/common.gypi b/common.gypi -index bdadbdaa607b2f668749fc484271de8d126bbd17..8df2802191b7fe6ae14edbd85cb3a5d16eb5a76a 100644 +index 5f47ec9bb405f6c1574304ac68807929604cd402..914f28b41d05b1485874885570ae5adaabd8e1b2 100644 --- a/common.gypi +++ b/common.gypi @@ -677,7 +677,7 @@ diff --git a/patches/node/chore_disable_deprecation_ftbfs_in_simdjson_header.patch b/patches/node/chore_disable_deprecation_ftbfs_in_simdjson_header.patch index f49f9814d0..3d3947a05b 100644 --- a/patches/node/chore_disable_deprecation_ftbfs_in_simdjson_header.patch +++ b/patches/node/chore_disable_deprecation_ftbfs_in_simdjson_header.patch @@ -14,10 +14,10 @@ and This patch can be removed once this is fixed upstream in simdjson. diff --git a/deps/simdjson/simdjson.h b/deps/simdjson/simdjson.h -index 35ff2626f26735495e308381782e5f1d9b8a629e..b4aa4bce33d62c579beee745712d24d9ebd5e0c2 100644 +index 1d6560e80fab0458b22f0ac2437056bce4873e8f..c3dbe2b6fc08c36a07ced5e29a814f7bcd85b748 100644 --- a/deps/simdjson/simdjson.h +++ b/deps/simdjson/simdjson.h -@@ -4179,12 +4179,17 @@ inline std::ostream& operator<<(std::ostream& out, simdjson_result padded_string::load(std::string_view filen +@@ -4729,6 +4734,9 @@ inline simdjson_result padded_string::load(std::wstring_view file } // namespace simdjson @@ -45,8 +45,8 @@ index 35ff2626f26735495e308381782e5f1d9b8a629e..b4aa4bce33d62c579beee745712d24d9 inline simdjson::padded_string operator ""_padded(const char *str, size_t len) { return simdjson::padded_string(str, len); } -@@ -4644,6 +4652,8 @@ inline simdjson::padded_string operator ""_padded(const char8_t *str, size_t len - return simdjson::padded_string(reinterpret_cast(str), len); +@@ -4737,6 +4745,8 @@ inline simdjson::padded_string operator ""_padded(const char8_t *str, size_t len + return simdjson::padded_string(reinterpret_cast(str), len); } #endif +#pragma clang diagnostic pop @@ -54,7 +54,7 @@ index 35ff2626f26735495e308381782e5f1d9b8a629e..b4aa4bce33d62c579beee745712d24d9 #endif // SIMDJSON_PADDED_STRING_INL_H /* end file simdjson/padded_string-inl.h */ /* skipped duplicate #include "simdjson/padded_string_view.h" */ -@@ -43674,12 +43684,16 @@ simdjson_inline simdjson_warn_unused std::unique_ptr& parser:: +@@ -44745,12 +44755,16 @@ simdjson_inline simdjson_warn_unused std::unique_ptr& parser:: return parser_instance; } @@ -71,7 +71,7 @@ index 35ff2626f26735495e308381782e5f1d9b8a629e..b4aa4bce33d62c579beee745712d24d9 } // namespace ondemand } // namespace arm64 -@@ -57923,12 +57937,16 @@ simdjson_inline simdjson_warn_unused std::unique_ptr& parser:: +@@ -59221,12 +59235,16 @@ simdjson_inline simdjson_warn_unused std::unique_ptr& parser:: return parser_instance; } diff --git a/patches/node/expose_get_builtin_module_function.patch b/patches/node/expose_get_builtin_module_function.patch index c5c4d3694f..6a703eccc2 100644 --- a/patches/node/expose_get_builtin_module_function.patch +++ b/patches/node/expose_get_builtin_module_function.patch @@ -9,7 +9,7 @@ modules to sandboxed renderers. TODO(codebytere): remove and replace with a public facing API. diff --git a/src/node_binding.cc b/src/node_binding.cc -index 5bd07e5253ae64b02ae1874226ab70c1972cf9e0..768d81a63a42d9016a42b7cdce7b6be86c59afdf 100644 +index 3b284583d6ccc9b2d0273d678335b9ab0a6fa81c..fbbdc26b8d1428084709ab113f102c42424842b0 100644 --- a/src/node_binding.cc +++ b/src/node_binding.cc @@ -655,6 +655,10 @@ void GetInternalBinding(const FunctionCallbackInfo& args) { diff --git a/patches/node/feat_disable_js_source_phase_imports_by_default.patch b/patches/node/feat_disable_js_source_phase_imports_by_default.patch index aa51478dd8..ad3aab2d7e 100644 --- a/patches/node/feat_disable_js_source_phase_imports_by_default.patch +++ b/patches/node/feat_disable_js_source_phase_imports_by_default.patch @@ -18,7 +18,7 @@ Stage 3. Upstreamed in https://github.com/nodejs/node/pull/60364 diff --git a/src/node.cc b/src/node.cc -index d77735f4f5686e914811c0576975b57e6c631398..d8e1c809df6e96ed561c73c0e8de0cf9736e4aaa 100644 +index ae082f2d0498e0e694e427da71078ca19086e275..f9630a5cd9bed1535a7839517313a2d47d403b1f 100644 --- a/src/node.cc +++ b/src/node.cc @@ -782,7 +782,7 @@ static ExitCode ProcessGlobalArgsInternal(std::vector* args, diff --git a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch index e526d855c7..e26b0fe61d 100644 --- a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch +++ b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch @@ -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 db1625378697d9e6d7685d57acbdc212e8f25ec0..8280cff0d93d42a95875b78de84221aa1bcae092 100644 +index 5adfd888711ae46a3ba157853359145c4409169b..cf3ceaf19972ee107deff63b4dba16c12191c615 100644 --- a/common.gypi +++ b/common.gypi @@ -91,6 +91,23 @@ diff --git a/patches/node/fix_allow_disabling_fetch_in_renderer_and_worker_processes.patch b/patches/node/fix_allow_disabling_fetch_in_renderer_and_worker_processes.patch index 0dec5dbc9d..68fca466dd 100644 --- a/patches/node/fix_allow_disabling_fetch_in_renderer_and_worker_processes.patch +++ b/patches/node/fix_allow_disabling_fetch_in_renderer_and_worker_processes.patch @@ -9,10 +9,10 @@ conflict with Blink's in renderer and worker processes. We should try to upstream some version of this. diff --git a/doc/api/cli.md b/doc/api/cli.md -index 667603438cc41701820d6aaa734d21ac35bcc8d1..6611face009797f9d540be4478df80d05888893a 100644 +index d94226df8d90d791c3c5fdb7cab7357b0e2555b0..7512ec43ea10d9b0e167125040bc8136f7ad568a 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md -@@ -1798,6 +1798,14 @@ changes: +@@ -1814,6 +1814,14 @@ changes: Disable using [syntax detection][] to determine module type. @@ -27,7 +27,7 @@ index 667603438cc41701820d6aaa734d21ac35bcc8d1..6611face009797f9d540be4478df80d0 ### `--no-experimental-global-navigator`