diff --git a/loader.js b/loader.js index a1e11663..bf16f2bd 100644 --- a/loader.js +++ b/loader.js @@ -350,9 +350,10 @@ // module names starting with '#' are never normalized // useful for plugins where the import doesn't represent a real path if (name.substr(0, 1) != '#') { - + console.log(name); + console.log(referer && referer.name); // location relative normalization - if (name.substr(0, 2) == './' && referer && referer.name && referer.name.indexOf(':') != -1) + if (name.substr(0, 2) == './' && referer && referer.name && referer.name.indexOf(':') != -1 && referer.name.indexOf('/') == -1) name = referer.name.substr(0, referer.name.indexOf(':') + 1) + name.substr(2); // do standard normalization (resolve relative module name) @@ -361,7 +362,7 @@ // do map config name = applyMap(name, parentName); - + console.log(name); } if (pluginName) diff --git a/test/test.html b/test/test.html index ab9933cc..418ff15f 100644 --- a/test/test.html +++ b/test/test.html @@ -120,10 +120,9 @@ 'mypath': './tests' } }); - jspm.import(['mypath:path'], complete); + jspm.import(['mypath:path', 'mypath:deep/deep'], complete); }, confirm: function(m) { - console.log(m); if (m != 'path') return 'module not loaded'; } diff --git a/test/tests/deep/deep-dep.js b/test/tests/deep/deep-dep.js new file mode 100644 index 00000000..20e4f186 --- /dev/null +++ b/test/tests/deep/deep-dep.js @@ -0,0 +1 @@ +define({}); diff --git a/test/tests/deep/deep.js b/test/tests/deep/deep.js new file mode 100644 index 00000000..cb3befa5 --- /dev/null +++ b/test/tests/deep/deep.js @@ -0,0 +1 @@ +require('./deep-dep');