Skip to content
Snippets Groups Projects
Commit b2943238 authored by Benjamin Tan's avatar Benjamin Tan
Browse files

Upgrade Grunt dependencies and standardise on a consistent file format. 

Closes #1226, #1538.
parent 360bc940
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.travis.yml
+ 4
− 2
View file @ b2943238
language: node_js language: node_js
node_js: node_js:
- 4.1.1 - 4
before_script: before_script:
- npm install -g grunt-cli - npm install -g grunt-cli
\ No newline at end of file after_script:
- grunt retire
Gruntfile.js
+ 37
− 38
View file @ b2943238
...@@ -25,7 +25,8 @@ module.exports = function(grunt) { ...@@ -25,7 +25,8 @@ module.exports = function(grunt) {
uglify: { uglify: {
options: { options: {
banner: '<%= meta.banner %>\n' banner: '<%= meta.banner %>\n',
screwIE8: false
}, },
build: { build: {
src: 'js/reveal.js', src: 'js/reveal.js',
...@@ -35,34 +36,31 @@ module.exports = function(grunt) { ...@@ -35,34 +36,31 @@ module.exports = function(grunt) {
sass: { sass: {
core: { core: {
files: { src: 'css/reveal.scss',
'css/reveal.css': 'css/reveal.scss', dest: 'css/reveal.css'
}
}, },
themes: { themes: {
files: [ expand: true,
{ cwd: 'css/theme/source',
expand: true, src: ['*.sass', '*.scss'],
cwd: 'css/theme/source', dest: 'css/theme',
src: ['*.sass', '*.scss'], ext: '.css'
dest: 'css/theme',
ext: '.css'
}
]
} }
}, },
autoprefixer: { autoprefixer: {
dist: { core: {
src: 'css/reveal.css' src: 'css/reveal.css'
} }
}, },
cssmin: { cssmin: {
options: {
compatibility: 'ie9'
},
compress: { compress: {
files: { src: 'css/reveal.css',
'css/reveal.min.css': [ 'css/reveal.css' ] dist: 'css/reveal.min.css'
}
} }
}, },
...@@ -72,7 +70,7 @@ module.exports = function(grunt) { ...@@ -72,7 +70,7 @@ module.exports = function(grunt) {
eqeqeq: true, eqeqeq: true,
immed: true, immed: true,
esnext: true, esnext: true,
latedef: true, latedef: 'nofunc',
newcap: true, newcap: true,
noarg: true, noarg: true,
sub: true, sub: true,
...@@ -100,20 +98,22 @@ module.exports = function(grunt) { ...@@ -100,20 +98,22 @@ module.exports = function(grunt) {
livereload: true, livereload: true,
open: true open: true
} }
}, }
}, },
zip: { zip: {
'reveal-js-presentation.zip': [ bundle: {
'index.html', src: [
'css/**', 'index.html',
'js/**', 'css/**',
'lib/**', 'js/**',
'images/**', 'lib/**',
'plugin/**', 'images/**',
'**.md' 'plugin/**',
] '**.md'
],
dest: 'reveal-js-presentation.zip'
}
}, },
watch: { watch: {
...@@ -146,25 +146,24 @@ module.exports = function(grunt) { ...@@ -146,25 +146,24 @@ module.exports = function(grunt) {
}, },
retire: { retire: {
js: ['js/reveal.js', 'lib/js/*.js', 'plugin/**/*.js'], js: [ 'js/reveal.js', 'lib/js/*.js', 'plugin/**/*.js' ],
node: ['.'], node: [ '.' ]
options: {}
} }
}); });
// Dependencies // Dependencies
grunt.loadNpmTasks( 'grunt-contrib-qunit' ); grunt.loadNpmTasks( 'grunt-contrib-connect' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' ); grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-qunit' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' ); grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-watch' ); grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-sass' );
grunt.loadNpmTasks( 'grunt-contrib-connect' );
grunt.loadNpmTasks( 'grunt-autoprefixer' ); grunt.loadNpmTasks( 'grunt-autoprefixer' );
grunt.loadNpmTasks( 'grunt-zip' );
grunt.loadNpmTasks( 'grunt-retire' ); grunt.loadNpmTasks( 'grunt-retire' );
grunt.loadNpmTasks( 'grunt-sass' );
grunt.loadNpmTasks( 'grunt-zip' );
// Default task // Default task
grunt.registerTask( 'default', [ 'css', 'js' ] ); grunt.registerTask( 'default', [ 'css', 'js' ] );
......
package.json
+ 13
− 14
View file @ b2943238
...@@ -23,22 +23,21 @@ ...@@ -23,22 +23,21 @@
"node": ">=4.0.0" "node": ">=4.0.0"
}, },
"devDependencies": { "devDependencies": {
"express": "~4.14.0", "express": "^4.15.2",
"grunt": "~1.0.1", "grunt": "^1.0.1",
"grunt-autoprefixer": "~3.0.3", "grunt-autoprefixer": "^3.0.4",
"grunt-cli": "~1.2.0", "grunt-cli": "^1.2.0",
"grunt-contrib-connect": "~0.11.2", "grunt-contrib-connect": "^1.0.2",
"grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-cssmin": "^2.1.0",
"grunt-contrib-jshint": "~0.11.3", "grunt-contrib-jshint": "^1.1.0",
"grunt-contrib-qunit": "~1.2.0", "grunt-contrib-qunit": "~1.2.0",
"grunt-contrib-uglify": "~0.9.2", "grunt-contrib-uglify": "^2.3.0",
"grunt-contrib-watch": "~1.0.0", "grunt-contrib-watch": "^1.0.0",
"grunt-sass": "~1.2.0", "grunt-sass": "^2.0.0",
"grunt-retire": "~0.3.10", "grunt-retire": "^1.0.7",
"grunt-zip": "~0.17.1", "grunt-zip": "~0.17.1",
"mustache": "~2.2.1", "mustache": "^2.3.0",
"node-sass": "~3.13.0", "socket.io": "^1.7.3"
"socket.io": "^1.4.8"
}, },
"license": "MIT" "license": "MIT"
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment