patches: bump to 19.7.0 and 18.15.0

patches/node.v18.15.0.cpp.patch

@@ -1,5 +1,5 @@
 diff --git node/common.gypi node/common.gypi
-index 5372c8d42d..4e2fb0ec2b 100644
+index 782c871cff..c379e36569 100644
 --- node/common.gypi
 +++ node/common.gypi
 @@ -174,7 +174,7 @@
@@ -258,10 +258,10 @@ index 09eb12bd15..2d2f196737 100644
  const { toNamespacedPath } = require('path');
  
 diff --git node/lib/internal/process/pre_execution.js node/lib/internal/process/pre_execution.js
-index 73ccca1c6c..24e7062602 100644
+index 44a9183d77..3d2268c612 100644
 --- node/lib/internal/process/pre_execution.js
 +++ node/lib/internal/process/pre_execution.js
-@@ -32,7 +32,12 @@ const {
+@@ -33,7 +33,12 @@ const {
    isBuildingSnapshot,
  } = require('v8').startupSnapshot;
  
@@ -274,7 +274,7 @@ index 73ccca1c6c..24e7062602 100644
    prepareExecution({
      expandArgv1,
      initializeModules,
-@@ -150,7 +155,8 @@ function patchProcessObject(expandArgv1) {
+@@ -143,7 +148,8 @@ function patchProcessObject(expandArgv1) {
    process.argv[0] = process.execPath;
  
    if (expandArgv1 && process.argv[1] &&
@@ -284,7 +284,7 @@ index 73ccca1c6c..24e7062602 100644
      // Expand process.argv[1] into a full path.
      const path = require('path');
      try {
-@@ -613,6 +619,7 @@ function loadPreloadModules() {
+@@ -598,6 +604,7 @@ function loadPreloadModules() {
    // For user code, we preload modules if `-r` is passed
    const preloadModules = getOptionValue('--require');
    if (preloadModules && preloadModules.length > 0) {
@@ -315,7 +315,7 @@ index ec91c8a265..5bb649a377 100644
        throw e; /* node-do-not-add-exception-line */
      }
 diff --git node/node.gyp node/node.gyp
-index cec24aed03..5b6677f7dd 100644
+index 0b5c3ff5ba..09776d4b1f 100644
 --- node/node.gyp
 +++ node/node.gyp
 @@ -112,6 +112,9 @@
@@ -370,10 +370,10 @@ index 1067dee74c..8b32a10d08 100644
    }
  
 diff --git node/src/node_contextify.cc node/src/node_contextify.cc
-index 53b947fd1b..8713ce0ddf 100644
+index ed552ddd55..f757ac3b49 100644
 --- node/src/node_contextify.cc
 +++ node/src/node_contextify.cc
-@@ -73,6 +73,7 @@ using v8::ScriptOrigin;
+@@ -75,6 +75,7 @@ using v8::ScriptOrigin;
  using v8::String;
  using v8::Uint32;
  using v8::UnboundScript;
@@ -381,7 +381,7 @@ index 53b947fd1b..8713ce0ddf 100644
  using v8::Value;
  using v8::WeakCallbackInfo;
  using v8::WeakCallbackType;
-@@ -769,11 +770,12 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+@@ -771,11 +772,12 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    Local<ArrayBufferView> cached_data_buf;
    bool produce_cached_data = false;
    Local<Context> parsing_context = context;
@@ -395,7 +395,7 @@ index 53b947fd1b..8713ce0ddf 100644
      CHECK(args[2]->IsNumber());
      line_offset = args[2].As<Int32>()->Value();
      CHECK(args[3]->IsNumber());
-@@ -792,6 +794,7 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+@@ -794,6 +796,7 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
        CHECK_NOT_NULL(sandbox);
        parsing_context = sandbox->context();
      }
@@ -403,7 +403,7 @@ index 53b947fd1b..8713ce0ddf 100644
    }
  
    ContextifyScript* contextify_script =
-@@ -842,6 +845,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+@@ -844,6 +847,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    ShouldNotAbortOnUncaughtScope no_abort_scope(env);
    Context::Scope scope(parsing_context);
  
@@ -414,7 +414,7 @@ index 53b947fd1b..8713ce0ddf 100644
    MaybeLocal<UnboundScript> maybe_v8_script =
        ScriptCompiler::CompileUnboundScript(isolate, &source, compile_options);
  
-@@ -855,6 +862,13 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+@@ -857,6 +864,13 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
                       "ContextifyScript::New");
      return;
    }
@@ -427,10 +427,10 @@ index 53b947fd1b..8713ce0ddf 100644
 +
    contextify_script->script_.Reset(isolate, v8_script);
  
-   Local<Context> env_context = env->context();
-@@ -888,6 +902,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
-             v8_script->GetSourceMappingURL())
-       .Check();
+   std::unique_ptr<ScriptCompiler::CachedData> new_cached_data;
+@@ -881,6 +895,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+           .IsNothing())
+     return;
  
 +  if (sourceless && produce_cached_data) {
 +    V8::DisableCompilationForSourcelessUse();
@@ -550,10 +550,10 @@ index d486bbc31c..eb806b1ce4 100644
 +  return adjacent(c, nargv);
 +}
 diff --git node/src/node_options.cc node/src/node_options.cc
-index def333cfdd..8dba8f360f 100644
+index 6eabf78f1b..e9be1ed5ba 100644
 --- node/src/node_options.cc
 +++ node/src/node_options.cc
-@@ -301,6 +301,7 @@ void Parse(
+@@ -308,6 +308,7 @@ void Parse(
  // TODO(addaleax): Make that unnecessary.
  
  DebugOptionsParser::DebugOptionsParser() {

patches/node.v19.7.0.cpp.patch

@@ -12,10 +12,10 @@ index b3718cff39..6a4a664ba0 100644
                'lto': ' -flto ', # Clang
              }],
 diff --git node/configure.py node/configure.py
-index 215aee5d80..ccb59bd304 100755
+index b1fc5513e7..cade999317 100755
 --- node/configure.py
 +++ node/configure.py
-@@ -1259,9 +1259,7 @@ def configure_node(o):
+@@ -1265,9 +1265,7 @@ def configure_node(o):
  
    o['variables']['want_separate_host_toolset'] = int(cross_compiling)
  
@@ -169,7 +169,7 @@ index 95352299f8..2dd794b855 100644
    uint32_t max_payload_length = this->size_ - kHeaderSize;
    if (payload_length > max_payload_length) {
 diff --git node/lib/child_process.js node/lib/child_process.js
-index 55e6b781cd..2a499d6d5f 100644
+index 1ee9d56f86..ffbf3f093f 100644
 --- node/lib/child_process.js
 +++ node/lib/child_process.js
 @@ -167,7 +167,7 @@ function fork(modulePath, args = [], options) {
@@ -232,7 +232,7 @@ index 0000000000..e97e9e524c
 +  }());
 +}());
 diff --git node/lib/internal/modules/cjs/loader.js node/lib/internal/modules/cjs/loader.js
-index a859911522..d492088f37 100644
+index ec1d215074..c28fb8f3c2 100644
 --- node/lib/internal/modules/cjs/loader.js
 +++ node/lib/internal/modules/cjs/loader.js
 @@ -94,7 +94,7 @@ const fs = require('fs');
@@ -245,7 +245,7 @@ index a859911522..d492088f37 100644
  const {
    privateSymbols: {
 diff --git node/lib/internal/modules/package_json_reader.js node/lib/internal/modules/package_json_reader.js
-index 09eb12bd15..2d2f196737 100644
+index bb175d0df5..07f4834c07 100644
 --- node/lib/internal/modules/package_json_reader.js
 +++ node/lib/internal/modules/package_json_reader.js
 @@ -1,7 +1,7 @@
@@ -258,10 +258,10 @@ index 09eb12bd15..2d2f196737 100644
  const { toNamespacedPath } = require('path');
  
 diff --git node/lib/internal/process/pre_execution.js node/lib/internal/process/pre_execution.js
-index 4c44927fb0..361f7d5752 100644
+index ebc699ef1d..f109969a94 100644
 --- node/lib/internal/process/pre_execution.js
 +++ node/lib/internal/process/pre_execution.js
-@@ -35,7 +35,12 @@ const {
+@@ -36,7 +36,12 @@ const {
    },
  } = require('internal/v8/startup_snapshot');
  
@@ -274,7 +274,7 @@ index 4c44927fb0..361f7d5752 100644
    prepareExecution({
      expandArgv1,
      initializeModules,
-@@ -154,7 +159,8 @@ function patchProcessObject(expandArgv1) {
+@@ -147,7 +152,8 @@ function patchProcessObject(expandArgv1) {
    process.argv[0] = process.execPath;
  
    if (expandArgv1 && process.argv[1] &&
@@ -284,16 +284,16 @@ index 4c44927fb0..361f7d5752 100644
      // Expand process.argv[1] into a full path.
      const path = require('path');
      try {
-@@ -612,6 +618,7 @@ function loadPreloadModules() {
+@@ -597,6 +603,7 @@ function loadPreloadModules() {
    // For user code, we preload modules if `-r` is passed
    const preloadModules = getOptionValue('--require');
    if (preloadModules && preloadModules.length > 0) {
 +    assert(false, '--require is not supported');
      const {
        Module: {
-         _preloadModules
+         _preloadModules,
 diff --git node/lib/vm.js node/lib/vm.js
-index dea0121566..d8618f3edb 100644
+index f47a88a35d..1f17b8b90c 100644
 --- node/lib/vm.js
 +++ node/lib/vm.js
 @@ -79,6 +79,7 @@ class Script extends ContextifyScript {
@@ -315,7 +315,7 @@ index dea0121566..d8618f3edb 100644
        throw e; /* node-do-not-add-exception-line */
      }
 diff --git node/node.gyp node/node.gyp
-index b0f132efd8..3a43b724dc 100644
+index 6d1b2bf369..3a2e36b390 100644
 --- node/node.gyp
 +++ node/node.gyp
 @@ -110,6 +110,9 @@
@@ -329,10 +329,10 @@ index b0f132efd8..3a43b724dc 100644
          'ldflags': [
            '-Wl,-bnoerrmsg',
 diff --git node/src/inspector_agent.cc node/src/inspector_agent.cc
-index decd9f748a..4e5afbee4f 100644
+index ad193d477a..e0444b9e05 100644
 --- node/src/inspector_agent.cc
 +++ node/src/inspector_agent.cc
-@@ -695,8 +695,6 @@ bool Agent::Start(const std::string& path,
+@@ -696,8 +696,6 @@ bool Agent::Start(const std::string& path,
                                StartIoThreadAsyncCallback));
      uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
      start_io_thread_async.data = this;
@@ -342,10 +342,10 @@ index decd9f748a..4e5afbee4f 100644
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git node/src/node.cc node/src/node.cc
-index c5b6c2b844..017e641dce 100644
+index 6bdcbb3de9..f94d3d396d 100644
 --- node/src/node.cc
 +++ node/src/node.cc
-@@ -294,6 +294,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
+@@ -303,6 +303,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
      return env->RunSnapshotDeserializeMain();
    }
  
@@ -354,7 +354,7 @@ index c5b6c2b844..017e641dce 100644
    if (env->worker_context() != nullptr) {
      return StartExecution(env, "internal/main/worker_thread");
    }
-@@ -485,14 +487,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
+@@ -506,14 +508,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
    }
  
    if (!(flags & ProcessInitializationFlags::kNoDefaultSignalHandling)) {
@@ -370,7 +370,7 @@ index c5b6c2b844..017e641dce 100644
    }
  
 diff --git node/src/node_contextify.cc node/src/node_contextify.cc
-index ed552ddd55..f757ac3b49 100644
+index d618dafcb5..a7e2826a59 100644
 --- node/src/node_contextify.cc
 +++ node/src/node_contextify.cc
 @@ -75,6 +75,7 @@ using v8::ScriptOrigin;
@@ -550,17 +550,17 @@ index 56deaf47fa..e7ffa1baaa 100644
 +  return adjacent(c, nargv);
 +}
 diff --git node/src/node_options.cc node/src/node_options.cc
-index b9314eaa53..29f82d9738 100644
+index e7b0ba1073..530d56bd76 100644
 --- node/src/node_options.cc
 +++ node/src/node_options.cc
-@@ -293,6 +293,7 @@ void Parse(
+@@ -301,6 +301,7 @@ void Parse(
  // TODO(addaleax): Make that unnecessary.
  
  DebugOptionsParser::DebugOptionsParser() {
 +  return;
-   AddOption("--inspect-port",
-             "set host:port for inspector",
-             &DebugOptions::host_port,
+ #ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION
+   if (sea::IsSingleExecutable()) return;
+ #endif
 diff --git node/tools/icu/icu-generic.gyp node/tools/icu/icu-generic.gyp
 index db45e6fbdf..3e39f1fbdf 100644
 --- node/tools/icu/icu-generic.gyp

patches/patches.json

@@ -1,6 +1,6 @@
 {
-  "v19.6.1": ["node.v19.6.1.cpp.patch"],
-  "v18.14.1": ["node.v18.14.1.cpp.patch"],
+  "v19.7.0": ["node.v19.7.0.cpp.patch"],
+  "v18.15.0": ["node.v18.15.0.cpp.patch"],
   "v16.19.1": ["node.v16.19.1.cpp.patch"],
   "v14.21.3": ["node.v14.21.3.cpp.patch"],
   "v12.22.11": ["node.v12.22.11.cpp.patch"],