Skip to content

Commit 82a59d9

Browse files
chore: bump node to v22.16.0 (main) (#47217)
* chore: bump node in DEPS to v22.16.0 * crypto: remove BoringSSL dh-primes addition nodejs/node#57023 * tools: enable linter in test/fixtures/test\-runner/output nodejs/node#57698 * src: improve thread safety of TaskQueue nodejs/node#57910 * buffer: define global v8::CFunction objects as const nodejs/node#57676 * src: disable abseil deadlock detection nodejs/node#57582 * zlib: fix pointer alignment nodejs/node#57727 * chore: fixup patch indices * src: set default config as node.config.json nodejs/node#57171 * src: update std::vector<v8::Local<T>> to use v8::LocalVector<T> nodejs/node#57578 * test: disable chmod tests failing in Docker nodejs/node#58326 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
1 parent 55006fe commit 82a59d9

File tree

38 files changed

+177
-223
lines changed

38 files changed

+177
-223
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'138.0.7178.0',
66
'node_version':
7-
'v22.15.1',
7+
'v22.16.0',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

patches/node/.patches

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ fix_ensure_traverseparent_bails_on_resource_path_exit.patch
4747
cli_move_--trace-atomics-wait_to_eol.patch
4848
fix_cppgc_initializing_twice.patch
4949
fix_task_starvation_in_inspector_context_test.patch
50-
zlib_fix_pointer_alignment.patch
5150
fix_expose_readfilesync_override_for_modules.patch
5251
test_force_slow_json_stringify_path_for_overflow.patch

patches/node/add_v8_taskpirority_to_foreground_task_runner_signature.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ naturally upstream, and we will be able to remove this patch in a future
88
Node.js upgrade.
99

1010
diff --git a/src/node_platform.cc b/src/node_platform.cc
11-
index 65a9b79ae6ac8b7589e8f8109a709acb41d12b97..743ac069ad579a208a632ef5096ae46c8a0dfd74 100644
11+
index b438b3774d0aa7680fdbc6c6bf39a87893d221b2..ec355061825fb861c17fa2e6cc967b4c7b8d4586 100644
1212
--- a/src/node_platform.cc
1313
+++ b/src/node_platform.cc
14-
@@ -556,8 +556,8 @@ bool NodePlatform::IdleTasksEnabled(Isolate* isolate) {
14+
@@ -687,8 +687,8 @@ bool NodePlatform::IdleTasksEnabled(Isolate* isolate) {
1515
return ForIsolate(isolate)->IdleTasksEnabled();
1616
}
1717

@@ -23,10 +23,10 @@ index 65a9b79ae6ac8b7589e8f8109a709acb41d12b97..743ac069ad579a208a632ef5096ae46c
2323
}
2424

2525
diff --git a/src/node_platform.h b/src/node_platform.h
26-
index dde2d1b5687a5b52a4f09183bb4ff88d7d3e4d01..0a99f5b4b5eeb221ef3a34db7a50955c32d3c163 100644
26+
index a0222b4a1b074c6708e390d58d04221717069ac1..8015ca1801573c3a7c4a5db6d0f10b4016a9267c 100644
2727
--- a/src/node_platform.h
2828
+++ b/src/node_platform.h
29-
@@ -177,7 +177,7 @@ class NodePlatform : public MultiIsolatePlatform {
29+
@@ -213,7 +213,7 @@ class NodePlatform : public MultiIsolatePlatform {
3030
void (*callback)(void*), void* data) override;
3131

3232
std::shared_ptr<v8::TaskRunner> GetForegroundTaskRunner(

patches/node/build_add_gn_build_files.patch

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ index a2123cc6c6d21c53fafc8934203b3720393e7b11..245a43920c7baf000ba63192a84a4c3f
5555

5656
assert(!node_enable_inspector || node_use_openssl,
5757
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
58-
index e85860de93dd5753dd4542ecee9f0888af93898a..04eab49c368c8f86837ed2c1384bf3c63e4bde24 100644
58+
index defb657a62a0316224a02b68505ac1142fd89d03..d637faac88875bfa110e2b8d1f53962061d98279 100644
5959
--- a/src/node_builtins.cc
6060
+++ b/src/node_builtins.cc
61-
@@ -783,6 +783,7 @@ void BuiltinLoader::RegisterExternalReferences(
61+
@@ -785,6 +785,7 @@ void BuiltinLoader::RegisterExternalReferences(
6262
registry->Register(GetNatives);
6363

6464
RegisterExternalReferencesForInternalizedBuiltinCode(registry);
@@ -67,7 +67,7 @@ index e85860de93dd5753dd4542ecee9f0888af93898a..04eab49c368c8f86837ed2c1384bf3c6
6767

6868
} // namespace builtins
6969
diff --git a/src/node_builtins.h b/src/node_builtins.h
70-
index a73de23a1debfdac66873e0baccf882e383bfc36..7ac5291be093773ee7efd39e77e01bf5d5ce5247 100644
70+
index f9426599f2d5dc6ad061407f0c4eb2c9203a4433..302030f610965f07dd6998d282275c1bdf738009 100644
7171
--- a/src/node_builtins.h
7272
+++ b/src/node_builtins.h
7373
@@ -74,6 +74,8 @@ using BuiltinCodeCacheMap =
@@ -258,10 +258,10 @@ index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd1
258258
if sys.platform == 'win32':
259259
files = [ x.replace('\\', '/') for x in files ]
260260
diff --git a/unofficial.gni b/unofficial.gni
261-
index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50ae50a3d8 100644
261+
index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187f3c04c5c 100644
262262
--- a/unofficial.gni
263263
+++ b/unofficial.gni
264-
@@ -142,32 +142,39 @@ template("node_gn_build") {
264+
@@ -142,32 +142,42 @@ template("node_gn_build") {
265265
public_configs = [
266266
":node_external_config",
267267
"deps/googletest:googletest_config",
@@ -296,15 +296,18 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
296296
"$node_v8_path:v8_libplatform",
297297
]
298298

299-
+ cflags_cc = [ "-Wno-unguarded-availability-new" ]
299+
+ cflags_cc = [
300+
+ "-Wno-unguarded-availability-new",
301+
+ "-Wno-return-stack-address"
302+
+ ]
300303
+
301304
sources = [
302305
+ "src/node_snapshot_stub.cc",
303306
+ "$root_gen_dir/electron_natives.cc",
304307
"$target_gen_dir/node_javascript.cc",
305308
] + gypi_values.node_sources
306309

307-
@@ -190,7 +197,7 @@ template("node_gn_build") {
310+
@@ -190,7 +200,7 @@ template("node_gn_build") {
308311
}
309312
if (node_use_openssl) {
310313
deps += [ "deps/ncrypto" ]
@@ -313,7 +316,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
313316
sources += gypi_values.node_crypto_sources
314317
}
315318
if (node_enable_inspector) {
316-
@@ -214,6 +221,10 @@ template("node_gn_build") {
319+
@@ -214,6 +224,10 @@ template("node_gn_build") {
317320
}
318321
}
319322

@@ -324,15 +327,15 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
324327
executable(target_name) {
325328
forward_variables_from(invoker, "*")
326329

327-
@@ -288,6 +299,7 @@ template("node_gn_build") {
330+
@@ -288,6 +302,7 @@ template("node_gn_build") {
328331
}
329332

330333
executable("node_js2c") {
331334
+ defines = []
332335
deps = [
333336
"deps/uv",
334337
"$node_simdutf_path",
335-
@@ -298,26 +310,75 @@ template("node_gn_build") {
338+
@@ -298,26 +313,75 @@ template("node_gn_build") {
336339
"src/embedded_data.cc",
337340
"src/embedded_data.h",
338341
]
@@ -418,7 +421,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
418421
outputs = [ "$target_gen_dir/node_javascript.cc" ]
419422

420423
# Get the path to node_js2c executable of the host toolchain.
421-
@@ -331,11 +392,11 @@ template("node_gn_build") {
424+
@@ -331,11 +395,11 @@ template("node_gn_build") {
422425
get_label_info(":node_js2c($host_toolchain)", "name") +
423426
host_executable_suffix
424427

patches/node/build_allow_unbundling_of_node_js_dependencies.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ We don't need to do this for zlib, as the existing gn workflow uses the same
1414
Upstreamed at https://github.com/nodejs/node/pull/55903
1515

1616
diff --git a/unofficial.gni b/unofficial.gni
17-
index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f756b2e34a 100644
17+
index e17e4f043af6e4047ab82723ffd83187f3c04c5c..d591dfc99fdea4f830008502786ee44d863a31fc 100644
1818
--- a/unofficial.gni
1919
+++ b/unofficial.gni
2020
@@ -155,7 +155,6 @@ template("node_gn_build") {
@@ -25,7 +25,7 @@ index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f7
2525
"deps/nbytes",
2626
"deps/nghttp2",
2727
"deps/postject",
28-
@@ -191,7 +190,17 @@ template("node_gn_build") {
28+
@@ -194,7 +193,17 @@ template("node_gn_build") {
2929
configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
3030
configs += [ "//build/config/gcc:symbol_visibility_default" ]
3131
}
@@ -44,7 +44,7 @@ index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f7
4444
if (v8_enable_i18n_support) {
4545
deps += [ "//third_party/icu" ]
4646
}
47-
@@ -219,6 +228,19 @@ template("node_gn_build") {
47+
@@ -222,6 +231,19 @@ template("node_gn_build") {
4848
sources += node_inspector.node_inspector_sources +
4949
node_inspector.node_inspector_generated_sources
5050
}

patches/node/build_compile_with_c_20_support.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ V8 requires C++20 support as of https://chromium-review.googlesource.com/c/v8/v8
1010
This can be removed when Electron upgrades to a version of Node.js containing the required V8 version.
1111

1212
diff --git a/common.gypi b/common.gypi
13-
index 53016fc79c3d914982abeb61bf0a76181024e2bf..99b147482b636706b1372b89298f35b60ca2bb31 100644
13+
index f3476a91e4c3cda7cecf49e07bb594a167ac46ef..de73f6c18131f43e6fe3107c866599aa3398cf10 100644
1414
--- a/common.gypi
1515
+++ b/common.gypi
1616
@@ -530,7 +530,7 @@

patches/node/build_enable_perfetto.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@ index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327
6464

6565
module.exports = {
6666
diff --git a/node.gyp b/node.gyp
67-
index ec1f90b73f7d119b2c0e0207a5e36f3cec7295e9..66244b6638e34536aed397f56c6a4570a73e9b90 100644
67+
index ad010a8d99cf08013b7202eddce66e5b3885652d..d735b887d05ddfadec8e56dd8eae09646890aa84 100644
6868
--- a/node.gyp
6969
+++ b/node.gyp
70-
@@ -175,7 +175,6 @@
70+
@@ -176,7 +176,6 @@
7171
'src/timers.cc',
7272
'src/timer_wrap.cc',
7373
'src/tracing/agent.cc',
7474
- 'src/tracing/node_trace_buffer.cc',
7575
'src/tracing/node_trace_writer.cc',
7676
'src/tracing/trace_event.cc',
7777
'src/tracing/traced_value.cc',
78-
@@ -303,7 +302,6 @@
78+
@@ -305,7 +304,6 @@
7979
'src/tcp_wrap.h',
8080
'src/timers.h',
8181
'src/tracing/agent.h',

patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Subject: build: ensure native module compilation fails if not using a new
77
This should not be upstreamed, it is a quality-of-life patch for downstream module builders.
88

99
diff --git a/common.gypi b/common.gypi
10-
index f2a45f0f0bbfce93e61d3696a18425af4d022a00..53016fc79c3d914982abeb61bf0a76181024e2bf 100644
10+
index d9c0b721fe0a629a30efb3c4e04905176ca0a7f5..f3476a91e4c3cda7cecf49e07bb594a167ac46ef 100644
1111
--- a/common.gypi
1212
+++ b/common.gypi
1313
@@ -88,6 +88,8 @@
@@ -40,7 +40,7 @@ index f2a45f0f0bbfce93e61d3696a18425af4d022a00..53016fc79c3d914982abeb61bf0a7618
4040
# list in v8/BUILD.gn.
4141
['v8_enable_v8_checks == 1', {
4242
diff --git a/configure.py b/configure.py
43-
index 95faeeef3867cbf3ca4b1857d893aa127d550a2f..b36f63a5482074f79a20709b8c4774cb6dadec52 100755
43+
index 932484674e5b15b765b8bfe307bdf99b49b5039f..befaa85527b9ebebad226e603586e23d04ec1e51 100755
4444
--- a/configure.py
4545
+++ b/configure.py
4646
@@ -1698,6 +1698,7 @@ def configure_library(lib, output, pkgname=None):
@@ -52,7 +52,7 @@ index 95faeeef3867cbf3ca4b1857d893aa127d550a2f..b36f63a5482074f79a20709b8c4774cb
5252
o['variables']['v8_enable_javascript_promise_hooks'] = 1
5353
o['variables']['v8_enable_lite_mode'] = 1 if options.v8_lite_mode else 0
5454
diff --git a/src/node.h b/src/node.h
55-
index 8b77f7cb4d53105f42ba76d99a76a98b7a73789f..bdc77f8eb7abffa9e6c98cd254daedad3e44b981 100644
55+
index 835c78145956de3d8c52b6cc0581bcfef600f90b..174fd4d1af4c8cd75aec09f4548a674fd5539fb2 100644
5656
--- a/src/node.h
5757
+++ b/src/node.h
5858
@@ -22,6 +22,12 @@

patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ index 411eab8136d5957ae8a491bc38ffbdc88e59f5da..63c93b5be09692d0d4b6bfbb214b173b
3434
let kResistStopPropagation;
3535

3636
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
37-
index 04eab49c368c8f86837ed2c1384bf3c63e4bde24..c3d2b3c90c206dd81a3d8aa6c14fdf4678a1cddd 100644
37+
index d637faac88875bfa110e2b8d1f53962061d98279..e0b58c4d0ac5640a677c22d710f88f1b318378d7 100644
3838
--- a/src/node_builtins.cc
3939
+++ b/src/node_builtins.cc
40-
@@ -34,6 +34,7 @@ using v8::Value;
40+
@@ -35,6 +35,7 @@ using v8::Value;
4141
BuiltinLoader::BuiltinLoader()
4242
: config_(GetConfig()), code_cache_(std::make_shared<BuiltinCodeCache>()) {
4343
LoadJavaScriptSource();
@@ -46,7 +46,7 @@ index 04eab49c368c8f86837ed2c1384bf3c63e4bde24..c3d2b3c90c206dd81a3d8aa6c14fdf46
4646
AddExternalizedBuiltin(
4747
"internal/deps/cjs-module-lexer/lexer",
4848
diff --git a/src/node_builtins.h b/src/node_builtins.h
49-
index 7ac5291be093773ee7efd39e77e01bf5d5ce5247..c3c987d535285be84026ad0c633650bd2067d22d 100644
49+
index 302030f610965f07dd6998d282275c1bdf738009..35cb7766eeccc62dd2f0ce9484a2f1ec7beccc05 100644
5050
--- a/src/node_builtins.h
5151
+++ b/src/node_builtins.h
5252
@@ -138,6 +138,7 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {

patches/node/build_option_to_use_custom_inspector_protocol_path.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ index 3d7aa148678b2646b88fa7c32abec91791b02b82..4810d93eb971b253f7dadff7011a632f
6565
gypi_values = exec_script(
6666
"../../tools/gypi_to_gn.py",
6767
diff --git a/unofficial.gni b/unofficial.gni
68-
index a8ce18acfe333350f91b3e5f235db5f756b2e34a..6bcc40b282543fc40f80c5c6659de658209844b8 100644
68+
index d591dfc99fdea4f830008502786ee44d863a31fc..9e26399482d6a1cdb843efb72c152d5cdd5e08ea 100644
6969
--- a/unofficial.gni
7070
+++ b/unofficial.gni
71-
@@ -211,13 +211,14 @@ template("node_gn_build") {
71+
@@ -214,13 +214,14 @@ template("node_gn_build") {
7272
}
7373
if (node_enable_inspector) {
7474
deps += [

patches/node/build_restore_clang_as_default_compiler_on_macos.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ node-gyp will use the result of `process.config` that reflects the environment
1111
in which the binary got built.
1212

1313
diff --git a/common.gypi b/common.gypi
14-
index 99b147482b636706b1372b89298f35b60ca2bb31..5024e5fb0aee210f4986572638a523db6d26b4cc 100644
14+
index de73f6c18131f43e6fe3107c866599aa3398cf10..e2171e14b9e29dfc3c629f8164545d56d5e9057e 100644
1515
--- a/common.gypi
1616
+++ b/common.gypi
1717
@@ -127,6 +127,7 @@

patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ they use themselves as the entry point. We should try to upstream some form
88
of this.
99

1010
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
11-
index d1c05d1717cdc825c4e48885c963c9ed65bcf51c..278665921c5160ff10b3178db27d4df319fab6b3 100644
11+
index 4e7be0594ca1e1ceaf1963debbce46783893ed77..a6df0672bf6ae6e9a74ebbb0e4debff63599cc99 100644
1212
--- a/lib/internal/process/pre_execution.js
1313
+++ b/lib/internal/process/pre_execution.js
14-
@@ -243,12 +243,14 @@ function patchProcessObject(expandArgv1) {
14+
@@ -245,12 +245,14 @@ function patchProcessObject(expandArgv1) {
1515
// the entry point.
1616
if (expandArgv1 && process.argv[1] && process.argv[1][0] !== '-') {
1717
// Expand process.argv[1] into a full path.

patches/node/ci_ensure_node_tests_set_electron_run_as_node.patch

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ which causes the `ELECTRON_RUN_AS_NODE` variable to be lost. This patch
88
re-injects it.
99

1010
diff --git a/test/fixtures/test-runner/output/arbitrary-output-colored.js b/test/fixtures/test-runner/output/arbitrary-output-colored.js
11-
index af23e674cb361ed81dafa22670d5633559cd1144..1dd59990cb7cdba8aecf4f499ee6b92e7cd41b30 100644
11+
index 444531da1df2f9bbbc19bb8a43fb6eb2d1802d1a..81b3b3e37e5664dc53bec987a2ce3a83a8da105f 100644
1212
--- a/test/fixtures/test-runner/output/arbitrary-output-colored.js
1313
+++ b/test/fixtures/test-runner/output/arbitrary-output-colored.js
14-
@@ -7,6 +7,6 @@ const fixtures = require('../../../common/fixtures');
14+
@@ -7,9 +7,9 @@ const fixtures = require('../../../common/fixtures');
1515
(async function run() {
1616
const test = fixtures.path('test-runner/output/arbitrary-output-colored-1.js');
1717
const reset = fixtures.path('test-runner/output/reset-color-depth.js');
1818
- await once(spawn(process.execPath, ['-r', reset, '--test', test], { stdio: 'inherit' }), 'exit');
19-
- await once(spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit' }), 'exit');
2019
+ await once(spawn(process.execPath, ['-r', reset, '--test', test], { stdio: 'inherit', env: { ELECTRON_RUN_AS_NODE: 1 }}), 'exit');
21-
+ await once(spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit', env: { ELECTRON_RUN_AS_NODE: 1 } }), 'exit');
20+
await once(
21+
- spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit' }),
22+
+ spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit', env: { ELECTRON_RUN_AS_NODE: 1 }}),
23+
'exit',
24+
);
2225
})().then(common.mustCall());

patches/node/cli_move_--trace-atomics-wait_to_eol.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Reviewed-By: Benjamin Gruenbaum <[email protected]>
1515
Reviewed-By: Yagiz Nizipli <[email protected]>
1616

1717
diff --git a/doc/api/cli.md b/doc/api/cli.md
18-
index 114b7bbf6b1e105fc1696ed8a064065db73ff519..ad863e52761332c3249a86af0e3d239cd0f73b03 100644
18+
index 121d8f2bbd2b1d93067a06a902b1e7b986bcdb49..3460ad33c6186dcc3aa3281d80b723a1cc1d50dd 100644
1919
--- a/doc/api/cli.md
2020
+++ b/doc/api/cli.md
21-
@@ -3313,7 +3313,6 @@ one is included in the list below.
21+
@@ -3367,7 +3367,6 @@ one is included in the list below.
2222
* `--tls-min-v1.1`
2323
* `--tls-min-v1.2`
2424
* `--tls-min-v1.3`
@@ -27,10 +27,10 @@ index 114b7bbf6b1e105fc1696ed8a064065db73ff519..ad863e52761332c3249a86af0e3d239c
2727
* `--trace-env-js-stack`
2828
* `--trace-env-native-stack`
2929
diff --git a/doc/node.1 b/doc/node.1
30-
index 9f534746ef9d9c1c1ee2edd6c195573a2e228600..e01fc511a1034518c0fb9bc5fa925524aecad927 100644
30+
index 663d123ac728f097e8a76c94cf10c53d059983d7..497f5a61182beafbaa26b945181056353674cfc3 100644
3131
--- a/doc/node.1
3232
+++ b/doc/node.1
33-
@@ -533,11 +533,6 @@ but the option is supported for compatibility with older Node.js versions.
33+
@@ -539,11 +539,6 @@ but the option is supported for compatibility with older Node.js versions.
3434
Set default minVersion to 'TLSv1.3'. Use to disable support for TLSv1.2 in
3535
favour of TLSv1.3, which is more secure.
3636
.
@@ -43,10 +43,10 @@ index 9f534746ef9d9c1c1ee2edd6c195573a2e228600..e01fc511a1034518c0fb9bc5fa925524
4343
Print stack traces for deprecations.
4444
.
4545
diff --git a/src/node.cc b/src/node.cc
46-
index 2f58a6fa69069dabb99b5ddb8011991b07fa5f02..9f6fa646ba6673f67f5f625e157ed850633a26da 100644
46+
index 6f8f6386d0db8aef1e2e0126cc9064101cbe6112..bc670a6c8b5027417cdc35e1cd94a60f63fd342d 100644
4747
--- a/src/node.cc
4848
+++ b/src/node.cc
49-
@@ -226,44 +226,6 @@ void Environment::WaitForInspectorFrontendByOptions() {
49+
@@ -232,44 +232,6 @@ void Environment::WaitForInspectorFrontendByOptions() {
5050
}
5151
#endif // HAVE_INSPECTOR
5252

@@ -91,7 +91,7 @@ index 2f58a6fa69069dabb99b5ddb8011991b07fa5f02..9f6fa646ba6673f67f5f625e157ed850
9191
void Environment::InitializeDiagnostics() {
9292
isolate_->GetHeapProfiler()->AddBuildEmbedderGraphCallback(
9393
Environment::BuildEmbedderGraph, this);
94-
@@ -272,17 +234,6 @@ void Environment::InitializeDiagnostics() {
94+
@@ -278,17 +240,6 @@ void Environment::InitializeDiagnostics() {
9595
}
9696
if (options_->trace_uncaught)
9797
isolate_->SetCaptureStackTraceForUncaughtExceptions(true);
@@ -110,10 +110,10 @@ index 2f58a6fa69069dabb99b5ddb8011991b07fa5f02..9f6fa646ba6673f67f5f625e157ed850
110110
isolate_->SetPromiseHook(TracePromises);
111111
}
112112
diff --git a/src/node_options.cc b/src/node_options.cc
113-
index 54b253aa54f5cdebdb04315f9c6c2506977555c0..acf390bd456c7ddfa6987e440fb45940aec6b1ff 100644
113+
index a9500716f2a955fc591628a969c5fba40783a2e7..b153d2c6a771e80bcdf5ed6adbc1cd225b3bf97e 100644
114114
--- a/src/node_options.cc
115115
+++ b/src/node_options.cc
116-
@@ -762,10 +762,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
116+
@@ -770,10 +770,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
117117
"throw an exception on deprecations",
118118
&EnvironmentOptions::throw_deprecation,
119119
kAllowedInEnvvar);
@@ -125,7 +125,7 @@ index 54b253aa54f5cdebdb04315f9c6c2506977555c0..acf390bd456c7ddfa6987e440fb45940
125125
"show stack traces on deprecations",
126126
&EnvironmentOptions::trace_deprecation,
127127
diff --git a/src/node_options.h b/src/node_options.h
128-
index 065457acfde6ba4d04ed570cc72005cfd2798fd5..150f833bb21bd6d37f652f0785a4a98f3de5f67d 100644
128+
index 60068b008b2e2a034c3f0c58b947a8d04d55e3b2..d821bc6a9adf28ea312a9c446f8acfc8ed586ae3 100644
129129
--- a/src/node_options.h
130130
+++ b/src/node_options.h
131131
@@ -203,7 +203,6 @@ class EnvironmentOptions : public Options {

patches/node/cli_remove_deprecated_v8_flag.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Reviewed-By: Michaël Zasso <[email protected]>
1818
Reviewed-By: Yagiz Nizipli <[email protected]>
1919

2020
diff --git a/doc/api/cli.md b/doc/api/cli.md
21-
index 1b42c5a7f4715e56fa5bc39cd6f78a76473406f2..114b7bbf6b1e105fc1696ed8a064065db73ff519 100644
21+
index 6f984926a62973ba36bd3c27cc39b01f2bcac819..121d8f2bbd2b1d93067a06a902b1e7b986bcdb49 100644
2222
--- a/doc/api/cli.md
2323
+++ b/doc/api/cli.md
24-
@@ -3350,7 +3350,6 @@ V8 options that are allowed are:
24+
@@ -3404,7 +3404,6 @@ V8 options that are allowed are:
2525
* `--disallow-code-generation-from-strings`
2626
* `--enable-etw-stack-walking`
2727
* `--expose-gc`
@@ -30,10 +30,10 @@ index 1b42c5a7f4715e56fa5bc39cd6f78a76473406f2..114b7bbf6b1e105fc1696ed8a064065d
3030
* `--jitless`
3131
* `--max-old-space-size`
3232
diff --git a/src/node_options.cc b/src/node_options.cc
33-
index b22fbb0a285f6f323779d6ebb2b027a3990b031e..54b253aa54f5cdebdb04315f9c6c2506977555c0 100644
33+
index bb1e80ece4158dfed1b8bab7dc6d00dd56505aac..a9500716f2a955fc591628a969c5fba40783a2e7 100644
3434
--- a/src/node_options.cc
3535
+++ b/src/node_options.cc
36-
@@ -984,11 +984,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
36+
@@ -992,11 +992,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
3737
"disallow eval and friends",
3838
V8Option{},
3939
kAllowedInEnvvar);

0 commit comments

Comments
 (0)