From cfae97a64c1cd77fbe757528e97ddc3697e35e3a Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Fri, 10 Jan 2020 07:42:53 +1300 Subject: [PATCH] chore: bump node to v12.14.1 (master) (#21703) Co-authored-by: Shelley Vohr --- DEPS | 2 +- patches/node/.patches | 3 +- patches/node/build_add_gn_build_files.patch | 4 +- ...ng_back_node_with_ltcg_configuration.patch | 2 +- ..._log_from_fallback_stream_on_windows.patch | 2 +- ...on_not_being_set_in_the_electron_env.patch | 23 -- ...xt-aware_native_modules_being_loaded.patch | 14 +- ...vironment_into_createenvironment_and.patch | 4 +- ...is_on_64bit_arch_and_ptr_compression.patch | 2 +- .../expose_get_builtin_module_function.patch | 4 +- ...s_for_low-level_hooks_and_exceptions.patch | 16 +- .../feat_add_uv_loop_watcher_queue_code.patch | 12 +- .../node/feat_initialize_asar_support.patch | 2 +- ...r_enable_lto_and_build_v8_with_gn_in.patch | 2 +- ...fix_build_and_expose_inspector_agent.patch | 6 +- ...ebugoptions_s_constructors_in_header.patch | 2 +- patches/node/fix_export_debugoptions.patch | 2 +- .../fix_expose_internalcallbackscope.patch | 4 +- ...se_tracing_tracingcontroller_instead.patch | 4 +- ...include_libuv_header_in_node_binding.patch | 23 ++ ..._apis_are_not_available_in_boringssl.patch | 4 +- .../fix_remove_unused_llhttp_variables.patch | 48 +++ .../fixme_comment_trace_event_macro.patch | 4 +- ...efined_version_of_internalmodulestat.patch | 2 +- ..._crashpad_pipe_name_in_child_process.patch | 2 +- .../make_module_globalpaths_a_reference.patch | 4 +- .../pass_all_globals_through_require.patch | 4 +- ...dder_overriding_of_internal_fs_calls.patch | 2 +- ...cess_fork_to_use_execute_script_with.patch | 2 +- .../revert_crypto_add_oaeplabel_option.patch | 4 +- script/node-disabled-tests.json | 278 +++++++++--------- 31 files changed, 269 insertions(+), 218 deletions(-) delete mode 100644 patches/node/chore_handle_default_configuration_not_being_set_in_the_electron_env.patch create mode 100644 patches/node/fix_include_libuv_header_in_node_binding.patch create mode 100644 patches/node/fix_remove_unused_llhttp_variables.patch diff --git a/DEPS b/DEPS index eb30f755bd11..9498681774e4 100644 --- a/DEPS +++ b/DEPS @@ -13,7 +13,7 @@ vars = { 'chromium_version': 'd0c764fc71894cc24d3bb17a7406ba6c6cc6dc29', 'node_version': - 'v12.14.0', + 'v12.14.1', 'nan_version': '2ee313aaca52e2b478965ac50eb5082520380d1b', diff --git a/patches/node/.patches b/patches/node/.patches index 7fda34744e3a..8c00abca1f23 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -25,8 +25,9 @@ chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch inherit_electron_crashpad_pipe_name_in_child_process.patch chore_read_nobrowserglobals_from_global_not_process.patch chore_split_createenvironment_into_createenvironment_and.patch -chore_handle_default_configuration_not_being_set_in_the_electron_env.patch build_bring_back_node_with_ltcg_configuration.patch revert_crypto_add_oaeplabel_option.patch refactor_transferrablemodule_is_deprecated_use_compiledwasmmodule.patch enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch +fix_remove_unused_llhttp_variables.patch +fix_include_libuv_header_in_node_binding.patch diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index 5b4b62d4a9ec..7ae0cbe15201 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -883,7 +883,7 @@ index 0000000000000000000000000000000000000000..f13b471d17128468bed06e66bd03a2ea +} diff --git a/filenames.json b/filenames.json new file mode 100644 -index 0000000000000000000000000000000000000000..5eb839f45aca3ed73d69b43a34c438ce254a2c6b +index 0000000000000000000000000000000000000000..db73a7699cdb1925c723fd1708d6ce1fad1cc946 --- /dev/null +++ b/filenames.json @@ -0,0 +1,448 @@ @@ -1541,7 +1541,7 @@ index 0000000000000000000000000000000000000000..f3c5c798c0aefcb8cf9b1570a7b4817c + args = rebase_path(inputs + outputs, root_build_dir) +} diff --git a/src/node_version.h b/src/node_version.h -index b974af56853d28d2154f314f5ca9a38d19efc84c..57c846c81d511051cc56d3827609b12993e70240 100644 +index 8a6fb55a5a3824b40d2c744a0ed1e8d84e6bbc4a..c68a60d7b0a818b25ce3bd44037d52abe57769f2 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -89,7 +89,10 @@ diff --git a/patches/node/build_bring_back_node_with_ltcg_configuration.patch b/patches/node/build_bring_back_node_with_ltcg_configuration.patch index ff48f6394a2f..5cd712c2bf42 100644 --- a/patches/node/build_bring_back_node_with_ltcg_configuration.patch +++ b/patches/node/build_bring_back_node_with_ltcg_configuration.patch @@ -10,7 +10,7 @@ THe fix for this should land in node-gyp as discussed in above issue, landing this as temporary patch. diff --git a/common.gypi b/common.gypi -index bde7d7300f44596abe5cdfac0639ecb1bb4d885f..412f613e7cfcf563fa6a000b932723166ab567da 100644 +index f07e65f719a1a5939997dfcae7bc787ee6391f4d..f4d03a2fdfd47a4e6a71c7146d92ce7cbc44993d 100644 --- a/common.gypi +++ b/common.gypi @@ -19,7 +19,7 @@ diff --git a/patches/node/call_process_log_from_fallback_stream_on_windows.patch b/patches/node/call_process_log_from_fallback_stream_on_windows.patch index 1ca5519a9d0b..be7a586e2ecc 100644 --- a/patches/node/call_process_log_from_fallback_stream_on_windows.patch +++ b/patches/node/call_process_log_from_fallback_stream_on_windows.patch @@ -6,7 +6,7 @@ Subject: Call process.log from fallback stream on Windows (cherry picked from commit d31e629b4f2daf3500a485caab2b2990a41e3ad4) diff --git a/lib/internal/process/stdio.js b/lib/internal/process/stdio.js -index 08781547c489526834609861c5a906ef5183936b..e60ad6b0d4c634a8b0990da6ca090ea48715b830 100644 +index 2491f14cdf01409e4625d6793279ef87dbcc6942..54d3fb23dc1b51fec206e8989e4873d95884583f 100644 --- a/lib/internal/process/stdio.js +++ b/lib/internal/process/stdio.js @@ -192,6 +192,11 @@ function createWritableStdioStream(fd) { diff --git a/patches/node/chore_handle_default_configuration_not_being_set_in_the_electron_env.patch b/patches/node/chore_handle_default_configuration_not_being_set_in_the_electron_env.patch deleted file mode 100644 index 88837070d3fa..000000000000 --- a/patches/node/chore_handle_default_configuration_not_being_set_in_the_electron_env.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Attard -Date: Tue, 23 Jul 2019 11:36:48 -0700 -Subject: chore: handle default_configuration not being set in the electron env - -We don't set the `default_configuration` key in our config.gypi, this allows -the tests to run in spite of that. - -TODO(marshallofsound/nornagon): Just add this key to config.gypi. - -diff --git a/test/common/index.js b/test/common/index.js -index 00ebd283a0c3e960de2a7c4e3748561c499eb820..2ebec24f9e1f53306882e827a17925201cad0ea6 100644 ---- a/test/common/index.js -+++ b/test/common/index.js -@@ -118,7 +118,7 @@ const enoughTestCpu = Array.isArray(cpus) && - - const rootDir = isWindows ? 'c:\\' : '/'; - --const buildType = process.config.target_defaults.default_configuration; -+const buildType = process.config.target_defaults ? process.config.target_defaults.default_configuration : 'Release'; - - - // If env var is set then enable async_hook hooks for all tests. diff --git a/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch b/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch index 2491bd782d8f..f8c369cf0754 100644 --- a/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch +++ b/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch @@ -8,7 +8,7 @@ once we stop warning and begin to unilaterally prevent non-context aware modules from being loaded. diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js -index 113d2e58a9cecf233bf6a60138cdfc60f338b28c..f4e21997054dc86e21ed093a7bc227b0c5d150cd 100644 +index e7bd18855fb98a822833b4366bfb595dccfc1b6f..a96f891f675cc598e912a5e010c24938a9f6fc98 100644 --- a/lib/internal/bootstrap/pre_execution.js +++ b/lib/internal/bootstrap/pre_execution.js @@ -80,8 +80,10 @@ function patchProcessObject(expandArgv1) { @@ -23,10 +23,10 @@ index 113d2e58a9cecf233bf6a60138cdfc60f338b28c..f4e21997054dc86e21ed093a7bc227b0 // TODO(joyeecheung): most of these should be deprecated and removed, diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index 18fdf148ccca5d92f10b78144eee39bdff7919d2..df995ecc75a0c7cf509d2f4d75051c68cd507d5a 100644 +index 2fddd3766ffb28dc9176ed1b7a4b01361dd72fcd..c14cbe0279bbce98ea875bc3487996da679b4f40 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -933,6 +933,13 @@ Module.prototype._compile = function(content, filename) { +@@ -932,6 +932,13 @@ Module.prototype._compile = function(content, filename) { if (getOptionValue('--inspect-brk') && process._eval == null) { if (!resolvedArgv) { // We enter the repl if we're not given a filename argument. @@ -41,10 +41,10 @@ index 18fdf148ccca5d92f10b78144eee39bdff7919d2..df995ecc75a0c7cf509d2f4d75051c68 resolvedArgv = Module._resolveFilename(process.argv[1], null, false); } else { diff --git a/src/env.h b/src/env.h -index 8e12764ea3a9a3d4441b276fdf9db9fce7109f72..1df2907fe0bc8a4a2bee3c569bfa535465d9f289 100644 +index 60cb1b6d113e7e0687d96806f8940b5a715144cf..eef7b7bc244b4231419b4ec3013fa1cf700c97ef 100644 --- a/src/env.h +++ b/src/env.h -@@ -912,6 +912,15 @@ class Environment : public MemoryRetainer { +@@ -914,6 +914,15 @@ class Environment : public MemoryRetainer { uint64_t thread_id = kNoThreadId); ~Environment(); @@ -60,7 +60,7 @@ index 8e12764ea3a9a3d4441b276fdf9db9fce7109f72..1df2907fe0bc8a4a2bee3c569bfa5354 void InitializeLibuv(bool start_profiler_idle_notifier); inline const std::vector& exec_argv(); inline const std::vector& argv(); -@@ -1266,6 +1275,9 @@ class Environment : public MemoryRetainer { +@@ -1268,6 +1277,9 @@ class Environment : public MemoryRetainer { inline void ThrowError(v8::Local (*fun)(v8::Local), const char* errmsg); @@ -71,7 +71,7 @@ index 8e12764ea3a9a3d4441b276fdf9db9fce7109f72..1df2907fe0bc8a4a2bee3c569bfa5354 v8::Isolate* const isolate_; IsolateData* const isolate_data_; diff --git a/src/node_binding.cc b/src/node_binding.cc -index 3a5ea646fc68d88cb045380c3401812dff590496..12255167f0f38ec856339dd86d95171a56d61553 100644 +index 4adb4b893925b1b0ebf6ba41040121438db56d1f..7c1dfaf06f1c7a08d9301d6d1837fa008b076cbd 100644 --- a/src/node_binding.cc +++ b/src/node_binding.cc @@ -3,6 +3,7 @@ diff --git a/patches/node/chore_split_createenvironment_into_createenvironment_and.patch b/patches/node/chore_split_createenvironment_into_createenvironment_and.patch index 74063c09831c..3b25d46fe206 100644 --- a/patches/node/chore_split_createenvironment_into_createenvironment_and.patch +++ b/patches/node/chore_split_createenvironment_into_createenvironment_and.patch @@ -8,7 +8,7 @@ This allows us to run operations on a created but not yet bootstrapped environment such as setting up an InspectorAgent diff --git a/src/api/environment.cc b/src/api/environment.cc -index ae26cb7e9ef55fc0b965e28de4686aec87f42522..50886f4a998f1e7f346a6b7fad91ce49c3a7cdff 100644 +index 356131156b4a714eebf4e202cd105f0f184e3852..96192f0ea4174315d73e03849ce1bed996afc44c 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -263,7 +263,8 @@ Environment* CreateEnvironment(IsolateData* isolate_data, @@ -53,7 +53,7 @@ index ae26cb7e9ef55fc0b965e28de4686aec87f42522..50886f4a998f1e7f346a6b7fad91ce49 void FreeEnvironment(Environment* env) { diff --git a/src/node.h b/src/node.h -index 80a27dc734a81a7ca8d888d1d55fc8d24a536280..9c6dcbf7014f7cf87f7f66886cbf255978c244fa 100644 +index e3258434eba34124c71562225e295cd1807fdf7c..2ac35208ae8b2cfd067b5b712d4447121ef6e47d 100644 --- a/src/node.h +++ b/src/node.h @@ -326,7 +326,9 @@ NODE_EXTERN Environment* CreateEnvironment(IsolateData* isolate_data, diff --git a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch index 210fc806d151..bf5210ef9609 100644 --- a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch +++ b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch @@ -8,7 +8,7 @@ node modules will have different (wrong) ideas about how v8 structs are laid out in memory on 64-bit machines, and will summarily fail to work. diff --git a/common.gypi b/common.gypi -index 412f613e7cfcf563fa6a000b932723166ab567da..6e2ad757781f794333b3656ec05f6e48ade86d2e 100644 +index f4d03a2fdfd47a4e6a71c7146d92ce7cbc44993d..d88db157c0e2972c5a7c4f8dacb5a69bff1d9b72 100644 --- a/common.gypi +++ b/common.gypi @@ -75,6 +75,9 @@ diff --git a/patches/node/expose_get_builtin_module_function.patch b/patches/node/expose_get_builtin_module_function.patch index 965c867d4ce4..01dcb2ae7001 100644 --- a/patches/node/expose_get_builtin_module_function.patch +++ b/patches/node/expose_get_builtin_module_function.patch @@ -9,10 +9,10 @@ modules to sandboxed renderers. (cherry picked from commit 4c058a6cb5331eef1c7f51c042dd074a2d4f9234) diff --git a/src/node_binding.h b/src/node_binding.h -index dd94fab36a0e8fcb453ba82091f6284e8193c00d..b2aa45b7e85127f645f43d5fce0050fd488f2668 100644 +index 42f3c5b8d00880588f442a4e724e080128c56dfe..cefb6419ebb7f5c5c79927d179eef0a790e234ad 100644 --- a/src/node_binding.h +++ b/src/node_binding.h -@@ -93,6 +93,8 @@ void GetInternalBinding(const v8::FunctionCallbackInfo& args); +@@ -90,6 +90,8 @@ void GetInternalBinding(const v8::FunctionCallbackInfo& args); void GetLinkedBinding(const v8::FunctionCallbackInfo& args); void DLOpen(const v8::FunctionCallbackInfo& args); diff --git a/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch b/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch index fc91404d4c65..59c8fbf34112 100644 --- a/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch +++ b/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch @@ -24,10 +24,10 @@ Environment on the V8 context of blink, so no new V8 context is created. As a result, a renderer process may have multiple Node Environments in it. diff --git a/src/env.cc b/src/env.cc -index 2400785ea82fe4e975d222214161a417d2e6c002..069cd137b35e748dd45e5c720ec71d4fe274562b 100644 +index 90d10590e5dcc4c6cd6253403f8ae34bd02e7212..948a29c5c245ed7e646378bd9b8ea1f213848455 100644 --- a/src/env.cc +++ b/src/env.cc -@@ -383,6 +383,12 @@ Environment::Environment(IsolateData* isolate_data, +@@ -382,6 +382,12 @@ Environment::Environment(IsolateData* isolate_data, // TODO(joyeecheung): deserialize when the snapshot covers the environment // properties. CreateProperties(); @@ -41,7 +41,7 @@ index 2400785ea82fe4e975d222214161a417d2e6c002..069cd137b35e748dd45e5c720ec71d4f Environment::~Environment() { diff --git a/src/node.cc b/src/node.cc -index 572490730da5854ad1a79670564ad9705c86747b..9b43d7676e5e106318b58bfe443651cc49780068 100644 +index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9462f07f6 100644 --- a/src/node.cc +++ b/src/node.cc @@ -27,6 +27,7 @@ @@ -62,7 +62,7 @@ index 572490730da5854ad1a79670564ad9705c86747b..9b43d7676e5e106318b58bfe443651cc namespace per_process { // node_revert.h -@@ -352,6 +356,13 @@ MaybeLocal Environment::RunBootstrapping() { +@@ -325,6 +329,13 @@ MaybeLocal Environment::RunBootstrapping() { CHECK(!has_run_bootstrapping_code()); @@ -76,7 +76,7 @@ index 572490730da5854ad1a79670564ad9705c86747b..9b43d7676e5e106318b58bfe443651cc if (BootstrapInternalLoaders().IsEmpty()) { return MaybeLocal(); } -@@ -741,7 +752,9 @@ int InitializeNodeWithArgs(std::vector* argv, +@@ -716,7 +727,9 @@ int InitializeNodeWithArgs(std::vector* argv, binding::RegisterBuiltinModules(); // Make inherited handles noninheritable. @@ -87,7 +87,7 @@ index 572490730da5854ad1a79670564ad9705c86747b..9b43d7676e5e106318b58bfe443651cc #ifdef NODE_REPORT // Cache the original command line to be -@@ -843,6 +856,9 @@ int InitializeNodeWithArgs(std::vector* argv, +@@ -811,6 +824,9 @@ int InitializeNodeWithArgs(std::vector* argv, } #endif @@ -97,7 +97,7 @@ index 572490730da5854ad1a79670564ad9705c86747b..9b43d7676e5e106318b58bfe443651cc const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, false); if (exit_code != 0) return exit_code; -@@ -865,6 +881,8 @@ int InitializeNodeWithArgs(std::vector* argv, +@@ -833,6 +849,8 @@ int InitializeNodeWithArgs(std::vector* argv, per_process::metadata.versions.InitializeIntlVersions(); #endif @@ -107,7 +107,7 @@ index 572490730da5854ad1a79670564ad9705c86747b..9b43d7676e5e106318b58bfe443651cc // We should set node_is_initialized here instead of in node::Start, diff --git a/src/node.h b/src/node.h -index 13d71d41398545963139e61488474e23fa0ebeea..2baf51c3181fe2d390246f655ad35c3aac51f229 100644 +index 025c6b949dc438a98a960d3630c723376f731ca7..892dafd8031533d23a88298406356107409cbd0a 100644 --- a/src/node.h +++ b/src/node.h @@ -203,6 +203,9 @@ namespace node { diff --git a/patches/node/feat_add_uv_loop_watcher_queue_code.patch b/patches/node/feat_add_uv_loop_watcher_queue_code.patch index 157e40716b18..4d31537f2775 100644 --- a/patches/node/feat_add_uv_loop_watcher_queue_code.patch +++ b/patches/node/feat_add_uv_loop_watcher_queue_code.patch @@ -6,10 +6,10 @@ Subject: feat: add uv_loop watcher_queue code Electron's Node Integration works by listening to Node's backend file descriptor in a separate thread; when an event is ready the backend file descriptor will trigger a new event for it, and the main thread will then iterate the libuv loop. For certain operations (ex. adding a timeout task) the backend file descriptor isn't informed, & as a result the main thread doesn't know it needs to iterate the libuv loop so the timeout task will never execute until something else trigger a new event. This commit should be removed when https://github.com/libuv/libuv/pull/1921 is merged diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h -index ee45bcaefce1d3684df90c0342b1ff9f89c94544..a73396b2e74eecb01e6abed755875dde6760d3d6 100644 +index 0e8132e4384be02737e9a001aa2a65f76e7a1215..b79a5228c2abef854cf63dbbcd3704c14c3bb25e 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h -@@ -1693,6 +1693,8 @@ union uv_any_req { +@@ -1734,6 +1734,8 @@ union uv_any_req { struct uv_loop_s { /* User data - use this for whatever. */ void* data; @@ -19,10 +19,10 @@ index ee45bcaefce1d3684df90c0342b1ff9f89c94544..a73396b2e74eecb01e6abed755875dde unsigned int active_handles; void* handle_queue[2]; diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c -index 366c43c2ab08437a6af6bf15f24563bcc6cb40e1..517ca26c39fbcb63f17bca5a0658bda18bc15921 100644 +index ffce948c9574034443203b9d2569d5f7aec1070e..ca2a755e09ac96c313737efb7b9c5880a1c158ae 100644 --- a/deps/uv/src/unix/core.c +++ b/deps/uv/src/unix/core.c -@@ -897,8 +897,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) { +@@ -899,8 +899,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) { return; #endif @@ -35,7 +35,7 @@ index 366c43c2ab08437a6af6bf15f24563bcc6cb40e1..517ca26c39fbcb63f17bca5a0658bda1 if (loop->watchers[w->fd] == NULL) { loop->watchers[w->fd] = w; -@@ -934,8 +937,11 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) { +@@ -936,8 +939,11 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) { w->events = 0; } } @@ -48,7 +48,7 @@ index 366c43c2ab08437a6af6bf15f24563bcc6cb40e1..517ca26c39fbcb63f17bca5a0658bda1 } -@@ -952,6 +958,8 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) { +@@ -954,6 +960,8 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) { void uv__io_feed(uv_loop_t* loop, uv__io_t* w) { if (QUEUE_EMPTY(&w->pending_queue)) QUEUE_INSERT_TAIL(&loop->pending_queue, &w->pending_queue); diff --git a/patches/node/feat_initialize_asar_support.patch b/patches/node/feat_initialize_asar_support.patch index 12d11de3d72c..4a49897b1b4b 100644 --- a/patches/node/feat_initialize_asar_support.patch +++ b/patches/node/feat_initialize_asar_support.patch @@ -19,7 +19,7 @@ index 0cad5209c4ff4e68d7c400af1d2b4c234210ddb4..918bc8c0c4e78bad5a3372e8a5522da0 return NativeModule.map.has(id); }; diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js -index f959310156141623c2acc9e4d8bdad433d401925..113d2e58a9cecf233bf6a60138cdfc60f338b28c 100644 +index 2aa2a3b46c5fc12d22e0e74e304d2d55ca02c3b5..e7bd18855fb98a822833b4366bfb595dccfc1b6f 100644 --- a/lib/internal/bootstrap/pre_execution.js +++ b/lib/internal/bootstrap/pre_execution.js @@ -61,6 +61,7 @@ function prepareMainThreadExecution(expandArgv1 = false) { diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch index 81fe381573bc..fe018e7ad4c6 100644 --- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch +++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch @@ -8,7 +8,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 6501f78796fd17503f5ff9cd3a52cbfa688c2814..bde7d7300f44596abe5cdfac0639ecb1bb4d885f 100644 +index b86e5e05d7df9ad472f16735448a53f433620eef..f07e65f719a1a5939997dfcae7bc787ee6391f4d 100644 --- a/common.gypi +++ b/common.gypi @@ -77,6 +77,22 @@ diff --git a/patches/node/fix_build_and_expose_inspector_agent.patch b/patches/node/fix_build_and_expose_inspector_agent.patch index 3b1735de8f33..e725b5cbbc1f 100644 --- a/patches/node/fix_build_and_expose_inspector_agent.patch +++ b/patches/node/fix_build_and_expose_inspector_agent.patch @@ -6,10 +6,10 @@ Subject: fix: build and expose inspector agent Node inspector initialization happens in a different start-up function in node.cc, which we don't call in Electron. This allows for us to use the inspector agent in electron/atom/browser/node_debugger.cc diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc -index cf0110144a535dcc7e691650d015da6715179d7e..edb27e4650b1e98b5a5f7765c60e0dd45e7956f0 100644 +index aff52a5a5eccd175fae4f82ffcf9897ad43763ee..e55862ca202caaa9ec9800b40215232f98120476 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc -@@ -217,7 +217,7 @@ const int CONTEXT_GROUP_ID = 1; +@@ -222,7 +222,7 @@ const int CONTEXT_GROUP_ID = 1; std::string GetWorkerLabel(node::Environment* env) { std::ostringstream result; @@ -18,7 +18,7 @@ index cf0110144a535dcc7e691650d015da6715179d7e..edb27e4650b1e98b5a5f7765c60e0dd4 return result.str(); } -@@ -465,7 +465,7 @@ class NodeInspectorClient : public V8InspectorClient { +@@ -470,7 +470,7 @@ class NodeInspectorClient : public V8InspectorClient { client_ = V8Inspector::create(env->isolate(), this); // TODO(bnoordhuis) Make name configurable from src/node.cc. std::string name = diff --git a/patches/node/fix_do_not_define_debugoptions_s_constructors_in_header.patch b/patches/node/fix_do_not_define_debugoptions_s_constructors_in_header.patch index aa562c80b35f..7365c891f305 100644 --- a/patches/node/fix_do_not_define_debugoptions_s_constructors_in_header.patch +++ b/patches/node/fix_do_not_define_debugoptions_s_constructors_in_header.patch @@ -15,7 +15,7 @@ By putting the definitions of constructors into the implementation file, we can avoid this problem. diff --git a/src/node_options.cc b/src/node_options.cc -index c0c15a88c028d9c70081aa75fabf63d1d78014e6..03919d450b3373983d647165ee93c006eb5f2902 100644 +index 2dd90e9a8cf9381c8608b73ead247bcf86b72ab9..051e7b084b6770215bd009b0e37feabbb7df7389 100644 --- a/src/node_options.cc +++ b/src/node_options.cc @@ -26,6 +26,12 @@ Mutex cli_options_mutex; diff --git a/patches/node/fix_export_debugoptions.patch b/patches/node/fix_export_debugoptions.patch index 9d8734ae3feb..8fc168d6cfa9 100644 --- a/patches/node/fix_export_debugoptions.patch +++ b/patches/node/fix_export_debugoptions.patch @@ -6,7 +6,7 @@ Subject: fix: export DebugOptions This exports DebugOptions so we can parse args like `--inspect-brk`. diff --git a/src/node_options.cc b/src/node_options.cc -index d53ab2a4bfe87321e899b431eac262223e532335..c0c15a88c028d9c70081aa75fabf63d1d78014e6 100644 +index 35cac18a916c2ce104a3e7b6760d0280b33c2892..2dd90e9a8cf9381c8608b73ead247bcf86b72ab9 100644 --- a/src/node_options.cc +++ b/src/node_options.cc @@ -210,11 +210,6 @@ void EnvironmentOptions::CheckOptions(std::vector* errors) { diff --git a/patches/node/fix_expose_internalcallbackscope.patch b/patches/node/fix_expose_internalcallbackscope.patch index 73ffa3c24844..51269ce086bb 100644 --- a/patches/node/fix_expose_internalcallbackscope.patch +++ b/patches/node/fix_expose_internalcallbackscope.patch @@ -6,10 +6,10 @@ Subject: fix: expose InternalCallbackScope This commit exposes InternalCallbackScope in order to allow us access to kAllowEmptyResource for usage https://github.com/electron/electron/blob/master/atom/common/api/atom_bindings.cc\#L108. We should look to accomplish this another way so we no longer need to do this, as in verbose mode the regular CallBack Scope doesn't swallow errors and so we can otherwise use it. diff --git a/src/node_internals.h b/src/node_internals.h -index 85d2c5c1f18db01d64f8285720f6624f15aa2436..fb1188a6bbce37b2bbaba0a815f2826dca60cf3b 100644 +index 0fff2e6111e53f99ca8e92d6966d9847570d01bd..e8d6705e0197aad55b931910bb5221dd33b37fb0 100644 --- a/src/node_internals.h +++ b/src/node_internals.h -@@ -200,7 +200,7 @@ v8::MaybeLocal InternalMakeCallback( +@@ -203,7 +203,7 @@ v8::MaybeLocal InternalMakeCallback( v8::Local argv[], async_context asyncContext); diff --git a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch index 2dd5bbfba8b2..6de99839852a 100644 --- a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch +++ b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch @@ -5,7 +5,7 @@ Subject: fix: expose tracing::Agent and use tracing::TracingController instead of v8::TracingController diff --git a/src/api/environment.cc b/src/api/environment.cc -index 2c0fe1306319b25c378d0aae73e4045560a9b683..ae26cb7e9ef55fc0b965e28de4686aec87f42522 100644 +index 138f9ada984a952a6ecf8089ddb31bc258a8d35b..356131156b4a714eebf4e202cd105f0f184e3852 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -314,6 +314,10 @@ MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform() { @@ -20,7 +20,7 @@ index 2c0fe1306319b25c378d0aae73e4045560a9b683..ae26cb7e9ef55fc0b965e28de4686aec int thread_pool_size, node::tracing::TracingController* tracing_controller) { diff --git a/src/node.h b/src/node.h -index 2baf51c3181fe2d390246f655ad35c3aac51f229..80a27dc734a81a7ca8d888d1d55fc8d24a536280 100644 +index 892dafd8031533d23a88298406356107409cbd0a..e3258434eba34124c71562225e295cd1807fdf7c 100644 --- a/src/node.h +++ b/src/node.h @@ -108,6 +108,7 @@ namespace node { diff --git a/patches/node/fix_include_libuv_header_in_node_binding.patch b/patches/node/fix_include_libuv_header_in_node_binding.patch new file mode 100644 index 000000000000..f841c63f5ba4 --- /dev/null +++ b/patches/node/fix_include_libuv_header_in_node_binding.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shelley Vohr +Date: Wed, 8 Jan 2020 12:54:07 -0800 +Subject: fix: include libuv header in node_binding + +The libuv header uv.h was removed in +https://github.com/nodejs/node/commit/3bb085dbad4d23030c731834e35b2804c8a50b23, +but is necessary for Windows to understand what uv_lib_t is. + +Upstreamed in https://github.com/nodejs/node/pull/31265. + +diff --git a/src/node_binding.h b/src/node_binding.h +index cefb6419ebb7f5c5c79927d179eef0a790e234ad..5bced5b41431dc7838d1a30774a1a41ff797290e 100644 +--- a/src/node_binding.h ++++ b/src/node_binding.h +@@ -10,6 +10,7 @@ + #include "node.h" + #define NAPI_EXPERIMENTAL + #include "node_api.h" ++#include "uv.h" + + enum { + NM_F_BUILTIN = 1 << 0, // Unused. diff --git a/patches/node/fix_key_gen_apis_are_not_available_in_boringssl.patch b/patches/node/fix_key_gen_apis_are_not_available_in_boringssl.patch index 5eae38d197a7..500b97dd3eac 100644 --- a/patches/node/fix_key_gen_apis_are_not_available_in_boringssl.patch +++ b/patches/node/fix_key_gen_apis_are_not_available_in_boringssl.patch @@ -6,7 +6,7 @@ Subject: fix: key gen APIs are not available in BoringSSL This will make Node's key pair generation APIs fail. diff --git a/src/node_crypto.cc b/src/node_crypto.cc -index 2d539094a0589e9945bf2f27fa8a8afce47031b0..2c702d2f051d6b8f59ac53a4e2729ee02ba98a47 100644 +index ad06141752eae90a655d710932b479f9cd8482ff..861d321d6170b25e874080d4c70dda201cab3248 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -290,24 +290,14 @@ Maybe Decorate(Environment* env, Local obj, @@ -80,7 +80,7 @@ index 2d539094a0589e9945bf2f27fa8a8afce47031b0..2c702d2f051d6b8f59ac53a4e2729ee0 } private: -@@ -7112,9 +7112,12 @@ void Initialize(Local target, +@@ -7101,9 +7101,12 @@ void Initialize(Local target, env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC); env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid); NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED25519); diff --git a/patches/node/fix_remove_unused_llhttp_variables.patch b/patches/node/fix_remove_unused_llhttp_variables.patch new file mode 100644 index 000000000000..1f57b27fbf72 --- /dev/null +++ b/patches/node/fix_remove_unused_llhttp_variables.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shelley Vohr +Date: Wed, 8 Jan 2020 10:12:46 -0800 +Subject: fix: remove unused llhttp variables + +Node.js updated llhttps in https://github.com/nodejs/node/pull/30553, +which updated some of the llparse_blobs. To keep numbering consistency, +it left the newly unused ones, which causes compilation failures in Electron +as we do not allow unused variables. + +Fixed in https://github.com/nodejs/llparse/pull/34; this patch can be removed +as soon as llparse v6.2.1 is rolled into Node.js + +diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c +index 698230f93fe08f347a9e6e9f7194663c9b5318c3..664b563ad1ccf69794f0e86245e91d0bc26c1d58 100644 +--- a/deps/llhttp/src/llhttp.c ++++ b/deps/llhttp/src/llhttp.c +@@ -24,10 +24,6 @@ typedef int (*llhttp__internal__span_cb)( + static const unsigned char llparse_blob0[] = { + 'C', 'L' + }; +-static const unsigned char ALIGN(16) llparse_blob1[] = { +- 0x9, 0x9, 0xc, 0xc, '!', '"', '$', '>', '@', '~', 0x80, +- 0xff +-}; + static const unsigned char llparse_blob2[] = { + 'o', 'n' + }; +@@ -43,19 +39,9 @@ static const unsigned char llparse_blob5[] = { + static const unsigned char llparse_blob6[] = { + 'p', 'g', 'r', 'a', 'd', 'e' + }; +-static const unsigned char ALIGN(16) llparse_blob7[] = { +- 0x9, 0x9, ' ', '~', 0x80, 0xfe +-}; + static const unsigned char llparse_blob8[] = { + 'h', 'u', 'n', 'k', 'e', 'd' + }; +-static const unsigned char ALIGN(16) llparse_blob9[] = { +- ' ', '!', '#', '\'', '*', '+', '-', '.', '0', '9', 'A', +- 'Z', '^', 'z', '|', '|' +-}; +-static const unsigned char ALIGN(16) llparse_blob10[] = { +- '~', '~' +-}; + static const unsigned char llparse_blob11[] = { + 'e', 'n', 't', '-', 'l', 'e', 'n', 'g', 't', 'h' + }; diff --git a/patches/node/fixme_comment_trace_event_macro.patch b/patches/node/fixme_comment_trace_event_macro.patch index 57ed237bf7f8..b0969327c992 100644 --- a/patches/node/fixme_comment_trace_event_macro.patch +++ b/patches/node/fixme_comment_trace_event_macro.patch @@ -7,10 +7,10 @@ This broke the build at some point. Does it still? We should probably remove this patch and find out! diff --git a/src/node_internals.h b/src/node_internals.h -index fb1188a6bbce37b2bbaba0a815f2826dca60cf3b..843cbf1d253022c9601ceaf74022873a48ac0a5f 100644 +index e8d6705e0197aad55b931910bb5221dd33b37fb0..c55ddf6988344eef5fd9efc3b24337d3b1e4cdbb 100644 --- a/src/node_internals.h +++ b/src/node_internals.h -@@ -350,10 +350,11 @@ class TraceEventScope { +@@ -358,10 +358,11 @@ class TraceEventScope { TraceEventScope(const char* category, const char* name, void* id) : category_(category), name_(name), id_(id) { diff --git a/patches/node/fixme_use_redefined_version_of_internalmodulestat.patch b/patches/node/fixme_use_redefined_version_of_internalmodulestat.patch index 62e429f5b48b..58f0a89532de 100644 --- a/patches/node/fixme_use_redefined_version_of_internalmodulestat.patch +++ b/patches/node/fixme_use_redefined_version_of_internalmodulestat.patch @@ -9,7 +9,7 @@ this has to be done after the upgrade to the Node.js v8.7.0. in the very beginn to a native Node.js implementation of the function. diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index 481d59594dbca27c8529a8b424ab3cb190dd8def..03247551074e1ad3cdd412e6adc0d865746225d1 100644 +index 112a35280391ac85665f119ded9c78e88f868542..fc0f953820fa6222ff8cca2e27d3087e05288ff5 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -120,6 +120,8 @@ function enrichCJSError(err) { diff --git a/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch b/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch index dc362156913a..15a8fec80b23 100644 --- a/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch +++ b/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch @@ -6,7 +6,7 @@ Subject: Inherit ELECTRON_CRASHPAD_PIPE_NAME in child process This is required for crashReporter to work correctly in node process. diff --git a/lib/child_process.js b/lib/child_process.js -index 2f478625c8220fc86c34876c17c8f532d88ba922..9a79e06555b6bf5d970f96bedb2c2146d2c74a48 100644 +index d5d97c9da90281e0c24fe97a4914db12d685c7bc..a6d058c92dff927cd2fc6bcb2bb304e9ca497a31 100644 --- a/lib/child_process.js +++ b/lib/child_process.js @@ -107,6 +107,10 @@ function fork(modulePath /* , args, options */) { diff --git a/patches/node/make_module_globalpaths_a_reference.patch b/patches/node/make_module_globalpaths_a_reference.patch index 4ab77086aad7..3d6662516179 100644 --- a/patches/node/make_module_globalpaths_a_reference.patch +++ b/patches/node/make_module_globalpaths_a_reference.patch @@ -10,10 +10,10 @@ node's module code. (cherry picked from commit 76ba048c37588ee32636817fa7b8dffc64330cbf) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index 2d058b7e0dace3084d068f3e88dffbe93a67390d..a1c6db94e49fb2f13c68dc503481beb3decf5cf4 100644 +index c37105fa1ed04bd935bc6886606553cffd56a654..4bd467849ccf98ba17e0f4615d1df5febf878173 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1102,8 +1102,8 @@ Module._initPaths = function() { +@@ -1110,8 +1110,8 @@ Module._initPaths = function() { modulePaths = paths; diff --git a/patches/node/pass_all_globals_through_require.patch b/patches/node/pass_all_globals_through_require.patch index 01ceb3f6fe9d..25edebe12be9 100644 --- a/patches/node/pass_all_globals_through_require.patch +++ b/patches/node/pass_all_globals_through_require.patch @@ -6,7 +6,7 @@ Subject: Pass all globals through "require" (cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index a1c6db94e49fb2f13c68dc503481beb3decf5cf4..481d59594dbca27c8529a8b424ab3cb190dd8def 100644 +index 4bd467849ccf98ba17e0f4615d1df5febf878173..112a35280391ac85665f119ded9c78e88f868542 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -83,6 +83,13 @@ const { @@ -23,7 +23,7 @@ index a1c6db94e49fb2f13c68dc503481beb3decf5cf4..481d59594dbca27c8529a8b424ab3cb1 const isWindows = process.platform === 'win32'; const relativeResolveCache = Object.create(null); -@@ -951,10 +958,12 @@ Module.prototype._compile = function(content, filename) { +@@ -950,10 +957,12 @@ Module.prototype._compile = function(content, filename) { if (requireDepth === 0) statCache = new Map(); if (inspectorWrapper) { result = inspectorWrapper(compiledWrapper, thisValue, exports, diff --git a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch index 74a788054202..914eec444f73 100644 --- a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch +++ b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch @@ -22,7 +22,7 @@ index 18acd9d2b64774efdb9261e69923a5ba320a7f0e..0f36697ce5ed0b5bb6df74ceca219574 process.config = JSON.parse(internalBinding('native_module').config); diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index 03247551074e1ad3cdd412e6adc0d865746225d1..18fdf148ccca5d92f10b78144eee39bdff7919d2 100644 +index fc0f953820fa6222ff8cca2e27d3087e05288ff5..2fddd3766ffb28dc9176ed1b7a4b01361dd72fcd 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -42,10 +42,7 @@ const assert = require('internal/assert'); diff --git a/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch b/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch index 881f6d8ae315..f3a0401e05f4 100644 --- a/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch +++ b/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch @@ -7,7 +7,7 @@ Subject: refactor: alter child_process.fork to use execute script with When forking a child script, we setup a special environment to make the Electron binary run like the upstream node. On Mac, we use the helper app as node binary. diff --git a/lib/child_process.js b/lib/child_process.js -index 43257e53dfe0319d6c110e94529cbc991c2bcfb3..2f478625c8220fc86c34876c17c8f532d88ba922 100644 +index 42b04bb9b0629372ed20840a70f768832476d767..d5d97c9da90281e0c24fe97a4914db12d685c7bc 100644 --- a/lib/child_process.js +++ b/lib/child_process.js @@ -102,6 +102,15 @@ function fork(modulePath /* , args, options */) { diff --git a/patches/node/revert_crypto_add_oaeplabel_option.patch b/patches/node/revert_crypto_add_oaeplabel_option.patch index a05db27eba99..bdd7483c14bb 100644 --- a/patches/node/revert_crypto_add_oaeplabel_option.patch +++ b/patches/node/revert_crypto_add_oaeplabel_option.patch @@ -8,10 +8,10 @@ The BoringSSL incompatibilities (OPENSSL_memdup) will be shimmed in and this sho be removed when the associated update is rolled into Chromium. diff --git a/src/node_crypto.cc b/src/node_crypto.cc -index d7eff663a5d7465d33f53930868edca6cb89bf49..863b48c614b331fa93a511b21b997891159bb86e 100644 +index 861d321d6170b25e874080d4c70dda201cab3248..ef96843c820a5361056022cea5546e94e5572918 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc -@@ -5264,17 +5264,6 @@ bool PublicKeyCipher::Cipher(Environment* env, +@@ -5365,17 +5365,6 @@ bool PublicKeyCipher::Cipher(Environment* env, return false; } diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json index 24b45973d1af..e6b66cb54b71 100644 --- a/script/node-disabled-tests.json +++ b/script/node-disabled-tests.json @@ -1,75 +1,139 @@ [ + "abort/test-abort-backtrace", + "async-hooks/test-crypto-pbkdf2", + "async-hooks/test-crypto-randomBytes", + "async-hooks/test-emit-after-on-destroyed", + "async-hooks/test-emit-before-after", + "async-hooks/test-emit-before-on-destroyed", + "async-hooks/test-emit-init", + "async-hooks/test-fseventwrap", + "async-hooks/test-fsreqcallback-readFile", + "async-hooks/test-getaddrinforeqwrap", + "async-hooks/test-getnameinforeqwrap", + "async-hooks/test-graph.signal", + "async-hooks/test-improper-order", + "async-hooks/test-late-hook-enable", + "async-hooks/test-nexttick-default-trigger", + "async-hooks/test-pipewrap", + "async-hooks/test-promise", + "async-hooks/test-queue-microtask", + "async-hooks/test-signalwrap", + "async-hooks/test-statwatcher", + "async-hooks/test-timers.setInterval", + "es-module/test-cjs-esm-warn", + "es-module/test-esm-cjs-load-error-note", + "es-module/test-esm-cjs-main", + "es-module/test-esm-default-type", + "es-module/test-esm-json-cache", + "es-module/test-esm-no-extension", + "es-module/test-esm-scope-node-modules", + "es-module/test-esm-snapshot", + "es-module/test-esm-specifiers", + "es-module/test-esm-type-flag", + "message/assert_throws_stack", + "message/async_error_eval_esm", + "message/async_error_sync_esm", + "message/console", + "message/core_line_numbers", + "message/error_exit", + "message/esm_display_syntax_error", + "message/esm_display_syntax_error_import", + "message/esm_display_syntax_error_import_module", + "message/esm_display_syntax_error_module", + "message/eval_messages", + "message/events_unhandled_error_common_trace", + "message/events_unhandled_error_nexttick", + "message/events_unhandled_error_sameline", + "message/events_unhandled_error_subclass", + "message/if-error-has-good-stack", + "message/internal_assert", + "message/internal_assert_fail", + "message/promise_always_throw_unhandled", + "message/source_map_throw_catch", + "message/source_map_throw_first_tick", + "message/source_map_throw_set_immediate", + "message/undefined_reference_in_new_context", + "message/unhandled_promise_trace_warnings", + "message/util_inspect_error", + "message/v8_warning", + "message/vm_display_runtime_error", + "message/vm_display_syntax_error", + "message/vm_dont_display_runtime_error", + "message/vm_dont_display_syntax_error", "parallel/test-assert", "parallel/test-async-hooks-close-during-destroy", "parallel/test-async-hooks-promise", "parallel/test-async-hooks-promise-triggerid", "parallel/test-async-hooks-top-level-clearimmediate", - "parallel/test-inspector-async-hook-after-done", - "parallel/test-inspector-workers-flat-list", - "parallel/test-sync-io-option", - "parallel/test-heapdump-async-hooks-init-promise", - "parallel/test-http2-reset-flood", "parallel/test-bootstrap-modules", "parallel/test-buffer-backing-arraybuffer", "parallel/test-buffer-constructor-node-modules-paths", "parallel/test-buffer-constructor-outside-node-modules", "parallel/test-child-process-fork-exec-path", - "parallel/test-cli-bad-options", - "parallel/test-cli-node-print-help", "parallel/test-child-process-windows-hide", + "parallel/test-cli-bad-options", "parallel/test-cli-eval", - "parallel/test-cli-syntax-eval", "parallel/test-cli-node-options", - "parallel/test-cli-syntax-piped-good", + "parallel/test-cli-node-print-help", + "parallel/test-cli-syntax-eval", "parallel/test-cli-syntax-piped-bad", + "parallel/test-cli-syntax-piped-good", "parallel/test-code-cache", "parallel/test-common-gc", - "parallel/test-crypto-aes-wrap", "parallel/test-crypto", + "parallel/test-crypto-aes-wrap", "parallel/test-crypto-authenticated", - "parallel/test-crypto-des3-wrap", "parallel/test-crypto-binary-default", "parallel/test-crypto-certificate", "parallel/test-crypto-cipher-decipher", "parallel/test-crypto-cipheriv-decipheriv", + "parallel/test-crypto-classes", + "parallel/test-crypto-des3-wrap", + "parallel/test-crypto-dh", "parallel/test-crypto-ecb", "parallel/test-crypto-ecdh-convert-key", - "parallel/test-crypto-classes", "parallel/test-crypto-engine", - "parallel/test-crypto-dh", "parallel/test-crypto-hash-stream-pipe", "parallel/test-crypto-key-objects", "parallel/test-crypto-keygen", "parallel/test-crypto-padding", "parallel/test-crypto-padding-aes256", - "parallel/test-crypto-sign-verify", "parallel/test-crypto-rsa-dsa", - "parallel/test-crypto-stream", - "parallel/test-debugger-pid", "parallel/test-crypto-scrypt", + "parallel/test-crypto-sign-verify", + "parallel/test-crypto-stream", "parallel/test-debug-usage", - "parallel/test-domain-async-id-map-leak", + "parallel/test-debugger-pid", "parallel/test-domain-abort-on-uncaught", - "parallel/test-dummy-stdio", + "parallel/test-domain-async-id-map-leak", "parallel/test-domain-with-abort-on-uncaught-exception", + "parallel/test-dummy-stdio", "parallel/test-freeze-intrinsics", "parallel/test-fs-write-sigxfsz", - "parallel/test-http-client-readable", "parallel/test-gc-tls-external-memory", - "parallel/test-http2-compat-serverrequest-settimeout", + "parallel/test-heapdump-async-hooks-init-promise", + "parallel/test-http-agent-domain-reused-gc", + "parallel/test-http-client-readable", + "parallel/test-http2-compat-serverrequest-settimeout", "parallel/test-http2-compat-serverresponse-settimeout", + "parallel/test-http2-reset-flood", "parallel/test-https-agent-session-reuse", "parallel/test-https-options-boolean-check", + "parallel/test-inspector-async-hook-after-done", + "parallel/test-inspector-esm", + "parallel/test-inspector-heap-allocation-tracker", "parallel/test-inspector-port-zero-cluster", + "parallel/test-inspector-tracing-domain", "parallel/test-inspector-vm-global-accessors-getter-sideeffect", "parallel/test-inspector-vm-global-accessors-sideeffects", + "parallel/test-inspector-workers-flat-list", "parallel/test-internal-util-weakreference", - "parallel/test-inspector-heap-allocation-tracker", "parallel/test-module-loading-globalpaths", "parallel/test-module-version", "parallel/test-openssl-ca-options", - "parallel/test-preload-print-process-argv", + "parallel/test-policy-integrity", "parallel/test-preload", + "parallel/test-preload-print-process-argv", "parallel/test-process-env-allowed-flags-are-documented", "parallel/test-process-env-sideeffects", "parallel/test-process-exception-capture", @@ -80,132 +144,119 @@ "parallel/test-process-external-stdio-close-spawn", "parallel/test-process-versions", "parallel/test-readline-interface", - "parallel/test-inspector-esm", - "parallel/test-repl-harmony", - "parallel/test-inspector-tracing-domain", "parallel/test-repl", + "parallel/test-repl-harmony", "parallel/test-repl-pretty-custom-stack", "parallel/test-repl-pretty-stack", + "parallel/test-repl-sigint", + "parallel/test-repl-sigint-nested-eval", + "parallel/test-repl-tab-complete", "parallel/test-repl-uncaught-exception", "parallel/test-repl-underscore", - "parallel/test-signal-handler", "parallel/test-security-revert-unknown", + "parallel/test-signal-handler", + "parallel/test-source-map", "parallel/test-stdout-close-catch", - "parallel/test-policy-integrity", - "parallel/test-repl-tab-complete", + "parallel/test-sync-io-option", "parallel/test-tls-cert-chains-concat", "parallel/test-tls-cert-chains-in-ca", - "parallel/test-tls-client-getephemeralkeyinfo", - "parallel/test-tls-client-mindhsize", - "parallel/test-tls-cli-min-version-1.3", "parallel/test-tls-cli-max-version-1.2", "parallel/test-tls-cli-max-version-1.3", - "parallel/test-tls-client-auth", "parallel/test-tls-cli-min-version-1.1", "parallel/test-tls-cli-min-version-1.2", + "parallel/test-tls-cli-min-version-1.3", + "parallel/test-tls-client-auth", + "parallel/test-tls-client-getephemeralkeyinfo", + "parallel/test-tls-client-mindhsize", "parallel/test-tls-client-reject", "parallel/test-tls-client-renegotiation-13", "parallel/test-tls-disable-renegotiation", "parallel/test-tls-empty-sni-context", - "parallel/test-tls-handshake-error", + "parallel/test-tls-env-bad-extra-ca", + "parallel/test-tls-env-extra-ca", + "parallel/test-tls-finished", "parallel/test-tls-generic-stream", "parallel/test-tls-getcipher", - "parallel/test-tls-finished", - "parallel/test-tls-env-bad-extra-ca", + "parallel/test-tls-handshake-error", "parallel/test-tls-honorcipherorder", - "parallel/test-tls-env-extra-ca", - "parallel/test-tls-key-mismatch", "parallel/test-tls-junk-server", + "parallel/test-tls-key-mismatch", "parallel/test-tls-max-send-fragment", + "parallel/test-tls-min-max-version", "parallel/test-tls-multi-key", "parallel/test-tls-multi-pfx", "parallel/test-tls-no-cert-required", - "parallel/test-tls-min-max-version", "parallel/test-tls-options-boolean-check", "parallel/test-tls-passphrase", "parallel/test-tls-peer-certificate", "parallel/test-tls-pfx-authorizationerror", "parallel/test-tls-server-failed-handshake-emits-clienterror", - "parallel/test-tls-set-ciphers-error", "parallel/test-tls-set-ciphers", - "parallel/test-tls-socket-failed-handshake-emits-error", - "parallel/test-tls-socket-allow-half-open-option", - "parallel/test-tls-ticket", + "parallel/test-tls-set-ciphers-error", "parallel/test-tls-set-sigalgs", - "parallel/test-tls-write-error", + "parallel/test-tls-socket-allow-half-open-option", + "parallel/test-tls-socket-failed-handshake-emits-error", + "parallel/test-tls-ticket", "parallel/test-tls-ticket-cluster", + "parallel/test-tls-write-error", + "parallel/test-trace-events-all", + "parallel/test-trace-events-async-hooks", + "parallel/test-trace-events-binding", + "parallel/test-trace-events-bootstrap", + "parallel/test-trace-events-category-used", + "parallel/test-trace-events-console", "parallel/test-trace-events-dynamic-enable", "parallel/test-trace-events-dynamic-enable-workers-disabled", - "parallel/test-trace-events-all", - "parallel/test-trace-events-binding", - "parallel/test-trace-events-async-hooks", - "parallel/test-trace-events-category-used", - "parallel/test-trace-events-fs-sync", - "parallel/test-trace-events-bootstrap", - "parallel/test-trace-events-console", - "parallel/test-trace-events-process-exit", "parallel/test-trace-events-environment", "parallel/test-trace-events-file-pattern", - "parallel/test-trace-events-perf", - "parallel/test-trace-events-promises", + "parallel/test-trace-events-fs-sync", "parallel/test-trace-events-metadata", "parallel/test-trace-events-none", - "parallel/test-trace-events-vm", + "parallel/test-trace-events-perf", + "parallel/test-trace-events-process-exit", + "parallel/test-trace-events-promises", "parallel/test-trace-events-v8", + "parallel/test-trace-events-vm", "parallel/test-trace-events-worker-metadata", - "parallel/test-v8-flags", + "parallel/test-util-inspect", "parallel/test-v8-coverage", + "parallel/test-v8-flags", "parallel/test-vm-basic", "parallel/test-vm-codegen", + "parallel/test-vm-module-basic", "parallel/test-vm-parse-abort-on-uncaught-exception", + "parallel/test-vm-sigint", + "parallel/test-vm-sigint-existing-handler", "parallel/test-vm-syntax-error-message", + "parallel/test-vm-timeout", "parallel/test-warn-sigprof", "parallel/test-whatwg-encoding-custom-textdecoder", "parallel/test-worker-debug", + "parallel/test-worker-invalid-workerdata", "parallel/test-worker-message-channel", + "parallel/test-worker-message-port", "parallel/test-worker-message-port-transfer-duplicate", "parallel/test-worker-message-port-transfer-target", - "parallel/test-worker-message-port", - "parallel/test-worker-invalid-workerdata", "parallel/test-worker-ref-onexit", "parallel/test-worker-sharedarraybuffer-from-worker-thread", "parallel/test-worker-stdio", "parallel/test-wrap-js-stream-exceptions", - "async-hooks/test-crypto-randomBytes", - "async-hooks/test-fseventwrap", - "async-hooks/test-fsreqcallback-readFile", - "async-hooks/test-getaddrinforeqwrap", - "async-hooks/test-emit-after-on-destroyed", - "async-hooks/test-emit-before-after", - "async-hooks/test-emit-before-on-destroyed", - "async-hooks/test-getnameinforeqwrap", - "async-hooks/test-emit-init", - "async-hooks/test-graph.signal", - "async-hooks/test-crypto-pbkdf2", - "async-hooks/test-nexttick-default-trigger", - "async-hooks/test-promise", - "async-hooks/test-improper-order", - "async-hooks/test-pipewrap", - "async-hooks/test-queue-microtask", - "async-hooks/test-signalwrap", - "async-hooks/test-statwatcher", - "async-hooks/test-timers.setInterval", - "async-hooks/test-late-hook-enable", - "es-module/test-esm-cjs-main", - "es-module/test-cjs-esm-warn", - "es-module/test-esm-json-cache", - "es-module/test-esm-snapshot", - "es-module/test-esm-no-extension", - "es-module/test-esm-scope-node-modules", - "es-module/test-esm-cjs-load-error-note", + "pseudo-tty/console_colors", + "pseudo-tty/ref_keeps_node_running", + "pseudo-tty/test-async-wrap-getasyncid-tty", + "pseudo-tty/test-fatal-error", + "pseudo-tty/test-handle-wrap-isrefed-tty", + "pseudo-tty/test-set-raw-mode-reset", + "pseudo-tty/test-set-raw-mode-reset-process-exit", + "pseudo-tty/test-set-raw-mode-reset-signal", + "pseudo-tty/test-tty-color-support", + "pseudo-tty/test-tty-window-size", + "pseudo-tty/test-tty-wrap", "report/test-report-config", "report/test-report-getreport", "report/test-report-signal", - "es-module/test-esm-specifiers", "report/test-report-uncaught-exception", - "es-module/test-esm-type-flag", "report/test-report-writereport", - "abort/test-abort-backtrace", "sequential/test-child-process-execsync", "sequential/test-cli-syntax-bad", "sequential/test-cli-syntax-good", @@ -235,58 +286,9 @@ "sequential/test-inspector-stress-http", "sequential/test-perf-hooks", "sequential/test-process-warnings", - "sequential/test-tls-connect", - "parallel/test-vm-module-basic", - "parallel/test-repl-sigint-nested-eval", - "parallel/test-repl-sigint", - "parallel/test-util-inspect", - "sequential/test-vm-timeout-rethrow", - "parallel/test-vm-sigint", - "parallel/test-vm-timeout", - "parallel/test-vm-sigint-existing-handler", - "message/assert_throws_stack", - "message/async_error_eval_esm", - "message/async_error_sync_esm", - "message/console", - "message/core_line_numbers", - "message/error_exit", - "message/esm_display_syntax_error", - "message/esm_display_syntax_error_import", - "message/esm_display_syntax_error_import_module", - "message/esm_display_syntax_error_module", - "message/eval_messages", - "message/events_unhandled_error_common_trace", - "message/events_unhandled_error_nexttick", - "message/events_unhandled_error_sameline", - "message/events_unhandled_error_subclass", - "message/if-error-has-good-stack", - "message/internal_assert", - "message/internal_assert_fail", - "message/promise_always_throw_unhandled", - "message/undefined_reference_in_new_context", - "message/unhandled_promise_trace_warnings", - "message/util_inspect_error", - "message/source_map_throw_catch", - "message/source_map_throw_first_tick", - "message/source_map_throw_set_immediate", - "message/v8_warning", - "message/vm_display_runtime_error", - "message/vm_display_syntax_error", - "message/vm_dont_display_runtime_error", - "message/vm_dont_display_syntax_error", - "pseudo-tty/console_colors", - "pseudo-tty/ref_keeps_node_running", - "pseudo-tty/test-async-wrap-getasyncid-tty", - "pseudo-tty/test-fatal-error", - "pseudo-tty/test-handle-wrap-isrefed-tty", - "pseudo-tty/test-set-raw-mode-reset", - "pseudo-tty/test-set-raw-mode-reset-process-exit", - "pseudo-tty/test-set-raw-mode-reset-signal", - "pseudo-tty/test-tty-color-support", - "pseudo-tty/test-tty-window-size", - "pseudo-tty/test-tty-wrap", - "parallel/test-source-map", "sequential/test-timers-block-eventloop", "sequential/test-timers-set-interval-excludes-callback-duration", + "sequential/test-tls-connect", + "sequential/test-vm-timeout-rethrow", "wpt/test-encoding" ] \ No newline at end of file