ensure wildcard paths canonicalize with extension

systemjs · Feb 1, 2016 · d2313fe · d2313fe
1 parent 28010b9
commit d2313fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -181,7 +181,7 @@ function getCanonicalNamePlain(loader, normalized, isPlugin) {
         continue;
 
       // normalize the output path
-      var curPath = normalizePath(loader, p, isPlugin);
+      var curPath = normalizePath(loader, p, true);
 
       // do reverse match
       var wIndex = curPath.indexOf('*');
@@ -267,13 +267,13 @@ function getPackage(packages, name) {
 }
 
 var absURLRegEx = /^[^\/]+:\/\//;
-function normalizePath(loader, path, isPlugin) {
+function normalizePath(loader, path, skipExtension) {
   var curPath;
   if (loader.paths[path][0] == '.')
     curPath = decodeURI(url.resolve(toFileURL(process.cwd()) + '/', loader.paths[path]));
   else
     curPath = decodeURI(url.resolve(loader.baseURL, loader.paths[path]));
-  if (loader.defaultJSExtensions && !isPlugin && curPath.substr(curPath.length - 3, 3) != '.js')
+  if (loader.defaultJSExtensions && !skipExtension && curPath.substr(curPath.length - 3, 3) != '.js')
     curPath += '.js';
   return curPath;
 }

diff --git a/test/canonicals.js b/test/canonicals.js
@@ -27,7 +27,7 @@ suite('Canonical Names', function() {
   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');
+    assert.equal(builder.getCanonicalName(baseURL + 'test/dummy/file.jade!' + baseURL + 'test/fixtures/test-tree/jade.js'), 'file.jade!jade.js');
   });
 
   test('Trailing / canonical', function() {