f7be81d6 by Adam Heath

Add more conditionals around buildList targets.

1 parent 70513966
...@@ -565,7 +565,9 @@ module.exports = function (grunt) { ...@@ -565,7 +565,9 @@ module.exports = function (grunt) {
565 if (mpConfig.bower) { 565 if (mpConfig.bower) {
566 buildList.push('requirejs'); // script 566 buildList.push('requirejs'); // script
567 } 567 }
568 if (mpConfig.css) {
568 buildList.push('copy:css'); // css 569 buildList.push('copy:css'); // css
570 }
569 if (mpConfig.images) { 571 if (mpConfig.images) {
570 var minify = mpConfig.images.options.minify; 572 var minify = mpConfig.images.options.minify;
571 if (minify === undefined || minify) { 573 if (minify === undefined || minify) {
...@@ -579,8 +581,12 @@ module.exports = function (grunt) { ...@@ -579,8 +581,12 @@ module.exports = function (grunt) {
579 } 581 }
580 } 582 }
581 //buildList.push('autoprefixer'); // css 583 //buildList.push('autoprefixer'); // css
584 if (mpConfig.punch) {
582 buildList.push('concat:generated'); // montyPython 585 buildList.push('concat:generated'); // montyPython
586 }
587 if (mpConfig.css) {
583 buildList.push('cssmin'); // montyPython 588 buildList.push('cssmin'); // montyPython
589 }
584 //'uglify:dist'); 590 //'uglify:dist');
585 buildList.push('copy:dist'); 591 buildList.push('copy:dist');
586 //'modernizr'); 592 //'modernizr');
...@@ -589,8 +595,10 @@ module.exports = function (grunt) { ...@@ -589,8 +595,10 @@ module.exports = function (grunt) {
589 } 595 }
590 if (mpConfig.useRev) { 596 if (mpConfig.useRev) {
591 buildList.push('rev:dist'); // montyPython 597 buildList.push('rev:dist'); // montyPython
598 if (mpConfig.css) {
592 buildList.push('rev:css'); // montyPython 599 buildList.push('rev:css'); // montyPython
593 } 600 }
601 }
594 buildList.push('fixRequireConfig'); 602 buildList.push('fixRequireConfig');
595 if (mpConfig.bower) { 603 if (mpConfig.bower) {
596 buildList.push('concat:requirejs'); // montyPython 604 buildList.push('concat:requirejs'); // montyPython
...@@ -602,7 +610,9 @@ module.exports = function (grunt) { ...@@ -602,7 +610,9 @@ module.exports = function (grunt) {
602 buildList.push('uglify:montyPython'); // montyPython 610 buildList.push('uglify:montyPython'); // montyPython
603 } 611 }
604 buildList.push('usemin:html'); // montyPython 612 buildList.push('usemin:html'); // montyPython
613 if (mpConfig.css) {
605 buildList.push('usemin:css'); // montyPython 614 buildList.push('usemin:css'); // montyPython
615 }
606 buildList.push('htmlmin'); // montyPython 616 buildList.push('htmlmin'); // montyPython
607 buildList.push('deploy'); // montyPython 617 buildList.push('deploy'); // montyPython
608 618
......