node_modules

2 files changed, 28 insertions, 23 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
diff --git a/node_modules/merge-source-map/package.json b/node_modules/merge-source-map/package.json
index d927b7a3e..f57259ff1 100644
--- a/node_modules/merge-source-map/package.json
+++ b/node_modules/merge-source-map/package.json
@@ -1,6 +1,6 @@
 {
   "name": "merge-source-map",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Merge old source map and new source map in multi-transform flow",
   "main": "index.js",
   "scripts": {
@@ -22,19 +22,21 @@
     "source-map"
   ],
   "dependencies": {
-    "source-map": "^0.5.3"
+    "source-map": "^0.5.6"
   },
   "devDependencies": {
-    "babel-core": "^6.14.0",
-    "babel-preset-es2015": "^6.14.0",
-    "coffee-script": "^1.10.0",
-    "convert-source-map": "^1.3.0",
+    "babel-core": "^6.25.0",
+    "babel-plugin-syntax-object-rest-spread": "^6.13.0",
+    "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+    "babel-plugin-transform-es2015-spread": "^6.22.0",
+    "coffee-script": "^1.12.6",
+    "convert-source-map": "^1.5.0",
     "escodegen": "^1.8.1",
-    "eslint": "^3.5.0",
-    "esprima": "^3.0.0",
-    "estraverse": "^4.1.1",
-    "nyc": "^8.3.0",
-    "tape": "^4.5.1"
+    "eslint": "^3.19.0",
+    "esprima": "^3.1.3",
+    "estraverse": "^4.2.0",
+    "nyc": "^8.4.0",
+    "tape": "^4.6.3"
   },
   "files": []
 }