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

https://github.com/nodejs/node/pull/55050

* buffer: fix out of range for toString

https://github.com/nodejs/node/pull/54553

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2024-11-22 09:36:58 -05:00 committed by GitHub
parent 3137994b4a
commit d004ed620a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 54 additions and 42 deletions

2
DEPS
View file

@ -4,7 +4,7 @@ vars = {
'chromium_version': 'chromium_version':
'128.0.6613.186', '128.0.6613.186',
'node_version': 'node_version':
'v20.18.0', 'v20.18.1',
'nan_version': 'nan_version':
'e14bdcd1f72d62bca1d541b66da43130384ec213', 'e14bdcd1f72d62bca1d541b66da43130384ec213',
'squirrel.mac_version': 'squirrel.mac_version':

View file

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yoshisato Yanagisawa <yyanagisawa@chromium.org> From: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Date: Thu, 7 Nov 2024 10:14:59 +0000 Date: Thu, 7 Nov 2024 10:14:59 +0000
Subject: [M131] Make GetCacheIdentifier() respect GetSkipServiceWorker(). Subject: Make GetCacheIdentifier() respect GetSkipServiceWorker().
Since the current GetCacheIdentifier() ignores GetSkipServiceWorker(), Since the current GetCacheIdentifier() ignores GetSkipServiceWorker(),
GetCacheIdentifier() returns ServiceWorkerId even if GetSkipServiceWorker() GetCacheIdentifier() returns ServiceWorkerId even if GetSkipServiceWorker()

View file

@ -1,7 +1,7 @@
From e699ac35ac6c565f6cc24cb98719b922a319e600 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Reilly Grant <reillyg@chromium.org> From: Reilly Grant <reillyg@chromium.org>
Date: Tue, 29 Oct 2024 22:45:33 +0000 Date: Tue, 29 Oct 2024 22:45:33 +0000
Subject: [PATCH] [M-130] serial: Cancel mojo::SimpleWatcher when source/sink become garbage Subject: serial: Cancel mojo::SimpleWatcher when source/sink become garbage
SerialPortUnderlyingSink and SerialPortUnderlyingSource need SerialPortUnderlyingSink and SerialPortUnderlyingSource need
prefinalizers so that when they become garbage the mojo::SimpleWatcher 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
Commit-Queue: Reilly Grant <reillyg@chromium.org> Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/branch-heads/6723@{#1569} Cr-Commit-Position: refs/branch-heads/6723@{#1569}
Cr-Branched-From: 985f2961df230630f9cbd75bd6fe463009855a11-refs/heads/main@{#1356013} Cr-Branched-From: 985f2961df230630f9cbd75bd6fe463009855a11-refs/heads/main@{#1356013}
---
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 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
index 6aefbb5..a469a00c 100644 index 6aefbb59425ff7fc9096deba9841d1e022cf8a05..a469a00c372499295bc947bfcc0230c9a1e911e7 100644
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc --- a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc +++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
@@ -268,4 +268,10 @@ @@ -268,4 +268,10 @@ void SerialPortUnderlyingSink::PipeClosed() {
abort_handle_.Clear(); abort_handle_.Clear();
} }
@ -38,10 +37,10 @@ index 6aefbb5..a469a00c 100644
+ +
} // namespace blink } // namespace blink
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 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
index a32b0421..b4e664a 100644 index a32b04212f968479465a495e0cf402402d1b7e4d..b4e664a6debfd3b7c319ef3972774f693da48857 100644
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h --- a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h +++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@ class SerialPort;
class WritableStreamDefaultController; class WritableStreamDefaultController;
class SerialPortUnderlyingSink final : public UnderlyingSinkBase { class SerialPortUnderlyingSink final : public UnderlyingSinkBase {
@ -50,7 +49,7 @@ index a32b0421..b4e664a 100644
public: public:
SerialPortUnderlyingSink(SerialPort*, mojo::ScopedDataPipeProducerHandle); SerialPortUnderlyingSink(SerialPort*, mojo::ScopedDataPipeProducerHandle);
@@ -46,6 +48,7 @@ @@ -46,6 +48,7 @@ class SerialPortUnderlyingSink final : public UnderlyingSinkBase {
void OnFlushOrDrain(); void OnFlushOrDrain();
void WriteData(); void WriteData();
void PipeClosed(); void PipeClosed();
@ -59,10 +58,10 @@ index a32b0421..b4e664a 100644
mojo::ScopedDataPipeProducerHandle data_pipe_; mojo::ScopedDataPipeProducerHandle data_pipe_;
mojo::SimpleWatcher watcher_; mojo::SimpleWatcher watcher_;
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 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
index 6d2911c..6753be0 100644 index 13ffa6e40e4f4c3a4888100a70b78e39cd2a9768..fdc88308a8d668268822e05285da5f0a2701b50c 100644
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc --- a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc +++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc
@@ -224,4 +224,10 @@ @@ -224,4 +224,10 @@ void SerialPortUnderlyingSource::Close() {
data_pipe_.reset(); data_pipe_.reset();
} }
@ -74,7 +73,7 @@ index 6d2911c..6753be0 100644
+ +
} // namespace blink } // namespace blink
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 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
index 4066e98..0de89d2d 100644 index 4066e9822197f1a94c58b4784d5dcbe73885ea04..0de89d2d991b364e700d756f48eea81f51e0f468 100644
--- a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h --- a/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h
+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h +++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@ -85,7 +84,7 @@ index 4066e98..0de89d2d 100644
namespace blink { namespace blink {
@@ -20,6 +21,8 @@ @@ -20,6 +21,8 @@ class SerialPort;
class SerialPortUnderlyingSource : public UnderlyingByteSourceBase, class SerialPortUnderlyingSource : public UnderlyingByteSourceBase,
ExecutionContextLifecycleObserver { ExecutionContextLifecycleObserver {
@ -94,7 +93,7 @@ index 4066e98..0de89d2d 100644
public: public:
SerialPortUnderlyingSource(ScriptState*, SerialPortUnderlyingSource(ScriptState*,
SerialPort*, SerialPort*,
@@ -47,6 +50,7 @@ @@ -47,6 +50,7 @@ class SerialPortUnderlyingSource : public UnderlyingByteSourceBase,
void OnFlush(ScriptPromiseResolver<IDLUndefined>*); void OnFlush(ScriptPromiseResolver<IDLUndefined>*);
void PipeClosed(); void PipeClosed();
void Close(); void Close();

View file

@ -31,7 +31,7 @@ Reviewed-by: Orko Garai <orko@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1380008} Cr-Commit-Position: refs/heads/main@{#1380008}
diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
index 3d63985300269fb33707ead548665d5e99ebdbf3..22cb6406bc4f667b949c23690bedf1f59d988faa 100644 index 278022f08b334e5255e2f129fd609d1e3db9b9c1..d82f8e551addb2687a644ab359bb02bbd86784d7 100644
--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc --- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc +++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
@@ -54,6 +54,16 @@ namespace { @@ -54,6 +54,16 @@ namespace {
@ -71,7 +71,7 @@ index 3d63985300269fb33707ead548665d5e99ebdbf3..22cb6406bc4f667b949c23690bedf1f5
data_source_->SetDndActions(DragOperationsToDndActions(operations)); data_source_->SetDndActions(DragOperationsToDndActions(operations));
// Create drag icon surface (if any) and store the data to be exchanged. // Create drag icon surface (if any) and store the data to be exchanged.
@@ -788,11 +806,6 @@ WaylandDataDragController::GetAndValidateSerialForDrag(DragEventSource source) { @@ -774,11 +792,6 @@ WaylandDataDragController::GetAndValidateSerialForDrag(DragEventSource source) {
: std::nullopt; : std::nullopt;
} }
@ -84,7 +84,7 @@ index 3d63985300269fb33707ead548665d5e99ebdbf3..22cb6406bc4f667b949c23690bedf1f5
WaylandDataDragController::GetOfferedExchangeDataProvider() const { WaylandDataDragController::GetOfferedExchangeDataProvider() const {
DCHECK(offered_exchange_data_provider_); DCHECK(offered_exchange_data_provider_);
diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
index fd64adeeec3a715c278957e1ef934a8e53d07953..a7453424c0e3de7c62b912c4bce86156914d93f3 100644 index 93ef8583156ca925544eaa35bc50892c18a9cb56..de2cdd9ed8dd51492a1e7312437235350df9073b 100644
--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h --- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h +++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
@@ -216,7 +216,6 @@ class WaylandDataDragController : public WaylandDataDevice::DragDelegate, @@ -216,7 +216,6 @@ class WaylandDataDragController : public WaylandDataDevice::DragDelegate,

View file

@ -1268,10 +1268,10 @@ index 0000000000000000000000000000000000000000..af9cbada10203b387fb9732b346583b1
+} +}
diff --git a/filenames.json b/filenames.json diff --git a/filenames.json b/filenames.json
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..889a487e24721a8ecfef91f5a655892a607bb12f index 0000000000000000000000000000000000000000..c429d4cbfff605ff78c7c8ee3c5ad046594163f3
--- /dev/null --- /dev/null
+++ b/filenames.json +++ b/filenames.json
@@ -0,0 +1,741 @@ @@ -0,0 +1,740 @@
+// This file is automatically generated by generate_gn_filenames_json.py +// This file is automatically generated by generate_gn_filenames_json.py
+// DO NOT EDIT +// DO NOT EDIT
+{ +{
@ -1550,7 +1550,6 @@ index 0000000000000000000000000000000000000000..889a487e24721a8ecfef91f5a655892a
+ "lib/internal/http2/compat.js", + "lib/internal/http2/compat.js",
+ "lib/internal/http2/core.js", + "lib/internal/http2/core.js",
+ "lib/internal/http2/util.js", + "lib/internal/http2/util.js",
+ "lib/internal/idna.js",
+ "lib/internal/inspector_async_hook.js", + "lib/internal/inspector_async_hook.js",
+ "lib/internal/inspector_network_tracking.js", + "lib/internal/inspector_network_tracking.js",
+ "lib/internal/js_stream_socket.js", + "lib/internal/js_stream_socket.js",

View file

@ -40,7 +40,7 @@ index 697b8bba6a55358924d6986f2eb347a99ff73889..bdf1a1f33f3ea09d933757c7fee87c56
# list in v8/BUILD.gn. # list in v8/BUILD.gn.
['v8_enable_v8_checks == 1', { ['v8_enable_v8_checks == 1', {
diff --git a/configure.py b/configure.py diff --git a/configure.py b/configure.py
index a6f66c41f75bffcfaf75d4415c694300b7624136..7ca0762fe3590fef7b88ba684de44d99aaecace4 100755 index 0d089c35d1720e05c4c61d0226a2ebc276b65d6e..cf19b9d092698e1697508e8891926947bc2f7b12 100755
--- a/configure.py --- a/configure.py
+++ b/configure.py +++ b/configure.py
@@ -1585,6 +1585,7 @@ def configure_library(lib, output, pkgname=None): @@ -1585,6 +1585,7 @@ def configure_library(lib, output, pkgname=None):

View file

@ -26,7 +26,7 @@ index 364469160af5e348f8890417de16a63c0d1dca67..75d5f58fe02fa8cfa7716ffaf761d567
try { try {
resolvedArgv = Module._resolveFilename(process.argv[1], null, false); resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
index ea7afd52fab1cf3fde1674be1429a00562b714c0..02cfc8b3328fedb6306abf6c738bea772c674458 100644 index a05d2846050c2f505eac16320f645e79182a27f6..348bb80ef7fae1e0e5f529b1313093eeadad9276 100644
--- a/lib/internal/process/pre_execution.js --- a/lib/internal/process/pre_execution.js
+++ b/lib/internal/process/pre_execution.js +++ b/lib/internal/process/pre_execution.js
@@ -247,12 +247,14 @@ function patchProcessObject(expandArgv1) { @@ -247,12 +247,14 @@ function patchProcessObject(expandArgv1) {

View file

@ -9,7 +9,7 @@ This patch can be removed when Node.js upgrades to a version of V8 containing
the above CL. the above CL.
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
index 74e867ace6207751a96b4da03802b50b620dbd7b..53ceabeb58f56ebd27e60fd49c362d26e361e6d8 100644 index c028204481d44cb5f35ad98413022e7b07ce04b2..230c2378996c5d1ec18a9183ef138bbf70bba22d 100644
--- a/lib/.eslintrc.yaml --- a/lib/.eslintrc.yaml
+++ b/lib/.eslintrc.yaml +++ b/lib/.eslintrc.yaml
@@ -30,10 +30,6 @@ rules: @@ -30,10 +30,6 @@ rules:
@ -24,10 +24,10 @@ index 74e867ace6207751a96b4da03802b50b620dbd7b..53ceabeb58f56ebd27e60fd49c362d26
message: Use `const { Blob } = require('buffer');` instead of the global. message: Use `const { Blob } = require('buffer');` instead of the global.
- name: BroadcastChannel - name: BroadcastChannel
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
index 30f7a5f79e50fdeb4e1775a0e56dafa4c6908898..f7250985277c4127425ef36dff566c1fe06603e2 100644 index cfd1d1b6f18e2943e155cf021b566a4673f71ab0..8d1a184ad1936c0d8493d6c54c32bebcf0021d8b 100644
--- a/lib/internal/main/worker_thread.js --- a/lib/internal/main/worker_thread.js
+++ b/lib/internal/main/worker_thread.js +++ b/lib/internal/main/worker_thread.js
@@ -112,7 +112,7 @@ port.on('message', (message) => { @@ -113,7 +113,7 @@ port.on('message', (message) => {
require('internal/worker').assignEnvironmentData(environmentData); require('internal/worker').assignEnvironmentData(environmentData);

View file

@ -21,10 +21,10 @@ index 606a6f5caa3b11b6d2a9068ed2fd65800530a5eb..080dcce21da05ccea398d8a856deb397
typedef void (*FreeCallback)(char* data, void* hint); typedef void (*FreeCallback)(char* data, void* hint);
diff --git a/src/node_errors.h b/src/node_errors.h diff --git a/src/node_errors.h b/src/node_errors.h
index 1662491bac44311421eeb7ee35bb47c025162abf..a62b18e832986ee38d93b412b36020a2c22255a9 100644 index ac07b96b5cad0f3502468c86745e2b341d338e1f..f51c4309ceec3f0dc5e07982fb789ff6663076ba 100644
--- a/src/node_errors.h --- a/src/node_errors.h
+++ b/src/node_errors.h +++ b/src/node_errors.h
@@ -230,7 +230,7 @@ inline v8::Local<v8::Object> ERR_BUFFER_TOO_LARGE(v8::Isolate* isolate) { @@ -235,7 +235,7 @@ inline v8::Local<v8::Object> ERR_BUFFER_TOO_LARGE(v8::Isolate* isolate) {
char message[128]; char message[128];
snprintf(message, sizeof(message), snprintf(message, sizeof(message),
"Cannot create a Buffer larger than 0x%zx bytes", "Cannot create a Buffer larger than 0x%zx bytes",

View file

@ -8,7 +8,7 @@ which causes the `ELECTRON_RUN_AS_NODE` variable to be lost. This patch
re-injects it. re-injects it.
diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js
index a22455160bd9f71b42c7c9e09939781b2528dceb..233a0c8fb89df91890237e4e7f53b51f245ff64a 100644 index cebaa680e4f2a8249a307815e4254e56ace662ae..b19e7c04fa46b5503c5619b8b1555e51fc9155ce 100644
--- a/test/common/assertSnapshot.js --- a/test/common/assertSnapshot.js
+++ b/test/common/assertSnapshot.js +++ b/test/common/assertSnapshot.js
@@ -83,6 +83,7 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ... @@ -83,6 +83,7 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ...

View file

@ -8,7 +8,7 @@ to child processes spawned with `ELECTRON_RUN_AS_NODE` which is used
by the crashpad client to connect with the handler process. by the crashpad client to connect with the handler process.
diff --git a/lib/child_process.js b/lib/child_process.js diff --git a/lib/child_process.js b/lib/child_process.js
index 48870b35ad0f3411f2d509b12d92a9e0d20046f9..e7ef454d2d71207ae7b2788a437b82bf7732716e 100644 index cc81cb373d59dbc1ab18182aa2a0c8ebe63f6245..d3871405e2ecb3917b8ec816490c575891c91d18 100644
--- a/lib/child_process.js --- a/lib/child_process.js
+++ b/lib/child_process.js +++ b/lib/child_process.js
@@ -61,6 +61,7 @@ let debug = require('internal/util/debuglog').debuglog( @@ -61,6 +61,7 @@ let debug = require('internal/util/debuglog').debuglog(

View file

@ -58,7 +58,7 @@ index b9098d102b40adad7fafcc331ac62870617019b9..cb9269a31e073caf86164aa39c064037
} }
diff --git a/src/node_options.cc b/src/node_options.cc diff --git a/src/node_options.cc b/src/node_options.cc
index 818baf611fcab7838a339f3ea137467653e270d0..4e3c82e9528b04fd1a0cc99d30fb885e4b224bc9 100644 index efbe48e10b8408642a6b5010b1a7a3749068188a..9b5f49ebb478a21acf8f0d6ed012ed6829a8a320 100644
--- a/src/node_options.cc --- a/src/node_options.cc
+++ b/src/node_options.cc +++ b/src/node_options.cc
@@ -1405,14 +1405,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) { @@ -1405,14 +1405,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {

View file

@ -33,7 +33,7 @@ index f3dfc69cd2cdec50bc3b3f7cb2d63349812d87dd..b6f2d7194cb75ecc8c47869761c63184
if (!loaded) { if (!loaded) {
module = new CJSModule(filename); module = new CJSModule(filename);
diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
index ca401044c0178c46db9b439b27c440a5d7924c84..dc1a682f0a3cf1ba1095c60bf6a6ca992d6043b3 100644 index 4ad694debfc72f56dd98a4e56dd0bbc63711242e..73f0e00ad34132e7d2fd37ec321110881e89617f 100644
--- a/lib/internal/modules/run_main.js --- a/lib/internal/modules/run_main.js
+++ b/lib/internal/modules/run_main.js +++ b/lib/internal/modules/run_main.js
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
@ -58,7 +58,7 @@ index ca401044c0178c46db9b439b27c440a5d7924c84..dc1a682f0a3cf1ba1095c60bf6a6ca99
const defaultType = getOptionValue('--experimental-default-type'); const defaultType = getOptionValue('--experimental-default-type');
/** @type {string} */ /** @type {string} */
let mainPath; let mainPath;
@@ -59,6 +67,13 @@ function resolveMainPath(main) { @@ -58,6 +66,13 @@ function resolveMainPath(main) {
* @param {string} mainPath - Absolute path to the main entry point * @param {string} mainPath - Absolute path to the main entry point
*/ */
function shouldUseESMLoader(mainPath) { function shouldUseESMLoader(mainPath) {

View file

@ -353,7 +353,7 @@ index 990638ec3993bde40ad3dd40d373d816ebc66a6a..63d971e1fe6b861e29c12f04563701b0
} // namespace } // namespace
diff --git a/src/env.h b/src/env.h diff --git a/src/env.h b/src/env.h
index 30561ab7a24c734be71ed29d963c11e2ea2c2b22..7cb77fb4f35a60fbda5b868798321ac8b6340bfa 100644 index 2ec0a56e05ff879df8c55bf140677e571a56fafa..a30c25a3a61dfe73944731760404c555f2782d72 100644
--- a/src/env.h --- a/src/env.h
+++ b/src/env.h +++ b/src/env.h
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
@ -365,7 +365,7 @@ index 30561ab7a24c734be71ed29d963c11e2ea2c2b22..7cb77fb4f35a60fbda5b868798321ac8
#include <openssl/evp.h> #include <openssl/evp.h>
#endif #endif
@@ -1065,7 +1065,7 @@ class Environment : public MemoryRetainer { @@ -1051,7 +1051,7 @@ class Environment : public MemoryRetainer {
kExitInfoFieldCount kExitInfoFieldCount
}; };
@ -388,7 +388,7 @@ index cf051585e779e2b03bd7b95fe5008b89cc7f8162..9de49c6828468fdf846dcd4ad445390f
#if NODE_OPENSSL_HAS_QUIC #if NODE_OPENSSL_HAS_QUIC
#include <openssl/quic.h> #include <openssl/quic.h>
diff --git a/src/node_options.cc b/src/node_options.cc diff --git a/src/node_options.cc b/src/node_options.cc
index dba59c5560c22899bd108789360f21fd85dd41bf..818baf611fcab7838a339f3ea137467653e270d0 100644 index e325b082dec6ae891a737a4fa7775937e4d7b7f9..efbe48e10b8408642a6b5010b1a7a3749068188a 100644
--- a/src/node_options.cc --- a/src/node_options.cc
+++ b/src/node_options.cc +++ b/src/node_options.cc
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@

View file

@ -16,7 +16,7 @@ patch:
(cherry picked from commit 30329d06235a9f9733b1d4da479b403462d1b326) (cherry picked from commit 30329d06235a9f9733b1d4da479b403462d1b326)
diff --git a/src/env-inl.h b/src/env-inl.h diff --git a/src/env-inl.h b/src/env-inl.h
index d98a32d6ec311459877bc3b0de33cca4766aeda7..9fc934975b015b97ddd84bf3eea5d53144130035 100644 index 852c82fd7f50c01d08eeddc151b1bec6afa68028..8f4b004d6655acd1c0dac449612316a48cf885c6 100644
--- a/src/env-inl.h --- a/src/env-inl.h
+++ b/src/env-inl.h +++ b/src/env-inl.h
@@ -62,31 +62,6 @@ inline uv_loop_t* IsolateData::event_loop() const { @@ -62,31 +62,6 @@ inline uv_loop_t* IsolateData::event_loop() const {
@ -52,7 +52,7 @@ index d98a32d6ec311459877bc3b0de33cca4766aeda7..9fc934975b015b97ddd84bf3eea5d531
return &(wrapper_data_->cppgc_id); return &(wrapper_data_->cppgc_id);
} }
diff --git a/src/env.cc b/src/env.cc diff --git a/src/env.cc b/src/env.cc
index 38802b1e9acf9b3e99fdc4f39770e896393befe3..e0433e29ca98c42a38d1da6d66085fdea1edde29 100644 index ca75e0360bbf6a20ea18e67dda167d5ec523b075..158b96a9b1ea5553fa74d2429152a5c974d50c03 100644
--- a/src/env.cc --- a/src/env.cc
+++ b/src/env.cc +++ b/src/env.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -146,7 +146,7 @@ index 38802b1e9acf9b3e99fdc4f39770e896393befe3..e0433e29ca98c42a38d1da6d66085fde
void IsolateData::MemoryInfo(MemoryTracker* tracker) const { void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
diff --git a/src/env.h b/src/env.h diff --git a/src/env.h b/src/env.h
index 7cb77fb4f35a60fbda5b868798321ac8b6340bfa..06746554e1d60a9377ff6d7d970220f3fa88e4ac 100644 index a30c25a3a61dfe73944731760404c555f2782d72..6137551bb8168d8fa9a3e6bc79c3d1e79b306931 100644
--- a/src/env.h --- a/src/env.h
+++ b/src/env.h +++ b/src/env.h
@@ -174,10 +174,6 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer { @@ -174,10 +174,6 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {

View file

@ -298,3 +298,17 @@ index 9787b14352753c5e0f8dc2b90093680e7cd10f1a..31af9e62396368af1b81f8841a705fd3
auto ab = ArrayBuffer::New(isolate, std::move(bs)); auto ab = ArrayBuffer::New(isolate, std::move(bs));
v8::Local<Uint8Array> u8 = v8::Uint8Array::New(ab, 0, 1); v8::Local<Uint8Array> u8 = v8::Uint8Array::New(ab, 0, 1);
diff --git a/test/parallel/test-buffer-tostring-range.js b/test/parallel/test-buffer-tostring-range.js
index 1167654dcf0773be953d09dfcf534e902e75595b..a769ec1fb61916d4285fa9d3559ded5df4f02e9e 100644
--- a/test/parallel/test-buffer-tostring-range.js
+++ b/test/parallel/test-buffer-tostring-range.js
@@ -103,6 +103,8 @@ assert.throws(() => {
// Cannot test on 32bit machine as we are testing the case
// when start and end are above the threshold
common.skipIf32Bits();
+/* Disabled due to incompatiblity with v8 memory cage
const threshold = 0xFFFFFFFF;
const largeBuffer = Buffer.alloc(threshold);
largeBuffer.toString('utf8', threshold + 0xF, threshold + 0xFF);
+*/
\ No newline at end of file

View file

@ -28,7 +28,7 @@ index 79a953df7da64b7d7580e099a5cc5160e7842999..94616df356cab50c8ef4099e7863f598
test-net-write-fully-async-hex-string: PASS, FLAKY test-net-write-fully-async-hex-string: PASS, FLAKY
# https://github.com/nodejs/node/issues/52273 # https://github.com/nodejs/node/issues/52273
diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status
index a539649d5537376a6a2ac9a7a46051b8648f0cb1..a03c86b752772be7ae36fab31faeccf3b0ccff64 100644 index 073b29cce8dbca4c8d92ad666f9244ad511296db..338d20263f29a630febb96567f3cb708623bd09a 100644
--- a/test/sequential/sequential.status --- a/test/sequential/sequential.status
+++ b/test/sequential/sequential.status +++ b/test/sequential/sequential.status
@@ -7,6 +7,18 @@ prefix sequential @@ -7,6 +7,18 @@ prefix sequential

View file

@ -7,10 +7,10 @@ Subject: test: match wpt/streams/transferable/transform-stream-members.any.js
All four of this calls should fail - see third_party/blink/web_tests/external/wpt/streams/transferable/transform-stream-members.any-expected.txt All four of this calls should fail - see third_party/blink/web_tests/external/wpt/streams/transferable/transform-stream-members.any-expected.txt
diff --git a/test/wpt/status/streams.json b/test/wpt/status/streams.json diff --git a/test/wpt/status/streams.json b/test/wpt/status/streams.json
index 5425c86bba85079a44745779d998337aaa063df1..775661cd59b14132c9a811e448792ea02198f949 100644 index af3646c65ea6609e17638da925f86de8c9d6221c..f1d9e76718c264aafb9c27c516589d9874d8b73f 100644
--- a/test/wpt/status/streams.json --- a/test/wpt/status/streams.json
+++ b/test/wpt/status/streams.json +++ b/test/wpt/status/streams.json
@@ -60,7 +60,9 @@ @@ -53,7 +53,9 @@
"fail": { "fail": {
"expected": [ "expected": [
"Transferring [object TransformStream],[object ReadableStream] should fail", "Transferring [object TransformStream],[object ReadableStream] should fail",