Move other compilers over to Task subclasses

src/Config.js

@@ -204,6 +204,8 @@ const config = {
         sass: {
             folder: 'sass',
 
+            search: '/**/*.+(sass|scss)',
+
             // https://github.com/sass/node-sass#options
             pluginOptions: {
                 outputStyle: Elixir.inProduction ? 'compressed' : 'nested',
@@ -225,6 +227,8 @@ const config = {
         less: {
             folder: 'less',
 
+            search: '/**/*.less',
+
             // https://github.com/plus3network/gulp-less#options
             pluginOptions: {}
         }

src/bootstrap/SetDependencies.js

@@ -66,7 +66,7 @@ Elixir.Plugins = require('gulp-load-plugins')();
  *
  * @type {Task}
  */
-Elixir.Task = require('../Task').default;
+Elixir.Task = require('../tasks/conductors/Task').default;
 
 
 /**

src/tasks/combine.js

@@ -1,4 +1,4 @@
-import combine from './shared/Combine';
+import CombineTask from './conductors/CombineTask';
 
 /*
  |----------------------------------------------------------------
@@ -24,7 +24,7 @@ Elixir.extend('compress', task);
  * @param  {string|null}  baseDir
  */
 function task(src, output, baseDir) {
-    combine('combine', getPaths(src, baseDir, output));
+    new CombineTask('combine', getPaths(src, baseDir, output));
 }
 
 

src/tasks/conductors/CombineTask.js

@@ -0,0 +1,40 @@
+class CombineTask extends Elixir.Task {
+    /**
+     * Create a new TestingTask instance.
+     *
+     * @param {string}      name
+     * @param {GulpPaths}   paths
+     */
+    constructor(name, paths) {
+        super(name, null, paths);
+    }
+
+
+    /**
+     * Build the Gulp task.
+     */
+    gulpTask() {
+        return (
+            gulp
+            .src(this.src.path)
+            .pipe(this.initSourceMaps())
+            .pipe(this.concat())
+            .pipe(this.minify())
+            .pipe(this.writeSourceMaps())
+            .pipe(this.saveAs(gulp))
+            .pipe(this.onSuccess('Assets Combined!'))
+        );
+    }
+
+
+    /**
+     * Register file watchers.
+     */
+    registerWatchers() {
+        this.watch(this.src.path)
+            .ignore(this.output.path);
+    }
+}
+
+
+export default CombineTask;

src/tasks/conductors/CssTask.js

@@ -0,0 +1,56 @@
+class CssTask extends Elixir.Task {
+    /**
+     * Create a new TestingTask instance.
+     *
+     * @param {string}      name
+     * @param {GulpPaths}   paths
+     * @param {object|null} options
+     */
+    constructor(name, paths, options) {
+        super(name, null, paths);
+
+        this.options = options;
+    }
+
+
+    /**
+     * Build the Gulp task.
+     */
+    gulpTask() {
+        return (
+            gulp
+            .src(this.src.path)
+            .pipe(this.initSourceMaps())
+            .pipe(this.compile())
+            .on('error', this.onError)
+            .pipe(this.autoPrefix())
+            .pipe(this.concat())
+            .pipe(this.minify())
+            .pipe(this.writeSourceMaps())
+            .pipe(this.saveAs(gulp))
+            .pipe(this.onSuccess())
+        );
+    }
+
+
+    /**
+     * Register file watchers.
+     */
+    registerWatchers() {
+        this.watch(this.src.baseDir + Elixir.config.css[this.name].search)
+            .ignore(this.output.path);
+    }
+
+
+    /**
+     * Compile the CSS.
+     */
+    compile() {
+        return Elixir.Plugins[this.name](
+            this.options || Elixir.config.css[this.name].pluginOptions
+        );
+    }
+}
+
+
+export default CssTask;

src/tasks/compilers/JavaScriptCompiler.js → src/tasks/conductors/JavaScriptTask.js

@@ -1,17 +1,20 @@
 import fs from 'fs';
 import map from 'vinyl-map';
 import {extend} from 'underscore';
-import Compiler from './Compiler';
 import gulpWebpack from 'webpack-stream';
 
-class JavaScriptCompiler extends Compiler {
+class JavaScriptTask extends Elixir.Task {
     /**
-     * Create a new compiler instance.
+     * Create a new JavaScriptTask instance.
      *
+     * @param  {string}      name
+     * @param  {GulpPaths}   paths
      * @param  {object|null} options
      */
-    constructor(options) {
-        super(options);
+    constructor(name, paths, options) {
+        super(name, null, paths);
+
+        this.options = options;
 
         if (fs.existsSync('webpack.config.js')) {
             this.webpackConfig = require(process.cwd()+'/webpack.config.js');
@@ -20,16 +23,12 @@ class JavaScriptCompiler extends Compiler {
 
 
     /**
-     * Retrieve the full Gulp task.
-     *
-     * @param {Task} task
+     * Build up the Gulp task.
      */
-    toGulp(task) {
-        this.task = task;
-
+    gulpTask() {
         return (
             gulp
-            .src(task.src.path)
+            .src(this.src.path)
             .pipe(this.webpack())
             .on('error', this.onError)
             .pipe(this.minify())
@@ -47,28 +46,14 @@ class JavaScriptCompiler extends Compiler {
             watch: Elixir.isWatching(),
             devtool: Elixir.config.sourcemaps ? 'source-map' : '',
             output: {
-                filename: this.task.output.name
+                filename: this.output.name
             },
             module: {
                 loaders: Elixir.config.js.webpack.loaders
             }
         }, this.webpackConfig, this.options), require('webpack'));
     }
-
-
-    /**
-     * Uglify the code.
-     */
-    minify() {
-        if (Elixir.inProduction) {
-            return Elixir.Plugins.uglify(
-                Elixir.config.js.uglify.options
-            );
-        }
-
-        return map(function () {});
-    }
 }
 
 
-export default JavaScriptCompiler;
+export default JavaScriptTask;