change stylus to sass and build improvements

devfreebooks · Nov 28, 2016 · 8add161 · 8add161
1 parent b8751ba
commit 8add161
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 117 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -15,15 +15,6 @@ module.exports = (grunt) => {
         NODE_ENV: 'production'
       }
     },
-    // Stylus ========================================
-    stylus: {
-      main: {
-        options: { compress: true },
-        files: {
-          'public/assets/css/application.css': 'public/assets/css/_application.styl'
-        }
-      }
-    },
     // Compress ======================================
     compress: {
       main: {
@@ -123,16 +114,16 @@ module.exports = (grunt) => {
   grunt.loadNpmTasks('grunt-gh-pages');
   grunt.loadNpmTasks('grunt-env');
   grunt.loadNpmTasks('grunt-contrib-compress');
-  grunt.loadNpmTasks('grunt-contrib-stylus');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-imagemin');
   grunt.loadNpmTasks('grunt-appcache');
   grunt.loadNpmTasks('grunt-sw-precache');
   grunt.loadNpmTasks('grunt-sitemaps');
   grunt.loadNpmTasks('grunt-shell');
+  grunt.loadNpmTasks('grunt-newer');
 
-  grunt.registerTask('prebuild:dev', ['clean', 'env:dev', 'shell:categories', 'stylus', 'imagemin']);
-  grunt.registerTask('prebuild:prod', ['clean', 'env:prod', 'shell:categories', 'stylus', 'imagemin']);
+  grunt.registerTask('prebuild:dev', ['clean', 'env:dev', 'shell:categories', 'newer:imagemin']);
+  grunt.registerTask('prebuild:prod', ['clean', 'env:prod', 'shell:categories', 'newer:imagemin']);
   grunt.registerTask('build:prod', ['shell:feed', 'appcache', 'sw-precache', 'compress', 'sitemaps']);
   grunt.registerTask('deploy:prod', ['gh-pages', 'clean']);
 };
diff --git a/package.json b/package.json
@@ -13,15 +13,15 @@
     "eslint": "3.9.1",
     "eslint-config-airbnb-base": "10.0.1",
     "eslint-plugin-import": "2.2.0",
-    "fs-extra": "^1.0.0",
+    "fs-extra": "1.0.0",
     "grunt": "1.0.1",
     "grunt-appcache": "0.2.0",
     "grunt-contrib-clean": "1.0.0",
     "grunt-contrib-compress": "1.3.0",
     "grunt-contrib-imagemin": "1.0.1",
-    "grunt-contrib-stylus": "1.2.0",
     "grunt-env": "0.4.4",
     "grunt-gh-pages": "2.0.0",
+    "grunt-newer": "1.2.0",
     "grunt-shell": "2.1.0",
     "grunt-sitemaps": "0.1.1",
     "grunt-sw-precache": "1.0.3",