infer module type in create & switch some to Module

This commit is contained in:
pfg
2024-12-19 17:41:54 -08:00
parent 43e4e48c7c
commit 2834abecb5
12 changed files with 36 additions and 28 deletions

View File

@@ -1098,7 +1098,7 @@ bool JSCommonJSModule::evaluate(
bool isBuiltIn)
{
auto& vm = globalObject->vm();
auto sourceProvider = Zig::SourceProvider::create(jsCast<Zig::GlobalObject*>(globalObject), source, JSC::SourceProviderSourceType::Program, isBuiltIn);
auto sourceProvider = Zig::SourceProvider::create(jsCast<Zig::GlobalObject*>(globalObject), source, isBuiltIn);
this->ignoreESModuleAnnotation = source.tag == ResolvedSourceTagPackageJSONTypeModule;
if (this->hasEvaluated)
return true;
@@ -1152,7 +1152,7 @@ std::optional<JSC::SourceCode> createCommonJSModule(
dirname = jsEmptyString(vm);
}
auto sourceProvider = Zig::SourceProvider::create(jsCast<Zig::GlobalObject*>(globalObject), source, JSC::SourceProviderSourceType::Program, isBuiltIn);
auto sourceProvider = Zig::SourceProvider::create(jsCast<Zig::GlobalObject*>(globalObject), source, isBuiltIn);
sourceOrigin = sourceProvider->sourceOrigin();
moduleObject = JSCommonJSModule::create(
vm,