Merge pull request jakemmarsh#124 from DrewML/fixSourcemaps

Fix sourcemaps for Browserify

Author: jakemmarsh

gulp/tasks/browserify.js

@@ -17,12 +17,16 @@ import browserSync  from 'browser-sync';
 import debowerify   from 'debowerify';
 import ngAnnotate   from 'browserify-ngannotate';
 
+function createSourcemap() {
+  return !global.isProd || config.browserify.prodSourcemap;
+}
+
 // Based on: http://blog.avisi.nl/2014/04/25/how-to-keep-a-fast-build-with-browserify-and-reactjs/
 function buildScript(file) {
-
-  var bundler = browserify({
+  
+  let bundler = browserify({
     entries: [config.sourceDir + 'js/' + file],
-    debug: true,
+    debug: createSourcemap(),
     cache: {},
     packageCache: {},
     fullPaths: !global.isProd
@@ -51,16 +55,16 @@ function buildScript(file) {
 
   function rebundle() {
     const stream = bundler.bundle();
-    const createSourcemap = global.isProd && config.browserify.prodSourcemap;
+    const sourceMapLocation = global.isProd ? './' : '';
 
     return stream.on('error', handleErrors)
       .pipe(source(file))
-      .pipe(gulpif(createSourcemap, buffer()))
-      .pipe(gulpif(createSourcemap, sourcemaps.init()))
+      .pipe(gulpif(createSourcemap(), buffer()))
+      .pipe(gulpif(createSourcemap(), sourcemaps.init({ loadMaps: true })))
       .pipe(gulpif(global.isProd, streamify(uglify({
         compress: { drop_console: true }
       }))))
-      .pipe(gulpif(createSourcemap, sourcemaps.write('./')))
+      .pipe(gulpif(createSourcemap(), sourcemaps.write(sourceMapLocation)))
       .pipe(gulp.dest(config.scripts.dest))
       .pipe(browserSync.stream({ once: true }));
   }