Fix bug with import maps

oven-sh · Oct 8, 2022 · 1f5b5d1 · 1f5b5d1
1 parent 56fdf63
commit 1f5b5d1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Source/JavaScriptCore/builtins/ModuleLoader.js b/Source/JavaScriptCore/builtins/ModuleLoader.js
@@ -408,9 +408,11 @@ async function loadAndEvaluateModule(moduleName, parameters, fetcher)
     "use strict";
 
     var importMap = @importMapStatus();
-    if (importMap)
+    var key = moduleName;
+    if (importMap) {
         await importMap;
-    var key = this.resolve(moduleName, @undefined, fetcher);
+        key = this.resolve(moduleName, referrer, fetcher);
+    }
     key = await this.loadModule(key, parameters, fetcher);
     return await this.linkAndEvaluateModule(key, fetcher);
 }
@@ -421,9 +423,11 @@ async function requestImportModule(moduleName, referrer, parameters, fetcher)
     "use strict";
 
     var importMap = @importMapStatus();
-    if (importMap)
+    var key = moduleName;
+    if (importMap) {
         await importMap;
-    var key = this.resolve(moduleName, referrer, fetcher);
+        key = this.resolve(moduleName, referrer, fetcher);
+    }
     var entry = await this.requestSatisfy(this.ensureRegistered(key), parameters, fetcher, new @Set);
     await this.linkAndEvaluateModule(entry.key, fetcher);
     return this.getModuleNamespaceObject(entry.module);