Merge branch 'develop'

Author: gp-as

lib/gulp/concat-into-file.js

@@ -8,16 +8,6 @@ const buildSettings = require('./build-settings.js');
 
 module.exports = function(file, plugins, config) {
   return lazypipe()
-    .pipe(function() {
-      let defaults = [
-        true,
-        {
-          file: path.join(config.dist_dir, (file.dist_dir || ''), file.name),
-        }
-      ];
-      let settings = buildSettings('newer', defaults, file.settings);
-      return plugins.gulpif(settings[0], plugins.newer(settings[1].file));
-    })
     .pipe(function() {
       let defaults = [
         true,

tasks/scripts-concat.js

@@ -33,7 +33,7 @@ module.exports = (gulp, projectArguments) => {
   });
 
   if(!toConcat.length) {
-    return merged;
+    return eventStream.merge();
   }
 
   return eventStream.merge(concatStreams);

tasks/styles-concat.js

@@ -33,7 +33,7 @@ module.exports = (gulp, projectArguments) => {
   });
 
   if(!toConcat.length) {
-    return merged;
+    return eventStream.merge();
   }
 
   return eventStream.merge(concatStreams);