From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Mon, 15 Nov 2021 15:34:38 +0100 Subject: src: update ImportModuleDynamically PR-URL: https://github.com/nodejs/node/pull/41610 Reviewed-By: Jiawen Geng Reviewed-By: Antoine du Hamel Reviewed-By: Darshan Sen Reviewed-By: Colin Ihrig diff --git a/src/module_wrap.cc b/src/module_wrap.cc index b4b70ec1afd3eaa2489075156e7ccd7682ddd307..50ce8d510cb1a4299f3c161198ee6ed63fabc05f 100644 --- a/src/module_wrap.cc +++ b/src/module_wrap.cc @@ -46,7 +46,6 @@ using v8::PrimitiveArray; using v8::Promise; using v8::ScriptCompiler; using v8::ScriptOrigin; -using v8::ScriptOrModule; using v8::String; using v8::UnboundModuleScript; using v8::Undefined; @@ -553,7 +552,8 @@ MaybeLocal ModuleWrap::ResolveModuleCallback( static MaybeLocal ImportModuleDynamically( Local context, - Local referrer, + Local host_defined_options, + Local resource_name, Local specifier, Local import_assertions) { Isolate* isolate = context->GetIsolate(); @@ -568,7 +568,7 @@ static MaybeLocal ImportModuleDynamically( Local import_callback = env->host_import_module_dynamically_callback(); - Local options = referrer->GetHostDefinedOptions(); + Local options = host_defined_options.As(); if (options->Length() != HostDefinedOptions::kLength) { Local resolver; if (!Promise::Resolver::New(context).ToLocal(&resolver)) return {}; @@ -582,11 +582,11 @@ static MaybeLocal ImportModuleDynamically( Local object; - int type = options->Get(isolate, HostDefinedOptions::kType) + int type = options->Get(context, HostDefinedOptions::kType) .As() ->Int32Value(context) .ToChecked(); - uint32_t id = options->Get(isolate, HostDefinedOptions::kID) + uint32_t id = options->Get(context, HostDefinedOptions::kID) .As() ->Uint32Value(context) .ToChecked();