Skip to content

Commit f4ee3c1

Browse files
electron-roller[bot]codebyterezcbenz
authored
chore: bump node to v20.11.0 (main) (#40941)
* chore: bump node in DEPS to v20.11.0 * module: bootstrap module loaders in shadow realm nodejs/node#48655 * src: add commit hash shorthand in zlib version nodejs/node#50158 * v8,tools: expose necessary V8 defines nodejs/node#50820 * esm: do not call getSource when format is commonjs nodejs/node#50465 * esm: fallback to readFileSync when source is nullish nodejs/node#50825 * vm: allow dynamic import with a referrer realm nodejs/node#50360 * test: skip test-diagnostics-channel-memory-leak.js nodejs/node#50327 * esm: do not call getSource when format is commonjs nodejs/node#50465 * lib: fix assert throwing different error messages in ESM and CJS nodejs/node#50634 * src: fix compatility with upcoming V8 12.1 APIs nodejs/node#50709 * deps: update base64 to 0.5.1 nodejs/node#50629 * src: avoid silent coercion to signed/unsigned int nodejs/node#50663 * src: fix compatility with upcoming V8 12.1 APIs nodejs/node#50709 * chore: fix patch indices * chore: update patches * test: disable TLS cipher test This can't be enabled owing to BoringSSL incompatibilities. nodejs/node#50186 * fix: check for Buffer and global definition in shadow realm nodejs/node#51239 * test: disable parallel/test-shadow-realm-custom-loader Incompatible with our asar logic, resulting in the following failure: > Failed to CompileAndCall electron script: electron/js2c/asar_bundle * chore: remove deleted parallel/test-crypto-modp1-error test * test: make test-node-output-v8-warning generic nodejs/node#50421 * chore: fixup ModuleWrap patch * test: match wpt/streams/transferable/transform-stream-members.any.js to upstream * fix: sandbox is not enabled on arm * chore: disable v8 sandbox on ia32/arm --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]> Co-authored-by: Cheng Zhao <[email protected]>
1 parent 6ea7da4 commit f4ee3c1

File tree

43 files changed

+728
-749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+728
-749
lines changed

‎BUILD.gn‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import("//pdf/features.gni")
99
import("//ppapi/buildflags/buildflags.gni")
1010
import("//printing/buildflags/buildflags.gni")
1111
import("//testing/test.gni")
12-
import("//third_party/electron_node/node.gni")
12+
import("//third_party/electron_node/electron_node.gni")
1313
import("//third_party/ffmpeg/ffmpeg_options.gni")
1414
import("//tools/generate_library_loader/generate_library_loader.gni")
1515
import("//tools/grit/grit_rule.gni")
@@ -414,8 +414,10 @@ action("electron_generate_node_defines") {
414414
}
415415

416416
source_set("electron_lib") {
417-
configs += [ "//v8:external_startup_data" ]
418-
configs += [ "//third_party/electron_node:node_internals" ]
417+
configs += [
418+
"//v8:external_startup_data",
419+
"//third_party/electron_node:node_internals",
420+
]
419421

420422
public_configs = [
421423
":branding",

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'122.0.6236.2',
66
'node_version':
7-
'v20.10.0',
7+
'v20.11.0',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

‎patches/chromium/build_allow_electron_to_use_exec_script.patch‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ Subject: build: allow electron to use exec_script
66
This is similar to the //build usecase so we're OK adding ourselves here
77

88
diff --git a/.gn b/.gn
9-
index afe0b3e90fafb9413cc49198cf3ad5d66d433b54..a8d83d6c95ebda9a898a383a8a1581d75da09f2e 100644
9+
index afe0b3e90fafb9413cc49198cf3ad5d66d433b54..6b83b22994998ba98895144ec81b4cdff1b0e0db 100644
1010
--- a/.gn
1111
+++ b/.gn
12-
@@ -167,4 +167,6 @@ exec_script_whitelist =
12+
@@ -167,4 +167,8 @@ exec_script_whitelist =
1313

1414
"//tools/grit/grit_rule.gni",
1515
"//tools/gritsettings/BUILD.gn",
1616
+
17-
+ "//electron/BUILD.gn"
17+
+ "//electron/BUILD.gn",
18+
+ "//third_party/electron_node/deps/base64/BUILD.gn",
19+
+ "//third_party/electron_node/deps/base64/unofficial.gni",
1820
]

‎patches/node/.patches‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ fix_serdes_test.patch
1818
feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
1919
feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
2020
support_v8_sandboxed_pointers.patch
21-
build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
2221
build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
2322
fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
2423
fix_expose_lookupandcompile_with_parameters.patch
@@ -34,16 +33,16 @@ fix_do_not_resolve_electron_entrypoints.patch
3433
ci_ensure_node_tests_set_electron_run_as_node.patch
3534
fix_assert_module_in_the_renderer_process.patch
3635
fix_add_trusted_space_and_trusted_lo_space_to_the_v8_heap.patch
37-
src_adapt_to_v8_exception_api_change.patch
3836
win_process_avoid_assert_after_spawning_store_app_4152.patch
3937
chore_remove_use_of_deprecated_kmaxlength.patch
40-
fix_avx_detection.patch
41-
src_avoid_copying_string_in_fs_permission.patch
4238
fix_missing_include_for_node_extern.patch
4339
feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch
4440
build_only_create_cppgc_heap_on_non-32_bit_platforms.patch
45-
src_fix_compatility_with_upcoming_v8_12_1_apis.patch
4641
fix_-wshadow_error_in_uvwasi_c.patch
4742
src_update_default_v8_platform_to_override_functions_with_location.patch
4843
fix_capture_embedder_exceptions_before_entering_v8.patch
4944
spec_add_iterator_to_global_intrinsics.patch
45+
build_do_not_rely_on_gn_helpers_in_gn_build.patch
46+
test_make_test-node-output-v8-warning_generic.patch
47+
test_match_wpt_streams_transferable_transform-stream-members_any_js.patch
48+
build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch

0 commit comments

Comments
 (0)