Skip to content

Commit

Permalink
fix(build): standardize comments and comment out uglify:dist
Browse files Browse the repository at this point in the history
Standard the comment styles and add uglify to the css min commented
block as it is not used anymore

Fixes #455
  • Loading branch information
eddiemonge committed Nov 13, 2013
1 parent 7d0d96d commit d5d3e45
Showing 1 changed file with 32 additions and 34 deletions.
66 changes: 32 additions & 34 deletions templates/common/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ module.exports = function (grunt) {
},<% } %>
// not used since Uglify task does concat,
// but still available if needed
/*concat: {
dist: {}
},*/
// concat: {
// dist: {}
// },
rev: {
dist: {
files: {
Expand Down Expand Up @@ -210,31 +210,38 @@ module.exports = function (grunt) {
}]
}
},
cssmin: {
// By default, your `index.html` <!-- Usemin Block --> will take care of
// minification. This option is pre-configured if you do not wish to use
// Usemin blocks.
// dist: {
// files: {
// '<%%= yeoman.dist %>/styles/main.css': [
// '.tmp/styles/{,*/}*.css',
// '<%%= yeoman.app %>/styles/{,*/}*.css'
// ]
// }
// }
},
// By default, your `index.html` <!-- Usemin Block --> will take care of
// minification. This option is pre-configured if you do not wish to use
// Usemin blocks.
// cssmin: {
// dist: {
// files: {
// '<%%= yeoman.dist %>/styles/main.css': [
// '.tmp/styles/{,*/}*.css',
// '<%%= yeoman.app %>/styles/{,*/}*.css'
// ]
// }
// }
// },
// uglify: {
// dist: {
// files: {
// '<%%= yeoman.dist %>/scripts/scripts.js': [
// '<%%= yeoman.dist %>/scripts/scripts.js'
// ]
// }
// }
// },
htmlmin: {
dist: {
options: {
/*removeCommentsFromCDATA: true,
// https://github.com/yeoman/grunt-usemin/issues/44
//collapseWhitespace: true,
collapseBooleanAttributes: true,
removeAttributeQuotes: true,
removeRedundantAttributes: true,
useShortDoctype: true,
removeEmptyAttributes: true,
removeOptionalTags: true*/
// removeCommentsFromCDATA: true,
// collapseBooleanAttributes: true,
// removeAttributeQuotes: true,
// removeRedundantAttributes: true,
// useShortDoctype: true,
// removeEmptyAttributes: true,
// removeOptionalTags: true*/
},
files: [{
expand: true,
Expand Down Expand Up @@ -315,15 +322,6 @@ module.exports = function (grunt) {
dest: '.tmp/concat/scripts'
}]
}
},
uglify: {
dist: {
files: {
'<%%= yeoman.dist %>/scripts/scripts.js': [
'<%%= yeoman.dist %>/scripts/scripts.js'
]
}
}
}
});

Expand Down

0 comments on commit d5d3e45

Please sign in to comment.