Merge branch 'master' into i18n-translator-redux

1 files changed, 3 insertions, 3 deletions

diff --git a/gulpfile.js b/gulpfile.js
index adfb148a9..f57ea6206 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -339,7 +339,7 @@ function generateBundler(opts, performBundle) {
   const browserifyOpts = assign({}, watchify.args, {
     entries: ['./app/scripts/'+opts.filename],
     plugin: 'browserify-derequire',
-    debug: debug,
+    debug: true,
     fullPaths: debug,
   })
 
@@ -405,13 +405,13 @@ function bundleTask(opts) {
       .pipe(buffer())
       // sourcemaps
       // loads map from browserify file
-      .pipe(gulpif(debug, sourcemaps.init({ loadMaps: true })))
+      .pipe(sourcemaps.init({ loadMaps: true }))
       // Minification
       .pipe(gulpif(opts.isBuild, uglify({
         mangle: {  reserved: [ 'MetamaskInpageProvider' ] },
       })))
       // writes .map file
-      .pipe(gulpif(debug, sourcemaps.write('./')))
+      .pipe(sourcemaps.write(debug ? './' : '../../sourcemaps'))
       // write completed bundles
       .pipe(gulp.dest('./dist/firefox/scripts'))
       .pipe(gulp.dest('./dist/chrome/scripts'))