Merge branch 'v8/8.1' into v8/dev

src/Umbraco.Web.UI.Client/gulp/tasks/dev.js

@@ -5,6 +5,9 @@ var gulp = require('gulp');
 var runSequence = require('run-sequence');
 
 // Dev - build the files ready for development and start watchers
-gulp.task('dev', function(cb) {
+gulp.task('dev', function (cb) {
+
+    global.isProd = false;
+
     runSequence(["dependencies", "js", "less", "views"], "watch", cb);
 });

src/Umbraco.Web.UI.Client/gulp/tasks/fastdev.js

@@ -1,13 +0,0 @@
-'use strict';
-
-var config = require('../config');
-var gulp = require('gulp');
-var runSequence = require('run-sequence');
-
-// Dev - build the files ready for development and start watchers
-gulp.task('fastdev', function(cb) {
-    
-    global.isProd = false;
-    
-    runSequence(["dependencies", "js", "less", "views"], "watch", cb);
-});

src/Umbraco.Web.UI.Client/gulp/util/processJs.js

@@ -9,26 +9,28 @@ var concat = require('gulp-concat');
 var wrap = require("gulp-wrap-js");
 var embedTemplates = require('gulp-angular-embed-templates');
 
-module.exports = function(files, out) {
-    
+module.exports = function (files, out) {
+
     var task = gulp.src(files);
-    
-    if (global.isProd === true) {
-        // check for js errors
-        task = task.pipe(eslint());
-        // outputs the lint results to the console
-        task = task.pipe(eslint.format());
-    }
-    
+
+    // check for js errors
+    task = task.pipe(eslint());
+    // outputs the lint results to the console
+    task = task.pipe(eslint.format());
+
     // sort files in stream by path or any custom sort comparator
     task = task.pipe(babel())
-        .pipe(sort())
-        .pipe(embedTemplates({ basePath: "./src/", minimize:{ loose: true } }))
-        .pipe(concat(out))
+        .pipe(sort());
+
+    if (global.isProd === true) {
+        //in production, embed the templates
+        task = task.pipe(embedTemplates({ basePath: "./src/", minimize: { loose: true } }))
+    }
+    task = task.pipe(concat(out))
         .pipe(wrap('(function(){\n%= body %\n})();'))
         .pipe(gulp.dest(config.root + config.targets.js));
-    
-    
+
+
     return task;
-    
+
 };

src/Umbraco.Web.UI.Client/gulp/util/processLess.js

@@ -17,17 +17,12 @@ module.exports = function(files, out) {
     ];
 
     var task = gulp.src(files)
-        .pipe(less());
-    
-    
-    if (global.isProd === true) {
-        task = task.pipe(cleanCss());
-    }
-    
-    task = task.pipe(postcss(processors))
+        .pipe(less())
+        .pipe(cleanCss())
+        .pipe(postcss(processors))
         .pipe(rename(out))
         .pipe(gulp.dest(config.root + config.targets.css));
     
     return task;
     
-};
+};