Skip to content

Commit c30fa85

Browse files
committed
Merge pull request #1103 from macneib/canary
feat(grunt): remove grunt-autoprefixer, add grunt-postcss
2 parents 037b498 + d5b86c1 commit c30fa85

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

Diff for: app/templates/Gruntfile.js

+13-10
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,23 @@ module.exports = function (grunt) {
8080
},
8181
stylus: {
8282
files: ['<%%= yeoman.client %>/{app,components}/**/*.styl'],
83-
tasks: ['stylus', 'autoprefixer']
83+
tasks: ['stylus', 'postcss']
8484
},<% } if (filters.sass) { %>
8585
injectSass: {
8686
files: ['<%%= yeoman.client %>/{app,components}/**/*.{scss,sass}'],
8787
tasks: ['injector:sass']
8888
},
8989
sass: {
9090
files: ['<%%= yeoman.client %>/{app,components}/**/*.{scss,sass}'],
91-
tasks: ['sass', 'autoprefixer']
91+
tasks: ['sass', 'postcss']
9292
},<% } if (filters.less) { %>
9393
injectLess: {
9494
files: ['<%%= yeoman.client %>/{app,components}/**/*.less'],
9595
tasks: ['injector:less']
9696
},
9797
less: {
9898
files: ['<%%= yeoman.client %>/{app,components}/**/*.less'],
99-
tasks: ['less', 'autoprefixer']
99+
tasks: ['less', 'postcss']
100100
},<% } if (filters.jade) { %>
101101
jade: {
102102
files: [
@@ -189,9 +189,12 @@ module.exports = function (grunt) {
189189
},
190190

191191
// Add vendor prefixed styles
192-
autoprefixer: {
192+
postcss: {
193193
options: {
194-
browsers: ['last 1 version']
194+
map: true,
195+
processors: [
196+
require('autoprefixer-core')({browsers: ['last 1 version']})
197+
]
195198
},
196199
dist: {
197200
files: [{
@@ -771,7 +774,7 @@ module.exports = function (grunt) {
771774
'concurrent:server',
772775
'injector',
773776
'wiredep',
774-
'autoprefixer',
777+
'postcss',
775778
'concurrent:debug'
776779
]);
777780
}
@@ -785,7 +788,7 @@ module.exports = function (grunt) {
785788
'concurrent:server',
786789
'injector',
787790
'wiredep',
788-
'autoprefixer',
791+
'postcss',
789792
'express:dev',
790793
'wait',
791794
'open',
@@ -817,7 +820,7 @@ module.exports = function (grunt) {
817820
'injector:sass',<% } %>
818821
'concurrent:test',
819822
'injector',
820-
'autoprefixer',
823+
'postcss',
821824
'karma'
822825
]);
823826
}
@@ -845,7 +848,7 @@ module.exports = function (grunt) {
845848
'concurrent:test',
846849
'injector',
847850
'wiredep',
848-
'autoprefixer',
851+
'postcss',
849852
'express:dev',
850853
'protractor'
851854
]);
@@ -902,7 +905,7 @@ module.exports = function (grunt) {
902905
'injector',
903906
'wiredep',
904907
'useminPrepare',
905-
'autoprefixer',
908+
'postcss',
906909
'ngtemplates',
907910
'concat',
908911
'ngAnnotate',

Diff for: app/templates/_package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"serve-favicon": "~2.0.1"
3535
},
3636
"devDependencies": {
37+
"autoprefixer-core": "^5.2.1",
3738
"grunt": "~0.4.4",
38-
"grunt-autoprefixer": "~0.7.2",
3939
"grunt-wiredep": "~1.8.0",
4040
"grunt-concurrent": "~0.5.0",
4141
"grunt-contrib-clean": "~0.5.0",
@@ -74,6 +74,7 @@
7474
"jit-grunt": "^0.5.0",
7575
"time-grunt": "~0.3.1",
7676
"grunt-express-server": "~0.4.17",
77+
"grunt-postcss": "^0.5.5",
7778
"grunt-open": "~0.2.3",
7879
"open": "~0.0.4",
7980
"jshint-stylish": "~0.1.5",

0 commit comments

Comments
 (0)