Skip to content

Commit

Permalink
Updated Gruntfile to use ngAnnotate instead of ngMin
Browse files Browse the repository at this point in the history
  • Loading branch information
diegonetto committed Sep 4, 2014
1 parent c56cb88 commit 6ce89d7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
13 changes: 6 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2014-08-22 using generator-angular 0.9.5
// Generated on 2014-09-04 using generator-angular 0.9.7
'use strict';

// # Globbing
Expand Down Expand Up @@ -277,15 +277,14 @@ 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,
cwd: '.tmp/concat/scripts',
src: '*.js',
src: ['*.js', '!oldieshim.js'],
dest: '.tmp/concat/scripts'
}]
}
Expand Down Expand Up @@ -394,7 +393,7 @@ module.exports = function (grunt) {
'concurrent:dist',
'autoprefixer',
'concat',
'ngmin',
'ngAnnotate',
'copy:dist',
'cdnify',
'cssmin',
Expand Down
4 changes: 2 additions & 2 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<meta name="viewport" content="width=device-width">
<!-- build:css(.) styles/vendor.css -->
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="bower_components/angular-motion/dist/angular-motion.min.css" />
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
<link rel="stylesheet" href="bower_components/angular-motion/dist/angular-motion.min.css">
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-cssmin": "^0.9.0",
"grunt-contrib-htmlmin": "^0.3.0",
"grunt-contrib-imagemin": "^0.7.0",
"grunt-contrib-imagemin": "^0.8.1",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-filerev": "^0.2.1",
"grunt-google-cdn": "^0.4.0",
"grunt-karma": "^0.9.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",
"jshint-stylish": "^0.2.0",
"karma": "^0.12.23",
"karma-jasmine": "^0.1.5",
"karma-phantomjs-launcher": "^0.1.4",
"load-grunt-tasks": "^0.4.0",
"time-grunt": "^0.3.1"
},
Expand All @@ -33,4 +37,4 @@
"scripts": {
"test": "grunt test"
}
}
}

0 comments on commit 6ce89d7

Please sign in to comment.