chore: bump node to v22.13.1 (main) (#45307)
* chore: bump node in DEPS to v22.13.1 * chore: fixup GN build file * https://github.com/nodejs/node/pull/55529 * https://github.com/nodejs/node/pull/55798 * https://github.com/nodejs/node/pull/55530 * module: simplify --inspect-brk handling https://github.com/nodejs/node/pull/55679 * src: fix outdated js2c.cc references https://github.com/nodejs/node/pull/56133 * crypto: include openssl/rand.h explicitly https://github.com/nodejs/node/pull/55425 * build: use variable for crypto dep path https://github.com/nodejs/node/pull/55928 * crypto: fix RSA_PKCS1_PADDING error message https://github.com/nodejs/node/pull/55629 * build: use variable for simdutf path https://github.com/nodejs/node/pull/56196 * test,crypto: make crypto tests work with BoringSSL https://github.com/nodejs/node/pull/55491 * fix: suppress clang -Wdeprecated-declarations in libuv https://github.com/libuv/libuv/pull/4486 * deps: update libuv to 1.49.1 https://github.com/nodejs/node/pull/55114 * test: make test-node-output-v8-warning more flexible https://github.com/nodejs/node/pull/55401 * [v22.x] Revert "v8: enable maglev on supported architectures" https://github.com/nodejs/node/pull/54384 * fix: potential WIN32_LEAN_AND_MEAN redefinition https://github.com/c-ares/c-ares/pull/869 * deps: update nghttp2 to 1.64.0 https://github.com/nodejs/node/pull/55559 * src: provide workaround for container-overflow https://github.com/nodejs/node/pull/55591 * build: use variable for simdutf path https://github.com/nodejs/node/pull/56196 * chore: fixup patch indices * fixup! module: simplify --inspect-brk handling * lib: fix fs.readdir recursive async https://github.com/nodejs/node/pull/56041 * lib: avoid excluding symlinks in recursive fs.readdir with filetypes https://github.com/nodejs/node/pull/55714/ This doesn't currently play well with ASAR - this should be fixed in a follow up * test: disable CJS permission test for config.main This has diverged as a result of our revert of src,lb: reducing C++ calls of esm legacy main resolve * fixup! lib: fix fs.readdir recursive async * deps: update libuv to 1.49.1 https://github.com/nodejs/node/pull/55114 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot]
GitHub
parent
ecd5d0a3a4
commit
93f4a93e12
42 changed files with 431 additions and 824 deletions
|
|
@ -21,28 +21,8 @@ index d6909b95886f4de3f0b953c2a2992f69066b7434..972955f9144aafcd3a3fe278b7aaad40
|
|||
+ cflags_c = [ "-Wdeprecated-literal-operator" ]
|
||||
}
|
||||
}
|
||||
diff --git a/deps/sqlite/unofficial.gni b/deps/sqlite/unofficial.gni
|
||||
index ebb3ffcd6d42b4c16b6865a91ccf4428cffe864b..00225afa1fb4205f1e02d9f185aeb97d642b3fd9 100644
|
||||
--- a/deps/sqlite/unofficial.gni
|
||||
+++ b/deps/sqlite/unofficial.gni
|
||||
@@ -18,8 +18,14 @@ template("sqlite_gn_build") {
|
||||
forward_variables_from(invoker, "*")
|
||||
public_configs = [ ":sqlite_config" ]
|
||||
sources = gypi_values.sqlite_sources
|
||||
+ cflags_c = [
|
||||
+ "-Wno-implicit-fallthrough",
|
||||
+ "-Wno-unreachable-code-break",
|
||||
+ "-Wno-unreachable-code-return",
|
||||
+ "-Wno-unreachable-code",
|
||||
+ ]
|
||||
if (is_win) {
|
||||
- cflags_c = [
|
||||
+ cflags_c += [
|
||||
"-Wno-sign-compare",
|
||||
"-Wno-unused-but-set-variable",
|
||||
"-Wno-unused-function",
|
||||
diff --git a/node.gni b/node.gni
|
||||
index 9dca810decebd75aab427e306b3cc37c80fb55c9..852f64fa9cfb50fe6e9ce7aa46be336d3196d5b8 100644
|
||||
index a2123cc6c6d21c53fafc8934203b3720393e7b11..245a43920c7baf000ba63192a84a4c3fd219be7d 100644
|
||||
--- a/node.gni
|
||||
+++ b/node.gni
|
||||
@@ -5,10 +5,10 @@
|
||||
|
|
@ -52,13 +32,13 @@ index 9dca810decebd75aab427e306b3cc37c80fb55c9..852f64fa9cfb50fe6e9ce7aa46be336d
|
|||
- node_path = "//node"
|
||||
+ node_path = "//third_party/electron_node"
|
||||
|
||||
# The location of V8, use the one from node's deps by default.
|
||||
# The location of V8 - use the one from node's deps by default.
|
||||
- node_v8_path = "$node_path/deps/v8"
|
||||
+ node_v8_path = "//v8"
|
||||
|
||||
# The NODE_MODULE_VERSION defined in node_version.h.
|
||||
node_module_version = exec_script("$node_path/tools/getmoduleversion.py", [], "value")
|
||||
@@ -38,7 +38,7 @@ declare_args() {
|
||||
# The location of OpenSSL - use the one from node's deps by default.
|
||||
node_openssl_path = "$node_path/deps/openssl"
|
||||
@@ -44,7 +44,7 @@ declare_args() {
|
||||
node_openssl_system_ca_path = ""
|
||||
|
||||
# Initialize v8 platform during node.js startup.
|
||||
|
|
@ -67,15 +47,15 @@ index 9dca810decebd75aab427e306b3cc37c80fb55c9..852f64fa9cfb50fe6e9ce7aa46be336d
|
|||
|
||||
# Custom build tag.
|
||||
node_tag = ""
|
||||
@@ -58,7 +58,16 @@ declare_args() {
|
||||
@@ -64,10 +64,16 @@ declare_args() {
|
||||
# TODO(zcbenz): There are few broken things for now:
|
||||
# 1. cross-os compilation is not supported.
|
||||
# 2. node_mksnapshot crashes when cross-compiling for x64 from arm64.
|
||||
- node_use_node_snapshot = (host_os == target_os) && !(host_cpu == "arm64" && target_cpu == "x64")
|
||||
+ node_use_node_snapshot = false
|
||||
+
|
||||
+ # Build with Amaro (TypeScript utils).
|
||||
+ node_use_amaro = true
|
||||
|
||||
# Build with Amaro (TypeScript utils).
|
||||
node_use_amaro = true
|
||||
+
|
||||
+ # Allows downstream packagers (eg. Linux distributions) to build against system shared libraries.
|
||||
+ use_system_cares = false
|
||||
|
|
@ -86,10 +66,10 @@ index 9dca810decebd75aab427e306b3cc37c80fb55c9..852f64fa9cfb50fe6e9ce7aa46be336d
|
|||
|
||||
assert(!node_enable_inspector || node_use_openssl,
|
||||
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
|
||||
index 1bec44f6f29b0b652e92d2bb336fdb74b85eee30..599b59873dbb17ae5e7463403859e088ffb86cda 100644
|
||||
index 9aaf5626fcfe4a9b168e069df0265df7b535b76e..ece9c4656919d8dc408112142367791628dd5f8b 100644
|
||||
--- a/src/node_builtins.cc
|
||||
+++ b/src/node_builtins.cc
|
||||
@@ -778,6 +778,7 @@ void BuiltinLoader::RegisterExternalReferences(
|
||||
@@ -779,6 +779,7 @@ void BuiltinLoader::RegisterExternalReferences(
|
||||
registry->Register(GetNatives);
|
||||
|
||||
RegisterExternalReferencesForInternalizedBuiltinCode(registry);
|
||||
|
|
@ -98,11 +78,11 @@ index 1bec44f6f29b0b652e92d2bb336fdb74b85eee30..599b59873dbb17ae5e7463403859e088
|
|||
|
||||
} // namespace builtins
|
||||
diff --git a/src/node_builtins.h b/src/node_builtins.h
|
||||
index 1cb85b9058d06555382e565dc32192a9fa48ed9f..cec9be01abd107e8612f70daf19b4834e118ffcf 100644
|
||||
index a73de23a1debfdac66873e0baccf882e383bfc36..7ac5291be093773ee7efd39e77e01bf5d5ce5247 100644
|
||||
--- a/src/node_builtins.h
|
||||
+++ b/src/node_builtins.h
|
||||
@@ -74,6 +74,8 @@ using BuiltinCodeCacheMap =
|
||||
// Generated by tools/js2c.py as node_javascript.cc
|
||||
// Generated by tools/js2c.cc as node_javascript.cc
|
||||
void RegisterExternalReferencesForInternalizedBuiltinCode(
|
||||
ExternalReferenceRegistry* registry);
|
||||
+void EmbedderRegisterExternalReferencesForInternalizedBuiltinCode(
|
||||
|
|
@ -110,32 +90,11 @@ index 1cb85b9058d06555382e565dc32192a9fa48ed9f..cec9be01abd107e8612f70daf19b4834
|
|||
|
||||
// Handles compilation and caching of built-in JavaScript modules and
|
||||
// bootstrap scripts, whose source are bundled into the binary as static data.
|
||||
diff --git a/tools/generate_config_gypi.py b/tools/generate_config_gypi.py
|
||||
index 45b3ac5006140fb55aad0e6b78084b753a947a76..35cce2ea8fd85f21582962115ac455918d4c4553 100755
|
||||
--- a/tools/generate_config_gypi.py
|
||||
+++ b/tools/generate_config_gypi.py
|
||||
@@ -21,7 +21,7 @@ import getnapibuildversion
|
||||
GN_RE = re.compile(r'(\w+)\s+=\s+(.*?)$', re.MULTILINE)
|
||||
|
||||
if sys.platform == 'win32':
|
||||
- GN = 'gn.exe'
|
||||
+ GN = 'gn.bat'
|
||||
else:
|
||||
GN = 'gn'
|
||||
|
||||
@@ -65,6 +65,7 @@ def translate_config(out_dir, config, v8_config):
|
||||
eval(config['node_builtin_shareable_builtins']),
|
||||
'node_module_version': int(config['node_module_version']),
|
||||
'node_use_openssl': config['node_use_openssl'],
|
||||
+ 'node_use_amaro': config['node_use_amaro'],
|
||||
'node_use_node_code_cache': config['node_use_node_code_cache'],
|
||||
'node_use_node_snapshot': config['node_use_node_snapshot'],
|
||||
'v8_enable_inspector': # this is actually a node misnomer
|
||||
diff --git a/tools/install.py b/tools/install.py
|
||||
index bf54249b66c0d4e179deaae5a9fd55568e694fe0..31b94d2e4b532d3b8202b512e2d2f41d29a2a546 100755
|
||||
index 17515720ba9c85d533465365188021074a8d30f4..7232be863d517c8445059a57c5938c2cbdeaf81b 100755
|
||||
--- a/tools/install.py
|
||||
+++ b/tools/install.py
|
||||
@@ -285,6 +285,7 @@ def headers(options, action):
|
||||
@@ -291,6 +291,7 @@ def headers(options, action):
|
||||
'include/v8-promise.h',
|
||||
'include/v8-proxy.h',
|
||||
'include/v8-regexp.h',
|
||||
|
|
@ -302,22 +261,10 @@ index 65d0e1be42f0a85418491ebb548278cf431aa6a0..d4a31342f1c6107b029394c6e1d00a1d
|
|||
except Exception as e:
|
||||
print(str(e))
|
||||
diff --git a/unofficial.gni b/unofficial.gni
|
||||
index c3b311e4a7f5444b07d4d7028d4621806959804e..f6793b8bf22d6ac911a1977edaa881b6dbbe7ac7 100644
|
||||
index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..3632d5bd21e277fcbd8d62dc65598a7f7c87f00e 100644
|
||||
--- a/unofficial.gni
|
||||
+++ b/unofficial.gni
|
||||
@@ -22,6 +22,11 @@ template("node_gn_build") {
|
||||
} else {
|
||||
defines += [ "HAVE_OPENSSL=0" ]
|
||||
}
|
||||
+ if (node_use_amaro) {
|
||||
+ defines += [ "HAVE_AMARO=1" ]
|
||||
+ } else {
|
||||
+ defines += [ "HAVE_AMARO=0" ]
|
||||
+ }
|
||||
if (node_use_v8_platform) {
|
||||
defines += [ "NODE_USE_V8_PLATFORM=1" ]
|
||||
} else {
|
||||
@@ -139,6 +144,7 @@ template("node_gn_build") {
|
||||
@@ -145,6 +145,7 @@ template("node_gn_build") {
|
||||
public_deps = [
|
||||
"deps/ada",
|
||||
"deps/uv",
|
||||
|
|
@ -325,15 +272,15 @@ index c3b311e4a7f5444b07d4d7028d4621806959804e..f6793b8bf22d6ac911a1977edaa881b6
|
|||
"deps/simdjson",
|
||||
"$node_v8_path",
|
||||
]
|
||||
@@ -150,7 +156,6 @@ template("node_gn_build") {
|
||||
@@ -156,7 +157,6 @@ template("node_gn_build") {
|
||||
"deps/llhttp",
|
||||
"deps/nbytes",
|
||||
"deps/nghttp2",
|
||||
- "deps/ngtcp2",
|
||||
"deps/postject",
|
||||
"deps/simdutf",
|
||||
"deps/sqlite",
|
||||
@@ -159,7 +164,11 @@ template("node_gn_build") {
|
||||
"deps/uvwasi",
|
||||
@@ -165,7 +165,11 @@ template("node_gn_build") {
|
||||
"$node_v8_path:v8_libplatform",
|
||||
]
|
||||
|
||||
|
|
@ -345,28 +292,24 @@ index c3b311e4a7f5444b07d4d7028d4621806959804e..f6793b8bf22d6ac911a1977edaa881b6
|
|||
"$target_gen_dir/node_javascript.cc",
|
||||
] + gypi_values.node_sources
|
||||
|
||||
@@ -178,8 +187,10 @@ template("node_gn_build") {
|
||||
deps += [ "//third_party/icu" ]
|
||||
@@ -185,7 +189,7 @@ template("node_gn_build") {
|
||||
}
|
||||
if (node_use_openssl) {
|
||||
- deps += [ "deps/ncrypto" ]
|
||||
- public_deps += [ "deps/openssl" ]
|
||||
+ deps += [
|
||||
+ "deps/ncrypto",
|
||||
+ "//third_party/boringssl"
|
||||
+ ]
|
||||
deps += [ "deps/ncrypto" ]
|
||||
- public_deps += [ "$node_openssl_path" ]
|
||||
+ public_deps += [ "//third_party/boringssl" ]
|
||||
sources += gypi_values.node_crypto_sources
|
||||
}
|
||||
if (node_enable_inspector) {
|
||||
@@ -276,6 +287,7 @@ template("node_gn_build") {
|
||||
@@ -282,6 +286,7 @@ template("node_gn_build") {
|
||||
}
|
||||
|
||||
executable("node_js2c") {
|
||||
+ defines = []
|
||||
deps = [
|
||||
"deps/simdutf",
|
||||
"deps/uv",
|
||||
@@ -286,26 +298,75 @@ template("node_gn_build") {
|
||||
"$node_simdutf_path",
|
||||
@@ -292,26 +297,75 @@ template("node_gn_build") {
|
||||
"src/embedded_data.cc",
|
||||
"src/embedded_data.h",
|
||||
]
|
||||
|
|
@ -452,7 +395,7 @@ index c3b311e4a7f5444b07d4d7028d4621806959804e..f6793b8bf22d6ac911a1977edaa881b6
|
|||
outputs = [ "$target_gen_dir/node_javascript.cc" ]
|
||||
|
||||
# Get the path to node_js2c executable of the host toolchain.
|
||||
@@ -319,11 +380,11 @@ template("node_gn_build") {
|
||||
@@ -325,11 +379,11 @@ template("node_gn_build") {
|
||||
get_label_info(":node_js2c($host_toolchain)", "name") +
|
||||
host_executable_suffix
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue