chore: bump chromium to f755b70e34659441e72c1a928a406 (master) (#21000)

patches/node/.patches

@@ -23,7 +23,6 @@ src_disable_node_use_v8_platform_in_node_options.patch
 build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
 refactor_allow_embedder_overriding_of_internal_fs_calls.patch
 chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch
-chore_allow_the_node_entrypoint_to_be_a_builtin_module.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
@@ -37,3 +36,4 @@ fix_windows_compilation_on_libuv_setsockopt.patch
 fix_don_t_use_node-controlled_preparestacktrace.patch
 fix_remove_uses_of_node_use_v8_platform.patch
 fix_call_initializecontextruntime_in_initializecontext.patch
+refactor_transferrablemodule_is_deprecated_use_compiledwasmmodule.patch

patches/node/build_add_gn_build_files.patch

@@ -1539,7 +1539,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 a61a186edd3c92d6f0bd760a9990b5c8ed57e6fa..e4963fdfd9b93a6f50a4f1035f63e95432dd8d8e 100644
+index b974af56853d28d2154f314f5ca9a38d19efc84c..57c846c81d511051cc56d3827609b12993e70240 100644
 --- a/src/node_version.h
 +++ b/src/node_version.h
 @@ -89,7 +89,10 @@

patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch

@@ -38,7 +38,7 @@ index fabaea75686161f488a03349e07049a513b98fad..5a6b01dc12fb77d5f8c26a1153ead2a1
  
    bool Exists(const char* id);
 diff --git a/tools/js2c.py b/tools/js2c.py
-index 7b3e90af88b873c32f8ed51712f7dfdff3c1c706..586d0f72dcb4215ce73c23b401bce7238ed5bb0d 100755
+index 752344d68c3f63b4c5e491b33d4576ed48f8b74f..a6f0805048e3c3f4dd81ce6e90b684c48e52b67c 100755
 --- a/tools/js2c.py
 +++ b/tools/js2c.py
 @@ -187,13 +187,15 @@ namespace native_module {{
@@ -79,7 +79,7 @@ index 7b3e90af88b873c32f8ed51712f7dfdff3c1c706..586d0f72dcb4215ce73c23b401bce723
    if split[0] == 'deps':
      split = ['internal'] + split
    else:  # `lib/**/*.js` so drop the 'lib' part
-@@ -273,9 +275,9 @@ def NormalizeFileName(filename):
+@@ -274,9 +276,9 @@ def NormalizeFileName(filename):
  
    return os.path.splitext(filename)[0]
  
@@ -91,7 +91,7 @@ index 7b3e90af88b873c32f8ed51712f7dfdff3c1c706..586d0f72dcb4215ce73c23b401bce723
  
    # Build source code lines
    definitions = []
-@@ -283,14 +285,26 @@ def JS2C(source_files, target):
+@@ -284,14 +286,26 @@ def JS2C(source_files, target):
  
    for filename in source_files['.js']:
      AddModule(filename, consts, macros, definitions, initializers)
@@ -122,7 +122,7 @@ index 7b3e90af88b873c32f8ed51712f7dfdff3c1c706..586d0f72dcb4215ce73c23b401bce723
    write_if_chaged(out, target)
  
  
-@@ -343,17 +357,21 @@ def main():
+@@ -344,17 +358,21 @@ def main():
    )
    parser.add_argument('--target', help='output file')
    parser.add_argument('--verbose', action='store_true', help='output file')

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 61892165999d92704e49d0748c5e1d3d4d9582b7..0ea488c944b8fc8e21064476180c2b417c6e1125 100644
+index 08781547c489526834609861c5a906ef5183936b..e60ad6b0d4c634a8b0990da6ca090ea48715b830 100644
 --- a/lib/internal/process/stdio.js
 +++ b/lib/internal/process/stdio.js
 @@ -192,6 +192,11 @@ function createWritableStdioStream(fd) {

patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <samuel.r.attard@gmail.com>
-Date: Mon, 3 Jun 2019 01:05:58 -0700
-Subject: chore: allow the node entrypoint to be a builtin module
-
-This floats two patches onto the node 12 branch that I don't think we can upstream.
-
-The default behavior of node is to `path.resolve(firstArg)` to figure out what JS file to load.  Issue here is that we use that for `browser/init.js` which now doesn't exist on disk.  This adds an exception that won't affect user code to allow node to boot-up internal modules (in this case anything in the `electron/js2c` scope.
-
-Similar to the above, the loader uses `process.argv[1]` to figure out when to break for `--inspect-brk` this updates the logic to use an Electron provided `process._firstFileName`
-
-diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 072e614fca05197fb2b259914711033981f6e2f2..dd7b6496e23efe0b73c6c9919c3780abeecdcec3 100644
---- a/lib/internal/bootstrap/pre_execution.js
-+++ b/lib/internal/bootstrap/pre_execution.js
-@@ -71,8 +71,10 @@ function patchProcessObject(expandArgv1) {
- 
-   if (expandArgv1 && process.argv[1] && !process.argv[1].startsWith('-')) {
-     // Expand process.argv[1] into a full path.
-+    if (!process.argv[1] || !process.argv[1].startsWith('electron/js2c')) {
-     const path = require('path');
-     process.argv[1] = path.resolve(process.argv[1]);
-+    }
-   }
- 
-   // 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 2a7ffbff213f23536b94664c3ecffa18eb812849..6e73d0b57a11620b1fcec8b9b716b66673438864 100644
---- a/lib/internal/modules/cjs/loader.js
-+++ b/lib/internal/modules/cjs/loader.js
-@@ -845,6 +845,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.
-+      // process._firstFileName is used by Embedders to tell node what
-+      // the first "real" file is when they use themselves as the entry
-+      // point
-+      if (process._firstFileName) {
-+        resolvedArgv = process._firstFileName
-+        delete process._firstFileName
-+      } else
-       if (process.argv[1]) {
-         resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
-       } else {

patches/node/chore_handle_default_configuration_not_being_set_in_the_electron_env.patch

@@ -5,7 +5,7 @@ Subject: chore: handle default_configuration not being set in the electron env
 
 
 diff --git a/test/common/index.js b/test/common/index.js
-index 13604d06e14a3612e4d161ebbdda10912a46d3b0..0f1398ed665b66d4fe7778a33ceab5176c086ff4 100644
+index 00ebd283a0c3e960de2a7c4e3748561c499eb820..2ebec24f9e1f53306882e827a17925201cad0ea6 100644
 --- a/test/common/index.js
 +++ b/test/common/index.js
 @@ -118,7 +118,7 @@ const enoughTestCpu = Array.isArray(cpus) &&

patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch

@@ -7,11 +7,44 @@ This should be updated to take advantage of https://github.com/nodejs/node/pull/
 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
+--- a/lib/internal/bootstrap/pre_execution.js
++++ b/lib/internal/bootstrap/pre_execution.js
+@@ -80,8 +80,10 @@ function patchProcessObject(expandArgv1) {
+ 
+   if (expandArgv1 && process.argv[1] && !process.argv[1].startsWith('-')) {
+     // Expand process.argv[1] into a full path.
++    if (!process.argv[1] || !process.argv[1].startsWith('electron/js2c')) {
+     const path = require('path');
+     process.argv[1] = path.resolve(process.argv[1]);
++    }
+   }
+ 
+   // 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
+--- a/lib/internal/modules/cjs/loader.js
++++ b/lib/internal/modules/cjs/loader.js
+@@ -933,6 +933,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.
++      // process._firstFileName is used by Embedders to tell node what
++      // the first "real" file is when they use themselves as the entry
++      // point
++      if (process._firstFileName) {
++        resolvedArgv = process._firstFileName
++        delete process._firstFileName
++      } else
+       if (process.argv[1]) {
+         resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
+       } else {
 diff --git a/src/env.h b/src/env.h
-index 2dd6bdb75f02e2ccb07129996d16df99c0c4ccf2..ecb845803776f5ff6e7eec712ec7a5ebea2e8d0a 100644
+index 8e12764ea3a9a3d4441b276fdf9db9fce7109f72..1df2907fe0bc8a4a2bee3c569bfa535465d9f289 100644
 --- a/src/env.h
 +++ b/src/env.h
-@@ -884,6 +884,15 @@ class Environment : public MemoryRetainer {
+@@ -912,6 +912,15 @@ class Environment : public MemoryRetainer {
                uint64_t thread_id = kNoThreadId);
    ~Environment();
  
@@ -27,7 +60,7 @@ index 2dd6bdb75f02e2ccb07129996d16df99c0c4ccf2..ecb845803776f5ff6e7eec712ec7a5eb
    void InitializeLibuv(bool start_profiler_idle_notifier);
    inline const std::vector<std::string>& exec_argv();
    inline const std::vector<std::string>& argv();
-@@ -1234,6 +1243,9 @@ class Environment : public MemoryRetainer {
+@@ -1266,6 +1275,9 @@ class Environment : public MemoryRetainer {
    inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>),
                           const char* errmsg);
  
@@ -38,10 +71,10 @@ index 2dd6bdb75f02e2ccb07129996d16df99c0c4ccf2..ecb845803776f5ff6e7eec712ec7a5eb
    v8::Isolate* const isolate_;
    IsolateData* const isolate_data_;
 diff --git a/src/node_binding.cc b/src/node_binding.cc
-index c51a892e1bcd3df6ea8af952c8200975c7f4ac7e..9a4a7780f4ac1bcc0855cc9e3eed904d5a0b4254 100644
+index 3a5ea646fc68d88cb045380c3401812dff590496..12255167f0f38ec856339dd86d95171a56d61553 100644
 --- a/src/node_binding.cc
 +++ b/src/node_binding.cc
-@@ -2,6 +2,7 @@
+@@ -3,6 +3,7 @@
  #include <atomic>
  #include "env-inl.h"
  #include "node_native_module_env.h"
@@ -49,7 +82,7 @@ index c51a892e1bcd3df6ea8af952c8200975c7f4ac7e..9a4a7780f4ac1bcc0855cc9e3eed904d
  #include "util.h"
  
  #if HAVE_OPENSSL
-@@ -466,10 +466,12 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
+@@ -466,10 +467,12 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
  
      if (mp != nullptr) {
        if (mp->nm_context_register_func == nullptr) {
@@ -64,4 +97,3 @@ index c51a892e1bcd3df6ea8af952c8200975c7f4ac7e..9a4a7780f4ac1bcc0855cc9e3eed904d
          }
        }
        mp->nm_dso_handle = dlib->handle_;
- 

patches/node/chore_read_nobrowserglobals_from_global_not_process.patch

@@ -7,10 +7,10 @@ This is used so that we can modify the flag at runtime where
 config can only be set at compile time.
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index 48a38a6b5054c6bf14df82a8cb3c41d4bfb7bf68..a68e91171928ac3248a097bd6c58c9ae8c350f1a 100644
+index 0f36697ce5ed0b5bb6df74ceca219574da7eea53..a7fc05a247bfcd2b6da048c9def3b78025bd43fe 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
-@@ -169,7 +169,7 @@ const {
+@@ -167,7 +167,7 @@ const {
    queueMicrotask
  } = require('internal/process/task_queues');
  

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 443f49320b2e6720f932fcfcefdbe6e539594964..4d79af9ec2a7b476c5f86f3882f4fb63afafc53e 100644
+index ae26cb7e9ef55fc0b965e28de4686aec87f42522..50886f4a998f1e7f346a6b7fad91ce49c3a7cdff 100644
 --- a/src/api/environment.cc
 +++ b/src/api/environment.cc
 @@ -263,7 +263,8 @@ Environment* CreateEnvironment(IsolateData* isolate_data,
@@ -53,10 +53,10 @@ index 443f49320b2e6720f932fcfcefdbe6e539594964..4d79af9ec2a7b476c5f86f3882f4fb63
  
  void FreeEnvironment(Environment* env) {
 diff --git a/src/node.h b/src/node.h
-index c51fb1a6a6e497a091e2ba0b147e3d7b6a4d685c..211f00cca65eeba317a03af36411a19a6befae18 100644
+index 80a27dc734a81a7ca8d888d1d55fc8d24a536280..9c6dcbf7014f7cf87f7f66886cbf255978c244fa 100644
 --- a/src/node.h
 +++ b/src/node.h
-@@ -330,7 +330,9 @@ NODE_EXTERN Environment* CreateEnvironment(IsolateData* isolate_data,
+@@ -326,7 +326,9 @@ NODE_EXTERN Environment* CreateEnvironment(IsolateData* isolate_data,
                                             int argc,
                                             const char* const* argv,
                                             int exec_argc,

patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch

@@ -24,7 +24,7 @@ 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 257bf78519f32d690ea9cd5b9e21d3d863801c33..89e940cdc478df8a3be7738106a1c739542a7430 100644
+index 2400785ea82fe4e975d222214161a417d2e6c002..069cd137b35e748dd45e5c720ec71d4fe274562b 100644
 --- a/src/env.cc
 +++ b/src/env.cc
 @@ -383,6 +383,12 @@ Environment::Environment(IsolateData* isolate_data,
@@ -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 f78c76023bb667031b46e5fac80028bc5fd5374c..42ad1a5aba3fb57e27a07689768fd0dc8dd37d6d 100644
+index 13d71d41398545963139e61488474e23fa0ebeea..2baf51c3181fe2d390246f655ad35c3aac51f229 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -203,6 +203,9 @@ namespace node {

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 f97801cec2f41b104fae591277ffbb94c3b2f299..da648b3efd5948843c485d65035ae29c79eebc69 100644
+index ee45bcaefce1d3684df90c0342b1ff9f89c94544..a73396b2e74eecb01e6abed755875dde6760d3d6 100644
 --- a/deps/uv/include/uv.h
 +++ b/deps/uv/include/uv.h
-@@ -1657,6 +1657,8 @@ union uv_any_req {
+@@ -1693,6 +1693,8 @@ union uv_any_req {
  struct uv_loop_s {
    /* User data - use this for whatever. */
    void* data;
@@ -19,10 +19,10 @@ index f97801cec2f41b104fae591277ffbb94c3b2f299..da648b3efd5948843c485d65035ae29c
    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 202c75bbb5e94cb2e8a588b09d4fbfdfe1ccfe3a..041b1838c629ec828f2160ac735953f1bf986c01 100644
+index 366c43c2ab08437a6af6bf15f24563bcc6cb40e1..517ca26c39fbcb63f17bca5a0658bda18bc15921 100644
 --- a/deps/uv/src/unix/core.c
 +++ b/deps/uv/src/unix/core.c
-@@ -892,8 +892,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
+@@ -897,8 +897,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
      return;
  #endif
  
@@ -35,7 +35,7 @@ index 202c75bbb5e94cb2e8a588b09d4fbfdfe1ccfe3a..041b1838c629ec828f2160ac735953f1
  
    if (loop->watchers[w->fd] == NULL) {
      loop->watchers[w->fd] = w;
-@@ -929,8 +932,11 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
+@@ -934,8 +937,11 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
        w->events = 0;
      }
    }
@@ -48,7 +48,7 @@ index 202c75bbb5e94cb2e8a588b09d4fbfdfe1ccfe3a..041b1838c629ec828f2160ac735953f1
  }
  
  
-@@ -947,6 +953,8 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) {
+@@ -952,6 +958,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);

patches/node/feat_initialize_asar_support.patch

@@ -6,10 +6,10 @@ Subject: feat: initialize asar support
 This patch initializies asar support in Node.js.
 
 diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
-index 2889df4812bb031f1a0debe1eb0b75bd6c846407..0b3b92b33490fe754788a94dedce7533de528acf 100644
+index 0cad5209c4ff4e68d7c400af1d2b4c234210ddb4..918bc8c0c4e78bad5a3372e8a5522da00aa9073e 100644
 --- a/lib/internal/bootstrap/loaders.js
 +++ b/lib/internal/bootstrap/loaders.js
-@@ -189,6 +189,8 @@ function nativeModuleRequire(id) {
+@@ -192,6 +192,8 @@ function nativeModuleRequire(id) {
    return mod.compile();
  }
  
@@ -19,10 +19,10 @@ index 2889df4812bb031f1a0debe1eb0b75bd6c846407..0b3b92b33490fe754788a94dedce7533
    return NativeModule.map.has(id);
  };
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 158e9b73fa..8773e37c5c 100644
+index f959310156141623c2acc9e4d8bdad433d401925..113d2e58a9cecf233bf6a60138cdfc60f338b28c 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -52,6 +52,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
+@@ -61,6 +61,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
    initializeESMLoader();
    loadPreloadModules();
    initializeFrozenIntrinsics();
@@ -30,7 +30,7 @@ index 158e9b73fa..8773e37c5c 100644
  }
  
  function patchProcessObject(expandArgv1) {
-@@ -420,6 +421,10 @@ function loadPreloadModules() {
+@@ -444,6 +445,10 @@ function loadPreloadModules() {
    }
  }
  

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 b86e5e05d7df9ad472f16735448a53f433620eef..f07e65f719a1a5939997dfcae7bc787ee6391f4d 100644
+index 6501f78796fd17503f5ff9cd3a52cbfa688c2814..bde7d7300f44596abe5cdfac0639ecb1bb4d885f 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -77,6 +77,22 @@

patches/node/fix_build_and_expose_inspector_agent.patch

@@ -6,7 +6,7 @@ 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 2965483dea6244e7123c08c104f399fc023a84e0..b6624300e96daf6041a296fdc1ceeaf579e215cd 100644
+index cf0110144a535dcc7e691650d015da6715179d7e..edb27e4650b1e98b5a5f7765c60e0dd45e7956f0 100644
 --- a/src/inspector_agent.cc
 +++ b/src/inspector_agent.cc
 @@ -217,7 +217,7 @@ const int CONTEXT_GROUP_ID = 1;
@@ -28,7 +28,7 @@ index 2965483dea6244e7123c08c104f399fc023a84e0..b6624300e96daf6041a296fdc1ceeaf5
      info.is_default = true;
      contextCreated(env->context(), info);
 diff --git a/src/inspector_agent.h b/src/inspector_agent.h
-index 4fb544f85bd1453d0705088dfb5511ae32bacad2..ac9352e3fa953e2f4ac0a032c2aacd7353c2cf71 100644
+index d5088a1b5469044a3f694522c547c901d7cd91f8..19bdf7e6e7e8df944eb76e52e63957dc4cffdab8 100644
 --- a/src/inspector_agent.h
 +++ b/src/inspector_agent.h
 @@ -6,7 +6,9 @@

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 f4dc3d7df5a33ce92ca52e901283db5aa9f143b4..b9d6108c5db800465e6c7156ad1c28002c33261b 100644
+index c0c15a88c028d9c70081aa75fabf63d1d78014e6..03919d450b3373983d647165ee93c006eb5f2902 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
 @@ -26,6 +26,12 @@ Mutex cli_options_mutex;
@@ -32,7 +32,7 @@ index f4dc3d7df5a33ce92ca52e901283db5aa9f143b4..b9d6108c5db800465e6c7156ad1c2800
  #if !NODE_USE_V8_PLATFORM
    if (inspector_enabled) {
 diff --git a/src/node_options.h b/src/node_options.h
-index 5fb23cfda7aebca507174555b78c9a73e837dda0..ce86827024126c6b0d8462c811360057c298ec5b 100644
+index 40c19ea6ff4d98a1a1da59bca76087209445af81..4ce5551284bb5b1b4194905a9fe619f852933405 100644
 --- a/src/node_options.h
 +++ b/src/node_options.h
 @@ -61,11 +61,11 @@ struct InspectPublishUid {

patches/node/fix_don_t_create_console_window_when_creating_process.patch

@@ -6,7 +6,7 @@ Subject: fix: don't create console window when creating process
 This commit prevents console windows from being spawned when creating processes to better align with what Windows users expect and should be removed when upgrading to a version that includes https://github.com/nodejs/node/pull/21316
 
 diff --git a/deps/uv/src/win/process.c b/deps/uv/src/win/process.c
-index f9c53de0af007961b0d269651d368fd83717976a..fa1a76a2e6626e15bdd0681626fc82c9ca6907fe 100644
+index 9b7fdc1dc1b4e2b9e16e053d1aca36ef5221c460..e1010d1248a95a3927d6ed1a1affbb545c1d7201 100644
 --- a/deps/uv/src/win/process.c
 +++ b/deps/uv/src/win/process.c
 @@ -1099,6 +1099,9 @@ int uv_spawn(uv_loop_t* loop,

patches/node/fix_export_debugoptions.patch

@@ -5,10 +5,10 @@ Subject: fix: export DebugOptions
 
 
 diff --git a/src/node_options.cc b/src/node_options.cc
-index e2a39626b69fd3380febc258fb25efc0cea2a08e..f4dc3d7df5a33ce92ca52e901283db5aa9f143b4 100644
+index d53ab2a4bfe87321e899b431eac262223e532335..c0c15a88c028d9c70081aa75fabf63d1d78014e6 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
-@@ -204,11 +204,6 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
+@@ -210,11 +210,6 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
  
  namespace options_parser {
  
@@ -21,7 +21,7 @@ index e2a39626b69fd3380febc258fb25efc0cea2a08e..f4dc3d7df5a33ce92ca52e901283db5a
   public:
    EnvironmentOptionsParser();
 diff --git a/src/node_options.h b/src/node_options.h
-index dbd85b2d584be57619fc5c8d019140f67514f427..5fb23cfda7aebca507174555b78c9a73e837dda0 100644
+index 8937bfd9011e4795d22e232886e18183d698b8d4..40c19ea6ff4d98a1a1da59bca76087209445af81 100644
 --- a/src/node_options.h
 +++ b/src/node_options.h
 @@ -59,7 +59,7 @@ struct InspectPublishUid {
@@ -33,7 +33,7 @@ index dbd85b2d584be57619fc5c8d019140f67514f427..5fb23cfda7aebca507174555b78c9a73
   public:
    DebugOptions() = default;
    DebugOptions(const DebugOptions&) = default;
-@@ -240,7 +240,7 @@ class PerProcessOptions : public Options {
+@@ -244,7 +244,7 @@ class PerProcessOptions : public Options {
  
  namespace options_parser {
  
@@ -42,7 +42,7 @@ index dbd85b2d584be57619fc5c8d019140f67514f427..5fb23cfda7aebca507174555b78c9a73
      std::vector<std::string>* errors);
  void GetOptions(const v8::FunctionCallbackInfo<v8::Value>& args);
  
-@@ -433,6 +433,11 @@ class OptionsParser {
+@@ -437,6 +437,11 @@ class OptionsParser {
    friend void GetOptions(const v8::FunctionCallbackInfo<v8::Value>& args);
  };
  

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 621ed0225ba674bc31656ec628ee2b376a4f900c..2311036beadf7efaac4999ceef985566fe41c763 100644
+index 85d2c5c1f18db01d64f8285720f6624f15aa2436..fb1188a6bbce37b2bbaba0a815f2826dca60cf3b 100644
 --- a/src/node_internals.h
 +++ b/src/node_internals.h
-@@ -198,7 +198,7 @@ v8::MaybeLocal<v8::Value> InternalMakeCallback(
+@@ -200,7 +200,7 @@ v8::MaybeLocal<v8::Value> InternalMakeCallback(
      v8::Local<v8::Value> argv[],
      async_context asyncContext);
  

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 ac1e513967310aefa50100843c643c788ab5157c..35e8666ef771c56a1bcd441c99d4483a0d3e90bf 100644
+index 2c0fe1306319b25c378d0aae73e4045560a9b683..ae26cb7e9ef55fc0b965e28de4686aec87f42522 100644
 --- a/src/api/environment.cc
 +++ b/src/api/environment.cc
 @@ -314,6 +314,10 @@ MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform() {
@@ -20,7 +20,7 @@ index ac1e513967310aefa50100843c643c788ab5157c..35e8666ef771c56a1bcd441c99d4483a
      int thread_pool_size,
      node::tracing::TracingController* tracing_controller) {
 diff --git a/src/node.h b/src/node.h
-index 42ad1a5aba3fb57e27a07689768fd0dc8dd37d6d..a2b47d1cf984ec36994b477b371cdf262191ab9c 100644
+index 2baf51c3181fe2d390246f655ad35c3aac51f229..80a27dc734a81a7ca8d888d1d55fc8d24a536280 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -108,6 +108,7 @@ namespace node {
@@ -31,7 +31,7 @@ index 42ad1a5aba3fb57e27a07689768fd0dc8dd37d6d..a2b47d1cf984ec36994b477b371cdf26
  class TracingController;
  
  }
-@@ -334,6 +335,8 @@ NODE_EXTERN Environment* GetCurrentEnvironment(v8::Local<v8::Context> context);
+@@ -338,6 +339,8 @@ NODE_EXTERN Environment* GetCurrentEnvironment(v8::Local<v8::Context> context);
  // it returns nullptr.
  NODE_EXTERN MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform();
  

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 bca482cc9724fef680196a192a6bbd7b4d2e4fde..1cc2372fe2e385e9a9db27e38f0da61d62de2e81 100644
+index 2d539094a0589e9945bf2f27fa8a8afce47031b0..2c702d2f051d6b8f59ac53a4e2729ee02ba98a47 100644
 --- a/src/node_crypto.cc
 +++ b/src/node_crypto.cc
 @@ -290,24 +290,14 @@ Maybe<bool> Decorate(Environment* env, Local<Object> obj,
@@ -34,7 +34,7 @@ index bca482cc9724fef680196a192a6bbd7b4d2e4fde..1cc2372fe2e385e9a9db27e38f0da61d
      V(USER)                                                                   \
  
  #define V(name) case ERR_LIB_##name: lib = #name "_"; break;
-@@ -2487,8 +2477,11 @@ void SSLWrap<Base>::GetEphemeralKeyInfo(
+@@ -2557,8 +2547,11 @@ void SSLWrap<Base>::GetEphemeralKeyInfo(
              .Check();
          break;
        case EVP_PKEY_EC:
@@ -46,7 +46,7 @@ index bca482cc9724fef680196a192a6bbd7b4d2e4fde..1cc2372fe2e385e9a9db27e38f0da61d
          {
            const char* curve_name;
            if (kid == EVP_PKEY_EC) {
-@@ -3742,12 +3735,15 @@ Local<Value> KeyObject::GetAsymmetricKeyType() const {
+@@ -3894,12 +3887,15 @@ Local<Value> KeyObject::GetAsymmetricKeyType() const {
      return env()->crypto_ec_string();
    case EVP_PKEY_ED25519:
      return env()->crypto_ed25519_string();
@@ -62,7 +62,7 @@ index bca482cc9724fef680196a192a6bbd7b4d2e4fde..1cc2372fe2e385e9a9db27e38f0da61d
    default:
      return Undefined(env()->isolate());
    }
-@@ -6240,6 +6236,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
+@@ -6402,6 +6398,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
      if (EVP_PKEY_paramgen_init(param_ctx.get()) <= 0)
        return nullptr;
  
@@ -71,7 +71,7 @@ index bca482cc9724fef680196a192a6bbd7b4d2e4fde..1cc2372fe2e385e9a9db27e38f0da61d
      if (EVP_PKEY_CTX_set_dsa_paramgen_bits(param_ctx.get(), modulus_bits_) <= 0)
        return nullptr;
  
-@@ -6259,6 +6257,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
+@@ -6421,6 +6419,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
  
      EVPKeyCtxPointer key_ctx(EVP_PKEY_CTX_new(params.get(), nullptr));
      return key_ctx;
@@ -80,7 +80,7 @@ index bca482cc9724fef680196a192a6bbd7b4d2e4fde..1cc2372fe2e385e9a9db27e38f0da61d
    }
  
   private:
-@@ -6950,9 +6950,12 @@ void Initialize(Local<Object> target,
+@@ -7112,9 +7112,12 @@ void Initialize(Local<Object> target,
    env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC);
    env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid);
    NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED25519);

patches/node/fix_remove_uses_of_node_use_v8_platform.patch

@@ -11,10 +11,10 @@ test/parallel/test-inspector-connect-main-thread.js.
 Upstreamed at https://github.com/nodejs/node/pull/30029.
 
 diff --git a/src/env.h b/src/env.h
-index 5b8465c8ba5335c8706b54dcf6e4ed46af31bcf0..d83fc3ab8d997e8044c5ee5ef12dcba3c44bb1a1 100644
+index 1df2907fe0bc8a4a2bee3c569bfa535465d9f289..084833e467fb815adbd7ee39c2cfd2e79ba96f62 100644
 --- a/src/env.h
 +++ b/src/env.h
-@@ -868,7 +868,7 @@ class Environment : public MemoryRetainer {
+@@ -869,7 +869,7 @@ class Environment : public MemoryRetainer {
    void CreateProperties();
    // Should be called before InitializeInspector()
    void InitializeDiagnostics();

patches/node/fix_windows_compilation_on_libuv_setsockopt.patch

@@ -7,7 +7,7 @@ Upstreamed in https://github.com/libuv/libuv/pull/2520.
 This patch should be removed when Node.js rolls onto libuv v1.33.0.
 
 diff --git a/deps/uv/src/win/tcp.c b/deps/uv/src/win/tcp.c
-index 81e48136a3b9ef13b1b95d87a68ab3ba98f9aeb9..41f8fcbe8361dc7c7a145b38094745cb0fcfa350 100644
+index 81e48136a3b9ef13b1b95d87a68ab3ba98f9aeb9..fd34c623d8c543a01b70a17184b09bb4e29081eb 100644
 --- a/deps/uv/src/win/tcp.c
 +++ b/deps/uv/src/win/tcp.c
 @@ -556,7 +556,7 @@ int uv_tcp_close_reset(uv_tcp_t* handle, uv_close_cb close_cb) {

patches/node/fixme_comment_trace_event_macro.patch

@@ -5,10 +5,10 @@ Subject: fixme: Comment trace event macro
 
 
 diff --git a/src/node_internals.h b/src/node_internals.h
-index 2311036beadf7efaac4999ceef985566fe41c763..10fbbc1d8cf43f76248efdac9a2539a8c8287d71 100644
+index fb1188a6bbce37b2bbaba0a815f2826dca60cf3b..843cbf1d253022c9601ceaf74022873a48ac0a5f 100644
 --- a/src/node_internals.h
 +++ b/src/node_internals.h
-@@ -348,10 +348,11 @@ class TraceEventScope {
+@@ -350,10 +350,11 @@ class TraceEventScope {
    TraceEventScope(const char* category,
                    const char* name,
                    void* id) : category_(category), name_(name), id_(id) {

patches/node/fixme_remove_async_id_assertion_check.patch

@@ -5,10 +5,10 @@ Subject: FIXME: remove async_id assertion check
 
 
 diff --git a/src/api/callback.cc b/src/api/callback.cc
-index 52a8da35b671d196331b858ba46be04aecf1e0be..43ccfafd9f2c85e23a9ea6277e88e4864e287905 100644
+index e6098d5921a038063bf8255f8af6f000becf76a0..3c518870c9c8d92f3dfcd6c270f5e023e3b69633 100644
 --- a/src/api/callback.cc
 +++ b/src/api/callback.cc
-@@ -103,12 +103,14 @@ void InternalCallbackScope::Close() {
+@@ -104,12 +104,14 @@ void InternalCallbackScope::Close() {
      MicrotasksScope::PerformCheckpoint(env_->isolate());
    }
  

patches/node/fixme_use_redefined_version_of_internalmodulestat.patch

@@ -9,10 +9,10 @@ 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 437546e38ad30c518dce45f2f9ab104bdffbbe38..adb6dffa8f89035078c6e5b8a975c4874a5b0eb8 100644
+index 481d59594dbca27c8529a8b424ab3cb190dd8def..03247551074e1ad3cdd412e6adc0d865746225d1 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -117,6 +117,8 @@ function enrichCJSError(err) {
+@@ -120,6 +120,8 @@ function enrichCJSError(err) {
  }
  
  function stat(filename) {

patches/node/fsevents-regression-in-watching.patch

@@ -1,7 +1,10 @@
-From ae12376dbb56fa080b699f00840c7b9c5230a85f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jameson Nash <vtjnash@gmail.com>
 Date: Sat, 7 Sep 2019 20:45:39 -0400
-Subject: [PATCH] fsevents: regression in watching /
+Subject: fsevents: regression in watching /
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 This case got lost by accident in
 https://github.com/libuv/libuv/pull/2082,
@@ -13,7 +16,7 @@ Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
 Reviewed-By: Saúl Ibarra Corretgé <s@saghul.net>
 
 diff --git a/deps/uv/src/unix/fsevents.c b/deps/uv/src/unix/fsevents.c
-index ddacda31..deeaa63d 100644
+index ddacda31fef87eee131fc2ee2ff46cc88be429d9..deeaa63d4730de9aa17ee87923acd96d6507a55d 100644
 --- a/deps/uv/src/unix/fsevents.c
 +++ b/deps/uv/src/unix/fsevents.c
 @@ -263,10 +263,12 @@ static void uv__fsevents_event_cb(ConstFSEventStreamRef streamRef,
@@ -32,7 +35,7 @@ index ddacda31..deeaa63d 100644
  
        if (memcmp(path, handle->realpath, handle->realpath_len) != 0)
 diff --git a/deps/uv/test/test-fs-event.c b/deps/uv/test/test-fs-event.c
-index 4b8bb1ef..7725c3af 100644
+index 4b8bb1ef03e54407cba8eef85179039632cc3f28..7725c3af94edd5d62bb960912262d38aefa6676e 100644
 --- a/deps/uv/test/test-fs-event.c
 +++ b/deps/uv/test/test-fs-event.c
 @@ -47,6 +47,7 @@ static const char file_prefix[] = "fsevent-";

patches/node/fsevents-stop-using-fsevents-to-watch-files.patch

@@ -1,7 +1,10 @@
-From 97b85e8b75b8f3df774b6e008dbaa143daa412b7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jameson Nash <vtjnash@gmail.com>
 Date: Sat, 7 Sep 2019 14:55:40 -0400
-Subject: [PATCH] fsevents: stop using fsevents to watch files
+Subject: fsevents: stop using fsevents to watch files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Goes back to just using it to watch folders,
 but keeps the other logic changes around.
@@ -17,7 +20,7 @@ Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
 Reviewed-By: Saúl Ibarra Corretgé <s@saghul.net>
 
 diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
-index c04e7a48..ad09f403 100644
+index c04e7a485cf992beec501144e04ff068c17b9494..ad09f4031318cafe08faed3f0a6373e2bb598672 100644
 --- a/deps/uv/src/unix/kqueue.c
 +++ b/deps/uv/src/unix/kqueue.c
 @@ -454,10 +454,26 @@ int uv_fs_event_start(uv_fs_event_t* handle,
@@ -102,7 +105,7 @@ index c04e7a48..ad09f403 100644
  #endif
  
 diff --git a/deps/uv/test/test-fs-event.c b/deps/uv/test/test-fs-event.c
-index ea34bd63..4b8bb1ef 100644
+index ea34bd63a70625c3e2c60d5a1bbb087c5f0bbb2e..4b8bb1ef03e54407cba8eef85179039632cc3f28 100644
 --- a/deps/uv/test/test-fs-event.c
 +++ b/deps/uv/test/test-fs-event.c
 @@ -656,6 +656,12 @@ TEST_IMPL(fs_event_watch_file_current_dir) {

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 95724d4c27f12e4f9c90f70b20d3d7fad3e9f035..2a1a412fe7c55b8046b19860005e89a52ee3b816 100644
+index 2d058b7e0dace3084d068f3e88dffbe93a67390d..a1c6db94e49fb2f13c68dc503481beb3decf5cf4 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -1008,8 +1008,8 @@ Module._initPaths = function() {
+@@ -1102,8 +1102,8 @@ Module._initPaths = function() {
  
    modulePaths = paths;
  

patches/node/pass_all_globals_through_require.patch

@@ -6,10 +6,10 @@ 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 2a1a412fe7c55b8046b19860005e89a52ee3b816..70da676a40feeaa82d3a0ccd1c17882ab5d6edf3 100644
+index a1c6db94e49fb2f13c68dc503481beb3decf5cf4..481d59594dbca27c8529a8b424ab3cb190dd8def 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -79,6 +79,13 @@ const {
+@@ -83,6 +83,13 @@ const {
    CHAR_COLON
  } = require('internal/constants');
  
@@ -23,7 +23,7 @@ index 2a1a412fe7c55b8046b19860005e89a52ee3b816..70da676a40feeaa82d3a0ccd1c17882a
  const isWindows = process.platform === 'win32';
  
  const relativeResolveCache = Object.create(null);
-@@ -863,10 +870,12 @@ Module.prototype._compile = function(content, filename) {
+@@ -951,10 +958,12 @@ Module.prototype._compile = function(content, filename) {
    if (requireDepth === 0) statCache = new Map();
    if (inspectorWrapper) {
      result = inspectorWrapper(compiledWrapper, thisValue, exports,

patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch

@@ -5,10 +5,10 @@ Subject: refactor: allow embedder overriding of internal FS calls
 
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index 86b2164bb0d74a531acd0f01da5269642ea574cf..48a38a6b5054c6bf14df82a8cb3c41d4bfb7bf68 100644
+index 18acd9d2b64774efdb9261e69923a5ba320a7f0e..0f36697ce5ed0b5bb6df74ceca219574da7eea53 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
-@@ -65,6 +65,10 @@ if (ownsProcessState) {
+@@ -63,6 +63,10 @@ if (ownsProcessState) {
    );
  }
  
@@ -20,10 +20,10 @@ index 86b2164bb0d74a531acd0f01da5269642ea574cf..48a38a6b5054c6bf14df82a8cb3c41d4
  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 ffc7fb6fd5857b807198d4d26b7b899e63cde4a1..2a7ffbff213f23536b94664c3ecffa18eb812849 100644
+index 03247551074e1ad3cdd412e6adc0d865746225d1..18fdf148ccca5d92f10b78144eee39bdff7919d2 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -37,10 +37,7 @@ const assert = require('internal/assert');
+@@ -42,10 +42,7 @@ const assert = require('internal/assert');
  const fs = require('fs');
  const internalFS = require('internal/fs/utils');
  const path = require('path');
@@ -35,7 +35,7 @@ index ffc7fb6fd5857b807198d4d26b7b899e63cde4a1..2a7ffbff213f23536b94664c3ecffa18
  const { safeGetenv } = internalBinding('credentials');
  const {
    makeRequireFunction,
-@@ -117,14 +117,12 @@ const relativeResolveCache = Object.create(null);
+@@ -120,14 +117,12 @@ function enrichCJSError(err) {
  }
  
  function stat(filename) {
@@ -51,7 +51,7 @@ index ffc7fb6fd5857b807198d4d26b7b899e63cde4a1..2a7ffbff213f23536b94664c3ecffa18
    if (statCache !== null) statCache.set(filename, result);
    return result;
  }
-@@ -233,7 +233,7 @@ function readPackage(requestPath) {
+@@ -233,7 +228,7 @@ function readPackage(requestPath) {
    const existing = packageJsonCache.get(jsonPath);
    if (existing !== undefined) return existing;
  

patches/node/refactor_transferrablemodule_is_deprecated_use_compiledwasmmodule.patch

@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Mon, 2 Dec 2019 17:25:38 -0800
+Subject: refactor: TransferrableModule is deprecated, use CompiledWasmModule
+ instead
+
+This will be upstreamed to nodejs/node
+
+diff --git a/src/node_messaging.cc b/src/node_messaging.cc
+index 19065fdb7d1be5adb0f521dd27df08e5263fa40d..de92a9cc3d8cb57c2ce2a315f868b01ea9aba368 100644
+--- a/src/node_messaging.cc
++++ b/src/node_messaging.cc
+@@ -58,7 +58,7 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
+       Environment* env,
+       const std::vector<MessagePort*>& message_ports,
+       const std::vector<Local<SharedArrayBuffer>>& shared_array_buffers,
+-      const std::vector<WasmModuleObject::TransferrableModule>& wasm_modules)
++      const std::vector<v8::CompiledWasmModule>& wasm_modules)
+       : message_ports_(message_ports),
+         shared_array_buffers_(shared_array_buffers),
+         wasm_modules_(wasm_modules) {}
+@@ -82,7 +82,7 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
+   MaybeLocal<WasmModuleObject> GetWasmModuleFromId(
+       Isolate* isolate, uint32_t transfer_id) override {
+     CHECK_LE(transfer_id, wasm_modules_.size());
+-    return WasmModuleObject::FromTransferrableModule(
++    return WasmModuleObject::FromCompiledModule(
+         isolate, wasm_modules_[transfer_id]);
+   }
+ 
+@@ -91,7 +91,7 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
+  private:
+   const std::vector<MessagePort*>& message_ports_;
+   const std::vector<Local<SharedArrayBuffer>>& shared_array_buffers_;
+-  const std::vector<WasmModuleObject::TransferrableModule>& wasm_modules_;
++  const std::vector<v8::CompiledWasmModule>& wasm_modules_;
+ };
+ 
+ }  // anonymous namespace
+@@ -181,7 +181,7 @@ void Message::AddMessagePort(std::unique_ptr<MessagePortData>&& data) {
+   message_ports_.emplace_back(std::move(data));
+ }
+ 
+-uint32_t Message::AddWASMModule(WasmModuleObject::TransferrableModule&& mod) {
++uint32_t Message::AddWASMModule(v8::CompiledWasmModule&& mod) {
+   wasm_modules_.emplace_back(std::move(mod));
+   return wasm_modules_.size() - 1;
+ }
+@@ -264,7 +264,7 @@ class SerializerDelegate : public ValueSerializer::Delegate {
+ 
+   Maybe<uint32_t> GetWasmModuleTransferId(
+       Isolate* isolate, Local<WasmModuleObject> module) override {
+-    return Just(msg_->AddWASMModule(module->GetTransferrableModule()));
++    return Just(msg_->AddWASMModule(module->GetCompiledModule()));
+   }
+ 
+   void Finish() {
+diff --git a/src/node_messaging.h b/src/node_messaging.h
+index 054521b0563c4256f65d6f01eeeb108e3a515d86..53c766da554452c635a3bdfb38b75c0492bbfb5e 100644
+--- a/src/node_messaging.h
++++ b/src/node_messaging.h
+@@ -58,7 +58,7 @@ class Message : public MemoryRetainer {
+   void AddMessagePort(std::unique_ptr<MessagePortData>&& data);
+   // Internal method of Message that is called when a new WebAssembly.Module
+   // object is encountered in the incoming value's structure.
+-  uint32_t AddWASMModule(v8::WasmModuleObject::TransferrableModule&& mod);
++  uint32_t AddWASMModule(v8::CompiledWasmModule&& mod);
+ 
+   // The MessagePorts that will be transferred, as recorded by Serialize().
+   // Used for warning user about posting the target MessagePort to itself,
+@@ -77,7 +77,7 @@ class Message : public MemoryRetainer {
+   std::vector<MallocedBuffer<char>> array_buffer_contents_;
+   std::vector<SharedArrayBufferMetadataReference> shared_array_buffers_;
+   std::vector<std::unique_ptr<MessagePortData>> message_ports_;
+-  std::vector<v8::WasmModuleObject::TransferrableModule> wasm_modules_;
++  std::vector<v8::CompiledWasmModule> wasm_modules_;
+ 
+   friend class MessagePort;
+ };

patches/node/revert_crypto_add_oaeplabel_option.patch

@@ -4,14 +4,14 @@ Date: Tue, 15 Oct 2019 11:30:27 -0700
 Subject: Revert "crypto: add oaepLabel option"
 
 This partially reverts https://github.com/nodejs/node/pull/29489.
-The BoringSSL incompatibilities (OPENSSL_memdup) will be shimmed in and this should 
+The BoringSSL incompatibilities (OPENSSL_memdup) will be shimmed in and this should
 be removed when the associated update is rolled into Chromium.
 
 diff --git a/src/node_crypto.cc b/src/node_crypto.cc
-index 63dd6a1863..1ca4c75d64 100644
+index d7eff663a5d7465d33f53930868edca6cb89bf49..863b48c614b331fa93a511b21b997891159bb86e 100644
 --- a/src/node_crypto.cc
 +++ b/src/node_crypto.cc
-@@ -5188,17 +5188,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
+@@ -5264,17 +5264,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
        return false;
    }
  

patches/node/revert_tls_add_option_to_override_signature_algorithms.patch

@@ -8,7 +8,7 @@ Upstreamed at https://boringssl-review.googlesource.com/c/boringssl/+/38404
 and can be removed when that is merged and rolled into Chromium.
 
 diff --git a/src/node_crypto.cc b/src/node_crypto.cc
-index 870456216983c2685c53580e60c44aa4dd3f7267..63dd6a186366baad660ee8e38401ba842c6ddb17 100644
+index 2c702d2f051d6b8f59ac53a4e2729ee02ba98a47..d7eff663a5d7465d33f53930868edca6cb89bf49 100644
 --- a/src/node_crypto.cc
 +++ b/src/node_crypto.cc
 @@ -470,7 +470,6 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {
@@ -141,7 +141,7 @@ index 870456216983c2685c53580e60c44aa4dd3f7267..63dd6a186366baad660ee8e38401ba84
  void SSLWrap<Base>::GetProtocol(const FunctionCallbackInfo<Value>& args) {
    Base* w;
 diff --git a/src/node_crypto.h b/src/node_crypto.h
-index fb21077132dec0900118d178605c9b93cc458105..31e7da7da9daf2ecf965dc38df24272f838ba1a0 100644
+index 206a19119a73216ffe16f935ee6a9423bff6865f..6aa4654d5deb07e6e97507c2b746b577ea8a0b17 100644
 --- a/src/node_crypto.h
 +++ b/src/node_crypto.h
 @@ -129,7 +129,6 @@ class SecureContext : public BaseObject {

patches/node/src_disable_node_use_v8_platform_in_node_options.patch

@@ -6,7 +6,7 @@ Subject: src: Disable NODE_USE_V8_PLATFORM in node_options
 Electron does not set NODE_USE_V8_PLATFORM. If inspector is enabled when NODE_USE_V8_PLATFORM is false, then there's an error. We want to ignore that, use our own v8 platform but still use the node inspector
 
 diff --git a/src/node_options.cc b/src/node_options.cc
-index b9d6108c5db800465e6c7156ad1c28002c33261b..01dddb979042c098326a8b1ff37397642733f49b 100644
+index 03919d450b3373983d647165ee93c006eb5f2902..b9db121250c77e1bc8c35af336361ee444c271e4 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
 @@ -33,7 +33,7 @@ DebugOptions& DebugOptions::operator=(const DebugOptions&) = default;