Update to Node 20.5.1

yue · Aug 24, 2023 · 8041d44 · 8041d44
1 parent 1a488fd
commit 8041d44
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 23 deletions.
diff --git a/common.gypi b/common.gypi
@@ -73,15 +73,15 @@
     'v8_random_seed': 0,
     'v8_trace_maps': 0,
     'v8_use_siphash': 1,
-    'icu_data_file': 'icudt72l.dat',
-    'icu_data_in': '../../deps/icu-tmp/icudt72l.dat',
+    'icu_data_file': 'icudt73l.dat',
+    'icu_data_in': '../../deps/icu-tmp/icudt73l.dat',
     'icu_default_data': '',
     'icu_endianness': 'l',
     'icu_gyp_path': 'node/tools/icu/icu-generic.gyp',
     'icu_locales': 'en,root',
     'icu_path': '../../deps/icu-small',
     'icu_small': 'true',
-    'icu_ver_major': '72',
+    'icu_ver_major': '73',
   },
   'target_defaults': {
     'includes': [
@@ -119,7 +119,7 @@
           'node/deps/icu-small/source/tools/toolutil',
         ],
       }],
-      ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "libnode", "nghttp2", "zlib", "mksnapshot", "genrb", "genccode"] or _target_name.startswith("v8") or _target_name.startswith("icu") or _target_name.startswith("node")', {
+      ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "libnode", "nghttp2", "zlib", "mksnapshot", "genrb", "genccode", "simdutf"] or _target_name.startswith("v8") or _target_name.startswith("icu") or _target_name.startswith("node") or _target_name.startswith("torque")', {
         # Suppress all the warnings in Node.
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ -158,6 +158,7 @@
           '-Wno-inconsistent-missing-override',
         ],
         'cflags_c': [
+          '-Wno-deprecated-non-prototype',
           '-Wno-implicit-function-declaration',
         ],
         'cflags!': [

diff --git a/node b/node
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -15,7 +15,7 @@ function wrapWithActivateUvLoop(func) {
   delete process.bootstrap
 
   // The |require| here is actually |nativeModuleRequire|.
-  const {BuiltinModule, internalBinding, require} = internalRequire('internal/bootstrap/loaders')
+  const {BuiltinModule, internalBinding, require} = internalRequire('internal/bootstrap/realm')
 
   // Make async method work.
   const timers = require('timers')
@@ -60,13 +60,8 @@ function wrapWithActivateUvLoop(func) {
     const AsarArchive = require('asar_archive')
     process.asarArchive = new AsarArchive(execPath/* REPLACE_WITH_OFFSET */)
 
-    // If it is (i.e. no exception), then patch the fs module after bootstrap
-    // is over.
-    process.finishBootstrap = () => {
-      delete process.finishBootstrap
-      // Monkey patch built-in modules.
-      require('asar_monkey_patch').wrapFsWithAsar(require('fs'))
-    }
+    // Monkey patch built-in modules.
+    require('asar_monkey_patch').wrapFsWithAsar(require('fs'))
 
     // Redirect Node to execute from current ASAR archive, using a virtual
     // "asar" directory as root.

diff --git a/src/node_integration.cc b/src/node_integration.cc
@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "node/deps/uv/src/uv-common.h"
 #include "node/src/env-inl.h"
 #include "node/src/node.h"
 #include "node/src/node_internals.h"
@@ -107,12 +106,6 @@ void NodeIntegration::EmbedThreadRunner(void *arg) {
     if (self->embed_closed_)
       break;
 
-    // Break the loop when uv has decided to quit.
-    if (self->uv_loop_->stop_flag != 0 ||
-        (!uv__has_active_handles(self->uv_loop_) &&
-         !uv__has_active_reqs(self->uv_loop_)))
-      break;
-
     // Deal with event in main thread.
     self->WakeupMainThread();
   }

diff --git a/src/node_integration_win.cc b/src/node_integration_win.cc
@@ -4,7 +4,7 @@
 
 #include "src/node_integration_win.h"
 
-#include "node/deps/uv/src/uv-common.h"
+#include "node/deps/uv/include/uv.h"
 
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 extern "C" IMAGE_DOS_HEADER __ImageBase;

diff --git a/src/yode.cc b/src/yode.cc
@@ -85,7 +85,7 @@ bool InitWrapper(node::Environment* env) {
   v8::Local<v8::Value> versions = env->process_object()->Get(
       env->context(), ToV8(env, "versions")).ToLocalChecked();
   versions.As<v8::Object>()->Set(
-      env->context(), ToV8(env, "yode"), ToV8(env, "0.7.1")).ToChecked();
+      env->context(), ToV8(env, "yode"), ToV8(env, "0.11.0")).ToChecked();
   env->process_object()->DefineOwnProperty(
       env->context(), ToV8(env, "versions"), versions, v8::ReadOnly).Check();
   return true;

diff --git a/yode.gyp b/yode.gyp
@@ -29,10 +29,11 @@
         'node/src',  # for node things
       ],
       'defines': [
+        'NODE_HAVE_I18N_SUPPORT=1',
         'NODE_WANT_INTERNALS=1',
+        'NODE_SHARED_MODE',
         'HAVE_OPENSSL=1',
         'HAVE_INSPECTOR=1',
-        'NODE_SHARED_MODE',
       ],
       'dependencies': [
         'yode_js2c#host',