f4ee3c1b2a
* chore: bump node in DEPS to v20.11.0 * module: bootstrap module loaders in shadow realm https://github.com/nodejs/node/pull/48655 * src: add commit hash shorthand in zlib version https://github.com/nodejs/node/pull/50158 * v8,tools: expose necessary V8 defines https://github.com/nodejs/node/pull/50820 * esm: do not call getSource when format is commonjs https://github.com/nodejs/node/pull/50465 * esm: fallback to readFileSync when source is nullish https://github.com/nodejs/node/pull/50825 * vm: allow dynamic import with a referrer realm https://github.com/nodejs/node/pull/50360 * test: skip test-diagnostics-channel-memory-leak.js https://github.com/nodejs/node/pull/50327 * esm: do not call getSource when format is commonjs https://github.com/nodejs/node/pull/50465 * lib: fix assert throwing different error messages in ESM and CJS https://github.com/nodejs/node/pull/50634 * src: fix compatility with upcoming V8 12.1 APIs https://github.com/nodejs/node/pull/50709 * deps: update base64 to 0.5.1 https://github.com/nodejs/node/pull/50629 * src: avoid silent coercion to signed/unsigned int https://github.com/nodejs/node/pull/50663 * src: fix compatility with upcoming V8 12.1 APIs https://github.com/nodejs/node/pull/50709 * chore: fix patch indices * chore: update patches * test: disable TLS cipher test This can't be enabled owing to BoringSSL incompatibilities. https://github.com/nodejs/node/pull/50186 * fix: check for Buffer and global definition in shadow realm https://github.com/nodejs/node/pull/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 https://github.com/nodejs/node/pull/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 <shelley.vohr@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Thu, 13 Oct 2022 17:10:01 +0200
|
|
Subject: fix: expose LookupAndCompile with parameters
|
|
|
|
Node.js removed custom parameters from the public version of LookupAndCompile,
|
|
which we use in Electron. This patch re-exposes a wrapper to allow custom
|
|
parameters.
|
|
|
|
This should be upstreamed.
|
|
|
|
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
|
|
index bcef04f980d1b1f010c5349ecbfca8080f39b308..6861c28eb6deea72e844b04048d88ca726385c7f 100644
|
|
--- a/src/node_builtins.cc
|
|
+++ b/src/node_builtins.cc
|
|
@@ -482,6 +482,18 @@ MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
|
|
return fn->Call(context, undefined, argc, argv);
|
|
}
|
|
|
|
+MaybeLocal<Function> BuiltinLoader::LookupAndCompile(
|
|
+ Local<Context> context,
|
|
+ const char* id,
|
|
+ std::vector<Local<String>>* parameters,
|
|
+ Realm* optional_realm) {
|
|
+ Isolate* isolate = context->GetIsolate();
|
|
+
|
|
+ MaybeLocal<Function> maybe = LookupAndCompileInternal(
|
|
+ context, id, parameters, optional_realm);
|
|
+ return maybe;
|
|
+}
|
|
+
|
|
bool BuiltinLoader::CompileAllBuiltins(Local<Context> context) {
|
|
std::vector<std::string_view> ids = GetBuiltinIds();
|
|
bool all_succeeded = true;
|
|
diff --git a/src/node_builtins.h b/src/node_builtins.h
|
|
index 11d10f52b7c492bfae4bc58b39c20a693762a72d..b995e15fcd795f310126a38ec652efcd9fd36945 100644
|
|
--- a/src/node_builtins.h
|
|
+++ b/src/node_builtins.h
|
|
@@ -99,6 +99,12 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {
|
|
const char* id,
|
|
Realm* optional_realm);
|
|
|
|
+ v8::MaybeLocal<v8::Function> LookupAndCompile(
|
|
+ v8::Local<v8::Context> context,
|
|
+ const char* id,
|
|
+ std::vector<v8::Local<v8::String>>* parameters,
|
|
+ Realm* optional_realm);
|
|
+
|
|
v8::MaybeLocal<v8::Value> CompileAndCall(v8::Local<v8::Context> context,
|
|
const char* id,
|
|
int argc,
|
|
@@ -109,6 +115,7 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {
|
|
const char* id,
|
|
Realm* realm);
|
|
|
|
+
|
|
// Returns config.gypi as a JSON string
|
|
v8::Local<v8::String> GetConfigString(v8::Isolate* isolate);
|
|
bool Exists(const char* id);
|