Merge pull request #823 from thomas-darling/master

Fix missing path normalization, causing empty sourcesContent in source maps.
systemjs · Jul 22, 2017 · 62aa0ba · 62aa0ba
2 parents 8a8dcba + aeb03f2
commit 62aa0ba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/sourcemaps.js b/lib/sourcemaps.js
@@ -45,7 +45,7 @@ exports.concatenateSourceMaps = function(outFile, mapsWithOffsets, basePath, sou
 
     if (sourceMapContents && map.sourcesContent) {
       for (var i=0; i<map.sources.length; i++) {
-        var source = (map.sourceRoot || '') + map.sources[i];
+        var source = path.normalize(path.isAbsolute(map.sources[i]) ? map.sources[i] : (map.sourceRoot || '') + map.sources[i]).replace(/\\/g, '/');
         if (!source.match(/\/@traceur/)) {
           if (!contentsBySource[source]) {
             contentsBySource[source] = map.sourcesContent[i];
@@ -98,7 +98,7 @@ exports.concatenateSourceMaps = function(outFile, mapsWithOffsets, basePath, sou
     if (isFileURL(source))
       source = fromFileURL(source);
 
-    return path.relative(outPath, path.resolve(basePath, source)).replace(/\\/g, '/');
+    return path.isAbsolute(source) ? source : path.relative(outPath, path.resolve(basePath, source)).replace(/\\/g, '/');
   });
 
   return JSON.stringify(normalized);