fix(index): properly normalize for systemjs

Fixes aurelia/html-import-template-loader#8
aurelia · Feb 6, 2016 · aa3c481 · aa3c481
1 parent 0e2e526
commit aa3c481
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/index.js b/src/index.js
@@ -199,14 +199,16 @@ if (!PLATFORM.global.System || !PLATFORM.global.System.import) {
   };
 
   DefaultLoader.prototype.loadModule = function(id) {
-    let existing = this.moduleRegistry[id];
-    if (existing !== undefined) {
-      return Promise.resolve(existing);
-    }
+    return System.normalize(id).then(newId => {
+      let existing = this.moduleRegistry[newId];
+      if (existing !== undefined) {
+        return Promise.resolve(existing);
+      }
 
-    return System.import(id).then(m => {
-      this.moduleRegistry[id] = m;
-      return ensureOriginOnExports(m, id);
+      return System.import(newId).then(m => {
+        this.moduleRegistry[newId] = m;
+        return ensureOriginOnExports(m, newId);
+      });
     });
   };