From af5c4dedca550a856486ec8bbc9f6da76396496e Mon Sep 17 00:00:00 2001
From: Jarred Sumner <jarred@jarredsumner.com>
Date: Sat, 27 Aug 2022 23:46:05 -0700
Subject: Update WebKit (#1165)

* Update WebKit

* Fix `DataView` and non-8 bit sized typed arrays with TextDecoder

* New WebKit

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
---
 src/bun.js/builtins/js/ImportMetaObject.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/bun.js/builtins/js/ImportMetaObject.js')

diff --git a/src/bun.js/builtins/js/ImportMetaObject.js b/src/bun.js/builtins/js/ImportMetaObject.js
index 2318268c2..ce28775c2 100644
--- a/src/bun.js/builtins/js/ImportMetaObject.js
+++ b/src/bun.js/builtins/js/ImportMetaObject.js
@@ -89,7 +89,6 @@ function loadModule(meta, resolvedSpecifier) {
       entry.fetch,
       @promiseFieldReactionsOrResult
     );
-
     // parseModule() returns a Promise, but the value is already fulfilled
     // so we just pull it out of the promise here once again
     // But, this time we do it a little more carefully because this is a JSC function call and not bun source code
@@ -105,7 +104,6 @@ function loadModule(meta, resolvedSpecifier) {
         @promiseFieldFlags
       );
       var state = flags & @promiseStateMask;
-
       // this branch should never happen, but just to be safe
       if (
         state === @promiseStatePending ||
@@ -131,18 +129,15 @@ function loadModule(meta, resolvedSpecifier) {
     var dependenciesMap = module.dependenciesMap;
     var requestedModules = Loader.requestedModules(module);
     var dependencies = @newArrayWithSize(requestedModules.length);
-
     for (var i = 0, length = requestedModules.length; i < length; ++i) {
       var depName = requestedModules[i];
-
       // optimization: if it starts with a slash then it's an absolute path
       // we don't need to run the resolver a 2nd time
       var depKey =
         depName[0] === "/"
           ? depName
-          : Loader.resolveSync(depName, key, @undefined);
+          : Loader.resolve(depName, key, @undefined);
       var depEntry = Loader.ensureRegistered(depKey);
-
       if (depEntry.state < @ModuleLink) {
         queue.push(depKey);
       }
@@ -153,8 +148,8 @@ function loadModule(meta, resolvedSpecifier) {
 
     entry.dependencies = dependencies;
     // All dependencies resolved, set instantiate and satisfy field directly.
-    entry.instantiate = Promise.resolve(entry)
-    entry.satisfy = Promise.resolve(entry);
+    entry.instantiate = @Promise.resolve(entry)
+    entry.satisfy = @Promise.resolve(entry);
     key = queue.shift();
     while (key && (Loader.registry.@get(key)?.state ?? @ModuleFetch) >= @ModuleLink) {
       key = queue.shift();
-- 
cgit v1.2.3