Skip to content

Commit db147f3

Browse files
committed
catch up with main
1 parent e198308 commit db147f3

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

lib/internal/bootstrap/switches/is_embedded_env.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Set up globalThis.require and globalThis.import so that they can
77
// be easily accessed from C/C++
88

9-
/* global path, primordials */
9+
/* global path, primordials, process, GetLinkedBinding, GetInternalBinding */
1010

1111
const { globalThis, ObjectCreate } = primordials;
1212
const CJSLoader = require('internal/modules/cjs/loader');

src/js_native_api_v8.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -903,16 +903,16 @@ napi_status NAPI_CDECL napi_create_environment(napi_platform platform,
903903
auto path = v8::String::NewFromUtf8(emb_env->setup()->isolate(),
904904
env->exec_path().c_str())
905905
.ToLocalChecked();
906-
std::vector<v8::Local<v8::String>> params = {env->primordials_string(),
907-
env->process_string(),
908-
env->require_string(),
909-
env->path_string()};
910-
std::vector<v8::Local<v8::Value>> args = {env->primordials(),
911-
env->process_object(),
912-
env->native_module_require(),
913-
path};
906+
907+
std::vector<v8::Local<v8::Value>> bootstrap_args = {
908+
env->process_object(),
909+
env->builtin_module_require(),
910+
env->internal_binding_loader(),
911+
env->primordials(),
912+
path};
913+
914914
auto ret = node::ExecuteBootstrapper(
915-
env, "internal/bootstrap/switches/is_embedded_env", &params, &args);
915+
env, "internal/bootstrap/switches/is_embedded_env", &bootstrap_args);
916916
if (ret.IsEmpty()) return napi_pending_exception;
917917

918918
ret = node::LoadEnvironment(env, main_script);

src/node_builtins.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -370,12 +370,13 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(
370370
} else if (strncmp(id,
371371
"internal/bootstrap/",
372372
strlen("internal/bootstrap/")) == 0) {
373-
// internal/bootstrap/*: process, require, internalBinding, primordials
373+
// internal/bootstrap/*: process, require, internalBinding, primordials, path
374374
parameters = {
375375
FIXED_ONE_BYTE_STRING(isolate, "process"),
376376
FIXED_ONE_BYTE_STRING(isolate, "require"),
377377
FIXED_ONE_BYTE_STRING(isolate, "internalBinding"),
378378
FIXED_ONE_BYTE_STRING(isolate, "primordials"),
379+
FIXED_ONE_BYTE_STRING(isolate, "path"),
379380
};
380381
} else {
381382
// others: exports, require, module, process, internalBinding, primordials

0 commit comments

Comments
 (0)