Merge pull request #138 from EugeneZ/master

Fixes #127 #123

package.json

@@ -28,8 +28,10 @@
   },
   "dependencies": {
     "cli-color": "1.1.0",
+    "convert-source-map": "1.3.0",
     "lodash": "4.13.1",
     "md5": "2.1.0",
+    "offset-sourcemap-lines": "1.0.0",
     "through2": "2.0.1",
     "umd": "3.0.1",
     "ws": "1.1.1"

src/browserify-plugin/main.js

@@ -4,6 +4,8 @@ import through from "through2"
 import md5 from "md5"
 import {readFileSync} from "fs"
 import {resolve} from "path"
+import convertSourceMaps from 'convert-source-map'
+import offsetSourceMaps from 'offset-sourcemap-lines'
 import {startServer} from "./server"
 import {log} from "./console"
 import loader from "../reloading"
@@ -16,6 +18,7 @@ function LiveReactloadPlugin(b, opts = {}) {
     client = true,
     dedupe = true,
     debug = false,
+    basedir = process.cwd(),
     'ssl-cert': sslCert = null,
     'ssl-key': sslKey = null,
     } = opts
@@ -96,10 +99,24 @@ function LiveReactloadPlugin(b, opts = {}) {
     b.pipeline.get("label").push(through.obj(
       function transform(row, enc, next) {
         const {id, file, source, deps, entry} = row
+        const converter = convertSourceMaps.fromSource(source)
+        let sourceWithoutMaps = source
+        let adjustedSourcemap = ''
+        let hash;
+
+        if (converter) {
+          sourceWithoutMaps = convertSourceMaps.removeComments(source)
+          hash = md5(sourceWithoutMaps)
+          converter.setProperty('sources', [file.replace(basedir, hash)])
+          adjustedSourcemap = convertSourceMaps.fromObject(offsetSourceMaps(converter.toObject(), 1)).toComment()
+        } else {
+          hash = md5(source)
+        }
+
         if (entry) {
           entries.push(file)
         }
-        mappings[file] = [source, deps, {id: file, hash: md5(source), browserifyId: id}]
+        mappings[file] = [sourceWithoutMaps, deps, {id: file, hash: md5(sourceWithoutMaps), browserifyId: id, sourcemap: adjustedSourcemap}]
         next(null, row)
       },
       function flush(next) {
@@ -136,7 +153,8 @@ function LiveReactloadPlugin(b, opts = {}) {
           clientOpts
         ]
         let bundleSrc =
-          `(${loader.toString()})(${args.map(a => JSON.stringify(a, null, 2)).join(", ")});`
+          `(${loader.toString()})(${args.map(a => JSON.stringify(a, null, 2)).join(", ")});
+            ${__livereactload_loadAsModule.toString()};`
         if (standalone) {
           bundleSrc = umd(standalone, `return ${bundleSrc}`)
         }
@@ -155,4 +173,13 @@ function LiveReactloadPlugin(b, opts = {}) {
   }
 }
 
+function __livereactload_loadAsModule(__livereactload_source, __livereactload_sourcemap) {
+  return eval(
+    'function __livereactload_module(require, module, exports){\n' +
+    __livereactload_source +
+    '\n}; __livereactload_module;' +
+    (__livereactload_sourcemap || '')
+  );
+}
+
 module.exports = LiveReactloadPlugin

src/reloading.js

@@ -84,7 +84,7 @@ function loader(mappings, entryPoints, options) {
     var body = mapping[0];
     if (typeof body !== "function") {
       debug("Compiling module", mapping[2])
-      var compiled = new Function("require", "module", "exports", body);
+      var compiled = __livereactload_loadAsModule(body, mapping[2].sourcemap);
       mapping[0] = compiled;
       mapping[2].source = body;
     }
@@ -428,8 +428,8 @@ function loader(mappings, entryPoints, options) {
   function error(msg) {
     console.error("LiveReactload ::", msg);
   }
-}
 
+}
 
 module.exports = loader;
 module.exports["default"] = loader;