From 9cd81d9cbb636139f074ebbb2bab171144c3ba3c Mon Sep 17 00:00:00 2001 From: Danmer Date: Wed, 9 Apr 2014 16:14:11 +0200 Subject: [PATCH] Close GH-337: Remove unnecessary excludes and ignores. --- app/templates/Gruntfile.js | 4 ++-- app/templates/gitignore | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index aa608a81..e0066f48 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -236,9 +236,9 @@ module.exports = function (grunt) { // Automatically inject Bower components into the HTML file bowerInstall: { app: { - src: ['<%%= config.app %>/index.html'],<% if (includeSass) { %> + src: ['<%%= config.app %>/index.html']<% if (includeBootstrap) { %>,<% if (includeSass) { %> exclude: ['bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap.js']<% } else { %> - exclude: ['bower_components/bootstrap/dist/js/bootstrap.js']<% } %> + exclude: ['bower_components/bootstrap/dist/js/bootstrap.js']<% } } %> }<% if (includeSass) { %>, sass: { src: ['<%%= config.app %>/styles/{,*/}*.{scss,sass}'] diff --git a/app/templates/gitignore b/app/templates/gitignore index 2f4628a1..fdc561ec 100644 --- a/app/templates/gitignore +++ b/app/templates/gitignore @@ -1,6 +1,6 @@ node_modules dist -.tmp -.sass-cache +.tmp<% if (includeSass) { %> +.sass-cache<% } %> bower_components test/bower_components