Bind Compass functions to compassBootstrap variable

yeoman · Jan 5, 2014 · a84ee60 · a84ee60
1 parent 35d3313
commit a84ee60
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -48,11 +48,11 @@ module.exports = function (grunt) {
             },<% } %>
             gruntfile: {
                 files: ['Gruntfile.js']
-            },
+            },<% if (compassBootstrap) { %>
             compass: {
                 files: ['<%%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
                 tasks: ['compass:server', 'autoprefixer']
-            },
+            },<% } %>
             styles: {
                 files: ['<%%= yeoman.app %>/styles/{,*/}*.css'],
                 tasks: ['newer:copy:styles', 'autoprefixer']
@@ -177,6 +177,7 @@ module.exports = function (grunt) {
             }
         },<% } %>
 
+<% if (compassBootstrap) { %>
         // Compiles Sass to CSS and generates necessary files if requested
         compass: {
             options: {
@@ -203,7 +204,7 @@ module.exports = function (grunt) {
                     debugInfo: true
                 }
             }
-        },
+        },<% } %>
 
         // Add vendor prefixed styles
         autoprefixer: {
@@ -372,8 +373,8 @@ module.exports = function (grunt) {
 
         // Run some tasks in parallel to speed up build process
         concurrent: {
-            server: [
-                'compass:server',<% if (coffee) { %>
+            server: [<% if (compassBootstrap) { %>
+                'compass:server',<% } if (coffee) { %>
                 'coffee:dist',<% } %>
                 'copy:styles'
             ],
@@ -382,8 +383,8 @@ module.exports = function (grunt) {
                 'copy:styles'
             ],
             dist: [<% if (coffee) { %>
-                'coffee',<% } %>
-                'compass',
+                'coffee',<% } if (compassBootstrap) { %>
+                'compass',<% } %>
                 'copy:styles',
                 'imagemin',
                 'svgmin'

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -7,8 +7,8 @@
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-concat": "~0.3.0",<% if (coffee) { %>
     "grunt-contrib-coffee": "~0.7.0",<% } %>
-    "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-compass": "~0.7.0",
+    "grunt-contrib-uglify": "~0.2.0",<% if (compassBootstrap) { %>
+    "grunt-contrib-compass": "~0.7.0",<% } %>
     "grunt-contrib-jshint": "~0.7.0",
     "grunt-contrib-cssmin": "~0.7.0",
     "grunt-contrib-connect": "~0.5.0",