chore(build): fix and improve build

w11k · Aug 27, 2014 · b899c78 · b899c78
1 parent afdf664
commit b899c78
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -6,7 +6,8 @@ module.exports = function (grunt) {
 
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-sass');
+  grunt.loadNpmTasks('grunt-contrib-compass');
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-html2js');
@@ -48,14 +49,13 @@ module.exports = function (grunt) {
         }]
       }
     },
-    sass: {
+    compass: {
       dist: {
         options: {
-          style: 'expanded',
-          compass: true
-        },
-        files: {
-          'dist/w11k-slides.css': 'src/w11k-slides.scss'
+          outputStyle: 'expanded',
+          sassDir: 'src',
+          specify: 'src/w11k-slides.scss',
+          cssDir: 'dist'
         }
       }
     },
@@ -114,12 +114,18 @@ module.exports = function (grunt) {
         }]
       }
     },
+    cssmin: {
+      main: {
+        files: {
+          'dist/w11k-slides.min.css': ['dist/w11k-slides.css']
+        }
+      }
+    },
     connect: {
-      demo: {
+      test: {
         options: {
           port: 9000,
           base: '.',
-          directory: 'demo',
           keepalive: true
         }
       }
@@ -138,7 +144,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('default', ['build']);
 
-  grunt.registerTask('build', ['clean', 'jshint:src', 'sass', 'copy:template', 'copy:sass', 'html2js', 'uglify']);
-  grunt.registerTask('demo', ['build', 'connect:demo']);
+  grunt.registerTask('test', ['build', 'connect:test']);
+  grunt.registerTask('build', ['clean', 'jshint:src', 'compass', 'copy:template', 'copy:sass', 'html2js', 'uglify', 'cssmin']);
 
 };
diff --git a/package.json b/package.json
@@ -25,16 +25,18 @@
   }],
 
   "devDependencies": {
-    "grunt": "0.4.2",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-jshint": "0.8.0",
-    "grunt-contrib-sass": "0.7.2",
+    "grunt": "0.4.5",
+    "grunt-contrib-clean": "0.6.0",
+    "grunt-contrib-jshint": "0.10.0",
+    "grunt-contrib-compass": "0.9.1",
+    "grunt-contrib-cssmin": "0.10.0",
     "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-uglify": "0.4.0",
-    "grunt-html2js": "0.2.4",
-    "grunt-contrib-connect": "0.7.1",
+    "grunt-contrib-uglify": "0.5.1",
+    "grunt-html2js": "0.2.8",
 
-    "grunt-bump": "0.0.13",
+    "grunt-contrib-connect": "0.8.0",
+
+    "grunt-bump": "0.0.15",
     "grunt-conventional-changelog": "1.1.0"
   }
 }