handle canonicalization of plugin extensions against defaultJSExtensions

systemjs · Aug 26, 2015 · 6347cfe · 6347cfe
1 parent a8d3500
commit 6347cfe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -65,6 +65,14 @@ function getCanonicalName(loader, normalized) {
     }
   }
 
+  // add defaultJSExtension for reverse-pathing process to work out
+  // due to the fact that plugins remove defaultJSExtensions to begin with
+  var defaultJSExtension = false;
+  if (plugin && loader.defaultJSExtensions && normalized.substr(normalized.length - 3, 3) != '.js') {
+    normalized += '.js';
+    defaultJSExtension = true;
+  }
+
   // now just reverse apply paths rules to get canonical name
   var pathMatch;
 
@@ -116,6 +124,9 @@ function getCanonicalName(loader, normalized) {
   }
 
   if (plugin) {
+    if (defaultJSExtension && pathMatch.substr(pathMatch.length - 3, 3) == '.js')
+      pathMatch = pathMatch.substr(0, pathMatch.length - 3);
+
     if (loader.pluginFirst) {
       pathMatch = getCanonicalName(loader, plugin) + '!' + pathMatch;
     }

diff --git a/test/canonicals.js b/test/canonicals.js
@@ -23,4 +23,10 @@ suite('Canonical Names', function() {
   test('Wildcard extensions', function() {
     assert.equal(builder.getCanonicalName(baseURL + 'test/dummy/file.jade'), 'file.jade');
   });
+
+  test('Wildcard extensions with a plugin', function() {
+    builder.loader.defaultJSExtensions = true;
+    assert.equal(builder.getCanonicalName('cjs'), 'cjs');
+    assert.equal(builder.getCanonicalName(baseURL + 'test/dummy/file.jade!' + baseURL + 'test/fixtures/test-tree/jade.js'), 'file.jade!jade');
+  });
 });