From ff6a5d0990af7d6e3129d6ebca58681bbe081c13 Mon Sep 17 00:00:00 2001
From: Thomas Darling <mail@thda.dk>
Date: Mon, 17 Jul 2017 21:52:11 +0200
Subject: [PATCH 1/2] Fix missing path normalization, causing empty
 sourcesContent in source maps.

---
 lib/sourcemaps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sourcemaps.js b/lib/sourcemaps.js
index f31e279..c3bd34a 100644
--- 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.posix.normalize(map.sources[i].startsWith("/") ? map.sources[i] : (map.sourceRoot || '') + map.sources[i]);
         if (!source.match(/\/@traceur/)) {
           if (!contentsBySource[source]) {
             contentsBySource[source] = map.sourcesContent[i];

From aeb03f25b90e314bb492eea6dc46604998c33eb2 Mon Sep 17 00:00:00 2001
From: Thomas Darling <mail@thda.dk>
Date: Fri, 21 Jul 2017 18:14:09 +0200
Subject: [PATCH 2/2] Fix incorrect path normalization, causing wrong source
 paths in source maps.

---
 lib/sourcemaps.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sourcemaps.js b/lib/sourcemaps.js
index c3bd34a..9b81d9a 100644
--- 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 = path.posix.normalize(map.sources[i].startsWith("/") ? map.sources[i] : (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);