diff options
| author | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 09:00:31 +0200 |
|---|---|---|
| committer | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 09:00:31 +0200 |
| commit | 3293b44e1e52d09dbafde0f49b11fbe531c0f8c6 (patch) | |
| tree | 897eda84bf63c5ff5ac7b4261ffd8b6b8eccc00e | |
| parent | a31dbdce7181388e68da07c30e8ac7ed249ccfeb (diff) | |
Revert "Remove grunt-contrib-imagemin image minification"
This reverts commit 90e6b7bdfeccff5e96f0bda23bc5c9ab7b33238a.
| -rw-r--r-- | Gruntfile.js | 15 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 26209b1..0cb7d9c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -63,6 +63,16 @@ module.exports = function (grunt) { } } }, + imagemin: { + dist: { + files: [{ + expand: true, + cwd: 'img/', + src: '**/*.{png,jpg,gif}', + dest: 'dist/img/' + }] + } + }, copy: { dist: { files: [{ @@ -85,7 +95,12 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-htmlmin'); grunt.loadNpmTasks('grunt-contrib-cssmin'); + grunt.loadNpmTasks('grunt-contrib-imagemin'); grunt.loadNpmTasks('grunt-contrib-copy'); +<<<<<<< HEAD grunt.registerTask('default', ['swig', 'htmlmin', 'cssmin', 'uglify', 'copy']); +======= + grunt.registerTask('default', ['mkdir', 'swig', 'htmlmin', 'cssmin', 'uglify', 'imagemin', 'copy']); +>>>>>>> parent of 90e6b7b... Remove grunt-contrib-imagemin image minification }; diff --git a/package.json b/package.json index a175943..3a38e51 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "grunt-contrib-cssmin": "^1.0.1", "grunt-contrib-uglify": "^1.0.1", "grunt-contrib-htmlmin": "^0.5.0", + "grunt-contrib-imagemin": "^0.9.4", "grunt-swig": "^0.2.1" } } |