Skip to content

Commit 015e7a6

Browse files
electron-roller[bot]jkleinscGPT-5.3-Codexclaude
authored
chore: bump node to v24.18.0 (41-x-y) (#52104)
* chore: bump node in DEPS to v24.18.0 * fix(patch): crypto tests to run with BoringSSL Ref: nodejs/node@61b20f60a39 (cherry picked from commit 432172c) Co-Authored-By: GPT-5.3-Codex <[email protected]> * fix(patch): adapt ESM tests for Electron Ref: nodejs/node@69df688fff4 Co-Authored-By: GPT-5.3-Codex <[email protected]> (cherry picked from commit ce40736) * test: update JWK error message assertion for unsupported algorithm The error thrown for an unsupported OKP (Ed448) JWK changed from 'Invalid JWK data' to the more specific 'Invalid JWK OKP key'. Ref: nodejs/node#62499 (cherry picked from commit 5718143) * fix(patch): BoringSSL and OpenSSL incompatibilities Ref: nodejs/node@677ca7e76c9 Co-Authored-By: GPT-5.3-Codex <[email protected]> (cherry picked from commit 4d514ff) * fix(patch): expose built-in electron module in ESM loader Ref: nodejs/node@69df688fff4 Co-Authored-By: GPT-5.3-Codex <[email protected]> * test: disable parallel/test-runner-v8-deserializer This test synthesizes fake V8-serialized messages with the serialization format version hardcoded to 15 (0x0f). Electron bundles Chromium's V8, whose value-serializer format version is 16 (0x10), so the hardcoded headers are not recognized by the test runner's deserializer and the bytes fall through the UTF-8 stdout path (0xff -> U+FFFD), failing the assertions. The version difference is environmental and cannot be reconciled without re-patching the test on every V8 bump. The failing subtests were introduced upstream in nodejs/node#62704 (test_runner: avoid hanging on incomplete v8 frames). * docs: update node upgrade skill to reflect boringSSL updates * fix(patch): skip PQC crypto tests unsupported by BoringSSL Chromium 148's BoringSSL does not implement ML-KEM/ML-DSA/SLH-DSA, which upstream wired up for BoringSSL in nodejs/node#63255. Skip or disable the affected tests on BoringSSL for this Electron version. Ref: nodejs/node#63255 Co-Authored-By: Claude <[email protected]> * chore: update patches (trivial only) * fix(patch): gate BoringSSL PQC surface on BORINGSSL_API_VERSION Chromium 146 ships BoringSSL API version 39, which exposes the ML-DSA and ML-KEM NIDs but not the ML-KEM EVP_PKEY_ALG accessors, the ML-KEM encapsulate/decapsulate APIs, or EVP_PKEY_CTX_set1_signature_context_string. Those only became available at API version 40 (Chromium 148). Gate the BoringSSL PQC/KEM/signature-context capability macros on the API version so the older BoringSSL builds with PQC reported as unsupported. Ref: nodejs/node#63255 Co-Authored-By: GPT-5.3-Codex <[email protected]> * fix(patch): skip PQC tests unsupported by 41-x-y BoringSSL Chromium 146's BoringSSL (API v39) lacks ML-KEM and ML-DSA support, so guard the new PQC keygen/webcrypto tests that assume BoringSSL provides PQC (as it does on newer Chromium). Drops the boringssl PQC-enable disjunct so these tests skip on this branch's BoringSSL. Ref: nodejs/node#63255 Co-Authored-By: GPT-5.3-Codex <[email protected]> --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <[email protected]> Co-authored-by: GPT-5.3-Codex <[email protected]> Co-authored-by: Claude <[email protected]>
1 parent 9dbb737 commit 015e7a6

28 files changed

Lines changed: 427 additions & 1207 deletions

‎.claude/skills/electron-node-upgrade/SKILL.md‎

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -228,21 +228,48 @@ Electron runs a subset of Node.js's upstream test suite using a custom runner (`
228228

229229
### BoringSSL incompatibilities
230230

231-
Electron uses BoringSSL (via Chromium) instead of OpenSSL. Many crypto features are missing or behave differently:
231+
Electron builds Node.js against Chromium's BoringSSL instead of Node.js's bundled OpenSSL. As of the v24.18.0 roll this is wired up through a GN arg rather than large source patches:
232232

233-
| Unsupported in BoringSSL | Guard pattern |
234-
|--------------------------|---------------|
235-
| ChaCha20-Poly1305 | `if (!process.features.openssl_is_boringssl)` |
236-
| AES-CCM (aes-128-ccm, aes-256-ccm) | `if (ciphers.includes('aes-128-ccm'))` |
237-
| AES-KW (key wrapping) | `if (!process.features.openssl_is_boringssl)` |
238-
| DSA keys | `if (!process.features.openssl_is_boringssl)` |
239-
| Ed448 / X448 curves | `if (!process.features.openssl_is_boringssl)` |
240-
| DH key PEM loading | `if (!process.features.openssl_is_boringssl)` |
241-
| PQC algorithms (ML-KEM, ML-DSA, SLH-DSA) | `if (hasOpenSSL(3, 5))` (already guards these) |
233+
```gn
234+
# build/args/all.gn
235+
# Build Node.js against Chromium's BoringSSL instead of node's bundled OpenSSL.
236+
node_openssl_path = "//third_party/boringssl"
237+
```
238+
239+
Upstream Node.js now supports building against BoringSSL natively (see nodejs/node commits `677ca7e76c9` and `61b20f60a39`), so most of Electron's historical BoringSSL workarounds have been **eliminated**. During the v24.18.0 roll:
240+
241+
- `fix_crypto_tests_to_run_with_bssl.patch` shrank from ~1100 lines to skipping just two test files.
242+
- `fix_handle_boringssl_and_openssl_incompatibilities.patch` dropped ~176 lines. What remains is C++-level shimming in `deps/ncrypto/ncrypto.cc`, `src/crypto/crypto_{common,context,hash}.cc`, `src/env.h`, `src/node_metadata.h`, and `src/node_options.h`.
243+
244+
Expect to **delete** these workarounds over time rather than grow them. Only add a guard when a feature is genuinely still missing from BoringSSL; upstream tests increasingly self-skip when `process.features.openssl_is_boringssl` is set, so no Electron change is needed.
245+
246+
**Preferred guard for a still-unsupported feature** — skip the whole test file at the top, and add it to `fix_crypto_tests_to_run_with_bssl.patch`:
247+
248+
```js
249+
if (process.features.openssl_is_boringssl) {
250+
common.skip('Skipping unsupported ML-DSA key tests');
251+
}
252+
```
253+
254+
For tests that can't be cleanly guarded inline, add the whole file to `script/node-disabled-tests.json` instead.
255+
256+
**Still unsupported in Chromium's BoringSSL** (as of v24.18.0):
257+
258+
| Feature | Current handling |
259+
|---------|------------------|
260+
| RSA-PSS keygen (deprecation path) | file-level `common.skip` in `test-crypto-keygen-deprecation` |
261+
| ML-DSA keys | file-level `common.skip` in `test-crypto-pqc-key-objects-ml-dsa` |
262+
| ML-KEM keys | disabled in `node-disabled-tests.json` (`test-crypto-pqc-key-objects-ml-kem`) |
263+
| FIPS mode | disabled (`test-crypto-fips`) |
264+
| Secure heap | disabled (`test-crypto-secure-heap`) |
265+
| Stateless DH | disabled (`test-crypto-dh-stateless`) |
266+
| Assorted keygen / WebCrypto keygen | disabled (`test-crypto-keygen`, `test-webcrypto-keygen`, `wpt/test-webcrypto`) |
267+
268+
**Behavioral differences (assertion updates, not skips)** — some errors just changed shape:
242269
243-
When guarding tests, prefer checking cipher availability (`ciphers.includes(algo)`) over blanket BoringSSL checks where possible, as it's more precise and self-documenting.
270+
- Creating a private key from an unsupported OKP (Ed448) JWK now throws `Invalid JWK OKP key` (previously `Invalid JWK data`); see nodejs/node#62499. Electron's `spec/node-spec.ts` assertion was loosened to `/Invalid JWK/`.
244271

245-
New upstream tests that exercise these features will need guards added to the `fix_crypto_tests_to_run_with_bssl` patch.
272+
When you do need to guard a test, prefer a precise capability check (e.g. `ciphers.includes('aes-128-ccm')`) over a blanket `process.features.openssl_is_boringssl` check where the feature can be probed directly.
246273

247274
### Snapshot test mismatches
248275

@@ -300,8 +327,8 @@ Only add a test to `script/node-disabled-tests.json` as a **last resort** — wh
300327

301328
These patches consistently require the most work during Node.js upgrades:
302329

303-
- **`fix_handle_boringssl_and_openssl_incompatibilities.patch`** — Electron uses BoringSSL (via Chromium) while Node.js expects OpenSSL. This patch is large and complex, and upstream OpenSSL API changes frequently break it.
304-
- **`fix_crypto_tests_to_run_with_bssl.patch`** — Companion to the above; adapts Node.js crypto tests for BoringSSL. Can grow significantly during major upgrades.
330+
- **`fix_handle_boringssl_and_openssl_incompatibilities.patch`** — Electron uses BoringSSL (via Chromium) while Node.js expects OpenSSL. Historically large and complex, this patch was **greatly reduced** once Node.js gained native BoringSSL support (enabled via `node_openssl_path = "//third_party/boringssl"` in `build/args/all.gn`). It still shims some C++-level differences, and upstream OpenSSL/ncrypto API changes can break it.
331+
- **`fix_crypto_tests_to_run_with_bssl.patch`** — Companion to the above; adapts Node.js crypto tests for BoringSSL. Also **greatly reduced** now that upstream tests self-skip under BoringSSL — it mainly skips a handful of still-unsupported test files. See the "BoringSSL incompatibilities" section above.
305332
- **`support_v8_sandboxed_pointers.patch`** — V8 sandbox pointer support requires careful adaptation when V8 APIs change.
306333
- **`build_add_gn_build_files.patch`** — The GN build file patch is large and touches many build targets. Upstream build system changes frequently conflict.
307334

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'146.0.7680.216',
66
'node_version':
7-
'v24.17.0',
7+
'v24.18.0',
88
'nan_version':
99
'675cefebca42410733da8a454c8d9391fcebfbc2',
1010
'squirrel.mac_version':

‎build/args/all.gn‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ root_extra_deps = [ "//electron" ]
44
# Registry of NMVs --> https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json
55
node_module_version = 145
66

7+
# Build Node.js against Chromium's BoringSSL instead of node's bundled OpenSSL.
8+
node_openssl_path = "//third_party/boringssl"
9+
710
v8_promise_internal_field_count = 1
811
v8_embedder_string = "-electron.0"
912

‎patches/node/api_delete_deprecated_fields_on_v8_isolate.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: Delete deprecated fields on v8::Isolate
66
https://chromium-review.googlesource.com/c/v8/v8/+/7081397
77

88
diff --git a/src/api/environment.cc b/src/api/environment.cc
9-
index ececaae30e852e92bff0c2978fcb13c93ba61e97..c3a328684e5a4bc2fdbda22e33e77cd5da153486 100644
9+
index bcb56906d6f6184ee0c98e9b8b51c8fcdb359c73..8efaff68cb3732c60b8c619ca7963aaf466ba8f5 100644
1010
--- a/src/api/environment.cc
1111
+++ b/src/api/environment.cc
12-
@@ -226,8 +226,6 @@ void SetIsolateCreateParamsForNode(Isolate::CreateParams* params) {
12+
@@ -227,8 +227,6 @@ void SetIsolateCreateParamsForNode(Isolate::CreateParams* params) {
1313
// heap based on the actual physical memory.
1414
params->constraints.ConfigureDefaults(total_memory, 0);
1515
}

‎patches/node/api_remove_deprecated_getisolate.patch‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: Remove deprecated `GetIsolate`
66
https://chromium-review.googlesource.com/c/v8/v8/+/6905244
77

88
diff --git a/src/api/environment.cc b/src/api/environment.cc
9-
index a07744e892dc41c864d6ba1f20e0c0760c7cd61c..ececaae30e852e92bff0c2978fcb13c93ba61e97 100644
9+
index 5a9f177c58d421a3a3594d0eb318e25e97c15b6c..bcb56906d6f6184ee0c98e9b8b51c8fcdb359c73 100644
1010
--- a/src/api/environment.cc
1111
+++ b/src/api/environment.cc
12-
@@ -801,7 +801,7 @@ std::unique_ptr<MultiIsolatePlatform> MultiIsolatePlatform::Create(
12+
@@ -802,7 +802,7 @@ std::unique_ptr<MultiIsolatePlatform> MultiIsolatePlatform::Create(
1313

1414
MaybeLocal<Object> GetPerContextExports(Local<Context> context,
1515
IsolateData* isolate_data) {
@@ -18,7 +18,7 @@ index a07744e892dc41c864d6ba1f20e0c0760c7cd61c..ececaae30e852e92bff0c2978fcb13c9
1818
EscapableHandleScope handle_scope(isolate);
1919

2020
Local<Object> global = context->Global();
21-
@@ -847,7 +847,7 @@ void ProtoThrower(const FunctionCallbackInfo<Value>& info) {
21+
@@ -848,7 +848,7 @@ void ProtoThrower(const FunctionCallbackInfo<Value>& info) {
2222
// This runs at runtime, regardless of whether the context
2323
// is created from a snapshot.
2424
Maybe<void> InitializeContextRuntime(Local<Context> context) {
@@ -27,7 +27,7 @@ index a07744e892dc41c864d6ba1f20e0c0760c7cd61c..ececaae30e852e92bff0c2978fcb13c9
2727
HandleScope handle_scope(isolate);
2828

2929
// When `IsCodeGenerationFromStringsAllowed` is true, V8 takes the fast path
30-
@@ -926,7 +926,7 @@ Maybe<void> InitializeContextRuntime(Local<Context> context) {
30+
@@ -927,7 +927,7 @@ Maybe<void> InitializeContextRuntime(Local<Context> context) {
3131
}
3232

3333
Maybe<void> InitializeBaseContextForSnapshot(Local<Context> context) {
@@ -36,7 +36,7 @@ index a07744e892dc41c864d6ba1f20e0c0760c7cd61c..ececaae30e852e92bff0c2978fcb13c9
3636
HandleScope handle_scope(isolate);
3737

3838
// Delete `Intl.v8BreakIterator`
39-
@@ -951,7 +951,7 @@ Maybe<void> InitializeBaseContextForSnapshot(Local<Context> context) {
39+
@@ -952,7 +952,7 @@ Maybe<void> InitializeBaseContextForSnapshot(Local<Context> context) {
4040
}
4141

4242
Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {
@@ -45,7 +45,7 @@ index a07744e892dc41c864d6ba1f20e0c0760c7cd61c..ececaae30e852e92bff0c2978fcb13c9
4545
HandleScope handle_scope(isolate);
4646

4747
// Initialize the default values.
48-
@@ -969,7 +969,7 @@ Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {
48+
@@ -970,7 +970,7 @@ Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {
4949
MaybeLocal<Object> InitializePrivateSymbols(Local<Context> context,
5050
IsolateData* isolate_data) {
5151
CHECK(isolate_data);
@@ -54,7 +54,7 @@ index a07744e892dc41c864d6ba1f20e0c0760c7cd61c..ececaae30e852e92bff0c2978fcb13c9
5454
EscapableHandleScope scope(isolate);
5555
Context::Scope context_scope(context);
5656

57-
@@ -993,7 +993,7 @@ MaybeLocal<Object> InitializePrivateSymbols(Local<Context> context,
57+
@@ -994,7 +994,7 @@ MaybeLocal<Object> InitializePrivateSymbols(Local<Context> context,
5858
MaybeLocal<Object> InitializePerIsolateSymbols(Local<Context> context,
5959
IsolateData* isolate_data) {
6060
CHECK(isolate_data);
@@ -63,7 +63,7 @@ index a07744e892dc41c864d6ba1f20e0c0760c7cd61c..ececaae30e852e92bff0c2978fcb13c9
6363
EscapableHandleScope scope(isolate);
6464
Context::Scope context_scope(context);
6565

66-
@@ -1019,7 +1019,7 @@ MaybeLocal<Object> InitializePerIsolateSymbols(Local<Context> context,
66+
@@ -1020,7 +1020,7 @@ MaybeLocal<Object> InitializePerIsolateSymbols(Local<Context> context,
6767
Maybe<void> InitializePrimordials(Local<Context> context,
6868
IsolateData* isolate_data) {
6969
// Run per-context JS files.
@@ -85,10 +85,10 @@ index cc60ddddb037e0279615bbe24821eb20fd8da677..37d83e41b618a07aca98118260abe961
8585

8686
return handle;
8787
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
88-
index 67bde0803fc47982e41327be3aa3fc7eaafda2d2..bd90f26a961e60e8efe3cc0ba1f13d5af146bcc4 100644
88+
index 078efcf5716d6ff617bef047d78903f9011e225f..af01ce3c22c30968326e1fb2baf39663de2113f4 100644
8989
--- a/src/crypto/crypto_context.cc
9090
+++ b/src/crypto/crypto_context.cc
91-
@@ -1045,7 +1045,7 @@ bool ArrayOfStringsToX509s(Local<Context> context,
91+
@@ -1104,7 +1104,7 @@ bool ArrayOfStringsToX509s(Local<Context> context,
9292
Local<Array> cert_array,
9393
std::vector<X509*>* certs) {
9494
ClearErrorOnReturn clear_error_on_return;
@@ -120,7 +120,7 @@ index 6b7e4211a8969351168fc982fe3466a2096bed3a..76c84dd516719849a44e7d67f42ea16d
120120
NewStringType::kNormal,
121121
mem->length)
122122
diff --git a/src/encoding_binding.cc b/src/encoding_binding.cc
123-
index 6fe4f0492dc1f3eaf576c8ff7866080a54cb81c1..41e8e052ff81df78ece87163b0499966cc2ed1b9 100644
123+
index 31277621e92b4d3583a67140f4ab8a74a9c6df3b..caa109871b71926f3355491767b8064b50cb7e19 100644
124124
--- a/src/encoding_binding.cc
125125
+++ b/src/encoding_binding.cc
126126
@@ -76,7 +76,7 @@ void BindingData::Deserialize(Local<Context> context,
@@ -279,10 +279,10 @@ index 52483740bb377a2bc2a16af701615d9a4e448eae..84d17a46efe146c1794a43963c41a446
279279
CHECK(!env->temporary_required_module_facade_original.IsEmpty());
280280
return env->temporary_required_module_facade_original.Get(isolate);
281281
diff --git a/src/node.h b/src/node.h
282-
index 8aac774805a002f5af9e9aca62abc56e8f986bab..da87773ba7f0d38f04a7b3851d8a1a6df0eca489 100644
282+
index 4fab58689aa360a34d8b51d13f72c162701195f3..cf776248b9deef41e34eae8bdf000c66d9606172 100644
283283
--- a/src/node.h
284284
+++ b/src/node.h
285-
@@ -1144,7 +1144,7 @@ NODE_DEPRECATED("Use v8::Date::ValueOf() directly",
285+
@@ -1158,7 +1158,7 @@ NODE_DEPRECATED("Use v8::Date::ValueOf() directly",
286286

287287
#define NODE_DEFINE_CONSTANT(target, constant) \
288288
do { \
@@ -291,7 +291,7 @@ index 8aac774805a002f5af9e9aca62abc56e8f986bab..da87773ba7f0d38f04a7b3851d8a1a6d
291291
v8::Local<v8::Context> context = isolate->GetCurrentContext(); \
292292
v8::Local<v8::String> constant_name = v8::String::NewFromUtf8Literal( \
293293
isolate, #constant, v8::NewStringType::kInternalized); \
294-
@@ -1160,7 +1160,7 @@ NODE_DEPRECATED("Use v8::Date::ValueOf() directly",
294+
@@ -1174,7 +1174,7 @@ NODE_DEPRECATED("Use v8::Date::ValueOf() directly",
295295

296296
#define NODE_DEFINE_HIDDEN_CONSTANT(target, constant) \
297297
do { \
@@ -428,7 +428,7 @@ index 5550a4bee3ce9ec8759d216335a9b2b96e20c96e..b38c2f75a92f2d6c1b9c6e7b7aca9246
428428
Local<Array> keys;
429429
if (!entries->GetOwnPropertyNames(context).ToLocal(&keys))
430430
diff --git a/src/node_errors.cc b/src/node_errors.cc
431-
index 9a69e79bc0d8056454c556077ac9f5e47a87a463..a1cbd296ec184a0a3c2ceca5718b1e731ce31cef 100644
431+
index dc55d1c0d9fcbbbb99d6f459280e09e2d37cb04b..a222e7078b3a92ff21bd009ab00361fc78364172 100644
432432
--- a/src/node_errors.cc
433433
+++ b/src/node_errors.cc
434434
@@ -627,7 +627,7 @@ v8::ModifyCodeGenerationFromStringsResult ModifyCodeGenerationFromStrings(
@@ -449,7 +449,7 @@ index 9a69e79bc0d8056454c556077ac9f5e47a87a463..a1cbd296ec184a0a3c2ceca5718b1e73
449449
switch (message->ErrorLevel()) {
450450
case Isolate::MessageErrorLevel::kMessageWarning: {
451451
Environment* env = Environment::GetCurrent(isolate);
452-
@@ -1193,7 +1193,7 @@ void Initialize(Local<Object> target,
452+
@@ -1198,7 +1198,7 @@ void Initialize(Local<Object> target,
453453
SetMethod(
454454
context, target, "getErrorSourcePositions", GetErrorSourcePositions);
455455

@@ -586,10 +586,10 @@ index 41b0773f4c37a016cfa55aff6bb03baf50905b32..c3e995adf437413fe956e45c2ccc704d
586586
// Recreate the buffer in the constructor.
587587
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
588588
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
589-
index 6965d0a3fa97a55e90160e86d317a31fed6276f0..4d1a35d753230a806c3619232ff6f9270cda5563 100644
589+
index 5ca5165a255edbcc2dd374c089e264aab44483d8..dd101708c1dd08ca3770bc78319b04c19fcd3f2b 100644
590590
--- a/src/node_sqlite.cc
591591
+++ b/src/node_sqlite.cc
592-
@@ -2590,7 +2590,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
592+
@@ -2596,7 +2596,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
593593

594594
if (args[0]->IsObject() && !args[0]->IsArrayBufferView()) {
595595
Local<Object> obj = args[0].As<Object>();
@@ -625,10 +625,10 @@ index 5f5241f6c6741218024452202c4a17c7d0239e6b..75aaf468f508f2888daea2f77e98c728
625625
BindingData* binding = realm->AddBindingData<BindingData>(holder);
626626
CHECK_NOT_NULL(binding);
627627
diff --git a/src/node_v8.cc b/src/node_v8.cc
628-
index 4ee452d5bc6b67da52e91d98531ac35a7af155c7..b226d6fe60f4fdf5a237c336b9101c5a974ce837 100644
628+
index fbbf75acf50edceaf0cfb57d9c76d926b834ae30..1b86a8a08ba178ebd2f25d44f427c59676f05489 100644
629629
--- a/src/node_v8.cc
630630
+++ b/src/node_v8.cc
631-
@@ -163,7 +163,7 @@ void BindingData::Deserialize(Local<Context> context,
631+
@@ -164,7 +164,7 @@ void BindingData::Deserialize(Local<Context> context,
632632
int index,
633633
InternalFieldInfoBase* info) {
634634
DCHECK_IS_SNAPSHOT_SLOT(index);
@@ -684,10 +684,10 @@ index d8078241e81310eb838d3b7fd63d1c7ceada9e52..e5b3d2be2144ab23e7630f6713bbaf40
684684
Storage* storage;
685685
ASSIGN_OR_RETURN_UNWRAP(&storage, info.This());
686686
diff --git a/src/node_worker.cc b/src/node_worker.cc
687-
index a2631a96371becb0f4ea4f47a52313f4f02477da..4866c7ff589825d41fe84786ed8f9b3fccd3d1b7 100644
687+
index ed3aa30caac3f47691c4a7262e671589c3bace7b..3d6e0bdaaec133e89e947971b37cf0d8bdc08e38 100644
688688
--- a/src/node_worker.cc
689689
+++ b/src/node_worker.cc
690-
@@ -1465,8 +1465,6 @@ void GetEnvMessagePort(const FunctionCallbackInfo<Value>& args) {
690+
@@ -1466,8 +1466,6 @@ void GetEnvMessagePort(const FunctionCallbackInfo<Value>& args) {
691691
Local<Object> port = env->message_port();
692692
CHECK_IMPLIES(!env->is_main_thread(), !port.IsEmpty());
693693
if (!port.IsEmpty()) {
@@ -861,7 +861,7 @@ index 660cfff6b8a0c583be843e555e7a06cd09e0d279..c4b39450c5b7f91c46f7027db367c30d
861861
context, that, OneByteString(isolate, name), tmpl, flag);
862862
}
863863
diff --git a/src/util.h b/src/util.h
864-
index ac9fc698e608e58ed2f96327d6e4e100121341a0..a9e15c55f519beb52b73555082ca62e415ae75fd 100644
864+
index c9d787f68dfd90b9ea6cc58b9709c2d95a9bfc08..dc81d8f06e5deb5283285f9cfc446f7f40a2215d 100644
865865
--- a/src/util.h
866866
+++ b/src/util.h
867867
@@ -765,7 +765,7 @@ inline v8::MaybeLocal<v8::Value> ToV8Value(

‎patches/node/build_add_gn_build_files.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ really in 20/21. We have to wait until 22 is released to be able to
1111
build with upstream GN files.
1212

1313
diff --git a/configure.py b/configure.py
14-
index e05c11611052373bd74cf2f4fb1fdb7b1cf24e77..8f101999c20ef9d59d96d507b403f13cf9f23ae8 100755
14+
index 9c426b3f8f9cbf2ce086fce2fe1ee7c7bd636f89..bdf0d19292bf32e3e5621d7af2c93618c85dc6a4 100755
1515
--- a/configure.py
1616
+++ b/configure.py
17-
@@ -1897,7 +1897,7 @@ def configure_v8(o, configs):
17+
@@ -1947,7 +1947,7 @@ def configure_v8(o, configs):
1818
# Until we manage to get rid of all those, v8_enable_sandbox cannot be used.
1919
# Note that enabling pointer compression without enabling sandbox is unsupported by V8,
2020
# so this can be broken at any time.

‎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 116d699f505a4f53ec816ccb83b634cccdf2a67c..6459b3bdbc91b5cc988e5dce2b3b7d9e
6464

6565
function ipToInt(ip) {
6666
diff --git a/node.gyp b/node.gyp
67-
index 27402b3061afba6112a77f31d1b4c7c0d2526ba0..af4da538e0fef73253f47909513d0add2225df95 100644
67+
index 6387b945506278085dff461aeff51e5d20f457e6..e55a714a3a412d7889f3576d44ec3865f115752b 100644
6868
--- a/node.gyp
6969
+++ b/node.gyp
70-
@@ -185,7 +185,6 @@
70+
@@ -186,7 +186,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-
@@ -320,7 +319,6 @@
78+
@@ -322,7 +321,6 @@
7979
'src/tcp_wrap.h',
8080
'src/timers.h',
8181
'src/tracing/agent.h',

0 commit comments

Comments
 (0)