gulpfile modifications, default build set to dev

gulpfile.js

@@ -18,8 +18,8 @@ var bower = require('bower');
 
 var DEST = './dist/';
 
-var build = function(src, dst) {
-  return browserify({
+var build = function(src, dst, ugly) {
+  var result = browserify({
       debug: true,
       insert_global_vars: false,
       detectGlobals: false,
@@ -30,40 +30,25 @@ var build = function(src, dst) {
     .transform('envify', {
       NODE_ENV: 'build'
     })
-    .transform('unreachable-branch-transform')
-    .transform('uglifyify', {
-      mangle: false,
-      compress: {
-        dead_code: false,
-        conditionals: true,
-        unused: false,
-        hoist_funs: true,
-        hoist_vars: true,
-        negate_iife: false
-      },
-      beautify: true,
-      warnings: true
-    })
-    .bundle()
-    .pipe(exorcist(path.join( DEST, dst + '.js.map')))
-    .pipe(source(dst + '.js'))
-    .pipe(gulp.dest( DEST ));
-};
+    .transform('unreachable-branch-transform');
 
-var buildDev = function(src, dst) {
-  return browserify({
-      debug: true,
-      insert_global_vars: false,
-      detectGlobals: false,
-      bundleExternal: false
-    })
-    .require('./' + src + '.js', {expose: 'web3'})
-    .add('./' + src + '.js')
-    .transform('envify', {
-      NODE_ENV: 'build'
-    })
-    .transform('unreachable-branch-transform')
-    .bundle()
+    if (ugly) {
+      result = result.transform('uglifyify', {
+        mangle: false,
+        compress: {
+          dead_code: false,
+          conditionals: true,
+          unused: false,
+          hoist_funs: true,
+          hoist_vars: true,
+          negate_iife: false
+        },
+        beautify: true,
+        warnings: true
+      });
+    }
+
+    return result.bundle()
     .pipe(exorcist(path.join( DEST, dst + '.js.map')))
     .pipe(source(dst + '.js'))
     .pipe(gulp.dest( DEST ));
@@ -83,33 +68,29 @@ gulp.task('bower', function(cb){
   });
 });
 
+gulp.task('clean', ['lint'], function(cb) {
+  del([ DEST ], cb);
+});
+
 gulp.task('lint', function(){
   return gulp.src(['./*.js', './lib/*.js'])
     .pipe(jshint())
     .pipe(jshint.reporter('default'));
 });
 
-gulp.task('clean', ['lint'], function(cb) {
-  del([ DEST ], cb);
-});
-
 gulp.task('build', ['clean'], function () {
-    return build('index', 'ethereum');
-});
-
-gulp.task('buildQt', ['clean'], function () {
-    return build('index_qt', 'ethereum');
+    return build('index', 'ethereum', true);
 });
 
 gulp.task('buildDev', ['clean'], function () {
-    return buildDev('index', 'ethereum');
+    return build('index', 'ethereum', false);
 });
 
 gulp.task('uglify', ['build'], function(){
     return uglifyFile('ethereum');
 });
 
-gulp.task('uglifyQt', ['buildQt'], function () {
+gulp.task('uglify', ['buildDev'], function(){
     return uglifyFile('ethereum');
 });
 
@@ -117,7 +98,7 @@ gulp.task('watch', function() {
   gulp.watch(['./lib/*.js'], ['lint', 'prepare', 'build']);
 });
 
-gulp.task('default', ['bower', 'lint', 'build', 'uglify']);
-gulp.task('qt', ['bower', 'lint', 'buildQt', 'uglifyQt']);
-gulp.task('dev', ['bower', 'lint', 'buildDev']);
+gulp.task('release', ['bower', 'lint', 'build', 'uglify']);
+gulp.task('dev', ['bower', 'lint', 'buildDev', 'uglify']);
+gulp.task('default', ['dev']);