support conditional aliases, alias subpath fix

systemjs · Mar 10, 2016 · a015a0d · a015a0d
1 parent 7345bf6
commit a015a0d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/utils.js b/lib/utils.js
@@ -69,6 +69,9 @@ function getAlias(loader, canonicalName) {
   if (pluginIndex != -1)
     return getAlias(loader, canonicalName.substr(0, pluginIndex)) + '!' + getAlias(loader, canonicalName.substr(pluginIndex + 1));
 
+  // replace subpath conditionals with subpath
+  canonicalName = canonicalName.replace('/#:./', '/');
+
   if (canonicalName.match(/\#[\:\{\?]/))
     throw new Error('Unable to alias the conditional dependency "' + canonicalName + '".');
 
@@ -91,7 +94,7 @@ function getAlias(loader, canonicalName) {
     else if (canonicalName.substr(0, mapped.length) == mapped && 
         (canonicalName.length == mapped.length || canonicalName[mapped.length] == '/')) {
       bestAlias = alias;
-      bestAliasSubpath = canonicalName.substr(alias.length);
+      bestAliasSubpath = canonicalName.substr(mapped.length);
       bestAliasLength = alias.split('/').length;
     }
   });