mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-10 19:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebKit upgrade (#12246)

Browse Source 
Co-authored-by: Jarred-Sumner <Jarred-Sumner@users.noreply.github.com>
This commit is contained in:
Jarred Sumner
2024-07-01 23:27:59 -07:00
committed by GitHub
parent dd057613b9
commit b0018465cc
207 changed files with 6457 additions and 6338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/bun.js/bindings/ModuleLoader.cpp
View File

@@ -736,7 +736,7 @@ static JSValue fetchESMSourceCode(
default: {
if (tag & SyntheticModuleType::InternalModuleRegistryFlag) {
constexpr auto mask = (SyntheticModuleType::InternalModuleRegistryFlag - 1);
auto source = JSC::SourceCode(JSC::SyntheticSourceProvider::create(generateInternalModuleSourceCode(globalObject, static_cast<InternalModuleRegistry::Field>(tag & mask)), JSC::SourceOrigin(URL(makeString("builtins://", moduleKey))), moduleKey));
auto source = JSC::SourceCode(JSC::SyntheticSourceProvider::create(generateInternalModuleSourceCode(globalObject, static_cast<InternalModuleRegistry::Field>(tag & mask)), JSC::SourceOrigin(URL(makeString("builtins://"_s, moduleKey))), moduleKey));
return rejectOrResolve(JSSourceCode::create(vm, WTFMove(source)));
} else {
auto&& provider = Zig::SourceProvider::create(globalObject, res->result.value, JSC::SourceProviderSourceType::Module, true);
@@ -844,7 +844,32 @@ static JSValue fetchESMSourceCode(
JSC::SourceCode(Zig::SourceProvider::create(globalObject, res->result.value))));
}
extern "C" JSC::EncodedJSValue jsFunctionOnLoadObjectResultResolve(JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame)
JSValue fetchESMSourceCodeSync(
Zig::GlobalObject* globalObject,
JSC::JSValue specifierJS,
ErrorableResolvedSource* res,
BunString* specifier,
BunString* referrer,
BunString* typeAttribute)
{
return fetchESMSourceCode<false>(globalObject, specifierJS, res, specifier, referrer, typeAttribute);
}
JSValue fetchESMSourceCodeAsync(
Zig::GlobalObject* globalObject,
JSC::JSValue specifierJS,
ErrorableResolvedSource* res,
BunString* specifier,
BunString* referrer,
BunString* typeAttribute)
{
return fetchESMSourceCode<true>(globalObject, specifierJS, res, specifier, referrer, typeAttribute);
}
}
using namespace Bun;
BUN_DEFINE_HOST_FUNCTION(jsFunctionOnLoadObjectResultResolve, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
{
JSC::VM& vm = globalObject->vm();
ErrorableResolvedSource res = {};
@@ -882,7 +907,7 @@ extern "C" JSC::EncodedJSValue jsFunctionOnLoadObjectResultResolve(JSC::JSGlobal
return JSValue::encode(jsUndefined());
}
extern "C" JSC::EncodedJSValue jsFunctionOnLoadObjectResultReject(JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame)
BUN_DEFINE_HOST_FUNCTION(jsFunctionOnLoadObjectResultReject, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
{
JSC::VM& vm = globalObject->vm();
JSC::JSValue reason = callFrame->argument(0);
@@ -896,26 +921,3 @@ extern "C" JSC::EncodedJSValue jsFunctionOnLoadObjectResultReject(JSC::JSGlobalO
return JSValue::encode(reason);
}
JSValue fetchESMSourceCodeSync(
Zig::GlobalObject* globalObject,
JSC::JSValue specifierJS,
ErrorableResolvedSource* res,
BunString* specifier,
BunString* referrer,
BunString* typeAttribute)
{
return fetchESMSourceCode<false>(globalObject, specifierJS, res, specifier, referrer, typeAttribute);
}
JSValue fetchESMSourceCodeAsync(
Zig::GlobalObject* globalObject,
JSC::JSValue specifierJS,
ErrorableResolvedSource* res,
BunString* specifier,
BunString* referrer,
BunString* typeAttribute)
{
return fetchESMSourceCode<true>(globalObject, specifierJS, res, specifier, referrer, typeAttribute);
}
}