Update Gulp config

gulpfile.js

@@ -4,12 +4,30 @@ global.gulp = require('gulp');
 global.plugins = require('gulp-load-plugins')();
 
 global.config = {
-    assetsDir: 'assets',
+    autoprefixer: {
+        browsers: 'last 2 versions'
+    },
     bowerDir: 'vendor/bower',
-    jsPattern: 'js/**/*.js',
-    outputDir: 'source/assets',
+    fonts: {
+        output: 'source/assets/fonts'
+    },
+    htmlmin: {
+        collapseWhitespace: true
+    },
+    js: {
+        source: 'assets/js',
+        search: '/js/**/*.js',
+        output: 'source/assets/js'
+    },
     production: plugins.util.env.production || false,
-    sassPattern: 'sass/**/*.sass',
+    sass: {
+        source: 'assets/sass',
+        search: '/**/*.sass',
+        output: 'source/assets/css'
+    },
+    scss: {
+        search: '/**/*.scss'
+    }
 }
 
 global.app = {};
@@ -20,13 +38,12 @@ app.css = function (paths, filename) {
         .pipe(plugins.if(!config.production, plugins.sourcemaps.init()))
         .pipe(plugins.sassGlob())
         .pipe(plugins.sass())
-        .pipe(plugins.autoprefixer({ browsers: 'last 2 versions' }))
+        .pipe(plugins.autoprefixer(config.autoprefixer))
         .pipe(plugins.concat(filename))
         .pipe(plugins.if(config.production, plugins.cleanCss()))
         .pipe(plugins.if(!config.production, plugins.sourcemaps.write('.')))
-        .pipe(plugins.if(!config.production, gulp.dest(config.outputDir + '/css')))
         .pipe(plugins.if(!config.production, plugins.refresh()))
-        .pipe(gulp.dest(config.outputDir + '/css'));
+        .pipe(gulp.dest(config.sass.output));
 };
 
 app.js = function (paths, filename) {
@@ -36,7 +53,7 @@ app.js = function (paths, filename) {
         .pipe(plugins.concat(filename))
         .pipe(plugins.if(config.production, plugins.uglify()))
         .pipe(plugins.if(!config.production, plugins.sourcemaps.write('.')))
-        .pipe(gulp.dest(config.outputDir + '/js'));
+        .pipe(gulp.dest(config.js.output));
 };
 
 app.copy = function (source, destination) {