fix: work with sourcemaps when mocha is wrapped (codymikol#237)

* Work with source maps * Avoid calling callback twice
tschaub · Apr 19, 2017 · 2da1aa1 · 2da1aa1
1 parent 4701b62
commit 2da1aa1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "async": "~0.9.0",
     "loader-utils": "^0.2.5",
     "lodash": "^3.8.0",
-    "source-map": "^0.1.41",
+    "source-map": "^0.5.6",
     "webpack-dev-middleware": "^1.0.11"
   },
   "devDependencies": {

diff --git a/src/mocha-env-loader.js b/src/mocha-env-loader.js
@@ -1,19 +1,21 @@
-//var path = require('path')
-var SourceNode = require('source-map').SourceNode
+var sourceMap = require('source-map')
 var loaderUtils = require('loader-utils')
 
+var SourceNode = sourceMap.SourceNode
+var SourceMapConsumer = sourceMap.SourceMapConsumer
+
 module.exports = function(content, map) {
   this.cacheable()
 
   var sourceNode
   var id = this.options.name
 
   if (!id) {
-    this.callback(null, content, map)
+    return this.callback(null, content, map)
   }
 
   if (map) {
-    sourceNode = SourceNode.fromSourceWithMap(content, map)
+    sourceNode = SourceNode.fromStringWithSourceMap(content, new SourceMapConsumer(map))
   } else {
     var fileName = loaderUtils.getRemainingRequest(this)