Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	gulp/tasks/clean.js
#	package.json

Author: StrikeForceZero

README.md

@@ -1,5 +1,6 @@
 angularjs-cordova-gulp-browserify-boilerplate
 =====================================
+[![devDependency Status](https://david-dm.org/jakemmarsh/angularjs-gulp-browserify-boilerplate/dev-status.svg)](https://david-dm.org/jakemmarsh/angularjs-gulp-browserify-boilerplate#info=devDependencies)
 
 A boilerplate using AngularJS SASS, Gulp, and Browserify that also utilizes [these best AngularJS practices](https://github.com/toddmotto/angularjs-styleguide)  and Gulp best practices from [this resource](https://github.com/greypants/gulp-starter). Cordova support intergrated for quick app developement.
 

gulp/tasks/browserify.js

@@ -18,12 +18,16 @@ import debowerify   from 'debowerify';
 import ngAnnotate   from 'browserify-ngannotate';
 import fs           from 'fs';
 
+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
@@ -73,18 +77,18 @@ 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 }));
+      .pipe(browserSync.stream());
   }
 
   return rebundle();

gulp/tasks/clean.js

@@ -5,12 +5,11 @@ import gulp   from 'gulp';
 import del    from 'del';
 import file   from 'gulp-file';
 
-gulp.task('clean', function(cb) {
+gulp.task('clean', function() {
 
-  del([config.buildDir],function(){
+  return del([config.buildDir],function(){
 	//Cordova requires www, so lets keep the folder using .gitkeep even if its empty after a clean.
 	file('.gitkeep', '', { src: true }).pipe(gulp.dest(config.buildDir));
-	cb();
   });
 
 });

gulp/tasks/fonts.js

@@ -10,6 +10,6 @@ gulp.task('fonts', function() {
   return gulp.src(config.fonts.src)
     .pipe(changed(config.fonts.dest)) // Ignore unchanged files
     .pipe(gulp.dest(config.fonts.dest))
-    .pipe(browserSync.stream({ once: true }));
+    .pipe(browserSync.stream());
 
 });

gulp/tasks/images.js

@@ -13,6 +13,6 @@ gulp.task('images', function() {
     .pipe(changed(config.images.dest)) // Ignore unchanged files
     .pipe(gulpif(global.isProd, imagemin())) // Optimize
     .pipe(gulp.dest(config.images.dest))
-    .pipe(browserSync.stream({ once: true }));
+    .pipe(browserSync.stream());
 
-});
+});

gulp/tasks/styles.js

@@ -27,6 +27,6 @@ gulp.task('styles', function () {
       sourcemaps.write( global.isProd ? './' : null ))
     )
     .pipe(gulp.dest(config.styles.dest))
-    .pipe(browserSync.stream({ once: true }));
+    .pipe(browserSync.stream());
 
 });

gulp/tasks/views.js

@@ -18,6 +18,6 @@ gulp.task('views', function() {
       standalone: true
     }))
     .pipe(gulp.dest(config.views.dest))
-    .pipe(browserSync.stream({ once: true }));
+    .pipe(browserSync.stream());
 
-});
+});

package.json

@@ -23,64 +23,63 @@
     "protractor",
     "boilerplate"
   ],
-  "private": true,
+  "private": false,
   "engines": {
     "node": ">=0.12.x"
   },
   "devDependencies": {
     "babel-core": "^5.8.25",
-    "babelify": "^6.3.0",
+    "babelify": "^6.4.0",
     "brfs": "^1.2.0",
     "browser-sync": "^2.7.6",
     "browserify": "^12.0.0",
     "browserify-istanbul": "^0.2.1",
-    "browserify-ngannotate": "^1.0.1",
+    "browserify-ngannotate": "^2.0.0",
     "browserify-shim": "^3.8.9",
     "bulk-require": "^0.2.1",
     "bulkify": "^1.1.1",
     "cordova": "^5.1.1",
     "debowerify": "^1.3.1",
-    "del": "^0.1.3",
+    "del": "^2.1.0",
     "fs": "0.0.2",
     "gulp": "^3.8.8",
     "gulp-angular-templatecache": "^1.3.0",
-    "gulp-autoprefixer": "^2.0.0",
+    "gulp-autoprefixer": "^3.1.0",
     "gulp-changed": "^1.0.0",
     "gulp-file": "^0.2.0",
-    "gulp-gzip": "^0.0.8",
-    "gulp-if": "^1.2.5",
-    "gulp-imagemin": "^1.1.0",
+    "gulp-gzip": "^1.2.0",
+    "gulp-if": "^2.0.0",
+    "gulp-imagemin": "^2.4.0",
     "gulp-jshint": "^1.8.3",
     "gulp-notify": "^2.0.0",
-    "gulp-protractor": "^1.0.0",
+    "gulp-protractor": "^2.1.0",
     "gulp-rename": "^1.2.0",
     "gulp-sass": "^2.0.4",
     "gulp-sourcemaps": "^1.6.0",
-    "gulp-streamify": "0.0.5",
+    "gulp-streamify": "^1.0.2",
     "gulp-uglify": "^1.4.2",
     "gulp-util": "^3.0.1",
-    "imagemin-pngcrush": "^0.1.0",
-    "isparta": "^3.0.3",
-    "jshint-stylish": "^1.0.0",
+    "imagemin-pngcrush": "^4.1.0",
+    "isparta": "^4.0.0",
+    "jshint-stylish": "^2.1.0",
     "karma": "^0.13.14",
     "karma-browserify": "^4.4.0",
     "karma-chrome-launcher": "^0.2.1",
     "karma-coverage": "douglasduteil/karma-coverage#next",
     "karma-firefox-launcher": "^0.1.3",
     "karma-jasmine": "^0.3.6",
-    "pretty-hrtime": "^0.2.2",
-    "protractor": "^2.5.1",
-    "run-sequence": "^0.3.6",
+    "pretty-hrtime": "^1.0.1",
+    "protractor": "2.5.1",
+    "run-sequence": "^1.1.5",
     "tiny-lr": "0.0.9",
-    "uglifyify": "^2.5.0",
+    "uglifyify": "^3.0.1",
     "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^0.1.1",
+    "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.4.0"
   },
   "scripts": {
-    "pretest": "npm install",
     "test": "karma start test/karma.conf.js",
-    "preprotractor": "npm install && webdriver-manager update",
+    "preprotractor": "webdriver-manager update",
     "protractor": "protractor test/protractor.conf.js"
   },
   "browser": {

test/karma.conf.js

@@ -19,9 +19,10 @@ module.exports = function(config) {
 
     browserify: {
       debug: true,
-      extensions: ['.js', '.jsx'],
+      extensions: ['.js'],
       transform: [
         'babelify',
+        'browserify-ngannotate',
         'bulkify',
         istanbul({
           instrumenter: isparta,