Merge pull request #390 from sphereio/fingerprint-assets-384

Enable asset fingerprinting, closes #384
commercetools · Mar 3, 2016 · b2d5ebd · b2d5ebd
2 parents 3071609 + 1a1833a
commit b2d5ebd
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -17,10 +17,10 @@ module.exports = function(grunt) {
 
   grunt.registerTask('default', ['build', 'watch']);
 
-  grunt.registerTask('build', ['clean', 'build-images', 'build-assets', 'build-templates']);
-  grunt.registerTask('build-images', ['clean:images', 'copy:images', 'imagemin']);
-  grunt.registerTask('build-assets', ['clean:assets', 'copy:assets', 'sass', 'postcss', 'uglify']);
-  grunt.registerTask('build-templates', ['clean:templates', 'copy:templates', 'copy:others', 'json-refs', 'generate-html']);
+  grunt.registerTask('build', ['clean', 'internal-build-images', 'internal-build-assets', 'internal-build-templates', 'assetFingerprint']);
+  grunt.registerTask('build-images', ['clean:images', 'internal-build-images', 'assetFingerprint:images']);
+  grunt.registerTask('build-assets', ['clean:assets', 'internal-build-assets', 'assetFingerprint:assets']);
+  grunt.registerTask('build-templates', ['clean:templates', 'internal-build-templates', 'assetFingerprint']);
 
   grunt.registerTask('release-composer', ['build', 'copy:composer']);
   grunt.registerTask('webjars', ['build', 'maven:webjars']);
@@ -29,6 +29,10 @@ module.exports = function(grunt) {
 
   grunt.registerTask('publish', ['gh-pages-clean', 'build', 'gh-pages']);
 
+  grunt.registerTask('internal-build-images', ['copy:images', 'imagemin']);
+  grunt.registerTask('internal-build-assets', ['copy:assets', 'sass', 'postcss', 'uglify']);
+  grunt.registerTask('internal-build-templates', ['copy:templates', 'copy:others', 'json-refs', 'generate-html']);
+
 };
 
 function loadConfig(path) {

diff --git a/input/assets/css/main.min.css b/input/assets/css/main.min.css
diff --git a/input/assets/css/main.min.css.map b/input/assets/css/main.min.css.map
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "autoprefixer": "^6.2.3",
     "glob": "^6.0.4",
     "grunt": "^0.4.5",
+    "grunt-asset-fingerprint": "^0.2.1",
     "grunt-compile-handlebars": "^2.0.0",
     "grunt-contrib-clean": "^0.7.0",
     "grunt-contrib-copy": "^0.8.2",

diff --git a/tasks/options/assetFingerprint.js b/tasks/options/assetFingerprint.js
@@ -0,0 +1,50 @@
+module.exports = {
+
+  options: {
+    manifestPath: "output/assets.json",
+    findAndReplaceFiles: [
+      "output/assets/css/**/*.{css,map}",
+      "output/assets/js/**/*.js",
+      "output/templates/**/*.hbs",
+      "output/site/**/*.html"
+    ],
+    keepOriginalFiles: false
+  },
+
+  images: {
+    files: [
+      {
+        expand: true,
+        cwd: "output/assets",
+        src: [
+          "img/**/*",
+          "!img/favicon.ico"
+        ],
+        dest: "output/assets"
+      }
+    ]
+  },
+
+  assets: {
+    files: [
+      {
+        expand: true,
+        cwd: "output/assets",
+        src: [
+          "fonts/**/*",
+          "js/**/*.js"
+        ],
+        dest: "output/assets"
+      },
+      {
+        expand: true,
+        cwd: "output/assets/css",
+        src: [
+          "**/*.css"
+        ],
+        dest: "output/assets/css"
+      }
+    ]
+  }
+
+}
diff --git a/tasks/options/copy.js b/tasks/options/copy.js
@@ -38,13 +38,19 @@ module.exports = {
         expand: true,
         cwd: 'input/',
         dest: 'output/',
-        src: 'assets/css/*.css'
+        src: 'assets/css/**/*.css'
+      },
+      { 
+        expand: true,
+        cwd: 'input/assets/css/',
+        dest: 'output/assets/css/sass/',
+        src: '**/*.scss'
       },
       { 
         expand: true,
         cwd: 'input/',
         dest: 'output/',
-        src: 'assets/js/*.js' 
+        src: 'assets/js/**/*.js' 
       },
       { 
         expand: true,

diff --git a/tasks/options/postcss.js b/tasks/options/postcss.js
@@ -3,8 +3,6 @@ module.exports = {
     // 'grunt-postcss': optimizes CSS files with vendor prefixes
 
     options: {
-      map: true,
-      //diff: true,
       processors: require('autoprefixer')
     },
 

diff --git a/tasks/options/sass.js b/tasks/options/sass.js
@@ -7,7 +7,7 @@ module.exports = {
      style: 'compressed'
     },
     files: {
-      'output/assets/css/main.min.css' : 'input/assets/css/main.scss'
+      'output/assets/css/main.min.css' : 'output/assets/css/sass/main.scss'
     }
   }