Skip to content

Commit c0e51c8

Browse files
chore: bump node to v20.18.1 (33-x-y) (#44780)
* chore: bump node in DEPS to v20.18.1 * chore: update patches * lib: remove lib/internal/idna.js nodejs/node#55050 * buffer: fix out of range for toString nodejs/node#54553 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <[email protected]>
1 parent bf13656 commit c0e51c8

14 files changed

+37
-24
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
'130.0.6723.137',
66
'node_version':
7-
'v20.18.0',
7+
'v20.18.1',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

patches/node/build_add_gn_build_files.patch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,10 +1268,10 @@ index 0000000000000000000000000000000000000000..af9cbada10203b387fb9732b346583b1
12681268
+}
12691269
diff --git a/filenames.json b/filenames.json
12701270
new file mode 100644
1271-
index 0000000000000000000000000000000000000000..889a487e24721a8ecfef91f5a655892a607bb12f
1271+
index 0000000000000000000000000000000000000000..c429d4cbfff605ff78c7c8ee3c5ad046594163f3
12721272
--- /dev/null
12731273
+++ b/filenames.json
1274-
@@ -0,0 +1,741 @@
1274+
@@ -0,0 +1,740 @@
12751275
+// This file is automatically generated by generate_gn_filenames_json.py
12761276
+// DO NOT EDIT
12771277
+{
@@ -1550,7 +1550,6 @@ index 0000000000000000000000000000000000000000..889a487e24721a8ecfef91f5a655892a
15501550
+ "lib/internal/http2/compat.js",
15511551
+ "lib/internal/http2/core.js",
15521552
+ "lib/internal/http2/util.js",
1553-
+ "lib/internal/idna.js",
15541553
+ "lib/internal/inspector_async_hook.js",
15551554
+ "lib/internal/inspector_network_tracking.js",
15561555
+ "lib/internal/js_stream_socket.js",

patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ index 697b8bba6a55358924d6986f2eb347a99ff73889..bdf1a1f33f3ea09d933757c7fee87c56
4040
# list in v8/BUILD.gn.
4141
['v8_enable_v8_checks == 1', {
4242
diff --git a/configure.py b/configure.py
43-
index a6f66c41f75bffcfaf75d4415c694300b7624136..7ca0762fe3590fef7b88ba684de44d99aaecace4 100755
43+
index 0d089c35d1720e05c4c61d0226a2ebc276b65d6e..cf19b9d092698e1697508e8891926947bc2f7b12 100755
4444
--- a/configure.py
4545
+++ b/configure.py
4646
@@ -1585,6 +1585,7 @@ def configure_library(lib, output, pkgname=None):

patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ index 364469160af5e348f8890417de16a63c0d1dca67..75d5f58fe02fa8cfa7716ffaf761d567
2626
try {
2727
resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
2828
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
29-
index ea7afd52fab1cf3fde1674be1429a00562b714c0..02cfc8b3328fedb6306abf6c738bea772c674458 100644
29+
index a05d2846050c2f505eac16320f645e79182a27f6..348bb80ef7fae1e0e5f529b1313093eeadad9276 100644
3030
--- a/lib/internal/process/pre_execution.js
3131
+++ b/lib/internal/process/pre_execution.js
3232
@@ -247,12 +247,14 @@ function patchProcessObject(expandArgv1) {

patches/node/chore_remove_--no-harmony-atomics_related_code.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This patch can be removed when Node.js upgrades to a version of V8 containing
99
the above CL.
1010

1111
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
12-
index 74e867ace6207751a96b4da03802b50b620dbd7b..53ceabeb58f56ebd27e60fd49c362d26e361e6d8 100644
12+
index c028204481d44cb5f35ad98413022e7b07ce04b2..230c2378996c5d1ec18a9183ef138bbf70bba22d 100644
1313
--- a/lib/.eslintrc.yaml
1414
+++ b/lib/.eslintrc.yaml
1515
@@ -30,10 +30,6 @@ rules:
@@ -24,10 +24,10 @@ index 74e867ace6207751a96b4da03802b50b620dbd7b..53ceabeb58f56ebd27e60fd49c362d26
2424
message: Use `const { Blob } = require('buffer');` instead of the global.
2525
- name: BroadcastChannel
2626
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
27-
index 30f7a5f79e50fdeb4e1775a0e56dafa4c6908898..f7250985277c4127425ef36dff566c1fe06603e2 100644
27+
index cfd1d1b6f18e2943e155cf021b566a4673f71ab0..8d1a184ad1936c0d8493d6c54c32bebcf0021d8b 100644
2828
--- a/lib/internal/main/worker_thread.js
2929
+++ b/lib/internal/main/worker_thread.js
30-
@@ -112,7 +112,7 @@ port.on('message', (message) => {
30+
@@ -113,7 +113,7 @@ port.on('message', (message) => {
3131

3232
require('internal/worker').assignEnvironmentData(environmentData);
3333

patches/node/chore_remove_use_of_deprecated_kmaxlength.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ index 606a6f5caa3b11b6d2a9068ed2fd65800530a5eb..080dcce21da05ccea398d8a856deb397
2121
typedef void (*FreeCallback)(char* data, void* hint);
2222

2323
diff --git a/src/node_errors.h b/src/node_errors.h
24-
index 1662491bac44311421eeb7ee35bb47c025162abf..a62b18e832986ee38d93b412b36020a2c22255a9 100644
24+
index ac07b96b5cad0f3502468c86745e2b341d338e1f..f51c4309ceec3f0dc5e07982fb789ff6663076ba 100644
2525
--- a/src/node_errors.h
2626
+++ b/src/node_errors.h
27-
@@ -230,7 +230,7 @@ inline v8::Local<v8::Object> ERR_BUFFER_TOO_LARGE(v8::Isolate* isolate) {
27+
@@ -235,7 +235,7 @@ inline v8::Local<v8::Object> ERR_BUFFER_TOO_LARGE(v8::Isolate* isolate) {
2828
char message[128];
2929
snprintf(message, sizeof(message),
3030
"Cannot create a Buffer larger than 0x%zx bytes",

patches/node/enable_crashpad_linux_node_processes.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ to child processes spawned with `ELECTRON_RUN_AS_NODE` which is used
88
by the crashpad client to connect with the handler process.
99

1010
diff --git a/lib/child_process.js b/lib/child_process.js
11-
index 48870b35ad0f3411f2d509b12d92a9e0d20046f9..e7ef454d2d71207ae7b2788a437b82bf7732716e 100644
11+
index cc81cb373d59dbc1ab18182aa2a0c8ebe63f6245..d3871405e2ecb3917b8ec816490c575891c91d18 100644
1212
--- a/lib/child_process.js
1313
+++ b/lib/child_process.js
1414
@@ -61,6 +61,7 @@ let debug = require('internal/util/debuglog').debuglog(

patches/node/fix_assert_module_in_the_renderer_process.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ index b9098d102b40adad7fafcc331ac62870617019b9..cb9269a31e073caf86164aa39c064037
5858
}
5959

6060
diff --git a/src/node_options.cc b/src/node_options.cc
61-
index 818baf611fcab7838a339f3ea137467653e270d0..4e3c82e9528b04fd1a0cc99d30fb885e4b224bc9 100644
61+
index efbe48e10b8408642a6b5010b1a7a3749068188a..9b5f49ebb478a21acf8f0d6ed012ed6829a8a320 100644
6262
--- a/src/node_options.cc
6363
+++ b/src/node_options.cc
6464
@@ -1405,14 +1405,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {

patches/node/fix_do_not_resolve_electron_entrypoints.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ index f3dfc69cd2cdec50bc3b3f7cb2d63349812d87dd..b6f2d7194cb75ecc8c47869761c63184
3333
if (!loaded) {
3434
module = new CJSModule(filename);
3535
diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
36-
index ca401044c0178c46db9b439b27c440a5d7924c84..dc1a682f0a3cf1ba1095c60bf6a6ca992d6043b3 100644
36+
index 4ad694debfc72f56dd98a4e56dd0bbc63711242e..73f0e00ad34132e7d2fd37ec321110881e89617f 100644
3737
--- a/lib/internal/modules/run_main.js
3838
+++ b/lib/internal/modules/run_main.js
3939
@@ -2,6 +2,7 @@
@@ -58,7 +58,7 @@ index ca401044c0178c46db9b439b27c440a5d7924c84..dc1a682f0a3cf1ba1095c60bf6a6ca99
5858
const defaultType = getOptionValue('--experimental-default-type');
5959
/** @type {string} */
6060
let mainPath;
61-
@@ -59,6 +67,13 @@ function resolveMainPath(main) {
61+
@@ -58,6 +66,13 @@ function resolveMainPath(main) {
6262
* @param {string} mainPath - Absolute path to the main entry point
6363
*/
6464
function shouldUseESMLoader(mainPath) {

patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ index 990638ec3993bde40ad3dd40d373d816ebc66a6a..63d971e1fe6b861e29c12f04563701b0
353353
} // namespace
354354

355355
diff --git a/src/env.h b/src/env.h
356-
index 30561ab7a24c734be71ed29d963c11e2ea2c2b22..7cb77fb4f35a60fbda5b868798321ac8b6340bfa 100644
356+
index 2ec0a56e05ff879df8c55bf140677e571a56fafa..a30c25a3a61dfe73944731760404c555f2782d72 100644
357357
--- a/src/env.h
358358
+++ b/src/env.h
359359
@@ -49,7 +49,7 @@
@@ -365,7 +365,7 @@ index 30561ab7a24c734be71ed29d963c11e2ea2c2b22..7cb77fb4f35a60fbda5b868798321ac8
365365
#include <openssl/evp.h>
366366
#endif
367367

368-
@@ -1065,7 +1065,7 @@ class Environment : public MemoryRetainer {
368+
@@ -1051,7 +1051,7 @@ class Environment : public MemoryRetainer {
369369
kExitInfoFieldCount
370370
};
371371

@@ -388,7 +388,7 @@ index cf051585e779e2b03bd7b95fe5008b89cc7f8162..9de49c6828468fdf846dcd4ad445390f
388388
#if NODE_OPENSSL_HAS_QUIC
389389
#include <openssl/quic.h>
390390
diff --git a/src/node_options.cc b/src/node_options.cc
391-
index dba59c5560c22899bd108789360f21fd85dd41bf..818baf611fcab7838a339f3ea137467653e270d0 100644
391+
index e325b082dec6ae891a737a4fa7775937e4d7b7f9..efbe48e10b8408642a6b5010b1a7a3749068188a 100644
392392
--- a/src/node_options.cc
393393
+++ b/src/node_options.cc
394394
@@ -6,7 +6,7 @@

0 commit comments

Comments
 (0)