resolve scope keys to base url (#116)

guybedford · Mar 18, 2021 · 388091a · 388091a
1 parent 3ac57de
commit 388091a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/common.js b/src/common.js
@@ -174,9 +174,9 @@ export function resolveUrl (relUrl, parentUrl) {
   return resolveIfNotPlainOrUrl(relUrl, parentUrl) || (relUrl.indexOf(':') !== -1 ? relUrl : resolveIfNotPlainOrUrl('./' + relUrl, parentUrl));
 }
 
-function resolveAndComposePackages (packages, outPackages, baseUrl, parentMap, scopeUrl) {
+function resolveAndComposePackages (packages, outPackages, baseUrl, parentMap) {
   for (let p in packages) {
-    const resolvedLhs = resolveIfNotPlainOrUrl(p, scopeUrl || baseUrl) || p;
+    const resolvedLhs = resolveIfNotPlainOrUrl(p, baseUrl) || p;
     let target = packages[p];
     if (typeof target !== 'string') 
       continue;
@@ -198,7 +198,7 @@ export function resolveAndComposeImportMap (json, baseUrl, parentMap) {
   if (json.scopes)
     for (let s in json.scopes) {
       const resolvedScope = resolveUrl(s, baseUrl);
-      resolveAndComposePackages(json.scopes[s], outMap.scopes[resolvedScope] || (outMap.scopes[resolvedScope] = {}), baseUrl, parentMap, resolvedScope);
+      resolveAndComposePackages(json.scopes[s], outMap.scopes[resolvedScope] || (outMap.scopes[resolvedScope] = {}), baseUrl, parentMap);
     }
 
   return outMap;

diff --git a/test/test.html b/test/test.html
@@ -13,7 +13,7 @@
       "test-dep": "/test/fixtures/test-dep.js"
     },
     "/test/fixtures/es-modules/import-relative-path.js": {
-      "./relative-path": "/test/fixtures/es-modules/es6-dep.js"
+      "./fixtures/es-modules/relative-path": "./fixtures/es-modules/es6-dep.js"
     }
   }
 }