X Tutup
Skip to content

Commit db5a3c0

Browse files
electron-roller[bot]codebyterepatchup[bot]
authored
chore: bump node to v16.14.2 (main) (electron#32833)
* chore: bump node in DEPS to v16.14.0 * src: add flags for controlling process behavior nodejs/node#40339 * src: add x509.fingerprint512 to crypto module nodejs/node#39809 * deps: upgrade to libuv 1.43.0 nodejs/node#41398 * chore: fixup patch indices * chore: add missing filenames nodejs/node#39283 nodejs/node#40665 * crypto: trim input for NETSCAPE_SPKI_b64_decode nodejs/node#40757 * chore: update patches * chore: bump node in DEPS to v16.14.1 * tools: enable no-empty ESLint rule nodejs/node#41831 * chore: update patches * chore: update patches * chore: bump node in DEPS to v16.14.2 * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
1 parent cc253f5 commit db5a3c0

File tree

31 files changed

+95
-351
lines changed

31 files changed

+95
-351
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ vars = {
1717
'chromium_version':
1818
'100.0.4894.0',
1919
'node_version':
20-
'v16.13.2',
20+
'v16.14.2',
2121
'nan_version':
2222
# The following commit hash of NAN is v2.14.2 with *only* changes to the
2323
# test suite. This should be updated to a specific tag when one becomes

‎patches/node/.patches‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ feat_initialize_asar_support.patch
44
expose_get_builtin_module_function.patch
55
build_add_gn_build_files.patch
66
fix_add_default_values_for_variables_in_common_gypi.patch
7-
feat_add_flags_for_low-level_hooks_and_exceptions.patch
87
fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
98
pass_all_globals_through_require.patch
109
build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
@@ -19,11 +18,9 @@ fix_allow_preventing_initializeinspector_in_env.patch
1918
src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
2019
fix_crypto_tests_to_run_with_bssl.patch
2120
fix_account_for_debugger_agent_race_condition.patch
22-
add_should_read_node_options_from_env_option_to_disable_node_options.patch
2321
repl_fix_crash_when_sharedarraybuffer_disabled.patch
2422
fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
2523
chore_fix_-wimplicit-fallthrough.patch
26-
test_add_fixture_trim_option.patch
2724
fix_crash_caused_by_gethostnamew_on_windows_7.patch
2825
fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
2926
fix_don_t_create_console_window_when_creating_process.patch

‎patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎patches/node/be_compatible_with_cppgc.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ index bb1e8d4b46bce3bf08f730ac5d43f7113d17ae39..6da0669943fc6465ffc47a1c8c3dadfe
8383
}
8484

8585
diff --git a/src/base_object.h b/src/base_object.h
86-
index d46a0f216009c63f45c440fc352b54d1ac4a08d8..81913c0d7762bf499ee19aaa3b63b986ca370bb4 100644
86+
index 1c63da92fd80c042d5ea729bdd70049cae51a141..3b8127e884187b21cebeabb39b60bd3010b62217 100644
8787
--- a/src/base_object.h
8888
+++ b/src/base_object.h
8989
@@ -40,7 +40,7 @@ class TransferData;

‎patches/node/build_add_gn_build_files.patch‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -964,10 +964,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
964964
+}
965965
diff --git a/filenames.json b/filenames.json
966966
new file mode 100644
967-
index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc41054754
967+
index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424afb63ca5
968968
--- /dev/null
969969
+++ b/filenames.json
970-
@@ -0,0 +1,604 @@
970+
@@ -0,0 +1,612 @@
971971
+// This file is automatically generated by generate_gn_filenames_json.py
972972
+// DO NOT EDIT
973973
+{
@@ -1191,6 +1191,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
11911191
+ "lib/internal/blob.js",
11921192
+ "lib/internal/socket_list.js",
11931193
+ "lib/internal/socketaddress.js",
1194+
+ "lib/internal/promise_hooks.js",
11941195
+ "lib/internal/stream_base_commons.js",
11951196
+ "lib/internal/url.js",
11961197
+ "lib/internal/async_hooks.js",
@@ -1229,6 +1230,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
12291230
+ "lib/internal/webstreams/queuingstrategies.js",
12301231
+ "lib/internal/webstreams/encoding.js",
12311232
+ "lib/internal/webstreams/transformstream.js",
1233+
+ "lib/internal/webstreams/adapters.js",
12321234
+ "lib/internal/webstreams/transfer.js",
12331235
+ "lib/internal/bootstrap/loaders.js",
12341236
+ "lib/internal/bootstrap/pre_execution.js",
@@ -1252,6 +1254,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
12521254
+ "lib/internal/streams/destroy.js",
12531255
+ "lib/internal/streams/legacy.js",
12541256
+ "lib/internal/streams/passthrough.js",
1257+
+ "lib/internal/streams/operators.js",
12551258
+ "lib/internal/streams/readable.js",
12561259
+ "lib/internal/streams/from.js",
12571260
+ "lib/internal/streams/writable.js",
@@ -1263,6 +1266,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
12631266
+ "lib/internal/streams/lazy_transform.js",
12641267
+ "lib/internal/streams/duplex.js",
12651268
+ "lib/internal/streams/pipeline.js",
1269+
+ "lib/internal/readline/interface.js",
12661270
+ "lib/internal/readline/utils.js",
12671271
+ "lib/internal/readline/emitKeypressEvents.js",
12681272
+ "lib/internal/readline/callbacks.js",
@@ -1300,11 +1304,14 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
13001304
+ "lib/internal/modules/run_main.js",
13011305
+ "lib/internal/modules/package_json_reader.js",
13021306
+ "lib/internal/modules/esm/module_job.js",
1307+
+ "lib/internal/modules/esm/assert.js",
13031308
+ "lib/internal/modules/esm/get_source.js",
13041309
+ "lib/internal/modules/esm/translators.js",
13051310
+ "lib/internal/modules/esm/resolve.js",
13061311
+ "lib/internal/modules/esm/create_dynamic_module.js",
13071312
+ "lib/internal/modules/esm/load.js",
1313+
+ "lib/internal/modules/esm/handle_process_exit.js",
1314+
+ "lib/internal/modules/esm/initialize_import_meta.js",
13081315
+ "lib/internal/modules/esm/module_map.js",
13091316
+ "lib/internal/modules/esm/get_format.js",
13101317
+ "lib/internal/modules/esm/loader.js",
@@ -1565,6 +1572,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
15651572
+ "src/tracing/trace_event_common.h",
15661573
+ "src/tracing/traced_value.h",
15671574
+ "src/timer_wrap.h",
1575+
+ "src/timer_wrap-inl.h",
15681576
+ "src/tty_wrap.h",
15691577
+ "src/udp_wrap.h",
15701578
+ "src/util.h",
@@ -1778,7 +1786,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
17781786
+ args = rebase_path(inputs + outputs, root_build_dir)
17791787
+}
17801788
diff --git a/src/node_version.h b/src/node_version.h
1781-
index 31e75367f8263f575f37243475acb58bb5c40d04..8f102792fe66847dad0ba7176299cf09686cd182 100644
1789+
index 41081f82714169f3bf388c3a8c2d9aa78e21a3f4..48c0d2655789a0528dfea0a60f756aacb48a6f60 100644
17821790
--- a/src/node_version.h
17831791
+++ b/src/node_version.h
17841792
@@ -89,7 +89,10 @@
@@ -1905,10 +1913,10 @@ index 0000000000000000000000000000000000000000..3088ae4bdf814ae255c9805ebd393b2e
19051913
+
19061914
+ out_file.writelines(new_contents)
19071915
diff --git a/tools/install.py b/tools/install.py
1908-
index 41cc1cbc60a9480cc08df3aa0ebe582c2becc3a2..dd13ad149f1b4cb807ca7aff62e1b15718116855 100755
1916+
index 8a050dfa7c8b771ceb30fd2b74dc47f3de96834c..ad3bee1660de26d3502c6247f23b091171a6416c 100755
19091917
--- a/tools/install.py
19101918
+++ b/tools/install.py
1911-
@@ -170,17 +170,72 @@ def files(action):
1919+
@@ -172,17 +172,72 @@ def files(action):
19121920
def headers(action):
19131921
def wanted_v8_headers(files_arg, dest):
19141922
v8_headers = [
@@ -1991,7 +1999,7 @@ index 41cc1cbc60a9480cc08df3aa0ebe582c2becc3a2..dd13ad149f1b4cb807ca7aff62e1b157
19911999
files_arg = [name for name in files_arg if name in v8_headers]
19922000
action(files_arg, dest)
19932001

1994-
@@ -201,7 +256,7 @@ def headers(action):
2002+
@@ -209,7 +264,7 @@ def headers(action):
19952003
if sys.platform.startswith('aix'):
19962004
action(['out/Release/node.exp'], 'include/node/')
19972005

‎patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ index b45af42d12ff7df8a9e125e87f51af3456811c23..c84ff7feb07aebf656ada7e37d812d9d
3535
async function* watch(filename, options = {}) {
3636
const path = toNamespacedPath(getValidatedPath(filename));
3737
diff --git a/src/node_native_module.cc b/src/node_native_module.cc
38-
index 006a30903184d76d6c11849784e6c6b38fd39807..edde37f281c10a1cb69db642149cc300744499cb 100644
38+
index 5d20e1d6a86416c0de9f01a22b992aad889078d3..c836540c7d9328ae4646097ecc18023c1d8add8f 100644
3939
--- a/src/node_native_module.cc
4040
+++ b/src/node_native_module.cc
4141
@@ -20,6 +20,7 @@ NativeModuleLoader NativeModuleLoader::instance_;

‎patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch‎

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

1010
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
11-
index 4d4996e9868c35ac3e0babbf08c38d90a6857abc..419ffd9d5deb84eb94381259d3084411f6c3341b 100644
11+
index 3c5e6fe40070f52d8b3f4e9757485845c1d6dbed..2af6b11c97ecdca3c40792ab35c69b07b9db76a0 100644
1212
--- a/lib/internal/bootstrap/pre_execution.js
1313
+++ b/lib/internal/bootstrap/pre_execution.js
14-
@@ -104,10 +104,12 @@ function patchProcessObject(expandArgv1) {
14+
@@ -95,11 +95,13 @@ function patchProcessObject(expandArgv1) {
1515
if (expandArgv1 && process.argv[1] &&
1616
!StringPrototypeStartsWith(process.argv[1], '-')) {
1717
// Expand process.argv[1] into a full path.
1818
- const path = require('path');
1919
- try {
2020
- process.argv[1] = path.resolve(process.argv[1]);
21-
- } catch {}
21+
- } catch {
22+
- // Continue regardless of error.
2223
+ if (!process.argv[1] || !process.argv[1].startsWith('electron/js2c')) {
2324
+ const path = require('path');
2425
+ try {
2526
+ process.argv[1] = path.resolve(process.argv[1]);
26-
+ } catch {}
27-
+ }
27+
+ } catch {
28+
+ // Continue regardless of error.
29+
+ }
30+
}
2831
}
2932

30-
// TODO(joyeecheung): most of these should be deprecated and removed,
3133
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
32-
index 05a62bb3c3852536001912cb0b69fe5578ace125..37f395e9f2b7ab9ce99b0f8f4217253fcbd9175b 100644
34+
index caca939942cb721a3efde7005b0a987a19237a8b..2d30a56a87ff8657cddb3d9e6af5bd9f81deffdb 100644
3335
--- a/lib/internal/modules/cjs/loader.js
3436
+++ b/lib/internal/modules/cjs/loader.js
35-
@@ -1075,6 +1075,13 @@ Module.prototype._compile = function(content, filename) {
37+
@@ -1077,6 +1077,13 @@ Module.prototype._compile = function(content, filename) {
3638
if (getOptionValue('--inspect-brk') && process._eval == null) {
3739
if (!resolvedArgv) {
3840
// We enter the repl if we're not given a filename argument.

‎patches/node/chore_read_nobrowserglobals_from_global_not_process.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ This is used so that we can modify the flag at runtime where
77
config can only be set at compile time.
88

99
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
10-
index ef06d0563fa7452348754418867a56c9b8c6f4e1..a313402f93937cf2f1f93eb74422d9609e291d76 100644
10+
index 085dd7e09d31fb1800b3596cc068637e1956ba52..9e0f811b2a37f45a9d8162dff7c9d5c935b856d6 100644
1111
--- a/lib/internal/bootstrap/node.js
1212
+++ b/lib/internal/bootstrap/node.js
13-
@@ -193,7 +193,7 @@ const {
13+
@@ -209,7 +209,7 @@ const {
1414
queueMicrotask
1515
} = require('internal/process/task_queues');
1616

‎patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Refs: https://github.com/libuv/libuv/pull/482
1111
Refs: https://github.com/libuv/libuv/pull/3405
1212

1313
diff --git a/deps/uv/SUPPORTED_PLATFORMS.md b/deps/uv/SUPPORTED_PLATFORMS.md
14-
index 30e0ea617a6fcaa5b4b7c7c5b117652e61f367d3..dc57dfb12dc7ddf8d29308ac44f46084a933d5ca 100644
14+
index 87e23823ad6424526fdbc2457e535875124b31cb..79509db5b17bb9e7fe245d8a0fd7fa25f8665426 100644
1515
--- a/deps/uv/SUPPORTED_PLATFORMS.md
1616
+++ b/deps/uv/SUPPORTED_PLATFORMS.md
1717
@@ -3,7 +3,7 @@

‎patches/node/darwin_remove_eprototype_error_workaround_3405.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ I'm opting to simply remove the workaround and have the error bubble up.
1818
Refs: https://github.com/libuv/libuv/pull/482
1919

2020
diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
21-
index bc64fe8f44b26d9f4c0d4d0d282b65cdf11a531b..1af448e7691392c3f7794eed1905d9132394e207 100644
21+
index 5858258d2868c3352e0e9e3313045aa29ff4a873..c5cd6ddc0b627eeb047e0cb08677f65b4601b89b 100644
2222
--- a/deps/uv/src/unix/stream.c
2323
+++ b/deps/uv/src/unix/stream.c
2424
@@ -58,20 +58,6 @@ struct uv__stream_select_s {

0 commit comments

Comments
 (0)
X Tutup