Skip to content

Commit d004ed6

Browse files
electron-roller[bot]jkleinsc
electron-roller[bot]
and
jkleinsc
authored
chore: bump node to v20.18.1 (32-x-y) (#44779)
* 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 3137994 commit d004ed6

18 files changed

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

‎patches/chromium/cherry-pick-923797bac925.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Yoshisato Yanagisawa <[email protected]>
33
Date: Thu, 7 Nov 2024 10:14:59 +0000
4-
Subject: [M131] Make GetCacheIdentifier() respect GetSkipServiceWorker().
4+
Subject: Make GetCacheIdentifier() respect GetSkipServiceWorker().
55

66
Since the current GetCacheIdentifier() ignores GetSkipServiceWorker(),
77
GetCacheIdentifier() returns ServiceWorkerId even if GetSkipServiceWorker()

‎patches/chromium/cherry-pick-e699ac35ac6c.patch

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From e699ac35ac6c565f6cc24cb98719b922a319e600 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Reilly Grant <[email protected]>
33
Date: Tue, 29 Oct 2024 22:45:33 +0000
4-
Subject: [PATCH] [M-130] serial: Cancel mojo::SimpleWatcher when source/sink become garbage
4+
Subject: serial: Cancel mojo::SimpleWatcher when source/sink become garbage
55

66
SerialPortUnderlyingSink and SerialPortUnderlyingSource need
77
prefinalizers so that when they become garbage the mojo::SimpleWatcher
@@ -20,13 +20,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5976472
2020
Commit-Queue: Reilly Grant <[email protected]>
2121
Cr-Commit-Position: refs/branch-heads/6723@{#1569}
2222
Cr-Branched-From: 985f2961df230630f9cbd75bd6fe463009855a11-refs/heads/main@{#1356013}
23-
---
2423

2524
diff --git a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
26-
index 6aefbb5..a469a00c 100644
25+
index 6aefbb59425ff7fc9096deba9841d1e022cf8a05..a469a00c372499295bc947bfcc0230c9a1e911e7 100644
2726
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
2827
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
29-
@@ -268,4 +268,10 @@
28+
@@ -268,4 +268,10 @@ void SerialPortUnderlyingSink::PipeClosed() {
3029
abort_handle_.Clear();
3130
}
3231

@@ -38,10 +37,10 @@ index 6aefbb5..a469a00c 100644
3837
+
3938
} // namespace blink
4039
diff --git a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h
41-
index a32b0421..b4e664a 100644
40+
index a32b04212f968479465a495e0cf402402d1b7e4d..b4e664a6debfd3b7c319ef3972774f693da48857 100644
4241
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h
4342
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h
44-
@@ -20,6 +20,8 @@
43+
@@ -20,6 +20,8 @@ class SerialPort;
4544
class WritableStreamDefaultController;
4645

4746
class SerialPortUnderlyingSink final : public UnderlyingSinkBase {
@@ -50,7 +49,7 @@ index a32b0421..b4e664a 100644
5049
public:
5150
SerialPortUnderlyingSink(SerialPort*, mojo::ScopedDataPipeProducerHandle);
5251

53-
@@ -46,6 +48,7 @@
52+
@@ -46,6 +48,7 @@ class SerialPortUnderlyingSink final : public UnderlyingSinkBase {
5453
void OnFlushOrDrain();
5554
void WriteData();
5655
void PipeClosed();
@@ -59,10 +58,10 @@ index a32b0421..b4e664a 100644
5958
mojo::ScopedDataPipeProducerHandle data_pipe_;
6059
mojo::SimpleWatcher watcher_;
6160
diff --git a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc
62-
index 6d2911c..6753be0 100644
61+
index 13ffa6e40e4f4c3a4888100a70b78e39cd2a9768..fdc88308a8d668268822e05285da5f0a2701b50c 100644
6362
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc
6463
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc
65-
@@ -224,4 +224,10 @@
64+
@@ -224,4 +224,10 @@ void SerialPortUnderlyingSource::Close() {
6665
data_pipe_.reset();
6766
}
6867

@@ -74,7 +73,7 @@ index 6d2911c..6753be0 100644
7473
+
7574
} // namespace blink
7675
diff --git a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h
77-
index 4066e98..0de89d2d 100644
76+
index 4066e9822197f1a94c58b4784d5dcbe73885ea04..0de89d2d991b364e700d756f48eea81f51e0f468 100644
7877
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h
7978
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h
8079
@@ -12,6 +12,7 @@
@@ -85,7 +84,7 @@ index 4066e98..0de89d2d 100644
8584

8685
namespace blink {
8786

88-
@@ -20,6 +21,8 @@
87+
@@ -20,6 +21,8 @@ class SerialPort;
8988

9089
class SerialPortUnderlyingSource : public UnderlyingByteSourceBase,
9190
ExecutionContextLifecycleObserver {
@@ -94,7 +93,7 @@ index 4066e98..0de89d2d 100644
9493
public:
9594
SerialPortUnderlyingSource(ScriptState*,
9695
SerialPort*,
97-
@@ -47,6 +50,7 @@
96+
@@ -47,6 +50,7 @@ class SerialPortUnderlyingSource : public UnderlyingByteSourceBase,
9897
void OnFlush(ScriptPromiseResolver<IDLUndefined>*);
9998
void PipeClosed();
10099
void Close();

‎patches/chromium/wayland_support_outgoing_dnd_sessions_with_no_offered_mime_types.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Reviewed-by: Orko Garai <[email protected]>
3131
Cr-Commit-Position: refs/heads/main@{#1380008}
3232

3333
diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
34-
index 3d63985300269fb33707ead548665d5e99ebdbf3..22cb6406bc4f667b949c23690bedf1f59d988faa 100644
34+
index 278022f08b334e5255e2f129fd609d1e3db9b9c1..d82f8e551addb2687a644ab359bb02bbd86784d7 100644
3535
--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
3636
+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
3737
@@ -54,6 +54,16 @@ namespace {
@@ -71,7 +71,7 @@ index 3d63985300269fb33707ead548665d5e99ebdbf3..22cb6406bc4f667b949c23690bedf1f5
7171
data_source_->SetDndActions(DragOperationsToDndActions(operations));
7272

7373
// Create drag icon surface (if any) and store the data to be exchanged.
74-
@@ -788,11 +806,6 @@ WaylandDataDragController::GetAndValidateSerialForDrag(DragEventSource source) {
74+
@@ -774,11 +792,6 @@ WaylandDataDragController::GetAndValidateSerialForDrag(DragEventSource source) {
7575
: std::nullopt;
7676
}
7777

@@ -84,7 +84,7 @@ index 3d63985300269fb33707ead548665d5e99ebdbf3..22cb6406bc4f667b949c23690bedf1f5
8484
WaylandDataDragController::GetOfferedExchangeDataProvider() const {
8585
DCHECK(offered_exchange_data_provider_);
8686
diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
87-
index fd64adeeec3a715c278957e1ef934a8e53d07953..a7453424c0e3de7c62b912c4bce86156914d93f3 100644
87+
index 93ef8583156ca925544eaa35bc50892c18a9cb56..de2cdd9ed8dd51492a1e7312437235350df9073b 100644
8888
--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
8989
+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
9090
@@ -216,7 +216,6 @@ class WaylandDataDragController : public WaylandDataDevice::DragDelegate,

‎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/ci_ensure_node_tests_set_electron_run_as_node.patch

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

1010
diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js
11-
index a22455160bd9f71b42c7c9e09939781b2528dceb..233a0c8fb89df91890237e4e7f53b51f245ff64a 100644
11+
index cebaa680e4f2a8249a307815e4254e56ace662ae..b19e7c04fa46b5503c5619b8b1555e51fc9155ce 100644
1212
--- a/test/common/assertSnapshot.js
1313
+++ b/test/common/assertSnapshot.js
1414
@@ -83,6 +83,7 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ...

0 commit comments

Comments
 (0)