diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index bb68dcd33..7f17c0ea2 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -80,7 +80,7 @@ module.exports = function (grunt) { }, stylus: { files: ['<%%= yeoman.client %>/{app,components}/**/*.styl'], - tasks: ['stylus', 'autoprefixer'] + tasks: ['stylus', 'postcss'] },<% } if (filters.sass) { %> injectSass: { files: ['<%%= yeoman.client %>/{app,components}/**/*.{scss,sass}'], @@ -88,7 +88,7 @@ module.exports = function (grunt) { }, sass: { files: ['<%%= yeoman.client %>/{app,components}/**/*.{scss,sass}'], - tasks: ['sass', 'autoprefixer'] + tasks: ['sass', 'postcss'] },<% } if (filters.less) { %> injectLess: { files: ['<%%= yeoman.client %>/{app,components}/**/*.less'], @@ -96,7 +96,7 @@ module.exports = function (grunt) { }, less: { files: ['<%%= yeoman.client %>/{app,components}/**/*.less'], - tasks: ['less', 'autoprefixer'] + tasks: ['less', 'postcss'] },<% } if (filters.jade) { %> jade: { files: [ @@ -189,9 +189,12 @@ module.exports = function (grunt) { }, // Add vendor prefixed styles - autoprefixer: { + postcss: { options: { - browsers: ['last 1 version'] + map: true, + processors: [ + require('autoprefixer-core')({browsers: ['last 1 version']}) + ] }, dist: { files: [{ @@ -771,7 +774,7 @@ module.exports = function (grunt) { 'concurrent:server', 'injector', 'wiredep', - 'autoprefixer', + 'postcss', 'concurrent:debug' ]); } @@ -785,7 +788,7 @@ module.exports = function (grunt) { 'concurrent:server', 'injector', 'wiredep', - 'autoprefixer', + 'postcss', 'express:dev', 'wait', 'open', @@ -817,7 +820,7 @@ module.exports = function (grunt) { 'injector:sass',<% } %> 'concurrent:test', 'injector', - 'autoprefixer', + 'postcss', 'karma' ]); } @@ -845,7 +848,7 @@ module.exports = function (grunt) { 'concurrent:test', 'injector', 'wiredep', - 'autoprefixer', + 'postcss', 'express:dev', 'protractor' ]); @@ -902,7 +905,7 @@ module.exports = function (grunt) { 'injector', 'wiredep', 'useminPrepare', - 'autoprefixer', + 'postcss', 'ngtemplates', 'concat', 'ngAnnotate', diff --git a/app/templates/_package.json b/app/templates/_package.json index 7e7bec125..b5c31d259 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -34,8 +34,8 @@ "serve-favicon": "~2.0.1" }, "devDependencies": { + "autoprefixer-core": "^5.2.1", "grunt": "~0.4.4", - "grunt-autoprefixer": "~0.7.2", "grunt-wiredep": "~1.8.0", "grunt-concurrent": "~0.5.0", "grunt-contrib-clean": "~0.5.0", @@ -74,6 +74,7 @@ "jit-grunt": "^0.5.0", "time-grunt": "~0.3.1", "grunt-express-server": "~0.4.17", + "grunt-postcss": "^0.5.5", "grunt-open": "~0.2.3", "open": "~0.0.4", "jshint-stylish": "~0.1.5",