Skip to content

Commit

Permalink
Merge pull request yeoman#794 from ProteusCortex/master
Browse files Browse the repository at this point in the history
refactor(gen): replace ngmin with ng-annotate
  • Loading branch information
eddiemonge committed Jul 31, 2014
2 parents 43978f5 + 3eea4cb commit ae53202
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions templates/common/root/_Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,9 @@ module.exports = function (grunt) {
}
},

// ngmin tries to make the code safe for minification automatically by
// using the Angular long form for dependency injection. It doesn't work on
// things like resolve or inject so those have to be done manually.
ngmin: {
// ng-annotate tries to make the code safe for minification automatically
// by using the Angular long form for dependency injection.
ngAnnotate: {
dist: {
files: [{
expand: true,
Expand Down Expand Up @@ -482,7 +481,7 @@ module.exports = function (grunt) {
'concurrent:dist',
'autoprefixer',
'concat',
'ngmin',
'ngAnnotate',
'copy:dist',
'cdnify',
'cssmin',
Expand Down
2 changes: 1 addition & 1 deletion templates/common/root/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"grunt-filerev": "^0.2.1",
"grunt-google-cdn": "^0.4.0",
"grunt-newer": "^0.7.0",
"grunt-ngmin": "^0.0.3",
"grunt-ng-annotate": "^0.3.0",
"grunt-svgmin": "^0.4.0",
"grunt-usemin": "^2.1.1",
"grunt-wiredep": "^1.7.0",
Expand Down

0 comments on commit ae53202

Please sign in to comment.