Permalink
Browse files

Fix merge of the issue180

  • Loading branch information...
1 parent 051fd98 commit 9aab96f2d36ce547587170169a138c0f7e8ce963 @pkozlowski-opensource pkozlowski-opensource committed Sep 22, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 grunt.js
View
8 grunt.js
@@ -25,7 +25,7 @@ module.exports = function (grunt) {
},
concat: {
build: {
- src: ['<banner:meta.banner>'],
+ src: ['<banner:meta.banner>', 'common/*.js'],
dest: '<%= builddir %>/<%= pkg.name %>.js'
},
ieshiv: {
@@ -74,7 +74,7 @@ module.exports = function (grunt) {
grunt.registerTask('build', 'build all or some of the angular-ui modules', function () {
var jsBuildFiles = grunt.config('concat.build.src');
- var lessBuildFiles = grunt.config('recess.build.src');
+ var lessBuildFiles = [];
if (this.args.length > 0) {
@@ -92,8 +92,8 @@ module.exports = function (grunt) {
grunt.config('recess.build.src', lessBuildFiles);
} else {
- grunt.config('concat.build.src', jsBuildFiles.concat(['common/*.js', 'modules/*/*/*.js']));
- grunt.config('recess.build.src', lessBuildFiles.concat(['common/**/*.less']));
+ grunt.config('concat.build.src', jsBuildFiles.concat(['modules/*/*/*.js']));
+ grunt.config('recess.build.src', lessBuildFiles.concat(grunt.config('recess.build.src')));
}
grunt.task.run('concat min recess:build recess:min');

0 comments on commit 9aab96f

Please sign in to comment.