Skip to content

Commit

Permalink
Replace concat-helper with proper banner option
Browse files Browse the repository at this point in the history
  • Loading branch information
jzaefferer committed Dec 21, 2012
1 parent 2beb636 commit 4bfc254
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Gruntfile.js
Expand Up @@ -18,15 +18,15 @@ module.exports = function(grunt) {
all: 'test/*.css'
},
cssmin: {
options: {
banner: '/*my awesome css banner */'
},
plain: {
src: 'test/valid.css',
dest: 'valid.min.css'
},
banner: {
src: ['<%= cssmin.options.banner %>', 'test/valid.css' ],
options: {
banner: '/*my awesome css banner */'
},
src: 'test/valid.css',
dest: 'valid.min.banner.css'
}
}
Expand Down
1 change: 0 additions & 1 deletion package.json
Expand Up @@ -28,7 +28,6 @@
"sqwish": "0.2.0",
"csslint": "0.9.9",
"gzip-js": "0.3.1",
"grunt-lib-legacyhelpers": "0.1.0",
"grunt-contrib-jshint": "~0.1.0"
},
"devDependencies": {
Expand Down
19 changes: 12 additions & 7 deletions tasks/grunt-css.js
Expand Up @@ -7,6 +7,8 @@
*/

module.exports = function(grunt) {
"use strict";

function min_max(min, max) {
var gzip = require('gzip-js');
var gzipSize = String(gzip.zip(min, {}).length);
Expand Down Expand Up @@ -65,14 +67,17 @@ module.exports = function(grunt) {
});

grunt.registerMultiTask( "cssmin", "Minify CSS files with Sqwish.", function() {
var banner;
var helpers = require('grunt-lib-legacyhelpers').init(grunt);
// get banner here
var max = helpers.concat( grunt.file.expandFiles( this.file.src ) );
var min = require( "sqwish" ).minify( max, false );
var options = this.options({
banner: ''
});
var src = grunt.file.read( this.file.src );
var min = require( "sqwish" ).minify( src, false );
if ( options.banner ) {
min = options.banner + grunt.util.linefeed + min;
}
grunt.file.write( this.file.dest, min );
grunt.log.writeln( "File '" + this.file.dest + "' created." );
min_max( min, max );
grunt.log.writeln( "File '" + this.file.dest + "' written." );
min_max( min, src );
});

};
8 changes: 7 additions & 1 deletion test/valid.css
@@ -1 +1,7 @@
.myElement { font-size: 12pt; }
/* first declaration */
.myElement {
font-size: 12pt;
background: #eeeeee;
padding: 5px 2px 5px 2px;
}
/* more comments! */

0 comments on commit 4bfc254

Please sign in to comment.