From 29c83807f8583e8882a0060c162ce7673902e843 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Tue, 25 Feb 2014 12:42:40 -0700 Subject: [PATCH] Updates to the grunt tasks make the jade and less tasks more generic, compiling any file they find in place. --- tasks/config/jade.js | 10 +++++++--- tasks/config/less.js | 3 ++- tasks/config/watch.js | 15 +++++++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tasks/config/jade.js b/tasks/config/jade.js index 9c9ffbbfc2c2..fd19f7f151e9 100644 --- a/tasks/config/jade.js +++ b/tasks/config/jade.js @@ -1,6 +1,13 @@ module.exports = function (grunt) { return { test: { + src: [ + '<%= unitTestDir %>/**/*.jade', + '<%= app %>/partials/**/*.jade', + '<%= app %>/apps/**/*.jade' + ], + expand: true, + ext: '.html', options: { data: function (src, dest) { var pattern = grunt.config.process('<%= unitTestDir %>/**/*.js'); @@ -10,9 +17,6 @@ module.exports = function (grunt) { return { tests: JSON.stringify(tests) }; }, client: false - }, - files: { - '<%= unitTestDir %>/index.html': '<%= unitTestDir %>/index.jade' } } }; diff --git a/tasks/config/less.js b/tasks/config/less.js index 058206fb5938..bb7e345f0d93 100644 --- a/tasks/config/less.js +++ b/tasks/config/less.js @@ -2,7 +2,8 @@ module.exports = { src: { src: [ '<%= app %>/styles/**/*.less', - '<%= app %>/apps/**/*.less' + '<%= app %>/apps/**/*.less', + '!_*.less' ], expand: true, ext: '.css', diff --git a/tasks/config/watch.js b/tasks/config/watch.js index d1aaded99bde..2bfb964239ac 100644 --- a/tasks/config/watch.js +++ b/tasks/config/watch.js @@ -4,9 +4,20 @@ module.exports = function (grunt) { files: ['<%= unitTestDir %>/*.jade', '<%= unitTestDir %>/**/*.js'], tasks: ['jade:test', 'mocha:unit'] }, - src: { - files: ['<%= src %>'], + less: { + files: [ + '<%= app %>/**/*.less', + '<%= src %>/courier/**/*.less' + ], tasks: ['less'] + }, + jade: { + files: [ + '<%= app %>/**/*.jade', + '<%= src %>/courier/**/*.jade', + '!<%= unitTestDir %>/**/*.jade' + ], + tasks: ['jade'] } }; };