Merge branch 'upgrade-to-grunt-0.4' of https://github.com/boazsender/reveal.js into dev

edit
Hakim El Hattab 2013-02-27 13:13:54 -05:00
commit 9f1c5a0cea
2 changed files with 53 additions and 51 deletions

View File

@ -3,19 +3,11 @@ module.exports = function(grunt) {
// Project configuration
grunt.initConfig({
pkg: '<json:package.json>',
inputJS: 'js/reveal.js',
inputCSS: 'css/reveal.css',
outputJS: 'js/reveal.min.js',
outputCSS: 'css/reveal.min.css',
pkg: grunt.file.readJSON('package.json'),
meta: {
version: '2.3',
banner:
'/*!\n' +
' * reveal.js <%= meta.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' +
' * reveal.js <%= pkg.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' +
' * http://lab.hakim.se/reveal-js\n' +
' * MIT licensed\n' +
' *\n' +
@ -23,8 +15,8 @@ module.exports = function(grunt) {
' */'
},
lint: {
files: [ 'grunt.js', '<%= inputJS %>' ]
jshint: {
files: [ 'gruntfile.js', 'js/reveal.js' ]
},
// Tests will be added soon
@ -32,17 +24,20 @@ module.exports = function(grunt) {
files: [ 'test/**/*.html' ]
},
min: {
dist: {
src: [ '<banner:meta.banner>', '<%= inputJS %>' ],
dest: '<%= outputJS %>'
uglify: {
options: {
banner: '<%= meta.banner %> \n'
},
build: {
src: 'js/reveal.js',
dest: 'js/reveal.min.js'
}
},
mincss: {
cssmin: {
compress: {
files: {
'<%= outputCSS %>': [ '<%= inputCSS %>' ]
'css/reveal.min.css': [ 'css/reveal.css' ]
}
}
},
@ -69,16 +64,20 @@ module.exports = function(grunt) {
},
watch: {
files: [ 'grunt.js', '<%= inputJS %>', '<%= inputCSS %>' ],
files: [ 'gruntfile.js', 'js/reveal.js', 'css/reveal.css' ],
tasks: 'default'
}
});
// Dependencies
grunt.loadNpmTasks( 'grunt-contrib-mincss' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
// Default task
grunt.registerTask( 'default', [ 'lint', 'mincss', 'min' ] );
grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify' ] );
};

View File

@ -25,7 +25,10 @@
"mustache": "~0.4.0"
},
"devDependencies": {
"grunt-contrib-mincss": "~0.3.1",
"grunt": "~0.3.17"
"grunt-contrib-jshint": "~0.2.0",
"grunt-contrib-cssmin": "~0.4.1",
"grunt-contrib-uglify": "~0.1.1",
"grunt-contrib-watch": "~0.2.0",
"grunt": "~0.4.0"
}
}