node_modules

1 files changed, 15 insertions, 12 deletions

diff --git a/node_modules/merge-source-map/index.js b/node_modules/merge-source-map/index.js
index d15871c1d..ef208d99c 100644
--- a/node_modules/merge-source-map/index.js
+++ b/node_modules/merge-source-map/index.js
@@ -1,6 +1,6 @@
-var sourceMap = require('source-map'),
-    SourceMapConsumer = sourceMap.SourceMapConsumer,
-    SourceMapGenerator = sourceMap.SourceMapGenerator
+var sourceMap = require('source-map')
+var SourceMapConsumer = sourceMap.SourceMapConsumer
+var SourceMapGenerator = sourceMap.SourceMapGenerator
 
 module.exports = merge
 
@@ -8,8 +8,8 @@ module.exports = merge
  * Merge old source map and new source map and return merged.
  * If old or new source map value is falsy, return another one as it is.
  *
- * @param {object|undefined} oldMap old source map object
- * @param {object|undefined} newmap new source map object
+ * @param {object|string} [oldMap] old source map object
+ * @param {object|string} [newmap] new source map object
  * @return {object|undefined} merged source map object, or undefined when both old and new source map are undefined
  */
 function merge(oldMap, newMap) {
@@ -19,9 +19,9 @@ function merge(oldMap, newMap) {
   if (!newMap)
     return oldMap
 
-  var oldMapConsumer = new SourceMapConsumer(oldMap),
-      newMapConsumer = new SourceMapConsumer(newMap),
-      mergedMapGenerator = new SourceMapGenerator()
+  var oldMapConsumer = new SourceMapConsumer(oldMap)
+  var newMapConsumer = new SourceMapConsumer(newMap)
+  var mergedMapGenerator = new SourceMapGenerator()
 
   // iterate on new map and overwrite original position of new map with one of old map
   newMapConsumer.eachMapping(function(m) {
@@ -44,14 +44,17 @@ function merge(oldMap, newMap) {
         line: m.generatedLine,
         column: m.generatedColumn
       },
-      source: m.source,
-      name: m.name
+      source: origPosInOldMap.source,
+      name: origPosInOldMap.name
     })
   })
 
   var mergedMap = JSON.parse(mergedMapGenerator.toString())
-  mergedMap.sources = oldMap.sources
-  mergedMap.sourcesContent = oldMap.sourcesContent
+
+  mergedMap.sourcesContent = mergedMap.sources.map(function (source) {
+    return oldMapConsumer.sourceContentFor(source)
+  })
+
   mergedMap.sourceRoot = oldMap.sourceRoot
 
   return mergedMap