From 4a8b2546526e97583a2743d17405f664cbf6a16e Mon Sep 17 00:00:00 2001
From: Jarred Sumner <jarred@jarredsumner.com>
Date: Wed, 28 Jul 2021 20:56:29 -0700
Subject: esmodules work?

Former-commit-id: 5cb5af4416c12518eb195d1b310990fc5c94d6c8
---
 src/javascript/jsc/bindings/ZigGlobalObject.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/javascript/jsc/bindings/ZigGlobalObject.cpp')

diff --git a/src/javascript/jsc/bindings/ZigGlobalObject.cpp b/src/javascript/jsc/bindings/ZigGlobalObject.cpp
index ce66998ec..26ad666ba 100644
--- a/src/javascript/jsc/bindings/ZigGlobalObject.cpp
+++ b/src/javascript/jsc/bindings/ZigGlobalObject.cpp
@@ -82,7 +82,7 @@ const JSC::GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = {
     &shouldInterruptScript,
     &javaScriptRuntimeFlags,
     nullptr, // queueTaskToEventLoop
-nullptr,    // &shouldInterruptScriptBeforeTimeout,
+    nullptr,    // &shouldInterruptScriptBeforeTimeout,
     &moduleLoaderImportModule, // moduleLoaderImportModule
     &moduleLoaderResolve, // moduleLoaderResolve
     &moduleLoaderFetch, // moduleLoaderFetch
@@ -127,7 +127,6 @@ void GlobalObject::installAPIGlobals(JSClassRef* globals, int count) {
     }
     this->addStaticGlobals(extraStaticGlobals.data(), count);
     extraStaticGlobals.releaseBuffer();
-    
 }
 
 JSC::Identifier GlobalObject::moduleLoaderResolve(
@@ -140,11 +139,11 @@ JSC::Identifier GlobalObject::moduleLoaderResolve(
     auto res = Zig__GlobalObject__resolve(
         globalObject,
         toZigString(key, globalObject),
-        toZigString(referrer, globalObject)
+        referrer.isString() ? toZigString(referrer, globalObject) : ZigStringEmpty
     );
 
     if (res.success) {
-        return toIdentifier(res.result.value, globalObject);
+        return  toIdentifier(res.result.value, globalObject);
     } else {
         auto scope = DECLARE_THROW_SCOPE(globalObject->vm());
         throwException(scope, res.result.err.message, globalObject);
@@ -215,6 +214,7 @@ JSC::JSInternalPromise* GlobalObject::moduleLoaderFetch(JSGlobalObject* globalOb
 
     scope.release();
     promise->resolve(globalObject, sourceCode);
+    globalObject->vm().drainMicrotasks();
     return promise;
 }
 
-- 
cgit v1.2.3