mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
82a59d9894
* chore: bump node in DEPS to v22.16.0 * crypto: remove BoringSSL dh-primes addition https://github.com/nodejs/node/pull/57023 * tools: enable linter in test/fixtures/test\-runner/output https://github.com/nodejs/node/pull/57698 * src: improve thread safety of TaskQueue https://github.com/nodejs/node/pull/57910 * buffer: define global v8::CFunction objects as const https://github.com/nodejs/node/pull/57676 * src: disable abseil deadlock detection https://github.com/nodejs/node/pull/57582 * zlib: fix pointer alignment https://github.com/nodejs/node/pull/57727 * chore: fixup patch indices * src: set default config as node.config.json https://github.com/nodejs/node/pull/57171 * src: update std::vector<v8::Local<T>> to use v8::LocalVector<T> https://github.com/nodejs/node/pull/57578 * test: disable chmod tests failing in Docker https://github.com/nodejs/node/issues/58326 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Fri, 18 Oct 2024 17:01:06 +0200
|
|
Subject: fix: remove harmony-import-assertions from node.cc
|
|
|
|
harmony-import-assertions has been removed from V8 as of
|
|
https://chromium-review.googlesource.com/c/v8/v8/+/5507047,
|
|
so we should remove it from node.cc as well.
|
|
|
|
This patch can be removed when we upgrade to a V8 version that
|
|
contains the above CL.
|
|
|
|
diff --git a/src/node.cc b/src/node.cc
|
|
index 0fbcd55d674b1d0cae88f04fe337cfcca702255f..092b1c525c7d4d50a09f99dc088d0698afcaf8a6 100644
|
|
--- a/src/node.cc
|
|
+++ b/src/node.cc
|
|
@@ -814,7 +814,7 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args,
|
|
}
|
|
// TODO(nicolo-ribaudo): remove this once V8 doesn't enable it by default
|
|
// anymore.
|
|
- v8_args.emplace_back("--no-harmony-import-assertions");
|
|
+ // v8_args.emplace_back("--no-harmony-import-assertions");
|
|
|
|
auto env_opts = per_process::cli_options->per_isolate->per_env;
|
|
if (std::find(v8_args.begin(), v8_args.end(),
|