Ticket #25169: 25169.2.diff

Gruntfile.js

@@ -30 +30 @@
                                                 src: [
                                                         '**',
                                                         '!**/.{svn,git}/**', // Ignore version control directories.
-                                                        '!wp-includes/version.php' // Exclude version.php
+                                                        '!wp-includes/version.php', // Exclude version.php
+                                                        '!**/*.{png,jpg,gif,jpeg}' // Exclude images.  They are handled by the imagemin task
                                                 ],
                                                 dest: BUILD_DIR
                                         },
@@ -314 +315 @@
                                 }
                         }
                 },
+                imagemin: {
+                        files: {
+                                expand: true,
+                                cwd: SOURCE_DIR,
+                                src: '**/*.{png,jpg,gif,jpeg}',
+                                dest: BUILD_DIR
+                        }
+                },
                 watch: {
                         all: {
                                 files: [
@@ -356 +365 @@
         // Register tasks.
 
         // Copy task.
-        grunt.registerTask('copy:all', ['copy:files', 'copy:version']);
+        grunt.registerTask('copy:all', ['copy:files', 'copy:version', 'imagemin']);
 
         // RTL task.
         grunt.registerTask('rtl', ['cssjanus:core', 'cssjanus:colors']);

package.json

@@ -22 +22 @@
     "grunt-cssjanus": "~0.2.2",
     "grunt-sass": "~0.10.0",
     "grunt-jsvalidate": "~0.2.2",
+    "grunt-contrib-imagemin" : "~0.4.1",
     "matchdep": "~0.3.0"
   }
 }