combined script tasks into single file, closes #28

Author: Sebastian Henneberg

index.js

@@ -17,10 +17,6 @@ module.exports = function(gulp, tasks, config) {
     require('./tasks/compass')(gulp, config.app.scss, config.dirname, config.bases.app, config.dist.css);
   }
 
-  if (tasks.indexOf('configScripts') !== -1) {
-    require('./tasks/configScripts')(gulp, config.env.constants, config.configName, config.dist.js, config.env.rev);
-  }
-
   if (tasks.indexOf('browserSync') !== -1) {
     require('./tasks/browserSync')(gulp, browserSync, config.bases.dist, config.port, config.proxy);
   }
@@ -53,16 +49,12 @@ module.exports = function(gulp, tasks, config) {
     require('./tasks/mavenInstall')(gulp, config.mavenConfig);
   }
 
-  if (tasks.indexOf('partials') !== -1) {
-    require('./tasks/partials')(gulp, config.app.views, config.dist.js, config.templateName, config.sourceMapsPath, config.env.rev);
-  }
-
   if (tasks.indexOf('sass') !== -1) {
     require('./tasks/sass')(gulp, tasks, browserSync, config.app.scss, config.dist.css, config.env.rev, config.dist.fonts, config.sourceMapsPath);
   }
 
   if (tasks.indexOf('scripts') !== -1) {
-    require('./tasks/scripts')(gulp, config.app.js, config.dist.js, config.sourceMapsPath, config.env.rev);
+    require('./tasks/scripts')(gulp, tasks, config);
   }
 
   if (tasks.indexOf('statics') !== -1) {

package.json

@@ -35,7 +35,6 @@
     "gulp-angular-filesort": "^1.1.1",
     "gulp-autoprefixer": "^2.3.1",
     "gulp-bower": "0.0.10",
-    "gulp-cached": "^1.1.0",
     "gulp-compass": "^2.1.0",
     "gulp-concat": "^2.5.2",
     "gulp-debug": "^2.0.1",
@@ -54,14 +53,14 @@
     "gulp-ng-constant": "^0.3.0",
     "gulp-ng-html2js": "^0.2.0",
     "gulp-preprocess": "^1.2.0",
-    "gulp-remember": "^0.3.0",
     "gulp-rev": "^5.0.1",
     "gulp-rev-replace": "^0.4.2",
     "gulp-sass": "^2.0.3",
     "gulp-sourcemaps": "^1.5.2",
     "gulp-uglify": "^1.2.0",
     "jshint-stylish": "^2.0.1",
     "main-bower-files": "^2.8.0",
+    "merge-stream": "^1.0.0",
     "underscore": "^1.8.3"
   }
 }

tasks/configScripts.js

@@ -15,7 +15,7 @@ module.exports = function(gulp, tasks, dest, index, appName) {
       read: false
     };
 
-    var jsFiles = ['js/vendor*.js', 'js/constants*.js', 'js/partials*.js', 'js/scripts*.js'];
+    var jsFiles = ['js/vendor*.js', 'js/scripts*.js'];
     var cssFiles = ['css/vendor*.css', 'css/style*.css'];
 
     // use relative paths with dist as base; remove the prepended '../dist' in the path
@@ -45,6 +45,6 @@ module.exports = function(gulp, tasks, dest, index, appName) {
   gulp.task('justIndex', injectIndex);
 
   // use this initial building
-  var mergedTasks = _.intersection(tasks, ['partials', 'configScripts', 'scripts', 'bowerScripts', 'styles', 'bowerStyles']);
+  var mergedTasks = _.intersection(tasks, ['scripts', 'bowerScripts', 'styles', 'bowerStyles']);
   gulp.task('index', mergedTasks, injectIndex);
 };

tasks/index.js

@@ -1,31 +1,61 @@
 'use strict';
 
 var sourceMaps = require('gulp-sourcemaps'),
-  cached = require('gulp-cached'),
-  remember = require('gulp-remember'),
   ngAnnotate = require('gulp-ng-annotate'),
   ngFilesort = require('gulp-angular-filesort'),
+  ngConstant = require('gulp-ng-constant'),
+  minifyHtml = require('gulp-minify-html'),
+  ngHtml2Js = require('gulp-ng-html2js'),
   concat = require('gulp-concat'),
   gulpif = require('gulp-if'),
   rev = require('gulp-rev'),
-  uglify = require('gulp-uglify');
-
+  uglify = require('gulp-uglify'),
+  mergeStream = require('merge-stream');
 
 var scriptsFile = 'scripts.js';
 
-module.exports = function(gulp, src, dest, sourceMapsPath, revFlag) {
+module.exports = function(gulp, tasks, config) {
   gulp.task('scripts', function() {
-    return gulp.src(src)
+
+    var scripts = gulp.src(config.app.js);
+
+    // optionally add configScripts
+     if (tasks.indexOf('configScripts') !== -1) {
+       var configScripts = ngConstant({
+         constants: config.env.constants,
+         name: config.configName,
+         stream: true
+       });
+
+       scripts = mergeStream(scripts, configScripts);
+     }
+
+
+    // optionally add partials
+    if (tasks.indexOf('partials') !== -1) {
+      var partials = gulp.src(config.app.views)
+        .pipe(minifyHtml({
+          empty: true,
+          spare: true,
+          quotes: true
+        }))
+        .pipe(ngHtml2Js({
+          moduleName: config.templateName,
+          prefix: 'components/'
+        }));
+
+      scripts = mergeStream(scripts, partials);
+    }
+
+    return scripts
       .pipe(sourceMaps.init())
-      .pipe(cached('scriptsCache'))
       .pipe(ngAnnotate())
       .pipe(ngFilesort())
-      .pipe(remember('scriptsCache'))
       .pipe(concat(scriptsFile))
       .pipe(uglify())
-      .pipe(gulpif(revFlag, rev()))
-      .pipe(sourceMaps.write(sourceMapsPath))
-      .pipe(gulp.dest(dest));
+      .pipe(gulpif(config.env.rev, rev()))
+      .pipe(sourceMaps.write(config.sourceMapsPath))
+      .pipe(gulp.dest(config.dist.js));
   });
 };
 

tasks/partials.js

@@ -5,7 +5,7 @@ module.exports = function(gulp, tasks, browserSync, config) {
     gulp.watch(config.app.index, ['justIndex']);
 
     if (tasks.indexOf('partials')) {
-      gulp.watch(config.app.views, ['partials']);
+      gulp.watch(config.app.views, ['scripts']);
     }
 
     if (tasks.indexOf('statics')) {