75d2caf451
* chore: update to Node.js v18
* child_process: improve argument validation
https://github.com/nodejs/node/pull/41305
* bootstrap: support configure-time user-land snapshot
https://github.com/nodejs/node/pull/42466
* chore: update GN patch
* src: disambiguate terms used to refer to builtins and addons
https://github.com/nodejs/node/pull/44135
* src: use a typed array internally for process._exiting
https://github.com/nodejs/node/pull/43883
* chore: lib/internal/bootstrap -> lib/internal/process
* src: disambiguate terms used to refer to builtins and addons
https://github.com/nodejs/node/pull/44135
* chore: remove redudant browserGlobals patch
* chore: update BoringSSL patch
* src: allow embedder-provided PageAllocator in NodePlatform
https://github.com/nodejs/node/pull/38362
* chore: fixup Node.js crypto tests
- https://github.com/nodejs/node/pull/44171
- https://github.com/nodejs/node/pull/41600
* lib: add Promise methods to avoid-prototype-pollution lint rule
https://github.com/nodejs/node/pull/43849
* deps: update V8 to 10.1
https://github.com/nodejs/node/pull/42657
* src: add kNoBrowserGlobals flag for Environment
https://github.com/nodejs/node/pull/40532
* chore: consolidate asar initialization patches
* deps: update V8 to 10.1
https://github.com/nodejs/node/pull/42657
* deps: update V8 to 9.8
https://github.com/nodejs/node/pull/41610
* src,crypto: remove AllocatedBuffers from crypto_spkac
https://github.com/nodejs/node/pull/40752
* build: enable V8's shared read-only heap
https://github.com/nodejs/node/pull/42809
* src: fix ssize_t error from nghttp2.h
https://github.com/nodejs/node/pull/44393
* chore: fixup ESM patch
* chore: fixup patch indices
* src: merge NativeModuleEnv into NativeModuleLoader
https://github.com/nodejs/node/pull/43824
* [API] Pass OOMDetails to OOMErrorCallback
3647827
* src: iwyu in cleanup_queue.cc
* src: return Maybe from a couple of functions
https://github.com/nodejs/node/pull/39603
* src: clean up embedder API
https://github.com/nodejs/node/pull/35897
* src: refactor DH groups to delete crypto_groups.h
https://github.com/nodejs/node/pull/43896
* deps,src: use SIMD for normal base64 encoding
https://github.com/nodejs/node/pull/39775
* chore: remove deleted source file
* chore: update patches
* chore: remove deleted source file
* lib: add fetch
https://github.com/nodejs/node/pull/41749
* chore: remove nonexistent node specs
* test: split report OOM tests
https://github.com/nodejs/node/pull/44389
* src: trace fs async api
https://github.com/nodejs/node/pull/44057
* http: trace http request / response
https://github.com/nodejs/node/pull/44102
* test: split test-crypto-dh.js
https://github.com/nodejs/node/pull/40451
* crypto: introduce X509Certificate API
https://github.com/nodejs/node/pull/36804
* src: split property helpers from node::Environment
https://github.com/nodejs/node/pull/44056
* https://github.com/nodejs/node/pull/38905
bootstrap: implement run-time user-land snapshots via --build-snapshot and --snapshot-blob
* lib,src: implement WebAssembly Web API
https://github.com/nodejs/node/pull/42701
* fixup! deps,src: use SIMD for normal base64 encoding
* fixup! src: refactor DH groups to delete crypto_groups.h
* chore: fixup base64 GN file
* fix: check that node::InitializeContext() returns true
* chore: delete _noBrowserGlobals usage
* chore: disable fetch in renderer procceses
* dns: default to verbatim=true in dns.lookup()
https://github.com/nodejs/node/pull/39987
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
54 lines
2 KiB
Diff
54 lines
2 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 3bc9d113b6b818dcda332966f09f17248b421263..549339b5b677fa242a7b60ae716789c2a11ab18d 100644
|
|
--- a/src/node_builtins.cc
|
|
+++ b/src/node_builtins.cc
|
|
@@ -397,6 +397,22 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(
|
|
return maybe;
|
|
}
|
|
|
|
+MaybeLocal<Function> BuiltinLoader::LookupAndCompile(
|
|
+ Local<Context> context,
|
|
+ const char* id,
|
|
+ std::vector<Local<String>>* parameters,
|
|
+ Environment* optional_env) {
|
|
+ Result result;
|
|
+ Isolate* isolate = context->GetIsolate();
|
|
+
|
|
+ MaybeLocal<Function> maybe = GetInstance()->LookupAndCompileInternal(
|
|
+ context, id, parameters, &result);
|
|
+ if (optional_env != nullptr) {
|
|
+ RecordResult(id, result, optional_env);
|
|
+ }
|
|
+ return maybe;
|
|
+}
|
|
+
|
|
bool BuiltinLoader::CompileAllBuiltins(Local<Context> context) {
|
|
BuiltinLoader* loader = GetInstance();
|
|
std::vector<std::string> ids = loader->GetBuiltinIds();
|
|
diff --git a/src/node_builtins.h b/src/node_builtins.h
|
|
index 7f0a25af306ffefbc51ac43689ed208d4cd94f0b..a32a7a990082ea3dad73511f91a9c70c72f6fe31 100644
|
|
--- a/src/node_builtins.h
|
|
+++ b/src/node_builtins.h
|
|
@@ -49,6 +49,11 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {
|
|
v8::Local<v8::Context> context,
|
|
const char* id,
|
|
Environment* optional_env);
|
|
+ static v8::MaybeLocal<v8::Function> LookupAndCompile(
|
|
+ v8::Local<v8::Context> context,
|
|
+ const char* id,
|
|
+ std::vector<v8::Local<v8::String>>* parameters,
|
|
+ Environment* optional_env);
|
|
|
|
static v8::Local<v8::Object> GetSourceObject(v8::Local<v8::Context> context);
|
|
// Returns config.gypi as a JSON string
|