Skip to content

src: make LoadEnvironment with string work with builtin modules path #40607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
targos wants to merge 3 commits into from
Closed

src: make LoadEnvironment with string work with builtin modules path #40607

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da118db
src: make LoadEnvironment with string work with builtin modules path
targos Oct 26, 2021
e40fd65
test: skip macos sandbox test with builtin modules path
targos Oct 26, 2021
c80b1bf
fixup! src: make LoadEnvironment with string work with builtin module…
targos Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
src: make LoadEnvironment with string work with builtin modules path 
Fixes: #40605
  • Loading branch information
@targos
targos committed Oct 26, 2021
commit da118db366dff1f4df324e242510d9ed3c84937b
17 changes: 10 additions & 7 deletions src/node_native_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,16 @@ static std::string OnDiskFileName(const char* id) {
MaybeLocal<String> NativeModuleLoader::LoadBuiltinModuleSource(Isolate* isolate,
const char* id) {
#ifdef NODE_BUILTIN_MODULES_PATH
if(strncmp(id, "embedder_main_", strlen("embedder_main_")) == 0) {
#endif // NODE_BUILTIN_MODULES_PATH
const auto source_it = source_.find(id);
if (UNLIKELY(source_it == source_.end())) {
fprintf(stderr, "Cannot find native builtin: \"%s\".\n", id);
ABORT();
}
return source_it->second.ToStringChecked(isolate);
#ifdef NODE_BUILTIN_MODULES_PATH
}
std::string filename = OnDiskFileName(id);

std::string contents;
Expand All @@ -222,13 +232,6 @@ MaybeLocal<String> NativeModuleLoader::LoadBuiltinModuleSource(Isolate* isolate,
}
return String::NewFromUtf8(
isolate, contents.c_str(), v8::NewStringType::kNormal, contents.length());
#else
const auto source_it = source_.find(id);
if (UNLIKELY(source_it == source_.end())) {
fprintf(stderr, "Cannot find native builtin: \"%s\".\n", id);
ABORT();
}
return source_it->second.ToStringChecked(isolate);
#endif // NODE_BUILTIN_MODULES_PATH
}

Expand Down