Commit 9f68e14
src: elevate v8 namespaces
PR-URL: #31901
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Anna Henningsen <anna@addaleax.net>1 parent a468392 commit 9f68e14
1 file changed
Lines changed: 7 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -25,6 +25,7 @@ using node::url::URL_FLAGS_FAILED; | |||
| 25 | 25 | using v8::Array; | |
| 26 | 26 | using v8::ArrayBufferView; | |
| 27 | 27 | using v8::Context; | |
| 28 | + using v8::EscapableHandleScope; | ||
| 28 | 29 | using v8::Function; | |
| 29 | 30 | using v8::FunctionCallbackInfo; | |
| 30 | 31 | using v8::FunctionTemplate; | |
@@ -45,6 +46,7 @@ using v8::PrimitiveArray; | |||
| 45 | 46 | using v8::Promise; | |
| 46 | 47 | using v8::ScriptCompiler; | |
| 47 | 48 | using v8::ScriptOrigin; | |
| 49 | + using v8::ScriptOrModule; | ||
| 48 | 50 | using v8::String; | |
| 49 | 51 | using v8::UnboundModuleScript; | |
| 50 | 52 | using v8::Undefined; | |
@@ -627,7 +629,7 @@ Maybe<const PackageConfig*> GetPackageConfig(Environment* env, | |||
| 627 | 629 | std::string pkg_src = source.FromJust(); | |
| 628 | 630 | ||
| 629 | 631 | Isolate* isolate = env->isolate(); | |
| 630 | - v8::HandleScope handle_scope(isolate); | ||
| 632 | + HandleScope handle_scope(isolate); | ||
| 631 | 633 | ||
| 632 | 634 | Local<Object> pkg_json; | |
| 633 | 635 | { | |
@@ -899,7 +901,7 @@ void ThrowExportsInvalid(Environment* env, | |||
| 899 | 901 | const URL& base) { | |
| 900 | 902 | Local<String> target_string; | |
| 901 | 903 | if (target->IsObject()) { | |
| 902 | - if (!v8::JSON::Stringify(env->context(), target.As<v8::Object>(), | ||
| 904 | + if (!v8::JSON::Stringify(env->context(), target.As<Object>(), | ||
| 903 | 905 | v8::String::Empty(env->isolate())).ToLocal(&target_string)) | |
| 904 | 906 | return; | |
| 905 | 907 | } else { | |
@@ -977,7 +979,7 @@ Maybe<URL> ResolveExportsTarget(Environment* env, | |||
| 977 | 979 | Isolate* isolate = env->isolate(); | |
| 978 | 980 | Local<Context> context = env->context(); | |
| 979 | 981 | if (target->IsString()) { | |
| 980 | - Utf8Value target_utf8(isolate, target.As<v8::String>()); | ||
| 982 | + Utf8Value target_utf8(isolate, target.As<String>()); | ||
| 981 | 983 | std::string target_str(*target_utf8, target_utf8.length()); | |
| 982 | 984 | Maybe<URL> resolved = ResolveExportsTargetString(env, target_str, subpath, | |
| 983 | 985 | pkg_subpath, pjson_url, base); | |
@@ -1440,12 +1442,12 @@ void ModuleWrap::GetPackageType(const FunctionCallbackInfo<Value>& args) { | |||
| 1440 | 1442 | ||
| 1441 | 1443 | static MaybeLocal<Promise> ImportModuleDynamically( | |
| 1442 | 1444 | Local<Context> context, | |
| 1443 | - Local<v8::ScriptOrModule> referrer, | ||
| 1445 | + Local<ScriptOrModule> referrer, | ||
| 1444 | 1446 | Local<String> specifier) { | |
| 1445 | 1447 | Isolate* iso = context->GetIsolate(); | |
| 1446 | 1448 | Environment* env = Environment::GetCurrent(context); | |
| 1447 | 1449 | CHECK_NOT_NULL(env); // TODO(addaleax): Handle nullptr here. | |
| 1448 | - v8::EscapableHandleScope handle_scope(iso); | ||
| 1450 | + EscapableHandleScope handle_scope(iso); | ||
| 1449 | 1451 | ||
| 1450 | 1452 | Local<Function> import_callback = | |
| 1451 | 1453 | env->host_import_module_dynamically_callback(); | |
0 commit comments